@spider-mesh/core 1.0.21 → 1.0.22

package/build/src/RxjsTcpSocket.js

@@ -0,0 +1,83 @@
+import { createConnection } from "net";
+import { BehaviorSubject, Subject, filter, firstValueFrom, fromEvent, mergeMap, takeUntil } from "rxjs";
+import { sleep } from "./helpers/sleep";
+class RxjsTcpSocket {
+    opened_by_remote_side;
+    static #separator = String.fromCharCode(0x1E);
+    #$outgoing_data = new Subject();
+    $incoming_data = new Subject();
+    $status = new BehaviorSubject('connecting');
+    rawSocket;
+    constructor(opened_by_remote_side) {
+        this.opened_by_remote_side = opened_by_remote_side;
+    }
+    static connect(options) {
+        const $this = new this(false);
+        return new Promise(async (s) => {
+            for (let i = 0; i <= 5; i++) {
+                const socket = createConnection(options);
+                const connect_status = await new Promise(s => {
+                    socket.once('connect', () => s(true));
+                    socket.once('error', () => s(false));
+                    socket.once('timeout', () => s(false));
+                });
+                if (!connect_status)
+                    continue;
+                await $this.#join(socket);
+                s($this);
+                i = 0;
+                const status = await firstValueFrom($this.$status.pipe(filter(s => s == 'error' || s == 'closed')));
+                socket.removeAllListeners();
+                if (status == 'closed')
+                    return;
+                process.env.SPIDERMESH_DEBUG && console.log(`[${new Date().toLocaleTimeString()}] Socket error, retrying in 1 sec`);
+                await sleep(5000);
+            }
+            s(null);
+            $this.$status.next('error');
+        });
+    }
+    static async join(socket) {
+        const $this = new this(true);
+        await $this.#join(socket);
+        return $this;
+    }
+    async #join(socket) {
+        socket.once('error', () => this.$status.next('error'));
+        socket.once('close', () => this.$status.next('closed'));
+        socket.on('drain', () => this.$status.next('ready'));
+        socket.on('ready', () => this.$status.next('ready'));
+        socket.once('timeout', () => this.$status.next('error'));
+        socket.once('end', () => this.$status.next('closed'));
+        this.rawSocket = socket;
+        this.#$outgoing_data.pipe(takeUntil(this.$status.pipe(filter(s => s == 'error' || s == 'closed'))), mergeMap(async (buffer) => {
+            const wrote = socket.write(buffer);
+            !wrote && await firstValueFrom(fromEvent(socket, 'drain'));
+        }, 1)).subscribe();
+        let buffer = '';
+        socket.on('data', msg => {
+            buffer += msg.toString('utf8');
+            if (buffer.includes(RxjsTcpSocket.#separator)) {
+                const parts = buffer.split(RxjsTcpSocket.#separator);
+                for (const part of parts) {
+                    if (part != '') {
+                        try {
+                            const json = JSON.parse(part);
+                            this.$incoming_data.next(json);
+                        }
+                        catch (e) {
+                        }
+                    }
+                }
+                buffer = parts.pop() || '';
+            }
+        });
+    }
+    async write(data) {
+        const msg = JSON.stringify(data) + RxjsTcpSocket.#separator;
+        const buffer = Buffer.from(msg);
+        this.#$outgoing_data.next(buffer);
+    }
+}
+export { RxjsTcpSocket };
+//# sourceMappingURL=RxjsTcpSocket.js.map

package/build/src/RxjsTcpSocket.js.map

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

package/build/src/RxjsUdpBroadcaster.d.ts

@@ -0,0 +1,20 @@
+import { Observable } from "rxjs";
+export type RxjsUdpBroadcasterConfig = {
+    node_id: string;
+    namespace: string;
+    UDP_PORT?: number;
+    SEEDING_IP_RANGES?: string;
+    SEEDING_IPS?: string;
+};
+export declare class RxjsUdpBroadcaster {
+    static start({ UDP_PORT, namespace, node_id, SEEDING_IPS, SEEDING_IP_RANGES }: RxjsUdpBroadcasterConfig): Promise<{
+        broadcast: (port: number) => Promise<void>;
+        $new_node_discovered: Observable<{
+            port: number;
+            node_id: string;
+            namespace: string;
+        } & {
+            host: string;
+        }>;
+    }>;
+}

package/build/src/RxjsUdpBroadcaster.js

@@ -0,0 +1,60 @@
+import { createSocket } from "dgram";
+import { Observable } from "rxjs";
+export class RxjsUdpBroadcaster {
+    static async start({ UDP_PORT = 10000, namespace, node_id, SEEDING_IPS, SEEDING_IP_RANGES }) {
+        const udp = createSocket({
+            type: 'udp4',
+            reuseAddr: true
+        });
+        udp.bind({
+            address: '0.0.0.0',
+            port: UDP_PORT,
+        }, () => udp.setBroadcast(true));
+        const $new_node_discovered = new Observable(o => {
+            udp.on('message', async (raw, rinfo) => {
+                try {
+                    const info = JSON.parse(raw.toString('utf-8'));
+                    if (info.namespace == namespace && info.node_id != node_id) {
+                        o.next({ ...info, host: rinfo.address });
+                    }
+                }
+                catch (e) {
+                }
+            });
+        });
+        const broadcast_ips = ['255.255.255.255'];
+        // Add multicast IP or scan all subnets
+        if (SEEDING_IP_RANGES) {
+            const list = SEEDING_IP_RANGES.split(',').map(ip => ip.trim());
+            for (const range of list) {
+                for (let i = 1; i <= 255; i++) {
+                    const host = `${range}.${i}`;
+                    broadcast_ips.push(host);
+                }
+            }
+        }
+        // Add seeding ip
+        if (SEEDING_IPS) {
+            const list = SEEDING_IPS.split(',').map(ip => ip.trim());
+            for (const host of list) {
+                broadcast_ips.push(host);
+            }
+        }
+        const broadcast = async (port) => {
+            const msg = {
+                namespace,
+                node_id,
+                port
+            };
+            const json = JSON.stringify(msg);
+            for (const host of broadcast_ips) {
+                await udp.send(Buffer.from(json), UDP_PORT, host);
+            }
+        };
+        return {
+            broadcast,
+            $new_node_discovered
+        };
+    }
+}
+//# sourceMappingURL=RxjsUdpBroadcaster.js.map

package/build/src/RxjsUdpBroadcaster.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"RxjsUdpBroadcaster.js","sourceRoot":"","sources":["../../src/RxjsUdpBroadcaster.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,OAAO,CAAA;AACpC,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAA;AAUjC,MAAM,OAAO,kBAAkB;IAI3B,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,QAAQ,GAAG,KAAK,EAAE,SAAS,EAAE,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAA4B;QAOjH,MAAM,GAAG,GAAG,YAAY,CAAC;YACrB,IAAI,EAAE,MAAM;YACZ,SAAS,EAAE,IAAI;SAClB,CAAC,CAAA;QAEF,GAAG,CAAC,IAAI,CAAC;YACL,OAAO,EAAE,SAAS;YAClB,IAAI,EAAE,QAAQ;SACjB,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAA;QAEhC,MAAM,oBAAoB,GAAG,IAAI,UAAU,CAAsC,CAAC,CAAC,EAAE;YACjF,GAAG,CAAC,EAAE,CAAC,SAAS,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE;gBACnC,IAAI;oBACA,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAqB,CAAA;oBAClE,IAAI,IAAI,CAAC,SAAS,IAAI,SAAS,IAAI,IAAI,CAAC,OAAO,IAAI,OAAO,EAAE;wBACxD,CAAC,CAAC,IAAI,CAAC,EAAE,GAAG,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC,CAAA;qBAC3C;iBAEJ;gBAAC,OAAO,CAAC,EAAE;iBACX;YACL,CAAC,CAAC,CAAA;QACN,CAAC,CAAC,CAAA;QAEF,MAAM,aAAa,GAAG,CAAC,iBAAiB,CAAC,CAAA;QAEzC,uCAAuC;QACvC,IAAI,iBAAiB,EAAE;YACnB,MAAM,IAAI,GAAG,iBAAiB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,CAAA;YAC9D,KAAK,MAAM,KAAK,IAAI,IAAI,EAAE;gBACtB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,GAAG,EAAE,CAAC,EAAE,EAAE;oBAC3B,MAAM,IAAI,GAAG,GAAG,KAAK,IAAI,CAAC,EAAE,CAAA;oBAC5B,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;iBAC3B;aACJ;SACJ;QAED,iBAAiB;QACjB,IAAI,WAAW,EAAE;YACb,MAAM,IAAI,GAAG,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,CAAA;YACxD,KAAK,MAAM,IAAI,IAAI,IAAI,EAAE;gBACrB,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;aAC3B;SACJ;QAED,MAAM,SAAS,GAAG,KAAK,EAAE,IAAY,EAAE,EAAE;YACrC,MAAM,GAAG,GAAqB;gBAC1B,SAAS;gBACT,OAAO;gBACP,IAAI;aACP,CAAA;YACD,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAA;YAChC,KAAK,MAAM,IAAI,IAAI,aAAa,EAAE;gBAC9B,MAAM,GAAG,CAAC,IAAI,CACV,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EACjB,QAAQ,EACR,IAAI,CACP,CAAA;aACJ;QACL,CAAC,CAAA;QAED,OAAO;YACH,SAAS;YACT,oBAAoB;SACvB,CAAA;IACL,CAAC;CACJ"}

package/build/src/SpiderMesh.d.ts

@@ -1,26 +1,41 @@
 import { SpiderMeshNode, SpiderMeshNodeMetadata } from './SpiderMeshNode';
-import { SpiderMeshTransporter, SpiderMeshTransporterFactory } from './SpiderMeshTransporter';
+import { SpiderMeshTransporter, SpiderMeshTransporterEvent } from './SpiderMeshTransporter';
 import { RPCOptions } from './RPCOptions';
 import { RemoteService } from './RemoteService';
-export type ServiceNodeMonitor = (online: boolean, node: SpiderMeshNode) => any;
+import { Observable, Subject } from 'rxjs';
+export type RpcPayload = {
+    id: string;
+    type: string;
+    args: any[];
+    service: string;
+    method: string;
+    response: any;
+    error: any;
+    index: number;
+    event: string;
+    data: any;
+    nervermind: boolean;
+};
+export declare class SpiderMeshConfig {
+    namespace?: string;
+    node_id?: string;
+    transporter: SpiderMeshTransporter;
+}
 export declare class SpiderMesh {
     #private;
-    readonly node_id: `${string}-${string}-${string}-${string}-${string}`;
-    readonly namespace: any;
-    static readonly spider_mesh_instances: SpiderMesh[];
-    private constructor();
-    static init(...transporters: SpiderMeshTransporterFactory[]): Promise<SpiderMesh>;
-    $metadata(): Promise<SpiderMeshNodeMetadata>;
-    add_transporter(factory: {
-        new (...args: any[]): SpiderMeshTransporter;
-    }): Promise<void>;
+    private transporter;
+    $nodes_monitor: Subject<{
+        online: boolean;
+        node: SpiderMeshNode;
+    }>;
+    constructor(transporter: SpiderMeshTransporter);
+    $metadata(revalidate_on_join?: boolean): Promise<SpiderMeshNodeMetadata>;
+    $update_isolate_mode(active: boolean): Promise<SpiderMeshNodeMetadata>;
+    start(): Promise<void>;
     rpc(service: string, method: string, args: any, options: RPCOptions): Promise<any>;
     link_remote_service<T>(factory: {
         new (...args: any[]): T;
     }): RemoteService<T>;
-    active_local_service(instance: any): Promise<void>;
-    publish<T = any>(topic: string, data: T): Promise<void>;
-    subscribe<T = any>(topic: string, cb: (from_node_id: string, data: T) => any): Promise<{
-        unsubscribe: () => void;
-    }>;
+    publish<T = any>(event: string, data: T): Promise<void>;
+    listen<T = any>(topic: string): Observable<SpiderMeshTransporterEvent<T>>;
 }