@wireapp/core 38.0.1 → 38.2.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.
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { PostMlsMessageResponse } from '@wireapp/api-client/lib/conversation';
|
|
2
|
+
import { Subconversation } from '@wireapp/api-client/lib/conversation/Subconversation';
|
|
2
3
|
import { QualifiedId } from '@wireapp/api-client/lib/user';
|
|
3
4
|
import logdown from 'logdown';
|
|
4
5
|
import { APIClient } from '@wireapp/api-client';
|
|
@@ -25,6 +26,17 @@ export declare class MLSService {
|
|
|
25
26
|
getEpoch(groupId: string | Uint8Array): Promise<number>;
|
|
26
27
|
newProposal(proposalType: ProposalType, args: ProposalArgs | AddProposalArgs | RemoveProposalArgs): Promise<import("@wireapp/core-crypto").ProposalBundle>;
|
|
27
28
|
joinByExternalCommit(getGroupInfo: () => Promise<Uint8Array>): Promise<PostMlsMessageResponse | null>;
|
|
29
|
+
/**
|
|
30
|
+
* Will join or register an mls subconversation for conference calls.
|
|
31
|
+
* Will return the secret key derived from the subconversation
|
|
32
|
+
*
|
|
33
|
+
* @param conversationId Id of the parent conversation in which the call should happen
|
|
34
|
+
*/
|
|
35
|
+
joinConferenceSubconversation(conversationId: QualifiedId): Promise<{
|
|
36
|
+
subconversation: Subconversation;
|
|
37
|
+
secretKey: string;
|
|
38
|
+
keyLength: number;
|
|
39
|
+
}>;
|
|
28
40
|
newExternalProposal(externalProposalType: ExternalProposalType, args: ExternalProposalArgs | ExternalRemoveProposalArgs): Promise<Uint8Array>;
|
|
29
41
|
processWelcomeMessage(welcomeMessage: Uint8Array): Promise<ConversationId>;
|
|
30
42
|
decryptMessage(conversationId: ConversationId, payload: Uint8Array): Promise<DecryptedMessage>;
|
|
@@ -123,5 +135,15 @@ export declare class MLSService {
|
|
|
123
135
|
*
|
|
124
136
|
*/
|
|
125
137
|
checkExistingPendingProposals(): Promise<void>;
|
|
138
|
+
/**
|
|
139
|
+
* Get all conversation members client ids.
|
|
140
|
+
*
|
|
141
|
+
* @param groupId groupId of the conversation
|
|
142
|
+
*/
|
|
143
|
+
getClientIds(groupId: string): Promise<{
|
|
144
|
+
userId: string;
|
|
145
|
+
clientId: string;
|
|
146
|
+
domain: string;
|
|
147
|
+
}[]>;
|
|
126
148
|
}
|
|
127
149
|
//# sourceMappingURL=MLSService.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MLSService.d.ts","sourceRoot":"","sources":["../../../../src/messagingProtocols/mls/MLSService/MLSService.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,sBAAsB,
|
|
1
|
+
{"version":3,"file":"MLSService.d.ts","sourceRoot":"","sources":["../../../../src/messagingProtocols/mls/MLSService/MLSService.ts"],"names":[],"mappings":"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"}
|
|
@@ -33,6 +33,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
33
33
|
};
|
|
34
34
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
35
35
|
exports.MLSService = exports.optionalToUint8Array = void 0;
|
|
36
|
+
const conversation_1 = require("@wireapp/api-client/lib/conversation");
|
|
36
37
|
const axios_1 = __importDefault(require("axios"));
|
|
37
38
|
const bazinga64_1 = require("bazinga64");
|
|
38
39
|
const logdown_1 = __importDefault(require("logdown"));
|
|
@@ -170,6 +171,29 @@ class MLSService {
|
|
|
170
171
|
regenerateCommitBundle: async () => (await generateCommit()).commitBundle,
|
|
171
172
|
});
|
|
172
173
|
}
|
|
174
|
+
/**
|
|
175
|
+
* Will join or register an mls subconversation for conference calls.
|
|
176
|
+
* Will return the secret key derived from the subconversation
|
|
177
|
+
*
|
|
178
|
+
* @param conversationId Id of the parent conversation in which the call should happen
|
|
179
|
+
*/
|
|
180
|
+
async joinConferenceSubconversation(conversationId) {
|
|
181
|
+
const subconversation = await this.apiClient.api.conversation.getSubconversation(conversationId, conversation_1.SUBCONVERSATION_ID.CONFERENCE);
|
|
182
|
+
if (subconversation.epoch === 0) {
|
|
183
|
+
await this.registerConversation(subconversation.group_id, []);
|
|
184
|
+
}
|
|
185
|
+
else {
|
|
186
|
+
await this.joinByExternalCommit(() => this.apiClient.api.conversation.getSubconversationGroupInfo(conversationId, conversation_1.SUBCONVERSATION_ID.CONFERENCE));
|
|
187
|
+
}
|
|
188
|
+
const keyLength = 256;
|
|
189
|
+
const groupIdBytes = bazinga64_1.Decoder.fromBase64(subconversation.group_id).asBytes;
|
|
190
|
+
const secretKey = await this.coreCryptoClient.exportSecretKey(groupIdBytes, keyLength);
|
|
191
|
+
return {
|
|
192
|
+
subconversation,
|
|
193
|
+
secretKey: new TextDecoder().decode(secretKey),
|
|
194
|
+
keyLength,
|
|
195
|
+
};
|
|
196
|
+
}
|
|
173
197
|
async newExternalProposal(externalProposalType, args) {
|
|
174
198
|
return this.coreCryptoClient.newExternalProposal(externalProposalType, args);
|
|
175
199
|
}
|
|
@@ -430,5 +454,20 @@ class MLSService {
|
|
|
430
454
|
this.logger.error('Could not get pending proposals', error);
|
|
431
455
|
}
|
|
432
456
|
}
|
|
457
|
+
/**
|
|
458
|
+
* Get all conversation members client ids.
|
|
459
|
+
*
|
|
460
|
+
* @param groupId groupId of the conversation
|
|
461
|
+
*/
|
|
462
|
+
async getClientIds(groupId) {
|
|
463
|
+
const groupIdBytes = bazinga64_1.Decoder.fromBase64(groupId).asBytes;
|
|
464
|
+
const decoder = new TextDecoder();
|
|
465
|
+
const rawClientIds = await this.coreCryptoClient.getClientIds(groupIdBytes);
|
|
466
|
+
const clientIds = rawClientIds.map(id => {
|
|
467
|
+
const { user, client, domain } = (0, fullyQualifiedClientIdUtils_1.parseFullQualifiedClientId)(decoder.decode(id));
|
|
468
|
+
return { userId: user, clientId: client, domain };
|
|
469
|
+
});
|
|
470
|
+
return clientIds;
|
|
471
|
+
}
|
|
433
472
|
}
|
|
434
473
|
exports.MLSService = MLSService;
|
package/package.json
CHANGED
|
@@ -11,7 +11,7 @@
|
|
|
11
11
|
"./lib/cryptography/AssetCryptography/crypto.node": "./lib/cryptography/AssetCryptography/crypto.browser.js"
|
|
12
12
|
},
|
|
13
13
|
"dependencies": {
|
|
14
|
-
"@wireapp/api-client": "^22.
|
|
14
|
+
"@wireapp/api-client": "^22.13.0",
|
|
15
15
|
"@wireapp/commons": "^5.0.4",
|
|
16
16
|
"@wireapp/core-crypto": "0.6.0-rc.3",
|
|
17
17
|
"@wireapp/promise-queue": "^2.1.1",
|
|
@@ -59,6 +59,6 @@
|
|
|
59
59
|
"test:coverage": "jest --coverage",
|
|
60
60
|
"watch": "tsc --watch"
|
|
61
61
|
},
|
|
62
|
-
"version": "38.0
|
|
63
|
-
"gitHead": "
|
|
62
|
+
"version": "38.2.0",
|
|
63
|
+
"gitHead": "f66aefbd515bc6387107b9f31da2d5699d36a206"
|
|
64
64
|
}
|