@wireapp/core 43.14.1 → 43.14.3

package/lib/messagingProtocols/mls/E2EIdentityService/E2EIServiceInternal.d.ts

@@ -1,5 +1,6 @@
 import { AcmeService } from './Connection/AcmeServer';
 import { InitParams, RotateBundle } from './E2EIService.types';
+import { InitialData } from './Storage/E2EIStorage.schema';
 export declare class E2EIServiceInternal {
     private readonly coreCryptoClient;
     private readonly apiClient;
@@ -11,9 +12,11 @@ export declare class E2EIServiceInternal {
     private static instance;
     private readonly logger;
     private _acmeService?;
+    private _initialData?;
     private constructor();
     static getInstance(params?: InitParams): Promise<E2EIServiceInternal>;
     get acmeService(): AcmeService;
+    get initialData(): InitialData;
     startCertificateProcess(hasActiveCertificate: boolean): Promise<{
         challenge: {
             url: string;
@@ -23,6 +26,13 @@ export declare class E2EIServiceInternal {
         keyAuth: string;
     }>;
     continueCertificateProcess(oAuthIdToken: string): Promise<RotateBundle | undefined>;
+    /**
+     * This function starts a ACME refresh flow for an existing client with a valid refresh token
+     *
+     * @param oAuthIdToken
+     * @returns
+     */
+    renewCertificate(oAuthIdToken: string, hasActiveCertificate: boolean): Promise<RotateBundle>;
     private initIdentity;
     private init;
     private getDirectory;
@@ -56,12 +66,5 @@ export declare class E2EIServiceInternal {
      * @returns RotateBundle | undefined
      */
     private continueOAuthFlow;
-    /**
-     * This function starts a ACME refresh flow for an existing client with a valid refresh token
-     *
-     * @param oAuthIdToken
-     * @returns
-     */
-    startRefreshCertficateFlow(oAuthIdToken: string, hasActiveCertificate: boolean): Promise<RotateBundle>;
 }
 //# sourceMappingURL=E2EIServiceInternal.d.ts.map

package/lib/messagingProtocols/mls/E2EIdentityService/E2EIServiceInternal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"E2EIServiceInternal.d.ts","sourceRoot":"","sources":["../../../../src/messagingProtocols/mls/E2EIdentityService/E2EIServiceInternal.ts"],"names":[],"mappings":"AAwBA,OAAO,EAAC,WAAW,EAAC,MAAM,yBAAyB,CAAC;AACpD,OAAO,EAAyD,UAAU,EAAE,YAAY,EAAC,MAAM,qBAAqB,CAAC;AAcrH,qBAAa,mBAAmB;IAM5B,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IACpC,wDAAwD;IACxD,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,gCAAgC;IAXnD,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAsB;IAC7C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAuD;IAC9E,OAAO,CAAC,YAAY,CAAC,CAAc;IAEnC,OAAO;WAYa,WAAW,CAAC,MAAM,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC,mBAAmB,CAAC;IAkClF,IAAI,WAAW,IAAI,WAAW,CAK7B;IAEY,uBAAuB,CAAC,oBAAoB,EAAE,OAAO;;;;;;;;IAOrD,0BAA0B,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,GAAG,SAAS,CAAC;YAUlF,YAAY;YAuBZ,IAAI;YASJ,YAAY;YAUZ,eAAe;IAQ7B;;;;;OAKG;YACW,uBAAuB;IA6CrC;;;;;;;OAOG;YACW,sCAAsC;IAiEpD;;;OAGG;YACW,iBAAiB;IAoB/B;;;;;;OAMG;YACW,iBAAiB;IAU/B;;;;;OAKG;IACU,0BAA0B,CAAC,YAAY,EAAE,MAAM,EAAE,oBAAoB,EAAE,OAAO;CAQ5F"}
+{"version":3,"file":"E2EIServiceInternal.d.ts","sourceRoot":"","sources":["../../../../src/messagingProtocols/mls/E2EIdentityService/E2EIServiceInternal.ts"],"names":[],"mappings":"AAwBA,OAAO,EAAC,WAAW,EAAC,MAAM,yBAAyB,CAAC;AACpD,OAAO,EAAyD,UAAU,EAAE,YAAY,EAAC,MAAM,qBAAqB,CAAC;AAUrH,OAAO,EAAW,WAAW,EAAC,MAAM,8BAA8B,CAAC;AAInE,qBAAa,mBAAmB;IAO5B,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IACpC,wDAAwD;IACxD,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,gCAAgC;IAZnD,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAsB;IAC7C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAuD;IAC9E,OAAO,CAAC,YAAY,CAAC,CAAc;IACnC,OAAO,CAAC,YAAY,CAAC,CAAc;IAEnC,OAAO;WAYa,WAAW,CAAC,MAAM,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC,mBAAmB,CAAC;IAiClF,IAAI,WAAW,IAAI,WAAW,CAK7B;IAED,IAAI,WAAW,IAAI,WAAW,CAK7B;IAEY,uBAAuB,CAAC,oBAAoB,EAAE,OAAO;;;;;;;;IAOrD,0BAA0B,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,GAAG,SAAS,CAAC;IAQhG;;;;;OAKG;IACU,gBAAgB,CAAC,YAAY,EAAE,MAAM,EAAE,oBAAoB,EAAE,OAAO;YASnE,YAAY;YAuBZ,IAAI;YASJ,YAAY;YAUZ,eAAe;IAQ7B;;;;;OAKG;YACW,uBAAuB;IAyCrC;;;;;;;OAOG;YACW,sCAAsC;IAiEpD;;;OAGG;YACW,iBAAiB;IAyB/B;;;;;;OAMG;YACW,iBAAiB;CAShC"}

package/lib/messagingProtocols/mls/E2EIdentityService/E2EIServiceInternal.js

@@ -59,7 +59,6 @@ class E2EIServiceInternal {
                 if (!discoveryUrl || !user || !clientId) {
                     throw new Error('discoveryUrl, user and clientId are required to initialize E2EIServiceInternal');
                 }
-                E2EIStorage_1.E2EIStorage.store.initialData({ discoveryUrl, user, clientId });
                 await E2EIServiceInternal.instance.init({ clientId, discoveryUrl, user });
             }
         }
@@ -71,6 +70,12 @@ class E2EIServiceInternal {
         }
         return this._acmeService;
     }
+    get initialData() {
+        if (!this._initialData) {
+            throw new Error('Error while trying to get InitialData. E2EIServiceInternal has not been initialized');
+        }
+        return this._initialData;
+    }
     async startCertificateProcess(hasActiveCertificate) {
         // Step 0: Check if we have a handle in local storage
         // If we don't have a handle, we need to start a new OAuth flow
@@ -84,9 +89,20 @@ class E2EIServiceInternal {
         }
         throw new Error('Error while trying to continue OAuth flow. No enrollment in progress found');
     }
+    /**
+     * This function starts a ACME refresh flow for an existing client with a valid refresh token
+     *
+     * @param oAuthIdToken
+     * @returns
+     */
+    async renewCertificate(oAuthIdToken, hasActiveCertificate) {
+        const identity = await this.initIdentity(hasActiveCertificate);
+        const authData = await this.getEnrollmentChallenges(identity);
+        return this.getRotateBundleAndStoreCertificateData(identity, oAuthIdToken, authData.authChallenges);
+    }
     // ############ Internal Functions ############
     async initIdentity(hasActiveCertificate) {
-        const { user } = E2EIStorage_1.E2EIStorage.get.initialData();
+        const { user } = this.initialData;
         // How long the issued certificate should be maximal valid
         const ciphersuite = E2EIService_types_1.Ciphersuite.MLS_128_DHKEMX25519_AES128GCM_SHA256_Ed25519;
         return hasActiveCertificate
@@ -96,9 +112,9 @@ class E2EIServiceInternal {
     async init(params) {
         const { user, clientId, discoveryUrl } = params;
         if (!user || !clientId) {
-            this.logger.error('user and clientId are required to initialize E2eIdentityService');
-            throw new Error();
+            throw new Error('user and clientId are required to initialize E2eIdentityService');
         }
+        this._initialData = { user, clientId, discoveryUrl };
         this._acmeService = new AcmeServer_1.AcmeService(discoveryUrl);
     }
     async getDirectory(identity, connection) {
@@ -155,10 +171,7 @@ class E2EIServiceInternal {
             authzUrls: orderData.authzUrls,
             nonce: orderData.nonce,
         });
-        // Store the values in local storage for later use (e.g. in the continue flow)
-        E2EIStorage_1.E2EIStorage.store.authData(authChallenges);
-        E2EIStorage_1.E2EIStorage.store.orderData({ orderUrl: orderData.orderUrl });
-        return authChallenges;
+        return { authChallenges, orderUrl: orderData.orderUrl };
     }
     /**
      * Continuation of the ACME enrollment flow
@@ -181,7 +194,7 @@ class E2EIServiceInternal {
         if (!oidcData.data.validated) {
             throw new Error('Error while trying to continue OAuth flow. OIDC challenge not validated');
         }
-        const { user: wireUser, clientId } = E2EIStorage_1.E2EIStorage.get.initialData();
+        const { user: wireUser, clientId } = this.initialData;
         //Step 8: Do DPOP Challenge
         const dpopData = await (0, DpopChallenge_1.doWireDpopChallenge)({
             authData,
@@ -231,14 +244,17 @@ class E2EIServiceInternal {
         if (this.e2eiServiceExternal.isEnrollmentInProgress()) {
             throw new Error('Error while trying to start OAuth flow. There is already a flow in progress');
         }
-        const { authorization: { oidcChallenge: wireOidcChallenge, keyauth }, } = await this.getEnrollmentChallenges(identity);
+        const { authChallenges, orderUrl } = await this.getEnrollmentChallenges(identity);
+        const { authorization: { oidcChallenge: wireOidcChallenge, keyauth }, } = authChallenges;
         if (!wireOidcChallenge || !keyauth) {
             throw new Error('missing wireOidcChallenge or keyauth');
         }
         // stash the identity for later use
         const handle = await this.coreCryptoClient.e2eiEnrollmentStash(identity);
-        // stash the handle in local storage
+        // Store the values in local storage for later use (e.g. in the continue flow)
         E2EIStorage_1.E2EIStorage.store.handle(bazinga64_1.Encoder.toBase64(handle).asString);
+        E2EIStorage_1.E2EIStorage.store.authData(authChallenges);
+        E2EIStorage_1.E2EIStorage.store.orderData({ orderUrl });
         // we need to pass back the aquired wireOidcChallenge to the UI
         return { challenge: wireOidcChallenge, keyAuth: keyauth };
     }
@@ -256,17 +272,5 @@ class E2EIServiceInternal {
         this.logger.log('retrieved identity from stash');
         return this.getRotateBundleAndStoreCertificateData(identity, oAuthIdToken, authData);
     }
-    /**
-     * This function starts a ACME refresh flow for an existing client with a valid refresh token
-     *
-     * @param oAuthIdToken
-     * @returns
-     */
-    async startRefreshCertficateFlow(oAuthIdToken, hasActiveCertificate) {
-        // We need to initialize the identity
-        const identity = await this.initIdentity(hasActiveCertificate);
-        const authData = await this.getEnrollmentChallenges(identity);
-        return this.getRotateBundleAndStoreCertificateData(identity, oAuthIdToken, authData);
-    }
 }
 exports.E2EIServiceInternal = E2EIServiceInternal;

package/lib/messagingProtocols/mls/E2EIdentityService/Storage/E2EIStorage.d.ts

@@ -1,23 +1,19 @@
-import { AuthData, InitialData, OrderData } from './E2EIStorage.schema';
+import { AuthData, OrderData } from './E2EIStorage.schema';
 export declare const E2EIStorage: {
     store: {
         handle: (handle: string) => void;
         authData: (data: AuthData) => void;
         orderData: (data: OrderData) => void;
-        initialData: (data: InitialData) => void;
     };
     get: {
-        initialData: () => InitialData;
         handle: () => string;
         authData: () => AuthData;
         orderData: () => OrderData;
     };
     has: {
         handle: () => boolean;
-        initialData: () => boolean;
     };
     remove: {
-        initialData: () => void;
         temporaryData: () => void;
         all: () => void;
     };

package/lib/messagingProtocols/mls/E2EIdentityService/Storage/E2EIStorage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"E2EIStorage.d.ts","sourceRoot":"","sources":["../../../../../src/messagingProtocols/mls/E2EIdentityService/Storage/E2EIStorage.ts"],"names":[],"mappings":"AAqBA,OAAO,EAAC,QAAQ,EAAkB,WAAW,EAAqB,SAAS,EAAC,MAAM,sBAAsB,CAAC;AAuEzG,eAAO,MAAM,WAAW;;yBA5DK,MAAM;yBAEN,QAAQ;0BADP,SAAS;4BAEP,WAAW;;;2BAwBhB,WAAW;;wBATL,QAAQ;yBAkBP,SAAS;;;;;;;;;;;CA8C1C,CAAC"}
+{"version":3,"file":"E2EIStorage.d.ts","sourceRoot":"","sources":["../../../../../src/messagingProtocols/mls/E2EIdentityService/Storage/E2EIStorage.ts"],"names":[],"mappings":"AAqBA,OAAO,EAAC,QAAQ,EAAkB,SAAS,EAAC,MAAM,sBAAsB,CAAC;AAqDzE,eAAO,MAAM,WAAW;;yBA3CK,MAAM;yBAEN,QAAQ;0BADP,SAAS;;;;wBAcN,QAAQ;yBASP,SAAS;;;;;;;;;CAqC1C,CAAC"}

package/lib/messagingProtocols/mls/E2EIdentityService/Storage/E2EIStorage.js

@@ -25,14 +25,11 @@ const LocalStorageStore_1 = require("../../../../util/LocalStorageStore");
 const HandleKey = 'Handle';
 const AuthDataKey = 'AuthData';
 const OderDataKey = 'OrderData';
-const InitialDataKey = 'InitialData';
 const storage = (0, LocalStorageStore_1.LocalStorageStore)('E2EIStorage');
 const storeHandle = (handle) => storage.add(HandleKey, bazinga64_1.Encoder.toBase64(handle).asString);
 const storeOrderData = (data) => storage.add(OderDataKey, bazinga64_1.Encoder.toBase64(JSON.stringify(data)).asString);
 const storeAuthData = (data) => storage.add(AuthDataKey, bazinga64_1.Encoder.toBase64(JSON.stringify(data)).asString);
-const storeInitialData = (data) => storage.add(InitialDataKey, bazinga64_1.Encoder.toBase64(JSON.stringify(data)).asString);
 const hasHandle = () => storage.has(HandleKey);
-const hasInitialData = () => storage.has(InitialDataKey);
 const getAndVerifyHandle = () => {
     const handle = storage.get(HandleKey);
     if (!handle) {
@@ -48,14 +45,6 @@ const getAndVerifyAuthData = () => {
     const decodedData = bazinga64_1.Decoder.fromBase64(data).asString;
     return E2EIStorage_schema_1.AuthDataSchema.parse(JSON.parse(decodedData));
 };
-const getInitialData = () => {
-    const data = storage.get(InitialDataKey);
-    if (!data) {
-        throw new Error('ACME: InitialData not found');
-    }
-    const decodedData = bazinga64_1.Decoder.fromBase64(data).asString;
-    return E2EIStorage_schema_1.InitialDataSchema.parse(JSON.parse(decodedData));
-};
 const getAndVerifyOrderData = () => {
     const data = storage.get(OderDataKey);
     if (!data) {
@@ -64,9 +53,6 @@ const getAndVerifyOrderData = () => {
     const decodedData = bazinga64_1.Decoder.fromBase64(data).asString;
     return JSON.parse(decodedData);
 };
-const removeInitialData = () => {
-    storage.remove(InitialDataKey);
-};
 const removeTemporaryData = () => {
     storage.remove(HandleKey);
     storage.remove(AuthDataKey);
@@ -74,27 +60,22 @@ const removeTemporaryData = () => {
 };
 const removeAll = () => {
     removeTemporaryData();
-    removeInitialData();
 };
 exports.E2EIStorage = {
     store: {
         handle: storeHandle,
         authData: storeAuthData,
         orderData: storeOrderData,
-        initialData: storeInitialData,
     },
     get: {
-        initialData: getInitialData,
         handle: getAndVerifyHandle,
         authData: getAndVerifyAuthData,
         orderData: getAndVerifyOrderData,
     },
     has: {
         handle: hasHandle,
-        initialData: hasInitialData,
     },
     remove: {
-        initialData: removeInitialData,
         temporaryData: removeTemporaryData,
         all: removeAll,
     },

package/lib/messagingProtocols/mls/MLSService/MLSService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MLSService.d.ts","sourceRoot":"","sources":["../../../../src/messagingProtocols/mls/MLSService/MLSService.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"MLSService.d.ts","sourceRoot":"","sources":["../../../../src/messagingProtocols/mls/MLSService/MLSService.ts"],"names":[],"mappings":"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"}

package/lib/messagingProtocols/mls/MLSService/MLSService.js

@@ -34,6 +34,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MLSService = exports.optionalToUint8Array = void 0;
 const http_1 = require("@wireapp/api-client/lib/http");
+const ExponentialBackoff_1 = require("@wireapp/commons/lib/util/ExponentialBackoff");
+const TimeUtil_1 = require("@wireapp/commons/lib/util/TimeUtil");
 const bazinga64_1 = require("bazinga64");
 const logdown_1 = __importDefault(require("logdown"));
 const commons_1 = require("@wireapp/commons");
@@ -70,6 +72,11 @@ class MLSService extends commons_1.TypedEventEmitter {
         this.textDecoder = new TextDecoder();
         this.uploadCommitBundle = async (groupId, commitBundle, { regenerateCommitBundle, isExternalCommit } = {}) => {
             const groupIdStr = bazinga64_1.Encoder.toBase64(groupId).asString;
+            const backoffKey = `upload-commit-bundle-409-${groupIdStr}`;
+            const { backOff, resetBackOff } = (0, ExponentialBackoff_1.exponentialBackoff)(backoffKey, {
+                maxDelay: TimeUtil_1.TimeInMillis.SECOND * 32,
+                minDelay: TimeUtil_1.TimeInMillis.SECOND / 2,
+            });
             // We need to lock the incoming mls messages queue while we are uploading the commit bundle
             // it's possible that we will be sent some mls messages before we receive the response from backend and accept a commit locally.
             return (0, messageAdd_1.withLockedMLSMessagesQueue)(groupIdStr, async () => {
@@ -85,6 +92,8 @@ class MLSService extends commons_1.TypedEventEmitter {
                     }
                     const newEpoch = await this.getEpoch(groupId);
                     this.emit('newEpoch', { epoch: newEpoch, groupId: groupIdStr });
+                    // We need to reset the backoff after a successful request
+                    resetBackOff();
                     return response;
                 }
                 catch (error) {
@@ -100,8 +109,13 @@ class MLSService extends commons_1.TypedEventEmitter {
                         // could be that we are trying to upload a commit to a conversation that has a different epoch on backend
                         // in this case we will most likely receive a commit from backend that will increase our local epoch
                         this.logger.warn(`Uploading commitBundle failed. Will retry generating a new bundle`);
-                        const updatedCommitBundle = await regenerateCommitBundle();
-                        return this.uploadCommitBundle(groupId, updatedCommitBundle, { isExternalCommit });
+                        return backOff(async () => {
+                            const updatedCommitBundle = await regenerateCommitBundle();
+                            return this.uploadCommitBundle(groupId, updatedCommitBundle, { regenerateCommitBundle, isExternalCommit });
+                        }, () => {
+                            this.logger.error('Uploading commit bundle retry limit reached', error);
+                            throw error;
+                        });
                     }
                     throw error;
                 }
@@ -662,7 +676,7 @@ class MLSService extends commons_1.TypedEventEmitter {
             ? // If we are not refreshing the active certificate, we need to continue the certificate process with Oauth
                 await instance.continueCertificateProcess(oAuthIdToken)
             : // If we are refreshing the active certificate, can start the refresh process
-                await instance.startRefreshCertficateFlow(oAuthIdToken, hasActiveCertificate);
+                await instance.renewCertificate(oAuthIdToken, hasActiveCertificate);
         if (rotateBundle === undefined) {
             throw new Error('Could not get the rotate bundle');
         }

package/lib/testUtils/index.d.ts

@@ -4,5 +4,4 @@ export declare function generateQualifiedId(domain: string): {
     domain: string;
 };
 export declare function generateQualifiedIds(nbUsers: number, domain: string): QualifiedId[];
-export declare const advanceJestTimersWithPromise: (time: number) => Promise<unknown>;
 //# sourceMappingURL=index.d.ts.map

package/lib/testUtils/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/testUtils/index.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,WAAW,EAAC,MAAM,8BAA8B,CAAC;AAIzD,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM;;;EAEjD;AAED,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,iBAMnE;AAKD,eAAO,MAAM,4BAA4B,SAAgB,MAAM,qBAG9D,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/testUtils/index.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,WAAW,EAAC,MAAM,8BAA8B,CAAC;AAIzD,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM;;;EAEjD;AAED,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,iBAMnE"}

package/lib/testUtils/index.js

@@ -18,7 +18,7 @@
  *
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.advanceJestTimersWithPromise = exports.generateQualifiedIds = exports.generateQualifiedId = void 0;
+exports.generateQualifiedIds = exports.generateQualifiedId = void 0;
 const crypto_1 = require("crypto");
 function generateQualifiedId(domain) {
     return { id: (0, crypto_1.randomUUID)(), domain };
@@ -32,11 +32,3 @@ function generateQualifiedIds(nbUsers, domain) {
     return users;
 }
 exports.generateQualifiedIds = generateQualifiedIds;
-/*
- * Jest fake timers do not play well with promises, so we need to advance the timers and wait for all the promises to resolve.
- */
-const advanceJestTimersWithPromise = async (time) => {
-    jest.advanceTimersByTime(time);
-    return new Promise(jest.requireActual('timers').setImmediate);
-};
-exports.advanceJestTimersWithPromise = advanceJestTimersWithPromise;

package/lib/util/LowPrecisionTaskScheduler/LowPrecisionTaskScheduler.test.js

@@ -18,8 +18,8 @@
  *
  */
 Object.defineProperty(exports, "__esModule", { value: true });
+const testUtils_1 = require("@wireapp/commons/lib/util/testUtils");
 const LowPrecisionTaskScheduler_1 = require("./LowPrecisionTaskScheduler");
-const testUtils_1 = require("../../testUtils");
 describe('LowPrecisionTaskScheduler', () => {
     beforeEach(() => {
         jest.useFakeTimers();

package/lib/util/RecurringTaskScheduler/RecurringTaskScheduler.test.js

@@ -18,9 +18,9 @@
  *
  */
 Object.defineProperty(exports, "__esModule", { value: true });
+const testUtils_1 = require("@wireapp/commons/lib/util/testUtils");
 const commons_1 = require("@wireapp/commons");
 const RecurringTaskScheduler_1 = require("./RecurringTaskScheduler");
-const testUtils_1 = require("../../testUtils");
 const mockedStore = {
     storage: new Map(),
     set: async (key, timestamp) => {

package/package.json

@@ -11,11 +11,11 @@
     "./lib/cryptography/AssetCryptography/crypto.node": "./lib/cryptography/AssetCryptography/crypto.browser.js"
   },
   "dependencies": {
-    "@wireapp/api-client": "^26.10.5",
-    "@wireapp/commons": "^5.2.4",
+    "@wireapp/api-client": "^26.10.6",
+    "@wireapp/commons": "^5.2.5",
     "@wireapp/core-crypto": "1.0.0-rc.36",
     "@wireapp/cryptobox": "12.8.0",
-    "@wireapp/promise-queue": "^2.2.9",
+    "@wireapp/promise-queue": "^2.2.10",
     "@wireapp/protocol-messaging": "1.44.0",
     "@wireapp/store-engine": "5.1.5",
     "@wireapp/store-engine-dexie": "^2.1.7",
@@ -61,6 +61,6 @@
     "test:coverage": "jest --coverage",
     "watch": "tsc --watch"
   },
-  "version": "43.14.1",
-  "gitHead": "be5c29911af8df6a7ba7367d927a32e8354387fb"
+  "version": "43.14.3",
+  "gitHead": "82a565bd0b61a6ebd29a7afa67a2f4a63e0dfca4"
 }