@fluidframework/odsp-driver 2.0.0-dev-rc.4.0.0.261659 → 2.0.0-dev-rc.5.0.0.263932

package/src/fetchSnapshot.ts

@@ -375,17 +375,31 @@ async function fetchLatestSnapshotCore(
 					case "application/json": {
 						let text: string;
 						[text, receiveContentTime] = await measureP(async () =>
-							odspResponse.content.text().catch((error) =>
-								// Parsing can fail and message could contain full request URI, including
-								// tokens, etc. So do not log error object itself.
-								throwOdspNetworkError(
-									"Error while parsing fetch response",
-									fetchIncorrectResponse,
-									odspResponse.content, // response
-									undefined, // response text
-									propsToLog,
+							odspResponse.content
+								.text()
+								.then((res) => {
+									if (res.length === 0) {
+										throwOdspNetworkError(
+											"Response from browser is empty",
+											fetchIncorrectResponse,
+											odspResponse.content, // response
+											undefined, // response text
+											propsToLog,
+										);
+									}
+									return res;
+								})
+								.catch((error) =>
+									// Parsing can fail and message could contain full request URI, including
+									// tokens, etc. So do not log error object itself.
+									throwOdspNetworkError(
+										"Error while parsing fetch response",
+										fetchIncorrectResponse,
+										odspResponse.content, // response
+										undefined, // response text
+										propsToLog,
+									),
 								),
-							),
 						);
 						propsToLog.bodySize = text.length;
 						let content: IOdspSnapshot;
@@ -405,17 +419,31 @@ async function fetchLatestSnapshotCore(
 					case "application/ms-fluid": {
 						let content: ArrayBuffer;
 						[content, receiveContentTime] = await measureP(async () =>
-							odspResponse.content.arrayBuffer().catch((error) =>
-								// Parsing can fail and message could contain full request URI, including
-								// tokens, etc. So do not log error object itself.
-								throwOdspNetworkError(
-									"Error while parsing fetch response",
-									fetchIncorrectResponse,
-									odspResponse.content, // response
-									undefined, // response text
-									propsToLog,
+							odspResponse.content
+								.arrayBuffer()
+								.then((res) => {
+									if (res.byteLength === 0) {
+										throwOdspNetworkError(
+											"Response from browser is empty",
+											fetchIncorrectResponse,
+											odspResponse.content, // response
+											undefined, // response text
+											propsToLog,
+										);
+									}
+									return res;
+								})
+								.catch((error) =>
+									// Parsing can fail and message could contain full request URI, including
+									// tokens, etc. So do not log error object itself.
+									throwOdspNetworkError(
+										"Error while parsing fetch response",
+										fetchIncorrectResponse,
+										odspResponse.content, // response
+										undefined, // response text
+										propsToLog,
+									),
 								),
-							),
 						);
 						propsToLog.bodySize = content.byteLength;
 						let snapshotContents: ISnapshotContentsWithProps;

package/src/odspDelayLoadedDeltaStream.ts

@@ -10,6 +10,7 @@ import {
 	IDocumentDeltaConnection,
 	IDocumentServicePolicies,
 	IResolvedUrl,
+	type IAnyDriverError,
 } from "@fluidframework/driver-definitions/internal";
 import {
 	DeltaStreamConnectionForbiddenError,
@@ -220,9 +221,19 @@ 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 is from socket event connect_document_error.
+				// Otherwise keep it in cache so that this session can be re-used after disconnection.
+				// Also keeping an undefined check here to account for any unknown code path that is unable to stamp the value as in that case also
+				// it is safer to clear join session cache and start over.
+				if (
+					error &&
+					typeof error === "object" &&
+					((error as IAnyDriverError).scenarioName === "connect_document_error" ||
+						(error as IAnyDriverError).scenarioName === undefined)
+				) {
+					this.clearJoinSessionTimer();
+					this.cache.sessionJoinCache.remove(this.joinSessionKey);
+				}
 				const normalizedError = this.annotateConnectionError(
 					error,
 					"createDeltaConnection",

package/src/odspDocumentDeltaConnection.ts

@@ -7,7 +7,7 @@ import { TypedEventEmitter, performance } from "@fluid-internal/client-utils";
 import { IEvent } from "@fluidframework/core-interfaces";
 import { assert, Deferred } from "@fluidframework/core-utils/internal";
 import { DocumentDeltaConnection } from "@fluidframework/driver-base/internal";
-import { IAnyDriverError } from "@fluidframework/driver-definitions";
+import { IAnyDriverError } from "@fluidframework/driver-definitions/internal";
 import { createGenericNetworkError } from "@fluidframework/driver-utils/internal";
 import { OdspError } from "@fluidframework/odsp-driver-definitions/internal";
 import {
@@ -361,8 +361,12 @@ export class OdspDocumentDeltaConnection extends DocumentDeltaConnection {
 	/**
 	 * Error raising for socket.io issues
 	 */
-	// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types, @typescript-eslint/no-explicit-any
-	protected createErrorObject(handler: string, error?: any, canRetry = true): IAnyDriverError {
+	protected createErrorObject(
+		handler: string,
+		// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types, @typescript-eslint/no-explicit-any
+		error?: any,
+		canRetry = true,
+	): IAnyDriverError {
 		// Note: we suspect the incoming error object is either:
 		// - a socketError: add it to the OdspError object for driver to be able to parse it and reason over it.
 		// - anything else: let base class handle it

package/src/odspError.ts

@@ -32,7 +32,11 @@ export function errorObjectFromSocketError(
 				: undefined, // responseText
 		);
 
-		error.addTelemetryProperties({ odspError: true, relayServiceError: true });
+		error.addTelemetryProperties({
+			odspError: true,
+			relayServiceError: true,
+			scenarioName: handler,
+		});
 		return error;
 	} catch {
 		return new NonRetryableError(

package/src/packageVersion.ts

@@ -6,4 +6,4 @@
  */
 
 export const pkgName = "@fluidframework/odsp-driver";
-export const pkgVersion = "2.0.0-dev-rc.4.0.0.261659";
+export const pkgVersion = "2.0.0-dev-rc.5.0.0.263932";