@wireapp/core 38.11.0 → 38.11.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/lib/Account.d.ts.map +1 -1
- package/lib/Account.js +2 -5
- package/lib/conversation/ConversationService/ConversationService.d.ts +2 -17
- package/lib/conversation/ConversationService/ConversationService.d.ts.map +1 -1
- package/lib/conversation/ConversationService/ConversationService.js +3 -41
- package/lib/conversation/ConversationService/ConversationService.test.js +3 -46
- package/package.json +2 -2
package/lib/Account.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Account.d.ts","sourceRoot":"","sources":["../src/Account.ts"],"names":[],"mappings":"AAmBA,OAAO,EACL,YAAY,EAGZ,OAAO,EACP,MAAM,EAEN,SAAS,EACV,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAuB,UAAU,EAAE,gBAAgB,EAAC,MAAM,iCAAiC,CAAC;AACnG,OAAO,KAAK,MAAM,MAAM,+BAA+B,CAAC;AAOxD,OAAO,EAAC,SAAS,EAAE,eAAe,EAAC,MAAM,qBAAqB,CAAC;AAC/D,OAAO,EAAC,UAAU,EAAe,MAAM,uBAAuB,CAAC;AAE/D,OAAO,EAAC,cAAc,EAAC,MAAM,YAAY,CAAC;AAE1C,OAAO,EAAC,gBAAgB,EAAC,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAC,UAAU,EAAE,aAAa,EAAC,MAAM,WAAW,CAAC;AACpD,OAAO,EAAC,iBAAiB,EAAC,MAAM,eAAe,CAAC;AAChD,OAAO,EAAC,YAAY,EAAE,mBAAmB,EAAC,MAAM,iBAAiB,CAAC;AAElE,OAAO,EAAC,YAAY,EAAC,MAAM,UAAU,CAAC;AACtC,OAAO,EAAC,kBAAkB,EAAC,MAAM,eAAe,CAAC;AACjD,OAAO,EAAC,UAAU,EAAC,MAAM,0BAA0B,CAAC;AACpD,OAAO,EAAC,YAAY,EAAE,oBAAoB,EAAC,MAAM,gCAAgC,CAAC;AAClF,OAAO,EAAC,SAAS,EAAE,cAAc,EAAC,MAAM,8BAA8B,CAAC;AAEvE,OAAO,EAAC,mBAAmB,EAAE,mBAAmB,EAAE,kBAAkB,EAAC,MAAM,iBAAiB,CAAC;AAC7F,OAAO,EAAC,WAAW,EAAC,MAAM,SAAS,CAAC;AAEpC,OAAO,EAAC,WAAW,EAAC,MAAM,SAAS,CAAC;AACpC,OAAO,EAAC,WAAW,EAAC,MAAM,SAAS,CAAC;AAEpC,OAAO,EAAC,iBAAiB,EAAC,MAAM,0BAA0B,CAAC;AAE3D,MAAM,MAAM,qBAAqB,GAAG,mBAAmB,CAAC;AAExD,oBAAY,MAAM;IAChB;;;OAGG;IACH,WAAW,gBAAgB;CAC5B;AAED,oBAAY,eAAe;IACzB,8EAA8E;IAC9E,MAAM,WAAW;IACjB,oCAAoC;IACpC,UAAU,eAAe;IACzB,mFAAmF;IACnF,wBAAwB,6BAA6B;IACrD,oGAAoG;IACpG,IAAI,SAAS;CACd;AAED,MAAM,MAAM,aAAa,GAAG,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,KAAK,SAAS,GAAG,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,CAAC;AAEjH,UAAU,cAAc,CAAC,CAAC;IACxB,8FAA8F;IAC9F,WAAW,CAAC,EAAE,aAAa,CAAC;IAE5B;;;;;;;;OAQG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;OAEG;IACH,oBAAoB,CAAC,EAAE,oBAAoB,CAAC,CAAC,CAAC,CAAC;CAChD;AAED,KAAK,WAAW,GAAG;IACjB,2FAA2F;IAC3F,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAQF,KAAK,MAAM,GAAG;IACZ,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE,SAAS,CAAC;CACjC,CAAC;AAEF,qBAAa,OAAO,CAAC,CAAC,GAAG,GAAG,CAAE,SAAQ,iBAAiB,CAAC,MAAM,CAAC;IAC7D,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAY;IACtC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAiB;IACxC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAgB;IAC5C,OAAO,CAAC,WAAW,CAAC,CAAa;IACjC,OAAO,CAAC,EAAE,CAAC,CAAe;IAC1B,OAAO,CAAC,SAAS,CAAC,CAAsB;IACxC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;IACnC,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAC,CAA0B;IAEzD,OAAO,CAAC,EAAE;QACf,GAAG,CAAC,EAAE,UAAU,CAAC;QACjB,OAAO,EAAE,cAAc,CAAC;QACxB,OAAO,EAAE,cAAc,CAAC;QACxB,KAAK,EAAE,YAAY,CAAC;QACpB,SAAS,EAAE,gBAAgB,CAAC;QAC5B,MAAM,EAAE,aAAa,CAAC;QACtB,UAAU,EAAE,iBAAiB,CAAC;QAC9B,YAAY,EAAE,mBAAmB,CAAC;QAClC,KAAK,EAAE,YAAY,CAAC;QACpB,WAAW,EAAE,kBAAkB,CAAC;QAChC,YAAY,EAAE,mBAAmB,CAAC;QAClC,IAAI,EAAE,WAAW,CAAC;QAClB,IAAI,EAAE,WAAW,CAAC;QAClB,IAAI,EAAE,WAAW,CAAC;KACnB,CAAC;IACK,eAAe,EAAE,eAAe,CAAC;IAExC;;;OAGG;gBAED,SAAS,GAAE,SAA2B,EACtC,EAAC,WAA6B,EAAE,SAAa,EAAE,oBAAoB,EAAC,GAAE,cAAc,CAAC,CAAC,CAAM;IAyB9F;;;;;;;;;;OAUG;IACU,aAAa,CAAC,iBAAiB,EAAE,MAAM,EAAE,EAAE,aAAa,CAAC,EAAE,OAAO;IAM/E,OAAO,CAAC,aAAa;IAKrB,IAAI,QAAQ,IAAI,MAAM,CAErB;IAED,IAAI,MAAM,IAAI,MAAM,CAEnB;IAED;;;;;OAKG;IACU,QAAQ,CAAC,YAAY,EAAE,YAAY,EAAE,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC;IAM3F;;;;OAIG;IACU,IAAI,CAAC,UAAU,EAAE,UAAU,EAAE,EAAC,MAAM,EAAC,GAAE,WAAgB,GAAG,OAAO,CAAC,OAAO,CAAC;IAMvF;;;;;OAKG;IACU,KAAK,CAAC,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC;IAU1D;;OAEG;IACU,cAAc,CACzB,SAAS,EAAE,SAAS,EACpB,UAAU,GAAE,UAA8B,EAC1C,WAAW,CAAC,EAAE,UAAU,GACvB,OAAO,CAAC,gBAAgB,CAAC;IAsB5B;;;;OAIG;IACU,UAAU,CAAC,MAAM,CAAC,EAAE,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC;YAiC3E,iBAAiB;YAkBjB,iBAAiB;IAyB/B;;;;;;OAMG;IACH,qBAAqB,CAAC,YAAY,EAAE,YAAY;IAInC,YAAY,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"Account.d.ts","sourceRoot":"","sources":["../src/Account.ts"],"names":[],"mappings":"AAmBA,OAAO,EACL,YAAY,EAGZ,OAAO,EACP,MAAM,EAEN,SAAS,EACV,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAuB,UAAU,EAAE,gBAAgB,EAAC,MAAM,iCAAiC,CAAC;AACnG,OAAO,KAAK,MAAM,MAAM,+BAA+B,CAAC;AAOxD,OAAO,EAAC,SAAS,EAAE,eAAe,EAAC,MAAM,qBAAqB,CAAC;AAC/D,OAAO,EAAC,UAAU,EAAe,MAAM,uBAAuB,CAAC;AAE/D,OAAO,EAAC,cAAc,EAAC,MAAM,YAAY,CAAC;AAE1C,OAAO,EAAC,gBAAgB,EAAC,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAC,UAAU,EAAE,aAAa,EAAC,MAAM,WAAW,CAAC;AACpD,OAAO,EAAC,iBAAiB,EAAC,MAAM,eAAe,CAAC;AAChD,OAAO,EAAC,YAAY,EAAE,mBAAmB,EAAC,MAAM,iBAAiB,CAAC;AAElE,OAAO,EAAC,YAAY,EAAC,MAAM,UAAU,CAAC;AACtC,OAAO,EAAC,kBAAkB,EAAC,MAAM,eAAe,CAAC;AACjD,OAAO,EAAC,UAAU,EAAC,MAAM,0BAA0B,CAAC;AACpD,OAAO,EAAC,YAAY,EAAE,oBAAoB,EAAC,MAAM,gCAAgC,CAAC;AAClF,OAAO,EAAC,SAAS,EAAE,cAAc,EAAC,MAAM,8BAA8B,CAAC;AAEvE,OAAO,EAAC,mBAAmB,EAAE,mBAAmB,EAAE,kBAAkB,EAAC,MAAM,iBAAiB,CAAC;AAC7F,OAAO,EAAC,WAAW,EAAC,MAAM,SAAS,CAAC;AAEpC,OAAO,EAAC,WAAW,EAAC,MAAM,SAAS,CAAC;AACpC,OAAO,EAAC,WAAW,EAAC,MAAM,SAAS,CAAC;AAEpC,OAAO,EAAC,iBAAiB,EAAC,MAAM,0BAA0B,CAAC;AAE3D,MAAM,MAAM,qBAAqB,GAAG,mBAAmB,CAAC;AAExD,oBAAY,MAAM;IAChB;;;OAGG;IACH,WAAW,gBAAgB;CAC5B;AAED,oBAAY,eAAe;IACzB,8EAA8E;IAC9E,MAAM,WAAW;IACjB,oCAAoC;IACpC,UAAU,eAAe;IACzB,mFAAmF;IACnF,wBAAwB,6BAA6B;IACrD,oGAAoG;IACpG,IAAI,SAAS;CACd;AAED,MAAM,MAAM,aAAa,GAAG,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,KAAK,SAAS,GAAG,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,CAAC;AAEjH,UAAU,cAAc,CAAC,CAAC;IACxB,8FAA8F;IAC9F,WAAW,CAAC,EAAE,aAAa,CAAC;IAE5B;;;;;;;;OAQG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;OAEG;IACH,oBAAoB,CAAC,EAAE,oBAAoB,CAAC,CAAC,CAAC,CAAC;CAChD;AAED,KAAK,WAAW,GAAG;IACjB,2FAA2F;IAC3F,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAQF,KAAK,MAAM,GAAG;IACZ,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE,SAAS,CAAC;CACjC,CAAC;AAEF,qBAAa,OAAO,CAAC,CAAC,GAAG,GAAG,CAAE,SAAQ,iBAAiB,CAAC,MAAM,CAAC;IAC7D,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAY;IACtC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAiB;IACxC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAgB;IAC5C,OAAO,CAAC,WAAW,CAAC,CAAa;IACjC,OAAO,CAAC,EAAE,CAAC,CAAe;IAC1B,OAAO,CAAC,SAAS,CAAC,CAAsB;IACxC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;IACnC,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAC,CAA0B;IAEzD,OAAO,CAAC,EAAE;QACf,GAAG,CAAC,EAAE,UAAU,CAAC;QACjB,OAAO,EAAE,cAAc,CAAC;QACxB,OAAO,EAAE,cAAc,CAAC;QACxB,KAAK,EAAE,YAAY,CAAC;QACpB,SAAS,EAAE,gBAAgB,CAAC;QAC5B,MAAM,EAAE,aAAa,CAAC;QACtB,UAAU,EAAE,iBAAiB,CAAC;QAC9B,YAAY,EAAE,mBAAmB,CAAC;QAClC,KAAK,EAAE,YAAY,CAAC;QACpB,WAAW,EAAE,kBAAkB,CAAC;QAChC,YAAY,EAAE,mBAAmB,CAAC;QAClC,IAAI,EAAE,WAAW,CAAC;QAClB,IAAI,EAAE,WAAW,CAAC;QAClB,IAAI,EAAE,WAAW,CAAC;KACnB,CAAC;IACK,eAAe,EAAE,eAAe,CAAC;IAExC;;;OAGG;gBAED,SAAS,GAAE,SAA2B,EACtC,EAAC,WAA6B,EAAE,SAAa,EAAE,oBAAoB,EAAC,GAAE,cAAc,CAAC,CAAC,CAAM;IAyB9F;;;;;;;;;;OAUG;IACU,aAAa,CAAC,iBAAiB,EAAE,MAAM,EAAE,EAAE,aAAa,CAAC,EAAE,OAAO;IAM/E,OAAO,CAAC,aAAa;IAKrB,IAAI,QAAQ,IAAI,MAAM,CAErB;IAED,IAAI,MAAM,IAAI,MAAM,CAEnB;IAED;;;;;OAKG;IACU,QAAQ,CAAC,YAAY,EAAE,YAAY,EAAE,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC;IAM3F;;;;OAIG;IACU,IAAI,CAAC,UAAU,EAAE,UAAU,EAAE,EAAC,MAAM,EAAC,GAAE,WAAgB,GAAG,OAAO,CAAC,OAAO,CAAC;IAMvF;;;;;OAKG;IACU,KAAK,CAAC,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC;IAU1D;;OAEG;IACU,cAAc,CACzB,SAAS,EAAE,SAAS,EACpB,UAAU,GAAE,UAA8B,EAC1C,WAAW,CAAC,EAAE,UAAU,GACvB,OAAO,CAAC,gBAAgB,CAAC;IAsB5B;;;;OAIG;IACU,UAAU,CAAC,MAAM,CAAC,EAAE,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC;YAiC3E,iBAAiB;YAkBjB,iBAAiB;IAyB/B;;;;;;OAMG;IACH,qBAAqB,CAAC,YAAY,EAAE,YAAY;IAInC,YAAY,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAwD1D,OAAO,CAAC,YAAY;IAKpB;;;OAGG;IACU,MAAM,CAAC,SAAS,GAAE,OAAe,GAAG,OAAO,CAAC,IAAI,CAAC;YAShD,IAAI;IAQlB;;;;;;OAMG;IACI,MAAM,CAAC,EACZ,OAAkB,EAClB,wBAAmC,EACnC,4BAAuC,EACvC,qBAAgC,EAChC,MAAc,GACf,GAAE;QACD;;;;WAIG;QACH,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,mBAAmB,EAAE,MAAM,EAAE,kBAAkB,KAAK,IAAI,CAAC;QAE7E;;WAEG;QACH,4BAA4B,CAAC,EAAE,CAAC,EAAC,IAAI,EAAE,KAAK,EAAC,EAAE;YAAC,IAAI,EAAE,MAAM,CAAC;YAAC,KAAK,EAAE,MAAM,CAAA;SAAC,KAAK,IAAI,CAAC;QAEtF;;WAEG;QACH,wBAAwB,CAAC,EAAE,CAAC,KAAK,EAAE,eAAe,KAAK,IAAI,CAAC;QAE5D;;;;;;WAMG;QACH,qBAAqB,CAAC,EAAE,CAAC,cAAc,EAAE,MAAM,KAAK,IAAI,CAAC;QAEzD;;WAEG;QACH,MAAM,CAAC,EAAE,OAAO,CAAC;KACb,GAAG,MAAM,IAAI;IA2FnB,OAAO,CAAC,cAAc;IAKtB,OAAO,CAAC,kBAAkB;YAIZ,UAAU;CAqBzB"}
|
package/lib/Account.js
CHANGED
|
@@ -290,10 +290,7 @@ class Account extends TypedEventEmitter_1.TypedEventEmitter {
|
|
|
290
290
|
const giphyService = new giphy_1.GiphyService(this.apiClient);
|
|
291
291
|
const linkPreviewService = new linkPreview_1.LinkPreviewService(assetService);
|
|
292
292
|
const notificationService = new notification_1.NotificationService(this.apiClient, proteusService, this.storeEngine, mlsService);
|
|
293
|
-
const conversationService = new conversation_1.ConversationService(this.apiClient,
|
|
294
|
-
// We can use qualified ids to send messages as long as the backend supports federated endpoints
|
|
295
|
-
useQualifiedIds: this.backendFeatures.federationEndpoints,
|
|
296
|
-
}, proteusService, mlsService);
|
|
293
|
+
const conversationService = new conversation_1.ConversationService(this.apiClient, proteusService, mlsService);
|
|
297
294
|
const selfService = new self_1.SelfService(this.apiClient);
|
|
298
295
|
const teamService = new team_1.TeamService(this.apiClient);
|
|
299
296
|
const broadcastService = new broadcast_1.BroadcastService(this.apiClient, proteusService);
|
|
@@ -361,7 +358,7 @@ class Account extends TypedEventEmitter_1.TypedEventEmitter {
|
|
|
361
358
|
break;
|
|
362
359
|
}
|
|
363
360
|
}
|
|
364
|
-
onEvent(payload, source);
|
|
361
|
+
await onEvent(payload, source);
|
|
365
362
|
};
|
|
366
363
|
const handleNotification = async (notification, source) => {
|
|
367
364
|
var _a, e_1, _b, _c;
|
|
@@ -11,34 +11,19 @@ import { AddUsersToProteusConversationParams, SendProteusMessageParams } from '.
|
|
|
11
11
|
import { RemoteData } from '../content';
|
|
12
12
|
export declare class ConversationService {
|
|
13
13
|
private readonly apiClient;
|
|
14
|
-
private readonly config;
|
|
15
14
|
private readonly proteusService;
|
|
16
15
|
private readonly _mlsService?;
|
|
17
16
|
readonly messageTimer: MessageTimer;
|
|
18
|
-
private readonly messageService;
|
|
19
17
|
private readonly logger;
|
|
20
|
-
constructor(apiClient: APIClient,
|
|
21
|
-
useQualifiedIds?: boolean;
|
|
22
|
-
}, proteusService: ProteusService, _mlsService?: MLSService | undefined);
|
|
18
|
+
constructor(apiClient: APIClient, proteusService: ProteusService, _mlsService?: MLSService | undefined);
|
|
23
19
|
get mlsService(): MLSService;
|
|
24
|
-
/**
|
|
25
|
-
* Get a fresh list from backend of clients for all the participants of the conversation.
|
|
26
|
-
* This is a hacky way of getting all the clients for a conversation.
|
|
27
|
-
* The idea is to send an empty message to the backend to absolutely no users and let backend reply with a mismatch error.
|
|
28
|
-
* We then get the missing members in the mismatch, that is our fresh list of participants' clients.
|
|
29
|
-
*
|
|
30
|
-
* @deprecated
|
|
31
|
-
* @param {string} conversationId
|
|
32
|
-
* @param {string} conversationDomain? - If given will send the message to the new qualified endpoint
|
|
33
|
-
*/
|
|
34
|
-
getAllParticipantsClients(conversationId: QualifiedId): Promise<UserClients | QualifiedUserClients>;
|
|
35
20
|
/**
|
|
36
21
|
* Get a fresh list from backend of clients for all the participants of the conversation.
|
|
37
22
|
* @fixme there are some case where this method is not enough to detect removed devices
|
|
38
23
|
* @param {string} conversationId
|
|
39
24
|
* @param {string} conversationDomain? - If given will send the message to the new qualified endpoint
|
|
40
25
|
*/
|
|
41
|
-
fetchAllParticipantsClients(conversationId:
|
|
26
|
+
fetchAllParticipantsClients(conversationId: QualifiedId | string): Promise<UserClients | QualifiedUserClients>;
|
|
42
27
|
/**
|
|
43
28
|
* Create a group conversation.
|
|
44
29
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ConversationService.d.ts","sourceRoot":"","sources":["../../../src/conversation/ConversationService/ConversationService.ts"],"names":[],"mappings":"AAmBA,OAAO,
|
|
1
|
+
{"version":3,"file":"ConversationService.d.ts","sourceRoot":"","sources":["../../../src/conversation/ConversationService/ConversationService.ts"],"names":[],"mappings":"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"}
|
|
@@ -35,16 +35,13 @@ const proteus_1 = require("../../messagingProtocols/proteus");
|
|
|
35
35
|
const util_1 = require("../../util");
|
|
36
36
|
const fullyQualifiedClientIdUtils_1 = require("../../util/fullyQualifiedClientIdUtils");
|
|
37
37
|
const messageSender_1 = require("../message/messageSender");
|
|
38
|
-
const MessageService_1 = require("../message/MessageService");
|
|
39
38
|
class ConversationService {
|
|
40
|
-
constructor(apiClient,
|
|
39
|
+
constructor(apiClient, proteusService, _mlsService) {
|
|
41
40
|
this.apiClient = apiClient;
|
|
42
|
-
this.config = config;
|
|
43
41
|
this.proteusService = proteusService;
|
|
44
42
|
this._mlsService = _mlsService;
|
|
45
43
|
this.logger = (0, logdown_1.default)('@wireapp/core/ConversationService');
|
|
46
44
|
this.messageTimer = new conversation_2.MessageTimer();
|
|
47
|
-
this.messageService = new MessageService_1.MessageService(this.apiClient, this.proteusService);
|
|
48
45
|
}
|
|
49
46
|
get mlsService() {
|
|
50
47
|
if (!this._mlsService) {
|
|
@@ -52,51 +49,16 @@ class ConversationService {
|
|
|
52
49
|
}
|
|
53
50
|
return this._mlsService;
|
|
54
51
|
}
|
|
55
|
-
/**
|
|
56
|
-
* Get a fresh list from backend of clients for all the participants of the conversation.
|
|
57
|
-
* This is a hacky way of getting all the clients for a conversation.
|
|
58
|
-
* The idea is to send an empty message to the backend to absolutely no users and let backend reply with a mismatch error.
|
|
59
|
-
* We then get the missing members in the mismatch, that is our fresh list of participants' clients.
|
|
60
|
-
*
|
|
61
|
-
* @deprecated
|
|
62
|
-
* @param {string} conversationId
|
|
63
|
-
* @param {string} conversationDomain? - If given will send the message to the new qualified endpoint
|
|
64
|
-
*/
|
|
65
|
-
getAllParticipantsClients(conversationId) {
|
|
66
|
-
const sendingClientId = this.apiClient.validatedClientId;
|
|
67
|
-
const recipients = {};
|
|
68
|
-
const text = new Uint8Array();
|
|
69
|
-
return new Promise(async (resolve) => {
|
|
70
|
-
const onClientMismatch = (mismatch) => {
|
|
71
|
-
resolve(mismatch.missing);
|
|
72
|
-
// When the mismatch happens, we ask the messageService to cancel the sending
|
|
73
|
-
return false;
|
|
74
|
-
};
|
|
75
|
-
if (conversationId.domain && this.config.useQualifiedIds) {
|
|
76
|
-
await this.messageService.sendFederatedMessage(sendingClientId, recipients, text, {
|
|
77
|
-
conversationId,
|
|
78
|
-
onClientMismatch,
|
|
79
|
-
reportMissing: true,
|
|
80
|
-
});
|
|
81
|
-
}
|
|
82
|
-
else {
|
|
83
|
-
await this.messageService.sendMessage(sendingClientId, recipients, text, {
|
|
84
|
-
conversationId,
|
|
85
|
-
onClientMismatch,
|
|
86
|
-
});
|
|
87
|
-
}
|
|
88
|
-
});
|
|
89
|
-
}
|
|
90
52
|
/**
|
|
91
53
|
* Get a fresh list from backend of clients for all the participants of the conversation.
|
|
92
54
|
* @fixme there are some case where this method is not enough to detect removed devices
|
|
93
55
|
* @param {string} conversationId
|
|
94
56
|
* @param {string} conversationDomain? - If given will send the message to the new qualified endpoint
|
|
95
57
|
*/
|
|
96
|
-
async fetchAllParticipantsClients(conversationId
|
|
58
|
+
async fetchAllParticipantsClients(conversationId) {
|
|
97
59
|
const qualifiedMembers = await (0, proteus_1.getConversationQualifiedMembers)({
|
|
98
60
|
apiClient: this.apiClient,
|
|
99
|
-
conversationId
|
|
61
|
+
conversationId,
|
|
100
62
|
});
|
|
101
63
|
const allClients = await this.apiClient.api.user.postListClients({ qualified_users: qualifiedMembers });
|
|
102
64
|
const qualifiedUserClients = {};
|
|
@@ -66,7 +66,7 @@ describe('ConversationService', () => {
|
|
|
66
66
|
jest.useFakeTimers();
|
|
67
67
|
jest.setSystemTime(new Date(0));
|
|
68
68
|
});
|
|
69
|
-
function buildConversationService(
|
|
69
|
+
function buildConversationService() {
|
|
70
70
|
const client = new api_client_1.APIClient({ urls: api_client_1.APIClient.BACKEND.STAGING });
|
|
71
71
|
jest.spyOn(client.api.conversation, 'postMlsMessage').mockReturnValue(Promise.resolve({
|
|
72
72
|
events: [],
|
|
@@ -88,9 +88,7 @@ describe('ConversationService', () => {
|
|
|
88
88
|
userId: PayloadHelper.getUUID(),
|
|
89
89
|
clientId: PayloadHelper.getUUID(),
|
|
90
90
|
};
|
|
91
|
-
const conversationService = new __1.ConversationService(client,
|
|
92
|
-
useQualifiedIds: federated,
|
|
93
|
-
}, mockedProteusService, mockedMLSService);
|
|
91
|
+
const conversationService = new __1.ConversationService(client, mockedProteusService, mockedMLSService);
|
|
94
92
|
jest.spyOn(conversationService, 'joinByExternalCommit');
|
|
95
93
|
return [conversationService, { apiClient: client, mlsService: mockedMLSService }];
|
|
96
94
|
}
|
|
@@ -190,7 +188,7 @@ describe('ConversationService', () => {
|
|
|
190
188
|
});
|
|
191
189
|
describe('fetchAllParticipantsClients', () => {
|
|
192
190
|
it('gives the members and clients of a federated conversation', async () => {
|
|
193
|
-
const [conversationService, { apiClient }] = buildConversationService(
|
|
191
|
+
const [conversationService, { apiClient }] = buildConversationService();
|
|
194
192
|
jest.spyOn(apiClient.api.conversation, 'getConversation').mockResolvedValue({
|
|
195
193
|
members: {
|
|
196
194
|
others: [
|
|
@@ -214,47 +212,6 @@ describe('ConversationService', () => {
|
|
|
214
212
|
expect(fetchedMembers).toEqual(members);
|
|
215
213
|
});
|
|
216
214
|
});
|
|
217
|
-
describe('getAllParticipantsClients', () => {
|
|
218
|
-
it('gives the members and clients of a federated conversation', async () => {
|
|
219
|
-
const members = {
|
|
220
|
-
user1: ['client1', 'client2'],
|
|
221
|
-
user2: ['client1', 'client2'],
|
|
222
|
-
user3: ['client1', 'client2'],
|
|
223
|
-
};
|
|
224
|
-
const [conversationService] = buildConversationService(true);
|
|
225
|
-
jest
|
|
226
|
-
.spyOn(conversationService['messageService'], 'sendMessage')
|
|
227
|
-
.mockImplementation((_client, _recipients, _text, options) => {
|
|
228
|
-
var _a;
|
|
229
|
-
void ((_a = options === null || options === void 0 ? void 0 : options.onClientMismatch) === null || _a === void 0 ? void 0 : _a.call(options, { missing: members, deleted: {}, redundant: {}, time: '' }));
|
|
230
|
-
return {};
|
|
231
|
-
});
|
|
232
|
-
const fetchedMembers = await conversationService.getAllParticipantsClients({ id: 'convid', domain: '' });
|
|
233
|
-
expect(fetchedMembers).toEqual(members);
|
|
234
|
-
});
|
|
235
|
-
it('gives the members and clients of a federated conversation 2', async () => {
|
|
236
|
-
const members = {
|
|
237
|
-
domain1: { user1: ['client1', 'client2'] },
|
|
238
|
-
domain2: { user2: ['client1', 'client2'], user3: ['client1', 'client2'] },
|
|
239
|
-
};
|
|
240
|
-
const [conversationService] = buildConversationService(true);
|
|
241
|
-
jest
|
|
242
|
-
.spyOn(conversationService['messageService'], 'sendFederatedMessage')
|
|
243
|
-
.mockImplementation((_client, _recipients, _text, options) => {
|
|
244
|
-
var _a;
|
|
245
|
-
void ((_a = options === null || options === void 0 ? void 0 : options.onClientMismatch) === null || _a === void 0 ? void 0 : _a.call(options, {
|
|
246
|
-
missing: members,
|
|
247
|
-
deleted: {},
|
|
248
|
-
redundant: {},
|
|
249
|
-
failed_to_send: {},
|
|
250
|
-
time: '',
|
|
251
|
-
}));
|
|
252
|
-
return {};
|
|
253
|
-
});
|
|
254
|
-
const fetchedMembers = await conversationService.getAllParticipantsClients({ id: 'convid', domain: 'domain1' });
|
|
255
|
-
expect(fetchedMembers).toEqual(members);
|
|
256
|
-
});
|
|
257
|
-
});
|
|
258
215
|
});
|
|
259
216
|
function generateImage() {
|
|
260
217
|
const image = {
|
package/package.json
CHANGED