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

package/src/contracts.ts

@@ -6,7 +6,8 @@
 import * as api from "@fluidframework/protocol-definitions";
 import { HostStoragePolicy } from "@fluidframework/odsp-driver-definitions";
 import { ISnapshot } from "@fluidframework/driver-definitions";
-import { ISnapshotContents } from "./odspPublicUtils";
+// eslint-disable-next-line import/no-deprecated
+import { ISnapshotContents } from "./odspPublicUtils.js";
 
 /**
  * Interface for error responses for the WebSocket connection
@@ -34,7 +35,7 @@ export interface IOdspSocketError {
 	 * Any error supplied by the socket containing codes and inner errors with further
 	 * details about the error.
 	 */
-	error?: any;
+	error?: unknown;
 }
 
 /**
@@ -86,6 +87,7 @@ export interface IOdspSummaryTreeValueEntry extends IOdspSummaryTreeBaseEntry {
 	value: OdspSummaryTreeValue;
 	// Indicates that this tree entry is unreferenced. If this is not present, the tree entry is considered referenced.
 	unreferenced?: true;
+	groupId?: string;
 }
 
 export interface IOdspSummaryTreeHandleEntry extends IOdspSummaryTreeBaseEntry {
@@ -116,6 +118,7 @@ export interface IOdspSnapshotTreeEntryTree {
 	type: "tree";
 	// Indicates that this tree entry is unreferenced. If this is not present, the tree entry is considered referenced.
 	unreferenced?: true;
+	groupId?: string;
 }
 
 export interface IOdspSnapshotTreeEntryCommit {
@@ -178,12 +181,16 @@ export interface ICreateFileResponse {
 	"itemUrl": string;
 	"sequenceNumber": number;
 	// sharing object contains shareId, sharingLink data or error in the response
+	// TODO: use a stronger type
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
 	"sharing"?: any;
 	"sharingLink"?: string;
 	"sharingLinkErrorReason"?: string;
 }
 
 export interface IVersionedValueWithEpoch {
+	// TODO: use a stronger type
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
 	value: any;
 	fluidEpoch: string;
 	// This is same as "persistedCacheValueVersion" below. This represents the version of data stored in cache.
@@ -195,7 +202,9 @@ export const persistedCacheValueVersion = 3;
 export interface IGetOpsResponse {
 	nonce: string;
 	code: number;
-	/** Time in seconds. Currently never set by PUSH */
+	/**
+	 * Time in seconds. Currently never set by PUSH
+	 */
 	retryAfter?: number;
 	messages?: api.ISequencedDocumentMessage[];
 }
@@ -203,7 +212,9 @@ export interface IGetOpsResponse {
 export interface IFlushOpsResponse {
 	nonce: string;
 	code: number;
-	/** Time in seconds */
+	/**
+	 * Time in seconds
+	 */
 	retryAfter?: number;
 	lastPersistedSequenceNumber?: number;
 }
@@ -213,6 +224,7 @@ export interface IFlushOpsResponse {
  * @deprecated - This will be replaced with ISnapshotCachedEntry2 which wraps the new ISnapshot interface.
  * For now, to support back compat from cache, we need to keep it for now.
  */
+// eslint-disable-next-line import/no-deprecated
 export interface ISnapshotCachedEntry extends ISnapshotContents {
 	cacheEntryTime: number;
 }

package/src/createFile.ts

@@ -15,31 +15,31 @@ import {
 	IFileEntry,
 } from "@fluidframework/odsp-driver-definitions";
 import { ISnapshot } from "@fluidframework/driver-definitions";
-import { ICreateFileResponse } from "./contracts";
-import { getUrlAndHeadersWithAuth } from "./getUrlAndHeadersWithAuth";
+import { ICreateFileResponse } from "./contracts.js";
+import { getUrlAndHeadersWithAuth } from "./getUrlAndHeadersWithAuth.js";
 import {
 	buildOdspShareLinkReqParams,
 	createCacheSnapshotKey,
 	getWithRetryForTokenRefresh,
 	INewFileInfo,
 	getOrigin,
-} from "./odspUtils";
-import { createOdspUrl } from "./createOdspUrl";
-import { getApiRoot } from "./odspUrlHelper";
-import { EpochTracker } from "./epochTracker";
-import { OdspDriverUrlResolver } from "./odspDriverUrlResolver";
+} from "./odspUtils.js";
+import { createOdspUrl } from "./createOdspUrl.js";
+import { getApiRoot } from "./odspUrlHelper.js";
+import { EpochTracker } from "./epochTracker.js";
+import { OdspDriverUrlResolver } from "./odspDriverUrlResolver.js";
 import {
 	convertCreateNewSummaryTreeToTreeAndBlobs,
 	convertSummaryIntoContainerSnapshot,
 	createNewFluidContainerCore,
-} from "./createNewUtils";
-import { runWithRetry } from "./retryUtils";
-import { pkgVersion as driverVersion } from "./packageVersion";
-import { ClpCompliantAppHeader } from "./contractsPublic";
+} from "./createNewUtils.js";
+import { runWithRetry } from "./retryUtils.js";
+import { pkgVersion as driverVersion } from "./packageVersion.js";
+import { ClpCompliantAppHeader } from "./contractsPublic.js";
 
 const isInvalidFileName = (fileName: string): boolean => {
 	const invalidCharsRegex = /["*/:<>?\\|]+/g;
-	return !!fileName.match(invalidCharsRegex);
+	return invalidCharsRegex.test(fileName);
 };
 
 /**
@@ -134,10 +134,12 @@ function extractShareLinkData(
 ): ShareLinkInfoType | undefined {
 	let shareLinkInfo: ShareLinkInfoType | undefined;
 	if (enableSingleRequestForShareLinkWithCreate) {
+		// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
 		const { sharing } = response;
 		if (!sharing) {
 			return;
 		}
+		/* eslint-disable @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access */
 		shareLinkInfo = {
 			createLink: {
 				link: sharing.sharingLink
@@ -152,6 +154,7 @@ function extractShareLinkData(
 				shareId: sharing.shareId,
 			},
 		};
+		/* eslint-enable @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access */
 	}
 	return shareLinkInfo;
 }
@@ -209,7 +212,7 @@ export async function createNewEmptyFluidFile(
 					);
 				}
 				event.end({
-					headers: Object.keys(headers).length !== 0 ? true : undefined,
+					headers: Object.keys(headers).length > 0 ? true : undefined,
 					...fetchResponse.propsToLog,
 				});
 				return content.id;

package/src/createNewContainerOnExistingFile.ts

@@ -12,18 +12,18 @@ import {
 	InstrumentedStorageTokenFetcher,
 	IOdspResolvedUrl,
 } from "@fluidframework/odsp-driver-definitions";
-import { IWriteSummaryResponse } from "./contracts";
-import { createCacheSnapshotKey, getOrigin, IExistingFileInfo } from "./odspUtils";
-import { createOdspUrl } from "./createOdspUrl";
-import { getApiRoot } from "./odspUrlHelper";
-import { EpochTracker } from "./epochTracker";
-import { OdspDriverUrlResolver } from "./odspDriverUrlResolver";
+import { IWriteSummaryResponse } from "./contracts.js";
+import { createCacheSnapshotKey, getOrigin, IExistingFileInfo } from "./odspUtils.js";
+import { createOdspUrl } from "./createOdspUrl.js";
+import { getApiRoot } from "./odspUrlHelper.js";
+import { EpochTracker } from "./epochTracker.js";
+import { OdspDriverUrlResolver } from "./odspDriverUrlResolver.js";
 import {
 	convertCreateNewSummaryTreeToTreeAndBlobs,
 	convertSummaryIntoContainerSnapshot,
 	createNewFluidContainerCore,
-} from "./createNewUtils";
-import { ClpCompliantAppHeader } from "./contractsPublic";
+} from "./createNewUtils.js";
+import { ClpCompliantAppHeader } from "./contractsPublic.js";
 
 /**
  * Creates a new Fluid container on an existing file.

package/src/createNewModule.ts

@@ -3,5 +3,5 @@
  * Licensed under the MIT License.
  */
 
-export { createNewFluidFile } from "./createFile";
-export { createNewContainerOnExistingFile } from "./createNewContainerOnExistingFile";
+export { createNewFluidFile } from "./createFile.js";
+export { createNewContainerOnExistingFile } from "./createNewContainerOnExistingFile.js";

package/src/createNewUtils.ts

@@ -9,6 +9,7 @@ import {
 	ISummaryTree,
 	SummaryType,
 	ISnapshotTree,
+	type SummaryObject,
 } from "@fluidframework/protocol-definitions";
 import {
 	getDocAttributesFromProtocolSummary,
@@ -25,11 +26,11 @@ import {
 	IOdspSummaryTree,
 	OdspSummaryTreeEntry,
 	OdspSummaryTreeValue,
-} from "./contracts";
-import { getWithRetryForTokenRefresh, maxUmpPostBodySize } from "./odspUtils";
-import { EpochTracker, FetchType } from "./epochTracker";
-import { getUrlAndHeadersWithAuth } from "./getUrlAndHeadersWithAuth";
-import { runWithRetry } from "./retryUtils";
+} from "./contracts.js";
+import { getWithRetryForTokenRefresh, maxUmpPostBodySize } from "./odspUtils.js";
+import { EpochTracker, FetchType } from "./epochTracker.js";
+import { getUrlAndHeadersWithAuth } from "./getUrlAndHeadersWithAuth.js";
+import { runWithRetry } from "./retryUtils.js";
 
 /**
  * Converts a summary(ISummaryTree) taken in detached container to snapshot tree and blobs
@@ -59,11 +60,12 @@ export function convertCreateNewSummaryTreeToTreeAndBlobs(
 function convertCreateNewSummaryTreeToTreeAndBlobsCore(
 	summary: ISummaryTree,
 	blobs: Map<string, ArrayBuffer>,
-) {
+): ISnapshotTree {
 	const treeNode: ISnapshotTree = {
 		blobs: {},
 		trees: {},
 		unreferenced: summary.unreferenced,
+		groupId: summary.groupId,
 	};
 	const keys = Object.keys(summary.tree);
 	for (const key of keys) {
@@ -92,14 +94,19 @@ function convertCreateNewSummaryTreeToTreeAndBlobsCore(
 				throw new Error(`No ${summaryObject.type} should be present for detached summary!`);
 			}
 			default: {
-				unreachableCase(summaryObject, `Unknown tree type ${(summaryObject as any).type}`);
+				unreachableCase(
+					summaryObject,
+					`Unknown tree type ${(summaryObject as SummaryObject).type}`,
+				);
 			}
 		}
 	}
 	return treeNode;
 }
 
-export function convertSummaryIntoContainerSnapshot(createNewSummary: ISummaryTree) {
+export function convertSummaryIntoContainerSnapshot(
+	createNewSummary: ISummaryTree,
+): IOdspSummaryPayload {
 	if (!isCombinedAppAndProtocolSummary(createNewSummary)) {
 		throw new Error("App and protocol summary required for create new path!!");
 	}
@@ -146,11 +153,13 @@ function convertSummaryToSnapshotTreeForCreateNew(summary: ISummaryTree): IOdspS
 		// property is not present, the tree entry is considered referenced. If the property is present and is true,
 		// the tree entry is considered unreferenced.
 		let unreferenced: true | undefined;
+		let groupId: string | undefined;
 
 		switch (summaryObject.type) {
 			case SummaryType.Tree: {
 				value = convertSummaryToSnapshotTreeForCreateNew(summaryObject);
 				unreferenced = summaryObject.unreferenced;
+				groupId = summaryObject.groupId;
 				break;
 			}
 			case SummaryType.Blob: {
@@ -180,6 +189,7 @@ function convertSummaryToSnapshotTreeForCreateNew(summary: ISummaryTree): IOdspS
 			type: getGitType(summaryObject),
 			value,
 			unreferenced,
+			groupId,
 		};
 		snapshotTree.entries?.push(entry);
 	}
@@ -271,7 +281,7 @@ export async function createNewFluidContainerCore<T>(args: {
 				validateResponseCallback?.(fetchResponse.content);
 
 				event.end({
-					headers: Object.keys(headers).length !== 0 ? true : undefined,
+					headers: Object.keys(headers).length > 0 ? true : undefined,
 					attempts: options.refresh ? 2 : 1,
 					...fetchResponse.propsToLog,
 				});

package/src/createOdspCreateContainerRequest.ts

@@ -2,10 +2,11 @@
  * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
  * Licensed under the MIT License.
  */
+
 import { IRequest } from "@fluidframework/core-interfaces";
 import { DriverHeader } from "@fluidframework/driver-definitions";
 import { ISharingLinkKind } from "@fluidframework/odsp-driver-definitions";
-import { buildOdspShareLinkReqParams } from "./odspUtils";
+import { buildOdspShareLinkReqParams } from "./odspUtils.js";
 
 /**
  * Create the request object with url and headers for creating a new file on OneDrive Sharepoint

package/src/createOdspUrl.ts

@@ -3,7 +3,7 @@
  * Licensed under the MIT License.
  */
 
-import { OdspFluidDataStoreLocator } from "./contractsPublic";
+import { OdspFluidDataStoreLocator } from "./contractsPublic.js";
 
 /*
  * Per https://github.com/microsoft/FluidFramework/issues/1556, isolating createOdspUrl() in its own file.

package/src/epochTracker.ts

@@ -29,6 +29,8 @@ import {
 	IOdspError,
 	IOdspErrorAugmentations,
 	IOdspResolvedUrl,
+	maximumCacheDurationMs,
+	type HostStoragePolicy,
 } from "@fluidframework/odsp-driver-definitions";
 import {
 	fetchAndParseAsJSONHelper,
@@ -36,12 +38,12 @@ import {
 	fetchHelper,
 	getOdspResolvedUrl,
 	IOdspResponse,
-} from "./odspUtils";
-import { IOdspCache, INonPersistentCache, IPersistedFileCache } from "./odspCache";
-import { IVersionedValueWithEpoch, persistedCacheValueVersion } from "./contracts";
-import { ClpCompliantAppHeader } from "./contractsPublic";
-import { pkgVersion as driverVersion } from "./packageVersion";
-import { patchOdspResolvedUrl } from "./odspLocationRedirection";
+} from "./odspUtils.js";
+import { IOdspCache, INonPersistentCache, IPersistedFileCache } from "./odspCache.js";
+import { IVersionedValueWithEpoch, persistedCacheValueVersion } from "./contracts.js";
+import { ClpCompliantAppHeader } from "./contractsPublic.js";
+import { pkgVersion as driverVersion } from "./packageVersion.js";
+import { patchOdspResolvedUrl } from "./odspLocationRedirection.js";
 
 /**
  * @alpha
@@ -66,9 +68,6 @@ export type FetchTypeInternal = FetchType | "cache";
 
 export const Odsp409Error = "Odsp409Error";
 
-// Must be less than policy of 5 days
-export const defaultCacheExpiryTimeoutMs: number = 2 * 24 * 60 * 60 * 1000; // 2 days in ms
-
 /**
  * In ODSP, the concept of "epoch" refers to binary updates to files. For example, this might include using
  * version restore, or if the user downloads a Fluid file and then uploads it again. These result in the epoch
@@ -98,6 +97,7 @@ export class EpochTracker implements IPersistedFileCache {
 		protected readonly fileEntry: IFileEntry,
 		protected readonly logger: ITelemetryLoggerExt,
 		protected readonly clientIsSummarizer?: boolean,
+		protected readonly hostPolicy?: HostStoragePolicy,
 	) {
 		// Limits the max number of concurrent requests to 24.
 		this.rateLimiter = new RateLimiter(24);
@@ -107,11 +107,11 @@ export class EpochTracker implements IPersistedFileCache {
 			"Fluid.Driver.Odsp.TestOverride.DisableSnapshotCache",
 		)
 			? 0
-			: defaultCacheExpiryTimeoutMs;
+			: maximumCacheDurationMs;
 	}
 
 	// public for UT purposes only!
-	public setEpoch(epoch: string, fromCache: boolean, fetchType: FetchTypeInternal) {
+	public setEpoch(epoch: string, fromCache: boolean, fetchType: FetchTypeInternal): void {
 		assert(this._fluidEpoch === undefined, 0x1db /* "epoch exists" */);
 		this._fluidEpoch = epoch;
 
@@ -123,9 +123,12 @@ export class EpochTracker implements IPersistedFileCache {
 		});
 	}
 
+	// TODO: return a stronger type
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
 	public async get(entry: IEntry): Promise<any> {
 		try {
 			// Return undefined so that the ops/snapshots are grabbed from the server instead of the cache
+			// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
 			const value: IVersionedValueWithEpoch = await this.cache.get(
 				this.fileEntryFromEntry(entry),
 			);
@@ -145,6 +148,7 @@ export class EpochTracker implements IPersistedFileCache {
 			// Expire the cached snapshot if it's older than snapshotCacheExpiryTimeoutMs and immediately
 			// expire all old caches that do not have cacheEntryTime
 			if (entry.type === snapshotKey) {
+				// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access
 				const cacheTime = value.value?.cacheEntryTime;
 				const currentTime = Date.now();
 				if (
@@ -168,14 +172,18 @@ export class EpochTracker implements IPersistedFileCache {
 		}
 	}
 
-	public async put(entry: IEntry, value: any) {
+	// TODO: take a stronger type or `unknown`
+	// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types, @typescript-eslint/no-explicit-any
+	public async put(entry: IEntry, value: any): Promise<void> {
 		assert(this._fluidEpoch !== undefined, 0x1dd /* "no epoch" */);
 		// For snapshots, the value should have the cacheEntryTime.
 		// This will be used to expire snapshots older than snapshotCacheExpiryTimeoutMs.
 		if (entry.type === snapshotKey) {
+			// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access
 			value.cacheEntryTime = value.cacheEntryTime ?? Date.now();
 		}
 		const data: IVersionedValueWithEpoch = {
+			// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
 			value,
 			version: persistedCacheValueVersion,
 			fluidEpoch: this._fluidEpoch,
@@ -194,11 +202,11 @@ export class EpochTracker implements IPersistedFileCache {
 		}
 	}
 
-	public get fluidEpoch() {
+	public get fluidEpoch(): string | undefined {
 		return this._fluidEpoch;
 	}
 
-	public async validateEpoch(epoch: string | undefined, fetchType: FetchType) {
+	public async validateEpoch(epoch: string | undefined, fetchType: FetchType): Promise<void> {
 		assert(epoch !== undefined, 0x584 /* response should contain epoch */);
 		try {
 			this.validateEpochFromResponse(epoch, fetchType);
@@ -247,7 +255,7 @@ export class EpochTracker implements IPersistedFileCache {
 		fetchType: FetchType,
 		addInBody: boolean = false,
 		fetchReason?: string,
-	) {
+	): Promise<IOdspResponse<Response>> {
 		return this.fetchCore<Response>(
 			url,
 			fetchOptions,
@@ -260,12 +268,12 @@ export class EpochTracker implements IPersistedFileCache {
 
 	private async fetchCore<T>(
 		url: string,
-		fetchOptions: { [index: string]: any },
-		fetcher: (url: string, fetchOptions: { [index: string]: any }) => Promise<IOdspResponse<T>>,
+		fetchOptions: RequestInit,
+		fetcher: (url: string, fetchOptions: RequestInit) => Promise<IOdspResponse<T>>,
 		fetchType: FetchType,
 		addInBody: boolean = false,
 		fetchReason?: string,
-	) {
+	): Promise<IOdspResponse<T>> {
 		const clientCorrelationId = this.formatClientCorrelationId(fetchReason);
 		// Add epoch in fetch request.
 		this.addEpochInRequest(fetchOptions, addInBody, clientCorrelationId);
@@ -288,29 +296,48 @@ export class EpochTracker implements IPersistedFileCache {
 				throw error;
 			})
 			.catch((error) => {
-				// If the error is about location redirection, then we need to generate new resolved url with correct
-				// location info.
-				if (
-					isFluidError(error) &&
-					error.errorType === OdspErrorTypes.fileNotFoundOrAccessDeniedError
-				) {
-					const redirectLocation = (error as IOdspErrorAugmentations).redirectLocation;
-					if (redirectLocation !== undefined) {
-						const redirectUrl: IOdspResolvedUrl = patchOdspResolvedUrl(
-							this.fileEntry.resolvedUrl,
-							redirectLocation,
-						);
-						const locationRedirectionError = new LocationRedirectionError(
+				if (isFluidError(error)) {
+					// If the error is about location redirection, then we need to generate new resolved url with correct
+					// location info.
+					if (error.errorType === OdspErrorTypes.fileNotFoundOrAccessDeniedError) {
+						const redirectLocation = (error as IOdspErrorAugmentations)
+							.redirectLocation;
+						if (redirectLocation !== undefined) {
+							const redirectUrl: IOdspResolvedUrl = patchOdspResolvedUrl(
+								this.fileEntry.resolvedUrl,
+								redirectLocation,
+							);
+							const locationRedirectionError = new LocationRedirectionError(
+								error.message,
+								redirectUrl,
+								{ driverVersion, redirectLocation },
+							);
+							locationRedirectionError.addTelemetryProperties(
+								error.getTelemetryProperties(),
+							);
+							throw locationRedirectionError;
+						}
+					}
+					// If the hostPolicy disallows retries for throttling errors, then we throw a NonRetryableError
+					else if (
+						error.errorType === OdspErrorTypes.throttlingError &&
+						this.hostPolicy?.disableRetriesOnStorageThrottlingError
+					) {
+						const nonRetriableThrottlingError = new NonRetryableError(
 							error.message,
-							redirectUrl,
-							{ driverVersion, redirectLocation },
+							OdspErrorTypes.throttlingError,
+							{
+								driverVersion,
+							},
 						);
-						locationRedirectionError.addTelemetryProperties(
+						// This step ensures all the telemetry props are preserved including the retryAfterSeconds from the original error
+						nonRetriableThrottlingError.addTelemetryProperties(
 							error.getTelemetryProperties(),
 						);
-						throw locationRedirectionError;
+						throw nonRetriableThrottlingError;
 					}
 				}
+
 				throw error;
 			})
 			.catch((error) => {
@@ -331,11 +358,11 @@ export class EpochTracker implements IPersistedFileCache {
 	 */
 	public async fetchArray(
 		url: string,
-		fetchOptions: { [index: string]: any },
+		fetchOptions: { [index: string]: RequestInit },
 		fetchType: FetchType,
 		addInBody: boolean = false,
 		fetchReason?: string,
-	) {
+	): Promise<IOdspResponse<ArrayBuffer>> {
 		return this.fetchCore<ArrayBuffer>(
 			url,
 			fetchOptions,
@@ -350,7 +377,7 @@ export class EpochTracker implements IPersistedFileCache {
 		fetchOptions: RequestInit,
 		addInBody: boolean,
 		clientCorrelationId: string,
-	) {
+	): void {
 		const isClpCompliantApp = getOdspResolvedUrl(this.fileEntry.resolvedUrl).isClpCompliantApp;
 		if (addInBody) {
 			const headers: { [key: string]: string } = {};
@@ -363,7 +390,7 @@ export class EpochTracker implements IPersistedFileCache {
 			}
 			this.addParamInBody(fetchOptions, headers);
 		} else {
-			const addHeader = (key: string, val: string) => {
+			const addHeader = (key: string, val: string): void => {
 				fetchOptions.headers = {
 					...fetchOptions.headers,
 				};
@@ -383,7 +410,7 @@ export class EpochTracker implements IPersistedFileCache {
 		}
 	}
 
-	private addParamInBody(fetchOptions: RequestInit, headers: { [key: string]: string }) {
+	private addParamInBody(fetchOptions: RequestInit, headers: { [key: string]: string }): void {
 		// We use multi part form request for post body where we want to use this.
 		// So extract the form boundary to mark the end of form.
 		const body = fetchOptions.body;
@@ -392,16 +419,16 @@ export class EpochTracker implements IPersistedFileCache {
 		const firstLine = splitBody.shift();
 		assert(firstLine?.startsWith("--") === true, 0x21e /* "improper boundary format" */);
 		const formParams = [firstLine];
-		Object.entries(headers).forEach(([key, value]) => {
+		for (const [key, value] of Object.entries(headers)) {
 			formParams.push(`${key}: ${value}`);
-		});
-		splitBody.forEach((value: string) => {
+		}
+		for (const value of splitBody) {
 			formParams.push(value);
-		});
+		}
 		fetchOptions.body = formParams.join("\r\n");
 	}
 
-	private formatClientCorrelationId(fetchReason?: string) {
+	private formatClientCorrelationId(fetchReason?: string): string {
 		const items: string[] = [
 			`driverId=${this.driverId}`,
 			`RequestNumber=${this.networkCallNumber++}`,
@@ -418,15 +445,13 @@ export class EpochTracker implements IPersistedFileCache {
 		epochFromResponse: string | undefined,
 		fetchType: FetchTypeInternal,
 		fromCache: boolean = false,
-	) {
+	): void {
 		const error = this.checkForEpochErrorCore(epochFromResponse);
 		if (error !== undefined) {
 			throw error;
 		}
-		if (epochFromResponse !== undefined) {
-			if (this._fluidEpoch === undefined) {
-				this.setEpoch(epochFromResponse, fromCache, fetchType);
-			}
+		if (epochFromResponse !== undefined && this._fluidEpoch === undefined) {
+			this.setEpoch(epochFromResponse, fromCache, fetchType);
 		}
 	}
 
@@ -435,7 +460,7 @@ export class EpochTracker implements IPersistedFileCache {
 		epochFromResponse: string | null | undefined,
 		fetchType: FetchTypeInternal,
 		fromCache: boolean = false,
-	) {
+	): Promise<void> {
 		if (isFluidError(error) && error.errorType === OdspErrorTypes.fileOverwrittenInStorage) {
 			const epochError = this.checkForEpochErrorCore(epochFromResponse);
 			if (epochError !== undefined) {
@@ -461,7 +486,9 @@ export class EpochTracker implements IPersistedFileCache {
 		}
 	}
 
-	private checkForEpochErrorCore(epochFromResponse: string | null | undefined) {
+	private checkForEpochErrorCore(
+		epochFromResponse: string | null | undefined,
+	): NonRetryableError<"fileOverwrittenInStorage"> | undefined {
 		// If epoch is undefined, then don't compare it because initially for createNew or TreesLatest
 		// initializes this value. Sometimes response does not contain epoch as it is still in
 		// implementation phase at server side. In that case also, don't compare it with our epoch value.
@@ -489,8 +516,9 @@ export class EpochTrackerWithRedemption extends EpochTracker {
 		protected readonly fileEntry: IFileEntry,
 		protected readonly logger: ITelemetryLoggerExt,
 		protected readonly clientIsSummarizer?: boolean,
+		protected readonly hostPolicy?: HostStoragePolicy,
 	) {
-		super(cache, fileEntry, logger, clientIsSummarizer);
+		super(cache, fileEntry, logger, clientIsSummarizer, hostPolicy);
 		// Handles the rejected promise within treesLatestDeferral.
 		this.treesLatestDeferral.promise.catch(() => {});
 	}
@@ -499,7 +527,7 @@ export class EpochTrackerWithRedemption extends EpochTracker {
 		epochFromResponse: string | undefined,
 		fetchType: FetchType,
 		fromCache: boolean = false,
-	) {
+	): void {
 		super.validateEpochFromResponse(epochFromResponse, fetchType, fromCache);
 
 		// Any successful call means we have access to a file, i.e. any redemption that was required already happened.
@@ -508,6 +536,8 @@ export class EpochTrackerWithRedemption extends EpochTracker {
 		this.treesLatestDeferral.resolve();
 	}
 
+	// TODO: return a stronger type
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
 	public async get(entry: IEntry): Promise<any> {
 		let result = super.get(entry);
 
@@ -533,7 +563,7 @@ export class EpochTrackerWithRedemption extends EpochTracker {
 
 	public async fetchAndParseAsJSON<T>(
 		url: string,
-		fetchOptions: { [index: string]: any },
+		fetchOptions: { [index: string]: RequestInit },
 		fetchType: FetchType,
 		addInBody: boolean = false,
 		fetchReason?: string,
@@ -550,6 +580,7 @@ export class EpochTrackerWithRedemption extends EpochTracker {
 				addInBody,
 				fetchReason,
 			);
+			// eslint-disable-next-line @typescript-eslint/no-explicit-any
 		} catch (error: any) {
 			// Only handling here treesLatest. If createFile failed, we should never try to do joinSession.
 			// Similar, if getVersions failed, we should not do any further storage calls.
@@ -559,7 +590,9 @@ export class EpochTrackerWithRedemption extends EpochTracker {
 			}
 			if (
 				fetchType !== "joinSession" ||
+				// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
 				error.statusCode < 401 ||
+				// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
 				error.statusCode > 404 ||
 				completed
 			) {
@@ -616,12 +649,14 @@ export function createOdspCacheAndTracker(
 	fileEntry: IFileEntry,
 	logger: ITelemetryLoggerExt,
 	clientIsSummarizer?: boolean,
+	hostPolicy?: HostStoragePolicy,
 ): ICacheAndTracker {
 	const epochTracker = new EpochTrackerWithRedemption(
 		persistedCacheArg,
 		fileEntry,
 		logger,
 		clientIsSummarizer,
+		hostPolicy,
 	);
 	return {
 		cache: {