@vuu-ui/vuu-data-remote 5.0.0-alpha.3 → 5.0.0-alpha.5

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "5.0.0-alpha.3",
+  "version": "5.0.0-alpha.5",
   "main": "./src/index.js",
   "author": "heswell",
   "license": "Apache-2.0",
@@ -11,15 +11,15 @@
     "type-defs": "node ../../scripts/build-type-defs.mjs"
   },
   "devDependencies": {
-    "@vuu-ui/vuu-data-types": "5.0.0-alpha.3",
-    "@vuu-ui/vuu-table-types": "5.0.0-alpha.3",
-    "@vuu-ui/vuu-filter-types": "5.0.0-alpha.3",
-    "@vuu-ui/vuu-protocol-types": "5.0.0-alpha.3"
+    "@vuu-ui/vuu-data-types": "5.0.0-alpha.5",
+    "@vuu-ui/vuu-table-types": "5.0.0-alpha.5",
+    "@vuu-ui/vuu-filter-types": "5.0.0-alpha.5",
+    "@vuu-ui/vuu-protocol-types": "5.0.0-alpha.5"
   },
   "dependencies": {
-    "@vuu-ui/vuu-filter-parser": "5.0.0-alpha.3",
-    "@vuu-ui/vuu-utils": "5.0.0-alpha.3",
-    "@vuu-ui/vuu-data-editing": "5.0.0-alpha.3"
+    "@vuu-ui/vuu-filter-parser": "5.0.0-alpha.5",
+    "@vuu-ui/vuu-utils": "5.0.0-alpha.5",
+    "@vuu-ui/vuu-data-editing": "5.0.0-alpha.5"
   },
   "files": [
     "README.md",

package/src/VuuDataSource.js

@@ -107,6 +107,7 @@ class VuuDataSource extends BaseDataSource {
             else {
                 if (infoEnabled && "viewport-update" === message.type) info(`handleMessageFromServer<viewport-update> range (${message.range?.from}:${message.range?.to}) rows ${message.rows?.at(0)?.[0]} - ${message.rows?.at(-1)?.[0]}`);
                 this._clientCallback?.(message);
+                if ("subscribe-failed" === message.type && this.#sourceTableDataSource) this.unsubscribe(false);
             }
             if ("debounce" === this.optimize) this.revertDebounce();
         }
@@ -121,17 +122,18 @@ class VuuDataSource extends BaseDataSource {
             this._clientCallback?.(msg);
         }
     };
-    unsubscribe() {
+    unsubscribe(notifyServer = true) {
         if ("unsubscribed" !== this.#status) {
             info?.(`unsubscribe #${this.viewport}`);
-            if (this.viewport) {
-                this.server?.unsubscribe(this.viewport);
-                this.emit("unsubscribed", this.viewport);
+            const viewport = this.viewport;
+            this.#status = "unsubscribed";
+            if (viewport) {
+                if (notifyServer) this.server?.unsubscribe(viewport);
+                this.emit("unsubscribed", viewport);
             }
-            this.server?.destroy(this.viewport);
+            this.server?.destroy(viewport);
             this.server = null;
             this.removeAllListeners();
-            this.#status = "unsubscribed";
             this.viewport = "";
             this.range = Range(0, 0);
         }

package/src/server-proxy/server-proxy.js

@@ -92,8 +92,16 @@ class ServerProxy {
         if ("" === this.authToken) server_proxy_error("login, cannot login until auth token has been obtained");
     }
     clearAllViewports() {
-        this.viewports.forEach((viewport)=>{
-            viewport.clearCache();
+        this.viewports.forEach((viewport, key)=>{
+            if (isSessionTable(viewport.table)) {
+                this.mapClientToServerViewport.delete(viewport.clientViewportId);
+                this.viewports.delete(key);
+                this.postMessageToClient({
+                    clientViewportId: viewport.clientViewportId,
+                    type: "subscribe-failed",
+                    msg: `session table ${viewport.table.table} disconnected`
+                });
+            } else viewport.clearCache();
         });
     }
     disconnect() {

package/types/VuuDataSource.d.ts

@@ -14,7 +14,7 @@ export declare class VuuDataSource extends BaseDataSource implements DataSourceB
     subscribe(subscribeProps: DataSourceSubscribeProps, callback: DataSourceSubscribeCallback): Promise<void>;
     handleMessageFromServer: (message: DataSourceCallbackMessage) => void;
     handleSessionMessageFromServer: (msg: DataSourceCallbackMessage) => void;
-    unsubscribe(): void;
+    unsubscribe(notifyServer?: boolean): void;
     suspend(escalateToDisable?: boolean, escalateDelay?: number | undefined): void;
     /**
      * Tell the server we wish to resume receiving messages. Server will send a