@fluidframework/odsp-driver 0.57.2 → 0.58.1000

package/src/odspUtils.ts

@@ -109,14 +109,13 @@ export async function fetchHelper(
         // Let's assume we can retry.
         if (!response) {
             throw new NonRetryableError(
-                "odspFetchErrorNoResponse",
-                "No response from fetch call",
+                "No response from ODSP fetch call",
                 DriverErrorType.incorrectServerResponse,
                 { driverVersion });
         }
         if (!response.ok || response.status < 200 || response.status >= 300) {
             throwOdspNetworkError(
-                `odspFetchError [${response.status}]`, response.status, response, await response.text());
+                `ODSP fetch error [${response.status}]`, response.status, response, await response.text());
         }
 
         const headers = headersToMap(response.headers);
@@ -138,25 +137,25 @@ export async function fetchHelper(
         // This error is thrown by fetch() when AbortSignal is provided and it gets cancelled
         if (error.name === "AbortError") {
             throw new RetryableError(
-                "fetchAbort", "Fetch Timeout (AbortError)", OdspErrorType.fetchTimeout, { driverVersion });
+                "Fetch Timeout (AbortError)", OdspErrorType.fetchTimeout, { driverVersion });
         }
         // TCP/IP timeout
         if (errorText.indexOf("ETIMEDOUT") !== -1) {
             throw new RetryableError(
-                "fetchETimedout", "Fetch Timeout (ETIMEDOUT)", OdspErrorType.fetchTimeout, { driverVersion });
+                "Fetch Timeout (ETIMEDOUT)", OdspErrorType.fetchTimeout, { driverVersion });
         }
 
         //
         // WARNING: Do not log error object itself or any of its properties!
-        // It could container PII, like URI in message itself, or token in properties.
+        // It could contain PII, like URI in message itself, or token in properties.
         // It is also non-serializable object due to circular references.
         //
         if (online === OnlineStatus.Offline) {
             throw new RetryableError(
-                "OdspFetchOffline", `Offline: ${errorText}`, DriverErrorType.offlineError, { driverVersion });
+                `ODSP fetch failure (Offline): ${errorText}`, DriverErrorType.offlineError, { driverVersion });
         } else {
             throw new RetryableError(
-                "OdspFetchError", `Fetch error: ${errorText}`, DriverErrorType.fetchFailure, { driverVersion });
+                `ODSP fetch failure: ${errorText}`, DriverErrorType.fetchFailure, { driverVersion });
         }
     });
 }
@@ -202,7 +201,7 @@ export async function fetchAndParseAsJSONHelper<T>(
         // succeeds on retry.
         // So do not log error object itself.
         throwOdspNetworkError(
-            "errorWhileParsingFetchResponse",
+            "Error while parsing fetch response",
             fetchIncorrectResponse,
             content, // response
             text,
@@ -306,8 +305,7 @@ export function toInstrumentedOdspTokenFetcher(
                 }
                 if (token === null && throwOnNullToken) {
                     throw new NonRetryableError(
-                        "storageTokenIsNull",
-                        `Token is null for ${name} call`,
+                        `The Host-provided token fetcher for ${name} call returned null`,
                         OdspErrorType.fetchTokenError,
                         { method: name, driverVersion });
                 }
@@ -319,8 +317,7 @@ export function toInstrumentedOdspTokenFetcher(
                 const tokenError = wrapError(
                     error,
                     (errorMessage) => new NetworkErrorBasic(
-                        "tokenFetcherFailed",
-                        errorMessage,
+                        `The Host-provided token fetcher for ${name} call threw an error: ${errorMessage}`,
                         OdspErrorType.fetchTokenError,
                         typeof rawCanRetry === "boolean" ? rawCanRetry : false /* canRetry */,
                         { method: name, driverVersion }));

package/src/packageVersion.ts

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

package/src/retryErrorsStorageAdapter.ts

@@ -92,7 +92,7 @@ export class RetryErrorsStorageAdapter implements IDocumentStorageService, IDisp
 
     private checkStorageDisposed() {
         if (this._disposed) {
-            throw new LoggingError("storageServiceDisposedCannotRetry", { canRetry: false });
+            throw new LoggingError("Storage Service is disposed. Cannot retry", { canRetry: false });
         }
     }
 

package/src/vroom.ts

@@ -29,6 +29,7 @@ interface IJoinSessionBody {
  * @param requestSocketToken - flag indicating whether joinSession is expected to return access token
  * which is used when establishing websocket connection with collab session backend service.
  * @param options - Options to fetch the token.
+ * @param disableJoinSessionRefresh - Whether the caller wants to disable refreshing join session periodically.
  * @param guestDisplayName - display name used to identify guest user joining a session.
  * This is optional and used only when collab session is being joined via invite.
  */
@@ -41,6 +42,7 @@ export async function fetchJoinSession(
     epochTracker: EpochTracker,
     requestSocketToken: boolean,
     options: TokenFetchOptionsEx,
+    disableJoinSessionRefresh: boolean | undefined,
     guestDisplayName?: string,
 ): Promise<ISocketStorageDiscovery> {
     const token = await getStorageToken(options, "JoinSession");
@@ -61,6 +63,9 @@ export async function fetchJoinSession(
             postBody += `Authorization: Bearer ${token}\r\n`;
             postBody += `X-HTTP-Method-Override: POST\r\n`;
             postBody += `Content-Type: application/json\r\n`;
+            if (!disableJoinSessionRefresh) {
+                postBody += `prefer: FluidRemoveCheckAccess\r\n`;
+            }
             postBody += `_post: 1\r\n`;
             // Name should be there when socket token is requested and vice-versa.
             if (requestSocketToken && guestDisplayName !== undefined) {
@@ -98,6 +103,7 @@ export async function fetchJoinSession(
                 // pushV2 websocket urls will contain pushf
                 pushv2: socketUrl.includes("pushf"),
                 webSocketHostName,
+                refreshSessionDurationSeconds: response.content.refreshSessionDurationSeconds,
             });
 
             if (response.content.runtimeTenantId && !response.content.tenantId) {

package/src/zipItDataRepresentationUtils.ts

@@ -480,8 +480,7 @@ function throwBufferParseException(
     message: string,
 ): never {
     throw new NonRetryableError(
-        "bufferParsingException",
-        message,
+        `Buffer parsing exception: ${message}`,
         DriverErrorType.incorrectServerResponse,
         {
             nodeType: getNodeType(node),