core-3nweb-client-lib 0.32.1 → 0.34.0

package/build/core-ipc/common-caps.d.ts

@@ -1,7 +1,7 @@
-import { Caller, CoreSideServices } from "../ipc-via-protobuf/connector";
+import { CoreSide, ClientSide } from "../ipc-via-protobuf/connector";
 import { ClientCAPsWraps, CAPsExposures, TypeDifference } from "./generic";
 type W3N = web3n.caps.common.W3N;
-export declare function exposeW3N<T extends W3N>(coreSide: CoreSideServices, w3n: T, extraCAPs?: CAPsExposures<TypeDifference<T, W3N>>): void;
-export declare function makeW3Nclient<T extends W3N>(clientSide: Caller, extraCAPs?: ClientCAPsWraps<TypeDifference<T, W3N>>): T;
-export declare function promiseW3Nclient<T extends W3N>(clientSide: Caller, extraCAPs?: ClientCAPsWraps<TypeDifference<T, W3N>>): Promise<T>;
+export declare function exposeW3N<T extends W3N>(coreSide: CoreSide, w3n: T, extraCAPs?: CAPsExposures<TypeDifference<T, W3N>>): void;
+export declare function makeW3Nclient<T extends W3N>(clientSide: ClientSide, extraCAPs?: ClientCAPsWraps<TypeDifference<T, W3N>>): T;
+export declare function promiseW3Nclient<T extends W3N>(clientSide: ClientSide, extraCAPs?: ClientCAPsWraps<TypeDifference<T, W3N>>): Promise<T>;
 export {};

package/build/core-ipc/common-caps.js

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2020 - 2021, 2023 3NSoft Inc.
+ Copyright (C) 2020 - 2021, 2023 - 2024 3NSoft Inc.
  
  This program is free software: you can redistribute it and/or modify it under
  the terms of the GNU General Public License as published by the Free Software

package/build/core-ipc/generic.d.ts

@@ -1,14 +1,14 @@
-import { ExposedObj, ExposedFn, CoreSideServices, Caller } from "../ipc-via-protobuf/connector";
+import { ExposedObj, ExposedFn, CoreSideServices, Caller, CoreSide, CallerToClient, ClientSideServices, ClientSide } from "../ipc-via-protobuf/connector";
 export type CAPsExposures<T> = {
-    [cap in keyof Required<T>]: (cap: any, coreSide: CoreSideServices) => ExposedObj<any> | ExposedFn;
+    [cap in keyof Required<T>]: (cap: any, coreSide: CoreSideServices, callerToClient: CallerToClient) => ExposedObj<any> | ExposedFn;
 };
 export type TypeDifference<T extends TExc, TExc extends object> = {
     [cap in Exclude<keyof T, keyof TExc>]: T[cap];
 };
-export declare function exposeCAPs<T extends W3N, W3N extends object>(coreSide: CoreSideServices, w3n: T, mainCAPs: CAPsExposures<W3N>, extraCAPs: CAPsExposures<TypeDifference<T, W3N>> | undefined): void;
-export type MakeCapClient = (clientSide: Caller, objPath: string[]) => any;
+export declare function exposeCAPs<T extends W3N, W3N extends object>(coreSide: CoreSide, w3n: T, mainCAPs: CAPsExposures<W3N>, extraCAPs: CAPsExposures<TypeDifference<T, W3N>> | undefined): void;
+export type MakeCapClient = (clientSide: Caller, objPath: string[], expServices: ClientSideServices) => any;
 export type ClientCAPsWraps<T> = {
     [cap in keyof Required<T>]: MakeCapClient;
 };
-export declare function makeClientSide<T extends W3N, W3N extends object>(clientSide: Caller, mainCAPs: ClientCAPsWraps<W3N>, extraCAPs: ClientCAPsWraps<TypeDifference<T, W3N>> | undefined): T;
-export declare function promiseClientSide<T extends W3N, W3N extends object>(clientSide: Caller, mainCAPs: ClientCAPsWraps<W3N>, extraCAPs: ClientCAPsWraps<TypeDifference<T, W3N>> | undefined): Promise<T>;
+export declare function makeClientSide<T extends W3N, W3N extends object>({ caller, exposedServices }: ClientSide, mainCAPs: ClientCAPsWraps<W3N>, extraCAPs: ClientCAPsWraps<TypeDifference<T, W3N>> | undefined): T;
+export declare function promiseClientSide<T extends W3N, W3N extends object>({ caller, exposedServices }: ClientSide, mainCAPs: ClientCAPsWraps<W3N>, extraCAPs: ClientCAPsWraps<TypeDifference<T, W3N>> | undefined): Promise<T>;

package/build/core-ipc/generic.js

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2021 - 2022 3NSoft Inc.
+ Copyright (C) 2021 - 2022, 2024 3NSoft Inc.
  
  This program is free software: you can redistribute it and/or modify it under
  the terms of the GNU General Public License as published by the Free Software
@@ -27,55 +27,55 @@ function exposeCAPs(coreSide, w3n, mainCAPs, extraCAPs) {
     if (extraCAPs) {
         addCAPsInExposure(expW3N, coreSide, w3n, extraCAPs);
     }
-    coreSide.exposeW3NService(expW3N);
+    coreSide.exposedServices.exposeW3NService(expW3N);
 }
-function addCAPsInExposure(expW3N, coreSide, w3n, capExposures) {
+function addCAPsInExposure(expW3N, { exposedServices, caller: callerToClient }, w3n, capExposures) {
     for (const capName in capExposures) {
         const expose = capExposures[capName];
         (0, assert_1.assert)(typeof expose === 'function');
         (0, assert_1.assert)(!expW3N[capName], `Capability ${capName} is already exposed, and we specifically have no shadowing.`);
         const cap = w3n[capName];
         if (cap) {
-            expW3N[capName] = expose(cap, coreSide);
+            expW3N[capName] = expose(cap, exposedServices, callerToClient);
         }
     }
 }
-function makeClientSide(clientSide, mainCAPs, extraCAPs) {
-    (0, assert_1.assert)(!!clientSide.listObj);
+function makeClientSide({ caller, exposedServices }, mainCAPs, extraCAPs) {
+    (0, assert_1.assert)(!!caller.listObj);
     const objPath = [connector_1.W3N_NAME];
-    const lstOfCAPs = clientSide.listObj(objPath);
+    const lstOfCAPs = caller.listObj(objPath);
     const w3n = {};
     for (const cap of lstOfCAPs) {
         const capObjPath = objPath.concat(cap);
         if (mainCAPs[cap]) {
             const makeCap = mainCAPs[cap];
             (0, assert_1.assert)(typeof makeCap === 'function');
-            w3n[cap] = makeCap(clientSide, capObjPath);
+            w3n[cap] = makeCap(caller, capObjPath, exposedServices);
         }
         else if (extraCAPs) {
             const makeCap = extraCAPs[cap];
             (0, assert_1.assert)(typeof makeCap === 'function');
-            w3n[cap] = makeCap(clientSide, capObjPath);
+            w3n[cap] = makeCap(caller, capObjPath, exposedServices);
         }
     }
     return w3n;
 }
-async function promiseClientSide(clientSide, mainCAPs, extraCAPs) {
-    (0, assert_1.assert)(!!clientSide.listObjAsync);
+async function promiseClientSide({ caller, exposedServices }, mainCAPs, extraCAPs) {
+    (0, assert_1.assert)(!!caller.listObjAsync);
     const objPath = [connector_1.W3N_NAME];
-    const lstOfCAPs = (await clientSide.listObjAsync(objPath));
+    const lstOfCAPs = (await caller.listObjAsync(objPath));
     const w3n = {};
     for (const cap of lstOfCAPs) {
         const capObjPath = objPath.concat(cap);
         if (mainCAPs[cap]) {
             const makeCap = mainCAPs[cap];
             (0, assert_1.assert)(typeof makeCap === 'function');
-            w3n[cap] = await makeCap(clientSide, capObjPath);
+            w3n[cap] = await makeCap(caller, capObjPath, exposedServices);
         }
         else if (extraCAPs) {
             const makeCap = extraCAPs[cap];
             (0, assert_1.assert)(typeof makeCap === 'function');
-            w3n[cap] = await makeCap(clientSide, capObjPath);
+            w3n[cap] = await makeCap(caller, capObjPath, exposedServices);
         }
     }
     return w3n;

package/build/core-ipc/startup-caps.d.ts

@@ -1,6 +1,6 @@
-import { CoreSideServices, Caller } from "../ipc-via-protobuf/connector";
+import { CoreSide, ClientSide } from "../ipc-via-protobuf/connector";
 import { ClientCAPsWraps, CAPsExposures, TypeDifference } from "./generic";
 type W3N = web3n.startup.W3N;
-export declare function exposeStartupW3N<T extends W3N>(coreSide: CoreSideServices, w3n: T, extraCAPs?: CAPsExposures<TypeDifference<T, W3N>>): void;
-export declare function makeStartupW3Nclient<T extends W3N>(clientSide: Caller, extraCAPs?: ClientCAPsWraps<TypeDifference<T, W3N>>): W3N;
+export declare function exposeStartupW3N<T extends W3N>(coreSide: CoreSide, w3n: T, extraCAPs?: CAPsExposures<TypeDifference<T, W3N>>): void;
+export declare function makeStartupW3Nclient<T extends W3N>(clientSide: ClientSide, extraCAPs?: ClientCAPsWraps<TypeDifference<T, W3N>>): W3N;
 export {};

package/build/ipc-via-protobuf/connector-clients-side.js

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2020 - 2023 3NSoft Inc.
+ Copyright (C) 2020 - 2024 3NSoft Inc.
  
  This program is free software: you can redistribute it and/or modify it under
  the terms of the GNU General Public License as published by the Free Software
@@ -32,10 +32,6 @@ class ClientsSideImpl {
         this.weakSrvByRefs = new Map();
         this.srvFinalRegistry = new FinalizationRegistry(this.doOnClientObjDrop.bind(this));
         this.isStopped = false;
-        if ((this.asyncReqToListObj && this.syncReqToListObj)
-            || (!this.asyncReqToListObj && !this.syncReqToListObj)) {
-            throw new Error(`Expect either sync or async obj listing function.`);
-        }
         Object.seal(this);
     }
     stop(exc) {

package/build/ipc-via-protobuf/connector-services-side.d.ts

@@ -18,10 +18,12 @@ export declare class ExposedObjs {
     private readonly objs;
     private readonly objToRefs;
     exposeDroppableService<T extends string>(objType: T, exp: ExposedFn | ExposedObj<any>, original: any): ObjectReference<T>;
+    private newRef;
     getOriginalObj<T>(ref: ObjectReference<any>): T;
     getObjForTransfer<T extends string>(ref: ObjectReference<T>): TransferableObj<T>;
     findRefIfAlreadyExposed(o: any): ObjectReference<any> | undefined;
-    exposeStaticService(name: string, exp: ExposedFn | ExposedObj<any>): void;
+    exposeW3NService(exp: ExposedFn | ExposedObj<any>): void;
+    exposeStaticService<T extends string>(objType: T, exp: ExposedFn | ExposedObj<any>): ObjectReference<T>;
     drop(name: string): void;
     find(path: string[] | undefined): ExposedFn | ExposedObj<any> | undefined;
     findFn(path: string[] | undefined): ExposedFn;

package/build/ipc-via-protobuf/connector-services-side.js

@@ -132,6 +132,7 @@ class ServicesSideImpl {
         const expSrv = {
             exposeDroppableService: this.exposedObjs.exposeDroppableService.bind(this.exposedObjs),
             exposeStaticService: this.exposedObjs.exposeStaticService.bind(this.exposedObjs),
+            exposeW3NService: this.exposedObjs.exposeW3NService.bind(this.exposedObjs),
             getOriginalObj: this.exposedObjs.getOriginalObj.bind(this.exposedObjs),
             listObj: path => {
                 const obj = this.exposedObjs.find(path);
@@ -152,16 +153,19 @@ class ExposedObjs {
         this.objToRefs = new Map();
     }
     exposeDroppableService(objType, exp, original) {
+        const ref = this.newRef(objType);
+        this.objs.set(ref.path[0], { exp, original, objType });
+        this.objToRefs.set(original, ref);
+        return ref;
+    }
+    newRef(objType) {
         let id;
         do {
             id = (0, random_node_1.stringOfB64CharsSync)(20);
         } while (this.objs.has(id));
-        const ref = {
+        return {
             objType, path: [id]
         };
-        this.objs.set(id, { exp, original, objType });
-        this.objToRefs.set(original, ref);
-        return ref;
     }
     getOriginalObj(ref) {
         const o = this.objs.get(ref.path[0]);
@@ -187,11 +191,21 @@ class ExposedObjs {
     findRefIfAlreadyExposed(o) {
         return this.objToRefs.get(o);
     }
-    exposeStaticService(name, exp) {
-        this.objs.set(name, {
+    exposeW3NService(exp) {
+        if (this.objs.has(connector_1.W3N_NAME)) {
+            throw new Error(`${connector_1.W3N_NAME} object has already been added`);
+        }
+        this.objs.set(connector_1.W3N_NAME, {
             exp, original: undefined, objType: 'non-transferable'
         });
     }
+    exposeStaticService(objType, exp) {
+        const ref = this.newRef(objType);
+        this.objs.set(ref.path[0], {
+            exp, original: undefined, objType
+        });
+        return ref;
+    }
     drop(name) {
         if (name !== connector_1.W3N_NAME) {
             const o = this.objs.get(name);

package/build/ipc-via-protobuf/connector.d.ts

@@ -1,10 +1,21 @@
 import { Observer, SubjectLike, Subscribable } from "rxjs";
 import { ObjectReference, Value } from "./protobuf-msg";
 import { ProtoType } from '../lib-client/protobuf-type';
+export interface ClientSide {
+    caller: Caller;
+    exposedServices: ClientSideServices;
+    close: (err?: any) => void;
+}
+export interface CoreSide {
+    caller: CallerToClient;
+    exposedServices: CoreSideServices;
+    close: (err?: any) => void;
+}
 export interface ServicesImpl {
     exposeDroppableService<T extends string>(objType: T, exp: ExposedFn | ExposedObj<any>, original: any): ObjectReference<T>;
+    exposeStaticService<T extends string>(objType: T, exp: ExposedFn | ExposedObj<any>): ObjectReference<T>;
     getOriginalObj<T>(ref: ObjectReference<any>): T;
-    exposeStaticService(name: string, exp: ExposedFn | ExposedObj<any>): void;
+    exposeW3NService(exp: ExposedFn | ExposedObj<any>): void;
     listObj(path: string[]): string[] | null;
     getObjForTransfer<T extends string>(ref: ObjectReference<T>): TransferableObj<T>;
     findRefIfAlreadyExposed(o: any): ObjectReference<any> | undefined;
@@ -13,29 +24,26 @@ export interface TransferableObj<T extends string> {
     type: T;
     o: any;
 }
-export interface ServicesSide {
-    exposedServices(): ServicesImpl;
-    processCallStart(fnCallNum: number, path: string[] | undefined, body: EnvelopeBody): void;
-    processCallCancelation(fnCallNum: number): void;
-    processListObj(fnCallNum: number, path: string[] | undefined): void;
-    processObjectDrop(path: string[] | undefined): void;
-    stop(): void;
-}
 export interface CoreSideServices {
     exposeDroppableService: ServicesImpl['exposeDroppableService'];
     getOriginalObj: ServicesImpl['getOriginalObj'];
-    exposeW3NService(exp: ExposedFn | ExposedObj<any>): void;
+    exposeW3NService: ServicesImpl['exposeW3NService'];
     listObj: ServicesImpl['listObj'];
     getObjForTransfer: ServicesImpl['getObjForTransfer'];
     findRefIfAlreadyExposed: ServicesImpl['findRefIfAlreadyExposed'];
 }
-export interface CoreSide {
-    exposedServices: CoreSideServices;
-    close: (err?: any) => void;
+export interface ClientSideServices {
+    exposeDroppableService: ServicesImpl['exposeDroppableService'];
+    getOriginalObj: ServicesImpl['getOriginalObj'];
+    exposeStaticService: ServicesImpl['exposeStaticService'];
+    getObjForTransfer: ServicesImpl['getObjForTransfer'];
+    findRefIfAlreadyExposed: ServicesImpl['findRefIfAlreadyExposed'];
 }
-export interface ClientSide {
-    caller: Caller;
-    close: (err?: any) => void;
+export interface CallerToClient {
+    startPromiseCall: Caller['startPromiseCall'];
+    startObservableCall: Caller['startObservableCall'];
+    registerClientDrop: Caller['registerClientDrop'];
+    srvRefOf: Caller['srvRefOf'];
 }
 export interface Caller {
     startPromiseCall(path: string[], req: EnvelopeBody): Promise<EnvelopeBody>;
@@ -52,6 +60,14 @@ export interface Caller {
 export interface ObjectFromCore {
     _isObjectFromCore: true;
 }
+export interface ServicesSide {
+    exposedServices(): ServicesImpl;
+    processCallStart(fnCallNum: number, path: string[] | undefined, body: EnvelopeBody): void;
+    processCallCancelation(fnCallNum: number): void;
+    processListObj(fnCallNum: number, path: string[] | undefined): void;
+    processObjectDrop(path: string[] | undefined): void;
+    stop(): void;
+}
 export interface ClientsSide {
     caller(): Caller;
     processInterimCallReply(fnCallNum: number, body: EnvelopeBody): void;

package/build/ipc-via-protobuf/connector.js

@@ -51,7 +51,7 @@ class ObjectsConnector {
         switch (side) {
             case 'core':
                 this.services = makeServicesSide(sendMsg);
-                this.clients = undefined;
+                this.clients = makeClientsSide(sendMsg, undefined, undefined);
                 break;
             case "client":
                 if ((!listObj && !listObjAsync)
@@ -59,35 +59,35 @@ class ObjectsConnector {
                     throw new Error(`Client side needs either listObj, or listObjAsync argument`);
                 }
                 this.clients = makeClientsSide(sendMsg, listObj, listObjAsync);
-                this.services = undefined;
+                this.services = makeServicesSide(sendMsg);
                 break;
         }
         Object.seal(this);
     }
     static makeCoreSide(fromCore, toCore) {
         const connector = new ObjectsConnector('core', fromCore, toCore);
-        const { exposeDroppableService, exposeStaticService, findRefIfAlreadyExposed, getObjForTransfer, getOriginalObj, listObj } = connector.services.exposedServices();
-        let w3nIsSet = false;
+        const { exposeDroppableService, exposeW3NService, findRefIfAlreadyExposed, getObjForTransfer, getOriginalObj, listObj } = connector.services.exposedServices();
+        const { registerClientDrop, srvRefOf, startObservableCall, startPromiseCall } = connector.clients.caller();
         return {
             exposedServices: {
-                exposeDroppableService,
-                exposeW3NService: exp => {
-                    if (w3nIsSet) {
-                        throw new Error(`${exports.W3N_NAME} object has already been added`);
-                    }
-                    exposeStaticService(exports.W3N_NAME, exp);
-                    w3nIsSet = true;
-                },
-                findRefIfAlreadyExposed, getObjForTransfer,
-                getOriginalObj, listObj
+                exposeDroppableService, exposeW3NService, findRefIfAlreadyExposed,
+                getObjForTransfer, getOriginalObj, listObj
+            },
+            caller: {
+                registerClientDrop, srvRefOf, startObservableCall, startPromiseCall
             },
             close: err => connector.close(err)
         };
     }
     static makeClientSide(fromClient, toClient, listObj, listObjAsync) {
         const connector = new ObjectsConnector('client', fromClient, toClient, listObj, listObjAsync);
+        const { exposeDroppableService, findRefIfAlreadyExposed, getObjForTransfer, getOriginalObj, exposeStaticService } = connector.services.exposedServices();
         return {
             caller: connector.clients.caller(),
+            exposedServices: {
+                exposeDroppableService, findRefIfAlreadyExposed, getObjForTransfer,
+                getOriginalObj, exposeStaticService
+            },
             close: err => connector.close(err)
         };
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "core-3nweb-client-lib",
-  "version": "0.32.1",
+  "version": "0.34.0",
   "description": "3NWeb client core library, embeddable into different environments",
   "main": "build/lib-index.js",
   "types": "build/lib-index.d.ts",