@fluidframework/container-runtime 2.0.0-internal.2.2.1 → 2.0.0-internal.2.3.0

package/.eslintrc.js

@@ -4,13 +4,24 @@
  */
 
 module.exports = {
-    "extends": [
-        require.resolve("@fluidframework/eslint-config-fluid"), "prettier"
-    ],
-    "parserOptions": {
-        "project": ["./tsconfig.json", "./src/test/tsconfig.json"]
+    extends: [require.resolve("@fluidframework/eslint-config-fluid/minimal"), "prettier"],
+    parserOptions: {
+        project: ["./tsconfig.json", "./src/test/tsconfig.json"],
     },
-    "rules": {
+    rules: {
         "@typescript-eslint/strict-boolean-expressions": "off",
-    }
-}
+
+        // This library is used in the browser, so we don't want dependencies on most node libraries.
+        "import/no-nodejs-modules": ["error", { allow: ["events"] }],
+    },
+    overrides: [
+        {
+            // Rules only for test files
+            files: ["*.spec.ts", "src/test/**"],
+            rules: {
+                // Test files are run in node only so additional node libraries can be used.
+                "import/no-nodejs-modules": ["error", { allow: ["assert", "crypto", "events"] }],
+            },
+        },
+    ],
+};

package/dist/batchTracker.d.ts

@@ -2,8 +2,7 @@
  * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
  * Licensed under the MIT License.
  */
-/// <reference types="node" />
-import EventEmitter from "events";
+import { EventEmitter } from "events";
 import { ITelemetryLogger } from "@fluidframework/common-definitions";
 export declare class BatchTracker {
     private readonly batchEventEmitter;

package/dist/batchTracker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"batchTracker.d.ts","sourceRoot":"","sources":["../src/batchTracker.ts"],"names":[],"mappings":"AAAA;;;GAGG;;AAEH,OAAO,YAAY,MAAM,QAAQ,CAAC;AAClC,OAAO,EAAE,gBAAgB,EAAE,MAAM,oCAAoC,CAAC;AAKtE,qBAAa,YAAY;IAOjB,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IANtC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAmB;IAC1C,OAAO,CAAC,wBAAwB,CAAqB;IACrD,OAAO,CAAC,iBAAiB,CAAa;IACtC,OAAO,CAAC,6BAA6B,CAAqB;gBAGrC,iBAAiB,EAAE,YAAY,EAChD,MAAM,EAAE,gBAAgB,EACxB,oBAAoB,EAAE,MAAM,EAC5B,sBAAsB,EAAE,MAAM,EAC9B,gBAAgB,GAAE,MAAM,MAAgC;CAyC/D;AAED;;;;;;;GAOG;AACH,eAAO,MAAM,gBAAgB,sBACN,YAAY,UACvB,gBAAgB,yBACF,MAAM,2BACJ,MAAM,iBAC4D,CAAC"}
+{"version":3,"file":"batchTracker.d.ts","sourceRoot":"","sources":["../src/batchTracker.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,EAAE,gBAAgB,EAAE,MAAM,oCAAoC,CAAC;AAKtE,qBAAa,YAAY;IAOjB,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IANtC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAmB;IAC1C,OAAO,CAAC,wBAAwB,CAAqB;IACrD,OAAO,CAAC,iBAAiB,CAAa;IACtC,OAAO,CAAC,6BAA6B,CAAqB;gBAGrC,iBAAiB,EAAE,YAAY,EAChD,MAAM,EAAE,gBAAgB,EACxB,oBAAoB,EAAE,MAAM,EAC5B,sBAAsB,EAAE,MAAM,EAC9B,gBAAgB,GAAE,MAAM,MAAgC;CAyC/D;AAED;;;;;;;GAOG;AACH,eAAO,MAAM,gBAAgB,sBACN,YAAY,UACvB,gBAAgB,yBACF,MAAM,2BACJ,MAAM,iBAC4D,CAAC"}

package/dist/batchTracker.js.map

@@ -1 +1 @@
-{"version":3,"file":"batchTracker.js","sourceRoot":"","sources":["../src/batchTracker.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;AAIH,+DAAmE;AAEnE,qEAA8D;AAE9D,MAAa,YAAY;IAMrB,YACqB,iBAA+B,EAChD,MAAwB,EACxB,oBAA4B,EAC5B,sBAA8B,EAC9B,mBAAiC,GAAG,EAAE,CAAC,0BAAW,CAAC,GAAG,EAAE;QAJvC,sBAAiB,GAAjB,iBAAiB,CAAc;QAJ5C,sBAAiB,GAAW,CAAC,CAAC;QAUlC,IAAI,CAAC,MAAM,GAAG,6BAAW,CAAC,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;QAErD,IAAI,CAAC,iBAAiB,CAAC,EAAE,CAAC,YAAY,EAAE,CAAC,OAAkC,EAAE,EAAE;YAC3E,IAAI,CAAC,wBAAwB,GAAG,OAAO,CAAC,cAAc,CAAC;YACvD,IAAI,CAAC,6BAA6B,GAAG,gBAAgB,EAAE,CAAC;YACxD,IAAI,CAAC,iBAAiB,EAAE,CAAC;QAC7B,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,iBAAiB,CAAC,EAAE,CAAC,UAAU,EAAE,CAAC,KAAsB,EAAE,OAAkC,EAAE,EAAE;YACjG,IAAA,qBAAM,EACF,IAAI,CAAC,wBAAwB,KAAK,SAAS,IAAI,IAAI,CAAC,6BAA6B,KAAK,SAAS,EAC/F,KAAK,CAAC,4CAA4C,CAAC,CAAC;YAExD,MAAM,MAAM,GAAG,OAAO,CAAC,cAAc,GAAG,IAAI,CAAC,wBAAwB,GAAG,CAAC,CAAC;YAC1E,IAAI,MAAM,IAAI,oBAAoB,EAAE;gBAChC,IAAI,CAAC,MAAM,CAAC,oBAAoB,CAAC;oBAC7B,SAAS,EAAE,cAAc;oBACzB,MAAM;oBACN,SAAS,EAAE,oBAAoB;oBAC/B,sBAAsB,EAAE,OAAO,CAAC,cAAc;oBAC9C,QAAQ,EAAE,gBAAgB,EAAE,GAAG,IAAI,CAAC,6BAA6B;oBACjE,UAAU,EAAE,KAAK,KAAK,SAAS;iBAClC,CAAC,CAAC;aACN;YAED,IAAI,IAAI,CAAC,iBAAiB,GAAG,sBAAsB,KAAK,CAAC,EAAE;gBACvD,IAAI,CAAC,MAAM,CAAC,oBAAoB,CAAC;oBAC7B,SAAS,EAAE,QAAQ;oBACnB,MAAM;oBACN,YAAY,EAAE,sBAAsB;oBACpC,sBAAsB,EAAE,OAAO,CAAC,cAAc;oBAC9C,QAAQ,EAAE,gBAAgB,EAAE,GAAG,IAAI,CAAC,6BAA6B;iBACpE,CAAC,CAAC;aACN;YAED,IAAI,CAAC,wBAAwB,GAAG,SAAS,CAAC;YAC1C,IAAI,CAAC,6BAA6B,GAAG,SAAS,CAAC;QACnD,CAAC,CAAC,CAAC;IACP,CAAC;CACJ;AApDD,oCAoDC;AAED;;;;;;;GAOG;AACI,MAAM,gBAAgB,GAAG,CAC5B,iBAA+B,EAC/B,MAAwB,EACxB,uBAA+B,IAAI,EACnC,yBAAiC,IAAI,EACvC,EAAE,CAAC,IAAI,YAAY,CAAC,iBAAiB,EAAE,MAAM,EAAE,oBAAoB,EAAE,sBAAsB,CAAC,CAAC;AALlF,QAAA,gBAAgB,oBAKkE","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport EventEmitter from \"events\";\nimport { ITelemetryLogger } from \"@fluidframework/common-definitions\";\nimport { assert, performance } from \"@fluidframework/common-utils\";\nimport { ISequencedDocumentMessage } from \"@fluidframework/protocol-definitions\";\nimport { ChildLogger } from \"@fluidframework/telemetry-utils\";\n\nexport class BatchTracker {\n    private readonly logger: ITelemetryLogger;\n    private startBatchSequenceNumber: number | undefined;\n    private trackedBatchCount: number = 0;\n    private batchProcessingStartTimeStamp: number | undefined;\n\n    constructor(\n        private readonly batchEventEmitter: EventEmitter,\n        logger: ITelemetryLogger,\n        batchLengthThreshold: number,\n        batchCountSamplingRate: number,\n        dateTimeProvider: () => number = () => performance.now(),\n    ) {\n        this.logger = ChildLogger.create(logger, \"Batching\");\n\n        this.batchEventEmitter.on(\"batchBegin\", (message: ISequencedDocumentMessage) => {\n            this.startBatchSequenceNumber = message.sequenceNumber;\n            this.batchProcessingStartTimeStamp = dateTimeProvider();\n            this.trackedBatchCount++;\n        });\n\n        this.batchEventEmitter.on(\"batchEnd\", (error: any | undefined, message: ISequencedDocumentMessage) => {\n            assert(\n                this.startBatchSequenceNumber !== undefined && this.batchProcessingStartTimeStamp !== undefined,\n                0x2ba /* \"batchBegin must fire before batchEnd\" */);\n\n            const length = message.sequenceNumber - this.startBatchSequenceNumber + 1;\n            if (length >= batchLengthThreshold) {\n                this.logger.sendPerformanceEvent({\n                    eventName: \"LengthTooBig\",\n                    length,\n                    threshold: batchLengthThreshold,\n                    batchEndSequenceNumber: message.sequenceNumber,\n                    duration: dateTimeProvider() - this.batchProcessingStartTimeStamp,\n                    batchError: error !== undefined,\n                });\n            }\n\n            if (this.trackedBatchCount % batchCountSamplingRate === 0) {\n                this.logger.sendPerformanceEvent({\n                    eventName: \"Length\",\n                    length,\n                    samplingRate: batchCountSamplingRate,\n                    batchEndSequenceNumber: message.sequenceNumber,\n                    duration: dateTimeProvider() - this.batchProcessingStartTimeStamp,\n                });\n            }\n\n            this.startBatchSequenceNumber = undefined;\n            this.batchProcessingStartTimeStamp = undefined;\n        });\n    }\n}\n\n/**\n * Track batch sizes in terms of op counts and processing times\n *\n * @param batchEventEmitter - event emitter which tracks the lifecycle of batch operations\n * @param logger - See {@link @fluidframework/common-definitions#ITelemetryLogger}\n * @param batchLengthThreshold - threshold for the length of a batch when to send an error event\n * @param batchCountSamplingRate - rate for batches for which to send an event with its characteristics\n */\nexport const BindBatchTracker = (\n    batchEventEmitter: EventEmitter,\n    logger: ITelemetryLogger,\n    batchLengthThreshold: number = 1000,\n    batchCountSamplingRate: number = 1000,\n) => new BatchTracker(batchEventEmitter, logger, batchLengthThreshold, batchCountSamplingRate);\n"]}
+{"version":3,"file":"batchTracker.js","sourceRoot":"","sources":["../src/batchTracker.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;AAIH,+DAAmE;AAEnE,qEAA8D;AAE9D,MAAa,YAAY;IAMrB,YACqB,iBAA+B,EAChD,MAAwB,EACxB,oBAA4B,EAC5B,sBAA8B,EAC9B,mBAAiC,GAAG,EAAE,CAAC,0BAAW,CAAC,GAAG,EAAE;QAJvC,sBAAiB,GAAjB,iBAAiB,CAAc;QAJ5C,sBAAiB,GAAW,CAAC,CAAC;QAUlC,IAAI,CAAC,MAAM,GAAG,6BAAW,CAAC,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;QAErD,IAAI,CAAC,iBAAiB,CAAC,EAAE,CAAC,YAAY,EAAE,CAAC,OAAkC,EAAE,EAAE;YAC3E,IAAI,CAAC,wBAAwB,GAAG,OAAO,CAAC,cAAc,CAAC;YACvD,IAAI,CAAC,6BAA6B,GAAG,gBAAgB,EAAE,CAAC;YACxD,IAAI,CAAC,iBAAiB,EAAE,CAAC;QAC7B,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,iBAAiB,CAAC,EAAE,CAAC,UAAU,EAAE,CAAC,KAAsB,EAAE,OAAkC,EAAE,EAAE;YACjG,IAAA,qBAAM,EACF,IAAI,CAAC,wBAAwB,KAAK,SAAS,IAAI,IAAI,CAAC,6BAA6B,KAAK,SAAS,EAC/F,KAAK,CAAC,4CAA4C,CAAC,CAAC;YAExD,MAAM,MAAM,GAAG,OAAO,CAAC,cAAc,GAAG,IAAI,CAAC,wBAAwB,GAAG,CAAC,CAAC;YAC1E,IAAI,MAAM,IAAI,oBAAoB,EAAE;gBAChC,IAAI,CAAC,MAAM,CAAC,oBAAoB,CAAC;oBAC7B,SAAS,EAAE,cAAc;oBACzB,MAAM;oBACN,SAAS,EAAE,oBAAoB;oBAC/B,sBAAsB,EAAE,OAAO,CAAC,cAAc;oBAC9C,QAAQ,EAAE,gBAAgB,EAAE,GAAG,IAAI,CAAC,6BAA6B;oBACjE,UAAU,EAAE,KAAK,KAAK,SAAS;iBAClC,CAAC,CAAC;aACN;YAED,IAAI,IAAI,CAAC,iBAAiB,GAAG,sBAAsB,KAAK,CAAC,EAAE;gBACvD,IAAI,CAAC,MAAM,CAAC,oBAAoB,CAAC;oBAC7B,SAAS,EAAE,QAAQ;oBACnB,MAAM;oBACN,YAAY,EAAE,sBAAsB;oBACpC,sBAAsB,EAAE,OAAO,CAAC,cAAc;oBAC9C,QAAQ,EAAE,gBAAgB,EAAE,GAAG,IAAI,CAAC,6BAA6B;iBACpE,CAAC,CAAC;aACN;YAED,IAAI,CAAC,wBAAwB,GAAG,SAAS,CAAC;YAC1C,IAAI,CAAC,6BAA6B,GAAG,SAAS,CAAC;QACnD,CAAC,CAAC,CAAC;IACP,CAAC;CACJ;AApDD,oCAoDC;AAED;;;;;;;GAOG;AACI,MAAM,gBAAgB,GAAG,CAC5B,iBAA+B,EAC/B,MAAwB,EACxB,uBAA+B,IAAI,EACnC,yBAAiC,IAAI,EACvC,EAAE,CAAC,IAAI,YAAY,CAAC,iBAAiB,EAAE,MAAM,EAAE,oBAAoB,EAAE,sBAAsB,CAAC,CAAC;AALlF,QAAA,gBAAgB,oBAKkE","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { EventEmitter } from \"events\";\nimport { ITelemetryLogger } from \"@fluidframework/common-definitions\";\nimport { assert, performance } from \"@fluidframework/common-utils\";\nimport { ISequencedDocumentMessage } from \"@fluidframework/protocol-definitions\";\nimport { ChildLogger } from \"@fluidframework/telemetry-utils\";\n\nexport class BatchTracker {\n    private readonly logger: ITelemetryLogger;\n    private startBatchSequenceNumber: number | undefined;\n    private trackedBatchCount: number = 0;\n    private batchProcessingStartTimeStamp: number | undefined;\n\n    constructor(\n        private readonly batchEventEmitter: EventEmitter,\n        logger: ITelemetryLogger,\n        batchLengthThreshold: number,\n        batchCountSamplingRate: number,\n        dateTimeProvider: () => number = () => performance.now(),\n    ) {\n        this.logger = ChildLogger.create(logger, \"Batching\");\n\n        this.batchEventEmitter.on(\"batchBegin\", (message: ISequencedDocumentMessage) => {\n            this.startBatchSequenceNumber = message.sequenceNumber;\n            this.batchProcessingStartTimeStamp = dateTimeProvider();\n            this.trackedBatchCount++;\n        });\n\n        this.batchEventEmitter.on(\"batchEnd\", (error: any | undefined, message: ISequencedDocumentMessage) => {\n            assert(\n                this.startBatchSequenceNumber !== undefined && this.batchProcessingStartTimeStamp !== undefined,\n                0x2ba /* \"batchBegin must fire before batchEnd\" */);\n\n            const length = message.sequenceNumber - this.startBatchSequenceNumber + 1;\n            if (length >= batchLengthThreshold) {\n                this.logger.sendPerformanceEvent({\n                    eventName: \"LengthTooBig\",\n                    length,\n                    threshold: batchLengthThreshold,\n                    batchEndSequenceNumber: message.sequenceNumber,\n                    duration: dateTimeProvider() - this.batchProcessingStartTimeStamp,\n                    batchError: error !== undefined,\n                });\n            }\n\n            if (this.trackedBatchCount % batchCountSamplingRate === 0) {\n                this.logger.sendPerformanceEvent({\n                    eventName: \"Length\",\n                    length,\n                    samplingRate: batchCountSamplingRate,\n                    batchEndSequenceNumber: message.sequenceNumber,\n                    duration: dateTimeProvider() - this.batchProcessingStartTimeStamp,\n                });\n            }\n\n            this.startBatchSequenceNumber = undefined;\n            this.batchProcessingStartTimeStamp = undefined;\n        });\n    }\n}\n\n/**\n * Track batch sizes in terms of op counts and processing times\n *\n * @param batchEventEmitter - event emitter which tracks the lifecycle of batch operations\n * @param logger - See {@link @fluidframework/common-definitions#ITelemetryLogger}\n * @param batchLengthThreshold - threshold for the length of a batch when to send an error event\n * @param batchCountSamplingRate - rate for batches for which to send an event with its characteristics\n */\nexport const BindBatchTracker = (\n    batchEventEmitter: EventEmitter,\n    logger: ITelemetryLogger,\n    batchLengthThreshold: number = 1000,\n    batchCountSamplingRate: number = 1000,\n) => new BatchTracker(batchEventEmitter, logger, batchLengthThreshold, batchCountSamplingRate);\n"]}

package/dist/blobManager.d.ts

@@ -40,30 +40,35 @@ export interface IPendingBlobs {
         blob: string;
     };
 }
-export declare class BlobManager {
+export interface IBlobManagerEvents {
+    (event: "noPendingBlobs", listener: () => void): any;
+}
+export declare class BlobManager extends TypedEventEmitter<IBlobManagerEvents> {
     private readonly routeContext;
     private readonly getStorage;
     /**
-     * Submit a BlobAttach op. When a blob is uploaded, there is a short grace period before which
-     * the blob is deleted. The BlobAttach op notifies the server that blob is in use. The server
-     * will then not delete the blob as long as it is listed as referenced in future summaries.
-     * The summarizing client will know to include the storage ID in the summary when it sees the op.
+     * Submit a BlobAttach op. When a blob is uploaded, there is a short grace period before which the blob is
+     * deleted. The BlobAttach op notifies the server that blob is in use. The server will then not delete the
+     * the blob as long as it is listed as referenced in future summaries. The summarizing client will know to
+     * include the storage ID in the summary when it sees the op.
      *
-     * The op may also include a local ID to inform all clients of the relation to the storage
-     * ID, without knowledge of which they cannot request the blob from storage. This is also
-     * included in the redirect table in the summary.
+     * The op will also include a local ID to inform all clients of the relation to the storage ID, without
+     * knowledge of which they cannot request the blob from storage. It's important that this op is sequenced
+     * before any ops that reference the local ID, otherwise, an invalid handle could be added to the document.
      */
     private readonly sendBlobAttachOp;
-    private readonly gcNodeUpdated;
+    private readonly blobRequested;
+    private readonly addedBlobReference;
     private readonly runtime;
     static readonly basePath = "_blobs";
     private static readonly redirectTableBlobName;
     private readonly mc;
     /**
-     * Map of local (offline/detached) IDs to storage IDs. Contains identity entries
-     * (id → id) for storage IDs, so all requested IDs should be a key in this map.
-     * Blobs created while the container is detached are stored in IDetachedBlobStorage
-     * which gives local IDs; the storage IDs are filled in at attach time.
+     * Map of local IDs to storage IDs. Contains identity entries (id → id) for storage IDs. All requested IDs should
+     * be a key in this map. Blobs created while the container is detached are stored in IDetachedBlobStorage which
+     * gives local IDs; the storage IDs are filled in at attach time.
+     * Note: It contains mappings from all clients, i.e., from remote clients as well. local ID comes from the client
+     * that uploaded the blob but its mapping to storage ID is needed in all clients in order to retrieve the blob.
      */
     private readonly redirectTable;
     /**
@@ -73,32 +78,34 @@ export declare class BlobManager {
      */
     private readonly pendingBlobs;
     /**
-     * Track ops in flight for online flow. Used to avoid searching pendingBlobs since BlobAttach ops
-     * don't include local ID in online flow.
+     * Track ops in flight for online flow. This is used for optimizations where if we receive an ack for a storage ID,
+     * we can resolve all pending blobs with the same storage ID even though they may have different local IDs. That's
+     * because we know that the server will not delete the blob corresponding to that storage ID.
      */
     private readonly opsInFlight;
     private readonly retryThrottler;
     /** If true, throw an error when a tombstone attachment blob is retrieved. */
     private readonly throwOnTombstoneUsage;
     /**
-     * This stores ides of tombstoned blobs.
+     * This stores IDs of tombstoned blobs.
      * Tombstone is a temporary feature that imitates a blob getting swept by garbage collection.
      */
     private readonly tombstonedBlobs;
     constructor(routeContext: IFluidHandleContext, snapshot: IBlobManagerLoadInfo, getStorage: () => IDocumentStorageService, 
     /**
-     * Submit a BlobAttach op. When a blob is uploaded, there is a short grace period before which
-     * the blob is deleted. The BlobAttach op notifies the server that blob is in use. The server
-     * will then not delete the blob as long as it is listed as referenced in future summaries.
-     * The summarizing client will know to include the storage ID in the summary when it sees the op.
+     * Submit a BlobAttach op. When a blob is uploaded, there is a short grace period before which the blob is
+     * deleted. The BlobAttach op notifies the server that blob is in use. The server will then not delete the
+     * the blob as long as it is listed as referenced in future summaries. The summarizing client will know to
+     * include the storage ID in the summary when it sees the op.
      *
-     * The op may also include a local ID to inform all clients of the relation to the storage
-     * ID, without knowledge of which they cannot request the blob from storage. This is also
-     * included in the redirect table in the summary.
+     * The op will also include a local ID to inform all clients of the relation to the storage ID, without
+     * knowledge of which they cannot request the blob from storage. It's important that this op is sequenced
+     * before any ops that reference the local ID, otherwise, an invalid handle could be added to the document.
      */
-    sendBlobAttachOp: (storageId?: string, localId?: string) => void, gcNodeUpdated: (blobPath: string) => void, runtime: IBlobManagerRuntime, stashedBlobs?: IPendingBlobs);
+    sendBlobAttachOp: (localId: string, storageId?: string) => void, blobRequested: (blobPath: string) => void, addedBlobReference: (fromNodePath: string, toNodePath: string) => void, runtime: IBlobManagerRuntime, stashedBlobs?: IPendingBlobs);
     private get pendingOfflineUploads();
     get hasPendingOfflineUploads(): boolean;
+    get hasPendingBlobs(): boolean;
     /**
      * Upload blobs added while offline. This must be completed before connecting and resubmitting ops.
      */
@@ -124,6 +131,12 @@ export declare class BlobManager {
     private createBlobDetached;
     createBlob(blob: ArrayBufferLike): Promise<IFluidHandle<ArrayBufferLike>>;
     private uploadBlob;
+    /**
+     * Set up a mapping in the redirect table from fromId to toId. Also, notify the runtime that a reference is added
+     * which is required for GC.
+     */
+    private setRedirection;
+    private deleteAndEmitsIfEmpty;
     private onUploadResolve;
     private onUploadReject;
     private transitionToOffline;
@@ -153,18 +166,16 @@ export declare class BlobManager {
      */
     getGCData(fullGC?: boolean): IGarbageCollectionData;
     /**
-     * This is called to update blobs whose routes are used. The used blobs are removed from the tombstone list.
-     * @param usedRoutes - The routes of the blob nodes that are used.
+     * This is called to update blobs whose routes are unused. The unused blobs are deleted.
+     * @param unusedRoutes - The routes of the blob nodes that are unused.
      */
-    updateUsedRoutes(usedRoutes: string[]): void;
+    updateUnusedRoutes(unusedRoutes: string[]): void;
     /**
-     * This is called to update blobs whose routes are unused. The unused blobs are either deleted or marked as
-     * tombstones.
-     * @param unusedRoutes - The routes of the blob nodes that are unused.
-     * @param tombstone - if true, the objects corresponding to unused routes are marked tombstones. Otherwise, they
-     * are deleted.
+     * This is called to update blobs whose routes are tombstones. Tombstoned blobs enable testing scenarios with
+     * accessing deleted content without actually deleting content from summaries.
+     * @param tombstonedRoutes - The routes of blob nodes that are tombstones.
      */
-    updateUnusedRoutes(unusedRoutes: string[], tombstone: boolean): void;
+    updateTombstonedRoutes(tombstonedRoutes: string[]): void;
     summarize(telemetryContext?: ITelemetryContext): ISummaryTreeWithStats;
     setRedirectTable(table: Map<string, string>): void;
     getPendingBlobs(): IPendingBlobs;

package/dist/blobManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"blobManager.d.ts","sourceRoot":"","sources":["../src/blobManager.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"blobManager.d.ts","sourceRoot":"","sources":["../src/blobManager.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EAAE,YAAY,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AACpF,OAAO,EAAE,uBAAuB,EAAE,MAAM,oCAAoC,CAAC;AAC7E,OAAO,EAAuB,yBAAyB,EAAE,aAAa,EAAE,MAAM,sCAAsC,CAAC;AAOrH,OAAO,EAAoD,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AACnH,OAAO,EAAE,iBAAiB,EAAE,uBAAuB,EAAE,MAAM,+CAA+C,CAAC;AAG3G,OAAO,EACH,sBAAsB,EACtB,qBAAqB,EACrB,iBAAiB,EACpB,MAAM,qCAAqC,CAAC;AAM7C;;;;;;GAMG;AACH,qBAAa,UAAW,YAAW,YAAY,CAAC,eAAe,CAAC;aAYxC,IAAI,EAAE,MAAM;aACZ,YAAY,EAAE,mBAAmB;IAC1C,GAAG,EAAE,MAAM,OAAO,CAAC,GAAG,CAAC;IAblC,OAAO,CAAC,QAAQ,CAAkB;IAElC,IAAW,YAAY,IAAI,YAAY,CAAiB;IAExD,IAAW,UAAU,IAAI,OAAO,CAE/B;IAED,SAAgB,YAAY,EAAE,MAAM,CAAC;gBAGjB,IAAI,EAAE,MAAM,EACZ,YAAY,EAAE,mBAAmB,EAC1C,GAAG,EAAE,MAAM,OAAO,CAAC,GAAG,CAAC;IAK3B,WAAW;IAIX,IAAI,CAAC,MAAM,EAAE,YAAY;CAGnC;AAmBD;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACjC,GAAG,CAAC,EAAE,MAAM,EAAE,CAAC;IACf,aAAa,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC;CACtC;AAID,oBAAY,mBAAmB,GAC3B,IAAI,CAAC,iBAAiB,EAAE,aAAa,GAAG,WAAW,GAAG,QAAQ,GAAG,eAAe,CAAC,GAAG,iBAAiB,CAAC,uBAAuB,CAAC,CAAC;AAmBnI,MAAM,WAAW,aAAa;IAAG,CAAC,EAAE,EAAE,MAAM,GAAG;QAAE,IAAI,EAAE,MAAM,CAAC;KAAE,CAAC;CAAE;AAEnE,MAAM,WAAW,kBAAkB;IAC/B,CAAC,KAAK,EAAE,gBAAgB,EAAE,QAAQ,EAAE,MAAM,IAAI,OAAE;CACnD;AAED,qBAAa,WAAY,SAAQ,iBAAiB,CAAC,kBAAkB,CAAC;IA4C9D,OAAO,CAAC,QAAQ,CAAC,YAAY;IAE7B,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B;;;;;;;;;OASG;IACH,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IAGjC,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,OAAO,CAAC,QAAQ,CAAC,kBAAkB;IACnC,OAAO,CAAC,QAAQ,CAAC,OAAO;IA7D5B,gBAAuB,QAAQ,YAAY;IAC3C,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,qBAAqB,CAAoB;IACjE,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAoB;IAEvC;;;;;;OAMG;IACH,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAkC;IAEhE;;;;OAIG;IACH,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAuC;IAEpE;;;;OAIG;IACH,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAoC;IAEhE,OAAO,CAAC,QAAQ,CAAC,cAAc,CAK5B;IAEH,6EAA6E;IAC7E,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAU;IAChD;;;OAGG;IACH,OAAO,CAAC,QAAQ,CAAC,eAAe,CAA0B;gBAGrC,YAAY,EAAE,mBAAmB,EAClD,QAAQ,EAAE,oBAAoB,EACb,UAAU,EAAE,MAAM,uBAAuB;IAC1D;;;;;;;;;OASG;IACc,gBAAgB,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,KAAK,IAAI,EAG/D,aAAa,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,EACzC,kBAAkB,EAAE,CAAC,YAAY,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,KAAK,IAAI,EACtE,OAAO,EAAE,mBAAmB,EAC7C,YAAY,GAAE,aAAkB;IAwBpC,OAAO,KAAK,qBAAqB,GAGhC;IAED,IAAW,wBAAwB,IAAI,OAAO,CAE7C;IAED,IAAW,eAAe,IAAI,OAAO,CAGpC;IAED;;OAEG;IACU,WAAW;IAWxB;;;OAGG;IACH,OAAO,CAAC,cAAc;IAUtB;;;;OAIG;IACH,OAAO,CAAC,iBAAiB;IAIzB;;;OAGG;IACH,OAAO,KAAK,UAAU,GAYrB;IAEY,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC;IA4C9D,OAAO,CAAC,aAAa;YAUP,kBAAkB;IAQnB,UAAU,CAAC,IAAI,EAAE,eAAe,GAAG,OAAO,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC;YA0BxE,UAAU;IAYxB;;;OAGG;IACH,OAAO,CAAC,cAAc;IAStB,OAAO,CAAC,qBAAqB;IAS7B,OAAO,CAAC,eAAe;YA2CT,cAAc;IAgB5B,OAAO,CAAC,mBAAmB;IAyB3B;;;;OAIG;IACI,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS;IActD,mBAAmB,CAAC,OAAO,EAAE,yBAAyB,EAAE,KAAK,EAAE,OAAO;IA2C7E;;;;;OAKG;WACiB,IAAI,CACpB,SAAS,EAAE,aAAa,GAAG,SAAS,EACpC,YAAY,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC,GAC1D,OAAO,CAAC,oBAAoB,CAAC;IAchC;;OAEG;IACH,OAAO,CAAC,IAAI;IAgBZ;;;;;OAKG;IACI,SAAS,CAAC,MAAM,GAAE,OAAe,GAAG,sBAAsB;IASjE;;;OAGG;IACI,kBAAkB,CAAC,YAAY,EAAE,MAAM,EAAE,GAAG,IAAI;IAcvD;;;;OAIG;IACI,sBAAsB,CAAC,gBAAgB,EAAE,MAAM,EAAE;IA0BjD,SAAS,CAAC,gBAAgB,CAAC,EAAE,iBAAiB,GAAG,qBAAqB;IAqBtE,gBAAgB,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC;IAa3C,eAAe,IAAI,aAAa;CAO1C"}

package/dist/blobManager.js

@@ -13,6 +13,7 @@ const telemetry_utils_1 = require("@fluidframework/telemetry-utils");
 const throttler_1 = require("./throttler");
 const summarizerClientElection_1 = require("./summarizerClientElection");
 const garbageCollectionConstants_1 = require("./garbageCollectionConstants");
+const garbageCollectionTombstoneUtils_1 = require("./garbageCollectionTombstoneUtils");
 /**
  * This class represents blob (long string)
  * This object is used only when creating (writing) new blob and serialization purposes.
@@ -65,26 +66,28 @@ var PendingBlobStatus;
     PendingBlobStatus[PendingBlobStatus["OfflinePendingUpload"] = 2] = "OfflinePendingUpload";
     PendingBlobStatus[PendingBlobStatus["OfflinePendingOp"] = 3] = "OfflinePendingOp";
 })(PendingBlobStatus || (PendingBlobStatus = {}));
-class BlobManager {
+class BlobManager extends common_utils_1.TypedEventEmitter {
     constructor(routeContext, snapshot, getStorage, 
     /**
-     * Submit a BlobAttach op. When a blob is uploaded, there is a short grace period before which
-     * the blob is deleted. The BlobAttach op notifies the server that blob is in use. The server
-     * will then not delete the blob as long as it is listed as referenced in future summaries.
-     * The summarizing client will know to include the storage ID in the summary when it sees the op.
+     * Submit a BlobAttach op. When a blob is uploaded, there is a short grace period before which the blob is
+     * deleted. The BlobAttach op notifies the server that blob is in use. The server will then not delete the
+     * the blob as long as it is listed as referenced in future summaries. The summarizing client will know to
+     * include the storage ID in the summary when it sees the op.
      *
-     * The op may also include a local ID to inform all clients of the relation to the storage
-     * ID, without knowledge of which they cannot request the blob from storage. This is also
-     * included in the redirect table in the summary.
+     * The op will also include a local ID to inform all clients of the relation to the storage ID, without
+     * knowledge of which they cannot request the blob from storage. It's important that this op is sequenced
+     * before any ops that reference the local ID, otherwise, an invalid handle could be added to the document.
      */
     sendBlobAttachOp, 
     // To be called when a blob node is requested. blobPath is the path of the blob's node in GC's graph. It's
     // of the format `/<BlobManager.basePath>/<blobId>`.
-    gcNodeUpdated, runtime, stashedBlobs = {}) {
+    blobRequested, addedBlobReference, runtime, stashedBlobs = {}) {
+        super();
         this.routeContext = routeContext;
         this.getStorage = getStorage;
         this.sendBlobAttachOp = sendBlobAttachOp;
-        this.gcNodeUpdated = gcNodeUpdated;
+        this.blobRequested = blobRequested;
+        this.addedBlobReference = addedBlobReference;
         this.runtime = runtime;
         /**
          * Blobs which have not been uploaded or for which we have not yet seen a BlobAttach op round-trip.
@@ -93,8 +96,9 @@ class BlobManager {
          */
         this.pendingBlobs = new Map();
         /**
-         * Track ops in flight for online flow. Used to avoid searching pendingBlobs since BlobAttach ops
-         * don't include local ID in online flow.
+         * Track ops in flight for online flow. This is used for optimizations where if we receive an ack for a storage ID,
+         * we can resolve all pending blobs with the same storage ID even though they may have different local IDs. That's
+         * because we know that the server will not delete the blob corresponding to that storage ID.
          */
         this.opsInFlight = new Map();
         this.retryThrottler = new CancellableThrottler(new throttler_1.Throttler(60 * 1000, // 60 sec delay window
@@ -102,7 +106,7 @@ class BlobManager {
         // throttling function increases exponentially (0ms, 40ms, 80ms, 160ms, etc)
         (0, throttler_1.formExponentialFn)({ coefficient: 20, initialDelay: 0 })));
         /**
-         * This stores ides of tombstoned blobs.
+         * This stores IDs of tombstoned blobs.
          * Tombstone is a temporary feature that imitates a blob getting swept by garbage collection.
          */
         this.tombstonedBlobs = new Set();
@@ -131,6 +135,10 @@ class BlobManager {
     get hasPendingOfflineUploads() {
         return this.pendingOfflineUploads.length > 0;
     }
+    get hasPendingBlobs() {
+        return (this.runtime.attachState !== container_definitions_1.AttachState.Attached && this.redirectTable.size > 0)
+            || this.pendingBlobs.size > 0;
+    }
     /**
      * Upload blobs added while offline. This must be completed before connecting and resubmitting ops.
      */
@@ -180,10 +188,11 @@ class BlobManager {
         const request = { url: blobId };
         if (this.tombstonedBlobs.has(blobId)) {
             const error = (0, runtime_utils_1.responseToException)((0, runtime_utils_1.createResponseError)(404, "Blob removed by gc", request), request);
-            this.mc.logger.sendErrorEvent({
+            const event = {
                 eventName: "GC_Tombstone_Blob_Requested",
                 url: request.url,
-            }, error);
+            };
+            (0, garbageCollectionTombstoneUtils_1.sendGCTombstoneEvent)(this.mc, event, this.runtime.clientDetails.type === summarizerClientElection_1.summarizerClientType, [BlobManager.basePath], error);
             if (this.throwOnTombstoneUsage) {
                 throw error;
             }
@@ -200,11 +209,12 @@ class BlobManager {
             storageId = blobId;
         }
         else {
-            storageId = this.redirectTable.get(blobId);
-            (0, common_utils_1.assert)(!!storageId, 0x11f /* "requesting unknown blobs" */);
+            const attachedStorageId = this.redirectTable.get(blobId);
+            (0, common_utils_1.assert)(!!attachedStorageId, 0x11f /* "requesting unknown blobs" */);
+            storageId = attachedStorageId;
         }
-        // When a GC-able (not pending) blob is retrieved, let runtime know that the corresponding GC node got updated.
-        this.gcNodeUpdated(this.getBlobGCNodePath(blobId));
+        // Let runtime know that the corresponding GC node was requested.
+        this.blobRequested(this.getBlobGCNodePath(blobId));
         return telemetry_utils_1.PerformanceEvent.timedExecAsync(this.mc.logger, { eventName: "AttachmentReadBlob", id: storageId }, async () => {
             return this.getStorage().readBlob(storageId);
         }, { end: true, cancel: "error" });
@@ -217,7 +227,7 @@ class BlobManager {
         // Blobs created while the container is detached are stored in IDetachedBlobStorage.
         // The 'IDocumentStorageService.createBlob()' call below will respond with a localId.
         const response = await this.getStorage().createBlob(blob);
-        this.redirectTable.set(response.id, undefined);
+        this.setRedirection(response.id, undefined);
         return this.getBlobHandle(response.id);
     }
     async createBlob(blob) {
@@ -230,8 +240,8 @@ class BlobManager {
             await new Promise((resolve) => this.runtime.once("attached", resolve));
         }
         (0, common_utils_1.assert)(this.runtime.attachState === container_definitions_1.AttachState.Attached, 0x385 /* For clarity and paranoid defense against adding future attachment states */);
-        // Create a local ID for each blob. This is used to support blobs if/when the client goes
-        // offline since we don't have the ID from storage yet. If online flow succeeds this won't be used.
+        // Create a local ID for the blob. After uploading it to storage and before returning it, a local ID to
+        // storage ID mapping is created.
         const localId = (0, uuid_1.v4)();
         const pendingEntry = {
             blob,
@@ -245,6 +255,26 @@ class BlobManager {
     async uploadBlob(localId, blob) {
         return telemetry_utils_1.PerformanceEvent.timedExecAsync(this.mc.logger, { eventName: "createBlob" }, async () => this.getStorage().createBlob(blob), { end: true, cancel: this.runtime.connected ? "error" : "generic" }).then((response) => this.onUploadResolve(localId, response), async (err) => this.onUploadReject(localId, err));
     }
+    /**
+     * Set up a mapping in the redirect table from fromId to toId. Also, notify the runtime that a reference is added
+     * which is required for GC.
+     */
+    setRedirection(fromId, toId) {
+        this.redirectTable.set(fromId, toId);
+        // Notify runtime of a reference added if toId is not undefined. It can be undefined when a blob is uploaded in
+        // detached mode. In this case, the entry will be updated when the blob is updated.
+        if (toId !== undefined) {
+            this.addedBlobReference(this.getBlobGCNodePath(fromId), this.getBlobGCNodePath(toId));
+        }
+    }
+    deleteAndEmitsIfEmpty(id) {
+        if (this.pendingBlobs.has(id)) {
+            this.pendingBlobs.delete(id);
+            if (!this.hasPendingBlobs) {
+                this.emit("noPendingBlobs");
+            }
+        }
+    }
     onUploadResolve(localId, response) {
         var _a;
         const entry = this.pendingBlobs.get(localId);
@@ -253,17 +283,24 @@ class BlobManager {
         entry.storageId = response.id;
         if (this.runtime.connected) {
             if (entry.status === PendingBlobStatus.OnlinePendingUpload) {
+                // Send a blob attach op. This serves two purposes:
+                // 1. If its a new blob, i.e., it isn't de-duped, the server will keep the blob alive if it sees this op
+                //    until its storage ID is added to the next summary.
+                // 2. It will create a local ID to storage ID mapping in all clients which is needed to retrieve the
+                //    blob from the server via the storage ID.
+                this.sendBlobAttachOp(localId, response.id);
                 if (this.storageIds.has(response.id)) {
-                    // Storage may dedupe blobs and give us an ID we already know
-                    // no need to submit BlobAttach op in this case
-                    entry.handleP.resolve(this.getBlobHandle(response.id));
-                    this.pendingBlobs.delete(localId);
+                    // The blob is de-duped. Set up a local ID to storage ID mapping and return the blob. Since this is
+                    // an existing blob, we don't have to wait for the op to be ack'd since this step has already
+                    // happened before and so, the server won't delete it.
+                    this.setRedirection(localId, response.id);
+                    entry.handleP.resolve(this.getBlobHandle(localId));
+                    this.deleteAndEmitsIfEmpty(localId);
                 }
                 else {
-                    // Check for still-pending duplicates too; if an op is already in flight we can wait for that one
-                    if (!this.opsInFlight.has(response.id)) {
-                        this.sendBlobAttachOp(response.id);
-                    }
+                    // If there is already an op for this storage ID, append the local ID to the list. Once any op for
+                    // this storage ID is ack'd, all pending blobs for it can be resolved since the op will keep the
+                    // blob alive in storage.
                     this.opsInFlight.set(response.id, ((_a = this.opsInFlight.get(response.id)) !== null && _a !== void 0 ? _a : []).concat(localId));
                     entry.status = PendingBlobStatus.OnlinePendingOp;
                 }
@@ -304,15 +341,19 @@ class BlobManager {
         const entry = this.pendingBlobs.get(localId);
         (0, common_utils_1.assert)(!!entry, 0x389 /* No pending blob entry */);
         (0, common_utils_1.assert)([PendingBlobStatus.OnlinePendingUpload, PendingBlobStatus.OnlinePendingOp].includes(entry.status), 0x38a /* Blob must be in online flow to transition to offline flow */);
+        /**
+         * If we haven't already submitted a BlobAttach op for this entry, send it before returning the blob handle.
+         * This will make sure that the BlobAttach op is sequenced prior to any ops referencing the handle. Otherwise,
+         * an invalid handle could be added to the document.
+         * storageId may be undefined but since we are not connected we will have a chance to add it when reSubmit()
+         * is called on reconnection.
+         */
+        if (entry.status !== PendingBlobStatus.OnlinePendingOp) {
+            this.sendBlobAttachOp(localId, entry.storageId);
+        }
         entry.status = entry.status === PendingBlobStatus.OnlinePendingUpload
             ? PendingBlobStatus.OfflinePendingUpload
             : PendingBlobStatus.OfflinePendingOp;
-        // Submit a BlobAttach op. It's important we submit this op now before returning the blob handle so the
-        // BlobAttach op is sequenced prior to any ops referencing the handle. Otherwise an invalid handle could be
-        // added to the document if the ops are not all successfully submitted upon reconnection.
-        // storageId may be undefined but since we are not connected we will have a chance to add it when reSubmit()
-        // is called
-        this.sendBlobAttachOp(entry.storageId, localId);
         entry.handleP.resolve(this.getBlobHandle(localId));
     }
     /**
@@ -322,45 +363,52 @@ class BlobManager {
      */
     reSubmit(metadata) {
         (0, common_utils_1.assert)(!!metadata, 0x38b /* Resubmitted ops must have metadata */);
-        const { blobId, localId } = metadata;
+        const { localId, blobId } = metadata;
+        (0, common_utils_1.assert)(localId !== undefined, 0x50d /* local ID not available on reSubmit */);
         if (!blobId) {
-            (0, common_utils_1.assert)(!!localId, 0x38c /* Submitted BlobAttach ops must have a blobId or localId */);
             // We submitted this op while offline. The blob should have been uploaded by now.
             const pendingEntry = this.pendingBlobs.get(localId);
             (0, common_utils_1.assert)((pendingEntry === null || pendingEntry === void 0 ? void 0 : pendingEntry.status) === PendingBlobStatus.OfflinePendingOp &&
                 !!(pendingEntry === null || pendingEntry === void 0 ? void 0 : pendingEntry.storageId), 0x38d /* blob must be uploaded before resubmitting BlobAttach op */);
-            return this.sendBlobAttachOp(pendingEntry.storageId, localId);
+            return this.sendBlobAttachOp(localId, pendingEntry.storageId);
         }
-        return this.sendBlobAttachOp(blobId, localId);
+        return this.sendBlobAttachOp(localId, blobId);
     }
     processBlobAttachOp(message, local) {
         var _a, _b;
-        (0, common_utils_1.assert)((_a = message === null || message === void 0 ? void 0 : message.metadata) === null || _a === void 0 ? void 0 : _a.blobId, 0x12a /* "Missing blob id on metadata" */);
-        if (message.metadata.localId !== undefined) {
-            this.redirectTable.set(message.metadata.localId, message.metadata.blobId);
+        const localId = (_a = message.metadata) === null || _a === void 0 ? void 0 : _a.localId;
+        const blobId = (_b = message.metadata) === null || _b === void 0 ? void 0 : _b.blobId;
+        (0, common_utils_1.assert)(blobId !== undefined, 0x12a /* "Missing blob id on metadata" */);
+        // Set up a mapping from local ID to storage ID. This is crucial since without this the blob cannot be
+        // requested from the server.
+        // Note: The check for undefined is needed for back-compat when localId was not part of the BlobAttach op that
+        // was sent when online.
+        if (localId !== undefined) {
+            this.setRedirection(localId, blobId);
         }
         // set identity (id -> id) entry
-        this.redirectTable.set(message.metadata.blobId, message.metadata.blobId);
+        this.setRedirection(blobId, blobId);
         if (local) {
-            if (message.metadata.localId === undefined) {
-                // Since there is no local ID, we know this op was submitted while online.
-                const waitingBlobs = this.opsInFlight.get(message.metadata.blobId);
-                (0, common_utils_1.assert)(!!waitingBlobs, 0x38e /* local online BlobAttach op with no pending blob */);
-                waitingBlobs.forEach((localId) => {
-                    const pendingBlobEntry = this.pendingBlobs.get(localId);
+            (0, common_utils_1.assert)(localId !== undefined, 0x50e /* local ID not present in blob attach message */);
+            const waitingBlobs = this.opsInFlight.get(blobId);
+            if (waitingBlobs !== undefined) {
+                // For each op corresponding to this storage ID that we are waiting for, resolve the pending blob.
+                // This is safe because the server will keep the blob alive and the op containing the local ID to
+                // storage ID is already in flight and any op containing this local ID will be sequenced after that.
+                waitingBlobs.forEach((pendingLocalId) => {
+                    const pendingBlobEntry = this.pendingBlobs.get(pendingLocalId);
                     (0, common_utils_1.assert)(pendingBlobEntry !== undefined, 0x38f);
                     // It's possible we transitioned to offline flow while waiting for this op.
                     if (pendingBlobEntry.status === PendingBlobStatus.OnlinePendingOp) {
-                        pendingBlobEntry.handleP.resolve(this.getBlobHandle(message.metadata.blobId));
-                        this.pendingBlobs.delete(localId);
+                        this.setRedirection(pendingLocalId, blobId);
+                        pendingBlobEntry.handleP.resolve(this.getBlobHandle(pendingLocalId));
+                        this.deleteAndEmitsIfEmpty(pendingLocalId);
                     }
                 });
+                this.opsInFlight.delete(blobId);
             }
-            else {
-                // Each local ID is unique; get the pending blob entry and delete it
-                (0, common_utils_1.assert)(((_b = this.pendingBlobs.get(message.metadata.localId)) === null || _b === void 0 ? void 0 : _b.status) === PendingBlobStatus.OfflinePendingOp, 0x1f8 /* "local BlobAttach op with no pending blob" */);
-                this.pendingBlobs.delete(message.metadata.localId);
-            }
+            // For blobs that were transitioned to offline flow while waiting for this op, the entry should be deleted.
+            this.deleteAndEmitsIfEmpty(localId);
         }
     }
     /**
@@ -409,65 +457,50 @@ class BlobManager {
      */
     getGCData(fullGC = false) {
         const gcData = { gcNodes: {} };
-        /**
-          * The node path is of the format `/_blobs/blobId`. This path must match the path of the blob handle returned
-          * by the createBlob API because blobs are marked referenced by storing these handles in a referenced DDS.
-          */
-        this.storageIds.forEach((blobId) => {
-            gcData.gcNodes[this.getBlobGCNodePath(blobId)] = [];
-        });
-        // For some blobs, the handle returned on creation is based off of the localId. So, these
-        // nodes can be referenced by storing the localId handle. When that happens, the corresponding storageId node
-        // must also be marked referenced. So, we add a route from the localId node to the storageId node.
-        // Note that because of de-duping, there can be multiple localIds that all redirect to the same storageId or
-        // a blob may be referenced via its storageId handle.
         for (const [localId, storageId] of this.redirectTable) {
             (0, common_utils_1.assert)(!!storageId, 0x390 /* Must be attached to get GC data */);
-            // Add node for the localId and add a route to the storageId node. The storageId node will have been
-            // added above when adding nodes for this.blobIds.
             gcData.gcNodes[this.getBlobGCNodePath(localId)] = [this.getBlobGCNodePath(storageId)];
         }
         return gcData;
     }
     /**
-     * This is called to update blobs whose routes are used. The used blobs are removed from the tombstone list.
-     * @param usedRoutes - The routes of the blob nodes that are used.
+     * This is called to update blobs whose routes are unused. The unused blobs are deleted.
+     * @param unusedRoutes - The routes of the blob nodes that are unused.
      */
-    updateUsedRoutes(usedRoutes) {
+    updateUnusedRoutes(unusedRoutes) {
         // The routes or blob node paths are in the same format as returned in getGCData -
         // `/<BlobManager.basePath>/<blobId>`.
-        for (const route of usedRoutes) {
+        for (const route of unusedRoutes) {
             const pathParts = route.split("/");
-            (0, common_utils_1.assert)(pathParts.length === 3 && pathParts[1] === BlobManager.basePath, 0x4bc /* Invalid blob node id in used routes. */);
+            (0, common_utils_1.assert)(pathParts.length === 3 && pathParts[1] === BlobManager.basePath, 0x2d5 /* "Invalid blob node id in unused routes." */);
             const blobId = pathParts[2];
-            // Un-tombstone the blob if it was marked tombstone.
-            this.tombstonedBlobs.delete(blobId);
+            this.redirectTable.delete(blobId);
         }
     }
     /**
-     * This is called to update blobs whose routes are unused. The unused blobs are either deleted or marked as
-     * tombstones.
-     * @param unusedRoutes - The routes of the blob nodes that are unused.
-     * @param tombstone - if true, the objects corresponding to unused routes are marked tombstones. Otherwise, they
-     * are deleted.
+     * This is called to update blobs whose routes are tombstones. Tombstoned blobs enable testing scenarios with
+     * accessing deleted content without actually deleting content from summaries.
+     * @param tombstonedRoutes - The routes of blob nodes that are tombstones.
      */
-    updateUnusedRoutes(unusedRoutes, tombstone) {
+    updateTombstonedRoutes(tombstonedRoutes) {
+        const tombstonedBlobsSet = new Set();
         // The routes or blob node paths are in the same format as returned in getGCData -
         // `/<BlobManager.basePath>/<blobId>`.
-        for (const route of unusedRoutes) {
+        for (const route of tombstonedRoutes) {
             const pathParts = route.split("/");
-            (0, common_utils_1.assert)(pathParts.length === 3 && pathParts[1] === BlobManager.basePath, 0x2d5 /* "Invalid blob node id in unused routes." */);
-            const blobId = pathParts[2];
-            if (tombstone) {
-                // If tombstone is set, add this blob to the tombstone list.
-                this.tombstonedBlobs.add(blobId);
-            }
-            else {
-                // The unused blobId could be a localId. If so, remove it from the redirect table and continue. The
-                // corresponding storageId may still be used either directly or via other localIds.
-                this.redirectTable.delete(blobId);
+            (0, common_utils_1.assert)(pathParts.length === 3 && pathParts[1] === BlobManager.basePath, 0x50f /* Invalid blob node id in tombstoned routes. */);
+            tombstonedBlobsSet.add(pathParts[2]);
+        }
+        // Remove blobs from the tombstone list that were tombstoned but aren't anymore as per the tombstoneRoutes.
+        for (const blobId of this.tombstonedBlobs) {
+            if (!tombstonedBlobsSet.has(blobId)) {
+                this.tombstonedBlobs.delete(blobId);
             }
         }
+        // Mark blobs that are now tombstoned by adding them to the tombstone list.
+        for (const blobId of tombstonedBlobsSet) {
+            this.tombstonedBlobs.add(blobId);
+        }
     }
     summarize(telemetryContext) {
         // if storageIds is empty, it means we are detached and have only local IDs, or that there are no blobs attached
@@ -490,9 +523,9 @@ class BlobManager {
         (0, common_utils_1.assert)(this.redirectTable.size === table.size, 0x391 /* Redirect table size must match BlobManager's local ID count */);
         for (const [localId, storageId] of table) {
             (0, common_utils_1.assert)(this.redirectTable.has(localId), 0x254 /* "unrecognized id in redirect table" */);
-            this.redirectTable.set(localId, storageId);
+            this.setRedirection(localId, storageId);
             // set identity (id -> id) entry
-            this.redirectTable.set(storageId, storageId);
+            this.setRedirection(storageId, storageId);
         }
     }
     getPendingBlobs() {