@fluidframework/datastore 2.71.0 → 2.72.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluidframework/datastore",
-  "version": "2.71.0",
+  "version": "2.72.0",
   "description": "Fluid data store implementation",
   "homepage": "https://fluidframework.com",
   "repository": {
@@ -69,29 +69,29 @@
     "temp-directory": "nyc/.nyc_output"
   },
   "dependencies": {
-    "@fluid-internal/client-utils": "~2.71.0",
-    "@fluidframework/container-definitions": "~2.71.0",
-    "@fluidframework/core-interfaces": "~2.71.0",
-    "@fluidframework/core-utils": "~2.71.0",
-    "@fluidframework/datastore-definitions": "~2.71.0",
-    "@fluidframework/driver-definitions": "~2.71.0",
-    "@fluidframework/driver-utils": "~2.71.0",
-    "@fluidframework/id-compressor": "~2.71.0",
-    "@fluidframework/runtime-definitions": "~2.71.0",
-    "@fluidframework/runtime-utils": "~2.71.0",
-    "@fluidframework/telemetry-utils": "~2.71.0",
+    "@fluid-internal/client-utils": "~2.72.0",
+    "@fluidframework/container-definitions": "~2.72.0",
+    "@fluidframework/core-interfaces": "~2.72.0",
+    "@fluidframework/core-utils": "~2.72.0",
+    "@fluidframework/datastore-definitions": "~2.72.0",
+    "@fluidframework/driver-definitions": "~2.72.0",
+    "@fluidframework/driver-utils": "~2.72.0",
+    "@fluidframework/id-compressor": "~2.72.0",
+    "@fluidframework/runtime-definitions": "~2.72.0",
+    "@fluidframework/runtime-utils": "~2.72.0",
+    "@fluidframework/telemetry-utils": "~2.72.0",
     "uuid": "^11.1.0"
   },
   "devDependencies": {
     "@arethetypeswrong/cli": "^0.17.1",
     "@biomejs/biome": "~1.9.3",
-    "@fluid-internal/mocha-test-setup": "~2.71.0",
-    "@fluid-tools/build-cli": "^0.58.3",
+    "@fluid-internal/mocha-test-setup": "~2.72.0",
+    "@fluid-tools/build-cli": "^0.60.0",
     "@fluidframework/build-common": "^2.0.3",
-    "@fluidframework/build-tools": "^0.58.3",
-    "@fluidframework/datastore-previous": "npm:@fluidframework/datastore@2.70.0",
-    "@fluidframework/eslint-config-fluid": "^7.0.0",
-    "@fluidframework/test-runtime-utils": "~2.71.0",
+    "@fluidframework/build-tools": "^0.60.0",
+    "@fluidframework/datastore-previous": "npm:@fluidframework/datastore@2.71.0",
+    "@fluidframework/eslint-config-fluid": "~2.72.0",
+    "@fluidframework/test-runtime-utils": "~2.72.0",
     "@microsoft/api-extractor": "7.52.11",
     "@types/lodash": "^4.14.118",
     "@types/mocha": "^10.0.10",
@@ -109,7 +109,11 @@
     "typescript": "~5.4.5"
   },
   "typeValidation": {
-    "broken": {},
+    "broken": {
+      "Class_FluidDataStoreRuntime": {
+        "forwardCompat": false
+      }
+    },
     "entrypoint": "legacy"
   },
   "scripts": {

package/src/dataStoreLayerCompatState.ts

@@ -26,7 +26,7 @@ export const dataStoreCoreCompatDetails = {
 	/**
 	 * The current generation of the Runtime layer.
 	 */
-	generation: 1,
+	generation: 2,
 };
 
 /**

package/src/dataStoreRuntime.ts

@@ -244,6 +244,11 @@ export class FluidDataStoreRuntime
 		return this;
 	}
 
+	private localOpActivity: "applyStashed" | "rollback" | undefined = undefined;
+	public get activeLocalOperationActivity(): "applyStashed" | "rollback" | undefined {
+		return this.localOpActivity;
+	}
+
 	private _disposed = false;
 	public get disposed(): boolean {
 		return this._disposed;
@@ -1326,69 +1331,83 @@ export class FluidDataStoreRuntime
 		localOpMetadata: unknown,
 	): void {
 		this.verifyNotClosed();
+		assert(!this.localOpActivity, "localOpActivity must be undefined when entering rollback");
+		this.localOpActivity = "rollback";
+		try {
+			// The op being rolled back was not/will not be submitted, so decrement the count.
+			--this.pendingOpCount.value;
 
-		// The op being rolled back was not/will not be submitted, so decrement the count.
-		--this.pendingOpCount.value;
-
-		switch (type) {
-			case DataStoreMessageType.ChannelOp: {
-				// For Operations, find the right channel and trigger resubmission on it.
-				const envelope = content as IEnvelope;
-				const channelContext = this.contexts.get(envelope.address);
-				assert(!!channelContext, 0x2ed /* "There should be a channel context for the op" */);
+			switch (type) {
+				case DataStoreMessageType.ChannelOp: {
+					// For Operations, find the right channel and trigger resubmission on it.
+					const envelope = content as IEnvelope;
+					const channelContext = this.contexts.get(envelope.address);
+					assert(!!channelContext, 0x2ed /* "There should be a channel context for the op" */);
 
-				channelContext.rollback(envelope.contents, localOpMetadata);
-				break;
-			}
-			default: {
-				throw new LoggingError(`Can't rollback ${type} message`);
+					channelContext.rollback(envelope.contents, localOpMetadata);
+					break;
+				}
+				default: {
+					throw new LoggingError(`Can't rollback ${type} message`);
+				}
 			}
+		} finally {
+			this.localOpActivity = undefined;
 		}
 	}
 
 	// TODO: use something other than `any` here
 	// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types, @typescript-eslint/no-explicit-any
 	public async applyStashedOp(content: any): Promise<unknown> {
-		// The op being applied may have been submitted in a previous session, so we increment the count here.
-		// Either the ack will arrive and be processed, or that previous session's connection will end, at which point the op will be resubmitted.
-		++this.pendingOpCount.value;
+		assert(
+			!this.localOpActivity,
+			"localOpActivity must be undefined when entering applyStashedOp",
+		);
+		this.localOpActivity = "applyStashed";
+		try {
+			// The op being applied may have been submitted in a previous session, so we increment the count here.
+			// Either the ack will arrive and be processed, or that previous session's connection will end, at which point the op will be resubmitted.
+			++this.pendingOpCount.value;
 
-		// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-		const type = content?.type as DataStoreMessageType;
-		switch (type) {
-			case DataStoreMessageType.Attach: {
-				// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-				const attachMessage = content.content as IAttachMessage;
+			// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+			const type = content?.type as DataStoreMessageType;
+			switch (type) {
+				case DataStoreMessageType.Attach: {
+					// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+					const attachMessage = content.content as IAttachMessage;
 
-				const flatBlobs = new Map<string, ArrayBufferLike>();
-				const snapshotTree = buildSnapshotTree(attachMessage.snapshot.entries, flatBlobs);
+					const flatBlobs = new Map<string, ArrayBufferLike>();
+					const snapshotTree = buildSnapshotTree(attachMessage.snapshot.entries, flatBlobs);
 
-				const channelContext = this.createRehydratedLocalChannelContext(
-					attachMessage.id,
-					snapshotTree,
-					flatBlobs,
-				);
-				await channelContext.getChannel();
-				this.contexts.set(attachMessage.id, channelContext);
-				if (this.attachState === AttachState.Detached) {
-					this.localChannelContextQueue.set(attachMessage.id, channelContext);
-				} else {
-					channelContext.makeVisible();
-					this.pendingAttach.add(attachMessage.id);
+					const channelContext = this.createRehydratedLocalChannelContext(
+						attachMessage.id,
+						snapshotTree,
+						flatBlobs,
+					);
+					await channelContext.getChannel();
+					this.contexts.set(attachMessage.id, channelContext);
+					if (this.attachState === AttachState.Detached) {
+						this.localChannelContextQueue.set(attachMessage.id, channelContext);
+					} else {
+						channelContext.makeVisible();
+						this.pendingAttach.add(attachMessage.id);
+					}
+					return;
+				}
+				case DataStoreMessageType.ChannelOp: {
+					// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+					const envelope = content.content as IEnvelope;
+					const channelContext = this.contexts.get(envelope.address);
+					assert(!!channelContext, 0x184 /* "There should be a channel context for the op" */);
+					await channelContext.getChannel();
+					return channelContext.applyStashedOp(envelope.contents);
+				}
+				default: {
+					unreachableCase(type);
 				}
-				return;
-			}
-			case DataStoreMessageType.ChannelOp: {
-				// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-				const envelope = content.content as IEnvelope;
-				const channelContext = this.contexts.get(envelope.address);
-				assert(!!channelContext, 0x184 /* "There should be a channel context for the op" */);
-				await channelContext.getChannel();
-				return channelContext.applyStashedOp(envelope.contents);
-			}
-			default: {
-				unreachableCase(type);
 			}
+		} finally {
+			this.localOpActivity = undefined;
 		}
 	}
 

package/src/packageVersion.ts

@@ -6,4 +6,4 @@
  */
 
 export const pkgName = "@fluidframework/datastore";
-export const pkgVersion = "2.71.0";
+export const pkgVersion = "2.72.0";