@wireapp/api-client 26.5.4 → 26.7.0
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/client/ClientAPI.d.ts +7 -5
- package/lib/client/ClientAPI.d.ts.map +1 -1
- package/lib/client/ClientAPI.js +5 -1
- package/lib/client/NewClient.d.ts +2 -4
- package/lib/client/NewClient.d.ts.map +1 -1
- package/lib/client/RegisteredClient.d.ts +2 -2
- package/lib/client/RegisteredClient.d.ts.map +1 -1
- package/lib/http/HttpClient.d.ts.map +1 -1
- package/lib/http/HttpClient.js +11 -3
- package/package.json +3 -2
|
@@ -10,10 +10,12 @@ export type ClaimedKeyPackages = {
|
|
|
10
10
|
user: string;
|
|
11
11
|
}[];
|
|
12
12
|
};
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
13
|
+
export declare enum MLSPublicKeyAlgorithmKeys {
|
|
14
|
+
ED25519 = "ed25519"
|
|
15
|
+
}
|
|
16
|
+
export type MLSPublicKeyRecord = Partial<Record<MLSPublicKeyAlgorithmKeys, string>>;
|
|
17
|
+
type GetMLSPublicKeysResponseData = {
|
|
18
|
+
removal: MLSPublicKeyRecord;
|
|
17
19
|
};
|
|
18
20
|
export declare class ClientAPI {
|
|
19
21
|
private readonly client;
|
|
@@ -75,7 +77,7 @@ export declare class ClientAPI {
|
|
|
75
77
|
* In the future this may be used for other purposes as well.
|
|
76
78
|
* @see https://staging-nginz-https.zinfra.io/api/swagger-ui/#/default/get_mls_public_keys
|
|
77
79
|
*/
|
|
78
|
-
getPublicKeys(): Promise<
|
|
80
|
+
getPublicKeys(): Promise<GetMLSPublicKeysResponseData>;
|
|
79
81
|
getNonce(clientId: string): Promise<string>;
|
|
80
82
|
getAccessToken(clientId: string, dpopToken: Uint8Array): Promise<{
|
|
81
83
|
type: "DPoP";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ClientAPI.d.ts","sourceRoot":"","sources":["../../src/client/ClientAPI.ts"],"names":[],"mappings":"AAsBA,OAAO,EAAC,oBAAoB,EAAC,MAAM,wBAAwB,CAAC;AAI5D,OAAO,EAAC,mBAAmB,EAAE,gBAAgB,EAAE,mBAAmB,EAAC,MAAM,YAAY,CAAC;AACtF,OAAO,EAAkC,UAAU,EAAC,MAAM,UAAU,CAAC;AAErE,MAAM,MAAM,kBAAkB,GAAG;IAC/B,YAAY,EAAE;QACZ,MAAM,EAAE,MAAM,CAAC;QACf,MAAM,EAAE,MAAM,CAAC;QACf,WAAW,EAAE,MAAM,CAAC;QACpB,eAAe,EAAE,MAAM,CAAC;QACxB,IAAI,EAAE,MAAM,CAAC;KACd,EAAE,CAAC;CACL,CAAC;AAEF,
|
|
1
|
+
{"version":3,"file":"ClientAPI.d.ts","sourceRoot":"","sources":["../../src/client/ClientAPI.ts"],"names":[],"mappings":"AAsBA,OAAO,EAAC,oBAAoB,EAAC,MAAM,wBAAwB,CAAC;AAI5D,OAAO,EAAC,mBAAmB,EAAE,gBAAgB,EAAE,mBAAmB,EAAC,MAAM,YAAY,CAAC;AACtF,OAAO,EAAkC,UAAU,EAAC,MAAM,UAAU,CAAC;AAErE,MAAM,MAAM,kBAAkB,GAAG;IAC/B,YAAY,EAAE;QACZ,MAAM,EAAE,MAAM,CAAC;QACf,MAAM,EAAE,MAAM,CAAC;QACf,WAAW,EAAE,MAAM,CAAC;QACpB,eAAe,EAAE,MAAM,CAAC;QACxB,IAAI,EAAE,MAAM,CAAC;KACd,EAAE,CAAC;CACL,CAAC;AAEF,oBAAY,yBAAyB;IACnC,OAAO,YAAY;CACpB;AACD,MAAM,MAAM,kBAAkB,GAAG,OAAO,CAAC,MAAM,CAAC,yBAAyB,EAAE,MAAM,CAAC,CAAC,CAAC;AAEpF,KAAK,4BAA4B,GAAG;IAClC,OAAO,EAAE,kBAAkB,CAAC;CAC7B,CAAC;AAEF,qBAAa,SAAS;IACR,OAAO,CAAC,QAAQ,CAAC,MAAM;gBAAN,MAAM,EAAE,UAAU;IAE/C,gBAAuB,GAAG;;;;;;;;;MASxB;IAEW,UAAU,CAAC,SAAS,EAAE,mBAAmB,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAWrE,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,aAAa,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC;IAmB9E,qBAAqB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,oBAAoB,CAAC;IAUnF;;;;OAIG;IACU,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAYhE,SAAS,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAUtD,UAAU,IAAI,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAUzC,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAUlE;;;;;OAKG;IACU,oBAAoB,CAAC,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE;IAUzE;;;;;OAKG;IACU,oBAAoB,CAAC,QAAQ,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE;IAgB5E;;;;;;;OAOG;IACU,mBAAmB,CAC9B,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,MAAM,EAClB,WAAW,EAAE,MAAM,EACnB,OAAO,CAAC,EAAE,MAAM,GACf,OAAO,CAAC,kBAAkB,CAAC;IAe9B;;;;;OAKG;IACU,qBAAqB,CAAC,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAa1F;;;;OAIG;IACU,aAAa,IAAI,OAAO,CAAC,4BAA4B,CAAC;IAUtD,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAgB3C,cAAc,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,UAAU;;;;;CAmBpE"}
|
package/lib/client/ClientAPI.js
CHANGED
|
@@ -18,10 +18,14 @@
|
|
|
18
18
|
*
|
|
19
19
|
*/
|
|
20
20
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
21
|
-
exports.ClientAPI = void 0;
|
|
21
|
+
exports.ClientAPI = exports.MLSPublicKeyAlgorithmKeys = void 0;
|
|
22
22
|
const zod_1 = require("zod");
|
|
23
23
|
const ClientError_1 = require("./ClientError");
|
|
24
24
|
const http_1 = require("../http/");
|
|
25
|
+
var MLSPublicKeyAlgorithmKeys;
|
|
26
|
+
(function (MLSPublicKeyAlgorithmKeys) {
|
|
27
|
+
MLSPublicKeyAlgorithmKeys["ED25519"] = "ed25519";
|
|
28
|
+
})(MLSPublicKeyAlgorithmKeys || (exports.MLSPublicKeyAlgorithmKeys = MLSPublicKeyAlgorithmKeys = {}));
|
|
25
29
|
class ClientAPI {
|
|
26
30
|
constructor(client) {
|
|
27
31
|
this.client = client;
|
|
@@ -1,13 +1,11 @@
|
|
|
1
1
|
import { ClientCapabilityData } from './ClientCapabilityData';
|
|
2
2
|
import { PreKey } from '../auth/';
|
|
3
|
-
import { ClientClassification, ClientType, Location } from './';
|
|
3
|
+
import { ClientClassification, ClientType, Location, MLSPublicKeyRecord } from './';
|
|
4
4
|
type BaseUpdatePayload = ClientCapabilityData & {
|
|
5
5
|
label?: string;
|
|
6
6
|
};
|
|
7
7
|
type MLSUpdatePayload = {
|
|
8
|
-
mls_public_keys:
|
|
9
|
-
ed25519: string;
|
|
10
|
-
};
|
|
8
|
+
mls_public_keys: MLSPublicKeyRecord;
|
|
11
9
|
} & BaseUpdatePayload;
|
|
12
10
|
type ProteusUpdatePayload = {
|
|
13
11
|
label?: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NewClient.d.ts","sourceRoot":"","sources":["../../src/client/NewClient.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,oBAAoB,EAAC,MAAM,wBAAwB,CAAC;AAE5D,OAAO,EAAC,MAAM,EAAC,MAAM,UAAU,CAAC;AAEhC,OAAO,EAAC,oBAAoB,EAAE,UAAU,EAAE,QAAQ,EAAC,MAAM,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"NewClient.d.ts","sourceRoot":"","sources":["../../src/client/NewClient.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,oBAAoB,EAAC,MAAM,wBAAwB,CAAC;AAE5D,OAAO,EAAC,MAAM,EAAC,MAAM,UAAU,CAAC;AAEhC,OAAO,EAAC,oBAAoB,EAAE,UAAU,EAAE,QAAQ,EAAE,kBAAkB,EAAC,MAAM,IAAI,CAAC;AAElF,KAAK,iBAAiB,GAAG,oBAAoB,GAAG;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAC,CAAC;AACjE,KAAK,gBAAgB,GAAG;IACtB,eAAe,EAAE,kBAAkB,CAAC;CACrC,GAAG,iBAAiB,CAAC;AAEtB,KAAK,oBAAoB,GAAG;IAC1B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB,GAAG,iBAAiB,CAAC;AAEtB,MAAM,MAAM,mBAAmB,GAAG,OAAO,CAAC,oBAAoB,GAAG,gBAAgB,CAAC,CAAC;AAEnF,MAAM,MAAM,mBAAmB,GAAG;IAChC,KAAK,EAAE,oBAAoB,CAAC,OAAO,GAAG,oBAAoB,CAAC,KAAK,GAAG,oBAAoB,CAAC,MAAM,CAAC;IAC/F,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,IAAI,EAAE,UAAU,CAAC,SAAS,GAAG,UAAU,CAAC,SAAS,CAAC;CACnD,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { ClientType, Location, PublicClient } from './';
|
|
1
|
+
import { ClientType, Location, MLSPublicKeyRecord, PublicClient } from './';
|
|
2
2
|
export interface AddedClient extends PublicClient {
|
|
3
3
|
/** The IP address from which the client was registered */
|
|
4
4
|
address?: string;
|
|
@@ -8,7 +8,7 @@ export interface AddedClient extends PublicClient {
|
|
|
8
8
|
/** An ISO 8601 Date string */
|
|
9
9
|
time: string;
|
|
10
10
|
type: ClientType.PERMANENT | ClientType.TEMPORARY;
|
|
11
|
-
mls_public_keys:
|
|
11
|
+
mls_public_keys: MLSPublicKeyRecord;
|
|
12
12
|
last_active?: string;
|
|
13
13
|
}
|
|
14
14
|
export interface RegisteredClient extends AddedClient {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RegisteredClient.d.ts","sourceRoot":"","sources":["../../src/client/RegisteredClient.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,UAAU,EAAE,QAAQ,EAAE,YAAY,EAAC,MAAM,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"RegisteredClient.d.ts","sourceRoot":"","sources":["../../src/client/RegisteredClient.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,UAAU,EAAE,QAAQ,EAAE,kBAAkB,EAAE,YAAY,EAAC,MAAM,IAAI,CAAC;AAE1E,MAAM,WAAW,WAAY,SAAQ,YAAY;IAC/C,0DAA0D;IAC1D,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,8BAA8B;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,UAAU,CAAC,SAAS,GAAG,UAAU,CAAC,SAAS,CAAC;IAClD,eAAe,EAAE,kBAAkB,CAAC;IACpC,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,gBAAiB,SAAQ,WAAW;IACnD,uBAAuB;IACvB,MAAM,EAAE,MAAM,CAAC;CAChB"}
|
|
@@ -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;
|
|
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
|
@@ -47,6 +47,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
47
47
|
exports.HttpClient = void 0;
|
|
48
48
|
const axios_1 = __importStar(require("axios"));
|
|
49
49
|
const axios_retry_1 = __importStar(require("axios-retry"));
|
|
50
|
+
const exponential_backoff_1 = require("exponential-backoff");
|
|
50
51
|
const logdown_1 = __importDefault(require("logdown"));
|
|
51
52
|
const pako_1 = require("pako");
|
|
52
53
|
const events_1 = require("events");
|
|
@@ -113,7 +114,7 @@ class HttpClient extends events_1.EventEmitter {
|
|
|
113
114
|
}
|
|
114
115
|
}
|
|
115
116
|
async _sendRequest(config, tokenAsParam = false, isFirstTry = true) {
|
|
116
|
-
var _a, _b;
|
|
117
|
+
var _a, _b, _c;
|
|
117
118
|
if (this.accessTokenStore.accessToken) {
|
|
118
119
|
const { token_type, access_token } = this.accessTokenStore.accessToken;
|
|
119
120
|
if (tokenAsParam) {
|
|
@@ -131,6 +132,13 @@ class HttpClient extends events_1.EventEmitter {
|
|
|
131
132
|
return response;
|
|
132
133
|
}
|
|
133
134
|
catch (error) {
|
|
135
|
+
const isTooManyRequestsError = axios_1.default.isAxiosError(error) && ((_a = error.response) === null || _a === void 0 ? void 0 : _a.status) === 420;
|
|
136
|
+
if (isTooManyRequestsError) {
|
|
137
|
+
return (0, exponential_backoff_1.backOff)(() => this._sendRequest(config, tokenAsParam, false), {
|
|
138
|
+
jitter: 'full',
|
|
139
|
+
maxDelay: 2000,
|
|
140
|
+
});
|
|
141
|
+
}
|
|
134
142
|
const retryWithTokenRefresh = async () => {
|
|
135
143
|
this.logger.warn(`Access token refresh triggered for "${config.method}" request to "${config.url}".`);
|
|
136
144
|
await this.refreshAccessToken();
|
|
@@ -139,8 +147,8 @@ class HttpClient extends events_1.EventEmitter {
|
|
|
139
147
|
};
|
|
140
148
|
return this._sendRequest(config, tokenAsParam, false);
|
|
141
149
|
};
|
|
142
|
-
const hasAccessToken = !!((
|
|
143
|
-
if (axios_1.default.isAxiosError(error) && ((
|
|
150
|
+
const hasAccessToken = !!((_b = this.accessTokenStore) === null || _b === void 0 ? void 0 : _b.accessToken);
|
|
151
|
+
if (axios_1.default.isAxiosError(error) && ((_c = error.response) === null || _c === void 0 ? void 0 : _c.status) === http_1.StatusCode.UNAUTHORIZED) {
|
|
144
152
|
return retryWithTokenRefresh();
|
|
145
153
|
}
|
|
146
154
|
if (HttpClient.isBackendError(error)) {
|
package/package.json
CHANGED
|
@@ -18,6 +18,7 @@
|
|
|
18
18
|
"@wireapp/protocol-messaging": "1.44.0",
|
|
19
19
|
"axios": "1.6.2",
|
|
20
20
|
"axios-retry": "3.9.1",
|
|
21
|
+
"exponential-backoff": "3.1.1",
|
|
21
22
|
"http-status-codes": "2.3.0",
|
|
22
23
|
"logdown": "3.3.1",
|
|
23
24
|
"pako": "2.1.0",
|
|
@@ -66,6 +67,6 @@
|
|
|
66
67
|
"watch": "webpack serve --config webpack.browser.js",
|
|
67
68
|
"prepare": "yarn dist"
|
|
68
69
|
},
|
|
69
|
-
"version": "26.
|
|
70
|
-
"gitHead": "
|
|
70
|
+
"version": "26.7.0",
|
|
71
|
+
"gitHead": "5cb2fa3efaab80cb0321c7728ef2f2f0d932c3f1"
|
|
71
72
|
}
|