@fluidframework/container-runtime 2.0.0-rc.2.0.1 → 2.0.0-rc.3.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluidframework/container-runtime",
-  "version": "2.0.0-rc.2.0.1",
+  "version": "2.0.0-rc.3.0.0",
   "description": "Fluid container runtime",
   "homepage": "https://fluidframework.com",
   "repository": {
@@ -15,31 +15,21 @@
   "exports": {
     ".": {
       "import": {
-        "types": "./lib/index.d.ts",
-        "default": "./lib/index.js"
-      },
-      "require": {
-        "types": "./dist/index.d.ts",
-        "default": "./dist/index.js"
-      }
-    },
-    "./public": {
-      "import": {
-        "types": "./lib/container-runtime-public.d.ts",
+        "types": "./lib/public.d.ts",
         "default": "./lib/index.js"
       },
       "require": {
-        "types": "./dist/container-runtime-public.d.ts",
+        "types": "./dist/public.d.ts",
         "default": "./dist/index.js"
       }
     },
-    "./alpha": {
+    "./legacy": {
       "import": {
-        "types": "./lib/container-runtime-alpha.d.ts",
+        "types": "./lib/legacy.d.ts",
         "default": "./lib/index.js"
       },
       "require": {
-        "types": "./dist/container-runtime-alpha.d.ts",
+        "types": "./dist/legacy.d.ts",
         "default": "./dist/index.js"
       }
     },
@@ -53,7 +43,7 @@
         "default": "./dist/index.js"
       }
     },
-    "./test/containerRuntime": {
+    "./internal/test/containerRuntime": {
       "import": {
         "types": "./lib/containerRuntime.d.ts",
         "default": "./lib/containerRuntime.js"
@@ -63,7 +53,7 @@
         "default": "./dist/containerRuntime.js"
       }
     },
-    "./test/deltaScheduler": {
+    "./internal/test/deltaScheduler": {
       "import": {
         "types": "./lib/deltaScheduler.d.ts",
         "default": "./lib/deltaScheduler.js"
@@ -73,7 +63,7 @@
         "default": "./dist/deltaScheduler.js"
       }
     },
-    "./test/scheduleManager": {
+    "./internal/test/scheduleManager": {
       "import": {
         "types": "./lib/scheduleManager.d.ts",
         "default": "./lib/scheduleManager.js"
@@ -83,7 +73,7 @@
         "default": "./dist/scheduleManager.js"
       }
     },
-    "./test/blobManager": {
+    "./internal/test/blobManager": {
       "import": {
         "types": "./lib/blobManager.d.ts",
         "default": "./lib/blobManager.js"
@@ -93,7 +83,7 @@
         "default": "./dist/blobManager.js"
       }
     },
-    "./test/summary": {
+    "./internal/test/summary": {
       "import": {
         "types": "./lib/summary/index.d.ts",
         "default": "./lib/summary/index.js"
@@ -103,7 +93,7 @@
         "default": "./dist/summary/index.js"
       }
     },
-    "./test/gc": {
+    "./internal/test/gc": {
       "import": {
         "types": "./lib/gc/index.d.ts",
         "default": "./lib/gc/index.js"
@@ -114,8 +104,8 @@
       }
     }
   },
-  "main": "dist/index.js",
-  "types": "dist/index.d.ts",
+  "main": "lib/index.js",
+  "types": "lib/public.d.ts",
   "c8": {
     "all": true,
     "cache-dir": "nyc/.cache",
@@ -137,38 +127,42 @@
     "temp-directory": "nyc/.nyc_output"
   },
   "dependencies": {
-    "@fluid-internal/client-utils": ">=2.0.0-rc.2.0.1 <2.0.0-rc.2.1.0",
-    "@fluidframework/container-definitions": ">=2.0.0-rc.2.0.1 <2.0.0-rc.2.1.0",
-    "@fluidframework/container-runtime-definitions": ">=2.0.0-rc.2.0.1 <2.0.0-rc.2.1.0",
-    "@fluidframework/core-interfaces": ">=2.0.0-rc.2.0.1 <2.0.0-rc.2.1.0",
-    "@fluidframework/core-utils": ">=2.0.0-rc.2.0.1 <2.0.0-rc.2.1.0",
-    "@fluidframework/datastore": ">=2.0.0-rc.2.0.1 <2.0.0-rc.2.1.0",
-    "@fluidframework/driver-definitions": ">=2.0.0-rc.2.0.1 <2.0.0-rc.2.1.0",
-    "@fluidframework/driver-utils": ">=2.0.0-rc.2.0.1 <2.0.0-rc.2.1.0",
-    "@fluidframework/id-compressor": ">=2.0.0-rc.2.0.1 <2.0.0-rc.2.1.0",
+    "@fluid-internal/client-utils": ">=2.0.0-rc.3.0.0 <2.0.0-rc.3.1.0",
+    "@fluidframework/common-definitions": "^1.1.0",
+    "@fluidframework/container-definitions": ">=2.0.0-rc.3.0.0 <2.0.0-rc.3.1.0",
+    "@fluidframework/container-runtime-definitions": ">=2.0.0-rc.3.0.0 <2.0.0-rc.3.1.0",
+    "@fluidframework/core-interfaces": ">=2.0.0-rc.3.0.0 <2.0.0-rc.3.1.0",
+    "@fluidframework/core-utils": ">=2.0.0-rc.3.0.0 <2.0.0-rc.3.1.0",
+    "@fluidframework/datastore": ">=2.0.0-rc.3.0.0 <2.0.0-rc.3.1.0",
+    "@fluidframework/driver-definitions": ">=2.0.0-rc.3.0.0 <2.0.0-rc.3.1.0",
+    "@fluidframework/driver-utils": ">=2.0.0-rc.3.0.0 <2.0.0-rc.3.1.0",
+    "@fluidframework/id-compressor": ">=2.0.0-rc.3.0.0 <2.0.0-rc.3.1.0",
     "@fluidframework/protocol-definitions": "^3.2.0",
-    "@fluidframework/runtime-definitions": ">=2.0.0-rc.2.0.1 <2.0.0-rc.2.1.0",
-    "@fluidframework/runtime-utils": ">=2.0.0-rc.2.0.1 <2.0.0-rc.2.1.0",
-    "@fluidframework/telemetry-utils": ">=2.0.0-rc.2.0.1 <2.0.0-rc.2.1.0",
+    "@fluidframework/runtime-definitions": ">=2.0.0-rc.3.0.0 <2.0.0-rc.3.1.0",
+    "@fluidframework/runtime-utils": ">=2.0.0-rc.3.0.0 <2.0.0-rc.3.1.0",
+    "@fluidframework/telemetry-utils": ">=2.0.0-rc.3.0.0 <2.0.0-rc.3.1.0",
     "@tylerbu/sorted-btree-es6": "^1.8.0",
     "double-ended-queue": "^2.1.0-0",
     "lz4js": "^0.2.0",
     "uuid": "^9.0.0"
   },
   "devDependencies": {
-    "@arethetypeswrong/cli": "^0.13.3",
-    "@fluid-internal/mocha-test-setup": ">=2.0.0-rc.2.0.1 <2.0.0-rc.2.1.0",
-    "@fluid-private/stochastic-test-utils": ">=2.0.0-rc.2.0.1 <2.0.0-rc.2.1.0",
+    "@arethetypeswrong/cli": "^0.15.2",
+    "@biomejs/biome": "^1.6.2",
+    "@fluid-internal/mocha-test-setup": ">=2.0.0-rc.3.0.0 <2.0.0-rc.3.1.0",
+    "@fluid-private/stochastic-test-utils": ">=2.0.0-rc.3.0.0 <2.0.0-rc.3.1.0",
+    "@fluid-private/test-pairwise-generator": ">=2.0.0-rc.3.0.0 <2.0.0-rc.3.1.0",
     "@fluid-tools/benchmark": "^0.48.0",
-    "@fluid-tools/build-cli": "^0.34.0",
+    "@fluid-tools/build-cli": "^0.37.0",
     "@fluidframework/build-common": "^2.0.3",
-    "@fluidframework/build-tools": "^0.34.0",
+    "@fluidframework/build-tools": "^0.37.0",
     "@fluidframework/container-runtime-previous": "npm:@fluidframework/container-runtime@2.0.0-internal.8.0.0",
-    "@fluidframework/eslint-config-fluid": "^4.0.0",
-    "@fluidframework/test-runtime-utils": ">=2.0.0-rc.2.0.1 <2.0.0-rc.2.1.0",
+    "@fluidframework/eslint-config-fluid": "^5.1.0",
+    "@fluidframework/test-runtime-utils": ">=2.0.0-rc.3.0.0 <2.0.0-rc.3.1.0",
     "@microsoft/api-extractor": "^7.42.3",
     "@types/double-ended-queue": "^2.1.0",
     "@types/mocha": "^9.1.1",
+    "@types/node": "^18.19.0",
     "@types/sinon": "^17.0.3",
     "@types/uuid": "^9.0.2",
     "c8": "^8.0.1",
@@ -184,18 +178,6 @@
     "sinon": "^17.0.1",
     "typescript": "~5.1.6"
   },
-  "fluidBuild": {
-    "tasks": {
-      "build:docs": {
-        "dependsOn": [
-          "...",
-          "api-extractor:commonjs",
-          "api-extractor:esnext"
-        ],
-        "script": false
-      }
-    }
-  },
   "typeValidation": {
     "broken": {
       "ClassDeclaration_ContainerRuntime": {
@@ -220,33 +202,43 @@
       "RemovedFunctionDeclaration_isStableId": {
         "backCompat": false,
         "forwardCompat": false
+      },
+      "InterfaceDeclaration_IContainerRuntimeMetadata": {
+        "backCompat": false
+      },
+      "RemovedEnumDeclaration_RuntimeMessage": {
+        "backCompat": false,
+        "forwardCompat": false
+      },
+      "InterfaceDeclaration_IChunkedOp": {
+        "backCompat": false
       }
     }
   },
   "scripts": {
     "api": "fluid-build . --task api",
-    "api-extractor:commonjs": "api-extractor run --config ./api-extractor-cjs.json",
-    "api-extractor:esnext": "api-extractor run --local",
+    "api-extractor:commonjs": "flub generate entrypoints --outFileAlpha legacy --outDir ./dist",
+    "api-extractor:esnext": "flub generate entrypoints --outFileAlpha legacy --outDir ./lib --node10TypeCompat",
     "build": "fluid-build . --task build",
     "build:commonjs": "fluid-build . --task commonjs",
     "build:compile": "fluid-build . --task compile",
-    "build:docs": "fluid-build . --task api",
+    "build:docs": "api-extractor run --local",
     "build:esnext": "tsc --project ./tsconfig.json",
     "build:genver": "gen-version",
     "build:test": "npm run build:test:esm && npm run build:test:cjs",
     "build:test:cjs": "fluid-tsc commonjs --project ./src/test/tsconfig.cjs.json",
     "build:test:esm": "tsc --project ./src/test/tsconfig.json",
-    "check:are-the-types-wrong": "attw --pack . --entrypoints .",
+    "check:are-the-types-wrong": "attw --pack . --exclude-entrypoints ./internal/test/containerRuntime ./internal/test/deltaScheduler ./internal/test/scheduleManager ./internal/test/blobManager ./internal/test/summary ./internal/test/gc",
+    "check:prettier": "prettier --check . --cache --ignore-path ../../../.prettierignore",
     "check:release-tags": "api-extractor run --local --config ./api-extractor-lint.json",
     "ci:build:docs": "api-extractor run",
-    "clean": "rimraf --glob dist lib \"**/*.tsbuildinfo\" \"**/*.build.log\" _api-extractor-temp nyc",
+    "clean": "rimraf --glob dist lib \"*.d.ts\" \"**/*.tsbuildinfo\" \"**/*.build.log\" _api-extractor-temp nyc",
     "eslint": "eslint --format stylish src",
     "eslint:fix": "eslint --format stylish src --fix --fix-type problem,suggestion,layout",
-    "format": "npm run prettier:fix",
-    "lint": "npm run prettier && npm run check:release-tags && npm run eslint",
-    "lint:fix": "npm run prettier:fix && npm run eslint:fix",
-    "prettier": "prettier --check . --cache --ignore-path ../../../.prettierignore",
-    "prettier:fix": "prettier --write . --cache --ignore-path ../../../.prettierignore",
+    "format": "fluid-build --task format .",
+    "format:prettier": "prettier --write . --cache --ignore-path ../../../.prettierignore",
+    "lint": "fluid-build . --task lint",
+    "lint:fix": "fluid-build . --task eslint:fix --task format",
     "test": "npm run test:mocha",
     "test:benchmark:report": "mocha --timeout 999999 --perfMode --parentProcess --fgrep @Benchmark --reporter @fluid-tools/benchmark/dist/MochaReporter.js \"./dist/**/*.perf.spec.*js\"",
     "test:coverage": "c8 npm test",

package/src/batchTracker.ts

@@ -3,12 +3,13 @@
  * Licensed under the MIT License.
  */
 
-import { ITelemetryLoggerExt, createChildLogger } from "@fluidframework/telemetry-utils";
-import { assert } from "@fluidframework/core-utils";
 import type { EventEmitter } from "@fluid-internal/client-utils";
 import { performance } from "@fluid-internal/client-utils";
-import { ISequencedDocumentMessage } from "@fluidframework/protocol-definitions";
 import { ITelemetryBaseLogger } from "@fluidframework/core-interfaces";
+import { assert } from "@fluidframework/core-utils/internal";
+import { ISequencedDocumentMessage } from "@fluidframework/protocol-definitions";
+import { ITelemetryLoggerExt } from "@fluidframework/telemetry-utils";
+import { createChildLogger } from "@fluidframework/telemetry-utils/internal";
 
 export class BatchTracker {
 	private readonly logger: ITelemetryLoggerExt;

package/src/blobManager.ts

@@ -3,42 +3,42 @@
  * Licensed under the MIT License.
  */
 
-import { v4 as uuid } from "uuid";
+import { TypedEventEmitter, bufferToString, stringToBuffer } from "@fluid-internal/client-utils";
+import { AttachState, ICriticalContainerError } from "@fluidframework/container-definitions";
+import {
+	IContainerRuntime,
+	IContainerRuntimeEvents,
+} from "@fluidframework/container-runtime-definitions/internal";
 import { IFluidHandle, IFluidHandleContext } from "@fluidframework/core-interfaces";
-import { IDocumentStorageService } from "@fluidframework/driver-definitions";
+import { assert, Deferred } from "@fluidframework/core-utils/internal";
+import { IDocumentStorageService } from "@fluidframework/driver-definitions/internal";
+import { canRetryOnError, runWithRetry } from "@fluidframework/driver-utils/internal";
 import {
 	ICreateBlobResponse,
 	ISequencedDocumentMessage,
 	ISnapshotTree,
 } from "@fluidframework/protocol-definitions";
 import {
+	IGarbageCollectionData,
+	ISummaryTreeWithStats,
+	ITelemetryContext,
+} from "@fluidframework/runtime-definitions";
+import {
+	SummaryTreeBuilder,
 	createResponseError,
 	generateHandleContextPath,
 	responseToException,
-	SummaryTreeBuilder,
-} from "@fluidframework/runtime-utils";
-import { assert, Deferred } from "@fluidframework/core-utils";
-import { bufferToString, stringToBuffer, TypedEventEmitter } from "@fluid-internal/client-utils";
+} from "@fluidframework/runtime-utils/internal";
 import {
-	IContainerRuntime,
-	IContainerRuntimeEvents,
-} from "@fluidframework/container-runtime-definitions";
-import { AttachState, ICriticalContainerError } from "@fluidframework/container-definitions";
-import {
-	createChildMonitoringContext,
 	GenericError,
 	LoggingError,
 	MonitoringContext,
 	PerformanceEvent,
+	createChildMonitoringContext,
 	wrapError,
-} from "@fluidframework/telemetry-utils";
-import {
-	IGarbageCollectionData,
-	ISummaryTreeWithStats,
-	ITelemetryContext,
-} from "@fluidframework/runtime-definitions";
+} from "@fluidframework/telemetry-utils/internal";
+import { v4 as uuid } from "uuid";
 
-import { canRetryOnError, runWithRetry } from "@fluidframework/driver-utils";
 import { IBlobMetadata } from "./metadata.js";
 
 /**
@@ -103,7 +103,6 @@ type ICreateBlobResponseWithTTL = ICreateBlobResponse & Partial<Record<"minTTLIn
 
 interface PendingBlob {
 	blob: ArrayBufferLike;
-	uploading?: boolean;
 	opsent?: boolean;
 	storageId?: string;
 	handleP: Deferred<BlobHandle>;
@@ -113,7 +112,7 @@ interface PendingBlob {
 	attached?: boolean;
 	acked?: boolean;
 	abortSignal?: AbortSignal;
-	pendingStashed?: boolean;
+	stashedUpload?: boolean;
 }
 
 export interface IPendingBlobs {
@@ -122,7 +121,6 @@ export interface IPendingBlobs {
 		storageId?: string;
 		uploadTime?: number;
 		minTTLInSeconds?: number;
-		attached?: boolean;
 		acked?: boolean;
 	};
 }
@@ -131,6 +129,16 @@ export interface IBlobManagerEvents {
 	(event: "noPendingBlobs", listener: () => void);
 }
 
+const stashedPendingBlobOverrides: Pick<
+	PendingBlob,
+	"stashedUpload" | "storageId" | "minTTLInSeconds" | "uploadTime"
+> = {
+	stashedUpload: true,
+	storageId: undefined,
+	minTTLInSeconds: undefined,
+	uploadTime: undefined,
+} as const;
+
 export class BlobManager extends TypedEventEmitter<IBlobManagerEvents> {
 	public static readonly basePath = "_blobs";
 	private static readonly redirectTableBlobName = ".redirectTable";
@@ -168,10 +176,21 @@ export class BlobManager extends TypedEventEmitter<IBlobManagerEvents> {
 	private readonly sendBlobAttachOp: (localId: string, storageId?: string) => void;
 	private stopAttaching: boolean = false;
 
-	constructor(
-		private readonly routeContext: IFluidHandleContext,
-		snapshot: IBlobManagerLoadInfo,
-		private readonly getStorage: () => IDocumentStorageService,
+	private readonly routeContext: IFluidHandleContext;
+	private readonly getStorage: () => IDocumentStorageService;
+	// Called when a blob node is requested. blobPath is the path of the blob's node in GC's graph.
+	// blobPath's format - `/<BlobManager.basePath>/<blobId>`.
+	private readonly blobRequested: (blobPath: string) => void;
+	// Called to check if a blob has been deleted by GC.
+	// blobPath's format - `/<BlobManager.basePath>/<blobId>`.
+	private readonly isBlobDeleted: (blobPath: string) => boolean;
+	private readonly runtime: IBlobManagerRuntime;
+	private readonly closeContainer: (error?: ICriticalContainerError) => void;
+
+	constructor(props: {
+		readonly routeContext: IFluidHandleContext;
+		snapshot: IBlobManagerLoadInfo;
+		readonly 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
@@ -182,18 +201,36 @@ export class BlobManager extends TypedEventEmitter<IBlobManagerEvents> {
 		 * 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: (localId: string, storageId?: string) => void,
+		sendBlobAttachOp: (localId: string, storageId?: string) => void;
 		// Called when a blob node is requested. blobPath is the path of the blob's node in GC's graph.
 		// blobPath's format - `/<BlobManager.basePath>/<blobId>`.
-		private readonly blobRequested: (blobPath: string) => void,
+		readonly blobRequested: (blobPath: string) => void;
 		// Called to check if a blob has been deleted by GC.
 		// blobPath's format - `/<BlobManager.basePath>/<blobId>`.
-		private readonly isBlobDeleted: (blobPath: string) => boolean,
-		private readonly runtime: IBlobManagerRuntime,
-		stashedBlobs: IPendingBlobs = {},
-		private readonly closeContainer: (error?: ICriticalContainerError) => void,
-	) {
+		readonly isBlobDeleted: (blobPath: string) => boolean;
+		readonly runtime: IBlobManagerRuntime;
+		stashedBlobs: IPendingBlobs | undefined;
+		readonly closeContainer: (error?: ICriticalContainerError) => void;
+	}) {
 		super();
+		const {
+			routeContext,
+			snapshot,
+			getStorage,
+			sendBlobAttachOp,
+			blobRequested,
+			isBlobDeleted,
+			runtime,
+			stashedBlobs,
+			closeContainer,
+		} = props;
+		this.routeContext = routeContext;
+		this.getStorage = getStorage;
+		this.blobRequested = blobRequested;
+		this.isBlobDeleted = isBlobDeleted;
+		this.runtime = runtime;
+		this.closeContainer = closeContainer;
+
 		this.mc = createChildMonitoringContext({
 			logger: this.runtime.logger,
 			namespace: "BlobManager",
@@ -202,39 +239,34 @@ export class BlobManager extends TypedEventEmitter<IBlobManagerEvents> {
 		this.redirectTable = this.load(snapshot);
 
 		// Begin uploading stashed blobs from previous container instance
-		Object.entries(stashedBlobs).forEach(([localId, entry]) => {
+		Object.entries(stashedBlobs ?? {}).forEach(([localId, entry]) => {
+			const { acked, storageId, minTTLInSeconds, uploadTime } = entry;
 			const blob = stringToBuffer(entry.blob, "base64");
-			const attached = entry.attached;
-			const acked = entry.acked;
-			const storageId = entry.storageId; // entry.storageId = response.id
-			if (entry.minTTLInSeconds && entry.uploadTime) {
-				const timeLapseSinceLocalUpload = (Date.now() - entry.uploadTime) / 1000;
+			const pendingEntry: PendingBlob = {
+				blob,
+				opsent: true,
+				handleP: new Deferred(),
+				storageId,
+				uploadP: undefined,
+				uploadTime,
+				minTTLInSeconds,
+				attached: true,
+				acked,
+			};
+			this.pendingBlobs.set(localId, pendingEntry);
+
+			if (storageId !== undefined && minTTLInSeconds && uploadTime) {
+				const timeLapseSinceLocalUpload = (Date.now() - uploadTime) / 1000;
 				// stashed entries with more than half-life in storage will not be reuploaded
-				if (entry.minTTLInSeconds - timeLapseSinceLocalUpload > entry.minTTLInSeconds / 2) {
-					this.pendingBlobs.set(localId, {
-						blob,
-						uploading: false,
-						opsent: true,
-						handleP: new Deferred(),
-						storageId,
-						uploadP: undefined,
-						uploadTime: entry.uploadTime,
-						minTTLInSeconds: entry.minTTLInSeconds,
-						attached,
-						acked,
-					});
+				if (minTTLInSeconds - timeLapseSinceLocalUpload > minTTLInSeconds / 2) {
 					return;
 				}
 			}
+
 			this.pendingBlobs.set(localId, {
-				blob,
-				uploading: true,
-				handleP: new Deferred(),
+				...pendingEntry,
+				...stashedPendingBlobOverrides,
 				uploadP: this.uploadBlob(localId, blob),
-				attached,
-				acked,
-				opsent: true,
-				pendingStashed: true,
 			});
 		});
 
@@ -296,16 +328,19 @@ export class BlobManager extends TypedEventEmitter<IBlobManagerEvents> {
 		});
 	}
 
-	public hasPendingStashedBlobs(): boolean {
-		return Array.from(this.pendingBlobs.values()).some((e) => e.pendingStashed === true);
+	public hasPendingStashedUploads(): boolean {
+		return Array.from(this.pendingBlobs.values()).some((e) => e.stashedUpload === true);
 	}
 	/**
 	 * Upload blobs added while offline. This must be completed before connecting and resubmitting ops.
 	 */
-	public async processStashedChanges() {
+	public async trackPendingStashedUploads(): Promise<void> {
 		const pendingUploads = Array.from(this.pendingBlobs.values())
-			.filter((e) => e.pendingStashed === true)
+			.filter((e) => e.stashedUpload === true)
 			.map(async (e) => e.uploadP);
+		if (pendingUploads.length === 0) {
+			return;
+		}
 		await PerformanceEvent.timedExecAsync(
 			this.mc.logger,
 			{
@@ -432,7 +467,6 @@ export class BlobManager extends TypedEventEmitter<IBlobManagerEvents> {
 		const localId = uuid();
 		const pendingEntry: PendingBlob = {
 			blob,
-			uploading: true,
 			handleP: new Deferred(),
 			uploadP: this.uploadBlob(localId, blob),
 			attached: false,
@@ -525,9 +559,10 @@ export class BlobManager extends TypedEventEmitter<IBlobManagerEvents> {
 			return;
 		}
 		assert(
-			entry.uploading === true,
+			entry.storageId === undefined,
 			0x386 /* Must have pending blob entry for uploaded blob */,
 		);
+		entry.stashedUpload = undefined;
 		entry.storageId = response.id;
 		entry.uploadTime = Date.now();
 		entry.minTTLInSeconds = response.minTTLInSeconds;
@@ -590,9 +625,6 @@ export class BlobManager extends TypedEventEmitter<IBlobManagerEvents> {
 				this.deletePendingBlob(localId);
 				return;
 			}
-			if (pendingEntry?.pendingStashed) {
-				pendingEntry.pendingStashed = false;
-			}
 		}
 		assert(blobId !== undefined, 0x12a /* "Missing blob id on metadata" */);
 
@@ -726,14 +758,6 @@ export class BlobManager extends TypedEventEmitter<IBlobManagerEvents> {
 		return gcData;
 	}
 
-	/**
-	 * 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. These routes will be based off of local ids.
-	 */
-	public updateUnusedRoutes(unusedRoutes: readonly string[]): void {
-		this.deleteBlobsFromRedirectTable(unusedRoutes);
-	}
-
 	/**
 	 * Delete attachment blobs that are sweep ready.
 	 * @param sweepReadyBlobRoutes - The routes of blobs that are sweep ready and should be deleted. These routes will
@@ -938,7 +962,6 @@ export class BlobManager extends TypedEventEmitter<IBlobManagerEvents> {
 					blobs[id] = {
 						blob: bufferToString(entry.blob, "base64"),
 						storageId: entry.storageId,
-						attached: entry.attached,
 						acked: entry.acked,
 						minTTLInSeconds: entry.minTTLInSeconds,
 						uploadTime: entry.uploadTime,