@wireapp/api-client 27.6.0 → 27.6.1
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/lib/http/HttpClient.d.ts +8 -3
- package/lib/http/HttpClient.d.ts.map +1 -1
- package/lib/http/HttpClient.js +9 -8
- package/lib/notification/NotificationAPI/NotificationAPI.d.ts +2 -2
- package/lib/notification/NotificationAPI/NotificationAPI.d.ts.map +1 -1
- package/lib/notification/NotificationAPI/NotificationAPI.js +4 -4
- package/lib/shims/browser/cookie.d.ts.map +1 -1
- package/lib/shims/browser/cookie.js +1 -1
- package/lib/shims/node/cookie.js +1 -1
- package/lib/tcp/WebSocketClient.d.ts +1 -6
- package/lib/tcp/WebSocketClient.d.ts.map +1 -1
- package/lib/tcp/WebSocketClient.js +2 -10
- package/package.json +6 -6
package/lib/http/HttpClient.d.ts
CHANGED
|
@@ -7,6 +7,11 @@ declare enum TOPIC {
|
|
|
7
7
|
ON_CONNECTION_STATE_CHANGE = "HttpClient.TOPIC.ON_CONNECTION_STATE_CHANGE",
|
|
8
8
|
ON_INVALID_TOKEN = "HttpClient.TOPIC.ON_INVALID_TOKEN"
|
|
9
9
|
}
|
|
10
|
+
type SendRequest = {
|
|
11
|
+
config: AxiosRequestConfig;
|
|
12
|
+
isFirstTry?: boolean;
|
|
13
|
+
abortController?: AbortController;
|
|
14
|
+
};
|
|
10
15
|
export interface HttpClient {
|
|
11
16
|
on(event: TOPIC.ON_CONNECTION_STATE_CHANGE, listener: (state: ConnectionState) => void): this;
|
|
12
17
|
on(event: TOPIC.ON_INVALID_TOKEN, listener: (error: InvalidTokenError | MissingCookieError) => void): this;
|
|
@@ -25,7 +30,7 @@ export declare class HttpClient extends EventEmitter {
|
|
|
25
30
|
getBaseUrl(): string;
|
|
26
31
|
useVersion(version: number): void;
|
|
27
32
|
private updateConnectionState;
|
|
28
|
-
_sendRequest<T>(config
|
|
33
|
+
_sendRequest<T>({ config, isFirstTry, abortController }: SendRequest): Promise<AxiosResponse<T>>;
|
|
29
34
|
static isAxiosError(errorCandidate: any): errorCandidate is AxiosError;
|
|
30
35
|
static isBackendError(errorCandidate: any): errorCandidate is AxiosError<BackendError> & {
|
|
31
36
|
response: BackendError;
|
|
@@ -44,8 +49,8 @@ export declare class HttpClient extends EventEmitter {
|
|
|
44
49
|
* @param {string} clientId - id of the client with which the new login session will be associated
|
|
45
50
|
*/
|
|
46
51
|
associateClientWithSession(clientId: string): Promise<AccessTokenData>;
|
|
47
|
-
sendRequest<T>(config: AxiosRequestConfig, isSynchronousRequest?: boolean): Promise<AxiosResponse<T>>;
|
|
48
|
-
sendJSON<T>(config: AxiosRequestConfig, isSynchronousRequest?: boolean): Promise<AxiosResponse<T>>;
|
|
52
|
+
sendRequest<T>(config: AxiosRequestConfig, isSynchronousRequest?: boolean, abortController?: AbortController): Promise<AxiosResponse<T>>;
|
|
53
|
+
sendJSON<T>(config: AxiosRequestConfig, isSynchronousRequest?: boolean, abortController?: AbortController): Promise<AxiosResponse<T>>;
|
|
49
54
|
sendXML<T>(config: AxiosRequestConfig): Promise<AxiosResponse<T>>;
|
|
50
55
|
sendProtocolBuffer<T>(config: AxiosRequestConfig, isSynchronousRequest?: boolean): Promise<AxiosResponse<T>>;
|
|
51
56
|
sendProtocolMls<T>(config: AxiosRequestConfig, isSynchronousRequest?: boolean): Promise<AxiosResponse<T>>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HttpClient.d.ts","sourceRoot":"","sources":["../../src/http/HttpClient.ts"],"names":[],"mappings":"AAmBA,OAAc,EAAC,UAAU,EAA+B,kBAAkB,EAAE,aAAa,EAAC,MAAM,OAAO,CAAC;AAKxG,OAAO,EAAC,YAAY,EAAC,MAAM,QAAQ,CAAC;AAKpC,OAAO,EACL,eAAe,EACf,gBAAgB,EAEhB,iBAAiB,EAEjB,kBAAkB,EAEnB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAC,MAAM,EAAC,MAAM,WAAW,CAAC;AACjC,OAAO,EAAC,YAAY,EAAsB,eAAe,EAA0B,MAAM,UAAU,CAAC;AAIpG,aAAK,KAAK;IACR,0BAA0B,gDAAgD;IAC1E,gBAAgB,sCAAsC;CACvD;AAED,MAAM,WAAW,UAAU;IACzB,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,0BAA0B,EAAE,QAAQ,EAAE,CAAC,KAAK,EAAE,eAAe,KAAK,IAAI,GAAG,IAAI,CAAC;IAE9F,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,gBAAgB,EAAE,QAAQ,EAAE,CAAC,KAAK,EAAE,iBAAiB,GAAG,kBAAkB,KAAK,IAAI,GAAG,IAAI,CAAC;CAC5G;AAID,qBAAa,UAAW,SAAQ,YAAY;IAUxC,OAAO,CAAC,QAAQ,CAAC,MAAM;IAChB,gBAAgB,EAAE,gBAAgB;IAV3C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAgB;IACvC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAiB;IACxC,OAAO,CAAC,eAAe,CAAkB;IACzC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAgB;IAC7C,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAgB;IAC7C,gBAAuB,KAAK,eAAS;IACrC,OAAO,CAAC,aAAa,CAAM;gBAGR,MAAM,EAAE,MAAM,EACxB,gBAAgB,EAAE,gBAAgB;IAmDpC,UAAU;IAIV,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IAIxC,OAAO,CAAC,qBAAqB;IAOhB,YAAY,CAAC,CAAC,EAAE,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"HttpClient.d.ts","sourceRoot":"","sources":["../../src/http/HttpClient.ts"],"names":[],"mappings":"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"}
|
package/lib/http/HttpClient.js
CHANGED
|
@@ -129,7 +129,7 @@ class HttpClient extends events_1.EventEmitter {
|
|
|
129
129
|
this.emit(HttpClient.TOPIC.ON_CONNECTION_STATE_CHANGE, this.connectionState);
|
|
130
130
|
}
|
|
131
131
|
}
|
|
132
|
-
async _sendRequest(config, isFirstTry = true) {
|
|
132
|
+
async _sendRequest({ config, isFirstTry = true, abortController }) {
|
|
133
133
|
if (this.accessTokenStore.accessToken) {
|
|
134
134
|
// TODO: remove tokenAsParam
|
|
135
135
|
const { token_type, access_token } = this.accessTokenStore.accessToken;
|
|
@@ -141,6 +141,7 @@ class HttpClient extends events_1.EventEmitter {
|
|
|
141
141
|
try {
|
|
142
142
|
const response = await this.client.request({
|
|
143
143
|
...config,
|
|
144
|
+
signal: abortController?.signal,
|
|
144
145
|
// We want to prefix all urls, except the ones with cookies which are attached to unprefixed urls
|
|
145
146
|
url: config.withCredentials ? config.url : `${this.versionPrefix}${config.url}`,
|
|
146
147
|
maxBodyLength: FILE_SIZE_100_MB,
|
|
@@ -156,7 +157,7 @@ class HttpClient extends events_1.EventEmitter {
|
|
|
156
157
|
config['axios-retry'] = {
|
|
157
158
|
retries: 0,
|
|
158
159
|
};
|
|
159
|
-
return this._sendRequest(config, false);
|
|
160
|
+
return this._sendRequest({ config, isFirstTry: false, abortController });
|
|
160
161
|
};
|
|
161
162
|
const hasAccessToken = !!this.accessTokenStore?.accessToken;
|
|
162
163
|
if (axios_1.default.isAxiosError(error) && error.response?.status === http_1.StatusCode.UNAUTHORIZED) {
|
|
@@ -238,10 +239,10 @@ class HttpClient extends events_1.EventEmitter {
|
|
|
238
239
|
const newToken = await this.postAccess(storedToken, clientId);
|
|
239
240
|
return this.accessTokenStore.updateToken(newToken);
|
|
240
241
|
}
|
|
241
|
-
async sendRequest(config, isSynchronousRequest = false) {
|
|
242
|
+
async sendRequest(config, isSynchronousRequest = false, abortController) {
|
|
242
243
|
const promise = isSynchronousRequest
|
|
243
|
-
? this.requestQueue.add(() => this._sendRequest(config))
|
|
244
|
-
: this._sendRequest(config);
|
|
244
|
+
? this.requestQueue.add(() => this._sendRequest({ config, abortController }))
|
|
245
|
+
: this._sendRequest({ config, abortController });
|
|
245
246
|
try {
|
|
246
247
|
return await promise;
|
|
247
248
|
}
|
|
@@ -250,12 +251,12 @@ class HttpClient extends events_1.EventEmitter {
|
|
|
250
251
|
// It will be retried after a (growing) delay
|
|
251
252
|
const isTooManyRequestsError = axios_1.default.isAxiosError(error) && error.response?.status === 420;
|
|
252
253
|
if (isTooManyRequestsError) {
|
|
253
|
-
return this.backOffQueue.add(() => this._sendRequest(config));
|
|
254
|
+
return this.backOffQueue.add(() => this._sendRequest({ config, abortController }));
|
|
254
255
|
}
|
|
255
256
|
throw error;
|
|
256
257
|
}
|
|
257
258
|
}
|
|
258
|
-
sendJSON(config, isSynchronousRequest = false) {
|
|
259
|
+
sendJSON(config, isSynchronousRequest = false, abortController) {
|
|
259
260
|
const shouldGzipData = process.env.NODE_ENV !== 'test' &&
|
|
260
261
|
!!config.data &&
|
|
261
262
|
['post', 'put', 'patch'].includes(config.method?.toLowerCase() ?? '');
|
|
@@ -267,7 +268,7 @@ class HttpClient extends events_1.EventEmitter {
|
|
|
267
268
|
'Content-Type': http_1.ContentType.APPLICATION_JSON,
|
|
268
269
|
'Content-Encoding': shouldGzipData ? 'gzip' : config.headers?.['Content-Encoding'],
|
|
269
270
|
};
|
|
270
|
-
return this.sendRequest(config, isSynchronousRequest);
|
|
271
|
+
return this.sendRequest(config, isSynchronousRequest, abortController);
|
|
271
272
|
}
|
|
272
273
|
sendXML(config) {
|
|
273
274
|
config.headers = {
|
|
@@ -24,14 +24,14 @@ export declare class NotificationAPI {
|
|
|
24
24
|
* @param since Only return notifications more recent than this.
|
|
25
25
|
* @see https://staging-nginz-https.zinfra.io/swagger-ui/#!/push/fetchNotifications
|
|
26
26
|
*/
|
|
27
|
-
getNotifications(clientId?: string, size?: number, since?: string): Promise<NotificationList>;
|
|
27
|
+
getNotifications(clientId?: string, size?: number, since?: string, abortController?: AbortController): Promise<NotificationList>;
|
|
28
28
|
/**
|
|
29
29
|
* Fetch all notifications.
|
|
30
30
|
* @param clientId Only return notifications targeted at the given client
|
|
31
31
|
* @param lastNotificationId Only return notifications more recent than this
|
|
32
32
|
* @see https://staging-nginz-https.zinfra.io/swagger-ui/#!/push/fetchNotifications
|
|
33
33
|
*/
|
|
34
|
-
getAllNotifications(clientId?: string, lastNotificationId?: string): Promise<NotificationsReponse>;
|
|
34
|
+
getAllNotifications(clientId?: string, lastNotificationId?: string, abortController?: AbortController): Promise<NotificationsReponse>;
|
|
35
35
|
/**
|
|
36
36
|
* Fetch a notification by ID.
|
|
37
37
|
* @see https://staging-nginz-https.zinfra.io/swagger-ui/#!/push/getNotification
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NotificationAPI.d.ts","sourceRoot":"","sources":["../../../src/notification/NotificationAPI/NotificationAPI.ts"],"names":[],"mappings":"AAqBA,OAAO,EAAC,YAAY,EAAE,gBAAgB,EAAC,MAAM,IAAI,CAAC;AAClD,OAAO,EAAkC,UAAU,EAAa,MAAM,YAAY,CAAC;AAEnF,eAAO,MAAM,yBAAyB,QAAQ,CAAC;AAE/C,KAAK,oBAAoB,GAAG;IAC1B,aAAa,EAAE,YAAY,EAAE,CAAC;IAC9B,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC7B,CAAC;AAEF,qBAAa,eAAe;IACd,OAAO,CAAC,QAAQ,CAAC,MAAM;gBAAN,MAAM,EAAE,UAAU;IAE/C,gBAAuB,GAAG;;;MAGxB;IAEF;;;OAGG;IACU,mBAAmB,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC;IAa1E;;;;;;OAMG;IACU,gBAAgB,CAC3B,QAAQ,CAAC,EAAE,MAAM,EACjB,IAAI,GAAE,MAAkC,EACxC,KAAK,CAAC,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"NotificationAPI.d.ts","sourceRoot":"","sources":["../../../src/notification/NotificationAPI/NotificationAPI.ts"],"names":[],"mappings":"AAqBA,OAAO,EAAC,YAAY,EAAE,gBAAgB,EAAC,MAAM,IAAI,CAAC;AAClD,OAAO,EAAkC,UAAU,EAAa,MAAM,YAAY,CAAC;AAEnF,eAAO,MAAM,yBAAyB,QAAQ,CAAC;AAE/C,KAAK,oBAAoB,GAAG;IAC1B,aAAa,EAAE,YAAY,EAAE,CAAC;IAC9B,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC7B,CAAC;AAEF,qBAAa,eAAe;IACd,OAAO,CAAC,QAAQ,CAAC,MAAM;gBAAN,MAAM,EAAE,UAAU;IAE/C,gBAAuB,GAAG;;;MAGxB;IAEF;;;OAGG;IACU,mBAAmB,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC;IAa1E;;;;;;OAMG;IACU,gBAAgB,CAC3B,QAAQ,CAAC,EAAE,MAAM,EACjB,IAAI,GAAE,MAAkC,EACxC,KAAK,CAAC,EAAE,MAAM,EACd,eAAe,CAAC,EAAE,eAAe,GAChC,OAAO,CAAC,gBAAgB,CAAC;IAe5B;;;;;OAKG;IACU,mBAAmB,CAC9B,QAAQ,CAAC,EAAE,MAAM,EACjB,kBAAkB,CAAC,EAAE,MAAM,EAC3B,eAAe,CAAC,EAAE,eAAe,GAChC,OAAO,CAAC,oBAAoB,CAAC;IA0EhC;;;OAGG;IACU,eAAe,CAAC,cAAc,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC;CAY/F"}
|
|
@@ -56,7 +56,7 @@ class NotificationAPI {
|
|
|
56
56
|
* @param since Only return notifications more recent than this.
|
|
57
57
|
* @see https://staging-nginz-https.zinfra.io/swagger-ui/#!/push/fetchNotifications
|
|
58
58
|
*/
|
|
59
|
-
async getNotifications(clientId, size = exports.NOTIFICATION_SIZE_MAXIMUM, since) {
|
|
59
|
+
async getNotifications(clientId, size = exports.NOTIFICATION_SIZE_MAXIMUM, since, abortController) {
|
|
60
60
|
const config = {
|
|
61
61
|
method: 'get',
|
|
62
62
|
params: {
|
|
@@ -66,7 +66,7 @@ class NotificationAPI {
|
|
|
66
66
|
},
|
|
67
67
|
url: NotificationAPI.URL.NOTIFICATION,
|
|
68
68
|
};
|
|
69
|
-
const response = await this.client.sendJSON(config);
|
|
69
|
+
const response = await this.client.sendJSON(config, false, abortController);
|
|
70
70
|
return response.data;
|
|
71
71
|
}
|
|
72
72
|
/**
|
|
@@ -75,7 +75,7 @@ class NotificationAPI {
|
|
|
75
75
|
* @param lastNotificationId Only return notifications more recent than this
|
|
76
76
|
* @see https://staging-nginz-https.zinfra.io/swagger-ui/#!/push/fetchNotifications
|
|
77
77
|
*/
|
|
78
|
-
async getAllNotifications(clientId, lastNotificationId) {
|
|
78
|
+
async getAllNotifications(clientId, lastNotificationId, abortController) {
|
|
79
79
|
const getNotificationChunks = async (notificationList, currentClientId, currentNotificationId) => {
|
|
80
80
|
const defaultPayload = {
|
|
81
81
|
notifications: [],
|
|
@@ -85,7 +85,7 @@ class NotificationAPI {
|
|
|
85
85
|
let payload = { ...defaultPayload };
|
|
86
86
|
let hasMissedNotifications = false;
|
|
87
87
|
try {
|
|
88
|
-
payload = await this.getNotifications(currentClientId, exports.NOTIFICATION_SIZE_MAXIMUM, currentNotificationId);
|
|
88
|
+
payload = await this.getNotifications(currentClientId, exports.NOTIFICATION_SIZE_MAXIMUM, currentNotificationId, abortController);
|
|
89
89
|
}
|
|
90
90
|
catch (error) {
|
|
91
91
|
const isAxiosError = axios_1.default.isAxiosError(error);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cookie.d.ts","sourceRoot":"","sources":["../../../src/shims/browser/cookie.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,kBAAkB,EAAE,aAAa,EAAC,MAAM,OAAO,CAAC;AAExD,OAAO,EAAC,eAAe,EAAC,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAC,UAAU,EAAC,MAAM,aAAa,CAAC;AAEvC,eAAO,MAAM,cAAc,aAAc,aAAa,CAAC,eAAe,CAAC,KAAG,OAAO,CAAC,eAAe,CACjE,CAAC;AAEjC,eAAO,MAAM,qBAAqB,GAAI,CAAC,UAAU,UAAU,UAAU,kBAAkB,KAAG,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"cookie.d.ts","sourceRoot":"","sources":["../../../src/shims/browser/cookie.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,kBAAkB,EAAE,aAAa,EAAC,MAAM,OAAO,CAAC;AAExD,OAAO,EAAC,eAAe,EAAC,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAC,UAAU,EAAC,MAAM,aAAa,CAAC;AAEvC,eAAO,MAAM,cAAc,aAAc,aAAa,CAAC,eAAe,CAAC,KAAG,OAAO,CAAC,eAAe,CACjE,CAAC;AAEjC,eAAO,MAAM,qBAAqB,GAAI,CAAC,UAAU,UAAU,UAAU,kBAAkB,KAAG,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAChF,CAAC"}
|
|
@@ -21,5 +21,5 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
21
21
|
exports.sendRequestWithCookie = exports.retrieveCookie = void 0;
|
|
22
22
|
const retrieveCookie = (response) => Promise.resolve(response.data);
|
|
23
23
|
exports.retrieveCookie = retrieveCookie;
|
|
24
|
-
const sendRequestWithCookie = (client, config) => client._sendRequest(config);
|
|
24
|
+
const sendRequestWithCookie = (client, config) => client._sendRequest({ config });
|
|
25
25
|
exports.sendRequestWithCookie = sendRequestWithCookie;
|
package/lib/shims/node/cookie.js
CHANGED
|
@@ -57,6 +57,6 @@ const sendRequestWithCookie = async (client, config) => {
|
|
|
57
57
|
config.headers.set('Cookie', `zuid=${cookie.zuid}`);
|
|
58
58
|
config.withCredentials = true;
|
|
59
59
|
}
|
|
60
|
-
return client._sendRequest(config);
|
|
60
|
+
return client._sendRequest({ config });
|
|
61
61
|
};
|
|
62
62
|
exports.sendRequestWithCookie = sendRequestWithCookie;
|
|
@@ -16,12 +16,7 @@ export interface WebSocketClient {
|
|
|
16
16
|
on(event: TOPIC.ON_MESSAGE, listener: (notification: Notification) => void): this;
|
|
17
17
|
on(event: TOPIC.ON_STATE_CHANGE, listener: (state: WEBSOCKET_STATE) => void): this;
|
|
18
18
|
}
|
|
19
|
-
export
|
|
20
|
-
private aborted;
|
|
21
|
-
abort: () => void;
|
|
22
|
-
isAborted: () => boolean;
|
|
23
|
-
}
|
|
24
|
-
export type OnConnect = (abortHandler: AbortHandler) => Promise<void>;
|
|
19
|
+
export type OnConnect = (abortHandler: AbortController) => Promise<void>;
|
|
25
20
|
export declare class WebSocketClient extends EventEmitter {
|
|
26
21
|
private clientId?;
|
|
27
22
|
private isRefreshingAccessToken;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WebSocketClient.d.ts","sourceRoot":"","sources":["../../src/tcp/WebSocketClient.ts"],"names":[],"mappings":"AAoBA,OAAO,EAAC,UAAU,EAAC,MAAM,wBAAwB,CAAC;AAElD,OAAO,EAAC,YAAY,EAAC,MAAM,QAAQ,CAAC;AAEpC,OAAO,EAAwB,eAAe,EAAC,MAAM,yBAAyB,CAAC;AAE/E,OAAO,EAAC,iBAAiB,EAA8B,kBAAkB,EAAC,MAAM,UAAU,CAAC;AAC3F,OAAO,EAAC,UAAU,EAAe,MAAM,UAAU,CAAC;AAClD,OAAO,EAAC,YAAY,EAAC,MAAM,kBAAkB,CAAC;AAE9C,aAAK,KAAK;IACR,QAAQ,mCAAmC;IAC3C,gBAAgB,2CAA2C;IAC3D,UAAU,qCAAqC;IAC/C,eAAe,0CAA0C;CAC1D;AAED,MAAM,WAAW,eAAe;IAC9B,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,QAAQ,EAAE,QAAQ,EAAE,CAAC,KAAK,EAAE,KAAK,GAAG,UAAU,KAAK,IAAI,GAAG,IAAI,CAAC;IAC/E,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,gBAAgB,EAAE,QAAQ,EAAE,CAAC,KAAK,EAAE,iBAAiB,GAAG,kBAAkB,KAAK,IAAI,GAAG,IAAI,CAAC;IAC3G,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,UAAU,EAAE,QAAQ,EAAE,CAAC,YAAY,EAAE,YAAY,KAAK,IAAI,GAAG,IAAI,CAAC;IAClF,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,eAAe,EAAE,QAAQ,EAAE,CAAC,KAAK,EAAE,eAAe,KAAK,IAAI,GAAG,IAAI,CAAC;CACpF;AAED,
|
|
1
|
+
{"version":3,"file":"WebSocketClient.d.ts","sourceRoot":"","sources":["../../src/tcp/WebSocketClient.ts"],"names":[],"mappings":"AAoBA,OAAO,EAAC,UAAU,EAAC,MAAM,wBAAwB,CAAC;AAElD,OAAO,EAAC,YAAY,EAAC,MAAM,QAAQ,CAAC;AAEpC,OAAO,EAAwB,eAAe,EAAC,MAAM,yBAAyB,CAAC;AAE/E,OAAO,EAAC,iBAAiB,EAA8B,kBAAkB,EAAC,MAAM,UAAU,CAAC;AAC3F,OAAO,EAAC,UAAU,EAAe,MAAM,UAAU,CAAC;AAClD,OAAO,EAAC,YAAY,EAAC,MAAM,kBAAkB,CAAC;AAE9C,aAAK,KAAK;IACR,QAAQ,mCAAmC;IAC3C,gBAAgB,2CAA2C;IAC3D,UAAU,qCAAqC;IAC/C,eAAe,0CAA0C;CAC1D;AAED,MAAM,WAAW,eAAe;IAC9B,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,QAAQ,EAAE,QAAQ,EAAE,CAAC,KAAK,EAAE,KAAK,GAAG,UAAU,KAAK,IAAI,GAAG,IAAI,CAAC;IAC/E,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,gBAAgB,EAAE,QAAQ,EAAE,CAAC,KAAK,EAAE,iBAAiB,GAAG,kBAAkB,KAAK,IAAI,GAAG,IAAI,CAAC;IAC3G,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,UAAU,EAAE,QAAQ,EAAE,CAAC,YAAY,EAAE,YAAY,KAAK,IAAI,GAAG,IAAI,CAAC;IAClF,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,eAAe,EAAE,QAAQ,EAAE,CAAC,KAAK,EAAE,eAAe,KAAK,IAAI,GAAG,IAAI,CAAC;CACpF;AAED,MAAM,MAAM,SAAS,GAAG,CAAC,YAAY,EAAE,eAAe,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;AAEzE,qBAAa,eAAgB,SAAQ,YAAY;IAC/C,OAAO,CAAC,QAAQ,CAAC,CAAS;IAC1B,OAAO,CAAC,uBAAuB,CAAU;IACzC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;IACjC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAiB;IACxC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAwB;IAC/C,OAAO,CAAC,cAAc,CAAkB;IACjC,MAAM,EAAE,UAAU,CAAC;IAC1B,OAAO,CAAC,cAAc,CAAU;IAChC,OAAO,CAAC,gBAAgB,CAAW;IACnC,OAAO,CAAC,YAAY,CAAC,CAAkB;IAEvC,gBAAuB,KAAK,eAAS;gBAEzB,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU;IAiB/C,OAAO,CAAC,aAAa;IAOrB,OAAO,CAAC,QAAQ,CAAC,SAAS,CAOxB;IAEF,OAAO,CAAC,QAAQ,CAAC,OAAO,CAItB;IAEF,OAAO,CAAC,QAAQ,CAAC,WAAW,CAM1B;IAEF,OAAO,CAAC,QAAQ,CAAC,MAAM,CAErB;IAEF,OAAO,CAAC,QAAQ,CAAC,OAAO,CAItB;IAEF;;;;;;;;;;;OAWG;IACI,OAAO,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,SAAS,GAAG,eAAe;YAmB3D,kBAAkB;IA8BzB,UAAU,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI;IAMxC;;;;OAIG;IACH,SAAgB,MAAM,aAOpB;IAEF;;;;;OAKG;IACH,SAAgB,IAAI,aAGlB;IAEK,QAAQ,IAAI,OAAO;IAI1B,OAAO,CAAC,iBAAiB;CAc1B"}
|
|
@@ -21,7 +21,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
21
21
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
22
22
|
};
|
|
23
23
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
24
|
-
exports.WebSocketClient =
|
|
24
|
+
exports.WebSocketClient = void 0;
|
|
25
25
|
const logdown_1 = __importDefault(require("logdown"));
|
|
26
26
|
const events_1 = require("events");
|
|
27
27
|
const ReconnectingWebsocket_1 = require("./ReconnectingWebsocket");
|
|
@@ -34,14 +34,6 @@ var TOPIC;
|
|
|
34
34
|
TOPIC["ON_MESSAGE"] = "WebSocketClient.TOPIC.ON_MESSAGE";
|
|
35
35
|
TOPIC["ON_STATE_CHANGE"] = "WebSocketClient.TOPIC.ON_STATE_CHANGE";
|
|
36
36
|
})(TOPIC || (TOPIC = {}));
|
|
37
|
-
class AbortHandler {
|
|
38
|
-
aborted = false;
|
|
39
|
-
abort = () => {
|
|
40
|
-
this.aborted = true;
|
|
41
|
-
};
|
|
42
|
-
isAborted = () => this.aborted;
|
|
43
|
-
}
|
|
44
|
-
exports.AbortHandler = AbortHandler;
|
|
45
37
|
class WebSocketClient extends events_1.EventEmitter {
|
|
46
38
|
clientId;
|
|
47
39
|
isRefreshingAccessToken;
|
|
@@ -123,7 +115,7 @@ class WebSocketClient extends events_1.EventEmitter {
|
|
|
123
115
|
this.socket.setOnOpen(() => {
|
|
124
116
|
this.onOpen();
|
|
125
117
|
if (onConnect) {
|
|
126
|
-
this.abortHandler = new
|
|
118
|
+
this.abortHandler = new AbortController();
|
|
127
119
|
void onConnect(this.abortHandler);
|
|
128
120
|
}
|
|
129
121
|
});
|
package/package.json
CHANGED
|
@@ -13,8 +13,8 @@
|
|
|
13
13
|
"./lib/shims/node/websocket": "./lib/shims/browser/websocket.js"
|
|
14
14
|
},
|
|
15
15
|
"dependencies": {
|
|
16
|
-
"@wireapp/commons": "^5.2.
|
|
17
|
-
"@wireapp/priority-queue": "^2.1.
|
|
16
|
+
"@wireapp/commons": "^5.2.12",
|
|
17
|
+
"@wireapp/priority-queue": "^2.1.10",
|
|
18
18
|
"@wireapp/protocol-messaging": "1.50.0",
|
|
19
19
|
"axios": "1.7.7",
|
|
20
20
|
"axios-retry": "4.5.0",
|
|
@@ -37,8 +37,8 @@
|
|
|
37
37
|
"@types/spark-md5": "3.0.4",
|
|
38
38
|
"@types/tough-cookie": "4.0.5",
|
|
39
39
|
"@types/ws": "8.5.12",
|
|
40
|
-
"@wireapp/store-engine": "^5.1.
|
|
41
|
-
"@wireapp/store-engine-fs": "^3.1.
|
|
40
|
+
"@wireapp/store-engine": "^5.1.10",
|
|
41
|
+
"@wireapp/store-engine-fs": "^3.1.10",
|
|
42
42
|
"browser-sync": "3.0.2",
|
|
43
43
|
"concurrently": "9.0.1",
|
|
44
44
|
"cross-env": "7.0.3",
|
|
@@ -66,6 +66,6 @@
|
|
|
66
66
|
"watch": "webpack serve --config webpack.browser.js",
|
|
67
67
|
"prepare": "yarn dist"
|
|
68
68
|
},
|
|
69
|
-
"version": "27.6.
|
|
70
|
-
"gitHead": "
|
|
69
|
+
"version": "27.6.1",
|
|
70
|
+
"gitHead": "bf2116ef1d5172f2f452a0db7ebf9868db0179d5"
|
|
71
71
|
}
|