core-3nweb-client-lib 0.33.0 → 0.34.1

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/json-ipc-wrapping/service-side-wrap.js

@@ -41,7 +41,15 @@ function wrapReqReplyFunc(srvOrFn, funcOrTransforms, transforms) {
         let promise = (args ?
             func.call(srv, ...args) :
             func.call(srv));
-        promise = promise === null || promise === void 0 ? void 0 : promise.then(result => resultToBuffer(result, transforms));
+        if (promise === undefined) {
+            promise = Promise.resolve();
+        }
+        else if ((promise === null) || !promise.then) {
+            promise = Promise.resolve(resultToBuffer(promise, transforms));
+        }
+        else {
+            promise = promise.then(result => resultToBuffer(result, transforms));
+        }
         return { promise };
     };
 }

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/package.json

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