core-3nweb-client-lib 0.41.10 → 0.41.11

package/build/lib-client/server-events.d.ts

@@ -1,11 +1,13 @@
 import { SubscribingClient } from '../lib-common/ipc/generic-ipc';
 import { Observable } from 'rxjs';
+import { LogError } from './logging/log-to-file';
 export declare class ServerEvents<N extends string, T> {
-    private subscribeToServer;
+    private readonly subscribeToServer;
     private restartWaitSecs;
+    private readonly logError;
     private server;
     private openningServer;
-    constructor(subscribeToServer: () => Promise<SubscribingClient>, restartWaitSecs: number);
+    constructor(subscribeToServer: () => Promise<SubscribingClient>, restartWaitSecs: number, logError: LogError);
     /**
      * This method creates an observable of server's events.
      * @param event is an event on server, to which to subscribe.

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

@@ -23,9 +23,10 @@ const sleep_1 = require("../lib-common/processes/sleep");
 const operators_1 = require("rxjs/operators");
 const error_1 = require("../lib-common/exceptions/error");
 class ServerEvents {
-    constructor(subscribeToServer, restartWaitSecs) {
+    constructor(subscribeToServer, restartWaitSecs, logError) {
         this.subscribeToServer = subscribeToServer;
         this.restartWaitSecs = restartWaitSecs;
+        this.logError = logError;
         this.server = undefined;
         this.openningServer = new synced_1.SingleProc();
         Object.seal(this);
@@ -72,13 +73,18 @@ class ServerEvents {
                 }
             };
         })
-            .pipe((0, operators_1.catchError)(err => {
+            .pipe(
+        // XXX tap to log more details
+        (0, operators_1.tap)({
+            complete: () => this.logError({}, `ServerEvents.observe stream completes`),
+            error: err => this.logError(err, `ServerEvents.observe stream has error`)
+        }), (0, operators_1.catchError)(err => {
             if (this.shouldRestartAfterErr(err)) {
                 console.error((0, error_1.stringifyErr)(err));
                 return this.restartObservation(event);
             }
             else {
-                return (0, rxjs_1.throwError)(err);
+                return (0, rxjs_1.throwError)(() => err);
             }
         }));
         return event$;

package/build/lib-client/ws-utils.js

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2017, 2019 3NSoft Inc.
+ Copyright (C) 2017, 2019, 2025 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
@@ -29,7 +29,7 @@ function openSocket(url, sessionId) {
     headers[request_utils_1.SESSION_ID_HEADER] = sessionId;
     const ws = new WebSocket(url, { headers, agent: https_1.globalAgent });
     const opening = (0, deferred_1.defer)();
-    const initOnError = err => opening.reject((0, http_1.makeConnectionException)(url, undefined, `Cannot open websocket connection due to error: ${err.message}`));
+    const initOnError = (err) => opening.reject((0, http_1.makeConnectionException)(url, undefined, `Cannot open websocket connection due to error: ${err.message}`));
     const onNonOkReply = (req, res) => {
         const errReply = {
             url,

package/build/lib-common/ipc/generic-ipc.js

@@ -13,15 +13,20 @@
  See the GNU General Public License for more details.
  
  You should have received a copy of the GNU General Public License along with
- this program. If not, see <http://www.gnu.org/licenses/>. */
+ this program. If not, see <http://www.gnu.org/licenses/>.
+*/
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SingleObserverWrap = exports.MultiObserverWrap = void 0;
 exports.makeRequestingClient = makeRequestingClient;
 exports.makeRequestServer = makeRequestServer;
 exports.makeEventfulServer = makeEventfulServer;
 exports.makeSubscribingClient = makeSubscribingClient;
+const runtime_1 = require("../exceptions/runtime");
 const map_of_sets_1 = require("../map-of-sets");
 const synced_1 = require("../processes/synced");
+function makeEventException(params) {
+    return (0, runtime_1.makeRuntimeException)('events', params, {});
+}
 function toTransferrableError(e) {
     if (e.runtimeException) {
         return e;
@@ -142,7 +147,14 @@ class RequestingSide extends MessageHandler {
         }
         this.replyDeferreds.clear();
     }
-    makeRequest(name, req, notifyCallback) {
+    async makeRequest(name, req, notifyCallback) {
+        if (!this.rawDuplex) {
+            throw makeEventException({
+                channel: this.channel,
+                duplexDisconnected: true,
+                request: name
+            });
+        }
         this.counter += 1;
         if (this.counter === Number.MAX_SAFE_INTEGER) {
             this.counter = Number.MIN_SAFE_INTEGER;
@@ -225,26 +237,21 @@ class ReplyingSide extends MessageHandler {
         }
     }
     errorReply(env, err) {
-        const reply = {
+        return {
             type: 'reply',
             reqName: env.name,
             reqCount: env.count,
-            rep: null
+            rep: null,
+            err: (err.runtimeException ?
+                err : toTransferrableError(err))
         };
-        if (err.runtimeException) {
-            reply.err = err;
-        }
-        else {
-            reply.err = toTransferrableError(err);
-        }
-        return reply;
     }
     normalReply(env, rep, isInProgress = false) {
         const reply = {
             type: 'reply',
             reqName: env.name,
             reqCount: env.count,
-            rep: rep,
+            rep,
         };
         if (isInProgress) {
             reply.isInProgress = true;
@@ -283,14 +290,6 @@ Object.freeze(ReplyingSide);
 function makeRequestServer(channel, comm) {
     return (new ReplyingSide(channel, comm)).wrap();
 }
-function makeUnknownEventException(message) {
-    return {
-        runtimeException: true,
-        type: 'events',
-        unknownEvent: true,
-        message
-    };
-}
 const SUBSCRIBE_REQ_NAME = 'subscribe';
 const UNSUBSCRIBE_REQ_NAME = 'unsubscribe';
 class EventsSendingSide extends ReplyingSide {
@@ -313,7 +312,11 @@ class EventsSendingSide extends ReplyingSide {
         const event = env.req;
         const gr = this.findGroup(event);
         if (!gr) {
-            throw makeUnknownEventException(`Events' channel ${event} is not found in handling subscribe`);
+            throw makeEventException({
+                channel: this.channel,
+                unknownEvent: true,
+                message: `Events' channel ${event} is not found in handling subscribe`
+            });
         }
         this.subscribedEvents.add(event);
         await gr.subscribe(event);
@@ -322,7 +325,11 @@ class EventsSendingSide extends ReplyingSide {
         const event = env.req;
         const gr = this.findGroup(event);
         if (!gr) {
-            throw makeUnknownEventException(`Events' channel ${event} is not found in handling unsubscribe`);
+            throw makeEventException({
+                channel: this.channel,
+                unknownEvent: true,
+                message: `Events' channel ${event} is not found in handling unsubscribe`
+            });
         }
         this.subscribedEvents.delete(event);
         if (gr.unsubscribe) {
@@ -442,9 +449,7 @@ class EventsReceivingSide extends RequestingSide {
          * name, to which listener is attached.
          */
         this.listeners = new map_of_sets_1.MapOfSets();
-        this.channels = new IpcEventChannels((ipcChannel) => this.makeRequest(SUBSCRIBE_REQ_NAME, ipcChannel)
-            .catch(err => this.completeEvent(ipcChannel, err)), (ipcChannel) => this.makeRequest(UNSUBSCRIBE_REQ_NAME, ipcChannel)
-            .catch(_ => { }));
+        this.channels = new IpcEventChannels(ipcChannel => this.makeRequest(SUBSCRIBE_REQ_NAME, ipcChannel).catch(err => this.completeEvent(ipcChannel, err)), ipcChannel => this.makeRequest(UNSUBSCRIBE_REQ_NAME, ipcChannel).catch(_ => { }));
     }
     handleMsg(env) {
         if (env.type === 'event') {

package/build/lib-common/ipc/ws-ipc.d.ts

@@ -6,4 +6,5 @@ export interface WSException extends web3n.RuntimeException {
     socketSlow?: true;
     socketClosed?: true;
 }
+export declare function makeWSException(params: Partial<WSException>, flags?: Partial<WSException>): WSException;
 export declare function makeSubscriber(ws: WebSocket, ipcChannel: string | undefined): SubscribingClient;

package/build/lib-common/ipc/ws-ipc.js

@@ -16,10 +16,15 @@
  this program. If not, see <http://www.gnu.org/licenses/>. */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeEventfulServer = void 0;
+exports.makeWSException = makeWSException;
 exports.makeSubscriber = makeSubscriber;
+const runtime_1 = require("../exceptions/runtime");
 const generic_ipc_1 = require("./generic-ipc");
 var generic_ipc_2 = require("./generic-ipc");
 Object.defineProperty(exports, "makeEventfulServer", { enumerable: true, get: function () { return generic_ipc_2.makeEventfulServer; } });
+function makeWSException(params, flags) {
+    return (0, runtime_1.makeRuntimeException)('websocket', params, flags !== null && flags !== void 0 ? flags : {});
+}
 const MAX_TXT_BUFFER = 64 * 1024;
 /**
  * This creates a json communication point on a given web socket.
@@ -37,12 +42,7 @@ function makeJsonCommPoint(ws) {
         subscribe: obs => observers.add(obs),
         postMessage(env) {
             if (ws.bufferedAmount > MAX_TXT_BUFFER) {
-                const exc = {
-                    runtimeException: true,
-                    type: 'websocket',
-                    socketSlow: true
-                };
-                throw exc;
+                throw makeWSException({ socketSlow: true });
             }
             ws.send(JSON.stringify(env));
         }
@@ -84,13 +84,10 @@ function onClose(observers) {
             observers.complete();
         }
         else {
-            const exc = {
-                runtimeException: true,
-                type: 'websocket',
+            observers.error(makeWSException({
                 socketClosed: true,
                 cause: { code, reason }
-            };
-            observers.error(exc);
+            }));
         }
     };
 }
@@ -101,12 +98,7 @@ function onClose(observers) {
  */
 function onError(ws, observers) {
     return (err) => {
-        const exc = {
-            runtimeException: true,
-            type: 'websocket',
-            cause: err
-        };
-        observers.error(exc);
+        observers.error(makeWSException({ cause: err }));
         ws.close();
     };
 }

package/package.json

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