@fluidframework/odsp-driver 2.50.0 → 2.51.0-347100

package/src/fetchSnapshot.ts

@@ -42,6 +42,7 @@ import {
 	IVersionedValueWithEpoch,
 	persistedCacheValueVersion,
 } from "./contracts.js";
+import { ClpCompliantAppHeader } from "./contractsPublic.js";
 import { EpochTracker } from "./epochTracker.js";
 import { getQueryString } from "./getQueryString.js";
 import { getHeadersWithAuth } from "./getUrlAndHeadersWithAuth.js";
@@ -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/odspDelayLoadedDeltaStream.ts

@@ -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/odspDocumentServiceFactoryCore.ts

@@ -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/odspDriverUrlResolver.ts

@@ -17,7 +17,7 @@ import {
 	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/packageVersion.ts

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