@rc-ex/ws 1.4.1 → 1.4.3

package/dist/subscription.js

@@ -0,0 +1,99 @@
+import Utils from "./utils.js";
+class Subscription {
+  subscriptionInfo;
+  wse;
+  eventFilters;
+  eventListener;
+  timeout;
+  enabled = true;
+  constructor(wse, eventFilters, callback) {
+    this.wse = wse;
+    this.eventFilters = eventFilters;
+    this.eventListener = (mEvent) => {
+      const event = mEvent;
+      const [meta, body] = Utils.splitWsgData(event.data);
+      if (this.enabled && meta.type === "ServerNotification" && body.subscriptionId === this.subscriptionInfo.id) {
+        callback(body);
+      }
+    };
+    this.setupWsEventListener();
+  }
+  setupWsEventListener() {
+    this.wse.ws.addEventListener("message", this.eventListener);
+  }
+  get requestBody() {
+    return {
+      deliveryMode: { transportType: "WebSocket" },
+      // because WebSocket is not in spec
+      eventFilters: this.eventFilters
+    };
+  }
+  async subscribe() {
+    this.subscriptionInfo = (await this.wse.request(
+      "POST",
+      "/restapi/v1.0/subscription",
+      this.requestBody
+    )).data;
+  }
+  async refresh() {
+    if (!this.subscriptionInfo) {
+      return;
+    }
+    try {
+      this.subscriptionInfo = (await this.wse.request(
+        "PUT",
+        `/restapi/v1.0/subscription/${this.subscriptionInfo.id}`,
+        this.requestBody
+      )).data;
+    } catch (e) {
+      const re = e;
+      if (re.response && re.response.status === 404) {
+        await this.subscribe();
+      }
+    }
+  }
+  async revoke() {
+    if (!this.subscriptionInfo) {
+      return;
+    }
+    try {
+      await this.wse.request(
+        "DELETE",
+        `/restapi/v1.0/subscription/${this.subscriptionInfo.id}`
+      );
+    } catch (e) {
+      const re = e;
+      if (re.response && re.response.status === 404) {
+        if (this.wse.options.debugMode) {
+          console.debug(
+            `Subscription ${this.subscriptionInfo.id} doesn't exist on server side`
+          );
+        }
+      } else if (re.response && re.response.status === 401) {
+        if (this.wse.options.debugMode) {
+          console.debug("Token invalid when trying to revoke subscription");
+        }
+      } else {
+        throw e;
+      }
+    }
+    this.remove();
+  }
+  remove() {
+    if (this.timeout) {
+      global.clearTimeout(this.timeout);
+      this.timeout = void 0;
+    }
+    this.enabled = false;
+    this.subscriptionInfo = void 0;
+    if (this.wse.ws) {
+      this.wse.ws.removeEventListener("message", this.eventListener);
+    }
+    this.wse.subscription = void 0;
+  }
+}
+var subscription_default = Subscription;
+export {
+  subscription_default as default
+};
+//# sourceMappingURL=subscription.js.map

package/dist/subscription.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/subscription.ts"],"sourcesContent":["import type CreateSubscriptionRequest from \"@rc-ex/core/definitions/CreateSubscriptionRequest\";\nimport type SubscriptionInfo from \"@rc-ex/core/definitions/SubscriptionInfo\";\nimport type { RestResponse } from \"@rc-ex/core/types\";\nimport type { MessageEvent } from \"ws\";\n\nimport type {\n  WebSocketExtensionInterface,\n  WsgEvent,\n  WsgMeta,\n} from \"./types.js\";\nimport Utils from \"./utils.js\";\n\nclass Subscription {\n  public subscriptionInfo?: SubscriptionInfo;\n\n  public wse: WebSocketExtensionInterface;\n\n  public eventFilters: string[];\n\n  public eventListener: (event: MessageEvent) => void;\n\n  public timeout?: NodeJS.Timeout;\n\n  public enabled = true;\n\n  public constructor(\n    wse: WebSocketExtensionInterface,\n    eventFilters: string[],\n    callback: (event: {}) => void,\n  ) {\n    this.wse = wse;\n    this.eventFilters = eventFilters;\n    this.eventListener = (mEvent: MessageEvent) => {\n      const event = mEvent as WsgEvent;\n      const [meta, body]: [WsgMeta, { subscriptionId: string }] =\n        Utils.splitWsgData(event.data);\n      if (\n        this.enabled &&\n        meta.type === \"ServerNotification\" &&\n        body.subscriptionId === this.subscriptionInfo!.id\n      ) {\n        callback(body);\n      }\n    };\n    this.setupWsEventListener();\n  }\n\n  public setupWsEventListener() {\n    this.wse.ws.addEventListener(\"message\", this.eventListener);\n  }\n\n  public get requestBody(): CreateSubscriptionRequest {\n    return {\n      deliveryMode: { transportType: \"WebSocket\" as any }, // because WebSocket is not in spec\n      eventFilters: this.eventFilters,\n    };\n  }\n\n  public async subscribe() {\n    this.subscriptionInfo = (\n      await this.wse.request<SubscriptionInfo>(\n        \"POST\",\n        \"/restapi/v1.0/subscription\",\n        this.requestBody,\n      )\n    ).data;\n  }\n\n  public async refresh() {\n    if (!this.subscriptionInfo) {\n      return;\n    }\n    try {\n      this.subscriptionInfo = (\n        await this.wse.request<SubscriptionInfo>(\n          \"PUT\",\n          `/restapi/v1.0/subscription/${this.subscriptionInfo!.id}`,\n          this.requestBody,\n        )\n      ).data;\n    } catch (e) {\n      const re = e as { response: RestResponse };\n      if (re.response && re.response.status === 404) {\n        // subscription expired\n        await this.subscribe();\n      }\n    }\n  }\n\n  public async revoke() {\n    if (!this.subscriptionInfo) {\n      return;\n    }\n    try {\n      await this.wse.request<SubscriptionInfo>(\n        \"DELETE\",\n        `/restapi/v1.0/subscription/${this.subscriptionInfo!.id}`,\n      );\n    } catch (e) {\n      const re = e as { response: RestResponse };\n      if (re.response && re.response.status === 404) {\n        // ignore\n        if (this.wse.options.debugMode) {\n          console.debug(\n            `Subscription ${\n              this.subscriptionInfo!.id\n            } doesn't exist on server side`,\n          );\n        }\n      } else if (re.response && re.response.status === 401) {\n        // ignore\n        if (this.wse.options.debugMode) {\n          console.debug(\"Token invalid when trying to revoke subscription\");\n        }\n      } else {\n        throw e;\n      }\n    }\n    this.remove();\n  }\n\n  public remove() {\n    if (this.timeout) {\n      global.clearTimeout(this.timeout);\n      this.timeout = undefined;\n    }\n    this.enabled = false;\n    this.subscriptionInfo = undefined;\n    if (this.wse.ws) {\n      this.wse.ws.removeEventListener(\"message\", this.eventListener);\n    }\n    this.wse.subscription = undefined;\n  }\n}\n\nexport default Subscription;\n"],"mappings":"AAUA,OAAO,WAAW;AAElB,MAAM,aAAa;AAAA,EACV;AAAA,EAEA;AAAA,EAEA;AAAA,EAEA;AAAA,EAEA;AAAA,EAEA,UAAU;AAAA,EAEV,YACL,KACA,cACA,UACA;AACA,SAAK,MAAM;AACX,SAAK,eAAe;AACpB,SAAK,gBAAgB,CAAC,WAAyB;AAC7C,YAAM,QAAQ;AACd,YAAM,CAAC,MAAM,IAAI,IACf,MAAM,aAAa,MAAM,IAAI;AAC/B,UACE,KAAK,WACL,KAAK,SAAS,wBACd,KAAK,mBAAmB,KAAK,iBAAkB,IAC/C;AACA,iBAAS,IAAI;AAAA,MACf;AAAA,IACF;AACA,SAAK,qBAAqB;AAAA,EAC5B;AAAA,EAEO,uBAAuB;AAC5B,SAAK,IAAI,GAAG,iBAAiB,WAAW,KAAK,aAAa;AAAA,EAC5D;AAAA,EAEA,IAAW,cAAyC;AAClD,WAAO;AAAA,MACL,cAAc,EAAE,eAAe,YAAmB;AAAA;AAAA,MAClD,cAAc,KAAK;AAAA,IACrB;AAAA,EACF;AAAA,EAEA,MAAa,YAAY;AACvB,SAAK,oBACH,MAAM,KAAK,IAAI;AAAA,MACb;AAAA,MACA;AAAA,MACA,KAAK;AAAA,IACP,GACA;AAAA,EACJ;AAAA,EAEA,MAAa,UAAU;AACrB,QAAI,CAAC,KAAK,kBAAkB;AAC1B;AAAA,IACF;AACA,QAAI;AACF,WAAK,oBACH,MAAM,KAAK,IAAI;AAAA,QACb;AAAA,QACA,8BAA8B,KAAK,iBAAkB,EAAE;AAAA,QACvD,KAAK;AAAA,MACP,GACA;AAAA,IACJ,SAAS,GAAG;AACV,YAAM,KAAK;AACX,UAAI,GAAG,YAAY,GAAG,SAAS,WAAW,KAAK;AAE7C,cAAM,KAAK,UAAU;AAAA,MACvB;AAAA,IACF;AAAA,EACF;AAAA,EAEA,MAAa,SAAS;AACpB,QAAI,CAAC,KAAK,kBAAkB;AAC1B;AAAA,IACF;AACA,QAAI;AACF,YAAM,KAAK,IAAI;AAAA,QACb;AAAA,QACA,8BAA8B,KAAK,iBAAkB,EAAE;AAAA,MACzD;AAAA,IACF,SAAS,GAAG;AACV,YAAM,KAAK;AACX,UAAI,GAAG,YAAY,GAAG,SAAS,WAAW,KAAK;AAE7C,YAAI,KAAK,IAAI,QAAQ,WAAW;AAC9B,kBAAQ;AAAA,YACN,gBACE,KAAK,iBAAkB,EACzB;AAAA,UACF;AAAA,QACF;AAAA,MACF,WAAW,GAAG,YAAY,GAAG,SAAS,WAAW,KAAK;AAEpD,YAAI,KAAK,IAAI,QAAQ,WAAW;AAC9B,kBAAQ,MAAM,kDAAkD;AAAA,QAClE;AAAA,MACF,OAAO;AACL,cAAM;AAAA,MACR;AAAA,IACF;AACA,SAAK,OAAO;AAAA,EACd;AAAA,EAEO,SAAS;AACd,QAAI,KAAK,SAAS;AAChB,aAAO,aAAa,KAAK,OAAO;AAChC,WAAK,UAAU;AAAA,IACjB;AACA,SAAK,UAAU;AACf,SAAK,mBAAmB;AACxB,QAAI,KAAK,IAAI,IAAI;AACf,WAAK,IAAI,GAAG,oBAAoB,WAAW,KAAK,aAAa;AAAA,IAC/D;AACA,SAAK,IAAI,eAAe;AAAA,EAC1B;AACF;AAEA,IAAO,uBAAQ;","names":[]}

package/dist/types.cjs

@@ -0,0 +1,16 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var types_exports = {};
+module.exports = __toCommonJS(types_exports);
+//# sourceMappingURL=types.cjs.map

package/dist/types.cjs.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/types.ts"],"sourcesContent":["import type RingCentral from \"@rc-ex/core\";\nimport type {\n  RestMethod,\n  RestRequestConfig,\n  RestResponse,\n} from \"@rc-ex/core/types\";\nimport type WS from \"isomorphic-ws\";\n\nexport interface WsToken {\n  uri: string;\n  ws_access_token: string;\n  expires_in: number;\n}\n\nexport type CheckInterval = (retriesAttempted: number) => number;\nexport interface WebSocketOptions {\n  restOverWebSocket?: boolean;\n  debugMode?: boolean;\n  autoRecover?: {\n    enabled: boolean;\n    checkInterval?: CheckInterval;\n    pingServerInterval?: number;\n  };\n  wscToken?: string;\n}\n\nexport interface WsgEvent {\n  data: string;\n}\n\nexport interface Wsc {\n  token: string;\n  sequence: number;\n}\n\nexport interface WsgMeta {\n  type:\n    | \"ClientRequest\"\n    | \"ServerNotification\"\n    | \"Error\"\n    | \"ConnectionDetails\"\n    | \"Heartbeat\";\n  messageId: string;\n  status: number;\n  headers: {\n    [key: string]: string;\n  };\n  wsc?: Wsc;\n}\n\nexport interface WsgError {\n  errorCode: string;\n  message: string;\n}\n\nexport interface ConnectionDetails {\n  creationTime: string;\n  maxConnectionsPerSession: number;\n  recoveryBufferSize: number;\n  recoveryTimeout: number;\n  idleTimeout: number;\n  absoluteTimeout: number;\n  maxActiveRequests: number;\n  recoveryState?: \"Successful\" | \"Failed\";\n  recoveryErrorCode?: string;\n}\n\nexport interface WebSocketExtensionInterface {\n  options: WebSocketOptions;\n  subscription?: SubscriptionInterface;\n  ws: WS;\n  wsToken?: WsToken;\n  rc: RingCentral;\n  request: <T>(\n    method: RestMethod,\n    endpoint: string,\n    content?: {},\n    queryParams?: {},\n    config?: RestRequestConfig,\n  ) => Promise<RestResponse<T>>;\n}\n\nexport interface SubscriptionInterface {\n  eventFilters: string[];\n}\n"],"mappings":";;;;;;;;;;;;;AAAA;AAAA;","names":[]}

package/dist/types.js

@@ -0,0 +1 @@
+//# sourceMappingURL=types.js.map

package/dist/types.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":[],"sourcesContent":[],"mappings":"","names":[]}

package/dist/utils.cjs

@@ -0,0 +1,103 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var utils_exports = {};
+__export(utils_exports, {
+  default: () => utils_default
+});
+module.exports = __toCommonJS(utils_exports);
+var import_ClosedException = __toESM(require("./exceptions/ClosedException.js"), 1);
+var import_TimeoutException = __toESM(require("./exceptions/TimeoutException.js"), 1);
+class Utils {
+  static splitWsgData(wsgData) {
+    if (wsgData.includes(",--Boundary")) {
+      const index = wsgData.indexOf(",--Boundary");
+      return [
+        JSON.parse(wsgData.substring(1, index)),
+        wsgData.substring(index + 1, wsgData.length - 1)
+      ];
+    }
+    return JSON.parse(wsgData);
+  }
+  static debugWebSocket(_ws) {
+    const ws = _ws;
+    const send = ws.send.bind(ws);
+    ws.send = async (str) => {
+      await send(str);
+      console.debug(
+        `*** WebSocket outgoing message: ***
+${JSON.stringify(JSON.parse(str), null, 2)}
+******`
+      );
+    };
+    ws.addEventListener("message", (mEvent) => {
+      const event = mEvent;
+      console.debug(
+        `*** WebSocket incoming message: ***
+${JSON.stringify(JSON.parse(event.data), null, 2)}
+******`
+      );
+    });
+    ws.addEventListener("open", (event) => {
+      console.debug("WebSocket open event:", event);
+    });
+    ws.addEventListener("error", (event) => {
+      console.debug("WebSocket error event:", event);
+    });
+    ws.addEventListener("close", (event) => {
+      console.debug("WebSocket close event:", event);
+    });
+  }
+  static waitForWebSocketMessage(ws, matchCondition, timeout = 6e4) {
+    return new Promise((resolve, reject) => {
+      const checkHandle = setInterval(() => {
+        if (ws.readyState === ws.CLOSED) {
+          clearInterval(checkHandle);
+          reject(new import_ClosedException.default());
+        }
+      }, 1e3);
+      const timeoutHandle = setTimeout(() => {
+        ws.removeEventListener("message", handler);
+        clearInterval(checkHandle);
+        reject(new import_TimeoutException.default());
+      }, timeout);
+      const handler = (mEvent) => {
+        const event = mEvent;
+        const [meta, body] = Utils.splitWsgData(event.data);
+        if (matchCondition(meta)) {
+          ws.removeEventListener("message", handler);
+          clearInterval(checkHandle);
+          clearTimeout(timeoutHandle);
+          resolve([meta, body, event]);
+        }
+      };
+      ws.addEventListener("message", handler);
+    });
+  }
+}
+var utils_default = Utils;
+//# sourceMappingURL=utils.cjs.map

package/dist/utils.cjs.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/utils.ts"],"sourcesContent":["import type WS from \"isomorphic-ws\";\nimport type { MessageEvent } from \"isomorphic-ws\";\nimport ClosedException from \"./exceptions/ClosedException.js\";\nimport TimeoutException from \"./exceptions/TimeoutException.js\";\nimport type { WsgEvent, WsgMeta } from \"./types.js\";\n\nclass Utils {\n  public static splitWsgData(wsgData: string): [WsgMeta, any] {\n    if (wsgData.includes(\",--Boundary\")) {\n      const index = wsgData.indexOf(\",--Boundary\");\n      return [\n        JSON.parse(wsgData.substring(1, index)),\n        wsgData.substring(index + 1, wsgData.length - 1),\n      ];\n    }\n    return JSON.parse(wsgData);\n  }\n\n  public static debugWebSocket(_ws: WS) {\n    const ws = _ws;\n    const send = ws.send.bind(ws);\n    ws.send = async (str: string) => {\n      await send(str);\n      console.debug(\n        `*** WebSocket outgoing message: ***\n${JSON.stringify(JSON.parse(str), null, 2)}\n******`,\n      );\n    };\n    ws.addEventListener(\"message\", (mEvent: MessageEvent) => {\n      const event = mEvent as WsgEvent;\n      console.debug(\n        `*** WebSocket incoming message: ***\n${JSON.stringify(JSON.parse(event.data), null, 2)}\n******`,\n      );\n    });\n    ws.addEventListener(\"open\", (event) => {\n      console.debug(\"WebSocket open event:\", event);\n    });\n    ws.addEventListener(\"error\", (event) => {\n      console.debug(\"WebSocket error event:\", event);\n    });\n    ws.addEventListener(\"close\", (event) => {\n      console.debug(\"WebSocket close event:\", event);\n    });\n  }\n\n  public static waitForWebSocketMessage(\n    ws: WS,\n    matchCondition: (meta: WsgMeta) => boolean,\n    timeout = 60000,\n  ) {\n    return new Promise<[WsgMeta, any, WsgEvent]>((resolve, reject) => {\n      const checkHandle = setInterval(() => {\n        if (ws.readyState === ws.CLOSED) {\n          clearInterval(checkHandle);\n          reject(new ClosedException());\n        }\n      }, 1000);\n      const timeoutHandle = setTimeout(() => {\n        ws.removeEventListener(\"message\", handler);\n        clearInterval(checkHandle);\n        reject(new TimeoutException());\n      }, timeout);\n      const handler = (mEvent: MessageEvent) => {\n        const event = mEvent as WsgEvent;\n        const [meta, body] = Utils.splitWsgData(event.data);\n        if (matchCondition(meta)) {\n          ws.removeEventListener(\"message\", handler);\n          clearInterval(checkHandle);\n          clearTimeout(timeoutHandle);\n          resolve([meta, body, event]);\n        }\n      };\n      ws.addEventListener(\"message\", handler);\n    });\n  }\n}\n\nexport default Utils;\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAEA,6BAA4B;AAC5B,8BAA6B;AAG7B,MAAM,MAAM;AAAA,EACV,OAAc,aAAa,SAAiC;AAC1D,QAAI,QAAQ,SAAS,aAAa,GAAG;AACnC,YAAM,QAAQ,QAAQ,QAAQ,aAAa;AAC3C,aAAO;AAAA,QACL,KAAK,MAAM,QAAQ,UAAU,GAAG,KAAK,CAAC;AAAA,QACtC,QAAQ,UAAU,QAAQ,GAAG,QAAQ,SAAS,CAAC;AAAA,MACjD;AAAA,IACF;AACA,WAAO,KAAK,MAAM,OAAO;AAAA,EAC3B;AAAA,EAEA,OAAc,eAAe,KAAS;AACpC,UAAM,KAAK;AACX,UAAM,OAAO,GAAG,KAAK,KAAK,EAAE;AAC5B,OAAG,OAAO,OAAO,QAAgB;AAC/B,YAAM,KAAK,GAAG;AACd,cAAQ;AAAA,QACN;AAAA,EACN,KAAK,UAAU,KAAK,MAAM,GAAG,GAAG,MAAM,CAAC,CAAC;AAAA;AAAA,MAEpC;AAAA,IACF;AACA,OAAG,iBAAiB,WAAW,CAAC,WAAyB;AACvD,YAAM,QAAQ;AACd,cAAQ;AAAA,QACN;AAAA,EACN,KAAK,UAAU,KAAK,MAAM,MAAM,IAAI,GAAG,MAAM,CAAC,CAAC;AAAA;AAAA,MAE3C;AAAA,IACF,CAAC;AACD,OAAG,iBAAiB,QAAQ,CAAC,UAAU;AACrC,cAAQ,MAAM,yBAAyB,KAAK;AAAA,IAC9C,CAAC;AACD,OAAG,iBAAiB,SAAS,CAAC,UAAU;AACtC,cAAQ,MAAM,0BAA0B,KAAK;AAAA,IAC/C,CAAC;AACD,OAAG,iBAAiB,SAAS,CAAC,UAAU;AACtC,cAAQ,MAAM,0BAA0B,KAAK;AAAA,IAC/C,CAAC;AAAA,EACH;AAAA,EAEA,OAAc,wBACZ,IACA,gBACA,UAAU,KACV;AACA,WAAO,IAAI,QAAkC,CAAC,SAAS,WAAW;AAChE,YAAM,cAAc,YAAY,MAAM;AACpC,YAAI,GAAG,eAAe,GAAG,QAAQ;AAC/B,wBAAc,WAAW;AACzB,iBAAO,IAAI,uBAAAA,QAAgB,CAAC;AAAA,QAC9B;AAAA,MACF,GAAG,GAAI;AACP,YAAM,gBAAgB,WAAW,MAAM;AACrC,WAAG,oBAAoB,WAAW,OAAO;AACzC,sBAAc,WAAW;AACzB,eAAO,IAAI,wBAAAC,QAAiB,CAAC;AAAA,MAC/B,GAAG,OAAO;AACV,YAAM,UAAU,CAAC,WAAyB;AACxC,cAAM,QAAQ;AACd,cAAM,CAAC,MAAM,IAAI,IAAI,MAAM,aAAa,MAAM,IAAI;AAClD,YAAI,eAAe,IAAI,GAAG;AACxB,aAAG,oBAAoB,WAAW,OAAO;AACzC,wBAAc,WAAW;AACzB,uBAAa,aAAa;AAC1B,kBAAQ,CAAC,MAAM,MAAM,KAAK,CAAC;AAAA,QAC7B;AAAA,MACF;AACA,SAAG,iBAAiB,WAAW,OAAO;AAAA,IACxC,CAAC;AAAA,EACH;AACF;AAEA,IAAO,gBAAQ;","names":["ClosedException","TimeoutException"]}

package/dist/utils.js

@@ -0,0 +1,74 @@
+import ClosedException from "./exceptions/ClosedException.js";
+import TimeoutException from "./exceptions/TimeoutException.js";
+class Utils {
+  static splitWsgData(wsgData) {
+    if (wsgData.includes(",--Boundary")) {
+      const index = wsgData.indexOf(",--Boundary");
+      return [
+        JSON.parse(wsgData.substring(1, index)),
+        wsgData.substring(index + 1, wsgData.length - 1)
+      ];
+    }
+    return JSON.parse(wsgData);
+  }
+  static debugWebSocket(_ws) {
+    const ws = _ws;
+    const send = ws.send.bind(ws);
+    ws.send = async (str) => {
+      await send(str);
+      console.debug(
+        `*** WebSocket outgoing message: ***
+${JSON.stringify(JSON.parse(str), null, 2)}
+******`
+      );
+    };
+    ws.addEventListener("message", (mEvent) => {
+      const event = mEvent;
+      console.debug(
+        `*** WebSocket incoming message: ***
+${JSON.stringify(JSON.parse(event.data), null, 2)}
+******`
+      );
+    });
+    ws.addEventListener("open", (event) => {
+      console.debug("WebSocket open event:", event);
+    });
+    ws.addEventListener("error", (event) => {
+      console.debug("WebSocket error event:", event);
+    });
+    ws.addEventListener("close", (event) => {
+      console.debug("WebSocket close event:", event);
+    });
+  }
+  static waitForWebSocketMessage(ws, matchCondition, timeout = 6e4) {
+    return new Promise((resolve, reject) => {
+      const checkHandle = setInterval(() => {
+        if (ws.readyState === ws.CLOSED) {
+          clearInterval(checkHandle);
+          reject(new ClosedException());
+        }
+      }, 1e3);
+      const timeoutHandle = setTimeout(() => {
+        ws.removeEventListener("message", handler);
+        clearInterval(checkHandle);
+        reject(new TimeoutException());
+      }, timeout);
+      const handler = (mEvent) => {
+        const event = mEvent;
+        const [meta, body] = Utils.splitWsgData(event.data);
+        if (matchCondition(meta)) {
+          ws.removeEventListener("message", handler);
+          clearInterval(checkHandle);
+          clearTimeout(timeoutHandle);
+          resolve([meta, body, event]);
+        }
+      };
+      ws.addEventListener("message", handler);
+    });
+  }
+}
+var utils_default = Utils;
+export {
+  utils_default as default
+};
+//# sourceMappingURL=utils.js.map

package/dist/utils.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/utils.ts"],"sourcesContent":["import type WS from \"isomorphic-ws\";\nimport type { MessageEvent } from \"isomorphic-ws\";\nimport ClosedException from \"./exceptions/ClosedException.js\";\nimport TimeoutException from \"./exceptions/TimeoutException.js\";\nimport type { WsgEvent, WsgMeta } from \"./types.js\";\n\nclass Utils {\n  public static splitWsgData(wsgData: string): [WsgMeta, any] {\n    if (wsgData.includes(\",--Boundary\")) {\n      const index = wsgData.indexOf(\",--Boundary\");\n      return [\n        JSON.parse(wsgData.substring(1, index)),\n        wsgData.substring(index + 1, wsgData.length - 1),\n      ];\n    }\n    return JSON.parse(wsgData);\n  }\n\n  public static debugWebSocket(_ws: WS) {\n    const ws = _ws;\n    const send = ws.send.bind(ws);\n    ws.send = async (str: string) => {\n      await send(str);\n      console.debug(\n        `*** WebSocket outgoing message: ***\n${JSON.stringify(JSON.parse(str), null, 2)}\n******`,\n      );\n    };\n    ws.addEventListener(\"message\", (mEvent: MessageEvent) => {\n      const event = mEvent as WsgEvent;\n      console.debug(\n        `*** WebSocket incoming message: ***\n${JSON.stringify(JSON.parse(event.data), null, 2)}\n******`,\n      );\n    });\n    ws.addEventListener(\"open\", (event) => {\n      console.debug(\"WebSocket open event:\", event);\n    });\n    ws.addEventListener(\"error\", (event) => {\n      console.debug(\"WebSocket error event:\", event);\n    });\n    ws.addEventListener(\"close\", (event) => {\n      console.debug(\"WebSocket close event:\", event);\n    });\n  }\n\n  public static waitForWebSocketMessage(\n    ws: WS,\n    matchCondition: (meta: WsgMeta) => boolean,\n    timeout = 60000,\n  ) {\n    return new Promise<[WsgMeta, any, WsgEvent]>((resolve, reject) => {\n      const checkHandle = setInterval(() => {\n        if (ws.readyState === ws.CLOSED) {\n          clearInterval(checkHandle);\n          reject(new ClosedException());\n        }\n      }, 1000);\n      const timeoutHandle = setTimeout(() => {\n        ws.removeEventListener(\"message\", handler);\n        clearInterval(checkHandle);\n        reject(new TimeoutException());\n      }, timeout);\n      const handler = (mEvent: MessageEvent) => {\n        const event = mEvent as WsgEvent;\n        const [meta, body] = Utils.splitWsgData(event.data);\n        if (matchCondition(meta)) {\n          ws.removeEventListener(\"message\", handler);\n          clearInterval(checkHandle);\n          clearTimeout(timeoutHandle);\n          resolve([meta, body, event]);\n        }\n      };\n      ws.addEventListener(\"message\", handler);\n    });\n  }\n}\n\nexport default Utils;\n"],"mappings":"AAEA,OAAO,qBAAqB;AAC5B,OAAO,sBAAsB;AAG7B,MAAM,MAAM;AAAA,EACV,OAAc,aAAa,SAAiC;AAC1D,QAAI,QAAQ,SAAS,aAAa,GAAG;AACnC,YAAM,QAAQ,QAAQ,QAAQ,aAAa;AAC3C,aAAO;AAAA,QACL,KAAK,MAAM,QAAQ,UAAU,GAAG,KAAK,CAAC;AAAA,QACtC,QAAQ,UAAU,QAAQ,GAAG,QAAQ,SAAS,CAAC;AAAA,MACjD;AAAA,IACF;AACA,WAAO,KAAK,MAAM,OAAO;AAAA,EAC3B;AAAA,EAEA,OAAc,eAAe,KAAS;AACpC,UAAM,KAAK;AACX,UAAM,OAAO,GAAG,KAAK,KAAK,EAAE;AAC5B,OAAG,OAAO,OAAO,QAAgB;AAC/B,YAAM,KAAK,GAAG;AACd,cAAQ;AAAA,QACN;AAAA,EACN,KAAK,UAAU,KAAK,MAAM,GAAG,GAAG,MAAM,CAAC,CAAC;AAAA;AAAA,MAEpC;AAAA,IACF;AACA,OAAG,iBAAiB,WAAW,CAAC,WAAyB;AACvD,YAAM,QAAQ;AACd,cAAQ;AAAA,QACN;AAAA,EACN,KAAK,UAAU,KAAK,MAAM,MAAM,IAAI,GAAG,MAAM,CAAC,CAAC;AAAA;AAAA,MAE3C;AAAA,IACF,CAAC;AACD,OAAG,iBAAiB,QAAQ,CAAC,UAAU;AACrC,cAAQ,MAAM,yBAAyB,KAAK;AAAA,IAC9C,CAAC;AACD,OAAG,iBAAiB,SAAS,CAAC,UAAU;AACtC,cAAQ,MAAM,0BAA0B,KAAK;AAAA,IAC/C,CAAC;AACD,OAAG,iBAAiB,SAAS,CAAC,UAAU;AACtC,cAAQ,MAAM,0BAA0B,KAAK;AAAA,IAC/C,CAAC;AAAA,EACH;AAAA,EAEA,OAAc,wBACZ,IACA,gBACA,UAAU,KACV;AACA,WAAO,IAAI,QAAkC,CAAC,SAAS,WAAW;AAChE,YAAM,cAAc,YAAY,MAAM;AACpC,YAAI,GAAG,eAAe,GAAG,QAAQ;AAC/B,wBAAc,WAAW;AACzB,iBAAO,IAAI,gBAAgB,CAAC;AAAA,QAC9B;AAAA,MACF,GAAG,GAAI;AACP,YAAM,gBAAgB,WAAW,MAAM;AACrC,WAAG,oBAAoB,WAAW,OAAO;AACzC,sBAAc,WAAW;AACzB,eAAO,IAAI,iBAAiB,CAAC;AAAA,MAC/B,GAAG,OAAO;AACV,YAAM,UAAU,CAAC,WAAyB;AACxC,cAAM,QAAQ;AACd,cAAM,CAAC,MAAM,IAAI,IAAI,MAAM,aAAa,MAAM,IAAI;AAClD,YAAI,eAAe,IAAI,GAAG;AACxB,aAAG,oBAAoB,WAAW,OAAO;AACzC,wBAAc,WAAW;AACzB,uBAAa,aAAa;AAC1B,kBAAQ,CAAC,MAAM,MAAM,KAAK,CAAC;AAAA,QAC7B;AAAA,MACF;AACA,SAAG,iBAAiB,WAAW,OAAO;AAAA,IACxC,CAAC;AAAA,EACH;AACF;AAEA,IAAO,gBAAQ;","names":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rc-ex/ws",
-  "version": "1.4.1",
+  "version": "1.4.3",
   "description": "WebSocket extension for ringcentral-extensible project",
   "author": "Tyler Liu <tyler.liu@ringcentral.com>",
   "homepage": "https://github.com/ringcentral/ringcentral-extensible/tree/master/packages/extensions/ws",
@@ -8,24 +8,24 @@
   "files": [
     "dist"
   ],
-  "types": "./dist/esm/index.d.ts",
-  "main": "./dist/cjs/index.js",
-  "module": "./dist/esm/index.js",
+  "types": "./dist/index.d.ts",
+  "main": "./dist/index.cjs",
+  "module": "./dist/index.js",
   "exports": {
     ".": {
-      "types": "./dist/esm/index.d.ts",
-      "import": "./dist/esm/index.js",
-      "require": "./dist/cjs/index.js"
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.js",
+      "require": "./dist/index.cjs"
     },
     "./lib/*": {
-      "types": "./dist/esm/*.d.ts",
-      "import": "./dist/esm/*.js",
-      "require": "./dist/cjs/*.js"
+      "types": "./dist/*.d.ts",
+      "import": "./dist/*.js",
+      "require": "./dist/*.cjs"
     },
     "./*": {
-      "types": "./dist/esm/*.d.ts",
-      "import": "./dist/esm/*.js",
-      "require": "./dist/cjs/*.js"
+      "types": "./dist/*.d.ts",
+      "import": "./dist/*.js",
+      "require": "./dist/*.cjs"
     }
   },
   "repository": {
@@ -43,11 +43,12 @@
     "http-status-codes": "^2.3.0",
     "hyperid": "^3.3.0",
     "isomorphic-ws": "^5.0.0",
-    "wait-for-async": "^0.7.13",
-    "ws": "^8.18.3"
+    "wait-for-async": "^0.8.0",
+    "ws": "^8.19.0"
   },
   "scripts": {
-    "build": "tsc -p tsconfig.esm.json && tsc -p tsconfig.cjs.json"
+    "build": "tsup --config tsup.config.ts && tsc -p tsconfig.esm.json --declaration --emitDeclarationOnly --outDir dist"
   },
-  "gitHead": "c45b0085b85bed1763c358a8a658fbec09a51a73"
+  "type": "module",
+  "gitHead": "faeee1d92ec28e390edf150844deceddfb5dce7d"
 }

package/dist/cjs/exceptions/ClosedException.js

@@ -1,8 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-class ClosedException extends Error {
-    constructor(message) {
-        super(message ?? "WebSocket has been closed");
-    }
-}
-exports.default = ClosedException;

package/dist/cjs/exceptions/ConnectionException.js

@@ -1,17 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const utils_js_1 = __importDefault(require("../utils.js"));
-class ConnectionException extends Error {
-    wsgEvent;
-    wsgError;
-    constructor(wsgEvent) {
-        const [, wsgError] = utils_js_1.default.splitWsgData(wsgEvent.data);
-        super(JSON.stringify(wsgError, null, 2));
-        this.wsgEvent = wsgEvent;
-        this.wsgError = wsgError;
-    }
-}
-exports.default = ConnectionException;

package/dist/cjs/exceptions/TimeoutException.js

@@ -1,8 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-class TimeoutException extends Error {
-    constructor(message) {
-        super(message ?? "Failed to receive expected WebSocket message in time.");
-    }
-}
-exports.default = TimeoutException;