topsyde-utils 1.0.32 → 1.0.34

package/dist/index.d.ts

@@ -10,8 +10,8 @@ export * from "./server/controller";
 export * from "./server/bun/router/routes";
 export * from "./server/bun/router/router";
 export * from "./server/bun/router/router.internal";
+export * from "./server/bun/websocket/Client";
 export * from "./server/bun/websocket/Websocket";
-export * from "./server/bun/websocket/WebsocketClient";
 export * from "./server/bun/websocket/websocket.types";
 export * from "./server/bun/websocket/Channel";
 export * from "./utils/Guards";
@@ -24,8 +24,8 @@ export { default as Throwable } from "./throwable";
 export { default as Controller } from "./server/controller";
 export { default as Router } from "./server/bun/router/router";
 export { default as Router_Internal } from "./server/bun/router/router.internal";
+export { default as Client } from "./server/bun/websocket/Client";
 export { default as Websocket } from "./server/bun/websocket/Websocket";
-export { default as WebsocketClient } from "./server/bun/websocket/WebsocketClient";
 export { default as Channel } from "./server/bun/websocket/Channel";
 export { default as Guards } from "./utils/Guards";
 export { default as Lib } from "./utils/Lib";
@@ -39,4 +39,4 @@ export { ClassConstructor, NonNullableType, ObjectKeys, KVObj, I_ApplicationResp
 export { E_IS, E_ENVIRONMENTS } from "./enums";
 export { ControllerResponse, ControllerAction, ControllerMap, ControllerOptions } from "./server/controller";
 export { Routes } from "./server/bun/router/routes";
-export { I_WebsocketClient, WebsocketClientData, WebsocketMessage, WebsocketStructuredMessage, WebsocketChannel } from "./server/bun/websocket/websocket.types";
+export { I_WebsocketEntity, I_WebsocketClient, WebsocketClientData, WebsocketMessage, WebsocketStructuredMessage, WebsocketChannel, } from "./server/bun/websocket/websocket.types";

package/dist/index.js

@@ -19,7 +19,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.E_ENVIRONMENTS = exports.E_IS = exports.LOG_ICONS = exports.LOG_COLORS = exports.DEFAULT_FALSE_RESPONSE = exports.RESPONSE_METHOD_OPTIONS = exports.RESPONSE_INIT = exports.WS_ERROR_CODE = exports.HTTP_ERROR_CODE = exports.ERROR_CODE = exports.Console = exports.Lib = exports.Guards = exports.Channel = exports.WebsocketClient = exports.Websocket = exports.Router_Internal = exports.Router = exports.Controller = exports.Throwable = exports.Application = exports.Initializable = exports.Singleton = void 0;
+exports.E_ENVIRONMENTS = exports.E_IS = exports.LOG_ICONS = exports.LOG_COLORS = exports.DEFAULT_FALSE_RESPONSE = exports.RESPONSE_METHOD_OPTIONS = exports.RESPONSE_INIT = exports.WS_ERROR_CODE = exports.HTTP_ERROR_CODE = exports.ERROR_CODE = exports.Console = exports.Lib = exports.Guards = exports.Channel = exports.Websocket = exports.Client = exports.Router_Internal = exports.Router = exports.Controller = exports.Throwable = exports.Application = exports.Initializable = exports.Singleton = void 0;
 // Export all modules
 __exportStar(require("./errors"), exports);
 __exportStar(require("./singleton"), exports);
@@ -33,8 +33,8 @@ __exportStar(require("./server/controller"), exports);
 __exportStar(require("./server/bun/router/routes"), exports);
 __exportStar(require("./server/bun/router/router"), exports);
 __exportStar(require("./server/bun/router/router.internal"), exports);
+__exportStar(require("./server/bun/websocket/Client"), exports);
 __exportStar(require("./server/bun/websocket/Websocket"), exports);
-__exportStar(require("./server/bun/websocket/WebsocketClient"), exports);
 __exportStar(require("./server/bun/websocket/websocket.types"), exports);
 __exportStar(require("./server/bun/websocket/Channel"), exports);
 __exportStar(require("./utils/Guards"), exports);
@@ -55,10 +55,10 @@ var router_1 = require("./server/bun/router/router");
 Object.defineProperty(exports, "Router", { enumerable: true, get: function () { return __importDefault(router_1).default; } });
 var router_internal_1 = require("./server/bun/router/router.internal");
 Object.defineProperty(exports, "Router_Internal", { enumerable: true, get: function () { return __importDefault(router_internal_1).default; } });
+var Client_1 = require("./server/bun/websocket/Client");
+Object.defineProperty(exports, "Client", { enumerable: true, get: function () { return __importDefault(Client_1).default; } });
 var Websocket_1 = require("./server/bun/websocket/Websocket");
 Object.defineProperty(exports, "Websocket", { enumerable: true, get: function () { return __importDefault(Websocket_1).default; } });
-var WebsocketClient_1 = require("./server/bun/websocket/WebsocketClient");
-Object.defineProperty(exports, "WebsocketClient", { enumerable: true, get: function () { return __importDefault(WebsocketClient_1).default; } });
 var Channel_1 = require("./server/bun/websocket/Channel");
 Object.defineProperty(exports, "Channel", { enumerable: true, get: function () { return __importDefault(Channel_1).default; } });
 var Guards_1 = require("./utils/Guards");

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAAA,6DAA6D;AAC7D,iCAAiC;;;;;;;;;;;;;;;;;;;;AAEjC,qBAAqB;AACrB,2CAAyB;AACzB,8CAA4B;AAC5B,kDAAgC;AAChC,gDAA8B;AAC9B,2CAAyB;AACzB,0CAAwB;AACxB,8CAA4B;AAC5B,0CAAwB;AACxB,sDAAoC;AACpC,6DAA2C;AAC3C,6DAA2C;AAC3C,sEAAoD;AACpD,mEAAiD;AACjD,yEAAuD;AACvD,yEAAuD;AACvD,iEAA+C;AAC/C,iDAA+B;AAC/B,8CAA4B;AAC5B,kDAAgC;AAEhC,yBAAyB;AACzB,yCAAmD;AAA1C,uHAAA,OAAO,OAAa;AAC7B,iDAA2D;AAAlD,+HAAA,OAAO,OAAiB;AACjC,6CAAuD;AAA9C,2HAAA,OAAO,OAAe;AAC/B,yCAAmD;AAA1C,uHAAA,OAAO,OAAa;AAC7B,kDAA4D;AAAnD,yHAAA,OAAO,OAAc;AAC9B,qDAA+D;AAAtD,iHAAA,OAAO,OAAU;AAC1B,uEAAiF;AAAxE,mIAAA,OAAO,OAAmB;AACnC,8DAAwE;AAA/D,uHAAA,OAAO,OAAa;AAC7B,0EAAoF;AAA3E,mIAAA,OAAO,OAAmB;AACnC,0DAAoE;AAA3D,mHAAA,OAAO,OAAW;AAC3B,yCAAmD;AAA1C,iHAAA,OAAO,OAAU;AAC1B,mCAA6C;AAApC,2GAAA,OAAO,OAAO;AACvB,2CAAqD;AAA5C,mHAAA,OAAO,OAAW;AAE3B,sDAAsD;AACtD,mCAAsE;AAA7D,oGAAA,UAAU,OAAA;AAAE,yGAAA,eAAe,OAAA;AAAE,uGAAA,aAAa,OAAA;AAGnD,6CAAuE;AAA9D,4GAAA,aAAa,OAAA;AAAE,sHAAA,uBAAuB,OAAA;AAC/C,mCAAyE;AAAhE,gHAAA,sBAAsB,OAAA;AAAE,oGAAA,UAAU,OAAA;AAAE,mGAAA,SAAS,OAAA;AAEtD,iCAA+C;AAAtC,6FAAA,IAAI,OAAA;AAAE,uGAAA,cAAc,OAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAAA,6DAA6D;AAC7D,iCAAiC;;;;;;;;;;;;;;;;;;;;AAEjC,qBAAqB;AACrB,2CAAyB;AACzB,8CAA4B;AAC5B,kDAAgC;AAChC,gDAA8B;AAC9B,2CAAyB;AACzB,0CAAwB;AACxB,8CAA4B;AAC5B,0CAAwB;AACxB,sDAAoC;AACpC,6DAA2C;AAC3C,6DAA2C;AAC3C,sEAAoD;AACpD,gEAA8C;AAC9C,mEAAiD;AACjD,yEAAuD;AACvD,iEAA+C;AAC/C,iDAA+B;AAC/B,8CAA4B;AAC5B,kDAAgC;AAEhC,yBAAyB;AACzB,yCAAmD;AAA1C,uHAAA,OAAO,OAAa;AAC7B,iDAA2D;AAAlD,+HAAA,OAAO,OAAiB;AACjC,6CAAuD;AAA9C,2HAAA,OAAO,OAAe;AAC/B,yCAAmD;AAA1C,uHAAA,OAAO,OAAa;AAC7B,kDAA4D;AAAnD,yHAAA,OAAO,OAAc;AAC9B,qDAA+D;AAAtD,iHAAA,OAAO,OAAU;AAC1B,uEAAiF;AAAxE,mIAAA,OAAO,OAAmB;AACnC,wDAAkE;AAAzD,iHAAA,OAAO,OAAU;AAC1B,8DAAwE;AAA/D,uHAAA,OAAO,OAAa;AAC7B,0DAAoE;AAA3D,mHAAA,OAAO,OAAW;AAC3B,yCAAmD;AAA1C,iHAAA,OAAO,OAAU;AAC1B,mCAA6C;AAApC,2GAAA,OAAO,OAAO;AACvB,2CAAqD;AAA5C,mHAAA,OAAO,OAAW;AAE3B,sDAAsD;AACtD,mCAAsE;AAA7D,oGAAA,UAAU,OAAA;AAAE,yGAAA,eAAe,OAAA;AAAE,uGAAA,aAAa,OAAA;AAGnD,6CAAuE;AAA9D,4GAAA,aAAa,OAAA;AAAE,sHAAA,uBAAuB,OAAA;AAC/C,mCAAyE;AAAhE,gHAAA,sBAAsB,OAAA;AAAE,oGAAA,UAAU,OAAA;AAAE,mGAAA,SAAS,OAAA;AAEtD,iCAA+C;AAAtC,6FAAA,IAAI,OAAA;AAAE,uGAAA,cAAc,OAAA"}

package/dist/server/bun/websocket/Channel.d.ts

@@ -1,5 +1,5 @@
-import type { WebsocketStructuredMessage, I_WebsocketClient } from "./websocket.types";
-import WebsocketClient from "./WebsocketClient";
+import type { WebsocketStructuredMessage, I_WebsocketClient, I_WebsocketEntity } from "./websocket.types";
+import Client from "./Client";
 export default class Channel {
     private createdAt?;
     private id;
@@ -7,13 +7,13 @@ export default class Channel {
     private limit;
     private members;
     private metadata;
-    constructor(id: string, name: string, limit?: number, members?: Map<string, WebsocketClient>, metadata?: Record<string, string>);
-    addMember(client: WebsocketClient): void;
-    removeMember(client: WebsocketClient): void;
+    constructor(id: string, name: string, limit?: number, members?: Map<string, Client>, metadata?: Record<string, string>);
+    addMember(entity: I_WebsocketEntity): void;
+    removeMember(entity: I_WebsocketEntity): void;
     broadcast(message: WebsocketStructuredMessage, exclude?: string[] | I_WebsocketClient[]): void;
     hasMember(client: I_WebsocketClient | string): void;
     getMember(client: I_WebsocketClient | string): void;
-    getMembers(): WebsocketClient[];
+    getMembers(): I_WebsocketClient[];
     getMetadata(): Record<string, string>;
     getCreatedAt(): Date | undefined;
     getId(): string;

package/dist/server/bun/websocket/Channel.js

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const Websocket_1 = __importDefault(require("./Websocket"));
+const Client_1 = __importDefault(require("./Client"));
 class Channel {
     constructor(id, name, limit, members, metadata) {
         this.createdAt = new Date();
@@ -13,25 +14,31 @@ class Channel {
         this.members = members ?? new Map();
         this.metadata = metadata ?? {};
     }
-    addMember(client) {
-        if (this.canAddMember()) {
-            this.members.set(client.getId(), client);
-            client.joinChannel(this);
-        }
+    addMember(entity) {
+        if (!this.canAddMember())
+            return;
+        const client = new Client_1.default(entity.id, entity.ws);
+        this.members.set(client.getId(), client);
+        client.joinChannel(this);
         this.broadcast({
             type: "channel.member.added",
-            data: {
+            content: {
                 channelId: this.id,
                 clientId: client.getId(),
             },
         });
     }
-    removeMember(client) {
-        this.members.delete(client.getId());
+    removeMember(entity) {
+        if (!this.members.has(entity.id))
+            return;
+        const client = this.members.get(entity.id);
+        if (!client)
+            return;
         client.leaveChannel(this);
+        this.members.delete(entity.id);
     }
     broadcast(message, exclude) {
-        Websocket_1.default.Server().publish(this.id, JSON.stringify(message));
+        Websocket_1.default.Broadcast(this.id, message);
     }
     hasMember(client) { }
     getMember(client) { }

package/dist/server/bun/websocket/Channel.js.map

@@ -1 +1 @@
-{"version":3,"file":"Channel.js","sourceRoot":"","sources":["../../../../src/server/bun/websocket/Channel.ts"],"names":[],"mappings":";;;;;AAAA,4DAAoC;AAIpC,MAAqB,OAAO;IAQ3B,YAAY,EAAU,EAAE,IAAY,EAAE,KAAc,EAAE,OAAsC,EAAE,QAAiC;QAPvH,cAAS,GAAU,IAAI,IAAI,EAAE,CAAC;QAQrC,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;QACb,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,KAAK,GAAG,KAAK,IAAI,CAAC,CAAC;QACxB,IAAI,CAAC,OAAO,GAAG,OAAO,IAAI,IAAI,GAAG,EAAE,CAAC;QACpC,IAAI,CAAC,QAAQ,GAAG,QAAQ,IAAI,EAAE,CAAC;IAChC,CAAC;IAEM,SAAS,CAAC,MAAuB;QACvC,IAAI,IAAI,CAAC,YAAY,EAAE,EAAE,CAAC;YACzB,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,MAAM,CAAC,CAAC;YACzC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QAC1B,CAAC;QAED,IAAI,CAAC,SAAS,CAAC;YACd,IAAI,EAAE,sBAAsB;YAC5B,IAAI,EAAE;gBACL,SAAS,EAAE,IAAI,CAAC,EAAE;gBAClB,QAAQ,EAAE,MAAM,CAAC,KAAK,EAAE;aACxB;SACD,CAAC,CAAC;IACJ,CAAC;IAEM,YAAY,CAAC,MAAuB;QAC1C,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC;QACpC,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;IAC3B,CAAC;IAEM,SAAS,CAAC,OAAmC,EAAE,OAAwC;QAC7F,mBAAS,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC;IAC9D,CAAC;IAEM,SAAS,CAAC,MAAkC,IAAG,CAAC;IAChD,SAAS,CAAC,MAAkC,IAAG,CAAC;IAChD,UAAU;QAChB,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IAC1C,CAAC;IACM,WAAW;QACjB,OAAO,IAAI,CAAC,QAAQ,CAAC;IACtB,CAAC;IAEM,YAAY;QAClB,OAAO,IAAI,CAAC,SAAS,CAAC;IACvB,CAAC;IAEM,KAAK;QACX,OAAO,IAAI,CAAC,EAAE,CAAC;IAChB,CAAC;IAEM,OAAO;QACb,OAAO,IAAI,CAAC,IAAI,CAAC;IAClB,CAAC;IAEM,QAAQ;QACd,OAAO,IAAI,CAAC,KAAK,CAAC;IACnB,CAAC;IAEM,OAAO;QACb,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC;IAC1B,CAAC;IACO,YAAY;QACnB,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;QAC5B,OAAO,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC;IAC1B,CAAC;CACD;AAxED,0BAwEC"}
+{"version":3,"file":"Channel.js","sourceRoot":"","sources":["../../../../src/server/bun/websocket/Channel.ts"],"names":[],"mappings":";;;;;AAAA,4DAAoC;AAEpC,sDAA8B;AAE9B,MAAqB,OAAO;IAQ3B,YAAY,EAAU,EAAE,IAAY,EAAE,KAAc,EAAE,OAA6B,EAAE,QAAiC;QAP9G,cAAS,GAAU,IAAI,IAAI,EAAE,CAAC;QAQrC,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;QACb,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,KAAK,GAAG,KAAK,IAAI,CAAC,CAAC;QACxB,IAAI,CAAC,OAAO,GAAG,OAAO,IAAI,IAAI,GAAG,EAAE,CAAC;QACpC,IAAI,CAAC,QAAQ,GAAG,QAAQ,IAAI,EAAE,CAAC;IAChC,CAAC;IAEM,SAAS,CAAC,MAAyB;QACzC,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE;YAAE,OAAO;QACjC,MAAM,MAAM,GAAG,IAAI,gBAAM,CAAC,MAAM,CAAC,EAAE,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC;QAChD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,MAAM,CAAC,CAAC;QACzC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QAEzB,IAAI,CAAC,SAAS,CAAC;YACd,IAAI,EAAE,sBAAsB;YAC5B,OAAO,EAAE;gBACR,SAAS,EAAE,IAAI,CAAC,EAAE;gBAClB,QAAQ,EAAE,MAAM,CAAC,KAAK,EAAE;aACxB;SACD,CAAC,CAAC;IACJ,CAAC;IAEM,YAAY,CAAC,MAAyB;QAC5C,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC;YAAE,OAAO;QACzC,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAC3C,IAAI,CAAC,MAAM;YAAE,OAAO;QACpB,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;QAC1B,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IAChC,CAAC;IAEM,SAAS,CAAC,OAAmC,EAAE,OAAwC;QAC7F,mBAAS,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;IACvC,CAAC;IAEM,SAAS,CAAC,MAAkC,IAAG,CAAC;IAEhD,SAAS,CAAC,MAAkC,IAAG,CAAC;IAEhD,UAAU;QAChB,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IAC1C,CAAC;IAEM,WAAW;QACjB,OAAO,IAAI,CAAC,QAAQ,CAAC;IACtB,CAAC;IAEM,YAAY;QAClB,OAAO,IAAI,CAAC,SAAS,CAAC;IACvB,CAAC;IAEM,KAAK;QACX,OAAO,IAAI,CAAC,EAAE,CAAC;IAChB,CAAC;IAEM,OAAO;QACb,OAAO,IAAI,CAAC,IAAI,CAAC;IAClB,CAAC;IAEM,QAAQ;QACd,OAAO,IAAI,CAAC,KAAK,CAAC;IACnB,CAAC;IAEM,OAAO;QACb,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC;IAC1B,CAAC;IACO,YAAY;QACnB,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;QAC5B,OAAO,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC;IAC1B,CAAC;CACD;AA9ED,0BA8EC"}

package/dist/server/bun/websocket/{WebsocketClient.d.ts → Client.d.ts}

@@ -1,7 +1,7 @@
 import { ServerWebSocket } from "bun";
 import Channel from "./Channel";
-import type { I_WebsocketClient, WebsocketClientData, WebsocketChannel } from "./websocket.types";
-export default class WebsocketClient implements I_WebsocketClient {
+import type { I_WebsocketClient, WebsocketClientData, WebsocketChannel, WebsocketStructuredMessage } from "./websocket.types";
+export default class Client implements I_WebsocketClient {
     id: string;
     ws: ServerWebSocket<WebsocketClientData>;
     private channels;
@@ -10,4 +10,7 @@ export default class WebsocketClient implements I_WebsocketClient {
     leaveChannel(channel: Channel): void;
     getChannels(): WebsocketChannel;
     getId(): string;
+    send(message: WebsocketStructuredMessage): void;
+    subscribe(channel: string): void;
+    unsubscribe(channel: string): void;
 }

package/dist/server/bun/websocket/Client.js

@@ -0,0 +1,36 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+class Client {
+    constructor(id, ws) {
+        this.channels = new Map();
+        this.id = id;
+        this.ws = ws;
+    }
+    joinChannel(channel) {
+        this.channels.set(channel.getId(), channel);
+        this.subscribe(channel.getId());
+        this.send({ type: "channel.join", content: { channelId: channel.getId() } });
+    }
+    leaveChannel(channel) {
+        this.channels.delete(channel.getId());
+        this.unsubscribe(channel.getId());
+        this.send({ type: "channel.leave", content: { channelId: channel.getId() } });
+    }
+    getChannels() {
+        return this.channels;
+    }
+    getId() {
+        return this.id;
+    }
+    send(message) {
+        this.ws.send(JSON.stringify(message));
+    }
+    subscribe(channel) {
+        this.ws.subscribe(channel);
+    }
+    unsubscribe(channel) {
+        this.ws.unsubscribe(channel);
+    }
+}
+exports.default = Client;
+//# sourceMappingURL=Client.js.map

package/dist/server/bun/websocket/Client.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Client.js","sourceRoot":"","sources":["../../../../src/server/bun/websocket/Client.ts"],"names":[],"mappings":";;AAIA,MAAqB,MAAM;IAK1B,YAAY,EAAU,EAAE,EAAwC;QAFxD,aAAQ,GAAqB,IAAI,GAAG,EAAE,CAAC;QAG9C,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;QACb,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;IACd,CAAC;IAEM,WAAW,CAAC,OAAgB;QAClC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,OAAO,CAAC,CAAC;QAC5C,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC;QAChC,IAAI,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,cAAc,EAAE,OAAO,EAAE,EAAE,SAAS,EAAE,OAAO,CAAC,KAAK,EAAE,EAAE,EAAE,CAAC,CAAC;IAC9E,CAAC;IAEM,YAAY,CAAC,OAAgB;QACnC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC;QACtC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC;QAClC,IAAI,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,eAAe,EAAE,OAAO,EAAE,EAAE,SAAS,EAAE,OAAO,CAAC,KAAK,EAAE,EAAE,EAAE,CAAC,CAAC;IAC/E,CAAC;IAEM,WAAW;QACjB,OAAO,IAAI,CAAC,QAAQ,CAAC;IACtB,CAAC;IAEM,KAAK;QACX,OAAO,IAAI,CAAC,EAAE,CAAC;IAChB,CAAC;IAEM,IAAI,CAAC,OAAmC;QAC9C,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC;IACvC,CAAC;IAEM,SAAS,CAAC,OAAe;QAC/B,IAAI,CAAC,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;IAC5B,CAAC;IAEM,WAAW,CAAC,OAAe;QACjC,IAAI,CAAC,EAAE,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;IAC9B,CAAC;CACD;AAzCD,yBAyCC"}

package/dist/server/bun/websocket/Websocket.d.ts

@@ -1,14 +1,18 @@
 import { Server, WebSocketHandler } from "bun";
 import Singleton from "../../../singleton";
-import type { WebsocketClientData } from "./websocket.types";
+import type { I_WebsocketEntity, WebsocketClientData, WebsocketStructuredMessage } from "./websocket.types";
 export default class Websocket extends Singleton {
     private channels;
     private server;
     private constructor();
     set(server: Server): void;
     static Server(): Server;
+    static Broadcast(channel: string, message: WebsocketStructuredMessage): void;
+    static Publish(message: WebsocketStructuredMessage): void;
+    static Join(channel: string, entity: I_WebsocketEntity): void;
+    static Leave(channel: string, entity: I_WebsocketEntity): void;
     setup(): WebSocketHandler<WebsocketClientData>;
-    private messageReceived;
+    private clientMessageReceived;
     private clientConnected;
     private clientDisconnected;
 }

package/dist/server/bun/websocket/Websocket.js

@@ -8,43 +8,65 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const Channel_1 = __importDefault(require("./Channel"));
-const WebsocketClient_1 = __importDefault(require("./WebsocketClient"));
 const singleton_1 = __importDefault(require("../../../singleton"));
+const Console_1 = require("../../../utils/Console");
+const Channel_1 = __importDefault(require("./Channel"));
 class Websocket extends singleton_1.default {
     constructor() {
         super();
         this.channels = new Map();
-        this.messageReceived = (ws, message) => {
+        this.clientMessageReceived = (ws, message) => {
             console.log("Received message:", message);
-            if (message === "ping")
-                ws.send("pong");
+            if (message === "ping") {
+                const pong = { type: "pong", content: "pong" };
+                ws.send(JSON.stringify(pong));
+            }
             else
                 ws.send(message);
+            Websocket.Publish({ type: "client.message.received", content: message });
         };
         this.clientConnected = (ws) => {
-            console.log("WebSocket connection opened");
             const global = this.channels.get("global");
-            const client = new WebsocketClient_1.default(ws.data.id, ws);
             if (global)
-                global.addMember(client);
+                global.addMember({ id: ws.data.id, ws });
         };
         this.clientDisconnected = (ws) => {
             console.log("WebSocket connection closed");
+            this.channels.forEach((channel) => {
+                channel.removeMember({ id: ws.data.id, ws });
+            });
         };
         const global = new Channel_1.default("global", "Global Channel", 1000);
         this.channels.set("global", global);
     }
     set(server) {
         this.server = server;
+        Console_1.Console.success("Websocket server set");
     }
     static Server() {
         return Websocket.GetInstance().server;
     }
+    static Broadcast(channel, message) {
+        this.Server().publish(channel, JSON.stringify(message));
+    }
+    static Publish(message) {
+        const ws = Websocket.GetInstance();
+        ws.channels.forEach((channel) => {
+            channel.broadcast(message);
+        });
+    }
+    static Join(channel, entity) {
+        const ws = Websocket.GetInstance();
+        ws.channels.get(channel)?.addMember(entity);
+    }
+    static Leave(channel, entity) {
+        const ws = Websocket.GetInstance();
+        ws.channels.get(channel)?.removeMember(entity);
+    }
     setup() {
         return {
-            message: this.messageReceived,
             open: this.clientConnected,
+            message: this.clientMessageReceived,
             close: this.clientDisconnected,
         };
     }

package/dist/server/bun/websocket/Websocket.js.map

@@ -1 +1 @@
-{"version":3,"file":"Websocket.js","sourceRoot":"","sources":["../../../../src/server/bun/websocket/Websocket.ts"],"names":[],"mappings":";AAAA;;;;0FAI0F;;;;;AAG1F,wDAAgC;AAChC,wEAAgD;AAChD,mEAA2C;AAI3C,MAAqB,SAAU,SAAQ,mBAAS;IAG/C;QACC,KAAK,EAAE,CAAC;QAHD,aAAQ,GAAqB,IAAI,GAAG,EAAE,CAAC;QAwBvC,oBAAe,GAAG,CAAC,EAAwC,EAAE,OAAyB,EAAE,EAAE;YACjG,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE,OAAO,CAAC,CAAC;YAC1C,IAAI,OAAO,KAAK,MAAM;gBAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;;gBACnC,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACvB,CAAC,CAAC;QAEM,oBAAe,GAAG,CAAC,EAAwC,EAAE,EAAE;YACtE,OAAO,CAAC,GAAG,CAAC,6BAA6B,CAAC,CAAC;YAC3C,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YAC3C,MAAM,MAAM,GAAG,IAAI,yBAAe,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;YACnD,IAAI,MAAM;gBAAE,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QACtC,CAAC,CAAC;QAEM,uBAAkB,GAAG,CAAC,EAAwC,EAAE,EAAE;YACzE,OAAO,CAAC,GAAG,CAAC,6BAA6B,CAAC,CAAC;QAC5C,CAAC,CAAC;QAnCD,MAAM,MAAM,GAAG,IAAI,iBAAO,CAAC,QAAQ,EAAE,gBAAgB,EAAE,IAAI,CAAC,CAAC;QAC7D,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IACrC,CAAC;IAEM,GAAG,CAAC,MAAc;QACxB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACtB,CAAC;IAEM,MAAM,CAAC,MAAM;QACnB,OAAO,SAAS,CAAC,WAAW,EAAE,CAAC,MAAM,CAAC;IACvC,CAAC;IAEM,KAAK;QACX,OAAO;YACN,OAAO,EAAE,IAAI,CAAC,eAAe;YAC7B,IAAI,EAAE,IAAI,CAAC,eAAe;YAC1B,KAAK,EAAE,IAAI,CAAC,kBAAkB;SAC9B,CAAC;IACH,CAAC;CAkBD;AAzCD,4BAyCC"}
+{"version":3,"file":"Websocket.js","sourceRoot":"","sources":["../../../../src/server/bun/websocket/Websocket.ts"],"names":[],"mappings":"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"}

package/dist/server/bun/websocket/index.d.ts

@@ -1,7 +1,7 @@
+export * from './Client';
 export * from './Websocket';
-export * from './WebsocketClient';
 export * from './websocket.types';
 export * from './Channel';
+export { default as Client } from './Client';
 export { default as Websocket } from './Websocket';
-export { default as WebsocketClient } from './WebsocketClient';
 export { default as Channel } from './Channel';

package/dist/server/bun/websocket/index.js

@@ -19,15 +19,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Channel = exports.WebsocketClient = exports.Websocket = void 0;
+exports.Channel = exports.Websocket = exports.Client = void 0;
+__exportStar(require("./Client"), exports);
 __exportStar(require("./Websocket"), exports);
-__exportStar(require("./WebsocketClient"), exports);
 __exportStar(require("./websocket.types"), exports);
 __exportStar(require("./Channel"), exports);
+var Client_1 = require("./Client");
+Object.defineProperty(exports, "Client", { enumerable: true, get: function () { return __importDefault(Client_1).default; } });
 var Websocket_1 = require("./Websocket");
 Object.defineProperty(exports, "Websocket", { enumerable: true, get: function () { return __importDefault(Websocket_1).default; } });
-var WebsocketClient_1 = require("./WebsocketClient");
-Object.defineProperty(exports, "WebsocketClient", { enumerable: true, get: function () { return __importDefault(WebsocketClient_1).default; } });
 var Channel_1 = require("./Channel");
 Object.defineProperty(exports, "Channel", { enumerable: true, get: function () { return __importDefault(Channel_1).default; } });
 //# sourceMappingURL=index.js.map

package/dist/server/bun/websocket/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/server/bun/websocket/index.ts"],"names":[],"mappings":";AAAA,6DAA6D;AAC7D,iCAAiC;;;;;;;;;;;;;;;;;;;;AAEjC,8CAA4B;AAC5B,oDAAkC;AAClC,oDAAkC;AAClC,4CAA0B;AAC1B,yCAAmD;AAA1C,uHAAA,OAAO,OAAa;AAC7B,qDAA+D;AAAtD,mIAAA,OAAO,OAAmB;AACnC,qCAA+C;AAAtC,mHAAA,OAAO,OAAW"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/server/bun/websocket/index.ts"],"names":[],"mappings":";AAAA,6DAA6D;AAC7D,iCAAiC;;;;;;;;;;;;;;;;;;;;AAEjC,2CAAyB;AACzB,8CAA4B;AAC5B,oDAAkC;AAClC,4CAA0B;AAC1B,mCAA6C;AAApC,iHAAA,OAAO,OAAU;AAC1B,yCAAmD;AAA1C,uHAAA,OAAO,OAAa;AAC7B,qCAA+C;AAAtC,mHAAA,OAAO,OAAW"}

package/dist/server/bun/websocket/websocket.types.d.ts

@@ -1,15 +1,22 @@
 import { ServerWebSocket } from "bun";
 import Channel from "./Channel";
-export interface I_WebsocketClient {
+export interface I_WebsocketEntity {
     ws: ServerWebSocket<WebsocketClientData>;
     id: string;
 }
+export interface I_WebsocketClient extends I_WebsocketEntity {
+    send(message: WebsocketStructuredMessage): void;
+    subscribe(channel: string): void;
+    unsubscribe(channel: string): void;
+}
 export type WebsocketClientData = {
     id: string;
 };
 export type WebsocketMessage = string | Buffer<ArrayBufferLike>;
 export type WebsocketStructuredMessage = {
     type: string;
-    data: any;
+    content: any;
+    channel?: string;
+    metadata?: Record<string, string>;
 };
 export type WebsocketChannel<T extends Channel = Channel> = Map<string, T>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "topsyde-utils",
-  "version": "1.0.32",
+  "version": "1.0.34",
   "description": "A bundle of TypeScript utility classes and functions",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/dist/server/bun/websocket/WebsocketClient.js

@@ -1,25 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-class WebsocketClient {
-    constructor(id, ws) {
-        this.channels = new Map();
-        this.id = id;
-        this.ws = ws;
-    }
-    joinChannel(channel) {
-        this.channels.set(channel.getId(), channel);
-        this.ws.subscribe(channel.getId());
-    }
-    leaveChannel(channel) {
-        this.channels.delete(channel.getId());
-        this.ws.unsubscribe(channel.getId());
-    }
-    getChannels() {
-        return this.channels;
-    }
-    getId() {
-        return this.id;
-    }
-}
-exports.default = WebsocketClient;
-//# sourceMappingURL=WebsocketClient.js.map

package/dist/server/bun/websocket/WebsocketClient.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"WebsocketClient.js","sourceRoot":"","sources":["../../../../src/server/bun/websocket/WebsocketClient.ts"],"names":[],"mappings":";;AAIA,MAAqB,eAAe;IAKnC,YAAY,EAAU,EAAE,EAAwC;QAFxD,aAAQ,GAAqB,IAAI,GAAG,EAAE,CAAC;QAG9C,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;QACb,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;IACd,CAAC;IAEM,WAAW,CAAC,OAAgB;QAClC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,OAAO,CAAC,CAAC;QAC5C,IAAI,CAAC,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC;IACpC,CAAC;IAEM,YAAY,CAAC,OAAgB;QACnC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC;QACtC,IAAI,CAAC,EAAE,CAAC,WAAW,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC;IACtC,CAAC;IAEM,WAAW;QACjB,OAAO,IAAI,CAAC,QAAQ,CAAC;IACtB,CAAC;IAEM,KAAK;QACX,OAAO,IAAI,CAAC,EAAE,CAAC;IAChB,CAAC;CACD;AA3BD,kCA2BC"}