@fluidframework/odsp-driver 2.20.0 → 2.21.0

package/src/odspDocumentStorageManager.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 { LogLevel } from "@fluidframework/core-interfaces";
 import { assert, delay } from "@fluidframework/core-utils/internal";
 import { promiseRaceWithWinner } from "@fluidframework/driver-base/internal";
@@ -271,7 +271,7 @@ export class OdspDocumentStorageService extends OdspDocumentStorageServiceBase {
 				let retrievedSnapshot: ISnapshot | IPrefetchSnapshotContents | undefined;
 
 				let method: string;
-				let prefetchWaitStartTime: number = performance.now();
+				let prefetchWaitStartTime: number = performanceNow();
 				if (snapshotFetchOptions.fetchSource === FetchSource.noCache) {
 					retrievedSnapshot = await this.fetchSnapshotFromNetwork(
 						hostSnapshotOptions,
@@ -394,13 +394,13 @@ export class OdspDocumentStorageService extends OdspDocumentStorageServiceBase {
 					} else {
 						// Note: There's a race condition here - another caller may come past the undefined check
 						// while the first caller is awaiting later async code in this block.
-						const startTime = performance.now();
+						const startTime = performanceNow();
 						retrievedSnapshot = await cachedSnapshotP;
-						cacheLookupTimeInSerialFetch = performance.now() - startTime;
+						cacheLookupTimeInSerialFetch = performanceNow() - startTime;
 						method = retrievedSnapshot === undefined ? "network" : "cache";
 
 						if (retrievedSnapshot === undefined) {
-							prefetchWaitStartTime = performance.now();
+							prefetchWaitStartTime = performanceNow();
 							retrievedSnapshot = await this.fetchSnapshotFromNetwork(
 								hostSnapshotOptions,
 								snapshotFetchOptions.loadingGroupIds,
@@ -437,7 +437,7 @@ export class OdspDocumentStorageService extends OdspDocumentStorageServiceBase {
 			},
 		);
 
-		const stTime = performance.now();
+		const stTime = performanceNow();
 		// Don't override ops which were fetched during initial load, since we could still need them.
 		const id = this.initializeFromSnapshot(
 			odspSnapshotCacheValue,
@@ -447,7 +447,7 @@ export class OdspDocumentStorageService extends OdspDocumentStorageServiceBase {
 		this.logger.sendTelemetryEvent(
 			{
 				eventName: "SnapshotInitializeTime",
-				duration: performance.now() - stTime,
+				duration: performanceNow() - stTime,
 			},
 			undefined,
 			LogLevel.verbose,

package/src/odspUtils.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 {
 	ITelemetryBaseLogger,
 	ITelemetryBaseProperties,
@@ -135,7 +135,7 @@ export async function fetchHelper(
 	requestInfo: RequestInfo,
 	requestInit: RequestInit | undefined,
 ): Promise<IOdspResponse<Response>> {
-	const start = performance.now();
+	const start = performanceNow();
 
 	// Node-fetch and dom have conflicting typing, force them to work by casting for now
 	return fetch(requestInfo, requestInit).then(
@@ -165,7 +165,7 @@ export async function fetchHelper(
 				content: response,
 				headers,
 				propsToLog: getSPOAndGraphRequestIdsFromResponse(headers),
-				duration: performance.now() - start,
+				duration: performanceNow() - start,
 			};
 		},
 		(error) => {
@@ -508,16 +508,16 @@ export function buildOdspShareLinkReqParams(
 }
 
 export function measure<T>(callback: () => T): [T, number] {
-	const start = performance.now();
+	const start = performanceNow();
 	const result = callback();
-	const time = performance.now() - start;
+	const time = performanceNow() - start;
 	return [result, time];
 }
 
 export async function measureP<T>(callback: () => Promise<T>): Promise<[T, number]> {
-	const start = performance.now();
+	const start = performanceNow();
 	const result = await callback();
-	const time = performance.now() - start;
+	const time = performanceNow() - start;
 	return [result, time];
 }
 

package/src/opsCaching.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 { ITelemetryLoggerExt } from "@fluidframework/telemetry-utils/internal";
 
 // ISequencedDocumentMessage
@@ -183,11 +183,11 @@ export class OpsCache {
 	 * @returns ops retrieved
 	 */
 	public async get(from: number, to?: number): Promise<IMessage[]> {
-		const start = performance.now();
+		const start = performanceNow();
 
 		const messages = await this.getCore(from, to);
 
-		const duration = performance.now() - start;
+		const duration = performanceNow() - start;
 		if (messages.length > 0 || duration > 1000) {
 			this.logger.sendPerformanceEvent({
 				eventName: "CacheOpsUsed",

package/src/packageVersion.ts

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

package/src/prefetchLatestSnapshot.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 { ITelemetryBaseLogger } from "@fluidframework/core-interfaces";
 import { assert, Deferred } from "@fluidframework/core-utils/internal";
 import { IResolvedUrl } from "@fluidframework/driver-definitions/internal";
@@ -127,7 +127,7 @@ export async function prefetchLatestSnapshot(
 		odspLogger,
 		{ eventName: "PrefetchLatestSnapshot" },
 		async () => {
-			const prefetchStartTime = performance.now();
+			const prefetchStartTime = performanceNow();
 			// Add the deferred promise to the cache, so that it can be leveraged while loading the container.
 			const snapshotContentsWithEpochP = new Deferred<IPrefetchSnapshotContents>();
 			const nonPersistentCacheKey = getKeyForCacheEntry(snapshotKey);

package/src/retryUtils.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 {
 	canRetryOnError,
@@ -24,7 +24,7 @@ export async function runWithRetry<T>(
 	checkDisposed?: () => void,
 ): Promise<T> {
 	let retryAfter = 1000;
-	const start = performance.now();
+	const start = performanceNow();
 	let lastError: unknown;
 	for (let attempts = 1; ; attempts++) {
 		if (checkDisposed !== undefined) {
@@ -38,7 +38,7 @@ export async function runWithRetry<T>(
 						eventName: "MultipleRetries",
 						callName,
 						attempts,
-						duration: performance.now() - start,
+						duration: performanceNow() - start,
 					},
 					lastError,
 				);
@@ -62,7 +62,7 @@ export async function runWithRetry<T>(
 						eventName: `${callName}_firstFailed`,
 						callName,
 						attempts,
-						duration: performance.now() - start, // record total wait time.
+						duration: performanceNow() - start, // record total wait time.
 					},
 					error,
 				);
@@ -86,7 +86,7 @@ export async function runWithRetry<T>(
 							: "ServiceReadonlyErrorTooManyRetries",
 						callName,
 						attempts,
-						duration: performance.now() - start, // record total wait time.
+						duration: performanceNow() - start, // record total wait time.
 					},
 					error,
 				);

package/dist/odspDocumentServiceFactoryWithCodeSplit.d.ts

@@ -1,16 +0,0 @@
-/*!
- * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
- * Licensed under the MIT License.
- */
-import { IDocumentServiceFactory } from "@fluidframework/driver-definitions/internal";
-import { HostStoragePolicy, IPersistedCache, OdspResourceTokenFetchOptions, TokenFetcher } from "@fluidframework/odsp-driver-definitions/internal";
-import { OdspDocumentServiceFactoryCore } from "./odspDocumentServiceFactoryCore.js";
-/**
- * @deprecated This is deprecated in favour of OdspDocumentServiceFactory as the socket io is now loaded inside the
- * other dynamically imported module.
- * @internal
- */
-export declare class OdspDocumentServiceFactoryWithCodeSplit extends OdspDocumentServiceFactoryCore implements IDocumentServiceFactory {
-    constructor(getStorageToken: TokenFetcher<OdspResourceTokenFetchOptions>, getWebsocketToken: TokenFetcher<OdspResourceTokenFetchOptions> | undefined, persistedCache?: IPersistedCache, hostPolicy?: HostStoragePolicy);
-}
-//# sourceMappingURL=odspDocumentServiceFactoryWithCodeSplit.d.ts.map

package/dist/odspDocumentServiceFactoryWithCodeSplit.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"odspDocumentServiceFactoryWithCodeSplit.d.ts","sourceRoot":"","sources":["../src/odspDocumentServiceFactoryWithCodeSplit.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,uBAAuB,EAAE,MAAM,6CAA6C,CAAC;AACtF,OAAO,EACN,iBAAiB,EACjB,eAAe,EACf,6BAA6B,EAC7B,YAAY,EACZ,MAAM,kDAAkD,CAAC;AAE1D,OAAO,EAAE,8BAA8B,EAAE,MAAM,qCAAqC,CAAC;AAErF;;;;GAIG;AACH,qBAAa,uCACZ,SAAQ,8BACR,YAAW,uBAAuB;gBAGjC,eAAe,EAAE,YAAY,CAAC,6BAA6B,CAAC,EAC5D,iBAAiB,EAAE,YAAY,CAAC,6BAA6B,CAAC,GAAG,SAAS,EAC1E,cAAc,CAAC,EAAE,eAAe,EAChC,UAAU,CAAC,EAAE,iBAAiB;CAI/B"}

package/dist/odspDocumentServiceFactoryWithCodeSplit.js

@@ -1,20 +0,0 @@
-"use strict";
-/*!
- * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
- * Licensed under the MIT License.
- */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.OdspDocumentServiceFactoryWithCodeSplit = void 0;
-const odspDocumentServiceFactoryCore_js_1 = require("./odspDocumentServiceFactoryCore.js");
-/**
- * @deprecated This is deprecated in favour of OdspDocumentServiceFactory as the socket io is now loaded inside the
- * other dynamically imported module.
- * @internal
- */
-class OdspDocumentServiceFactoryWithCodeSplit extends odspDocumentServiceFactoryCore_js_1.OdspDocumentServiceFactoryCore {
-    constructor(getStorageToken, getWebsocketToken, persistedCache, hostPolicy) {
-        super(getStorageToken, getWebsocketToken, persistedCache, hostPolicy);
-    }
-}
-exports.OdspDocumentServiceFactoryWithCodeSplit = OdspDocumentServiceFactoryWithCodeSplit;
-//# sourceMappingURL=odspDocumentServiceFactoryWithCodeSplit.js.map

package/dist/odspDocumentServiceFactoryWithCodeSplit.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"odspDocumentServiceFactoryWithCodeSplit.js","sourceRoot":"","sources":["../src/odspDocumentServiceFactoryWithCodeSplit.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;AAUH,2FAAqF;AAErF;;;;GAIG;AACH,MAAa,uCACZ,SAAQ,kEAA8B;IAGtC,YACC,eAA4D,EAC5D,iBAA0E,EAC1E,cAAgC,EAChC,UAA8B;QAE9B,KAAK,CAAC,eAAe,EAAE,iBAAiB,EAAE,cAAc,EAAE,UAAU,CAAC,CAAC;IACvE,CAAC;CACD;AAZD,0FAYC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { IDocumentServiceFactory } from \"@fluidframework/driver-definitions/internal\";\nimport {\n\tHostStoragePolicy,\n\tIPersistedCache,\n\tOdspResourceTokenFetchOptions,\n\tTokenFetcher,\n} from \"@fluidframework/odsp-driver-definitions/internal\";\n\nimport { OdspDocumentServiceFactoryCore } from \"./odspDocumentServiceFactoryCore.js\";\n\n/**\n * @deprecated This is deprecated in favour of OdspDocumentServiceFactory as the socket io is now loaded inside the\n * other dynamically imported module.\n * @internal\n */\nexport class OdspDocumentServiceFactoryWithCodeSplit\n\textends OdspDocumentServiceFactoryCore\n\timplements IDocumentServiceFactory\n{\n\tconstructor(\n\t\tgetStorageToken: TokenFetcher<OdspResourceTokenFetchOptions>,\n\t\tgetWebsocketToken: TokenFetcher<OdspResourceTokenFetchOptions> | undefined,\n\t\tpersistedCache?: IPersistedCache,\n\t\thostPolicy?: HostStoragePolicy,\n\t) {\n\t\tsuper(getStorageToken, getWebsocketToken, persistedCache, hostPolicy);\n\t}\n}\n"]}

package/lib/odspDocumentServiceFactoryWithCodeSplit.d.ts

@@ -1,16 +0,0 @@
-/*!
- * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
- * Licensed under the MIT License.
- */
-import { IDocumentServiceFactory } from "@fluidframework/driver-definitions/internal";
-import { HostStoragePolicy, IPersistedCache, OdspResourceTokenFetchOptions, TokenFetcher } from "@fluidframework/odsp-driver-definitions/internal";
-import { OdspDocumentServiceFactoryCore } from "./odspDocumentServiceFactoryCore.js";
-/**
- * @deprecated This is deprecated in favour of OdspDocumentServiceFactory as the socket io is now loaded inside the
- * other dynamically imported module.
- * @internal
- */
-export declare class OdspDocumentServiceFactoryWithCodeSplit extends OdspDocumentServiceFactoryCore implements IDocumentServiceFactory {
-    constructor(getStorageToken: TokenFetcher<OdspResourceTokenFetchOptions>, getWebsocketToken: TokenFetcher<OdspResourceTokenFetchOptions> | undefined, persistedCache?: IPersistedCache, hostPolicy?: HostStoragePolicy);
-}
-//# sourceMappingURL=odspDocumentServiceFactoryWithCodeSplit.d.ts.map

package/lib/odspDocumentServiceFactoryWithCodeSplit.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"odspDocumentServiceFactoryWithCodeSplit.d.ts","sourceRoot":"","sources":["../src/odspDocumentServiceFactoryWithCodeSplit.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,uBAAuB,EAAE,MAAM,6CAA6C,CAAC;AACtF,OAAO,EACN,iBAAiB,EACjB,eAAe,EACf,6BAA6B,EAC7B,YAAY,EACZ,MAAM,kDAAkD,CAAC;AAE1D,OAAO,EAAE,8BAA8B,EAAE,MAAM,qCAAqC,CAAC;AAErF;;;;GAIG;AACH,qBAAa,uCACZ,SAAQ,8BACR,YAAW,uBAAuB;gBAGjC,eAAe,EAAE,YAAY,CAAC,6BAA6B,CAAC,EAC5D,iBAAiB,EAAE,YAAY,CAAC,6BAA6B,CAAC,GAAG,SAAS,EAC1E,cAAc,CAAC,EAAE,eAAe,EAChC,UAAU,CAAC,EAAE,iBAAiB;CAI/B"}

package/lib/odspDocumentServiceFactoryWithCodeSplit.js

@@ -1,16 +0,0 @@
-/*!
- * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
- * Licensed under the MIT License.
- */
-import { OdspDocumentServiceFactoryCore } from "./odspDocumentServiceFactoryCore.js";
-/**
- * @deprecated This is deprecated in favour of OdspDocumentServiceFactory as the socket io is now loaded inside the
- * other dynamically imported module.
- * @internal
- */
-export class OdspDocumentServiceFactoryWithCodeSplit extends OdspDocumentServiceFactoryCore {
-    constructor(getStorageToken, getWebsocketToken, persistedCache, hostPolicy) {
-        super(getStorageToken, getWebsocketToken, persistedCache, hostPolicy);
-    }
-}
-//# sourceMappingURL=odspDocumentServiceFactoryWithCodeSplit.js.map

package/lib/odspDocumentServiceFactoryWithCodeSplit.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"odspDocumentServiceFactoryWithCodeSplit.js","sourceRoot":"","sources":["../src/odspDocumentServiceFactoryWithCodeSplit.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAUH,OAAO,EAAE,8BAA8B,EAAE,MAAM,qCAAqC,CAAC;AAErF;;;;GAIG;AACH,MAAM,OAAO,uCACZ,SAAQ,8BAA8B;IAGtC,YACC,eAA4D,EAC5D,iBAA0E,EAC1E,cAAgC,EAChC,UAA8B;QAE9B,KAAK,CAAC,eAAe,EAAE,iBAAiB,EAAE,cAAc,EAAE,UAAU,CAAC,CAAC;IACvE,CAAC;CACD","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { IDocumentServiceFactory } from \"@fluidframework/driver-definitions/internal\";\nimport {\n\tHostStoragePolicy,\n\tIPersistedCache,\n\tOdspResourceTokenFetchOptions,\n\tTokenFetcher,\n} from \"@fluidframework/odsp-driver-definitions/internal\";\n\nimport { OdspDocumentServiceFactoryCore } from \"./odspDocumentServiceFactoryCore.js\";\n\n/**\n * @deprecated This is deprecated in favour of OdspDocumentServiceFactory as the socket io is now loaded inside the\n * other dynamically imported module.\n * @internal\n */\nexport class OdspDocumentServiceFactoryWithCodeSplit\n\textends OdspDocumentServiceFactoryCore\n\timplements IDocumentServiceFactory\n{\n\tconstructor(\n\t\tgetStorageToken: TokenFetcher<OdspResourceTokenFetchOptions>,\n\t\tgetWebsocketToken: TokenFetcher<OdspResourceTokenFetchOptions> | undefined,\n\t\tpersistedCache?: IPersistedCache,\n\t\thostPolicy?: HostStoragePolicy,\n\t) {\n\t\tsuper(getStorageToken, getWebsocketToken, persistedCache, hostPolicy);\n\t}\n}\n"]}

package/src/odspDocumentServiceFactoryWithCodeSplit.ts

@@ -1,33 +0,0 @@
-/*!
- * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
- * Licensed under the MIT License.
- */
-
-import { IDocumentServiceFactory } from "@fluidframework/driver-definitions/internal";
-import {
-	HostStoragePolicy,
-	IPersistedCache,
-	OdspResourceTokenFetchOptions,
-	TokenFetcher,
-} from "@fluidframework/odsp-driver-definitions/internal";
-
-import { OdspDocumentServiceFactoryCore } from "./odspDocumentServiceFactoryCore.js";
-
-/**
- * @deprecated This is deprecated in favour of OdspDocumentServiceFactory as the socket io is now loaded inside the
- * other dynamically imported module.
- * @internal
- */
-export class OdspDocumentServiceFactoryWithCodeSplit
-	extends OdspDocumentServiceFactoryCore
-	implements IDocumentServiceFactory
-{
-	constructor(
-		getStorageToken: TokenFetcher<OdspResourceTokenFetchOptions>,
-		getWebsocketToken: TokenFetcher<OdspResourceTokenFetchOptions> | undefined,
-		persistedCache?: IPersistedCache,
-		hostPolicy?: HostStoragePolicy,
-	) {
-		super(getStorageToken, getWebsocketToken, persistedCache, hostPolicy);
-	}
-}