Merge pull request #393 from Hornwitser/abandon-1.2.x

Abandon 1.2.x [skip ci]
Abandon the 1.2.x version
2026-11-11 23:04:52 +09:00 · 2021-06-18 13:59:20 +02:00 · 2021-06-17 16:12:15 +02:00 · 2021-06-17 16:05:17 +02:00 · 2020-11-08 18:08:02 +01:00 · 2020-10-27 00:44:18 +01:00
4 changed files with 6 additions and 16 deletions
@@ -1,10 +0,0 @@
-language: node_js
-node_js:
-  - 10
-before_install:
-  - sudo apt-get -qq update
-  - sudo apt-get install -y curl git tar
-  - curl -o factorio.tar.gz -L https://www.factorio.com/get-download/latest/headless/linux64
-  - tar -xvf factorio.tar.gz
-script:
-  - npm run cover
@@ -8,12 +8,11 @@

 Discord for development/support/play: https://discord.gg/5XuDkje

-## Important notice
+# ABANDONED VERSION

-This is the stable branch of the project.  The
-[master branch](http://github.com/clusterio/factorioClusterio/tree/master)
-is undergoing significant changes that breaks compatibility to plugins and
-existing installations and is not recommended for use.
+**The 1.2.x version of Clusterio has been abandonded.
+Please go to the [main branch of the project](https://github.com/clusterio/clusterio) and continue from there.
+The information below is out of date and kept for archival purposes only.**

 ### Ways to support me/the project:

@@ -716,7 +716,7 @@ async function instanceManagement(instanceconfig) {
 							console.error(err);
 						} else if (response && response.body) {
 							// In the future we might be interested in whether or not we actually manage to send it, but honestly I don't care.
-							if(response.body !== "ok") {
+							if (typeof response.body !== "string" || response.body.toLowerCase() !== "ok") {
                                console.log("Got no \"ok\" while registering our precense with master "+config.masterIP+" at " + payload.time);
                                console.log(response.body);
                            }
@@ -329,6 +329,7 @@ app.post("/api/getID", authenticate.middleware, function(req,res) {
 		}
 		// console.log("Slave registered: " + slaves[req.body.unique].mac + " : " + slaves[req.body.unique].serverPort+" at " + slaves[req.body.unique].publicIP + " with name " + slaves[req.body.unique].instanceName);
 	}
+	res.sendStatus(200);
 });
 /**
 POST Allows you to add metadata related to slaves for other tools, like owner data, descriptions or statistics.
Author	SHA1	Message	Date
Hornwitser	22c1630ff0	Merge pull request #393 from Hornwitser/abandon-1.2.x Abandon 1.2.x [skip ci]	2021-06-18 13:59:20 +02:00
Hornwitser	ed9966f65c	Abandon the 1.2.x version Development has effectively stopped on the 1.2.x branch and there's no interest in keeping it going. Put up a warning that this version is no longer supported and direct people to go to main clusterio project page instead. [skip ci]	2021-06-17 16:12:15 +02:00
Hornwitser	248d9fcd3e	Remove Travis integration The Travis integration is completely broken for 1.2.x due to some issue with the npm cache and the linked packages created in it by the master branch. Remove it from here.	2021-06-17 16:05:17 +02:00
Hornwitser	1c0db7e58a	Fix crash on incorrect authentication token (#336 ) Fix client.js exiting abruptly when the getID endpoint returns something other than a string as the body, this happens on authentication failure.	2020-11-08 18:08:02 +01:00
Hornwitser	3d8cfef8bc	Merge pull request #324 from Hornwitser/fix-log-spam Fix 'Got no "ok"' log spam	2020-10-27 00:44:18 +01:00
Hornwitser	8803a737a5	Fix 'Got no "ok"' log spam In `1bdf23d` I incorrectly assumed that the response sent wouldn't matter as it hadn't sent a response in ages. That was not the case and the client code checks to see if the response is "ok" while .sendStatus(200) sends a response of "OK". Fix log spam by doing a case insensitive comparison of the response.	2020-10-23 15:58:56 +02:00
Hornwitser	320677194e	Merge pull request #307 from mlyszczek/1.2.x master.js: fix missing response for /api/getID	2020-08-27 11:05:01 +02:00
Michał Łyszczek	1bdf23d960	master.js: fix missing response for /api/getID According to rfc2616#section-6: > After receiving and interpreting a request message, a server > responds with an HTTP response message. That response was missing for /api/getID which could lead to EMFILE, because needle module was waiting indefiniately for response from server. Since client sends /api/getID once every 10 seconds, this piles up, ultimately reaching ulimit for opened file descriptors. Signed-off-by: Michał Łyszczek <michal.lyszczek@bofc.pl>	2020-08-27 04:05:52 +02:00