@cimo/websocket 1.1.23 → 1.1.25

package/README.md

@@ -26,38 +26,28 @@ import * as ControllerTest from "../controller/Test";
 
 ...
 
-const cwsServer = new CwsServer();
-cwsServer.create(server);
+const cwsServer = new CwsServer(server);
 
-cwsServer.receiveOutput("test", (socket, data) => {
-    ControllerTest.websocket(cwsServer, socket, data);
-});
+ControllerTester.websocket(cwsServer);
 
 ...
 ```
 
--   ControllerTest.ts
+-   ControllerTester.ts
 
 ```
 ...
 
-import { CwsServer, CwsServerInterface } from "@cimo/websocket";
-
-...
-
-let cwsServer: CwsServer;
+import { CwsServer } from "@cimo/websocket";
 
 ...
 
-export const websocket = (cwsServerValue: CwsServer, socket: CwsServerInterface.Isocket, data: CwsServerInterface.Imessage) => {
-    cwsServer = cwsServerValue;
-
-    const tag = data.tag;
-    const message = data.message;
-
-    if (tag === "cws_test_o") {
-        cwsServer.sendInput(socket, "test", message);
-    }
+export const websocket = (cwsServer: CwsServer, cp: Cp) => {
+    cwsServer.receiveData("action_test", (clientId, data) => {
+        if (typeof data === "string") {
+            cwsServer.sendData(clientId, 1, JSON.stringify({ test: "end" }), "action_test");
+        }
+    });
 };
 
 ...
@@ -74,21 +64,20 @@ import CwsClient from "@cimo/websocket/dist/client/Service";
 
 ...
 
-const cwsClient = CwsClient();
-cwsClient.connection("wss://localhost");
+const cwsClient = new CwsClient("wss://localhost");
 
-cwsClient.receiveMessage("broadcast", (data) => {
-    // Global event
-});
+cwsClient.checkConnection(() => {
+    cwsClient.receiveData("action_test", (data) => {
+        if (typeof data === "string") {
+            const message = JSON.parse(data) as Record<string, string>;
 
-cwsClient.receiveMessage("test", (data) => {
-    // Test event
+            console.log(message);
+        }
+    });
 });
 
-...
-
 elementButton.addEventListener("click", (event) => {
-    cwsClient.sendMessage("test", { value: 1 });
+    cwsClient.sendData(1, JSON.stringify({ test: "start" }), "action_test");
 });
 
 ...

package/dist/Main.d.ts

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

package/dist/Main.js

@@ -1,33 +1,9 @@
 "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 = exports.CwsServerInterface = void 0;
+exports.CwsServer = 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;AAGhC,oBAHF,iBAAS,CAGE;AADlB,yEAAyD"}
+{"version":3,"file":"Main.js","sourceRoot":"","sources":["../src/Main.ts"],"names":[],"mappings":";;;;;;AAAA,+DAAyC;AAEhC,oBAFF,iBAAS,CAEE"}

package/dist/client/Interface.d.ts

@@ -1,8 +1,13 @@
+export interface Iclient {
+    socket: WebSocket;
+}
 export interface Imessage {
-    date: string;
     tag: string;
     message: string;
 }
 export interface IcallbackReceiveMessage {
-    (data: Imessage): void;
+    (data: string | DataView): any;
+}
+export interface IcallbackReceiveDownload {
+    (data: DataView, filename: string): any;
 }

package/dist/client/Service.d.ts

@@ -1,16 +1,23 @@
 import * as Interface from "./Interface";
 export default class CwsClient {
-    private serverAddress;
-    private websocket;
-    private timeoutReconnect;
-    private receiveMessageHandleList;
-    constructor();
-    connection: (address?: string) => void;
-    sendMessage: (tagValue: string, messageValue: string | Record<string, unknown>) => void;
-    receiveMessage: (tag: string, callback: Interface.IcallbackReceiveMessage) => void;
-    receiveMessageOff: (tag: string) => void;
-    checkConnection: () => boolean;
-    private eventOpen;
-    private receiveMessageHandle;
-    private eventClose;
+    private clientId;
+    private address;
+    private ws;
+    private handleReceiveDataList;
+    private countCheckConnection;
+    private countCheckConnectionLimit;
+    private intervalCheckConnection;
+    private callbackCheckConnection;
+    getClientId: () => string;
+    constructor(address: string, countCheckConnectionLimit?: number);
+    sendData: (mode: number, data: string | ArrayBuffer, tag?: string) => 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;
+    private create;
+    private handleReceiveData;
+    private cleanup;
 }

package/dist/client/Service.js

@@ -1,70 +1,136 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 class CwsClient {
-    constructor() {
-        this.connection = (address) => {
-            this.serverAddress = address ? address : this.serverAddress;
-            this.websocket = new WebSocket(this.serverAddress);
-            this.websocket.addEventListener("open", this.eventOpen);
-            this.websocket.addEventListener("message", this.receiveMessageHandle);
-            this.websocket.addEventListener("close", this.eventClose);
+    constructor(address, countCheckConnectionLimit = 25) {
+        this.getClientId = () => {
+            return this.clientId;
         };
-        this.sendMessage = (tagValue, messageValue) => {
-            const check = this.checkConnection();
-            if (this.websocket && check) {
-                const dataStructure = {
-                    date: new Date().toISOString(),
-                    tag: `cws_${tagValue}_o`,
-                    message: messageValue
-                };
-                this.websocket.send(JSON.stringify(dataStructure));
+        this.sendData = (mode, data, tag = "") => {
+            if (this.ws && this.ws.readyState === WebSocket.OPEN) {
+                if (mode === 1) {
+                    const json = {
+                        tag: `cws_${tag}`,
+                        message: data
+                    };
+                    this.ws.send(JSON.stringify(json));
+                }
+                else if (mode === 2) {
+                    this.ws.send(data);
+                }
             }
+            else {
+                console.log("@cimo/webSocket - Client - Service.ts - sendData()", "Client not connected.");
+            }
+        };
+        this.sendDataBroadcast = (data) => {
+            this.sendData(1, data, "broadcast");
         };
-        this.receiveMessage = (tag, callback) => {
-            this.receiveMessageHandleList.set(`cws_${tag}_i`, (data) => {
+        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);
-                return;
             });
         };
-        this.receiveMessageOff = (tag) => {
-            if (this.receiveMessageHandleList.has(`cws_${tag}_i`)) {
-                this.receiveMessageHandleList.delete(`cws_${tag}_i`);
+        this.receiveDataDownload = (callback) => {
+            let filename = "";
+            this.receiveData("download", (data) => {
+                if (typeof data === "string") {
+                    const message = JSON.parse(data);
+                    filename = message.filename;
+                }
+                else {
+                    callback(data, filename);
+                    filename = "";
+                }
+            });
+        };
+        this.receiveDataOff = (tag) => {
+            if (this.handleReceiveDataList.has(`cws_${tag}`)) {
+                this.handleReceiveDataList.delete(`cws_${tag}`);
             }
         };
-        this.checkConnection = () => {
-            if (this.websocket && this.websocket.readyState === WebSocket.OPEN) {
-                return true;
+        this.checkConnection = (callback) => {
+            if (this.countCheckConnection > this.countCheckConnectionLimit) {
+                clearInterval(this.intervalCheckConnection);
+            }
+            if (!this.callbackCheckConnection) {
+                this.callbackCheckConnection = callback;
+            }
+            if (this.ws) {
+                if (this.ws.readyState === WebSocket.OPEN) {
+                    clearInterval(this.intervalCheckConnection);
+                    this.intervalCheckConnection = undefined;
+                    this.countCheckConnection = 0;
+                    this.callbackCheckConnection();
+                }
+                else if (!this.intervalCheckConnection && (this.ws.readyState === WebSocket.CONNECTING || this.ws.readyState === WebSocket.CLOSED)) {
+                    this.intervalCheckConnection = setInterval(() => {
+                        this.checkConnection(callback);
+                    }, 1000);
+                }
             }
-            console.log("@cimo/websocket - Service.ts - checkConnection():", "Server not ready.");
-            return false;
         };
-        this.eventOpen = () => {
-            console.log("@cimo/websocket - Service.ts - eventOpen():", "Connected.");
-            clearTimeout(this.timeoutReconnect);
+        this.create = () => {
+            this.ws = new WebSocket(this.address);
+            this.ws.binaryType = "arraybuffer";
+            this.ws.onopen = () => {
+                console.log("@cimo/webSocket - Client - Service.ts - onOpen()", "Connection open.");
+            };
+            let messageTagDownload = "";
+            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;
+                        }
+                        else if (json.tag === "cws_download") {
+                            messageTagDownload = json.tag;
+                        }
+                        this.handleReceiveData(json.tag, json.message);
+                    }
+                    else if (typeof event.data !== "string" && messageTagDownload) {
+                        const view = new DataView(event.data);
+                        this.handleReceiveData(messageTagDownload, view);
+                        messageTagDownload = "";
+                    }
+                }
+            };
+            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.receiveMessageHandle = (event) => {
-            const data = JSON.parse(event.data);
-            for (const [tag, callback] of this.receiveMessageHandleList) {
-                if (tag === data.tag) {
+        this.handleReceiveData = (tag, data) => {
+            for (const [index, callback] of this.handleReceiveDataList) {
+                if (tag === index) {
                     callback(data);
                     return;
                 }
             }
         };
-        this.eventClose = () => {
-            if (this.websocket) {
-                console.log("@cimo/websocket - Service.ts - eventClose():", "Disconnected. Try to reconnect...");
-                this.websocket.removeEventListener("open", this.eventOpen);
-                this.websocket.removeEventListener("message", this.receiveMessageHandle);
-                this.websocket.removeEventListener("close", this.eventClose);
-                this.websocket = null;
-                this.timeoutReconnect = setTimeout(this.connection, 1000);
-            }
+        this.cleanup = () => {
+            this.clientId = "";
+            this.ws = undefined;
         };
-        this.serverAddress = "";
-        this.websocket = null;
-        this.timeoutReconnect = undefined;
-        this.receiveMessageHandleList = new Map();
+        this.clientId = "";
+        this.address = address;
+        this.ws = undefined;
+        this.handleReceiveDataList = new Map();
+        this.countCheckConnection = 0;
+        this.countCheckConnectionLimit = countCheckConnectionLimit;
+        this.intervalCheckConnection = undefined;
+        this.callbackCheckConnection = undefined;
+        this.create();
     }
 }
 exports.default = CwsClient;

package/dist/client/Service.js.map

@@ -1 +1 @@
-{"version":3,"file":"Service.js","sourceRoot":"","sources":["../../src/client/Service.ts"],"names":[],"mappings":";;AAGA,MAAqB,SAAS;IAM1B;QAOA,eAAU,GAAG,CAAC,OAAgB,EAAE,EAAE;YAC9B,IAAI,CAAC,aAAa,GAAG,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC;YAE5D,IAAI,CAAC,SAAS,GAAG,IAAI,SAAS,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;YAEnD,IAAI,CAAC,SAAS,CAAC,gBAAgB,CAAC,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;YACxD,IAAI,CAAC,SAAS,CAAC,gBAAgB,CAAC,SAAS,EAAE,IAAI,CAAC,oBAAoB,CAAC,CAAC;YACtE,IAAI,CAAC,SAAS,CAAC,gBAAgB,CAAC,OAAO,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;QAC9D,CAAC,CAAC;QAEF,gBAAW,GAAG,CAAC,QAAgB,EAAE,YAA8C,EAAE,EAAE;YAC/E,MAAM,KAAK,GAAG,IAAI,CAAC,eAAe,EAAE,CAAC;YAErC,IAAI,IAAI,CAAC,SAAS,IAAI,KAAK,EAAE;gBACzB,MAAM,aAAa,GAAG;oBAClB,IAAI,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;oBAC9B,GAAG,EAAE,OAAO,QAAQ,IAAI;oBACxB,OAAO,EAAE,YAAY;iBACxB,CAAC;gBAEF,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC,CAAC;aACtD;QACL,CAAC,CAAC;QAEF,mBAAc,GAAG,CAAC,GAAW,EAAE,QAA2C,EAAE,EAAE;YAC1E,IAAI,CAAC,wBAAwB,CAAC,GAAG,CAAC,OAAO,GAAG,IAAI,EAAE,CAAC,IAAI,EAAE,EAAE;gBACvD,QAAQ,CAAC,IAAI,CAAC,CAAC;gBAEf,OAAO;YACX,CAAC,CAAC,CAAC;QACP,CAAC,CAAC;QAEF,sBAAiB,GAAG,CAAC,GAAW,EAAE,EAAE;YAChC,IAAI,IAAI,CAAC,wBAAwB,CAAC,GAAG,CAAC,OAAO,GAAG,IAAI,CAAC,EAAE;gBACnD,IAAI,CAAC,wBAAwB,CAAC,MAAM,CAAC,OAAO,GAAG,IAAI,CAAC,CAAC;aACxD;QACL,CAAC,CAAC;QAEF,oBAAe,GAAG,GAAG,EAAE;YACnB,IAAI,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,SAAS,CAAC,UAAU,KAAK,SAAS,CAAC,IAAI,EAAE;gBAChE,OAAO,IAAI,CAAC;aACf;YAGD,OAAO,CAAC,GAAG,CAAC,mDAAmD,EAAE,mBAAmB,CAAC,CAAC;YAEtF,OAAO,KAAK,CAAC;QACjB,CAAC,CAAC;QAEM,cAAS,GAAG,GAAG,EAAE;YAErB,OAAO,CAAC,GAAG,CAAC,6CAA6C,EAAE,YAAY,CAAC,CAAC;YAEzE,YAAY,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;QACxC,CAAC,CAAC;QAEM,yBAAoB,GAAG,CAAC,KAAmB,EAAE,EAAE;YACnD,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,IAAc,CAAuB,CAAC;YAEpE,KAAK,MAAM,CAAC,GAAG,EAAE,QAAQ,CAAC,IAAI,IAAI,CAAC,wBAAwB,EAAE;gBACzD,IAAI,GAAG,KAAK,IAAI,CAAC,GAAG,EAAE;oBAClB,QAAQ,CAAC,IAAI,CAAC,CAAC;oBAEf,OAAO;iBACV;aACJ;QACL,CAAC,CAAC;QAEM,eAAU,GAAG,GAAG,EAAE;YACtB,IAAI,IAAI,CAAC,SAAS,EAAE;gBAEhB,OAAO,CAAC,GAAG,CAAC,8CAA8C,EAAE,mCAAmC,CAAC,CAAC;gBAEjG,IAAI,CAAC,SAAS,CAAC,mBAAmB,CAAC,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;gBAC3D,IAAI,CAAC,SAAS,CAAC,mBAAmB,CAAC,SAAS,EAAE,IAAI,CAAC,oBAAoB,CAAC,CAAC;gBACzE,IAAI,CAAC,SAAS,CAAC,mBAAmB,CAAC,OAAO,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;gBAE7D,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;gBAEtB,IAAI,CAAC,gBAAgB,GAAG,UAAU,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;aAC7D;QACL,CAAC,CAAC;QAvFE,IAAI,CAAC,aAAa,GAAG,EAAE,CAAC;QACxB,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;QACtB,IAAI,CAAC,gBAAgB,GAAG,SAAS,CAAC;QAClC,IAAI,CAAC,wBAAwB,GAAG,IAAI,GAAG,EAAE,CAAC;IAC9C,CAAC;CAoFJ;AA/FD,4BA+FC"}
+{"version":3,"file":"Service.js","sourceRoot":"","sources":["../../src/client/Service.ts"],"names":[],"mappings":"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"}

package/dist/server/Interface.d.ts

@@ -1,13 +1,26 @@
 /// <reference types="node" />
-import { Socket } from "net";
+/// <reference types="node" />
+/// <reference types="node" />
 import { Server } from "https";
-export { Socket as Isocket };
+import * as Net from "net";
 export { Server as IhttpsServer };
+export interface Iclient {
+    socket: Net.Socket;
+    buffer: Buffer;
+    opCode: number;
+    fragmentList: Buffer[];
+    intervalPing: NodeJS.Timeout | undefined;
+}
 export interface Imessage {
-    date: string;
     tag: string;
     message: string;
 }
-export interface IcallbackReceiveOutput {
-    (socket: Socket, data: Imessage): void;
+export interface IcallbackReceiveMessage {
+    (clientId: string, data: string | Buffer[]): any;
+}
+export interface IcallbackReceiveUpload {
+    (clientId: string, data: Buffer[], filename: string): any;
+}
+export interface IcallbackHandleFrame {
+    (clientOpCode: number, clientFragmentList: Buffer[]): any;
 }

package/dist/server/Interface.js

@@ -1,8 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.IhttpsServer = exports.Isocket = void 0;
-const net_1 = require("net");
-Object.defineProperty(exports, "Isocket", { enumerable: true, get: function () { return net_1.Socket; } });
+exports.IhttpsServer = void 0;
 const https_1 = require("https");
 Object.defineProperty(exports, "IhttpsServer", { enumerable: true, get: function () { return https_1.Server; } });
 //# sourceMappingURL=Interface.js.map

package/dist/server/Interface.js.map

@@ -1 +1 @@
-{"version":3,"file":"Interface.js","sourceRoot":"","sources":["../../src/server/Interface.ts"],"names":[],"mappings":";;;AAAA,6BAA6B;AAGV,wFAHV,YAAM,OAGW;AAF1B,iCAA+B;AAGZ,6FAHV,cAAM,OAGgB"}
+{"version":3,"file":"Interface.js","sourceRoot":"","sources":["../../src/server/Interface.ts"],"names":[],"mappings":";;;AAAA,iCAA+B;AAGZ,6FAHV,cAAM,OAGgB"}

package/dist/server/Service.d.ts

@@ -1,21 +1,24 @@
+/// <reference types="node" />
+/// <reference types="node" />
 import * as Interface from "./Interface";
 export default class CwsServer {
-    private WEBSOCKET_MAGIC_STRING_KEY;
-    private SEVEN_BITS_INTEGER_MARKER;
-    private SIXTEEN_BITS_INTEGER_MARKER;
-    private THIRTYTWO_BITS_INTEGER_MARKER;
-    private MASK_KEY_BYTES_LENGTH;
-    private socketList;
-    private receiveOutputHandleList;
-    constructor();
-    create: (server: Interface.IhttpsServer) => void;
-    receiveOutput: (tag: string, callback: Interface.IcallbackReceiveOutput) => void;
-    receiveOutputOff: (tag: string) => void;
-    sendInput: (socket: Interface.Isocket | null, tagValue: string, messageValue: string | Record<string, unknown>) => void;
-    sendInputBroadcast: (socket: Interface.Isocket | null, tag: string, message: string | Record<string, unknown>) => void;
-    private onServerUpgrade;
-    private onSocketData;
-    private onSocketEnd;
-    private receiveOutputHandle;
-    private prepareMessage;
+    private clientList;
+    private timePing;
+    private handleReceiveDataList;
+    getClientList: () => Map<string, Interface.Iclient>;
+    constructor(server: Interface.IhttpsServer, 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;
+    receiveData: (tag: string, callback: Interface.IcallbackReceiveMessage) => void;
+    receiveDataUpload: (callback: Interface.IcallbackReceiveUpload) => void;
+    receiveDataOff: (tag: string) => void;
+    private create;
+    private responseHeader;
+    private generateClientId;
+    private checkClient;
+    private handleFrame;
+    private ping;
+    private handleReceiveData;
+    private cleanup;
 }

package/dist/server/Service.js

@@ -25,155 +25,240 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const Crypto = __importStar(require("crypto"));
 class CwsServer {
-    WEBSOCKET_MAGIC_STRING_KEY;
-    SEVEN_BITS_INTEGER_MARKER;
-    SIXTEEN_BITS_INTEGER_MARKER;
-    THIRTYTWO_BITS_INTEGER_MARKER;
-    MASK_KEY_BYTES_LENGTH;
-    socketList;
-    receiveOutputHandleList;
-    constructor() {
-        this.WEBSOCKET_MAGIC_STRING_KEY = "258EAFA5-E914-47DA-95CA-C5AB0DC85B11";
-        this.SEVEN_BITS_INTEGER_MARKER = 125;
-        this.SIXTEEN_BITS_INTEGER_MARKER = 126;
-        this.THIRTYTWO_BITS_INTEGER_MARKER = 127;
-        this.MASK_KEY_BYTES_LENGTH = 4;
-        this.socketList = [];
-        this.receiveOutputHandleList = new Map();
-    }
-    create = (server) => {
-        server.on("upgrade", this.onServerUpgrade);
+    clientList;
+    timePing;
+    handleReceiveDataList;
+    getClientList = () => {
+        return this.clientList;
     };
-    receiveOutput = (tag, callback) => {
-        this.receiveOutputHandleList.set(`cws_${tag}_o`, (socket, data) => {
-            callback(socket, data);
+    constructor(server, timePing = 25000) {
+        this.clientList = new Map();
+        this.timePing = timePing;
+        this.handleReceiveDataList = new Map();
+        this.create(server);
+    }
+    sendData = (clientId, mode, data, tag = "") => {
+        const client = this.checkClient(clientId);
+        if (!client) {
             return;
-        });
-    };
-    receiveOutputOff = (tag) => {
-        if (this.receiveOutputHandleList.has(`cws_${tag}_o`)) {
-            this.receiveOutputHandleList.delete(`cws_${tag}_o`);
         }
-    };
-    sendInput = (socket, tagValue, messageValue) => {
-        if (socket && tagValue) {
-            const dataStructure = {
-                date: new Date().toISOString(),
-                tag: `cws_${tagValue}_i`,
-                message: messageValue
-            };
-            const result = this.prepareMessage(JSON.stringify(dataStructure));
-            socket.write(result);
+        if (client && client.socket && client.socket.writable) {
+            let buffer = Buffer.alloc(0);
+            let frame0 = 0;
+            if (mode === 1) {
+                const json = {
+                    tag: `cws_${tag}`,
+                    message: data
+                };
+                buffer = Buffer.from(JSON.stringify(json));
+                frame0 = 0x81;
+            }
+            else if (mode === 2) {
+                buffer = Buffer.from(data);
+                frame0 = 0x82;
+            }
+            const length = buffer.length;
+            let frame;
+            if (length <= 125) {
+                frame = Buffer.alloc(length + 2);
+                frame[0] = frame0;
+                frame[1] = length;
+            }
+            else if (length <= 65535) {
+                frame = Buffer.alloc(length + 4);
+                frame[0] = frame0;
+                frame[1] = 126;
+                frame.writeUInt16BE(length, 2);
+            }
+            else {
+                frame = Buffer.alloc(length + 10);
+                frame[0] = frame0;
+                frame[1] = 127;
+                frame.writeBigUInt64BE(BigInt(length), 2);
+            }
+            buffer.copy(frame, frame.length - length);
+            client.socket.write(frame);
         }
     };
-    sendInputBroadcast = (socket, tag, message) => {
-        for (const client of this.socketList) {
-            if (client && !client.destroyed && client !== socket) {
-                this.sendInput(client, tag, message);
+    sendDataBroadcast = (data, clientId) => {
+        for (const [index] of this.clientList) {
+            if (!clientId || (clientId && clientId !== index)) {
+                this.sendData(index, 1, data, "broadcast");
             }
         }
     };
-    onServerUpgrade = (request, socket) => {
-        if (request.headers["upgrade"] !== "websocket") {
-            socket.end("HTTP/1.1 400 Bad Request");
-            return;
-        }
-        const { "sec-websocket-key": webClientSocketKey } = request.headers;
-        const socketKey = webClientSocketKey;
-        const acceptKey = Crypto.createHash("sha1").update(socketKey.concat(this.WEBSOCKET_MAGIC_STRING_KEY)).digest("base64");
-        const header = ["HTTP/1.1 101 Switching Protocols", "Upgrade: websocket", "Connection: Upgrade", `Sec-WebSocket-Accept: ${acceptKey}`, ""]
-            .map((line) => line.concat("\r\n"))
-            .join("");
-        socket.write(header, (error) => {
-            if (error) {
-                throw new Error(`@cimo/websocket - Service.ts - onServerUpgrade - Error: ${error.toString()}`);
-            }
+    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);
         });
-        this.socketList.push(socket);
-        socket.on("data", (buffer) => {
-            this.onSocketData(socket, buffer);
+    };
+    receiveDataUpload = (callback) => {
+        let filename = "";
+        this.receiveData("upload", (clientId, data) => {
+            if (typeof data === "string") {
+                const message = JSON.parse(data);
+                filename = message.filename;
+            }
+            else {
+                callback(clientId, data, filename);
+                filename = "";
+            }
         });
-        socket.on("end", () => {
-            this.onSocketEnd(socket);
+    };
+    receiveDataOff = (tag) => {
+        if (this.handleReceiveDataList.has(`cws_${tag}`)) {
+            this.handleReceiveDataList.delete(`cws_${tag}`);
+        }
+    };
+    create = (server) => {
+        server.on("upgrade", (request, socket) => {
+            if (request.headers["upgrade"] !== "websocket") {
+                socket.end("HTTP/1.1 400 Bad Request");
+                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);
+            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);
+                        }
+                        else if (json.tag === "cws_upload") {
+                            messageTagUpload = json.tag;
+                        }
+                        this.handleReceiveData(json.tag, clientId, json.message);
+                    }
+                    else if ((clientOpCode === 0 || clientOpCode === 2) && messageTagUpload) {
+                        this.handleReceiveData(messageTagUpload, clientId, clientFragmentList);
+                        messageTagUpload = "";
+                    }
+                });
+            });
+            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.sendInputBroadcast(socket, "broadcast", `Client ${socket.remoteAddress || ""} connected.`);
     };
-    onSocketData = (socket, buffer) => {
-        let data = {};
-        let payloadLength = buffer[1] & 0x7f;
-        let payloadOffset = 2;
-        const opcode = buffer[0] & 0x0f;
-        const isMasked = (buffer[1] & 0x80) !== 0;
-        if (payloadLength === this.SIXTEEN_BITS_INTEGER_MARKER) {
-            payloadLength = buffer.readUInt16BE(2);
-            payloadOffset = 4;
+    responseHeader = (request) => {
+        const key = request.headers["sec-websocket-key"] || "";
+        const hash = Crypto.createHash("sha1").update(`${key}258EAFA5-E914-47DA-95CA-C5AB0DC85B11`).digest("base64");
+        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");
+    }
+    checkClient = (clientId) => {
+        const client = this.clientList.get(clientId);
+        if (!client) {
+            console.log("@cimo/webSocket - Server - Service.ts - checkClient()", `Client ${clientId} not exists!`);
+            return undefined;
         }
-        else if (payloadLength === this.THIRTYTWO_BITS_INTEGER_MARKER) {
-            payloadLength = buffer.readUInt32BE(2);
-            payloadOffset = 10;
+        return client;
+    };
+    handleFrame = (clientId, data, callback) => {
+        const client = this.checkClient(clientId);
+        if (!client) {
+            return;
         }
-        if (isMasked) {
-            const maskingKey = buffer.subarray(payloadOffset, payloadOffset + this.MASK_KEY_BYTES_LENGTH);
-            payloadOffset += this.MASK_KEY_BYTES_LENGTH;
-            for (let i = 0; i < payloadLength; i++) {
-                buffer[payloadOffset + i] ^= maskingKey[i % this.MASK_KEY_BYTES_LENGTH];
+        client.buffer = Buffer.concat([client.buffer, data]);
+        while (client.buffer.length > 2) {
+            let payloadLength = client.buffer[1] & 0x7f;
+            let frameLength = payloadLength + 6;
+            let maskingKeyStart = 2;
+            if (payloadLength === 126) {
+                payloadLength = client.buffer.readUInt16BE(2);
+                frameLength = payloadLength + 8;
+                maskingKeyStart = 4;
             }
-        }
-        const payloadData = buffer.subarray(payloadOffset, payloadOffset + payloadLength);
-        if (opcode === 0x01) {
-            const payloadOutput = payloadData.toString("utf-8");
-            if (/^[\],:{}\s]*$/.test(payloadOutput
-                .replace(/\\["\\/bfnrtu]/g, "@")
-                .replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\\-]?\d+)?/g, "]")
-                .replace(/(?:^|:|,)(?:\s*\[)+/g, ""))) {
-                data = JSON.parse(payloadOutput);
+            else if (payloadLength === 127) {
+                payloadLength = Number(client.buffer.readBigUInt64BE(2));
+                frameLength = payloadLength + 14;
+                maskingKeyStart = 10;
+            }
+            if (client.buffer.length < frameLength) {
+                break;
+            }
+            const frame = client.buffer.slice(0, frameLength);
+            client.buffer = client.buffer.slice(frameLength);
+            const fin = (frame[0] & 0x80) === 0x80;
+            client.opCode = frame[0] & 0x0f;
+            const isMasked = frame[1] & 0x80;
+            const payloadStart = maskingKeyStart + 4;
+            const payload = frame.slice(payloadStart);
+            if (isMasked) {
+                const maskingKey = frame.slice(maskingKeyStart, payloadStart);
+                for (let a = 0; a < payload.length; a++) {
+                    payload[a] ^= maskingKey[a % 4];
+                }
+            }
+            if (client.opCode === 0x01 || client.opCode === 0x02 || client.opCode === 0x00) {
+                client.fragmentList.push(payload);
+            }
+            else if (client.opCode === 0x0a) {
+                console.log("@cimo/webSocket - Server - Service.ts - handleFrame()", `Client ${clientId} pong.`);
+            }
+            if (fin) {
+                const clientOpCode = client.opCode;
+                const clientFragmentList = client.fragmentList;
+                callback(clientOpCode, clientFragmentList);
+                client.buffer = Buffer.alloc(0);
+                client.opCode = -1;
+                client.fragmentList = [];
             }
         }
-        this.receiveOutputHandle(socket, data);
     };
-    onSocketEnd = (socket) => {
-        this.sendInputBroadcast(socket, "broadcast", `Client ${socket.remoteAddress || ""} disconnected.`);
-        const index = this.socketList.indexOf(socket);
-        if (index > -1) {
-            this.socketList.splice(index, 1);
+    ping = (clientId) => {
+        const client = this.checkClient(clientId);
+        if (!client) {
+            return;
         }
-        socket.destroy();
+        client.intervalPing = setInterval(() => {
+            if (client.socket && client.socket.writable) {
+                const frame = Buffer.alloc(2);
+                frame[0] = 0x89;
+                frame[1] = 0x00;
+                client.socket.write(frame);
+            }
+        }, this.timePing);
     };
-    receiveOutputHandle = (socket, data) => {
-        for (const [tag, callback] of this.receiveOutputHandleList) {
-            if (tag === data.tag) {
-                callback(socket, data);
+    handleReceiveData = (tag, clientId, data) => {
+        for (const [index, callback] of this.handleReceiveDataList) {
+            if (tag === index) {
+                callback(clientId, data);
                 return;
             }
         }
     };
-    prepareMessage = (data) => {
-        const message = Buffer.from(data);
-        const messageSize = message.length;
-        let dataBuffer;
-        const firstByte = 0x80 | 0x01;
-        if (messageSize <= this.SEVEN_BITS_INTEGER_MARKER) {
-            const bytes = [firstByte];
-            dataBuffer = Buffer.from(bytes.concat(messageSize));
-        }
-        else if (messageSize <= 2 ** 16) {
-            const target = Buffer.allocUnsafe(4);
-            target[0] = firstByte;
-            target[1] = this.SIXTEEN_BITS_INTEGER_MARKER | 0x0;
-            target.writeUint16BE(messageSize, 2);
-            dataBuffer = target;
-        }
-        else {
-            throw new Error("@cimo/websocket - Service.ts - prepareMessage - Error: Message too long.");
+    cleanup = (clientId) => {
+        const client = this.checkClient(clientId);
+        if (!client) {
+            return;
         }
-        const totalLength = dataBuffer.byteLength + messageSize;
-        const result = Buffer.allocUnsafe(totalLength);
-        let offset = 0;
-        for (const buffer of [dataBuffer, message]) {
-            result.set(buffer, offset);
-            offset += buffer.length;
+        if (client.socket) {
+            client.socket.end();
+            this.clientList.delete(clientId);
         }
-        return result;
     };
 }
 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.23",
+    "version": "1.1.25",
     "description": "Websocket (server/client). Light, fast and secure.",
     "author": "cimo",
     "license": "MIT",