@wireapp/api-client 27.67.1 → 27.69.0

package/lib/Config.d.ts

@@ -3,5 +3,5 @@ export interface Config {
     urls: BackendData;
     headers?: Record<string, string>;
 }
-export declare const MINIMUM_API_VERSION = 8;
+export declare const MINIMUM_API_VERSION = 9;
 //# sourceMappingURL=Config.d.ts.map

package/lib/Config.js

@@ -19,4 +19,4 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MINIMUM_API_VERSION = void 0;
-exports.MINIMUM_API_VERSION = 8;
+exports.MINIMUM_API_VERSION = 9;

package/lib/auth/AccessTokenStore.d.ts

@@ -9,15 +9,25 @@ export interface AccessTokenStore {
 export declare class AccessTokenStore extends EventEmitter {
     private readonly logger;
     static readonly TOPIC: typeof TOPIC;
-    accessToken?: AccessTokenData;
+    accessTokenData?: AccessTokenData;
     /**
      * The date at which the token will be invalid. This value should be use with a grain of salt as there might be some time shift between browser and server time
      * It is suggested to add an error margin
      */
     tokenExpirationDate?: number;
+    /**
+     * Marker token used when opening a new WebSocket connection.
+     * It is used to know we have processed all notifications up to this marker,
+     * any notifications received after the marker is returned from websocket
+     * are considered live notifications
+     * @note This is a random token generated by the client.
+     */
+    markerToken?: string;
     constructor();
-    delete(): Promise<void>;
-    updateToken(accessToken: AccessTokenData): Promise<AccessTokenData>;
+    delete: () => Promise<void>;
+    updateToken: (accessToken: AccessTokenData) => Promise<AccessTokenData>;
+    getNextMarkerToken: () => string;
+    getAccessToken: () => string | undefined;
 }
 export {};
 //# sourceMappingURL=AccessTokenStore.d.ts.map

package/lib/auth/AccessTokenStore.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AccessTokenStore.d.ts","sourceRoot":"","sources":["../../src/auth/AccessTokenStore.ts"],"names":[],"mappings":"AAqBA,OAAO,EAAC,YAAY,EAAC,MAAM,QAAQ,CAAC;AAIpC,OAAO,EAAC,eAAe,EAAC,MAAM,UAAU,CAAC;AAEzC,aAAK,KAAK;IACR,oBAAoB,gDAAgD;CACrE;AAED,MAAM,WAAW,gBAAgB;IAC/B,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,oBAAoB,EAAE,QAAQ,EAAE,CAAC,WAAW,EAAE,eAAe,KAAK,IAAI,GAAG,IAAI,CAAC;CAC/F;AAED,qBAAa,gBAAiB,SAAQ,YAAY;IAChD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAiB;IAExC,gBAAuB,KAAK,eAAS;IAC9B,WAAW,CAAC,EAAE,eAAe,CAAC;IACrC;;;OAGG;IACI,mBAAmB,CAAC,EAAE,MAAM,CAAC;;IAQvB,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAMvB,WAAW,CAAC,WAAW,EAAE,eAAe,GAAG,OAAO,CAAC,eAAe,CAAC;CASjF"}
+{"version":3,"file":"AccessTokenStore.d.ts","sourceRoot":"","sources":["../../src/auth/AccessTokenStore.ts"],"names":[],"mappings":"AAsBA,OAAO,EAAC,YAAY,EAAC,MAAM,QAAQ,CAAC;AAIpC,OAAO,EAAC,eAAe,EAAC,MAAM,UAAU,CAAC;AAEzC,aAAK,KAAK;IACR,oBAAoB,gDAAgD;CACrE;AAED,MAAM,WAAW,gBAAgB;IAC/B,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,oBAAoB,EAAE,QAAQ,EAAE,CAAC,WAAW,EAAE,eAAe,KAAK,IAAI,GAAG,IAAI,CAAC;CAC/F;AAED,qBAAa,gBAAiB,SAAQ,YAAY;IAChD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAiB;IAExC,gBAAuB,KAAK,eAAS;IAC9B,eAAe,CAAC,EAAE,eAAe,CAAC;IACzC;;;OAGG;IACI,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAEpC;;;;;;OAMG;IACI,WAAW,CAAC,EAAE,MAAM,CAAC;;IAQrB,MAAM,QAAa,OAAO,CAAC,IAAI,CAAC,CAKrC;IAEK,WAAW,gBAAuB,eAAe,KAAG,OAAO,CAAC,eAAe,CAAC,CAQjF;IAEK,kBAAkB,QAAO,MAAM,CAKpC;IAEK,cAAc,QAAO,MAAM,GAAG,SAAS,CAM5C;CACH"}

package/lib/auth/AccessTokenStore.js

@@ -19,6 +19,7 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AccessTokenStore = void 0;
+const uuid_1 = require("uuid");
 const events_1 = require("events");
 const commons_1 = require("@wireapp/commons");
 var TOPIC;
@@ -28,29 +29,51 @@ var TOPIC;
 class AccessTokenStore extends events_1.EventEmitter {
     logger;
     static TOPIC = TOPIC;
-    accessToken;
+    accessTokenData;
     /**
      * The date at which the token will be invalid. This value should be use with a grain of salt as there might be some time shift between browser and server time
      * It is suggested to add an error margin
      */
     tokenExpirationDate;
+    /**
+     * Marker token used when opening a new WebSocket connection.
+     * It is used to know we have processed all notifications up to this marker,
+     * any notifications received after the marker is returned from websocket
+     * are considered live notifications
+     * @note This is a random token generated by the client.
+     */
+    markerToken;
     constructor() {
         super();
         this.logger = commons_1.LogFactory.getLogger('@wireapp/api-client/AccessTokenStore');
     }
-    async delete() {
+    delete = async () => {
         this.logger.log('Deleting local access token');
-        this.accessToken = undefined;
+        this.accessTokenData = undefined;
         this.tokenExpirationDate = undefined;
-    }
-    async updateToken(accessToken) {
-        if (this.accessToken !== accessToken) {
+        this.markerToken = undefined;
+    };
+    updateToken = async (accessToken) => {
+        if (this.accessTokenData !== accessToken) {
             this.logger.log('Saving local access token');
             this.tokenExpirationDate = Date.now() + accessToken.expires_in * 1000;
-            this.accessToken = accessToken;
-            this.emit(AccessTokenStore.TOPIC.ACCESS_TOKEN_REFRESH, this.accessToken);
+            this.accessTokenData = accessToken;
+            this.emit(AccessTokenStore.TOPIC.ACCESS_TOKEN_REFRESH, this.accessTokenData);
         }
-        return this.accessToken;
-    }
+        return this.accessTokenData;
+    };
+    getNextMarkerToken = () => {
+        const newMarkerToken = (0, uuid_1.v4)();
+        this.logger.info('Generated new marker token:', newMarkerToken, 'Previous marker token:', this.markerToken);
+        this.markerToken = newMarkerToken;
+        return this.markerToken;
+    };
+    getAccessToken = () => {
+        if (this.accessTokenData && this.tokenExpirationDate && this.tokenExpirationDate > Date.now()) {
+            return this.accessTokenData.access_token;
+        }
+        this.logger.warn('Access token is not set or has expired');
+        return undefined;
+    };
 }
 exports.AccessTokenStore = AccessTokenStore;

package/lib/cells/CellsAPI.d.ts

@@ -5,12 +5,12 @@ import { HttpClient } from '../http';
 export type SortDirection = 'asc' | 'desc';
 interface CellsConfig {
     pydio: {
-        apiKey: string;
+        apiKey?: string;
         segment: string;
         url: string;
     };
     s3: {
-        apiKey: string;
+        apiKey?: string;
         bucket: string;
         endpoint: string;
         region: string;
@@ -30,6 +30,7 @@ export declare class CellsAPI {
         httpClient?: HttpClient;
         storageService?: CellsStorage;
     }): void;
+    private getHttpClient;
     uploadNodeDraft({ uuid, versionId, path, file, autoRename, progressCallback, abortController, }: {
         uuid: string;
         versionId: string;

package/lib/cells/CellsAPI.d.ts.map

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

package/lib/cells/CellsAPI.js

@@ -38,15 +38,36 @@ class CellsAPI {
         this.client = null;
     }
     initialize({ cellsConfig, httpClient, storageService, }) {
-        const http = httpClient ||
-            new http_1.HttpClient({
-                ...this.httpClientConfig,
-                urls: { ...this.httpClientConfig.urls, rest: cellsConfig.pydio.url + cellsConfig.pydio.segment },
-                headers: { ...this.httpClientConfig.headers, Authorization: `Bearer ${cellsConfig.pydio.apiKey}` },
-            }, this.accessTokenStore);
-        this.storageService = storageService || new S3Service_1.S3Service(cellsConfig.s3);
+        const http = httpClient || this.getHttpClient({ cellsConfig });
+        this.storageService =
+            storageService || new S3Service_1.S3Service({ config: cellsConfig.s3, getAccessToken: this.accessTokenStore.getAccessToken });
         this.client = new cells_sdk_ts_1.NodeServiceApi(undefined, undefined, http.client);
     }
+    getHttpClient({ cellsConfig }) {
+        const baseHttpClientConfig = {
+            ...this.httpClientConfig,
+            urls: { ...this.httpClientConfig.urls, rest: cellsConfig.pydio.url + cellsConfig.pydio.segment },
+            headers: { ...this.httpClientConfig.headers },
+        };
+        if (cellsConfig.pydio.apiKey) {
+            return new http_1.HttpClient({
+                ...baseHttpClientConfig,
+                headers: { ...baseHttpClientConfig.headers, Authorization: `Bearer ${cellsConfig.pydio.apiKey}` },
+            }, this.accessTokenStore);
+        }
+        const http = new http_1.HttpClient(baseHttpClientConfig, this.accessTokenStore);
+        // Add axios interceptor to automatically add Authorization header to every request
+        // Althouht the HttpClient handles the authorization already (see _sendRequest), as we pass a custom axios instance to the NodeServiceApi, we need to add it manually
+        http.client.interceptors.request.use(config => {
+            const accessToken = this.accessTokenStore.getAccessToken();
+            if (accessToken) {
+                config.headers = config.headers || {};
+                config.headers.Authorization = `Bearer ${accessToken}`;
+            }
+            return config;
+        });
+        return http;
+    }
     async uploadNodeDraft({ uuid, versionId, path, file, autoRename = true, progressCallback, abortController, }) {
         if (!this.client || !this.storageService) {
             throw new Error(CONFIGURATION_ERROR);

package/lib/cells/CellsStorage/S3Service.d.ts

@@ -1,6 +1,6 @@
 import { CellsStorage } from './CellsStorage';
 interface S3ServiceConfig {
-    apiKey: string;
+    apiKey?: string;
     bucket: string;
     endpoint: string;
     region: string;
@@ -10,7 +10,11 @@ export declare const PART_SIZE: number;
 export declare class S3Service implements CellsStorage {
     private client;
     private bucket;
-    constructor({ apiKey, bucket, endpoint, region }: S3ServiceConfig);
+    private getAccessToken;
+    constructor({ config, getAccessToken }: {
+        config: S3ServiceConfig;
+        getAccessToken: () => string | undefined;
+    });
     putObject({ path, file, metadata, progressCallback, abortController, }: {
         path: string;
         file: File;

package/lib/cells/CellsStorage/S3Service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"S3Service.d.ts","sourceRoot":"","sources":["../../../src/cells/CellsStorage/S3Service.ts"],"names":[],"mappings":"AAsBA,OAAO,EAAC,YAAY,EAAoB,MAAM,gBAAgB,CAAC;AAE/D,UAAU,eAAe;IACvB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,eAAO,MAAM,cAAc,IAAI,CAAC;AAChC,eAAO,MAAM,SAAS,QAAmB,CAAC;AAE1C,qBAAa,SAAU,YAAW,YAAY;IAC5C,OAAO,CAAC,MAAM,CAAW;IACzB,OAAO,CAAC,MAAM,CAAS;gBAEX,EAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAC,EAAE,eAAe;IAezD,SAAS,CAAC,EACd,IAAI,EACJ,IAAI,EACJ,QAAQ,EACR,gBAAgB,EAChB,eAAe,GAChB,EAAE;QACD,IAAI,EAAE,MAAM,CAAC;QACb,IAAI,EAAE,IAAI,CAAC;QACX,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAClC,gBAAgB,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,CAAC;QAC9C,eAAe,CAAC,EAAE,eAAe,CAAC;KACnC,GAAG,OAAO,CAAC,IAAI,CAAC;CA2ClB"}
+{"version":3,"file":"S3Service.d.ts","sourceRoot":"","sources":["../../../src/cells/CellsStorage/S3Service.ts"],"names":[],"mappings":"AAsBA,OAAO,EAAC,YAAY,EAAoB,MAAM,gBAAgB,CAAC;AAE/D,UAAU,eAAe;IACvB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,eAAO,MAAM,cAAc,IAAI,CAAC;AAChC,eAAO,MAAM,SAAS,QAAmB,CAAC;AAE1C,qBAAa,SAAU,YAAW,YAAY;IAC5C,OAAO,CAAC,MAAM,CAAW;IACzB,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,cAAc,CAA2B;gBAErC,EAAC,MAAM,EAAE,cAAc,EAAC,EAAE;QAAC,MAAM,EAAE,eAAe,CAAC;QAAC,cAAc,EAAE,MAAM,MAAM,GAAG,SAAS,CAAA;KAAC;IA6BnG,SAAS,CAAC,EACd,IAAI,EACJ,IAAI,EACJ,QAAQ,EACR,gBAAgB,EAChB,eAAe,GAChB,EAAE;QACD,IAAI,EAAE,MAAM,CAAC;QACb,IAAI,EAAE,IAAI,CAAC;QACX,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAClC,gBAAgB,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,CAAC;QAC9C,eAAe,CAAC,EAAE,eAAe,CAAC;KACnC,GAAG,OAAO,CAAC,IAAI,CAAC;CA2ClB"}

package/lib/cells/CellsStorage/S3Service.js

@@ -27,16 +27,30 @@ exports.PART_SIZE = 10 * 1024 * 1024; // 10MB
 class S3Service {
     client;
     bucket;
-    constructor({ apiKey, bucket, endpoint, region }) {
-        this.bucket = bucket;
+    getAccessToken;
+    constructor({ config, getAccessToken }) {
+        this.bucket = config.bucket;
+        this.getAccessToken = getAccessToken;
         this.client = new client_s3_1.S3Client({
-            endpoint,
+            endpoint: config.endpoint,
             forcePathStyle: true,
-            region,
-            credentials: async () => ({
-                accessKeyId: apiKey,
-                secretAccessKey: 'gatewaysecret',
-            }),
+            region: config.region,
+            credentials: async () => {
+                if (config.apiKey) {
+                    return {
+                        accessKeyId: config.apiKey,
+                        secretAccessKey: 'gatewaysecret',
+                    };
+                }
+                const accessToken = this.getAccessToken();
+                if (!accessToken) {
+                    throw new Error('No access token available for S3 authentication');
+                }
+                return {
+                    accessKeyId: accessToken,
+                    secretAccessKey: 'gatewaysecret',
+                };
+            },
             requestChecksumCalculation: 'WHEN_REQUIRED',
         });
     }

package/lib/demo/http401.js

@@ -21,7 +21,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const initClient_1 = require("./initClient");
 (async () => {
     const apiClient = await (0, initClient_1.initClient)();
-    apiClient['accessTokenStore'].accessToken.access_token = 'invalid';
+    apiClient['accessTokenStore'].accessTokenData.access_token = 'invalid';
     await apiClient.api.conversation.getConversationList();
 })().catch(error => {
     console.error(error);

package/lib/http/HttpClient.js

@@ -124,9 +124,9 @@ class HttpClient extends events_1.EventEmitter {
         }
     }
     async _sendRequest({ config, isFirstTry = true, abortController }) {
-        if (this.accessTokenStore.accessToken) {
+        if (this.accessTokenStore.accessTokenData) {
             // TODO: remove tokenAsParam
-            const { token_type, access_token } = this.accessTokenStore.accessToken;
+            const { token_type, access_token } = this.accessTokenStore.accessTokenData;
             config.headers = {
                 ...config.headers,
                 Authorization: `${token_type} ${access_token}`,
@@ -153,7 +153,7 @@ class HttpClient extends events_1.EventEmitter {
                 };
                 return this._sendRequest({ config, isFirstTry: false, abortController });
             };
-            const hasAccessToken = !!this.accessTokenStore?.accessToken;
+            const hasAccessToken = !!this.accessTokenStore?.accessTokenData;
             if (axios_1.default.isAxiosError(error) && error.response?.status === http_1.StatusCode.UNAUTHORIZED) {
                 return retryWithTokenRefresh();
             }
@@ -201,8 +201,8 @@ class HttpClient extends events_1.EventEmitter {
     }
     async refreshAccessToken() {
         let expiredAccessToken;
-        if (this.accessTokenStore.accessToken?.access_token) {
-            expiredAccessToken = this.accessTokenStore.accessToken;
+        if (this.accessTokenStore.accessTokenData?.access_token) {
+            expiredAccessToken = this.accessTokenStore.accessTokenData;
         }
         const accessToken = await this.postAccess(expiredAccessToken);
         this.logger.info(`Received updated access token. It will expire in "${accessToken.expires_in}" seconds.`, obfuscation_1.ObfuscationUtil.obfuscateAccessToken(accessToken));
@@ -229,7 +229,7 @@ class HttpClient extends events_1.EventEmitter {
      * @param  {string} clientId - id of the client with which the new login session will be associated
      */
     async associateClientWithSession(clientId) {
-        const storedToken = this.accessTokenStore.accessToken;
+        const storedToken = this.accessTokenStore.accessTokenData;
         const newToken = await this.postAccess(storedToken, clientId);
         return this.accessTokenStore.updateToken(newToken);
     }

package/lib/notification/ConsumableNotification.d.ts

@@ -7,12 +7,40 @@ import { BackendEvent } from '../event';
 export declare enum ConsumableEvent {
     EVENT = "event",
     MISSED = "notifications_missed",
-    MESSAGE_COUNT = "message_count"
+    SYNCHRONIZATION = "synchronization"
+}
+/**
+ * Notification type for synchronization messages sent by the server
+ * to indicate the end of the message queue at the time of connection.
+ *
+ * This message is **only included** if the client initiated the WebSocket
+ * connection using a `sync_marker` query parameter.
+ * @TODO when BackendEvent is typed in zod use:
+ * export type ConsumableNotificationSynchronization = z.infer<typeof ConsumableNotificationSynchronization>;
+ */
+export interface ConsumableNotificationSynchronization {
+    /**
+     * Always set to "synchronization" to distinguish from other message types.
+     */
+    type: ConsumableEvent.SYNCHRONIZATION;
+    data: {
+        /**
+         * Unique delivery tag assigned by the server for this synchronization message.
+         * Must be acknowledged once processed to allow server-side cleanup.
+         */
+        delivery_tag: number;
+        /**
+         * Unique identifier (UUID) that matches the `sync_marker` value the client provided
+         * during the WebSocket connection initiation. Used to ensure the message
+         * corresponds to the current synchronization session.
+         */
+        marker_id: string;
+    };
 }
 /**
  * Notification type received when the client has missed messages due to being offline too long.
  * Requires a full re-sync before consuming more notifications.
- * TODO: when BackendEvent is typed in zod use:
+ * @TODO when BackendEvent is typed in zod use:
  * export type ConsumableNotificationMissed = z.infer<typeof ConsumableNotificationMissedSchema>;
  */
 export interface ConsumableNotificationMissed {
@@ -21,7 +49,7 @@ export interface ConsumableNotificationMissed {
 /**
  * Notification type for actual backend events, contains one or more event payloads.
  * Includes a delivery tag for acknowledgment.
- * TODO: when BackendEvent is typed in zod use:
+ * @TODO when BackendEvent is typed in zod use:
  * export type ConsumableNotificationEvent = z.infer<typeof ConsumableNotificationEventSchema>;
  */
 export interface ConsumableNotificationEvent {
@@ -34,27 +62,41 @@ export interface ConsumableNotificationEvent {
         };
     };
 }
-/**
- * Notification sent after connecting to indicate current number of messages queued.
- * TODO: when BackendEvent is typed in zod use:
- * export type ConsumableNotificationMessageCount = z.infer<typeof ConsumableNotificationMessageCountSchema>;
- */
-export interface ConsumableNotificationMessageCount {
-    type: ConsumableEvent.MESSAGE_COUNT;
-    data: {
-        count: number;
-    };
-}
 /**
  * Union of all valid notification types supported by the WebSocket backend.
- * TODO: when BackendEvent is typed in zod use:
+ * @TODO when BackendEvent is typed in zod use:
  * export const ConsumableNotificationSchema = z.discriminatedUnion('type', [
-    ConsumableNotificationMissedSchema,
-    ConsumableNotificationEventSchema,
-    ConsumableNotificationMessageCountSchema,
-  ]);
+ *   ConsumableNotificationMissedSchema,
+ *   ConsumableNotificationEventSchema,
+ *.  ConsumableNotificationSynchronization
+ * ]);
  */
-export type ConsumableNotification = ConsumableNotificationMissed | ConsumableNotificationEvent | ConsumableNotificationMessageCount;
+export type ConsumableNotification = ConsumableNotificationMissed | ConsumableNotificationEvent | ConsumableNotificationSynchronization;
+export declare const ConsumableNotificationSynchronizationSchema: z.ZodObject<{
+    type: z.ZodLiteral<ConsumableEvent.SYNCHRONIZATION>;
+    data: z.ZodObject<{
+        delivery_tag: z.ZodNumber;
+        marker_id: z.ZodString;
+    }, "strip", z.ZodTypeAny, {
+        delivery_tag: number;
+        marker_id: string;
+    }, {
+        delivery_tag: number;
+        marker_id: string;
+    }>;
+}, "strip", z.ZodTypeAny, {
+    type: ConsumableEvent.SYNCHRONIZATION;
+    data: {
+        delivery_tag: number;
+        marker_id: string;
+    };
+}, {
+    type: ConsumableEvent.SYNCHRONIZATION;
+    data: {
+        delivery_tag: number;
+        marker_id: string;
+    };
+}>;
 export declare const ConsumableNotificationMissedSchema: z.ZodObject<{
     type: z.ZodLiteral<ConsumableEvent.MISSED>;
 }, "strip", z.ZodTypeAny, {
@@ -108,26 +150,6 @@ export declare const ConsumableNotificationEventSchema: z.ZodObject<{
         delivery_tag: number;
     };
 }>;
-export declare const ConsumableNotificationMessageCountSchema: z.ZodObject<{
-    type: z.ZodLiteral<ConsumableEvent.MESSAGE_COUNT>;
-    data: z.ZodObject<{
-        count: z.ZodNumber;
-    }, "strip", z.ZodTypeAny, {
-        count: number;
-    }, {
-        count: number;
-    }>;
-}, "strip", z.ZodTypeAny, {
-    type: ConsumableEvent.MESSAGE_COUNT;
-    data: {
-        count: number;
-    };
-}, {
-    type: ConsumableEvent.MESSAGE_COUNT;
-    data: {
-        count: number;
-    };
-}>;
 export declare const ConsumableNotificationSchema: z.ZodDiscriminatedUnion<"type", [z.ZodObject<{
     type: z.ZodLiteral<ConsumableEvent.MISSED>;
 }, "strip", z.ZodTypeAny, {
@@ -180,23 +202,28 @@ export declare const ConsumableNotificationSchema: z.ZodDiscriminatedUnion<"type
         delivery_tag: number;
     };
 }>, z.ZodObject<{
-    type: z.ZodLiteral<ConsumableEvent.MESSAGE_COUNT>;
+    type: z.ZodLiteral<ConsumableEvent.SYNCHRONIZATION>;
     data: z.ZodObject<{
-        count: z.ZodNumber;
+        delivery_tag: z.ZodNumber;
+        marker_id: z.ZodString;
     }, "strip", z.ZodTypeAny, {
-        count: number;
+        delivery_tag: number;
+        marker_id: string;
     }, {
-        count: number;
+        delivery_tag: number;
+        marker_id: string;
     }>;
 }, "strip", z.ZodTypeAny, {
-    type: ConsumableEvent.MESSAGE_COUNT;
+    type: ConsumableEvent.SYNCHRONIZATION;
     data: {
-        count: number;
+        delivery_tag: number;
+        marker_id: string;
     };
 }, {
-    type: ConsumableEvent.MESSAGE_COUNT;
+    type: ConsumableEvent.SYNCHRONIZATION;
     data: {
-        count: number;
+        delivery_tag: number;
+        marker_id: string;
     };
 }>]>;
 //# sourceMappingURL=ConsumableNotification.d.ts.map

package/lib/notification/ConsumableNotification.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ConsumableNotification.d.ts","sourceRoot":"","sources":["../../src/notification/ConsumableNotification.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,CAAC,EAAC,MAAM,KAAK,CAAC;AAEtB,OAAO,EAAC,YAAY,EAAC,MAAM,UAAU,CAAC;AAEtC;;;GAGG;AACH,oBAAY,eAAe;IACzB,KAAK,UAAU;IACf,MAAM,yBAAyB;IAC/B,aAAa,kBAAkB;CAChC;AAED;;;;;GAKG;AACH,MAAM,WAAW,4BAA4B;IAC3C,IAAI,EAAE,eAAe,CAAC,MAAM,CAAC;CAC9B;AAED;;;;;GAKG;AACH,MAAM,WAAW,2BAA2B;IAC1C,IAAI,EAAE,eAAe,CAAC,KAAK,CAAC;IAC5B,IAAI,EAAE;QACJ,YAAY,EAAE,MAAM,CAAC;QACrB,KAAK,EAAE;YACL,EAAE,EAAE,MAAM,CAAC;YACX,OAAO,EAAE,YAAY,EAAE,CAAC;SACzB,CAAC;KACH,CAAC;CACH;AAED;;;;GAIG;AACH,MAAM,WAAW,kCAAkC;IACjD,IAAI,EAAE,eAAe,CAAC,aAAa,CAAC;IACpC,IAAI,EAAE;QACJ,KAAK,EAAE,MAAM,CAAC;KACf,CAAC;CACH;AAED;;;;;;;;GAQG;AACH,MAAM,MAAM,sBAAsB,GAC9B,4BAA4B,GAC5B,2BAA2B,GAC3B,kCAAkC,CAAC;AAOvC,eAAO,MAAM,kCAAkC;;;;;;EAE7C,CAAC;AAEH,eAAO,MAAM,iCAAiC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAM5C,CAAC;AAEH,eAAO,MAAM,wCAAwC;;;;;;;;;;;;;;;;;;;EAKnD,CAAC;AAEH,eAAO,MAAM,4BAA4B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAIvC,CAAC"}
+{"version":3,"file":"ConsumableNotification.d.ts","sourceRoot":"","sources":["../../src/notification/ConsumableNotification.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,CAAC,EAAC,MAAM,KAAK,CAAC;AAEtB,OAAO,EAAC,YAAY,EAAC,MAAM,UAAU,CAAC;AAEtC;;;GAGG;AACH,oBAAY,eAAe;IACzB,KAAK,UAAU;IACf,MAAM,yBAAyB;IAC/B,eAAe,oBAAoB;CACpC;AAED;;;;;;;;GAQG;AACH,MAAM,WAAW,qCAAqC;IACpD;;OAEG;IACH,IAAI,EAAE,eAAe,CAAC,eAAe,CAAC;IAEtC,IAAI,EAAE;QACJ;;;WAGG;QACH,YAAY,EAAE,MAAM,CAAC;QAErB;;;;WAIG;QACH,SAAS,EAAE,MAAM,CAAC;KACnB,CAAC;CACH;AAED;;;;;GAKG;AACH,MAAM,WAAW,4BAA4B;IAC3C,IAAI,EAAE,eAAe,CAAC,MAAM,CAAC;CAC9B;AAED;;;;;GAKG;AACH,MAAM,WAAW,2BAA2B;IAC1C,IAAI,EAAE,eAAe,CAAC,KAAK,CAAC;IAC5B,IAAI,EAAE;QACJ,YAAY,EAAE,MAAM,CAAC;QACrB,KAAK,EAAE;YACL,EAAE,EAAE,MAAM,CAAC;YACX,OAAO,EAAE,YAAY,EAAE,CAAC;SACzB,CAAC;KACH,CAAC;CACH;AAED;;;;;;;;GAQG;AACH,MAAM,MAAM,sBAAsB,GAC9B,4BAA4B,GAC5B,2BAA2B,GAC3B,qCAAqC,CAAC;AAO1C,eAAO,MAAM,2CAA2C;;;;;;;;;;;;;;;;;;;;;;;;EAMtD,CAAC;AAEH,eAAO,MAAM,kCAAkC;;;;;;EAE7C,CAAC;AAEH,eAAO,MAAM,iCAAiC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAM5C,CAAC;AAEH,eAAO,MAAM,4BAA4B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAIvC,CAAC"}

package/lib/notification/ConsumableNotification.js

@@ -18,7 +18,7 @@
  *
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ConsumableNotificationSchema = exports.ConsumableNotificationMessageCountSchema = exports.ConsumableNotificationEventSchema = exports.ConsumableNotificationMissedSchema = exports.ConsumableEvent = void 0;
+exports.ConsumableNotificationSchema = exports.ConsumableNotificationEventSchema = exports.ConsumableNotificationMissedSchema = exports.ConsumableNotificationSynchronizationSchema = exports.ConsumableEvent = void 0;
 const zod_1 = require("zod");
 /**
  * Enum of all possible consumable notification types received via WebSocket.
@@ -28,11 +28,18 @@ var ConsumableEvent;
 (function (ConsumableEvent) {
     ConsumableEvent["EVENT"] = "event";
     ConsumableEvent["MISSED"] = "notifications_missed";
-    ConsumableEvent["MESSAGE_COUNT"] = "message_count";
+    ConsumableEvent["SYNCHRONIZATION"] = "synchronization";
 })(ConsumableEvent || (exports.ConsumableEvent = ConsumableEvent = {}));
 const BackendEventSchema = zod_1.z.object({
     id: zod_1.z.string(),
-    payload: zod_1.z.array(zod_1.z.unknown()), // TODO: Replace `z.any()` with BackendEvent schema when available
+    payload: zod_1.z.array(zod_1.z.unknown()), // @TODO Replace `z.unknown()` with BackendEvent schema when available
+});
+exports.ConsumableNotificationSynchronizationSchema = zod_1.z.object({
+    type: zod_1.z.literal(ConsumableEvent.SYNCHRONIZATION),
+    data: zod_1.z.object({
+        delivery_tag: zod_1.z.number(),
+        marker_id: zod_1.z.string(),
+    }),
 });
 exports.ConsumableNotificationMissedSchema = zod_1.z.object({
     type: zod_1.z.literal(ConsumableEvent.MISSED),
@@ -44,14 +51,8 @@ exports.ConsumableNotificationEventSchema = zod_1.z.object({
         event: BackendEventSchema,
     }),
 });
-exports.ConsumableNotificationMessageCountSchema = zod_1.z.object({
-    type: zod_1.z.literal(ConsumableEvent.MESSAGE_COUNT),
-    data: zod_1.z.object({
-        count: zod_1.z.number(),
-    }),
-});
 exports.ConsumableNotificationSchema = zod_1.z.discriminatedUnion('type', [
     exports.ConsumableNotificationMissedSchema,
     exports.ConsumableNotificationEventSchema,
-    exports.ConsumableNotificationMessageCountSchema,
+    exports.ConsumableNotificationSynchronizationSchema,
 ]);

package/lib/notification/NotificationAPI/NotificationsAPI.mocks.js

@@ -24,7 +24,7 @@ const http_1 = require("../../http");
 const domain = 'https://test.zinfra.io';
 const testConfig = { urls: { rest: domain, ws: '', name: 'test' } };
 const mockedAccessTokenStore = {
-    accessToken: {
+    accessTokenData: {
         access_token: 'iJCRCjc8oROO-dkrkqCXOade997oa8Jhbz6awMUQPBQo80VenWqp_oNvfY6AnU5BxEsd' +
             'DPOBfBP-uz_b0gAKBQ==.v=1.k=1.d=1498600993.t=a.l=.u=aaf9a833-ef30-4c2' +
             '2-86a0-9adc8a15b3b4.c=15037015562284012115',

package/lib/tcp/AcknowledgeEvent.types.d.ts

@@ -8,7 +8,6 @@ export interface AcknowledgeData {
 }
 export declare enum AcknowledgeType {
     ACK = "ack",
-    ACK_MESSAGE_COUNT = "ack_message_count",
     ACK_FULL_SYNC = "ack_full_sync"
 }
 //# sourceMappingURL=AcknowledgeEvent.types.d.ts.map

package/lib/tcp/AcknowledgeEvent.types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AcknowledgeEvent.types.d.ts","sourceRoot":"","sources":["../../src/tcp/AcknowledgeEvent.types.ts"],"names":[],"mappings":"AAmBA,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,eAAe,CAAC;IACtB,IAAI,CAAC,EAAE,eAAe,CAAC;CACxB;AAED,MAAM,WAAW,eAAe;IAC9B,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,OAAO,CAAC;CACnB;AAED,oBAAY,eAAe;IACzB,GAAG,QAAQ;IACX,iBAAiB,sBAAsB;IACvC,aAAa,kBAAkB;CAChC"}
+{"version":3,"file":"AcknowledgeEvent.types.d.ts","sourceRoot":"","sources":["../../src/tcp/AcknowledgeEvent.types.ts"],"names":[],"mappings":"AAmBA,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,eAAe,CAAC;IACtB,IAAI,CAAC,EAAE,eAAe,CAAC;CACxB;AAED,MAAM,WAAW,eAAe;IAC9B,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,OAAO,CAAC;CACnB;AAED,oBAAY,eAAe;IACzB,GAAG,QAAQ;IACX,aAAa,kBAAkB;CAChC"}

package/lib/tcp/AcknowledgeEvent.types.js

@@ -22,6 +22,5 @@ exports.AcknowledgeType = void 0;
 var AcknowledgeType;
 (function (AcknowledgeType) {
     AcknowledgeType["ACK"] = "ack";
-    AcknowledgeType["ACK_MESSAGE_COUNT"] = "ack_message_count";
     AcknowledgeType["ACK_FULL_SYNC"] = "ack_full_sync";
 })(AcknowledgeType || (exports.AcknowledgeType = AcknowledgeType = {}));

package/lib/tcp/WebSocketClient.d.ts

@@ -3,7 +3,7 @@ import { EventEmitter } from 'events';
 import { WEBSOCKET_STATE } from './ReconnectingWebsocket';
 import { InvalidTokenError, MissingCookieError } from '../auth/';
 import { HttpClient } from '../http/';
-import { ConsumableNotification, ConsumableNotificationEvent } from '../notification/ConsumableNotification';
+import { ConsumableNotification, ConsumableNotificationEvent, ConsumableNotificationSynchronization } from '../notification/ConsumableNotification';
 declare enum TOPIC {
     ON_ERROR = "WebSocketClient.TOPIC.ON_ERROR",
     ON_INVALID_TOKEN = "WebSocketClient.TOPIC.ON_INVALID_TOKEN",
@@ -67,9 +67,9 @@ export declare class WebSocketClient extends EventEmitter {
      */
     readonly lock: () => void;
     isLocked(): boolean;
-    private buildWebSocketUrl;
+    buildWebSocketUrl(): string;
     acknowledgeMissedNotification(): void;
-    acknowledgeMessageCountNotification(): void;
+    acknowledgeConsumableNotificationSynchronization(notification: ConsumableNotificationSynchronization): void;
     acknowledgeNotification(notification: ConsumableNotificationEvent): void;
 }
 export {};

package/lib/tcp/WebSocketClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"WebSocketClient.d.ts","sourceRoot":"","sources":["../../src/tcp/WebSocketClient.ts"],"names":[],"mappings":"AAoBA,OAAO,EAAC,UAAU,EAAC,MAAM,wBAAwB,CAAC;AAElD,OAAO,EAAC,YAAY,EAAC,MAAM,QAAQ,CAAC;AAKpC,OAAO,EAAwB,eAAe,EAAC,MAAM,yBAAyB,CAAC;AAE/E,OAAO,EAAC,iBAAiB,EAA8B,kBAAkB,EAAC,MAAM,UAAU,CAAC;AAE3F,OAAO,EAAC,UAAU,EAAe,MAAM,UAAU,CAAC;AAClD,OAAO,EACL,sBAAsB,EACtB,2BAA2B,EAE5B,MAAM,wCAAwC,CAAC;AAEhD,aAAK,KAAK;IACR,QAAQ,mCAAmC;IAC3C,gBAAgB,2CAA2C;IAC3D,UAAU,qCAAqC;IAC/C,eAAe,0CAA0C;CAC1D;AAED,MAAM,WAAW,eAAe;IAC9B,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,QAAQ,EAAE,QAAQ,EAAE,CAAC,KAAK,EAAE,KAAK,GAAG,UAAU,KAAK,IAAI,GAAG,IAAI,CAAC;IAC/E,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,gBAAgB,EAAE,QAAQ,EAAE,CAAC,KAAK,EAAE,iBAAiB,GAAG,kBAAkB,KAAK,IAAI,GAAG,IAAI,CAAC;IAC3G,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,UAAU,EAAE,QAAQ,EAAE,CAAC,YAAY,EAAE,sBAAsB,KAAK,IAAI,GAAG,IAAI,CAAC;IAC5F,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,eAAe,EAAE,QAAQ,EAAE,CAAC,KAAK,EAAE,eAAe,KAAK,IAAI,GAAG,IAAI,CAAC;CACpF;AAED,MAAM,MAAM,SAAS,GAAG,CAAC,YAAY,EAAE,eAAe,KAAK,IAAI,CAAC;AAEhE,qBAAa,eAAgB,SAAQ,YAAY;IAC/C,OAAO,CAAC,QAAQ,CAAC,CAAS;IAC1B,OAAO,CAAC,uBAAuB,CAAU;IACzC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;IACjC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAiB;IACxC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAwB;IAC/C,OAAO,CAAC,cAAc,CAAkB;IACjC,MAAM,EAAE,UAAU,CAAC;IAC1B,OAAO,CAAC,cAAc,CAAU;IAChC,OAAO,CAAC,gBAAgB,CAAW;IACnC,OAAO,CAAC,YAAY,CAAC,CAAkB;IACvC,OAAO,CAAC,aAAa,CAAM;IAE3B,gBAAuB,KAAK,eAAS;gBAEzB,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU;IAcxC,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IAOxC,OAAO,CAAC,aAAa;IAOrB,OAAO,CAAC,QAAQ,CAAC,SAAS,CAOxB;IAEF,OAAO,CAAC,QAAQ,CAAC,OAAO,CAItB;IAEF,OAAO,CAAC,QAAQ,CAAC,WAAW,CAM1B;IAEF,OAAO,CAAC,QAAQ,CAAC,MAAM,CAErB;IAEF,OAAO,CAAC,QAAQ,CAAC,OAAO,CAItB;IAEF;;;;;;;;;;;OAWG;IACI,OAAO,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,SAAS,GAAG,eAAe;YAmB3D,kBAAkB;IA8BzB,UAAU,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI;IAMxC;;;;OAIG;IACH,SAAgB,MAAM,aAOpB;IAEF;;;;;OAKG;IACH,SAAgB,IAAI,aAGlB;IAEK,QAAQ,IAAI,OAAO;IAI1B,OAAO,CAAC,iBAAiB;IAoBlB,6BAA6B;IAQ7B,mCAAmC;IAQnC,uBAAuB,CAAC,YAAY,EAAE,2BAA2B;CAgBzE"}
+{"version":3,"file":"WebSocketClient.d.ts","sourceRoot":"","sources":["../../src/tcp/WebSocketClient.ts"],"names":[],"mappings":"AAoBA,OAAO,EAAC,UAAU,EAAC,MAAM,wBAAwB,CAAC;AAElD,OAAO,EAAC,YAAY,EAAC,MAAM,QAAQ,CAAC;AAKpC,OAAO,EAAwB,eAAe,EAAC,MAAM,yBAAyB,CAAC;AAE/E,OAAO,EAAC,iBAAiB,EAA8B,kBAAkB,EAAC,MAAM,UAAU,CAAC;AAE3F,OAAO,EAAC,UAAU,EAAe,MAAM,UAAU,CAAC;AAClD,OAAO,EACL,sBAAsB,EACtB,2BAA2B,EAE3B,qCAAqC,EACtC,MAAM,wCAAwC,CAAC;AAEhD,aAAK,KAAK;IACR,QAAQ,mCAAmC;IAC3C,gBAAgB,2CAA2C;IAC3D,UAAU,qCAAqC;IAC/C,eAAe,0CAA0C;CAC1D;AAED,MAAM,WAAW,eAAe;IAC9B,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,QAAQ,EAAE,QAAQ,EAAE,CAAC,KAAK,EAAE,KAAK,GAAG,UAAU,KAAK,IAAI,GAAG,IAAI,CAAC;IAC/E,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,gBAAgB,EAAE,QAAQ,EAAE,CAAC,KAAK,EAAE,iBAAiB,GAAG,kBAAkB,KAAK,IAAI,GAAG,IAAI,CAAC;IAC3G,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,UAAU,EAAE,QAAQ,EAAE,CAAC,YAAY,EAAE,sBAAsB,KAAK,IAAI,GAAG,IAAI,CAAC;IAC5F,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,eAAe,EAAE,QAAQ,EAAE,CAAC,KAAK,EAAE,eAAe,KAAK,IAAI,GAAG,IAAI,CAAC;CACpF;AAED,MAAM,MAAM,SAAS,GAAG,CAAC,YAAY,EAAE,eAAe,KAAK,IAAI,CAAC;AAEhE,qBAAa,eAAgB,SAAQ,YAAY;IAC/C,OAAO,CAAC,QAAQ,CAAC,CAAS;IAC1B,OAAO,CAAC,uBAAuB,CAAU;IACzC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;IACjC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAiB;IACxC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAwB;IAC/C,OAAO,CAAC,cAAc,CAAkB;IACjC,MAAM,EAAE,UAAU,CAAC;IAC1B,OAAO,CAAC,cAAc,CAAU;IAChC,OAAO,CAAC,gBAAgB,CAAW;IACnC,OAAO,CAAC,YAAY,CAAC,CAAkB;IACvC,OAAO,CAAC,aAAa,CAAM;IAE3B,gBAAuB,KAAK,eAAS;gBAEzB,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU;IAcxC,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IAOxC,OAAO,CAAC,aAAa;IAOrB,OAAO,CAAC,QAAQ,CAAC,SAAS,CAOxB;IAEF,OAAO,CAAC,QAAQ,CAAC,OAAO,CAItB;IAEF,OAAO,CAAC,QAAQ,CAAC,WAAW,CAM1B;IAEF,OAAO,CAAC,QAAQ,CAAC,MAAM,CAErB;IAEF,OAAO,CAAC,QAAQ,CAAC,OAAO,CAItB;IAEF;;;;;;;;;;;OAWG;IACI,OAAO,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,SAAS,GAAG,eAAe;YAmB3D,kBAAkB;IA8BzB,UAAU,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI;IAMxC;;;;OAIG;IACH,SAAgB,MAAM,aAOpB;IAEF;;;;;OAKG;IACH,SAAgB,IAAI,aAGlB;IAEK,QAAQ,IAAI,OAAO;IAInB,iBAAiB,IAAI,MAAM;IAsC3B,6BAA6B;IAQ7B,gDAAgD,CAAC,YAAY,EAAE,qCAAqC;IAYpG,uBAAuB,CAAC,YAAY,EAAE,2BAA2B;CAgBzE"}

package/lib/tcp/WebSocketClient.js

@@ -186,21 +186,31 @@ class WebSocketClient extends events_1.EventEmitter {
         return this.isSocketLocked;
     }
     buildWebSocketUrl() {
-        const store = this.client.accessTokenStore.accessToken;
-        const token = store && store.access_token ? store.access_token : '';
-        if (!token) {
+        const { accessTokenStore: { getAccessToken, getNextMarkerToken }, } = this.client;
+        const accessToken = getAccessToken?.() ?? '';
+        const markerToken = getNextMarkerToken?.();
+        if (!accessToken) {
             this.logger.warn('Reconnecting WebSocket with unset token');
         }
         if (!this.versionPrefix) {
-            throw new Error('Backend api version is not set to connect to web socket');
+            throw new Error('Missing backend API version: cannot establish WebSocket connection');
         }
-        let url = `${this.baseUrl}${this.versionPrefix}/events?access_token=${token}`;
+        const queryParams = new URLSearchParams({
+            access_token: accessToken,
+        });
+        if (markerToken) {
+            queryParams.append('sync_marker', markerToken);
+        }
+        /**
+         * @note If no client ID is given, then the WebSocket connection
+         * will receive all notifications for all clients of the connected user
+         */
         if (this.clientId) {
-            // Note: If no client ID is given, then the WebSocket connection will receive all notifications for all clients
-            // of the connected user
-            url += `&client=${this.clientId}`;
+            queryParams.append('client', this.clientId);
         }
-        return url;
+        const queryString = queryParams.toString();
+        this.logger.info(`WebSocket URL: ${this.baseUrl}${this.versionPrefix}/events?${queryString}`);
+        return `${this.baseUrl}${this.versionPrefix}/events?${queryString}`;
     }
     acknowledgeMissedNotification() {
         const jsonEvent = JSON.stringify({
@@ -208,9 +218,13 @@ class WebSocketClient extends events_1.EventEmitter {
         });
         this.socket.send(jsonEvent);
     }
-    acknowledgeMessageCountNotification() {
+    acknowledgeConsumableNotificationSynchronization(notification) {
         const jsonEvent = JSON.stringify({
-            type: AcknowledgeEvent_types_1.AcknowledgeType.ACK_MESSAGE_COUNT,
+            type: AcknowledgeEvent_types_1.AcknowledgeType.ACK,
+            data: {
+                multiple: false,
+                delivery_tag: notification.data.delivery_tag,
+            },
         });
         this.socket.send(jsonEvent);
     }

package/package.json

@@ -70,6 +70,6 @@
     "watch": "webpack serve --config webpack.browser.js",
     "prepare": "yarn dist"
   },
-  "version": "27.67.1",
-  "gitHead": "e417cc7cd746d3d58ee03829bfe35b0122c361b7"
+  "version": "27.69.0",
+  "gitHead": "17c7dba776dee6377b3345588475c1b5c20db51a"
 }