@fluidframework/odsp-driver 2.50.0 → 2.51.0

package/src/odspDocumentStorageServiceBase.ts

@@ -4,23 +4,23 @@
  */
 
 import { assert } from "@fluidframework/core-utils/internal";
-import { ISummaryHandle, ISummaryTree } from "@fluidframework/driver-definitions";
+import type { ISummaryHandle, ISummaryTree } from "@fluidframework/driver-definitions";
 import {
-	FetchSource,
-	FiveDaysMs,
-	IDocumentStorageService,
-	IDocumentStorageServicePolicies,
-	ISnapshot,
-	ISnapshotFetchOptions,
-	ISummaryContext,
+	type FetchSource,
+	type FiveDaysMs,
+	type IDocumentStorageService,
+	type IDocumentStorageServicePolicies,
+	type ISnapshot,
+	type ISnapshotFetchOptions,
+	type ISummaryContext,
 	LoaderCachingPolicy,
-	ISnapshotTree,
-	ICreateBlobResponse,
-	IVersion,
-	ISequencedDocumentMessage,
+	type ISnapshotTree,
+	type ICreateBlobResponse,
+	type IVersion,
+	type ISequencedDocumentMessage,
 } from "@fluidframework/driver-definitions/internal";
 import { maximumCacheDurationMs } from "@fluidframework/odsp-driver-definitions/internal";
-import { IConfigProvider } from "@fluidframework/telemetry-utils/internal";
+import type { IConfigProvider } from "@fluidframework/telemetry-utils/internal";
 
 class BlobCache {
 	// Save the timeout so we can cancel and reschedule it as needed

package/src/odspDriverUrlResolver.ts

@@ -3,21 +3,21 @@
  * Licensed under the MIT License.
  */
 
-import { IRequest } from "@fluidframework/core-interfaces";
+import type { IRequest } from "@fluidframework/core-interfaces";
 import { assert } from "@fluidframework/core-utils/internal";
 import {
 	DriverHeader,
-	IContainerPackageInfo,
-	IResolvedUrl,
-	IUrlResolver,
+	type IContainerPackageInfo,
+	type IResolvedUrl,
+	type IUrlResolver,
 } from "@fluidframework/driver-definitions/internal";
 import { NonRetryableError } from "@fluidframework/driver-utils/internal";
 import {
-	IOdspResolvedUrl,
+	type IOdspResolvedUrl,
 	OdspErrorTypes,
 } from "@fluidframework/odsp-driver-definitions/internal";
 
-import { ClpCompliantAppHeader } from "./contractsPublic.js";
+import { ClpCompliantAppHeader, FileMetadataHeader } from "./contractsPublic.js";
 import { createOdspUrl } from "./createOdspUrl.js";
 import { getHashedDocumentId } from "./odspPublicUtils.js";
 import { getApiRoot } from "./odspUrlHelper.js";
@@ -180,6 +180,9 @@ export class OdspDriverUrlResolver implements IUrlResolver {
 			},
 			fileVersion,
 			isClpCompliantApp: request.headers?.[ClpCompliantAppHeader.isClpCompliantApp],
+			fileMetadata: {
+				eTag: request.headers?.[FileMetadataHeader.eTag],
+			},
 		};
 	}
 

package/src/odspDriverUrlResolverForShareLink.ts

@@ -3,22 +3,22 @@
  * Licensed under the MIT License.
  */
 
-import { IRequest, ITelemetryBaseLogger } from "@fluidframework/core-interfaces";
+import type { IRequest, ITelemetryBaseLogger } from "@fluidframework/core-interfaces";
 import { PromiseCache } from "@fluidframework/core-utils/internal";
-import {
+import type {
 	IContainerPackageInfo,
 	IResolvedUrl,
 	IUrlResolver,
 } from "@fluidframework/driver-definitions/internal";
-import {
+import type {
 	IOdspResolvedUrl,
 	IdentityType,
 	OdspResourceTokenFetchOptions,
 	TokenFetcher,
 } from "@fluidframework/odsp-driver-definitions/internal";
-import { ITelemetryLoggerExt } from "@fluidframework/telemetry-utils/internal";
+import type { ITelemetryLoggerExt } from "@fluidframework/telemetry-utils/internal";
 
-import { OdspFluidDataStoreLocator, SharingLinkHeader } from "./contractsPublic.js";
+import { type OdspFluidDataStoreLocator, SharingLinkHeader } from "./contractsPublic.js";
 import { createOdspUrl } from "./createOdspUrl.js";
 import { getFileLink } from "./getFileLink.js";
 import { OdspDriverUrlResolver } from "./odspDriverUrlResolver.js";

package/src/odspError.ts

@@ -5,13 +5,16 @@
 
 import { NonRetryableError } from "@fluidframework/driver-utils/internal";
 import { createOdspNetworkError } from "@fluidframework/odsp-doclib-utils/internal";
-import { OdspError, OdspErrorTypes } from "@fluidframework/odsp-driver-definitions/internal";
 import {
-	IFluidErrorBase,
+	type OdspError,
+	OdspErrorTypes,
+} from "@fluidframework/odsp-driver-definitions/internal";
+import {
+	type IFluidErrorBase,
 	getCircularReplacer,
 } from "@fluidframework/telemetry-utils/internal";
 
-import { IOdspSocketError } from "./contracts.js";
+import type { IOdspSocketError } from "./contracts.js";
 import { pkgVersion as driverVersion } from "./packageVersion.js";
 
 /**

package/src/odspFluidFileLink.ts

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

package/src/odspLayerCompatState.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/odspLocationRedirection.ts

@@ -3,8 +3,8 @@
  * Licensed under the MIT License.
  */
 
-import { IResolvedUrl } from "@fluidframework/driver-definitions/internal";
-import { IOdspResolvedUrl } from "@fluidframework/odsp-driver-definitions/internal";
+import type { IResolvedUrl } from "@fluidframework/driver-definitions/internal";
+import type { IOdspResolvedUrl } from "@fluidframework/odsp-driver-definitions/internal";
 
 import { getOdspResolvedUrl } from "./odspUtils.js";
 

package/src/odspPublicUtils.ts

@@ -4,7 +4,7 @@
  */
 
 import { IsoBuffer, hashFile } from "@fluid-internal/client-utils";
-import {
+import type {
 	ISnapshotTree,
 	ISequencedDocumentMessage,
 } from "@fluidframework/driver-definitions/internal";

package/src/odspSnapshotParser.ts

@@ -5,9 +5,9 @@
 
 import { stringToBuffer } from "@fluid-internal/client-utils";
 import { assert } from "@fluidframework/core-utils/internal";
-import { ISnapshot, ISnapshotTree } from "@fluidframework/driver-definitions/internal";
+import type { ISnapshot, ISnapshotTree } from "@fluidframework/driver-definitions/internal";
 
-import { IOdspSnapshot, IOdspSnapshotCommit } from "./contracts.js";
+import type { IOdspSnapshot, IOdspSnapshotCommit } from "./contracts.js";
 
 /**
  * Build a tree hierarchy base on a flat tree

package/src/odspSummaryUploadManager.ts

@@ -5,21 +5,25 @@
 
 import { Uint8ArrayToString } from "@fluid-internal/client-utils";
 import { assert, unreachableCase } from "@fluidframework/core-utils/internal";
-import { ISummaryTree, SummaryType, SummaryObject } from "@fluidframework/driver-definitions";
-import { ISummaryContext } from "@fluidframework/driver-definitions/internal";
+import {
+	type ISummaryTree,
+	SummaryType,
+	type SummaryObject,
+} from "@fluidframework/driver-definitions";
+import type { ISummaryContext } from "@fluidframework/driver-definitions/internal";
 import {
 	getGitType,
 	isCombinedAppAndProtocolSummary,
 } from "@fluidframework/driver-utils/internal";
-import { InstrumentedStorageTokenFetcher } from "@fluidframework/odsp-driver-definitions/internal";
+import type { InstrumentedStorageTokenFetcher } from "@fluidframework/odsp-driver-definitions/internal";
 import {
-	ITelemetryLoggerExt,
-	MonitoringContext,
+	type ITelemetryLoggerExt,
+	type MonitoringContext,
 	PerformanceEvent,
 	loggerToMonitoringContext,
 } from "@fluidframework/telemetry-utils/internal";
 
-import {
+import type {
 	IOdspSummaryPayload,
 	IOdspSummaryTree,
 	IOdspSummaryTreeBaseEntry,
@@ -27,7 +31,7 @@ import {
 	OdspSummaryTreeEntry,
 	OdspSummaryTreeValue,
 } from "./contracts.js";
-import { EpochTracker } from "./epochTracker.js";
+import type { EpochTracker } from "./epochTracker.js";
 import { getHeadersWithAuth } from "./getUrlAndHeadersWithAuth.js";
 import { getWithRetryForTokenRefresh } from "./odspUtils.js";
 

package/src/odspUrlHelper.ts

@@ -3,7 +3,7 @@
  * Licensed under the MIT License.
  */
 
-import { IOdspUrlParts } from "@fluidframework/odsp-driver-definitions/internal";
+import type { IOdspUrlParts } from "@fluidframework/odsp-driver-definitions/internal";
 
 // Centralized store for all ODC/SPO logic
 

package/src/odspUtils.ts

@@ -4,12 +4,12 @@
  */
 
 import { performanceNow } from "@fluid-internal/client-utils";
-import {
+import type {
 	ITelemetryBaseLogger,
 	ITelemetryBaseProperties,
 } from "@fluidframework/core-interfaces";
 import { assert } from "@fluidframework/core-utils/internal";
-import {
+import type {
 	IResolvedUrl,
 	ISnapshot,
 	IContainerPackageInfo,
@@ -28,17 +28,17 @@ import {
 	throwOdspNetworkError,
 } from "@fluidframework/odsp-doclib-utils/internal";
 import {
-	ICacheEntry,
-	IOdspResolvedUrl,
-	IOdspUrlParts,
-	ISharingLinkKind,
-	InstrumentedStorageTokenFetcher,
-	InstrumentedTokenFetcher,
+	type ICacheEntry,
+	type IOdspResolvedUrl,
+	type IOdspUrlParts,
+	type ISharingLinkKind,
+	type InstrumentedStorageTokenFetcher,
+	type InstrumentedTokenFetcher,
 	OdspErrorTypes,
 	authHeaderFromTokenResponse,
-	OdspResourceTokenFetchOptions,
-	TokenFetchOptions,
-	TokenFetcher,
+	type OdspResourceTokenFetchOptions,
+	type TokenFetchOptions,
+	type TokenFetcher,
 	isTokenFromCache,
 	snapshotKey,
 	tokenFromResponse,
@@ -47,7 +47,7 @@ import {
 import {
 	type IConfigProvider,
 	type IFluidErrorBase,
-	ITelemetryLoggerExt,
+	type ITelemetryLoggerExt,
 	PerformanceEvent,
 	TelemetryDataTag,
 	createChildLogger,
@@ -56,7 +56,7 @@ import {
 
 import { storeLocatorInOdspUrl } from "./odspFluidFileLink.js";
 // eslint-disable-next-line import/no-deprecated
-import { ISnapshotContents } from "./odspPublicUtils.js";
+import type { ISnapshotContents } from "./odspPublicUtils.js";
 import { pkgVersion as driverVersion } from "./packageVersion.js";
 
 export const getWithRetryForTokenRefreshRepeat = "getWithRetryForTokenRefreshRepeat";

package/src/opsCaching.ts

@@ -4,7 +4,7 @@
  */
 
 import { performanceNow } from "@fluid-internal/client-utils";
-import { ITelemetryLoggerExt } from "@fluidframework/telemetry-utils/internal";
+import type { ITelemetryLoggerExt } from "@fluidframework/telemetry-utils/internal";
 
 // ISequencedDocumentMessage
 export interface IMessage {

package/src/packageVersion.ts

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

package/src/prefetchLatestSnapshot.ts

@@ -4,16 +4,16 @@
  */
 
 import { performanceNow } from "@fluid-internal/client-utils";
-import { ITelemetryBaseLogger } from "@fluidframework/core-interfaces";
+import type { ITelemetryBaseLogger } from "@fluidframework/core-interfaces";
 import { assert, Deferred } from "@fluidframework/core-utils/internal";
-import { IResolvedUrl } from "@fluidframework/driver-definitions/internal";
+import type { IResolvedUrl } from "@fluidframework/driver-definitions/internal";
 import {
-	IOdspResolvedUrl,
-	IOdspUrlParts,
-	IPersistedCache,
-	ISnapshotOptions,
-	OdspResourceTokenFetchOptions,
-	TokenFetcher,
+	type IOdspResolvedUrl,
+	type IOdspUrlParts,
+	type IPersistedCache,
+	type ISnapshotOptions,
+	type OdspResourceTokenFetchOptions,
+	type TokenFetcher,
 	getKeyForCacheEntry,
 	type InstrumentedStorageTokenFetcher,
 } from "@fluidframework/odsp-driver-definitions/internal";
@@ -22,15 +22,15 @@ import {
 	createChildMonitoringContext,
 } from "@fluidframework/telemetry-utils/internal";
 
-import { IVersionedValueWithEpoch } from "./contracts.js";
+import type { IVersionedValueWithEpoch } from "./contracts.js";
 import {
-	ISnapshotRequestAndResponseOptions,
-	SnapshotFormatSupportType,
+	type ISnapshotRequestAndResponseOptions,
+	type SnapshotFormatSupportType,
 	downloadSnapshot,
 	fetchSnapshotWithRedeem,
 } from "./fetchSnapshot.js";
-import { IPrefetchSnapshotContents } from "./odspCache.js";
-import { OdspDocumentServiceFactory } from "./odspDocumentServiceFactory.js";
+import type { IPrefetchSnapshotContents } from "./odspCache.js";
+import type { OdspDocumentServiceFactory } from "./odspDocumentServiceFactory.js";
 import {
 	createCacheSnapshotKey,
 	createOdspLogger,

package/src/retryErrorsStorageAdapter.ts

@@ -3,9 +3,9 @@
  * Licensed under the MIT License.
  */
 
-import { IDisposable } from "@fluidframework/core-interfaces";
-import { ISummaryHandle, ISummaryTree } from "@fluidframework/driver-definitions";
-import {
+import type { IDisposable } from "@fluidframework/core-interfaces";
+import type { ISummaryHandle, ISummaryTree } from "@fluidframework/driver-definitions";
+import type {
 	FetchSource,
 	IDocumentStorageService,
 	IDocumentStorageServicePolicies,
@@ -17,7 +17,7 @@ import {
 	IVersion,
 } from "@fluidframework/driver-definitions/internal";
 import {
-	ITelemetryLoggerExt,
+	type ITelemetryLoggerExt,
 	LoggingError,
 	UsageError,
 } from "@fluidframework/telemetry-utils/internal";

package/src/retryUtils.ts

@@ -10,7 +10,7 @@ import {
 	getRetryDelayFromError,
 } from "@fluidframework/driver-utils/internal";
 import { OdspErrorTypes } from "@fluidframework/odsp-driver-definitions/internal";
-import { ITelemetryLoggerExt } from "@fluidframework/telemetry-utils/internal";
+import type { ITelemetryLoggerExt } from "@fluidframework/telemetry-utils/internal";
 
 import { Odsp409Error } from "./epochTracker.js";
 

package/src/vroom.ts

@@ -3,22 +3,22 @@
  * Licensed under the MIT License.
  */
 
-import { ITelemetryBaseProperties } from "@fluidframework/core-interfaces";
-import {
+import type { ITelemetryBaseProperties } from "@fluidframework/core-interfaces";
+import type {
 	IOdspUrlParts,
 	ISocketStorageDiscovery,
 	InstrumentedStorageTokenFetcher,
 } from "@fluidframework/odsp-driver-definitions/internal";
 import {
-	ITelemetryLoggerExt,
+	type ITelemetryLoggerExt,
 	PerformanceEvent,
 } from "@fluidframework/telemetry-utils/internal";
 import { v4 as uuid } from "uuid";
 
-import { EpochTracker } from "./epochTracker.js";
+import type { EpochTracker } from "./epochTracker.js";
 import { mockify } from "./mockify.js";
 import { getApiRoot } from "./odspUrlHelper.js";
-import { TokenFetchOptionsEx } from "./odspUtils.js";
+import type { TokenFetchOptionsEx } from "./odspUtils.js";
 import { runWithRetry } from "./retryUtils.js";
 
 interface IJoinSessionBody {

package/src/zipItDataRepresentationUtils.ts

@@ -12,9 +12,9 @@ import { Uint8ArrayToArrayBuffer, Uint8ArrayToString } from "@fluid-internal/cli
 import { assert } from "@fluidframework/core-utils/internal";
 import { NonRetryableError } from "@fluidframework/driver-utils/internal";
 import { OdspErrorTypes } from "@fluidframework/odsp-driver-definitions/internal";
-import { ITelemetryLoggerExt } from "@fluidframework/telemetry-utils/internal";
+import type { ITelemetryLoggerExt } from "@fluidframework/telemetry-utils/internal";
 
-import { ReadBuffer } from "./ReadBufferUtils.js";
+import type { ReadBuffer } from "./ReadBufferUtils.js";
 import { measure } from "./odspUtils.js";
 import { pkgVersion as driverVersion } from "./packageVersion.js";