@wireapp/core 46.3.2 → 46.4.0-experimental-abort-controller.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/Account.d.ts.map +1 -1
- package/lib/Account.js +1 -1
- package/lib/conversation/ConversationService/ConversationService.d.ts +1 -1
- package/lib/conversation/ConversationService/ConversationService.d.ts.map +1 -1
- package/lib/conversation/ConversationService/ConversationService.js +11 -5
- package/lib/conversation/ConversationService/ConversationService.test.js +2 -2
- package/lib/conversation/SubconversationService/SubconversationService.d.ts +0 -8
- package/lib/conversation/SubconversationService/SubconversationService.d.ts.map +1 -1
- package/lib/conversation/SubconversationService/SubconversationService.js +0 -34
- package/lib/messagingProtocols/mls/E2EIdentityService/Connection/AcmeServer/AcmeService.d.ts +11 -11
- package/lib/messagingProtocols/mls/E2EIdentityService/Connection/AcmeServer/schema.d.ts +28 -28
- package/lib/messagingProtocols/mls/E2EIdentityService/Steps/DpopChallenge/DpopChallenge.d.ts +3 -3
- package/lib/messagingProtocols/mls/E2EIdentityService/Steps/OidcChallenge.d.ts +4 -4
- package/lib/messagingProtocols/mls/E2EIdentityService/Storage/E2EIStorage.schema.d.ts +21 -21
- package/lib/messagingProtocols/mls/MLSService/MLSService.d.ts +3 -3
- package/lib/messagingProtocols/mls/MLSService/MLSService.d.ts.map +1 -1
- package/lib/messagingProtocols/mls/MLSService/MLSService.js +4 -4
- package/lib/notification/NotificationBackendRepository.d.ts +1 -1
- package/lib/notification/NotificationBackendRepository.d.ts.map +1 -1
- package/lib/notification/NotificationBackendRepository.js +2 -2
- package/lib/notification/NotificationService.d.ts +1 -2
- package/lib/notification/NotificationService.d.ts.map +1 -1
- package/lib/notification/NotificationService.js +4 -4
- package/lib/user/UserService.d.ts +2 -2
- package/package.json +11 -12
package/lib/Account.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Account.d.ts","sourceRoot":"","sources":["../src/Account.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"Account.d.ts","sourceRoot":"","sources":["../src/Account.ts"],"names":[],"mappings":"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"}
|
package/lib/Account.js
CHANGED
|
@@ -461,7 +461,7 @@ class Account extends commons_1.TypedEventEmitter {
|
|
|
461
461
|
onNotificationStreamProgress(progress);
|
|
462
462
|
}, handleMissedNotifications, abortHandler);
|
|
463
463
|
this.logger.info(`Finished processing notifications ${JSON.stringify(results)}`, results);
|
|
464
|
-
if (abortHandler.
|
|
464
|
+
if (abortHandler.signal.aborted) {
|
|
465
465
|
this.logger.warn('Ending connection process as websocket was closed');
|
|
466
466
|
return;
|
|
467
467
|
}
|
|
@@ -135,7 +135,7 @@ export declare class ConversationService extends TypedEventEmitter<Events> {
|
|
|
135
135
|
* Get a MLS 1:1-conversation with a given user.
|
|
136
136
|
* @param userId - qualified user id
|
|
137
137
|
*/
|
|
138
|
-
getMLS1to1Conversation(userId: QualifiedId): Promise<
|
|
138
|
+
getMLS1to1Conversation(userId: QualifiedId): Promise<import("@wireapp/api-client/lib/conversation").MLS1to1Conversation>;
|
|
139
139
|
/**
|
|
140
140
|
* Will try registering mls 1:1 conversation adding the other user.
|
|
141
141
|
* If it fails and the conversation is already established, it will try joining via external commit instead.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ConversationService.d.ts","sourceRoot":"","sources":["../../../src/conversation/ConversationService/ConversationService.ts"],"names":[],"mappings":"AAmBA,OAAO,EACL,YAAY,EACZ,2BAA2B,EAC3B,WAAW,EACX,eAAe,EACf,oBAAoB,EAEpB,mBAAmB,EACnB,sBAAsB,EACtB,eAAe,EACf,kBAAkB,
|
|
1
|
+
{"version":3,"file":"ConversationService.d.ts","sourceRoot":"","sources":["../../../src/conversation/ConversationService/ConversationService.ts"],"names":[],"mappings":"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"}
|
|
@@ -379,7 +379,11 @@ class ConversationService extends commons_1.TypedEventEmitter {
|
|
|
379
379
|
* @param userId - qualified user id
|
|
380
380
|
*/
|
|
381
381
|
async getMLS1to1Conversation(userId) {
|
|
382
|
-
|
|
382
|
+
const conversation = await this.apiClient.api.conversation.getMLS1to1Conversation(userId);
|
|
383
|
+
if ((0, conversation_1.isMLS1to1Conversation)(conversation)) {
|
|
384
|
+
return conversation;
|
|
385
|
+
}
|
|
386
|
+
return { conversation };
|
|
383
387
|
}
|
|
384
388
|
/**
|
|
385
389
|
* Will try registering mls 1:1 conversation adding the other user.
|
|
@@ -394,7 +398,7 @@ class ConversationService extends commons_1.TypedEventEmitter {
|
|
|
394
398
|
// Before trying to register a group, check if the group is already established o backend.
|
|
395
399
|
// If remote epoch is higher than 0, it means that the group was already established.
|
|
396
400
|
// It's possible that we've already received a welcome message.
|
|
397
|
-
const mlsConversation = await this.getMLS1to1Conversation(otherUserId);
|
|
401
|
+
const { conversation: mlsConversation, public_keys } = await this.getMLS1to1Conversation(otherUserId);
|
|
398
402
|
if (mlsConversation.epoch > 0) {
|
|
399
403
|
this.logger.debug(`Conversation (id ${mlsConversation.qualified_id.id}) is already established on backend, checking the local epoch...`);
|
|
400
404
|
const isMLSGroupEstablishedLocally = await this.isMLSGroupEstablishedLocally(groupId);
|
|
@@ -407,15 +411,17 @@ class ConversationService extends commons_1.TypedEventEmitter {
|
|
|
407
411
|
// We try joining via external commit.
|
|
408
412
|
this.logger.debug(`Conversation (id ${mlsConversation.qualified_id.id}) is not yet established locally, joining via external commit...`);
|
|
409
413
|
await this.joinByExternalCommit(mlsConversation.qualified_id);
|
|
410
|
-
|
|
414
|
+
const { conversation: updatedMLSConversation } = await this.getMLS1to1Conversation(otherUserId);
|
|
415
|
+
return updatedMLSConversation;
|
|
411
416
|
}
|
|
412
417
|
// If group is not established on backend,
|
|
413
418
|
// we wipe the it locally (in case it exsits in the local store) and try to register it.
|
|
414
419
|
await this.mlsService.wipeConversation(groupId);
|
|
415
420
|
try {
|
|
416
|
-
await this.mlsService.register1to1Conversation(groupId, otherUserId, selfUser);
|
|
421
|
+
await this.mlsService.register1to1Conversation(groupId, otherUserId, selfUser, public_keys?.removal);
|
|
417
422
|
this.logger.info(`Conversation (id ${mlsConversation.qualified_id.id}) established successfully.`);
|
|
418
|
-
|
|
423
|
+
const { conversation: updatedMLSConversation } = await this.getMLS1to1Conversation(otherUserId);
|
|
424
|
+
return updatedMLSConversation;
|
|
419
425
|
}
|
|
420
426
|
catch (error) {
|
|
421
427
|
if (!shouldRetry) {
|
|
@@ -338,7 +338,7 @@ describe('ConversationService', () => {
|
|
|
338
338
|
const establishedConversation = await conversationService.establishMLS1to1Conversation(mockGroupId, selfUser, otherUserId);
|
|
339
339
|
expect(mlsService.wipeConversation).toHaveBeenCalledWith(mockGroupId);
|
|
340
340
|
expect(mlsService.register1to1Conversation).toHaveBeenCalledTimes(1);
|
|
341
|
-
expect(mlsService.register1to1Conversation).toHaveBeenCalledWith(mockGroupId, otherUserId, selfUser);
|
|
341
|
+
expect(mlsService.register1to1Conversation).toHaveBeenCalledWith(mockGroupId, otherUserId, selfUser, undefined);
|
|
342
342
|
expect(conversationService.joinByExternalCommit).not.toHaveBeenCalled();
|
|
343
343
|
expect(establishedConversation.epoch).toEqual(updatedEpoch);
|
|
344
344
|
});
|
|
@@ -375,7 +375,7 @@ describe('ConversationService', () => {
|
|
|
375
375
|
const establishedConversation = await conversationService.establishMLS1to1Conversation(mockGroupId, selfUser, otherUserId);
|
|
376
376
|
expect(mlsService.wipeConversation).toHaveBeenCalledWith(mockGroupId);
|
|
377
377
|
expect(mlsService.register1to1Conversation).toHaveBeenCalledTimes(2);
|
|
378
|
-
expect(mlsService.register1to1Conversation).toHaveBeenCalledWith(mockGroupId, otherUserId, selfUser);
|
|
378
|
+
expect(mlsService.register1to1Conversation).toHaveBeenCalledWith(mockGroupId, otherUserId, selfUser, undefined);
|
|
379
379
|
expect(conversationService.joinByExternalCommit).not.toHaveBeenCalled();
|
|
380
380
|
expect(establishedConversation.epoch).toEqual(updatedEpoch);
|
|
381
381
|
});
|
|
@@ -38,14 +38,6 @@ export declare class SubconversationService extends TypedEventEmitter<Events> {
|
|
|
38
38
|
* @param conversationId Id of the parent conversation which subconversation we want to leave
|
|
39
39
|
*/
|
|
40
40
|
leaveConferenceSubconversation(conversationId: QualifiedId): Promise<void>;
|
|
41
|
-
/**
|
|
42
|
-
* Short term solution to an issues with 1:1 MLS call, see
|
|
43
|
-
* https://wearezeta.atlassian.net/wiki/spaces/PAD/pages/1314750477/2024-07-29+1+1+calls+over+SFT#Do-not-leave-the-subconversation
|
|
44
|
-
* Will delete a conference subconversation when hanging up on a 1:1 call instead of leaving.
|
|
45
|
-
*
|
|
46
|
-
* @param conversationId Id of the parent conversation which subconversation we want to leave
|
|
47
|
-
*/
|
|
48
|
-
leave1on1ConferenceSubconversation(conversationId: QualifiedId): Promise<void>;
|
|
49
41
|
leaveStaleConferenceSubconversations(): Promise<void>;
|
|
50
42
|
getSubconversationEpochInfo(parentConversationId: QualifiedId, parentConversationGroupId: string, shouldAdvanceEpoch?: boolean): Promise<{
|
|
51
43
|
members: SubconversationEpochInfoMember[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SubconversationService.d.ts","sourceRoot":"","sources":["../../../src/conversation/SubconversationService/SubconversationService.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,kBAAkB,EAAkB,MAAM,sCAAsC,CAAC;AACzF,OAAO,EAAC,WAAW,EAAC,MAAM,8BAA8B,CAAC;AAIzD,OAAO,EAAC,SAAS,EAAC,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAC,iBAAiB,EAAC,MAAM,kBAAkB,CAAC;AAInD,OAAO,EAAC,UAAU,EAAC,MAAM,8BAA8B,CAAC;AACxD,OAAO,EAAC,YAAY,EAAC,MAAM,sBAAsB,CAAC;AAGlD,KAAK,MAAM,GAAG;IACZ,wBAAwB,EAAE;QAAC,cAAc,EAAE,WAAW,CAAA;KAAC,CAAC;CACzD,CAAC;AAEF,MAAM,WAAW,8BAA8B;IAC7C,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,OAAO,CAAC;CACrB;AAID,qBAAa,sBAAuB,SAAQ,iBAAiB,CAAC,MAAM,CAAC;IAIjE,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC;IAL/B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAmD;gBAGvD,SAAS,EAAE,SAAS,EACpB,YAAY,EAAE,YAAY,EAC1B,WAAW,CAAC,EAAE,UAAU,YAAA;IAK3C,IAAI,UAAU,IAAI,UAAU,CAK3B;IAED;;;;;;OAMG;IACU,6BAA6B,CACxC,cAAc,EAAE,WAAW,EAC3B,OAAO,EAAE,MAAM,EACf,WAAW,UAAO,GACjB,OAAO,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAC,CAAC;IAiD5C;;;;OAIG;IACU,8BAA8B,CAAC,cAAc,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"SubconversationService.d.ts","sourceRoot":"","sources":["../../../src/conversation/SubconversationService/SubconversationService.ts"],"names":[],"mappings":"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"}
|
|
@@ -115,40 +115,6 @@ class SubconversationService extends commons_1.TypedEventEmitter {
|
|
|
115
115
|
// once we've left the subconversation, we can remove it from the store
|
|
116
116
|
await this.clearSubconversationGroupId(conversationId, conversation_1.SUBCONVERSATION_ID.CONFERENCE);
|
|
117
117
|
}
|
|
118
|
-
/**
|
|
119
|
-
* Short term solution to an issues with 1:1 MLS call, see
|
|
120
|
-
* https://wearezeta.atlassian.net/wiki/spaces/PAD/pages/1314750477/2024-07-29+1+1+calls+over+SFT#Do-not-leave-the-subconversation
|
|
121
|
-
* Will delete a conference subconversation when hanging up on a 1:1 call instead of leaving.
|
|
122
|
-
*
|
|
123
|
-
* @param conversationId Id of the parent conversation which subconversation we want to leave
|
|
124
|
-
*/
|
|
125
|
-
async leave1on1ConferenceSubconversation(conversationId) {
|
|
126
|
-
const subconversationGroupId = await this.getSubconversationGroupId(conversationId, conversation_1.SUBCONVERSATION_ID.CONFERENCE);
|
|
127
|
-
if (!subconversationGroupId) {
|
|
128
|
-
return;
|
|
129
|
-
}
|
|
130
|
-
const doesGroupExistLocally = await this.mlsService.conversationExists(subconversationGroupId);
|
|
131
|
-
if (!doesGroupExistLocally) {
|
|
132
|
-
// If the subconversation was known by a client but is does not exist locally, we can remove it from the store.
|
|
133
|
-
return this.clearSubconversationGroupId(conversationId, conversation_1.SUBCONVERSATION_ID.CONFERENCE);
|
|
134
|
-
}
|
|
135
|
-
try {
|
|
136
|
-
const epochInfo = await this.getSubconversationEpochInfo(conversationId, subconversationGroupId);
|
|
137
|
-
if (!epochInfo) {
|
|
138
|
-
throw new Error('Failed to get epoch info for conference subconversation');
|
|
139
|
-
}
|
|
140
|
-
await this.apiClient.api.conversation.deleteSubconversation(conversationId, conversation_1.SUBCONVERSATION_ID.CONFERENCE, {
|
|
141
|
-
groupId: subconversationGroupId,
|
|
142
|
-
epoch: epochInfo.epoch,
|
|
143
|
-
});
|
|
144
|
-
}
|
|
145
|
-
catch (error) {
|
|
146
|
-
this.logger.error(`Failed to delete conference subconversation:`, error);
|
|
147
|
-
}
|
|
148
|
-
await this.mlsService.wipeConversation(subconversationGroupId);
|
|
149
|
-
// once we've deleted the subconversation, we can remove it from the store
|
|
150
|
-
await this.clearSubconversationGroupId(conversationId, conversation_1.SUBCONVERSATION_ID.CONFERENCE);
|
|
151
|
-
}
|
|
152
118
|
async leaveStaleConferenceSubconversations() {
|
|
153
119
|
const conversationIds = await this.getAllGroupIdsBySubconversationId(conversation_1.SUBCONVERSATION_ID.CONFERENCE);
|
|
154
120
|
for (const { parentConversationId } of conversationIds) {
|
package/lib/messagingProtocols/mls/E2EIdentityService/Connection/AcmeServer/AcmeService.d.ts
CHANGED
|
@@ -44,31 +44,31 @@ export declare class AcmeService {
|
|
|
44
44
|
};
|
|
45
45
|
expires: string;
|
|
46
46
|
challenges: {
|
|
47
|
-
type: string;
|
|
48
|
-
url: string;
|
|
49
|
-
target: string;
|
|
50
47
|
status: string;
|
|
48
|
+
url: string;
|
|
49
|
+
type: string;
|
|
51
50
|
token: string;
|
|
51
|
+
target: string;
|
|
52
52
|
}[];
|
|
53
53
|
}>>;
|
|
54
54
|
validateDpopChallenge(url: AcmeChallenge['url'], payload: Uint8Array): Promise<PostJoseRequestReturnValue<{
|
|
55
|
-
type: string;
|
|
56
|
-
url: string;
|
|
57
|
-
target: string;
|
|
58
55
|
status: string;
|
|
56
|
+
url: string;
|
|
57
|
+
type: string;
|
|
59
58
|
token: string;
|
|
59
|
+
target: string;
|
|
60
60
|
}>>;
|
|
61
61
|
validateOidcChallenge(url: AcmeChallenge['url'], payload: Uint8Array): Promise<PostJoseRequestReturnValue<{
|
|
62
|
-
type: string;
|
|
63
|
-
url: string;
|
|
64
|
-
target: string;
|
|
65
62
|
status: string;
|
|
63
|
+
url: string;
|
|
64
|
+
type: string;
|
|
66
65
|
token: string;
|
|
66
|
+
target: string;
|
|
67
|
+
validated?: string | undefined;
|
|
67
68
|
error?: {
|
|
68
69
|
type: string;
|
|
69
70
|
detail: string;
|
|
70
71
|
} | undefined;
|
|
71
|
-
validated?: string | undefined;
|
|
72
72
|
}>>;
|
|
73
73
|
checkStatusOfOrder(url: string, payload: Uint8Array): Promise<PostJoseRequestReturnValue<{
|
|
74
74
|
id: string;
|
|
@@ -85,7 +85,6 @@ export declare class AcmeService {
|
|
|
85
85
|
}>>;
|
|
86
86
|
finalizeOrder(url: string, payload: Uint8Array): Promise<PostJoseRequestReturnValue<{
|
|
87
87
|
id: string;
|
|
88
|
-
certificate: string;
|
|
89
88
|
status: string;
|
|
90
89
|
authorizations: string[];
|
|
91
90
|
expires: string;
|
|
@@ -96,6 +95,7 @@ export declare class AcmeService {
|
|
|
96
95
|
value: string;
|
|
97
96
|
}[];
|
|
98
97
|
finalize: string;
|
|
98
|
+
certificate: string;
|
|
99
99
|
}>>;
|
|
100
100
|
getCertificate(url: string, payload: Uint8Array): Promise<PostJoseRequestReturnValue<string>>;
|
|
101
101
|
}
|
|
@@ -122,17 +122,17 @@ export declare const AuthorizationResponseSchema: z.ZodObject<{
|
|
|
122
122
|
token: z.ZodString;
|
|
123
123
|
target: z.ZodString;
|
|
124
124
|
}, "strip", z.ZodTypeAny, {
|
|
125
|
-
type: string;
|
|
126
|
-
url: string;
|
|
127
|
-
target: string;
|
|
128
125
|
status: string;
|
|
129
|
-
token: string;
|
|
130
|
-
}, {
|
|
131
|
-
type: string;
|
|
132
126
|
url: string;
|
|
127
|
+
type: string;
|
|
128
|
+
token: string;
|
|
133
129
|
target: string;
|
|
130
|
+
}, {
|
|
134
131
|
status: string;
|
|
132
|
+
url: string;
|
|
133
|
+
type: string;
|
|
135
134
|
token: string;
|
|
135
|
+
target: string;
|
|
136
136
|
}>, "many">;
|
|
137
137
|
}, "strip", z.ZodTypeAny, {
|
|
138
138
|
status: string;
|
|
@@ -142,11 +142,11 @@ export declare const AuthorizationResponseSchema: z.ZodObject<{
|
|
|
142
142
|
};
|
|
143
143
|
expires: string;
|
|
144
144
|
challenges: {
|
|
145
|
-
type: string;
|
|
146
|
-
url: string;
|
|
147
|
-
target: string;
|
|
148
145
|
status: string;
|
|
146
|
+
url: string;
|
|
147
|
+
type: string;
|
|
149
148
|
token: string;
|
|
149
|
+
target: string;
|
|
150
150
|
}[];
|
|
151
151
|
}, {
|
|
152
152
|
status: string;
|
|
@@ -156,11 +156,11 @@ export declare const AuthorizationResponseSchema: z.ZodObject<{
|
|
|
156
156
|
};
|
|
157
157
|
expires: string;
|
|
158
158
|
challenges: {
|
|
159
|
-
type: string;
|
|
160
|
-
url: string;
|
|
161
|
-
target: string;
|
|
162
159
|
status: string;
|
|
160
|
+
url: string;
|
|
161
|
+
type: string;
|
|
163
162
|
token: string;
|
|
163
|
+
target: string;
|
|
164
164
|
}[];
|
|
165
165
|
}>;
|
|
166
166
|
export type AuthorizationResponseData = z.infer<typeof AuthorizationResponseSchema>;
|
|
@@ -171,17 +171,17 @@ export declare const DpopChallengeResponseSchema: z.ZodObject<{
|
|
|
171
171
|
token: z.ZodString;
|
|
172
172
|
target: z.ZodString;
|
|
173
173
|
}, "strip", z.ZodTypeAny, {
|
|
174
|
-
type: string;
|
|
175
|
-
url: string;
|
|
176
|
-
target: string;
|
|
177
174
|
status: string;
|
|
178
|
-
token: string;
|
|
179
|
-
}, {
|
|
180
|
-
type: string;
|
|
181
175
|
url: string;
|
|
176
|
+
type: string;
|
|
177
|
+
token: string;
|
|
182
178
|
target: string;
|
|
179
|
+
}, {
|
|
183
180
|
status: string;
|
|
181
|
+
url: string;
|
|
182
|
+
type: string;
|
|
184
183
|
token: string;
|
|
184
|
+
target: string;
|
|
185
185
|
}>;
|
|
186
186
|
export type DpopChallengeResponseData = z.infer<typeof DpopChallengeResponseSchema>;
|
|
187
187
|
export declare const OidcChallengeResponseSchema: z.ZodObject<{
|
|
@@ -202,27 +202,27 @@ export declare const OidcChallengeResponseSchema: z.ZodObject<{
|
|
|
202
202
|
detail: string;
|
|
203
203
|
}>>;
|
|
204
204
|
}, "strip", z.ZodTypeAny, {
|
|
205
|
-
type: string;
|
|
206
|
-
url: string;
|
|
207
|
-
target: string;
|
|
208
205
|
status: string;
|
|
206
|
+
url: string;
|
|
207
|
+
type: string;
|
|
209
208
|
token: string;
|
|
209
|
+
target: string;
|
|
210
|
+
validated?: string | undefined;
|
|
210
211
|
error?: {
|
|
211
212
|
type: string;
|
|
212
213
|
detail: string;
|
|
213
214
|
} | undefined;
|
|
214
|
-
validated?: string | undefined;
|
|
215
215
|
}, {
|
|
216
|
-
type: string;
|
|
217
|
-
url: string;
|
|
218
|
-
target: string;
|
|
219
216
|
status: string;
|
|
217
|
+
url: string;
|
|
218
|
+
type: string;
|
|
220
219
|
token: string;
|
|
220
|
+
target: string;
|
|
221
|
+
validated?: string | undefined;
|
|
221
222
|
error?: {
|
|
222
223
|
type: string;
|
|
223
224
|
detail: string;
|
|
224
225
|
} | undefined;
|
|
225
|
-
validated?: string | undefined;
|
|
226
226
|
}>;
|
|
227
227
|
export type OidcChallengeResponseData = z.infer<typeof OidcChallengeResponseSchema>;
|
|
228
228
|
export declare const CheckStatusOfOrderResponseSchema: z.ZodObject<{
|
|
@@ -290,7 +290,6 @@ export declare const FinalizeOrderResponseSchema: z.ZodObject<{
|
|
|
290
290
|
certificate: z.ZodString;
|
|
291
291
|
}, "strip", z.ZodTypeAny, {
|
|
292
292
|
id: string;
|
|
293
|
-
certificate: string;
|
|
294
293
|
status: string;
|
|
295
294
|
authorizations: string[];
|
|
296
295
|
expires: string;
|
|
@@ -301,9 +300,9 @@ export declare const FinalizeOrderResponseSchema: z.ZodObject<{
|
|
|
301
300
|
value: string;
|
|
302
301
|
}[];
|
|
303
302
|
finalize: string;
|
|
303
|
+
certificate: string;
|
|
304
304
|
}, {
|
|
305
305
|
id: string;
|
|
306
|
-
certificate: string;
|
|
307
306
|
status: string;
|
|
308
307
|
authorizations: string[];
|
|
309
308
|
expires: string;
|
|
@@ -314,6 +313,7 @@ export declare const FinalizeOrderResponseSchema: z.ZodObject<{
|
|
|
314
313
|
value: string;
|
|
315
314
|
}[];
|
|
316
315
|
finalize: string;
|
|
316
|
+
certificate: string;
|
|
317
317
|
}>;
|
|
318
318
|
export type FinalizeOrderResponseData = z.infer<typeof FinalizeOrderResponseSchema>;
|
|
319
319
|
export declare const GetCertificateResponseSchema: z.ZodString;
|
package/lib/messagingProtocols/mls/E2EIdentityService/Steps/DpopChallenge/DpopChallenge.d.ts
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { DoWireDpopChallengeParams } from './DpopChallenge.types';
|
|
2
2
|
export declare const doWireDpopChallenge: ({ apiClient, clientId, authData, identity, nonce, connection, expirySecs, }: DoWireDpopChallengeParams) => Promise<import("../../Connection/AcmeServer/AcmeService.types").PostJoseRequestReturnValue<{
|
|
3
|
-
type: string;
|
|
4
|
-
url: string;
|
|
5
|
-
target: string;
|
|
6
3
|
status: string;
|
|
4
|
+
url: string;
|
|
5
|
+
type: string;
|
|
7
6
|
token: string;
|
|
7
|
+
target: string;
|
|
8
8
|
}>>;
|
|
9
9
|
//# sourceMappingURL=DpopChallenge.d.ts.map
|
|
@@ -9,16 +9,16 @@ interface DoWireOidcChallengeParams {
|
|
|
9
9
|
oAuthIdToken: string;
|
|
10
10
|
}
|
|
11
11
|
export declare const doWireOidcChallenge: ({ connection, authData, identity, nonce, oAuthIdToken, }: DoWireOidcChallengeParams) => Promise<import("../Connection/AcmeServer/AcmeService.types").PostJoseRequestReturnValue<{
|
|
12
|
-
type: string;
|
|
13
|
-
url: string;
|
|
14
|
-
target: string;
|
|
15
12
|
status: string;
|
|
13
|
+
url: string;
|
|
14
|
+
type: string;
|
|
16
15
|
token: string;
|
|
16
|
+
target: string;
|
|
17
|
+
validated?: string | undefined;
|
|
17
18
|
error?: {
|
|
18
19
|
type: string;
|
|
19
20
|
detail: string;
|
|
20
21
|
} | undefined;
|
|
21
|
-
validated?: string | undefined;
|
|
22
22
|
}>>;
|
|
23
23
|
export {};
|
|
24
24
|
//# sourceMappingURL=OidcChallenge.d.ts.map
|
|
@@ -11,36 +11,36 @@ export declare const InitialDataSchema: z.ZodObject<{
|
|
|
11
11
|
}, "strip", z.ZodTypeAny, {
|
|
12
12
|
id: string;
|
|
13
13
|
domain: string;
|
|
14
|
-
handle: string;
|
|
15
14
|
displayName: string;
|
|
15
|
+
handle: string;
|
|
16
16
|
teamId: string;
|
|
17
17
|
}, {
|
|
18
18
|
id: string;
|
|
19
19
|
domain: string;
|
|
20
|
-
handle: string;
|
|
21
20
|
displayName: string;
|
|
21
|
+
handle: string;
|
|
22
22
|
teamId: string;
|
|
23
23
|
}>;
|
|
24
24
|
}, "strip", z.ZodTypeAny, {
|
|
25
|
+
clientId: string;
|
|
26
|
+
discoveryUrl: string;
|
|
25
27
|
user: {
|
|
26
28
|
id: string;
|
|
27
29
|
domain: string;
|
|
28
|
-
handle: string;
|
|
29
30
|
displayName: string;
|
|
31
|
+
handle: string;
|
|
30
32
|
teamId: string;
|
|
31
33
|
};
|
|
34
|
+
}, {
|
|
32
35
|
clientId: string;
|
|
33
36
|
discoveryUrl: string;
|
|
34
|
-
}, {
|
|
35
37
|
user: {
|
|
36
38
|
id: string;
|
|
37
39
|
domain: string;
|
|
38
|
-
handle: string;
|
|
39
40
|
displayName: string;
|
|
41
|
+
handle: string;
|
|
40
42
|
teamId: string;
|
|
41
43
|
};
|
|
42
|
-
clientId: string;
|
|
43
|
-
discoveryUrl: string;
|
|
44
44
|
}>;
|
|
45
45
|
export type InitialData = z.infer<typeof InitialDataSchema>;
|
|
46
46
|
export declare const EnrollmentFlowDataSchema: z.ZodObject<{
|
|
@@ -54,12 +54,12 @@ export declare const EnrollmentFlowDataSchema: z.ZodObject<{
|
|
|
54
54
|
target: z.ZodString;
|
|
55
55
|
}, "strip", z.ZodTypeAny, {
|
|
56
56
|
url: string;
|
|
57
|
-
target: string;
|
|
58
57
|
delegate: Uint8Array;
|
|
58
|
+
target: string;
|
|
59
59
|
}, {
|
|
60
60
|
url: string;
|
|
61
|
-
target: string;
|
|
62
61
|
delegate: Uint8Array;
|
|
62
|
+
target: string;
|
|
63
63
|
}>;
|
|
64
64
|
oidcChallenge: z.ZodObject<{
|
|
65
65
|
delegate: z.ZodType<Uint8Array, z.ZodTypeDef, Uint8Array>;
|
|
@@ -67,73 +67,73 @@ export declare const EnrollmentFlowDataSchema: z.ZodObject<{
|
|
|
67
67
|
target: z.ZodString;
|
|
68
68
|
}, "strip", z.ZodTypeAny, {
|
|
69
69
|
url: string;
|
|
70
|
-
target: string;
|
|
71
70
|
delegate: Uint8Array;
|
|
71
|
+
target: string;
|
|
72
72
|
}, {
|
|
73
73
|
url: string;
|
|
74
|
-
target: string;
|
|
75
74
|
delegate: Uint8Array;
|
|
75
|
+
target: string;
|
|
76
76
|
}>;
|
|
77
77
|
}, "strip", z.ZodTypeAny, {
|
|
78
78
|
keyauth: string;
|
|
79
79
|
dpopChallenge: {
|
|
80
80
|
url: string;
|
|
81
|
-
target: string;
|
|
82
81
|
delegate: Uint8Array;
|
|
82
|
+
target: string;
|
|
83
83
|
};
|
|
84
84
|
oidcChallenge: {
|
|
85
85
|
url: string;
|
|
86
|
-
target: string;
|
|
87
86
|
delegate: Uint8Array;
|
|
87
|
+
target: string;
|
|
88
88
|
};
|
|
89
89
|
}, {
|
|
90
90
|
keyauth: string;
|
|
91
91
|
dpopChallenge: {
|
|
92
92
|
url: string;
|
|
93
|
-
target: string;
|
|
94
93
|
delegate: Uint8Array;
|
|
94
|
+
target: string;
|
|
95
95
|
};
|
|
96
96
|
oidcChallenge: {
|
|
97
97
|
url: string;
|
|
98
|
-
target: string;
|
|
99
98
|
delegate: Uint8Array;
|
|
99
|
+
target: string;
|
|
100
100
|
};
|
|
101
101
|
}>;
|
|
102
102
|
nonce: z.ZodString;
|
|
103
103
|
}, "strip", z.ZodTypeAny, {
|
|
104
|
-
nonce: string;
|
|
105
104
|
handle: Uint8Array;
|
|
106
105
|
orderUrl: string;
|
|
107
106
|
authorization: {
|
|
108
107
|
keyauth: string;
|
|
109
108
|
dpopChallenge: {
|
|
110
109
|
url: string;
|
|
111
|
-
target: string;
|
|
112
110
|
delegate: Uint8Array;
|
|
111
|
+
target: string;
|
|
113
112
|
};
|
|
114
113
|
oidcChallenge: {
|
|
115
114
|
url: string;
|
|
116
|
-
target: string;
|
|
117
115
|
delegate: Uint8Array;
|
|
116
|
+
target: string;
|
|
118
117
|
};
|
|
119
118
|
};
|
|
120
|
-
}, {
|
|
121
119
|
nonce: string;
|
|
120
|
+
}, {
|
|
122
121
|
handle: Uint8Array;
|
|
123
122
|
orderUrl: string;
|
|
124
123
|
authorization: {
|
|
125
124
|
keyauth: string;
|
|
126
125
|
dpopChallenge: {
|
|
127
126
|
url: string;
|
|
128
|
-
target: string;
|
|
129
127
|
delegate: Uint8Array;
|
|
128
|
+
target: string;
|
|
130
129
|
};
|
|
131
130
|
oidcChallenge: {
|
|
132
131
|
url: string;
|
|
133
|
-
target: string;
|
|
134
132
|
delegate: Uint8Array;
|
|
133
|
+
target: string;
|
|
135
134
|
};
|
|
136
135
|
};
|
|
136
|
+
nonce: string;
|
|
137
137
|
}>;
|
|
138
138
|
export type EnrollmentFlowData = z.infer<typeof EnrollmentFlowDataSchema>;
|
|
139
139
|
export type UnidentifiedEnrollmentFlowData = Omit<EnrollmentFlowData, 'handle'>;
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { RegisteredClient } from '@wireapp/api-client/lib/client';
|
|
1
|
+
import type { MLSPublicKeyRecord, RegisteredClient } from '@wireapp/api-client/lib/client';
|
|
2
2
|
import { PostMlsMessageResponse, SUBCONVERSATION_ID } from '@wireapp/api-client/lib/conversation';
|
|
3
3
|
import { ConversationMLSMessageAddEvent, ConversationMLSWelcomeEvent } from '@wireapp/api-client/lib/event';
|
|
4
4
|
import { QualifiedId } from '@wireapp/api-client/lib/user';
|
|
@@ -109,7 +109,7 @@ export declare class MLSService extends TypedEventEmitter<Events> {
|
|
|
109
109
|
* @param groupId the id of the group to create inside of coreCrypto
|
|
110
110
|
* @param parentGroupId in case the conversation is a subconversation, the id of the parent conversation
|
|
111
111
|
*/
|
|
112
|
-
registerEmptyConversation(groupId: string, parentGroupId?: string): Promise<void>;
|
|
112
|
+
registerEmptyConversation(groupId: string, parentGroupId?: string, removalKeyFor1to1Signature?: MLSPublicKeyRecord): Promise<void>;
|
|
113
113
|
/**
|
|
114
114
|
* Will create a conversation inside of coreCrypto, add users to it or update the keying material if empty key packages list is provided.
|
|
115
115
|
* @param groupId the id of the group to create inside of coreCrypto
|
|
@@ -135,7 +135,7 @@ export declare class MLSService extends TypedEventEmitter<Events> {
|
|
|
135
135
|
register1to1Conversation(groupId: string, userId: QualifiedId, selfUser: {
|
|
136
136
|
user: QualifiedId;
|
|
137
137
|
client: string;
|
|
138
|
-
}): Promise<PostMlsMessageResponse & {
|
|
138
|
+
}, removalKeyFor1to1Signature?: MLSPublicKeyRecord): Promise<PostMlsMessageResponse & {
|
|
139
139
|
failures: AddUsersFailure[];
|
|
140
140
|
}>;
|
|
141
141
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MLSService.d.ts","sourceRoot":"","sources":["../../../../src/messagingProtocols/mls/MLSService/MLSService.ts"],"names":[],"mappings":"AAmBA,OAAO,KAAK,EAAqB,gBAAgB,EAAC,MAAM,gCAAgC,CAAC;
|
|
1
|
+
{"version":3,"file":"MLSService.d.ts","sourceRoot":"","sources":["../../../../src/messagingProtocols/mls/MLSService/MLSService.ts"],"names":[],"mappings":"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"}
|
|
@@ -352,7 +352,7 @@ class MLSService extends commons_1.TypedEventEmitter {
|
|
|
352
352
|
* @param groupId the id of the group to create inside of coreCrypto
|
|
353
353
|
* @param parentGroupId in case the conversation is a subconversation, the id of the parent conversation
|
|
354
354
|
*/
|
|
355
|
-
async registerEmptyConversation(groupId, parentGroupId) {
|
|
355
|
+
async registerEmptyConversation(groupId, parentGroupId, removalKeyFor1to1Signature) {
|
|
356
356
|
const groupIdBytes = bazinga64_1.Decoder.fromBase64(groupId).asBytes;
|
|
357
357
|
let externalSenders = [];
|
|
358
358
|
if (parentGroupId) {
|
|
@@ -362,7 +362,7 @@ class MLSService extends commons_1.TypedEventEmitter {
|
|
|
362
362
|
else {
|
|
363
363
|
const mlsKeys = (await this.apiClient.api.client.getPublicKeys()).removal;
|
|
364
364
|
const ciphersuiteSignature = (0, Helper_1.getSignatureAlgorithmForCiphersuite)(this.config.defaultCiphersuite);
|
|
365
|
-
const removalKeyForSignature = mlsKeys[ciphersuiteSignature];
|
|
365
|
+
const removalKeyForSignature = removalKeyFor1to1Signature?.[ciphersuiteSignature] ?? mlsKeys[ciphersuiteSignature];
|
|
366
366
|
if (!removalKeyForSignature) {
|
|
367
367
|
throw new Error(`Cannot create conversation: No backend removal key found for the signature ${ciphersuiteSignature}`);
|
|
368
368
|
}
|
|
@@ -417,9 +417,9 @@ class MLSService extends commons_1.TypedEventEmitter {
|
|
|
417
417
|
* @param userId the id of the user to register the conversation with
|
|
418
418
|
* @param selfUser the self user that is creating the 1:1 conversation (user and client ids)
|
|
419
419
|
*/
|
|
420
|
-
async register1to1Conversation(groupId, userId, selfUser) {
|
|
420
|
+
async register1to1Conversation(groupId, userId, selfUser, removalKeyFor1to1Signature) {
|
|
421
421
|
try {
|
|
422
|
-
await this.registerEmptyConversation(groupId);
|
|
422
|
+
await this.registerEmptyConversation(groupId, undefined, removalKeyFor1to1Signature);
|
|
423
423
|
// We fist fetch key packages for the user we want to add
|
|
424
424
|
const { keyPackages: otherUserKeyPackages, failures: otherUserKeysClaimingFailures } = await this.getKeyPackagesPayload([userId]);
|
|
425
425
|
// If we're missing key packages for the user we want to add, we can't register the conversation
|
|
@@ -3,7 +3,7 @@ import { APIClient } from '@wireapp/api-client';
|
|
|
3
3
|
export declare class NotificationBackendRepository {
|
|
4
4
|
private readonly apiClient;
|
|
5
5
|
constructor(apiClient: APIClient);
|
|
6
|
-
getAllNotifications(clientId?: string, lastNotificationId?: string): Promise<{
|
|
6
|
+
getAllNotifications(clientId?: string, lastNotificationId?: string, abortController?: AbortController): Promise<{
|
|
7
7
|
notifications: Notification[];
|
|
8
8
|
missedNotification?: string;
|
|
9
9
|
}>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NotificationBackendRepository.d.ts","sourceRoot":"","sources":["../../src/notification/NotificationBackendRepository.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,YAAY,EAAC,MAAM,uCAAuC,CAAC;AAEnE,OAAO,EAAC,SAAS,EAAC,MAAM,qBAAqB,CAAC;AAE9C,qBAAa,6BAA6B;IAC5B,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAAT,SAAS,EAAE,SAAS;IAEpC,mBAAmB,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,kBAAkB,CAAC,EAAE,MAAM;;;;
|
|
1
|
+
{"version":3,"file":"NotificationBackendRepository.d.ts","sourceRoot":"","sources":["../../src/notification/NotificationBackendRepository.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,YAAY,EAAC,MAAM,uCAAuC,CAAC;AAEnE,OAAO,EAAC,SAAS,EAAC,MAAM,qBAAqB,CAAC;AAE9C,qBAAa,6BAA6B;IAC5B,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAAT,SAAS,EAAE,SAAS;IAEpC,mBAAmB,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,kBAAkB,CAAC,EAAE,MAAM,EAAE,eAAe,CAAC,EAAE,eAAe;;;;IAI3G,mBAAmB,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC;CAGrE"}
|
|
@@ -24,8 +24,8 @@ class NotificationBackendRepository {
|
|
|
24
24
|
constructor(apiClient) {
|
|
25
25
|
this.apiClient = apiClient;
|
|
26
26
|
}
|
|
27
|
-
async getAllNotifications(clientId, lastNotificationId) {
|
|
28
|
-
return this.apiClient.api.notification.getAllNotifications(clientId, lastNotificationId);
|
|
27
|
+
async getAllNotifications(clientId, lastNotificationId, abortController) {
|
|
28
|
+
return this.apiClient.api.notification.getAllNotifications(clientId, lastNotificationId, abortController);
|
|
29
29
|
}
|
|
30
30
|
getLastNotification(clientId) {
|
|
31
31
|
return this.apiClient.api.notification.getLastNotification(clientId);
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { BackendEvent } from '@wireapp/api-client/lib/event';
|
|
2
2
|
import { Notification } from '@wireapp/api-client/lib/notification/';
|
|
3
|
-
import { AbortHandler } from '@wireapp/api-client/lib/tcp';
|
|
4
3
|
import { APIClient } from '@wireapp/api-client';
|
|
5
4
|
import { TypedEventEmitter } from '@wireapp/commons';
|
|
6
5
|
import { GenericMessage } from '@wireapp/protocol-messaging';
|
|
@@ -56,7 +55,7 @@ export declare class NotificationService extends TypedEventEmitter<Events> {
|
|
|
56
55
|
getNotificationEventList(): Promise<BackendEvent[]>;
|
|
57
56
|
setLastEventDate(eventDate: Date): Promise<Date>;
|
|
58
57
|
private setLastNotificationId;
|
|
59
|
-
processNotificationStream(notificationHandler: NotificationHandler, onMissedNotifications: (notificationId: string) => void, abortHandler:
|
|
58
|
+
processNotificationStream(notificationHandler: NotificationHandler, onMissedNotifications: (notificationId: string) => void, abortHandler: AbortController): Promise<{
|
|
60
59
|
total: number;
|
|
61
60
|
error: number;
|
|
62
61
|
success: number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NotificationService.d.ts","sourceRoot":"","sources":["../../src/notification/NotificationService.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,YAAY,EAAC,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAC,YAAY,EAAC,MAAM,uCAAuC,CAAC;
|
|
1
|
+
{"version":3,"file":"NotificationService.d.ts","sourceRoot":"","sources":["../../src/notification/NotificationService.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,YAAY,EAAC,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAC,YAAY,EAAC,MAAM,uCAAuC,CAAC;AAGnE,OAAO,EAAC,SAAS,EAAC,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAC,iBAAiB,EAAC,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAC,cAAc,EAAC,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAC,UAAU,EAA4B,MAAM,uBAAuB,CAAC;AAI5E,OAAO,EAAC,kBAAkB,EAAC,MAAM,uBAAuB,CAAC;AAEzD,OAAO,EAAC,mBAAmB,EAAC,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAAY,iBAAiB,EAAC,MAAM,cAAc,CAAC;AAC1D,OAAO,EAAC,eAAe,EAAC,MAAM,2BAA2B,CAAC;AAE1D,MAAM,MAAM,mBAAmB,GAAG;IAChC,0CAA0C;IAC1C,KAAK,EAAE,YAAY,CAAC;IACpB,kEAAkE;IAClE,aAAa,CAAC,EAAE,cAAc,CAAC;IAC/B,8FAA8F;IAC9F,eAAe,CAAC,EAAE,eAAe,CAAC;CACnC,CAAC;AAEF;;;;;GAKG;AACH,MAAM,MAAM,kBAAkB,GAC1B;IAAC,MAAM,EAAE,WAAW,CAAA;CAAC,GACrB;IAAC,MAAM,EAAE,SAAS,CAAA;CAAC,GACnB;IAAC,MAAM,EAAE,SAAS,CAAC;IAAC,OAAO,EAAE,mBAAmB,GAAG,IAAI,CAAA;CAAC,CAAC;AAE7D,aAAK,KAAK;IACR,kBAAkB,iDAAiD;CACpE;AAED,MAAM,MAAM,mBAAmB,GAAG,CAChC,YAAY,EAAE,YAAY,EAC1B,MAAM,EAAE,kBAAkB,EAC1B,QAAQ,EAAE;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAC,KACpC,OAAO,CAAC,IAAI,CAAC,CAAC;AAEnB,KAAK,MAAM,GAAG;IACZ,CAAC,KAAK,CAAC,kBAAkB,CAAC,EAAE,iBAAiB,CAAC;CAC/C,CAAC;AAEF,qBAAa,mBAAoB,SAAQ,iBAAiB,CAAC,MAAM,CAAC;IAa9D,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IAZtC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAY;IACtC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAgC;IACxD,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAiC;IAC1D,OAAO,CAAC,QAAQ,CAAC,MAAM,CAGpB;IACH,gBAAuB,KAAK,eAAS;gBAGnC,SAAS,EAAE,SAAS,EACpB,WAAW,EAAE,UAAU,EACN,mBAAmB,EAAE,mBAAmB;YAQ7C,mBAAmB;IAKjC,0DAA0D;IAC7C,4BAA4B,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAM/D,UAAU,IAAI,OAAO,CAAC,OAAO,CAAC;IAKpC,wBAAwB,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;IAI7C,gBAAgB,CAAC,SAAS,EAAE,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;YAsB/C,qBAAqB;IAItB,yBAAyB,CACpC,mBAAmB,EAAE,mBAAmB,EACxC,qBAAqB,EAAE,CAAC,cAAc,EAAE,MAAM,KAAK,IAAI,EACvD,YAAY,EAAE,eAAe,GAC5B,OAAO,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAC,CAAC;IAoC3D;;;;;;;OAOG;IACH,OAAO,CAAC,eAAe;IAYT,kBAAkB,CAC9B,YAAY,EAAE,YAAY,EAC1B,MAAM,EAAE,kBAAkB,EAC1B,MAAM,GAAE,OAAe,GACtB,cAAc,CAAC,mBAAmB,CAAC;IAmCtC;;;;;OAKG;YACW,WAAW;CAc1B"}
|
|
@@ -50,9 +50,9 @@ class NotificationService extends commons_1.TypedEventEmitter {
|
|
|
50
50
|
this.backend = new NotificationBackendRepository_1.NotificationBackendRepository(this.apiClient);
|
|
51
51
|
this.database = new NotificationDatabaseRepository_1.NotificationDatabaseRepository(storeEngine);
|
|
52
52
|
}
|
|
53
|
-
async getAllNotifications(since) {
|
|
53
|
+
async getAllNotifications(since, abortController) {
|
|
54
54
|
const clientId = this.apiClient.clientId;
|
|
55
|
-
return this.backend.getAllNotifications(clientId, since);
|
|
55
|
+
return this.backend.getAllNotifications(clientId, since, abortController);
|
|
56
56
|
}
|
|
57
57
|
/** Should only be called with a completely new client. */
|
|
58
58
|
async initializeNotificationStream(clientId) {
|
|
@@ -89,7 +89,7 @@ class NotificationService extends commons_1.TypedEventEmitter {
|
|
|
89
89
|
}
|
|
90
90
|
async processNotificationStream(notificationHandler, onMissedNotifications, abortHandler) {
|
|
91
91
|
const lastNotificationId = await this.database.getLastNotificationId();
|
|
92
|
-
const { notifications, missedNotification } = await this.getAllNotifications(lastNotificationId);
|
|
92
|
+
const { notifications, missedNotification } = await this.getAllNotifications(lastNotificationId, abortHandler);
|
|
93
93
|
if (missedNotification) {
|
|
94
94
|
onMissedNotifications(missedNotification);
|
|
95
95
|
}
|
|
@@ -99,7 +99,7 @@ class NotificationService extends commons_1.TypedEventEmitter {
|
|
|
99
99
|
: `No notification to process from the stream`;
|
|
100
100
|
this.logger.log(logMessage);
|
|
101
101
|
for (const [index, notification] of notifications.entries()) {
|
|
102
|
-
if (abortHandler.
|
|
102
|
+
if (abortHandler.signal.aborted) {
|
|
103
103
|
/* Stop handling notifications if the websocket has been disconnected.
|
|
104
104
|
* Upon reconnecting we are going to restart handling the notification stream for where we left of
|
|
105
105
|
*/
|
|
@@ -5,11 +5,11 @@ export declare class UserService {
|
|
|
5
5
|
private readonly apiClient;
|
|
6
6
|
constructor(apiClient: APIClient);
|
|
7
7
|
getUser(userId: string | QualifiedId): Promise<User>;
|
|
8
|
-
getUsers(userIds: QualifiedId[]): Promise<{
|
|
8
|
+
getUsers(userIds: QualifiedId[]): Promise<never[] | {
|
|
9
9
|
found: User[];
|
|
10
10
|
failed?: QualifiedId[];
|
|
11
11
|
not_found?: QualifiedId[];
|
|
12
|
-
}
|
|
12
|
+
}>;
|
|
13
13
|
/**
|
|
14
14
|
* Get the list of other user's supported protocols.
|
|
15
15
|
*/
|
package/package.json
CHANGED
|
@@ -11,16 +11,16 @@
|
|
|
11
11
|
"./lib/cryptography/AssetCryptography/crypto.node": "./lib/cryptography/AssetCryptography/crypto.browser.js"
|
|
12
12
|
},
|
|
13
13
|
"dependencies": {
|
|
14
|
-
"@wireapp/api-client": "^27.
|
|
15
|
-
"@wireapp/commons": "^5.2.
|
|
14
|
+
"@wireapp/api-client": "^27.6.0-experimental-abort-controller.1",
|
|
15
|
+
"@wireapp/commons": "^5.2.11",
|
|
16
16
|
"@wireapp/core-crypto": "1.0.2",
|
|
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.
|
|
22
|
-
"axios": "1.7.
|
|
23
|
-
"bazinga64": "^6.3.
|
|
18
|
+
"@wireapp/priority-queue": "^2.1.9",
|
|
19
|
+
"@wireapp/promise-queue": "^2.3.6",
|
|
20
|
+
"@wireapp/protocol-messaging": "1.50.0",
|
|
21
|
+
"@wireapp/store-engine": "5.1.9",
|
|
22
|
+
"axios": "1.7.7",
|
|
23
|
+
"bazinga64": "^6.3.9",
|
|
24
24
|
"deepmerge-ts": "6.0.0",
|
|
25
25
|
"hash.js": "1.1.7",
|
|
26
26
|
"http-status-codes": "2.3.0",
|
|
@@ -31,12 +31,11 @@
|
|
|
31
31
|
"zod": "3.23.8"
|
|
32
32
|
},
|
|
33
33
|
"devDependencies": {
|
|
34
|
-
"@faker-js/faker": "^
|
|
34
|
+
"@faker-js/faker": "^9.0.0",
|
|
35
35
|
"@swc/core": "^1.3.10",
|
|
36
36
|
"@swc/jest": "^0.2.23",
|
|
37
37
|
"@types/jest": "^29.2.0",
|
|
38
38
|
"@types/long": "^5.0.0",
|
|
39
|
-
"@types/rimraf": "4.0.5",
|
|
40
39
|
"@types/tough-cookie": "4.0.5",
|
|
41
40
|
"@types/uuid": "9.0.8",
|
|
42
41
|
"commander": "12.1.0",
|
|
@@ -62,6 +61,6 @@
|
|
|
62
61
|
"test:coverage": "jest --coverage",
|
|
63
62
|
"watch": "tsc --watch"
|
|
64
63
|
},
|
|
65
|
-
"version": "46.
|
|
66
|
-
"gitHead": "
|
|
64
|
+
"version": "46.4.0-experimental-abort-controller.1",
|
|
65
|
+
"gitHead": "8fe98da70ba343fbb2617dcf504a52047c8ecb85"
|
|
67
66
|
}
|