@spider-mesh/core 1.0.116 → 1.0.117

package/build/src/Encoder.d.ts

@@ -1,5 +1,17 @@
 /// <reference types="node" resolution-mode="require"/>
+import { Observable } from "rxjs";
+export type PureData = string | number | boolean | null | Buffer | PureData[] | {
+    [key: string]: PureData;
+};
+export type EncoablePrimitiveType = Function | PureData | Observable<any> | Buffer;
+export type Encodeable = PureData | Array<EncoablePrimitiveType | Encodeable> | {
+    [key: string]: EncoablePrimitiveType | Encodeable;
+} | Observable<PureData>;
 export declare const Encoder: {
-    encode: <T = any>(data: T) => Buffer;
-    decode: <T_1 = any>(data: Buffer | string) => T_1;
+    encode: <T extends Encodeable>(content: T) => {
+        buffer: Buffer;
+        functions: Map<string, Function>;
+        observables: Map<string, Observable<PureData>>;
+    };
+    decode: <T_1>(raw: Buffer, function_handler?: (index: string) => Function, oservable_handler?: (id: string) => Observable<any>) => T_1 | null;
 };

package/build/src/Encoder.js

@@ -1,42 +1,94 @@
-function replacer(key, value) {
-    const originalObject = this[key];
-    if (originalObject instanceof Map)
-        return {
-            __dataType: 'Map',
-            value: Array.from(originalObject.entries()),
-        };
-    if (originalObject instanceof Set)
-        return {
-            __dataType: 'Set',
-            value: Array.from(originalObject.values()),
-        };
-    if (typeof originalObject == 'function')
-        return {
-            __dataType: 'Function'
-        };
-    return value;
-}
-function receiver(key, value) {
-    if (typeof value === 'object' && value !== null) {
-        if (value.__dataType === 'Map') {
-            return new Map(value.value);
-        }
-        if (value.__dataType === 'Set') {
-            return new Set(value.value);
-        }
-        if (value.__dataType == 'Function')
-            return () => { };
-    }
-    return value;
-}
+import { randomUUID } from "crypto";
+import { Observable } from "rxjs";
 export const Encoder = {
-    encode: (data) => Buffer.from(JSON.stringify(data, replacer)),
-    decode: (data) => {
-        try {
-            return JSON.parse(typeof data == 'string' ? data : data.toString('utf8'), receiver);
+    encode: (content) => {
+        const buffers = [];
+        const functions = new Map();
+        const observables = new Map();
+        function replacer(key, value) {
+            const originalObject = this[key];
+            if (originalObject instanceof Map)
+                return {
+                    __$$__dataType: 'Map',
+                    __$$__value: Array.from(originalObject.entries()),
+                };
+            if (originalObject instanceof Set)
+                return {
+                    __$$__dataType: 'Set',
+                    __$$__value: Array.from(originalObject.values()),
+                };
+            if (originalObject instanceof Observable) {
+                const id = randomUUID();
+                observables.set(id, originalObject);
+                return {
+                    __$$__dataType: 'Observable',
+                    id
+                };
+            }
+            if (typeof originalObject == 'function') {
+                const id = randomUUID();
+                functions.set(id, originalObject);
+                return {
+                    __$$__dataType: 'Function',
+                    id
+                };
+            }
+            if (originalObject instanceof Buffer) {
+                buffers.push(originalObject);
+                return {
+                    __$$__dataType: 'Buffer',
+                    __index: buffers.length - 1
+                };
+            }
+            return value;
+        }
+        const metadata = JSON.stringify(content, replacer);
+        const buffers_count = Buffer.alloc(4);
+        buffers_count.writeUInt32LE(buffers.length, 0);
+        const buffers_list = buffers.map(b => {
+            const length = Buffer.alloc(4);
+            length.writeUInt32LE(b.length);
+            return [length, b];
+        }).flat(2);
+        const data = Buffer.from(metadata, 'utf-8');
+        const buffer = Buffer.concat([buffers_count, ...buffers_list, data]);
+        return { buffer, functions, observables };
+    },
+    decode: (raw, function_handler = (() => () => { }), oservable_handler = () => new Observable()) => {
+        const buffers = [];
+        const length = raw.readUInt32LE(0);
+        if (length > raw.length)
+            return null;
+        let index = 4;
+        for (let i = 0; i < length; i++) {
+            const blength = raw.readUint32LE(index);
+            index += 4;
+            const buff = raw.slice(index, index + blength);
+            buffers.push(buff);
+            index += blength;
         }
-        catch (e) {
+        const metadata = raw.toString('utf-8', index);
+        function receiver(key, value) {
+            if (typeof value === 'object' && value !== null) {
+                if (value.__$$__dataType === 'Map') {
+                    return new Map(value.__$$__value);
+                }
+                if (value.__$$__dataType === 'Set') {
+                    return new Set(value.__$$__value);
+                }
+                if (value.__$$__dataType == 'Function') {
+                    return function_handler(value.id);
+                }
+                if (value.__$$__dataType == 'Buffer') {
+                    return buffers[value.__index];
+                }
+                if (value.__$$__dataType == 'Observable') {
+                    return oservable_handler(value.id) || (() => new Observable());
+                }
+            }
+            return value;
         }
+        return JSON.parse(metadata, receiver);
     }
 };
 //# sourceMappingURL=Encoder.js.map

package/build/src/Encoder.js.map

@@ -1 +1 @@
-{"version":3,"file":"Encoder.js","sourceRoot":"","sources":["../../src/Encoder.ts"],"names":[],"mappings":"AAAA,SAAS,QAAQ,CAAC,GAAG,EAAE,KAAK;IACxB,MAAM,cAAc,GAAG,IAAI,CAAC,GAAG,CAAC,CAAA;IAEhC,IAAI,cAAc,YAAY,GAAG;QAAE,OAAO;YACtC,UAAU,EAAE,KAAK;YACjB,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,CAAC;SAC9C,CAAA;IAED,IAAI,cAAc,YAAY,GAAG;QAAE,OAAO;YACtC,UAAU,EAAE,KAAK;YACjB,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,CAAC;SAC7C,CAAA;IAED,IAAI,OAAO,cAAc,IAAI,UAAU;QAAE,OAAO;YAC5C,UAAU,EAAE,UAAU;SACzB,CAAA;IAED,OAAO,KAAK,CAAA;AAChB,CAAC;AAGD,SAAS,QAAQ,CAAC,GAAG,EAAE,KAAK;IACxB,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,EAAE;QAC7C,IAAI,KAAK,CAAC,UAAU,KAAK,KAAK,EAAE;YAC5B,OAAO,IAAI,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;SAC/B;QAED,IAAI,KAAK,CAAC,UAAU,KAAK,KAAK,EAAE;YAC5B,OAAO,IAAI,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;SAC/B;QAED,IAAI,KAAK,CAAC,UAAU,IAAI,UAAU;YAAE,OAAO,GAAG,EAAE,GAAG,CAAC,CAAA;KACvD;IAED,OAAO,KAAK,CAAC;AACjB,CAAC;AAED,MAAM,CAAC,MAAM,OAAO,GAAG;IACnB,MAAM,EAAE,CAAU,IAAO,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IACzE,MAAM,EAAE,CAAU,IAAqB,EAAE,EAAE;QACvC,IAAI;YACA,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,IAAI,IAAI,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,QAAQ,CAAM,CAAA;SAC3F;QAAC,OAAO,CAAC,EAAE;SAEX;IACL,CAAC;CACJ,CAAA"}
+{"version":3,"file":"Encoder.js","sourceRoot":"","sources":["../../src/Encoder.ts"],"names":[],"mappings":"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"}

package/build/src/SpiderMesh.d.ts

@@ -1,47 +1,81 @@
+/// <reference types="node" resolution-mode="require"/>
 import { SpiderMeshNodeMetadata } from './interfaces/SpiderMeshNode.js';
-import { SpiderMeshTransporter, SpiderMeshTransporterEvent } from './interfaces/SpiderMeshTransporter.js';
+import { SpiderMeshTransporter } from './interfaces/SpiderMeshTransporter.js';
 import { RPCOptions } from './RPCOptions.js';
 import { RemoteService } from './interfaces/RemoteService.js';
 import { EventHub } from './decorators/ListenEvent.js';
-import { Observable, Subject } from 'rxjs';
-export type RpcPayload = {
-    id: string;
-    type: string;
-    args: any[];
+import { Observable, Subject, Subscription } from 'rxjs';
+import { Encodeable } from './Encoder.js';
+export type PureData = string | number | boolean | null | Buffer | PureData[] | {
+    [key: string]: PureData;
+};
+export declare enum MessageType {
+    RpcRequest = 10,
+    RpcSubscribeChannel = 20,
+    RpcUnsubscribeChannel = 30,
+    RpcStream = 50
+}
+export type RpcRequest = {
+    session_id: string;
+    type: MessageType.RpcRequest;
+    args: Buffer;
     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 type RpcSubscribeChannel = {
+    session_id: string;
+    observable_id: string;
+    channel_id: string;
+    type: MessageType.RpcSubscribeChannel;
+};
+export type RpcUnsubscribeChannel = {
+    session_id: string;
+    channel_id: string;
+    type: MessageType.RpcUnsubscribeChannel;
+};
+export type RpcStream = {
+    session_id: string;
+    channel_id: string;
+    type: MessageType.RpcStream;
+    error?: PureData;
+    data?: PureData;
+    completed?: true;
+};
+export type RpcEvent = RpcRequest | RpcStream | RpcSubscribeChannel | RpcUnsubscribeChannel;
 export type SpiderMeshNamespace = string;
+export type SpiderMeshRequest = {
+    target_node_id: string;
+    observables: Map<string, Observable<PureData>>;
+    channels: Map<string, Subject<PureData>>;
+    subscriptions: Map<string, Subscription>;
+};
 export declare class SpiderMesh {
     #private;
     private transporter;
     $nodes_monitor: Subject<SpiderMeshNodeMetadata>;
     constructor(transporter?: SpiderMeshTransporter);
-    static add_transporter(transporter: SpiderMeshTransporter): void;
+    rpc<T = any>(service: string, method: string, args: any, options?: Partial<RPCOptions>): Observable<T> & Promise<T>;
     $metadata(): Promise<SpiderMeshNodeMetadata>;
     $update_isolate_mode(active: boolean): Promise<SpiderMeshNodeMetadata>;
-    rpc<T = any>(service: string, method: string, args: any, options: RPCOptions): Observable<T> & Promise<T>;
     link_remote_service<T>(factory: {
         new (...args: any[]): T;
     }, wait_service_online?: boolean): Promise<RemoteService<T>>;
-    link_event<T>(event_factory: {
+    link_event<T extends Encodeable = Encodeable>(event_factory: {
         new (...args: any[]): T;
-    }, publish_buffer_ms?: number): Promise<EventHub<T>>;
-    publish<T = any>(topic: string | {
+    }, publish_buffer_ms?: number): Promise<{
+        publish: (data: T) => Promise<void>;
+        listen: () => Observable<{
+            data: T;
+            sender_node_id: string;
+        }>;
+    }>;
+    publish<T extends Encodeable>(topic: string | {
         new (): EventHub<T>;
     }, payload: T, node_id?: string): Promise<void>;
-    listen<T = any>(topic: string | {
-        new (): EventHub<T>;
-    }): Observable<SpiderMeshTransporterEvent<T>>;
+    listen<T extends Encodeable = Encodeable>(topic: string | {
+        new (...args: any[]): T;
+    }): Observable<{
+        data: T;
+        sender_node_id: string;
+    }>;
 }