@hile/micro 1.0.2 → 1.0.3

package/dist/application.d.ts

@@ -12,7 +12,7 @@ export declare class Application extends Server {
     private readonly _registry_address;
     private readonly namespaces;
     constructor(props: ApplicationProps);
-    listen(port: number): Promise<() => Promise<void>>;
+    listen(port?: number): Promise<() => Promise<void>>;
     private reconnectToRegistry;
     private findFromRegistry;
     get(namespace: string): Promise<Client>;

package/dist/application.js

@@ -15,7 +15,7 @@ export class Application extends Server {
         super(namespace, loaderProps);
         this._registry_address = registry;
     }
-    async listen(port) {
+    async listen(port = 0) {
         const callback = await super.listen(port);
         await this.reconnectToRegistry();
         return async () => {

package/dist/server.d.ts

@@ -1,6 +1,8 @@
 import { MessageLoader, MessageLoaderProps } from "@hile/message-loader";
 import { Client } from './client.js';
+import { IncomingMessage } from 'http';
 import { EventEmitter } from 'node:events';
+import type { Duplex } from "node:stream";
 export declare class Server extends MessageLoader {
     private readonly namespace;
     private wss?;
@@ -9,8 +11,10 @@ export declare class Server extends MessageLoader {
     private readonly ipv4;
     readonly events: EventEmitter<any>;
     constructor(namespace: string, props?: MessageLoaderProps);
-    private onConnected;
-    private onRegister;
+    private upstream;
+    private createClient;
     protected connect(host: string, port: number, timeout?: number): Promise<Client>;
     listen(port?: number): Promise<() => Promise<void>>;
+    setPort(port: number): this;
+    handleUpgrade(req: IncomingMessage, socket: Duplex, head: Buffer): this;
 }

package/dist/server.js

@@ -22,7 +22,7 @@ export class Server extends MessageLoader {
             client.events.emit('disconnect', extras);
         });
     }
-    onConnected(ws, req) {
+    upstream(ws, req) {
         const path = req.url?.split('?')[0];
         if (!path)
             return ws.close();
@@ -34,9 +34,9 @@ export class Server extends MessageLoader {
         const [host, port, ...extras] = sp;
         if (!host || !port)
             return ws.close();
-        this.onRegister(ws, host, Number(port), extras);
+        this.createClient(ws, host, Number(port), extras);
     }
-    onRegister(ws, host, port, extras = []) {
+    createClient(ws, host, port, extras = []) {
         const key = `${host}:${port}`;
         const client = new Client({ server: this, ws, host, port });
         ws.on('close', () => {
@@ -55,6 +55,8 @@ export class Server extends MessageLoader {
         if (this.clients.has(key)) {
             return this.clients.get(key);
         }
+        if (!this.port)
+            throw new Error('You can not connect to a server without a local port, please use `.setPort(port)` for local port.');
         const ws = await new Promise((resolve, reject) => {
             const ws = new WebSocket(`ws://${host}:${port}/${this.ipv4}/${this.port}/${this.namespace}`);
             const timer = setTimeout(() => {
@@ -82,36 +84,39 @@ export class Server extends MessageLoader {
             ws.on('open', onopen);
             ws.on('error', onerror);
         });
-        return this.onRegister(ws, host, port);
+        return this.createClient(ws, host, port);
     }
-    async listen(port) {
-        this.wss = await new Promise((resolve, reject) => {
+    async listen(port = 0) {
+        if (port > 0) {
             const wss = new WebSocketServer({ port });
-            const clear = () => {
-                wss.off('error', onerror);
-                wss.off('listening', onlistening);
-            };
-            const onerror = (err) => {
-                clear();
-                reject(err);
-            };
-            const onlistening = () => {
-                clear();
-                resolve(wss);
-            };
-            wss.on('error', onerror);
-            wss.on('listening', onlistening);
-        });
-        const onConnection = (ws, req) => this.onConnected(ws, req);
-        this.wss.on('connection', onConnection);
-        this.port = port;
+            this.wss = await new Promise((resolve, reject) => {
+                const clear = () => {
+                    wss.off('error', onerror);
+                    wss.off('listening', onlistening);
+                };
+                const onerror = (err) => {
+                    clear();
+                    reject(err);
+                };
+                const onlistening = () => {
+                    clear();
+                    resolve(wss);
+                };
+                wss.on('error', onerror);
+                wss.on('listening', onlistening);
+            });
+            this.wss.on('connection', (ws, req) => this.upstream(ws, req));
+            this.setPort(port);
+        }
+        else {
+            this.wss = new WebSocketServer({ noServer: true });
+        }
         return async () => {
             for (const client of this.clients.values()) {
                 client.dispose();
             }
             this.clients.clear();
             if (this.wss) {
-                this.wss.off('connection', onConnection);
                 await new Promise((resolve, reject) => {
                     this.wss.close((err) => {
                         if (err)
@@ -124,4 +129,16 @@ export class Server extends MessageLoader {
             this.port = undefined;
         };
     }
+    setPort(port) {
+        this.port = port;
+        return this;
+    }
+    handleUpgrade(req, socket, head) {
+        if (!this.wss)
+            throw new Error('WebSocket server not initialized');
+        this.wss.handleUpgrade(req, socket, head, ws => {
+            this.upstream(ws, req);
+        });
+        return this;
+    }
 }

package/dist/utils.d.ts

@@ -1,4 +1,4 @@
 /**
- * 获取本机第一个非回环、非内部的 IPv4 地址；若无则返回 `undefined`。
+ * 本机用于「宣告」给其他节点的 IPv4（与 {@link internalIpV4Sync} 行为一致：多网卡无法唯一确定时可能为 `undefined`）。
  */
 export declare function getLocalIPv4(): string | undefined;

package/dist/utils.js

@@ -1,24 +1,7 @@
-import { networkInterfaces } from 'node:os';
-function isIPv4(family) {
-    return family === 'IPv4' || family === 4;
-}
+import { internalIpV4Sync } from 'internal-ip';
 /**
- * 获取本机第一个非回环、非内部的 IPv4 地址；若无则返回 `undefined`。
+ * 本机用于「宣告」给其他节点的 IPv4（与 {@link internalIpV4Sync} 行为一致：多网卡无法唯一确定时可能为 `undefined`）。
  */
 export function getLocalIPv4() {
-    const ifaces = networkInterfaces();
-    if (!ifaces) {
-        return undefined;
-    }
-    for (const addrs of Object.values(ifaces)) {
-        if (!addrs) {
-            continue;
-        }
-        for (const addr of addrs) {
-            if (isIPv4(addr.family) && !addr.internal) {
-                return addr.address;
-            }
-        }
-    }
-    return undefined;
+    return internalIpV4Sync();
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hile/micro",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "type": "module",
   "main": "./dist/index.js",
   "scripts": {
@@ -25,7 +25,8 @@
   "dependencies": {
     "@hile/message-loader": "^1.0.8",
     "@hile/message-ws": "^1.0.6",
+    "internal-ip": "^9.0.0",
     "ws": "^8.19.0"
   },
-  "gitHead": "4b006a4ea61b06b7746eeb66b9dad8b227cb6670"
+  "gitHead": "fc98c3e1ecf57f6cb4aded9caef28da0a35b7f30"
 }