@fluidframework/odsp-driver 2.41.0 → 2.42.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluidframework/odsp-driver",
-  "version": "2.41.0",
+  "version": "2.42.0",
   "description": "Socket storage implementation for SPO and ODC",
   "homepage": "https://fluidframework.com",
   "repository": {
@@ -69,27 +69,27 @@
     "temp-directory": "nyc/.nyc_output"
   },
   "dependencies": {
-    "@fluid-internal/client-utils": "~2.41.0",
-    "@fluidframework/core-interfaces": "~2.41.0",
-    "@fluidframework/core-utils": "~2.41.0",
-    "@fluidframework/driver-base": "~2.41.0",
-    "@fluidframework/driver-definitions": "~2.41.0",
-    "@fluidframework/driver-utils": "~2.41.0",
-    "@fluidframework/odsp-doclib-utils": "~2.41.0",
-    "@fluidframework/odsp-driver-definitions": "~2.41.0",
-    "@fluidframework/telemetry-utils": "~2.41.0",
+    "@fluid-internal/client-utils": "~2.42.0",
+    "@fluidframework/core-interfaces": "~2.42.0",
+    "@fluidframework/core-utils": "~2.42.0",
+    "@fluidframework/driver-base": "~2.42.0",
+    "@fluidframework/driver-definitions": "~2.42.0",
+    "@fluidframework/driver-utils": "~2.42.0",
+    "@fluidframework/odsp-doclib-utils": "~2.42.0",
+    "@fluidframework/odsp-driver-definitions": "~2.42.0",
+    "@fluidframework/telemetry-utils": "~2.42.0",
     "socket.io-client": "~4.7.5",
     "uuid": "^9.0.0"
   },
   "devDependencies": {
     "@arethetypeswrong/cli": "^0.17.1",
     "@biomejs/biome": "~1.9.3",
-    "@fluid-internal/mocha-test-setup": "~2.41.0",
+    "@fluid-internal/mocha-test-setup": "~2.42.0",
     "@fluid-tools/build-cli": "^0.55.0",
     "@fluidframework/build-common": "^2.0.3",
     "@fluidframework/build-tools": "^0.55.0",
     "@fluidframework/eslint-config-fluid": "^5.7.4",
-    "@fluidframework/odsp-driver-previous": "npm:@fluidframework/odsp-driver@2.40.0",
+    "@fluidframework/odsp-driver-previous": "npm:@fluidframework/odsp-driver@2.41.0",
     "@microsoft/api-extractor": "7.52.8",
     "@types/mocha": "^10.0.10",
     "@types/node": "^18.19.0",

package/src/createFile/createFile.ts

@@ -212,7 +212,7 @@ export async function createNewEmptyFluidFile(
 	const encodedFilename = encodeURIComponent(`${newFileInfo.filename}.tmp`);
 	const initialUrl = `${getApiRoot(new URL(newFileInfo.siteUrl))}/drives/${
 		newFileInfo.driveId
-	}/items/root:/${filePath}/${encodedFilename}:/content?@name.conflictBehavior=rename&select=id,name,parentReference`;
+	}/items/root:${filePath}/${encodedFilename}:/content?@name.conflictBehavior=rename&select=id,name,parentReference`;
 
 	return getWithRetryForTokenRefresh(async (options) => {
 		const url = initialUrl;

package/src/fetchSnapshot.ts

@@ -27,7 +27,6 @@ import {
 	ITelemetryLoggerExt,
 	PerformanceEvent,
 	isFluidError,
-	loggerToMonitoringContext,
 	wrapError,
 } from "@fluidframework/telemetry-utils/internal";
 import { v4 as uuid } from "uuid";
@@ -215,7 +214,7 @@ async function redeemSharingLink(
 		{
 			eventName: "RedeemShareLink",
 		},
-		async () => {
+		async (event) => {
 			assert(
 				!!odspResolvedUrl.shareLinkInfo?.sharingLinkToRedeem,
 				0x1ed /* "Share link should be present" */,
@@ -246,34 +245,23 @@ async function redeemSharingLink(
 				});
 			}
 
-			const disableUsingTenantDomain = loggerToMonitoringContext(logger).config.getBoolean(
-				"Fluid.Driver.Odsp.DisableUsingTenantDomainForSharesApi",
-			);
+			const details = JSON.stringify({
+				length: redeemUrl?.length,
+				shareLinkUrlLength: odspResolvedUrl.shareLinkInfo?.sharingLinkToRedeem.length,
+				queryParamsLength: new URL(odspResolvedUrl.shareLinkInfo?.sharingLinkToRedeem).search
+					.length,
+				useHeaders: true,
+			});
 			// There is an issue where if we use the siteUrl in /shares, then the allowed length of url is just a few hundred characters(300-400)
-			// and we fail to do the redeem. But if we use the tenant domain in the url, then the allowed length becomes 2048. So, first
-			// construct the url for /shares using tenant domain but to be on safer side, fallback to using the siteUrl. We get tenant domain
-			// by getting origin of the siteUrl.
-			if (!disableUsingTenantDomain) {
-				try {
-					await callSharesAPI(new URL(odspResolvedUrl.siteUrl).origin);
-					return;
-				} catch (error) {
-					logger.sendTelemetryEvent(
-						{
-							eventName: "ShareLinkRedeemFailedWithTenantDomain",
-							details: JSON.stringify({
-								length: redeemUrl?.length,
-								shareLinkUrlLength: odspResolvedUrl.shareLinkInfo?.sharingLinkToRedeem.length,
-								queryParamsLength: new URL(odspResolvedUrl.shareLinkInfo?.sharingLinkToRedeem)
-									.search.length,
-								useHeaders: true,
-							}),
-						},
-						error,
-					);
-				}
+			// and we fail to do the redeem. But if we use the tenant domain in the url, then the allowed length becomes 2048. So,
+			// construct the url for /shares using tenant domain. We get tenant domain by getting origin of the siteUrl.
+			try {
+				await callSharesAPI(new URL(odspResolvedUrl.siteUrl).origin);
+				event.end({ details });
+			} catch (error) {
+				event.cancel({ details }, error);
+				throw error;
 			}
-			await callSharesAPI(odspResolvedUrl.siteUrl);
 		},
 	);
 }

package/src/odspDocumentStorageManager.ts

@@ -138,6 +138,10 @@ export class OdspDocumentStorageService extends OdspDocumentStorageServiceBase {
 			);
 			const headers = getHeadersWithAuth(authHeader);
 			headers["Content-Type"] = "application/octet-stream";
+			if (this.config.getBoolean("Fluid.Driver.Odsp.enableLargeBlobUpload")) {
+				// Enable the large blob upload feature
+				headers.Prefer = "Increase-Attachment-Size-Limit";
+			}
 
 			return PerformanceEvent.timedExecAsync(
 				this.logger,

package/src/packageVersion.ts

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