core-3nweb-client-lib 0.43.0 → 0.43.2

package/build/core/storage/synced/remote-events.js

@@ -48,13 +48,15 @@ class RemoteEvents {
             heartbeat.subscribe({
                 next: ev => this.connectionEvents.next(toStorageConnectionStatus(ev))
             });
-            return client;
+            return [
+                this.absorbObjChange(client),
+                this.absorbObjRemoval(client),
+                // XXX commenting out these for now, as server hasn't implemented these
+                // this.absorbObjVersionArchival(client),
+                // this.absorbArchVersionRemoval(client)
+            ];
         }))
-            .pipe((0, operators_1.map)(client => (0, rxjs_1.merge)(this.absorbObjChange(client), this.absorbObjRemoval(client), 
-        // XXX commenting out to see if unknownEvent exception goes away
-        //     Is server doesn't know it?
-        // this.absorbObjVersionArchival(client),
-        this.absorbArchVersionRemoval(client))), (0, operators_1.mergeMap)(event$ => event$))
+            .pipe((0, operators_1.mergeMap)(event$ => event$), (0, operators_1.mergeMap)(event$ => event$))
             .subscribe({
             next: noop,
             error: async (err) => {

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

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2016 - 2017 3NSoft Inc.
+ Copyright (C) 2016 - 2017, 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
@@ -451,7 +451,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), ipcChannel => this.makeRequest(UNSUBSCRIBE_REQ_NAME, ipcChannel).catch(_ => { }));
     }
     handleMsg(env) {
         if (env.type === 'event') {
@@ -543,8 +543,19 @@ class EventsReceivingSide extends RequestingSide {
             }
         };
         const listener = new EventListener(channel, observer, detach);
-        this.listeners.add(ipcChannel, listener);
-        this.channels.subscribeTo(ipcChannel);
+        this.channels.subscribeTo(ipcChannel).then(() => this.listeners.add(ipcChannel, listener), err => {
+            var _a;
+            if (observer.error) {
+                observer.error(makeEventException({
+                    cause: err,
+                    failToSubscribe: true,
+                    channel: ipcChannel
+                }));
+            }
+            else {
+                (_a = observer.complete) === null || _a === void 0 ? void 0 : _a.call(observer);
+            }
+        });
         return detach;
     }
     wrap() {
@@ -571,16 +582,22 @@ class IpcEventChannels {
         this.subscriptionProcs = new synced_1.NamedProcs();
         Object.freeze(this);
     }
-    subscribeTo(ipcChannel) {
+    async subscribeTo(ipcChannel) {
         if (this.subscribedIpcChannels.has(ipcChannel)) {
             return;
         }
-        this.subscriptionProcs.startOrChain(ipcChannel, async () => {
+        await this.subscriptionProcs.startOrChain(ipcChannel, async () => {
             if (this.subscribedIpcChannels.has(ipcChannel)) {
                 return;
             }
             this.subscribedIpcChannels.add(ipcChannel);
-            await this.subscribe(ipcChannel);
+            try {
+                await this.subscribe(ipcChannel);
+            }
+            catch (err) {
+                this.subscribedIpcChannels.delete(ipcChannel);
+                throw err;
+            }
         });
     }
     async unsubscribeFrom(ipcChannel) {

package/package.json

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