core-3nweb-client-lib 0.20.4 → 0.20.8

package/build/api-defs/startup.d.ts

@@ -116,7 +116,6 @@ declare namespace web3n.startup {
 	interface W3N {
 		signIn: startup.SignInService;
 		signUp: startup.SignUpService;
-		log?: caps.common.Logger;
 	}
 	
 }

package/build/core/index.d.ts

@@ -22,7 +22,7 @@ export declare class Core {
     private closingProc;
     private constructor();
     static make(conf: CoreConf, makeNet: () => NetClient, makeResolver: ServiceLocatorMaker, makeCryptor: makeCryptor): Core;
-    start(logCAP?: boolean): {
+    start(): {
         capsForStartup: web3n.startup.W3N;
         coreInit: Promise<string>;
     };

package/build/core/index.js

@@ -112,16 +112,13 @@ class Core {
         const core = new Core(makeNet, makeResolver, makeCryptor, dirs, logger, conf.signUpUrl);
         return core;
     }
-    start(logCAP = false) {
+    start() {
         const signUp = new sign_up_1.SignUp(this.signUpUrl, this.cryptor.cryptor, this.makeNet, this.appDirs.getUsersOnDisk, this.logger.logError);
         const signIn = new sign_in_1.SignIn(this.cryptor.cryptor, this.initForExistingUserWithoutCache, this.initForExistingUserWithCache, this.appDirs.getUsersOnDisk, this.logger.logError);
         const capsForStartup = {
             signUp: signUp.exposedService(),
             signIn: signIn.exposedService()
         };
-        if (logCAP) {
-            capsForStartup.log = (type, msg, e) => this.logger.appLog(type, STARTUP_APP_DOMAIN, msg, e);
-        }
         Object.freeze(capsForStartup);
         const initFromSignUp$ = signUp.newUser$
             .pipe(operators_1.mergeMap(this.initForNewUser, 1));

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

@@ -1,10 +1,6 @@
 import { Caller, ExposedServices } from "../ipc-via-protobuf/connector";
-import { CapExposer, MakeCapClient } from "./generic";
+import { ClientCAPsWraps, CAPsExposures, TypeDifference } from "./generic";
 declare type W3N = web3n.caps.common.W3N;
-export declare function exposeW3N<T extends W3N>(coreSide: ExposedServices, w3n: T, extraCAPs?: {
-    [cap in keyof T]: CapExposer;
-}): void;
-export declare function makeW3Nclient<T extends W3N>(clientSide: Caller, extraCAPs?: {
-    [cap in keyof T]: MakeCapClient;
-}): T;
+export declare function exposeW3N<T extends W3N>(coreSide: ExposedServices, w3n: T, extraCAPs?: CAPsExposures<TypeDifference<T, W3N>>): void;
+export declare function makeW3Nclient<T extends W3N>(clientSide: Caller, extraCAPs?: ClientCAPsWraps<TypeDifference<T, W3N>>): T;
 export {};

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

@@ -1,16 +1,13 @@
 import { ExposedObj, ExposedFn, ExposedServices, Caller } from "../ipc-via-protobuf/connector";
-export declare type CapExposer = (cap: any, coreSide: ExposedServices) => ExposedObj<any> | ExposedFn;
+export declare type CAPsExposures<T> = {
+    [cap in keyof Required<T>]: (cap: any, coreSide: ExposedServices) => ExposedObj<any> | ExposedFn;
+};
+export declare 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: ExposedServices, w3n: T, mainCAPs: CAPsExposures<W3N>, extraCAPs: CAPsExposures<TypeDifference<T, W3N>> | undefined): void;
 export declare type MakeCapClient = (clientSide: Caller, objPath: string[]) => any;
-export declare function addCAPsInExposure<T extends object>(expW3N: ExposedObj<T>, coreSide: ExposedServices, w3n: T, capExposures: {
-    [cap in keyof T]: CapExposer;
-}): void;
-export declare function exposeCAPs<T extends W3N, W3N extends object>(coreSide: ExposedServices, w3n: T, mainCAPs: {
-    [cap in keyof W3N]: CapExposer;
-}, extraCAPs?: {
-    [cap in keyof T]: CapExposer;
-}): void;
-export declare function makeClientSide<T extends W3N, W3N extends object>(clientSide: Caller, mainCAPs: {
-    [cap in keyof W3N]: MakeCapClient;
-}, extraCAPs?: {
-    [cap in keyof T]: MakeCapClient;
-}): T;
+export declare 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;

package/build/core-ipc/generic.js

@@ -16,20 +16,9 @@
  this program. If not, see <http://www.gnu.org/licenses/>.
 */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeClientSide = exports.exposeCAPs = exports.addCAPsInExposure = void 0;
+exports.makeClientSide = exports.exposeCAPs = void 0;
 const connector_1 = require("../ipc-via-protobuf/connector");
 const assert_1 = require("../lib-common/assert");
-function addCAPsInExposure(expW3N, coreSide, w3n, capExposures) {
-    for (const [capName, expose] of Object.entries(capExposures)) {
-        assert_1.assert(typeof expose === 'function');
-        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);
-        }
-    }
-}
-exports.addCAPsInExposure = addCAPsInExposure;
 function exposeCAPs(coreSide, w3n, mainCAPs, extraCAPs) {
     const expW3N = {};
     addCAPsInExposure(expW3N, coreSide, w3n, mainCAPs);
@@ -39,6 +28,17 @@ function exposeCAPs(coreSide, w3n, mainCAPs, extraCAPs) {
     coreSide.exposeW3NService(expW3N);
 }
 exports.exposeCAPs = exposeCAPs;
+function addCAPsInExposure(expW3N, coreSide, w3n, capExposures) {
+    for (const capName in capExposures) {
+        const expose = capExposures[capName];
+        assert_1.assert(typeof expose === 'function');
+        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);
+        }
+    }
+}
 function makeClientSide(clientSide, mainCAPs, extraCAPs) {
     const objPath = [connector_1.W3N_NAME];
     const lstOfCAPs = clientSide.listObj(objPath);
@@ -50,7 +50,8 @@ function makeClientSide(clientSide, mainCAPs, extraCAPs) {
             assert_1.assert(typeof makeCap === 'function');
             w3n[cap] = makeCap(clientSide, capObjPath);
         }
-        else if (extraCAPs && extraCAPs[cap]) {
+        else if (extraCAPs) {
+            assert_1.assert(!!exposeCAPs);
             const makeCap = extraCAPs[cap];
             assert_1.assert(typeof makeCap === 'function');
             w3n[cap] = makeCap(clientSide, capObjPath);

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

@@ -1,10 +1,6 @@
 import { ExposedServices, Caller } from "../ipc-via-protobuf/connector";
-import { CapExposer, MakeCapClient } from "./generic";
+import { ClientCAPsWraps, CAPsExposures, TypeDifference } from "./generic";
 declare type W3N = web3n.startup.W3N;
-export declare function exposeStartupW3N<T extends W3N>(coreSide: ExposedServices, w3n: T, extraCAPs?: {
-    [cap in keyof T]: CapExposer;
-}): void;
-export declare function makeStartupW3Nclient<T extends W3N>(clientSide: Caller, extraCAPs?: {
-    [cap in keyof T]: MakeCapClient;
-}): W3N;
+export declare function exposeStartupW3N<T extends W3N>(coreSide: ExposedServices, w3n: T, extraCAPs?: CAPsExposures<TypeDifference<T, W3N>>): void;
+export declare function makeStartupW3Nclient<T extends W3N>(clientSide: Caller, extraCAPs?: ClientCAPsWraps<TypeDifference<T, W3N>>): W3N;
 export {};

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

@@ -18,14 +18,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeStartupW3Nclient = exports.exposeStartupW3N = void 0;
 const connector_1 = require("../ipc-via-protobuf/connector");
-const log_cap_1 = require("../ipc-via-protobuf/log-cap");
 const startup_cap_1 = require("../ipc-via-protobuf/startup-cap");
 const generic_1 = require("./generic");
 function exposeStartupW3N(coreSide, w3n, extraCAPs) {
     const startupCAPsExposures = {
         signIn: startup_cap_1.wrapSignInCAP,
         signUp: startup_cap_1.wrapSignUpCAP,
-        log: log_cap_1.exposeLogger,
     };
     generic_1.exposeCAPs(coreSide, w3n, startupCAPsExposures, extraCAPs);
 }
@@ -35,7 +33,6 @@ exports.exposeStartupW3N = exposeStartupW3N;
 const unused = connector_1.W3N_NAME;
 function makeStartupW3Nclient(clientSide, extraCAPs) {
     const mainCAPs = {
-        log: log_cap_1.makeLogCaller,
         signIn: startup_cap_1.makeSignInCaller,
         signUp: startup_cap_1.makeSignUpCaller,
     };

package/package.json

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