diff --git a/client.js b/client.js index 543baa0d..5e3165bf 100644 --- a/client.js +++ b/client.js @@ -13,7 +13,7 @@ const asTable = require("as-table").configure({delimiter: ' | '}); const util = require("util"); // internal libraries -const objectOps = require("lib/objectOps.js"); +const objectOps = require("lib/objectOps"); const fileOps = require("lib/fileOps"); const pluginManager = require("lib/manager/pluginManager"); const modManager = require("lib/manager/modManager"); @@ -594,7 +594,7 @@ async function instanceManagement(config, instance, instanceconfig, server) { } if(pluginConfig.binary == "nodePackage" && pluginConfig.enabled){ // require plugin class and execute it - let pluginClass = require(path.resolve(pluginConfig.pluginPath, "index.js")); + let pluginClass = require(path.resolve(pluginConfig.pluginPath, "index")); plugins[i] = new pluginClass(combinedConfig, async function(data, callback){ if(data && data.toString('utf8')[0] != "/") { console.log("Clusterio | "+ pluginsToLoad[i].name + " | " + data.toString('utf8')); diff --git a/lib/clusterTools/index.js b/lib/clusterTools/index.js index eee7cb1b..09351555 100644 --- a/lib/clusterTools/index.js +++ b/lib/clusterTools/index.js @@ -12,5 +12,5 @@ module.exports = ({config} = {}) => ({ arg1 is the instanceID Promise resolves with a string, either the displayName or instanceID if not found. */ - getInstanceName: require("./getInstanceName.js")(config), + getInstanceName: require("./getInstanceName")(config), }) diff --git a/lib/isFactorioCommand/index.js b/lib/isFactorioCommand/index.js index 5d4aeb9b..408a2086 100644 --- a/lib/isFactorioCommand/index.js +++ b/lib/isFactorioCommand/index.js @@ -1 +1 @@ -module.exports = require("./isFactorioCommand.js"); \ No newline at end of file +module.exports = require("./isFactorioCommand"); diff --git a/lib/manager/modManager.js b/lib/manager/modManager.js index 606cef05..dc5da90b 100644 --- a/lib/manager/modManager.js +++ b/lib/manager/modManager.js @@ -36,7 +36,7 @@ modManager.listMods(config, instance); */ async function listMods(config, instance) { return new Promise((resolve, reject) => { - const instances = require("./../getInstances.js")(config).sync(); + const instances = require("./../getInstances")(config).sync(); if (instances.includes(instance.name)) { factorioAPI.init(false, instance.path("instanceMods"), instance.path("saves"), config.factorio_version); factorioAPI.authenticate({ diff --git a/master.js b/master.js index 2606e639..3acb2be3 100644 --- a/master.js +++ b/master.js @@ -11,7 +11,7 @@ node master */ // Attempt updating -// const updater = require("./updater.js"); +// const updater = require("./updater"); // updater.update().then(console.log); // argument parsing @@ -32,7 +32,7 @@ let config = {}; // homebrew modules const generateSSLcert = require("lib/generateSSLcert"); -const pluginManager = require("lib/manager/pluginManager.js"); +const pluginManager = require("lib/manager/pluginManager"); const database = require("lib/database"); const factorio = require("lib/factorio"); @@ -71,8 +71,8 @@ app.use(function(req, res, next){ next(); }); -require("./routes.js")(app); -require("./routes/api/getPictures.js")(app); +require("./routes")(app); +require("./routes/api/getPictures")(app); // Set folder to serve static content from (the website) app.use(express.static('static')); @@ -480,7 +480,7 @@ app.post("/api/place", authenticate.middleware, function(req, res) { res.send("failure"); } }); -const routes_api_remove = require("./routes/api/remove.js"); +const routes_api_remove = require("./routes/api/remove"); let neuralDole; /** diff --git a/routes/api/remove.js b/routes/api/remove.js index 4de5ba18..382dade9 100644 --- a/routes/api/remove.js +++ b/routes/api/remove.js @@ -1,6 +1,6 @@ const averagedTimeSeries = require("averaged-timeseries") -const doleNN = require("lib/dole_nn_base.js") +const doleNN = require("lib/dole_nn_base") const Prometheus = require('prom-client'); diff --git a/sharedPlugins/clusterioMod/index.js b/sharedPlugins/clusterioMod/index.js index ce4b57a7..64a11ce4 100644 --- a/sharedPlugins/clusterioMod/index.js +++ b/sharedPlugins/clusterioMod/index.js @@ -1,7 +1,7 @@ const needle = require("needle"); const fs = require("fs-extra"); -const objectOps = require("lib/objectOps.js"); +const objectOps = require("lib/objectOps"); const fileOps = require("lib/fileOps"); const pluginConfig = require("./config"); diff --git a/sharedPlugins/inventoryImports/index.js b/sharedPlugins/inventoryImports/index.js index 40dd929e..282dbf45 100644 --- a/sharedPlugins/inventoryImports/index.js +++ b/sharedPlugins/inventoryImports/index.js @@ -1,6 +1,6 @@ const needle = require("needle"); -const isJson = require("./isJson.js"); -const pluginConfig = require("./config.js"); +const isJson = require("./isJson"); +const pluginConfig = require("./config"); const functions = require("./interfacingFunctions"); diff --git a/sharedPlugins/inventoryImports/interfacingFunctions.js b/sharedPlugins/inventoryImports/interfacingFunctions.js index 870185d8..9ea57750 100644 --- a/sharedPlugins/inventoryImports/interfacingFunctions.js +++ b/sharedPlugins/inventoryImports/interfacingFunctions.js @@ -1,4 +1,4 @@ -const objectOps = require("lib/objectOps.js"); +const objectOps = require("lib/objectOps"); const needle = require("needle"); const pluginConfig = require("./config") const isJson = require("./isJson") diff --git a/sharedPlugins/researchSync/test/index.js b/sharedPlugins/researchSync/test/index.js index aa0b9a6c..00f8788f 100644 --- a/sharedPlugins/researchSync/test/index.js +++ b/sharedPlugins/researchSync/test/index.js @@ -3,7 +3,7 @@ const nock = require("nock"); const isFactorioCommand = require("lib/isFactorioCommand"); -const researchSync = require("../index.js"); +const researchSync = require("../index"); describe("researchSync/index.js", function() { it("exports a single class (or at least a function)", function() { diff --git a/sharedPlugins/serverManager/index.js b/sharedPlugins/serverManager/index.js index aafa32a7..3208b305 100644 --- a/sharedPlugins/serverManager/index.js +++ b/sharedPlugins/serverManager/index.js @@ -8,7 +8,7 @@ module.exports = class remoteCommands { this.messageInterface = messageInterface; this.config = mergedConfig; this.socket = extras.socket; - const pluginManager = require("lib/manager/pluginManager.js"); + const pluginManager = require("lib/manager/pluginManager"); // const modManager = require("lib/manager/modManager"); this.socket.on("hello", () => { this.socket.emit("registerServerManager"); diff --git a/sharedPlugins/serverManager/masterPlugin.js b/sharedPlugins/serverManager/masterPlugin.js index 981dbf00..6c458389 100644 --- a/sharedPlugins/serverManager/masterPlugin.js +++ b/sharedPlugins/serverManager/masterPlugin.js @@ -22,10 +22,10 @@ class masterPlugin { // this.banlist = getDatabaseSync("database/banlist.json").banlist || []; // initialize web API - require("./js/api-endpoints.js")(this); + require("./js/api-endpoints")(this); // expose UI elements embedded in the master - this.ui = require("./js/ui.js").injectThis(this).ui; + this.ui = require("./js/ui").injectThis(this).ui; this.serverSockets = {}; diff --git a/test/lib/generateSSLcert.js b/test/lib/generateSSLcert.js index 6f69efae..dbed9058 100644 --- a/test/lib/generateSSLcert.js +++ b/test/lib/generateSSLcert.js @@ -2,7 +2,7 @@ var assert = require("assert"); var fs = require("fs-extra"); var fileOps = require("lib/fileOps"); -var generateSSLcert = require("lib/generateSSLcert.js") +var generateSSLcert = require("lib/generateSSLcert") describe("generateSSLcert.js(options)", ()=>{ it("Creates a folder with a .crt and .key file in it", async function() { diff --git a/test/master.js b/test/master.js index 8153ec7d..79dbf410 100644 --- a/test/master.js +++ b/test/master.js @@ -4,7 +4,7 @@ const validateHTML = require('html5-validator'); const parallel = require('mocha.parallel'); const jwt = require("jsonwebtoken"); -const master = require('../master.js'); +const master = require('../master'); const authenticate = require('lib/authenticate'); const database = require('lib/database');