core-3nweb-client-lib 0.31.3 → 0.31.5

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/log-cap.js

@@ -26,6 +26,7 @@ function exposeLogger(fn) {
 }
 function makeLogCaller(caller, path) {
     const log = (0, caller_side_wrap_1.makeReqRepFuncCaller)(caller, path);
-    return (type, msg, err) => log(type, msg, (0, error_1.stringifyErr)(err));
+    return (type, msg, err) => log(type, msg, (0, error_1.stringifyErr)(err)).catch(noop);
 }
+function noop() { }
 Object.freeze(exports);

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

@@ -192,12 +192,12 @@ class ClientsSideImpl {
         const fnCallNum = reqEnv.headers.fnCallNum.value;
         try {
             this.startCall(reqEnv);
-            return deferred.promise;
         }
         catch (err) {
             this.fnCalls.delete(fnCallNum);
-            throw err;
+            deferred.reject(err);
         }
+        return deferred.promise;
     }
     startObservableCall(path, req, obs) {
         const reqEnv = this.setupFnCall(path, req, undefined, obs);