@cimo/websocket 1.4.45 → 1.5.46

package/README.md

@@ -50,10 +50,10 @@ import { CwsServer } from "@cimo/websocket/dist/src/Main";
 ...
 
 export const websocket = (cwsServer: CwsServer, cp: Cp) => {
-    cwsServer.receiveData("action_test", (clientId, message) => {
-        console.log(message);
+    cwsServer.receiveData("action_test", (data, clientId) => {
+        console.log(data);
 
-        cwsServer.sendData(clientId, "text", { test: "end" }, "action_test");
+        cwsServer.sendMessage("text", { test: "end" }, "action_test", clientId);
     });
 };
 
@@ -73,14 +73,18 @@ import CwsClient from "@cimo/websocket/dist/src/client/Manager";
 
 const cwsClient = new CwsClient("wss://localhost");
 
-cwsClient.checkConnection(() => {
-    cwsClient.receiveData("action_test", (message) => {
-        console.log(message);
+this.cwsClient.checkStatus("connection", () => {
+    cwsClient.receiveData("action_test", (data) => {
+        console.log(data);
     });
 });
 
+this.cwsClient.checkStatus("disconnection", () => {
+    console.log("disconnected");
+});
+
 elementButton.addEventListener("click", (event) => {
-    cwsClient.sendData("text", { test: "start" }, "action_test");
+    cwsClient.sendMessage("text", { test: "start" }, "action_test");
 });
 
 ...

package/dist/src/client/Manager.d.ts

@@ -2,21 +2,20 @@ import * as model from "./Model";
 export default class Manager {
     private ws;
     private address;
-    private clientId;
-    private callbackHandleResponseMap;
-    private countCheckConnection;
-    private countCheckConnectionLimit;
-    private intervalCheckConnection;
-    private handleResponse;
+    private handleReceiveDataList;
+    private callbackConnection;
+    private callbackDisconnection;
+    private handleReceiveData;
+    private handleReceiveDataRemove;
     private cleanup;
     private create;
-    constructor(addressValue: string, countCheckConnectionLimitValue?: number);
-    getClientId: () => string;
-    sendData: (mode: string, message: model.TsendMessage, tag?: string, timeout?: number) => void;
-    receiveData: <T>(tag: string, callback: (message: T) => void) => void;
+    constructor(addressValue: string);
+    checkStatus: (mode: string, callback: () => void) => void;
+    sendMessage: (mode: string, data: model.TsendData, tag?: string, timeout?: number) => void;
+    sendDataBroadcast: (data: model.TsendData) => void;
     sendDataUpload: (filename: string, file: ArrayBuffer) => void;
+    sendDataDirect: (data: model.TsendData, clientId: string) => void;
+    receiveData: <T>(tag: string, callbackValue: model.IcallbackReceiveData<T>) => void;
     receiveDataDownload: (callback: model.IcallbackReceiveDataDownload) => void;
-    receiveDataOff: (tag: string) => void;
-    sendDataBroadcast: (message: model.TsendMessage) => void;
-    checkConnection: (callback: () => void) => void;
+    receiveDataDirect: (callback: (data: model.TreceiveData) => void) => void;
 }

package/dist/src/client/Manager.js

@@ -37,27 +37,39 @@ const helperSrc = __importStar(require("../HelperSrc"));
 class Manager {
     ws;
     address;
-    clientId;
-    callbackHandleResponseMap;
-    countCheckConnection;
-    countCheckConnectionLimit;
-    intervalCheckConnection;
-    handleResponse = (tag, message) => {
-        for (const [index, callback] of this.callbackHandleResponseMap) {
-            if (tag === index) {
-                callback(message);
+    handleReceiveDataList;
+    callbackConnection = null;
+    callbackDisconnection = null;
+    handleReceiveData = (tag, data) => {
+        for (const handleReceiveData of this.handleReceiveDataList) {
+            if (handleReceiveData.tag === tag) {
+                handleReceiveData.callback(data);
                 return;
             }
         }
     };
+    handleReceiveDataRemove = (tag) => {
+        for (let a = this.handleReceiveDataList.length - 1; a >= 0; a--) {
+            if (this.handleReceiveDataList[a].tag === tag) {
+                this.handleReceiveDataList.splice(a, 1);
+                break;
+            }
+        }
+    };
     cleanup = () => {
-        this.ws = undefined;
+        if (this.ws) {
+            this.ws.close();
+            this.ws = undefined;
+        }
     };
     create = () => {
         this.ws = new WebSocket(this.address);
         this.ws.binaryType = "arraybuffer";
         this.ws.onopen = () => {
-            helperSrc.writeLog("@cimo/websocket - Client - Manager.ts - create() - onOpen()", "Connection open.");
+            helperSrc.writeLog("@cimo/websocket - Client - Manager.ts - create() - onopen()", "Connection open.");
+            if (this.callbackConnection) {
+                this.callbackConnection();
+            }
         };
         let messageTagDownload = "";
         this.ws.onmessage = (event) => {
@@ -77,49 +89,53 @@ class Manager {
                     if (messageObject.tag === "cws_download") {
                         messageTagDownload = messageObject.tag;
                     }
-                    this.handleResponse(messageObject.tag, messageObject.data);
+                    this.handleReceiveData(messageObject.tag, messageObject.data);
                 }
                 else if (typeof event.data !== "string" && messageTagDownload) {
                     const view = new DataView(event.data);
-                    this.handleResponse(messageTagDownload, view);
+                    this.handleReceiveData(messageTagDownload, view);
                     messageTagDownload = "";
                 }
             }
         };
         this.ws.onclose = () => {
-            helperSrc.writeLog("@cimo/websocket - Client - Manager.ts - create() - onClose()", "Connection close.");
+            helperSrc.writeLog("@cimo/websocket - Client - Manager.ts - create() - onclose()", "Connection close.");
             this.cleanup();
+            if (this.callbackDisconnection) {
+                this.callbackDisconnection();
+            }
         };
     };
-    constructor(addressValue, countCheckConnectionLimitValue = 25) {
+    constructor(addressValue) {
         this.ws = undefined;
         this.address = addressValue;
-        this.clientId = "";
-        this.callbackHandleResponseMap = new Map();
-        this.countCheckConnection = 0;
-        this.countCheckConnectionLimit = countCheckConnectionLimitValue;
-        this.intervalCheckConnection = undefined;
+        this.handleReceiveDataList = [];
         this.create();
     }
-    getClientId = () => {
-        return this.clientId;
+    checkStatus = (mode, callback) => {
+        if (mode === "connection") {
+            this.callbackConnection = callback;
+        }
+        else if (mode === "disconnection") {
+            this.callbackDisconnection = callback;
+        }
     };
-    sendData = (mode, message, tag = "", timeout = 0) => {
+    sendMessage = (mode, data, tag = "", timeout = 0) => {
         if (this.ws && this.ws.readyState === WebSocket.OPEN) {
-            if (!(message instanceof ArrayBuffer) && !(typeof message === "string") && !(typeof message === "object" && message !== null)) {
-                helperSrc.writeLog("@cimo/websocket - Client - Manager.ts - sendData()", "Invalid message type!");
+            if (!(data instanceof ArrayBuffer) && !(typeof data === "string") && !(typeof data === "object" && data !== null)) {
+                helperSrc.writeLog("@cimo/websocket - Client - Manager.ts - sendMessage()", "Invalid data type!");
             }
-            if (mode === "text" && !(message instanceof ArrayBuffer)) {
-                let resultMessage = "";
-                if (typeof message === "string") {
-                    resultMessage = message;
+            if (mode === "text" && !(data instanceof ArrayBuffer)) {
+                let resultData = "";
+                if (typeof data === "string") {
+                    resultData = data;
                 }
-                else if (typeof message === "object") {
-                    resultMessage = JSON.stringify(message);
+                else if (typeof data === "object") {
+                    resultData = JSON.stringify(data);
                 }
                 const messageObject = {
                     tag: `cws_${tag}`,
-                    data: window.btoa(String.fromCharCode(...new TextEncoder().encode(resultMessage)))
+                    data: window.btoa(String.fromCharCode(...new TextEncoder().encode(resultData)))
                 };
                 if (timeout > 0) {
                     const timeoutEvent = setTimeout(() => {
@@ -133,77 +149,63 @@ class Manager {
                     this.ws.send(JSON.stringify(messageObject));
                 }
             }
-            else if (mode === "binary" && message instanceof ArrayBuffer) {
-                this.ws.send(message);
+            else if (mode === "binary" && data instanceof ArrayBuffer) {
+                this.ws.send(data);
             }
             else {
-                helperSrc.writeLog("@cimo/websocket - Client - Manager.ts - sendData()", "Message type doesn't match mode!");
+                helperSrc.writeLog("@cimo/websocket - Client - Manager.ts - sendMessage()", "Message type doesn't match mode!");
             }
         }
         else {
-            helperSrc.writeLog("@cimo/websocket - Client - Manager.ts - sendData()", "Client not connected!");
+            helperSrc.writeLog("@cimo/websocket - Client - Manager.ts - sendMessage()", "Client not connected!");
+        }
+    };
+    sendDataBroadcast = (data) => {
+        this.sendMessage("text", data, "broadcast");
+    };
+    sendDataUpload = (filename, file) => {
+        this.sendMessage("text", filename, "upload");
+        this.sendMessage("binary", file, "", 100);
+    };
+    sendDataDirect = (data, clientId) => {
+        if (clientId !== "") {
+            this.sendMessage("text", { content: data, toClientId: clientId }, "direct");
         }
     };
-    receiveData = (tag, callback) => {
-        this.callbackHandleResponseMap.set(`cws_${tag}`, (message) => {
-            let resultMessage;
-            if (typeof message === "string") {
-                const decoded = helperSrc.base64ToUtf8(message);
-                if (!helperSrc.isJson(decoded)) {
-                    resultMessage = decoded;
+    receiveData = (tag, callbackValue) => {
+        const cwsTag = `cws_${tag}`;
+        this.handleReceiveDataRemove(cwsTag);
+        this.handleReceiveDataList.push({
+            tag: cwsTag,
+            callback: (data) => {
+                let resultData;
+                if (typeof data === "string") {
+                    const decoded = helperSrc.base64ToUtf8(data);
+                    resultData = !helperSrc.isJson(decoded) ? decoded : JSON.parse(decoded);
                 }
                 else {
-                    resultMessage = JSON.parse(decoded);
+                    resultData = data;
                 }
+                callbackValue(resultData);
             }
-            else {
-                resultMessage = message;
-            }
-            callback(resultMessage);
         });
     };
-    sendDataUpload = (filename, file) => {
-        this.sendData("text", filename, "upload");
-        this.sendData("binary", file, "", 100);
-    };
     receiveDataDownload = (callback) => {
         let filename = "";
-        this.receiveData("download", (message) => {
-            if (typeof message === "string") {
-                filename = message;
+        this.receiveData("download", (data) => {
+            if (typeof data === "string") {
+                filename = data;
             }
             else {
-                callback(message, filename);
+                callback(data, filename);
                 filename = "";
             }
         });
     };
-    receiveDataOff = (tag) => {
-        if (this.callbackHandleResponseMap.has(`cws_${tag}`)) {
-            this.callbackHandleResponseMap.delete(`cws_${tag}`);
-        }
-    };
-    sendDataBroadcast = (message) => {
-        this.sendData("text", message, "broadcast");
-    };
-    checkConnection = (callback) => {
-        if (this.countCheckConnection > this.countCheckConnectionLimit) {
-            clearInterval(this.intervalCheckConnection);
-            return;
-        }
-        if (this.ws) {
-            if (this.ws.readyState === WebSocket.OPEN) {
-                clearInterval(this.intervalCheckConnection);
-                this.countCheckConnection = 0;
-                callback();
-            }
-            else if (this.countCheckConnection === 0) {
-                this.intervalCheckConnection = setInterval(() => {
-                    this.countCheckConnection++;
-                    this.checkConnection(callback);
-                }, 5000);
-            }
-        }
+    receiveDataDirect = (callback) => {
+        this.receiveData("direct", (data) => {
+            callback(data);
+        });
     };
 }
 exports.default = Manager;

package/dist/src/client/Manager.js.map

@@ -1 +1 @@
-{"version":3,"file":"Manager.js","sourceRoot":"","sources":["../../../src/client/Manager.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,wDAA0C;AAG1C,MAAqB,OAAO;IAChB,EAAE,CAAwB;IAC1B,OAAO,CAAS;IAChB,QAAQ,CAAS;IACjB,yBAAyB,CAA6C;IACtE,oBAAoB,CAAS;IAC7B,yBAAyB,CAAS;IAClC,uBAAuB,CAA6B;IAEpD,cAAc,GAAG,CAAC,GAAW,EAAE,OAA6B,EAAQ,EAAE;QAC1E,KAAK,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,IAAI,IAAI,CAAC,yBAAyB,EAAE,CAAC;YAC7D,IAAI,GAAG,KAAK,KAAK,EAAE,CAAC;gBAChB,QAAQ,CAAC,OAAO,CAAC,CAAC;gBAElB,OAAO;YACX,CAAC;QACL,CAAC;IACL,CAAC,CAAC;IAEM,OAAO,GAAG,GAAS,EAAE;QACzB,IAAI,CAAC,EAAE,GAAG,SAAS,CAAC;IACxB,CAAC,CAAC;IAEM,MAAM,GAAG,GAAS,EAAE;QACxB,IAAI,CAAC,EAAE,GAAG,IAAI,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACtC,IAAI,CAAC,EAAE,CAAC,UAAU,GAAG,aAAa,CAAC;QAEnC,IAAI,CAAC,EAAE,CAAC,MAAM,GAAG,GAAG,EAAE;YAClB,SAAS,CAAC,QAAQ,CAAC,6DAA6D,EAAE,kBAAkB,CAAC,CAAC;QAC1G,CAAC,CAAC;QAEF,IAAI,kBAAkB,GAAG,EAAE,CAAC;QAE5B,IAAI,CAAC,EAAE,CAAC,SAAS,GAAG,CAAC,KAAgC,EAAE,EAAE;YACrD,IAAI,IAAI,CAAC,EAAE,EAAE,CAAC;gBACV,IAAI,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;oBACjC,MAAM,SAAS,GAAG,KAAK,CAAC,IAAc,CAAC;oBAEvC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,EAAE,CAAC;wBACpB,OAAO;oBACX,CAAC;oBAED,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC;wBAC/B,OAAO;oBACX,CAAC;oBAED,MAAM,aAAa,GAAmB,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;oBAE5D,IAAI,CAAC,aAAa,IAAI,OAAO,aAAa,CAAC,GAAG,KAAK,QAAQ,EAAE,CAAC;wBAC1D,OAAO;oBACX,CAAC;oBAED,IAAI,aAAa,CAAC,GAAG,KAAK,cAAc,EAAE,CAAC;wBACvC,kBAAkB,GAAG,aAAa,CAAC,GAAG,CAAC;oBAC3C,CAAC;oBAED,IAAI,CAAC,cAAc,CAAC,aAAa,CAAC,GAAG,EAAE,aAAa,CAAC,IAAI,CAAC,CAAC;gBAC/D,CAAC;qBAAM,IAAI,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ,IAAI,kBAAkB,EAAE,CAAC;oBAC9D,MAAM,IAAI,GAAG,IAAI,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;oBAEtC,IAAI,CAAC,cAAc,CAAC,kBAAkB,EAAE,IAAI,CAAC,CAAC;oBAE9C,kBAAkB,GAAG,EAAE,CAAC;gBAC5B,CAAC;YACL,CAAC;QACL,CAAC,CAAC;QAEF,IAAI,CAAC,EAAE,CAAC,OAAO,GAAG,GAAG,EAAE;YACnB,SAAS,CAAC,QAAQ,CAAC,8DAA8D,EAAE,mBAAmB,CAAC,CAAC;YAExG,IAAI,CAAC,OAAO,EAAE,CAAC;QACnB,CAAC,CAAC;IACN,CAAC,CAAC;IAEF,YAAY,YAAoB,EAAE,8BAA8B,GAAG,EAAE;QACjE,IAAI,CAAC,EAAE,GAAG,SAAS,CAAC;QACpB,IAAI,CAAC,OAAO,GAAG,YAAY,CAAC;QAC5B,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC;QACnB,IAAI,CAAC,yBAAyB,GAAG,IAAI,GAAG,EAAE,CAAC;QAC3C,IAAI,CAAC,oBAAoB,GAAG,CAAC,CAAC;QAC9B,IAAI,CAAC,yBAAyB,GAAG,8BAA8B,CAAC;QAChE,IAAI,CAAC,uBAAuB,GAAG,SAAS,CAAC;QAEzC,IAAI,CAAC,MAAM,EAAE,CAAC;IAClB,CAAC;IAED,WAAW,GAAG,GAAW,EAAE;QACvB,OAAO,IAAI,CAAC,QAAQ,CAAC;IACzB,CAAC,CAAC;IAEF,QAAQ,GAAG,CAAC,IAAY,EAAE,OAA2B,EAAE,GAAG,GAAG,EAAE,EAAE,OAAO,GAAG,CAAC,EAAQ,EAAE;QAClF,IAAI,IAAI,CAAC,EAAE,IAAI,IAAI,CAAC,EAAE,CAAC,UAAU,KAAK,SAAS,CAAC,IAAI,EAAE,CAAC;YACnD,IAAI,CAAC,CAAC,OAAO,YAAY,WAAW,CAAC,IAAI,CAAC,CAAC,OAAO,OAAO,KAAK,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,OAAO,KAAK,QAAQ,IAAI,OAAO,KAAK,IAAI,CAAC,EAAE,CAAC;gBAC5H,SAAS,CAAC,QAAQ,CAAC,oDAAoD,EAAE,uBAAuB,CAAC,CAAC;YACtG,CAAC;YAED,IAAI,IAAI,KAAK,MAAM,IAAI,CAAC,CAAC,OAAO,YAAY,WAAW,CAAC,EAAE,CAAC;gBACvD,IAAI,aAAa,GAAG,EAAE,CAAC;gBAEvB,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;oBAC9B,aAAa,GAAG,OAAO,CAAC;gBAC5B,CAAC;qBAAM,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;oBACrC,aAAa,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;gBAC5C,CAAC;gBAED,MAAM,aAAa,GAAmB;oBAClC,GAAG,EAAE,OAAO,GAAG,EAAE;oBACjB,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,GAAG,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC;iBACrF,CAAC;gBAEF,IAAI,OAAO,GAAG,CAAC,EAAE,CAAC;oBACd,MAAM,YAAY,GAAG,UAAU,CAAC,GAAG,EAAE;wBACjC,YAAY,CAAC,YAAY,CAAC,CAAC;wBAE3B,IAAI,IAAI,CAAC,EAAE,EAAE,CAAC;4BACV,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC,CAAC;wBAChD,CAAC;oBACL,CAAC,EAAE,OAAO,CAAC,CAAC;gBAChB,CAAC;qBAAM,CAAC;oBACJ,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC,CAAC;gBAChD,CAAC;YACL,CAAC;iBAAM,IAAI,IAAI,KAAK,QAAQ,IAAI,OAAO,YAAY,WAAW,EAAE,CAAC;gBAC7D,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAC1B,CAAC;iBAAM,CAAC;gBACJ,SAAS,CAAC,QAAQ,CAAC,oDAAoD,EAAE,kCAAkC,CAAC,CAAC;YACjH,CAAC;QACL,CAAC;aAAM,CAAC;YACJ,SAAS,CAAC,QAAQ,CAAC,oDAAoD,EAAE,uBAAuB,CAAC,CAAC;QACtG,CAAC;IACL,CAAC,CAAC;IAEF,WAAW,GAAG,CAAI,GAAW,EAAE,QAA8B,EAAQ,EAAE;QACnE,IAAI,CAAC,yBAAyB,CAAC,GAAG,CAAC,OAAO,GAAG,EAAE,EAAE,CAAC,OAAO,EAAE,EAAE;YACzD,IAAI,aAAgB,CAAC;YAErB,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;gBAC9B,MAAM,OAAO,GAAG,SAAS,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;gBAEhD,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC;oBAC7B,aAAa,GAAG,OAAY,CAAC;gBACjC,CAAC;qBAAM,CAAC;oBACJ,aAAa,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAM,CAAC;gBAC7C,CAAC;YACL,CAAC;iBAAM,CAAC;gBACJ,aAAa,GAAG,OAAY,CAAC;YACjC,CAAC;YAED,QAAQ,CAAC,aAAa,CAAC,CAAC;QAC5B,CAAC,CAAC,CAAC;IACP,CAAC,CAAC;IAEF,cAAc,GAAG,CAAC,QAAgB,EAAE,IAAiB,EAAQ,EAAE;QAC3D,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;QAC1C,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,CAAC,CAAC;IAC3C,CAAC,CAAC;IAEF,mBAAmB,GAAG,CAAC,QAA4C,EAAQ,EAAE;QACzE,IAAI,QAAQ,GAAG,EAAE,CAAC;QAElB,IAAI,CAAC,WAAW,CAAC,UAAU,EAAE,CAAC,OAA6B,EAAE,EAAE;YAC3D,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;gBAC9B,QAAQ,GAAG,OAAO,CAAC;YACvB,CAAC;iBAAM,CAAC;gBACJ,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;gBAE5B,QAAQ,GAAG,EAAE,CAAC;YAClB,CAAC;QACL,CAAC,CAAC,CAAC;IACP,CAAC,CAAC;IAEF,cAAc,GAAG,CAAC,GAAW,EAAQ,EAAE;QACnC,IAAI,IAAI,CAAC,yBAAyB,CAAC,GAAG,CAAC,OAAO,GAAG,EAAE,CAAC,EAAE,CAAC;YACnD,IAAI,CAAC,yBAAyB,CAAC,MAAM,CAAC,OAAO,GAAG,EAAE,CAAC,CAAC;QACxD,CAAC;IACL,CAAC,CAAC;IAEF,iBAAiB,GAAG,CAAC,OAA2B,EAAQ,EAAE;QACtD,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC;IAChD,CAAC,CAAC;IAEF,eAAe,GAAG,CAAC,QAAoB,EAAQ,EAAE;QAC7C,IAAI,IAAI,CAAC,oBAAoB,GAAG,IAAI,CAAC,yBAAyB,EAAE,CAAC;YAC7D,aAAa,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;YAE5C,OAAO;QACX,CAAC;QAED,IAAI,IAAI,CAAC,EAAE,EAAE,CAAC;YACV,IAAI,IAAI,CAAC,EAAE,CAAC,UAAU,KAAK,SAAS,CAAC,IAAI,EAAE,CAAC;gBACxC,aAAa,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;gBAE5C,IAAI,CAAC,oBAAoB,GAAG,CAAC,CAAC;gBAE9B,QAAQ,EAAE,CAAC;YACf,CAAC;iBAAM,IAAI,IAAI,CAAC,oBAAoB,KAAK,CAAC,EAAE,CAAC;gBACzC,IAAI,CAAC,uBAAuB,GAAG,WAAW,CAAC,GAAG,EAAE;oBAC5C,IAAI,CAAC,oBAAoB,EAAE,CAAC;oBAE5B,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;gBACnC,CAAC,EAAE,IAAI,CAAC,CAAC;YACb,CAAC;QACL,CAAC;IACL,CAAC,CAAC;CACL;AA3MD,0BA2MC"}
+{"version":3,"file":"Manager.js","sourceRoot":"","sources":["../../../src/client/Manager.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,wDAA0C;AAG1C,MAAqB,OAAO;IAChB,EAAE,CAAwB;IAC1B,OAAO,CAAS;IAChB,qBAAqB,CAA6B;IAClD,kBAAkB,GAAwB,IAAI,CAAC;IAC/C,qBAAqB,GAAwB,IAAI,CAAC;IAElD,iBAAiB,GAAG,CAAC,GAAW,EAAE,IAAwB,EAAQ,EAAE;QACxE,KAAK,MAAM,iBAAiB,IAAI,IAAI,CAAC,qBAAqB,EAAE,CAAC;YACzD,IAAI,iBAAiB,CAAC,GAAG,KAAK,GAAG,EAAE,CAAC;gBAChC,iBAAiB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;gBAEjC,OAAO;YACX,CAAC;QACL,CAAC;IACL,CAAC,CAAC;IAEM,uBAAuB,GAAG,CAAC,GAAW,EAAQ,EAAE;QACpD,KAAK,IAAI,CAAC,GAAG,IAAI,CAAC,qBAAqB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;YAC9D,IAAI,IAAI,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC,GAAG,KAAK,GAAG,EAAE,CAAC;gBAC5C,IAAI,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;gBAExC,MAAM;YACV,CAAC;QACL,CAAC;IACL,CAAC,CAAC;IAEM,OAAO,GAAG,GAAS,EAAE;QACzB,IAAI,IAAI,CAAC,EAAE,EAAE,CAAC;YACV,IAAI,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC;YAChB,IAAI,CAAC,EAAE,GAAG,SAAS,CAAC;QACxB,CAAC;IACL,CAAC,CAAC;IAEM,MAAM,GAAG,GAAS,EAAE;QACxB,IAAI,CAAC,EAAE,GAAG,IAAI,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACtC,IAAI,CAAC,EAAE,CAAC,UAAU,GAAG,aAAa,CAAC;QAEnC,IAAI,CAAC,EAAE,CAAC,MAAM,GAAG,GAAG,EAAE;YAClB,SAAS,CAAC,QAAQ,CAAC,6DAA6D,EAAE,kBAAkB,CAAC,CAAC;YAEtG,IAAI,IAAI,CAAC,kBAAkB,EAAE,CAAC;gBAC1B,IAAI,CAAC,kBAAkB,EAAE,CAAC;YAC9B,CAAC;QACL,CAAC,CAAC;QAEF,IAAI,kBAAkB,GAAG,EAAE,CAAC;QAE5B,IAAI,CAAC,EAAE,CAAC,SAAS,GAAG,CAAC,KAAgC,EAAE,EAAE;YACrD,IAAI,IAAI,CAAC,EAAE,EAAE,CAAC;gBACV,IAAI,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;oBACjC,MAAM,SAAS,GAAG,KAAK,CAAC,IAAc,CAAC;oBAEvC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,EAAE,CAAC;wBACpB,OAAO;oBACX,CAAC;oBAED,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC;wBAC/B,OAAO;oBACX,CAAC;oBAED,MAAM,aAAa,GAAmB,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;oBAE5D,IAAI,CAAC,aAAa,IAAI,OAAO,aAAa,CAAC,GAAG,KAAK,QAAQ,EAAE,CAAC;wBAC1D,OAAO;oBACX,CAAC;oBAED,IAAI,aAAa,CAAC,GAAG,KAAK,cAAc,EAAE,CAAC;wBACvC,kBAAkB,GAAG,aAAa,CAAC,GAAG,CAAC;oBAC3C,CAAC;oBAED,IAAI,CAAC,iBAAiB,CAAC,aAAa,CAAC,GAAG,EAAE,aAAa,CAAC,IAAI,CAAC,CAAC;gBAClE,CAAC;qBAAM,IAAI,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ,IAAI,kBAAkB,EAAE,CAAC;oBAC9D,MAAM,IAAI,GAAG,IAAI,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;oBAEtC,IAAI,CAAC,iBAAiB,CAAC,kBAAkB,EAAE,IAAI,CAAC,CAAC;oBAEjD,kBAAkB,GAAG,EAAE,CAAC;gBAC5B,CAAC;YACL,CAAC;QACL,CAAC,CAAC;QAEF,IAAI,CAAC,EAAE,CAAC,OAAO,GAAG,GAAG,EAAE;YACnB,SAAS,CAAC,QAAQ,CAAC,8DAA8D,EAAE,mBAAmB,CAAC,CAAC;YAExG,IAAI,CAAC,OAAO,EAAE,CAAC;YAEf,IAAI,IAAI,CAAC,qBAAqB,EAAE,CAAC;gBAC7B,IAAI,CAAC,qBAAqB,EAAE,CAAC;YACjC,CAAC;QACL,CAAC,CAAC;IACN,CAAC,CAAC;IAEF,YAAY,YAAoB;QAC5B,IAAI,CAAC,EAAE,GAAG,SAAS,CAAC;QACpB,IAAI,CAAC,OAAO,GAAG,YAAY,CAAC;QAC5B,IAAI,CAAC,qBAAqB,GAAG,EAAE,CAAC;QAEhC,IAAI,CAAC,MAAM,EAAE,CAAC;IAClB,CAAC;IAED,WAAW,GAAG,CAAC,IAAY,EAAE,QAAoB,EAAQ,EAAE;QACvD,IAAI,IAAI,KAAK,YAAY,EAAE,CAAC;YACxB,IAAI,CAAC,kBAAkB,GAAG,QAAQ,CAAC;QACvC,CAAC;aAAM,IAAI,IAAI,KAAK,eAAe,EAAE,CAAC;YAClC,IAAI,CAAC,qBAAqB,GAAG,QAAQ,CAAC;QAC1C,CAAC;IACL,CAAC,CAAC;IAEF,WAAW,GAAG,CAAC,IAAY,EAAE,IAAqB,EAAE,GAAG,GAAG,EAAE,EAAE,OAAO,GAAG,CAAC,EAAQ,EAAE;QAC/E,IAAI,IAAI,CAAC,EAAE,IAAI,IAAI,CAAC,EAAE,CAAC,UAAU,KAAK,SAAS,CAAC,IAAI,EAAE,CAAC;YACnD,IAAI,CAAC,CAAC,IAAI,YAAY,WAAW,CAAC,IAAI,CAAC,CAAC,OAAO,IAAI,KAAK,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,KAAK,IAAI,CAAC,EAAE,CAAC;gBAChH,SAAS,CAAC,QAAQ,CAAC,uDAAuD,EAAE,oBAAoB,CAAC,CAAC;YACtG,CAAC;YAED,IAAI,IAAI,KAAK,MAAM,IAAI,CAAC,CAAC,IAAI,YAAY,WAAW,CAAC,EAAE,CAAC;gBACpD,IAAI,UAAU,GAAG,EAAE,CAAC;gBAEpB,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;oBAC3B,UAAU,GAAG,IAAI,CAAC;gBACtB,CAAC;qBAAM,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;oBAClC,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;gBACtC,CAAC;gBAED,MAAM,aAAa,GAAmB;oBAClC,GAAG,EAAE,OAAO,GAAG,EAAE;oBACjB,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,GAAG,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC;iBAClF,CAAC;gBAEF,IAAI,OAAO,GAAG,CAAC,EAAE,CAAC;oBACd,MAAM,YAAY,GAAG,UAAU,CAAC,GAAG,EAAE;wBACjC,YAAY,CAAC,YAAY,CAAC,CAAC;wBAE3B,IAAI,IAAI,CAAC,EAAE,EAAE,CAAC;4BACV,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC,CAAC;wBAChD,CAAC;oBACL,CAAC,EAAE,OAAO,CAAC,CAAC;gBAChB,CAAC;qBAAM,CAAC;oBACJ,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC,CAAC;gBAChD,CAAC;YACL,CAAC;iBAAM,IAAI,IAAI,KAAK,QAAQ,IAAI,IAAI,YAAY,WAAW,EAAE,CAAC;gBAC1D,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACvB,CAAC;iBAAM,CAAC;gBACJ,SAAS,CAAC,QAAQ,CAAC,uDAAuD,EAAE,kCAAkC,CAAC,CAAC;YACpH,CAAC;QACL,CAAC;aAAM,CAAC;YACJ,SAAS,CAAC,QAAQ,CAAC,uDAAuD,EAAE,uBAAuB,CAAC,CAAC;QACzG,CAAC;IACL,CAAC,CAAC;IAEF,iBAAiB,GAAG,CAAC,IAAqB,EAAQ,EAAE;QAChD,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,IAAI,EAAE,WAAW,CAAC,CAAC;IAChD,CAAC,CAAC;IAEF,cAAc,GAAG,CAAC,QAAgB,EAAE,IAAiB,EAAQ,EAAE;QAC3D,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;QAC7C,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,CAAC,CAAC;IAC9C,CAAC,CAAC;IAEF,cAAc,GAAG,CAAC,IAAqB,EAAE,QAAgB,EAAQ,EAAE;QAC/D,IAAI,QAAQ,KAAK,EAAE,EAAE,CAAC;YAClB,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,EAAE,QAAQ,CAAC,CAAC;QAChF,CAAC;IACL,CAAC,CAAC;IAEF,WAAW,GAAG,CAAI,GAAW,EAAE,aAA4C,EAAQ,EAAE;QACjF,MAAM,MAAM,GAAG,OAAO,GAAG,EAAE,CAAC;QAE5B,IAAI,CAAC,uBAAuB,CAAC,MAAM,CAAC,CAAC;QAErC,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC;YAC5B,GAAG,EAAE,MAAM;YACX,QAAQ,EAAE,CAAC,IAAI,EAAE,EAAE;gBACf,IAAI,UAAa,CAAC;gBAElB,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;oBAC3B,MAAM,OAAO,GAAG,SAAS,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;oBAE7C,UAAU,GAAG,CAAC,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAE,OAAa,CAAC,CAAC,CAAE,IAAI,CAAC,KAAK,CAAC,OAAO,CAAO,CAAC;gBAC1F,CAAC;qBAAM,CAAC;oBACJ,UAAU,GAAG,IAAS,CAAC;gBAC3B,CAAC;gBAED,aAAa,CAAC,UAAU,CAAC,CAAC;YAC9B,CAAC;SACJ,CAAC,CAAC;IACP,CAAC,CAAC;IAEF,mBAAmB,GAAG,CAAC,QAA4C,EAAQ,EAAE;QACzE,IAAI,QAAQ,GAAG,EAAE,CAAC;QAElB,IAAI,CAAC,WAAW,CAAqB,UAAU,EAAE,CAAC,IAAI,EAAE,EAAE;YACtD,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;gBAC3B,QAAQ,GAAG,IAAI,CAAC;YACpB,CAAC;iBAAM,CAAC;gBACJ,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;gBAEzB,QAAQ,GAAG,EAAE,CAAC;YAClB,CAAC;QACL,CAAC,CAAC,CAAC;IACP,CAAC,CAAC;IAEF,iBAAiB,GAAG,CAAC,QAA4C,EAAE,EAAE;QACjE,IAAI,CAAC,WAAW,CAAqB,QAAQ,EAAE,CAAC,IAAI,EAAE,EAAE;YACpD,QAAQ,CAAC,IAAI,CAAC,CAAC;QACnB,CAAC,CAAC,CAAC;IACP,CAAC,CAAC;CACL;AA/MD,0BA+MC"}

package/dist/src/client/Model.d.ts

@@ -1,15 +1,19 @@
 export interface Iclient {
     socket: WebSocket;
 }
-export interface IcallbackHandleResponse {
-    (message: ThandleMessage): void;
+export interface IhandleReceiveData {
+    tag: string;
+    callback: IcallbackReceiveData<TreceiveData>;
+}
+export interface IcallbackReceiveData<T> {
+    (data: T): void;
 }
 export interface IcallbackReceiveDataDownload {
-    (message: DataView, filename: string): void;
+    (data: DataView, filename: string): void;
 }
 export interface Imessage {
     tag: string;
     data: string;
 }
-export type TsendMessage = string | Record<string, unknown> | ArrayBuffer;
-export type ThandleMessage = string | DataView;
+export type TreceiveData = string | DataView;
+export type TsendData = string | Record<string, unknown> | ArrayBuffer;

package/dist/src/server/Manager.d.ts

@@ -2,26 +2,28 @@ import * as model from "./Model";
 export default class Manager {
     private secretKey;
     private timePing;
-    private clientMap;
-    private callbackHandleResponseMap;
-    private responseHeader;
+    private clientList;
+    private handleReceiveDataList;
     private generateClientId;
     private generateSignature;
-    private ping;
-    private clientConnection;
-    private checkClient;
     private verifySignature;
+    private clientRemove;
+    private clientCheck;
+    private clientConnection;
+    private clientDisconnection;
+    private ping;
+    private responseHeader;
     private handleFrame;
-    private handleResponse;
+    private handleReceiveData;
+    private handleReceiveDataRemove;
     private cleanup;
-    private clientDisconnection;
+    private sendDataDirect;
     private create;
     constructor(server: model.IhttpServer.Server | model.IhttpsServer.Server, secretKeyValue: string, timePingValue?: number);
-    getClientMap: () => Map<string, model.Iclient>;
-    sendData: (clientId: string, mode: string, message: model.TsendMessage, tag?: string, timeout?: number) => void;
-    receiveData: <T>(tag: string, callback: (clientId: string, message: T) => void) => void;
-    sendDataDownload: (clientId: string, filename: string, file: Buffer) => void;
+    clientIdList: () => string[];
+    sendMessage: (mode: string, data: model.TsendData, tag: string | undefined, clientId: string, timeout?: number) => void;
+    sendDataBroadcast: (data: model.TsendData, excludeClientId?: string) => void;
+    sendDataDownload: (filename: string, file: Buffer, clientId: string) => void;
+    receiveData: <T>(tag: string, callbackValue: model.IcallbackReceiveData<T>) => void;
     receiveDataUpload: (callback: model.IcallbackReceiveDataUpload) => void;
-    receiveDataOff: (tag: string) => void;
-    sendDataBroadcast: (message: model.TsendMessage, excludeClientId?: string) => void;
 }

package/dist/src/server/Manager.js

@@ -38,25 +38,64 @@ const helperSrc = __importStar(require("../HelperSrc"));
 class Manager {
     secretKey;
     timePing;
-    clientMap;
-    callbackHandleResponseMap;
-    responseHeader = (request) => {
-        const key = request.headers["sec-websocket-key"];
-        if (!key || Array.isArray(key)) {
-            helperSrc.writeLog("@cimo/webSocket - Server - Manager.ts - responseHeader()", "Invalid Sec-WebSocket-Key header!");
-        }
-        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() {
+    clientList;
+    handleReceiveDataList;
+    generateClientId = () => {
         return Crypto.randomBytes(20).toString("hex");
-    }
+    };
     generateSignature = (value) => {
         return Crypto.createHmac("sha256", this.secretKey).update(value).digest("hex");
     };
+    verifySignature = (clientId, signature) => {
+        if (signature !== this.generateSignature(clientId)) {
+            return false;
+        }
+        return true;
+    };
+    clientRemove = (clientId) => {
+        for (let a = this.clientList.length - 1; a >= 0; a--) {
+            if (this.clientList[a].id === clientId) {
+                this.clientList.splice(a, 1);
+            }
+        }
+    };
+    clientCheck = (clientId) => {
+        for (let a = 0; a < this.clientList.length; a++) {
+            if (this.clientList[a].id === clientId) {
+                return this.clientList[a];
+            }
+        }
+        return null;
+    };
+    clientConnection = (socket) => {
+        const clientId = this.generateClientId();
+        const signature = this.generateSignature(clientId);
+        helperSrc.writeLog("@cimo/websocket - Server - Manager.ts - clientConnection()", `Connection request from Ip: ${socket.remoteAddress || ""} - Client ${clientId}.`);
+        this.clientRemove(clientId);
+        this.clientList.push({
+            id: clientId,
+            signature,
+            username: "",
+            socket,
+            buffer: Buffer.alloc(0),
+            opCode: -1,
+            fragmentList: [],
+            intervalPing: undefined,
+            lastPong: Date.now()
+        });
+        this.sendDataBroadcast({ label: "connection", result: `Client ${clientId} connected.` }, clientId);
+        this.ping(clientId);
+        return clientId;
+    };
+    clientDisconnection = (socket, clientId) => {
+        helperSrc.writeLog("@cimo/websocket - Server - Manager.ts - clientDisconnection()", `Disconnection request from Ip: ${socket.remoteAddress || ""} - Client ${clientId}.`);
+        this.sendDataBroadcast({ label: "disconnection", result: `Client ${clientId} disconnected.` }, clientId);
+        this.cleanup(clientId);
+    };
     ping = (clientId) => {
-        const client = this.checkClient(clientId);
+        const client = this.clientCheck(clientId);
         if (!client) {
+            helperSrc.writeLog("@cimo/webSocket - Server - Manager.ts - ping()", `Client ${clientId} doesn't exists!`);
             return;
         }
         client.intervalPing = setInterval(() => {
@@ -74,44 +113,23 @@ class Manager {
             }
         }, this.timePing);
     };
-    clientConnection(socket) {
-        const clientId = this.generateClientId();
-        const signature = this.generateSignature(clientId);
-        helperSrc.writeLog("@cimo/websocket - Server - Manager.ts - clientConnection()", `Connection request from Ip: ${socket.remoteAddress || ""} - Client ${clientId}.`);
-        this.clientMap.set(clientId, {
-            socket,
-            buffer: Buffer.alloc(0),
-            signature,
-            opCode: -1,
-            fragmentList: [],
-            intervalPing: undefined,
-            lastPong: Date.now()
-        });
-        this.sendDataBroadcast({ tag: "connection", result: `Client ${clientId} connected.` }, clientId);
-        this.ping(clientId);
-        return clientId;
-    }
-    checkClient = (clientId) => {
-        const client = this.clientMap.get(clientId);
-        if (!client) {
-            helperSrc.writeLog("@cimo/webSocket - Server - Manager.ts - checkClient()", `Client ${clientId} doesn't exists!`);
-            return null;
-        }
-        return client;
-    };
-    verifySignature = (value, signature) => {
-        if (signature !== this.generateSignature(value)) {
-            helperSrc.writeLog("@cimo/websocket - Server - Manager.ts - verifySignature()", "Wrong signature!");
+    responseHeader = (request) => {
+        const key = request.headers["sec-websocket-key"];
+        if (!key || Array.isArray(key)) {
+            helperSrc.writeLog("@cimo/webSocket - Server - Manager.ts - responseHeader()", "Invalid Sec-WebSocket-Key header!");
         }
-        return true;
+        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"];
     };
     handleFrame = (clientId, data, callback) => {
-        const client = this.checkClient(clientId);
+        const client = this.clientCheck(clientId);
         if (!client) {
+            helperSrc.writeLog("@cimo/webSocket - Server - Manager.ts - handleFrame()", `Client ${clientId} doesn't exists!`);
             return;
         }
         const isSignatureVerified = this.verifySignature(clientId, client.signature);
         if (!isSignatureVerified) {
+            helperSrc.writeLog("@cimo/websocket - Server - Manager.ts - handleFrame()", "Wrong signature!");
             return;
         }
         client.buffer = Buffer.concat([client.buffer, data]);
@@ -167,29 +185,37 @@ class Manager {
             }
         }
     };
-    handleResponse = (clientId, tag, message) => {
-        for (const [index, callback] of this.callbackHandleResponseMap) {
-            if (tag === index) {
-                callback(clientId, message);
+    handleReceiveData = (tag, data, clientId) => {
+        for (const handleReceiveData of this.handleReceiveDataList) {
+            if (handleReceiveData.tag === tag) {
+                handleReceiveData.callback(data, clientId);
                 return;
             }
         }
     };
+    handleReceiveDataRemove = (tag) => {
+        for (let a = this.handleReceiveDataList.length - 1; a >= 0; a--) {
+            if (this.handleReceiveDataList[a].tag === tag) {
+                this.handleReceiveDataList.splice(a, 1);
+            }
+        }
+    };
     cleanup = (clientId) => {
-        const client = this.clientMap.get(clientId);
+        const client = this.clientCheck(clientId);
         if (!client) {
+            helperSrc.writeLog("@cimo/webSocket - Server - Manager.ts - cleanup()", `Client ${clientId} doesn't exists!`);
             return;
         }
         if (client.intervalPing) {
             clearInterval(client.intervalPing);
         }
         client.socket.end();
-        this.clientMap.delete(clientId);
+        this.clientRemove(clientId);
     };
-    clientDisconnection = (socket, clientId) => {
-        helperSrc.writeLog("@cimo/websocket - Server - Manager.ts - clientDisconnection()", `Disconnection request from Ip: ${socket.remoteAddress || ""} - Client ${clientId}.`);
-        this.sendDataBroadcast({ tag: "disconnection", result: `Client ${clientId} disconnected.` }, clientId);
-        this.cleanup(clientId);
+    sendDataDirect = () => {
+        this.receiveData("direct", (data) => {
+            this.sendMessage("text", data.content, "direct", data.toClientId);
+        });
     };
     create = (server) => {
         server.on("upgrade", (request, socket) => {
@@ -220,10 +246,13 @@ class Manager {
                         else if (messageObject.tag === "cws_broadcast") {
                             this.sendDataBroadcast(messageObject.data, clientId);
                         }
-                        this.handleResponse(clientId, messageObject.tag, messageObject.data);
+                        else if (messageObject.tag === "cws_direct") {
+                            this.sendDataDirect();
+                        }
+                        this.handleReceiveData(messageObject.tag, messageObject.data, clientId);
                     }
                     else if ((clientOpCode === 0 || clientOpCode === 2) && messageTagUpload) {
-                        this.handleResponse(clientId, messageTagUpload, clientFragmentList);
+                        this.handleReceiveData(messageTagUpload, clientFragmentList, clientId);
                         messageTagUpload = "";
                     }
                 });
@@ -236,45 +265,50 @@ class Manager {
     constructor(server, secretKeyValue, timePingValue = 25000) {
         this.secretKey = secretKeyValue;
         this.timePing = timePingValue;
-        this.clientMap = new Map();
-        this.callbackHandleResponseMap = new Map();
+        this.clientList = [];
+        this.handleReceiveDataList = [];
         this.create(server);
     }
-    getClientMap = () => {
-        return this.clientMap;
+    clientIdList = () => {
+        const resultList = [];
+        for (const client of this.clientList) {
+            resultList.push(client.id);
+        }
+        return resultList;
     };
-    sendData = (clientId, mode, message, tag = "", timeout = 0) => {
-        const client = this.checkClient(clientId);
+    sendMessage = (mode, data, tag = "", clientId, timeout = 0) => {
+        const client = this.clientCheck(clientId);
         if (!client) {
+            helperSrc.writeLog("@cimo/webSocket - Server - Manager.ts - sendMessage()", `Client ${clientId} doesn't exists!`);
             return;
         }
         if (client && client.socket && client.socket.writable) {
             let buffer = Buffer.alloc(0);
             let frame0 = 0;
-            if (!Buffer.isBuffer(message) && !(typeof message === "string") && !(typeof message === "object" && message !== null)) {
-                helperSrc.writeLog("@cimo/websocket - Server - Manager.ts - sendData()", "Invalid message type!");
+            if (!Buffer.isBuffer(data) && !(typeof data === "string") && !(typeof data === "object" && data !== null)) {
+                helperSrc.writeLog("@cimo/websocket - Server - Manager.ts - sendMessage()", "Invalid data type!");
             }
-            if (mode === "text" && !Buffer.isBuffer(message)) {
-                let resultMessage = "";
-                if (typeof message === "string") {
-                    resultMessage = message;
+            if (mode === "text" && !Buffer.isBuffer(data)) {
+                let resultData = "";
+                if (typeof data === "string") {
+                    resultData = data;
                 }
-                else if (typeof message === "object") {
-                    resultMessage = JSON.stringify(message);
+                else if (typeof data === "object") {
+                    resultData = JSON.stringify(data);
                 }
                 const messageObject = {
                     tag: `cws_${tag}`,
-                    data: Buffer.from(resultMessage).toString("base64")
+                    data: Buffer.from(resultData).toString("base64")
                 };
                 buffer = Buffer.from(JSON.stringify(messageObject));
                 frame0 = 0x81;
             }
-            else if (mode === "binary" && Buffer.isBuffer(message)) {
-                buffer = Buffer.from(message);
+            else if (mode === "binary" && Buffer.isBuffer(data)) {
+                buffer = Buffer.from(data);
                 frame0 = 0x82;
             }
             else {
-                helperSrc.writeLog("@cimo/websocket - Server - Manager.ts - sendData()", "Message type doesn't match mode!");
+                helperSrc.writeLog("@cimo/websocket - Server - Manager.ts - sendMessage()", "Message type doesn't match mode!");
             }
             const length = buffer.length;
             let frame;
@@ -307,52 +341,47 @@ class Manager {
             }
         }
     };
-    receiveData = (tag, callback) => {
-        this.callbackHandleResponseMap.set(`cws_${tag}`, (clientId, message) => {
-            let resultMessage;
-            if (typeof message === "string") {
-                const decoded = Buffer.from(message, "base64").toString();
-                if (!helperSrc.isJson(decoded)) {
-                    resultMessage = decoded;
+    sendDataBroadcast = (data, excludeClientId) => {
+        for (const client of this.clientList) {
+            if (client.id !== excludeClientId) {
+                this.sendMessage("text", data, "broadcast", client.id);
+            }
+        }
+    };
+    sendDataDownload = (filename, file, clientId) => {
+        this.sendMessage("text", filename, "download", clientId);
+        this.sendMessage("binary", file, "", clientId, 100);
+    };
+    receiveData = (tag, callbackValue) => {
+        const cwsTag = `cws_${tag}`;
+        this.handleReceiveDataRemove(cwsTag);
+        this.handleReceiveDataList.push({
+            tag: cwsTag,
+            callback: (data, clientId) => {
+                let resultData;
+                if (typeof data === "string") {
+                    const decoded = Buffer.from(data, "base64").toString();
+                    resultData = !helperSrc.isJson(decoded) ? decoded : JSON.parse(decoded);
                 }
                 else {
-                    resultMessage = JSON.parse(decoded);
+                    resultData = data;
                 }
+                callbackValue(resultData, clientId);
             }
-            else {
-                resultMessage = message;
-            }
-            callback(clientId, resultMessage);
         });
     };
-    sendDataDownload = (clientId, filename, file) => {
-        this.sendData(clientId, "text", filename, "download");
-        this.sendData(clientId, "binary", file, "", 100);
-    };
     receiveDataUpload = (callback) => {
         let filename = "";
-        this.receiveData("upload", (clientId, message) => {
-            if (typeof message === "string") {
-                filename = message;
+        this.receiveData("upload", (data, clientId) => {
+            if (typeof data === "string") {
+                filename = data;
             }
             else {
-                callback(clientId, message, filename);
+                callback(data, filename, clientId);
                 filename = "";
             }
         });
     };
-    receiveDataOff = (tag) => {
-        if (this.callbackHandleResponseMap.has(`cws_${tag}`)) {
-            this.callbackHandleResponseMap.delete(`cws_${tag}`);
-        }
-    };
-    sendDataBroadcast = (message, excludeClientId) => {
-        for (const clientId of this.clientMap.keys()) {
-            if (clientId !== excludeClientId) {
-                this.sendData(clientId, "text", message, "broadcast");
-            }
-        }
-    };
 }
 exports.default = Manager;
 //# sourceMappingURL=Manager.js.map

package/dist/src/server/Manager.js.map

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

package/dist/src/server/Model.d.ts

@@ -4,26 +4,36 @@ import * as Net from "net";
 export { Http as IhttpServer };
 export { Https as IhttpsServer };
 export interface Iclient {
+    id: string;
+    signature: string;
+    username: string;
     socket: Net.Socket;
     buffer: Buffer;
-    signature: string;
     opCode: number;
     fragmentList: Buffer[];
     intervalPing: NodeJS.Timeout | undefined;
     lastPong: number;
 }
+export interface IhandleReceiveData {
+    tag: string;
+    callback: IcallbackReceiveData<TreceiveData>;
+}
 export interface IcallbackHandleFrame {
     (clientOpCode: number, clientFragmentList: Buffer[]): void;
 }
-export interface IcallbackHandleResponse {
-    (clientId: string, message: ThandleMessage): void;
+export interface IcallbackReceiveData<T> {
+    (data: T, clientId: string): void;
 }
 export interface IcallbackReceiveDataUpload {
-    (clientId: string, messageList: Buffer[], filename: string): void;
+    (dataList: Buffer[], filename: string, clientId: string): void;
 }
 export interface Imessage {
     tag: string;
     data: string;
 }
-export type TsendMessage = string | Record<string, unknown> | Buffer;
-export type ThandleMessage = string | Buffer[];
+export interface ImessageDirect {
+    content: TsendData;
+    toClientId: string;
+}
+export type TreceiveData = string | Buffer[];
+export type TsendData = string | Record<string, unknown> | Buffer;

package/package.json

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