@fluidframework/container-runtime 2.0.0-internal.2.3.1 → 2.0.0-internal.3.0.0

package/lib/opLifecycle/outbox.js.map

@@ -1 +1 @@
-{"version":3,"file":"outbox.js","sourceRoot":"","sources":["../../src/opLifecycle/outbox.ts"],"names":[],"mappings":"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","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { ITelemetryLogger } from \"@fluidframework/common-definitions\";\nimport { assert } from \"@fluidframework/common-utils\";\nimport { IContainerContext } from \"@fluidframework/container-definitions\";\nimport { GenericError } from \"@fluidframework/container-utils\";\nimport { MessageType } from \"@fluidframework/protocol-definitions\";\nimport { ICompressionRuntimeOptions } from \"../containerRuntime\";\nimport { PendingStateManager } from \"../pendingStateManager\";\nimport { BatchManager } from \"./batchManager\";\nimport { BatchMessage, IBatch } from \"./definitions\";\nimport { OpCompressor } from \"./opCompressor\";\nimport { OpSplitter } from \"./opSplitter\";\n\nexport interface IOutboxConfig {\n    readonly compressionOptions: ICompressionRuntimeOptions;\n    // The maximum size of a batch that we can send over the wire.\n    readonly maxBatchSizeInBytes: number;\n    readonly enableOpReentryCheck?: boolean;\n};\n\nexport interface IOutboxParameters {\n    readonly shouldSend: () => boolean,\n    readonly pendingStateManager: PendingStateManager,\n    readonly containerContext: IContainerContext,\n    readonly config: IOutboxConfig,\n    readonly compressor: OpCompressor;\n    readonly splitter: OpSplitter;\n    readonly logger: ITelemetryLogger;\n}\n\nexport class Outbox {\n    private readonly attachFlowBatch: BatchManager;\n    private readonly mainBatch: BatchManager;\n    private readonly defaultAttachFlowSoftLimitInBytes = 64 * 1024;\n\n    constructor(private readonly params: IOutboxParameters) {\n        const isCompressionEnabled = this.params.config.compressionOptions.minimumBatchSizeInBytes !== Number.POSITIVE_INFINITY;\n        // We need to allow infinite size batches if we enable compression\n        const hardLimit = isCompressionEnabled ? Infinity : this.params.config.maxBatchSizeInBytes;\n        const softLimit = isCompressionEnabled ? Infinity : this.defaultAttachFlowSoftLimitInBytes;\n\n        this.attachFlowBatch = new BatchManager({\n            hardLimit,\n            softLimit,\n            enableOpReentryCheck: params.config.enableOpReentryCheck,\n        }, params.logger);\n        this.mainBatch = new BatchManager({\n            hardLimit,\n            enableOpReentryCheck: params.config.enableOpReentryCheck,\n        }, params.logger);\n    }\n\n    public get isEmpty(): boolean {\n        return this.attachFlowBatch.length === 0 && this.mainBatch.length === 0;\n    }\n\n    public submit(message: BatchMessage) {\n        if (!this.mainBatch.push(message)) {\n            throw new GenericError(\n                \"BatchTooLarge\",\n                /* error */ undefined,\n                {\n                    opSize: (message.contents?.length) ?? 0,\n                    count: this.mainBatch.length,\n                    limit: this.mainBatch.options.hardLimit,\n                });\n        }\n    }\n\n    public submitAttach(message: BatchMessage) {\n        if (!this.attachFlowBatch.push(message)) {\n            // BatchManager has two limits - soft limit & hard limit. Soft limit is only engaged\n            // when queue is not empty.\n            // Flush queue & retry. Failure on retry would mean - single message is bigger than hard limit\n            this.flushInternal(this.attachFlowBatch.popBatch());\n            if (!this.attachFlowBatch.push(message)) {\n                throw new GenericError(\n                    \"BatchTooLarge\",\n                    /* error */ undefined,\n                    {\n                        opSize: (message.contents?.length) ?? 0,\n                        count: this.attachFlowBatch.length,\n                        limit: this.attachFlowBatch.options.hardLimit,\n                    });\n            }\n        }\n\n        // If compression is enabled, we will always successfully receive\n        // attach ops and compress then send them at the next JS turn, regardless\n        // of the overall size of the accumulated ops in the batch.\n        // However, it is more efficient to flush these ops faster, preferably\n        // after they reach a size which would benefit from compression.\n        if (this.attachFlowBatch.contentSizeInBytes >= this.params.config.compressionOptions.minimumBatchSizeInBytes) {\n            this.flushInternal(this.attachFlowBatch.popBatch());\n        }\n    }\n\n    public flush() {\n        this.flushInternal(this.attachFlowBatch.popBatch());\n        this.flushInternal(this.mainBatch.popBatch());\n    }\n\n    private flushInternal(rawBatch: IBatch) {\n        const processedBatch = this.compressBatch(rawBatch);\n        const clientSequenceNumber = this.sendBatch(processedBatch);\n\n        this.persistBatch(clientSequenceNumber, rawBatch.content);\n    }\n\n    private compressBatch(batch: IBatch): IBatch {\n        if (batch.content.length === 0\n            || this.params.config.compressionOptions === undefined\n            || this.params.config.compressionOptions.minimumBatchSizeInBytes > batch.contentSizeInBytes) {\n            // Nothing to do if the batch is empty or if compression is disabled or if we don't need to compress\n            return batch;\n        }\n\n        const compressedBatch = this.params.compressor.compressBatch(batch);\n        if (compressedBatch.contentSizeInBytes <= this.params.config.maxBatchSizeInBytes) {\n            // If we don't reach the maximum supported size of a batch, it can safely be sent as is\n            return compressedBatch;\n        }\n\n        if (this.params.splitter.isBatchChunkingEnabled) {\n            return this.params.splitter.splitCompressedBatch(compressedBatch);\n        }\n\n        // If we've reached this point, the runtime would attempt to send a batch larger than the allowed size\n        throw new GenericError(\n            \"BatchTooLarge\",\n            /* error */ undefined,\n            {\n                opSize: batch.contentSizeInBytes,\n                count: batch.content.length,\n                limit: this.params.config.maxBatchSizeInBytes,\n                compressed: true,\n            });\n    }\n\n    /**\n     * Sends the batch object to the container context to be sent over the wire.\n     *\n     * @param batch - batch to be sent\n     * @returns the client sequence number of the last batched op which was sent and\n     * -1 if there are no ops or the container cannot send ops.\n     */\n    private sendBatch(batch: IBatch): number {\n        let clientSequenceNumber: number = -1;\n        const length = batch.content.length;\n\n        // Did we disconnect in the middle of turn-based batch?\n        // If so, do nothing, as pending state manager will resubmit it correctly on reconnect.\n        if (length === 0 || !this.params.shouldSend()) {\n            return clientSequenceNumber;\n        }\n\n        if (this.params.containerContext.submitBatchFn === undefined) {\n            // Legacy path - supporting old loader versions. Can be removed only when LTS moves above\n            // version that has support for batches (submitBatchFn)\n            for (const message of batch.content) {\n                // Legacy path doesn't support compressed payloads and will submit uncompressed payload anyways\n                if (message.metadata?.compressed) {\n                    delete message.metadata.compressed;\n                }\n\n                clientSequenceNumber = this.params.containerContext.submitFn(\n                    MessageType.Operation,\n                    message.deserializedContent,\n                    true, // batch\n                    message.metadata);\n            }\n\n            this.params.containerContext.deltaManager.flush();\n        } else {\n            // returns clientSequenceNumber of last message in a batch\n            clientSequenceNumber = this.params.containerContext.submitBatchFn(\n                batch.content.map((message) => ({\n                    contents: message.contents,\n                    metadata: message.metadata,\n                    compression: message.compression,\n                })));\n        }\n\n        // Convert from clientSequenceNumber of last message in the batch to clientSequenceNumber of first message.\n        clientSequenceNumber -= length - 1;\n        assert(clientSequenceNumber >= 0, 0x3d0 /* clientSequenceNumber can't be negative */);\n        return clientSequenceNumber;\n    }\n\n    private persistBatch(initialClientSequenceNumber: number, batch: BatchMessage[]) {\n        let clientSequenceNumber = initialClientSequenceNumber;\n        // Let the PendingStateManager know that a message was submitted.\n        // In future, need to shift toward keeping batch as a whole!\n        for (const message of batch) {\n            this.params.pendingStateManager.onSubmitMessage(\n                message.deserializedContent.type,\n                clientSequenceNumber,\n                message.referenceSequenceNumber,\n                message.deserializedContent.contents,\n                message.localOpMetadata,\n                message.metadata,\n            );\n\n            clientSequenceNumber++;\n        }\n\n        this.params.pendingStateManager.onFlush();\n    }\n\n    public checkpoint() {\n        return {\n            mainBatch: this.mainBatch.checkpoint(),\n            attachFlowBatch: this.attachFlowBatch.checkpoint(),\n        };\n    }\n}\n"]}
+{"version":3,"file":"outbox.js","sourceRoot":"","sources":["../../src/opLifecycle/outbox.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EAAE,MAAM,EAAE,MAAM,8BAA8B,CAAC;AAEtD,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AAGnE,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAU7C,CAAC;AAYF,MAAM,OAAO,MAAM;IAKf,YAA6B,MAAyB;QAAzB,WAAM,GAAN,MAAM,CAAmB;QAFrC,sCAAiC,GAAG,EAAE,GAAG,IAAI,CAAC;QAG3D,MAAM,oBAAoB,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,kBAAkB,CAAC,uBAAuB,KAAK,MAAM,CAAC,iBAAiB,CAAC;QACxH,kEAAkE;QAClE,MAAM,SAAS,GAAG,oBAAoB,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,mBAAmB,CAAC;QAC3F,MAAM,SAAS,GAAG,oBAAoB,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,iCAAiC,CAAC;QAE3F,IAAI,CAAC,eAAe,GAAG,IAAI,YAAY,CAAC;YACpC,SAAS;YACT,SAAS;YACT,oBAAoB,EAAE,MAAM,CAAC,MAAM,CAAC,oBAAoB;SAC3D,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;QAClB,IAAI,CAAC,SAAS,GAAG,IAAI,YAAY,CAAC;YAC9B,SAAS;YACT,oBAAoB,EAAE,MAAM,CAAC,MAAM,CAAC,oBAAoB;SAC3D,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;IACtB,CAAC;IAED,IAAW,OAAO;QACd,OAAO,IAAI,CAAC,eAAe,CAAC,MAAM,KAAK,CAAC,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,KAAK,CAAC,CAAC;IAC5E,CAAC;IAEM,MAAM,CAAC,OAAqB;;QAC/B,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE;YAC/B,MAAM,IAAI,YAAY,CAClB,eAAe;YACf,WAAW,CAAC,SAAS,EACrB;gBACI,MAAM,EAAE,MAAA,CAAC,MAAA,OAAO,CAAC,QAAQ,0CAAE,MAAM,CAAC,mCAAI,CAAC;gBACvC,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM;gBAC5B,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,SAAS;aAC1C,CAAC,CAAC;SACV;IACL,CAAC;IAEM,YAAY,CAAC,OAAqB;;QACrC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE;YACrC,oFAAoF;YACpF,2BAA2B;YAC3B,8FAA8F;YAC9F,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,eAAe,CAAC,QAAQ,EAAE,CAAC,CAAC;YACpD,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE;gBACrC,MAAM,IAAI,YAAY,CAClB,eAAe;gBACf,WAAW,CAAC,SAAS,EACrB;oBACI,MAAM,EAAE,MAAA,CAAC,MAAA,OAAO,CAAC,QAAQ,0CAAE,MAAM,CAAC,mCAAI,CAAC;oBACvC,KAAK,EAAE,IAAI,CAAC,eAAe,CAAC,MAAM;oBAClC,KAAK,EAAE,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,SAAS;iBAChD,CAAC,CAAC;aACV;SACJ;QAED,iEAAiE;QACjE,yEAAyE;QACzE,2DAA2D;QAC3D,sEAAsE;QACtE,gEAAgE;QAChE,IAAI,IAAI,CAAC,eAAe,CAAC,kBAAkB,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,kBAAkB,CAAC,uBAAuB,EAAE;YAC1G,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,eAAe,CAAC,QAAQ,EAAE,CAAC,CAAC;SACvD;IACL,CAAC;IAEM,KAAK;QACR,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,eAAe,CAAC,QAAQ,EAAE,CAAC,CAAC;QACpD,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC,CAAC;IAClD,CAAC;IAEO,aAAa,CAAC,QAAgB;QAClC,MAAM,cAAc,GAAG,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;QACpD,MAAM,oBAAoB,GAAG,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;QAE5D,IAAI,CAAC,YAAY,CAAC,oBAAoB,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAC;IAC9D,CAAC;IAEO,aAAa,CAAC,KAAa;QAC/B,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC;eACvB,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,kBAAkB,KAAK,SAAS;eACnD,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,kBAAkB,CAAC,uBAAuB,GAAG,KAAK,CAAC,kBAAkB,EAAE;YAC7F,oGAAoG;YACpG,OAAO,KAAK,CAAC;SAChB;QAED,MAAM,eAAe,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QACpE,IAAI,eAAe,CAAC,kBAAkB,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,mBAAmB,EAAE;YAC9E,uFAAuF;YACvF,OAAO,eAAe,CAAC;SAC1B;QAED,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,sBAAsB,EAAE;YAC7C,OAAO,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,oBAAoB,CAAC,eAAe,CAAC,CAAC;SACrE;QAED,sGAAsG;QACtG,MAAM,IAAI,YAAY,CAClB,eAAe;QACf,WAAW,CAAC,SAAS,EACrB;YACI,MAAM,EAAE,KAAK,CAAC,kBAAkB;YAChC,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC,MAAM;YAC3B,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,mBAAmB;YAC7C,UAAU,EAAE,IAAI;SACnB,CAAC,CAAC;IACX,CAAC;IAED;;;;;;OAMG;IACK,SAAS,CAAC,KAAa;;QAC3B,IAAI,oBAAoB,GAAW,CAAC,CAAC,CAAC;QACtC,MAAM,MAAM,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC;QAEpC,uDAAuD;QACvD,uFAAuF;QACvF,IAAI,MAAM,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,EAAE;YAC3C,OAAO,oBAAoB,CAAC;SAC/B;QAED,IAAI,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,aAAa,KAAK,SAAS,EAAE;YAC1D,yFAAyF;YACzF,uDAAuD;YACvD,KAAK,MAAM,OAAO,IAAI,KAAK,CAAC,OAAO,EAAE;gBACjC,+FAA+F;gBAC/F,IAAI,MAAA,OAAO,CAAC,QAAQ,0CAAE,UAAU,EAAE;oBAC9B,OAAO,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC;iBACtC;gBAED,oBAAoB,GAAG,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,QAAQ,CACxD,WAAW,CAAC,SAAS,EACrB,OAAO,CAAC,mBAAmB,EAC3B,IAAI,EAAE,QAAQ;gBACd,OAAO,CAAC,QAAQ,CAAC,CAAC;aACzB;YAED,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC;SACrD;aAAM;YACH,0DAA0D;YAC1D,oBAAoB,GAAG,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,aAAa,CAC7D,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;gBAC5B,QAAQ,EAAE,OAAO,CAAC,QAAQ;gBAC1B,QAAQ,EAAE,OAAO,CAAC,QAAQ;gBAC1B,WAAW,EAAE,OAAO,CAAC,WAAW;aACnC,CAAC,CAAC,CAAC,CAAC;SACZ;QAED,2GAA2G;QAC3G,oBAAoB,IAAI,MAAM,GAAG,CAAC,CAAC;QACnC,MAAM,CAAC,oBAAoB,IAAI,CAAC,EAAE,KAAK,CAAC,4CAA4C,CAAC,CAAC;QACtF,OAAO,oBAAoB,CAAC;IAChC,CAAC;IAEO,YAAY,CAAC,2BAAmC,EAAE,KAAqB;QAC3E,IAAI,oBAAoB,GAAG,2BAA2B,CAAC;QACvD,iEAAiE;QACjE,4DAA4D;QAC5D,KAAK,MAAM,OAAO,IAAI,KAAK,EAAE;YACzB,IAAI,CAAC,MAAM,CAAC,mBAAmB,CAAC,eAAe,CAC3C,OAAO,CAAC,mBAAmB,CAAC,IAAI,EAChC,oBAAoB,EACpB,OAAO,CAAC,uBAAuB,EAC/B,OAAO,CAAC,mBAAmB,CAAC,QAAQ,EACpC,OAAO,CAAC,eAAe,EACvB,OAAO,CAAC,QAAQ,CACnB,CAAC;YAEF,oBAAoB,EAAE,CAAC;SAC1B;IACL,CAAC;IAEM,UAAU;QACb,OAAO;YACH,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,UAAU,EAAE;YACtC,eAAe,EAAE,IAAI,CAAC,eAAe,CAAC,UAAU,EAAE;SACrD,CAAC;IACN,CAAC;CACJ","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { ITelemetryLogger } from \"@fluidframework/common-definitions\";\nimport { assert } from \"@fluidframework/common-utils\";\nimport { IContainerContext } from \"@fluidframework/container-definitions\";\nimport { GenericError } from \"@fluidframework/container-utils\";\nimport { MessageType } from \"@fluidframework/protocol-definitions\";\nimport { ICompressionRuntimeOptions } from \"../containerRuntime\";\nimport { PendingStateManager } from \"../pendingStateManager\";\nimport { BatchManager } from \"./batchManager\";\nimport { BatchMessage, IBatch } from \"./definitions\";\nimport { OpCompressor } from \"./opCompressor\";\nimport { OpSplitter } from \"./opSplitter\";\n\nexport interface IOutboxConfig {\n    readonly compressionOptions: ICompressionRuntimeOptions;\n    // The maximum size of a batch that we can send over the wire.\n    readonly maxBatchSizeInBytes: number;\n    readonly enableOpReentryCheck?: boolean;\n};\n\nexport interface IOutboxParameters {\n    readonly shouldSend: () => boolean,\n    readonly pendingStateManager: PendingStateManager,\n    readonly containerContext: IContainerContext,\n    readonly config: IOutboxConfig,\n    readonly compressor: OpCompressor;\n    readonly splitter: OpSplitter;\n    readonly logger: ITelemetryLogger;\n}\n\nexport class Outbox {\n    private readonly attachFlowBatch: BatchManager;\n    private readonly mainBatch: BatchManager;\n    private readonly defaultAttachFlowSoftLimitInBytes = 64 * 1024;\n\n    constructor(private readonly params: IOutboxParameters) {\n        const isCompressionEnabled = this.params.config.compressionOptions.minimumBatchSizeInBytes !== Number.POSITIVE_INFINITY;\n        // We need to allow infinite size batches if we enable compression\n        const hardLimit = isCompressionEnabled ? Infinity : this.params.config.maxBatchSizeInBytes;\n        const softLimit = isCompressionEnabled ? Infinity : this.defaultAttachFlowSoftLimitInBytes;\n\n        this.attachFlowBatch = new BatchManager({\n            hardLimit,\n            softLimit,\n            enableOpReentryCheck: params.config.enableOpReentryCheck,\n        }, params.logger);\n        this.mainBatch = new BatchManager({\n            hardLimit,\n            enableOpReentryCheck: params.config.enableOpReentryCheck,\n        }, params.logger);\n    }\n\n    public get isEmpty(): boolean {\n        return this.attachFlowBatch.length === 0 && this.mainBatch.length === 0;\n    }\n\n    public submit(message: BatchMessage) {\n        if (!this.mainBatch.push(message)) {\n            throw new GenericError(\n                \"BatchTooLarge\",\n                /* error */ undefined,\n                {\n                    opSize: (message.contents?.length) ?? 0,\n                    count: this.mainBatch.length,\n                    limit: this.mainBatch.options.hardLimit,\n                });\n        }\n    }\n\n    public submitAttach(message: BatchMessage) {\n        if (!this.attachFlowBatch.push(message)) {\n            // BatchManager has two limits - soft limit & hard limit. Soft limit is only engaged\n            // when queue is not empty.\n            // Flush queue & retry. Failure on retry would mean - single message is bigger than hard limit\n            this.flushInternal(this.attachFlowBatch.popBatch());\n            if (!this.attachFlowBatch.push(message)) {\n                throw new GenericError(\n                    \"BatchTooLarge\",\n                    /* error */ undefined,\n                    {\n                        opSize: (message.contents?.length) ?? 0,\n                        count: this.attachFlowBatch.length,\n                        limit: this.attachFlowBatch.options.hardLimit,\n                    });\n            }\n        }\n\n        // If compression is enabled, we will always successfully receive\n        // attach ops and compress then send them at the next JS turn, regardless\n        // of the overall size of the accumulated ops in the batch.\n        // However, it is more efficient to flush these ops faster, preferably\n        // after they reach a size which would benefit from compression.\n        if (this.attachFlowBatch.contentSizeInBytes >= this.params.config.compressionOptions.minimumBatchSizeInBytes) {\n            this.flushInternal(this.attachFlowBatch.popBatch());\n        }\n    }\n\n    public flush() {\n        this.flushInternal(this.attachFlowBatch.popBatch());\n        this.flushInternal(this.mainBatch.popBatch());\n    }\n\n    private flushInternal(rawBatch: IBatch) {\n        const processedBatch = this.compressBatch(rawBatch);\n        const clientSequenceNumber = this.sendBatch(processedBatch);\n\n        this.persistBatch(clientSequenceNumber, rawBatch.content);\n    }\n\n    private compressBatch(batch: IBatch): IBatch {\n        if (batch.content.length === 0\n            || this.params.config.compressionOptions === undefined\n            || this.params.config.compressionOptions.minimumBatchSizeInBytes > batch.contentSizeInBytes) {\n            // Nothing to do if the batch is empty or if compression is disabled or if we don't need to compress\n            return batch;\n        }\n\n        const compressedBatch = this.params.compressor.compressBatch(batch);\n        if (compressedBatch.contentSizeInBytes <= this.params.config.maxBatchSizeInBytes) {\n            // If we don't reach the maximum supported size of a batch, it can safely be sent as is\n            return compressedBatch;\n        }\n\n        if (this.params.splitter.isBatchChunkingEnabled) {\n            return this.params.splitter.splitCompressedBatch(compressedBatch);\n        }\n\n        // If we've reached this point, the runtime would attempt to send a batch larger than the allowed size\n        throw new GenericError(\n            \"BatchTooLarge\",\n            /* error */ undefined,\n            {\n                opSize: batch.contentSizeInBytes,\n                count: batch.content.length,\n                limit: this.params.config.maxBatchSizeInBytes,\n                compressed: true,\n            });\n    }\n\n    /**\n     * Sends the batch object to the container context to be sent over the wire.\n     *\n     * @param batch - batch to be sent\n     * @returns the client sequence number of the last batched op which was sent and\n     * -1 if there are no ops or the container cannot send ops.\n     */\n    private sendBatch(batch: IBatch): number {\n        let clientSequenceNumber: number = -1;\n        const length = batch.content.length;\n\n        // Did we disconnect in the middle of turn-based batch?\n        // If so, do nothing, as pending state manager will resubmit it correctly on reconnect.\n        if (length === 0 || !this.params.shouldSend()) {\n            return clientSequenceNumber;\n        }\n\n        if (this.params.containerContext.submitBatchFn === undefined) {\n            // Legacy path - supporting old loader versions. Can be removed only when LTS moves above\n            // version that has support for batches (submitBatchFn)\n            for (const message of batch.content) {\n                // Legacy path doesn't support compressed payloads and will submit uncompressed payload anyways\n                if (message.metadata?.compressed) {\n                    delete message.metadata.compressed;\n                }\n\n                clientSequenceNumber = this.params.containerContext.submitFn(\n                    MessageType.Operation,\n                    message.deserializedContent,\n                    true, // batch\n                    message.metadata);\n            }\n\n            this.params.containerContext.deltaManager.flush();\n        } else {\n            // returns clientSequenceNumber of last message in a batch\n            clientSequenceNumber = this.params.containerContext.submitBatchFn(\n                batch.content.map((message) => ({\n                    contents: message.contents,\n                    metadata: message.metadata,\n                    compression: message.compression,\n                })));\n        }\n\n        // Convert from clientSequenceNumber of last message in the batch to clientSequenceNumber of first message.\n        clientSequenceNumber -= length - 1;\n        assert(clientSequenceNumber >= 0, 0x3d0 /* clientSequenceNumber can't be negative */);\n        return clientSequenceNumber;\n    }\n\n    private persistBatch(initialClientSequenceNumber: number, batch: BatchMessage[]) {\n        let clientSequenceNumber = initialClientSequenceNumber;\n        // Let the PendingStateManager know that a message was submitted.\n        // In future, need to shift toward keeping batch as a whole!\n        for (const message of batch) {\n            this.params.pendingStateManager.onSubmitMessage(\n                message.deserializedContent.type,\n                clientSequenceNumber,\n                message.referenceSequenceNumber,\n                message.deserializedContent.contents,\n                message.localOpMetadata,\n                message.metadata,\n            );\n\n            clientSequenceNumber++;\n        }\n    }\n\n    public checkpoint() {\n        return {\n            mainBatch: this.mainBatch.checkpoint(),\n            attachFlowBatch: this.attachFlowBatch.checkpoint(),\n        };\n    }\n}\n"]}

package/lib/packageVersion.d.ts

@@ -5,5 +5,5 @@
  * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY
  */
 export declare const pkgName = "@fluidframework/container-runtime";
-export declare const pkgVersion = "2.0.0-internal.2.3.1";
+export declare const pkgVersion = "2.0.0-internal.3.0.0";
 //# sourceMappingURL=packageVersion.d.ts.map

package/lib/packageVersion.js

@@ -5,5 +5,5 @@
  * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY
  */
 export const pkgName = "@fluidframework/container-runtime";
-export const pkgVersion = "2.0.0-internal.2.3.1";
+export const pkgVersion = "2.0.0-internal.3.0.0";
 //# sourceMappingURL=packageVersion.js.map

package/lib/packageVersion.js.map

@@ -1 +1 @@
-{"version":3,"file":"packageVersion.js","sourceRoot":"","sources":["../src/packageVersion.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,MAAM,CAAC,MAAM,OAAO,GAAG,mCAAmC,CAAC;AAC3D,MAAM,CAAC,MAAM,UAAU,GAAG,sBAAsB,CAAC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n *\n * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY\n */\n\nexport const pkgName = \"@fluidframework/container-runtime\";\nexport const pkgVersion = \"2.0.0-internal.2.3.1\";\n"]}
+{"version":3,"file":"packageVersion.js","sourceRoot":"","sources":["../src/packageVersion.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,MAAM,CAAC,MAAM,OAAO,GAAG,mCAAmC,CAAC;AAC3D,MAAM,CAAC,MAAM,UAAU,GAAG,sBAAsB,CAAC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n *\n * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY\n */\n\nexport const pkgName = \"@fluidframework/container-runtime\";\nexport const pkgVersion = \"2.0.0-internal.3.0.0\";\n"]}

package/lib/pendingStateManager.d.ts

@@ -22,6 +22,7 @@ export interface IPendingMessage {
 /**
  * This represents an explicit flush call and is added to the pending queue when flush is called on the ContainerRuntime
  * to flush pending messages.
+ * @deprecated Use batch metadata on IPendingMessage instead. To be removed in 2.0.0-internal.4.0.0 (AB#2496)
  */
 export interface IPendingFlush {
     type: "flush";
@@ -38,7 +39,6 @@ export interface IRuntimeStateHandler {
     clientId(): string | undefined;
     close(error?: ICriticalContainerError): void;
     applyStashedOp: (type: ContainerMessageType, content: ISequencedDocumentMessage) => Promise<unknown>;
-    flush(): void;
     reSubmit(type: ContainerMessageType, content: any, localOpMetadata: unknown, opMetadata: Record<string, unknown> | undefined): void;
     rollback(type: ContainerMessageType, content: any, localOpMetadata: unknown): void;
     orderSequentially(callback: () => void): void;
@@ -54,16 +54,15 @@ export interface IRuntimeStateHandler {
  */
 export declare class PendingStateManager implements IDisposable {
     private readonly stateHandler;
-    private readonly pendingStates;
-    private readonly initialStates;
+    private readonly pendingMessages;
+    private readonly initialMessages;
     private readonly disposeOnce;
-    private _pendingMessagesCount;
     get pendingMessagesCount(): number;
     private isProcessingBatch;
     private pendingBatchBeginMessage;
     private clientId;
     /**
-     * Called to check if there are any pending messages in the pending state queue.
+     * Called to check if there are any pending messages in the pending message queue.
      * @returns A boolean indicating whether there are messages or not.
      */
     hasPendingMessages(): boolean;
@@ -80,10 +79,6 @@ export declare class PendingStateManager implements IDisposable {
      * @param localOpMetadata - The local metadata associated with the message.
      */
     onSubmitMessage(type: ContainerMessageType, clientSequenceNumber: number, referenceSequenceNumber: number, content: any, localOpMetadata: unknown, opMetadata: Record<string, unknown> | undefined): void;
-    /**
-     * Called when flush() is called on the ContainerRuntime to manually flush messages.
-     */
-    onFlush(): void;
     /**
      * Applies stashed ops at their reference sequence number so they are ready to be ACKed or resubmitted
      * @param seqNum - Sequence number at which to apply ops. Will apply all ops if seqNum is undefined.
@@ -105,10 +100,6 @@ export declare class PendingStateManager implements IDisposable {
      * @param message - The message that is being processed.
      */
     private maybeProcessBatchEnd;
-    /**
-     * Returns the next pending state from the pending state queue.
-     */
-    private peekNextPendingState;
     /**
      * Called when the Container's connection state changes. If the Container gets connected, it replays all the pending
      * states in its queue. This includes triggering resubmission of unacked ops.

package/lib/pendingStateManager.d.ts.map

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

package/lib/pendingStateManager.js

@@ -17,38 +17,74 @@ import { pkgVersion } from "./packageVersion";
  */
 export class PendingStateManager {
     constructor(stateHandler, initialLocalState) {
-        var _a;
+        var _a, _b;
         this.stateHandler = stateHandler;
-        this.pendingStates = new Deque();
+        this.pendingMessages = new Deque();
+        this.initialMessages = new Deque();
         this.disposeOnce = new Lazy(() => {
-            this.initialStates.clear();
-            this.pendingStates.clear();
+            this.initialMessages.clear();
+            this.pendingMessages.clear();
         });
-        // Maintains the count of messages that are currently unacked.
-        this._pendingMessagesCount = 0;
         // Indicates whether we are processing a batch.
         this.isProcessingBatch = false;
         this.dispose = () => this.disposeOnce.value;
-        this.initialStates = new Deque((_a = initialLocalState === null || initialLocalState === void 0 ? void 0 : initialLocalState.pendingStates) !== null && _a !== void 0 ? _a : []);
+        /**
+         * Convert old local state format to the new format
+         * The old format contained "flush" messages as the indicator of batch ends
+         * The new format instead uses batch metadata on the last message to indicate batch ends
+         * ! TODO: Remove this conversion in "2.0.0-internal.4.0.0" as rollback from future version will be new format
+         * AB#2496 tracks removal
+         */
+        if (initialLocalState === null || initialLocalState === void 0 ? void 0 : initialLocalState.pendingStates) {
+            const pendingStates = initialLocalState === null || initialLocalState === void 0 ? void 0 : initialLocalState.pendingStates;
+            let currentlyBatching = false;
+            for (let i = 0; i < pendingStates.length; i++) {
+                const initialState = pendingStates[i];
+                // Skip over "flush" messages
+                if (initialState.type === "message") {
+                    if ((_a = initialState.opMetadata) === null || _a === void 0 ? void 0 : _a.batch) {
+                        currentlyBatching = true;
+                    }
+                    else if (((_b = initialState.opMetadata) === null || _b === void 0 ? void 0 : _b.batch) === false) {
+                        currentlyBatching = false;
+                    }
+                    else if (
+                    // End of batch if we are currently batching and this is last message or next message is flush
+                    currentlyBatching
+                        && (i === pendingStates.length - 1 || pendingStates[i + 1].type === "flush")) {
+                        currentlyBatching = false;
+                        initialState.opMetadata = Object.assign(Object.assign({}, initialState.opMetadata), { batch: false });
+                    }
+                    this.initialMessages.push(initialState);
+                }
+            }
+        }
     }
     get pendingMessagesCount() {
-        return this._pendingMessagesCount;
+        return this.pendingMessages.length;
     }
     /**
-     * Called to check if there are any pending messages in the pending state queue.
+     * Called to check if there are any pending messages in the pending message queue.
      * @returns A boolean indicating whether there are messages or not.
      */
     hasPendingMessages() {
-        return this._pendingMessagesCount !== 0 || !this.initialStates.isEmpty();
+        return !this.pendingMessages.isEmpty() || !this.initialMessages.isEmpty();
     }
     getLocalState() {
-        assert(this.initialStates.isEmpty(), 0x2e9 /* "Must call getLocalState() after applying initial states" */);
-        if (this.hasPendingMessages()) {
+        assert(this.initialMessages.isEmpty(), 0x2e9 /* "Must call getLocalState() after applying initial states" */);
+        if (!this.pendingMessages.isEmpty()) {
             return {
-                pendingStates: this.pendingStates.toArray().map(
-                // delete localOpMetadata since it may not be serializable
-                // and will be regenerated by applyStashedOp()
-                (state) => state.type === "message" ? Object.assign(Object.assign({}, state), { localOpMetadata: undefined }) : state),
+                pendingStates: this.pendingMessages.toArray().reduce((arr, message) => {
+                    var _a;
+                    // delete localOpMetadata since it may not be serializable
+                    // and will be regenerated by applyStashedOp()
+                    arr.push(Object.assign(Object.assign({}, message), { localOpMetadata: undefined }));
+                    // TODO: Remove in 2.0.0-internal.4.0.0 (AB#2496)
+                    if (((_a = message.opMetadata) === null || _a === void 0 ? void 0 : _a.batch) === false) {
+                        arr.push({ type: "flush" });
+                    }
+                    return arr;
+                }, new Array()),
             };
         }
     }
@@ -71,20 +107,7 @@ export class PendingStateManager {
             localOpMetadata,
             opMetadata,
         };
-        this.pendingStates.push(pendingMessage);
-        this._pendingMessagesCount++;
-    }
-    /**
-     * Called when flush() is called on the ContainerRuntime to manually flush messages.
-     */
-    onFlush() {
-        // If the previous state is not a message, flush is a no-op.
-        const previousState = this.pendingStates.peekBack();
-        if ((previousState === null || previousState === void 0 ? void 0 : previousState.type) !== "message") {
-            return;
-        }
-        // An explicit flush is interesting and is tracked only if there are messages sent in TurnBased mode.
-        this.pendingStates.push({ type: "flush" });
+        this.pendingMessages.push(pendingMessage);
     }
     /**
      * Applies stashed ops at their reference sequence number so they are ready to be ACKed or resubmitted
@@ -92,29 +115,23 @@ export class PendingStateManager {
      */
     async applyStashedOpsAt(seqNum) {
         // apply stashed ops at sequence number
-        while (!this.initialStates.isEmpty()) {
+        while (!this.initialMessages.isEmpty()) {
             // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-            const nextState = this.initialStates.peekFront();
-            if (nextState.type === "message") {
-                if (seqNum !== undefined) {
-                    if (nextState.referenceSequenceNumber > seqNum) {
-                        break; // nothing left to do at this sequence number
-                    }
-                    else if (nextState.referenceSequenceNumber < seqNum) {
-                        throw new Error("loaded from snapshot too recent to apply stashed ops");
-                    }
+            const nextMessage = this.initialMessages.peekFront();
+            if (seqNum !== undefined) {
+                if (nextMessage.referenceSequenceNumber > seqNum) {
+                    break; // nothing left to do at this sequence number
+                }
+                if (nextMessage.referenceSequenceNumber < seqNum) {
+                    throw new Error("loaded from snapshot too recent to apply stashed ops");
                 }
-                // applyStashedOp will cause the DDS to behave as if it has sent the op but not actually send it
-                const localOpMetadata = await this.stateHandler.applyStashedOp(nextState.messageType, nextState.content);
-                nextState.localOpMetadata = localOpMetadata;
             }
-            // then we push onto pendingStates which will cause PendingStateManager to resubmit when we connect
+            // applyStashedOp will cause the DDS to behave as if it has sent the op but not actually send it
+            const localOpMetadata = await this.stateHandler.applyStashedOp(nextMessage.messageType, nextMessage.content);
+            nextMessage.localOpMetadata = localOpMetadata;
+            // then we push onto pendingMessages which will cause PendingStateManager to resubmit when we connect
             // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-            const firstPendingState = this.initialStates.shift();
-            this.pendingStates.push(firstPendingState);
-            if (firstPendingState.type === "message") {
-                this._pendingMessagesCount++;
-            }
+            this.pendingMessages.push(this.initialMessages.shift());
         }
     }
     /**
@@ -125,23 +142,21 @@ export class PendingStateManager {
     processPendingLocalMessage(message) {
         // Pre-processing part - This may be the start of a batch.
         this.maybeProcessBatchBegin(message);
-        // Get the next state from the pending queue and verify that it is of type "message".
-        const pendingState = this.peekNextPendingState();
-        assert(pendingState.type === "message", 0x169 /* "No pending message found for this remote message" */);
-        this.pendingStates.shift();
+        // Get the next message from the pending queue. Verify a message exists.
+        const pendingMessage = this.pendingMessages.peekFront();
+        assert(pendingMessage !== undefined, 0x169 /* "No pending message found for this remote message" */);
+        this.pendingMessages.shift();
         // Processing part - Verify that there has been no data corruption.
         // The clientSequenceNumber of the incoming message must match that of the pending message.
-        if (pendingState.clientSequenceNumber !== message.clientSequenceNumber) {
+        if (pendingMessage.clientSequenceNumber !== message.clientSequenceNumber) {
             // Close the container because this could indicate data corruption.
-            const error = DataProcessingError.create("pending local message clientSequenceNumber mismatch", "unexpectedAckReceived", message, { expectedClientSequenceNumber: pendingState.clientSequenceNumber });
+            const error = DataProcessingError.create("pending local message clientSequenceNumber mismatch", "unexpectedAckReceived", message, { expectedClientSequenceNumber: pendingMessage.clientSequenceNumber });
             this.stateHandler.close(error);
             return;
         }
-        this._pendingMessagesCount--;
-        assert(this._pendingMessagesCount >= 0, 0x3d6 /* positive */);
         // Post-processing part - If we are processing a batch then this could be the last message in the batch.
         this.maybeProcessBatchEnd(message);
-        return pendingState.localOpMetadata;
+        return pendingMessage.localOpMetadata;
     }
     /**
      * This message could be the first message in batch. If so, set batch state marking the beginning of a batch.
@@ -149,20 +164,6 @@ export class PendingStateManager {
      */
     maybeProcessBatchBegin(message) {
         var _a;
-        /**
-         * We are checking if the next message is the start of a batch. It can happen in the following scenarios:
-         *
-         * 1. The FlushMode was set to TurnBased before this message was sent.
-         *
-         * 2. The FlushMode was already TurnBased and a flush was called before this message was sent. This essentially
-         * means that the flush marked the end of a previous batch and beginning of a new batch.
-         *
-         * Keep reading pending states from the queue until we encounter a message. It's possible that the FlushMode was
-         * updated a bunch of times without sending any messages.
-         */
-        while (this.peekNextPendingState().type !== "message") {
-            this.pendingStates.shift();
-        }
         // This message is the first in a batch if the "batch" property on the metadata is set to true
         if ((_a = message.metadata) === null || _a === void 0 ? void 0 : _a.batch) {
             // We should not already be processing a batch and there should be no pending batch begin message.
@@ -181,48 +182,36 @@ export class PendingStateManager {
         if (!this.isProcessingBatch) {
             return;
         }
-        const nextPendingState = this.peekNextPendingState();
-        if (nextPendingState.type === "message") {
-            return;
-        }
         // There should be a pending batch begin message.
         assert(this.pendingBatchBeginMessage !== undefined, 0x16d /* "There is no pending batch begin message" */);
-        // Get the batch begin metadata from the first message in the batch.
-        const batchBeginMetadata = (_a = this.pendingBatchBeginMessage.metadata) === null || _a === void 0 ? void 0 : _a.batch;
-        // There could be just a single message in the batch. If so, it should not have any batch metadata. If there
-        // are multiple messages in the batch, verify that we got the correct batch begin and end metadata.
-        if (this.pendingBatchBeginMessage === message) {
-            assert(batchBeginMetadata === undefined, 0x16e /* "Batch with single message should not have batch metadata" */);
-        }
-        else {
-            // Get the batch metadata from the last message in the batch.
-            const batchEndMetadata = (_b = message.metadata) === null || _b === void 0 ? void 0 : _b.batch;
-            if (batchBeginMetadata !== true || batchEndMetadata !== false) {
-                this.stateHandler.close(DataProcessingError.create("Pending batch inconsistency", // Formerly known as asserts 0x16f and 0x170
-                "processPendingLocalMessage", message, {
-                    runtimeVersion: pkgVersion,
-                    batchClientId: this.pendingBatchBeginMessage.clientId,
-                    clientId: this.stateHandler.clientId(),
-                    hasBatchStart: batchBeginMetadata === true,
-                    hasBatchEnd: batchEndMetadata === false,
-                    messageType: message.type,
-                    batchStartSequenceNumber: this.pendingBatchBeginMessage.clientSequenceNumber,
-                    pendingMessagesCount: this.pendingMessagesCount,
-                    nextPendingState: nextPendingState.type,
-                }));
+        const batchEndMetadata = (_a = message.metadata) === null || _a === void 0 ? void 0 : _a.batch;
+        if (this.pendingMessages.isEmpty() || batchEndMetadata === false) {
+            // Get the batch begin metadata from the first message in the batch.
+            const batchBeginMetadata = (_b = this.pendingBatchBeginMessage.metadata) === null || _b === void 0 ? void 0 : _b.batch;
+            // There could be just a single message in the batch. If so, it should not have any batch metadata. If there
+            // are multiple messages in the batch, verify that we got the correct batch begin and end metadata.
+            if (this.pendingBatchBeginMessage === message) {
+                assert(batchBeginMetadata === undefined, 0x16e /* "Batch with single message should not have batch metadata" */);
+            }
+            else {
+                if (batchBeginMetadata !== true || batchEndMetadata !== false) {
+                    this.stateHandler.close(DataProcessingError.create("Pending batch inconsistency", // Formerly known as asserts 0x16f and 0x170
+                    "processPendingLocalMessage", message, {
+                        runtimeVersion: pkgVersion,
+                        batchClientId: this.pendingBatchBeginMessage.clientId,
+                        clientId: this.stateHandler.clientId(),
+                        hasBatchStart: batchBeginMetadata === true,
+                        hasBatchEnd: batchEndMetadata === false,
+                        messageType: message.type,
+                        batchStartSequenceNumber: this.pendingBatchBeginMessage.clientSequenceNumber,
+                        pendingMessagesCount: this.pendingMessagesCount,
+                    }));
+                }
             }
+            // Clear the pending batch state now that we have processed the entire batch.
+            this.pendingBatchBeginMessage = undefined;
+            this.isProcessingBatch = false;
         }
-        // Clear the pending batch state now that we have processed the entire batch.
-        this.pendingBatchBeginMessage = undefined;
-        this.isProcessingBatch = false;
-    }
-    /**
-     * Returns the next pending state from the pending state queue.
-     */
-    peekNextPendingState() {
-        const nextPendingState = this.pendingStates.peekFront();
-        assert(!!nextPendingState, 0x171 /* "No pending state found for the remote message" */);
-        return nextPendingState;
     }
     /**
      * Called when the Container's connection state changes. If the Container gets connected, it replays all the pending
@@ -234,63 +223,44 @@ export class PendingStateManager {
         // This assert suggests we are about to send same ops twice, which will result in data loss.
         assert(this.clientId !== this.stateHandler.clientId(), 0x173 /* "replayPendingStates called twice for same clientId!" */);
         this.clientId = this.stateHandler.clientId();
-        assert(this.initialStates.isEmpty(), 0x174 /* "initial states should be empty before replaying pending" */);
-        let pendingStatesCount = this.pendingStates.length;
-        if (pendingStatesCount === 0) {
+        assert(this.initialMessages.isEmpty(), 0x174 /* "initial states should be empty before replaying pending" */);
+        let pendingMessagesCount = this.pendingMessages.length;
+        if (pendingMessagesCount === 0) {
             return;
         }
-        // Reset the pending message count because all these messages will be removed from the queue.
-        this._pendingMessagesCount = 0;
-        const messageBatchQueue = new Deque();
-        // Process exactly `pendingStatesCount` items in the queue as it represents the number of states that were
+        // Process exactly `pendingMessagesCount` items in the queue as it represents the number of messages that were
         // pending when we connected. This is important because the `reSubmitFn` might add more items in the queue
         // which must not be replayed.
-        while (pendingStatesCount > 0) {
+        while (pendingMessagesCount > 0) {
             // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-            const pendingState = this.pendingStates.shift();
-            switch (pendingState.type) {
-                case "message":
-                    assert(((_a = pendingState.opMetadata) === null || _a === void 0 ? void 0 : _a.batch) !== false || messageBatchQueue.length > 0, 0x41b /* We cannot process batches in chunks */);
-                    /**
-                     * We want to ensure grouped messages get processed in a batch.
-                     * Note: It is not possible for the PendingStateManager to receive a partially acked batch. It will
-                     * either receive the whole batch ack or nothing at all.
-                     */
-                    if (messageBatchQueue.length > 0 || ((_b = pendingState.opMetadata) === null || _b === void 0 ? void 0 : _b.batch)) {
-                        messageBatchQueue.enqueue(pendingState);
-                    }
-                    else {
-                        this.stateHandler.reSubmit(pendingState.messageType, pendingState.content, pendingState.localOpMetadata, pendingState.opMetadata);
+            let pendingMessage = this.pendingMessages.shift();
+            pendingMessagesCount--;
+            assert(((_a = pendingMessage.opMetadata) === null || _a === void 0 ? void 0 : _a.batch) !== false, 0x41b /* We cannot process batches in chunks */);
+            /**
+             * We want to ensure grouped messages get processed in a batch.
+             * Note: It is not possible for the PendingStateManager to receive a partially acked batch. It will
+             * either receive the whole batch ack or nothing at all.
+             */
+            if ((_b = pendingMessage.opMetadata) === null || _b === void 0 ? void 0 : _b.batch) {
+                assert(pendingMessagesCount > 0, 0x554 /* Last pending message cannot be a batch begin */);
+                this.stateHandler.orderSequentially(() => {
+                    var _a, _b;
+                    while (pendingMessagesCount >= 0) { // check is >= because batch end may be last pending message
+                        this.stateHandler.reSubmit(pendingMessage.messageType, pendingMessage.content, pendingMessage.localOpMetadata, pendingMessage.opMetadata);
+                        if (((_a = pendingMessage.opMetadata) === null || _a === void 0 ? void 0 : _a.batch) === false) {
+                            break;
+                        }
+                        assert(pendingMessagesCount > 0, 0x555 /* No batch end found */);
+                        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+                        pendingMessage = this.pendingMessages.shift();
+                        pendingMessagesCount--;
+                        assert(((_b = pendingMessage.opMetadata) === null || _b === void 0 ? void 0 : _b.batch) !== true, 0x556 /* Batch start needs a corresponding batch end */);
                     }
-                    break;
-                case "flush":
-                    /**
-                     * A "flush" call can indicate the end of a batch.
-                     * We can't rely on the "batch" property in the message metadata as it gets
-                     * updated elsewhere and it is not the same object instance that gets updated.
-                     */
-                    if (messageBatchQueue.length > 0) {
-                        this.stateHandler.orderSequentially(() => {
-                            while (messageBatchQueue.length > 0) {
-                                // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-                                const message = messageBatchQueue.dequeue();
-                                this.stateHandler.reSubmit(message.messageType, message.content, message.localOpMetadata, message.opMetadata);
-                            }
-                        });
-                    }
-                    assert(messageBatchQueue.length === 0, 0x41c /* cannot flush in the middle of a batch */);
-                    this.stateHandler.flush();
-                    break;
-                default:
-                    break;
+                });
+            }
+            else {
+                this.stateHandler.reSubmit(pendingMessage.messageType, pendingMessage.content, pendingMessage.localOpMetadata, pendingMessage.opMetadata);
             }
-            pendingStatesCount--;
-        }
-        // There are some cases where ops are stashed but not flushed. We need to ensure they are resubmitted
-        while (messageBatchQueue.length > 0) {
-            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-            const message = messageBatchQueue.dequeue();
-            this.stateHandler.reSubmit(message.messageType, message.content, message.localOpMetadata, message.opMetadata);
         }
     }
 }