@wireapp/core 32.0.3 → 32.0.5

package/src/main/conversation/message/MessageBuilder.js

@@ -21,105 +21,243 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MessageBuilder = void 0;
-const protocol_messaging_1 = require("@wireapp/protocol-messaging");
+exports.wrapInEphemeral = exports.buildTextMessage = exports.buildHideMessage = exports.buildDeleteMessage = exports.buildCallMessage = exports.buildSessionResetMessage = exports.buildReactionMessage = exports.buildPingMessage = exports.buildLocationMessage = exports.buildImageMessage = exports.buildFileAbortMessage = exports.buildFileMetaDataMessage = exports.buildFileDataMessage = exports.buildEditedTextMessage = exports.buildConfirmationMessage = exports.buildCompositeMessage = exports.buildButtonActionConfirmationMessage = exports.buildButtonActionMessage = exports.createId = void 0;
 const uuidjs_1 = __importDefault(require("uuidjs"));
-const __1 = require("..");
-const CompositeContentBuilder_1 = require("./CompositeContentBuilder");
-const TextContentBuilder_1 = require("./TextContentBuilder");
-function createCommonProperties(options) {
-    return {
-        id: options.messageId || MessageBuilder.createId(),
-        conversation: options.conversationId,
-        from: options.from,
-        source: __1.PayloadBundleSource.LOCAL,
-        state: __1.PayloadBundleState.OUTGOING_UNSENT,
-        timestamp: Date.now(),
-    };
-}
-class MessageBuilder {
-    static createEditedText(payload) {
-        return new TextContentBuilder_1.TextContentBuilder(Object.assign(Object.assign({}, createCommonProperties(payload)), { content: {
-                originalMessageId: payload.originalMessageId,
-                text: payload.newMessageText,
-            }, type: __1.PayloadBundleType.MESSAGE_EDIT }));
-    }
-    static createFileData(payload) {
-        const { asset, expectsReadConfirmation, file, legalHoldStatus, originalMessageId } = payload;
-        return Object.assign(Object.assign({}, createCommonProperties(payload)), { content: {
-                asset,
-                expectsReadConfirmation,
-                file,
-                legalHoldStatus,
-            }, id: originalMessageId, type: __1.PayloadBundleType.ASSET });
-    }
-    static createMessageDelete(payload) {
-        return Object.assign(Object.assign({}, createCommonProperties(payload)), { content: { messageId: payload.messageIdToDelete }, type: __1.PayloadBundleType.MESSAGE_DELETE });
-    }
-    static createMessageHide(payload) {
-        return Object.assign(Object.assign({}, createCommonProperties(payload)), { content: { messageId: payload.messageIdToDelete, conversationId: payload.targetConversation }, type: __1.PayloadBundleType.MESSAGE_HIDE });
-    }
-    static createFileMetadata(payload) {
-        const { expectsReadConfirmation, legalHoldStatus, metaData } = payload;
-        return Object.assign(Object.assign({}, createCommonProperties(payload)), { content: {
-                expectsReadConfirmation,
-                legalHoldStatus,
-                metaData,
-            }, type: __1.PayloadBundleType.ASSET_META });
-    }
-    static createFileAbort(payload) {
-        const { expectsReadConfirmation, legalHoldStatus, reason } = payload;
-        return Object.assign(Object.assign({}, createCommonProperties(payload)), { content: {
-                expectsReadConfirmation,
-                legalHoldStatus,
-                reason,
-            }, id: payload.originalMessageId, type: __1.PayloadBundleType.ASSET_ABORT });
-    }
-    static createImage(payload) {
-        const { expectsReadConfirmation, image, asset, legalHoldStatus } = payload;
-        return Object.assign(Object.assign({}, createCommonProperties(payload)), { content: {
-                expectsReadConfirmation,
-                image,
-                asset,
-                legalHoldStatus,
-            }, type: __1.PayloadBundleType.ASSET_IMAGE });
-    }
-    static createLocation(payload) {
-        return Object.assign(Object.assign({}, createCommonProperties(payload)), { content: payload.location, type: __1.PayloadBundleType.LOCATION });
-    }
-    static createCall(payload) {
-        return Object.assign(Object.assign({}, createCommonProperties(payload)), { content: payload.content, type: __1.PayloadBundleType.CALL });
-    }
-    static createReaction(payload) {
-        return Object.assign(Object.assign({}, createCommonProperties(payload)), { content: payload.reaction, type: __1.PayloadBundleType.REACTION });
-    }
-    static createText(payload) {
-        return new TextContentBuilder_1.TextContentBuilder(Object.assign(Object.assign({}, createCommonProperties(payload)), { content: { text: payload.text }, type: __1.PayloadBundleType.TEXT }));
-    }
-    static createConfirmation(payload) {
-        const { firstMessageId, moreMessageIds, type } = payload;
-        return Object.assign(Object.assign({}, createCommonProperties(payload)), { content: { firstMessageId, moreMessageIds, type }, type: __1.PayloadBundleType.CONFIRMATION });
-    }
-    static createButtonActionMessage(payload) {
-        return Object.assign(Object.assign({}, createCommonProperties(payload)), { content: payload.content, type: __1.PayloadBundleType.BUTTON_ACTION });
-    }
-    static createButtonActionConfirmationMessage(payload) {
-        return Object.assign(Object.assign({}, createCommonProperties(payload)), { content: payload.content, type: __1.PayloadBundleType.BUTTON_ACTION_CONFIRMATION });
-    }
-    static createComposite(payload) {
-        return new CompositeContentBuilder_1.CompositeContentBuilder(Object.assign(Object.assign({}, createCommonProperties(payload)), { content: {}, type: __1.PayloadBundleType.COMPOSITE }));
-    }
-    static createPing(payload) {
-        return Object.assign(Object.assign({}, createCommonProperties(payload)), { content: payload.ping || { hotKnock: false }, type: __1.PayloadBundleType.PING });
-    }
-    static createSessionReset(payload) {
-        return Object.assign(Object.assign({}, createCommonProperties(payload)), { content: {
-                clientAction: protocol_messaging_1.ClientAction.RESET_SESSION,
-            }, type: __1.PayloadBundleType.CLIENT_ACTION });
-    }
-    static createId() {
-        return uuidjs_1.default.genV4().toString();
-    }
-}
-exports.MessageBuilder = MessageBuilder;
+const protocol_messaging_1 = require("@wireapp/protocol-messaging");
+const MessageToProtoMapper_1 = require("../message/MessageToProtoMapper");
+const GenericMessageType_1 = require("../GenericMessageType");
+const AssetTransferState_1 = require("../AssetTransferState");
+function createId() {
+    return uuidjs_1.default.genV4().toString();
+}
+exports.createId = createId;
+function buildButtonActionMessage(payloadBundle) {
+    return protocol_messaging_1.GenericMessage.create({
+        [GenericMessageType_1.GenericMessageType.BUTTON_ACTION]: protocol_messaging_1.ButtonAction.create(payloadBundle),
+        messageId: createId(),
+    });
+}
+exports.buildButtonActionMessage = buildButtonActionMessage;
+function buildButtonActionConfirmationMessage(payloadBundle) {
+    return protocol_messaging_1.GenericMessage.create({
+        [GenericMessageType_1.GenericMessageType.BUTTON_ACTION_CONFIRMATION]: protocol_messaging_1.ButtonActionConfirmation.create(payloadBundle),
+        messageId: createId(),
+    });
+}
+exports.buildButtonActionConfirmationMessage = buildButtonActionConfirmationMessage;
+function buildCompositeMessage(payload) {
+    return protocol_messaging_1.GenericMessage.create({
+        [GenericMessageType_1.GenericMessageType.COMPOSITE]: protocol_messaging_1.Composite.create(payload),
+        messageId: createId(),
+    });
+}
+exports.buildCompositeMessage = buildCompositeMessage;
+function buildConfirmationMessage(payloadBundle) {
+    const content = protocol_messaging_1.Confirmation.create(payloadBundle);
+    return protocol_messaging_1.GenericMessage.create({
+        [GenericMessageType_1.GenericMessageType.CONFIRMATION]: content,
+        messageId: createId(),
+    });
+}
+exports.buildConfirmationMessage = buildConfirmationMessage;
+function buildEditedTextMessage(payloadBundle, messageId = createId()) {
+    const editedMessage = protocol_messaging_1.MessageEdit.create({
+        replacingMessageId: payloadBundle.originalMessageId,
+        text: MessageToProtoMapper_1.MessageToProtoMapper.mapText(payloadBundle),
+    });
+    return protocol_messaging_1.GenericMessage.create({
+        [GenericMessageType_1.GenericMessageType.EDITED]: editedMessage,
+        messageId,
+    });
+}
+exports.buildEditedTextMessage = buildEditedTextMessage;
+function buildFileDataMessage(payloadBundle, messageId = createId()) {
+    const { asset, expectsReadConfirmation, legalHoldStatus } = payloadBundle;
+    const remoteData = protocol_messaging_1.Asset.RemoteData.create({
+        assetId: asset.key,
+        assetToken: asset.token,
+        otrKey: asset.keyBytes,
+        sha256: asset.sha256,
+        assetDomain: asset.domain,
+    });
+    const assetMessage = protocol_messaging_1.Asset.create({
+        expectsReadConfirmation,
+        legalHoldStatus,
+        uploaded: remoteData,
+    });
+    assetMessage.status = AssetTransferState_1.AssetTransferState.UPLOADED;
+    const genericMessage = protocol_messaging_1.GenericMessage.create({
+        [GenericMessageType_1.GenericMessageType.ASSET]: assetMessage,
+        messageId,
+    });
+    return genericMessage;
+}
+exports.buildFileDataMessage = buildFileDataMessage;
+function buildFileMetaDataMessage(payloadBundle) {
+    const { expectsReadConfirmation, legalHoldStatus, metaData } = payloadBundle;
+    const original = protocol_messaging_1.Asset.Original.create({
+        audio: metaData.audio,
+        mimeType: metaData.type,
+        name: metaData.name,
+        size: metaData.length,
+        video: metaData.video,
+        image: metaData.image,
+    });
+    const assetMessage = protocol_messaging_1.Asset.create({
+        expectsReadConfirmation,
+        legalHoldStatus,
+        original,
+    });
+    const genericMessage = protocol_messaging_1.GenericMessage.create({
+        [GenericMessageType_1.GenericMessageType.ASSET]: assetMessage,
+        messageId: createId(),
+    });
+    return genericMessage;
+}
+exports.buildFileMetaDataMessage = buildFileMetaDataMessage;
+function buildFileAbortMessage(payloadBundle, messageId = createId()) {
+    const { expectsReadConfirmation, legalHoldStatus, reason } = payloadBundle;
+    const assetMessage = protocol_messaging_1.Asset.create({
+        expectsReadConfirmation,
+        legalHoldStatus,
+        notUploaded: reason,
+    });
+    assetMessage.status = AssetTransferState_1.AssetTransferState.NOT_UPLOADED;
+    const genericMessage = protocol_messaging_1.GenericMessage.create({
+        [GenericMessageType_1.GenericMessageType.ASSET]: assetMessage,
+        messageId,
+    });
+    return genericMessage;
+}
+exports.buildFileAbortMessage = buildFileAbortMessage;
+function buildImageMessage(payloadBundle, messageId = createId()) {
+    const imageAsset = buildAsset(payloadBundle);
+    const genericMessage = protocol_messaging_1.GenericMessage.create({
+        [GenericMessageType_1.GenericMessageType.ASSET]: imageAsset,
+        messageId,
+    });
+    return genericMessage;
+}
+exports.buildImageMessage = buildImageMessage;
+function buildLocationMessage(payloadBundle) {
+    const { expectsReadConfirmation, latitude, legalHoldStatus, longitude, name, zoom } = payloadBundle;
+    const locationMessage = protocol_messaging_1.Location.create({
+        expectsReadConfirmation,
+        latitude,
+        legalHoldStatus,
+        longitude,
+        name,
+        zoom,
+    });
+    const genericMessage = protocol_messaging_1.GenericMessage.create({
+        [GenericMessageType_1.GenericMessageType.LOCATION]: locationMessage,
+        messageId: createId(),
+    });
+    return genericMessage;
+}
+exports.buildLocationMessage = buildLocationMessage;
+function buildPingMessage(payloadBundle) {
+    const content = protocol_messaging_1.Knock.create(payloadBundle);
+    const genericMessage = protocol_messaging_1.GenericMessage.create({
+        [GenericMessageType_1.GenericMessageType.KNOCK]: content,
+        messageId: createId(),
+    });
+    return genericMessage;
+}
+exports.buildPingMessage = buildPingMessage;
+function buildReactionMessage(payloadBundle) {
+    const { legalHoldStatus, originalMessageId, type } = payloadBundle;
+    const reaction = protocol_messaging_1.Reaction.create({
+        emoji: type,
+        legalHoldStatus,
+        messageId: originalMessageId,
+    });
+    const genericMessage = protocol_messaging_1.GenericMessage.create({
+        [GenericMessageType_1.GenericMessageType.REACTION]: reaction,
+        messageId: createId(),
+    });
+    return genericMessage;
+}
+exports.buildReactionMessage = buildReactionMessage;
+function buildSessionResetMessage() {
+    return protocol_messaging_1.GenericMessage.create({
+        [GenericMessageType_1.GenericMessageType.CLIENT_ACTION]: protocol_messaging_1.ClientAction.RESET_SESSION,
+        messageId: createId(),
+    });
+}
+exports.buildSessionResetMessage = buildSessionResetMessage;
+function buildCallMessage(payloadBundle) {
+    const callMessage = protocol_messaging_1.Calling.create({
+        content: payloadBundle,
+    });
+    return protocol_messaging_1.GenericMessage.create({
+        [GenericMessageType_1.GenericMessageType.CALLING]: callMessage,
+        messageId: createId(),
+    });
+}
+exports.buildCallMessage = buildCallMessage;
+function buildDeleteMessage(payload) {
+    const content = protocol_messaging_1.MessageDelete.create(payload);
+    return protocol_messaging_1.GenericMessage.create({
+        [GenericMessageType_1.GenericMessageType.DELETED]: content,
+        messageId: createId(),
+    });
+}
+exports.buildDeleteMessage = buildDeleteMessage;
+function buildHideMessage(payload) {
+    const content = protocol_messaging_1.MessageHide.create(payload);
+    return protocol_messaging_1.GenericMessage.create({
+        [GenericMessageType_1.GenericMessageType.HIDDEN]: content,
+        messageId: createId(),
+    });
+}
+exports.buildHideMessage = buildHideMessage;
+function buildTextMessage(payloadBundle, messageId = createId()) {
+    const genericMessage = protocol_messaging_1.GenericMessage.create({
+        messageId,
+        [GenericMessageType_1.GenericMessageType.TEXT]: MessageToProtoMapper_1.MessageToProtoMapper.mapText(payloadBundle),
+    });
+    return genericMessage;
+}
+exports.buildTextMessage = buildTextMessage;
+function buildAsset(payloadBundle) {
+    const { asset, expectsReadConfirmation, image, legalHoldStatus } = payloadBundle;
+    const imageMetadata = protocol_messaging_1.Asset.ImageMetaData.create({
+        height: image.height,
+        width: image.width,
+    });
+    const original = protocol_messaging_1.Asset.Original.create({
+        [GenericMessageType_1.GenericMessageType.IMAGE]: imageMetadata,
+        mimeType: image.type,
+        name: null,
+        size: image.data.length,
+    });
+    const remoteData = protocol_messaging_1.Asset.RemoteData.create({
+        assetId: asset.key,
+        assetToken: asset.token,
+        assetDomain: asset.domain,
+        otrKey: asset.keyBytes,
+        sha256: asset.sha256,
+    });
+    const assetMessage = protocol_messaging_1.Asset.create({
+        expectsReadConfirmation,
+        legalHoldStatus,
+        original,
+        uploaded: remoteData,
+    });
+    assetMessage.status = AssetTransferState_1.AssetTransferState.UPLOADED;
+    return assetMessage;
+}
+function wrapInEphemeral(originalGenericMessage, expireAfterMillis) {
+    const ephemeralMessage = protocol_messaging_1.Ephemeral.create({
+        expireAfterMillis,
+        [originalGenericMessage.content]: originalGenericMessage[originalGenericMessage.content],
+    });
+    const genericMessage = protocol_messaging_1.GenericMessage.create({
+        [GenericMessageType_1.GenericMessageType.EPHEMERAL]: ephemeralMessage,
+        messageId: originalGenericMessage.messageId,
+    });
+    return genericMessage;
+}
+exports.wrapInEphemeral = wrapInEphemeral;
 //# sourceMappingURL=MessageBuilder.js.map

package/src/main/conversation/message/MessageService.d.ts

@@ -19,7 +19,7 @@ export declare class MessageService {
      * @return the ClientMismatch status returned by the backend
      */
     sendMessage(sendingClientId: string, recipients: UserClients | UserPreKeyBundleMap, plainText: Uint8Array, options?: {
-        conversationId?: string;
+        conversationId?: QualifiedId;
         reportMissing?: boolean | string[];
         sendAsProtobuf?: boolean;
         nativePush?: boolean;

package/src/main/conversation/message/MessageService.js

@@ -184,12 +184,12 @@ class MessageService {
         }
         return !options.conversationId
             ? this.apiClient.api.broadcast.postBroadcastMessage(sendingClientId, message, ignoreMissing)
-            : this.apiClient.api.conversation.postOTRMessage(sendingClientId, options.conversationId, message, ignoreMissing);
+            : this.apiClient.api.conversation.postOTRMessage(sendingClientId, options.conversationId.id, message, ignoreMissing);
     }
     async generateExternalPayload(plainText) {
         const asset = await (0, AssetCryptography_1.encryptAsset)({ plainText });
         const { cipherText, keyBytes, sha256 } = asset;
-        const messageId = MessageBuilder_1.MessageBuilder.createId();
+        const messageId = (0, MessageBuilder_1.createId)();
         const externalMessage = {
             otrKey: new Uint8Array(keyBytes),
             sha256: new Uint8Array(sha256),
@@ -286,7 +286,7 @@ class MessageService {
         }
         return !options.conversationId
             ? this.apiClient.api.broadcast.postBroadcastProtobufMessage(sendingClientId, protoMessage, ignoreMissing)
-            : this.apiClient.api.conversation.postOTRProtobufMessage(sendingClientId, options.conversationId, protoMessage, ignoreMissing);
+            : this.apiClient.api.conversation.postOTRProtobufMessage(sendingClientId, options.conversationId.id, protoMessage, ignoreMissing);
     }
 }
 exports.MessageService = MessageService;

package/src/main/conversation/message/MessageToProtoMapper.d.ts

@@ -3,5 +3,5 @@ import { LinkPreviewUploadedContent } from '../content';
 import { EditedTextMessage, TextMessage } from './OtrMessage';
 export declare class MessageToProtoMapper {
     static mapLinkPreviews(linkPreviews: LinkPreviewUploadedContent[]): LinkPreview[];
-    static mapText(payloadBundle: TextMessage | EditedTextMessage): Text;
+    static mapText(payloadBundle: TextMessage['content'] | EditedTextMessage['content']): Text;
 }

package/src/main/conversation/message/MessageToProtoMapper.js

@@ -74,7 +74,7 @@ class MessageToProtoMapper {
         return builtLinkPreviews;
     }
     static mapText(payloadBundle) {
-        const { expectsReadConfirmation, legalHoldStatus, linkPreviews, mentions, quote, text } = payloadBundle.content;
+        const { expectsReadConfirmation, legalHoldStatus, linkPreviews, mentions, quote, text } = payloadBundle;
         const textMessage = protocol_messaging_1.Text.create({
             content: text,
             expectsReadConfirmation,

package/src/main/conversation/message/TextContentBuilder.d.ts

@@ -1,13 +1,12 @@
-import { LegalHoldStatus, LinkPreviewUploadedContent, MentionContent, QuoteContent } from '../content';
-import { EditedTextMessage, TextMessage, QuotableMessage } from './OtrMessage';
-export declare class TextContentBuilder {
+import { EditedTextContent, LegalHoldStatus, LinkPreviewUploadedContent, MentionContent, QuoteContent, TextContent } from '../content';
+import { QuotableMessage } from './OtrMessage';
+export declare class TextContentBuilder<T extends TextContent | EditedTextContent> {
     private readonly content;
-    private readonly payloadBundle;
-    constructor(payloadBundle: TextMessage | EditedTextMessage);
-    build(): TextMessage | EditedTextMessage;
-    withLinkPreviews(linkPreviews?: LinkPreviewUploadedContent[]): TextContentBuilder;
-    withMentions(mentions?: MentionContent[]): TextContentBuilder;
-    withQuote(quote?: QuotableMessage | QuoteContent): TextContentBuilder;
-    withReadConfirmation(expectsReadConfirmation?: boolean): TextContentBuilder;
-    withLegalHoldStatus(legalHoldStatus?: LegalHoldStatus): TextContentBuilder;
+    constructor(textContent: T);
+    build(): T;
+    withLinkPreviews(linkPreviews?: LinkPreviewUploadedContent[]): this;
+    withMentions(mentions?: MentionContent[]): this;
+    withQuote(quote?: QuotableMessage | QuoteContent): this;
+    withReadConfirmation(expectsReadConfirmation?: boolean): this;
+    withLegalHoldStatus(legalHoldStatus?: LegalHoldStatus): this;
 }

package/src/main/conversation/message/TextContentBuilder.js

@@ -22,13 +22,11 @@ exports.TextContentBuilder = void 0;
 const cryptography_1 = require("../../cryptography");
 const content_1 = require("../content");
 class TextContentBuilder {
-    constructor(payloadBundle) {
-        this.payloadBundle = payloadBundle;
-        this.content = this.payloadBundle.content;
+    constructor(textContent) {
+        this.content = textContent;
     }
     build() {
-        this.payloadBundle.content = this.content;
-        return this.payloadBundle;
+        return this.content;
     }
     withLinkPreviews(linkPreviews) {
         if (linkPreviews === null || linkPreviews === void 0 ? void 0 : linkPreviews.length) {

package/src/main/conversation/message/messageSender.d.ts

@@ -1,4 +1,5 @@
 import { Task } from '@wireapp/promise-queue';
 export declare function sendMessage<T>(sendingFunction: Task<T>): Promise<T>;
+export declare function getQueueLength(): number;
 export declare function resumeMessageSending(): void;
 export declare function pauseMessageSending(): void;

package/src/main/conversation/message/messageSender.js

@@ -18,13 +18,17 @@
  *
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.pauseMessageSending = exports.resumeMessageSending = exports.sendMessage = void 0;
+exports.pauseMessageSending = exports.resumeMessageSending = exports.getQueueLength = exports.sendMessage = void 0;
 const promise_queue_1 = require("@wireapp/promise-queue");
 const sendingQueue = new promise_queue_1.PromiseQueue({ name: 'message-sender', paused: true });
 function sendMessage(sendingFunction) {
     return sendingQueue.push(sendingFunction);
 }
 exports.sendMessage = sendMessage;
+function getQueueLength() {
+    return sendingQueue.getLength();
+}
+exports.getQueueLength = getQueueLength;
 function resumeMessageSending() {
     sendingQueue.pause(false);
 }

package/src/main/index.d.ts

@@ -1,17 +1,7 @@
-import { Account } from './Account';
-import * as auth from './auth/';
-import * as conversation from './conversation/';
-import { CoreError } from './CoreError';
-import * as cryptography from './cryptography/';
-import * as util from './util';
-import { MessageBuilder } from './conversation/message/MessageBuilder';
-declare const _default: {
-    Account: typeof Account;
-    MessageBuilder: typeof MessageBuilder;
-    CoreError: typeof CoreError;
-    auth: typeof auth;
-    conversation: typeof conversation;
-    cryptography: typeof cryptography;
-    util: typeof util;
-};
-export = _default;
+export { Account, ConnectionState, ProcessedEventPayload } from './Account';
+export * as auth from './auth/';
+export * as conversation from './conversation/';
+export { CoreError } from './CoreError';
+export * as cryptography from './cryptography/';
+export * as util from './util';
+export * as MessageBuilder from './conversation/message/MessageBuilder';

package/src/main/index.js

@@ -40,20 +40,16 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
-const Account_1 = require("./Account");
-const auth = __importStar(require("./auth/"));
-const conversation = __importStar(require("./conversation/"));
-const CoreError_1 = require("./CoreError");
-const cryptography = __importStar(require("./cryptography/"));
-const util = __importStar(require("./util"));
-const MessageBuilder_1 = require("./conversation/message/MessageBuilder");
-module.exports = {
-    Account: Account_1.Account,
-    MessageBuilder: MessageBuilder_1.MessageBuilder,
-    CoreError: CoreError_1.CoreError,
-    auth,
-    conversation,
-    cryptography,
-    util,
-};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MessageBuilder = exports.util = exports.cryptography = exports.CoreError = exports.conversation = exports.auth = exports.ConnectionState = exports.Account = void 0;
+var Account_1 = require("./Account");
+Object.defineProperty(exports, "Account", { enumerable: true, get: function () { return Account_1.Account; } });
+Object.defineProperty(exports, "ConnectionState", { enumerable: true, get: function () { return Account_1.ConnectionState; } });
+exports.auth = __importStar(require("./auth/"));
+exports.conversation = __importStar(require("./conversation/"));
+var CoreError_1 = require("./CoreError");
+Object.defineProperty(exports, "CoreError", { enumerable: true, get: function () { return CoreError_1.CoreError; } });
+exports.cryptography = __importStar(require("./cryptography/"));
+exports.util = __importStar(require("./util"));
+exports.MessageBuilder = __importStar(require("./conversation/message/MessageBuilder"));
 //# sourceMappingURL=index.js.map

package/src/main/user/UserMapper.js

@@ -31,7 +31,7 @@ class UserMapper {
                     content: { connection, user },
                     conversation: connection.conversation,
                     from: connection.from,
-                    id: MessageBuilder_1.MessageBuilder.createId(),
+                    id: (0, MessageBuilder_1.createId)(),
                     messageTimer: 0,
                     source,
                     state: conversation_1.PayloadBundleState.INCOMING,
@@ -45,7 +45,7 @@ class UserMapper {
                     content: { client },
                     conversation: selfUserId,
                     from: selfUserId,
-                    id: MessageBuilder_1.MessageBuilder.createId(),
+                    id: (0, MessageBuilder_1.createId)(),
                     messageTimer: 0,
                     source,
                     state: conversation_1.PayloadBundleState.INCOMING,
@@ -59,7 +59,7 @@ class UserMapper {
                     content: { user },
                     conversation: selfUserId,
                     from: selfUserId,
-                    id: MessageBuilder_1.MessageBuilder.createId(),
+                    id: (0, MessageBuilder_1.createId)(),
                     source,
                     state: conversation_1.PayloadBundleState.INCOMING,
                     timestamp: new Date().getTime(),
@@ -72,7 +72,7 @@ class UserMapper {
                     content: { client },
                     conversation: selfUserId,
                     from: selfUserId,
-                    id: MessageBuilder_1.MessageBuilder.createId(),
+                    id: (0, MessageBuilder_1.createId)(),
                     messageTimer: 0,
                     source,
                     state: conversation_1.PayloadBundleState.INCOMING,

package/src/main/user/UserService.js

@@ -62,7 +62,9 @@ class UserService {
                 userId: connection.to,
                 conversationId: connection.conversation,
             };
-            return this.conversationService.getPreKeyBundleMap(mappedConnection.conversationId, [mappedConnection.userId]);
+            return this.conversationService.getPreKeyBundleMap({ id: mappedConnection.conversationId, domain: '' }, [
+                mappedConnection.userId,
+            ]);
         });
         const preKeyBundlesFromConnections = await Promise.all(preKeyBundlePromises);
         // Merge pre-key bundles

package/src/main/account/AccountService.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"AccountService.js","sourceRoot":"","sources":["AccountService.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;GAiBG;;;AAGH,8CAAyC;AAGzC,MAAa,cAAc;IACzB,YAA6B,SAAoB;QAApB,cAAS,GAAT,SAAS,CAAW;IAAG,CAAC;IAErD,aAAa;QACX,MAAM,iBAAiB,GAAG,iBAAO,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAC9D,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,aAAa,CAAC,iBAAiB,CAAC,CAAC;IACrE,CAAC;CACF;AAPD,wCAOC"}

package/src/main/account/AccountService.ts

@@ -1,31 +0,0 @@
-/*
- * Wire
- * Copyright (C) 2020 Wire Swiss GmbH
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see http://www.gnu.org/licenses/.
- *
- */
-
-import {APIClient} from '@wireapp/api-client';
-import {Runtime} from '@wireapp/commons';
-import {CallConfigData} from '@wireapp/api-client/src/account/CallConfigData';
-
-export class AccountService {
-  constructor(private readonly apiClient: APIClient) {}
-
-  getCallConfig(): Promise<CallConfigData> {
-    const iceCandidateLimit = Runtime.isFirefox() ? 3 : undefined;
-    return this.apiClient.api.account.getCallConfig(iceCandidateLimit);
-  }
-}

package/src/main/account/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;GAiBG;;;;;;;;;;;;;;;;AAEH,mDAAiC"}

package/src/main/account/index.ts

@@ -1,20 +0,0 @@
-/*
- * Wire
- * Copyright (C) 2020 Wire Swiss GmbH
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see http://www.gnu.org/licenses/.
- *
- */
-
-export * from './AccountService';