core-3nweb-client-lib 0.18.5 → 0.19.1

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

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

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

@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2016 - 2017 3NSoft Inc.
+ Copyright (C) 2016 - 2017, 2021 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
@@ -19,7 +19,7 @@
  * This is a namespace for things used by storage and any file functionality.
  */
 declare namespace web3n.storage {
-	
+
 	interface Service {
 
 		/**
@@ -57,4 +57,13 @@ declare namespace web3n.storage {
 	type StorageType = 'device'|'synced'|'local';
 	type StorageUse = 'user'|'system'|'app';
 
+	interface StorageException extends web3n.RuntimeException {
+		type: 'storage';
+		appName?: string;
+		badAppName?: boolean;
+		notAllowedToOpenFS?: boolean;
+		storageType?: StorageType;
+		storageSegment: StorageUse;
+	}
+
 }

package/build/core/asmail/delivery/msg.js

@@ -176,7 +176,7 @@ class Msg {
         return this.progress.allDone;
     }
     isSendingNow() {
-        return !!this.sendingProc.getP();
+        return !!this.sendingProc.isProcessing();
     }
     deliverySizeLeft() {
         if (this.progress.allDone) {
@@ -210,7 +210,7 @@ class Msg {
             return;
         }
         this.cancelled = true;
-        const filesProc = this.progressSavingProc.getP();
+        const filesProc = this.progressSavingProc.latestTaskAtThisMoment();
         if (!filesProc) {
             return;
         }

package/build/core/asmail/delivery/per-recipient-wip.js

@@ -82,7 +82,7 @@ class WIP {
      * or if this wip is done, undefined is returned.
      */
     startNext() {
-        let proc = this.proc.getP();
+        let proc = this.proc.latestTaskAtThisMoment();
         if (proc) {
             return;
         }

package/build/core/asmail/inbox/index.js

@@ -78,7 +78,7 @@ class InboxOnServer {
     async removeMsg(msgId) {
         // check for an already started process
         const procId = 'removal of ' + msgId;
-        const promise = this.procs.getP(procId);
+        const promise = this.procs.latestTaskAtThisMoment(procId);
         if (promise) {
             return promise;
         }
@@ -194,7 +194,7 @@ class InboxOnServer {
         }
         // check for an already started process
         const procId = 'listing msgs';
-        const promise = this.procs.getP(procId);
+        const promise = this.procs.latestTaskAtThisMoment(procId);
         if (promise) {
             return promise;
         }
@@ -234,7 +234,7 @@ class InboxOnServer {
             throw `Given message id is not a non-empty string`;
         }
         const procId = `get msg #${msgId}`;
-        const promise = this.procs.getP(procId);
+        const promise = this.procs.latestTaskAtThisMoment(procId);
         if (promise) {
             return promise;
         }

package/build/core/id-manager.js

@@ -192,7 +192,7 @@ class IdManager {
         }
     }
     async provisionUsingSavedKey() {
-        let proc = this.provisioningProc.getP();
+        let proc = this.provisioningProc.latestTaskAtThisMoment();
         if (proc) {
             return proc;
         }

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(): {
+    start(logCAP?: boolean): {
         capsForStartup: web3n.startup.W3N;
         coreInit: Promise<string>;
     };

package/build/core/index.js

@@ -30,6 +30,7 @@ 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;
@@ -111,13 +112,16 @@ class Core {
         const core = new Core(makeNet, makeResolver, makeCryptor, dirs, logger, conf.signUpUrl);
         return core;
     }
-    start() {
+    start(logCAP = false) {
         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/storage/index.d.ts

@@ -1,7 +1,6 @@
 import { GetSigner } from '../id-manager';
 import { GenerateKey } from '../sign-in';
 import { StorageGetter } from '../../lib-client/3nstorage/xsp-fs/common';
-import { StorageException as BaseExc } from '../../lib-client/3nstorage/exceptions';
 import { ServiceLocator } from '../../lib-client/service-locator';
 import { AsyncSBoxCryptor } from 'xsp-files';
 import { NetClient } from '../../lib-client/request-utils';
@@ -10,13 +9,6 @@ import { LogError } from '../../lib-client/logging/log-to-file';
 declare type WritableFS = web3n.files.WritableFS;
 declare type StorageType = web3n.storage.StorageType;
 declare type FSItem = web3n.files.FSItem;
-export interface StorageException extends BaseExc {
-    appName?: string;
-    badAppName?: boolean;
-    notAllowedToOpenFS?: boolean;
-    storageType?: StorageType;
-    storageSegment: 'app' | 'system' | 'user';
-}
 export declare const sysFolders: {
     appData: string;
     apps: string;

package/build/core/storage/local/obj-files-gc.js

@@ -39,7 +39,7 @@ class GC {
         this.scheduled = new Set();
         this.scheduleCollection = (obj) => {
             this.scheduled.add(obj);
-            if (this.gcProc.getP()) {
+            if (this.gcProc.isProcessing()) {
                 return;
             }
             this.gcProc.start(this.objCollecting);

package/build/core/storage/synced/obj-files-gc.js

@@ -42,7 +42,7 @@ class GC {
                 return;
             }
             this.scheduled.add(obj);
-            if (this.gcProc.getP()) {
+            if (this.gcProc.isProcessing()) {
                 return;
             }
             this.gcProc.start(this.objCollecting);

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

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2020 3NSoft Inc.
+ Copyright (C) 2020 - 2021 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
@@ -18,21 +18,30 @@
 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");
 function exposeStartupW3N(coreSide, w3n) {
     const expW3N = {
         signIn: startup_cap_1.wrapSignInCAP(w3n.signIn),
         signUp: startup_cap_1.wrapSignUpCAP(w3n.signUp)
     };
+    if (w3n.log) {
+        expW3N.log = log_cap_1.exposeLogger(w3n.log);
+    }
     coreSide.exposeW3NService(expW3N);
 }
 exports.exposeStartupW3N = exposeStartupW3N;
 function makeStartupW3Nclient(clientSide) {
     const objPath = [connector_1.W3N_NAME];
-    return {
+    const lstOfCAPs = clientSide.listObj(objPath);
+    const w3n = {
         signIn: startup_cap_1.makeSignInCaller(clientSide, objPath.concat('signIn')),
         signUp: startup_cap_1.makeSignUpCaller(clientSide, objPath.concat('signUp'))
     };
+    if (lstOfCAPs.includes('log')) {
+        w3n.log = log_cap_1.makeLogCaller(clientSide, objPath.concat('log'));
+    }
+    return w3n;
 }
 exports.makeStartupW3Nclient = makeStartupW3Nclient;
 Object.freeze(exports);

package/build/lib-client/3nstorage/xsp-fs/node-in-fs.d.ts

@@ -41,7 +41,6 @@ export declare abstract class NodeInFS<TCrypto extends NodeCrypto, TAttrs extend
     protected crypto: TCrypto;
     protected attrs: AttrsHolder<TAttrs>;
     private writeProc;
-    protected get transition(): Promise<any> | undefined;
     get version(): number;
     protected setCurrentVersion(newVersion: number): void;
     private remoteEvents;

package/build/lib-client/3nstorage/xsp-fs/node-in-fs.js

@@ -155,12 +155,6 @@ class NodeInFS {
          */
         this.events = undefined;
     }
-    get transition() {
-        if (!this.writeProc) {
-            return;
-        }
-        return this.writeProc.getP();
-    }
     get version() {
         return this.currentVersion;
     }
@@ -274,7 +268,7 @@ class NodeInFS {
         if (!this.writeProc) {
             this.writeProc = new processes_1.SingleProc();
         }
-        if (!awaitPrevChange && this.writeProc.getP()) {
+        if (!awaitPrevChange && this.writeProc.isProcessing()) {
             throw file_1.makeFileException(file_1.Code.concurrentUpdate, this.name + ` type ${this.type}`);
         }
         try {

package/build/lib-client/server-events.js

@@ -42,10 +42,10 @@ class ServerEvents {
             let detach;
             let obs = observer;
             // open server, ensuring only one process running
-            if (!this.openningServer.getP()) {
+            if (!this.openningServer.isProcessing()) {
                 this.openningServer.addStarted(this.subscribeToServer());
             }
-            this.openningServer.getP()
+            this.openningServer.latestTaskAtThisMoment()
                 .then((server) => {
                 this.setServer(server);
                 if (!obs) {
@@ -106,7 +106,7 @@ class ServerEvents {
         }
     }
     restartObservation(event) {
-        return rxjs_1.from(processes_1.sleep(this.restartWaitSecs))
+        return rxjs_1.from(processes_1.sleep(this.restartWaitSecs * 1000))
             .pipe(operators_1.mergeMap(() => this.observe(event)));
     }
 }

package/build/lib-common/processes.d.ts

@@ -22,7 +22,8 @@ export declare class NamedProcs {
      * @return a promise of a process' completion, or undefined, if process with
      * given id is unknown.
      */
-    getP<T>(id: string): Promise<T> | undefined;
+    latestTaskAtThisMoment<T>(id: string): Promise<T> | undefined;
+    isProcessing(id: string): boolean;
     /**
      * This method will add a promise of an already started process.
      * @param id is a string key of a process
@@ -60,7 +61,8 @@ export declare class SingleProc {
     private actions;
     private running;
     constructor(onGoingIdle?: (() => void) | undefined);
-    getP<T>(): Promise<T> | undefined;
+    isProcessing(): boolean;
+    latestTaskAtThisMoment<T>(): Promise<T> | undefined;
     addStarted<T>(promise: Promise<T>): Promise<T>;
     start<T>(action: Action<T>): Promise<T>;
     private runIfIdle;

package/build/lib-common/processes.js

@@ -41,9 +41,13 @@ class NamedProcs {
      * @return a promise of a process' completion, or undefined, if process with
      * given id is unknown.
      */
-    getP(id) {
+    latestTaskAtThisMoment(id) {
         const proc = this.processes.get(id);
-        return (proc ? proc.getP() : undefined);
+        return (proc ? proc.latestTaskAtThisMoment() : undefined);
+    }
+    isProcessing(id) {
+        const proc = this.processes.get(id);
+        return (proc ? proc.isProcessing() : false);
     }
     /**
      * This method will add a promise of an already started process.
@@ -52,7 +56,7 @@ class NamedProcs {
      * @return a promise of a process' completion.
      */
     addStarted(id, promise) {
-        if (this.getP(id)) {
+        if (this.isProcessing(id)) {
             throw new Error('Process with id "' + id + '" is already in progress.');
         }
         return this.startOrChain(id, () => promise);
@@ -65,7 +69,7 @@ class NamedProcs {
      * @return a promise of a process' completion.
      */
     start(id, action) {
-        if (this.getP(id)) {
+        if (this.isProcessing(id)) {
             throw new Error('Process with id "' + id + '" is already in progress.');
         }
         return this.startOrChain(id, action);
@@ -104,19 +108,22 @@ class SingleProc {
         this.running = false;
         Object.seal(this);
     }
-    getP() {
+    isProcessing() {
+        return (this.actions.length > 0);
+    }
+    latestTaskAtThisMoment() {
         return ((this.actions.length === 0) ?
             undefined :
             this.actions[this.actions.length - 1].deferred.promise);
     }
     addStarted(promise) {
-        if (this.actions.length > 0) {
+        if (this.isProcessing()) {
             throw new Error('Process is already in progress.');
         }
         return this.startOrChain(() => promise);
     }
     start(action) {
-        if (this.actions.length > 0) {
+        if (this.isProcessing()) {
             throw new Error('Process is already in progress.');
         }
         return this.startOrChain(action);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "core-3nweb-client-lib",
-  "version": "0.18.5",
+  "version": "0.19.1",
   "description": "3NWeb client core library, embeddable into different environments",
   "main": "build/lib-index.js",
   "types": "build/lib-index.d.ts",
@@ -34,10 +34,10 @@
     "xsp-files": "^3.1.10"
   },
   "devDependencies": {
-    "@types/jasmine": "^3.5.11",
+    "@types/jasmine": "^3.9.1",
     "@types/node": "^12.0.4",
     "@types/ws": "^4.0.0",
-    "jasmine": "^2.4.1",
+    "jasmine": "^3.9.0",
     "spec-3nweb-server": "^1.3.8",
     "typescript": "^3.7.3"
   }