@wireapp/core 46.0.8 → 46.0.10
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/Account.test.js +5 -5
- package/lib/conversation/AssetService/AssetService.test.js +3 -3
- package/lib/conversation/message/MessageBuilder.js +2 -2
- package/lib/conversation/message/MessageService.test.js +3 -3
- package/lib/messagingProtocols/mls/E2EIdentityService/E2EIServiceExternal.d.ts.map +1 -1
- package/lib/messagingProtocols/mls/E2EIdentityService/E2EIServiceExternal.js +1 -1
- package/lib/test/PayloadHelper.js +2 -2
- package/package.json +16 -15
package/lib/Account.test.js
CHANGED
|
@@ -53,7 +53,7 @@ const ReconnectingWebsocket_1 = require("@wireapp/api-client/lib/tcp/Reconnectin
|
|
|
53
53
|
const http_status_codes_1 = require("http-status-codes");
|
|
54
54
|
const jest_websocket_mock_1 = require("jest-websocket-mock");
|
|
55
55
|
const nock_1 = __importStar(require("nock"));
|
|
56
|
-
const
|
|
56
|
+
const uuid_1 = require("uuid");
|
|
57
57
|
const api_client_1 = require("@wireapp/api-client");
|
|
58
58
|
const commons_1 = require("@wireapp/commons");
|
|
59
59
|
const protocol_messaging_1 = require("@wireapp/protocol-messaging");
|
|
@@ -249,7 +249,7 @@ describe('Account', () => {
|
|
|
249
249
|
let dependencies;
|
|
250
250
|
const mockNotifications = (size) => {
|
|
251
251
|
const notifications = Array.from(new Array(size)).map(() => ({
|
|
252
|
-
id: (0,
|
|
252
|
+
id: (0, uuid_1.v4)(),
|
|
253
253
|
payload: [{}],
|
|
254
254
|
}));
|
|
255
255
|
jest.spyOn(dependencies.apiClient.api.notification, 'getAllNotifications').mockResolvedValue({ notifications });
|
|
@@ -347,7 +347,7 @@ describe('Account', () => {
|
|
|
347
347
|
expect(onEvent).toHaveBeenCalledWith(expect.any(Object), notification_2.NotificationSource.NOTIFICATION_STREAM);
|
|
348
348
|
expect(onEvent).not.toHaveBeenCalledWith(expect.any(Object), notification_2.NotificationSource.WEBSOCKET);
|
|
349
349
|
onEvent.mockReset();
|
|
350
|
-
server.send(JSON.stringify({ id: (0,
|
|
350
|
+
server.send(JSON.stringify({ id: (0, uuid_1.v4)(), payload: [{}] }));
|
|
351
351
|
await waitFor(() => expect(onEvent).toHaveBeenCalledTimes(1));
|
|
352
352
|
expect(onEvent).not.toHaveBeenCalledWith(expect.any(Object), notification_2.NotificationSource.NOTIFICATION_STREAM);
|
|
353
353
|
expect(onEvent).toHaveBeenCalledWith(expect.any(Object), notification_2.NotificationSource.WEBSOCKET);
|
|
@@ -371,7 +371,7 @@ describe('Account', () => {
|
|
|
371
371
|
case Account_1.ConnectionState.PROCESSING_NOTIFICATIONS:
|
|
372
372
|
// sending a message as soon as the notificaiton stream starts to process
|
|
373
373
|
// This message should only be forwarded once the notification stream is fully processed
|
|
374
|
-
server.send(JSON.stringify({ id: (0,
|
|
374
|
+
server.send(JSON.stringify({ id: (0, uuid_1.v4)(), payload: [{}] }));
|
|
375
375
|
break;
|
|
376
376
|
case Account_1.ConnectionState.LIVE:
|
|
377
377
|
expect(onNotificationStreamProgress).toHaveBeenCalledTimes(nbNotifications);
|
|
@@ -406,7 +406,7 @@ describe('Account', () => {
|
|
|
406
406
|
case Account_1.ConnectionState.PROCESSING_NOTIFICATIONS:
|
|
407
407
|
// sending a message as soon as the notificaiton stream starts to process
|
|
408
408
|
// This message should only be forwarded once the notification stream is fully processed
|
|
409
|
-
server.send(JSON.stringify({ id: (0,
|
|
409
|
+
server.send(JSON.stringify({ id: (0, uuid_1.v4)(), payload: [{}] }));
|
|
410
410
|
break;
|
|
411
411
|
case Account_1.ConnectionState.LIVE:
|
|
412
412
|
reject(new Error());
|
|
@@ -18,7 +18,7 @@
|
|
|
18
18
|
*
|
|
19
19
|
*/
|
|
20
20
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
21
|
-
const
|
|
21
|
+
const uuid_1 = require("uuid");
|
|
22
22
|
const api_client_1 = require("@wireapp/api-client");
|
|
23
23
|
const AssetService_1 = require("./AssetService");
|
|
24
24
|
describe('AssetService', () => {
|
|
@@ -27,8 +27,8 @@ describe('AssetService', () => {
|
|
|
27
27
|
const apiClient = new api_client_1.APIClient();
|
|
28
28
|
const assetService = new AssetService_1.AssetService(apiClient);
|
|
29
29
|
const assetServerData = {
|
|
30
|
-
key: `3-2-${(0,
|
|
31
|
-
token: (0,
|
|
30
|
+
key: `3-2-${(0, uuid_1.v4)()}`,
|
|
31
|
+
token: (0, uuid_1.v4)(),
|
|
32
32
|
expires: '',
|
|
33
33
|
};
|
|
34
34
|
jest.spyOn(apiClient.api.asset, 'postAsset').mockReturnValue({
|
|
@@ -19,13 +19,13 @@
|
|
|
19
19
|
*/
|
|
20
20
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
21
21
|
exports.wrapInEphemeral = exports.buildTextMessage = exports.buildHideMessage = exports.buildDeleteMessage = exports.buildCallMessage = exports.buildSessionResetMessage = exports.buildReactionMessage = exports.buildPingMessage = exports.buildLocationMessage = exports.buildImageMessage = exports.buildClearedMessage = exports.buildDataTransferMessage = exports.buildLastReadMessage = exports.buildFileAbortMessage = exports.buildFileMetaDataMessage = exports.buildFileDataMessage = exports.buildEditedTextMessage = exports.buildConfirmationMessage = exports.buildCompositeMessage = exports.buildButtonActionConfirmationMessage = exports.buildButtonActionMessage = exports.createId = void 0;
|
|
22
|
-
const
|
|
22
|
+
const uuid_1 = require("uuid");
|
|
23
23
|
const protocol_messaging_1 = require("@wireapp/protocol-messaging");
|
|
24
24
|
const AssetTransferState_1 = require("../AssetTransferState");
|
|
25
25
|
const GenericMessageType_1 = require("../GenericMessageType");
|
|
26
26
|
const MessageToProtoMapper_1 = require("../message/MessageToProtoMapper");
|
|
27
27
|
function createId() {
|
|
28
|
-
return (0,
|
|
28
|
+
return (0, uuid_1.v4)();
|
|
29
29
|
}
|
|
30
30
|
exports.createId = createId;
|
|
31
31
|
function buildButtonActionMessage(payloadBundle) {
|
|
@@ -19,7 +19,7 @@
|
|
|
19
19
|
*/
|
|
20
20
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
21
21
|
const http_status_codes_1 = require("http-status-codes");
|
|
22
|
-
const
|
|
22
|
+
const uuid_1 = require("uuid");
|
|
23
23
|
const api_client_1 = require("@wireapp/api-client");
|
|
24
24
|
const protocol_messaging_1 = require("@wireapp/protocol-messaging");
|
|
25
25
|
const MessageService_1 = require("./MessageService");
|
|
@@ -33,12 +33,12 @@ const baseMessageSendingStatus = {
|
|
|
33
33
|
time: new Date().toISOString(),
|
|
34
34
|
};
|
|
35
35
|
const user1 = {
|
|
36
|
-
id: (0,
|
|
36
|
+
id: (0, uuid_1.v4)(),
|
|
37
37
|
domain: '1.wire.test',
|
|
38
38
|
clients: ['client1.1', 'client1.2', 'client1.3', 'client1.4'],
|
|
39
39
|
};
|
|
40
40
|
const user2 = {
|
|
41
|
-
id: (0,
|
|
41
|
+
id: (0, uuid_1.v4)(),
|
|
42
42
|
domain: '2.wire.test',
|
|
43
43
|
clients: ['client2.1', 'client2.2', 'client2.3', 'client2.4'],
|
|
44
44
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"E2EIServiceExternal.d.ts","sourceRoot":"","sources":["../../../../src/messagingProtocols/mls/E2EIdentityService/E2EIServiceExternal.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,WAAW,EAAC,MAAM,8BAA8B,CAAC;AAIzD,OAAO,EAAC,iBAAiB,EAAC,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAC,UAAU,EAAE,qBAAqB,EAAE,YAAY,EAAE,YAAY,EAAiB,MAAM,sBAAsB,CAAC;AAMnH,OAAO,EAAC,aAAa,EAAC,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAC,YAAY,EAAC,MAAM,yBAAyB,CAAC;AAGrD,OAAO,EAAC,sBAAsB,EAAuB,MAAM,+BAA+B,CAAC;AAC3F,OAAO,EAAC,sBAAsB,EAAC,MAAM,sCAAsC,CAAC;AAC5E,OAAO,EAAC,UAAU,EAAC,MAAM,eAAe,CAAC;AAEzC,MAAM,MAAM,cAAc,GAAG,IAAI,CAAC,YAAY,EAAE,MAAM,GAAG,QAAQ,CAAC,GAAG;IACnE,MAAM,CAAC,EAAE,YAAY,CAAC;IACtB,QAAQ,EAAE,MAAM,CAAC;IACjB,eAAe,EAAE,WAAW,CAAC;CAC9B,CAAC;AAEF,KAAK,MAAM,GAAG;IACZ,UAAU,EAAE;QAAC,MAAM,EAAE,MAAM,CAAA;KAAC,CAAC;CAC9B,CAAC;AAGF,qBAAa,mBAAoB,SAAQ,iBAAiB,CAAC,MAAM,CAAC;IAK9D,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,sBAAsB;IACvC,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,OAAO,CAAC,QAAQ,CAAC,UAAU;IAR7B,OAAO,CAAC,YAAY,CAAC,CAAc;IACnC,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAiD;gBAGhE,gBAAgB,EAAE,UAAU,EAC5B,YAAY,EAAE,YAAY,EAC1B,sBAAsB,EAAE,sBAAsB,EAC9C,aAAa,EAAE,aAAa,EAC5B,UAAU,EAAE,UAAU;
|
|
1
|
+
{"version":3,"file":"E2EIServiceExternal.d.ts","sourceRoot":"","sources":["../../../../src/messagingProtocols/mls/E2EIdentityService/E2EIServiceExternal.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,WAAW,EAAC,MAAM,8BAA8B,CAAC;AAIzD,OAAO,EAAC,iBAAiB,EAAC,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAC,UAAU,EAAE,qBAAqB,EAAE,YAAY,EAAE,YAAY,EAAiB,MAAM,sBAAsB,CAAC;AAMnH,OAAO,EAAC,aAAa,EAAC,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAC,YAAY,EAAC,MAAM,yBAAyB,CAAC;AAGrD,OAAO,EAAC,sBAAsB,EAAuB,MAAM,+BAA+B,CAAC;AAC3F,OAAO,EAAC,sBAAsB,EAAC,MAAM,sCAAsC,CAAC;AAC5E,OAAO,EAAC,UAAU,EAAC,MAAM,eAAe,CAAC;AAEzC,MAAM,MAAM,cAAc,GAAG,IAAI,CAAC,YAAY,EAAE,MAAM,GAAG,QAAQ,CAAC,GAAG;IACnE,MAAM,CAAC,EAAE,YAAY,CAAC;IACtB,QAAQ,EAAE,MAAM,CAAC;IACjB,eAAe,EAAE,WAAW,CAAC;CAC9B,CAAC;AAEF,KAAK,MAAM,GAAG;IACZ,UAAU,EAAE;QAAC,MAAM,EAAE,MAAM,CAAA;KAAC,CAAC;CAC9B,CAAC;AAGF,qBAAa,mBAAoB,SAAQ,iBAAiB,CAAC,MAAM,CAAC;IAK9D,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,sBAAsB;IACvC,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,OAAO,CAAC,QAAQ,CAAC,UAAU;IAR7B,OAAO,CAAC,YAAY,CAAC,CAAc;IACnC,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAiD;gBAGhE,gBAAgB,EAAE,UAAU,EAC5B,YAAY,EAAE,YAAY,EAC1B,sBAAsB,EAAE,sBAAsB,EAC9C,aAAa,EAAE,aAAa,EAC5B,UAAU,EAAE,UAAU;IAO5B,sBAAsB,IAAI,OAAO,CAAC,OAAO,CAAC;IAKhD,gBAAgB;IAIV,oBAAoB,CAAC,cAAc,EAAE,UAAU,GAAG,OAAO,CAAC,qBAAqB,CAAC;IAItF,aAAa,IAAI,OAAO,CAAC,OAAO,CAAC;IAI3B,0BAA0B,CACrC,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,GAAG,CAAC,sBAAsB,EAAE,cAAc,EAAE,CAAC,GAAG,SAAS,CAAC;IAsBxD,kBAAkB,CAC7B,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,WAAW,EAAE,GACrB,OAAO,CAAC,GAAG,CAAC,sBAAsB,EAAE,cAAc,EAAE,CAAC,GAAG,SAAS,CAAC;IAyDxD,oBAAoB,CAC/B,OAAO,EAAE,MAAM,EACf,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,GAC1C,OAAO,CAAC,cAAc,EAAE,CAAC;IAiBf,oBAAoB,IAAI,OAAO,CAAC,OAAO,CAAC;YAKvC,4BAA4B;IAO1C;;;;;OAKG;IACU,UAAU,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAW5D,OAAO,KAAK,WAAW,GAKtB;YAEa,+BAA+B;IAK7C;;;;;;;;;;;;OAYG;YACW,0BAA0B;IA2BxC,OAAO,CAAC,4BAA4B;YAStB,+BAA+B;YAQ/B,uBAAuB;YAKvB,0BAA0B;YAI1B,4BAA4B;YAO5B,WAAW;YAkBX,8BAA8B;CAM7C"}
|
|
@@ -39,7 +39,6 @@ class E2EIServiceExternal extends commons_1.TypedEventEmitter {
|
|
|
39
39
|
this.clientService = clientService;
|
|
40
40
|
this.mlsService = mlsService;
|
|
41
41
|
this.enrollmentStorage = (0, E2EIStorage_1.createE2EIEnrollmentStorage)(coreDatabase);
|
|
42
|
-
mlsService.on('newCrlDistributionPoints', distributionPoints => this.handleNewCrlDistributionPoints(distributionPoints));
|
|
43
42
|
}
|
|
44
43
|
// If we have a handle in the local storage, we are in the enrollment process (this handle is saved before oauth redirect)
|
|
45
44
|
async isEnrollmentInProgress() {
|
|
@@ -118,6 +117,7 @@ class E2EIServiceExternal extends commons_1.TypedEventEmitter {
|
|
|
118
117
|
*/
|
|
119
118
|
async initialize(discoveryUrl) {
|
|
120
119
|
this._acmeService = new Connection_1.AcmeService(discoveryUrl);
|
|
120
|
+
this.mlsService.on('newCrlDistributionPoints', distributionPoints => this.handleNewCrlDistributionPoints(distributionPoints));
|
|
121
121
|
await this.registerServerCertificates();
|
|
122
122
|
await this.initialiseCrlDistributionTimers();
|
|
123
123
|
}
|
|
@@ -20,9 +20,9 @@
|
|
|
20
20
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
21
21
|
exports.mockUserPayload = exports.getUrlParameter = exports.getUUID = void 0;
|
|
22
22
|
const faker_1 = require("@faker-js/faker");
|
|
23
|
-
const
|
|
23
|
+
const uuid_1 = require("uuid");
|
|
24
24
|
function getUUID() {
|
|
25
|
-
return (0,
|
|
25
|
+
return (0, uuid_1.v4)();
|
|
26
26
|
}
|
|
27
27
|
exports.getUUID = getUUID;
|
|
28
28
|
function getUrlParameter(url, parameter) {
|
package/package.json
CHANGED
|
@@ -11,24 +11,24 @@
|
|
|
11
11
|
"./lib/cryptography/AssetCryptography/crypto.node": "./lib/cryptography/AssetCryptography/crypto.browser.js"
|
|
12
12
|
},
|
|
13
13
|
"dependencies": {
|
|
14
|
-
"@wireapp/api-client": "^27.0.
|
|
15
|
-
"@wireapp/commons": "^5.2.
|
|
14
|
+
"@wireapp/api-client": "^27.0.4",
|
|
15
|
+
"@wireapp/commons": "^5.2.8",
|
|
16
16
|
"@wireapp/core-crypto": "1.0.0-rc.60",
|
|
17
17
|
"@wireapp/cryptobox": "12.8.0",
|
|
18
|
-
"@wireapp/priority-queue": "^2.1.
|
|
19
|
-
"@wireapp/promise-queue": "^2.3.
|
|
20
|
-
"@wireapp/protocol-messaging": "1.
|
|
21
|
-
"@wireapp/store-engine": "5.1.
|
|
18
|
+
"@wireapp/priority-queue": "^2.1.6",
|
|
19
|
+
"@wireapp/promise-queue": "^2.3.3",
|
|
20
|
+
"@wireapp/protocol-messaging": "1.48.0",
|
|
21
|
+
"@wireapp/store-engine": "5.1.6",
|
|
22
22
|
"axios": "1.6.8",
|
|
23
|
-
"bazinga64": "^6.3.
|
|
24
|
-
"deepmerge-ts": "
|
|
23
|
+
"bazinga64": "^6.3.5",
|
|
24
|
+
"deepmerge-ts": "6.0.0",
|
|
25
25
|
"hash.js": "1.1.7",
|
|
26
26
|
"http-status-codes": "2.3.0",
|
|
27
27
|
"idb": "8.0.0",
|
|
28
28
|
"logdown": "3.3.1",
|
|
29
29
|
"long": "^5.2.0",
|
|
30
|
-
"
|
|
31
|
-
"zod": "3.23.
|
|
30
|
+
"uuid": "9.0.1",
|
|
31
|
+
"zod": "3.23.8"
|
|
32
32
|
},
|
|
33
33
|
"devDependencies": {
|
|
34
34
|
"@faker-js/faker": "^8.0.0",
|
|
@@ -36,16 +36,17 @@
|
|
|
36
36
|
"@swc/jest": "^0.2.23",
|
|
37
37
|
"@types/jest": "^29.2.0",
|
|
38
38
|
"@types/long": "^5.0.0",
|
|
39
|
-
"@types/rimraf": "
|
|
39
|
+
"@types/rimraf": "4.0.5",
|
|
40
40
|
"@types/tough-cookie": "4.0.5",
|
|
41
|
-
"
|
|
41
|
+
"@types/uuid": "9.0.8",
|
|
42
|
+
"commander": "12.1.0",
|
|
42
43
|
"cross-env": "7.0.3",
|
|
43
44
|
"dotenv-defaults": "5.0.2",
|
|
44
45
|
"fake-indexeddb": "^5.0.2",
|
|
45
46
|
"jest": "^29.2.1",
|
|
46
47
|
"jest-websocket-mock": "2.5.0",
|
|
47
48
|
"nock": "13.5.4",
|
|
48
|
-
"rimraf": "
|
|
49
|
+
"rimraf": "5.0.7",
|
|
49
50
|
"typescript": "^5.0.4"
|
|
50
51
|
},
|
|
51
52
|
"scripts": {
|
|
@@ -61,6 +62,6 @@
|
|
|
61
62
|
"test:coverage": "jest --coverage",
|
|
62
63
|
"watch": "tsc --watch"
|
|
63
64
|
},
|
|
64
|
-
"version": "46.0.
|
|
65
|
-
"gitHead": "
|
|
65
|
+
"version": "46.0.10",
|
|
66
|
+
"gitHead": "feef5c17cee44152998a3f0a61272d1a86b00e86"
|
|
66
67
|
}
|