@cimo/websocket 1.1.27 → 1.1.28

package/README.md

@@ -32,7 +32,7 @@ import * as ControllerTest from "../controller/Test";
 
 ...
 
-const cwsServer = new CwsServer(server);
+const cwsServer = new CwsServer(server, "secret-key");
 
 ControllerTester.websocket(cwsServer);
 

package/dist/Main.d.ts

@@ -1,2 +1,3 @@
 import CwsServer from "./server/Service";
+export * as CwsServerInterface from "./server/Interface";
 export { CwsServer };

package/dist/Main.js

@@ -1,9 +1,33 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CwsServer = void 0;
+exports.CwsServer = exports.CwsServerInterface = void 0;
 const Service_1 = __importDefault(require("./server/Service"));
 exports.CwsServer = Service_1.default;
+exports.CwsServerInterface = __importStar(require("./server/Interface"));
 //# sourceMappingURL=Main.js.map

package/dist/Main.js.map

@@ -1 +1 @@
-{"version":3,"file":"Main.js","sourceRoot":"","sources":["../src/Main.ts"],"names":[],"mappings":";;;;;;AAAA,+DAAyC;AAEhC,oBAFF,iBAAS,CAEE"}
+{"version":3,"file":"Main.js","sourceRoot":"","sources":["../src/Main.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+DAAyC;AAGhC,oBAHF,iBAAS,CAGE;AADlB,yEAAyD"}

package/dist/client/Interface.d.ts

@@ -3,7 +3,10 @@ export interface Iclient {
 }
 export interface Imessage {
     tag: string;
-    message: string;
+    data: string;
+}
+export interface Ifile {
+    filename: string;
 }
 export interface IcallbackReceiveMessage {
     (data: string | DataView): any;

package/dist/client/Service.d.ts

@@ -1,22 +1,25 @@
 import * as Interface from "./Interface";
 export default class CwsClient {
-    private clientId;
     private address;
     private ws;
+    private clientId;
     private handleReceiveDataList;
     private countCheckConnection;
-    private countCheckConnectionLimit;
     private intervalCheckConnection;
     private callbackCheckConnection;
+    private intervalReconnection;
+    private countCheckReconnection;
+    private countCheckLimit;
     getClientId: () => string;
-    constructor(address: string, countCheckConnectionLimit?: number);
+    constructor(address: string, countCheckLimit?: number);
     sendData: (mode: number, data: string | ArrayBuffer, tag?: string) => void;
+    sendDataUpload: (filename: string, file: ArrayBuffer) => void;
     sendDataBroadcast: (data: string) => void;
-    sendDataUpload: (filename: string, data: ArrayBuffer) => void;
     receiveData: (tag: string, callback: Interface.IcallbackReceiveMessage) => void;
     receiveDataDownload: (callback: Interface.IcallbackReceiveDownload) => void;
     receiveDataOff: (tag: string) => void;
-    checkConnection: (callback: () => void) => void;
+    checkConnection: (callback: (mode: string) => void) => void;
+    checkReconnection: (mode: string) => void;
     private create;
     private handleReceiveData;
     private cleanup;

package/dist/client/Service.js

@@ -1,18 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 class CwsClient {
-    constructor(address, countCheckConnectionLimit = 25) {
+    constructor(address, countCheckLimit = 25) {
         this.getClientId = () => {
             return this.clientId;
         };
         this.sendData = (mode, data, tag = "") => {
             if (this.ws && this.ws.readyState === WebSocket.OPEN) {
                 if (mode === 1) {
-                    const json = {
+                    const jsonMessage = {
                         tag: `cws_${tag}`,
-                        message: data
+                        data
                     };
-                    this.ws.send(JSON.stringify(json));
+                    this.ws.send(JSON.stringify(jsonMessage));
                 }
                 else if (mode === 2) {
                     this.ws.send(data);
@@ -22,13 +22,14 @@ class CwsClient {
                 console.log("@cimo/webSocket - Client => Service.ts => sendData()", "Client not connected.");
             }
         };
+        this.sendDataUpload = (filename, file) => {
+            const jsonMessage = { filename };
+            this.sendData(1, JSON.stringify(jsonMessage), "upload");
+            this.sendData(2, file);
+        };
         this.sendDataBroadcast = (data) => {
             this.sendData(1, data, "broadcast");
         };
-        this.sendDataUpload = (filename, data) => {
-            this.sendData(1, JSON.stringify({ filename }), "upload");
-            this.sendData(2, data);
-        };
         this.receiveData = (tag, callback) => {
             this.handleReceiveDataList.set(`cws_${tag}`, (data) => {
                 callback(data);
@@ -38,8 +39,8 @@ class CwsClient {
             let filename = "";
             this.receiveData("download", (data) => {
                 if (typeof data === "string") {
-                    const message = JSON.parse(data);
-                    filename = message.filename;
+                    const jsonMessage = JSON.parse(data);
+                    filename = jsonMessage.filename;
                 }
                 else {
                     callback(data, filename);
@@ -53,8 +54,9 @@ class CwsClient {
             }
         };
         this.checkConnection = (callback) => {
-            if (this.countCheckConnection > this.countCheckConnectionLimit) {
+            if (this.countCheckConnection > this.countCheckLimit) {
                 clearInterval(this.intervalCheckConnection);
+                return;
             }
             if (!this.callbackCheckConnection) {
                 this.callbackCheckConnection = callback;
@@ -62,17 +64,38 @@ class CwsClient {
             if (this.ws) {
                 if (this.ws.readyState === WebSocket.OPEN) {
                     clearInterval(this.intervalCheckConnection);
-                    this.intervalCheckConnection = undefined;
                     this.countCheckConnection = 0;
-                    this.callbackCheckConnection();
+                    this.callbackCheckConnection("connection");
                 }
-                else if (!this.intervalCheckConnection && (this.ws.readyState === WebSocket.CONNECTING || this.ws.readyState === WebSocket.CLOSED)) {
+                else if (this.countCheckConnection === 0) {
                     this.intervalCheckConnection = setInterval(() => {
+                        this.countCheckConnection++;
                         this.checkConnection(callback);
-                    }, 1000);
+                    }, 3000);
                 }
             }
         };
+        this.checkReconnection = (mode) => {
+            if (this.countCheckReconnection > this.countCheckLimit) {
+                clearInterval(this.intervalReconnection);
+                return;
+            }
+            if (mode === "end") {
+                clearInterval(this.intervalReconnection);
+                this.countCheckReconnection = 0;
+                if (this.callbackCheckConnection) {
+                    this.callbackCheckConnection("reconnection");
+                }
+            }
+            else if (mode === "start" && this.countCheckReconnection === 0) {
+                this.intervalReconnection = setInterval(() => {
+                    this.countCheckReconnection++;
+                    if (!this.ws) {
+                        this.create();
+                    }
+                }, 3000);
+            }
+        };
         this.create = () => {
             this.ws = new WebSocket(this.address);
             this.ws.binaryType = "arraybuffer";
@@ -83,17 +106,24 @@ class CwsClient {
             this.ws.onmessage = (event) => {
                 if (this.ws) {
                     if (typeof event.data === "string") {
-                        const json = JSON.parse(event.data);
-                        if (json.tag === "cws_client_connection") {
-                            this.clientId = json.message;
+                        const jsonMessage = JSON.parse(event.data);
+                        if (jsonMessage.tag === "cws_client_connection") {
+                            if (!this.clientId) {
+                                this.sendData(1, "", "client_connected");
+                            }
+                            else {
+                                this.sendData(1, "", "client_reconnection");
+                                this.checkReconnection("end");
+                            }
+                            this.clientId = jsonMessage.data;
                         }
-                        else if (json.tag === "cws_ping") {
+                        else if (jsonMessage.tag === "cws_ping") {
                             this.sendData(1, "", "pong");
                         }
-                        else if (json.tag === "cws_download") {
-                            messageTagDownload = json.tag;
+                        else if (jsonMessage.tag === "cws_download") {
+                            messageTagDownload = jsonMessage.tag;
                         }
-                        this.handleReceiveData(json.tag, json.message);
+                        this.handleReceiveData(jsonMessage.tag, jsonMessage.data);
                     }
                     else if (typeof event.data !== "string" && messageTagDownload) {
                         const view = new DataView(event.data);
@@ -105,12 +135,7 @@ class CwsClient {
             this.ws.onclose = () => {
                 console.log("@cimo/webSocket - Client => Service.ts => onClose()", "Connection close.");
                 this.cleanup();
-                if (this.countCheckConnection < this.countCheckConnectionLimit) {
-                    this.countCheckConnection++;
-                    this.create();
-                    this.checkConnection(() => {
-                    });
-                }
+                this.checkReconnection("start");
             };
         };
         this.handleReceiveData = (tag, data) => {
@@ -122,17 +147,18 @@ class CwsClient {
             }
         };
         this.cleanup = () => {
-            this.clientId = "";
             this.ws = undefined;
         };
-        this.clientId = "";
         this.address = address;
         this.ws = undefined;
+        this.clientId = "";
         this.handleReceiveDataList = new Map();
         this.countCheckConnection = 0;
-        this.countCheckConnectionLimit = countCheckConnectionLimit;
         this.intervalCheckConnection = undefined;
         this.callbackCheckConnection = undefined;
+        this.intervalReconnection = undefined;
+        this.countCheckReconnection = 0;
+        this.countCheckLimit = countCheckLimit;
         this.create();
     }
 }

package/dist/client/Service.js.map

@@ -1 +1 @@
-{"version":3,"file":"Service.js","sourceRoot":"","sources":["../../src/client/Service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Service.js","sourceRoot":"","sources":["../../src/client/Service.ts"],"names":[],"mappings":"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"}

package/dist/server/Interface.d.ts

@@ -7,13 +7,18 @@ export { Server as IhttpsServer };
 export interface Iclient {
     socket: Net.Socket;
     buffer: Buffer;
+    signature: string;
     opCode: number;
     fragmentList: Buffer[];
     intervalPing: NodeJS.Timeout | undefined;
+    lastAction: number;
 }
 export interface Imessage {
     tag: string;
-    message: string;
+    data: string;
+}
+export interface Ifile {
+    filename: string;
 }
 export interface IcallbackReceiveMessage {
     (clientId: string, data: string | Buffer[]): any;

package/dist/server/Service.d.ts

@@ -3,14 +3,15 @@
 import * as Interface from "./Interface";
 export default class CwsServer {
     private clientList;
+    private secretKey;
     private modePing;
     private timePing;
     private handleReceiveDataList;
     getClientList: () => Map<string, Interface.Iclient>;
-    constructor(server: Interface.IhttpsServer, modePing?: number, timePing?: number);
+    constructor(server: Interface.IhttpsServer, secretKey: string, modePing?: number, timePing?: number);
     sendData: (clientId: string, mode: number, data: string | Buffer, tag?: string) => void;
-    sendDataBroadcast: (data: string, clientId?: string) => void;
     sendDataDownload: (clientId: string, filename: string, file: Buffer) => void;
+    sendDataBroadcast: (data: string, clientId?: string) => void;
     receiveData: (tag: string, callback: Interface.IcallbackReceiveMessage) => void;
     receiveDataUpload: (callback: Interface.IcallbackReceiveUpload) => void;
     receiveDataOff: (tag: string) => void;
@@ -22,4 +23,9 @@ export default class CwsServer {
     private ping;
     private handleReceiveData;
     private cleanup;
+    private clientConnection;
+    private clientReconnection;
+    private clientDisconnection;
+    private generateSignature;
+    private verifySignature;
 }

package/dist/server/Service.js

@@ -26,14 +26,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const Crypto = __importStar(require("crypto"));
 class CwsServer {
     clientList;
+    secretKey;
     modePing;
     timePing;
     handleReceiveDataList;
     getClientList = () => {
         return this.clientList;
     };
-    constructor(server, modePing = 1, timePing = 25000) {
+    constructor(server, secretKey, modePing = 1, timePing = 25000) {
         this.clientList = new Map();
+        this.secretKey = secretKey;
         this.modePing = modePing;
         this.timePing = timePing;
         this.handleReceiveDataList = new Map();
@@ -45,14 +47,15 @@ class CwsServer {
             return;
         }
         if (client && client.socket && client.socket.writable) {
+            client.lastAction = Date.now();
             let buffer = Buffer.alloc(0);
             let frame0 = 0;
             if (mode === 1) {
-                const json = {
+                const jsonMessage = {
                     tag: `cws_${tag}`,
-                    message: data
+                    data
                 };
-                buffer = Buffer.from(JSON.stringify(json));
+                buffer = Buffer.from(JSON.stringify(jsonMessage));
                 frame0 = 0x81;
             }
             else if (mode === 2) {
@@ -82,6 +85,11 @@ class CwsServer {
             client.socket.write(frame);
         }
     };
+    sendDataDownload = (clientId, filename, file) => {
+        const jsonMessage = { filename };
+        this.sendData(clientId, 1, JSON.stringify(jsonMessage), "download");
+        this.sendData(clientId, 2, file);
+    };
     sendDataBroadcast = (data, clientId) => {
         for (const [index] of this.clientList) {
             if (!clientId || (clientId && clientId !== index)) {
@@ -89,10 +97,6 @@ class CwsServer {
             }
         }
     };
-    sendDataDownload = (clientId, filename, file) => {
-        this.sendData(clientId, 1, JSON.stringify({ filename }), "download");
-        this.sendData(clientId, 2, file);
-    };
     receiveData = (tag, callback) => {
         this.handleReceiveDataList.set(`cws_${tag}`, (clientId, data) => {
             callback(clientId, data);
@@ -102,8 +106,8 @@ class CwsServer {
         let filename = "";
         this.receiveData("upload", (clientId, data) => {
             if (typeof data === "string") {
-                const message = JSON.parse(data);
-                filename = message.filename;
+                const jsonMessage = JSON.parse(data);
+                filename = jsonMessage.filename;
             }
             else {
                 callback(clientId, data, filename);
@@ -123,32 +127,28 @@ class CwsServer {
                 return;
             }
             socket.write(this.responseHeader(request).join("\r\n"));
-            const clientId = this.generateClientId();
-            this.clientList.set(clientId, {
-                socket,
-                buffer: Buffer.alloc(0),
-                opCode: -1,
-                fragmentList: [],
-                intervalPing: undefined
-            });
-            this.ping(clientId);
-            console.log("@cimo/webSocket - Server => Service.ts => create() => onUpgrade()", `Client ${clientId} - Ip: ${socket.remoteAddress || ""} connected`);
-            this.sendData(clientId, 1, clientId, "client_connection");
-            this.sendDataBroadcast(`Client ${clientId} connected`, clientId);
+            const clientId = this.clientConnection(socket);
             let messageTagUpload = "";
             socket.on("data", (data) => {
                 this.handleFrame(clientId, data, (clientOpCode, clientFragmentList) => {
                     if (clientOpCode === 1) {
-                        const json = JSON.parse(clientFragmentList);
-                        if (json.tag === "cws_broadcast") {
-                            this.sendDataBroadcast(json.message, clientId);
+                        const jsonMessage = JSON.parse(clientFragmentList);
+                        if (jsonMessage.tag === "cws_client_connected") {
+                            const jsonMessage = { result: `Client ${clientId} connected.`, tag: "connection" };
+                            this.sendDataBroadcast(JSON.stringify(jsonMessage), clientId);
+                        }
+                        else if (jsonMessage.tag === "cws_client_reconnection") {
+                            this.clientReconnection(socket, clientId);
+                        }
+                        else if (jsonMessage.tag === "cws_pong") {
                         }
-                        else if (json.tag === "cws_pong") {
+                        else if (jsonMessage.tag === "cws_upload") {
+                            messageTagUpload = jsonMessage.tag;
                         }
-                        else if (json.tag === "cws_upload") {
-                            messageTagUpload = json.tag;
+                        else if (jsonMessage.tag === "cws_broadcast") {
+                            this.sendDataBroadcast(jsonMessage.data, clientId);
                         }
-                        this.handleReceiveData(json.tag, clientId, json.message);
+                        this.handleReceiveData(jsonMessage.tag, clientId, jsonMessage.data);
                     }
                     else if ((clientOpCode === 0 || clientOpCode === 2) && messageTagUpload) {
                         this.handleReceiveData(messageTagUpload, clientId, clientFragmentList);
@@ -157,9 +157,7 @@ class CwsServer {
                 });
             });
             socket.on("end", () => {
-                console.log("@cimo/webSocket - Server => Service.ts => create() => onEnd()", `Client ${clientId} - Ip: ${socket.remoteAddress || ""} disconnected`);
-                this.sendDataBroadcast(`Client ${clientId} disconnected`, clientId);
-                this.cleanup(clientId);
+                this.clientDisconnection(socket, clientId);
             });
         });
     };
@@ -169,13 +167,12 @@ class CwsServer {
         return ["HTTP/1.1 101 Switching Protocols", "Upgrade: websocket", "Connection: Upgrade", `Sec-WebSocket-Accept: ${hash}`, "\r\n"];
     };
     generateClientId() {
-        const randomBytes = Crypto.randomBytes(16);
-        return randomBytes.toString("hex");
+        return Crypto.randomBytes(20).toString("hex");
     }
     checkClient = (clientId) => {
         const client = this.clientList.get(clientId);
         if (!client) {
-            console.log("@cimo/webSocket - Server => Service.ts => checkClient()", `Client ${clientId} not exists!`);
+            console.log("@cimo/webSocket - Server => Service.ts => checkClient()", `Client ${clientId} doesn't exists!`);
             return undefined;
         }
         return client;
@@ -185,6 +182,10 @@ class CwsServer {
         if (!client) {
             return;
         }
+        const verifySignature = this.verifySignature(clientId, client.signature);
+        if (!verifySignature) {
+            return;
+        }
         client.buffer = Buffer.concat([client.buffer, data]);
         while (client.buffer.length > 2) {
             let payloadLength = client.buffer[1] & 0x7f;
@@ -259,14 +260,58 @@ class CwsServer {
         }
     };
     cleanup = (clientId) => {
-        const client = this.checkClient(clientId);
+        const client = this.clientList.get(clientId);
         if (!client) {
             return;
         }
-        if (client.socket) {
-            client.socket.end();
-            this.clientList.delete(clientId);
+        client.socket.end();
+        this.clientList.delete(clientId);
+    };
+    clientConnection(socket) {
+        const clientId = this.generateClientId();
+        const signature = this.generateSignature(clientId);
+        console.log("@cimo/webSocket - Server => Service.ts => clientConnection()", `Connection request from -> Ip: ${socket.remoteAddress || ""} - Client ${clientId}.`);
+        this.clientList.set(clientId, {
+            socket,
+            buffer: Buffer.alloc(0),
+            signature,
+            opCode: -1,
+            fragmentList: [],
+            intervalPing: undefined,
+            lastAction: Date.now()
+        });
+        this.sendData(clientId, 1, clientId, "client_connection");
+        this.ping(clientId);
+        return clientId;
+    }
+    clientReconnection = (socket, clientId) => {
+        const client = this.checkClient(clientId);
+        if (!client) {
+            return "";
+        }
+        const verifySignature = this.verifySignature(clientId, client.signature);
+        if (!verifySignature) {
+            return "";
+        }
+        console.log("@cimo/webSocket - Server => Service.ts => clientReconnection()", `Reconnection request from -> Ip: ${socket.remoteAddress || ""} - Client ${clientId}.`);
+        const jsonMessage = { result: `Client ${clientId} reconnected.`, tag: "reconnection" };
+        this.sendDataBroadcast(JSON.stringify(jsonMessage), clientId);
+    };
+    clientDisconnection = (socket, clientId) => {
+        console.log("@cimo/webSocket - Server => Service.ts => clientDisconnection()", `Disconnection request from -> Ip: ${socket.remoteAddress || ""} - Client ${clientId}.`);
+        this.cleanup(clientId);
+        const jsonMessage = { result: `Client ${clientId} disconnected.`, tag: "disconnection" };
+        this.sendDataBroadcast(JSON.stringify(jsonMessage), clientId);
+    };
+    generateSignature = (data) => {
+        return Crypto.createHmac("sha256", this.secretKey).update(data).digest("hex");
+    };
+    verifySignature = (data, signature) => {
+        if (signature !== this.generateSignature(data)) {
+            console.log("@cimo/webSocket - Server => Service.ts => verifySignature()", `Wrong signature!`);
+            return false;
         }
+        return true;
     };
 }
 exports.default = CwsServer;

package/dist/server/Service.js.map

@@ -1 +1 @@
-{"version":3,"file":"Service.js","sourceRoot":"","sources":["../../src/server/Service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Service.js","sourceRoot":"","sources":["../../src/server/Service.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cimo/websocket",
-    "version": "1.1.27",
+    "version": "1.1.28",
     "description": "Websocket (server/client). Light, fast and secure.",
     "author": "cimo",
     "license": "MIT",