@fluidframework/routerlicious-driver 1.2.1 → 2.0.0-internal.1.0.0

package/dist/deltaStorageService.d.ts

@@ -13,9 +13,9 @@ import { DocumentStorageService } from "./documentStorageService";
 export declare class DocumentDeltaStorageService implements IDocumentDeltaStorageService {
     private readonly tenantId;
     private readonly id;
-    private readonly storageService;
+    private readonly deltaStorageService;
     private readonly documentStorageService;
-    constructor(tenantId: string, id: string, storageService: IDeltaStorageService, documentStorageService: DocumentStorageService);
+    constructor(tenantId: string, id: string, deltaStorageService: IDeltaStorageService, documentStorageService: DocumentStorageService);
     private logtailSha;
     fetchMessages(from: number, to: number | undefined, abortSignal?: AbortSignal, cachedOnly?: boolean, fetchReason?: string): IStream<ISequencedDocumentMessage[]>;
     private getCore;
@@ -27,7 +27,9 @@ export declare class DeltaStorageService implements IDeltaStorageService {
     private readonly url;
     private readonly restWrapper;
     private readonly logger;
-    constructor(url: string, restWrapper: RestWrapper, logger: ITelemetryLogger);
+    private readonly getRestWrapper;
+    private readonly getDeltaStorageUrl;
+    constructor(url: string, restWrapper: RestWrapper, logger: ITelemetryLogger, getRestWrapper?: () => Promise<RestWrapper>, getDeltaStorageUrl?: () => string);
     get(tenantId: string, id: string, from: number, // inclusive
     to: number): Promise<IDeltasFetchResult>;
 }

package/dist/deltaStorageService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deltaStorageService.d.ts","sourceRoot":"","sources":["../src/deltaStorageService.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EACH,oBAAoB,EACpB,4BAA4B,EAC5B,kBAAkB,EAClB,OAAO,EACV,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EAAE,yBAAyB,EAAE,MAAM,sCAAsC,CAAC;AAGjF,OAAO,EAAE,gBAAgB,EAAE,MAAM,oCAAoC,CAAC;AAEtE,OAAO,EAAE,WAAW,EAAE,MAAM,wCAAwC,CAAC;AACrE,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAIlE;;GAEG;AACH,qBAAa,2BAA4B,YAAW,4BAA4B;IAExE,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,EAAE;IACnB,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,sBAAsB;gBAHtB,QAAQ,EAAE,MAAM,EAChB,EAAE,EAAE,MAAM,EACV,cAAc,EAAE,oBAAoB,EACpC,sBAAsB,EAAE,sBAAsB;IAGnE,OAAO,CAAC,UAAU,CAA8D;IAEhF,aAAa,CAAC,IAAI,EAAE,MAAM,EACtB,EAAE,EAAE,MAAM,GAAG,SAAS,EACtB,WAAW,CAAC,EAAE,WAAW,EACzB,UAAU,CAAC,EAAE,OAAO,EACpB,WAAW,CAAC,EAAE,MAAM,GACrB,OAAO,CAAC,yBAAyB,EAAE,CAAC;YAkBzB,OAAO;CAiBxB;AAED;;GAEG;AACH,qBAAa,mBAAoB,YAAW,oBAAoB;IAExD,OAAO,CAAC,QAAQ,CAAC,GAAG;IACpB,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,MAAM;gBAFN,GAAG,EAAE,MAAM,EACX,WAAW,EAAE,WAAW,EACxB,MAAM,EAAE,gBAAgB;IAGhC,GAAG,CACZ,QAAQ,EAAE,MAAM,EAChB,EAAE,EAAE,MAAM,EACV,IAAI,EAAE,MAAM,EAAE,YAAY;IAC1B,EAAE,EAAE,MAAM,GACX,OAAO,CAAC,kBAAkB,CAAC;CAuBjC"}
+{"version":3,"file":"deltaStorageService.d.ts","sourceRoot":"","sources":["../src/deltaStorageService.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EACH,oBAAoB,EACpB,4BAA4B,EAC5B,kBAAkB,EAClB,OAAO,EACV,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EAAE,yBAAyB,EAAE,MAAM,sCAAsC,CAAC;AAGjF,OAAO,EAAE,gBAAgB,EAAE,MAAM,oCAAoC,CAAC;AAEtE,OAAO,EAAE,WAAW,EAAE,MAAM,wCAAwC,CAAC;AACrE,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAIlE;;GAEG;AACH,qBAAa,2BAA4B,YAAW,4BAA4B;IAExE,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,EAAE;IACnB,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IACpC,OAAO,CAAC,QAAQ,CAAC,sBAAsB;gBAHtB,QAAQ,EAAE,MAAM,EAChB,EAAE,EAAE,MAAM,EACV,mBAAmB,EAAE,oBAAoB,EACzC,sBAAsB,EAAE,sBAAsB;IAGnE,OAAO,CAAC,UAAU,CAA8D;IAEhF,aAAa,CAAC,IAAI,EAAE,MAAM,EACtB,EAAE,EAAE,MAAM,GAAG,SAAS,EACtB,WAAW,CAAC,EAAE,WAAW,EACzB,UAAU,CAAC,EAAE,OAAO,EACpB,WAAW,CAAC,EAAE,MAAM,GACrB,OAAO,CAAC,yBAAyB,EAAE,CAAC;YAkBzB,OAAO;CAiBxB;AAED;;GAEG;AACH,qBAAa,mBAAoB,YAAW,oBAAoB;IAExD,OAAO,CAAC,QAAQ,CAAC,GAAG;IACpB,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,kBAAkB;gBAJlB,GAAG,EAAE,MAAM,EACX,WAAW,EAAE,WAAW,EACxB,MAAM,EAAE,gBAAgB,EACxB,cAAc,GAAE,MAAM,OAAO,CAAC,WAAW,CAAgC,EACzE,kBAAkB,GAAE,MAAM,MAAuB;IAIzD,GAAG,CACZ,QAAQ,EAAE,MAAM,EAChB,EAAE,EAAE,MAAM,EACV,IAAI,EAAE,MAAM,EAAE,YAAY;IAC1B,EAAE,EAAE,MAAM,GACX,OAAO,CAAC,kBAAkB,CAAC;CAyBjC"}

package/dist/deltaStorageService.js

@@ -13,10 +13,10 @@ const MaxBatchDeltas = 2000; // Maximum number of ops we can fetch at a time
  * Storage service limited to only being able to fetch documents for a specific document
  */
 class DocumentDeltaStorageService {
-    constructor(tenantId, id, storageService, documentStorageService) {
+    constructor(tenantId, id, deltaStorageService, documentStorageService) {
         this.tenantId = tenantId;
         this.id = id;
-        this.storageService = storageService;
+        this.deltaStorageService = deltaStorageService;
         this.documentStorageService = documentStorageService;
         this.logtailSha = this.documentStorageService.logTailSha;
     }
@@ -43,7 +43,7 @@ class DocumentDeltaStorageService {
                 return { messages, partialResult: true };
             }
         }
-        return this.storageService.get(this.tenantId, this.id, from, to);
+        return this.deltaStorageService.get(this.tenantId, this.id, from, to);
     }
 }
 exports.DocumentDeltaStorageService = DocumentDeltaStorageService;
@@ -51,10 +51,12 @@ exports.DocumentDeltaStorageService = DocumentDeltaStorageService;
  * Provides access to the underlying delta storage on the server for routerlicious driver.
  */
 class DeltaStorageService {
-    constructor(url, restWrapper, logger) {
+    constructor(url, restWrapper, logger, getRestWrapper = async () => this.restWrapper, getDeltaStorageUrl = () => this.url) {
         this.url = url;
         this.restWrapper = restWrapper;
         this.logger = logger;
+        this.getRestWrapper = getRestWrapper;
+        this.getDeltaStorageUrl = getDeltaStorageUrl;
     }
     async get(tenantId, id, from, // inclusive
     to) {
@@ -63,7 +65,9 @@ class DeltaStorageService {
             from,
             to,
         }, async (event) => {
-            const response = await this.restWrapper.get(this.url, { from: from - 1, to });
+            const restWrapper = await this.getRestWrapper();
+            const url = this.getDeltaStorageUrl();
+            const response = await restWrapper.get(url, { from: from - 1, to });
             event.end({
                 count: response.length,
             });

package/dist/deltaStorageService.js.map

@@ -1 +1 @@
-{"version":3,"file":"deltaStorageService.js","sourceRoot":"","sources":["../src/deltaStorageService.ts"],"names":[],"mappings":"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","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport {\n    IDeltaStorageService,\n    IDocumentDeltaStorageService,\n    IDeltasFetchResult,\n    IStream,\n} from \"@fluidframework/driver-definitions\";\nimport { ISequencedDocumentMessage } from \"@fluidframework/protocol-definitions\";\nimport { readAndParse, requestOps, emptyMessageStream } from \"@fluidframework/driver-utils\";\nimport { TelemetryNullLogger } from \"@fluidframework/common-utils\";\nimport { ITelemetryLogger } from \"@fluidframework/common-definitions\";\nimport { PerformanceEvent } from \"@fluidframework/telemetry-utils\";\nimport { RestWrapper } from \"@fluidframework/server-services-client\";\nimport { DocumentStorageService } from \"./documentStorageService\";\n\nconst MaxBatchDeltas = 2000; // Maximum number of ops we can fetch at a time\n\n/**\n * Storage service limited to only being able to fetch documents for a specific document\n */\nexport class DocumentDeltaStorageService implements IDocumentDeltaStorageService {\n    constructor(\n        private readonly tenantId: string,\n        private readonly id: string,\n        private readonly storageService: IDeltaStorageService,\n        private readonly documentStorageService: DocumentStorageService) {\n    }\n\n    private logtailSha: string | undefined = this.documentStorageService.logTailSha;\n\n    fetchMessages(from: number,\n        to: number | undefined,\n        abortSignal?: AbortSignal,\n        cachedOnly?: boolean,\n        fetchReason?: string,\n    ): IStream<ISequencedDocumentMessage[]> {\n        if (cachedOnly) {\n            return emptyMessageStream;\n        }\n        return requestOps(\n            this.getCore.bind(this),\n            // Staging: starting with no concurrency, listening for feedback first.\n            // In future releases we will switch to actual concurrency\n            1, // concurrency\n            from, // inclusive\n            to, // exclusive\n            MaxBatchDeltas,\n            new TelemetryNullLogger(),\n            abortSignal,\n            fetchReason,\n        );\n    }\n\n    private async getCore(from: number, to: number): Promise<IDeltasFetchResult> {\n        const opsFromLogTail = this.logtailSha\n            ? await readAndParse<ISequencedDocumentMessage[]>(this.documentStorageService, this.logtailSha)\n            : [];\n\n        this.logtailSha = undefined;\n        if (opsFromLogTail.length > 0) {\n            const messages = opsFromLogTail.filter((op) =>\n                op.sequenceNumber >= from,\n            );\n            if (messages.length > 0) {\n                return { messages, partialResult: true };\n            }\n        }\n\n        return this.storageService.get(this.tenantId, this.id, from, to);\n    }\n}\n\n/**\n * Provides access to the underlying delta storage on the server for routerlicious driver.\n */\nexport class DeltaStorageService implements IDeltaStorageService {\n    constructor(\n        private readonly url: string,\n        private readonly restWrapper: RestWrapper,\n        private readonly logger: ITelemetryLogger) {\n    }\n\n    public async get(\n        tenantId: string,\n        id: string,\n        from: number, // inclusive\n        to: number, // exclusive\n    ): Promise<IDeltasFetchResult> {\n        const ops = await PerformanceEvent.timedExecAsync(\n            this.logger,\n            {\n                eventName: \"getDeltas\",\n                from,\n                to,\n            },\n            async (event) => {\n                const response = await this.restWrapper.get<ISequencedDocumentMessage[]>(\n                    this.url,\n                    { from: from - 1, to });\n                event.end({\n                    count: response.length,\n                });\n                return response;\n            },\n        );\n\n        // It is assumed that server always returns all the ops that it has in the range that was requested.\n        // This may change in the future, if so, we need to adjust and receive \"end\" value from server in such case.\n        return { messages: ops, partialResult: false };\n    }\n}\n"]}
+{"version":3,"file":"deltaStorageService.js","sourceRoot":"","sources":["../src/deltaStorageService.ts"],"names":[],"mappings":"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","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport {\n    IDeltaStorageService,\n    IDocumentDeltaStorageService,\n    IDeltasFetchResult,\n    IStream,\n} from \"@fluidframework/driver-definitions\";\nimport { ISequencedDocumentMessage } from \"@fluidframework/protocol-definitions\";\nimport { readAndParse, requestOps, emptyMessageStream } from \"@fluidframework/driver-utils\";\nimport { TelemetryNullLogger } from \"@fluidframework/common-utils\";\nimport { ITelemetryLogger } from \"@fluidframework/common-definitions\";\nimport { PerformanceEvent } from \"@fluidframework/telemetry-utils\";\nimport { RestWrapper } from \"@fluidframework/server-services-client\";\nimport { DocumentStorageService } from \"./documentStorageService\";\n\nconst MaxBatchDeltas = 2000; // Maximum number of ops we can fetch at a time\n\n/**\n * Storage service limited to only being able to fetch documents for a specific document\n */\nexport class DocumentDeltaStorageService implements IDocumentDeltaStorageService {\n    constructor(\n        private readonly tenantId: string,\n        private readonly id: string,\n        private readonly deltaStorageService: IDeltaStorageService,\n        private readonly documentStorageService: DocumentStorageService) {\n    }\n\n    private logtailSha: string | undefined = this.documentStorageService.logTailSha;\n\n    fetchMessages(from: number,\n        to: number | undefined,\n        abortSignal?: AbortSignal,\n        cachedOnly?: boolean,\n        fetchReason?: string,\n    ): IStream<ISequencedDocumentMessage[]> {\n        if (cachedOnly) {\n            return emptyMessageStream;\n        }\n        return requestOps(\n            this.getCore.bind(this),\n            // Staging: starting with no concurrency, listening for feedback first.\n            // In future releases we will switch to actual concurrency\n            1, // concurrency\n            from, // inclusive\n            to, // exclusive\n            MaxBatchDeltas,\n            new TelemetryNullLogger(),\n            abortSignal,\n            fetchReason,\n        );\n    }\n\n    private async getCore(from: number, to: number): Promise<IDeltasFetchResult> {\n        const opsFromLogTail = this.logtailSha\n            ? await readAndParse<ISequencedDocumentMessage[]>(this.documentStorageService, this.logtailSha)\n            : [];\n\n        this.logtailSha = undefined;\n        if (opsFromLogTail.length > 0) {\n            const messages = opsFromLogTail.filter((op) =>\n                op.sequenceNumber >= from,\n            );\n            if (messages.length > 0) {\n                return { messages, partialResult: true };\n            }\n        }\n\n        return this.deltaStorageService.get(this.tenantId, this.id, from, to);\n    }\n}\n\n/**\n * Provides access to the underlying delta storage on the server for routerlicious driver.\n */\nexport class DeltaStorageService implements IDeltaStorageService {\n    constructor(\n        private readonly url: string,\n        private readonly restWrapper: RestWrapper,\n        private readonly logger: ITelemetryLogger,\n        private readonly getRestWrapper: () => Promise<RestWrapper> = async () => this.restWrapper,\n        private readonly getDeltaStorageUrl: () => string = () => this.url,\n    ) {\n    }\n\n    public async get(\n        tenantId: string,\n        id: string,\n        from: number, // inclusive\n        to: number, // exclusive\n    ): Promise<IDeltasFetchResult> {\n        const ops = await PerformanceEvent.timedExecAsync(\n            this.logger,\n            {\n                eventName: \"getDeltas\",\n                from,\n                to,\n            },\n            async (event) => {\n                const restWrapper = await this.getRestWrapper();\n                const url = this.getDeltaStorageUrl();\n                const response = await restWrapper.get<ISequencedDocumentMessage[]>(\n                    url,\n                    { from: from - 1, to });\n                event.end({\n                    count: response.length,\n                });\n                return response;\n            },\n        );\n\n        // It is assumed that server always returns all the ops that it has in the range that was requested.\n        // This may change in the future, if so, we need to adjust and receive \"end\" value from server in such case.\n        return { messages: ops, partialResult: false };\n    }\n}\n"]}

package/dist/documentService.d.ts

@@ -11,13 +11,13 @@ import { ICache } from "./cache";
 import { ISnapshotTreeVersion } from "./definitions";
 /**
  * The DocumentService manages the Socket.IO connection and manages routing requests to connected
- * clients
+ * clients.
  */
 export declare class DocumentService implements api.IDocumentService {
-    readonly resolvedUrl: api.IResolvedUrl;
+    private _resolvedUrl;
     protected ordererUrl: string;
-    private readonly deltaStorageUrl;
-    private readonly gitUrl;
+    private deltaStorageUrl;
+    private storageUrl;
     private readonly logger;
     protected tokenProvider: ITokenProvider;
     protected tenantId: string;
@@ -25,7 +25,14 @@ export declare class DocumentService implements api.IDocumentService {
     private readonly driverPolicies;
     private readonly blobCache;
     private readonly snapshotTreeCache;
-    constructor(resolvedUrl: api.IResolvedUrl, ordererUrl: string, deltaStorageUrl: string, gitUrl: string, logger: ITelemetryLogger, tokenProvider: ITokenProvider, tenantId: string, documentId: string, driverPolicies: IRouterliciousDriverPolicies, blobCache: ICache<ArrayBufferLike>, snapshotTreeCache: ICache<ISnapshotTreeVersion>);
+    private readonly discoverFluidResolvedUrl;
+    private lastDiscoveredAt;
+    private discoverP;
+    private storageManager;
+    private noCacheStorageManager;
+    private ordererRestWrapper;
+    get resolvedUrl(): api.IResolvedUrl;
+    constructor(_resolvedUrl: api.IResolvedUrl, ordererUrl: string, deltaStorageUrl: string, storageUrl: string, logger: ITelemetryLogger, tokenProvider: ITokenProvider, tenantId: string, documentId: string, driverPolicies: IRouterliciousDriverPolicies, blobCache: ICache<ArrayBufferLike>, snapshotTreeCache: ICache<ISnapshotTreeVersion>, discoverFluidResolvedUrl: () => Promise<api.IFluidResolvedUrl>);
     private documentStorageService;
     dispose(): void;
     /**
@@ -46,5 +53,14 @@ export declare class DocumentService implements api.IDocumentService {
      * @returns returns the document delta stream service for routerlicious driver.
      */
     connectToDeltaStream(client: IClient): Promise<api.IDocumentDeltaConnection>;
+    /**
+     * Re-discover session URLs if necessary.
+     */
+    private refreshDiscovery;
+    private refreshDiscoveryCore;
+    /**
+     * Whether enough time has passed since last disconnect to warrant a new discovery call on reconnect.
+     */
+    private shouldUpdateDiscoveredSessionInfo;
 }
 //# sourceMappingURL=documentService.d.ts.map

package/dist/documentService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"documentService.d.ts","sourceRoot":"","sources":["../src/documentService.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,KAAK,GAAG,MAAM,oCAAoC,CAAC;AAE1D,OAAO,EAAE,OAAO,EAAE,MAAM,sCAAsC,CAAC;AAG/D,OAAO,EAAE,gBAAgB,EAAE,MAAM,oCAAoC,CAAC;AAKtE,OAAO,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAE1C,OAAO,EAAE,4BAA4B,EAAE,MAAM,YAAY,CAAC;AAC1D,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAC;AAErD;;;GAGG;AACH,qBAAa,eAAgB,YAAW,GAAG,CAAC,gBAAgB;aAEpC,WAAW,EAAE,GAAG,CAAC,YAAY;IAC7C,SAAS,CAAC,UAAU,EAAE,MAAM;IAC5B,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,SAAS,CAAC,aAAa,EAAE,cAAc;IACvC,SAAS,CAAC,QAAQ,EAAE,MAAM;IAC1B,SAAS,CAAC,UAAU,EAAE,MAAM;IAC5B,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,iBAAiB;gBAVlB,WAAW,EAAE,GAAG,CAAC,YAAY,EACnC,UAAU,EAAE,MAAM,EACX,eAAe,EAAE,MAAM,EACvB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,gBAAgB,EAC/B,aAAa,EAAE,cAAc,EAC7B,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,EACX,cAAc,EAAE,4BAA4B,EAC5C,SAAS,EAAE,MAAM,CAAC,eAAe,CAAC,EAClC,iBAAiB,EAAE,MAAM,CAAC,oBAAoB,CAAC;IAIpE,OAAO,CAAC,sBAAsB,CAAqC;IAE5D,OAAO;IAEd;;;;OAIG;IACU,gBAAgB,IAAI,OAAO,CAAC,GAAG,CAAC,uBAAuB,CAAC;IAkDrE;;;;OAIG;IACU,qBAAqB,IAAI,OAAO,CAAC,GAAG,CAAC,4BAA4B,CAAC;IAkB/E;;;;OAIG;IACU,oBAAoB,CAAC,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,wBAAwB,CAAC;CAgC5F"}
+{"version":3,"file":"documentService.d.ts","sourceRoot":"","sources":["../src/documentService.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,KAAK,GAAG,MAAM,oCAAoC,CAAC;AAE1D,OAAO,EAAE,OAAO,EAAE,MAAM,sCAAsC,CAAC;AAI/D,OAAO,EAAE,gBAAgB,EAAE,MAAM,oCAAoC,CAAC;AAKtE,OAAO,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAE1C,OAAO,EAAE,4BAA4B,EAAE,MAAM,YAAY,CAAC;AAC1D,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAC;AAUrD;;;GAGG;AACH,qBAAa,eAAgB,YAAW,GAAG,CAAC,gBAAgB;IAapD,OAAO,CAAC,YAAY;IACpB,SAAS,CAAC,UAAU,EAAE,MAAM;IAC5B,OAAO,CAAC,eAAe;IACvB,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,SAAS,CAAC,aAAa,EAAE,cAAc;IACvC,SAAS,CAAC,QAAQ,EAAE,MAAM;IAC1B,SAAS,CAAC,UAAU,EAAE,MAAM;IAC5B,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,wBAAwB;IAvB7C,OAAO,CAAC,gBAAgB,CAAsB;IAC9C,OAAO,CAAC,SAAS,CAA4B;IAE7C,OAAO,CAAC,cAAc,CAAyB;IAC/C,OAAO,CAAC,qBAAqB,CAAyB;IACtD,OAAO,CAAC,kBAAkB,CAA0B;IAEpD,IAAW,WAAW,qBAErB;gBAGW,YAAY,EAAE,GAAG,CAAC,YAAY,EAC5B,UAAU,EAAE,MAAM,EACpB,eAAe,EAAE,MAAM,EACvB,UAAU,EAAE,MAAM,EACT,MAAM,EAAE,gBAAgB,EAC/B,aAAa,EAAE,cAAc,EAC7B,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,EACX,cAAc,EAAE,4BAA4B,EAC5C,SAAS,EAAE,MAAM,CAAC,eAAe,CAAC,EAClC,iBAAiB,EAAE,MAAM,CAAC,oBAAoB,CAAC,EAC/C,wBAAwB,EAAE,MAAM,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC;IAInF,OAAO,CAAC,sBAAsB,CAAqC;IAE5D,OAAO;IAEd;;;;OAIG;IACU,gBAAgB,IAAI,OAAO,CAAC,GAAG,CAAC,uBAAuB,CAAC;IAgErE;;;;OAIG;IACU,qBAAqB,IAAI,OAAO,CAAC,GAAG,CAAC,4BAA4B,CAAC;IAsC/E;;;;OAIG;IACU,oBAAoB,CAAC,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,wBAAwB,CAAC;IAqCzF;;OAEG;YACW,gBAAgB;YAahB,oBAAoB;IASlC;;OAEG;IACH,OAAO,CAAC,iCAAiC;CAY5C"}

package/dist/documentService.js

@@ -32,21 +32,29 @@ const api = __importStar(require("@fluidframework/driver-definitions"));
 const driver_utils_1 = require("@fluidframework/driver-utils");
 const server_services_client_1 = require("@fluidframework/server-services-client");
 const socket_io_client_1 = __importDefault(require("socket.io-client"));
+const telemetry_utils_1 = require("@fluidframework/telemetry-utils");
 const deltaStorageService_1 = require("./deltaStorageService");
 const documentStorageService_1 = require("./documentStorageService");
 const documentDeltaConnection_1 = require("./documentDeltaConnection");
 const nullBlobStorageService_1 = require("./nullBlobStorageService");
 const restWrapper_1 = require("./restWrapper");
+/**
+ * Amount of time between discoveries within which we don't need to rediscover on re-connect.
+ * Currently, R11s defines session length at 10 minutes. To avoid any weird unknown edge-cases though,
+ * we set the limit to 5 minutes here.
+ * In the future, we likely want to retrieve this information from service's "inactive session" definition.
+ */
+const RediscoverAfterTimeSinceDiscoveryMs = 5 * 60000; // 5 minute
 /**
  * The DocumentService manages the Socket.IO connection and manages routing requests to connected
- * clients
+ * clients.
  */
 class DocumentService {
-    constructor(resolvedUrl, ordererUrl, deltaStorageUrl, gitUrl, logger, tokenProvider, tenantId, documentId, driverPolicies, blobCache, snapshotTreeCache) {
-        this.resolvedUrl = resolvedUrl;
+    constructor(_resolvedUrl, ordererUrl, deltaStorageUrl, storageUrl, logger, tokenProvider, tenantId, documentId, driverPolicies, blobCache, snapshotTreeCache, discoverFluidResolvedUrl) {
+        this._resolvedUrl = _resolvedUrl;
         this.ordererUrl = ordererUrl;
         this.deltaStorageUrl = deltaStorageUrl;
-        this.gitUrl = gitUrl;
+        this.storageUrl = storageUrl;
         this.logger = logger;
         this.tokenProvider = tokenProvider;
         this.tenantId = tenantId;
@@ -54,6 +62,11 @@ class DocumentService {
         this.driverPolicies = driverPolicies;
         this.blobCache = blobCache;
         this.snapshotTreeCache = snapshotTreeCache;
+        this.discoverFluidResolvedUrl = discoverFluidResolvedUrl;
+        this.lastDiscoveredAt = Date.now();
+    }
+    get resolvedUrl() {
+        return this._resolvedUrl;
     }
     dispose() { }
     /**
@@ -65,22 +78,34 @@ class DocumentService {
         if (this.documentStorageService !== undefined) {
             return this.documentStorageService;
         }
-        if (this.gitUrl === undefined) {
+        if (this.storageUrl === undefined) {
             return new nullBlobStorageService_1.NullBlobStorageService();
         }
-        const rateLimiter = new driver_utils_1.RateLimiter(this.driverPolicies.maxConcurrentStorageRequests);
-        const storageRestWrapper = await restWrapper_1.RouterliciousStorageRestWrapper.load(this.tenantId, this.documentId, this.tokenProvider, this.logger, rateLimiter, this.driverPolicies.enableRestLess, this.gitUrl);
-        const historian = new server_services_client_1.Historian(this.gitUrl, true, false, storageRestWrapper);
-        const gitManager = new server_services_client_1.GitManager(historian);
-        const noCacheHistorian = new server_services_client_1.Historian(this.gitUrl, true, true, storageRestWrapper);
-        const noCacheGitManager = new server_services_client_1.GitManager(noCacheHistorian);
+        const getStorageManager = async (disableCache) => {
+            const shouldUpdateDiscoveredSessionInfo = this.shouldUpdateDiscoveredSessionInfo();
+            if (shouldUpdateDiscoveredSessionInfo) {
+                await this.refreshDiscovery();
+            }
+            if (!this.storageManager || !this.noCacheStorageManager || shouldUpdateDiscoveredSessionInfo) {
+                const rateLimiter = new driver_utils_1.RateLimiter(this.driverPolicies.maxConcurrentStorageRequests);
+                const storageRestWrapper = await restWrapper_1.RouterliciousStorageRestWrapper.load(this.tenantId, this.documentId, this.tokenProvider, this.logger, rateLimiter, this.driverPolicies.enableRestLess, this.storageUrl);
+                const historian = new server_services_client_1.Historian(this.storageUrl, true, false, storageRestWrapper);
+                this.storageManager = new server_services_client_1.GitManager(historian);
+                const noCacheHistorian = new server_services_client_1.Historian(this.storageUrl, true, true, storageRestWrapper);
+                this.noCacheStorageManager = new server_services_client_1.GitManager(noCacheHistorian);
+            }
+            return disableCache ? this.noCacheStorageManager : this.storageManager;
+        };
+        // Initialize storageManager and noCacheStorageManager
+        const storageManager = await getStorageManager();
+        const noCacheStorageManager = await getStorageManager(true);
         const documentStorageServicePolicies = {
             caching: this.driverPolicies.enablePrefetch
                 ? api.LoaderCachingPolicy.Prefetch
                 : api.LoaderCachingPolicy.NoCaching,
             minBlobSize: this.driverPolicies.aggregateBlobsSmallerThanBytes,
         };
-        this.documentStorageService = new documentStorageService_1.DocumentStorageService(this.documentId, gitManager, this.logger, documentStorageServicePolicies, this.driverPolicies, this.blobCache, this.snapshotTreeCache, noCacheGitManager);
+        this.documentStorageService = new documentStorageService_1.DocumentStorageService(this.documentId, storageManager, this.logger, documentStorageServicePolicies, this.driverPolicies, this.blobCache, this.snapshotTreeCache, noCacheStorageManager, getStorageManager);
         return this.documentStorageService;
     }
     /**
@@ -91,10 +116,20 @@ class DocumentService {
     async connectToDeltaStorage() {
         await this.connectToStorage();
         (0, common_utils_1.assert)(!!this.documentStorageService, 0x0b1 /* "Storage service not initialized" */);
-        const rateLimiter = new driver_utils_1.RateLimiter(this.driverPolicies.maxConcurrentOrdererRequests);
-        const ordererRestWrapper = await restWrapper_1.RouterliciousOrdererRestWrapper.load(this.tenantId, this.documentId, this.tokenProvider, this.logger, rateLimiter, this.driverPolicies.enableRestLess);
-        const deltaStorage = new deltaStorageService_1.DeltaStorageService(this.deltaStorageUrl, ordererRestWrapper, this.logger);
-        return new deltaStorageService_1.DocumentDeltaStorageService(this.tenantId, this.documentId, deltaStorage, this.documentStorageService);
+        const getRestWrapper = async () => {
+            const shouldUpdateDiscoveredSessionInfo = this.shouldUpdateDiscoveredSessionInfo();
+            if (shouldUpdateDiscoveredSessionInfo) {
+                await this.refreshDiscovery();
+            }
+            if (!this.ordererRestWrapper || shouldUpdateDiscoveredSessionInfo) {
+                const rateLimiter = new driver_utils_1.RateLimiter(this.driverPolicies.maxConcurrentOrdererRequests);
+                this.ordererRestWrapper = await restWrapper_1.RouterliciousOrdererRestWrapper.load(this.tenantId, this.documentId, this.tokenProvider, this.logger, rateLimiter, this.driverPolicies.enableRestLess);
+            }
+            return this.ordererRestWrapper;
+        };
+        const restWrapper = await getRestWrapper();
+        const deltaStorageService = new deltaStorageService_1.DeltaStorageService(this.deltaStorageUrl, restWrapper, this.logger, getRestWrapper, () => this.deltaStorageUrl);
+        return new deltaStorageService_1.DocumentDeltaStorageService(this.tenantId, this.documentId, deltaStorageService, this.documentStorageService);
     }
     /**
      * Connects to a delta stream endpoint for emitting ops.
@@ -103,23 +138,61 @@ class DocumentService {
      */
     async connectToDeltaStream(client) {
         const connect = async (refreshToken) => {
+            if (this.shouldUpdateDiscoveredSessionInfo()) {
+                await this.refreshDiscovery();
+            }
             const ordererToken = await this.tokenProvider.fetchOrdererToken(this.tenantId, this.documentId, refreshToken);
             return documentDeltaConnection_1.R11sDocumentDeltaConnection.create(this.tenantId, this.documentId, ordererToken.jwt, socket_io_client_1.default, client, this.ordererUrl, this.logger);
         };
         // Attempt to establish connection.
         // Retry with new token on authorization error; otherwise, allow container layer to handle.
+        let connection;
         try {
-            const connection = await connect();
-            return connection;
+            connection = await connect();
         }
         catch (error) {
             if ((error === null || error === void 0 ? void 0 : error.statusCode) === 401) {
                 // Fetch new token and retry once,
                 // otherwise 401 will be bubbled up as non-retriable AuthorizationError.
-                return connect(true /* refreshToken */);
+                connection = await connect(true /* refreshToken */);
             }
             throw error;
         }
+        return connection;
+    }
+    /**
+     * Re-discover session URLs if necessary.
+     */
+    async refreshDiscovery() {
+        if (!this.discoverP) {
+            this.discoverP = telemetry_utils_1.PerformanceEvent.timedExecAsync(this.logger, {
+                eventName: "refreshSessionDiscovery",
+            }, async () => this.refreshDiscoveryCore());
+        }
+        return this.discoverP;
+    }
+    async refreshDiscoveryCore() {
+        const fluidResolvedUrl = await this.discoverFluidResolvedUrl();
+        this._resolvedUrl = fluidResolvedUrl;
+        this.storageUrl = fluidResolvedUrl.endpoints.storageUrl;
+        this.ordererUrl = fluidResolvedUrl.endpoints.ordererUrl;
+        this.deltaStorageUrl = fluidResolvedUrl.endpoints.deltaStorageUrl;
+        this.lastDiscoveredAt = Date.now();
+    }
+    /**
+     * Whether enough time has passed since last disconnect to warrant a new discovery call on reconnect.
+     */
+    shouldUpdateDiscoveredSessionInfo() {
+        if (!this.driverPolicies.enableDiscovery) {
+            return false;
+        }
+        const now = Date.now();
+        // When connection is disconnected, we cannot know if session has moved or document has been deleted
+        // without re-doing discovery on the next attempt to connect.
+        // Disconnect event is not so reliable in local testing. To ensure re-discovery when necessary,
+        // re-discover if enough time has passed since last discovery.
+        const pastLastDiscoveryTimeThreshold = (now - this.lastDiscoveredAt) > RediscoverAfterTimeSinceDiscoveryMs;
+        return pastLastDiscoveryTimeThreshold;
     }
 }
 exports.DocumentService = DocumentService;

package/dist/documentService.js.map

@@ -1 +1 @@
-{"version":3,"file":"documentService.js","sourceRoot":"","sources":["../src/documentService.ts"],"names":[],"mappings":"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","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { assert } from \"@fluidframework/common-utils\";\nimport * as api from \"@fluidframework/driver-definitions\";\nimport { RateLimiter } from \"@fluidframework/driver-utils\";\nimport { IClient } from \"@fluidframework/protocol-definitions\";\nimport { GitManager, Historian } from \"@fluidframework/server-services-client\";\nimport io from \"socket.io-client\";\nimport { ITelemetryLogger } from \"@fluidframework/common-definitions\";\nimport { DeltaStorageService, DocumentDeltaStorageService } from \"./deltaStorageService\";\nimport { DocumentStorageService } from \"./documentStorageService\";\nimport { R11sDocumentDeltaConnection } from \"./documentDeltaConnection\";\nimport { NullBlobStorageService } from \"./nullBlobStorageService\";\nimport { ITokenProvider } from \"./tokens\";\nimport { RouterliciousOrdererRestWrapper, RouterliciousStorageRestWrapper } from \"./restWrapper\";\nimport { IRouterliciousDriverPolicies } from \"./policies\";\nimport { ICache } from \"./cache\";\nimport { ISnapshotTreeVersion } from \"./definitions\";\n\n/**\n * The DocumentService manages the Socket.IO connection and manages routing requests to connected\n * clients\n */\nexport class DocumentService implements api.IDocumentService {\n    constructor(\n        public readonly resolvedUrl: api.IResolvedUrl,\n        protected ordererUrl: string,\n        private readonly deltaStorageUrl: string,\n        private readonly gitUrl: string,\n        private readonly logger: ITelemetryLogger,\n        protected tokenProvider: ITokenProvider,\n        protected tenantId: string,\n        protected documentId: string,\n        private readonly driverPolicies: IRouterliciousDriverPolicies,\n        private readonly blobCache: ICache<ArrayBufferLike>,\n        private readonly snapshotTreeCache: ICache<ISnapshotTreeVersion>,\n    ) {\n    }\n\n    private documentStorageService: DocumentStorageService | undefined;\n\n    public dispose() { }\n\n    /**\n     * Connects to a storage endpoint for snapshot service.\n     *\n     * @returns returns the document storage service for routerlicious driver.\n     */\n    public async connectToStorage(): Promise<api.IDocumentStorageService> {\n        if (this.documentStorageService !== undefined) {\n            return this.documentStorageService;\n        }\n\n        if (this.gitUrl === undefined) {\n            return new NullBlobStorageService();\n        }\n\n        const rateLimiter = new RateLimiter(this.driverPolicies.maxConcurrentStorageRequests);\n        const storageRestWrapper = await RouterliciousStorageRestWrapper.load(\n            this.tenantId,\n            this.documentId,\n            this.tokenProvider,\n            this.logger,\n            rateLimiter,\n            this.driverPolicies.enableRestLess,\n            this.gitUrl,\n        );\n        const historian = new Historian(\n            this.gitUrl,\n            true,\n            false,\n            storageRestWrapper);\n        const gitManager = new GitManager(historian);\n        const noCacheHistorian = new Historian(\n            this.gitUrl,\n            true,\n            true,\n            storageRestWrapper);\n        const noCacheGitManager = new GitManager(noCacheHistorian);\n        const documentStorageServicePolicies: api.IDocumentStorageServicePolicies = {\n            caching: this.driverPolicies.enablePrefetch\n                ? api.LoaderCachingPolicy.Prefetch\n                : api.LoaderCachingPolicy.NoCaching,\n            minBlobSize: this.driverPolicies.aggregateBlobsSmallerThanBytes,\n        };\n\n        this.documentStorageService = new DocumentStorageService(\n            this.documentId,\n            gitManager,\n            this.logger,\n            documentStorageServicePolicies,\n            this.driverPolicies,\n            this.blobCache,\n            this.snapshotTreeCache,\n            noCacheGitManager);\n        return this.documentStorageService;\n    }\n\n    /**\n     * Connects to a delta storage endpoint for getting ops between a range.\n     *\n     * @returns returns the document delta storage service for routerlicious driver.\n     */\n    public async connectToDeltaStorage(): Promise<api.IDocumentDeltaStorageService> {\n        await this.connectToStorage();\n        assert(!!this.documentStorageService, 0x0b1 /* \"Storage service not initialized\" */);\n\n        const rateLimiter = new RateLimiter(this.driverPolicies.maxConcurrentOrdererRequests);\n        const ordererRestWrapper = await RouterliciousOrdererRestWrapper.load(\n            this.tenantId,\n            this.documentId,\n            this.tokenProvider,\n            this.logger,\n            rateLimiter,\n            this.driverPolicies.enableRestLess,\n        );\n        const deltaStorage = new DeltaStorageService(this.deltaStorageUrl, ordererRestWrapper, this.logger);\n        return new DocumentDeltaStorageService(this.tenantId, this.documentId,\n            deltaStorage, this.documentStorageService);\n    }\n\n    /**\n     * Connects to a delta stream endpoint for emitting ops.\n     *\n     * @returns returns the document delta stream service for routerlicious driver.\n     */\n    public async connectToDeltaStream(client: IClient): Promise<api.IDocumentDeltaConnection> {\n        const connect = async (refreshToken?: boolean) => {\n            const ordererToken = await this.tokenProvider.fetchOrdererToken(\n                this.tenantId,\n                this.documentId,\n                refreshToken,\n            );\n            return R11sDocumentDeltaConnection.create(\n                this.tenantId,\n                this.documentId,\n                ordererToken.jwt,\n                io,\n                client,\n                this.ordererUrl,\n                this.logger,\n            );\n        };\n\n        // Attempt to establish connection.\n        // Retry with new token on authorization error; otherwise, allow container layer to handle.\n        try {\n            const connection = await connect();\n            return connection;\n        } catch (error: any) {\n            if (error?.statusCode === 401) {\n                // Fetch new token and retry once,\n                // otherwise 401 will be bubbled up as non-retriable AuthorizationError.\n                return connect(true /* refreshToken */);\n            }\n            throw error;\n        }\n    }\n}\n"]}
+{"version":3,"file":"documentService.js","sourceRoot":"","sources":["../src/documentService.ts"],"names":[],"mappings":"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","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { assert } from \"@fluidframework/common-utils\";\nimport * as api from \"@fluidframework/driver-definitions\";\nimport { RateLimiter } from \"@fluidframework/driver-utils\";\nimport { IClient } from \"@fluidframework/protocol-definitions\";\nimport { GitManager, Historian, RestWrapper } from \"@fluidframework/server-services-client\";\nimport io from \"socket.io-client\";\nimport { PerformanceEvent } from \"@fluidframework/telemetry-utils\";\nimport { ITelemetryLogger } from \"@fluidframework/common-definitions\";\nimport { DeltaStorageService, DocumentDeltaStorageService } from \"./deltaStorageService\";\nimport { DocumentStorageService } from \"./documentStorageService\";\nimport { R11sDocumentDeltaConnection } from \"./documentDeltaConnection\";\nimport { NullBlobStorageService } from \"./nullBlobStorageService\";\nimport { ITokenProvider } from \"./tokens\";\nimport { RouterliciousOrdererRestWrapper, RouterliciousStorageRestWrapper } from \"./restWrapper\";\nimport { IRouterliciousDriverPolicies } from \"./policies\";\nimport { ICache } from \"./cache\";\nimport { ISnapshotTreeVersion } from \"./definitions\";\n\n/**\n * Amount of time between discoveries within which we don't need to rediscover on re-connect.\n * Currently, R11s defines session length at 10 minutes. To avoid any weird unknown edge-cases though,\n * we set the limit to 5 minutes here.\n * In the future, we likely want to retrieve this information from service's \"inactive session\" definition.\n */\nconst RediscoverAfterTimeSinceDiscoveryMs = 5 * 60000; // 5 minute\n\n/**\n * The DocumentService manages the Socket.IO connection and manages routing requests to connected\n * clients.\n */\nexport class DocumentService implements api.IDocumentService {\n    private lastDiscoveredAt: number = Date.now();\n    private discoverP: Promise<void> | undefined;\n\n    private storageManager: GitManager | undefined;\n    private noCacheStorageManager: GitManager | undefined;\n    private ordererRestWrapper: RestWrapper | undefined;\n\n    public get resolvedUrl() {\n        return this._resolvedUrl;\n    }\n\n    constructor(\n        private _resolvedUrl: api.IResolvedUrl,\n        protected ordererUrl: string,\n        private deltaStorageUrl: string,\n        private storageUrl: string,\n        private readonly logger: ITelemetryLogger,\n        protected tokenProvider: ITokenProvider,\n        protected tenantId: string,\n        protected documentId: string,\n        private readonly driverPolicies: IRouterliciousDriverPolicies,\n        private readonly blobCache: ICache<ArrayBufferLike>,\n        private readonly snapshotTreeCache: ICache<ISnapshotTreeVersion>,\n        private readonly discoverFluidResolvedUrl: () => Promise<api.IFluidResolvedUrl>,\n    ) {\n    }\n\n    private documentStorageService: DocumentStorageService | undefined;\n\n    public dispose() { }\n\n    /**\n     * Connects to a storage endpoint for snapshot service.\n     *\n     * @returns returns the document storage service for routerlicious driver.\n     */\n    public async connectToStorage(): Promise<api.IDocumentStorageService> {\n        if (this.documentStorageService !== undefined) {\n            return this.documentStorageService;\n        }\n\n        if (this.storageUrl === undefined) {\n            return new NullBlobStorageService();\n        }\n\n        const getStorageManager = async (disableCache?: boolean): Promise<GitManager> => {\n            const shouldUpdateDiscoveredSessionInfo = this.shouldUpdateDiscoveredSessionInfo();\n            if (shouldUpdateDiscoveredSessionInfo) {\n                await this.refreshDiscovery();\n            }\n            if (!this.storageManager || !this.noCacheStorageManager || shouldUpdateDiscoveredSessionInfo) {\n                const rateLimiter = new RateLimiter(this.driverPolicies.maxConcurrentStorageRequests);\n                const storageRestWrapper = await RouterliciousStorageRestWrapper.load(\n                    this.tenantId,\n                    this.documentId,\n                    this.tokenProvider,\n                    this.logger,\n                    rateLimiter,\n                    this.driverPolicies.enableRestLess,\n                    this.storageUrl,\n                );\n                const historian = new Historian(\n                    this.storageUrl,\n                    true,\n                    false,\n                    storageRestWrapper);\n                this.storageManager = new GitManager(historian);\n                const noCacheHistorian = new Historian(\n                    this.storageUrl,\n                    true,\n                    true,\n                    storageRestWrapper);\n                this.noCacheStorageManager = new GitManager(noCacheHistorian);\n            }\n\n            return disableCache ? this.noCacheStorageManager : this.storageManager;\n        };\n        // Initialize storageManager and noCacheStorageManager\n        const storageManager = await getStorageManager();\n        const noCacheStorageManager = await getStorageManager(true);\n        const documentStorageServicePolicies: api.IDocumentStorageServicePolicies = {\n            caching: this.driverPolicies.enablePrefetch\n                ? api.LoaderCachingPolicy.Prefetch\n                : api.LoaderCachingPolicy.NoCaching,\n            minBlobSize: this.driverPolicies.aggregateBlobsSmallerThanBytes,\n        };\n\n        this.documentStorageService = new DocumentStorageService(\n            this.documentId,\n            storageManager,\n            this.logger,\n            documentStorageServicePolicies,\n            this.driverPolicies,\n            this.blobCache,\n            this.snapshotTreeCache,\n            noCacheStorageManager,\n            getStorageManager);\n        return this.documentStorageService;\n    }\n\n    /**\n     * Connects to a delta storage endpoint for getting ops between a range.\n     *\n     * @returns returns the document delta storage service for routerlicious driver.\n     */\n    public async connectToDeltaStorage(): Promise<api.IDocumentDeltaStorageService> {\n        await this.connectToStorage();\n        assert(!!this.documentStorageService, 0x0b1 /* \"Storage service not initialized\" */);\n\n        const getRestWrapper = async (): Promise<RestWrapper> => {\n            const shouldUpdateDiscoveredSessionInfo = this.shouldUpdateDiscoveredSessionInfo();\n            if (shouldUpdateDiscoveredSessionInfo) {\n                await this.refreshDiscovery();\n            }\n            if (!this.ordererRestWrapper || shouldUpdateDiscoveredSessionInfo) {\n                const rateLimiter = new RateLimiter(this.driverPolicies.maxConcurrentOrdererRequests);\n                this.ordererRestWrapper = await RouterliciousOrdererRestWrapper.load(\n                    this.tenantId,\n                    this.documentId,\n                    this.tokenProvider,\n                    this.logger,\n                    rateLimiter,\n                    this.driverPolicies.enableRestLess,\n                );\n            }\n            return this.ordererRestWrapper;\n        };\n        const restWrapper = await getRestWrapper();\n        const deltaStorageService = new DeltaStorageService(\n            this.deltaStorageUrl,\n            restWrapper,\n            this.logger,\n            getRestWrapper,\n            () => this.deltaStorageUrl,\n        );\n        return new DocumentDeltaStorageService(\n            this.tenantId,\n            this.documentId,\n            deltaStorageService,\n            this.documentStorageService,\n        );\n    }\n\n    /**\n     * Connects to a delta stream endpoint for emitting ops.\n     *\n     * @returns returns the document delta stream service for routerlicious driver.\n     */\n    public async connectToDeltaStream(client: IClient): Promise<api.IDocumentDeltaConnection> {\n        const connect = async (refreshToken?: boolean) => {\n            if (this.shouldUpdateDiscoveredSessionInfo()) {\n                await this.refreshDiscovery();\n            }\n            const ordererToken = await this.tokenProvider.fetchOrdererToken(\n                this.tenantId,\n                this.documentId,\n                refreshToken,\n            );\n            return R11sDocumentDeltaConnection.create(\n                this.tenantId,\n                this.documentId,\n                ordererToken.jwt,\n                io,\n                client,\n                this.ordererUrl,\n                this.logger,\n            );\n        };\n\n        // Attempt to establish connection.\n        // Retry with new token on authorization error; otherwise, allow container layer to handle.\n        let connection: api.IDocumentDeltaConnection;\n        try {\n            connection = await connect();\n        } catch (error: any) {\n            if (error?.statusCode === 401) {\n                // Fetch new token and retry once,\n                // otherwise 401 will be bubbled up as non-retriable AuthorizationError.\n                connection = await connect(true /* refreshToken */);\n            }\n            throw error;\n        }\n        return connection;\n    }\n\n    /**\n     * Re-discover session URLs if necessary.\n     */\n    private async refreshDiscovery(): Promise<void> {\n        if (!this.discoverP) {\n            this.discoverP = PerformanceEvent.timedExecAsync(\n                this.logger,\n                {\n                    eventName: \"refreshSessionDiscovery\",\n                },\n                async () => this.refreshDiscoveryCore(),\n            );\n        }\n        return this.discoverP;\n    }\n\n    private async refreshDiscoveryCore(): Promise<void> {\n        const fluidResolvedUrl = await this.discoverFluidResolvedUrl();\n        this._resolvedUrl = fluidResolvedUrl;\n        this.storageUrl = fluidResolvedUrl.endpoints.storageUrl;\n        this.ordererUrl = fluidResolvedUrl.endpoints.ordererUrl;\n        this.deltaStorageUrl = fluidResolvedUrl.endpoints.deltaStorageUrl;\n        this.lastDiscoveredAt = Date.now();\n    }\n\n    /**\n     * Whether enough time has passed since last disconnect to warrant a new discovery call on reconnect.\n     */\n    private shouldUpdateDiscoveredSessionInfo(): boolean {\n        if (!this.driverPolicies.enableDiscovery) {\n            return false;\n        }\n        const now = Date.now();\n        // When connection is disconnected, we cannot know if session has moved or document has been deleted\n        // without re-doing discovery on the next attempt to connect.\n        // Disconnect event is not so reliable in local testing. To ensure re-discovery when necessary,\n        // re-discover if enough time has passed since last discovery.\n        const pastLastDiscoveryTimeThreshold = (now - this.lastDiscoveredAt) > RediscoverAfterTimeSinceDiscoveryMs;\n        return pastLastDiscoveryTimeThreshold;\n    }\n}\n"]}

package/dist/documentServiceFactory.d.ts

@@ -5,6 +5,7 @@
 import { IDocumentService, IDocumentServiceFactory, IResolvedUrl } from "@fluidframework/driver-definitions";
 import { ITelemetryBaseLogger } from "@fluidframework/common-definitions";
 import { ISummaryTree } from "@fluidframework/protocol-definitions";
+import { ISession } from "@fluidframework/server-services-client";
 import { IRouterliciousDriverPolicies } from "./policies";
 import { ITokenProvider } from "./tokens";
 /**
@@ -26,11 +27,11 @@ export declare class RouterliciousDocumentServiceFactory implements IDocumentSer
      */
     createContainer(createNewSummary: ISummaryTree | undefined, resolvedUrl: IResolvedUrl, logger?: ITelemetryBaseLogger, clientIsSummarizer?: boolean): Promise<IDocumentService>;
     /**
-     * {@inheritDoc @fluidframework/driver-definitions#IDocumentServiceFactory.createContainer}
+     * {@inheritDoc @fluidframework/driver-definitions#IDocumentServiceFactory.createDocumentService}
      *
      * @returns Routerlicious document service.
      */
-    createDocumentService(resolvedUrl: IResolvedUrl, logger?: ITelemetryBaseLogger, clientIsSummarizer?: boolean, isCreateContainer?: boolean): Promise<IDocumentService>;
+    createDocumentService(resolvedUrl: IResolvedUrl, logger?: ITelemetryBaseLogger, clientIsSummarizer?: boolean, session?: ISession): Promise<IDocumentService>;
 }
 /**
  * Error returned by {@link RouterliciousDocumentServiceFactory.createContainer} when an error is thrown

package/dist/documentServiceFactory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"documentServiceFactory.d.ts","sourceRoot":"","sources":["../src/documentServiceFactory.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EACH,gBAAgB,EAChB,uBAAuB,EACvB,YAAY,EACf,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAC;AAC1E,OAAO,EAAE,YAAY,EAAE,MAAM,sCAAsC,CAAC;AAUpE,OAAO,EAAE,4BAA4B,EAAE,MAAM,YAAY,CAAC;AAC1D,OAAO,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAkB1C;;;GAGG;AACH,qBAAa,mCAAoC,YAAW,uBAAuB;IAO3E,OAAO,CAAC,QAAQ,CAAC,aAAa;IANlC,SAAgB,YAAY,YAAY;IACxC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAA+B;IAC9D,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAwC;IAClE,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAA6C;gBAG1D,aAAa,EAAE,cAAc,EAC9C,cAAc,GAAE,OAAO,CAAC,4BAA4B,CAAM;IAQ9D;;;;;OAKG;IACU,eAAe,CACxB,gBAAgB,EAAE,YAAY,GAAG,SAAS,EAC1C,WAAW,EAAE,YAAY,EACzB,MAAM,CAAC,EAAE,oBAAoB,EAC7B,kBAAkB,CAAC,EAAE,OAAO,GAC7B,OAAO,CAAC,gBAAgB,CAAC;IAqG5B;;;;OAIG;IACU,qBAAqB,CAC9B,WAAW,EAAE,YAAY,EACzB,MAAM,CAAC,EAAE,oBAAoB,EAC7B,kBAAkB,CAAC,EAAE,OAAO,EAC5B,iBAAiB,CAAC,EAAE,OAAO,GAC5B,OAAO,CAAC,gBAAgB,CAAC;CAsD/B;AAED;;;;;;;;;;GAUG;AACF,qBAAa,uBAAwB,SAAQ,KAAK;IAE3C;;OAEG;IACH,OAAO,CAAC,QAAQ,CAAC,UAAU;;IAH3B;;OAEG;IACc,UAAU,EAAE,KAAK;IAKtC,SAAgB,IAAI,6BAA6B;IAEjD,IAAW,KAAK,uBAAoC;CACvD"}
+{"version":3,"file":"documentServiceFactory.d.ts","sourceRoot":"","sources":["../src/documentServiceFactory.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EACH,gBAAgB,EAChB,uBAAuB,EAEvB,YAAY,EACf,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAC;AAC1E,OAAO,EAAE,YAAY,EAAE,MAAM,sCAAsC,CAAC;AAQpE,OAAO,EAAE,QAAQ,EAAE,MAAM,wCAAwC,CAAC;AAElE,OAAO,EAAE,4BAA4B,EAAE,MAAM,YAAY,CAAC;AAC1D,OAAO,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAkB1C;;;GAGG;AACH,qBAAa,mCAAoC,YAAW,uBAAuB;IAO3E,OAAO,CAAC,QAAQ,CAAC,aAAa;IANlC,SAAgB,YAAY,YAAY;IACxC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAA+B;IAC9D,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAwC;IAClE,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAA6C;gBAG1D,aAAa,EAAE,cAAc,EAC9C,cAAc,GAAE,OAAO,CAAC,4BAA4B,CAAM;IAQ9D;;;;;OAKG;IACU,eAAe,CACxB,gBAAgB,EAAE,YAAY,GAAG,SAAS,EAC1C,WAAW,EAAE,YAAY,EACzB,MAAM,CAAC,EAAE,oBAAoB,EAC7B,kBAAkB,CAAC,EAAE,OAAO,GAC7B,OAAO,CAAC,gBAAgB,CAAC;IA+F5B;;;;OAIG;IACU,qBAAqB,CAC9B,WAAW,EAAE,YAAY,EACzB,MAAM,CAAC,EAAE,oBAAoB,EAC7B,kBAAkB,CAAC,EAAE,OAAO,EAC5B,OAAO,CAAC,EAAE,QAAQ,GACnB,OAAO,CAAC,gBAAgB,CAAC;CAyD/B;AAED;;;;;;;;;;GAUG;AACH,qBAAa,uBAAwB,SAAQ,KAAK;IAE1C;;OAEG;IACH,OAAO,CAAC,QAAQ,CAAC,UAAU;;IAH3B;;OAEG;IACc,UAAU,EAAE,KAAK;IAKtC,SAAgB,IAAI,6BAA6B;IAEjD,IAAW,KAAK,uBAAoC;CACvD"}

package/dist/documentServiceFactory.js

@@ -76,22 +76,15 @@ class RouterliciousDocumentServiceFactory {
         let documentId;
         let token;
         let session;
-        let fluidResolvedUrl;
         if (typeof res === "string") {
             documentId = res;
         }
         else {
             documentId = res.id;
             token = res.token;
-            session = res.session;
+            session = this.driverPolicies.enableDiscovery ? res.session : undefined;
         }
-        if (session && this.driverPolicies.enableDiscovery) {
-            fluidResolvedUrl = (0, urlUtils_1.getDiscoveredFluidResolvedUrl)(resolvedUrl, session);
-        }
-        else {
-            fluidResolvedUrl = resolvedUrl;
-        }
-        parsedUrl = (0, urlUtils_1.parseFluidUrl)(fluidResolvedUrl.url);
+        parsedUrl = (0, urlUtils_1.parseFluidUrl)(resolvedUrl.url);
         // @TODO: Remove token from the condition, checking the documentPostCreateCallback !== undefined
         // is sufficient to determine if the token will be undefined or not.
         if (token && this.tokenProvider.documentPostCreateCallback !== undefined) {
@@ -103,20 +96,20 @@ class RouterliciousDocumentServiceFactory {
             }
         }
         parsedUrl.set("pathname", (0, urlUtils_1.replaceDocumentIdInPath)(parsedUrl.pathname, documentId));
-        const deltaStorageUrl = fluidResolvedUrl.endpoints.deltaStorageUrl;
+        const deltaStorageUrl = resolvedUrl.endpoints.deltaStorageUrl;
         if (!deltaStorageUrl) {
             throw new Error(`All endpoints urls must be provided. [deltaStorageUrl:${deltaStorageUrl}]`);
         }
         const parsedDeltaStorageUrl = new URL(deltaStorageUrl);
         parsedDeltaStorageUrl.pathname = (0, urlUtils_1.replaceDocumentIdInPath)(parsedDeltaStorageUrl.pathname, documentId);
-        return this.createDocumentService(Object.assign(Object.assign({}, fluidResolvedUrl), { url: parsedUrl.toString(), id: documentId, endpoints: Object.assign(Object.assign({}, fluidResolvedUrl.endpoints), { deltaStorageUrl: parsedDeltaStorageUrl.toString() }) }), logger, clientIsSummarizer, true);
+        return this.createDocumentService(Object.assign(Object.assign({}, resolvedUrl), { url: parsedUrl.toString(), id: documentId, endpoints: Object.assign(Object.assign({}, resolvedUrl.endpoints), { deltaStorageUrl: parsedDeltaStorageUrl.toString() }) }), logger, clientIsSummarizer, session);
     }
     /**
-     * {@inheritDoc @fluidframework/driver-definitions#IDocumentServiceFactory.createContainer}
+     * {@inheritDoc @fluidframework/driver-definitions#IDocumentServiceFactory.createDocumentService}
      *
      * @returns Routerlicious document service.
      */
-    async createDocumentService(resolvedUrl, logger, clientIsSummarizer, isCreateContainer) {
+    async createDocumentService(resolvedUrl, logger, clientIsSummarizer, session) {
         (0, driver_utils_1.ensureFluidResolvedUrl)(resolvedUrl);
         const parsedUrl = (0, urlUtils_1.parseFluidUrl)(resolvedUrl.url);
         const [, tenantId, documentId] = parsedUrl.pathname.split("/");
@@ -124,24 +117,26 @@ class RouterliciousDocumentServiceFactory {
             throw new Error(`Couldn't parse documentId and/or tenantId. [documentId:${documentId}][tenantId:${tenantId}]`);
         }
         const logger2 = telemetry_utils_1.ChildLogger.create(logger, "RouterliciousDriver", { all: { driverVersion: packageVersion_1.pkgVersion } });
-        let fluidResolvedUrl;
-        if (!isCreateContainer && this.driverPolicies.enableDiscovery) {
+        const discoverFluidResolvedUrl = async () => {
+            if (!this.driverPolicies.enableDiscovery) {
+                return resolvedUrl;
+            }
             const rateLimiter = new driver_utils_1.RateLimiter(this.driverPolicies.maxConcurrentOrdererRequests);
             const ordererRestWrapper = await restWrapper_1.RouterliciousOrdererRestWrapper.load(tenantId, documentId, this.tokenProvider, logger2, rateLimiter, this.driverPolicies.enableRestLess, resolvedUrl.endpoints.ordererUrl);
-            // the backend responds with the actual document session associated with the container.
-            const session = await ordererRestWrapper.get(`/documents/${tenantId}/session/${documentId}`);
-            fluidResolvedUrl = (0, urlUtils_1.getDiscoveredFluidResolvedUrl)(resolvedUrl, session);
-        }
-        else {
-            fluidResolvedUrl = resolvedUrl;
-        }
+            // The service responds with the current document session associated with the container.
+            const discoveredSession = await ordererRestWrapper.get(`/documents/${tenantId}/session/${documentId}`);
+            return (0, urlUtils_1.getDiscoveredFluidResolvedUrl)(resolvedUrl, discoveredSession);
+        };
+        const fluidResolvedUrl = session !== undefined
+            ? (0, urlUtils_1.getDiscoveredFluidResolvedUrl)(resolvedUrl, session)
+            : await discoverFluidResolvedUrl();
         const storageUrl = fluidResolvedUrl.endpoints.storageUrl;
         const ordererUrl = fluidResolvedUrl.endpoints.ordererUrl;
         const deltaStorageUrl = fluidResolvedUrl.endpoints.deltaStorageUrl;
         if (!ordererUrl || !deltaStorageUrl) {
             throw new Error(`All endpoints urls must be provided. [ordererUrl:${ordererUrl}][deltaStorageUrl:${deltaStorageUrl}]`);
         }
-        return new documentService_1.DocumentService(fluidResolvedUrl, ordererUrl, deltaStorageUrl, storageUrl, logger2, this.tokenProvider, tenantId, documentId, this.driverPolicies, this.blobCache, this.snapshotTreeCache);
+        return new documentService_1.DocumentService(fluidResolvedUrl, ordererUrl, deltaStorageUrl, storageUrl, logger2, this.tokenProvider, tenantId, documentId, this.driverPolicies, this.blobCache, this.snapshotTreeCache, discoverFluidResolvedUrl);
     }
 }
 exports.RouterliciousDocumentServiceFactory = RouterliciousDocumentServiceFactory;