Prefix clusterio/lib imports with lib

Use lib* prefix for the modules impored from the lib package to help
distinguish them more from ordinary variables.  Fix up the naming
convention for files to be consistently lowercase_underscore for
JavaScript files.
This commit is contained in:
Hornwitser committed 2020-10-23 21:22:43 +02:00
1 parent fbbaf3dd3a
commit 24397b75cc
55 files changed
+692 -668

No files matched your search

+5 -5
View File
@@ -1,5 +1,5 @@
"use strict";
const link = require("@clusterio/lib/link");
const libLink = require("@clusterio/lib/link");
// schema used for syncing technologies to and from the master
@@ -26,7 +26,7 @@ module.exports = {
masterEntrypoint: "master",
messages: {
contribution: new link.Event({
contribution: new libLink.Event({
type: "research_sync:contribution",
links: ["instance-slave", "slave-master"],
forwardTo: "master",
@@ -36,7 +36,7 @@ module.exports = {
"contribution": { type: "number" },
},
}),
progress: new link.Event({
progress: new libLink.Event({
type: "research_sync:progress",
links: ["master-slave", "slave-instance"],
broadcastTo: "instance",
@@ -55,7 +55,7 @@ module.exports = {
},
},
}),
finished: new link.Event({
finished: new libLink.Event({
type: "research_sync:finished",
links: ["instance-slave", "slave-master", "master-slave", "slave-instance"],
forwardTo: "master",
@@ -65,7 +65,7 @@ module.exports = {
"level": { type: "integer" },
},
}),
syncTechnologies: new link.Request({
syncTechnologies: new libLink.Request({
type: "research_sync:sync_technologies",
links: ["instance-slave", "slave-master"],
forwardTo: "master",
+6 -6
View File
@@ -1,6 +1,6 @@
"use strict";
const plugin = require("@clusterio/lib/plugin");
const luaTools = require("@clusterio/lib/luaTools");
const libPlugin = require("@clusterio/lib/plugin");
const libLuaTools = require("@clusterio/lib/lua_tools");
function unexpectedError(err) {
@@ -9,7 +9,7 @@ function unexpectedError(err) {
console.log(err);
}
class InstancePlugin extends plugin.BaseInstancePlugin {
class InstancePlugin extends libPlugin.BaseInstancePlugin {
async init() {
if (!this.instance.config.get("factorio.enable_save_patching")) {
throw new Error("research_sync plugin requires save patching.");
@@ -28,7 +28,7 @@ class InstancePlugin extends plugin.BaseInstancePlugin {
}
async progressEventHandler(message) {
let techsJson = luaTools.escapeString(JSON.stringify(message.data.technologies));
let techsJson = libLuaTools.escapeString(JSON.stringify(message.data.technologies));
await this.instance.server.sendRcon(`/sc research_sync.update_progress("${techsJson}")`, true);
}
@@ -39,7 +39,7 @@ class InstancePlugin extends plugin.BaseInstancePlugin {
async finishedEventHandler(message) {
let { name, level, researched } = message.data;
await this.instance.server.sendRcon(
`/sc research_sync.research_technology("${luaTools.escapeString(name)}", ${level})`, true
`/sc research_sync.research_technology("${libLuaTools.escapeString(name)}", ${level})`, true
);
}
@@ -73,7 +73,7 @@ class InstancePlugin extends plugin.BaseInstancePlugin {
}
if (techsToSync.length) {
let syncJson = luaTools.escapeString(JSON.stringify(techsToSync));
let syncJson = libLuaTools.escapeString(JSON.stringify(techsToSync));
await this.instance.server.sendRcon(`/sc research_sync.sync_technologies("${syncJson}")`, true);
}
}
+2 -2
View File
@@ -2,10 +2,10 @@
const fs = require("fs-extra");
const path = require("path");
const plugin = require("@clusterio/lib/plugin");
const libPlugin = require("@clusterio/lib/plugin");
class MasterPlugin extends plugin.BaseMasterPlugin {
class MasterPlugin extends libPlugin.BaseMasterPlugin {
async init() {
this.technologies = await loadTechnologies(this.master.config);
this.lastProgressBroadcast = Date.now();