@forinda/kickjs-ws 1.6.0 → 1.7.1-alpha.0

package/dist/index.js

@@ -2,10 +2,10 @@ import { randomUUID as k } from "node:crypto";
 import { WebSocketServer as u } from "ws";
 import { Service as p, createLogger as R, ref as h } from "@forinda/kickjs-core";
 import "reflect-metadata";
-var i = {
+var c = {
   WS_CONTROLLER: /* @__PURE__ */ Symbol("kick:ws:controller"),
   WS_HANDLERS: /* @__PURE__ */ Symbol("kick:ws:handlers")
-}, S = /* @__PURE__ */ new Set(), M = class {
+}, g = /* @__PURE__ */ new Set(), M = class {
   id;
   data;
   event;
@@ -87,7 +87,7 @@ var i = {
       event: t,
       data: s
     });
-    for (const [c, r] of o) c !== a && r.readyState === r.OPEN && r.send(n);
+    for (const [i, r] of o) i !== a && r.readyState === r.OPEN && r.send(n);
   }
 }, d = R("WsAdapter"), A = class {
   name = "WsAdapter";
@@ -123,47 +123,47 @@ var i = {
       rooms: this.roomManager.getAllRooms()
     };
   }
-  beforeStart(e, t) {
-    this.container = t;
-    for (const s of S) {
-      const a = Reflect.getMetadata(i.WS_CONTROLLER, s);
-      if (a === void 0) continue;
-      const o = Reflect.getMetadata(i.WS_HANDLERS, s) || [], n = this.basePath + (a === "/" ? "" : a);
-      this.namespaces.set(n, {
-        namespace: a,
-        controllerClass: s,
-        handlers: o,
+  beforeStart({ container: e }) {
+    this.container = e;
+    for (const t of g) {
+      const s = Reflect.getMetadata(c.WS_CONTROLLER, t);
+      if (s === void 0) continue;
+      const a = Reflect.getMetadata(c.WS_HANDLERS, t) || [], o = this.basePath + (s === "/" ? "" : s);
+      this.namespaces.set(o, {
+        namespace: s,
+        controllerClass: t,
+        handlers: a,
         sockets: /* @__PURE__ */ new Map(),
         contexts: /* @__PURE__ */ new Map()
-      }), d.info(`Registered WS namespace: ${n} (${s.name})`);
+      }), d.info(`Registered WS namespace: ${o} (${t.name})`);
     }
   }
-  afterStart(e, t) {
+  afterStart({ server: e }) {
     this.wss = new u({
       noServer: !0,
       maxPayload: this.maxPayload
-    }), e.on("upgrade", (a, o, n) => {
-      const c = (a.url || "/").split("?")[0], r = this.namespaces.get(c);
-      if (!r) {
-        o.write(`HTTP/1.1 404 Not Found\r
+    }), e.on("upgrade", (s, a, o) => {
+      const n = (s.url || "/").split("?")[0], i = this.namespaces.get(n);
+      if (!i) {
+        a.write(`HTTP/1.1 404 Not Found\r
 \r
-`), o.destroy();
+`), a.destroy();
         return;
       }
-      this.wss.handleUpgrade(a, o, n, (m) => {
-        this.handleConnection(m, r);
+      this.wss.handleUpgrade(s, a, o, (r) => {
+        this.handleConnection(r, i);
       });
     }), this.heartbeatInterval > 0 && (this.heartbeatTimer = setInterval(() => {
-      for (const [, a] of this.namespaces) for (const [, o] of a.sockets) {
-        if (o.__alive === !1) {
-          o.terminate();
+      for (const [, s] of this.namespaces) for (const [, a] of s.sockets) {
+        if (a.__alive === !1) {
+          a.terminate();
           continue;
         }
-        o.__alive = !1, o.ping();
+        a.__alive = !1, a.ping();
       }
     }, this.heartbeatInterval));
-    const s = Array.from(this.namespaces.values()).reduce((a, o) => a + o.handlers.length, 0);
-    d.info(`WebSocket ready — ${this.namespaces.size} namespace(s), ${s} handler(s)`);
+    const t = Array.from(this.namespaces.values()).reduce((s, a) => s + a.handlers.length, 0);
+    d.info(`WebSocket ready — ${this.namespaces.size} namespace(s), ${t} handler(s)`);
   }
   shutdown() {
     this.heartbeatTimer && clearInterval(this.heartbeatTimer);
@@ -184,16 +184,16 @@ var i = {
     }), this.invokeHandlers(o, t.handlers, "connect", a), e.on("message", (n) => {
       this.messagesReceived.value++;
       try {
-        const c = JSON.parse(n.toString()), r = c.event, m = c.data;
+        const i = JSON.parse(n.toString()), r = i.event, S = i.data;
         if (!r || typeof r != "string") {
           a.send("error", { message: 'Invalid message format: missing "event" field' });
           return;
         }
-        a.event = r, a.data = m;
-        const v = t.handlers.find((l) => l.type === "message" && l.event === r);
-        if (v) this.safeInvoke(o, v.handlerName, a);
+        a.event = r, a.data = S;
+        const f = t.handlers.find((l) => l.type === "message" && l.event === r);
+        if (f) this.safeInvoke(o, f.handlerName, a);
         else {
-          const l = t.handlers.find((g) => g.type === "message" && g.event === "*");
+          const l = t.handlers.find((v) => v.type === "message" && v.event === "*");
           l && this.safeInvoke(o, l.handlerName, a);
         }
       } catch {
@@ -224,37 +224,37 @@ var i = {
 };
 function O(e) {
   return (t) => {
-    p()(t), Reflect.defineMetadata(i.WS_CONTROLLER, e || "/", t), S.add(t);
+    p()(t), Reflect.defineMetadata(c.WS_CONTROLLER, e || "/", t), g.add(t);
   };
 }
-function f(e, t) {
+function m(e, t) {
   return () => (s, a) => {
-    const o = Reflect.getMetadata(i.WS_HANDLERS, s.constructor) || [];
+    const o = Reflect.getMetadata(c.WS_HANDLERS, s.constructor) || [];
     o.push({
       type: e,
       event: t,
       handlerName: a
-    }), Reflect.defineMetadata(i.WS_HANDLERS, o, s.constructor);
+    }), Reflect.defineMetadata(c.WS_HANDLERS, o, s.constructor);
   };
 }
-var _ = f("connect"), y = f("disconnect"), E = f("error");
+var y = m("connect"), E = m("disconnect"), _ = m("error");
 function P(e) {
   return (t, s) => {
-    const a = Reflect.getMetadata(i.WS_HANDLERS, t.constructor) || [];
+    const a = Reflect.getMetadata(c.WS_HANDLERS, t.constructor) || [];
     a.push({
       type: "message",
       event: e,
       handlerName: s
-    }), Reflect.defineMetadata(i.WS_HANDLERS, a, t.constructor);
+    }), Reflect.defineMetadata(c.WS_HANDLERS, a, t.constructor);
   };
 }
 export {
-  _ as OnConnect,
-  y as OnDisconnect,
-  E as OnError,
+  y as OnConnect,
+  E as OnDisconnect,
+  _ as OnError,
   P as OnMessage,
   N as RoomManager,
-  i as WS_METADATA,
+  c as WS_METADATA,
   A as WsAdapter,
   M as WsContext,
   O as WsController

package/dist/ws-adapter.d.ts

@@ -1,4 +1,4 @@
-import { type AppAdapter, type Container, type Ref } from '@forinda/kickjs-core';
+import { type AppAdapter, type AdapterContext, type Ref } from '@forinda/kickjs-core';
 import { type WsAdapterOptions } from './interfaces';
 /**
  * WebSocket adapter for KickJS. Attaches to the HTTP server and routes
@@ -53,8 +53,8 @@ export declare class WsAdapter implements AppAdapter {
         }>;
         rooms: Record<string, number>;
     };
-    beforeStart(_app: any, container: Container): void;
-    afterStart(server: any, _container: Container): void;
+    beforeStart({ container }: AdapterContext): void;
+    afterStart({ server }: AdapterContext): void;
     shutdown(): void;
     private handleConnection;
     private invokeHandlers;

package/dist/ws-adapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ws-adapter.d.ts","sourceRoot":"","sources":["../src/ws-adapter.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,UAAU,EAAE,KAAK,SAAS,EAAqB,KAAK,GAAG,EAAE,MAAM,sBAAsB,CAAA;AACnG,OAAO,EAGL,KAAK,gBAAgB,EAEtB,MAAM,cAAc,CAAA;AAcrB;;;;;;;;;;;;;;;;;;GAkBG;AACH,qBAAa,SAAU,YAAW,UAAU;IAC1C,QAAQ,CAAC,IAAI,eAAc;IAE3B,OAAO,CAAC,QAAQ,CAAQ;IACxB,OAAO,CAAC,iBAAiB,CAAQ;IACjC,OAAO,CAAC,UAAU,CAAoB;IACtC,OAAO,CAAC,GAAG,CAA+B;IAC1C,OAAO,CAAC,SAAS,CAAyB;IAC1C,OAAO,CAAC,UAAU,CAAoC;IACtD,OAAO,CAAC,WAAW,CAAoB;IACvC,OAAO,CAAC,cAAc,CAA8C;IAGpE,8CAA8C;IAC9C,QAAQ,CAAC,gBAAgB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;IACtC,mCAAmC;IACnC,QAAQ,CAAC,iBAAiB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;IACvC,8BAA8B;IAC9B,QAAQ,CAAC,gBAAgB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;IACtC,0BAA0B;IAC1B,QAAQ,CAAC,YAAY,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;IAClC,mBAAmB;IACnB,QAAQ,CAAC,QAAQ,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;gBAElB,OAAO,GAAE,gBAAqB;IAY1C,qDAAqD;IACrD,QAAQ;;;;;;;yBAC8C,MAAM;sBAAY,MAAM;;;;IAkB9E,WAAW,CAAC,IAAI,EAAE,GAAG,EAAE,SAAS,EAAE,SAAS,GAAG,IAAI;IA4BlD,UAAU,CAAC,MAAM,EAAE,GAAG,EAAE,UAAU,EAAE,SAAS,GAAG,IAAI;IA+CpD,QAAQ,IAAI,IAAI;IAmBhB,OAAO,CAAC,gBAAgB;IAgFxB,OAAO,CAAC,cAAc;IAatB,OAAO,CAAC,UAAU;CAYnB"}
+{"version":3,"file":"ws-adapter.d.ts","sourceRoot":"","sources":["../src/ws-adapter.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,KAAK,UAAU,EACf,KAAK,cAAc,EAInB,KAAK,GAAG,EACT,MAAM,sBAAsB,CAAA;AAC7B,OAAO,EAGL,KAAK,gBAAgB,EAEtB,MAAM,cAAc,CAAA;AAcrB;;;;;;;;;;;;;;;;;;GAkBG;AACH,qBAAa,SAAU,YAAW,UAAU;IAC1C,QAAQ,CAAC,IAAI,eAAc;IAE3B,OAAO,CAAC,QAAQ,CAAQ;IACxB,OAAO,CAAC,iBAAiB,CAAQ;IACjC,OAAO,CAAC,UAAU,CAAoB;IACtC,OAAO,CAAC,GAAG,CAA+B;IAC1C,OAAO,CAAC,SAAS,CAAyB;IAC1C,OAAO,CAAC,UAAU,CAAoC;IACtD,OAAO,CAAC,WAAW,CAAoB;IACvC,OAAO,CAAC,cAAc,CAA8C;IAGpE,8CAA8C;IAC9C,QAAQ,CAAC,gBAAgB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;IACtC,mCAAmC;IACnC,QAAQ,CAAC,iBAAiB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;IACvC,8BAA8B;IAC9B,QAAQ,CAAC,gBAAgB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;IACtC,0BAA0B;IAC1B,QAAQ,CAAC,YAAY,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;IAClC,mBAAmB;IACnB,QAAQ,CAAC,QAAQ,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;gBAElB,OAAO,GAAE,gBAAqB;IAY1C,qDAAqD;IACrD,QAAQ;;;;;;;yBAC8C,MAAM;sBAAY,MAAM;;;;IAkB9E,WAAW,CAAC,EAAE,SAAS,EAAE,EAAE,cAAc,GAAG,IAAI;IA4BhD,UAAU,CAAC,EAAE,MAAM,EAAE,EAAE,cAAc,GAAG,IAAI;IA+C5C,QAAQ,IAAI,IAAI;IAmBhB,OAAO,CAAC,gBAAgB;IAgFxB,OAAO,CAAC,cAAc;IAatB,OAAO,CAAC,UAAU;CAYnB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forinda/kickjs-ws",
-  "version": "1.6.0",
+  "version": "1.7.1-alpha.0",
   "description": "WebSocket support with decorators, namespaces, rooms, and DI integration for KickJS",
   "keywords": [
     "kickjs",
@@ -52,7 +52,7 @@
   "dependencies": {
     "reflect-metadata": "^0.2.2",
     "ws": "^8.20.0",
-    "@forinda/kickjs-core": "1.6.0"
+    "@forinda/kickjs-core": "1.7.1-alpha.0"
   },
   "devDependencies": {
     "@swc/core": "^1.7.28",