tmp2

src/script/cpp_api/s_sscsm.cpp

@@ -10,6 +10,18 @@
 void ScriptApiSSCSM::load_mods(const std::vector<std::string> &init_paths)
 {
 	//TODO
+
+	SSCSMEnvironment *env = getSSCSMEnv();
+	actionstream << "load_mods:\n";
+	for (const auto &p : init_paths) {
+		actionstream << "    " << p << ":\n";
+		auto f = env->readVFSFile(p);
+		if (!f.has_value()) {
+			env->setFatalError("load_mods(): File doesn't exist: " + p);
+			return;
+		}
+		actionstream << *f << "\n";
+	}
 }
 
 void ScriptApiSSCSM::environment_step(float dtime)

src/script/lua_api/l_sscsm.cpp

@@ -9,14 +9,16 @@
 #include "l_internal.h"
 #include "log.h"
 #include "script/sscsm/sscsm_environment.h"
+#include "script/sscsm/sscsm_requests.h"
 #include "mapnode.h"
 
 // print(text)
 int ModApiSSCSM::l_print(lua_State *L)
 {
-	// TODO: send request to main process
+	auto request = SSCSMRequestPrint{};
-	std::string text = luaL_checkstring(L, 1);
+	request.text = luaL_checkstring(L, 1);
-	rawstream << text << std::endl;
+	getSSCSMEnv(L)->doRequest(std::move(request));
+
 	return 0;
 }
 
@@ -28,11 +30,13 @@ int ModApiSSCSM::l_get_node_or_nil(lua_State *L)
 	v3s16 pos = read_v3s16(L, 1);
 
 	// Do it
-	bool pos_ok = true;
+	auto request = SSCSMRequestGetNode{};
-	MapNode n = getSSCSMEnv(L)->requestGetNode(pos); //TODO: add pos_ok to request
+	request.pos = pos;
-	if (pos_ok) {
+	auto answer = getSSCSMEnv(L)->doRequest(std::move(request));
+
+	if (answer.is_pos_ok) {
 		// Return node
-		pushnode(L, n);
+		pushnode(L, answer.node);
 	} else {
 		lua_pushnil(L);
 	}

src/script/scripting_sscsm.cpp

@@ -4,7 +4,8 @@
 
 #include "scripting_sscsm.h"
 
-SSCSMScripting::SSCSMScripting(SSCSMEnvironment *env)
+SSCSMScripting::SSCSMScripting(SSCSMEnvironment *env) :
+	ScriptApiBase(ScriptingType::SSCSM)
 {
 	setSSCSMEnv(env);
 

src/script/sscsm/sscsm_environment.cpp

@@ -42,20 +42,26 @@ void SSCSMEnvironment::updateVFSFiles(std::vector<std::pair<std::string, std::st
 	}
 }
 
+std::optional<std::string_view> SSCSMEnvironment::readVFSFile(const std::string &path)
+{
+	auto it = m_vfs.find(path);
+	if (it == m_vfs.end())
+		return std::nullopt;
+	else
+		return it->second;
+}
+
 void SSCSMEnvironment::setFatalError(const std::string &reason)
 {
-	//TODO
+	auto request = SSCSMRequestSetFatalError{};
-	// what to do on error?
+	request.reason = reason;
-	// probably send a request
+	doRequest(std::move(request));
-	errorstream << "SSCSMEnvironment::setFatalError() reason: " << reason << std::endl;
 }
 
 std::unique_ptr<ISSCSMEvent> SSCSMEnvironment::requestPollNextEvent()
 {
 	auto request = SSCSMRequestPollNextEvent{};
-	auto answer = deserializeSSCSMAnswer<SSCSMRequestPollNextEvent::Answer>(
+	auto answer = doRequest(std::move(request));
-			exchange(serializeSSCSMRequest(request))
-		);
 	return std::move(answer.next_event);
 }
 
@@ -63,8 +69,6 @@ MapNode SSCSMEnvironment::requestGetNode(v3s16 pos)
 {
 	auto request = SSCSMRequestGetNode{};
 	request.pos = pos;
-	auto answer = deserializeSSCSMAnswer<SSCSMRequestGetNode::Answer>(
+	auto answer = doRequest(std::move(request));
-			exchange(serializeSSCSMRequest(request))
-		);
 	return answer.node;
 }

src/script/sscsm/sscsm_environment.h

@@ -5,6 +5,9 @@
 #pragma once
 
 #include <memory>
+#include <optional>
+#include <string>
+#include <string_view>
 #include "client/client.h"
 #include "threading/thread.h"
 #include "sscsm_controller.h"
@@ -34,6 +37,7 @@ public:
 	SSCSMScripting *getScript() { return m_script.get(); }
 
 	void updateVFSFiles(std::vector<std::pair<std::string, std::string>> &&files);
+	std::optional<std::string_view> readVFSFile(const std::string &path);
 
 	void setFatalError(const std::string &reason);
 	void setFatalError(const LuaError &e)
@@ -41,6 +45,14 @@ public:
 		setFatalError(std::string("Lua: ") + e.what());
 	}
 
+	template <typename RQ>
+	typename RQ::Answer doRequest(RQ &&rq)
+	{
+		return deserializeSSCSMAnswer<typename RQ::Answer>(
+				exchange(serializeSSCSMRequest(std::forward<RQ>(rq)))
+			);
+	}
+
 	std::unique_ptr<ISSCSMEvent> requestPollNextEvent();
 	MapNode requestGetNode(v3s16 pos);
 };

src/script/sscsm/sscsm_requests.h

@@ -9,7 +9,9 @@
 #include "mapnode.h"
 #include "map.h"
 #include "client/client.h"
+#include "log_internal.h"
 
+// Poll the next event (e.g. on_globalstep)
 struct SSCSMRequestPollNextEvent : public ISSCSMRequest
 {
 	struct Answer : public ISSCSMAnswer
@@ -23,21 +25,81 @@ struct SSCSMRequestPollNextEvent : public ISSCSMRequest
 	}
 };
 
+// Some error occured in the SSCSM env
+struct SSCSMRequestSetFatalError : public ISSCSMRequest
+{
+	struct Answer : public ISSCSMAnswer
+	{
+	};
+
+	std::string reason;
+
+	SerializedSSCSMAnswer exec(Client *client) override
+	{
+		client->setFatalError("[SSCSM] " + reason);
+
+		return serializeSSCSMAnswer(Answer{});
+	}
+};
+
+// print(text)
+struct SSCSMRequestPrint : public ISSCSMRequest
+{
+	struct Answer : public ISSCSMAnswer
+	{
+	};
+
+	std::string text;
+
+	SerializedSSCSMAnswer exec(Client *client) override
+	{
+		rawstream << text << std::endl;
+
+		return serializeSSCSMAnswer(Answer{});
+	}
+};
+
+// core.log(level, text)
+struct SSCSMRequestLog : public ISSCSMRequest
+{
+	struct Answer : public ISSCSMAnswer
+	{
+	};
+
+	std::string text;
+	LogLevel level;
+
+	SerializedSSCSMAnswer exec(Client *client) override
+	{
+		if (level >= LL_MAX) {
+			errorstream << "Tried to log at non-existent level." << std::endl; // TODO: should probably throw
+		} else {
+			g_logger.log(level, text);
+		}
+
+		return serializeSSCSMAnswer(Answer{});
+	}
+};
+
+// core.get_node(pos)
 struct SSCSMRequestGetNode : public ISSCSMRequest
 {
 	struct Answer : public ISSCSMAnswer
 	{
 		MapNode node;
+		bool is_pos_ok;
 	};
 
 	v3s16 pos;
 
 	SerializedSSCSMAnswer exec(Client *client) override
 	{
-		MapNode node = client->getEnv().getMap().getNode(pos);
+		bool is_pos_ok = false;
+		MapNode node = client->getEnv().getMap().getNode(pos, &is_pos_ok);
 
 		Answer answer{};
 		answer.node = node;
+		answer.is_pos_ok = is_pos_ok;
 		return serializeSSCSMAnswer(std::move(answer));
 	}
 };