@rc-ex/ws 0.15.3 → 0.16.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/index.ts +44 -30
- package/lib/index.d.ts +3 -3
- package/lib/index.js +40 -22
- package/lib/index.js.map +1 -1
- package/lib/package.json +5 -5
- package/lib/rest.js +2 -1
- package/lib/rest.js.map +1 -1
- package/package.json +5 -5
- package/rest.ts +1 -1
package/index.ts
CHANGED
|
@@ -40,11 +40,11 @@ class WebSocketExtension extends SdkExtension {
|
|
|
40
40
|
|
|
41
41
|
options: WebSocketOptions;
|
|
42
42
|
rc!: RingCentral;
|
|
43
|
-
wsToken
|
|
43
|
+
wsToken?: WsToken;
|
|
44
44
|
wsTokenExpiresAt = 0;
|
|
45
45
|
ws!: WS;
|
|
46
46
|
connectionDetails!: ConnectionDetails;
|
|
47
|
-
wsc
|
|
47
|
+
wsc?: Wsc;
|
|
48
48
|
subscriptions: Subscription[] = [];
|
|
49
49
|
recover: Function;
|
|
50
50
|
connect: Function;
|
|
@@ -88,29 +88,31 @@ class WebSocketExtension extends SdkExtension {
|
|
|
88
88
|
|
|
89
89
|
async install(rc: RingCentral) {
|
|
90
90
|
this.rc = rc;
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
'
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
91
|
+
if (this.options.restOverWebSocket) {
|
|
92
|
+
const request = rc.request.bind(rc);
|
|
93
|
+
rc.request = async <T>(
|
|
94
|
+
method: RestMethod,
|
|
95
|
+
endpoint: string,
|
|
96
|
+
content?: {},
|
|
97
|
+
queryParams?: {},
|
|
98
|
+
config?: RestRequestConfig
|
|
99
|
+
): Promise<RestResponse<T>> => {
|
|
100
|
+
if (!this.enabled || !this.options.restOverWebSocket) {
|
|
101
|
+
return request<T>(method, endpoint, content, queryParams, config);
|
|
102
|
+
}
|
|
103
|
+
if (
|
|
104
|
+
// the following cannot be done with WebSocket
|
|
105
|
+
(config?.headers?.['Content-Type'] as string | undefined)?.includes(
|
|
106
|
+
'multipart/form-data'
|
|
107
|
+
) ||
|
|
108
|
+
config?.responseType === 'arraybuffer' ||
|
|
109
|
+
endpoint.startsWith('/restapi/oauth/') // token, revoke, wstoken
|
|
110
|
+
) {
|
|
111
|
+
return request<T>(method, endpoint, content, queryParams, config);
|
|
112
|
+
}
|
|
113
|
+
return this.request<T>(method, endpoint, content, queryParams, config);
|
|
114
|
+
};
|
|
115
|
+
}
|
|
114
116
|
|
|
115
117
|
// should recover if this.options.wscToken
|
|
116
118
|
let connectMethod = this.connect.bind(this);
|
|
@@ -140,6 +142,9 @@ class WebSocketExtension extends SdkExtension {
|
|
|
140
142
|
}
|
|
141
143
|
let retriesAttempted = 0;
|
|
142
144
|
const check = async () => {
|
|
145
|
+
if (!this.enabled) {
|
|
146
|
+
return;
|
|
147
|
+
}
|
|
143
148
|
if (this.options.autoRecover?.enabled !== true) {
|
|
144
149
|
return;
|
|
145
150
|
}
|
|
@@ -222,6 +227,7 @@ class WebSocketExtension extends SdkExtension {
|
|
|
222
227
|
await this.connect(true); // connect to WSG and recover
|
|
223
228
|
}
|
|
224
229
|
this.recoverTimestamp = undefined;
|
|
230
|
+
this.enable();
|
|
225
231
|
}
|
|
226
232
|
|
|
227
233
|
async pingServer() {
|
|
@@ -255,9 +261,12 @@ class WebSocketExtension extends SdkExtension {
|
|
|
255
261
|
this.wsTokenExpiresAt =
|
|
256
262
|
Date.now() + (this.wsToken.expires_in - 10) * 1000;
|
|
257
263
|
}
|
|
258
|
-
let wsUri =
|
|
259
|
-
if (
|
|
260
|
-
wsUri = `${
|
|
264
|
+
let wsUri = '';
|
|
265
|
+
if (this.wsToken) {
|
|
266
|
+
wsUri = `${this.wsToken.uri}?access_token=${this.wsToken.ws_access_token}`;
|
|
267
|
+
if (recoverSession && this.wsc) {
|
|
268
|
+
wsUri += `&wsc=${this.wsc.token}`;
|
|
269
|
+
}
|
|
261
270
|
}
|
|
262
271
|
this.ws = new WS(wsUri);
|
|
263
272
|
this.eventEmitter.emit(Events.newWebSocketObject, this.ws);
|
|
@@ -330,18 +339,23 @@ class WebSocketExtension extends SdkExtension {
|
|
|
330
339
|
}
|
|
331
340
|
}
|
|
332
341
|
|
|
333
|
-
|
|
342
|
+
// keepInterval means we do not clear the interval
|
|
343
|
+
async revoke(keepInterval = false) {
|
|
334
344
|
for (const subscription of this.subscriptions) {
|
|
335
345
|
await subscription.revoke();
|
|
336
346
|
}
|
|
337
347
|
this.subscriptions = [];
|
|
338
|
-
if (this.intervalHandle) {
|
|
348
|
+
if (!keepInterval && this.intervalHandle) {
|
|
339
349
|
clearInterval(this.intervalHandle);
|
|
340
350
|
}
|
|
341
351
|
if (this.pingServerHandle) {
|
|
342
352
|
clearTimeout(this.pingServerHandle);
|
|
343
353
|
}
|
|
344
354
|
this.ws?.close();
|
|
355
|
+
this.wsc = undefined;
|
|
356
|
+
this.wsToken = undefined;
|
|
357
|
+
this.wsTokenExpiresAt = 0;
|
|
358
|
+
this.disable();
|
|
345
359
|
}
|
|
346
360
|
|
|
347
361
|
async subscribe(
|
package/lib/index.d.ts
CHANGED
|
@@ -19,11 +19,11 @@ declare class WebSocketExtension extends SdkExtension {
|
|
|
19
19
|
eventEmitter: EventEmitter;
|
|
20
20
|
options: WebSocketOptions;
|
|
21
21
|
rc: RingCentral;
|
|
22
|
-
wsToken
|
|
22
|
+
wsToken?: WsToken;
|
|
23
23
|
wsTokenExpiresAt: number;
|
|
24
24
|
ws: WS;
|
|
25
25
|
connectionDetails: ConnectionDetails;
|
|
26
|
-
wsc
|
|
26
|
+
wsc?: Wsc;
|
|
27
27
|
subscriptions: Subscription[];
|
|
28
28
|
recover: Function;
|
|
29
29
|
connect: Function;
|
|
@@ -37,7 +37,7 @@ declare class WebSocketExtension extends SdkExtension {
|
|
|
37
37
|
_recover(): Promise<void>;
|
|
38
38
|
pingServer(): Promise<void>;
|
|
39
39
|
_connect(recoverSession?: boolean): Promise<void>;
|
|
40
|
-
revoke(): Promise<void>;
|
|
40
|
+
revoke(keepInterval?: boolean): Promise<void>;
|
|
41
41
|
subscribe(eventFilters: string[], callback: (event: {}) => void, cache?: SubscriptionInfo | undefined | null): Promise<Subscription>;
|
|
42
42
|
}
|
|
43
43
|
export default WebSocketExtension;
|
package/lib/index.js
CHANGED
|
@@ -1,7 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
3
|
if (k2 === undefined) k2 = k;
|
|
4
|
-
Object.
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
5
9
|
}) : (function(o, m, k, k2) {
|
|
6
10
|
if (k2 === undefined) k2 = k;
|
|
7
11
|
o[k2] = m[k];
|
|
@@ -81,22 +85,24 @@ class WebSocketExtension extends SdkExtension_1.default {
|
|
|
81
85
|
}
|
|
82
86
|
async install(rc) {
|
|
83
87
|
this.rc = rc;
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
(config === null || config === void 0 ? void 0 : config.
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
88
|
+
if (this.options.restOverWebSocket) {
|
|
89
|
+
const request = rc.request.bind(rc);
|
|
90
|
+
rc.request = async (method, endpoint, content, queryParams, config) => {
|
|
91
|
+
var _a, _b;
|
|
92
|
+
if (!this.enabled || !this.options.restOverWebSocket) {
|
|
93
|
+
return request(method, endpoint, content, queryParams, config);
|
|
94
|
+
}
|
|
95
|
+
if (
|
|
96
|
+
// the following cannot be done with WebSocket
|
|
97
|
+
((_b = (_a = config === null || config === void 0 ? void 0 : config.headers) === null || _a === void 0 ? void 0 : _a['Content-Type']) === null || _b === void 0 ? void 0 : _b.includes('multipart/form-data')) ||
|
|
98
|
+
(config === null || config === void 0 ? void 0 : config.responseType) === 'arraybuffer' ||
|
|
99
|
+
endpoint.startsWith('/restapi/oauth/') // token, revoke, wstoken
|
|
100
|
+
) {
|
|
101
|
+
return request(method, endpoint, content, queryParams, config);
|
|
102
|
+
}
|
|
103
|
+
return this.request(method, endpoint, content, queryParams, config);
|
|
104
|
+
};
|
|
105
|
+
}
|
|
100
106
|
// should recover if this.options.wscToken
|
|
101
107
|
let connectMethod = this.connect.bind(this);
|
|
102
108
|
if (this.options.wscToken) {
|
|
@@ -125,6 +131,9 @@ class WebSocketExtension extends SdkExtension_1.default {
|
|
|
125
131
|
let retriesAttempted = 0;
|
|
126
132
|
const check = async () => {
|
|
127
133
|
var _a, _b, _c;
|
|
134
|
+
if (!this.enabled) {
|
|
135
|
+
return;
|
|
136
|
+
}
|
|
128
137
|
if (((_a = this.options.autoRecover) === null || _a === void 0 ? void 0 : _a.enabled) !== true) {
|
|
129
138
|
return;
|
|
130
139
|
}
|
|
@@ -196,6 +205,7 @@ class WebSocketExtension extends SdkExtension_1.default {
|
|
|
196
205
|
await this.connect(true); // connect to WSG and recover
|
|
197
206
|
}
|
|
198
207
|
this.recoverTimestamp = undefined;
|
|
208
|
+
this.enable();
|
|
199
209
|
}
|
|
200
210
|
async pingServer() {
|
|
201
211
|
var _a, _b, _c, _d, _e;
|
|
@@ -229,9 +239,12 @@ class WebSocketExtension extends SdkExtension_1.default {
|
|
|
229
239
|
this.wsTokenExpiresAt =
|
|
230
240
|
Date.now() + (this.wsToken.expires_in - 10) * 1000;
|
|
231
241
|
}
|
|
232
|
-
let wsUri =
|
|
233
|
-
if (
|
|
234
|
-
wsUri = `${
|
|
242
|
+
let wsUri = '';
|
|
243
|
+
if (this.wsToken) {
|
|
244
|
+
wsUri = `${this.wsToken.uri}?access_token=${this.wsToken.ws_access_token}`;
|
|
245
|
+
if (recoverSession && this.wsc) {
|
|
246
|
+
wsUri += `&wsc=${this.wsc.token}`;
|
|
247
|
+
}
|
|
235
248
|
}
|
|
236
249
|
this.ws = new isomorphic_ws_1.default(wsUri);
|
|
237
250
|
this.eventEmitter.emit(Events.newWebSocketObject, this.ws);
|
|
@@ -287,19 +300,24 @@ class WebSocketExtension extends SdkExtension_1.default {
|
|
|
287
300
|
}
|
|
288
301
|
}
|
|
289
302
|
}
|
|
290
|
-
|
|
303
|
+
// keepInterval means we do not clear the interval
|
|
304
|
+
async revoke(keepInterval = false) {
|
|
291
305
|
var _a;
|
|
292
306
|
for (const subscription of this.subscriptions) {
|
|
293
307
|
await subscription.revoke();
|
|
294
308
|
}
|
|
295
309
|
this.subscriptions = [];
|
|
296
|
-
if (this.intervalHandle) {
|
|
310
|
+
if (!keepInterval && this.intervalHandle) {
|
|
297
311
|
clearInterval(this.intervalHandle);
|
|
298
312
|
}
|
|
299
313
|
if (this.pingServerHandle) {
|
|
300
314
|
clearTimeout(this.pingServerHandle);
|
|
301
315
|
}
|
|
302
316
|
(_a = this.ws) === null || _a === void 0 ? void 0 : _a.close();
|
|
317
|
+
this.wsc = undefined;
|
|
318
|
+
this.wsToken = undefined;
|
|
319
|
+
this.wsTokenExpiresAt = 0;
|
|
320
|
+
this.disable();
|
|
303
321
|
}
|
|
304
322
|
async subscribe(eventFilters, callback, cache = undefined) {
|
|
305
323
|
const subscription = new subscription_1.default(this, eventFilters, callback);
|
package/lib/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAMA,gFAAwD;AACxD,+DAAiE;AACjE,sDAA8B;AAC9B,mCAAoC;AACpC,oEAAqC;AACrC,kFAA0D;AAE1D,+DAAuC;AAEvC,iCAA+B;AAQ/B,kEAA0C;AAC1C,6CAAiD;AACjD,oDAA4B;AAE5B,MAAM,IAAI,GAAG,IAAA,iBAAO,GAAE,CAAC;AAEvB,IAAY,MAMX;AAND,WAAY,MAAM;IAChB,mDAAyC,CAAA;IACzC,iDAAuC,CAAA;IACvC,+CAAqC,CAAA;IACrC,mDAAyC,CAAA;IACzC,2BAAiB,CAAA;AACnB,CAAC,EANW,MAAM,GAAN,cAAM,KAAN,cAAM,QAMjB;AAED,MAAM,kBAAmB,SAAQ,sBAAY;IAqB3C,YAAY,UAA4B,EAAE;;;QACxC,KAAK,EAAE,CAAC;QArBV,iBAAY,GAAG,IAAI,qBAAY,EAAE,CAAC;QAKlC,qBAAgB,GAAG,CAAC,CAAC;QAIrB,kBAAa,GAAmB,EAAE,CAAC;QASnC,YAAO,GAAG,cAAO,CAAC,CAAC,mEAAmE;QAIpF,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,YAAA,IAAI,CAAC,OAAO,EAAC,iBAAiB,uCAAjB,iBAAiB,GAAK,KAAK,EAAC;QACzC,YAAA,IAAI,CAAC,OAAO,EAAC,SAAS,uCAAT,SAAS,GAAK,KAAK,EAAC;QACjC,YAAA,IAAI,CAAC,OAAO,EAAC,WAAW,uCAAX,WAAW,GAAK;YAC3B,OAAO,EAAE,IAAI;SACd,EAAC;QACF,YAAA,IAAI,CAAC,OAAO,CAAC,WAAW,EAAC,aAAa,uCAAb,aAAa,GAAK,gBAAgB,CAAC,EAAE;YAC5D,MAAM,QAAQ,GAAG,IAAI,GAAG,IAAI,GAAG,gBAAgB,CAAC;YAChD,OAAO,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;QAClC,CAAC,EAAC;QACF,YAAA,IAAI,CAAC,OAAO,CAAC,WAAW,EAAC,kBAAkB,uCAAlB,kBAAkB,GAAK,KAAK,EAAC;QACtD,IAAI,CAAC,OAAO,GAAG,IAAA,kBAAQ,EAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,EAAE;YAC3C,OAAO,EAAE,IAAI;YACb,QAAQ,EAAE,KAAK;SAChB,CAAC,CAAC;QACH,IAAI,CAAC,OAAO,GAAG,IAAA,kBAAQ,EAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,EAAE;YAC3C,OAAO,EAAE,IAAI;YACb,QAAQ,EAAE,KAAK;SAChB,CAAC,CAAC;IACL,CAAC;IAED,OAAO;;QACL,KAAK,CAAC,OAAO,EAAE,CAAC;QAChB,KAAK,MAAM,YAAY,IAAI,MAAA,IAAI,CAAC,aAAa,mCAAI,EAAE,EAAE;YACnD,YAAY,CAAC,OAAO,GAAG,KAAK,CAAC;SAC9B;IACH,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,EAAe;QAC3B,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;QACb,IAAI,IAAI,CAAC,OAAO,CAAC,iBAAiB,EAAE;YAClC,MAAM,OAAO,GAAG,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YACpC,EAAE,CAAC,OAAO,GAAG,KAAK,EAChB,MAAkB,EAClB,QAAgB,EAChB,OAAY,EACZ,WAAgB,EAChB,MAA0B,EACA,EAAE;;gBAC5B,IAAI,CAAC,IAAI,CAAC,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,iBAAiB,EAAE;oBACpD,OAAO,OAAO,CAAI,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,CAAC,CAAC;iBACnE;gBACD;gBACE,8CAA8C;gBAC9C,CAAA,MAAC,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,OAAO,0CAAG,cAAc,CAAwB,0CAAE,QAAQ,CACjE,qBAAqB,CACtB;oBACD,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,YAAY,MAAK,aAAa;oBACtC,QAAQ,CAAC,UAAU,CAAC,iBAAiB,CAAC,CAAC,yBAAyB;kBAChE;oBACA,OAAO,OAAO,CAAI,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,CAAC,CAAC;iBACnE;gBACD,OAAO,IAAI,CAAC,OAAO,CAAI,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,CAAC,CAAC;YACzE,CAAC,CAAC;SACH;QAED,0CAA0C;QAC1C,IAAI,aAAa,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC5C,IAAI,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE;YACzB,IAAI,CAAC,GAAG,GAAG;gBACT,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,QAAQ;gBAC5B,QAAQ,EAAE,CAAC;aACZ,CAAC;YACF,aAAa,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SACzC;QAED,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,WAAY,CAAC,OAAO,EAAE;YACtC,MAAM,aAAa,EAAE,CAAC;YACtB,OAAO;SACR;QAED,iCAAiC;QACjC,IAAI;YACF,MAAM,aAAa,EAAE,CAAC;SACvB;QAAC,OAAO,CAAC,EAAE;YACV,IAAI,CAAC,YAAY,uBAAa,EAAE;gBAC9B,MAAM,CAAC,CAAC,CAAC,kCAAkC;aAC5C;YACD,IAAI,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE;gBAC1B,OAAO,CAAC,KAAK,CAAC,yBAAyB,EAAE,CAAC,CAAC,CAAC;aAC7C;SACF;QACD,IAAI,gBAAgB,GAAG,CAAC,CAAC;QACzB,MAAM,KAAK,GAAG,KAAK,IAAI,EAAE;;YACvB,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;gBACjB,OAAO;aACR;YACD,IAAI,CAAA,MAAA,IAAI,CAAC,OAAO,CAAC,WAAW,0CAAE,OAAO,MAAK,IAAI,EAAE;gBAC9C,OAAO;aACR;YACD,IAAI,CAAA,MAAA,IAAI,CAAC,EAAE,0CAAE,UAAU,MAAK,oBAAI,IAAI,CAAA,MAAA,IAAI,CAAC,EAAE,0CAAE,UAAU,MAAK,0BAAU,EAAE;gBACtE,aAAa,CAAC,IAAI,CAAC,cAAe,CAAC,CAAC;gBACpC,IAAI;oBACF,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;oBACrB,gBAAgB,GAAG,CAAC,CAAC;oBACrB,IAAI,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE;wBAC1B,OAAO,CAAC,KAAK,CACX,qCAAqC,IAAI,CAAC,iBAAiB,CAAC,aAAa,EAAE,CAC5E,CAAC;qBACH;oBACD,IAAI,CAAC,YAAY,CAAC,IAAI,CACpB,IAAI,CAAC,iBAAiB,CAAC,aAAa,KAAK,YAAY;wBACnD,CAAC,CAAC,MAAM,CAAC,kBAAkB;wBAC3B,CAAC,CAAC,MAAM,CAAC,iBAAiB,EAC5B,IAAI,CAAC,EAAE,CACR,CAAC;iBACH;gBAAC,OAAO,CAAC,EAAE;oBACV,IAAI,CAAC,YAAY,uBAAa,EAAE;wBAC9B,MAAM,CAAC,CAAC,CAAC,kCAAkC;qBAC5C;oBACD,gBAAgB,IAAI,CAAC,CAAC;oBACtB,IAAI,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE;wBAC1B,OAAO,CAAC,KAAK,CAAC,qBAAqB,EAAE,CAAC,CAAC,CAAC;qBACzC;oBACD,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,gBAAgB,EAAE,CAAC,CAAC,CAAC;iBACpD;gBACD,IAAI,CAAC,cAAc,GAAG,WAAW,CAC/B,KAAK,EACL,IAAI,CAAC,OAAO,CAAC,WAAY,CAAC,aAAc,CAAC,gBAAgB,CAAC,CAC3D,CAAC;aACH;QACH,CAAC,CAAC;QACF,IAAI,CAAC,cAAc,GAAG,WAAW,CAC/B,KAAK,EACL,IAAI,CAAC,OAAO,CAAC,WAAY,CAAC,aAAc,CAAC,gBAAgB,CAAC,CAC3D,CAAC;QAEF,0BAA0B;QAC1B,IAAI,OAAO,MAAM,KAAK,WAAW,IAAI,MAAM,CAAC,gBAAgB,EAAE;YAC5D,MAAM,CAAC,gBAAgB,CAAC,SAAS,EAAE,GAAG,EAAE;;gBACtC,IAAI,IAAI,CAAC,gBAAgB,EAAE;oBACzB,YAAY,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;iBACrC;gBACD,MAAA,IAAI,CAAC,EAAE,0CAAE,KAAK,EAAE,CAAC;YACnB,CAAC,CAAC,CAAC;YACH,MAAM,CAAC,gBAAgB,CAAC,QAAQ,EAAE,GAAG,EAAE;gBACrC,KAAK,EAAE,CAAC;YACV,CAAC,CAAC,CAAC;SACJ;QACD,wBAAwB;IAC1B,CAAC;IAED,KAAK,CAAC,QAAQ;;QACZ,IAAI,CAAA,MAAA,IAAI,CAAC,EAAE,0CAAE,UAAU,MAAK,oBAAI,IAAI,CAAA,MAAA,IAAI,CAAC,EAAE,0CAAE,UAAU,MAAK,0BAAU,EAAE;YACtE,OAAO;SACR;QACD,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE;YAChC,MAAM,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,oCAAoC;YAC/D,OAAO;SACR;QACD,IAAI,IAAI,CAAC,gBAAgB,KAAK,SAAS,EAAE;YACvC,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;SACpC;QACD,IACE,IAAI,CAAC,iBAAiB,KAAK,SAAS;YACpC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,gBAAgB;gBAChC,IAAI,CAAC,iBAAiB,CAAC,eAAe,GAAG,IAAI,EAC/C;YACA,IAAI,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE;gBAC1B,OAAO,CAAC,KAAK,CAAC,mCAAmC,CAAC,CAAC;aACpD;YACD,MAAM,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,oCAAoC;SAChE;aAAM;YACL,IAAI,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE;gBAC1B,OAAO,CAAC,KAAK,CAAC,4BAA4B,CAAC,CAAC;aAC7C;YACD,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,6BAA6B;SACxD;QACD,IAAI,CAAC,gBAAgB,GAAG,SAAS,CAAC;QAClC,IAAI,CAAC,MAAM,EAAE,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,UAAU;;QACd,IAAI,CAAA,MAAA,IAAI,CAAC,OAAO,CAAC,WAAW,0CAAE,OAAO,MAAK,IAAI,EAAE;YAC9C,OAAO;SACR;QACD,IAAI;YACF,IAAI,MAAA,IAAI,CAAC,EAAE,0CAAE,IAAI,EAAE;gBACjB,UAAU;gBACV,MAAA,IAAI,CAAC,EAAE,0CAAE,IAAI,EAAE,CAAC;aACjB;iBAAM;gBACL,UAAU;gBACV,MAAM,CAAA,MAAA,IAAI,CAAC,EAAE,0CAAE,IAAI,CACjB,IAAI,CAAC,SAAS,CAAC;oBACb;wBACE,IAAI,EAAE,WAAW;wBACjB,SAAS,EAAE,IAAI,EAAE;qBAClB;iBACF,CAAC,CACH,CAAA,CAAC;aACH;SACF;QAAC,OAAO,CAAC,EAAE;YACV,MAAA,IAAI,CAAC,EAAE,0CAAE,KAAK,EAAE,CAAC,CAAC,+BAA+B;SAClD;IACH,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,cAAc,GAAG,KAAK;;QACnC,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,gBAAgB,EAAE;YACtC,MAAM,CAAC,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;YACvD,IAAI,CAAC,OAAO,GAAG,CAAC,CAAC,IAAe,CAAC;YACjC,IAAI,CAAC,gBAAgB;gBACnB,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,GAAG,EAAE,CAAC,GAAG,IAAI,CAAC;SACtD;QACD,IAAI,KAAK,GAAG,EAAE,CAAC;QACf,IAAI,IAAI,CAAC,OAAO,EAAE;YAChB,KAAK,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,iBAAiB,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE,CAAC;YAC3E,IAAI,cAAc,IAAI,IAAI,CAAC,GAAG,EAAE;gBAC9B,KAAK,IAAI,QAAQ,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC;aACnC;SACF;QACD,IAAI,CAAC,EAAE,GAAG,IAAI,uBAAE,CAAC,KAAK,CAAC,CAAC;QACxB,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,kBAAkB,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;QAE3D,8CAA8C;QAC9C,MAAM,IAAI,GAAG,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACxC,IAAI,CAAC,EAAE,CAAC,IAAI,GAAG,KAAK,EAAE,CAAS,EAAE,EAAE;YACjC,IAAI,IAAI,CAAC,EAAE,CAAC,UAAU,KAAK,0BAAU,EAAE;gBACrC,MAAM,IAAA,wBAAO,EAAC;oBACZ,QAAQ,EAAE,GAAG;oBACb,SAAS,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,UAAU,KAAK,0BAAU;iBACnD,CAAC,CAAC;aACJ;YACD,MAAM,IAAI,CAAC,CAAC,CAAC,CAAC;QAChB,CAAC,CAAC;QAEF,IAAI,MAAA,IAAI,CAAC,OAAO,CAAC,WAAW,0CAAE,OAAO,EAAE;YACrC,IAAI,CAAC,EAAE,CAAC,gBAAgB,CAAC,SAAS,EAAE,GAAG,EAAE;gBACvC,IAAI,IAAI,CAAC,gBAAgB,EAAE;oBACzB,YAAY,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;iBACrC;gBACD,IAAI,CAAC,gBAAgB,GAAG,UAAU,CAChC,GAAG,EAAE,CAAC,IAAI,CAAC,UAAU,EAAE,EACvB,IAAI,CAAC,OAAO,CAAC,WAAY,CAAC,kBAAkB,CAC7C,CAAC;YACJ,CAAC,CAAC,CAAC;SACJ;QAED,4CAA4C;QAC5C,IAAI,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE;YAC1B,eAAK,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;SAC/B;QAED,0BAA0B;QAC1B,IAAI,CAAC,EAAE,CAAC,gBAAgB,CAAC,SAAS,EAAE,CAAC,MAAoB,EAAE,EAAE;YAC3D,MAAM,KAAK,GAAG,MAAkB,CAAC;YACjC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,eAAK,CAAC,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YACpD,IACE,IAAI,CAAC,GAAG;gBACR,CAAC,CAAC,IAAI,CAAC,GAAG;oBACR,CAAC,IAAI,CAAC,IAAI,KAAK,mBAAmB,IAAI,IAAI,CAAC,aAAa,CAAC;oBACzD,IAAI,CAAC,GAAG,CAAC,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,EACxC;gBACA,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC;gBACpB,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;aACjD;QACH,CAAC,CAAC,CAAC;QAEH,qCAAqC;QACrC,MAAM,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC,GAAG,MAAM,eAAK,CAAC,uBAAuB,CAC7D,IAAI,CAAC,EAAE,EACP,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,mBAAmB,IAAI,IAAI,CAAC,IAAI,KAAK,OAAO,CACnE,CAAC;QACF,IAAI,IAAI,CAAC,IAAI,KAAK,OAAO,EAAE;YACzB,MAAM,IAAI,gCAAmB,CAAC,KAAK,CAAC,CAAC;SACtC;QACD,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC;QAE9B,8CAA8C;QAC9C,KAAK,MAAM,YAAY,IAAI,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE;YACxE,kCAAkC;YAClC,YAAY,CAAC,oBAAoB,EAAE,CAAC;YACpC,IACE,CAAC,cAAc;gBACf,IAAI,CAAC,iBAAiB,CAAC,aAAa,KAAK,QAAQ,EACjD;gBACA,wDAAwD;gBACxD,MAAM,YAAY,CAAC,SAAS,EAAE,CAAC;aAChC;SACF;IACH,CAAC;IAED,kDAAkD;IAClD,KAAK,CAAC,MAAM,CAAC,YAAY,GAAG,KAAK;;QAC/B,KAAK,MAAM,YAAY,IAAI,IAAI,CAAC,aAAa,EAAE;YAC7C,MAAM,YAAY,CAAC,MAAM,EAAE,CAAC;SAC7B;QACD,IAAI,CAAC,aAAa,GAAG,EAAE,CAAC;QACxB,IAAI,CAAC,YAAY,IAAI,IAAI,CAAC,cAAc,EAAE;YACxC,aAAa,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;SACpC;QACD,IAAI,IAAI,CAAC,gBAAgB,EAAE;YACzB,YAAY,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;SACrC;QACD,MAAA,IAAI,CAAC,EAAE,0CAAE,KAAK,EAAE,CAAC;QACjB,IAAI,CAAC,GAAG,GAAG,SAAS,CAAC;QACrB,IAAI,CAAC,OAAO,GAAG,SAAS,CAAC;QACzB,IAAI,CAAC,gBAAgB,GAAG,CAAC,CAAC;QAC1B,IAAI,CAAC,OAAO,EAAE,CAAC;IACjB,CAAC;IAED,KAAK,CAAC,SAAS,CACb,YAAsB,EACtB,QAA6B,EAC7B,QAA6C,SAAS;QAEtD,MAAM,YAAY,GAAG,IAAI,sBAAY,CAAC,IAAI,EAAE,YAAY,EAAE,QAAQ,CAAC,CAAC;QACpE,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI,EAAE;YACzC,MAAM,YAAY,CAAC,SAAS,EAAE,CAAC;SAChC;aAAM;YACL,YAAY,CAAC,gBAAgB,GAAG,KAAK,CAAC;YACtC,MAAM,YAAY,CAAC,OAAO,EAAE,CAAC;SAC9B;QACD,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QACtC,OAAO,YAAY,CAAC;IACtB,CAAC;CACF;AAED,kBAAe,kBAAkB,CAAC"}
|
package/lib/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@rc-ex/ws",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.16.2",
|
|
4
4
|
"description": "WebSocket extension for ringcentral-extensible project",
|
|
5
5
|
"author": "Tyler Liu <tyler.liu@ringcentral.com>",
|
|
6
6
|
"homepage": "https://github.com/ringcentral/ringcentral-extensible/tree/master/packages/extensions/ws",
|
|
@@ -18,14 +18,14 @@
|
|
|
18
18
|
"access": "public"
|
|
19
19
|
},
|
|
20
20
|
"dependencies": {
|
|
21
|
-
"@types/lodash": "^4.14.
|
|
22
|
-
"@types/ws": "^8.
|
|
21
|
+
"@types/lodash": "^4.14.179",
|
|
22
|
+
"@types/ws": "^8.5.3",
|
|
23
23
|
"http-status-codes": "^2.2.0",
|
|
24
|
-
"hyperid": "^3.0.
|
|
24
|
+
"hyperid": "^3.0.1",
|
|
25
25
|
"isomorphic-ws": "^4.0.1",
|
|
26
26
|
"lodash": "^4.17.21",
|
|
27
27
|
"wait-for-async": "^0.6.0",
|
|
28
28
|
"ws": "^8.5.0"
|
|
29
29
|
},
|
|
30
|
-
"gitHead": "
|
|
30
|
+
"gitHead": "aacf516db73df494a3c03fbf8971bc5d7c1e6af6"
|
|
31
31
|
}
|
package/lib/rest.js
CHANGED
|
@@ -11,9 +11,10 @@ const package_json_1 = require("./package.json");
|
|
|
11
11
|
const utils_1 = __importDefault(require("./utils"));
|
|
12
12
|
const uuid = (0, hyperid_1.default)();
|
|
13
13
|
async function request(method, endpoint, content, queryParams, config) {
|
|
14
|
+
var _a;
|
|
14
15
|
const _config = {
|
|
15
16
|
method: method,
|
|
16
|
-
baseURL: this.wsToken.uri,
|
|
17
|
+
baseURL: (_a = this.wsToken) === null || _a === void 0 ? void 0 : _a.uri,
|
|
17
18
|
url: endpoint,
|
|
18
19
|
data: content,
|
|
19
20
|
params: queryParams,
|
package/lib/rest.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rest.js","sourceRoot":"","sources":["../rest.ts"],"names":[],"mappings":";;;;;;AAKA,kFAA0D;AAC1D,sDAA8B;AAC9B,yDAAkD;AAGlD,iDAAuC;AACvC,oDAA4B;AAE5B,MAAM,IAAI,GAAG,IAAA,iBAAO,GAAE,CAAC;AAEhB,KAAK,UAAU,OAAO,CAE3B,MAAkB,EAClB,QAAgB,EAChB,OAAY,EACZ,WAAgB,EAChB,MAA0B
|
|
1
|
+
{"version":3,"file":"rest.js","sourceRoot":"","sources":["../rest.ts"],"names":[],"mappings":";;;;;;AAKA,kFAA0D;AAC1D,sDAA8B;AAC9B,yDAAkD;AAGlD,iDAAuC;AACvC,oDAA4B;AAE5B,MAAM,IAAI,GAAG,IAAA,iBAAO,GAAE,CAAC;AAEhB,KAAK,UAAU,OAAO,CAE3B,MAAkB,EAClB,QAAgB,EAChB,OAAY,EACZ,WAAgB,EAChB,MAA0B;;IAE1B,MAAM,OAAO,GAAsB;QACjC,MAAM,EAAE,MAAM;QACd,OAAO,EAAE,MAAA,IAAI,CAAC,OAAO,0CAAE,GAAG;QAC1B,GAAG,EAAE,QAAQ;QACb,IAAI,EAAE,OAAO;QACb,MAAM,EAAE,WAAW;QACnB,GAAG,MAAM;KACV,CAAC;IACF,OAAO,CAAC,OAAO,GAAG;QAChB,GAAG,OAAO,CAAC,OAAO;QAClB,cAAc,EAAE,GAAG,IAAI,CAAC,EAAE,CAAC,IAAK,CAAC,OAAO,IACtC,IAAI,CAAC,EAAE,CAAC,IAAK,CAAC,UAChB,8BAA8B,sBAAO,EAAE;KACxC,CAAC;IACF,MAAM,SAAS,GAAG,IAAI,EAAE,CAAC;IACzB,MAAM,WAAW,GAAG;QAClB;YACE,IAAI,EAAE,eAAe;YACrB,SAAS;YACT,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,IAAI,EAAE,OAAO,CAAC,GAAG;YACjB,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,KAAK,EAAE,OAAO,CAAC,MAAM;SACtB;KACF,CAAC;IACF,IAAI,OAAO,CAAC,IAAI,EAAE;QAChB,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;KAChC;IACD,MAAM,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,CAAC;IAChD,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,MAAM,eAAK,CAAC,uBAAuB,CACtD,IAAI,CAAC,EAAE,EACP,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,SAAS,KAAK,SAAS,CACrC,CAAC;IACF,MAAM,QAAQ,GAAiB;QAC7B,IAAI,EAAE,IAAS;QACf,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,UAAU,EAAE,IAAA,mCAAe,EAAC,IAAI,CAAC,MAAM,CAAC;QACxC,OAAO,EAAE,IAAI,CAAC,OAAO;QACrB,MAAM,EAAE,OAAO;KAChB,CAAC;IACF,IACE,IAAI,CAAC,IAAI,KAAK,eAAe;QAC7B,IAAI,CAAC,MAAM,IAAI,GAAG;QAClB,IAAI,CAAC,MAAM,GAAG,GAAG,EACjB;QACA,OAAO,QAAQ,CAAC;KACjB;SAAM;QACL,MAAM,IAAI,uBAAa,CAAC,QAAQ,CAAC,CAAC;KACnC;AACH,CAAC;AAzDD,0BAyDC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@rc-ex/ws",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.16.2",
|
|
4
4
|
"description": "WebSocket extension for ringcentral-extensible project",
|
|
5
5
|
"author": "Tyler Liu <tyler.liu@ringcentral.com>",
|
|
6
6
|
"homepage": "https://github.com/ringcentral/ringcentral-extensible/tree/master/packages/extensions/ws",
|
|
@@ -18,14 +18,14 @@
|
|
|
18
18
|
"access": "public"
|
|
19
19
|
},
|
|
20
20
|
"dependencies": {
|
|
21
|
-
"@types/lodash": "^4.14.
|
|
22
|
-
"@types/ws": "^8.
|
|
21
|
+
"@types/lodash": "^4.14.179",
|
|
22
|
+
"@types/ws": "^8.5.3",
|
|
23
23
|
"http-status-codes": "^2.2.0",
|
|
24
|
-
"hyperid": "^3.0.
|
|
24
|
+
"hyperid": "^3.0.1",
|
|
25
25
|
"isomorphic-ws": "^4.0.1",
|
|
26
26
|
"lodash": "^4.17.21",
|
|
27
27
|
"wait-for-async": "^0.6.0",
|
|
28
28
|
"ws": "^8.5.0"
|
|
29
29
|
},
|
|
30
|
-
"gitHead": "
|
|
30
|
+
"gitHead": "aacf516db73df494a3c03fbf8971bc5d7c1e6af6"
|
|
31
31
|
}
|
package/rest.ts
CHANGED