@fluidframework/odsp-driver 2.0.0-dev-rc.2.0.0.246488 → 2.0.0-dev-rc.3.0.0.250606

package/src/getFileLink.ts

@@ -4,7 +4,6 @@
  */
 
 import type { ITelemetryBaseProperties } from "@fluidframework/core-interfaces";
-import { ITelemetryLoggerExt, PerformanceEvent } from "@fluidframework/telemetry-utils";
 import { assert } from "@fluidframework/core-utils";
 import { NonRetryableError, runWithRetry } from "@fluidframework/driver-utils";
 import {
@@ -13,6 +12,7 @@ import {
 	OdspResourceTokenFetchOptions,
 	TokenFetcher,
 } from "@fluidframework/odsp-driver-definitions";
+import { ITelemetryLoggerExt, PerformanceEvent } from "@fluidframework/telemetry-utils";
 import { getUrlAndHeadersWithAuth } from "./getUrlAndHeadersWithAuth.js";
 import {
 	fetchHelper,

package/src/localOdspDriver/localOdspDeltaStorageService.ts

@@ -3,11 +3,11 @@
  * Licensed under the MIT License.
  */
 
-import { ITelemetryLoggerExt } from "@fluidframework/telemetry-utils";
+import { validateMessages } from "@fluidframework/driver-base";
 import { IDocumentDeltaStorageService, IStream } from "@fluidframework/driver-definitions";
 import { Queue, emptyMessageStream } from "@fluidframework/driver-utils";
 import { ISequencedDocumentMessage } from "@fluidframework/protocol-definitions";
-import { validateMessages } from "@fluidframework/driver-base";
+import { ITelemetryLoggerExt } from "@fluidframework/telemetry-utils";
 
 /**
  * Implementation of IDocumentDeltaStorageService that will return snapshot ops when fetching messages

package/src/localOdspDriver/localOdspDocumentService.ts

@@ -4,7 +4,6 @@
  */
 
 import { TypedEventEmitter } from "@fluid-internal/client-utils";
-import { ITelemetryLoggerExt } from "@fluidframework/telemetry-utils";
 import {
 	IDocumentDeltaStorageService,
 	IDocumentService,
@@ -15,6 +14,7 @@ import {
 import { UsageError } from "@fluidframework/driver-utils";
 import { IOdspResolvedUrl } from "@fluidframework/odsp-driver-definitions";
 import { IClient } from "@fluidframework/protocol-definitions";
+import { ITelemetryLoggerExt } from "@fluidframework/telemetry-utils";
 import { LocalOdspDeltaStorageService } from "./localOdspDeltaStorageService.js";
 import { LocalOdspDocumentStorageService } from "./localOdspDocumentStorageManager.js";
 

package/src/localOdspDriver/localOdspDocumentServiceFactory.ts

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

package/src/localOdspDriver/localOdspDocumentStorageManager.ts

@@ -4,7 +4,6 @@
  */
 
 import { assert } from "@fluidframework/core-utils";
-import { ITelemetryLoggerExt, loggerToMonitoringContext } from "@fluidframework/telemetry-utils";
 import {
 	ISnapshot,
 	ISnapshotFetchOptions,
@@ -12,10 +11,11 @@ import {
 } from "@fluidframework/driver-definitions";
 import { UsageError } from "@fluidframework/driver-utils";
 import * as api from "@fluidframework/protocol-definitions";
-import { OdspDocumentStorageServiceBase } from "../odspDocumentStorageServiceBase.js";
+import { ITelemetryLoggerExt, loggerToMonitoringContext } from "@fluidframework/telemetry-utils";
+import { parseCompactSnapshotResponse } from "../compactSnapshotParser.js";
 import { IOdspSnapshot } from "../contracts.js";
+import { OdspDocumentStorageServiceBase } from "../odspDocumentStorageServiceBase.js";
 import { convertOdspSnapshotToSnapshotTreeAndBlobs } from "../odspSnapshotParser.js";
-import { parseCompactSnapshotResponse } from "../compactSnapshotParser.js";
 
 /**
  * ODSP document storage service that works on a provided snapshot for all its processing.

package/src/odspCache.ts

@@ -4,16 +4,16 @@
  */
 
 import { PromiseCache } from "@fluidframework/core-utils";
+import { ISnapshot } from "@fluidframework/driver-definitions";
 import {
-	IOdspResolvedUrl,
-	IFileEntry,
+	ICacheEntry,
 	IEntry,
+	IFileEntry,
+	IOdspResolvedUrl,
 	IPersistedCache,
-	ICacheEntry,
 	ISocketStorageDiscovery,
 	getKeyForCacheEntry,
 } from "@fluidframework/odsp-driver-definitions";
-import { ISnapshot } from "@fluidframework/driver-definitions";
 
 /**
  * Similar to IPersistedCache, but exposes cache interface for single file

package/src/odspDelayLoadedDeltaStream.ts

@@ -6,46 +6,46 @@
 import { performance } from "@fluid-internal/client-utils";
 import { ISignalEnvelope } from "@fluidframework/core-interfaces";
 import { assert } from "@fluidframework/core-utils";
-import {
-	IFluidErrorBase,
-	MonitoringContext,
-	normalizeError,
-} from "@fluidframework/telemetry-utils";
 import {
 	IDocumentDeltaConnection,
-	IResolvedUrl,
 	IDocumentServicePolicies,
+	IResolvedUrl,
 } from "@fluidframework/driver-definitions";
 import {
 	DeltaStreamConnectionForbiddenError,
 	NonRetryableError,
 } from "@fluidframework/driver-utils";
+import { hasFacetCodes } from "@fluidframework/odsp-doclib-utils/internal";
+import {
+	HostStoragePolicy,
+	type IOdspError,
+	IOdspResolvedUrl,
+	ISocketStorageDiscovery,
+	InstrumentedStorageTokenFetcher,
+	OdspErrorTypes,
+	TokenFetchOptions,
+} from "@fluidframework/odsp-driver-definitions";
 import {
 	IClient,
 	ISequencedDocumentMessage,
 	ISignalMessage,
 } from "@fluidframework/protocol-definitions";
 import {
-	IOdspResolvedUrl,
-	TokenFetchOptions,
-	HostStoragePolicy,
-	InstrumentedStorageTokenFetcher,
-	ISocketStorageDiscovery,
-	OdspErrorTypes,
-	type IOdspError,
-} from "@fluidframework/odsp-driver-definitions";
-import { hasFacetCodes } from "@fluidframework/odsp-doclib-utils/internal";
+	IFluidErrorBase,
+	MonitoringContext,
+	normalizeError,
+} from "@fluidframework/telemetry-utils";
+import { policyLabelsUpdatesSignalType } from "./contracts.js";
+import { EpochTracker } from "./epochTracker.js";
 import { IOdspCache } from "./odspCache.js";
 import { OdspDocumentDeltaConnection } from "./odspDocumentDeltaConnection.js";
 import {
+	TokenFetchOptionsEx,
 	getJoinSessionCacheKey,
 	getWithRetryForTokenRefresh,
-	TokenFetchOptionsEx,
 } from "./odspUtils.js";
-import { fetchJoinSession } from "./vroom.js";
-import { EpochTracker } from "./epochTracker.js";
 import { pkgVersion as driverVersion } from "./packageVersion.js";
-import { policyLabelsUpdatesSignalType } from "./contracts.js";
+import { fetchJoinSession } from "./vroom.js";
 
 /**
  * This OdspDelayLoadedDeltaStream is used by OdspDocumentService.ts to delay load the delta connection
@@ -219,9 +219,13 @@ export class OdspDelayLoadedDeltaStream {
 				this.currentConnection = connection;
 				return connection;
 			} catch (error) {
-				this.clearJoinSessionTimer();
-				this.cache.sessionJoinCache.remove(this.joinSessionKey);
-
+				// Remove join session information from cache only if it is an error related to connect_document and not a socket related error.
+				// Otherwise keep it in cache so that this session can be re-used after disconnection.
+				// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-explicit-any
+				if ((error as any).errorFrom === "connect_document_error") {
+					this.clearJoinSessionTimer();
+					this.cache.sessionJoinCache.remove(this.joinSessionKey);
+				}
 				const normalizedError = this.annotateConnectionError(
 					error,
 					"createDeltaConnection",

package/src/odspDeltaStorageService.ts

@@ -3,23 +3,23 @@
  * Licensed under the MIT License.
  */
 
-import { v4 as uuid } from "uuid";
 import { ITelemetryBaseProperties } from "@fluidframework/core-interfaces";
-import { validateMessages } from "@fluidframework/driver-base";
-import { ITelemetryLoggerExt, PerformanceEvent } from "@fluidframework/telemetry-utils";
 import { assert } from "@fluidframework/core-utils";
-import { ISequencedDocumentMessage } from "@fluidframework/protocol-definitions";
-import { InstrumentedStorageTokenFetcher } from "@fluidframework/odsp-driver-definitions";
+import { validateMessages } from "@fluidframework/driver-base";
 import {
 	IDeltasFetchResult,
 	IDocumentDeltaStorageService,
 	type IStream,
 } from "@fluidframework/driver-definitions";
 import { requestOps, streamObserver } from "@fluidframework/driver-utils";
+import { InstrumentedStorageTokenFetcher } from "@fluidframework/odsp-driver-definitions";
+import { ISequencedDocumentMessage } from "@fluidframework/protocol-definitions";
+import { ITelemetryLoggerExt, PerformanceEvent } from "@fluidframework/telemetry-utils";
+import { v4 as uuid } from "uuid";
 import { IDeltaStorageGetResponse, ISequencedDeltaOpMessage } from "./contracts.js";
 import { EpochTracker } from "./epochTracker.js";
-import { getWithRetryForTokenRefresh } from "./odspUtils.js";
 import { OdspDocumentStorageService } from "./odspDocumentStorageManager.js";
+import { getWithRetryForTokenRefresh } from "./odspUtils.js";
 
 /**
  * Provides access to the underlying delta storage on the server for sharepoint driver.

package/src/odspDocumentDeltaConnection.ts

@@ -3,16 +3,12 @@
  * Licensed under the MIT License.
  */
 
+import { TypedEventEmitter, performance } from "@fluid-internal/client-utils";
 import { IEvent } from "@fluidframework/core-interfaces";
-import {
-	ITelemetryLoggerExt,
-	IFluidErrorBase,
-	loggerToMonitoringContext,
-} from "@fluidframework/telemetry-utils";
-import { performance, TypedEventEmitter } from "@fluid-internal/client-utils";
 import { assert, Deferred } from "@fluidframework/core-utils";
 import { DocumentDeltaConnection } from "@fluidframework/driver-base";
 import { IAnyDriverError } from "@fluidframework/driver-definitions";
+import { createGenericNetworkError } from "@fluidframework/driver-utils";
 import { OdspError } from "@fluidframework/odsp-driver-definitions";
 import {
 	IClient,
@@ -23,14 +19,18 @@ import {
 	ISequencedDocumentMessage,
 	ISignalMessage,
 } from "@fluidframework/protocol-definitions";
+import {
+	IFluidErrorBase,
+	ITelemetryLoggerExt,
+	loggerToMonitoringContext,
+} from "@fluidframework/telemetry-utils";
 import { Socket } from "socket.io-client";
 import { v4 as uuid } from "uuid";
-import { createGenericNetworkError } from "@fluidframework/driver-utils";
-import { IOdspSocketError, IGetOpsResponse, IFlushOpsResponse } from "./contracts.js";
+import { IFlushOpsResponse, IGetOpsResponse, IOdspSocketError } from "./contracts.js";
 import { EpochTracker } from "./epochTracker.js";
 import { errorObjectFromSocketError } from "./odspError.js";
-import { SocketIOClientStatic } from "./socketModule.js";
 import { pkgVersion } from "./packageVersion.js";
+import { SocketIOClientStatic } from "./socketModule.js";
 
 const protocolVersions = ["^0.4.0", "^0.3.0", "^0.2.0", "^0.1.0"];
 const feature_get_ops = "api_get_ops";
@@ -740,7 +740,12 @@ export class OdspDocumentDeltaConnection extends DocumentDeltaConnection {
 		return !this.disposed && this.socket.connected;
 	}
 
-	protected emitMessages(type: string, messages: IDocumentMessage[][]): void {
+	protected override emitMessages(type: "submitOp", messages: IDocumentMessage[][]): void;
+	protected override emitMessages(
+		type: "submitSignal",
+		messages: string[][] | ISentSignalMessage[],
+	): void;
+	protected override emitMessages(type: string, messages: unknown): void {
 		// Only submit the op/signals if we are connected.
 		if (this.connected) {
 			this.socket.emit(type, this.clientId, messages);
@@ -761,15 +766,13 @@ export class OdspDocumentDeltaConnection extends DocumentDeltaConnection {
 	 * @param content - Content of the signal.
 	 * @param targetClientId - When specified, the signal is only sent to the provided client id.
 	 */
-	public submitSignal(content: IDocumentMessage, targetClientId?: string): void {
+	public submitSignal(content: string, targetClientId?: string): void {
 		const signal: ISentSignalMessage = {
 			content,
 			targetClientId,
 		};
 
-		// back-compat: the typing for this method and emitMessages is incorrect, will be fixed in a future PR
-		// eslint-disable-next-line @typescript-eslint/no-unsafe-argument, @typescript-eslint/no-explicit-any
-		this.emitMessages("submitSignal", [signal] as any);
+		this.emitMessages("submitSignal", [signal]);
 	}
 
 	/**

package/src/odspDocumentService.ts

@@ -3,40 +3,40 @@
  * Licensed under the MIT License.
  */
 
-import {
-	ITelemetryLoggerExt,
-	createChildMonitoringContext,
-	MonitoringContext,
-} from "@fluidframework/telemetry-utils";
 import { TypedEventEmitter } from "@fluid-internal/client-utils";
 import { assert } from "@fluidframework/core-utils";
 import {
 	IDocumentDeltaConnection,
 	IDocumentDeltaStorageService,
 	IDocumentService,
-	IResolvedUrl,
-	IDocumentStorageService,
-	IDocumentServicePolicies,
 	IDocumentServiceEvents,
+	IDocumentServicePolicies,
+	IDocumentStorageService,
+	IResolvedUrl,
 } from "@fluidframework/driver-definitions";
-import { IClient, ISequencedDocumentMessage } from "@fluidframework/protocol-definitions";
 import {
-	IOdspResolvedUrl,
-	TokenFetchOptions,
-	IEntry,
 	HostStoragePolicy,
+	IEntry,
+	IOdspResolvedUrl,
 	InstrumentedStorageTokenFetcher,
+	TokenFetchOptions,
 } from "@fluidframework/odsp-driver-definitions";
+import { IClient, ISequencedDocumentMessage } from "@fluidframework/protocol-definitions";
+import {
+	ITelemetryLoggerExt,
+	MonitoringContext,
+	createChildMonitoringContext,
+} from "@fluidframework/telemetry-utils";
 import { HostStoragePolicyInternal } from "./contracts.js";
+import { EpochTracker } from "./epochTracker.js";
 import { IOdspCache } from "./odspCache.js";
+import type { OdspDelayLoadedDeltaStream } from "./odspDelayLoadedDeltaStream.js";
 import { OdspDeltaStorageService, OdspDeltaStorageWithCache } from "./odspDeltaStorageService.js";
 import { OdspDocumentStorageService } from "./odspDocumentStorageManager.js";
-import { getOdspResolvedUrl } from "./odspUtils.js";
 import { isOdcOrigin } from "./odspUrlHelper.js";
-import { EpochTracker } from "./epochTracker.js";
+import { getOdspResolvedUrl } from "./odspUtils.js";
 import { OpsCache } from "./opsCaching.js";
 import { RetryErrorsStorageAdapter } from "./retryErrorsStorageAdapter.js";
-import type { OdspDelayLoadedDeltaStream } from "./odspDelayLoadedDeltaStream.js";
 
 /**
  * The DocumentService manages the Socket.IO connection and manages routing requests to connected

package/src/odspDocumentServiceFactory.ts

@@ -5,14 +5,14 @@
 
 import { IDocumentServiceFactory } from "@fluidframework/driver-definitions";
 import {
+	HostStoragePolicy,
+	IPersistedCache,
 	OdspResourceTokenFetchOptions,
 	TokenFetcher,
-	IPersistedCache,
-	HostStoragePolicy,
 } from "@fluidframework/odsp-driver-definitions";
-import { OdspDocumentServiceFactoryCore } from "./odspDocumentServiceFactoryCore.js";
 // eslint-disable-next-line import/no-internal-modules
 import { LocalOdspDocumentServiceFactory } from "./localOdspDriver/localOdspDocumentServiceFactory.js";
+import { OdspDocumentServiceFactoryCore } from "./odspDocumentServiceFactoryCore.js";
 
 /**
  * Factory for creating the sharepoint document service. Use this if you want to

package/src/odspDocumentServiceFactoryCore.ts

@@ -10,43 +10,43 @@ import {
 	IDocumentServiceFactory,
 	IResolvedUrl,
 } from "@fluidframework/driver-definitions";
-import { ISummaryTree } from "@fluidframework/protocol-definitions";
-import { PerformanceEvent, createChildLogger } from "@fluidframework/telemetry-utils";
 import {
 	getDocAttributesFromProtocolSummary,
 	isCombinedAppAndProtocolSummary,
 } from "@fluidframework/driver-utils";
 import {
-	TokenFetchOptions,
-	OdspResourceTokenFetchOptions,
-	TokenFetcher,
-	IPersistedCache,
 	HostStoragePolicy,
 	IFileEntry,
 	IOdspUrlParts,
-	SharingLinkScope,
-	SharingLinkRole,
+	IPersistedCache,
+	IRelaySessionAwareDriverFactory,
 	ISharingLinkKind,
 	ISocketStorageDiscovery,
-	IRelaySessionAwareDriverFactory,
+	OdspResourceTokenFetchOptions,
+	SharingLinkRole,
+	SharingLinkScope,
+	TokenFetchOptions,
+	TokenFetcher,
 } from "@fluidframework/odsp-driver-definitions";
+import { ISummaryTree } from "@fluidframework/protocol-definitions";
+import { PerformanceEvent, createChildLogger } from "@fluidframework/telemetry-utils";
 import { v4 as uuid } from "uuid";
+import { ICacheAndTracker, createOdspCacheAndTracker } from "./epochTracker.js";
 import {
 	INonPersistentCache,
 	IPrefetchSnapshotContents,
 	LocalPersistentCache,
 	NonPersistentCache,
 } from "./odspCache.js";
-import { createOdspCacheAndTracker, ICacheAndTracker } from "./epochTracker.js";
 import { OdspDocumentService } from "./odspDocumentService.js";
 import {
+	IExistingFileInfo,
 	INewFileInfo,
-	getOdspResolvedUrl,
 	createOdspLogger,
-	toInstrumentedOdspTokenFetcher,
-	IExistingFileInfo,
-	isNewFileInfo,
 	getJoinSessionCacheKey,
+	getOdspResolvedUrl,
+	isNewFileInfo,
+	toInstrumentedOdspTokenFetcher,
 } from "./odspUtils.js";
 
 /**

package/src/odspDocumentServiceFactoryWithCodeSplit.ts

@@ -5,10 +5,10 @@
 
 import { IDocumentServiceFactory } from "@fluidframework/driver-definitions";
 import {
+	HostStoragePolicy,
+	IPersistedCache,
 	OdspResourceTokenFetchOptions,
 	TokenFetcher,
-	IPersistedCache,
-	HostStoragePolicy,
 } from "@fluidframework/odsp-driver-definitions";
 import { OdspDocumentServiceFactoryCore } from "./odspDocumentServiceFactoryCore.js";
 

package/src/odspDocumentStorageManager.ts

@@ -3,64 +3,64 @@
  * Licensed under the MIT License.
  */
 
-import {
-	generateStack,
-	ITelemetryLoggerExt,
-	loggerToMonitoringContext,
-	normalizeError,
-	overwriteStack,
-	PerformanceEvent,
-} from "@fluidframework/telemetry-utils";
 import { performance } from "@fluid-internal/client-utils";
-import { assert, delay } from "@fluidframework/core-utils";
 import { LogLevel } from "@fluidframework/core-interfaces";
-import * as api from "@fluidframework/protocol-definitions";
+import { assert, delay } from "@fluidframework/core-utils";
 import { promiseRaceWithWinner } from "@fluidframework/driver-base";
 import {
-	ISummaryContext,
 	FetchSource,
 	ISnapshot,
 	ISnapshotFetchOptions,
+	ISummaryContext,
 } from "@fluidframework/driver-definitions";
-import { RateLimiter, NonRetryableError } from "@fluidframework/driver-utils";
+import { NonRetryableError, RateLimiter } from "@fluidframework/driver-utils";
 import {
 	IOdspResolvedUrl,
 	ISnapshotOptions,
-	OdspErrorTypes,
 	InstrumentedStorageTokenFetcher,
+	OdspErrorTypes,
 	getKeyForCacheEntry,
 } from "@fluidframework/odsp-driver-definitions";
+import * as api from "@fluidframework/protocol-definitions";
+import {
+	ITelemetryLoggerExt,
+	PerformanceEvent,
+	generateStack,
+	loggerToMonitoringContext,
+	normalizeError,
+	overwriteStack,
+} from "@fluidframework/telemetry-utils";
 import {
-	IDocumentStorageGetVersionsResponse,
 	HostStoragePolicyInternal,
-	IVersionedValueWithEpoch,
+	IDocumentStorageGetVersionsResponse,
 	// eslint-disable-next-line import/no-deprecated
 	ISnapshotCachedEntry,
 	ISnapshotCachedEntry2,
+	IVersionedValueWithEpoch,
 } from "./contracts.js";
+import { EpochTracker } from "./epochTracker.js";
 import {
+	ISnapshotRequestAndResponseOptions,
+	SnapshotFormatSupportType,
 	downloadSnapshot,
 	evalBlobsAndTrees,
 	fetchSnapshot,
 	fetchSnapshotWithRedeem,
-	ISnapshotRequestAndResponseOptions,
-	SnapshotFormatSupportType,
 } from "./fetchSnapshot.js";
 import { getUrlAndHeadersWithAuth } from "./getUrlAndHeadersWithAuth.js";
 import { IOdspCache, IPrefetchSnapshotContents } from "./odspCache.js";
+import { FlushResult } from "./odspDocumentDeltaConnection.js";
+import { OdspDocumentStorageServiceBase } from "./odspDocumentStorageServiceBase.js";
+import type { OdspSummaryUploadManager } from "./odspSummaryUploadManager.js";
 import {
+	IOdspResponse,
 	createCacheSnapshotKey,
 	getWithRetryForTokenRefresh,
-	IOdspResponse,
 	isInstanceOfISnapshot,
 	isSnapshotFetchForLoadingGroup,
 	useLegacyFlowWithoutGroupsForSnapshotFetch,
 } from "./odspUtils.js";
-import { EpochTracker } from "./epochTracker.js";
-import type { OdspSummaryUploadManager } from "./odspSummaryUploadManager.js";
-import { FlushResult } from "./odspDocumentDeltaConnection.js";
 import { pkgVersion as driverVersion } from "./packageVersion.js";
-import { OdspDocumentStorageServiceBase } from "./odspDocumentStorageServiceBase.js";
 
 export const defaultSummarizerCacheExpiryTimeout: number = 60 * 1000; // 60 seconds.
 

package/src/odspDocumentStorageServiceBase.ts

@@ -5,14 +5,14 @@
 
 import { assert } from "@fluidframework/core-utils";
 import {
+	FetchSource,
+	FiveDaysMs,
 	IDocumentStorageService,
 	IDocumentStorageServicePolicies,
-	ISummaryContext,
-	LoaderCachingPolicy,
-	FiveDaysMs,
-	FetchSource,
 	ISnapshot,
 	ISnapshotFetchOptions,
+	ISummaryContext,
+	LoaderCachingPolicy,
 } from "@fluidframework/driver-definitions";
 import { maximumCacheDurationMs } from "@fluidframework/odsp-driver-definitions";
 import * as api from "@fluidframework/protocol-definitions";

package/src/odspDriverUrlResolver.ts

@@ -3,21 +3,21 @@
  * Licensed under the MIT License.
  */
 
-import { assert } from "@fluidframework/core-utils";
 import { IRequest } from "@fluidframework/core-interfaces";
+import { assert } from "@fluidframework/core-utils";
 import {
 	DriverHeader,
 	IContainerPackageInfo,
 	IResolvedUrl,
 	IUrlResolver,
 } from "@fluidframework/driver-definitions";
-import { IOdspResolvedUrl, OdspErrorTypes } from "@fluidframework/odsp-driver-definitions";
 import { NonRetryableError } from "@fluidframework/driver-utils";
+import { IOdspResolvedUrl, OdspErrorTypes } from "@fluidframework/odsp-driver-definitions";
+import { ClpCompliantAppHeader } from "./contractsPublic.js";
 import { createOdspUrl } from "./createOdspUrl.js";
+import { getHashedDocumentId } from "./odspPublicUtils.js";
 import { getApiRoot } from "./odspUrlHelper.js";
 import { getOdspResolvedUrl } from "./odspUtils.js";
-import { getHashedDocumentId } from "./odspPublicUtils.js";
-import { ClpCompliantAppHeader } from "./contractsPublic.js";
 import { pkgVersion } from "./packageVersion.js";
 
 function getUrlBase(

package/src/odspDriverUrlResolverForShareLink.ts

@@ -3,30 +3,30 @@
  * Licensed under the MIT License.
  */
 
+import { IRequest, ITelemetryBaseLogger } from "@fluidframework/core-interfaces";
 import { PromiseCache } from "@fluidframework/core-utils";
-import { ITelemetryBaseLogger, IRequest } from "@fluidframework/core-interfaces";
 import {
 	IContainerPackageInfo,
 	IResolvedUrl,
 	IUrlResolver,
 } from "@fluidframework/driver-definitions";
-import { ITelemetryLoggerExt } from "@fluidframework/telemetry-utils";
 import {
 	IOdspResolvedUrl,
 	IdentityType,
 	OdspResourceTokenFetchOptions,
 	TokenFetcher,
 } from "@fluidframework/odsp-driver-definitions";
+import { ITelemetryLoggerExt } from "@fluidframework/telemetry-utils";
+import { OdspFluidDataStoreLocator, SharingLinkHeader } from "./contractsPublic.js";
+import { createOdspUrl } from "./createOdspUrl.js";
+import { getFileLink } from "./getFileLink.js";
+import { OdspDriverUrlResolver } from "./odspDriverUrlResolver.js";
 import {
 	getLocatorFromOdspUrl,
-	storeLocatorInOdspUrl,
 	locatorQueryParamName,
+	storeLocatorInOdspUrl,
 } from "./odspFluidFileLink.js";
-import { OdspFluidDataStoreLocator, SharingLinkHeader } from "./contractsPublic.js";
-import { createOdspUrl } from "./createOdspUrl.js";
-import { OdspDriverUrlResolver } from "./odspDriverUrlResolver.js";
-import { getOdspResolvedUrl, createOdspLogger } from "./odspUtils.js";
-import { getFileLink } from "./getFileLink.js";
+import { createOdspLogger, getOdspResolvedUrl } from "./odspUtils.js";
 
 /**
  * Properties passed to the code responsible for fetching share link for a file.

package/src/odspError.ts

@@ -3,10 +3,10 @@
  * Licensed under the MIT License.
  */
 
-import { createOdspNetworkError } from "@fluidframework/odsp-doclib-utils/internal";
 import { NonRetryableError } from "@fluidframework/driver-utils";
+import { createOdspNetworkError } from "@fluidframework/odsp-doclib-utils/internal";
 import { OdspError, OdspErrorTypes } from "@fluidframework/odsp-driver-definitions";
-import { getCircularReplacer, IFluidErrorBase } from "@fluidframework/telemetry-utils";
+import { IFluidErrorBase, getCircularReplacer } from "@fluidframework/telemetry-utils";
 import { IOdspSocketError } from "./contracts.js";
 import { pkgVersion as driverVersion } from "./packageVersion.js";
 

package/src/odspFluidFileLink.ts

@@ -4,8 +4,8 @@
  */
 
 import { fromBase64ToUtf8, fromUtf8ToBase64 } from "@fluid-internal/client-utils";
+import { OdcApiSiteOrigin, OdcFileSiteOrigin } from "./constants.js";
 import { OdspFluidDataStoreLocator } from "./contractsPublic.js";
-import { OdcFileSiteOrigin, OdcApiSiteOrigin } from "./constants.js";
 
 const fluidSignature = "1";
 const fluidSignatureParamName = "fluid";

package/src/odspPublicUtils.ts

@@ -3,7 +3,7 @@
  * Licensed under the MIT License.
  */
 
-import { hashFile, IsoBuffer } from "@fluid-internal/client-utils";
+import { IsoBuffer, hashFile } from "@fluid-internal/client-utils";
 import { ISequencedDocumentMessage, ISnapshotTree } from "@fluidframework/protocol-definitions";
 
 /**

package/src/odspSnapshotParser.ts

@@ -5,8 +5,8 @@
 
 import { stringToBuffer } from "@fluid-internal/client-utils";
 import { assert } from "@fluidframework/core-utils";
-import * as api from "@fluidframework/protocol-definitions";
 import { ISnapshot } from "@fluidframework/driver-definitions";
+import * as api from "@fluidframework/protocol-definitions";
 import { IOdspSnapshot, IOdspSnapshotCommit } from "./contracts.js";
 
 /**