@fluidframework/routerlicious-driver 2.0.0-internal.2.1.2 → 2.0.0-internal.2.2.0

package/lib/documentService.js

@@ -106,7 +106,7 @@ export class DocumentService {
         };
         const restWrapper = await getRestWrapper();
         const deltaStorageService = new DeltaStorageService(this.deltaStorageUrl, restWrapper, this.logger, getRestWrapper, () => this.deltaStorageUrl);
-        return new DocumentDeltaStorageService(this.tenantId, this.documentId, deltaStorageService, this.documentStorageService);
+        return new DocumentDeltaStorageService(this.tenantId, this.documentId, deltaStorageService, this.documentStorageService, this.logger);
     }
     /**
      * Connects to a delta stream endpoint for emitting ops.
@@ -167,7 +167,6 @@ export class DocumentService {
         this.ordererUrl = fluidResolvedUrl.endpoints.ordererUrl;
         this.deltaStorageUrl = fluidResolvedUrl.endpoints.deltaStorageUrl;
         this.deltaStreamUrl = fluidResolvedUrl.endpoints.deltaStreamUrl || this.ordererUrl;
-        this.lastDiscoveredAt = Date.now();
     }
     /**
      * Whether enough time has passed since last disconnect to warrant a new discovery call on reconnect.
@@ -182,6 +181,15 @@ export class DocumentService {
         // 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;
+        if (pastLastDiscoveryTimeThreshold) {
+            // Reset discover promise and refresh discovery.
+            this.lastDiscoveredAt = Date.now();
+            this.discoverP = undefined;
+            this.refreshDiscovery().catch(() => {
+                // Undo discovery time set on failure, so that next check refreshes.
+                this.lastDiscoveredAt = 0;
+            });
+        }
         return pastLastDiscoveryTimeThreshold;
     }
 }

package/lib/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, 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 */\n// eslint-disable-next-line import/namespace\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 deltaStreamUrl: 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\n            const ordererToken = await PerformanceEvent.timedExecAsync(\n                this.logger,\n                {\n                    eventName: \"GetDeltaStreamToken\",\n                    docId: this.documentId,\n                    details: JSON.stringify({\n                        refreshToken,\n                    }),\n                },\n                async () => {\n                    return this.tokenProvider.fetchOrdererToken(\n                        this.tenantId,\n                        this.documentId,\n                        refreshToken,\n                    );\n                }\n            );\n\n            return PerformanceEvent.timedExecAsync(\n                this.logger,\n                {\n                    eventName: \"ConnectToDeltaStream\",\n                    docId: this.documentId,\n                },\n                async () => {\n                    return R11sDocumentDeltaConnection.create(\n                        this.tenantId,\n                        this.documentId,\n                        ordererToken.jwt,\n                        io,\n                        client,\n                        this.deltaStreamUrl,\n                        this.logger,\n                    );\n                }\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    /**\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: \"RefreshDiscovery\",\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.deltaStreamUrl = fluidResolvedUrl.endpoints.deltaStreamUrl || this.ordererUrl;\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"]}
+{"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 */\n// eslint-disable-next-line import/namespace\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 deltaStreamUrl: 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            this.logger,\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\n            const ordererToken = await PerformanceEvent.timedExecAsync(\n                this.logger,\n                {\n                    eventName: \"GetDeltaStreamToken\",\n                    docId: this.documentId,\n                    details: JSON.stringify({\n                        refreshToken,\n                    }),\n                },\n                async () => {\n                    return this.tokenProvider.fetchOrdererToken(\n                        this.tenantId,\n                        this.documentId,\n                        refreshToken,\n                    );\n                }\n            );\n\n            return PerformanceEvent.timedExecAsync(\n                this.logger,\n                {\n                    eventName: \"ConnectToDeltaStream\",\n                    docId: this.documentId,\n                },\n                async () => {\n                    return R11sDocumentDeltaConnection.create(\n                        this.tenantId,\n                        this.documentId,\n                        ordererToken.jwt,\n                        io,\n                        client,\n                        this.deltaStreamUrl,\n                        this.logger,\n                    );\n                }\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    /**\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: \"RefreshDiscovery\",\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.deltaStreamUrl = fluidResolvedUrl.endpoints.deltaStreamUrl || this.ordererUrl;\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        if (pastLastDiscoveryTimeThreshold) {\n            // Reset discover promise and refresh discovery.\n            this.lastDiscoveredAt = Date.now();\n            this.discoverP = undefined;\n            this.refreshDiscovery().catch(() => {\n                // Undo discovery time set on failure, so that next check refreshes.\n                this.lastDiscoveredAt = 0;\n            });\n        }\n        return pastLastDiscoveryTimeThreshold;\n    }\n}\n"]}

package/lib/packageVersion.d.ts

@@ -5,5 +5,5 @@
  * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY
  */
 export declare const pkgName = "@fluidframework/routerlicious-driver";
-export declare const pkgVersion = "2.0.0-internal.2.1.2";
+export declare const pkgVersion = "2.0.0-internal.2.2.0";
 //# sourceMappingURL=packageVersion.d.ts.map

package/lib/packageVersion.js

@@ -5,5 +5,5 @@
  * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY
  */
 export const pkgName = "@fluidframework/routerlicious-driver";
-export const pkgVersion = "2.0.0-internal.2.1.2";
+export const pkgVersion = "2.0.0-internal.2.2.0";
 //# sourceMappingURL=packageVersion.js.map

package/lib/packageVersion.js.map

@@ -1 +1 @@
-{"version":3,"file":"packageVersion.js","sourceRoot":"","sources":["../src/packageVersion.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,MAAM,CAAC,MAAM,OAAO,GAAG,sCAAsC,CAAC;AAC9D,MAAM,CAAC,MAAM,UAAU,GAAG,sBAAsB,CAAC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n *\n * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY\n */\n\nexport const pkgName = \"@fluidframework/routerlicious-driver\";\nexport const pkgVersion = \"2.0.0-internal.2.1.2\";\n"]}
+{"version":3,"file":"packageVersion.js","sourceRoot":"","sources":["../src/packageVersion.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,MAAM,CAAC,MAAM,OAAO,GAAG,sCAAsC,CAAC;AAC9D,MAAM,CAAC,MAAM,UAAU,GAAG,sBAAsB,CAAC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n *\n * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY\n */\n\nexport const pkgName = \"@fluidframework/routerlicious-driver\";\nexport const pkgVersion = \"2.0.0-internal.2.2.0\";\n"]}

package/lib/restWrapper.d.ts

@@ -1,9 +1,9 @@
-/// <reference types="node" />
 /*!
  * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
  * Licensed under the MIT License.
  */
-import * as querystring from "querystring";
+/// <reference types="node" />
+import type { ParsedUrlQueryInput } from "querystring";
 import { ITelemetryLogger } from "@fluidframework/common-definitions";
 import { RateLimiter } from "@fluidframework/driver-utils";
 import { RestWrapper } from "@fluidframework/server-services-client";
@@ -16,7 +16,7 @@ export declare class RouterliciousRestWrapper extends RestWrapper {
     private readonly useRestLess;
     private authorizationHeader;
     private readonly restLess;
-    constructor(logger: ITelemetryLogger, rateLimiter: RateLimiter, getAuthorizationHeader: AuthorizationHeaderGetter, useRestLess: boolean, baseurl?: string, defaultQueryString?: querystring.ParsedUrlQueryInput);
+    constructor(logger: ITelemetryLogger, rateLimiter: RateLimiter, getAuthorizationHeader: AuthorizationHeaderGetter, useRestLess: boolean, baseurl?: string, defaultQueryString?: ParsedUrlQueryInput);
     load(): Promise<void>;
     protected request<T>(requestConfig: AxiosRequestConfig, statusCode: number, canRetry?: boolean): Promise<T>;
     private generateHeaders;

package/lib/restWrapper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"restWrapper.d.ts","sourceRoot":"","sources":["../src/restWrapper.ts"],"names":[],"mappings":";AAAA;;;GAGG;AACH,OAAO,KAAK,WAAW,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,gBAAgB,EAAE,MAAM,oCAAoC,CAAC;AAEtE,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EAGH,WAAW,EACd,MAAM,wCAAwC,CAAC;AAGhD,OAAO,KAAK,EAAE,kBAAkB,EAAuB,MAAM,OAAO,CAAC;AAIrE,OAAO,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAG1C,aAAK,yBAAyB,GAAG,CAAC,OAAO,CAAC,EAAE,OAAO,KAAK,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;AAgBpF,qBAAa,wBAAyB,SAAQ,WAAW;IAMjD,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,sBAAsB;IACvC,OAAO,CAAC,QAAQ,CAAC,WAAW;IAPhC,OAAO,CAAC,mBAAmB,CAAqB;IAChD,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAwB;gBAG7C,MAAM,EAAE,gBAAgB,EACP,WAAW,EAAE,WAAW,EACxB,sBAAsB,EAAE,yBAAyB,EACjD,WAAW,EAAE,OAAO,EACrC,OAAO,CAAC,EAAE,MAAM,EAChB,kBAAkB,GAAE,WAAW,CAAC,mBAAwB;IAK/C,IAAI;cAID,OAAO,CAAC,CAAC,EAAE,aAAa,EAAE,kBAAkB,EAAE,UAAU,EAAE,MAAM,EAAE,QAAQ,UAAO,GAAG,OAAO,CAAC,CAAC,CAAC;IAmD9G,OAAO,CAAC,eAAe;CAa1B;AAED,qBAAa,+BAAgC,SAAQ,wBAAwB;IACzE,OAAO;WAWa,IAAI,CACpB,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,EAClB,aAAa,EAAE,cAAc,EAC7B,MAAM,EAAE,gBAAgB,EACxB,WAAW,EAAE,WAAW,EACxB,WAAW,EAAE,OAAO,EACpB,OAAO,CAAC,EAAE,MAAM,GACjB,OAAO,CAAC,+BAA+B,CAAC;CAuC9C;AAED,qBAAa,+BAAgC,SAAQ,wBAAwB;IACzE,OAAO;WAWa,IAAI,CACpB,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,aAAa,EAAE,cAAc,EAC7B,MAAM,EAAE,gBAAgB,EACxB,WAAW,EAAE,WAAW,EACxB,WAAW,EAAE,OAAO,EACpB,OAAO,CAAC,EAAE,MAAM,GACjB,OAAO,CAAC,+BAA+B,CAAC;CA+B9C"}
+{"version":3,"file":"restWrapper.d.ts","sourceRoot":"","sources":["../src/restWrapper.ts"],"names":[],"mappings":"AAAA;;;GAGG;;AAIH,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAEvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oCAAoC,CAAC;AAEtE,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EAGH,WAAW,EACd,MAAM,wCAAwC,CAAC;AAGhD,OAAO,KAAK,EAAE,kBAAkB,EAAuB,MAAM,OAAO,CAAC;AAIrE,OAAO,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAG1C,aAAK,yBAAyB,GAAG,CAAC,OAAO,CAAC,EAAE,OAAO,KAAK,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;AAgBpF,qBAAa,wBAAyB,SAAQ,WAAW;IAMjD,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,sBAAsB;IACvC,OAAO,CAAC,QAAQ,CAAC,WAAW;IAPhC,OAAO,CAAC,mBAAmB,CAAqB;IAChD,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAwB;gBAG7C,MAAM,EAAE,gBAAgB,EACP,WAAW,EAAE,WAAW,EACxB,sBAAsB,EAAE,yBAAyB,EACjD,WAAW,EAAE,OAAO,EACrC,OAAO,CAAC,EAAE,MAAM,EAChB,kBAAkB,GAAE,mBAAwB;IAKnC,IAAI;cAID,OAAO,CAAC,CAAC,EAAE,aAAa,EAAE,kBAAkB,EAAE,UAAU,EAAE,MAAM,EAAE,QAAQ,UAAO,GAAG,OAAO,CAAC,CAAC,CAAC;IAmD9G,OAAO,CAAC,eAAe;CAa1B;AAED,qBAAa,+BAAgC,SAAQ,wBAAwB;IACzE,OAAO;WAWa,IAAI,CACpB,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,EAClB,aAAa,EAAE,cAAc,EAC7B,MAAM,EAAE,gBAAgB,EACxB,WAAW,EAAE,WAAW,EACxB,WAAW,EAAE,OAAO,EACpB,OAAO,CAAC,EAAE,MAAM,GACjB,OAAO,CAAC,+BAA+B,CAAC;CAuC9C;AAED,qBAAa,+BAAgC,SAAQ,wBAAwB;IACzE,OAAO;WAWa,IAAI,CACpB,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,aAAa,EAAE,cAAc,EAC7B,MAAM,EAAE,gBAAgB,EACxB,WAAW,EAAE,WAAW,EACxB,WAAW,EAAE,OAAO,EACpB,OAAO,CAAC,EAAE,MAAM,GACjB,OAAO,CAAC,+BAA+B,CAAC;CA+B9C"}

package/lib/restWrapper.js

@@ -1,3 +1,7 @@
+/*!
+ * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
+ * Licensed under the MIT License.
+ */
 import { fromUtf8ToBase64 } from "@fluidframework/common-utils";
 import { getAuthorizationTokenFromCredentials, RestLessClient, RestWrapper, } from "@fluidframework/server-services-client";
 import { PerformanceEvent } from "@fluidframework/telemetry-utils";

package/lib/restWrapper.js.map

@@ -1 +1 @@
-{"version":3,"file":"restWrapper.js","sourceRoot":"","sources":["../src/restWrapper.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 */\nimport * as querystring from \"querystring\";\nimport { ITelemetryLogger } from \"@fluidframework/common-definitions\";\nimport { fromUtf8ToBase64 } from \"@fluidframework/common-utils\";\nimport { RateLimiter } from \"@fluidframework/driver-utils\";\nimport {\n    getAuthorizationTokenFromCredentials,\n    RestLessClient,\n    RestWrapper,\n} from \"@fluidframework/server-services-client\";\nimport { PerformanceEvent } from \"@fluidframework/telemetry-utils\";\nimport fetch from \"cross-fetch\";\nimport type { AxiosRequestConfig, AxiosRequestHeaders } from \"axios\";\nimport safeStringify from \"json-stringify-safe\";\nimport { v4 as uuid } from \"uuid\";\nimport { throwR11sNetworkError } from \"./errorUtils\";\nimport { ITokenProvider } from \"./tokens\";\nimport { pkgVersion as driverVersion } from \"./packageVersion\";\n\ntype AuthorizationHeaderGetter = (refresh?: boolean) => Promise<string | undefined>;\n\nconst axiosRequestConfigToFetchRequestConfig = (requestConfig: AxiosRequestConfig): [RequestInfo, RequestInit] => {\n    const requestInfo: string = requestConfig.baseURL !== undefined\n        ? `${requestConfig.baseURL}${requestConfig.url ?? \"\"}`\n        : requestConfig.url ?? \"\";\n    const requestInit: RequestInit = {\n        method: requestConfig.method,\n        // NOTE: I believe that although the Axios type permits non-string values in the header, here we are\n        // guaranteed the requestConfig only has string values in its header.\n        headers: requestConfig.headers as Record<string, string>,\n        body: requestConfig.data,\n    };\n    return [requestInfo, requestInit];\n};\n\nexport class RouterliciousRestWrapper extends RestWrapper {\n    private authorizationHeader: string | undefined;\n    private readonly restLess = new RestLessClient();\n\n    constructor(\n        logger: ITelemetryLogger,\n        private readonly rateLimiter: RateLimiter,\n        private readonly getAuthorizationHeader: AuthorizationHeaderGetter,\n        private readonly useRestLess: boolean,\n        baseurl?: string,\n        defaultQueryString: querystring.ParsedUrlQueryInput = {},\n    ) {\n        super(baseurl, defaultQueryString);\n    }\n\n    public async load() {\n        this.authorizationHeader = await this.getAuthorizationHeader();\n    }\n\n    protected async request<T>(requestConfig: AxiosRequestConfig, statusCode: number, canRetry = true): Promise<T> {\n        const config = {\n            ...requestConfig,\n            headers: this.generateHeaders(requestConfig.headers),\n        };\n\n        const translatedConfig = this.useRestLess ? this.restLess.translate(config) : config;\n        const fetchRequestConfig = axiosRequestConfigToFetchRequestConfig(translatedConfig);\n\n        const response: Response = await this.rateLimiter.schedule(async () => fetch(...fetchRequestConfig)\n            .catch(async (error) => {\n                // Browser Fetch throws a TypeError on network error, `node-fetch` throws a FetchError\n                const isNetworkError = [\"TypeError\", \"FetchError\"].includes(error?.name);\n                throwR11sNetworkError(\n                    isNetworkError ? `NetworkError: ${error.message}` : safeStringify(error));\n            }));\n\n        const responseBody: any = response.headers.get(\"content-type\")?.includes(\"application/json\")\n            ? await response.json()\n            : await response.text();\n\n        // Success\n        if (response.ok || response.status === statusCode) {\n            const result: T = responseBody;\n            return result;\n        }\n        // Failure\n        if (response.status === 401 && canRetry) {\n            // Refresh Authorization header and retry once\n            this.authorizationHeader = await this.getAuthorizationHeader(true /* refreshToken */);\n            return this.request<T>(config, statusCode, false);\n        }\n        if (response.status === 429 && responseBody?.retryAfter > 0) {\n            // Retry based on retryAfter[Seconds]\n            return new Promise<T>((resolve, reject) => setTimeout(() => {\n                this.request<T>(config, statusCode)\n                    .then(resolve)\n                    .catch(reject);\n            }, responseBody.retryAfter * 1000));\n        }\n\n        const responseSummary = responseBody !== undefined\n            ? typeof responseBody === \"string\" ? responseBody : safeStringify(responseBody)\n            : response.statusText;\n        throwR11sNetworkError(\n            `R11s fetch error: ${responseSummary}`,\n            response.status,\n            responseBody?.retryAfter,\n        );\n    }\n\n    private generateHeaders(requestHeaders?: AxiosRequestHeaders | undefined): Record<string, string> {\n        const correlationId = requestHeaders?.[\"x-correlation-id\"] ?? uuid();\n\n        return {\n            ...requestHeaders,\n            // TODO: replace header names with CorrelationIdHeaderName and DriverVersionHeaderName from services-client\n            // NOTE: Can correlationId actually be number | true?\n            \"x-correlation-id\": correlationId as string,\n            \"x-driver-version\": driverVersion,\n            // NOTE: If this.authorizationHeader is undefined, should \"Authorization\" be removed entirely?\n            \"Authorization\": this.authorizationHeader!,\n        };\n    }\n}\n\nexport class RouterliciousStorageRestWrapper extends RouterliciousRestWrapper {\n    private constructor(\n        logger: ITelemetryLogger,\n        rateLimiter: RateLimiter,\n        getAuthorizationHeader: AuthorizationHeaderGetter,\n        useRestLess: boolean,\n        baseurl?: string,\n        defaultQueryString: querystring.ParsedUrlQueryInput = {},\n    ) {\n        super(logger, rateLimiter, getAuthorizationHeader, useRestLess, baseurl, defaultQueryString);\n    }\n\n    public static async load(\n        tenantId: string,\n        documentId: string,\n        tokenProvider: ITokenProvider,\n        logger: ITelemetryLogger,\n        rateLimiter: RateLimiter,\n        useRestLess: boolean,\n        baseurl?: string,\n    ): Promise<RouterliciousStorageRestWrapper> {\n        const defaultQueryString = {\n            token: `${fromUtf8ToBase64(tenantId)}`,\n        };\n        const getAuthorizationHeader: AuthorizationHeaderGetter = async (refreshToken?: boolean): Promise<string> => {\n            return PerformanceEvent.timedExecAsync(\n                logger,\n                {\n                    eventName: \"FetchStorageToken\",\n                    docId: documentId,\n                },\n                async () => {\n                    // Craft credentials using tenant id and token\n                    const storageToken = await tokenProvider.fetchStorageToken(\n                        tenantId,\n                        documentId,\n                        refreshToken\n                    );\n                    const credentials = {\n                        password: storageToken.jwt,\n                        user: tenantId,\n                    };\n                    return getAuthorizationTokenFromCredentials(credentials);\n                }\n            );\n        };\n\n        const restWrapper = new RouterliciousStorageRestWrapper(\n            logger, rateLimiter, getAuthorizationHeader, useRestLess, baseurl, defaultQueryString);\n        try {\n            await restWrapper.load();\n        } catch (e) {\n            logger.sendErrorEvent({\n                eventName: \"R11sRestWrapperLoadFailure\",\n            }, e);\n            await restWrapper.load();\n        }\n        return restWrapper;\n    }\n}\n\nexport class RouterliciousOrdererRestWrapper extends RouterliciousRestWrapper {\n    private constructor(\n        logger: ITelemetryLogger,\n        rateLimiter: RateLimiter,\n        getAuthorizationHeader: AuthorizationHeaderGetter,\n        useRestLess: boolean,\n        baseurl?: string,\n        defaultQueryString: querystring.ParsedUrlQueryInput = {},\n    ) {\n        super(logger, rateLimiter, getAuthorizationHeader, useRestLess, baseurl, defaultQueryString);\n    }\n\n    public static async load(\n        tenantId: string,\n        documentId: string | undefined,\n        tokenProvider: ITokenProvider,\n        logger: ITelemetryLogger,\n        rateLimiter: RateLimiter,\n        useRestLess: boolean,\n        baseurl?: string,\n    ): Promise<RouterliciousOrdererRestWrapper> {\n        const getAuthorizationHeader: AuthorizationHeaderGetter = async (refreshToken?: boolean): Promise<string> => {\n            return PerformanceEvent.timedExecAsync(\n                logger,\n                {\n                    eventName: \"FetchOrdererToken\",\n                    docId: documentId,\n                },\n                async () => {\n                    const ordererToken = await tokenProvider.fetchOrdererToken(\n                        tenantId,\n                        documentId,\n                        refreshToken,\n                    );\n                    return `Basic ${ordererToken.jwt}`;\n                }\n            );\n        };\n\n        const restWrapper = new RouterliciousOrdererRestWrapper(\n            logger, rateLimiter, getAuthorizationHeader, useRestLess, baseurl);\n        try {\n            await restWrapper.load();\n        } catch (e) {\n            logger.sendErrorEvent({\n                eventName: \"R11sRestWrapperLoadFailure\",\n            }, e);\n            await restWrapper.load();\n        }\n        return restWrapper;\n    }\n}\n"]}
+{"version":3,"file":"restWrapper.js","sourceRoot":"","sources":["../src/restWrapper.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\n// Just using the type from a node.js module does not introduce a runtime dependency.\n// eslint-disable-next-line import/no-nodejs-modules\nimport type { ParsedUrlQueryInput } from \"querystring\";\n\nimport { ITelemetryLogger } from \"@fluidframework/common-definitions\";\nimport { fromUtf8ToBase64 } from \"@fluidframework/common-utils\";\nimport { RateLimiter } from \"@fluidframework/driver-utils\";\nimport {\n    getAuthorizationTokenFromCredentials,\n    RestLessClient,\n    RestWrapper,\n} from \"@fluidframework/server-services-client\";\nimport { PerformanceEvent } from \"@fluidframework/telemetry-utils\";\nimport fetch from \"cross-fetch\";\nimport type { AxiosRequestConfig, AxiosRequestHeaders } from \"axios\";\nimport safeStringify from \"json-stringify-safe\";\nimport { v4 as uuid } from \"uuid\";\nimport { throwR11sNetworkError } from \"./errorUtils\";\nimport { ITokenProvider } from \"./tokens\";\nimport { pkgVersion as driverVersion } from \"./packageVersion\";\n\ntype AuthorizationHeaderGetter = (refresh?: boolean) => Promise<string | undefined>;\n\nconst axiosRequestConfigToFetchRequestConfig = (requestConfig: AxiosRequestConfig): [RequestInfo, RequestInit] => {\n    const requestInfo: string = requestConfig.baseURL !== undefined\n        ? `${requestConfig.baseURL}${requestConfig.url ?? \"\"}`\n        : requestConfig.url ?? \"\";\n    const requestInit: RequestInit = {\n        method: requestConfig.method,\n        // NOTE: I believe that although the Axios type permits non-string values in the header, here we are\n        // guaranteed the requestConfig only has string values in its header.\n        headers: requestConfig.headers as Record<string, string>,\n        body: requestConfig.data,\n    };\n    return [requestInfo, requestInit];\n};\n\nexport class RouterliciousRestWrapper extends RestWrapper {\n    private authorizationHeader: string | undefined;\n    private readonly restLess = new RestLessClient();\n\n    constructor(\n        logger: ITelemetryLogger,\n        private readonly rateLimiter: RateLimiter,\n        private readonly getAuthorizationHeader: AuthorizationHeaderGetter,\n        private readonly useRestLess: boolean,\n        baseurl?: string,\n        defaultQueryString: ParsedUrlQueryInput = {},\n    ) {\n        super(baseurl, defaultQueryString);\n    }\n\n    public async load() {\n        this.authorizationHeader = await this.getAuthorizationHeader();\n    }\n\n    protected async request<T>(requestConfig: AxiosRequestConfig, statusCode: number, canRetry = true): Promise<T> {\n        const config = {\n            ...requestConfig,\n            headers: this.generateHeaders(requestConfig.headers),\n        };\n\n        const translatedConfig = this.useRestLess ? this.restLess.translate(config) : config;\n        const fetchRequestConfig = axiosRequestConfigToFetchRequestConfig(translatedConfig);\n\n        const response: Response = await this.rateLimiter.schedule(async () => fetch(...fetchRequestConfig)\n            .catch(async (error) => {\n                // Browser Fetch throws a TypeError on network error, `node-fetch` throws a FetchError\n                const isNetworkError = [\"TypeError\", \"FetchError\"].includes(error?.name);\n                throwR11sNetworkError(\n                    isNetworkError ? `NetworkError: ${error.message}` : safeStringify(error));\n            }));\n\n        const responseBody: any = response.headers.get(\"content-type\")?.includes(\"application/json\")\n            ? await response.json()\n            : await response.text();\n\n        // Success\n        if (response.ok || response.status === statusCode) {\n            const result: T = responseBody;\n            return result;\n        }\n        // Failure\n        if (response.status === 401 && canRetry) {\n            // Refresh Authorization header and retry once\n            this.authorizationHeader = await this.getAuthorizationHeader(true /* refreshToken */);\n            return this.request<T>(config, statusCode, false);\n        }\n        if (response.status === 429 && responseBody?.retryAfter > 0) {\n            // Retry based on retryAfter[Seconds]\n            return new Promise<T>((resolve, reject) => setTimeout(() => {\n                this.request<T>(config, statusCode)\n                    .then(resolve)\n                    .catch(reject);\n            }, responseBody.retryAfter * 1000));\n        }\n\n        const responseSummary = responseBody !== undefined\n            ? typeof responseBody === \"string\" ? responseBody : safeStringify(responseBody)\n            : response.statusText;\n        throwR11sNetworkError(\n            `R11s fetch error: ${responseSummary}`,\n            response.status,\n            responseBody?.retryAfter,\n        );\n    }\n\n    private generateHeaders(requestHeaders?: AxiosRequestHeaders | undefined): Record<string, string> {\n        const correlationId = requestHeaders?.[\"x-correlation-id\"] ?? uuid();\n\n        return {\n            ...requestHeaders,\n            // TODO: replace header names with CorrelationIdHeaderName and DriverVersionHeaderName from services-client\n            // NOTE: Can correlationId actually be number | true?\n            \"x-correlation-id\": correlationId as string,\n            \"x-driver-version\": driverVersion,\n            // NOTE: If this.authorizationHeader is undefined, should \"Authorization\" be removed entirely?\n            \"Authorization\": this.authorizationHeader!,\n        };\n    }\n}\n\nexport class RouterliciousStorageRestWrapper extends RouterliciousRestWrapper {\n    private constructor(\n        logger: ITelemetryLogger,\n        rateLimiter: RateLimiter,\n        getAuthorizationHeader: AuthorizationHeaderGetter,\n        useRestLess: boolean,\n        baseurl?: string,\n        defaultQueryString: ParsedUrlQueryInput = {},\n    ) {\n        super(logger, rateLimiter, getAuthorizationHeader, useRestLess, baseurl, defaultQueryString);\n    }\n\n    public static async load(\n        tenantId: string,\n        documentId: string,\n        tokenProvider: ITokenProvider,\n        logger: ITelemetryLogger,\n        rateLimiter: RateLimiter,\n        useRestLess: boolean,\n        baseurl?: string,\n    ): Promise<RouterliciousStorageRestWrapper> {\n        const defaultQueryString = {\n            token: `${fromUtf8ToBase64(tenantId)}`,\n        };\n        const getAuthorizationHeader: AuthorizationHeaderGetter = async (refreshToken?: boolean): Promise<string> => {\n            return PerformanceEvent.timedExecAsync(\n                logger,\n                {\n                    eventName: \"FetchStorageToken\",\n                    docId: documentId,\n                },\n                async () => {\n                    // Craft credentials using tenant id and token\n                    const storageToken = await tokenProvider.fetchStorageToken(\n                        tenantId,\n                        documentId,\n                        refreshToken\n                    );\n                    const credentials = {\n                        password: storageToken.jwt,\n                        user: tenantId,\n                    };\n                    return getAuthorizationTokenFromCredentials(credentials);\n                }\n            );\n        };\n\n        const restWrapper = new RouterliciousStorageRestWrapper(\n            logger, rateLimiter, getAuthorizationHeader, useRestLess, baseurl, defaultQueryString);\n        try {\n            await restWrapper.load();\n        } catch (e) {\n            logger.sendErrorEvent({\n                eventName: \"R11sRestWrapperLoadFailure\",\n            }, e);\n            await restWrapper.load();\n        }\n        return restWrapper;\n    }\n}\n\nexport class RouterliciousOrdererRestWrapper extends RouterliciousRestWrapper {\n    private constructor(\n        logger: ITelemetryLogger,\n        rateLimiter: RateLimiter,\n        getAuthorizationHeader: AuthorizationHeaderGetter,\n        useRestLess: boolean,\n        baseurl?: string,\n        defaultQueryString: ParsedUrlQueryInput = {},\n    ) {\n        super(logger, rateLimiter, getAuthorizationHeader, useRestLess, baseurl, defaultQueryString);\n    }\n\n    public static async load(\n        tenantId: string,\n        documentId: string | undefined,\n        tokenProvider: ITokenProvider,\n        logger: ITelemetryLogger,\n        rateLimiter: RateLimiter,\n        useRestLess: boolean,\n        baseurl?: string,\n    ): Promise<RouterliciousOrdererRestWrapper> {\n        const getAuthorizationHeader: AuthorizationHeaderGetter = async (refreshToken?: boolean): Promise<string> => {\n            return PerformanceEvent.timedExecAsync(\n                logger,\n                {\n                    eventName: \"FetchOrdererToken\",\n                    docId: documentId,\n                },\n                async () => {\n                    const ordererToken = await tokenProvider.fetchOrdererToken(\n                        tenantId,\n                        documentId,\n                        refreshToken,\n                    );\n                    return `Basic ${ordererToken.jwt}`;\n                }\n            );\n        };\n\n        const restWrapper = new RouterliciousOrdererRestWrapper(\n            logger, rateLimiter, getAuthorizationHeader, useRestLess, baseurl);\n        try {\n            await restWrapper.load();\n        } catch (e) {\n            logger.sendErrorEvent({\n                eventName: \"R11sRestWrapperLoadFailure\",\n            }, e);\n            await restWrapper.load();\n        }\n        return restWrapper;\n    }\n}\n"]}

package/lib/urlUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"urlUtils.d.ts","sourceRoot":"","sources":["../src/urlUtils.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAC;AACvE,OAAO,QAAQ,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,QAAQ,EAAE,MAAM,wCAAwC,CAAC;AAElE,eAAO,MAAM,aAAa,aAAc,MAAM,KAAG,QAEhD,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,uBAAuB,YAAa,MAAM,cAAc,MAAM,KAAG,MACZ,CAAC;AAEnE,eAAO,MAAM,6BAA6B,gBAAiB,iBAAiB,WAAW,QAAQ,KAAG,iBA2BjG,CAAC"}
+{"version":3,"file":"urlUtils.d.ts","sourceRoot":"","sources":["../src/urlUtils.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAC;AACvE,OAAO,QAAQ,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,QAAQ,EAAE,MAAM,wCAAwC,CAAC;AAElE,eAAO,MAAM,aAAa,aAAc,MAAM,KAAG,QAEhD,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,uBAAuB,YAAa,MAAM,cAAc,MAAM,KAAG,MACZ,CAAC;AAEnE,eAAO,MAAM,6BAA6B,gBAAiB,iBAAiB,WAAW,QAAQ,KAAG,iBAuBjG,CAAC"}

package/lib/urlUtils.js

@@ -14,29 +14,25 @@ export const parseFluidUrl = (fluidUrl) => {
  */
 export const replaceDocumentIdInPath = (urlPath, documentId) => urlPath.split("/").slice(0, -1).concat([documentId]).join("/");
 export const getDiscoveredFluidResolvedUrl = (resolvedUrl, session) => {
-    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 = {
-            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;
-    }
+    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 = {
+        endpoints: {
+            deltaStorageUrl: deltaStorageUrl.toString(),
+            ordererUrl: session.ordererUrl,
+            deltaStreamUrl: session.deltaStreamUrl,
+            storageUrl: storageUrl.toString(),
+        },
+        id: resolvedUrl.id,
+        tokens: resolvedUrl.tokens,
+        type: resolvedUrl.type,
+        url: new URLParse(`fluid://${discoveredOrdererUrl.host}${parsedUrl.pathname}`).toString(),
+    };
+    return discoveredResolvedUrl;
 };
 //# sourceMappingURL=urlUtils.js.map

package/lib/urlUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"urlUtils.js","sourceRoot":"","sources":["../src/urlUtils.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,QAAQ,MAAM,WAAW,CAAC;AAGjC,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,QAAgB,EAAY,EAAE;IACxD,OAAO,IAAI,QAAQ,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;AACxC,CAAC,CAAC;AAEF;;;;;GAKG;AACH,MAAM,CAAC,MAAM,uBAAuB,GAAG,CAAC,OAAe,EAAE,UAAkB,EAAU,EAAE,CACnF,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAEnE,MAAM,CAAC,MAAM,6BAA6B,GAAG,CAAC,WAA8B,EAAE,OAAiB,EAAqB,EAAE;IAClH,IAAI,OAAO,EAAE;QACT,MAAM,oBAAoB,GAAG,IAAI,QAAQ,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QAC9D,MAAM,eAAe,GAAG,IAAI,QAAQ,CAAC,WAAW,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC;QAC5E,eAAe,CAAC,GAAG,CAAC,MAAM,EAAE,oBAAoB,CAAC,IAAI,CAAC,CAAC;QAEvD,MAAM,oBAAoB,GAAG,IAAI,QAAQ,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;QAChE,MAAM,UAAU,GAAG,IAAI,QAAQ,CAAC,WAAW,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;QAClE,UAAU,CAAC,GAAG,CAAC,MAAM,EAAE,oBAAoB,CAAC,IAAI,CAAC,CAAC;QAElD,MAAM,SAAS,GAAG,aAAa,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;QACjD,MAAM,qBAAqB,GAAsB;YAC7C,SAAS,EAAE;gBACP,eAAe,EAAE,eAAe,CAAC,QAAQ,EAAE;gBAC3C,UAAU,EAAE,OAAO,CAAC,UAAU;gBAC9B,UAAU,EAAE,UAAU,CAAC,QAAQ,EAAE;aACpC;YACD,EAAE,EAAE,WAAW,CAAC,EAAE;YAClB,MAAM,EAAE,WAAW,CAAC,MAAM;YAC1B,IAAI,EAAE,WAAW,CAAC,IAAI;YACtB,GAAG,EAAE,IAAI,QAAQ,CAAC,WAAW,oBAAoB,CAAC,IAAI,GAAG,SAAS,CAAC,QAAQ,EAAE,CAAC,CAAC,QAAQ,EAAE;SAC5F,CAAC;QAEF,OAAO,qBAAqB,CAAC;KAChC;SAAM;QACH,OAAO,WAAW,CAAC;KACtB;AACL,CAAC,CAAC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { IFluidResolvedUrl } from \"@fluidframework/driver-definitions\";\nimport URLParse from \"url-parse\";\nimport { ISession } from \"@fluidframework/server-services-client\";\n\nexport const parseFluidUrl = (fluidUrl: string): URLParse => {\n    return new URLParse(fluidUrl, true);\n};\n\n/**\n * Assume documentId is at end of url path.\n * This is true for Routerlicious' and Tinylicious' documentUrl and deltaStorageUrl.\n * Routerlicious and Tinylicious do not use documentId in storageUrl nor ordererUrl.\n * TODO: Ideally we would be able to regenerate the resolvedUrl, rather than patching the current one.\n */\nexport const replaceDocumentIdInPath = (urlPath: string, documentId: string): string =>\n    urlPath.split(\"/\").slice(0, -1).concat([documentId]).join(\"/\");\n\nexport const getDiscoveredFluidResolvedUrl = (resolvedUrl: IFluidResolvedUrl, session: ISession): IFluidResolvedUrl => {\n    if (session) {\n        const discoveredOrdererUrl = new URLParse(session.ordererUrl);\n        const deltaStorageUrl = new URLParse(resolvedUrl.endpoints.deltaStorageUrl);\n        deltaStorageUrl.set(\"host\", discoveredOrdererUrl.host);\n\n        const discoveredStorageUrl = new URLParse(session.historianUrl);\n        const storageUrl = new URLParse(resolvedUrl.endpoints.storageUrl);\n        storageUrl.set(\"host\", discoveredStorageUrl.host);\n\n        const parsedUrl = parseFluidUrl(resolvedUrl.url);\n        const discoveredResolvedUrl: IFluidResolvedUrl = {\n            endpoints: {\n                deltaStorageUrl: deltaStorageUrl.toString(),\n                ordererUrl: session.ordererUrl,\n                storageUrl: storageUrl.toString(),\n            },\n            id: resolvedUrl.id,\n            tokens: resolvedUrl.tokens,\n            type: resolvedUrl.type,\n            url: new URLParse(`fluid://${discoveredOrdererUrl.host}${parsedUrl.pathname}`).toString(),\n        };\n\n        return discoveredResolvedUrl;\n    } else {\n        return resolvedUrl;\n    }\n};\n"]}
+{"version":3,"file":"urlUtils.js","sourceRoot":"","sources":["../src/urlUtils.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,QAAQ,MAAM,WAAW,CAAC;AAGjC,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,QAAgB,EAAY,EAAE;IACxD,OAAO,IAAI,QAAQ,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;AACxC,CAAC,CAAC;AAEF;;;;;GAKG;AACH,MAAM,CAAC,MAAM,uBAAuB,GAAG,CAAC,OAAe,EAAE,UAAkB,EAAU,EAAE,CACnF,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAEnE,MAAM,CAAC,MAAM,6BAA6B,GAAG,CAAC,WAA8B,EAAE,OAAiB,EAAqB,EAAE;IAClH,MAAM,oBAAoB,GAAG,IAAI,QAAQ,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IAC9D,MAAM,eAAe,GAAG,IAAI,QAAQ,CAAC,WAAW,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC;IAC5E,eAAe,CAAC,GAAG,CAAC,MAAM,EAAE,oBAAoB,CAAC,IAAI,CAAC,CAAC;IAEvD,MAAM,oBAAoB,GAAG,IAAI,QAAQ,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;IAChE,MAAM,UAAU,GAAG,IAAI,QAAQ,CAAC,WAAW,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;IAClE,UAAU,CAAC,GAAG,CAAC,MAAM,EAAE,oBAAoB,CAAC,IAAI,CAAC,CAAC;IAElD,MAAM,SAAS,GAAG,aAAa,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;IACjD,MAAM,qBAAqB,GAAsB;QAC7C,SAAS,EAAE;YACP,eAAe,EAAE,eAAe,CAAC,QAAQ,EAAE;YAC3C,UAAU,EAAE,OAAO,CAAC,UAAU;YAC9B,cAAc,EAAE,OAAO,CAAC,cAAc;YACtC,UAAU,EAAE,UAAU,CAAC,QAAQ,EAAE;SACpC;QACD,EAAE,EAAE,WAAW,CAAC,EAAE;QAClB,MAAM,EAAE,WAAW,CAAC,MAAM;QAC1B,IAAI,EAAE,WAAW,CAAC,IAAI;QACtB,GAAG,EAAE,IAAI,QAAQ,CAAC,WAAW,oBAAoB,CAAC,IAAI,GAAG,SAAS,CAAC,QAAQ,EAAE,CAAC,CAAC,QAAQ,EAAE;KAC5F,CAAC;IACF,OAAO,qBAAqB,CAAC;AACjC,CAAC,CAAC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { IFluidResolvedUrl } from \"@fluidframework/driver-definitions\";\nimport URLParse from \"url-parse\";\nimport { ISession } from \"@fluidframework/server-services-client\";\n\nexport const parseFluidUrl = (fluidUrl: string): URLParse => {\n    return new URLParse(fluidUrl, true);\n};\n\n/**\n * Assume documentId is at end of url path.\n * This is true for Routerlicious' and Tinylicious' documentUrl and deltaStorageUrl.\n * Routerlicious and Tinylicious do not use documentId in storageUrl nor ordererUrl.\n * TODO: Ideally we would be able to regenerate the resolvedUrl, rather than patching the current one.\n */\nexport const replaceDocumentIdInPath = (urlPath: string, documentId: string): string =>\n    urlPath.split(\"/\").slice(0, -1).concat([documentId]).join(\"/\");\n\nexport const getDiscoveredFluidResolvedUrl = (resolvedUrl: IFluidResolvedUrl, session: ISession): IFluidResolvedUrl => {\n    const discoveredOrdererUrl = new URLParse(session.ordererUrl);\n    const deltaStorageUrl = new URLParse(resolvedUrl.endpoints.deltaStorageUrl);\n    deltaStorageUrl.set(\"host\", discoveredOrdererUrl.host);\n\n    const discoveredStorageUrl = new URLParse(session.historianUrl);\n    const storageUrl = new URLParse(resolvedUrl.endpoints.storageUrl);\n    storageUrl.set(\"host\", discoveredStorageUrl.host);\n\n    const parsedUrl = parseFluidUrl(resolvedUrl.url);\n    const discoveredResolvedUrl: IFluidResolvedUrl = {\n        endpoints: {\n            deltaStorageUrl: deltaStorageUrl.toString(),\n            ordererUrl: session.ordererUrl,\n            deltaStreamUrl: session.deltaStreamUrl,\n            storageUrl: storageUrl.toString(),\n        },\n        id: resolvedUrl.id,\n        tokens: resolvedUrl.tokens,\n        type: resolvedUrl.type,\n        url: new URLParse(`fluid://${discoveredOrdererUrl.host}${parsedUrl.pathname}`).toString(),\n    };\n    return discoveredResolvedUrl;\n};\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluidframework/routerlicious-driver",
-  "version": "2.0.0-internal.2.1.2",
+  "version": "2.0.0-internal.2.2.0",
   "description": "Socket.IO + Git implementation of Fluid service API",
   "homepage": "https://fluidframework.com",
   "repository": {
@@ -28,8 +28,11 @@
     "clean": "rimraf dist lib *.tsbuildinfo *.build.log",
     "eslint": "eslint --format stylish src",
     "eslint:fix": "eslint --format stylish src --fix --fix-type problem,suggestion,layout",
+    "format": "npm run prettier:fix",
     "lint": "npm run eslint",
     "lint:fix": "npm run eslint:fix",
+    "prettier": "prettier --check . --ignore-path ../../../.prettierignore",
+    "prettier:fix": "prettier --write . --ignore-path ../../../.prettierignore",
     "test": "npm run test:mocha",
     "test:coverage": "nyc npm test -- --reporter xunit --reporter-option output=nyc/junit-report.xml",
     "test:mocha": "mocha --ignore 'dist/test/types/*' --recursive dist/test -r node_modules/@fluidframework/mocha-test-setup --unhandled-rejections=strict",
@@ -61,14 +64,14 @@
   "dependencies": {
     "@fluidframework/common-definitions": "^0.20.1",
     "@fluidframework/common-utils": "^1.0.0",
-    "@fluidframework/driver-base": ">=2.0.0-internal.2.1.2 <2.0.0-internal.3.0.0",
-    "@fluidframework/driver-definitions": ">=2.0.0-internal.2.1.2 <2.0.0-internal.3.0.0",
-    "@fluidframework/driver-utils": ">=2.0.0-internal.2.1.2 <2.0.0-internal.3.0.0",
+    "@fluidframework/driver-base": ">=2.0.0-internal.2.2.0 <2.0.0-internal.3.0.0",
+    "@fluidframework/driver-definitions": ">=2.0.0-internal.2.2.0 <2.0.0-internal.3.0.0",
+    "@fluidframework/driver-utils": ">=2.0.0-internal.2.2.0 <2.0.0-internal.3.0.0",
     "@fluidframework/gitresources": "^0.1038.2000",
     "@fluidframework/protocol-base": "^0.1038.2000",
     "@fluidframework/protocol-definitions": "^1.1.0",
     "@fluidframework/server-services-client": "^0.1038.2000",
-    "@fluidframework/telemetry-utils": ">=2.0.0-internal.2.1.2 <2.0.0-internal.3.0.0",
+    "@fluidframework/telemetry-utils": ">=2.0.0-internal.2.2.0 <2.0.0-internal.3.0.0",
     "cross-fetch": "^3.1.5",
     "json-stringify-safe": "5.0.1",
     "querystring": "^0.2.0",
@@ -77,12 +80,12 @@
     "uuid": "^8.3.1"
   },
   "devDependencies": {
-    "@fluid-tools/build-cli": "^0.6.0",
+    "@fluid-tools/build-cli": "^0.7.0",
     "@fluidframework/build-common": "^1.1.0",
-    "@fluidframework/build-tools": "^0.6.0",
+    "@fluidframework/build-tools": "^0.7.0",
     "@fluidframework/eslint-config-fluid": "^1.2.0",
-    "@fluidframework/mocha-test-setup": ">=2.0.0-internal.2.1.2 <2.0.0-internal.3.0.0",
-    "@fluidframework/routerlicious-driver-previous": "npm:@fluidframework/routerlicious-driver@2.0.0-internal.2.1.1",
+    "@fluidframework/mocha-test-setup": ">=2.0.0-internal.2.2.0 <2.0.0-internal.3.0.0",
+    "@fluidframework/routerlicious-driver-previous": "npm:@fluidframework/routerlicious-driver@2.0.0-internal.2.1.0",
     "@microsoft/api-extractor": "^7.22.2",
     "@rushstack/eslint-config": "^2.5.1",
     "@types/mocha": "^9.1.1",
@@ -97,12 +100,14 @@
     "mocha": "^10.0.0",
     "nock": "^10.0.1",
     "nyc": "^15.0.0",
+    "prettier": "~2.6.2",
     "rimraf": "^2.6.2",
     "typescript": "~4.5.5"
   },
   "typeValidation": {
-    "version": "2.0.0-internal.2.1.2",
-    "baselineRange": "2.0.0-internal.2.1.1",
+    "version": "2.0.0-internal.2.2.0",
+    "baselineRange": ">=2.0.0-internal.2.1.0 <2.0.0-internal.2.2.0",
+    "baselineVersion": "2.0.0-internal.2.1.0",
     "broken": {}
   }
 }

package/prettier.config.cjs

@@ -0,0 +1,8 @@
+/*!
+ * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
+ * Licensed under the MIT License.
+ */
+
+module.exports = {
+    ...require("@fluidframework/build-common/prettier.config.cjs"),
+};

package/src/deltaStorageService.ts

@@ -26,7 +26,8 @@ export class DocumentDeltaStorageService implements IDocumentDeltaStorageService
         private readonly tenantId: string,
         private readonly id: string,
         private readonly deltaStorageService: IDeltaStorageService,
-        private readonly documentStorageService: DocumentStorageService) {
+        private readonly documentStorageService: DocumentStorageService,
+        private readonly logger: ITelemetryLogger) {
     }
 
     private logtailSha: string | undefined = this.documentStorageService.logTailSha;
@@ -61,11 +62,20 @@ export class DocumentDeltaStorageService implements IDocumentDeltaStorageService
 
         this.logtailSha = undefined;
         if (opsFromLogTail.length > 0) {
-            const messages = opsFromLogTail.filter((op) =>
-                op.sequenceNumber >= from,
-            );
-            if (messages.length > 0) {
-                return { messages, partialResult: true };
+            try {
+                const messages = opsFromLogTail.filter((op, i) => {
+                    // throw if the sequence numbers in logtail are not contiguous
+                    if (i > 0 && op.sequenceNumber !== opsFromLogTail[i - 1].sequenceNumber + 1) {
+                        throw new Error("Log tail ops are not contiguous");
+                    }
+                    return op.sequenceNumber >= from;
+                });
+                
+                if (messages.length > 0 && messages[0].sequenceNumber === from) {
+                    return { messages, partialResult: true };
+                }     
+            } catch (error) {
+                this.logger.sendErrorEvent({ eventName: "LogTailReadError" }, error);
             }
         }
 

package/src/documentService.ts

@@ -176,6 +176,7 @@ export class DocumentService implements api.IDocumentService {
             this.documentId,
             deltaStorageService,
             this.documentStorageService,
+            this.logger,
         );
     }
 
@@ -266,7 +267,6 @@ export class DocumentService implements api.IDocumentService {
         this.ordererUrl = fluidResolvedUrl.endpoints.ordererUrl;
         this.deltaStorageUrl = fluidResolvedUrl.endpoints.deltaStorageUrl;
         this.deltaStreamUrl = fluidResolvedUrl.endpoints.deltaStreamUrl || this.ordererUrl;
-        this.lastDiscoveredAt = Date.now();
     }
 
     /**
@@ -282,6 +282,15 @@ export class DocumentService implements api.IDocumentService {
         // 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;
+        if (pastLastDiscoveryTimeThreshold) {
+            // Reset discover promise and refresh discovery.
+            this.lastDiscoveredAt = Date.now();
+            this.discoverP = undefined;
+            this.refreshDiscovery().catch(() => {
+                // Undo discovery time set on failure, so that next check refreshes.
+                this.lastDiscoveredAt = 0;
+            });
+        }
         return pastLastDiscoveryTimeThreshold;
     }
 }

package/src/packageVersion.ts

@@ -6,4 +6,4 @@
  */
 
 export const pkgName = "@fluidframework/routerlicious-driver";
-export const pkgVersion = "2.0.0-internal.2.1.2";
+export const pkgVersion = "2.0.0-internal.2.2.0";

package/src/restWrapper.ts

@@ -2,7 +2,11 @@
  * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
  * Licensed under the MIT License.
  */
-import * as querystring from "querystring";
+
+// Just using the type from a node.js module does not introduce a runtime dependency.
+// eslint-disable-next-line import/no-nodejs-modules
+import type { ParsedUrlQueryInput } from "querystring";
+
 import { ITelemetryLogger } from "@fluidframework/common-definitions";
 import { fromUtf8ToBase64 } from "@fluidframework/common-utils";
 import { RateLimiter } from "@fluidframework/driver-utils";
@@ -46,7 +50,7 @@ export class RouterliciousRestWrapper extends RestWrapper {
         private readonly getAuthorizationHeader: AuthorizationHeaderGetter,
         private readonly useRestLess: boolean,
         baseurl?: string,
-        defaultQueryString: querystring.ParsedUrlQueryInput = {},
+        defaultQueryString: ParsedUrlQueryInput = {},
     ) {
         super(baseurl, defaultQueryString);
     }
@@ -128,7 +132,7 @@ export class RouterliciousStorageRestWrapper extends RouterliciousRestWrapper {
         getAuthorizationHeader: AuthorizationHeaderGetter,
         useRestLess: boolean,
         baseurl?: string,
-        defaultQueryString: querystring.ParsedUrlQueryInput = {},
+        defaultQueryString: ParsedUrlQueryInput = {},
     ) {
         super(logger, rateLimiter, getAuthorizationHeader, useRestLess, baseurl, defaultQueryString);
     }
@@ -189,7 +193,7 @@ export class RouterliciousOrdererRestWrapper extends RouterliciousRestWrapper {
         getAuthorizationHeader: AuthorizationHeaderGetter,
         useRestLess: boolean,
         baseurl?: string,
-        defaultQueryString: querystring.ParsedUrlQueryInput = {},
+        defaultQueryString: ParsedUrlQueryInput = {},
     ) {
         super(logger, rateLimiter, getAuthorizationHeader, useRestLess, baseurl, defaultQueryString);
     }

package/src/urlUtils.ts

@@ -21,30 +21,26 @@ export const replaceDocumentIdInPath = (urlPath: string, documentId: string): st
     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 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 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;
-    }
+    const parsedUrl = parseFluidUrl(resolvedUrl.url);
+    const discoveredResolvedUrl: IFluidResolvedUrl = {
+        endpoints: {
+            deltaStorageUrl: deltaStorageUrl.toString(),
+            ordererUrl: session.ordererUrl,
+            deltaStreamUrl: session.deltaStreamUrl,
+            storageUrl: storageUrl.toString(),
+        },
+        id: resolvedUrl.id,
+        tokens: resolvedUrl.tokens,
+        type: resolvedUrl.type,
+        url: new URLParse(`fluid://${discoveredOrdererUrl.host}${parsedUrl.pathname}`).toString(),
+    };
+    return discoveredResolvedUrl;
 };