core-3nweb-client-lib 0.31.4 → 0.31.6

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

@@ -32,7 +32,7 @@ declare namespace web3n.caps.common {
 		mail?: MailCAPSetting;
 		storage?: StorageCAPSetting;
 		mailerid?: true;
-		log?: LogCAPSetting;
+		logToPlatform?: true;
 	}
 
 	interface StorageCAPSetting {
@@ -65,12 +65,10 @@ declare namespace web3n.caps.common {
 		receivingFrom?: 'all' | { whitelist: string[]; };
 	}
 
-	type LogCAPSetting = 'all';
-
 	interface W3N {
+		log: Logger;
 		mail?: asmail.Service;
 		storage?: storage.Service;
-		log?: Logger;
 		mailerid?: mailerid.Service;
 	}
 

package/build/core/index.js

@@ -157,7 +157,7 @@ class Core {
         }
     }
     makeLogCAP(appDomain, requestedCAPs) {
-        if (requestedCAPs.log === 'all') {
+        if (requestedCAPs.logToPlatform === true) {
             return (type, msg, e) => this.logger.appLog(type, appDomain, msg, e);
         }
         else {

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

@@ -44,15 +44,49 @@ function makeW3Nclient(clientSide, extraCAPs) {
         mailerid: mailerid_cap_ipc_1.makeMailerIdCaller,
         storage: storage_cap_ipc_1.makeStorageCaller,
     };
-    return (0, generic_1.makeClientSide)(clientSide, mainCAPs, extraCAPs);
+    const clientW3N = (0, generic_1.makeClientSide)(clientSide, mainCAPs, extraCAPs);
+    addLogToConsoleIfNoCap(clientW3N);
+    return clientW3N;
 }
-function promiseW3Nclient(clientSide, extraCAPs) {
+async function promiseW3Nclient(clientSide, extraCAPs) {
     const mainCAPs = {
         log: log_cap_1.makeLogCaller,
         mail: asmail_cap_ipc_1.makeASMailCaller,
         mailerid: mailerid_cap_ipc_1.makeMailerIdCaller,
         storage: storage_cap_ipc_1.promiseStorageCaller,
     };
-    return (0, generic_1.promiseClientSide)(clientSide, mainCAPs, extraCAPs);
+    const clientW3N = await (0, generic_1.promiseClientSide)(clientSide, mainCAPs, extraCAPs);
+    addLogToConsoleIfNoCap(clientW3N);
+    return clientW3N;
+}
+function addLogToConsoleIfNoCap(clientW3N) {
+    if (!clientW3N.log) {
+        clientW3N.log = async (type, msg, err) => {
+            if (type === 'error') {
+                if (err === undefined) {
+                    console.error(msg);
+                }
+                else {
+                    console.error(msg, err);
+                }
+            }
+            else if (type === 'warning') {
+                if (err === undefined) {
+                    console.warn(msg);
+                }
+                else {
+                    console.warn(msg, err);
+                }
+            }
+            else {
+                if (err === undefined) {
+                    console.log(msg);
+                }
+                else {
+                    console.log(msg, err);
+                }
+            }
+        };
+    }
 }
 Object.freeze(exports);

package/build/core-ipc/file.js

@@ -105,7 +105,7 @@ function makeFileCaller(caller, fileMsg) {
             }
         }
     }
-    caller.registerClientDrop(file, fileMsg.impl);
+    caller.registerClientDrop(file, fileMsg.impl, fileMsg);
     return file;
 }
 function exposeFileService(file, expServices) {

package/build/core-ipc/fs.js

@@ -116,7 +116,7 @@ function makeFSCaller(caller, fsMsg) {
             }
         }
     }
-    caller.registerClientDrop(fs, fsMsg.impl);
+    caller.registerClientDrop(fs, fsMsg.impl, fsMsg);
     return fs;
 }
 function exposeFSService(fs, expServices) {

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

@@ -25,11 +25,14 @@ export declare class ClientsSideImpl implements ClientsSide {
     private setupFnCall;
     startPromiseCall(path: string[], req: EnvelopeBody): Promise<EnvelopeBody>;
     startObservableCall(path: string[], req: EnvelopeBody, obs: Subject<EnvelopeBody>): () => void;
-    registerClientDrop(o: any, srvRef: ObjectReference<any>): void;
+    registerClientDrop(o: any, srvRef: ObjectReference<any>, reconstructData?: any): void;
     private doOnClientObjDrop;
     private sendObjDropMsg;
     srvRefOf(clientObj: any): ObjectReference<any>;
-    findCallingObjByRef<T>(ref: ObjectReference<any>): T | undefined;
+    findCallingObjByRef<T, R>(ref: ObjectReference<any>): {
+        obj?: T;
+        reconstructData?: R;
+    } | undefined;
     listObj(path: string[]): string[];
     listObjAsync(path: string[]): Promise<string[]>;
 }

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

@@ -211,10 +211,12 @@ class ClientsSideImpl {
             throw err;
         }
     }
-    registerClientDrop(o, srvRef) {
+    registerClientDrop(o, srvRef, reconstructData) {
         o._isObjectFromCore = true;
         this.srvFinalRegistry.register(o, srvRef);
-        this.weakSrvByRefs.set(srvRef.path[0], new WeakRef(o));
+        this.weakSrvByRefs.set(srvRef.path[0], {
+            weakRef: new WeakRef(o), reconstructData
+        });
         this.srvRefs.set(o, srvRef);
     }
     doOnClientObjDrop(srvRef) {
@@ -237,13 +239,16 @@ class ClientsSideImpl {
         }
     }
     findCallingObjByRef(ref) {
-        const weakRef = this.weakSrvByRefs.get(ref.path[0]);
-        if (!weakRef) {
+        const found = this.weakSrvByRefs.get(ref.path[0]);
+        if (!found) {
             return;
         }
-        const o = weakRef.deref();
-        if (o) {
-            return o;
+        const obj = found.weakRef.deref();
+        if (obj) {
+            return { obj };
+        }
+        else if (found.reconstructData) {
+            return { reconstructData: found.reconstructData };
         }
         else {
             this.weakSrvByRefs.delete(ref.path[0]);

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

@@ -24,11 +24,14 @@ export interface ServicesSide {
 export interface Caller {
     startPromiseCall(path: string[], req: EnvelopeBody): Promise<EnvelopeBody>;
     startObservableCall(path: string[], req: EnvelopeBody, obs: SubjectLike<EnvelopeBody>): () => void;
-    registerClientDrop(o: any, srvRef: ObjectReference<any>): void;
+    registerClientDrop(o: any, srvRef: ObjectReference<any>, reconstructData?: any): void;
     srvRefOf(clientObj: any): ObjectReference<any>;
     listObj?: (path: string[]) => string[];
     listObjAsync?: (path: string[]) => Promise<string[]>;
-    findCallingObjByRef<T>(ref: ObjectReference<any>): T | undefined;
+    findCallingObjByRef<T, R>(ref: ObjectReference<any>): {
+        obj?: T;
+        reconstructData?: R;
+    } | undefined;
 }
 export interface ObjectFromCore {
     _isObjectFromCore: true;