@fluidframework/driver-utils 2.20.0 → 2.22.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluidframework/driver-utils",
-  "version": "2.20.0",
+  "version": "2.22.0",
   "description": "Collection of utility functions for Fluid drivers",
   "homepage": "https://fluidframework.com",
   "repository": {
@@ -69,11 +69,11 @@
     "temp-directory": "nyc/.nyc_output"
   },
   "dependencies": {
-    "@fluid-internal/client-utils": "~2.20.0",
-    "@fluidframework/core-interfaces": "~2.20.0",
-    "@fluidframework/core-utils": "~2.20.0",
-    "@fluidframework/driver-definitions": "~2.20.0",
-    "@fluidframework/telemetry-utils": "~2.20.0",
+    "@fluid-internal/client-utils": "~2.22.0",
+    "@fluidframework/core-interfaces": "~2.22.0",
+    "@fluidframework/core-utils": "~2.22.0",
+    "@fluidframework/driver-definitions": "~2.22.0",
+    "@fluidframework/telemetry-utils": "~2.22.0",
     "axios": "^1.7.7",
     "lz4js": "^0.2.0",
     "uuid": "^9.0.0"
@@ -81,12 +81,12 @@
   "devDependencies": {
     "@arethetypeswrong/cli": "^0.17.1",
     "@biomejs/biome": "~1.9.3",
-    "@fluid-internal/mocha-test-setup": "~2.20.0",
+    "@fluid-internal/mocha-test-setup": "~2.22.0",
     "@fluid-tools/build-cli": "^0.51.0",
     "@fluidframework/build-common": "^2.0.3",
     "@fluidframework/build-tools": "^0.51.0",
-    "@fluidframework/driver-utils-previous": "npm:@fluidframework/driver-utils@2.13.0",
-    "@fluidframework/eslint-config-fluid": "^5.6.0",
+    "@fluidframework/driver-utils-previous": "npm:@fluidframework/driver-utils@2.21.0",
+    "@fluidframework/eslint-config-fluid": "^5.7.3",
     "@microsoft/api-extractor": "7.47.8",
     "@types/mocha": "^10.0.10",
     "@types/node": "^18.19.0",
@@ -139,7 +139,7 @@
     "ci:build:api-reports:current": "api-extractor run --config api-extractor/api-extractor.current.json",
     "ci:build:api-reports:legacy": "api-extractor run --config api-extractor/api-extractor.legacy.json",
     "ci:build:docs": "api-extractor run",
-    "clean": "rimraf --glob dist lib \"*.d.ts\" \"**/*.tsbuildinfo\" \"**/*.build.log\" _api-extractor-temp nyc",
+    "clean": "rimraf --glob dist lib {alpha,beta,internal,legacy}.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 format:biome",
@@ -150,8 +150,8 @@
     "test": "npm run test:mocha",
     "test:coverage": "c8 npm test",
     "test:mocha": "npm run test:mocha:esm && echo skipping cjs to avoid overhead - npm run test:mocha:cjs",
-    "test:mocha:cjs": "mocha --recursive \"dist/test/**/*.spec.*js\" --exit",
-    "test:mocha:esm": "mocha --recursive \"lib/test/**/*.spec.*js\" --exit",
+    "test:mocha:cjs": "mocha --recursive \"dist/test/**/*.spec.*js\"",
+    "test:mocha:esm": "mocha --recursive \"lib/test/**/*.spec.*js\"",
     "test:mocha:verbose": "cross-env FLUID_TEST_VERBOSE=1 npm run test:mocha",
     "tsc": "fluid-tsc commonjs --project ./tsconfig.cjs.json && copyfiles -f ../../../common/build/build-common/src/cjs/package.json ./dist",
     "typetests:gen": "flub generate typetests --dir . -v",

package/src/adapters/compression/summaryblob/documentStorageServiceSummaryBlobCompressionAdapter.ts

@@ -291,9 +291,7 @@ export class DocumentStorageServiceCompressionAdapter extends DocumentStorageSer
 	 */
 	private static findMetadataHolderSummary(summary: ISummaryTree): ISummaryTree | undefined {
 		assert(typeof summary === "object", 0x6f7 /* summary must be a non-null object */);
-		for (const key of Object.keys(summary.tree)) {
-			const value = summary.tree[key];
-
+		for (const [key, value] of Object.entries(summary.tree)) {
 			if (Boolean(value) && value.type === SummaryType.Tree) {
 				const found = this.findMetadataHolderSummary(value);
 				if (found) {

package/src/packageVersion.ts

@@ -6,4 +6,4 @@
  */
 
 export const pkgName = "@fluidframework/driver-utils";
-export const pkgVersion = "2.20.0";
+export const pkgVersion = "2.22.0";

package/src/parallelRequests.ts

@@ -3,7 +3,7 @@
  * Licensed under the MIT License.
  */
 
-import { performance } from "@fluid-internal/client-utils";
+import { performanceNow } from "@fluid-internal/client-utils";
 import { ITelemetryBaseProperties } from "@fluidframework/core-interfaces";
 import { assert, Deferred } from "@fluidframework/core-utils/internal";
 import {
@@ -436,7 +436,7 @@ async function getSingleOpBatch(
 	while (signal?.aborted !== true) {
 		retry++;
 		let lastError: unknown;
-		const startTime = performance.now();
+		const startTime = performanceNow();
 
 		try {
 			// Issue async request for deltas
@@ -459,8 +459,8 @@ async function getSingleOpBatch(
 			if (lastSuccessTime === undefined) {
 				// Take timestamp of the first time server responded successfully, even though it wasn't with the ops we asked for.
 				// If we keep getting empty responses we'll eventually fail out below.
-				lastSuccessTime = performance.now();
-			} else if (performance.now() - lastSuccessTime > 30000) {
+				lastSuccessTime = performanceNow();
+			} else if (performanceNow() - lastSuccessTime > 30000) {
 				// If we are connected and receiving proper responses from server, but can't get any ops back,
 				// then give up after some time. This likely indicates the issue with ordering service not flushing
 				// ops to storage quick enough, and possibly waiting for summaries, while summarizer can't get
@@ -489,7 +489,7 @@ async function getSingleOpBatch(
 					eventName: "GetDeltas_Error",
 					...props,
 					retry,
-					duration: performance.now() - startTime,
+					duration: performanceNow() - startTime,
 					retryAfter,
 					reason: scenarioName,
 				},
@@ -503,7 +503,7 @@ async function getSingleOpBatch(
 		}
 
 		if (telemetryEvent === undefined) {
-			waitStartTime = performance.now();
+			waitStartTime = performanceNow();
 			telemetryEvent = PerformanceEvent.start(logger, {
 				eventName: "GetDeltasWaitTime",
 			});
@@ -521,7 +521,7 @@ async function getSingleOpBatch(
 		// NOTE: This isn't strictly true for drivers that don't require network (e.g. local driver).  Really this logic
 		// should probably live in the driver.
 		await waitForOnline();
-		totalRetryAfterTime += performance.now() - waitStartTime;
+		totalRetryAfterTime += performanceNow() - waitStartTime;
 	}
 
 	return nothing;

package/src/prefetchDocumentStorageService.ts

@@ -82,8 +82,7 @@ export class PrefetchDocumentStorageService extends DocumentStorageServiceProxy
 	}
 
 	private prefetchTreeCore(tree: ISnapshotTree, secondary: string[]) {
-		for (const blobKey of Object.keys(tree.blobs)) {
-			const blob = tree.blobs[blobKey];
+		for (const [blobKey, blob] of Object.entries(tree.blobs)) {
 			if (blobKey.startsWith(".") || blobKey === "header" || blobKey.startsWith("quorum")) {
 				if (blob !== null) {
 					// We don't care if the prefetch succeeds
@@ -96,8 +95,8 @@ export class PrefetchDocumentStorageService extends DocumentStorageServiceProxy
 			}
 		}
 
-		for (const subTree of Object.keys(tree.trees)) {
-			this.prefetchTreeCore(tree.trees[subTree], secondary);
+		for (const subTree of Object.values(tree.trees)) {
+			this.prefetchTreeCore(subTree, secondary);
 		}
 	}
 }

package/src/runWithRetry.ts

@@ -3,7 +3,7 @@
  * Licensed under the MIT License.
  */
 
-import { performance } from "@fluid-internal/client-utils";
+import { performanceNow } from "@fluid-internal/client-utils";
 import { delay } from "@fluidframework/core-utils/internal";
 import { DriverErrorTypes } from "@fluidframework/driver-definitions/internal";
 import { ITelemetryLoggerExt, isFluidError } from "@fluidframework/telemetry-utils/internal";
@@ -58,7 +58,7 @@ export async function runWithRetry<T>(
 	// We double this value in first try in when we calculate time to wait for in "calculateMaxWaitTime" function.
 	let retryAfterMs = 500; // has to be positive!
 	let numRetries = 0;
-	const startTime = performance.now();
+	const startTime = performanceNow();
 	let lastError: any;
 	do {
 		try {
@@ -71,7 +71,7 @@ export async function runWithRetry<T>(
 					{
 						eventName: `${fetchCallName}_cancel`,
 						retry: numRetries,
-						duration: performance.now() - startTime,
+						duration: performanceNow() - startTime,
 						fetchCallName,
 					},
 					err,
@@ -84,7 +84,7 @@ export async function runWithRetry<T>(
 					{
 						eventName: `${fetchCallName}_runWithRetryAborted`,
 						retry: numRetries,
-						duration: performance.now() - startTime,
+						duration: performanceNow() - startTime,
 						fetchCallName,
 						reason: progress.cancel.reason,
 					},
@@ -108,7 +108,7 @@ export async function runWithRetry<T>(
 				logger.sendTelemetryEvent(
 					{
 						eventName: `${fetchCallName}_firstFailed`,
-						duration: performance.now() - startTime,
+						duration: performanceNow() - startTime,
 						fetchCallName,
 					},
 					err,
@@ -130,7 +130,7 @@ export async function runWithRetry<T>(
 			{
 				eventName: `${fetchCallName}_lastError`,
 				retry: numRetries,
-				duration: performance.now() - startTime,
+				duration: performanceNow() - startTime,
 				fetchCallName,
 			},
 			lastError,