mirror of
https://gitlab.nic.cz/turris/reforis/foris-js.git
synced 2024-11-14 17:35:35 +01:00
WIP: Using socket.io for websocket handling
This commit is contained in:
parent
f3a1090dbd
commit
1fae301499
19460
package-lock.json
generated
19460
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
|
@ -14,6 +14,7 @@
|
||||||
"license": "GPL-3.0",
|
"license": "GPL-3.0",
|
||||||
"main": "./src/index.js",
|
"main": "./src/index.js",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
"socket.io-client": "4.4.1",
|
||||||
"axios": "^0.21.1",
|
"axios": "^0.21.1",
|
||||||
"immutability-helper": "3.0.1",
|
"immutability-helper": "3.0.1",
|
||||||
"moment": "^2.24.0",
|
"moment": "^2.24.0",
|
||||||
|
|
|
@ -7,49 +7,21 @@
|
||||||
|
|
||||||
/* eslint no-console: "off" */
|
/* eslint no-console: "off" */
|
||||||
|
|
||||||
const PROTOCOL = window.location.protocol === "http:" ? "ws" : "wss";
|
const { io } = require("socket.io-client");
|
||||||
|
|
||||||
const URL = process.env.LIGHTTPD
|
|
||||||
? `${PROTOCOL}://${window.location.host}/${
|
|
||||||
process.env.WSPATH || "foris-ws"
|
|
||||||
}`
|
|
||||||
: `${PROTOCOL}://${window.location.hostname}:9081`;
|
|
||||||
|
|
||||||
const WAITING_FOR_CONNECTION_TIMEOUT = 500;
|
|
||||||
|
|
||||||
export class WebSockets {
|
export class WebSockets {
|
||||||
constructor() {
|
constructor() {
|
||||||
this.ws = new WebSocket(URL);
|
this.socket = io("/notifications");
|
||||||
this.ws.onerror = (e) => {
|
this.socket.on("disconnect", (reason) => {});
|
||||||
console.error("WS: Error:", e);
|
this.socket.on("notification", (notification) => {
|
||||||
};
|
// TODO call dispatch
|
||||||
this.ws.onmessage = (e) => {
|
});
|
||||||
console.debug(`WS: Received Message: ${e.data}`);
|
this.socket.on("connect", (socket) => {});
|
||||||
const data = JSON.parse(e.data);
|
|
||||||
this.dispatch(data);
|
|
||||||
};
|
|
||||||
this.ws.onopen = () => {
|
|
||||||
console.debug("WS: Connection open.");
|
|
||||||
};
|
|
||||||
this.ws.onclose = () => {
|
|
||||||
console.debug("WS: Connection closed.");
|
|
||||||
};
|
|
||||||
|
|
||||||
// callbacks[module][action]
|
// callbacks[module][action]
|
||||||
this.callbacks = {};
|
this.callbacks = {};
|
||||||
}
|
}
|
||||||
|
|
||||||
waitForConnection(callback) {
|
|
||||||
if (this.ws.readyState === 1) {
|
|
||||||
callback();
|
|
||||||
} else {
|
|
||||||
const that = this;
|
|
||||||
setTimeout(() => {
|
|
||||||
that.waitForConnection(callback);
|
|
||||||
}, WAITING_FOR_CONNECTION_TIMEOUT);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
bind(module, action, callback) {
|
bind(module, action, callback) {
|
||||||
this.callbacks[module] = this.callbacks[module] || {};
|
this.callbacks[module] = this.callbacks[module] || {};
|
||||||
this.callbacks[module][action] = this.callbacks[module][action] || [];
|
this.callbacks[module][action] = this.callbacks[module][action] || [];
|
||||||
|
@ -57,13 +29,6 @@ export class WebSockets {
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
subscribe(module) {
|
|
||||||
this.waitForConnection(() => {
|
|
||||||
this.send("subscribe", module);
|
|
||||||
});
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
unbind(module, action, callback) {
|
unbind(module, action, callback) {
|
||||||
const callbacks = this.callbacks[module][action];
|
const callbacks = this.callbacks[module][action];
|
||||||
|
|
||||||
|
@ -78,20 +43,14 @@ export class WebSockets {
|
||||||
|
|
||||||
if (Object.keys(this.callbacks[module]).length === 0) {
|
if (Object.keys(this.callbacks[module]).length === 0) {
|
||||||
this.unsubscribe(module);
|
this.unsubscribe(module);
|
||||||
}
|
|
||||||
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
unsubscribe(module) {
|
|
||||||
this.waitForConnection(() => {
|
|
||||||
this.send("unsubscribe", module);
|
|
||||||
delete this.callbacks[module];
|
delete this.callbacks[module];
|
||||||
});
|
}
|
||||||
|
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
send(action, params) {
|
send(action, params) {
|
||||||
|
// TODO may not be required
|
||||||
const payload = JSON.stringify({ action, params });
|
const payload = JSON.stringify({ action, params });
|
||||||
this.waitForConnection(() => {
|
this.waitForConnection(() => {
|
||||||
this.ws.send(payload);
|
this.ws.send(payload);
|
||||||
|
@ -117,8 +76,4 @@ export class WebSockets {
|
||||||
|
|
||||||
chain.forEach((callback) => callback(json));
|
chain.forEach((callback) => callback(json));
|
||||||
}
|
}
|
||||||
|
|
||||||
close() {
|
|
||||||
this.ws.close();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user