core-3nweb-client-lib 0.20.6 → 0.21.0

package/build/api-defs/common-caps.d.ts

@@ -30,7 +30,6 @@ declare namespace web3n.caps.common {
 
 	interface AppManifest {
 		appDomain: string;
-		name: string;
 		capsRequested: {
 			mail?: MailCAPSetting;
 			storage?: StorageCAPSetting;

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

@@ -2,7 +2,7 @@ import { FactoryOfFSs } from './storage';
 import { makeCryptor } from '../lib-client/cryptor/cryptor';
 import { NetClient } from '../lib-client/request-utils';
 import { ServiceLocatorMaker } from '../lib-client/service-locator';
-declare type AppManifest = web3n.caps.common.AppManifest;
+declare type RequestedCAPs = web3n.caps.common.AppManifest['capsRequested'];
 declare type W3N = web3n.caps.common.W3N;
 export interface CoreConf {
     dataDir: string;
@@ -22,14 +22,14 @@ 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>;
     };
     private initForNewUser;
     private initForExistingUserWithoutCache;
     private initForExistingUserWithCache;
-    makeCAPsForApp(appDomain: string, manifest: AppManifest): {
+    makeCAPsForApp(appDomain: string, requestedCAPs: RequestedCAPs): {
         caps: W3N;
         close: () => void;
     };

package/build/core/index.js

@@ -30,7 +30,6 @@ const operators_1 = require("rxjs/operators");
 const app_files_1 = require("./app-files");
 const ASMAIL_APP_NAME = 'computer.3nweb.core.asmail';
 const MAILERID_APP_NAME = 'computer.3nweb.core.mailerid';
-const STARTUP_APP_DOMAIN = 'startup.3nweb.computer';
 class Core {
     constructor(makeNet, makeResolver, makeCryptor, appDirs, logger, signUpUrl) {
         this.makeNet = makeNet;
@@ -112,16 +111,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));
@@ -132,50 +128,47 @@ class Core {
         return { coreInit, capsForStartup };
     }
     ;
-    makeCAPsForApp(appDomain, manifest) {
+    makeCAPsForApp(appDomain, requestedCAPs) {
         if (!this.isInitialized || this.closingProc) {
             throw new Error(`Core is either not yet initialized, or is already closed.`);
         }
-        if (appDomain !== manifest.appDomain) {
-            throw new Error(`App manifest is for domain ${manifest.appDomain}, while app's domain is ${appDomain}`);
-        }
-        const { storage, close } = this.makeStorageCAP(manifest);
-        const mail = this.makeMailCAP(manifest);
-        const log = this.makeLogCAP(manifest);
-        const mailerid = this.makeMailerIdCAP(manifest);
+        const { storage, close } = this.makeStorageCAP(appDomain, requestedCAPs);
+        const mail = this.makeMailCAP(requestedCAPs);
+        const log = this.makeLogCAP(appDomain, requestedCAPs);
+        const mailerid = this.makeMailerIdCAP(requestedCAPs);
         const caps = { mail, log, mailerid, storage };
         return { caps, close };
     }
     ;
-    makeStorageCAP(m) {
-        if (m.capsRequested.storage) {
-            const { cap: storage, close } = this.storages.makeStorageCAP(m.appDomain, makeStoragePolicy(m));
+    makeStorageCAP(appDomain, requestedCAPs) {
+        if (requestedCAPs.storage) {
+            const { cap: storage, close } = this.storages.makeStorageCAP(appDomain, makeStoragePolicy(appDomain, requestedCAPs));
             return { storage, close };
         }
         else {
             return { close: () => { } };
         }
     }
-    makeMailCAP(m) {
-        if (m.capsRequested.mail
-            && (m.capsRequested.mail.receivingFrom === 'all')
-            && (m.capsRequested.mail.sendingTo === 'all')) {
+    makeMailCAP(requestedCAPs) {
+        if (requestedCAPs.mail
+            && (requestedCAPs.mail.receivingFrom === 'all')
+            && (requestedCAPs.mail.sendingTo === 'all')) {
             return this.asmail.makeASMailCAP();
         }
         else {
             return undefined;
         }
     }
-    makeLogCAP(m) {
-        if (m.capsRequested.log === 'all') {
-            return (type, msg, e) => this.logger.appLog(type, m.appDomain, msg, e);
+    makeLogCAP(appDomain, requestedCAPs) {
+        if (requestedCAPs.log === 'all') {
+            return (type, msg, e) => this.logger.appLog(type, appDomain, msg, e);
         }
         else {
             return undefined;
         }
     }
-    makeMailerIdCAP(m) {
-        if (m.capsRequested.mailerid === true) {
+    makeMailerIdCAP(requestedCAPs) {
+        if (requestedCAPs.mailerid === true) {
             return this.idManager.makeMailerIdCAP();
         }
         else {
@@ -218,24 +211,24 @@ class Core {
 exports.Core = Core;
 Object.freeze(Core.prototype);
 Object.freeze(Core);
-function makeStoragePolicy(manifest) {
-    if (!manifest.capsRequested.storage) {
+function makeStoragePolicy(appDomain, requestedCAPs) {
+    if (!requestedCAPs.storage) {
         throw new Error(`Missing storage setting in app's manifest`);
     }
-    const capReq = manifest.capsRequested.storage;
+    const capReq = requestedCAPs.storage;
     let policy;
     if (capReq.appFS === 'default') {
         policy = {
             canOpenAppFS: singleDomainAppFSChecker({
-                domain: manifest.appDomain,
+                domain: appDomain,
                 storage: 'synced-n-local'
             })
         };
     }
     else if (Array.isArray(capReq.appFS)) {
         const okDomains = capReq.appFS
-            .filter(fsInfo => (fsInfo.domain === manifest.appDomain) ||
-            fsInfo.domain.endsWith('.' + manifest.appDomain))
+            .filter(fsInfo => (fsInfo.domain === appDomain) ||
+            fsInfo.domain.endsWith('.' + appDomain))
             .map(fsInfo => json_utils_1.copy(fsInfo));
         policy = {
             canOpenAppFS: severalDomainsAppFSChecker(okDomains)

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

@@ -1,6 +1,6 @@
 import { Caller, ExposedServices } from "../ipc-via-protobuf/connector";
-import { ClientCAPsWraps, CAPsExposures } 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?: Exclude<CAPsExposures<T>, CAPsExposures<W3N>>): void;
-export declare function makeW3Nclient<T extends W3N>(clientSide: Caller, extraCAPs?: Exclude<ClientCAPsWraps<T>, ClientCAPsWraps<W3N>>): 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

@@ -2,9 +2,12 @@ import { ExposedObj, ExposedFn, ExposedServices, Caller } from "../ipc-via-proto
 export declare type CAPsExposures<T> = {
     [cap in keyof Required<T>]: (cap: any, coreSide: ExposedServices) => ExposedObj<any> | ExposedFn;
 };
-export declare function exposeCAPs<T extends W3N, W3N extends object>(coreSide: ExposedServices, w3n: T, mainCAPs: CAPsExposures<W3N>, extraCAPs: CAPsExposures<T> | undefined): void;
+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 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: Exclude<ClientCAPsWraps<T>, ClientCAPsWraps<W3N>> | undefined): T;
+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/startup-caps.d.ts

@@ -1,6 +1,6 @@
 import { ExposedServices, Caller } from "../ipc-via-protobuf/connector";
-import { ClientCAPsWraps, CAPsExposures } 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?: Exclude<CAPsExposures<T>, CAPsExposures<W3N>>): void;
-export declare function makeStartupW3Nclient<T extends W3N>(clientSide: Caller, extraCAPs?: Exclude<ClientCAPsWraps<T>, ClientCAPsWraps<W3N>>): 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/build/lib-index.d.ts

@@ -4,6 +4,7 @@ export * from "./core-ipc/startup-caps";
 export * from "./ipc-via-protobuf/connector";
 export { FileMsg, makeFileCaller, exposeFileService } from "./ipc-via-protobuf/file";
 export { FSMsg, makeFSCaller, exposeFSService } from "./ipc-via-protobuf/fs";
+export { makeLogCaller, exposeLogger } from "./ipc-via-protobuf/log-cap";
 export * from "./core";
 export { makeServiceLocator, ServiceLocatorMaker } from "./lib-client/service-locator";
 export { makeNetClient } from "./lib-client/request-utils";

package/build/lib-index.js

@@ -36,6 +36,9 @@ Object.defineProperty(exports, "exposeFileService", { enumerable: true, get: fun
 var fs_1 = require("./ipc-via-protobuf/fs");
 Object.defineProperty(exports, "makeFSCaller", { enumerable: true, get: function () { return fs_1.makeFSCaller; } });
 Object.defineProperty(exports, "exposeFSService", { enumerable: true, get: function () { return fs_1.exposeFSService; } });
+var log_cap_1 = require("./ipc-via-protobuf/log-cap");
+Object.defineProperty(exports, "makeLogCaller", { enumerable: true, get: function () { return log_cap_1.makeLogCaller; } });
+Object.defineProperty(exports, "exposeLogger", { enumerable: true, get: function () { return log_cap_1.exposeLogger; } });
 __exportStar(require("./core"), exports);
 var service_locator_1 = require("./lib-client/service-locator");
 Object.defineProperty(exports, "makeServiceLocator", { enumerable: true, get: function () { return service_locator_1.makeServiceLocator; } });

package/package.json

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