@fluidframework/odsp-driver 2.50.0 → 2.51.0

package/src/fetchSnapshot.ts

@@ -6,9 +6,9 @@
 import { fromUtf8ToBase64 } from "@fluid-internal/client-utils";
 import { assert } from "@fluidframework/core-utils/internal";
 import { getW3CData } from "@fluidframework/driver-base/internal";
-import { ISnapshot, ISnapshotTree } from "@fluidframework/driver-definitions/internal";
+import type { ISnapshot, ISnapshotTree } from "@fluidframework/driver-definitions/internal";
 import {
-	DriverErrorTelemetryProps,
+	type DriverErrorTelemetryProps,
 	NonRetryableError,
 	isRuntimeMessage,
 } from "@fluidframework/driver-utils/internal";
@@ -18,13 +18,13 @@ import {
 } from "@fluidframework/odsp-doclib-utils/internal";
 import {
 	type IOdspError,
-	IOdspResolvedUrl,
-	ISnapshotOptions,
-	InstrumentedStorageTokenFetcher,
+	type IOdspResolvedUrl,
+	type ISnapshotOptions,
+	type InstrumentedStorageTokenFetcher,
 	OdspErrorTypes,
 } from "@fluidframework/odsp-driver-definitions/internal";
 import {
-	ITelemetryLoggerExt,
+	type ITelemetryLoggerExt,
 	PerformanceEvent,
 	isFluidError,
 	wrapError,
@@ -32,24 +32,25 @@ import {
 import { v4 as uuid } from "uuid";
 
 import {
-	ISnapshotContentsWithProps,
+	type ISnapshotContentsWithProps,
 	currentReadVersion,
 	parseCompactSnapshotResponse,
 } from "./compactSnapshotParser.js";
 import {
-	IOdspSnapshot,
-	ISnapshotCachedEntry2,
-	IVersionedValueWithEpoch,
+	type IOdspSnapshot,
+	type ISnapshotCachedEntry2,
+	type IVersionedValueWithEpoch,
 	persistedCacheValueVersion,
 } from "./contracts.js";
-import { EpochTracker } from "./epochTracker.js";
+import { ClpCompliantAppHeader } from "./contractsPublic.js";
+import type { EpochTracker } from "./epochTracker.js";
 import { getQueryString } from "./getQueryString.js";
 import { getHeadersWithAuth } from "./getUrlAndHeadersWithAuth.js";
 import { mockify } from "./mockify.js";
 import { convertOdspSnapshotToSnapshotTreeAndBlobs } from "./odspSnapshotParser.js";
 import { checkForKnownServerFarmType } from "./odspUrlHelper.js";
 import {
-	IOdspResponse,
+	type IOdspResponse,
 	fetchAndParseAsJSONHelper,
 	fetchHelper,
 	getWithRetryForTokenRefresh,
@@ -739,9 +740,15 @@ export const downloadSnapshot = mockify(
 		// This error thrown by server will contain the new redirect location. Look at the 404 error parsing
 		// for further reference here: \packages\utils\odsp-doclib-utils\src\odspErrorUtils.ts
 		// If the share link is non-durable, we will add the nonDurableRedeem header to the header.prefer.
-		const header = isRedemptionNonDurable
+		const header: { [key: string]: string } = isRedemptionNonDurable
 			? { prefer: "manualredirect, nonDurableRedeem" }
 			: { prefer: "manualredirect" };
+		// Epoch tracker is handling adding the CLP Compliant App header, so only when a flow does not
+		// use epoch tracker, we add the header.
+		if (epochTracker === undefined && odspResolvedUrl.isClpCompliantApp !== undefined) {
+			header[ClpCompliantAppHeader.isClpCompliantApp] =
+				odspResolvedUrl.isClpCompliantApp.toString();
+		}
 		const authHeader = await getAuthHeader(
 			{ ...tokenFetchOptions, request: { url, method } },
 			"downloadSnapshot",

package/src/getFileLink.ts

@@ -7,14 +7,14 @@ import type { ITelemetryBaseProperties } from "@fluidframework/core-interfaces";
 import { assert } from "@fluidframework/core-utils/internal";
 import { NonRetryableError, runWithRetry } from "@fluidframework/driver-utils/internal";
 import {
-	IOdspUrlParts,
+	type IOdspUrlParts,
 	OdspErrorTypes,
-	OdspResourceTokenFetchOptions,
-	TokenFetcher,
+	type OdspResourceTokenFetchOptions,
+	type TokenFetcher,
 	type IOdspResolvedUrl,
 } from "@fluidframework/odsp-driver-definitions/internal";
 import {
-	ITelemetryLoggerExt,
+	type ITelemetryLoggerExt,
 	PerformanceEvent,
 	isFluidError,
 } from "@fluidframework/telemetry-utils/internal";

package/src/getQueryString.ts

@@ -3,7 +3,7 @@
  * Licensed under the MIT License.
  */
 
-import { ISnapshotOptions } from "@fluidframework/odsp-driver-definitions/internal";
+import type { ISnapshotOptions } from "@fluidframework/odsp-driver-definitions/internal";
 
 /**
  * Generates query string from the given query parameters.

package/src/index.ts

@@ -8,16 +8,16 @@ export { OdcApiSiteOrigin, OdcFileSiteOrigin } from "./constants.js";
 
 export {
 	ClpCompliantAppHeader,
-	IClpCompliantAppHeader,
-	ISharingLinkHeader,
-	OdspFluidDataStoreLocator,
+	type IClpCompliantAppHeader,
+	type ISharingLinkHeader,
+	type OdspFluidDataStoreLocator,
 	SharingLinkHeader,
 } from "./contractsPublic.js";
 
 // public utils
 export { checkUrl } from "./checkUrl.js";
 export { createOdspUrl } from "./createOdspUrl.js";
-export { getHashedDocumentId, ISnapshotContents } from "./odspPublicUtils.js";
+export { getHashedDocumentId, type ISnapshotContents } from "./odspPublicUtils.js";
 export { getOdspUrlParts, isOdcUrl, isSpoUrl } from "./odspUrlHelper.js";
 
 // prefetch latest snapshot before container load
@@ -37,7 +37,7 @@ export { createOdspCreateContainerRequest } from "./createOdspCreateContainerReq
 export { OdspDriverUrlResolver } from "./odspDriverUrlResolver.js";
 export {
 	OdspDriverUrlResolverForShareLink,
-	ShareLinkFetcherProps,
+	type ShareLinkFetcherProps,
 } from "./odspDriverUrlResolverForShareLink.js";
 
 // It's used by URL resolve code, but also has some public functions
@@ -48,22 +48,22 @@ export {
 	storeLocatorInOdspUrl,
 } from "./odspFluidFileLink.js";
 
-export {
+export type {
 	IOdspCache,
 	IPersistedFileCache,
 	INonPersistentCache,
 	IPrefetchSnapshotContents,
 } from "./odspCache.js";
-export {
+export type {
 	ICacheAndTracker,
-	type EpochTracker,
+	EpochTracker,
 	FetchType,
 	FetchTypeInternal,
 } from "./epochTracker.js";
-export { IOdspResponse, isOdspResolvedUrl } from "./odspUtils.js";
+export { type IOdspResponse, isOdspResolvedUrl } from "./odspUtils.js";
 export { SnapshotFormatSupportType } from "./fetchSnapshot.js";
 export {
-	ISnapshotContentsWithProps,
+	type ISnapshotContentsWithProps,
 	parseCompactSnapshotResponse,
 } from "./compactSnapshotParser.js";
 

package/src/localOdspDriver/localOdspDeltaStorageService.ts

@@ -4,13 +4,13 @@
  */
 
 import { validateMessages } from "@fluidframework/driver-base/internal";
-import {
+import type {
 	IDocumentDeltaStorageService,
 	IStream,
 	ISequencedDocumentMessage,
 } from "@fluidframework/driver-definitions/internal";
 import { Queue, emptyMessageStream } from "@fluidframework/driver-utils/internal";
-import { ITelemetryLoggerExt } from "@fluidframework/telemetry-utils/internal";
+import type { ITelemetryLoggerExt } from "@fluidframework/telemetry-utils/internal";
 
 /**
  * Implementation of IDocumentDeltaStorageService that will return snapshot ops when fetching messages

package/src/localOdspDriver/localOdspDocumentService.ts

@@ -4,8 +4,8 @@
  */
 
 import { TypedEventEmitter, type ILayerCompatDetails } from "@fluid-internal/client-utils";
-import { IClient } from "@fluidframework/driver-definitions";
-import {
+import type { IClient } from "@fluidframework/driver-definitions";
+import type {
 	IDocumentDeltaStorageService,
 	IDocumentService,
 	IDocumentServiceEvents,
@@ -13,8 +13,8 @@ import {
 	IResolvedUrl,
 } from "@fluidframework/driver-definitions/internal";
 import { UsageError } from "@fluidframework/driver-utils/internal";
-import { IOdspResolvedUrl } from "@fluidframework/odsp-driver-definitions/internal";
-import { ITelemetryLoggerExt } from "@fluidframework/telemetry-utils/internal";
+import type { IOdspResolvedUrl } from "@fluidframework/odsp-driver-definitions/internal";
+import type { ITelemetryLoggerExt } from "@fluidframework/telemetry-utils/internal";
 
 import { LocalOdspDeltaStorageService } from "./localOdspDeltaStorageService.js";
 import { LocalOdspDocumentStorageService } from "./localOdspDocumentStorageManager.js";

package/src/localOdspDriver/localOdspDocumentServiceFactory.ts

@@ -3,13 +3,16 @@
  * Licensed under the MIT License.
  */
 
-import { ITelemetryBaseLogger } from "@fluidframework/core-interfaces";
-import { ISummaryTree } from "@fluidframework/driver-definitions";
-import { IDocumentService, IResolvedUrl } from "@fluidframework/driver-definitions/internal";
+import type { ITelemetryBaseLogger } from "@fluidframework/core-interfaces";
+import type { ISummaryTree } from "@fluidframework/driver-definitions";
+import type {
+	IDocumentService,
+	IResolvedUrl,
+} from "@fluidframework/driver-definitions/internal";
 import { UsageError } from "@fluidframework/driver-utils/internal";
-import { ITelemetryLoggerExt } from "@fluidframework/telemetry-utils/internal";
+import type { ITelemetryLoggerExt } from "@fluidframework/telemetry-utils/internal";
 
-import { ICacheAndTracker } from "../epochTracker.js";
+import type { ICacheAndTracker } from "../epochTracker.js";
 import { OdspDocumentServiceFactoryCore } from "../odspDocumentServiceFactoryCore.js";
 import { createOdspLogger, getOdspResolvedUrl } from "../odspUtils.js";
 

package/src/localOdspDriver/localOdspDocumentStorageManager.ts

@@ -4,8 +4,8 @@
  */
 
 import { assert } from "@fluidframework/core-utils/internal";
-import { ISummaryTree } from "@fluidframework/driver-definitions";
-import {
+import type { ISummaryTree } from "@fluidframework/driver-definitions";
+import type {
 	ISnapshot,
 	ISnapshotFetchOptions,
 	ISummaryContext,
@@ -13,12 +13,12 @@ import {
 } from "@fluidframework/driver-definitions/internal";
 import { UsageError } from "@fluidframework/driver-utils/internal";
 import {
-	ITelemetryLoggerExt,
+	type ITelemetryLoggerExt,
 	loggerToMonitoringContext,
 } from "@fluidframework/telemetry-utils/internal";
 
 import { parseCompactSnapshotResponse } from "../compactSnapshotParser.js";
-import { IOdspSnapshot } from "../contracts.js";
+import type { IOdspSnapshot } from "../contracts.js";
 import { OdspDocumentStorageServiceBase } from "../odspDocumentStorageServiceBase.js";
 import { convertOdspSnapshotToSnapshotTreeAndBlobs } from "../odspSnapshotParser.js";
 

package/src/localOdspDriver/localOdspLayerCompatState.ts

@@ -3,7 +3,7 @@
  * Licensed under the MIT License.
  */
 
-import { type ILayerCompatDetails } from "@fluid-internal/client-utils";
+import type { ILayerCompatDetails } from "@fluid-internal/client-utils";
 
 import { pkgVersion } from "../packageVersion.js";
 

package/src/odspCache.ts

@@ -4,14 +4,14 @@
  */
 
 import { PromiseCache } from "@fluidframework/core-utils/internal";
-import { ISnapshot } from "@fluidframework/driver-definitions/internal";
+import type { ISnapshot } from "@fluidframework/driver-definitions/internal";
 import {
-	ICacheEntry,
-	IEntry,
-	IFileEntry,
-	IOdspResolvedUrl,
-	IPersistedCache,
-	ISocketStorageDiscovery,
+	type ICacheEntry,
+	type IEntry,
+	type IFileEntry,
+	type IOdspResolvedUrl,
+	type IPersistedCache,
+	type ISocketStorageDiscovery,
 	getKeyForCacheEntry,
 } from "@fluidframework/odsp-driver-definitions/internal";
 

package/src/odspDelayLoadedDeltaStream.ts

@@ -4,14 +4,14 @@
  */
 
 import { performanceNow } from "@fluid-internal/client-utils";
-import { ISignalEnvelope } from "@fluidframework/core-interfaces/internal";
+import type { ISignalEnvelope } from "@fluidframework/core-interfaces/internal";
 import { assert } from "@fluidframework/core-utils/internal";
-import { IClient } from "@fluidframework/driver-definitions";
-import {
+import type { IClient } from "@fluidframework/driver-definitions";
+import type {
 	IDocumentDeltaConnection,
 	IDocumentServicePolicies,
 	IResolvedUrl,
-	type IAnyDriverError,
+	IAnyDriverError,
 	ISequencedDocumentMessage,
 	ISignalMessage,
 } from "@fluidframework/driver-definitions/internal";
@@ -21,27 +21,27 @@ import {
 } from "@fluidframework/driver-utils/internal";
 import { hasFacetCodes } from "@fluidframework/odsp-doclib-utils/internal";
 import {
-	HostStoragePolicy,
+	type HostStoragePolicy,
 	type IOdspError,
-	IOdspResolvedUrl,
-	ISocketStorageDiscovery,
-	InstrumentedStorageTokenFetcher,
+	type IOdspResolvedUrl,
+	type ISocketStorageDiscovery,
+	type InstrumentedStorageTokenFetcher,
 	OdspErrorTypes,
-	TokenFetchOptions,
+	type TokenFetchOptions,
 } from "@fluidframework/odsp-driver-definitions/internal";
 import {
-	IFluidErrorBase,
-	MonitoringContext,
+	type IFluidErrorBase,
+	type MonitoringContext,
 	normalizeError,
 } from "@fluidframework/telemetry-utils/internal";
 import { v4 as uuid } from "uuid";
 
 import { policyLabelsUpdatesSignalType } from "./contracts.js";
-import { EpochTracker } from "./epochTracker.js";
-import { IOdspCache } from "./odspCache.js";
+import type { EpochTracker } from "./epochTracker.js";
+import type { IOdspCache } from "./odspCache.js";
 import { OdspDocumentDeltaConnection } from "./odspDocumentDeltaConnection.js";
 import {
-	TokenFetchOptionsEx,
+	type TokenFetchOptionsEx,
 	getJoinSessionCacheKey,
 	getWithRetryForTokenRefresh,
 } from "./odspUtils.js";
@@ -155,6 +155,16 @@ export class OdspDelayLoadedDeltaStream {
 				throw this.annotateConnectionError(error, step, !requestWebsocketTokenFromJoinSession);
 			};
 
+			// Log telemetry for join session attempt
+			if (this.firstConnectionAttempt) {
+				this.mc.logger.sendTelemetryEvent({
+					eventName: "FirstJoinSessionAttemptDetails",
+					details: {
+						requestWebsocketToken: requestWebsocketTokenFromJoinSession,
+					},
+				});
+			}
+
 			const joinSessionPromise = this.joinSession(
 				requestWebsocketTokenFromJoinSession,
 				options,

package/src/odspDeltaStorageService.ts

@@ -3,26 +3,26 @@
  * Licensed under the MIT License.
  */
 
-import { ITelemetryBaseProperties } from "@fluidframework/core-interfaces";
+import type { ITelemetryBaseProperties } from "@fluidframework/core-interfaces";
 import { assert } from "@fluidframework/core-utils/internal";
 import { validateMessages } from "@fluidframework/driver-base/internal";
-import {
+import type {
 	IDeltasFetchResult,
 	IDocumentDeltaStorageService,
-	type IStream,
+	IStream,
 	ISequencedDocumentMessage,
 } from "@fluidframework/driver-definitions/internal";
 import { requestOps, streamObserver } from "@fluidframework/driver-utils/internal";
-import { InstrumentedStorageTokenFetcher } from "@fluidframework/odsp-driver-definitions/internal";
+import type { InstrumentedStorageTokenFetcher } from "@fluidframework/odsp-driver-definitions/internal";
 import {
-	ITelemetryLoggerExt,
+	type ITelemetryLoggerExt,
 	PerformanceEvent,
 } from "@fluidframework/telemetry-utils/internal";
 import { v4 as uuid } from "uuid";
 
-import { IDeltaStorageGetResponse, ISequencedDeltaOpMessage } from "./contracts.js";
-import { EpochTracker } from "./epochTracker.js";
-import { OdspDocumentStorageService } from "./odspDocumentStorageManager.js";
+import type { IDeltaStorageGetResponse, ISequencedDeltaOpMessage } from "./contracts.js";
+import type { EpochTracker } from "./epochTracker.js";
+import type { OdspDocumentStorageService } from "./odspDocumentStorageManager.js";
 import { getWithRetryForTokenRefresh } from "./odspUtils.js";
 
 /**

package/src/odspDocumentDeltaConnection.ts

@@ -4,11 +4,11 @@
  */
 
 import { TypedEventEmitter, performanceNow } from "@fluid-internal/client-utils";
-import { IEvent } from "@fluidframework/core-interfaces";
+import type { IEvent } from "@fluidframework/core-interfaces";
 import { assert, Deferred } from "@fluidframework/core-utils/internal";
 import { DocumentDeltaConnection } from "@fluidframework/driver-base/internal";
-import { IClient } from "@fluidframework/driver-definitions";
-import {
+import type { IClient } from "@fluidframework/driver-definitions";
+import type {
 	IAnyDriverError,
 	IConnect,
 	IDocumentMessage,
@@ -18,17 +18,17 @@ import {
 	ISignalMessage,
 } from "@fluidframework/driver-definitions/internal";
 import { createGenericNetworkError } from "@fluidframework/driver-utils/internal";
-import { OdspError } from "@fluidframework/odsp-driver-definitions/internal";
+import type { OdspError } from "@fluidframework/odsp-driver-definitions/internal";
 import {
-	IFluidErrorBase,
-	ITelemetryLoggerExt,
+	type IFluidErrorBase,
+	type ITelemetryLoggerExt,
 	loggerToMonitoringContext,
 } from "@fluidframework/telemetry-utils/internal";
-import { Socket } from "socket.io-client";
+import type { Socket } from "socket.io-client";
 import { v4 as uuid } from "uuid";
 
-import { IFlushOpsResponse, IGetOpsResponse, IOdspSocketError } from "./contracts.js";
-import { EpochTracker } from "./epochTracker.js";
+import type { IFlushOpsResponse, IGetOpsResponse, IOdspSocketError } from "./contracts.js";
+import type { EpochTracker } from "./epochTracker.js";
 import { errorObjectFromSocketError } from "./odspError.js";
 import { pkgVersion } from "./packageVersion.js";
 import { SocketIOClientStatic } from "./socketModule.js";

package/src/odspDocumentService.ts

@@ -5,8 +5,8 @@
 
 import { TypedEventEmitter, type ILayerCompatDetails } from "@fluid-internal/client-utils";
 import { assert } from "@fluidframework/core-utils/internal";
-import { IClient } from "@fluidframework/driver-definitions";
-import {
+import type { IClient } from "@fluidframework/driver-definitions";
+import type {
 	IDocumentDeltaConnection,
 	IDocumentDeltaStorageService,
 	IDocumentService,
@@ -16,7 +16,7 @@ import {
 	IResolvedUrl,
 	ISequencedDocumentMessage,
 } from "@fluidframework/driver-definitions/internal";
-import {
+import type {
 	HostStoragePolicy,
 	IEntry,
 	IOdspResolvedUrl,
@@ -24,14 +24,14 @@ import {
 	TokenFetchOptions,
 } from "@fluidframework/odsp-driver-definitions/internal";
 import {
-	ITelemetryLoggerExt,
-	MonitoringContext,
+	type ITelemetryLoggerExt,
+	type MonitoringContext,
 	createChildMonitoringContext,
 } from "@fluidframework/telemetry-utils/internal";
 
-import { HostStoragePolicyInternal } from "./contracts.js";
-import { EpochTracker } from "./epochTracker.js";
-import { IOdspCache } from "./odspCache.js";
+import type { HostStoragePolicyInternal } from "./contracts.js";
+import type { EpochTracker } from "./epochTracker.js";
+import type { IOdspCache } from "./odspCache.js";
 import type { OdspDelayLoadedDeltaStream } from "./odspDelayLoadedDeltaStream.js";
 import {
 	OdspDeltaStorageService,

package/src/odspDocumentServiceFactory.ts

@@ -3,8 +3,8 @@
  * Licensed under the MIT License.
  */
 
-import { IDocumentServiceFactory } from "@fluidframework/driver-definitions/internal";
-import {
+import type { IDocumentServiceFactory } from "@fluidframework/driver-definitions/internal";
+import type {
 	HostStoragePolicy,
 	IPersistedCache,
 	OdspResourceTokenFetchOptions,

package/src/odspDocumentServiceFactoryCore.ts

@@ -3,10 +3,10 @@
  * Licensed under the MIT License.
  */
 
-import { ITelemetryBaseLogger } from "@fluidframework/core-interfaces";
-import { PromiseCache } from "@fluidframework/core-utils/internal";
-import { ISummaryTree } from "@fluidframework/driver-definitions";
-import {
+import type { ITelemetryBaseLogger } from "@fluidframework/core-interfaces";
+import type { PromiseCache } from "@fluidframework/core-utils/internal";
+import type { ISummaryTree } from "@fluidframework/driver-definitions";
+import type {
 	IDocumentService,
 	IDocumentServiceFactory,
 	IResolvedUrl,
@@ -16,34 +16,34 @@ import {
 	isCombinedAppAndProtocolSummary,
 } from "@fluidframework/driver-utils/internal";
 import {
-	HostStoragePolicy,
-	IFileEntry,
-	IOdspUrlParts,
-	IPersistedCache,
-	IRelaySessionAwareDriverFactory,
-	ISharingLinkKind,
-	ISocketStorageDiscovery,
-	OdspResourceTokenFetchOptions,
+	type HostStoragePolicy,
+	type IFileEntry,
+	type IOdspUrlParts,
+	type IPersistedCache,
+	type IRelaySessionAwareDriverFactory,
+	type ISharingLinkKind,
+	type ISocketStorageDiscovery,
+	type OdspResourceTokenFetchOptions,
 	SharingLinkRole,
 	SharingLinkScope,
-	TokenFetchOptions,
-	TokenFetcher,
+	type TokenFetchOptions,
+	type TokenFetcher,
 } from "@fluidframework/odsp-driver-definitions/internal";
 import { PerformanceEvent, createChildLogger } from "@fluidframework/telemetry-utils/internal";
 import { v4 as uuid } from "uuid";
 
 import { useCreateNewModule } from "./createFile/index.js";
-import { ICacheAndTracker, createOdspCacheAndTracker } from "./epochTracker.js";
+import { type ICacheAndTracker, createOdspCacheAndTracker } from "./epochTracker.js";
 import {
-	INonPersistentCache,
-	IPrefetchSnapshotContents,
+	type INonPersistentCache,
+	type IPrefetchSnapshotContents,
 	LocalPersistentCache,
 	NonPersistentCache,
 } from "./odspCache.js";
 import { OdspDocumentService } from "./odspDocumentService.js";
 import {
-	IExistingFileInfo,
-	INewFileInfo,
+	type IExistingFileInfo,
+	type INewFileInfo,
 	createOdspLogger,
 	getJoinSessionCacheKey,
 	getOdspResolvedUrl,
@@ -199,6 +199,7 @@ export class OdspDocumentServiceFactoryCore
 								this.hostPolicy.cacheCreateNewSummary ?? true,
 								!!this.hostPolicy.sessionOptions?.forceAccessTokenViaAuthorizationHeader,
 								odspResolvedUrl.isClpCompliantApp,
+								odspResolvedUrl.fileMetadata?.eTag,
 							);
 				});
 				const docService = this.createDocumentServiceCore(

package/src/odspDocumentStorageManager.ts

@@ -7,26 +7,26 @@ 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";
-import { ISummaryTree } from "@fluidframework/driver-definitions";
+import type { ISummaryTree } from "@fluidframework/driver-definitions";
 import {
 	FetchSource,
-	ISnapshot,
-	ISnapshotFetchOptions,
-	ISummaryContext,
-	ICreateBlobResponse,
-	IVersion,
-	ISnapshotTree,
+	type ISnapshot,
+	type ISnapshotFetchOptions,
+	type ISummaryContext,
+	type ICreateBlobResponse,
+	type IVersion,
+	type ISnapshotTree,
 } from "@fluidframework/driver-definitions/internal";
 import { NonRetryableError, RateLimiter } from "@fluidframework/driver-utils/internal";
 import {
-	IOdspResolvedUrl,
-	ISnapshotOptions,
-	InstrumentedStorageTokenFetcher,
+	type IOdspResolvedUrl,
+	type ISnapshotOptions,
+	type InstrumentedStorageTokenFetcher,
 	OdspErrorTypes,
 	getKeyForCacheEntry,
 } from "@fluidframework/odsp-driver-definitions/internal";
 import {
-	ITelemetryLoggerExt,
+	type ITelemetryLoggerExt,
 	PerformanceEvent,
 	generateStack,
 	loggerToMonitoringContext,
@@ -35,7 +35,7 @@ import {
 	type IConfigProvider,
 } from "@fluidframework/telemetry-utils/internal";
 
-import {
+import type {
 	HostStoragePolicyInternal,
 	IDocumentStorageGetVersionsResponse,
 	// eslint-disable-next-line import/no-deprecated
@@ -44,22 +44,22 @@ import {
 	IVersionedValueWithEpoch,
 } from "./contracts.js";
 import { useCreateNewModule } from "./createFile/index.js";
-import { EpochTracker } from "./epochTracker.js";
+import type { EpochTracker } from "./epochTracker.js";
 import {
-	ISnapshotRequestAndResponseOptions,
-	SnapshotFormatSupportType,
+	type ISnapshotRequestAndResponseOptions,
+	type SnapshotFormatSupportType,
 	downloadSnapshot,
 	getTreeStats,
 	fetchSnapshot,
 	fetchSnapshotWithRedeem,
 } from "./fetchSnapshot.js";
 import { getHeadersWithAuth } from "./getUrlAndHeadersWithAuth.js";
-import { IOdspCache, IPrefetchSnapshotContents } from "./odspCache.js";
-import { FlushResult } from "./odspDocumentDeltaConnection.js";
+import type { IOdspCache, IPrefetchSnapshotContents } from "./odspCache.js";
+import type { FlushResult } from "./odspDocumentDeltaConnection.js";
 import { OdspDocumentStorageServiceBase } from "./odspDocumentStorageServiceBase.js";
 import type { OdspSummaryUploadManager } from "./odspSummaryUploadManager.js";
 import {
-	IOdspResponse,
+	type IOdspResponse,
 	createCacheSnapshotKey,
 	getWithRetryForTokenRefresh,
 	isInstanceOfISnapshot,