mirror of
https://github.com/clusterio/clusterio.git
synced 2026-11-22 08:13:12 +09:00
Adapt config and link library to web
Make the config and link libraries compatible with packing for web with webpack. This would fail due to ws not being web compatible and config using a node function not available in the web shim for util.
This commit is contained in:
1 parent
fbf2843f5b
commit
f318f8826b
5 files changed
+54
-29
No files matched your search
@@ -2,8 +2,8 @@
|
|||||||
"use strict";
|
"use strict";
|
||||||
|
|
||||||
const events = require("events");
|
const events = require("events");
|
||||||
const util = require("util");
|
|
||||||
|
|
||||||
|
const isDeepStrictEqual = require("../is_deep_strict_equal");
|
||||||
const { basicType } = require("@clusterio/lib/helpers");
|
const { basicType } = require("@clusterio/lib/helpers");
|
||||||
|
|
||||||
|
|
||||||
@@ -415,7 +415,7 @@ class ConfigGroup {
|
|||||||
|
|
||||||
let prev = this._fields.get(name);
|
let prev = this._fields.get(name);
|
||||||
this._fields.set(name, value);
|
this._fields.set(name, value);
|
||||||
if (this._config && !util.isDeepStrictEqual(value, prev)) {
|
if (this._config && !isDeepStrictEqual(value, prev)) {
|
||||||
this._config.emit("fieldChanged", this, name, prev);
|
this._config.emit("fieldChanged", this, name, prev);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -452,7 +452,7 @@ class ConfigGroup {
|
|||||||
|
|
||||||
updated[prop] = value;
|
updated[prop] = value;
|
||||||
this._fields.set(name, updated);
|
this._fields.set(name, updated);
|
||||||
if (this._config && !util.isDeepStrictEqual(updated, prev)) {
|
if (this._config && !isDeepStrictEqual(updated, prev)) {
|
||||||
this._config.emit("fieldChanged", this, name, prev);
|
this._config.emit("fieldChanged", this, name, prev);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -502,7 +502,7 @@ class ConfigGroup {
|
|||||||
|
|
||||||
let prev = this._fields.get(name);
|
let prev = this._fields.get(name);
|
||||||
this._fields.set(name, value);
|
this._fields.set(name, value);
|
||||||
if (notify && this._config && !util.isDeepStrictEqual(value, prev)) {
|
if (notify && this._config && !isDeepStrictEqual(value, prev)) {
|
||||||
this._config.emit("fieldChanged", this, name, prev);
|
this._config.emit("fieldChanged", this, name, prev);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,7 @@
|
|||||||
|
"use strict";
|
||||||
|
// eslint-disable-next-line no-process-env
|
||||||
|
if (process.env.APP_ENV === "browser") {
|
||||||
|
module.exports = require("fast-deep-equal/es6");
|
||||||
|
} else {
|
||||||
|
module.exports = require("util").isDeepStrictEqual;
|
||||||
|
}
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
// Connection adapters for Links
|
// Connection adapters for Links
|
||||||
"use strict";
|
"use strict";
|
||||||
const events = require("events");
|
const events = require("events");
|
||||||
const WebSocket = require("ws");
|
const WebSocket = require("isomorphic-ws");
|
||||||
|
|
||||||
const schema = require("@clusterio/lib/schema");
|
const schema = require("@clusterio/lib/schema");
|
||||||
const errors = require("@clusterio/lib/errors");
|
const errors = require("@clusterio/lib/errors");
|
||||||
@@ -236,11 +236,17 @@ class WebSocketClientConnector extends WebSocketBaseConnector {
|
|||||||
// Open WebSocket to master
|
// Open WebSocket to master
|
||||||
console.log(`SOCKET | connecting to ${url}`);
|
console.log(`SOCKET | connecting to ${url}`);
|
||||||
|
|
||||||
this._socket = new WebSocket(url, {
|
// eslint-disable-next-line no-process-env
|
||||||
// For now we do not verify TLS certificates since the default setup is
|
if (process.env.APP_ENV === "browser") {
|
||||||
// to create a self-signed certificate.
|
this._socket = new WebSocket(url);
|
||||||
rejectUnauthorized: false,
|
|
||||||
});
|
} else {
|
||||||
|
this._socket = new WebSocket(url, {
|
||||||
|
// For now we do not verify TLS certificates since the default setup is
|
||||||
|
// to create a self-signed certificate.
|
||||||
|
rejectUnauthorized: false,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
this._attachSocketHandlers();
|
this._attachSocketHandlers();
|
||||||
}
|
}
|
||||||
@@ -277,11 +283,11 @@ class WebSocketClientConnector extends WebSocketBaseConnector {
|
|||||||
}
|
}
|
||||||
|
|
||||||
_attachSocketHandlers() {
|
_attachSocketHandlers() {
|
||||||
this._socket.on("close", (code, reason) => {
|
this._socket.onclose = event => {
|
||||||
console.log(`SOCKET | Close (code: ${code}, reason: ${reason})`);
|
console.log(`SOCKET | Close (code: ${event.code}, reason: ${event.reason})`);
|
||||||
// Authentication failed
|
// Authentication failed
|
||||||
if (code === 4003) {
|
if (event.code === 4003) {
|
||||||
this.emit("error", new errors.AuthenticationFailed(reason));
|
this.emit("error", new errors.AuthenticationFailed(event.reason));
|
||||||
this._state = "closing";
|
this._state = "closing";
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -303,26 +309,20 @@ class WebSocketClientConnector extends WebSocketBaseConnector {
|
|||||||
}
|
}
|
||||||
|
|
||||||
this.stopHeartbeat();
|
this.stopHeartbeat();
|
||||||
});
|
};
|
||||||
|
|
||||||
this._socket.on("error", err => {
|
this._socket.onerror = event => {
|
||||||
// It's assumed that close is always called by ws
|
// It's assumed that close is always called by ws
|
||||||
console.error("SOCKET | Error:", err);
|
console.error("SOCKET | Error:", event);
|
||||||
});
|
};
|
||||||
|
|
||||||
this._socket.on("open", () => {
|
this._socket.onopen = () => {
|
||||||
console.log("SOCKET | Open");
|
console.log("SOCKET | Open");
|
||||||
});
|
};
|
||||||
this._socket.on("ping", data => {
|
|
||||||
console.log(`SOCKET | Ping (data: ${data}`);
|
|
||||||
});
|
|
||||||
this._socket.on("pong", data => {
|
|
||||||
console.log(`SOCKET | Pong (data: ${data}`);
|
|
||||||
});
|
|
||||||
|
|
||||||
// Handle messages
|
// Handle messages
|
||||||
this._socket.on("message", data => {
|
this._socket.onmessage = event => {
|
||||||
let message = JSON.parse(data);
|
let message = JSON.parse(event.data);
|
||||||
if (this._state === "handshake") {
|
if (this._state === "handshake") {
|
||||||
this._processHandshake(message);
|
this._processHandshake(message);
|
||||||
|
|
||||||
@@ -341,7 +341,7 @@ class WebSocketClientConnector extends WebSocketBaseConnector {
|
|||||||
} else {
|
} else {
|
||||||
throw new Error(`Received message in unexpected state ${this._state}`);
|
throw new Error(`Received message in unexpected state ${this._state}`);
|
||||||
}
|
}
|
||||||
});
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
_processHandshake(message) {
|
_processHandshake(message) {
|
||||||
|
|||||||
@@ -13,6 +13,7 @@
|
|||||||
"dependencies": {
|
"dependencies": {
|
||||||
"fs-extra": "^8.1.0",
|
"fs-extra": "^8.1.0",
|
||||||
"ini": "^1.3.5",
|
"ini": "^1.3.5",
|
||||||
|
"isomorphic-ws": "^4.0.1",
|
||||||
"jimp": "^0.12.1",
|
"jimp": "^0.12.1",
|
||||||
"jsonwebtoken": "^8.2.1",
|
"jsonwebtoken": "^8.2.1",
|
||||||
"jszip": "^3.2.2",
|
"jszip": "^3.2.2",
|
||||||
|
|||||||
@@ -18,6 +18,23 @@ class MockSocket {
|
|||||||
this.events.set(event, fn);
|
this.events.set(event, fn);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* eslint-disable accessor-pairs */
|
||||||
|
set onclose(fn) {
|
||||||
|
this.on("close", (code, reason) => fn({ code, reason }));
|
||||||
|
}
|
||||||
|
|
||||||
|
set onerror(fn) {
|
||||||
|
this.on("error", fn);
|
||||||
|
}
|
||||||
|
|
||||||
|
set onopen(fn) {
|
||||||
|
this.on("open", fn);
|
||||||
|
}
|
||||||
|
|
||||||
|
set onmessage(fn) {
|
||||||
|
this.on("message", (data) => fn({ data }));
|
||||||
|
}
|
||||||
|
|
||||||
terminate() {
|
terminate() {
|
||||||
this.terminateCalled = true;
|
this.terminateCalled = true;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in new issue
Block a user