@vuu-ui/vuu-data-remote 0.13.107 → 0.13.108

package/cjs/ConnectionManager.js

@@ -15,11 +15,17 @@ var __accessCheck = (obj, member, msg) => member.has(obj) || __typeError("Cannot
 var __privateGet = (obj, member, getter) => (__accessCheck(obj, member, "read from private field"), getter ? getter.call(obj) : member.get(obj));
 var __privateAdd = (obj, member, value) => member.has(obj) ? __typeError("Cannot add the same private member more than once") : member instanceof WeakSet ? member.add(obj) : member.set(obj, value);
 var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "write to private field"), member.set(obj, value), value);
-var _instance, _connectionStatus, _deferredServerAPI, _pendingRequests, _viewports, _worker;
+var _connectionState, _instance, _deferredServerAPI, _pendingRequests, _viewports, _worker;
 const _ConnectionManager = class _ConnectionManager extends vuuUtils.EventEmitter {
   constructor() {
     super();
-    __privateAdd(this, _connectionStatus, "closed");
+    __privateAdd(this, _connectionState, {
+      connectionPhase: "connecting",
+      connectionStatus: "closed",
+      retryAttemptsTotal: -1,
+      retryAttemptsRemaining: -1,
+      secondsToNextRetry: -1
+    });
     __privateAdd(this, _deferredServerAPI, new vuuUtils.DeferredPromise());
     __privateAdd(this, _pendingRequests, /* @__PURE__ */ new Map());
     __privateAdd(this, _viewports, /* @__PURE__ */ new Map());
@@ -35,8 +41,12 @@ const _ConnectionManager = class _ConnectionManager extends vuuUtils.EventEmitte
             `[ConnectionManager] ${message.type} message received, viewport not found`
           );
         }
-      } else if (WebSocketConnection.isWebSocketConnectionStatus(message)) {
-        __privateSet(this, _connectionStatus, message);
+      } else if (message.type === "websocket-closed") {
+        this.emit("session-status", message);
+      } else if (vuuUtils.isLoginResponse(message)) {
+        this.emit("session-status", message);
+      } else if (WebSocketConnection.isWebSocketConnectionMessage(message)) {
+        __privateSet(this, _connectionState, message);
         this.emit("connection-status", message);
       } else if (vuuUtils.isConnectionQualityMetrics(message)) {
         this.emit("connection-metrics", message);
@@ -112,12 +122,6 @@ const _ConnectionManager = class _ConnectionManager extends vuuUtils.EventEmitte
     }
     return __privateGet(_ConnectionManager, _instance);
   }
-  get connectionStatus() {
-    return __privateGet(this, _connectionStatus);
-  }
-  get connected() {
-    return __privateGet(this, _connectionStatus) === "connected" || __privateGet(this, _connectionStatus) === "reconnected";
-  }
   /**
    * Open a connection to the VuuServer. This method opens the websocket connection
    * and logs in. It can be called from whichever client code has access to the auth
@@ -129,19 +133,16 @@ const _ConnectionManager = class _ConnectionManager extends vuuUtils.EventEmitte
    * @param token
    */
   async connect(options, throwOnRejected = false) {
-    try {
-      const result = await __privateGet(this, _worker).connect(options);
-      if (result === "connected") {
-        __privateGet(this, _deferredServerAPI).resolve(this.connectedServerAPI);
-      }
-      return result;
-    } catch (err) {
-      if (throwOnRejected) {
-        throw err;
-      } else {
-        return "connection-failed";
-      }
+    const result = await __privateGet(this, _worker).connect(options);
+    if (result === "connected") {
+      __privateGet(this, _deferredServerAPI).resolve(this.connectedServerAPI);
+    } else if (result === "rejected" && throwOnRejected) {
+      throw Error("[ConnectionManager] connection rejected");
     }
+    return result;
+  }
+  get connectionStatus() {
+    return __privateGet(this, _connectionState).connectionStatus;
   }
   get serverAPI() {
     return __privateGet(this, _deferredServerAPI).promise;
@@ -159,8 +160,8 @@ const _ConnectionManager = class _ConnectionManager extends vuuUtils.EventEmitte
     __privateGet(this, _worker).terminate();
   }
 };
+_connectionState = new WeakMap();
 _instance = new WeakMap();
-_connectionStatus = new WeakMap();
 _deferredServerAPI = new WeakMap();
 _pendingRequests = new WeakMap();
 _viewports = new WeakMap();

package/cjs/ConnectionManager.js.map

@@ -1 +1 @@
-{"version":3,"file":"ConnectionManager.js","sources":["../../../packages/vuu-data-remote/src/ConnectionManager.ts"],"sourcesContent":["import {\n  ConnectOptions,\n  DataSourceCallbackMessage,\n  ServerAPI,\n  ServerProxySubscribeMessage,\n  TableSchema,\n  VuuUIMessageIn,\n} from \"@vuu-ui/vuu-data-types\";\nimport {\n  SelectRequest,\n  SelectResponse,\n  VuuCreateVisualLink,\n  VuuRemoveVisualLink,\n  VuuRpcMenuRequest,\n  VuuRpcServiceRequest,\n  VuuTableList,\n  VuuTableListRequest,\n  VuuTableMetaRequest,\n} from \"@vuu-ui/vuu-protocol-types\";\nimport {\n  DeferredPromise,\n  EventEmitter,\n  isConnectionQualityMetrics,\n  isRequestResponse,\n  isTableSchemaMessage,\n  messageHasResult,\n  uuid,\n} from \"@vuu-ui/vuu-utils\";\nimport {\n  ConnectionStatus,\n  WebSocketConnectionEvents,\n  isWebSocketConnectionStatus,\n} from \"./WebSocketConnection\";\nimport { DedicatedWorker } from \"./DedicatedWorker\";\nimport { shouldMessageBeRoutedToDataSource } from \"./data-source\";\n\nimport { ConnectionQualityMetrics } from \"@vuu-ui/vuu-data-types\";\n\nexport type PostMessageToClientCallback = (\n  msg: DataSourceCallbackMessage,\n) => void;\n\nexport type ConnectionEvents = WebSocketConnectionEvents & {\n  \"connection-metrics\": (message: ConnectionQualityMetrics) => void;\n};\n\ntype RegisteredViewport = {\n  postMessageToClientDataSource: PostMessageToClientCallback;\n  request: ServerProxySubscribeMessage;\n  status: \"subscribing\";\n};\n\nclass ConnectionManager extends EventEmitter<ConnectionEvents> {\n  static #instance: ConnectionManager;\n  #connectionStatus: ConnectionStatus = \"closed\";\n  #deferredServerAPI = new DeferredPromise<ServerAPI>();\n  #pendingRequests = new Map();\n  #viewports = new Map<string, RegisteredViewport>();\n  // #worker?: Worker;\n  #worker: DedicatedWorker;\n\n  private constructor() {\n    super();\n    this.#worker = new DedicatedWorker(this.handleMessageFromWorker);\n  }\n\n  public static get instance(): ConnectionManager {\n    if (!ConnectionManager.#instance) {\n      ConnectionManager.#instance = new ConnectionManager();\n    }\n    return ConnectionManager.#instance;\n  }\n\n  get connectionStatus() {\n    return this.#connectionStatus;\n  }\n\n  get connected() {\n    return (\n      this.#connectionStatus === \"connected\" ||\n      this.#connectionStatus === \"reconnected\"\n    );\n  }\n\n  /**\n   * Open a connection to the VuuServer. This method opens the websocket connection\n   * and logs in. It can be called from whichever client code has access to the auth\n   * token (eg. the login page, or just a hardcoded login script in a sample).\n   * This will unblock any DataSources which may have already tried to subscribe to data,\n   * but lacked access to the auth token.\n   *\n   * @param serverUrl\n   * @param token\n   */\n  async connect(options: ConnectOptions, throwOnRejected = false) {\n    try {\n      const result = await this.#worker.connect(options);\n      if (result === \"connected\") {\n        this.#deferredServerAPI.resolve(this.connectedServerAPI);\n      }\n      return result;\n    } catch (err: unknown) {\n      if (throwOnRejected) {\n        throw err;\n      } else {\n        return \"connection-failed\";\n      }\n    }\n  }\n\n  private handleMessageFromWorker = (\n    message: VuuUIMessageIn | DataSourceCallbackMessage | ConnectionStatus,\n  ) => {\n    if (shouldMessageBeRoutedToDataSource(message)) {\n      const viewport = this.#viewports.get(message.clientViewportId);\n      if (viewport) {\n        viewport.postMessageToClientDataSource(message);\n      } else {\n        console.error(\n          `[ConnectionManager] ${message.type} message received, viewport not found`,\n        );\n      }\n    } else if (isWebSocketConnectionStatus(message)) {\n      this.#connectionStatus = message;\n      this.emit(\"connection-status\", message);\n    } else if (isConnectionQualityMetrics(message)) {\n      this.emit(\"connection-metrics\", message);\n    } else if (isRequestResponse(message)) {\n      const { requestId } = message;\n      if (this.#pendingRequests.has(requestId)) {\n        const { resolve } = this.#pendingRequests.get(requestId);\n        this.#pendingRequests.delete(requestId);\n        const { requestId: _, ...messageWithoutRequestId } = message;\n\n        if (messageHasResult(message)) {\n          resolve(message.result);\n        } else if (isTableSchemaMessage(message)) {\n          resolve(message.tableSchema);\n        } else {\n          resolve(messageWithoutRequestId);\n        }\n      } else {\n        console.warn(\n          \"%cConnectionManager Unexpected message from the worker\",\n          \"color:red;font-weight:bold;\",\n        );\n      }\n    }\n  };\n\n  get serverAPI() {\n    return this.#deferredServerAPI.promise;\n  }\n\n  private connectedServerAPI: ServerAPI = {\n    subscribe: (message, callback) => {\n      if (this.#viewports.get(message.viewport)) {\n        throw Error(\n          `ConnectionManager attempting to subscribe with an existing viewport id`,\n        );\n      }\n      // TODO we never use this status\n      this.#viewports.set(message.viewport, {\n        status: \"subscribing\",\n        request: message,\n        postMessageToClientDataSource: callback,\n      });\n      this.#worker.send({ type: \"subscribe\", ...message });\n    },\n\n    unsubscribe: (viewport) => {\n      this.#worker.send({ type: \"unsubscribe\", viewport });\n    },\n\n    send: (message) => {\n      this.#worker.send(message);\n    },\n\n    destroy: (viewportId?: string) => {\n      if (viewportId && this.#viewports.has(viewportId)) {\n        this.#viewports.delete(viewportId);\n      }\n    },\n\n    rpcCall: async <T = unknown>(\n      message:\n        | VuuRpcServiceRequest\n        | VuuRpcMenuRequest\n        | VuuCreateVisualLink\n        | VuuRemoveVisualLink,\n    ) => this.asyncRequest<T>(message),\n\n    select: async (selectRequest: SelectRequest) =>\n      this.asyncRequest<SelectResponse>(selectRequest),\n\n    getTableList: async () =>\n      this.asyncRequest<VuuTableList>({ type: \"GET_TABLE_LIST\" }),\n\n    getTableSchema: async (table) =>\n      this.asyncRequest<TableSchema>({\n        type: \"GET_TABLE_META\",\n        table,\n      }),\n  };\n\n  private asyncRequest = <T = unknown>(\n    msg:\n      | VuuRpcServiceRequest\n      | VuuRpcMenuRequest\n      | VuuTableListRequest\n      | VuuTableMetaRequest\n      | VuuCreateVisualLink\n      | VuuRemoveVisualLink\n      | SelectRequest,\n  ): Promise<T> => {\n    const requestId = uuid();\n    this.#worker.send({\n      requestId,\n      ...msg,\n    });\n    return new Promise((resolve, reject) => {\n      this.#pendingRequests.set(requestId, { resolve, reject });\n    });\n  };\n\n  async disconnect() {\n    try {\n      this.#worker.send({ type: \"disconnect\" });\n      this.#deferredServerAPI = new DeferredPromise<ServerAPI>();\n      return \"disconnected\";\n    } catch (err: unknown) {\n      return \"rejected\";\n    }\n  }\n\n  destroy() {\n    this.#worker.terminate();\n  }\n}\n\nexport default ConnectionManager.instance;\n"],"names":["EventEmitter","DeferredPromise","shouldMessageBeRoutedToDataSource","isWebSocketConnectionStatus","isConnectionQualityMetrics","isRequestResponse","messageHasResult","isTableSchemaMessage","uuid","DedicatedWorker"],"mappings":";;;;;;;;;;;;;;;;;AAAA,IAAA,SAAA,EAAA,iBAAA,EAAA,kBAAA,EAAA,gBAAA,EAAA,UAAA,EAAA,OAAA;AAoDA,MAAM,kBAAA,GAAN,MAAM,kBAAA,SAA0BA,qBAA+B,CAAA;AAAA,EASrD,WAAc,GAAA;AACpB,IAAM,KAAA,EAAA;AARR,IAAsC,YAAA,CAAA,IAAA,EAAA,iBAAA,EAAA,QAAA,CAAA;AACtC,IAAA,YAAA,CAAA,IAAA,EAAA,kBAAA,EAAqB,IAAIC,wBAA2B,EAAA,CAAA;AACpD,IAAA,YAAA,CAAA,IAAA,EAAA,gBAAA,sBAAuB,GAAI,EAAA,CAAA;AAC3B,IAAA,YAAA,CAAA,IAAA,EAAA,UAAA,sBAAiB,GAAgC,EAAA,CAAA;AAEjD;AAAA,IAAA,YAAA,CAAA,IAAA,EAAA,OAAA,CAAA;AAmDA,IAAQ,aAAA,CAAA,IAAA,EAAA,yBAAA,EAA0B,CAChC,OACG,KAAA;AACH,MAAI,IAAAC,4CAAA,CAAkC,OAAO,CAAG,EAAA;AAC9C,QAAA,MAAM,QAAW,GAAA,YAAA,CAAA,IAAA,EAAK,UAAW,CAAA,CAAA,GAAA,CAAI,QAAQ,gBAAgB,CAAA;AAC7D,QAAA,IAAI,QAAU,EAAA;AACZ,UAAA,QAAA,CAAS,8BAA8B,OAAO,CAAA;AAAA,SACzC,MAAA;AACL,UAAQ,OAAA,CAAA,KAAA;AAAA,YACN,CAAA,oBAAA,EAAuB,QAAQ,IAAI,CAAA,qCAAA;AAAA,WACrC;AAAA;AACF,OACF,MAAA,IAAWC,+CAA4B,CAAA,OAAO,CAAG,EAAA;AAC/C,QAAA,YAAA,CAAA,IAAA,EAAK,iBAAoB,EAAA,OAAA,CAAA;AACzB,QAAK,IAAA,CAAA,IAAA,CAAK,qBAAqB,OAAO,CAAA;AAAA,OACxC,MAAA,IAAWC,mCAA2B,CAAA,OAAO,CAAG,EAAA;AAC9C,QAAK,IAAA,CAAA,IAAA,CAAK,sBAAsB,OAAO,CAAA;AAAA,OACzC,MAAA,IAAWC,0BAAkB,CAAA,OAAO,CAAG,EAAA;AACrC,QAAM,MAAA,EAAE,WAAc,GAAA,OAAA;AACtB,QAAA,IAAI,YAAK,CAAA,IAAA,EAAA,gBAAA,CAAA,CAAiB,GAAI,CAAA,SAAS,CAAG,EAAA;AACxC,UAAA,MAAM,EAAE,OAAQ,EAAA,GAAI,YAAK,CAAA,IAAA,EAAA,gBAAA,CAAA,CAAiB,IAAI,SAAS,CAAA;AACvD,UAAK,YAAA,CAAA,IAAA,EAAA,gBAAA,CAAA,CAAiB,OAAO,SAAS,CAAA;AACtC,UAAA,MAAM,EAAE,SAAA,EAAW,CAAG,EAAA,GAAG,yBAA4B,GAAA,OAAA;AAErD,UAAI,IAAAC,yBAAA,CAAiB,OAAO,CAAG,EAAA;AAC7B,YAAA,OAAA,CAAQ,QAAQ,MAAM,CAAA;AAAA,WACxB,MAAA,IAAWC,6BAAqB,CAAA,OAAO,CAAG,EAAA;AACxC,YAAA,OAAA,CAAQ,QAAQ,WAAW,CAAA;AAAA,WACtB,MAAA;AACL,YAAA,OAAA,CAAQ,uBAAuB,CAAA;AAAA;AACjC,SACK,MAAA;AACL,UAAQ,OAAA,CAAA,IAAA;AAAA,YACN,wDAAA;AAAA,YACA;AAAA,WACF;AAAA;AACF;AACF,KACF,CAAA;AAMA,IAAA,aAAA,CAAA,IAAA,EAAQ,oBAAgC,EAAA;AAAA,MACtC,SAAA,EAAW,CAAC,OAAA,EAAS,QAAa,KAAA;AAChC,QAAA,IAAI,YAAK,CAAA,IAAA,EAAA,UAAA,CAAA,CAAW,GAAI,CAAA,OAAA,CAAQ,QAAQ,CAAG,EAAA;AACzC,UAAM,MAAA,KAAA;AAAA,YACJ,CAAA,sEAAA;AAAA,WACF;AAAA;AAGF,QAAK,YAAA,CAAA,IAAA,EAAA,UAAA,CAAA,CAAW,GAAI,CAAA,OAAA,CAAQ,QAAU,EAAA;AAAA,UACpC,MAAQ,EAAA,aAAA;AAAA,UACR,OAAS,EAAA,OAAA;AAAA,UACT,6BAA+B,EAAA;AAAA,SAChC,CAAA;AACD,QAAA,YAAA,CAAA,IAAA,EAAK,SAAQ,IAAK,CAAA,EAAE,MAAM,WAAa,EAAA,GAAG,SAAS,CAAA;AAAA,OACrD;AAAA,MAEA,WAAA,EAAa,CAAC,QAAa,KAAA;AACzB,QAAA,YAAA,CAAA,IAAA,EAAK,SAAQ,IAAK,CAAA,EAAE,IAAM,EAAA,aAAA,EAAe,UAAU,CAAA;AAAA,OACrD;AAAA,MAEA,IAAA,EAAM,CAAC,OAAY,KAAA;AACjB,QAAK,YAAA,CAAA,IAAA,EAAA,OAAA,CAAA,CAAQ,KAAK,OAAO,CAAA;AAAA,OAC3B;AAAA,MAEA,OAAA,EAAS,CAAC,UAAwB,KAAA;AAChC,QAAA,IAAI,UAAc,IAAA,YAAA,CAAA,IAAA,EAAK,UAAW,CAAA,CAAA,GAAA,CAAI,UAAU,CAAG,EAAA;AACjD,UAAK,YAAA,CAAA,IAAA,EAAA,UAAA,CAAA,CAAW,OAAO,UAAU,CAAA;AAAA;AACnC,OACF;AAAA,MAEA,OAAS,EAAA,OACP,OAKG,KAAA,IAAA,CAAK,aAAgB,OAAO,CAAA;AAAA,MAEjC,MAAQ,EAAA,OAAO,aACb,KAAA,IAAA,CAAK,aAA6B,aAAa,CAAA;AAAA,MAEjD,cAAc,YACZ,IAAA,CAAK,aAA2B,EAAE,IAAA,EAAM,kBAAkB,CAAA;AAAA,MAE5D,cAAgB,EAAA,OAAO,KACrB,KAAA,IAAA,CAAK,YAA0B,CAAA;AAAA,QAC7B,IAAM,EAAA,gBAAA;AAAA,QACN;AAAA,OACD;AAAA,KACL,CAAA;AAEA,IAAQ,aAAA,CAAA,IAAA,EAAA,cAAA,EAAe,CACrB,GAQe,KAAA;AACf,MAAA,MAAM,YAAYC,aAAK,EAAA;AACvB,MAAA,YAAA,CAAA,IAAA,EAAK,SAAQ,IAAK,CAAA;AAAA,QAChB,SAAA;AAAA,QACA,GAAG;AAAA,OACJ,CAAA;AACD,MAAA,OAAO,IAAI,OAAA,CAAQ,CAAC,OAAA,EAAS,MAAW,KAAA;AACtC,QAAA,YAAA,CAAA,IAAA,EAAK,kBAAiB,GAAI,CAAA,SAAA,EAAW,EAAE,OAAA,EAAS,QAAQ,CAAA;AAAA,OACzD,CAAA;AAAA,KACH,CAAA;AAhKE,IAAA,YAAA,CAAA,IAAA,EAAK,OAAU,EAAA,IAAIC,+BAAgB,CAAA,IAAA,CAAK,uBAAuB,CAAA,CAAA;AAAA;AACjE,EAEA,WAAkB,QAA8B,GAAA;AAC9C,IAAI,IAAA,CAAC,iCAAkB,SAAW,CAAA,EAAA;AAChC,MAAkB,YAAA,CAAA,kBAAA,EAAA,SAAA,EAAY,IAAI,kBAAkB,EAAA,CAAA;AAAA;AAEtD,IAAA,OAAO,YAAkB,CAAA,kBAAA,EAAA,SAAA,CAAA;AAAA;AAC3B,EAEA,IAAI,gBAAmB,GAAA;AACrB,IAAA,OAAO,YAAK,CAAA,IAAA,EAAA,iBAAA,CAAA;AAAA;AACd,EAEA,IAAI,SAAY,GAAA;AACd,IAAA,OACE,YAAK,CAAA,IAAA,EAAA,iBAAA,CAAA,KAAsB,WAC3B,IAAA,YAAA,CAAA,IAAA,EAAK,iBAAsB,CAAA,KAAA,aAAA;AAAA;AAE/B;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAYA,MAAM,OAAA,CAAQ,OAAyB,EAAA,eAAA,GAAkB,KAAO,EAAA;AAC9D,IAAI,IAAA;AACF,MAAA,MAAM,MAAS,GAAA,MAAM,YAAK,CAAA,IAAA,EAAA,OAAA,CAAA,CAAQ,QAAQ,OAAO,CAAA;AACjD,MAAA,IAAI,WAAW,WAAa,EAAA;AAC1B,QAAK,YAAA,CAAA,IAAA,EAAA,kBAAA,CAAA,CAAmB,OAAQ,CAAA,IAAA,CAAK,kBAAkB,CAAA;AAAA;AAEzD,MAAO,OAAA,MAAA;AAAA,aACA,GAAc,EAAA;AACrB,MAAA,IAAI,eAAiB,EAAA;AACnB,QAAM,MAAA,GAAA;AAAA,OACD,MAAA;AACL,QAAO,OAAA,mBAAA;AAAA;AACT;AACF;AACF,EA0CA,IAAI,SAAY,GAAA;AACd,IAAA,OAAO,mBAAK,kBAAmB,CAAA,CAAA,OAAA;AAAA;AACjC,EAyEA,MAAM,UAAa,GAAA;AACjB,IAAI,IAAA;AACF,MAAA,YAAA,CAAA,IAAA,EAAK,OAAQ,CAAA,CAAA,IAAA,CAAK,EAAE,IAAA,EAAM,cAAc,CAAA;AACxC,MAAK,YAAA,CAAA,IAAA,EAAA,kBAAA,EAAqB,IAAIR,wBAA2B,EAAA,CAAA;AACzD,MAAO,OAAA,cAAA;AAAA,aACA,GAAc,EAAA;AACrB,MAAO,OAAA,UAAA;AAAA;AACT;AACF,EAEA,OAAU,GAAA;AACR,IAAA,YAAA,CAAA,IAAA,EAAK,SAAQ,SAAU,EAAA;AAAA;AAE3B,CAAA;AAzLS,SAAA,GAAA,IAAA,OAAA,EAAA;AACP,iBAAA,GAAA,IAAA,OAAA,EAAA;AACA,kBAAA,GAAA,IAAA,OAAA,EAAA;AACA,gBAAA,GAAA,IAAA,OAAA,EAAA;AACA,UAAA,GAAA,IAAA,OAAA,EAAA;AAEA,OAAA,GAAA,IAAA,OAAA,EAAA;AANA,YAAA,CADI,kBACG,EAAA,SAAA,CAAA;AADT,IAAM,iBAAN,GAAA,kBAAA;AA4LA,0BAAe,iBAAkB,CAAA,QAAA;;;;"}
+{"version":3,"file":"ConnectionManager.js","sources":["../../../packages/vuu-data-remote/src/ConnectionManager.ts"],"sourcesContent":["import {\n  ConnectOptions,\n  DataSourceCallbackMessage,\n  ServerAPI,\n  ServerProxySubscribeMessage,\n  TableSchema,\n  VuuUIMessageIn,\n} from \"@vuu-ui/vuu-data-types\";\nimport {\n  SelectRequest,\n  SelectResponse,\n  VuuCreateVisualLink,\n  VuuLoginResponse,\n  VuuRemoveVisualLink,\n  VuuRpcMenuRequest,\n  VuuRpcServiceRequest,\n  VuuTableList,\n  VuuTableListRequest,\n  VuuTableMetaRequest,\n} from \"@vuu-ui/vuu-protocol-types\";\nimport {\n  DeferredPromise,\n  EventEmitter,\n  isConnectionQualityMetrics,\n  isLoginResponse,\n  isRequestResponse,\n  isTableSchemaMessage,\n  messageHasResult,\n  uuid,\n} from \"@vuu-ui/vuu-utils\";\nimport {\n  WebSocketCloseMessage,\n  WebSocketConnectionEvents,\n  WebSocketConnectionState,\n  isWebSocketConnectionMessage,\n} from \"./WebSocketConnection\";\nimport { DedicatedWorker } from \"./DedicatedWorker\";\nimport { shouldMessageBeRoutedToDataSource } from \"./data-source\";\n\nimport { ConnectionQualityMetrics } from \"@vuu-ui/vuu-data-types\";\n\nexport type PostMessageToClientCallback = (\n  msg: DataSourceCallbackMessage,\n) => void;\n\nexport type ConnectionEvents = WebSocketConnectionEvents & {\n  \"connection-metrics\": (message: ConnectionQualityMetrics) => void;\n  \"session-status\": (\n    loginResponse: VuuLoginResponse | WebSocketCloseMessage,\n  ) => void;\n};\n\ntype RegisteredViewport = {\n  postMessageToClientDataSource: PostMessageToClientCallback;\n  request: ServerProxySubscribeMessage;\n  status: \"subscribing\";\n};\n\nclass ConnectionManager extends EventEmitter<ConnectionEvents> {\n  #connectionState: WebSocketConnectionState = {\n    connectionPhase: \"connecting\",\n    connectionStatus: \"closed\",\n    retryAttemptsTotal: -1,\n    retryAttemptsRemaining: -1,\n    secondsToNextRetry: -1,\n  };\n  static #instance: ConnectionManager;\n  #deferredServerAPI = new DeferredPromise<ServerAPI>();\n  #pendingRequests = new Map();\n  #viewports = new Map<string, RegisteredViewport>();\n  // #worker?: Worker;\n  #worker: DedicatedWorker;\n\n  private constructor() {\n    super();\n    this.#worker = new DedicatedWorker(this.handleMessageFromWorker);\n  }\n\n  public static get instance(): ConnectionManager {\n    if (!ConnectionManager.#instance) {\n      ConnectionManager.#instance = new ConnectionManager();\n    }\n    return ConnectionManager.#instance;\n  }\n\n  /**\n   * Open a connection to the VuuServer. This method opens the websocket connection\n   * and logs in. It can be called from whichever client code has access to the auth\n   * token (eg. the login page, or just a hardcoded login script in a sample).\n   * This will unblock any DataSources which may have already tried to subscribe to data,\n   * but lacked access to the auth token.\n   *\n   * @param serverUrl\n   * @param token\n   */\n  async connect(options: ConnectOptions, throwOnRejected = false) {\n    const result = await this.#worker.connect(options);\n    if (result === \"connected\") {\n      this.#deferredServerAPI.resolve(this.connectedServerAPI);\n    } else if (result === \"rejected\" && throwOnRejected) {\n      throw Error(\"[ConnectionManager] connection rejected\");\n    }\n    return result;\n  }\n\n  private handleMessageFromWorker = (\n    message: VuuUIMessageIn | DataSourceCallbackMessage | WebSocketCloseMessage,\n  ) => {\n    if (shouldMessageBeRoutedToDataSource(message)) {\n      const viewport = this.#viewports.get(message.clientViewportId);\n      if (viewport) {\n        viewport.postMessageToClientDataSource(message);\n      } else {\n        console.error(\n          `[ConnectionManager] ${message.type} message received, viewport not found`,\n        );\n      }\n    } else if (message.type === \"websocket-closed\") {\n      this.emit(\"session-status\", message);\n    } else if (isLoginResponse(message)) {\n      this.emit(\"session-status\", message);\n    } else if (isWebSocketConnectionMessage(message)) {\n      this.#connectionState = message;\n      this.emit(\"connection-status\", message);\n    } else if (isConnectionQualityMetrics(message)) {\n      this.emit(\"connection-metrics\", message);\n    } else if (isRequestResponse(message)) {\n      const { requestId } = message;\n      if (this.#pendingRequests.has(requestId)) {\n        const { resolve } = this.#pendingRequests.get(requestId);\n        this.#pendingRequests.delete(requestId);\n        const { requestId: _, ...messageWithoutRequestId } = message;\n\n        if (messageHasResult(message)) {\n          resolve(message.result);\n        } else if (isTableSchemaMessage(message)) {\n          resolve(message.tableSchema);\n        } else {\n          resolve(messageWithoutRequestId);\n        }\n      } else {\n        console.warn(\n          \"%cConnectionManager Unexpected message from the worker\",\n          \"color:red;font-weight:bold;\",\n        );\n      }\n    }\n  };\n\n  get connectionStatus() {\n    return this.#connectionState.connectionStatus;\n  }\n\n  get serverAPI() {\n    return this.#deferredServerAPI.promise;\n  }\n\n  private connectedServerAPI: ServerAPI = {\n    subscribe: (message, callback) => {\n      if (this.#viewports.get(message.viewport)) {\n        throw Error(\n          `ConnectionManager attempting to subscribe with an existing viewport id`,\n        );\n      }\n      // TODO we never use this status\n      this.#viewports.set(message.viewport, {\n        status: \"subscribing\",\n        request: message,\n        postMessageToClientDataSource: callback,\n      });\n      this.#worker.send({ type: \"subscribe\", ...message });\n    },\n\n    unsubscribe: (viewport) => {\n      this.#worker.send({ type: \"unsubscribe\", viewport });\n    },\n\n    send: (message) => {\n      this.#worker.send(message);\n    },\n\n    destroy: (viewportId?: string) => {\n      if (viewportId && this.#viewports.has(viewportId)) {\n        this.#viewports.delete(viewportId);\n      }\n    },\n\n    rpcCall: async <T = unknown>(\n      message:\n        | VuuRpcServiceRequest\n        | VuuRpcMenuRequest\n        | VuuCreateVisualLink\n        | VuuRemoveVisualLink,\n    ) => this.asyncRequest<T>(message),\n\n    select: async (selectRequest: SelectRequest) =>\n      this.asyncRequest<SelectResponse>(selectRequest),\n\n    getTableList: async () =>\n      this.asyncRequest<VuuTableList>({ type: \"GET_TABLE_LIST\" }),\n\n    getTableSchema: async (table) =>\n      this.asyncRequest<TableSchema>({\n        type: \"GET_TABLE_META\",\n        table,\n      }),\n  };\n\n  private asyncRequest = <T = unknown>(\n    msg:\n      | VuuRpcServiceRequest\n      | VuuRpcMenuRequest\n      | VuuTableListRequest\n      | VuuTableMetaRequest\n      | VuuCreateVisualLink\n      | VuuRemoveVisualLink\n      | SelectRequest,\n  ): Promise<T> => {\n    const requestId = uuid();\n    this.#worker.send({\n      requestId,\n      ...msg,\n    });\n    return new Promise((resolve, reject) => {\n      this.#pendingRequests.set(requestId, { resolve, reject });\n    });\n  };\n\n  async disconnect() {\n    try {\n      this.#worker.send({ type: \"disconnect\" });\n      this.#deferredServerAPI = new DeferredPromise<ServerAPI>();\n      return \"disconnected\";\n    } catch (err: unknown) {\n      return \"rejected\";\n    }\n  }\n\n  destroy() {\n    this.#worker.terminate();\n  }\n}\n\nexport default ConnectionManager.instance;\n"],"names":["EventEmitter","DeferredPromise","shouldMessageBeRoutedToDataSource","isLoginResponse","isWebSocketConnectionMessage","isConnectionQualityMetrics","isRequestResponse","messageHasResult","isTableSchemaMessage","uuid","DedicatedWorker"],"mappings":"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"}

package/cjs/DedicatedWorker.js

@@ -33,7 +33,12 @@ class DedicatedWorker {
       } else if (message.type === "connected") {
         __privateGet(this, _deferredConnection)?.resolve("connected");
       } else if (message.type === "connection-failed") {
-        __privateGet(this, _deferredConnection)?.reject(message.reason);
+        __privateGet(this, _deferredConnection)?.resolve("rejected");
+      } else if (message.type === "websocket-closed") {
+        if (message.reason === "token-expired") {
+          console.log(`websocket closed ${message.reason}`);
+          onMessage(message);
+        }
       } else {
         onMessage(message);
       }

package/cjs/DedicatedWorker.js.map

@@ -1 +1 @@
-{"version":3,"file":"DedicatedWorker.js","sources":["../../../packages/vuu-data-remote/src/DedicatedWorker.ts"],"sourcesContent":["import {\n  ConnectOptions,\n  VuuUIMessageIn,\n  VuuUIMessageOut,\n  WithRequestId,\n} from \"@vuu-ui/vuu-data-types\";\nimport { DeferredPromise, getLoggingConfigForWorker } from \"@vuu-ui/vuu-utils\";\n\n// Note: inlined-worker is a generated file, it must be built\nimport { workerSourceCode } from \"./inlined-worker\";\nimport {\n  SelectRequest,\n  VuuCreateVisualLink,\n  VuuRemoveVisualLink,\n  VuuRpcMenuRequest,\n  VuuRpcServiceRequest,\n} from \"@vuu-ui/vuu-protocol-types\";\n\nconst workerBlob = new Blob([getLoggingConfigForWorker() + workerSourceCode], {\n  type: \"text/javascript\",\n});\nconst workerBlobUrl = URL.createObjectURL(workerBlob);\n\nexport class DedicatedWorker {\n  #deferredConnection?: DeferredPromise<\n    \"connected\" | \"reconnected\" | \"rejected\"\n  >;\n  #worker: Promise<Worker>;\n\n  constructor(onMessage: (msg: VuuUIMessageIn) => void) {\n    const deferredWorker = new DeferredPromise<Worker>();\n    this.#worker = deferredWorker.promise;\n    const worker = new Worker(workerBlobUrl);\n    const timer: number | null = window.setTimeout(() => {\n      console.warn(\"timed out waiting for worker to load\");\n    }, 1000);\n    worker.onmessage = (msg: MessageEvent<VuuUIMessageIn>) => {\n      const { data: message } = msg;\n      if (message.type === \"ready\") {\n        window.clearTimeout(timer);\n        deferredWorker.resolve(worker);\n      } else if (message.type === \"connected\") {\n        // how do we detect reconnected\n        this.#deferredConnection?.resolve(\"connected\");\n      } else if (message.type === \"connection-failed\") {\n        this.#deferredConnection?.reject(message.reason);\n      } else {\n        onMessage(message);\n      }\n    };\n  }\n\n  async connect(options: ConnectOptions) {\n    this.#deferredConnection = new DeferredPromise<\n      \"connected\" | \"reconnected\" | \"rejected\"\n    >();\n    this.send({\n      ...options,\n      type: \"connect\",\n    });\n    return this.#deferredConnection.promise;\n  }\n\n  async send(\n    message:\n      | VuuUIMessageOut\n      | WithRequestId<\n          | VuuCreateVisualLink\n          | VuuRemoveVisualLink\n          | VuuRpcServiceRequest\n          | VuuRpcMenuRequest\n          | SelectRequest\n        >,\n  ) {\n    (await this.#worker).postMessage(message);\n  }\n\n  async terminate() {\n    (await this.#worker).terminate();\n  }\n}\n"],"names":["getLoggingConfigForWorker","workerSourceCode","DeferredPromise"],"mappings":";;;;;;;;;;;;AAAA,IAAA,mBAAA,EAAA,OAAA;AAkBA,MAAM,aAAa,IAAI,IAAA,CAAK,CAACA,kCAA0B,EAAA,GAAIC,8BAAgB,CAAG,EAAA;AAAA,EAC5E,IAAM,EAAA;AACR,CAAC,CAAA;AACD,MAAM,aAAA,GAAgB,GAAI,CAAA,eAAA,CAAgB,UAAU,CAAA;AAE7C,MAAM,eAAgB,CAAA;AAAA,EAM3B,YAAY,SAA0C,EAAA;AALtD,IAAA,YAAA,CAAA,IAAA,EAAA,mBAAA,CAAA;AAGA,IAAA,YAAA,CAAA,IAAA,EAAA,OAAA,CAAA;AAGE,IAAM,MAAA,cAAA,GAAiB,IAAIC,wBAAwB,EAAA;AACnD,IAAA,YAAA,CAAA,IAAA,EAAK,SAAU,cAAe,CAAA,OAAA,CAAA;AAC9B,IAAM,MAAA,MAAA,GAAS,IAAI,MAAA,CAAO,aAAa,CAAA;AACvC,IAAM,MAAA,KAAA,GAAuB,MAAO,CAAA,UAAA,CAAW,MAAM;AACnD,MAAA,OAAA,CAAQ,KAAK,sCAAsC,CAAA;AAAA,OAClD,GAAI,CAAA;AACP,IAAO,MAAA,CAAA,SAAA,GAAY,CAAC,GAAsC,KAAA;AACxD,MAAM,MAAA,EAAE,IAAM,EAAA,OAAA,EAAY,GAAA,GAAA;AAC1B,MAAI,IAAA,OAAA,CAAQ,SAAS,OAAS,EAAA;AAC5B,QAAA,MAAA,CAAO,aAAa,KAAK,CAAA;AACzB,QAAA,cAAA,CAAe,QAAQ,MAAM,CAAA;AAAA,OAC/B,MAAA,IAAW,OAAQ,CAAA,IAAA,KAAS,WAAa,EAAA;AAEvC,QAAK,YAAA,CAAA,IAAA,EAAA,mBAAA,CAAA,EAAqB,QAAQ,WAAW,CAAA;AAAA,OAC/C,MAAA,IAAW,OAAQ,CAAA,IAAA,KAAS,mBAAqB,EAAA;AAC/C,QAAK,YAAA,CAAA,IAAA,EAAA,mBAAA,CAAA,EAAqB,MAAO,CAAA,OAAA,CAAQ,MAAM,CAAA;AAAA,OAC1C,MAAA;AACL,QAAA,SAAA,CAAU,OAAO,CAAA;AAAA;AACnB,KACF;AAAA;AACF,EAEA,MAAM,QAAQ,OAAyB,EAAA;AACrC,IAAK,YAAA,CAAA,IAAA,EAAA,mBAAA,EAAsB,IAAIA,wBAE7B,EAAA,CAAA;AACF,IAAA,IAAA,CAAK,IAAK,CAAA;AAAA,MACR,GAAG,OAAA;AAAA,MACH,IAAM,EAAA;AAAA,KACP,CAAA;AACD,IAAA,OAAO,mBAAK,mBAAoB,CAAA,CAAA,OAAA;AAAA;AAClC,EAEA,MAAM,KACJ,OASA,EAAA;AACA,IAAA,CAAC,MAAM,YAAA,CAAA,IAAA,EAAK,OAAS,CAAA,EAAA,WAAA,CAAY,OAAO,CAAA;AAAA;AAC1C,EAEA,MAAM,SAAY,GAAA;AAChB,IAAC,CAAA,MAAM,YAAK,CAAA,IAAA,EAAA,OAAA,CAAA,EAAS,SAAU,EAAA;AAAA;AAEnC;AAxDE,mBAAA,GAAA,IAAA,OAAA,EAAA;AAGA,OAAA,GAAA,IAAA,OAAA,EAAA;;;;"}
+{"version":3,"file":"DedicatedWorker.js","sources":["../../../packages/vuu-data-remote/src/DedicatedWorker.ts"],"sourcesContent":["import {\n  ConnectOptions,\n  VuuUIMessageIn,\n  VuuUIMessageOut,\n  WithRequestId,\n} from \"@vuu-ui/vuu-data-types\";\nimport { DeferredPromise, getLoggingConfigForWorker } from \"@vuu-ui/vuu-utils\";\n\n// Note: inlined-worker is a generated file, it must be built\nimport { workerSourceCode } from \"./inlined-worker\";\nimport {\n  SelectRequest,\n  VuuCreateVisualLink,\n  VuuRemoveVisualLink,\n  VuuRpcMenuRequest,\n  VuuRpcServiceRequest,\n} from \"@vuu-ui/vuu-protocol-types\";\nimport { WebSocketCloseMessage } from \"./WebSocketConnection\";\n\nconst workerBlob = new Blob([getLoggingConfigForWorker() + workerSourceCode], {\n  type: \"text/javascript\",\n});\nconst workerBlobUrl = URL.createObjectURL(workerBlob);\n\nexport class DedicatedWorker {\n  #deferredConnection?: DeferredPromise<\n    \"connected\" | \"reconnected\" | \"rejected\"\n  >;\n  #worker: Promise<Worker>;\n\n  constructor(\n    onMessage: (msg: VuuUIMessageIn | WebSocketCloseMessage) => void,\n  ) {\n    const deferredWorker = new DeferredPromise<Worker>();\n    this.#worker = deferredWorker.promise;\n    const worker = new Worker(workerBlobUrl);\n    const timer: number | null = window.setTimeout(() => {\n      console.warn(\"timed out waiting for worker to load\");\n    }, 1000);\n    worker.onmessage = (\n      msg: MessageEvent<VuuUIMessageIn | WebSocketCloseMessage>,\n    ) => {\n      const { data: message } = msg;\n      if (message.type === \"ready\") {\n        window.clearTimeout(timer);\n        deferredWorker.resolve(worker);\n      } else if (message.type === \"connected\") {\n        // how do we detect reconnected\n        this.#deferredConnection?.resolve(\"connected\");\n      } else if (message.type === \"connection-failed\") {\n        this.#deferredConnection?.resolve(\"rejected\");\n        // this.#deferredConnection?.reject(message.reason);\n      } else if (message.type === \"websocket-closed\") {\n        if (message.reason === \"token-expired\") {\n          console.log(`websocket closed ${message.reason}`);\n          onMessage(message);\n        }\n      } else {\n        onMessage(message);\n      }\n    };\n  }\n\n  async connect(options: ConnectOptions) {\n    this.#deferredConnection = new DeferredPromise<\n      \"connected\" | \"reconnected\" | \"rejected\"\n    >();\n    this.send({\n      ...options,\n      type: \"connect\",\n    });\n    return this.#deferredConnection.promise;\n  }\n\n  async send(\n    message:\n      | VuuUIMessageOut\n      | WithRequestId<\n          | VuuCreateVisualLink\n          | VuuRemoveVisualLink\n          | VuuRpcServiceRequest\n          | VuuRpcMenuRequest\n          | SelectRequest\n        >,\n  ) {\n    (await this.#worker).postMessage(message);\n  }\n\n  async terminate() {\n    (await this.#worker).terminate();\n  }\n}\n"],"names":["getLoggingConfigForWorker","workerSourceCode","DeferredPromise"],"mappings":";;;;;;;;;;;;AAAA,IAAA,mBAAA,EAAA,OAAA;AAmBA,MAAM,aAAa,IAAI,IAAA,CAAK,CAACA,kCAA0B,EAAA,GAAIC,8BAAgB,CAAG,EAAA;AAAA,EAC5E,IAAM,EAAA;AACR,CAAC,CAAA;AACD,MAAM,aAAA,GAAgB,GAAI,CAAA,eAAA,CAAgB,UAAU,CAAA;AAE7C,MAAM,eAAgB,CAAA;AAAA,EAM3B,YACE,SACA,EAAA;AAPF,IAAA,YAAA,CAAA,IAAA,EAAA,mBAAA,CAAA;AAGA,IAAA,YAAA,CAAA,IAAA,EAAA,OAAA,CAAA;AAKE,IAAM,MAAA,cAAA,GAAiB,IAAIC,wBAAwB,EAAA;AACnD,IAAA,YAAA,CAAA,IAAA,EAAK,SAAU,cAAe,CAAA,OAAA,CAAA;AAC9B,IAAM,MAAA,MAAA,GAAS,IAAI,MAAA,CAAO,aAAa,CAAA;AACvC,IAAM,MAAA,KAAA,GAAuB,MAAO,CAAA,UAAA,CAAW,MAAM;AACnD,MAAA,OAAA,CAAQ,KAAK,sCAAsC,CAAA;AAAA,OAClD,GAAI,CAAA;AACP,IAAO,MAAA,CAAA,SAAA,GAAY,CACjB,GACG,KAAA;AACH,MAAM,MAAA,EAAE,IAAM,EAAA,OAAA,EAAY,GAAA,GAAA;AAC1B,MAAI,IAAA,OAAA,CAAQ,SAAS,OAAS,EAAA;AAC5B,QAAA,MAAA,CAAO,aAAa,KAAK,CAAA;AACzB,QAAA,cAAA,CAAe,QAAQ,MAAM,CAAA;AAAA,OAC/B,MAAA,IAAW,OAAQ,CAAA,IAAA,KAAS,WAAa,EAAA;AAEvC,QAAK,YAAA,CAAA,IAAA,EAAA,mBAAA,CAAA,EAAqB,QAAQ,WAAW,CAAA;AAAA,OAC/C,MAAA,IAAW,OAAQ,CAAA,IAAA,KAAS,mBAAqB,EAAA;AAC/C,QAAK,YAAA,CAAA,IAAA,EAAA,mBAAA,CAAA,EAAqB,QAAQ,UAAU,CAAA;AAAA,OAE9C,MAAA,IAAW,OAAQ,CAAA,IAAA,KAAS,kBAAoB,EAAA;AAC9C,QAAI,IAAA,OAAA,CAAQ,WAAW,eAAiB,EAAA;AACtC,UAAA,OAAA,CAAQ,GAAI,CAAA,CAAA,iBAAA,EAAoB,OAAQ,CAAA,MAAM,CAAE,CAAA,CAAA;AAChD,UAAA,SAAA,CAAU,OAAO,CAAA;AAAA;AACnB,OACK,MAAA;AACL,QAAA,SAAA,CAAU,OAAO,CAAA;AAAA;AACnB,KACF;AAAA;AACF,EAEA,MAAM,QAAQ,OAAyB,EAAA;AACrC,IAAK,YAAA,CAAA,IAAA,EAAA,mBAAA,EAAsB,IAAIA,wBAE7B,EAAA,CAAA;AACF,IAAA,IAAA,CAAK,IAAK,CAAA;AAAA,MACR,GAAG,OAAA;AAAA,MACH,IAAM,EAAA;AAAA,KACP,CAAA;AACD,IAAA,OAAO,mBAAK,mBAAoB,CAAA,CAAA,OAAA;AAAA;AAClC,EAEA,MAAM,KACJ,OASA,EAAA;AACA,IAAA,CAAC,MAAM,YAAA,CAAA,IAAA,EAAK,OAAS,CAAA,EAAA,WAAA,CAAY,OAAO,CAAA;AAAA;AAC1C,EAEA,MAAM,SAAY,GAAA;AAChB,IAAC,CAAA,MAAM,YAAK,CAAA,IAAA,EAAA,OAAA,CAAA,EAAS,SAAU,EAAA;AAAA;AAEnC;AAlEE,mBAAA,GAAA,IAAA,OAAA,EAAA;AAGA,OAAA,GAAA,IAAA,OAAA,EAAA;;;;"}

package/cjs/WebSocketConnection.js

@@ -3,18 +3,24 @@
 var vuuUtils = require('@vuu-ui/vuu-utils');
 
 vuuUtils.logger("WebSocketConnection");
-const isWebSocketConnectionStatus = (msg) => typeof msg === "string" && [
-  "connecting",
-  "websocket-open",
-  "connected",
-  "reconnecting",
-  "reconnected",
-  "disconnected",
-  "closed",
-  "failed"
-].includes(msg);
+const isWebSocketConnectionMessage = (msg) => {
+  if ("connectionStatus" in msg) {
+    return [
+      "connecting",
+      "connected",
+      "connection-open-awaiting-session",
+      "reconnecting",
+      "reconnected",
+      "disconnected",
+      "closed",
+      "failed"
+    ].includes(msg.connectionStatus);
+  } else {
+    return false;
+  }
+};
 const isConnected = (status) => status === "connected" || status === "reconnected";
 
 exports.isConnected = isConnected;
-exports.isWebSocketConnectionStatus = isWebSocketConnectionStatus;
+exports.isWebSocketConnectionMessage = isWebSocketConnectionMessage;
 //# sourceMappingURL=WebSocketConnection.js.map

package/cjs/WebSocketConnection.js.map

@@ -1 +1 @@
-{"version":3,"file":"WebSocketConnection.js","sources":["../../../packages/vuu-data-remote/src/WebSocketConnection.ts"],"sourcesContent":["import { WebSocketProtocol } from \"@vuu-ui/vuu-data-types\";\nimport {\n  InvalidSessionReason,\n  InvalidTokenReason,\n  LoginErrorMessage,\n  VuuClientMessage,\n  VuuServerMessage,\n} from \"@vuu-ui/vuu-protocol-types\";\nimport {\n  DeferredPromise,\n  EventEmitter,\n  isLoginErrorMessage,\n  logger,\n} from \"@vuu-ui/vuu-utils\";\n\nexport type ConnectionPhase =\n  | \"initial-connection\"\n  | \"post-disconnect-reconnection\";\nexport type ConnectingStatus = \"connecting\" | \"reconnecting\";\nexport type ConnectedStatus = \"connected\" | \"reconnected\";\nexport type ConnectionStatus =\n  | ConnectingStatus\n  | ConnectedStatus\n  | \"closed\"\n  | \"websocket-open\"\n  | \"disconnected\"\n  | \"failed\"\n  | \"inactive\";\n\nexport const isInvalidTokenReason = (\n  text: string,\n): text is InvalidTokenReason =>\n  text === \"Invalid token\" || text === \"Token has expired\";\n\nexport const isInvalidSessionReason = (\n  text: string,\n): text is InvalidSessionReason =>\n  text === \"Invalid session\" || text === \"User session limit exceeded\";\n\nconst { debug, debugEnabled, info } = logger(\"WebSocketConnection\");\n\nexport const isWebSocketConnectionStatus = (\n  msg: unknown,\n): msg is ConnectionStatus =>\n  typeof msg === \"string\" &&\n  [\n    \"connecting\",\n    \"websocket-open\",\n    \"connected\",\n    \"reconnecting\",\n    \"reconnected\",\n    \"disconnected\",\n    \"closed\",\n    \"failed\",\n  ].includes(msg);\n\nexport const isConnected = (\n  status: ConnectionStatus,\n): status is ConnectedStatus =>\n  status === \"connected\" || status === \"reconnected\";\n\nexport type LoginRejectedMessage = {\n  type: \"LOGIN_REJECTED\";\n  reason: LoginErrorMessage;\n};\n\nexport const isLoginRejectedMessage = (\n  message: object,\n): message is LoginRejectedMessage =>\n  message !== null && \"type\" in message && message.type === \"LOGIN_REJECTED\";\n\nexport type VuuServerMessageCallback = (\n  msg: VuuServerMessage | LoginRejectedMessage,\n) => void;\n\nexport type WebSocketConnectionConfig = {\n  url: string;\n  protocols: WebSocketProtocol;\n  callback: VuuServerMessageCallback;\n  connectionTimeout?: number;\n};\n\nconst DEFAULT_CONNECTION_TIMEOUT = 10000;\n\nconst parseWebSocketMessage = (message: string): VuuServerMessage => {\n  try {\n    return JSON.parse(message) as VuuServerMessage;\n  } catch (e) {\n    throw Error(`Error parsing JSON response from server ${message}`);\n  }\n};\n\nexport type WebSocketConnectionCloseReason =\n  | LoginErrorMessage\n  | \"failure\"\n  | \"shutdown\";\n\nexport type WebSocketConnectionEvents = {\n  \"connection-status\": (status: ConnectionStatus) => void;\n};\n\nexport class WebSocketConnection extends EventEmitter<WebSocketConnectionEvents> {\n  #callback;\n  /**\n   We are not confirmedOpen until we receive the first message from the\n   server. If we get an unexpected close event before that, we consider\n   the reconnect attempts as still within the connection phase, not true\n   reconnection. This can happen e.g. when connecting to remote host via\n   a proxy.\n  */\n  #confirmedOpen = false;\n  #connectionPhase: ConnectionPhase = \"initial-connection\";\n  #connectionStatus: ConnectionStatus = \"closed\";\n\n  #connectionTimeout;\n  #deferredOpen?: DeferredPromise;\n  #protocols;\n  #url;\n  #ws?: WebSocket;\n\n  constructor({\n    callback,\n    connectionTimeout = DEFAULT_CONNECTION_TIMEOUT,\n    protocols,\n    url,\n  }: WebSocketConnectionConfig) {\n    super();\n\n    this.#callback = callback;\n    this.#connectionTimeout = connectionTimeout;\n    this.#url = url;\n    this.#protocols = protocols;\n  }\n\n  get connectionTimeout() {\n    return this.#connectionTimeout;\n  }\n\n  get protocols() {\n    return this.#protocols;\n  }\n\n  get isClosed() {\n    return this.#connectionStatus === \"closed\";\n  }\n  get isDisconnected() {\n    return this.#connectionStatus === \"disconnected\";\n  }\n\n  get connectionPhase() {\n    return this.#connectionPhase;\n  }\n\n  get connectionStatus() {\n    return this.#connectionStatus;\n  }\n\n  private set connectionStatus(connectionStatus: ConnectionStatus) {\n    if (\n      connectionStatus !== \"connecting\" &&\n      connectionStatus !== \"reconnecting\"\n    ) {\n      this.#connectionStatus = connectionStatus;\n      this.emit(\"connection-status\", this.#connectionStatus);\n    }\n  }\n\n  get confirmedOpen() {\n    return this.#confirmedOpen;\n  }\n\n  /**\n   * We are 'confirmedOpen' when we see the first message transmitted\n   * from the server. This ensures that even if we have one or more\n   * proxies in our route to the endPoint, all connections have been\n   * opened successfully.\n   * First time in here (on our initial successful connection) we switch\n   * from 'connect' phase to 'reconnect' phase. We may have different\n   * retry configurations for these two phases.\n   */\n  private set confirmedOpen(confirmedOpen: boolean) {\n    this.#confirmedOpen = confirmedOpen;\n    if (confirmedOpen && this.#connectionPhase === \"initial-connection\") {\n      this.#connectionPhase = \"post-disconnect-reconnection\";\n    }\n  }\n\n  get url() {\n    return this.#url;\n  }\n\n  async openWebSocket() {\n    const initialConnect = this.#connectionPhase === \"initial-connection\";\n    if (this.#deferredOpen === undefined) {\n      this.#deferredOpen = new DeferredPromise();\n    }\n    const { connectionTimeout, protocols, url } = this;\n    this.#connectionStatus = initialConnect ? \"connecting\" : \"reconnecting\";\n\n    const timer = setTimeout(() => {\n      throw Error(\n        `Failed to open WebSocket connection to ${url}, timed out after ${connectionTimeout}ms`,\n      );\n    }, connectionTimeout);\n\n    const ws = (this.#ws = new WebSocket(url, protocols));\n\n    ws.onopen = () => {\n      this.connectionStatus = \"websocket-open\";\n\n      clearTimeout(timer);\n\n      // Do we do this here or after login\n      if (this.#deferredOpen) {\n        this.#deferredOpen.resolve(undefined);\n        this.#deferredOpen = undefined;\n      }\n    };\n\n    ws.onerror = () => {\n      clearTimeout(timer);\n    };\n\n    ws.onclose = () => {\n      if (!this.isClosed) {\n        this.confirmedOpen = false;\n        // Do we emit disconnected even if not confirmed open ?\n        // this will emit disconnected\n        this.connectionStatus = \"disconnected\";\n        // this will emit closed\n        this.close(\"failure\");\n      }\n    };\n\n    ws.onmessage = (evt) => {\n      this.receive(evt);\n    };\n\n    return this.#deferredOpen?.promise;\n  }\n\n  private receive = (evt: MessageEvent) => {\n    if (isLoginErrorMessage(evt.data)) {\n      console.log(`[WebSocketConnection] closed because of login issue`);\n      if (this.#deferredOpen) {\n        console.log(`... and qwe have a deferred connection`);\n      }\n\n      this.#callback({\n        type: \"LOGIN_REJECTED\",\n        reason: evt.data,\n      });\n      this.close(evt.data);\n    } else {\n      const vuuMessageFromServer = parseWebSocketMessage(evt.data);\n\n      if (debugEnabled) {\n        if (vuuMessageFromServer.body.type !== \"HB\") {\n          debug(`${vuuMessageFromServer.body.type}`);\n          if (vuuMessageFromServer.body.type === \"CHANGE_VP_SUCCESS\") {\n            debug(JSON.stringify(vuuMessageFromServer.body));\n          }\n        }\n      }\n      this.#callback(vuuMessageFromServer);\n\n      if (!this.confirmedOpen) {\n        if (vuuMessageFromServer.body.type === \"LOGIN_SUCCESS\") {\n          // Now that we are confirmedOpen any subsequent close events\n          // will be treated as part of a reconnection phase.\n          this.connectionStatus =\n            this.#connectionPhase === \"initial-connection\"\n              ? \"connected\"\n              : \"reconnected\";\n          this.confirmedOpen = true;\n        }\n      }\n    }\n  };\n\n  send = (msg: VuuClientMessage) => {\n    if (msg.body.type === \"CHANGE_VP_RANGE\") {\n      info?.(\n        `CHANGE_VP_RANGE<#${msg.requestId}> ${msg.body.from}-${msg.body.to}`,\n      );\n    }\n    this.#ws?.send(JSON.stringify(msg));\n  };\n\n  close(reason: WebSocketConnectionCloseReason = \"shutdown\") {\n    this.connectionStatus = \"closed\";\n    if (reason === \"failure\") {\n      if (this.#deferredOpen) {\n        this.#deferredOpen.reject(Error(\"connection failed\"));\n        this.#deferredOpen = undefined;\n      }\n    } else {\n      this.#ws?.close();\n    }\n    this.#ws = undefined;\n  }\n}\n"],"names":["logger"],"mappings":";;;;AAuCsCA,gBAAO,qBAAqB;AAE3D,MAAM,2BAA8B,GAAA,CACzC,GAEA,KAAA,OAAO,QAAQ,QACf,IAAA;AAAA,EACE,YAAA;AAAA,EACA,gBAAA;AAAA,EACA,WAAA;AAAA,EACA,cAAA;AAAA,EACA,aAAA;AAAA,EACA,cAAA;AAAA,EACA,QAAA;AAAA,EACA;AACF,CAAA,CAAE,SAAS,GAAG;AAET,MAAM,WAAc,GAAA,CACzB,MAEA,KAAA,MAAA,KAAW,eAAe,MAAW,KAAA;;;;;"}
+{"version":3,"file":"WebSocketConnection.js","sources":["../../../packages/vuu-data-remote/src/WebSocketConnection.ts"],"sourcesContent":["import { WebSocketProtocol } from \"@vuu-ui/vuu-data-types\";\nimport { VuuClientMessage, VuuServerMessage } from \"@vuu-ui/vuu-protocol-types\";\nimport { DeferredPromise, EventEmitter, logger } from \"@vuu-ui/vuu-utils\";\n\nexport type ConnectingStatus = \"connecting\" | \"reconnecting\";\nexport type ConnectedStatus = \"connected\" | \"reconnected\";\nexport type ConnectionStatus =\n  | ConnectedStatus\n  | \"closed\"\n  | \"connection-open-awaiting-session\"\n  | \"disconnected\"\n  | \"failed\"\n  | \"inactive\";\n\ntype InternalConnectionStatus = ConnectionStatus | ConnectingStatus;\n\ntype ReconnectAttempts = {\n  retryAttemptsTotal: number;\n  retryAttemptsRemaining: number;\n  secondsToNextRetry: number;\n};\n\nexport interface WebSocketConnectionState<\n  T extends InternalConnectionStatus = ConnectionStatus,\n> extends ReconnectAttempts {\n  connectionPhase: ConnectingStatus;\n  connectionStatus: T;\n}\n\nconst { debug, debugEnabled, info } = logger(\"WebSocketConnection\");\n\nconst isNotConnecting = (\n  connectionState: WebSocketConnectionState<InternalConnectionStatus>,\n): connectionState is WebSocketConnectionState<ConnectionStatus> =>\n  connectionState.connectionStatus !== \"connecting\" &&\n  connectionState.connectionStatus !== \"reconnecting\";\n\nexport const isWebSocketConnectionMessage = (\n  msg: object | WebSocketConnectionState,\n): msg is WebSocketConnectionState => {\n  if (\"connectionStatus\" in msg) {\n    return [\n      \"connecting\",\n      \"connected\",\n      \"connection-open-awaiting-session\",\n      \"reconnecting\",\n      \"reconnected\",\n      \"disconnected\",\n      \"closed\",\n      \"failed\",\n    ].includes(msg.connectionStatus);\n  } else {\n    return false;\n  }\n};\n\nexport const isConnected = (\n  status: ConnectionStatus,\n): status is ConnectedStatus =>\n  status === \"connected\" || status === \"reconnected\";\n\nexport type VuuServerMessageCallback = (msg: VuuServerMessage) => void;\n\nexport type RetryLimits = {\n  connect: number;\n  reconnect: number;\n};\n\nexport type WebSocketConnectionConfig = {\n  url: string;\n  protocols: WebSocketProtocol;\n  callback: VuuServerMessageCallback;\n  connectionTimeout?: number;\n  retryLimits?: RetryLimits;\n};\n\nconst DEFAULT_RETRY_LIMITS: RetryLimits = {\n  connect: 5,\n  reconnect: 8,\n};\n\nconst DEFAULT_CONNECTION_TIMEOUT = 10000;\n\nconst ConnectingEndState: Record<ConnectingStatus, ConnectedStatus> = {\n  connecting: \"connected\",\n  reconnecting: \"reconnected\",\n} as const;\n\nconst parseWebSocketMessage = (message: string): VuuServerMessage => {\n  try {\n    return JSON.parse(message) as VuuServerMessage;\n  } catch (e) {\n    throw Error(`Error parsing JSON response from server ${message}`);\n  }\n};\n\nexport type WebSocketCloseMessage = {\n  type: \"websocket-closed\";\n  reason: WebSocketConnectionCloseReason;\n};\n\nexport type WebSocketConnectionCloseReason =\n  | \"failure\"\n  | \"shutdown\"\n  | \"invalid-token\"\n  | \"token-expired\";\nexport type WebSocketConnectionEvents = {\n  closed: (message: WebSocketCloseMessage) => void;\n  connected: () => void;\n  \"connection-status\": (message: WebSocketConnectionState) => void;\n  reconnected: () => void;\n};\n\nexport class WebSocketConnection extends EventEmitter<WebSocketConnectionEvents> {\n  #callback;\n  /**\n   We are not confirmedOpen until we receive the first message from the\n   server. If we get an unexpected close event before that, we consider\n   the reconnect attempts as still within the connection phase, not true\n   reconnection. This can happen e.g. when connecting to remote host via\n   a proxy.\n  */\n  #confirmedOpen = false;\n  #connectionState: WebSocketConnectionState<InternalConnectionStatus>;\n  #connectionTimeout;\n  #deferredConnection?: DeferredPromise;\n  #protocols;\n  #reconnectAttempts: ReconnectAttempts;\n  #requiresLogin = true;\n  #url;\n  #ws?: WebSocket;\n\n  constructor({\n    callback,\n    connectionTimeout = DEFAULT_CONNECTION_TIMEOUT,\n    protocols,\n    retryLimits = DEFAULT_RETRY_LIMITS,\n    url,\n  }: WebSocketConnectionConfig) {\n    super();\n\n    this.#callback = callback;\n    this.#connectionTimeout = connectionTimeout;\n    this.#url = url;\n    this.#protocols = protocols;\n\n    this.#reconnectAttempts = {\n      retryAttemptsTotal: retryLimits.reconnect,\n      retryAttemptsRemaining: retryLimits.reconnect,\n      secondsToNextRetry: 1,\n    };\n\n    /**\n     * Initial retryAttempts are for the 'connecting' phase. These will\n     * be replaced with 'reconnecting' phase retry attempts only once\n     * initial connection succeeds.\n     */\n    this.#connectionState = {\n      connectionPhase: \"connecting\",\n      connectionStatus: \"closed\",\n      retryAttemptsTotal: retryLimits.connect,\n      retryAttemptsRemaining: retryLimits.connect,\n      secondsToNextRetry: 1,\n    };\n  }\n\n  get connectionTimeout() {\n    return this.#connectionTimeout;\n  }\n\n  get protocols() {\n    return this.#protocols;\n  }\n\n  get requiresLogin() {\n    return this.#requiresLogin;\n  }\n\n  get isClosed() {\n    return this.status === \"closed\";\n  }\n  get isDisconnected() {\n    return this.status === \"disconnected\";\n  }\n\n  get isConnecting() {\n    return this.#connectionState.connectionPhase === \"connecting\";\n  }\n\n  get status() {\n    return this.#connectionState.connectionStatus;\n  }\n\n  private set status(connectionStatus: InternalConnectionStatus) {\n    this.#connectionState = {\n      ...this.#connectionState,\n      connectionStatus,\n    };\n    // we don't publish the connecting states. They have little meaning for clients\n    // and are will generally be very short-lived.\n    if (isNotConnecting(this.#connectionState)) {\n      this.emit(\"connection-status\", this.#connectionState);\n    }\n  }\n\n  get connectionState() {\n    return this.#connectionState;\n  }\n\n  private get hasConnectionAttemptsRemaining() {\n    return this.#connectionState.retryAttemptsRemaining > 0;\n  }\n\n  private get confirmedOpen() {\n    return this.#confirmedOpen;\n  }\n\n  /**\n   * We are 'confirmedOpen' when we see the first message transmitted\n   * from the server. This ensures that even if we have one or more\n   * proxies in our route to the endPoint, all connections have been\n   * opened successfully.\n   * First time in here (on our initial successful connection) we switch\n   * from 'connect' phase to 'reconnect' phase. We may have different\n   * retry configurations for these two phases.\n   */\n  private set confirmedOpen(confirmedOpen: boolean) {\n    this.#confirmedOpen = confirmedOpen;\n\n    if (confirmedOpen && this.isConnecting) {\n      this.#connectionState = {\n        ...this.#connectionState,\n        connectionPhase: \"reconnecting\",\n        ...this.#reconnectAttempts,\n      };\n    } else if (confirmedOpen) {\n      // we have successfully reconnected after a failure.\n      // Reset the retry attempts, ready for next failure\n      // Note: this retry is shared with 'disconnected' status\n      this.#connectionState = {\n        ...this.#connectionState,\n        ...this.#reconnectAttempts,\n      };\n    }\n  }\n\n  get url() {\n    return this.#url;\n  }\n\n  async connect(clientCall = true) {\n    const state = this.#connectionState;\n    if (this.isConnecting && this.#deferredConnection === undefined) {\n      // We block on the first connecting call, this will be the\n      // initial connect call from app. Any other calls will be\n      // reconnect attempts. The initial connecting call returns a promise.\n      // This promise is resolved either on that initial call or on a\n      // subsequent successful retry attempt within nthat same initial\n      // connecting phase.\n      this.#deferredConnection = new DeferredPromise();\n    }\n    const { connectionTimeout, protocols, url } = this;\n    this.status = state.connectionPhase;\n    const timer = setTimeout(() => {\n      throw Error(\n        `Failed to open WebSocket connection to ${url}, timed out after ${connectionTimeout}ms`,\n      );\n    }, connectionTimeout);\n\n    const ws = (this.#ws = new WebSocket(url, protocols));\n\n    ws.onopen = () => {\n      const connectedStatus = ConnectingEndState[state.connectionPhase];\n      this.status = connectedStatus;\n      clearTimeout(timer);\n      if (this.#deferredConnection) {\n        this.#deferredConnection.resolve(undefined);\n        this.#deferredConnection = undefined;\n      }\n      if (this.isConnecting) {\n        this.emit(\"connected\");\n      } else {\n        this.emit(\"reconnected\");\n      }\n    };\n    ws.onerror = () => {\n      clearTimeout(timer);\n    };\n\n    ws.onclose = () => {\n      if (!this.isClosed) {\n        this.confirmedOpen = false;\n        this.status = \"disconnected\";\n        if (this.hasConnectionAttemptsRemaining) {\n          this.reconnect();\n        } else {\n          this.close(\"failure\");\n        }\n      }\n    };\n\n    ws.onmessage = (evt) => {\n      if (!this.confirmedOpen) {\n        // Now that we are confirmedOpen any subsequent close events\n        // will be treated as part of a reconnection phase.\n        this.confirmedOpen = true;\n      }\n      this.receive(evt);\n    };\n\n    if (clientCall) {\n      return this.#deferredConnection?.promise;\n    }\n  }\n\n  private reconnect() {\n    const { retryAttemptsRemaining, secondsToNextRetry } =\n      this.#connectionState;\n    setTimeout(() => {\n      this.#connectionState = {\n        ...this.#connectionState,\n        retryAttemptsRemaining: retryAttemptsRemaining - 1,\n        secondsToNextRetry: secondsToNextRetry * 2,\n      };\n      this.connect(false);\n    }, secondsToNextRetry * 1000);\n  }\n\n  private receive = (evt: MessageEvent) => {\n    if (evt.data === \"Invalid token\" || evt.data === \"Token has expired\") {\n      const closeReason: WebSocketConnectionCloseReason =\n        evt.data === \"Invalid token\" ? \"invalid-token\" : \"token-expired\";\n      this.close(closeReason);\n    } else {\n      const vuuMessageFromServer = parseWebSocketMessage(evt.data);\n      if (vuuMessageFromServer.body.type === \"CHANGE_VP_RANGE_SUCCESS\") {\n        info?.(`CHANGE_VP_RANGE_SUCCESS<#${vuuMessageFromServer.requestId}>`);\n      }\n      if (debugEnabled) {\n        if (vuuMessageFromServer.body.type !== \"HB\") {\n          debug(`${vuuMessageFromServer.body.type}`);\n          if (vuuMessageFromServer.body.type === \"CHANGE_VP_SUCCESS\") {\n            debug(JSON.stringify(vuuMessageFromServer.body));\n          }\n        }\n      }\n      this.#callback(vuuMessageFromServer);\n    }\n  };\n\n  send = (msg: VuuClientMessage) => {\n    if (msg.body.type === \"CHANGE_VP_RANGE\") {\n      info?.(\n        `CHANGE_VP_RANGE<#${msg.requestId}> ${msg.body.from}-${msg.body.to}`,\n      );\n    }\n    this.#ws?.send(JSON.stringify(msg));\n  };\n\n  close(reason: WebSocketConnectionCloseReason = \"shutdown\") {\n    this.status = \"closed\";\n    if (reason === \"failure\") {\n      if (this.#deferredConnection) {\n        this.#deferredConnection.reject(Error(\"connection failed\"));\n        this.#deferredConnection = undefined;\n      }\n    } else {\n      this.#ws?.close();\n    }\n    this.emit(\"closed\", { type: \"websocket-closed\", reason });\n    this.#ws = undefined;\n  }\n}\n"],"names":["logger"],"mappings":";;;;AA6BsCA,gBAAO,qBAAqB;AAQrD,MAAA,4BAAA,GAA+B,CAC1C,GACoC,KAAA;AACpC,EAAA,IAAI,sBAAsB,GAAK,EAAA;AAC7B,IAAO,OAAA;AAAA,MACL,YAAA;AAAA,MACA,WAAA;AAAA,MACA,kCAAA;AAAA,MACA,cAAA;AAAA,MACA,aAAA;AAAA,MACA,cAAA;AAAA,MACA,QAAA;AAAA,MACA;AAAA,KACF,CAAE,QAAS,CAAA,GAAA,CAAI,gBAAgB,CAAA;AAAA,GAC1B,MAAA;AACL,IAAO,OAAA,KAAA;AAAA;AAEX;AAEO,MAAM,WAAc,GAAA,CACzB,MAEA,KAAA,MAAA,KAAW,eAAe,MAAW,KAAA;;;;;"}

package/cjs/authenticate.js

@@ -12,20 +12,6 @@ const parseVuuUserFromToken = (token) => {
     throw Error(`auth token does not containe VuuUser`);
   }
 };
-const getVuuAuthToken = async (authUrl, token) => {
-  const response = await fetch(authUrl, {
-    headers: { Authorization: `Bearer ${token}` }
-  });
-  if (!response.ok) {
-    throw Error("Authentication error: Auth token failure");
-  }
-  const json = await response.json();
-  const vuuUser = parseVuuUserFromToken(json.token);
-  return {
-    authorizations: vuuUser.authorizations,
-    token: json.token
-  };
-};
 const authenticate = async (username, password, authUrl = defaultAuthUrl) => {
   return fetch(authUrl, {
     method: "POST",
@@ -59,6 +45,5 @@ const authenticate = async (username, password, authUrl = defaultAuthUrl) => {
 };
 
 exports.authenticate = authenticate;
-exports.getVuuAuthToken = getVuuAuthToken;
 exports.parseVuuUserFromToken = parseVuuUserFromToken;
 //# sourceMappingURL=authenticate.js.map

package/cjs/authenticate.js.map

@@ -1 +1 @@
-{"version":3,"file":"authenticate.js","sources":["../../../packages/vuu-data-remote/src/authenticate.ts"],"sourcesContent":["import type { VuuUser } from \"@vuu-ui/vuu-protocol-types\";\n\nconst defaultAuthUrl = \"api/authn\";\n\nconst isValidVuuUser = (response: unknown): response is VuuUser =>\n  typeof response === \"object\" &&\n  response !== null &&\n  \"name\" in response &&\n  \"authorizations\" in response &&\n  typeof response.name === \"string\" &&\n  Array.isArray(response.authorizations);\n\n/**\n * The auth token returned from authn call encodes (Base64) a VuuUser\n * within the first part of the token.\n */\nexport const parseVuuUserFromToken = (token: string) => {\n  const [base64EncodedVuuUser] = token.split(\".\");\n  const jsonString = atob(base64EncodedVuuUser);\n  const response = JSON.parse(jsonString);\n  if (isValidVuuUser(response)) {\n    return response;\n  } else {\n    throw Error(`auth token does not containe VuuUser`);\n  }\n};\n\nexport type AuthenticationResponse = {\n  token: string;\n  user: VuuUser;\n};\n\nexport const getVuuAuthToken = async (\n  authUrl: string,\n  token: string,\n): Promise<{ authorizations: string[]; token: string }> => {\n  const response = await fetch(authUrl, {\n    headers: { Authorization: `Bearer ${token}` },\n  });\n  if (!response.ok) {\n    throw Error(\"Authentication error: Auth token failure\");\n  }\n  const json = await response.json();\n  const vuuUser = parseVuuUserFromToken(json.token);\n  return {\n    authorizations: vuuUser.authorizations,\n    token: json.token,\n  };\n};\n\nexport const authenticate = async (\n  username: string,\n  password: string,\n  authUrl = defaultAuthUrl,\n): Promise<AuthenticationResponse> => {\n  return fetch(authUrl, {\n    method: \"POST\",\n    credentials: \"include\",\n    headers: {\n      \"Content-Type\": \"application/json\",\n      \"access-control-allow-origin\": location.host,\n    },\n    body: JSON.stringify({ username, password }),\n  }).then((response) => {\n    if (response.ok) {\n      const authToken = response.headers.get(\"vuu-auth-token\");\n      if (typeof authToken === \"string\" && authToken.length > 0) {\n        try {\n          return {\n            token: authToken,\n            user: parseVuuUserFromToken(authToken),\n          };\n        } catch (e) {\n          throw Error(`Authentication error:  vuu auth token decoding failed.`);\n        }\n      } else {\n        throw Error(`Authentication failed auth token not returned by server`);\n      }\n    } else {\n      throw Error(\n        `Authentication failed ${response.status} ${response.statusText}`,\n      );\n    }\n  });\n};\n"],"names":[],"mappings":";;AAEA,MAAM,cAAiB,GAAA,WAAA;AAEvB,MAAM,iBAAiB,CAAC,QAAA,KACtB,OAAO,QAAa,KAAA,QAAA,IACpB,aAAa,IACb,IAAA,MAAA,IAAU,YACV,gBAAoB,IAAA,QAAA,IACpB,OAAO,QAAS,CAAA,IAAA,KAAS,YACzB,KAAM,CAAA,OAAA,CAAQ,SAAS,cAAc,CAAA;AAM1B,MAAA,qBAAA,GAAwB,CAAC,KAAkB,KAAA;AACtD,EAAA,MAAM,CAAC,oBAAoB,CAAI,GAAA,KAAA,CAAM,MAAM,GAAG,CAAA;AAC9C,EAAM,MAAA,UAAA,GAAa,KAAK,oBAAoB,CAAA;AAC5C,EAAM,MAAA,QAAA,GAAW,IAAK,CAAA,KAAA,CAAM,UAAU,CAAA;AACtC,EAAI,IAAA,cAAA,CAAe,QAAQ,CAAG,EAAA;AAC5B,IAAO,OAAA,QAAA;AAAA,GACF,MAAA;AACL,IAAA,MAAM,MAAM,CAAsC,oCAAA,CAAA,CAAA;AAAA;AAEtD;AAOa,MAAA,eAAA,GAAkB,OAC7B,OAAA,EACA,KACyD,KAAA;AACzD,EAAM,MAAA,QAAA,GAAW,MAAM,KAAA,CAAM,OAAS,EAAA;AAAA,IACpC,OAAS,EAAA,EAAE,aAAe,EAAA,CAAA,OAAA,EAAU,KAAK,CAAG,CAAA;AAAA,GAC7C,CAAA;AACD,EAAI,IAAA,CAAC,SAAS,EAAI,EAAA;AAChB,IAAA,MAAM,MAAM,0CAA0C,CAAA;AAAA;AAExD,EAAM,MAAA,IAAA,GAAO,MAAM,QAAA,CAAS,IAAK,EAAA;AACjC,EAAM,MAAA,OAAA,GAAU,qBAAsB,CAAA,IAAA,CAAK,KAAK,CAAA;AAChD,EAAO,OAAA;AAAA,IACL,gBAAgB,OAAQ,CAAA,cAAA;AAAA,IACxB,OAAO,IAAK,CAAA;AAAA,GACd;AACF;AAEO,MAAM,YAAe,GAAA,OAC1B,QACA,EAAA,QAAA,EACA,UAAU,cAC0B,KAAA;AACpC,EAAA,OAAO,MAAM,OAAS,EAAA;AAAA,IACpB,MAAQ,EAAA,MAAA;AAAA,IACR,WAAa,EAAA,SAAA;AAAA,IACb,OAAS,EAAA;AAAA,MACP,cAAgB,EAAA,kBAAA;AAAA,MAChB,+BAA+B,QAAS,CAAA;AAAA,KAC1C;AAAA,IACA,MAAM,IAAK,CAAA,SAAA,CAAU,EAAE,QAAA,EAAU,UAAU;AAAA,GAC5C,CAAA,CAAE,IAAK,CAAA,CAAC,QAAa,KAAA;AACpB,IAAA,IAAI,SAAS,EAAI,EAAA;AACf,MAAA,MAAM,SAAY,GAAA,QAAA,CAAS,OAAQ,CAAA,GAAA,CAAI,gBAAgB,CAAA;AACvD,MAAA,IAAI,OAAO,SAAA,KAAc,QAAY,IAAA,SAAA,CAAU,SAAS,CAAG,EAAA;AACzD,QAAI,IAAA;AACF,UAAO,OAAA;AAAA,YACL,KAAO,EAAA,SAAA;AAAA,YACP,IAAA,EAAM,sBAAsB,SAAS;AAAA,WACvC;AAAA,iBACO,CAAG,EAAA;AACV,UAAA,MAAM,MAAM,CAAwD,sDAAA,CAAA,CAAA;AAAA;AACtE,OACK,MAAA;AACL,QAAA,MAAM,MAAM,CAAyD,uDAAA,CAAA,CAAA;AAAA;AACvE,KACK,MAAA;AACL,MAAM,MAAA,KAAA;AAAA,QACJ,CAAyB,sBAAA,EAAA,QAAA,CAAS,MAAM,CAAA,CAAA,EAAI,SAAS,UAAU,CAAA;AAAA,OACjE;AAAA;AACF,GACD,CAAA;AACH;;;;;;"}
+{"version":3,"file":"authenticate.js","sources":["../../../packages/vuu-data-remote/src/authenticate.ts"],"sourcesContent":["import type { VuuUser } from \"@vuu-ui/vuu-protocol-types\";\n\nconst defaultAuthUrl = \"api/authn\";\n\nconst isValidVuuUser = (response: unknown): response is VuuUser =>\n  typeof response === \"object\" &&\n  response !== null &&\n  \"name\" in response &&\n  \"authorizations\" in response &&\n  typeof response.name === \"string\" &&\n  Array.isArray(response.authorizations);\n\n/**\n * The auth token returned from authn call encodes (Base64) a VuuUser\n * within the first part of the token.\n */\nexport const parseVuuUserFromToken = (token: string) => {\n  const [base64EncodedVuuUser] = token.split(\".\");\n  const jsonString = atob(base64EncodedVuuUser);\n  const response = JSON.parse(jsonString);\n  if (isValidVuuUser(response)) {\n    return response;\n  } else {\n    throw Error(`auth token does not containe VuuUser`);\n  }\n};\n\nexport type AuthenticationResponse = {\n  token: string;\n  user: VuuUser;\n};\n\nexport const authenticate = async (\n  username: string,\n  password: string,\n  authUrl = defaultAuthUrl,\n): Promise<AuthenticationResponse> => {\n  return fetch(authUrl, {\n    method: \"POST\",\n    credentials: \"include\",\n    headers: {\n      \"Content-Type\": \"application/json\",\n      \"access-control-allow-origin\": location.host,\n    },\n    body: JSON.stringify({ username, password }),\n  }).then((response) => {\n    if (response.ok) {\n      const authToken = response.headers.get(\"vuu-auth-token\");\n      if (typeof authToken === \"string\" && authToken.length > 0) {\n        try {\n          return {\n            token: authToken,\n            user: parseVuuUserFromToken(authToken),\n          };\n        } catch (e) {\n          throw Error(`Authentication error:  vuu auth token decoding failed.`);\n        }\n      } else {\n        throw Error(`Authentication failed auth token not returned by server`);\n      }\n    } else {\n      throw Error(\n        `Authentication failed ${response.status} ${response.statusText}`,\n      );\n    }\n  });\n};\n"],"names":[],"mappings":";;AAEA,MAAM,cAAiB,GAAA,WAAA;AAEvB,MAAM,iBAAiB,CAAC,QAAA,KACtB,OAAO,QAAa,KAAA,QAAA,IACpB,aAAa,IACb,IAAA,MAAA,IAAU,YACV,gBAAoB,IAAA,QAAA,IACpB,OAAO,QAAS,CAAA,IAAA,KAAS,YACzB,KAAM,CAAA,OAAA,CAAQ,SAAS,cAAc,CAAA;AAM1B,MAAA,qBAAA,GAAwB,CAAC,KAAkB,KAAA;AACtD,EAAA,MAAM,CAAC,oBAAoB,CAAI,GAAA,KAAA,CAAM,MAAM,GAAG,CAAA;AAC9C,EAAM,MAAA,UAAA,GAAa,KAAK,oBAAoB,CAAA;AAC5C,EAAM,MAAA,QAAA,GAAW,IAAK,CAAA,KAAA,CAAM,UAAU,CAAA;AACtC,EAAI,IAAA,cAAA,CAAe,QAAQ,CAAG,EAAA;AAC5B,IAAO,OAAA,QAAA;AAAA,GACF,MAAA;AACL,IAAA,MAAM,MAAM,CAAsC,oCAAA,CAAA,CAAA;AAAA;AAEtD;AAOO,MAAM,YAAe,GAAA,OAC1B,QACA,EAAA,QAAA,EACA,UAAU,cAC0B,KAAA;AACpC,EAAA,OAAO,MAAM,OAAS,EAAA;AAAA,IACpB,MAAQ,EAAA,MAAA;AAAA,IACR,WAAa,EAAA,SAAA;AAAA,IACb,OAAS,EAAA;AAAA,MACP,cAAgB,EAAA,kBAAA;AAAA,MAChB,+BAA+B,QAAS,CAAA;AAAA,KAC1C;AAAA,IACA,MAAM,IAAK,CAAA,SAAA,CAAU,EAAE,QAAA,EAAU,UAAU;AAAA,GAC5C,CAAA,CAAE,IAAK,CAAA,CAAC,QAAa,KAAA;AACpB,IAAA,IAAI,SAAS,EAAI,EAAA;AACf,MAAA,MAAM,SAAY,GAAA,QAAA,CAAS,OAAQ,CAAA,GAAA,CAAI,gBAAgB,CAAA;AACvD,MAAA,IAAI,OAAO,SAAA,KAAc,QAAY,IAAA,SAAA,CAAU,SAAS,CAAG,EAAA;AACzD,QAAI,IAAA;AACF,UAAO,OAAA;AAAA,YACL,KAAO,EAAA,SAAA;AAAA,YACP,IAAA,EAAM,sBAAsB,SAAS;AAAA,WACvC;AAAA,iBACO,CAAG,EAAA;AACV,UAAA,MAAM,MAAM,CAAwD,sDAAA,CAAA,CAAA;AAAA;AACtE,OACK,MAAA;AACL,QAAA,MAAM,MAAM,CAAyD,uDAAA,CAAA,CAAA;AAAA;AACvE,KACK,MAAA;AACL,MAAM,MAAA,KAAA;AAAA,QACJ,CAAyB,sBAAA,EAAA,QAAA,CAAS,MAAM,CAAA,CAAA,EAAI,SAAS,UAAU,CAAA;AAAA,OACjE;AAAA;AACF,GACD,CAAA;AACH;;;;;"}

package/cjs/index.js

@@ -4,17 +4,13 @@ var authenticate = require('./authenticate.js');
 var ConnectionManager = require('./ConnectionManager.js');
 var constants = require('./constants.js');
 var dataSource = require('./data-source.js');
-var LostConnectionHandler = require('./LostConnectionHandler.js');
 var messageUtils = require('./message-utils.js');
-var VuuAuthenticator = require('./VuuAuthenticator.js');
-var VuuAuthProvider = require('./VuuAuthProvider.js');
 var VuuDataSource = require('./VuuDataSource.js');
 var WebSocketConnection = require('./WebSocketConnection.js');
 
 
 
 exports.authenticate = authenticate.authenticate;
-exports.getVuuAuthToken = authenticate.getVuuAuthToken;
 exports.parseVuuUserFromToken = authenticate.parseVuuUserFromToken;
 exports.ConnectionManager = ConnectionManager;
 exports.connectionId = constants.connectionId;
@@ -23,16 +19,11 @@ exports.isDataSourceConfigMessage = dataSource.isDataSourceConfigMessage;
 exports.isSizeOnly = dataSource.isSizeOnly;
 exports.shouldMessageBeRoutedToDataSource = dataSource.shouldMessageBeRoutedToDataSource;
 exports.toDataSourceConfig = dataSource.toDataSourceConfig;
-exports.LostConnectionHandler = LostConnectionHandler.LostConnectionHandler;
-exports.RetryOptions = LostConnectionHandler.RetryOptions;
 exports.createSchemaFromTableMetadata = messageUtils.createSchemaFromTableMetadata;
 exports.getFirstAndLastRows = messageUtils.getFirstAndLastRows;
 exports.groupRowsByViewport = messageUtils.groupRowsByViewport;
 exports.hasRequestId = messageUtils.hasRequestId;
 exports.stripRequestId = messageUtils.stripRequestId;
-exports.VuuAuthTokenIssuePolicy = VuuAuthenticator.VuuAuthTokenIssuePolicy;
-exports.VuuAuthenticator = VuuAuthenticator.VuuAuthenticator;
-exports.VuuAuthProvider = VuuAuthProvider.VuuAuthProvider;
 exports.VuuDataSource = VuuDataSource.VuuDataSource;
 exports.isConnected = WebSocketConnection.isConnected;
 //# sourceMappingURL=index.js.map

package/cjs/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"index.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;"}