@fluidframework/odsp-driver 0.47.0 → 0.48.0

package/lib/opsCaching.js.map

@@ -1 +1 @@
-{"version":3,"file":"opsCaching.js","sourceRoot":"","sources":["../src/opsCaching.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAwB3D,MAAM,OAAO,QAAQ;IAInB,YACE,sBAA8B,EACb,MAAwB,EACxB,KAAa,EACb,SAAiB,EACjB,gBAAgB,EACzB,eAAe;QAJN,WAAM,GAAN,MAAM,CAAkB;QACxB,UAAK,GAAL,KAAK,CAAQ;QACb,cAAS,GAAT,SAAS,CAAQ;QACjB,qBAAgB,GAAhB,gBAAgB,CAAA;QACzB,oBAAe,GAAf,eAAe,CAAA;QATR,YAAO,GAA+B,IAAI,GAAG,EAAE,CAAC;QAW3D;;WAEG;QACH,MAAM,cAAc,GAAG,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,uBAAuB,CAAC,sBAAsB,CAAC,GAAG,CAAC,CAAC;QACjG,IAAI,cAAc,KAAK,CAAC,EAAE;YACtB,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC,sBAAsB,CAAC,EAAE;gBAC1D,cAAc;gBACd,SAAS,EAAG,IAAI,CAAC,2BAA2B,EAAE;gBAC9C,KAAK,EAAE,KAAK;aACf,CAAC,CAAC;SACN;IACL,CAAC;IAEM,OAAO;QACV,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;QACrB,IAAI,IAAI,CAAC,KAAK,KAAK,SAAS,EAAE;YAC1B,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACzB,IAAI,CAAC,KAAK,GAAG,SAAS,CAAC;SAC1B;IACL,CAAC;IAEM,QAAQ;QACX,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,IAAI,CAAC,OAAO,EAAE;YACrC,IAAI,KAAK,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE;gBAChC,SAAS;aACZ;YACD,KAAK,CAAC,KAAK,GAAG,KAAK,CAAC;YACpB,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;SAC1B;IACL,CAAC;IAEM,MAAM,CAAC,GAAe;QACzB,IAAI,IAAI,CAAC,eAAe,IAAI,CAAC,EAAE;YAC3B,OAAO;SACV;QAED,KAAK,MAAM,EAAE,IAAI,GAAG,EAAE;YAClB,MAAM,WAAW,GAAG,IAAI,CAAC,cAAc,CAAC,EAAE,CAAC,cAAc,CAAC,CAAC;YAC3D,MAAM,eAAe,GAAG,IAAI,CAAC,uBAAuB,CAAC,EAAE,CAAC,cAAc,CAAC,CAAC;YAExE,IAAI,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;YAEjD,IAAI,YAAY,KAAK,SAAS,EAAE;gBAC5B,YAAY,GAAG;oBACX,cAAc,EAAE,IAAI,CAAC,SAAS,GAAG,CAAC;oBAClC,SAAS,EAAE,IAAI,CAAC,2BAA2B,EAAE;oBAC7C,KAAK,EAAE,IAAI;iBACd,CAAC;gBACF,YAAY,CAAC,SAAS,CAAC,eAAe,CAAC,GAAG,EAAE,CAAC;gBAC7C,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC;aAC/C;iBAAM,IAAI,YAAY,KAAK,IAAI,IAAI,YAAY,CAAC,SAAS,CAAC,eAAe,CAAC,KAAK,SAAS,EAAE;gBACvF,YAAY,CAAC,SAAS,CAAC,eAAe,CAAC,GAAG,EAAE,CAAC;gBAC7C,YAAY,CAAC,cAAc,EAAE,CAAC;gBAC9B,YAAY,CAAC,KAAK,GAAG,IAAI,CAAC;aAC7B;iBAAM;gBACH,yEAAyE;gBACzE,OAAO;aACV;YAED,IAAI,YAAY,CAAC,cAAc,KAAK,CAAC,EAAE;gBACnC,gCAAgC;gBAChC,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC;gBACtC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;aACvC;iBAAM;gBACH,IAAI,CAAC,aAAa,EAAE,CAAC;aACxB;YAED,IAAI,CAAC,eAAe,EAAE,CAAC;YACvB,IAAI,IAAI,CAAC,eAAe,KAAK,CAAC,EAAE;gBAC5B,IAAI,CAAC,MAAM,CAAC,oBAAoB,CAAC,EAAE,SAAS,EAAE,kBAAkB,EAAC,CAAC,CAAC;gBACnE,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;gBACpB,IAAI,CAAC,OAAO,EAAE,CAAC;gBACf,MAAM;aACT;SACJ;IACL,CAAC;IAEM,KAAK,CAAC,GAAG,CAAC,IAAY,EAAE,EAAW;QACtC,MAAM,QAAQ,GAAe,EAAE,CAAC;QAChC,IAAI,WAAW,GAAG,IAAI,CAAC,cAAc,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC;QAChD,MAAM,KAAK,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC;QAChC,iDAAiD;QACjD,OAAO,IAAI,EAAE;YACT,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,SAAS,IAAI,WAAW,EAAE,CAAC,CAAC;YACtE,IAAI,GAAG,KAAK,SAAS,EAAE;gBACnB,MAAM;aACT;YACD,MAAM,MAAM,GAAe,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAC3C,KAAK,MAAM,EAAE,IAAI,MAAM,EAAE;gBACrB,mFAAmF;gBACnF,IAAI,EAAE,EAAE;oBACJ,IAAI,EAAE,KAAK,SAAS,IAAI,EAAE,CAAC,cAAc,IAAI,EAAE,EAAE;wBAC7C,MAAM;qBACT;oBACD,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE;wBACvB,IAAI,EAAE,CAAC,cAAc,GAAG,IAAI,GAAG,CAAC,EAAE;4BAC9B,MAAM;yBACT;6BAAM,IAAI,EAAE,CAAC,cAAc,IAAI,IAAI,EAAE;4BAClC,SAAS;yBACZ;qBACJ;oBACD,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;iBACrB;qBAAM,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE;oBAC9B,MAAM;iBACT;aACJ;YAED,WAAW,EAAE,CAAC;SACjB;QAED,MAAM,QAAQ,GAAG,WAAW,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC;QAC3C,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,IAAI,QAAQ,GAAG,IAAI,EAAE;YACxC,IAAI,CAAC,MAAM,CAAC,oBAAoB,CAAC;gBAC7B,SAAS,EAAE,cAAc;gBACzB,IAAI;gBACJ,EAAE;gBACF,MAAM,EAAE,QAAQ,CAAC,MAAM;gBACvB,QAAQ;aACX,CAAC,CAAC;SACN;QACD,OAAO,QAAQ,CAAC;IACpB,CAAC;IAES,KAAK,CAAC,WAAmB,EAAE,OAAe;QAChD,4EAA4E;QAC5E,yCAAyC;QACzC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,SAAS,IAAI,WAAW,EAAE,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE;YAC/F,IAAI,CAAC,eAAe,GAAG,CAAC,CAAC;QAC7B,CAAC,CAAC,CAAC;IACP,CAAC;IAES,aAAa;QACnB,IAAI,CAAC,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,gBAAgB,GAAG,CAAC,EAAE;YAC1C,IAAI,CAAC,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE;gBACzB,IAAI,CAAC,KAAK,GAAG,SAAS,CAAC;gBACvB,IAAI,CAAC,QAAQ,EAAE,CAAC;YACpB,CAAC,EAAE,IAAI,CAAC,gBAAgB,CAAC,CAAC;SAC7B;IACL,CAAC;IAEO,cAAc,CAAC,cAAsB;QACzC,OAAO,IAAI,CAAC,KAAK,CAAC,cAAc,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC;IACvD,CAAC;IAEO,uBAAuB,CAAC,cAAsB;QAClD,OAAO,cAAc,GAAG,IAAI,CAAC,SAAS,CAAC;IAC3C,CAAC;IAEO,2BAA2B;QAC/B,MAAM,SAAS,GAAe,EAAE,CAAC;QACjC,SAAS,CAAC,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,sCAAsC;QACzE,OAAO,SAAS,CAAC;IACrB,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 { performance } from \"@fluidframework/common-utils\";\n\n// ISequencedDocumentMessage\nexport interface IMessage {\n    sequenceNumber: number;\n}\n\nexport type CacheEntry = (IMessage | undefined)[];\n\nexport interface IBatch {\n    remainingSlots: number;\n    batchData: CacheEntry;\n    /**\n     * Tells if this batch is  dirty, i.e. it contains ops that were not flushed to cache\n     */\n    dirty: boolean;\n}\n\nexport interface ICache {\n  write(batchNumber: string, data: string): Promise<void>;\n  read(batchNumber: string): Promise<string | undefined>;\n  remove(): void;\n}\n\nexport class OpsCache {\n  private readonly batches: Map<number, null | IBatch> = new Map();\n  private timer: ReturnType<typeof setTimeout> | undefined;\n\n  constructor(\n    startingSequenceNumber: number,\n    private readonly logger: ITelemetryLogger,\n    private readonly cache: ICache,\n    private readonly batchSize: number,\n    private readonly timerGranularity,\n    private totalOpsToCache,\n  ) {\n        /** initial batch is a special case because it will never be full - all ops prior (inclusive) to\n         *  startingSequenceNumber are never going to show up (undefined)\n         */\n        const remainingSlots = this.batchSize - this.getPositionInBatchArray(startingSequenceNumber) - 1;\n        if (remainingSlots !== 0) {\n            this.batches.set(this.getBatchNumber(startingSequenceNumber), {\n                remainingSlots,\n                batchData : this.initializeNewBatchDataArray(),\n                dirty: false,\n            });\n        }\n    }\n\n    public dispose() {\n        this.batches.clear();\n        if (this.timer !== undefined) {\n            clearTimeout(this.timer);\n            this.timer = undefined;\n        }\n    }\n\n    public flushOps() {\n        for (const [key, value] of this.batches) {\n            if (value === null || !value.dirty) {\n                continue;\n            }\n            value.dirty = false;\n            this.write(key, value);\n        }\n    }\n\n    public addOps(ops: IMessage[]) {\n        if (this.totalOpsToCache <= 0) {\n            return;\n        }\n\n        for (const op of ops) {\n            const batchNumber = this.getBatchNumber(op.sequenceNumber);\n            const positionInBatch = this.getPositionInBatchArray(op.sequenceNumber);\n\n            let currentBatch = this.batches.get(batchNumber);\n\n            if (currentBatch === undefined) {\n                currentBatch = {\n                    remainingSlots: this.batchSize - 1,\n                    batchData: this.initializeNewBatchDataArray(),\n                    dirty: true,\n                };\n                currentBatch.batchData[positionInBatch] = op;\n                this.batches.set(batchNumber, currentBatch);\n            } else if (currentBatch !== null && currentBatch.batchData[positionInBatch] === undefined) {\n                currentBatch.batchData[positionInBatch] = op;\n                currentBatch.remainingSlots--;\n                currentBatch.dirty = true;\n            } else {\n                // Either batch was flushed or this op was already there - nothing to do!\n                return;\n            }\n\n            if (currentBatch.remainingSlots === 0) {\n                // batch is full, flush to cache\n                this.write(batchNumber, currentBatch);\n                this.batches.set(batchNumber, null);\n            } else {\n                this.scheduleTimer();\n            }\n\n            this.totalOpsToCache--;\n            if (this.totalOpsToCache === 0) {\n                this.logger.sendPerformanceEvent({ eventName: \"CacheOpsLimitHit\"});\n                this.cache.remove();\n                this.dispose();\n                break;\n            }\n        }\n    }\n\n    public async get(from: number, to?: number): Promise<IMessage[]> {\n        const messages: IMessage[] = [];\n        let batchNumber = this.getBatchNumber(from + 1);\n        const start = performance.now();\n        // eslint-disable-next-line no-constant-condition\n        while (true) {\n            const res = await this.cache.read(`${this.batchSize}_${batchNumber}`);\n            if (res === undefined) {\n                break;\n            }\n            const result: CacheEntry = JSON.parse(res);\n            for (const op of result) {\n                // Note that we write out undefined, but due to JSON.stringify, it turns into null!\n                if (op) {\n                    if (to !== undefined && op.sequenceNumber >= to) {\n                        break;\n                    }\n                    if (messages.length === 0) {\n                        if (op.sequenceNumber > from + 1) {\n                            break;\n                        } else if (op.sequenceNumber <= from) {\n                            continue;\n                        }\n                    }\n                    messages.push(op);\n                } else if (messages.length !== 0) {\n                    break;\n                }\n            }\n\n            batchNumber++;\n        }\n\n        const duration = performance.now() - start;\n        if (messages.length > 0 || duration > 1000) {\n            this.logger.sendPerformanceEvent({\n                eventName: \"CacheOpsUsed\",\n                from,\n                to,\n                length: messages.length,\n                duration,\n            });\n        }\n        return messages;\n    }\n\n    protected write(batchNumber: number, payload: IBatch) {\n        // Errors are caught and logged by PersistedCacheWithErrorHandling that sits\n        // in the adapter chain of cache adapters\n        this.cache.write(`${this.batchSize}_${batchNumber}`, JSON.stringify(payload.batchData)).catch(() => {\n            this.totalOpsToCache = 0;\n        });\n    }\n\n    protected scheduleTimer() {\n        if (!this.timer && this.timerGranularity > 0) {\n            this.timer = setTimeout(() => {\n                this.timer = undefined;\n                this.flushOps();\n            }, this.timerGranularity);\n        }\n    }\n\n    private getBatchNumber(sequenceNumber: number) {\n        return Math.floor(sequenceNumber / this.batchSize);\n    }\n\n    private getPositionInBatchArray(sequenceNumber: number) {\n        return sequenceNumber % this.batchSize;\n    }\n\n    private initializeNewBatchDataArray() {\n        const tempArray: IMessage[] = [];\n        tempArray.length = this.batchSize; // fill with empty, undefined elements\n        return tempArray;\n    }\n}\n"]}
+{"version":3,"file":"opsCaching.js","sourceRoot":"","sources":["../src/opsCaching.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 { performance } from \"@fluidframework/common-utils\";\n\n// ISequencedDocumentMessage\nexport interface IMessage {\n    sequenceNumber: number;\n}\n\nexport type CacheEntry = (IMessage | undefined)[];\n\nexport interface IBatch {\n    remainingSlots: number;\n    batchData: CacheEntry;\n    /**\n     * Tells if this batch is  dirty, i.e. it contains ops that were not flushed to cache\n     */\n    dirty: boolean;\n}\n\nexport interface ICache {\n  write(batchNumber: string, data: string): Promise<void>;\n  read(batchNumber: string): Promise<string | undefined>;\n  remove(): void;\n}\n\nexport class OpsCache {\n  private readonly batches: Map<number, null | IBatch> = new Map();\n  private timer: ReturnType<typeof setTimeout> | undefined;\n\n  constructor(\n    startingSequenceNumber: number,\n    private readonly logger: ITelemetryLogger,\n    private readonly cache: ICache,\n    private readonly batchSize: number,\n    private readonly timerGranularity,\n    private totalOpsToCache,\n  ) {\n        /** initial batch is a special case because it will never be full - all ops prior (inclusive) to\n         *  startingSequenceNumber are never going to show up (undefined)\n         */\n        const remainingSlots = this.batchSize - this.getPositionInBatchArray(startingSequenceNumber) - 1;\n        if (remainingSlots !== 0) {\n            this.batches.set(this.getBatchNumber(startingSequenceNumber), {\n                remainingSlots,\n                batchData : this.initializeNewBatchDataArray(),\n                dirty: false,\n            });\n        }\n    }\n\n    public dispose() {\n        this.batches.clear();\n        if (this.timer !== undefined) {\n            clearTimeout(this.timer);\n            this.timer = undefined;\n        }\n    }\n\n    public flushOps() {\n        for (const [key, value] of this.batches) {\n            if (value === null || !value.dirty) {\n                continue;\n            }\n            value.dirty = false;\n            this.write(key, value);\n        }\n    }\n\n    public addOps(ops: IMessage[]) {\n        if (this.totalOpsToCache <= 0) {\n            return;\n        }\n\n        for (const op of ops) {\n            const batchNumber = this.getBatchNumber(op.sequenceNumber);\n            const positionInBatch = this.getPositionInBatchArray(op.sequenceNumber);\n\n            let currentBatch = this.batches.get(batchNumber);\n\n            if (currentBatch === undefined) {\n                currentBatch = {\n                    remainingSlots: this.batchSize - 1,\n                    batchData: this.initializeNewBatchDataArray(),\n                    dirty: true,\n                };\n                currentBatch.batchData[positionInBatch] = op;\n                this.batches.set(batchNumber, currentBatch);\n            } else if (currentBatch !== null && currentBatch.batchData[positionInBatch] === undefined) {\n                currentBatch.batchData[positionInBatch] = op;\n                currentBatch.remainingSlots--;\n                currentBatch.dirty = true;\n            } else {\n                // Either batch was flushed or this op was already there - nothing to do!\n                return;\n            }\n\n            if (currentBatch.remainingSlots === 0) {\n                // batch is full, flush to cache\n                this.write(batchNumber, currentBatch);\n                this.batches.set(batchNumber, null);\n            } else {\n                this.scheduleTimer();\n            }\n\n            this.totalOpsToCache--;\n            if (this.totalOpsToCache === 0) {\n                this.logger.sendPerformanceEvent({ eventName: \"CacheOpsLimitHit\"});\n                this.cache.remove();\n                this.dispose();\n                break;\n            }\n        }\n    }\n\n    private async getCore(from: number, to?: number): Promise<IMessage[]> {\n        const messages: IMessage[] = [];\n        let batchNumber = this.getBatchNumber(from);\n        // eslint-disable-next-line no-constant-condition\n        while (true) {\n            const res = await this.cache.read(`${this.batchSize}_${batchNumber}`);\n            if (res === undefined) {\n                return messages;\n            }\n            const result: CacheEntry = JSON.parse(res);\n            for (const op of result) {\n                // Note that we write out undefined, but due to JSON.stringify, it turns into null!\n                if (op) {\n                    if (to !== undefined && op.sequenceNumber >= to) {\n                        return messages;\n                    }\n                    if (messages.length === 0) {\n                        if (op.sequenceNumber > from) {\n                            return messages;\n                        } else if (op.sequenceNumber < from) {\n                            continue;\n                        }\n                    }\n                    messages.push(op);\n                } else if (messages.length !== 0) {\n                    return messages;\n                }\n            }\n\n            batchNumber++;\n        }\n    }\n\n    public async get(from: number, to?: number): Promise<IMessage[]> {\n        const start = performance.now();\n\n        const messages = await this.getCore(from, to);\n\n        const duration = performance.now() - start;\n        if (messages.length > 0 || duration > 1000) {\n            this.logger.sendPerformanceEvent({\n                eventName: \"CacheOpsUsed\",\n                from,\n                to,\n                length: messages.length,\n                duration,\n            });\n        }\n        return messages;\n    }\n\n    protected write(batchNumber: number, payload: IBatch) {\n        // Errors are caught and logged by PersistedCacheWithErrorHandling that sits\n        // in the adapter chain of cache adapters\n        this.cache.write(`${this.batchSize}_${batchNumber}`, JSON.stringify(payload.batchData)).catch(() => {\n            this.totalOpsToCache = 0;\n        });\n    }\n\n    protected scheduleTimer() {\n        if (!this.timer && this.timerGranularity > 0) {\n            this.timer = setTimeout(() => {\n                this.timer = undefined;\n                this.flushOps();\n            }, this.timerGranularity);\n        }\n    }\n\n    private getBatchNumber(sequenceNumber: number) {\n        return Math.floor(sequenceNumber / this.batchSize);\n    }\n\n    private getPositionInBatchArray(sequenceNumber: number) {\n        return sequenceNumber % this.batchSize;\n    }\n\n    private initializeNewBatchDataArray() {\n        const tempArray: IMessage[] = [];\n        tempArray.length = this.batchSize; // fill with empty, undefined elements\n        return tempArray;\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/odsp-driver";
-export declare const pkgVersion = "0.47.0";
+export declare const pkgVersion = "0.48.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/odsp-driver";
-export const pkgVersion = "0.47.0";
+export const pkgVersion = "0.48.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,6BAA6B,CAAC;AACrD,MAAM,CAAC,MAAM,UAAU,GAAG,QAAQ,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/odsp-driver\";\nexport const pkgVersion = \"0.47.0\";\n"]}
+{"version":3,"file":"packageVersion.js","sourceRoot":"","sources":["../src/packageVersion.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,MAAM,CAAC,MAAM,OAAO,GAAG,6BAA6B,CAAC;AACrD,MAAM,CAAC,MAAM,UAAU,GAAG,QAAQ,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/odsp-driver\";\nexport const pkgVersion = \"0.48.0\";\n"]}

package/lib/vroom.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vroom.d.ts","sourceRoot":"","sources":["../src/vroom.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,gBAAgB,EAAE,MAAM,oCAAoC,CAAC;AAEtE,OAAO,EAAE,+BAA+B,EAAE,aAAa,EAAE,MAAM,yCAAyC,CAAC;AACzG,OAAO,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAC;AAGtD,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAQ9C;;;;;;;;;;;;;;GAcG;AACH,wBAAsB,gBAAgB,CAClC,QAAQ,EAAE,aAAa,EACvB,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,gBAAgB,EACxB,eAAe,EAAE,+BAA+B,EAChD,YAAY,EAAE,YAAY,EAC1B,kBAAkB,EAAE,OAAO,EAC3B,gBAAgB,CAAC,EAAE,MAAM,GAC1B,OAAO,CAAC,uBAAuB,CAAC,CA2DlC"}
+{"version":3,"file":"vroom.d.ts","sourceRoot":"","sources":["../src/vroom.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,gBAAgB,EAAE,MAAM,oCAAoC,CAAC;AAEtE,OAAO,EAAE,+BAA+B,EAAE,aAAa,EAAE,MAAM,yCAAyC,CAAC;AACzG,OAAO,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAC;AAGtD,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAQ9C;;;;;;;;;;;;;;GAcG;AACH,wBAAsB,gBAAgB,CAClC,QAAQ,EAAE,aAAa,EACvB,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,gBAAgB,EACxB,eAAe,EAAE,+BAA+B,EAChD,YAAY,EAAE,YAAY,EAC1B,kBAAkB,EAAE,OAAO,EAC3B,gBAAgB,CAAC,EAAE,MAAM,GAC1B,OAAO,CAAC,uBAAuB,CAAC,CA8DlC"}

package/lib/vroom.js

@@ -45,6 +45,9 @@ export async function fetchJoinSession(urlParts, path, method, logger, getStorag
                 if (guestDisplayName) {
                     body.guestDisplayName = guestDisplayName;
                 }
+                // IMPORTANT: Must set content-type header explicitly to application/json when request has body.
+                // By default, request will use text/plain as content-type and will be rejected by backend.
+                headers["Content-Type"] = "application/json";
             }
             const response = await runWithRetry(async () => epochTracker.fetchAndParseAsJSON(`${getApiRoot(siteOrigin)}/drives/${urlParts.driveId}/items/${urlParts.itemId}/${path}?${queryParams}`, { method, headers, body: body ? JSON.stringify(body) : undefined }, "joinSession"), "joinSession", logger);
             // TODO SPO-specific telemetry

package/lib/vroom.js.map

@@ -1 +1 @@
-{"version":3,"file":"vroom.js","sourceRoot":"","sources":["../src/vroom.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAGnE,OAAO,EAAE,2BAA2B,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACrE,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAE7C,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAO5C;;;;;;;;;;;;;;GAcG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAClC,QAAuB,EACvB,IAAY,EACZ,MAAc,EACd,MAAwB,EACxB,eAAgD,EAChD,YAA0B,EAC1B,kBAA2B,EAC3B,gBAAyB;IAEzB,OAAO,2BAA2B,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;QACjD,MAAM,KAAK,GAAG,MAAM,eAAe,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;QAE5D,MAAM,UAAU,GAAG,OAAO,CAAC,OAAO;YAC9B,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,WAAW,EAAE,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE;YAClE,CAAC,CAAC,EAAE,CAAC;QACT,OAAO,gBAAgB,CAAC,cAAc,CAClC,MAAM,kBACF,SAAS,EAAE,aAAa,EACxB,QAAQ,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAC9B,UAAU,GAEjB,KAAK,EAAE,KAAK,EAAE,EAAE;YACZ,kDAAkD;YAClD,MAAM,UAAU,GAAG,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;YAC/C,IAAI,WAAW,GAAG,gBAAgB,KAAK,EAAE,CAAC;YAC1C,IAAI,OAAO,GAAG,EAAE,CAAC;YACjB,IAAI,WAAW,CAAC,MAAM,GAAG,IAAI,EAAE;gBAC3B,WAAW,GAAG,EAAE,CAAC;gBACjB,OAAO,GAAG,EAAE,aAAa,EAAE,UAAU,KAAK,EAAE,EAAE,CAAC;aAClD;YACD,IAAI,IAAkC,CAAC;YACvC,IAAI,kBAAkB,IAAI,gBAAgB,EAAE;gBACxC,IAAI,GAAG,EAAE,CAAC;gBACV,IAAI,kBAAkB,EAAE;oBACpB,IAAI,CAAC,kBAAkB,GAAG,IAAI,CAAC;iBAClC;gBACD,IAAI,gBAAgB,EAAE;oBAClB,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;iBAC5C;aACJ;YAED,MAAM,QAAQ,GAAG,MAAM,YAAY,CAC/B,KAAK,IAAI,EAAE,CAAC,YAAY,CAAC,mBAAmB,CACxC,GAAG,UAAU,CAAC,UAAU,CAAC,WACrB,QAAQ,CAAC,OACb,UAAU,QAAQ,CAAC,MAAM,IAAI,IAAI,IAAI,WAAW,EAAE,EAClD,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,EAAE,EAClE,aAAa,CAChB,EACD,aAAa,EACb,MAAM,CACT,CAAC;YAEF,8BAA8B;YAC9B,KAAK,CAAC,GAAG,iCACF,QAAQ,CAAC,gBAAgB;gBAC5B,2CAA2C;gBAC3C,MAAM,EAAE,QAAQ,CAAC,OAAO,CAAC,oBAAoB,CAAC,QAAQ,CAAC,OAAO,CAAC,IACjE,CAAC;YAEH,IAAI,QAAQ,CAAC,OAAO,CAAC,eAAe,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAQ,EAAE;gBAChE,QAAQ,CAAC,OAAO,CAAC,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,eAAe,CAAC;aAChE;YAED,OAAO,QAAQ,CAAC,OAAO,CAAC;QAC5B,CAAC,CAAC,CAAC;IACX,CAAC,CAAC,CAAC;AACP,CAAC","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 { PerformanceEvent } from \"@fluidframework/telemetry-utils\";\nimport { InstrumentedStorageTokenFetcher, IOdspUrlParts } from \"@fluidframework/odsp-driver-definitions\";\nimport { ISocketStorageDiscovery } from \"./contracts\";\nimport { getWithRetryForTokenRefresh, getOrigin } from \"./odspUtils\";\nimport { getApiRoot } from \"./odspUrlHelper\";\nimport { EpochTracker } from \"./epochTracker\";\nimport { runWithRetry } from \"./retryUtils\";\n\ninterface IJoinSessionBody {\n    requestSocketToken?: boolean;\n    guestDisplayName?: string;\n}\n\n/**\n * Makes join session call on SPO to get information about the web socket for a document\n * @param driveId - The SPO drive id that this request should be made against\n * @param itemId -The SPO item id that this request should be made against\n * @param siteUrl - The SPO site that this request should be made against\n * @param path - The API path that is relevant to this request\n * @param method - The type of request, such as GET or POST\n * @param logger - A logger to use for this request\n * @param getStorageToken - A function that is able to provide the access token for this request\n * @param epochTracker - fetch wrapper which incorporates epoch logic around joinSession call\n * @param requestSocketToken - flag indicating whether joinSession is expected to return access token\n * which is used when establishing websocket connection with collab session backend service.\n * @param guestDisplayName - display name used to identify guest user joining a session.\n * This is optional and used only when collab session is being joined via invite.\n */\nexport async function fetchJoinSession(\n    urlParts: IOdspUrlParts,\n    path: string,\n    method: string,\n    logger: ITelemetryLogger,\n    getStorageToken: InstrumentedStorageTokenFetcher,\n    epochTracker: EpochTracker,\n    requestSocketToken: boolean,\n    guestDisplayName?: string,\n): Promise<ISocketStorageDiscovery> {\n    return getWithRetryForTokenRefresh(async (options) => {\n        const token = await getStorageToken(options, \"JoinSession\");\n\n        const extraProps = options.refresh\n            ? { hasClaims: !!options.claims, hasTenantId: !!options.tenantId }\n            : {};\n        return PerformanceEvent.timedExecAsync(\n            logger, {\n                eventName: \"JoinSession\",\n                attempts: options.refresh ? 2 : 1,\n                ...extraProps,\n            },\n            async (event) => {\n                // TODO Extract the auth header-vs-query logic out\n                const siteOrigin = getOrigin(urlParts.siteUrl);\n                let queryParams = `access_token=${token}`;\n                let headers = {};\n                if (queryParams.length > 2048) {\n                    queryParams = \"\";\n                    headers = { Authorization: `Bearer ${token}` };\n                }\n                let body: IJoinSessionBody | undefined;\n                if (requestSocketToken || guestDisplayName) {\n                    body = {};\n                    if (requestSocketToken) {\n                        body.requestSocketToken = true;\n                    }\n                    if (guestDisplayName) {\n                        body.guestDisplayName = guestDisplayName;\n                    }\n                }\n\n                const response = await runWithRetry(\n                    async () => epochTracker.fetchAndParseAsJSON<ISocketStorageDiscovery>(\n                        `${getApiRoot(siteOrigin)}/drives/${\n                            urlParts.driveId\n                        }/items/${urlParts.itemId}/${path}?${queryParams}`,\n                        { method, headers, body: body ? JSON.stringify(body) : undefined },\n                        \"joinSession\",\n                    ),\n                    \"joinSession\",\n                    logger,\n                );\n\n                // TODO SPO-specific telemetry\n                event.end({\n                    ...response.commonSpoHeaders,\n                    // pushV2 websocket urls will contain pushf\n                    pushv2: response.content.deltaStreamSocketUrl.includes(\"pushf\"),\n                });\n\n                if (response.content.runtimeTenantId && !response.content.tenantId) {\n                    response.content.tenantId = response.content.runtimeTenantId;\n                }\n\n                return response.content;\n            });\n    });\n}\n"]}
+{"version":3,"file":"vroom.js","sourceRoot":"","sources":["../src/vroom.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 { PerformanceEvent } from \"@fluidframework/telemetry-utils\";\nimport { InstrumentedStorageTokenFetcher, IOdspUrlParts } from \"@fluidframework/odsp-driver-definitions\";\nimport { ISocketStorageDiscovery } from \"./contracts\";\nimport { getWithRetryForTokenRefresh, getOrigin } from \"./odspUtils\";\nimport { getApiRoot } from \"./odspUrlHelper\";\nimport { EpochTracker } from \"./epochTracker\";\nimport { runWithRetry } from \"./retryUtils\";\n\ninterface IJoinSessionBody {\n    requestSocketToken?: boolean;\n    guestDisplayName?: string;\n}\n\n/**\n * Makes join session call on SPO to get information about the web socket for a document\n * @param driveId - The SPO drive id that this request should be made against\n * @param itemId -The SPO item id that this request should be made against\n * @param siteUrl - The SPO site that this request should be made against\n * @param path - The API path that is relevant to this request\n * @param method - The type of request, such as GET or POST\n * @param logger - A logger to use for this request\n * @param getStorageToken - A function that is able to provide the access token for this request\n * @param epochTracker - fetch wrapper which incorporates epoch logic around joinSession call\n * @param requestSocketToken - flag indicating whether joinSession is expected to return access token\n * which is used when establishing websocket connection with collab session backend service.\n * @param guestDisplayName - display name used to identify guest user joining a session.\n * This is optional and used only when collab session is being joined via invite.\n */\nexport async function fetchJoinSession(\n    urlParts: IOdspUrlParts,\n    path: string,\n    method: string,\n    logger: ITelemetryLogger,\n    getStorageToken: InstrumentedStorageTokenFetcher,\n    epochTracker: EpochTracker,\n    requestSocketToken: boolean,\n    guestDisplayName?: string,\n): Promise<ISocketStorageDiscovery> {\n    return getWithRetryForTokenRefresh(async (options) => {\n        const token = await getStorageToken(options, \"JoinSession\");\n\n        const extraProps = options.refresh\n            ? { hasClaims: !!options.claims, hasTenantId: !!options.tenantId }\n            : {};\n        return PerformanceEvent.timedExecAsync(\n            logger, {\n                eventName: \"JoinSession\",\n                attempts: options.refresh ? 2 : 1,\n                ...extraProps,\n            },\n            async (event) => {\n                // TODO Extract the auth header-vs-query logic out\n                const siteOrigin = getOrigin(urlParts.siteUrl);\n                let queryParams = `access_token=${token}`;\n                let headers = {};\n                if (queryParams.length > 2048) {\n                    queryParams = \"\";\n                    headers = { Authorization: `Bearer ${token}` };\n                }\n                let body: IJoinSessionBody | undefined;\n                if (requestSocketToken || guestDisplayName) {\n                    body = {};\n                    if (requestSocketToken) {\n                        body.requestSocketToken = true;\n                    }\n                    if (guestDisplayName) {\n                        body.guestDisplayName = guestDisplayName;\n                    }\n                    // IMPORTANT: Must set content-type header explicitly to application/json when request has body.\n                    // By default, request will use text/plain as content-type and will be rejected by backend.\n                    headers[\"Content-Type\"] = \"application/json\";\n                }\n\n                const response = await runWithRetry(\n                    async () => epochTracker.fetchAndParseAsJSON<ISocketStorageDiscovery>(\n                        `${getApiRoot(siteOrigin)}/drives/${\n                            urlParts.driveId\n                        }/items/${urlParts.itemId}/${path}?${queryParams}`,\n                        { method, headers, body: body ? JSON.stringify(body) : undefined },\n                        \"joinSession\",\n                    ),\n                    \"joinSession\",\n                    logger,\n                );\n\n                // TODO SPO-specific telemetry\n                event.end({\n                    ...response.commonSpoHeaders,\n                    // pushV2 websocket urls will contain pushf\n                    pushv2: response.content.deltaStreamSocketUrl.includes(\"pushf\"),\n                });\n\n                if (response.content.runtimeTenantId && !response.content.tenantId) {\n                    response.content.tenantId = response.content.runtimeTenantId;\n                }\n\n                return response.content;\n            });\n    });\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluidframework/odsp-driver",
-  "version": "0.47.0",
+  "version": "0.48.0",
   "description": "Socket storage implementation for SPO and ODC",
   "homepage": "https://fluidframework.com",
   "repository": "https://github.com/microsoft/FluidFramework",
@@ -58,15 +58,15 @@
     "@fluidframework/common-definitions": "^0.20.1",
     "@fluidframework/common-utils": "^0.32.1",
     "@fluidframework/core-interfaces": "^0.39.7",
-    "@fluidframework/driver-base": "^0.47.0",
+    "@fluidframework/driver-base": "^0.48.0",
     "@fluidframework/driver-definitions": "^0.39.6",
-    "@fluidframework/driver-utils": "^0.47.0",
-    "@fluidframework/gitresources": "^0.1030.0",
-    "@fluidframework/odsp-doclib-utils": "^0.47.0",
-    "@fluidframework/odsp-driver-definitions": "^0.47.0",
-    "@fluidframework/protocol-base": "^0.1030.0",
+    "@fluidframework/driver-utils": "^0.48.0",
+    "@fluidframework/gitresources": "^0.1031.0-37526",
+    "@fluidframework/odsp-doclib-utils": "^0.48.0",
+    "@fluidframework/odsp-driver-definitions": "^0.48.0",
+    "@fluidframework/protocol-base": "^0.1031.0-37526",
     "@fluidframework/protocol-definitions": "^0.1024.0",
-    "@fluidframework/telemetry-utils": "^0.47.0",
+    "@fluidframework/telemetry-utils": "^0.48.0",
     "abort-controller": "^3.0.0",
     "node-fetch": "^2.6.1",
     "socket.io-client": "^2.4.0",
@@ -75,7 +75,7 @@
   "devDependencies": {
     "@fluidframework/build-common": "^0.23.0",
     "@fluidframework/eslint-config-fluid": "^0.23.0",
-    "@fluidframework/mocha-test-setup": "^0.47.0",
+    "@fluidframework/mocha-test-setup": "^0.48.0",
     "@microsoft/api-extractor": "^7.16.1",
     "@types/mocha": "^8.2.2",
     "@types/node-fetch": "^2.5.10",

package/src/createFile.ts

@@ -61,7 +61,7 @@ export async function createNewFluidFile(
 ): Promise<IOdspResolvedUrl> {
     // Check for valid filename before the request to create file is actually made.
     if (isInvalidFileName(newFileInfo.filename)) {
-        throwOdspNetworkError("Invalid filename. Please try again.", invalidFileNameStatusCode);
+        throwOdspNetworkError("invalidFilename", invalidFileNameStatusCode);
     }
 
     let itemId: string;
@@ -132,7 +132,7 @@ export async function createNewEmptyFluidFile(
 
                 const content = fetchResponse.content;
                 if (!content || !content.id) {
-                    throwOdspNetworkError("Could not parse item from Vroom response", fetchIncorrectResponse);
+                    throwOdspNetworkError("couldNotParseItemFromVroomResponse", fetchIncorrectResponse);
                 }
                 event.end({
                     headers: Object.keys(headers).length !== 0 ? true : undefined,
@@ -186,7 +186,7 @@ export async function createNewFluidFileFromSummary(
 
                 const content = fetchResponse.content;
                 if (!content || !content.itemId) {
-                    throwOdspNetworkError("Could not parse item from Vroom response", fetchIncorrectResponse);
+                    throwOdspNetworkError("couldNotParseItemFromVroomResponse", fetchIncorrectResponse);
                 }
                 event.end({
                     headers: Object.keys(headers).length !== 0 ? true : undefined,

package/src/epochTracker.ts

@@ -282,7 +282,7 @@ export class EpochTracker implements IPersistedFileCache {
         // initializes this value. Sometimes response does not contain epoch as it is still in
         // implementation phase at server side. In that case also, don't compare it with our epoch value.
         if (this.fluidEpoch && epochFromResponse && (this.fluidEpoch !== epochFromResponse)) {
-            throwOdspNetworkError(message ?? "Epoch Mismatch", fluidEpochMismatchError);
+            throwOdspNetworkError(message ?? "epochMismatch", fluidEpochMismatchError);
         }
     }
 

package/src/odspDeltaStorageService.ts

@@ -121,6 +121,23 @@ export class OdspDeltaStorageWithCache implements IDocumentDeltaStorageService {
     ) {
     }
 
+    protected validateMessages(reason: string, messages: ISequencedDocumentMessage[], from: number) {
+        if (messages.length !== 0) {
+            const start = messages[0].sequenceNumber;
+            const length = messages.length;
+            const last = messages[length - 1].sequenceNumber;
+            if (start !== from) {
+                this.logger.sendErrorEvent({ eventName: "OpsFetchViolation", reason, from, start, last, length});
+                messages.length = 0;
+            }
+            if (last + 1 !== from + length) {
+                this.logger.sendErrorEvent({ eventName: "OpsFetchViolation", reason, from, start, last, length});
+                // we can do better here by finding consecutive sub-block and return it
+                messages.length = 0;
+            }
+        }
+    }
+
     public fetchMessages(
         fromTotal: number,
         toTotal: number | undefined,
@@ -137,44 +154,54 @@ export class OdspDeltaStorageWithCache implements IDocumentDeltaStorageService {
         let opsFromCache = 0;
         let opsFromStorage = 0;
 
-        const stream = requestOps(
-            async (from: number, to: number, telemetryProps: ITelemetryProperties) => {
-                if (this.snapshotOps !== undefined && this.snapshotOps.length !== 0) {
-                    const messages = this.snapshotOps.filter((op) =>
-                        op.sequenceNumber >= from && op.sequenceNumber < to);
-                    if (messages.length > 0 && messages[0].sequenceNumber === from) {
-                        this.snapshotOps = this.snapshotOps.filter((op) => op.sequenceNumber >= to);
-                        opsFromSnapshot = messages.length;
-                        return { messages, partialResult: true };
-                    }
-                    this.snapshotOps = undefined;
+        const requestCallback = async (from: number, to: number, telemetryProps: ITelemetryProperties) => {
+            if (this.snapshotOps !== undefined && this.snapshotOps.length !== 0) {
+                const messages = this.snapshotOps.filter((op) =>
+                    op.sequenceNumber >= from && op.sequenceNumber < to);
+                this.validateMessages("cached", messages, from);
+                if (messages.length > 0 && messages[0].sequenceNumber === from) {
+                    this.snapshotOps = this.snapshotOps.filter((op) => op.sequenceNumber >= to);
+                    opsFromSnapshot = messages.length;
+                    return { messages, partialResult: true };
                 }
+                this.snapshotOps = undefined;
+            }
 
-                // Kick out request to PUSH for ops if it has them
-                this.requestFromSocket(from, to);
-
-                // Cache in normal flow is continuous. Once there is a miss, stop consulting cache.
-                // This saves a bit of processing time
-                if (from < this.firstCacheMiss) {
-                    const messagesFromCache = await this.getCached(from, to);
-                    if (messagesFromCache.length !== 0) {
-                        opsFromCache += messagesFromCache.length;
-                        return {
-                            messages: messagesFromCache,
-                            partialResult: true,
-                        };
-                    }
-                    this.firstCacheMiss = Math.min(this.firstCacheMiss, from);
+            // Kick out request to PUSH for ops if it has them
+            this.requestFromSocket(from, to);
+
+            // Cache in normal flow is continuous. Once there is a miss, stop consulting cache.
+            // This saves a bit of processing time
+            if (from < this.firstCacheMiss) {
+                const messagesFromCache = await this.getCached(from, to);
+                this.validateMessages("cached", messagesFromCache, from);
+                if (messagesFromCache.length !== 0) {
+                    opsFromCache += messagesFromCache.length;
+                    return {
+                        messages: messagesFromCache,
+                        partialResult: true,
+                    };
                 }
+                this.firstCacheMiss = Math.min(this.firstCacheMiss, from);
+            }
 
-                if (cachedOnly) {
-                    return { messages: [], partialResult: false };
-                }
+            if (cachedOnly) {
+                return { messages: [], partialResult: false };
+            }
 
-                const ops = await this.getFromStorage(from, to, telemetryProps);
-                opsFromStorage += ops.messages.length;
-                this.opsReceived(ops.messages);
-                return ops;
+            const ops = await this.getFromStorage(from, to, telemetryProps);
+            this.validateMessages("storage", ops.messages, from);
+            opsFromStorage += ops.messages.length;
+            this.opsReceived(ops.messages);
+            return ops;
+        };
+
+        const stream = requestOps(
+            async (from: number, to: number, telemetryProps: ITelemetryProperties) => {
+                const result = await requestCallback(from, to, telemetryProps);
+                // Catch all case, just in case
+                this.validateMessages("catch all", result.messages, from);
+                return result;
             },
             // Staging: starting with no concurrency, listening for feedback first.
             // In future releases we will switch to actual concurrency

package/src/odspDocumentDeltaConnection.ts

@@ -432,18 +432,26 @@ export class OdspDocumentDeltaConnection extends DocumentDeltaConnection {
             // If so, there it most likely does not need these ops (otherwise it already asked for them)
             if (data !== undefined) {
                 this.getOpsMap.delete(result.nonce);
+                const common = {
+                    eventName: "GetOps",
+                    code: result.code,
+                    from: data.from,
+                    to: data.to,
+                    duration: performance.now() - data.start,
+                };
                 if (messages !== undefined && messages.length > 0) {
                     this.logger.sendPerformanceEvent({
-                        eventName: "GetOps",
+                        ...common,
                         first: messages[0].sequenceNumber,
                         last: messages[messages.length - 1].sequenceNumber,
-                        code: result.code,
-                        from: data.from,
-                        to: data.to,
-                        duration: performance.now() - data.start,
                         length: messages.length,
                     });
                     this.emit("op", this.documentId, messages);
+                } else {
+                    this.logger.sendPerformanceEvent({
+                        ...common,
+                        length: 0,
+                    });
                 }
             }
         });

package/src/odspDocumentService.ts

@@ -268,7 +268,7 @@ export class OdspDocumentService implements IDocumentService {
 
             const finalWebsocketToken = websocketToken ?? (websocketEndpoint.socketToken || null);
             if (finalWebsocketToken === null) {
-                throwOdspNetworkError("Push Token is null", fetchTokenErrorCode);
+                throwOdspNetworkError("pushTokenIsNull", fetchTokenErrorCode);
             }
             try {
                 const connection = await this.connectToDeltaStreamWithRetry(
@@ -391,10 +391,10 @@ export class OdspDocumentService implements IDocumentService {
                 write: async (key: string, opsData: string) => {
                     return this.cache.persistedCache.put({...opsKey, key}, opsData);
                 },
-                read: async (batch: string) => undefined,
+                read: async (key: string) => this.cache.persistedCache.get({...opsKey, key}),
                 remove: () => { this.cache.persistedCache.removeEntries().catch(() => {}); },
             },
-            this.hostPolicy.opsCaching?.batchSize ?? 100,
+            batchSize,
             this.hostPolicy.opsCaching?.timerGranularity ?? 5000,
             this.hostPolicy.opsCaching?.totalOpsToCache ?? 5000,
         );

package/src/odspDocumentStorageManager.ts

@@ -485,10 +485,10 @@ export class OdspDocumentStorageService implements IDocumentStorageService {
             );
             const versionsResponse = response.content;
             if (!versionsResponse) {
-                throwOdspNetworkError("getVersions returned no response", 400);
+                throwOdspNetworkError("getVersionsReturnedNoResponse", 400);
             }
             if (!Array.isArray(versionsResponse.value)) {
-                throwOdspNetworkError("getVersions returned non-array response", 400);
+                throwOdspNetworkError("getVersionsReturnedNonArrayResponse", 400);
             }
             return versionsResponse.value.map((version) => {
                 // Parse the date from the message
@@ -660,19 +660,19 @@ export class OdspDocumentStorageService implements IDocumentStorageService {
 
     private checkSnapshotUrl() {
         if (!this.snapshotUrl) {
-            throwOdspNetworkError("Method not supported because no snapshotUrl was provided", 400);
+            throwOdspNetworkError("methodNotSupportedBecauseNoSnapshotUrlWasProvided", 400);
         }
     }
 
     private checkAttachmentPOSTUrl() {
         if (!this.attachmentPOSTUrl) {
-            throwOdspNetworkError("Method not supported because no attachmentPOSTUrl was provided", 400);
+            throwOdspNetworkError("methodNotSupportedBecauseNoAttachmentPOSTUrlWasProvided", 400);
         }
     }
 
     private checkAttachmentGETUrl() {
         if (!this.attachmentGETUrl) {
-            throwOdspNetworkError("Method not supported because no attachmentGETUrl was provided", 400);
+            throwOdspNetworkError("methodNotSupportedBecauseNoAttachmentGETUrlWasProvided", 400);
         }
     }
 

package/src/odspDriverUrlResolverForShareLink.ts

@@ -157,7 +157,7 @@ export class OdspDriverUrlResolverForShareLink implements IUrlResolver {
                 { eventName: "GetSharingLinkToken" },
                 async (event) => tokenFetcher(options).then((tokenResponse) => {
                     if (tokenResponse === null) {
-                        throwOdspNetworkError("Share link Token is null", fetchTokenErrorCode);
+                        throwOdspNetworkError("shareLinkTokenIsNull", fetchTokenErrorCode);
                     }
                     event.end({ fromCache: isTokenFromCache(tokenResponse) });
                     return tokenResponse;

package/src/odspUtils.ts

@@ -105,7 +105,7 @@ export async function fetchHelper(
         const response = fetchResponse as any as Response;
         // Let's assume we can retry.
         if (!response) {
-            throwOdspNetworkError(`No response from the server`, fetchIncorrectResponse);
+            throwOdspNetworkError(`noResponseFromTheServer`, fetchIncorrectResponse);
         }
         if (!response.ok || response.status < 200 || response.status >= 300) {
             throwOdspNetworkError(
@@ -129,10 +129,10 @@ export async function fetchHelper(
             online = OnlineStatus.Offline;
         }
         if (error.name === "AbortError") {
-            throwOdspNetworkError("Timeout during fetch", fetchTimeoutStatusCode);
+            throwOdspNetworkError("timeoutDuringFetch", fetchTimeoutStatusCode);
         }
         if (errorText.indexOf("ETIMEDOUT") !== -1) {
-            throwOdspNetworkError("Timeout during fetch (ETIMEDOUT)", fetchTimeoutStatusCode);
+            throwOdspNetworkError("timeoutDuringFetch(ETIMEDOUT)", fetchTimeoutStatusCode);
         }
 
         //
@@ -141,7 +141,7 @@ export async function fetchHelper(
         // It is also non-serializable object due to circular references.
         //
         throwOdspNetworkError(
-            `Fetch error`,
+            `fetchError`,
             online === OnlineStatus.Offline ? offlineFetchFailureStatusCode : fetchFailureStatusCode,
             undefined, // response
         );
@@ -195,7 +195,13 @@ export async function fetchAndParseAsJSONHelper<T>(
         };
         return res;
     } catch (e) {
-        throwOdspNetworkError(`Error while parsing fetch response: ${e}`, fetchIncorrectResponse, content);
+        throwOdspNetworkError(
+            "errorWhileParsingFetchResponse",
+            fetchIncorrectResponse,
+            content,
+            undefined,
+            { error: Object(e) },
+        );
     }
 }
 
@@ -279,7 +285,7 @@ export function toInstrumentedOdspTokenFetcher(
                     event.end({ fromCache: isTokenFromCache(tokenResponse), isNull: token === null });
                 }
                 if (token === null && throwOnNullToken) {
-                    throwOdspNetworkError(`${name} Token is null`, fetchTokenErrorCode);
+                    throwOdspNetworkError("tokenIsNull", fetchTokenErrorCode, undefined, undefined, { method: name });
                 }
                 return token;
             }),

package/src/opsCaching.ts

@@ -117,38 +117,43 @@ export class OpsCache {
         }
     }
 
-    public async get(from: number, to?: number): Promise<IMessage[]> {
+    private async getCore(from: number, to?: number): Promise<IMessage[]> {
         const messages: IMessage[] = [];
-        let batchNumber = this.getBatchNumber(from + 1);
-        const start = performance.now();
+        let batchNumber = this.getBatchNumber(from);
         // eslint-disable-next-line no-constant-condition
         while (true) {
             const res = await this.cache.read(`${this.batchSize}_${batchNumber}`);
             if (res === undefined) {
-                break;
+                return messages;
             }
             const result: CacheEntry = JSON.parse(res);
             for (const op of result) {
                 // Note that we write out undefined, but due to JSON.stringify, it turns into null!
                 if (op) {
                     if (to !== undefined && op.sequenceNumber >= to) {
-                        break;
+                        return messages;
                     }
                     if (messages.length === 0) {
-                        if (op.sequenceNumber > from + 1) {
-                            break;
-                        } else if (op.sequenceNumber <= from) {
+                        if (op.sequenceNumber > from) {
+                            return messages;
+                        } else if (op.sequenceNumber < from) {
                             continue;
                         }
                     }
                     messages.push(op);
                 } else if (messages.length !== 0) {
-                    break;
+                    return messages;
                 }
             }
 
             batchNumber++;
         }
+    }
+
+    public async get(from: number, to?: number): Promise<IMessage[]> {
+        const start = performance.now();
+
+        const messages = await this.getCore(from, to);
 
         const duration = performance.now() - start;
         if (messages.length > 0 || duration > 1000) {

package/src/packageVersion.ts

@@ -6,4 +6,4 @@
  */
 
 export const pkgName = "@fluidframework/odsp-driver";
-export const pkgVersion = "0.47.0";
+export const pkgVersion = "0.48.0";

package/src/vroom.ts

@@ -72,6 +72,9 @@ export async function fetchJoinSession(
                     if (guestDisplayName) {
                         body.guestDisplayName = guestDisplayName;
                     }
+                    // IMPORTANT: Must set content-type header explicitly to application/json when request has body.
+                    // By default, request will use text/plain as content-type and will be rejected by backend.
+                    headers["Content-Type"] = "application/json";
                 }
 
                 const response = await runWithRetry(