@fluidframework/routerlicious-driver 0.59.2000-61729 → 0.59.2000-63294

package/src/documentStorageService.ts

@@ -37,15 +37,18 @@ export class DocumentStorageService extends DocumentStorageServiceProxy {
         policies: IDocumentStorageServicePolicies,
         driverPolicies?: IRouterliciousDriverPolicies,
         blobCache?: ICache<ArrayBufferLike>,
-        snapshotTreeCache?: ICache<ISnapshotTreeVersion>): IDocumentStorageService {
+        snapshotTreeCache?: ICache<ISnapshotTreeVersion>,
+        noCacheGitManager?: GitManager): IDocumentStorageService {
         const storageService = driverPolicies?.enableWholeSummaryUpload ?
             new WholeSummaryDocumentStorageService(
                 id,
                 manager,
                 logger,
                 policies,
+                driverPolicies,
                 blobCache,
                 snapshotTreeCache,
+                noCacheGitManager,
             ) :
             new ShreddedSummaryDocumentStorageService(
                 id,
@@ -70,7 +73,8 @@ export class DocumentStorageService extends DocumentStorageServiceProxy {
         policies: IDocumentStorageServicePolicies = {},
         driverPolicies?: IRouterliciousDriverPolicies,
         blobCache?: ICache<ArrayBufferLike>,
-        snapshotTreeCache?: ICache<ISnapshotTreeVersion>) {
+        snapshotTreeCache?: ICache<ISnapshotTreeVersion>,
+        public noCacheGitManager?: GitManager) {
         super(DocumentStorageService.loadInternalDocumentStorageService(
             id,
             manager,
@@ -79,6 +83,7 @@ export class DocumentStorageService extends DocumentStorageServiceProxy {
             driverPolicies,
             blobCache,
             snapshotTreeCache,
+            noCacheGitManager,
         ));
     }
 

package/src/errorUtils.ts

@@ -18,6 +18,7 @@ export enum R11sErrorType {
 
 /**
  * Interface for error responses for the WebSocket connection
+ * Intended to be compatible with output from {@link NetworkError.toJSON}
  */
 export interface IR11sSocketError {
     /**
@@ -36,6 +37,12 @@ export interface IR11sSocketError {
      * Optional Retry-After time in seconds.
      * The client should wait this many seconds before retrying its request.
      */
+    retryAfter?: number;
+
+    /**
+     * Optional Retry-After time in milliseconds.
+     * The client should wait this many milliseconds before retrying its request.
+     */
     retryAfterMs?: number;
 }
 
@@ -61,6 +68,8 @@ export function createR11sNetworkError(
             return new GenericNetworkError(
                 errorMessage, errorMessage.startsWith("NetworkError"), props);
         case 401:
+            // The first 401 is manually retried in RouterliciousRestWrapper with a refreshed token,
+            // so we treat repeat 401s the same as 403.
         case 403:
             return new AuthorizationError(
                 errorMessage, undefined, undefined, props);

package/src/packageVersion.ts

@@ -6,4 +6,4 @@
  */
 
 export const pkgName = "@fluidframework/routerlicious-driver";
-export const pkgVersion = "0.59.2000-61729";
+export const pkgVersion = "0.59.2000-63294";

package/src/policies.ts

@@ -32,6 +32,11 @@ export interface IRouterliciousDriverPolicies {
      * Default: false
      */
     enableWholeSummaryUpload: boolean;
+    /**
+     * Enable service endpoint discovery when creating or joining a session.
+     * Default: false
+     */
+    enableDiscovery?: boolean;
     /**
      * Enable using RestLess which avoids CORS preflight requests.
      * Default: true

package/src/urlUtils.ts

@@ -3,7 +3,9 @@
  * Licensed under the MIT License.
  */
 
+import { IFluidResolvedUrl } from "@fluidframework/driver-definitions";
 import URLParse from "url-parse";
+import { ISession } from "@fluidframework/server-services-client";
 
 export const parseFluidUrl = (fluidUrl: string): URLParse => {
     return new URLParse(fluidUrl, true);
@@ -17,3 +19,32 @@ export const parseFluidUrl = (fluidUrl: string): URLParse => {
  */
 export const replaceDocumentIdInPath = (urlPath: string, documentId: string): string =>
     urlPath.split("/").slice(0, -1).concat([documentId]).join("/");
+
+export const getDiscoveredFluidResolvedUrl = (resolvedUrl: IFluidResolvedUrl, session: ISession): IFluidResolvedUrl => {
+    if (session) {
+        const discoveredOrdererUrl = new URLParse(session.ordererUrl);
+        const deltaStorageUrl = new URLParse(resolvedUrl.endpoints.deltaStorageUrl);
+        deltaStorageUrl.set("host", discoveredOrdererUrl.host);
+
+        const discoveredStorageUrl = new URLParse(session.historianUrl);
+        const storageUrl = new URLParse(resolvedUrl.endpoints.storageUrl);
+        storageUrl.set("host", discoveredStorageUrl.host);
+
+        const parsedUrl = parseFluidUrl(resolvedUrl.url);
+        const discoveredResolvedUrl: IFluidResolvedUrl = {
+            endpoints: {
+                deltaStorageUrl: deltaStorageUrl.toString(),
+                ordererUrl: session.ordererUrl,
+                storageUrl: storageUrl.toString(),
+            },
+            id: resolvedUrl.id,
+            tokens: resolvedUrl.tokens,
+            type: resolvedUrl.type,
+            url: new URLParse(`fluid://${discoveredOrdererUrl.host}${parsedUrl.pathname}`).toString(),
+        };
+
+        return discoveredResolvedUrl;
+    } else {
+        return resolvedUrl;
+    }
+};

package/src/wholeSummaryDocumentStorageService.ts

@@ -13,7 +13,7 @@ import {
     IDocumentStorageService,
     ISummaryContext,
     IDocumentStorageServicePolicies,
- } from "@fluidframework/driver-definitions";
+} from "@fluidframework/driver-definitions";
 import {
     ICreateBlobResponse,
     ISnapshotTree,
@@ -31,6 +31,7 @@ import {
 import { PerformanceEvent } from "@fluidframework/telemetry-utils";
 import { ICache, InMemoryCache } from "./cache";
 import { ISnapshotTreeVersion } from "./definitions";
+import { IRouterliciousDriverPolicies } from "./policies";
 
 const latestSnapshotId: string = "latest";
 
@@ -47,8 +48,10 @@ export class WholeSummaryDocumentStorageService implements IDocumentStorageServi
         protected readonly manager: GitManager,
         protected readonly logger: ITelemetryLogger,
         public readonly policies: IDocumentStorageServicePolicies = {},
+        private readonly driverPolicies?: IRouterliciousDriverPolicies,
         private readonly blobCache: ICache<ArrayBufferLike> = new InMemoryCache(),
-        private readonly snapshotTreeCache: ICache<ISnapshotTreeVersion> = new InMemoryCache()) {
+        private readonly snapshotTreeCache: ICache<ISnapshotTreeVersion> = new InMemoryCache(),
+        protected readonly noCacheGitManager?: GitManager) {
         this.summaryUploadManager = new WholeSummaryUploadManager(manager);
     }
 
@@ -64,7 +67,9 @@ export class WholeSummaryDocumentStorageService implements IDocumentStorageServi
         // Fetch latest summary, cache it, and return its id.
         if (this.firstVersionsCall && count === 1) {
             this.firstVersionsCall = false;
-            const { id: _id, snapshotTree } = await this.fetchAndCacheSnapshotTree(latestSnapshotId);
+            const { id: _id, snapshotTree } = !this.driverPolicies?.enableDiscovery ?
+                await this.fetchAndCacheSnapshotTree(latestSnapshotId, false) :
+                await this.fetchAndCacheSnapshotTree(latestSnapshotId, true);
             return [{
                 id: _id,
                 treeId: snapshotTree.id!,
@@ -170,7 +175,7 @@ export class WholeSummaryDocumentStorageService implements IDocumentStorageServi
         );
     }
 
-    private async fetchAndCacheSnapshotTree(versionId: string): Promise<ISnapshotTreeVersion> {
+    private async fetchAndCacheSnapshotTree(versionId: string, disableCache?: boolean): Promise<ISnapshotTreeVersion> {
         const cachedSnapshotTreeVersion = await this.snapshotTreeCache.get(versionId);
         if (cachedSnapshotTreeVersion !== undefined) {
             return { id: cachedSnapshotTreeVersion.id, snapshotTree: cachedSnapshotTreeVersion.snapshotTree };
@@ -183,7 +188,9 @@ export class WholeSummaryDocumentStorageService implements IDocumentStorageServi
                 treeId: versionId,
             },
             async (event) => {
-                const response = await this.manager.getSummary(versionId);
+                const response = disableCache && this.noCacheGitManager !== undefined ?
+                    await this.noCacheGitManager.getSummary(versionId) :
+                    await this.manager.getSummary(versionId);
                 event.end({
                     size: response.trees[0]?.entries.length,
                 });
@@ -194,7 +201,7 @@ export class WholeSummaryDocumentStorageService implements IDocumentStorageServi
         const wholeFlatSummaryId: string = wholeFlatSummary.id;
         const snapshotTreeId = normalizedWholeSummary.snapshotTree.id;
         assert(snapshotTreeId !== undefined, 0x275 /* "Root tree should contain the id" */);
-        const snapshotTreeVersion = { id: wholeFlatSummaryId , snapshotTree: normalizedWholeSummary.snapshotTree };
+        const snapshotTreeVersion = { id: wholeFlatSummaryId, snapshotTree: normalizedWholeSummary.snapshotTree };
 
         const cachePs: Promise<any>[] = [
             this.snapshotTreeCache.put(