@spider-mesh/core 1.0.118 → 1.0.120

package/build/src/Encoder.d.ts

@@ -3,15 +3,10 @@ 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;
+export type Encodeable = PureData | Array<PureData | Encodeable> | {
+    [key: string]: PureData | Encodeable;
 } | Observable<PureData>;
 export declare const Encoder: {
-    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;
+    encode: <T extends Encodeable>(content: T) => Buffer;
+    decode: <T_1>(raw: Buffer) => T_1 | null;
 };

package/build/src/Encoder.js

@@ -1,18 +1,10 @@
-import { randomUUID } from "crypto";
-import { Observable } from "rxjs";
 export const Encoder = {
     encode: (content) => {
         const buffers = [];
-        const functions = new Map();
-        const observables = new Map();
         if (content == null || content == undefined) {
             const buffer = Buffer.alloc(4);
             buffer.writeInt32LE(-1);
-            return {
-                buffer,
-                functions,
-                observables
-            };
+            return buffer;
         }
         function replacer(key, value) {
             const originalObject = this[key];
@@ -26,22 +18,6 @@ export const Encoder = {
                     __$$__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 {
@@ -61,9 +37,9 @@ export const Encoder = {
         }).flat(2);
         const data = Buffer.from(metadata, 'utf-8');
         const buffer = Buffer.concat([buffers_count, ...buffers_list, data]);
-        return { buffer, functions, observables };
+        return buffer;
     },
-    decode: (raw, function_handler = (() => () => { }), oservable_handler = () => new Observable()) => {
+    decode: (raw) => {
         const buffers = [];
         const length = raw.readUInt32LE(0);
         if (length > raw.length || length < 0)
@@ -85,23 +61,13 @@ export const Encoder = {
                 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);
     }
 };
-const a = Encoder.encode(undefined);
-console.log(a);
-const b = Encoder.decode(a.buffer);
-console.log(b);
 //# sourceMappingURL=Encoder.js.map

package/build/src/Encoder.js.map

@@ -1 +1 @@
-{"version":3,"file":"Encoder.js","sourceRoot":"","sources":["../../src/Encoder.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Encoder.js","sourceRoot":"","sources":["../../src/Encoder.ts"],"names":[],"mappings":"AAaA,MAAM,CAAC,MAAM,OAAO,GAAG;IAEnB,MAAM,EAAE,CAAuB,OAAU,EAAE,EAAE;QAEzC,MAAM,OAAO,GAAa,EAAE,CAAA;QAG5B,IAAI,OAAO,IAAI,IAAI,IAAI,OAAO,IAAI,SAAS,EAAE;YACzC,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;YAC9B,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAA;YACvB,OAAO,MAAM,CAAA;SAChB;QAED,SAAS,QAAQ,CAAY,GAAW,EAAE,KAAU;YAChD,MAAM,cAAc,GAAG,IAAI,CAAC,GAAG,CAAC,CAAA;YAChC,IAAI,cAAc,YAAY,GAAG;gBAAE,OAAO;oBACtC,cAAc,EAAE,KAAK;oBACrB,WAAW,EAAE,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,CAAC;iBACpD,CAAA;YAED,IAAI,cAAc,YAAY,GAAG;gBAAE,OAAO;oBACtC,cAAc,EAAE,KAAK;oBACrB,WAAW,EAAE,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,CAAC;iBACnD,CAAA;YAGD,IAAI,cAAc,YAAY,MAAM,EAAE;gBAClC,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC,CAAA;gBAC5B,OAAO;oBACH,cAAc,EAAE,QAAQ;oBACxB,OAAO,EAAE,OAAO,CAAC,MAAM,GAAG,CAAC;iBAC9B,CAAA;aACJ;YAED,OAAO,KAAK,CAAA;QAChB,CAAC;QACD,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAA;QAElD,MAAM,aAAa,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;QACrC,aAAa,CAAC,aAAa,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,CAAA;QAE9C,MAAM,YAAY,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE;YACjC,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;YAC9B,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC,MAAM,CAAC,CAAA;YAC9B,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,CAAA;QACtB,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;QACV,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAA;QAC3C,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,aAAa,EAAE,GAAG,YAAY,EAAE,IAAI,CAAC,CAAC,CAAA;QACpE,OAAO,MAAM,CAAA;IACjB,CAAC;IAED,MAAM,EAAE,CACJ,GAAW,EACb,EAAE;QACA,MAAM,OAAO,GAAa,EAAE,CAAA;QAC5B,MAAM,MAAM,GAAG,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC,CAAA;QAClC,IAAI,MAAM,GAAG,GAAG,CAAC,MAAM,IAAI,MAAM,GAAG,CAAC;YAAE,OAAO,IAAI,CAAA;QAClD,IAAI,KAAK,GAAG,CAAC,CAAA;QACb,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,EAAE,CAAC,EAAE,EAAE;YAC7B,MAAM,OAAO,GAAG,GAAG,CAAC,YAAY,CAAC,KAAK,CAAC,CAAA;YACvC,KAAK,IAAI,CAAC,CAAA;YACV,MAAM,IAAI,GAAG,GAAG,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC,CAAA;YAC9C,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;YAClB,KAAK,IAAI,OAAO,CAAA;SACnB;QACD,MAAM,QAAQ,GAAG,GAAG,CAAC,QAAQ,CAAC,OAAO,EAAE,KAAK,CAAC,CAAA;QAC7C,SAAS,QAAQ,CAAY,GAAW,EAAE,KAAU;YAChD,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,EAAE;gBAC7C,IAAI,KAAK,CAAC,cAAc,KAAK,KAAK,EAAE;oBAChC,OAAO,IAAI,GAAG,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;iBACrC;gBAED,IAAI,KAAK,CAAC,cAAc,KAAK,KAAK,EAAE;oBAChC,OAAO,IAAI,GAAG,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;iBACrC;gBAGD,IAAI,KAAK,CAAC,cAAc,IAAI,QAAQ,EAAE;oBAClC,OAAO,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;iBAChC;aACJ;YAED,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,OAAO,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,QAAQ,CAAM,CAAA;IAC9C,CAAC;CACJ,CAAA"}

package/build/src/SpiderMesh.d.ts

@@ -4,59 +4,52 @@ 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, Subscription } from 'rxjs';
+import { Observable, Subject } 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;
-};
-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 SpiderMeshRpcEvent = {
+    request: {
+        request_id: string;
+        args: Buffer;
+        service: string;
+        method: string;
+    };
+    response: {
+        request_id: string;
+        error?: PureData;
+        data?: {
+            value: PureData;
+        };
+        completed?: boolean;
+    };
 };
-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 type SpiderMeshPublishPayload<T extends Encodeable = Encodeable> = {
+    topic: string | {
+        new (): EventHub<T>;
+    };
+    payload: T;
+    node_id?: string;
+    local_transporter_id?: string;
+};
+export type SpiderMeshBatchPublishPayload<T extends Encodeable = Encodeable> = {
+    topic: string | {
+        new (): EventHub<T>;
+    };
+    payload: T[];
+    node_id?: string;
+    local_transporter_id?: string;
 };
 export declare class SpiderMesh {
     #private;
-    private transporter;
     $nodes_monitor: Subject<SpiderMeshNodeMetadata>;
-    constructor(transporter?: SpiderMeshTransporter);
+    constructor(using_default_transporter?: boolean);
     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>;
+    $metadata(): Promise<Omit<SpiderMeshNodeMetadata, "remote_transporter_id" | "local_transporter_id">>;
+    $update_isolate_mode(active: boolean): Promise<void>;
+    link_transporter(transporter: SpiderMeshTransporter): Promise<void>;
     link_remote_service<T>(factory: {
         new (...args: any[]): T;
     }, wait_service_online?: boolean): Promise<RemoteService<T>>;
@@ -66,16 +59,19 @@ export declare class SpiderMesh {
         publish: (data: T) => Promise<void>;
         listen: () => Observable<{
             data: T;
+            received_transporter_id: string;
+            sender_transporter_id: string;
             sender_node_id: string;
         }>;
     }>;
-    publish<T extends Encodeable>(topic: string | {
-        new (): EventHub<T>;
-    }, payload: T, node_id?: string): Promise<void>;
+    batch_publish<T extends Encodeable>({ payload, topic, node_id, local_transporter_id }: SpiderMeshBatchPublishPayload<T>): Promise<void>;
+    publish<T extends Encodeable>({ payload, topic, node_id, local_transporter_id }: SpiderMeshPublishPayload<T>): Promise<void>;
     listen<T extends Encodeable = Encodeable>(topic: string | {
         new (...args: any[]): T;
     }): Observable<{
         data: T;
+        received_transporter_id: string;
+        sender_transporter_id: string;
         sender_node_id: string;
     }>;
 }