@rc-ex/ws 1.3.14 → 1.3.16

package/dist/esm/index.js

@@ -1,23 +1,17 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Events = void 0;
-const SdkExtension_1 = __importDefault(require("@rc-ex/core/SdkExtension"));
-const isomorphic_ws_1 = __importDefault(require("isomorphic-ws"));
-const hyperid_1 = __importDefault(require("hyperid"));
-const events_1 = require("events");
-const wait_for_async_1 = __importDefault(require("wait-for-async"));
-const RestException_1 = __importDefault(require("@rc-ex/core/RestException"));
-const rest_js_1 = require("./rest.js");
-const subscription_js_1 = __importDefault(require("./subscription.js"));
-const ConnectionException_js_1 = __importDefault(require("./exceptions/ConnectionException.js"));
-const utils_js_1 = __importDefault(require("./utils.js"));
+import SdkExtension from "@rc-ex/core/SdkExtension";
+import WS from "isomorphic-ws";
+import hyperid from "hyperid";
+import { EventEmitter } from "events";
+import waitFor from "wait-for-async";
+import RestException from "@rc-ex/core/RestException";
+import { request } from "./rest.js";
+import Subscription from "./subscription.js";
+import ConnectionException from "./exceptions/ConnectionException.js";
+import Utils from "./utils.js";
 const CONNECTING = 0;
 const OPEN = 1;
-const uuid = (0, hyperid_1.default)();
-var Events;
+const uuid = hyperid();
+export var Events;
 (function (Events) {
     Events["autoRecoverSuccess"] = "autoRecoverSuccess";
     Events["autoRecoverFailed"] = "autoRecoverFailed";
@@ -25,9 +19,9 @@ var Events;
     Events["newWebSocketObject"] = "newWebSocketObject";
     Events["newWsc"] = "newWsc";
     Events["connectionReady"] = "connectionReady";
-})(Events || (exports.Events = Events = {}));
-class WebSocketExtension extends SdkExtension_1.default {
-    eventEmitter = new events_1.EventEmitter();
+})(Events || (Events = {}));
+class WebSocketExtension extends SdkExtension {
+    eventEmitter = new EventEmitter();
     options;
     rc;
     wsToken;
@@ -42,7 +36,7 @@ class WebSocketExtension extends SdkExtension_1.default {
     pingServerHandle;
     _recoverPromise;
     _connectPromise;
-    request = rest_js_1.request; // request method was moved to another file to keep this file short
+    request = request; // request method was moved to another file to keep this file short
     constructor(options = {}) {
         super();
         this.options = options;
@@ -100,7 +94,7 @@ class WebSocketExtension extends SdkExtension_1.default {
             await connectMethod();
         }
         catch (e) {
-            if (e instanceof RestException_1.default) {
+            if (e instanceof RestException) {
                 throw e; // such as InsufficientPermissions
             }
             if (this.options.debugMode) {
@@ -133,7 +127,7 @@ class WebSocketExtension extends SdkExtension_1.default {
                         : Events.autoRecoverFailed, this.ws);
                 }
                 catch (e) {
-                    if (e instanceof RestException_1.default) {
+                    if (e instanceof RestException) {
                         throw e; // such as InsufficientPermissions
                     }
                     retriesAttempted += 1;
@@ -246,13 +240,13 @@ class WebSocketExtension extends SdkExtension_1.default {
         if (recoverSession && this.wsc) {
             wsUri += `&wsc=${this.wsc.token}`;
         }
-        this.ws = new isomorphic_ws_1.default(wsUri);
+        this.ws = new WS(wsUri);
         this.eventEmitter.emit(Events.newWebSocketObject, this.ws);
         // override send method to wait for connecting
         const send = this.ws.send.bind(this.ws);
         this.ws.send = async (s) => {
             if (this.ws.readyState === CONNECTING) {
-                await (0, wait_for_async_1.default)({
+                await waitFor({
                     interval: 100,
                     condition: () => this.ws.readyState !== CONNECTING,
                 });
@@ -269,12 +263,12 @@ class WebSocketExtension extends SdkExtension_1.default {
         }
         // debug mode to print all WebSocket traffic
         if (this.options.debugMode) {
-            utils_js_1.default.debugWebSocket(this.ws);
+            Utils.debugWebSocket(this.ws);
         }
         // listen for new wsc data
         this.ws.addEventListener("message", (mEvent) => {
             const event = mEvent;
-            const [meta, body] = utils_js_1.default.splitWsgData(event.data);
+            const [meta, body] = Utils.splitWsgData(event.data);
             if (meta.wsc &&
                 (!this.wsc ||
                     (meta.type === "ConnectionDetails" && body.recoveryState) ||
@@ -284,9 +278,9 @@ class WebSocketExtension extends SdkExtension_1.default {
             }
         });
         // get initial ConnectionDetails data
-        const [meta, body, event] = await utils_js_1.default.waitForWebSocketMessage(this.ws, (meta) => meta.type === "ConnectionDetails" || meta.type === "Error");
+        const [meta, body, event] = await Utils.waitForWebSocketMessage(this.ws, (meta) => meta.type === "ConnectionDetails" || meta.type === "Error");
         if (meta.type === "Error") {
-            throw new ConnectionException_js_1.default(event);
+            throw new ConnectionException(event);
         }
         this.connectionDetails = body;
         // fired when ws connection is ready for creating subscription
@@ -318,7 +312,7 @@ class WebSocketExtension extends SdkExtension_1.default {
         this.disable();
     }
     async subscribe(eventFilters, callback, cache = undefined) {
-        const subscription = new subscription_js_1.default(this, eventFilters, callback);
+        const subscription = new Subscription(this, eventFilters, callback);
         if (cache === undefined || cache === null) {
             await subscription.subscribe();
         }
@@ -330,4 +324,4 @@ class WebSocketExtension extends SdkExtension_1.default {
         return subscription;
     }
 }
-exports.default = WebSocketExtension;
+export default WebSocketExtension;

package/dist/esm/rest.js

@@ -1,16 +1,10 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.request = request;
-const RestException_1 = __importDefault(require("@rc-ex/core/RestException"));
-const hyperid_1 = __importDefault(require("hyperid"));
-const http_status_codes_1 = require("http-status-codes");
-const utils_js_1 = __importDefault(require("./utils.js"));
+import RestException from "@rc-ex/core/RestException";
+import hyperid from "hyperid";
+import { getReasonPhrase } from "http-status-codes";
+import Utils from "./utils.js";
 const version = "0.16";
-const uuid = (0, hyperid_1.default)();
-async function request(method, endpoint, content, queryParams, config) {
+const uuid = hyperid();
+export async function request(method, endpoint, content, queryParams, config) {
     const newConfig = {
         method,
         baseURL: this.wsToken?.uri,
@@ -38,16 +32,16 @@ async function request(method, endpoint, content, queryParams, config) {
         requestBody.push(newConfig.data);
     }
     await this.ws.send(JSON.stringify(requestBody));
-    const [meta, body] = await utils_js_1.default.waitForWebSocketMessage(this.ws, (_meta) => _meta.messageId === messageId);
+    const [meta, body] = await Utils.waitForWebSocketMessage(this.ws, (_meta) => _meta.messageId === messageId);
     const response = {
         data: body,
         status: meta.status,
-        statusText: (0, http_status_codes_1.getReasonPhrase)(meta.status),
+        statusText: getReasonPhrase(meta.status),
         headers: meta.headers,
         config: newConfig,
     };
     if (meta.type === "ClientRequest" && meta.status >= 200 && meta.status < 300) {
         return response;
     }
-    throw new RestException_1.default(response);
+    throw new RestException(response);
 }

package/dist/esm/subscription.js

@@ -1,9 +1,4 @@
-"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"));
+import Utils from "./utils.js";
 class Subscription {
     subscriptionInfo;
     wse;
@@ -16,7 +11,7 @@ class Subscription {
         this.eventFilters = eventFilters;
         this.eventListener = (mEvent) => {
             const event = mEvent;
-            const [meta, body] = utils_js_1.default
+            const [meta, body] = Utils
                 .splitWsgData(event.data);
             if (this.enabled && meta.type === "ServerNotification" &&
                 body.subscriptionId === this.subscriptionInfo.id) {
@@ -92,4 +87,4 @@ class Subscription {
         this.wse.subscription = undefined;
     }
 }
-exports.default = Subscription;
+export default Subscription;

package/dist/esm/types.d.ts

@@ -1,4 +1,4 @@
-import type RingCentral from "@rc-ex/core/index";
+import type RingCentral from "@rc-ex/core";
 import type { RestMethod, RestRequestConfig, RestResponse } from "@rc-ex/core/types";
 import type WS from "isomorphic-ws";
 export interface WsToken {

package/dist/esm/types.js

@@ -1,2 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};

package/dist/esm/utils.js

@@ -1,10 +1,5 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const ClosedException_js_1 = __importDefault(require("./exceptions/ClosedException.js"));
-const TimeoutException_js_1 = __importDefault(require("./exceptions/TimeoutException.js"));
+import ClosedException from "./exceptions/ClosedException.js";
+import TimeoutException from "./exceptions/TimeoutException.js";
 class Utils {
     static splitWsgData(wsgData) {
         if (wsgData.includes(",--Boundary")) {
@@ -46,13 +41,13 @@ ${JSON.stringify(JSON.parse(event.data), null, 2)}
             const checkHandle = setInterval(() => {
                 if (ws.readyState === ws.CLOSED) {
                     clearInterval(checkHandle);
-                    reject(new ClosedException_js_1.default());
+                    reject(new ClosedException());
                 }
             }, 1000);
             const timeoutHandle = setTimeout(() => {
                 ws.removeEventListener("message", handler);
                 clearInterval(checkHandle);
-                reject(new TimeoutException_js_1.default());
+                reject(new TimeoutException());
             }, timeout);
             const handler = (mEvent) => {
                 const event = mEvent;
@@ -68,4 +63,4 @@ ${JSON.stringify(JSON.parse(event.data), null, 2)}
         });
     }
 }
-exports.default = Utils;
+export default Utils;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rc-ex/ws",
-  "version": "1.3.14",
+  "version": "1.3.16",
   "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,9 +8,9 @@
   "files": [
     "dist"
   ],
-  "types": "dist/esm/index.d.ts",
-  "main": "dist/cjs/index.js",
-  "module": "dist/esm/index.js",
+  "types": "./dist/esm/index.d.ts",
+  "main": "./dist/cjs/index.js",
+  "module": "./dist/esm/index.js",
   "exports": {
     ".": {
       "types": "./dist/esm/index.d.ts",
@@ -43,11 +43,11 @@
     "http-status-codes": "^2.3.0",
     "hyperid": "^3.3.0",
     "isomorphic-ws": "^5.0.0",
-    "wait-for-async": "^0.7.10",
+    "wait-for-async": "^0.7.11",
     "ws": "^8.18.0"
   },
   "scripts": {
     "build": "tsc -p tsconfig.esm.json && tsc -p tsconfig.cjs.json"
   },
-  "gitHead": "246ee1235ef646864d519339c34975119292653d"
+  "gitHead": "7924e113c7b8d4dccbf39fab225f134cd30e866c"
 }