@cubejs-client/ws-transport 0.30.60 → 0.30.64

package/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.30.64](https://github.com/cube-js/cube.js/compare/v0.30.63...v0.30.64) (2022-09-07)
+
+**Note:** Version bump only for package @cubejs-client/ws-transport
+
+
+
+
+
 ## [0.30.60](https://github.com/cube-js/cube.js/compare/v0.30.59...v0.30.60) (2022-08-28)
 
 **Note:** Version bump only for package @cubejs-client/ws-transport

package/dist/cubejs-client-ws-transport.esm.js

@@ -1,22 +1,5 @@
-import _objectWithoutProperties from '@babel/runtime/helpers/objectWithoutProperties';
-import _asyncToGenerator from '@babel/runtime/helpers/asyncToGenerator';
-import _classCallCheck from '@babel/runtime/helpers/classCallCheck';
-import _createClass from '@babel/runtime/helpers/createClass';
-import _defineProperty from '@babel/runtime/helpers/defineProperty';
-import 'core-js/modules/es.array.for-each.js';
-import 'core-js/modules/es.object.to-string.js';
-import 'core-js/modules/web.dom-collections.for-each.js';
-import 'core-js/modules/es.date.to-string.js';
-import 'core-js/modules/es.object.keys.js';
-import 'core-js/modules/es.promise.js';
-import 'core-js/modules/web.timers.js';
-import 'core-js/modules/es.array.find.js';
-import 'core-js/modules/es.array.filter.js';
-import _regeneratorRuntime from '@babel/runtime/regenerator';
 import WebSocket from 'isomorphic-ws';
 
-var _excluded = ["baseRequestId"];
-
 /**
  * @title @cubejs-client/ws-transport
  * @permalink /@cubejs-client-ws-transport
@@ -25,103 +8,43 @@ var _excluded = ["baseRequestId"];
  * @menuOrder 4
  * @description WebSocket transport for Cube.js client
  */
-var WebSocketTransportResult = /*#__PURE__*/function () {
-  function WebSocketTransportResult(_ref) {
-    var status = _ref.status,
-        message = _ref.message;
-
-    _classCallCheck(this, WebSocketTransportResult);
-
-    _defineProperty(this, "status", void 0);
-
-    _defineProperty(this, "result", void 0);
-
+class WebSocketTransportResult {
+  constructor({
+    status,
+    message
+  }) {
     this.status = status;
     this.result = message;
   }
 
-  _createClass(WebSocketTransportResult, [{
-    key: "json",
-    value: function () {
-      var _json = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-        return _regeneratorRuntime.wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                return _context.abrupt("return", this.result);
-
-              case 1:
-              case "end":
-                return _context.stop();
-            }
-          }
-        }, _callee, this);
-      }));
-
-      function json() {
-        return _json.apply(this, arguments);
-      }
-
-      return json;
-    }()
-  }, {
-    key: "clone",
-    value: function clone() {
-      // no need to actually clone it
-      return this;
-    }
-  }, {
-    key: "text",
-    value: function () {
-      var _text = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
-        return _regeneratorRuntime.wrap(function _callee2$(_context2) {
-          while (1) {
-            switch (_context2.prev = _context2.next) {
-              case 0:
-                return _context2.abrupt("return", typeof this.result === 'string' ? this.result : JSON.stringify(this.result));
-
-              case 1:
-              case "end":
-                return _context2.stop();
-            }
-          }
-        }, _callee2, this);
-      }));
-
-      function text() {
-        return _text.apply(this, arguments);
-      }
-
-      return text;
-    }()
-  }]);
-
-  return WebSocketTransportResult;
-}();
-
-var WebSocketTransport = /*#__PURE__*/function () {
-  function WebSocketTransport(_ref2) {
-    var authorization = _ref2.authorization,
-        apiUrl = _ref2.apiUrl,
-        heartBeatInterval = _ref2.heartBeatInterval,
-        hearBeatInterval = _ref2.hearBeatInterval;
-
-    _classCallCheck(this, WebSocketTransport);
-
-    _defineProperty(this, "apiUrl", void 0);
-
-    _defineProperty(this, "heartBeatInterval", 60);
-
-    _defineProperty(this, "token", void 0);
-
-    _defineProperty(this, "ws", null);
-
-    _defineProperty(this, "messageCounter", 1);
+  async json() {
+    return this.result;
+  }
 
-    _defineProperty(this, "messageIdToSubscription", {});
+  clone() {
+    // no need to actually clone it
+    return this;
+  }
 
-    _defineProperty(this, "messageQueue", []);
+  async text() {
+    return typeof this.result === 'string' ? this.result : JSON.stringify(this.result);
+  }
 
+}
+
+class WebSocketTransport {
+  heartBeatInterval = 60;
+  ws = null;
+  messageCounter = 1;
+  messageIdToSubscription = {};
+  messageQueue = [];
+
+  constructor({
+    authorization,
+    apiUrl,
+    heartBeatInterval,
+    hearBeatInterval
+  }) {
     this.token = authorization;
     this.apiUrl = apiUrl;
 
@@ -133,257 +56,173 @@ var WebSocketTransport = /*#__PURE__*/function () {
     }
   }
 
-  _createClass(WebSocketTransport, [{
-    key: "authorization",
-    get: function get() {
-      return this.token;
-    },
-    set: function set(token) {
-      this.token = token;
+  set authorization(token) {
+    this.token = token;
 
-      if (this.ws) {
-        this.ws.close();
-      }
+    if (this.ws) {
+      this.ws.close();
     }
-  }, {
-    key: "close",
-    value: function () {
-      var _close = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
-        return _regeneratorRuntime.wrap(function _callee3$(_context3) {
-          while (1) {
-            switch (_context3.prev = _context3.next) {
-              case 0:
-                if (this.ws) {
-                  this.ws.close();
-                }
-
-              case 1:
-              case "end":
-                return _context3.stop();
-            }
-          }
-        }, _callee3, this);
-      }));
+  }
 
-      function close() {
-        return _close.apply(this, arguments);
+  async close() {
+    if (this.ws) {
+      this.ws.close();
+    }
+  }
+
+  get authorization() {
+    return this.token;
+  }
+
+  initSocket() {
+    if (this.ws) {
+      return this.ws.initPromise;
+    }
+
+    const ws = new WebSocket(this.apiUrl);
+    ws.messageIdSent = {};
+
+    ws.sendMessage = message => {
+      if (!message.messageId || message.messageId && !ws.messageIdSent[message.messageId]) {
+        ws.send(JSON.stringify(message));
+        ws.messageIdSent[message.messageId] = true;
       }
+    };
 
-      return close;
-    }()
-  }, {
-    key: "initSocket",
-    value: function initSocket() {
-      var _this = this;
+    ws.sendQueue = () => {
+      this.messageQueue.forEach(message => ws.sendMessage(message));
+      this.messageQueue = [];
+    };
 
-      if (this.ws) {
-        return this.ws.initPromise;
+    ws.reconcile = () => {
+      if (new Date().getTime() - ws.lastMessageTimestamp.getTime() > 4 * this.heartBeatInterval * 1000) {
+        ws.close();
+      } else {
+        Object.keys(this.messageIdToSubscription).forEach(messageId => {
+          // @ts-ignore
+          ws.sendMessage(this.messageIdToSubscription[messageId].message);
+        });
       }
+    };
 
-      var ws = new WebSocket(this.apiUrl);
-      ws.messageIdSent = {};
+    ws.lastMessageTimestamp = new Date();
+    ws.initPromise = new Promise(resolve => {
+      ws.onopen = () => {
+        ws.sendMessage({
+          authorization: this.authorization
+        });
+      };
+
+      ws.onmessage = event => {
+        ws.lastMessageTimestamp = new Date();
+        const message = JSON.parse(event.data);
 
-      ws.sendMessage = function (message) {
-        if (!message.messageId || message.messageId && !ws.messageIdSent[message.messageId]) {
-          ws.send(JSON.stringify(message));
-          ws.messageIdSent[message.messageId] = true;
+        if (message.handshake) {
+          ws.reconcile();
+          ws.reconcileTimer = setInterval(() => {
+            ws.messageIdSent = {};
+            ws.reconcile();
+          }, this.heartBeatInterval * 1000);
+          resolve();
         }
-      };
 
-      ws.sendQueue = function () {
-        _this.messageQueue.forEach(function (message) {
-          return ws.sendMessage(message);
-        });
+        if (this.messageIdToSubscription[message.messageId]) {
+          this.messageIdToSubscription[message.messageId].callback(new WebSocketTransportResult(message));
+        }
 
-        _this.messageQueue = [];
+        ws.sendQueue();
       };
 
-      ws.reconcile = function () {
-        if (new Date().getTime() - ws.lastMessageTimestamp.getTime() > 4 * _this.heartBeatInterval * 1000) {
+      ws.onclose = () => {
+        if (ws && ws.readyState !== WebSocket.CLOSED && ws.readyState !== WebSocket.CLOSING) {
           ws.close();
-        } else {
-          Object.keys(_this.messageIdToSubscription).forEach(function (messageId) {
-            // @ts-ignore
-            ws.sendMessage(_this.messageIdToSubscription[messageId].message);
-          });
         }
-      };
 
-      ws.lastMessageTimestamp = new Date();
-      ws.initPromise = new Promise(function (resolve) {
-        ws.onopen = function () {
-          ws.sendMessage({
-            authorization: _this.authorization
-          });
-        };
+        if (ws.reconcileTimer) {
+          clearInterval(ws.reconcileTimer);
+          ws.reconcileTimer = null;
+        }
 
-        ws.onmessage = function (event) {
-          ws.lastMessageTimestamp = new Date();
-          var message = JSON.parse(event.data);
+        if (this.ws === ws) {
+          this.ws = null;
 
-          if (message.handshake) {
-            ws.reconcile();
-            ws.reconcileTimer = setInterval(function () {
-              ws.messageIdSent = {};
-              ws.reconcile();
-            }, _this.heartBeatInterval * 1000);
-            resolve();
-          }
-
-          if (_this.messageIdToSubscription[message.messageId]) {
-            _this.messageIdToSubscription[message.messageId].callback(new WebSocketTransportResult(message));
+          if (Object.keys(this.messageIdToSubscription).length) {
+            this.initSocket();
           }
+        }
+      };
 
-          ws.sendQueue();
-        };
+      ws.onerror = ws.onclose;
+    });
+    this.ws = ws;
+    return this.ws.initPromise;
+  }
 
-        ws.onclose = function () {
-          if (ws && ws.readyState !== WebSocket.CLOSED && ws.readyState !== WebSocket.CLOSING) {
-            ws.close();
-          }
+  sendMessage(message) {
+    if (message.unsubscribe && this.messageQueue.find(m => m.messageId === message.unsubscribe)) {
+      this.messageQueue = this.messageQueue.filter(m => m.messageId !== message.unsubscribe);
+    } else {
+      this.messageQueue.push(message);
+    }
 
-          if (ws.reconcileTimer) {
-            clearInterval(ws.reconcileTimer);
-            ws.reconcileTimer = null;
-          }
+    setTimeout(async () => {
+      await this.initSocket();
+      this.ws.sendQueue();
+    }, 100);
+  }
 
-          if (_this.ws === ws) {
-            _this.ws = null;
+  request(method, {
+    baseRequestId,
+    ...params
+  }) {
+    const message = {
+      messageId: this.messageCounter++,
+      requestId: baseRequestId,
+      method,
+      params
+    };
+    const pendingResults = [];
+    let nextMessage = null;
+
+    const runNextMessage = () => {
+      if (nextMessage) {
+        nextMessage(pendingResults.pop());
+        nextMessage = null;
+      }
+    };
 
-            if (Object.keys(_this.messageIdToSubscription).length) {
-              _this.initSocket();
-            }
+    this.messageIdToSubscription[message.messageId] = {
+      message,
+      callback: result => {
+        pendingResults.push(result);
+        runNextMessage();
+      }
+    };
+    const transport = this;
+    return {
+      async subscribe(callback) {
+        transport.sendMessage(message);
+        const result = await new Promise(resolve => {
+          nextMessage = resolve;
+
+          if (pendingResults.length) {
+            runNextMessage();
           }
-        };
+        });
+        return callback(result, () => this.subscribe(callback));
+      },
 
-        ws.onerror = ws.onclose;
-      });
-      this.ws = ws;
-      return this.ws.initPromise;
-    }
-  }, {
-    key: "sendMessage",
-    value: function sendMessage(message) {
-      var _this2 = this;
-
-      if (message.unsubscribe && this.messageQueue.find(function (m) {
-        return m.messageId === message.unsubscribe;
-      })) {
-        this.messageQueue = this.messageQueue.filter(function (m) {
-          return m.messageId !== message.unsubscribe;
+      async unsubscribe() {
+        transport.sendMessage({
+          unsubscribe: message.messageId
         });
-      } else {
-        this.messageQueue.push(message);
+        delete transport.messageIdToSubscription[message.messageId];
       }
 
-      setTimeout( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4() {
-        return _regeneratorRuntime.wrap(function _callee4$(_context4) {
-          while (1) {
-            switch (_context4.prev = _context4.next) {
-              case 0:
-                _context4.next = 2;
-                return _this2.initSocket();
-
-              case 2:
-                _this2.ws.sendQueue();
-
-              case 3:
-              case "end":
-                return _context4.stop();
-            }
-          }
-        }, _callee4);
-      })), 100);
-    }
-  }, {
-    key: "request",
-    value: function request(method, _ref4) {
-      var baseRequestId = _ref4.baseRequestId,
-          params = _objectWithoutProperties(_ref4, _excluded);
-
-      var message = {
-        messageId: this.messageCounter++,
-        requestId: baseRequestId,
-        method: method,
-        params: params
-      };
-      var pendingResults = [];
-      var nextMessage = null;
-
-      var runNextMessage = function runNextMessage() {
-        if (nextMessage) {
-          nextMessage(pendingResults.pop());
-          nextMessage = null;
-        }
-      };
-
-      this.messageIdToSubscription[message.messageId] = {
-        message: message,
-        callback: function callback(result) {
-          pendingResults.push(result);
-          runNextMessage();
-        }
-      };
-      var transport = this;
-      return {
-        subscribe: function subscribe(callback) {
-          var _this3 = this;
-
-          return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5() {
-            var result;
-            return _regeneratorRuntime.wrap(function _callee5$(_context5) {
-              while (1) {
-                switch (_context5.prev = _context5.next) {
-                  case 0:
-                    transport.sendMessage(message);
-                    _context5.next = 3;
-                    return new Promise(function (resolve) {
-                      nextMessage = resolve;
-
-                      if (pendingResults.length) {
-                        runNextMessage();
-                      }
-                    });
-
-                  case 3:
-                    result = _context5.sent;
-                    return _context5.abrupt("return", callback(result, function () {
-                      return _this3.subscribe(callback);
-                    }));
-
-                  case 5:
-                  case "end":
-                    return _context5.stop();
-                }
-              }
-            }, _callee5);
-          }))();
-        },
-        unsubscribe: function unsubscribe() {
-          return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6() {
-            return _regeneratorRuntime.wrap(function _callee6$(_context6) {
-              while (1) {
-                switch (_context6.prev = _context6.next) {
-                  case 0:
-                    transport.sendMessage({
-                      unsubscribe: message.messageId
-                    });
-                    delete transport.messageIdToSubscription[message.messageId];
-
-                  case 2:
-                  case "end":
-                    return _context6.stop();
-                }
-              }
-            }, _callee6);
-          }))();
-        }
-      };
-    }
-  }]);
+    };
+  }
 
-  return WebSocketTransport;
-}();
+}
 
 export default WebSocketTransport;
 //# sourceMappingURL=cubejs-client-ws-transport.esm.js.map

package/dist/cubejs-client-ws-transport.esm.js.map

@@ -1 +1 @@
-{"version":3,"file":"cubejs-client-ws-transport.esm.js","sources":["../src/index.ts"],"sourcesContent":["import WebSocket from 'isomorphic-ws';\nimport type { ITransport, ITransportResponse } from '@cubejs-client/core';\n\n/**\n * @title @cubejs-client/ws-transport\n * @permalink /@cubejs-client-ws-transport\n * @menuCategory Cube.js Frontend\n * @subcategory Reference\n * @menuOrder 4\n * @description WebSocket transport for Cube.js client\n */\n\nclass WebSocketTransportResult {\n  protected readonly status: unknown;\n\n  protected readonly result: unknown;\n\n  public constructor({ status, message }: { status: unknown, message: unknown }) {\n    this.status = status;\n    this.result = message;\n  }\n\n  public async json() {\n    return this.result;\n  }\n\n  public clone() {\n    // no need to actually clone it\n    return this;\n  }\n\n  public async text() {\n    return typeof this.result === 'string' ? this.result : JSON.stringify(this.result);\n  }\n}\n\ntype WebSocketTransportOptions = {\n  authorization?: string,\n  apiUrl: string,\n  // @deprecated\n  hearBeatInterval?: number,\n  heartBeatInterval?: number,\n};\n\ntype Message = {\n  messageId: number,\n  requestId: any,\n  method: string,\n  params: Record<string, unknown>,\n};\n\ntype Subscription = {\n  message: Message,\n  callback: (result: WebSocketTransportResult) => void,\n};\n\nclass WebSocketTransport implements ITransport<WebSocketTransportResult> {\n  protected readonly apiUrl: string;\n\n  protected readonly heartBeatInterval: number = 60;\n\n  protected token: string | undefined;\n\n  protected ws: any = null;\n\n  protected messageCounter: number = 1;\n\n  protected messageIdToSubscription: Record<number, Subscription> = {};\n\n  protected messageQueue: Message[] = [];\n\n  public constructor({ authorization, apiUrl, heartBeatInterval, hearBeatInterval }: WebSocketTransportOptions) {\n    this.token = authorization;\n    this.apiUrl = apiUrl;\n\n    if (heartBeatInterval) {\n      this.heartBeatInterval = heartBeatInterval;\n    } else if (hearBeatInterval) {\n      console.warn('Option hearBeatInterval is deprecated. It was replaced by heartBeatInterval.');\n      this.heartBeatInterval = hearBeatInterval;\n    }\n  }\n\n  public set authorization(token) {\n    this.token = token;\n\n    if (this.ws) {\n      this.ws.close();\n    }\n  }\n\n  public async close(): Promise<void> {\n    if (this.ws) {\n      this.ws.close();\n    }\n  }\n\n  public get authorization() {\n    return this.token;\n  }\n\n  protected initSocket() {\n    if (this.ws) {\n      return this.ws.initPromise;\n    }\n\n    const ws: any = new WebSocket(this.apiUrl);\n\n    ws.messageIdSent = {};\n\n    ws.sendMessage = (message: any) => {\n      if (!message.messageId || message.messageId && !ws.messageIdSent[message.messageId]) {\n        ws.send(JSON.stringify(message));\n        ws.messageIdSent[message.messageId] = true;\n      }\n    };\n\n    ws.sendQueue = () => {\n      this.messageQueue.forEach(message => ws.sendMessage(message));\n      this.messageQueue = [];\n    };\n\n    ws.reconcile = () => {\n      if (new Date().getTime() - ws.lastMessageTimestamp.getTime() > 4 * this.heartBeatInterval * 1000) {\n        ws.close();\n      } else {\n        Object.keys(this.messageIdToSubscription).forEach(messageId => {\n          // @ts-ignore\n          ws.sendMessage(this.messageIdToSubscription[messageId].message);\n        });\n      }\n    };\n\n    ws.lastMessageTimestamp = new Date();\n\n    ws.initPromise = new Promise<void>(resolve => {\n      ws.onopen = () => {\n        ws.sendMessage({ authorization: this.authorization });\n      };\n\n      ws.onmessage = (event: any) => {\n        ws.lastMessageTimestamp = new Date();\n\n        const message: any = JSON.parse(event.data);\n        if (message.handshake) {\n          ws.reconcile();\n          ws.reconcileTimer = setInterval(() => {\n            ws.messageIdSent = {};\n            ws.reconcile();\n          }, this.heartBeatInterval * 1000);\n          resolve();\n        }\n\n        if (this.messageIdToSubscription[message.messageId]) {\n          this.messageIdToSubscription[message.messageId].callback(\n            new WebSocketTransportResult(message)\n          );\n        }\n\n        ws.sendQueue();\n      };\n\n      ws.onclose = () => {\n        if (ws && ws.readyState !== WebSocket.CLOSED && ws.readyState !== WebSocket.CLOSING) {\n          ws.close();\n        }\n        if (ws.reconcileTimer) {\n          clearInterval(ws.reconcileTimer);\n          ws.reconcileTimer = null;\n        }\n        if (this.ws === ws) {\n          this.ws = null;\n          if (Object.keys(this.messageIdToSubscription).length) {\n            this.initSocket();\n          }\n        }\n      };\n\n      ws.onerror = ws.onclose;\n    });\n\n    this.ws = ws;\n\n    return this.ws.initPromise;\n  }\n\n  protected sendMessage(message: any) {\n    if (message.unsubscribe && this.messageQueue.find(m => m.messageId === message.unsubscribe)) {\n      this.messageQueue = this.messageQueue.filter(m => m.messageId !== message.unsubscribe);\n    } else {\n      this.messageQueue.push(message);\n    }\n\n    setTimeout(async () => {\n      await this.initSocket();\n      this.ws.sendQueue();\n    }, 100);\n  }\n\n  public request(\n    method: string,\n    { baseRequestId, ...params }: Record<string, unknown>\n  ): ITransportResponse<WebSocketTransportResult> {\n    const message: Message = {\n      messageId: this.messageCounter++,\n      requestId: baseRequestId,\n      method,\n      params\n    };\n\n    const pendingResults: WebSocketTransportResult[] = [];\n    let nextMessage: ((value: any) => void) | null = null;\n\n    const runNextMessage = () => {\n      if (nextMessage) {\n        nextMessage(pendingResults.pop());\n        nextMessage = null;\n      }\n    };\n\n    this.messageIdToSubscription[message.messageId] = {\n      message,\n      callback: (result) => {\n        pendingResults.push(result);\n        runNextMessage();\n      }\n    };\n\n    const transport = this;\n\n    return {\n      async subscribe(callback) {\n        transport.sendMessage(message);\n\n        const result = await new Promise<WebSocketTransportResult>((resolve) => {\n          nextMessage = resolve;\n          if (pendingResults.length) {\n            runNextMessage();\n          }\n        });\n\n        return callback(result, () => this.subscribe(callback));\n      },\n      async unsubscribe() {\n        transport.sendMessage({ unsubscribe: message.messageId });\n        delete transport.messageIdToSubscription[message.messageId];\n      }\n    };\n  }\n}\n\nexport default WebSocketTransport;\n"],"names":["WebSocketTransportResult","status","message","result","JSON","stringify","WebSocketTransport","authorization","apiUrl","heartBeatInterval","hearBeatInterval","token","console","warn","ws","close","initPromise","WebSocket","messageIdSent","sendMessage","messageId","send","sendQueue","messageQueue","forEach","reconcile","Date","getTime","lastMessageTimestamp","Object","keys","messageIdToSubscription","Promise","resolve","onopen","onmessage","event","parse","data","handshake","reconcileTimer","setInterval","callback","onclose","readyState","CLOSED","CLOSING","clearInterval","length","initSocket","onerror","unsubscribe","find","m","filter","push","setTimeout","method","baseRequestId","params","messageCounter","requestId","pendingResults","nextMessage","runNextMessage","pop","transport","subscribe"],"mappings":"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"}
+{"version":3,"file":"cubejs-client-ws-transport.esm.js","sources":["../src/index.ts"],"sourcesContent":["import WebSocket from 'isomorphic-ws';\nimport type { ITransport, ITransportResponse } from '@cubejs-client/core';\n\n/**\n * @title @cubejs-client/ws-transport\n * @permalink /@cubejs-client-ws-transport\n * @menuCategory Cube.js Frontend\n * @subcategory Reference\n * @menuOrder 4\n * @description WebSocket transport for Cube.js client\n */\n\nclass WebSocketTransportResult {\n  protected readonly status: unknown;\n\n  protected readonly result: unknown;\n\n  public constructor({ status, message }: { status: unknown, message: unknown }) {\n    this.status = status;\n    this.result = message;\n  }\n\n  public async json() {\n    return this.result;\n  }\n\n  public clone() {\n    // no need to actually clone it\n    return this;\n  }\n\n  public async text() {\n    return typeof this.result === 'string' ? this.result : JSON.stringify(this.result);\n  }\n}\n\ntype WebSocketTransportOptions = {\n  authorization?: string,\n  apiUrl: string,\n  // @deprecated\n  hearBeatInterval?: number,\n  heartBeatInterval?: number,\n};\n\ntype Message = {\n  messageId: number,\n  requestId: any,\n  method: string,\n  params: Record<string, unknown>,\n};\n\ntype Subscription = {\n  message: Message,\n  callback: (result: WebSocketTransportResult) => void,\n};\n\nclass WebSocketTransport implements ITransport<WebSocketTransportResult> {\n  protected readonly apiUrl: string;\n\n  protected readonly heartBeatInterval: number = 60;\n\n  protected token: string | undefined;\n\n  protected ws: any = null;\n\n  protected messageCounter: number = 1;\n\n  protected messageIdToSubscription: Record<number, Subscription> = {};\n\n  protected messageQueue: Message[] = [];\n\n  public constructor({ authorization, apiUrl, heartBeatInterval, hearBeatInterval }: WebSocketTransportOptions) {\n    this.token = authorization;\n    this.apiUrl = apiUrl;\n\n    if (heartBeatInterval) {\n      this.heartBeatInterval = heartBeatInterval;\n    } else if (hearBeatInterval) {\n      console.warn('Option hearBeatInterval is deprecated. It was replaced by heartBeatInterval.');\n      this.heartBeatInterval = hearBeatInterval;\n    }\n  }\n\n  public set authorization(token) {\n    this.token = token;\n\n    if (this.ws) {\n      this.ws.close();\n    }\n  }\n\n  public async close(): Promise<void> {\n    if (this.ws) {\n      this.ws.close();\n    }\n  }\n\n  public get authorization() {\n    return this.token;\n  }\n\n  protected initSocket() {\n    if (this.ws) {\n      return this.ws.initPromise;\n    }\n\n    const ws: any = new WebSocket(this.apiUrl);\n\n    ws.messageIdSent = {};\n\n    ws.sendMessage = (message: any) => {\n      if (!message.messageId || message.messageId && !ws.messageIdSent[message.messageId]) {\n        ws.send(JSON.stringify(message));\n        ws.messageIdSent[message.messageId] = true;\n      }\n    };\n\n    ws.sendQueue = () => {\n      this.messageQueue.forEach(message => ws.sendMessage(message));\n      this.messageQueue = [];\n    };\n\n    ws.reconcile = () => {\n      if (new Date().getTime() - ws.lastMessageTimestamp.getTime() > 4 * this.heartBeatInterval * 1000) {\n        ws.close();\n      } else {\n        Object.keys(this.messageIdToSubscription).forEach(messageId => {\n          // @ts-ignore\n          ws.sendMessage(this.messageIdToSubscription[messageId].message);\n        });\n      }\n    };\n\n    ws.lastMessageTimestamp = new Date();\n\n    ws.initPromise = new Promise<void>(resolve => {\n      ws.onopen = () => {\n        ws.sendMessage({ authorization: this.authorization });\n      };\n\n      ws.onmessage = (event: any) => {\n        ws.lastMessageTimestamp = new Date();\n\n        const message: any = JSON.parse(event.data);\n        if (message.handshake) {\n          ws.reconcile();\n          ws.reconcileTimer = setInterval(() => {\n            ws.messageIdSent = {};\n            ws.reconcile();\n          }, this.heartBeatInterval * 1000);\n          resolve();\n        }\n\n        if (this.messageIdToSubscription[message.messageId]) {\n          this.messageIdToSubscription[message.messageId].callback(\n            new WebSocketTransportResult(message)\n          );\n        }\n\n        ws.sendQueue();\n      };\n\n      ws.onclose = () => {\n        if (ws && ws.readyState !== WebSocket.CLOSED && ws.readyState !== WebSocket.CLOSING) {\n          ws.close();\n        }\n        if (ws.reconcileTimer) {\n          clearInterval(ws.reconcileTimer);\n          ws.reconcileTimer = null;\n        }\n        if (this.ws === ws) {\n          this.ws = null;\n          if (Object.keys(this.messageIdToSubscription).length) {\n            this.initSocket();\n          }\n        }\n      };\n\n      ws.onerror = ws.onclose;\n    });\n\n    this.ws = ws;\n\n    return this.ws.initPromise;\n  }\n\n  protected sendMessage(message: any) {\n    if (message.unsubscribe && this.messageQueue.find(m => m.messageId === message.unsubscribe)) {\n      this.messageQueue = this.messageQueue.filter(m => m.messageId !== message.unsubscribe);\n    } else {\n      this.messageQueue.push(message);\n    }\n\n    setTimeout(async () => {\n      await this.initSocket();\n      this.ws.sendQueue();\n    }, 100);\n  }\n\n  public request(\n    method: string,\n    { baseRequestId, ...params }: Record<string, unknown>\n  ): ITransportResponse<WebSocketTransportResult> {\n    const message: Message = {\n      messageId: this.messageCounter++,\n      requestId: baseRequestId,\n      method,\n      params\n    };\n\n    const pendingResults: WebSocketTransportResult[] = [];\n    let nextMessage: ((value: any) => void) | null = null;\n\n    const runNextMessage = () => {\n      if (nextMessage) {\n        nextMessage(pendingResults.pop());\n        nextMessage = null;\n      }\n    };\n\n    this.messageIdToSubscription[message.messageId] = {\n      message,\n      callback: (result) => {\n        pendingResults.push(result);\n        runNextMessage();\n      }\n    };\n\n    const transport = this;\n\n    return {\n      async subscribe(callback) {\n        transport.sendMessage(message);\n\n        const result = await new Promise<WebSocketTransportResult>((resolve) => {\n          nextMessage = resolve;\n          if (pendingResults.length) {\n            runNextMessage();\n          }\n        });\n\n        return callback(result, () => this.subscribe(callback));\n      },\n      async unsubscribe() {\n        transport.sendMessage({ unsubscribe: message.messageId });\n        delete transport.messageIdToSubscription[message.messageId];\n      }\n    };\n  }\n}\n\nexport default WebSocketTransport;\n"],"names":["WebSocketTransportResult","constructor","status","message","result","json","clone","text","JSON","stringify","WebSocketTransport","heartBeatInterval","ws","messageCounter","messageIdToSubscription","messageQueue","authorization","apiUrl","hearBeatInterval","token","console","warn","close","initSocket","initPromise","WebSocket","messageIdSent","sendMessage","messageId","send","sendQueue","forEach","reconcile","Date","getTime","lastMessageTimestamp","Object","keys","Promise","resolve","onopen","onmessage","event","parse","data","handshake","reconcileTimer","setInterval","callback","onclose","readyState","CLOSED","CLOSING","clearInterval","length","onerror","unsubscribe","find","m","filter","push","setTimeout","request","method","baseRequestId","params","requestId","pendingResults","nextMessage","runNextMessage","pop","transport","subscribe"],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cubejs-client/ws-transport",
-  "version": "0.30.60",
+  "version": "0.30.64",
   "engines": {},
   "repository": {
     "type": "git",
@@ -20,7 +20,7 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.1.2",
-    "@cubejs-client/core": "^0.30.60",
+    "@cubejs-client/core": "^0.30.64",
     "core-js": "^3.6.5",
     "isomorphic-ws": "^4.0.1",
     "ws": "^7.3.1"
@@ -46,5 +46,5 @@
   "eslintConfig": {
     "extends": "../cubejs-linter"
   },
-  "gitHead": "7ec87645cf0063257e527a83ea91f77551ad607c"
+  "gitHead": "f5123837220235430a0eabf921e2c9cd4f513261"
 }