@wxn0brp/gloves-link-server 0.0.6 → 0.0.7

package/dist/index.d.ts

@@ -1,23 +1,26 @@
 import { WebSocketServer } from "ws";
 import { Server_Opts } from "./types.js";
 import { GLSocket } from "./socket.js";
-import FalconFrame from "@wxn0brp/falcon-frame";
+import FalconFrame, { Router } from "@wxn0brp/falcon-frame";
 import { Room, Rooms } from "./room.js";
 import { Namespace } from "./namespace.js";
 export declare class GlovesLinkServer {
     wss: WebSocketServer;
     logs: boolean;
     opts: Server_Opts;
-    initStatusTemp: {
-        [key: string]: number;
-    };
+    initStatusTemp: Record<string, {
+        status: number;
+        msg?: string;
+    }>;
     rooms: Rooms;
-    private namespaces;
+    namespaces: Map<string, Namespace>;
     constructor(opts: Partial<Server_Opts>);
     private saveSocketStatus;
     of(path: string): Namespace;
     broadcastRoom(roomName: string, event: string, ...args: any[]): void;
     room(name: string): Room;
+    statusRouter(): Router;
+    clientRouter(clientDir?: string): Router;
     falconFrame(app: FalconFrame, clientDir?: string | false): void;
 }
 export { GLSocket, Namespace, Server_Opts };

package/dist/index.js

@@ -37,8 +37,8 @@ export class GlovesLinkServer {
                     return;
                 }
                 const authResult = await namespace.authFn({ headers, url, token, request, socket, head });
-                if (!authResult) {
-                    this.saveSocketStatus(socketSelfId, pathname, 401);
+                if (!authResult || authResult.status !== 200) {
+                    this.saveSocketStatus(socketSelfId, pathname, authResult?.status || 401, authResult?.msg || "Unauthorized");
                     socket.write("HTTP/1.1 401 Unauthorized\r\n\r\n");
                     socket.destroy();
                     return;
@@ -46,7 +46,7 @@ export class GlovesLinkServer {
                 this.wss.handleUpgrade(request, socket, head, (ws) => {
                     const glSocket = new GLSocket(ws, this);
                     glSocket.logs = this.logs;
-                    if (typeof authResult === "object" && authResult !== null)
+                    if (typeof authResult.user === "object" && authResult.user !== null)
                         glSocket.user = authResult;
                     glSocket.namespace = pathname;
                     namespace.room.join(glSocket);
@@ -68,11 +68,14 @@ export class GlovesLinkServer {
             }
         });
     }
-    saveSocketStatus(socketSelfId, namespace, status) {
+    saveSocketStatus(socketSelfId, namespace, status, msg) {
         if (!socketSelfId)
             return;
         const id = namespace + "-" + socketSelfId;
-        this.initStatusTemp[id] = status;
+        this.initStatusTemp[id] = {
+            status,
+            msg
+        };
         setTimeout(() => {
             delete this.initStatusTemp[id];
         }, 10_000);
@@ -94,9 +97,8 @@ export class GlovesLinkServer {
     room(name) {
         return this.rooms.get(name) || this.rooms.set(name, new Room()).get(name);
     }
-    falconFrame(app, clientDir) {
+    statusRouter() {
         const router = new Router();
-        app.use("/gloves-link", router);
         router.get("/status", (req, res) => {
             const id = req.query.id;
             if (!id) {
@@ -116,14 +118,24 @@ export class GlovesLinkServer {
             res.json({ status });
             delete this.initStatusTemp[id];
         });
-        if (clientDir === false)
-            return;
+        return router;
+    }
+    clientRouter(clientDir) {
+        const router = new Router();
         clientDir = clientDir || "node_modules/@wxn0brp/gloves-link-client/dist/";
         router.static("/", clientDir);
         router.get("/*", (req, res) => {
             res.redirect("/gloves-link/GlovesLinkClient.js");
             res.end();
         });
+        return router;
+    }
+    falconFrame(app, clientDir) {
+        const router = new Router();
+        app.use("/gloves-link", router);
+        router.use(this.statusRouter());
+        if (clientDir !== false)
+            router.use(this.clientRouter(clientDir));
     }
 }
 export { GLSocket, Namespace };

package/dist/namespace.js

@@ -2,7 +2,7 @@ export class Namespace {
     name;
     server;
     onConnectEvent = () => { };
-    authFn = () => false;
+    authFn = async () => ({ status: 200 });
     room;
     constructor(name, server) {
         this.name = name;

package/dist/room.d.ts

@@ -10,7 +10,9 @@ export declare class Room {
     onJoin(handler: (socket: GLSocket, room: Room) => void): this;
     onLeave(handler: (socket: GLSocket, room: Room) => void): this;
     get size(): number;
-    get sockets(): GLSocket[];
+    get sockets(): GLSocket<{
+        _id?: string;
+    }>[];
     emit(evtName: string, ...data: any): void;
     emitWithoutSelf(socket: GLSocket, evtName: string, ...data: any): void;
     has(socket: GLSocket): boolean;

package/dist/socket.d.ts

@@ -1,10 +1,12 @@
 import { WebSocket } from "ws";
 import { GlovesLinkServer } from "./index.js";
-export declare class GLSocket {
+export declare class GLSocket<T = {
+    _id?: string;
+}> {
     ws: WebSocket;
     server: GlovesLinkServer;
     id: string;
-    user: any;
+    user: T;
     namespace: string;
     ackIdCounter: number;
     ackCallbacks: Map<number, Function>;
@@ -22,4 +24,5 @@ export declare class GLSocket {
     joinRoom(roomName: string): void;
     leaveRoom(roomName: string): void;
     leaveAllRooms(): void;
+    getNamespace(): import("./namespace.js").Namespace;
 }

package/dist/socket.js

@@ -3,7 +3,7 @@ export class GLSocket {
     ws;
     server;
     id;
-    user = {};
+    user;
     namespace;
     ackIdCounter = 1;
     ackCallbacks = new Map();
@@ -14,6 +14,7 @@ export class GLSocket {
         this.ws = ws;
         this.server = server;
         this.id = id || Date.now().toString(36) + Math.random().toString(36).substring(2, 10);
+        this.user = { _id: this.id };
         this.handlers = {};
         this.ws.on("message", (raw) => this._handle(raw));
     }
@@ -92,4 +93,7 @@ export class GLSocket {
         }
         this.rooms.clear();
     }
+    getNamespace() {
+        return this.server.namespaces.get(this.namespace);
+    }
 }

package/dist/types.d.ts

@@ -21,4 +21,10 @@ export interface Server_Auth_Opts {
     socket: Stream.Duplex;
     head: Buffer<ArrayBufferLike>;
 }
-export type AuthFn = (data: Server_Auth_Opts) => (Promise<object | boolean> | object | boolean);
+export interface AuthFnResult {
+    status: number;
+    user?: Record<string, any>;
+    msg?: string;
+    toSet?: Record<string, any>;
+}
+export type AuthFn = (data: Server_Auth_Opts) => Promise<AuthFnResult>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wxn0brp/gloves-link-server",
-  "version": "0.0.6",
+  "version": "0.0.7",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "author": "wxn0brP",