@fluidframework/odsp-driver 1.2.7 → 2.0.0-dev.1.3.0.96595

package/lib/odspDocumentServiceFactoryCore.js

@@ -4,6 +4,7 @@
  */
 import { PerformanceEvent, } from "@fluidframework/telemetry-utils";
 import { getDocAttributesFromProtocolSummary, ensureFluidResolvedUrl, } from "@fluidframework/driver-utils";
+import { SharingLinkScope, SharingLinkRole, ShareLinkTypes, } from "@fluidframework/odsp-driver-definitions";
 import { v4 as uuid } from "uuid";
 import { LocalPersistentCache, NonPersistentCache, } from "./odspCache";
 import { createOdspCacheAndTracker, } from "./epochTracker";
@@ -46,7 +47,6 @@ export class OdspDocumentServiceFactoryCore {
         this.hostPolicy.sessionOptions = Object.assign({ forceAccessTokenViaAuthorizationHeader: true }, this.hostPolicy.sessionOptions);
     }
     async createContainer(createNewSummary, createNewResolvedUrl, logger, clientIsSummarizer) {
-        var _a, _b;
         ensureFluidResolvedUrl(createNewResolvedUrl);
         let odspResolvedUrl = getOdspResolvedUrl(createNewResolvedUrl);
         const resolvedUrlData = {
@@ -67,15 +67,13 @@ export class OdspDocumentServiceFactoryCore {
                 throw new Error("Seq number in detached ODSP container should be 0");
             }
         }
+        const createShareLinkParam = getSharingLinkParams(this.hostPolicy, searchParams);
         const newFileInfo = {
             driveId: odspResolvedUrl.driveId,
             siteUrl: odspResolvedUrl.siteUrl,
             filePath,
             filename: odspResolvedUrl.fileName,
-            // set createLinkType to undefined if enableShareLinkWithCreate is set to false,
-            // so that share link creation with create file can be enabled
-            createLinkType: this.hostPolicy.enableShareLinkWithCreate ?
-                (_b = (_a = odspResolvedUrl.shareLinkInfo) === null || _a === void 0 ? void 0 : _a.createLink) === null || _b === void 0 ? void 0 : _b.type : undefined,
+            createLinkType: createShareLinkParam,
         };
         const odspLogger = createOdspLogger(logger);
         const fileEntry = { resolvedUrl: odspResolvedUrl, docId: odspResolvedUrl.hashedDocumentId };
@@ -83,9 +81,12 @@ export class OdspDocumentServiceFactoryCore {
         return PerformanceEvent.timedExecAsync(odspLogger, {
             eventName: "CreateNew",
             isWithSummaryUpload: true,
+            createShareLinkParam: JSON.stringify(createShareLinkParam),
+            enableShareLinkWithCreate: this.hostPolicy.enableShareLinkWithCreate,
+            enableSingleRequestForShareLinkWithCreate: this.hostPolicy.enableSingleRequestForShareLinkWithCreate,
         }, async (event) => {
             var _a, _b;
-            odspResolvedUrl = await createNewFluidFile(toInstrumentedOdspTokenFetcher(odspLogger, resolvedUrlData, this.getStorageToken, true /* throwOnNullToken */), newFileInfo, odspLogger, createNewSummary, cacheAndTracker.epochTracker, fileEntry, (_a = this.hostPolicy.cacheCreateNewSummary) !== null && _a !== void 0 ? _a : true, !!((_b = this.hostPolicy.sessionOptions) === null || _b === void 0 ? void 0 : _b.forceAccessTokenViaAuthorizationHeader), odspResolvedUrl.isClpCompliantApp);
+            odspResolvedUrl = await createNewFluidFile(toInstrumentedOdspTokenFetcher(odspLogger, resolvedUrlData, this.getStorageToken, true /* throwOnNullToken */), newFileInfo, odspLogger, createNewSummary, cacheAndTracker.epochTracker, fileEntry, (_a = this.hostPolicy.cacheCreateNewSummary) !== null && _a !== void 0 ? _a : true, !!((_b = this.hostPolicy.sessionOptions) === null || _b === void 0 ? void 0 : _b.forceAccessTokenViaAuthorizationHeader), odspResolvedUrl.isClpCompliantApp, this.hostPolicy.enableSingleRequestForShareLinkWithCreate, this.hostPolicy.enableShareLinkWithCreate);
             const docService = this.createDocumentServiceCore(odspResolvedUrl, odspLogger, cacheAndTracker, clientIsSummarizer);
             event.end({
                 docId: odspResolvedUrl.hashedDocumentId,
@@ -111,4 +112,26 @@ export class OdspDocumentServiceFactoryCore {
         return OdspDocumentService.create(resolvedUrl, storageTokenFetcher, webSocketTokenFetcher, odspLogger, this.getSocketIOClient, cacheAndTracker.cache, this.hostPolicy, cacheAndTracker.epochTracker, this.socketReferenceKeyPrefix, clientIsSummarizer);
     }
 }
+/**
+ * Extract the sharing link kind from the resolved URL's query paramerters
+ */
+function getSharingLinkParams(hostPolicy, searchParams) {
+    // extract request parameters for creation of sharing link (if provided) if the feature is enabled
+    let createShareLinkParam;
+    if (hostPolicy.enableSingleRequestForShareLinkWithCreate) {
+        const createLinkScope = searchParams.get("createLinkScope");
+        const createLinkRole = searchParams.get("createLinkRole");
+        if (createLinkScope && SharingLinkScope[createLinkScope]) {
+            createShareLinkParam = Object.assign({ scope: SharingLinkScope[createLinkScope] }, (createLinkRole && SharingLinkRole[createLinkRole] ?
+                { role: SharingLinkRole[createLinkRole] } : {}));
+        }
+    }
+    else if (hostPolicy.enableShareLinkWithCreate) {
+        const createLinkType = searchParams.get("createLinkType");
+        if (createLinkType && ShareLinkTypes[createLinkType]) {
+            createShareLinkParam = ShareLinkTypes[createLinkType || ""];
+        }
+    }
+    return createShareLinkParam;
+}
 //# sourceMappingURL=odspDocumentServiceFactoryCore.js.map

package/lib/odspDocumentServiceFactoryCore.js.map

@@ -1 +1 @@
-{"version":3,"file":"odspDocumentServiceFactoryCore.js","sourceRoot":"","sources":["../src/odspDocumentServiceFactoryCore.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 { ITelemetryBaseLogger } from \"@fluidframework/common-definitions\";\nimport {\n    IDocumentService,\n    IDocumentServiceFactory,\n    IResolvedUrl,\n} from \"@fluidframework/driver-definitions\";\nimport { ISummaryTree } from \"@fluidframework/protocol-definitions\";\nimport {\n    TelemetryLogger,\n    PerformanceEvent,\n} from \"@fluidframework/telemetry-utils\";\nimport {\n    getDocAttributesFromProtocolSummary,\n    ensureFluidResolvedUrl,\n} from \"@fluidframework/driver-utils\";\nimport {\n    TokenFetchOptions,\n    OdspResourceTokenFetchOptions,\n    TokenFetcher,\n    IPersistedCache,\n    HostStoragePolicy,\n    IFileEntry,\n    IOdspUrlParts,\n} from \"@fluidframework/odsp-driver-definitions\";\nimport type { io as SocketIOClientStatic } from \"socket.io-client\";\nimport { v4 as uuid } from \"uuid\";\nimport {\n    LocalPersistentCache,\n    NonPersistentCache,\n} from \"./odspCache\";\nimport {\n    createOdspCacheAndTracker,\n    ICacheAndTracker,\n} from \"./epochTracker\";\nimport { OdspDocumentService } from \"./odspDocumentService\";\nimport { INewFileInfo, getOdspResolvedUrl, createOdspLogger, toInstrumentedOdspTokenFetcher } from \"./odspUtils\";\nimport { createNewFluidFile } from \"./createFile\";\n\n/**\n * Factory for creating the sharepoint document service. Use this if you want to\n * use the sharepoint implementation.\n *\n * This constructor should be used by environments that support dynamic imports and that wish\n * to leverage code splitting as a means to keep bundles as small as possible.\n */\nexport class OdspDocumentServiceFactoryCore implements IDocumentServiceFactory {\n    public readonly protocolName = \"fluid-odsp:\";\n\n    private readonly nonPersistentCache = new NonPersistentCache();\n    private readonly socketReferenceKeyPrefix?: string;\n\n    public async createContainer(\n        createNewSummary: ISummaryTree | undefined,\n        createNewResolvedUrl: IResolvedUrl,\n        logger?: ITelemetryBaseLogger,\n        clientIsSummarizer?: boolean,\n    ): Promise<IDocumentService> {\n        ensureFluidResolvedUrl(createNewResolvedUrl);\n\n        let odspResolvedUrl = getOdspResolvedUrl(createNewResolvedUrl);\n        const resolvedUrlData: IOdspUrlParts = {\n            siteUrl: odspResolvedUrl.siteUrl,\n            driveId: odspResolvedUrl.driveId,\n            itemId: odspResolvedUrl.itemId,\n        };\n        const [, queryString] = odspResolvedUrl.url.split(\"?\");\n\n        const searchParams = new URLSearchParams(queryString);\n        const filePath = searchParams.get(\"path\");\n        if (filePath === undefined || filePath === null) {\n            throw new Error(\"File path should be provided!!\");\n        }\n\n        const protocolSummary = createNewSummary?.tree[\".protocol\"];\n        if (protocolSummary) {\n            const documentAttributes = getDocAttributesFromProtocolSummary(protocolSummary as ISummaryTree);\n            if (documentAttributes?.sequenceNumber !== 0) {\n                throw new Error(\"Seq number in detached ODSP container should be 0\");\n            }\n        }\n\n        const newFileInfo: INewFileInfo = {\n            driveId: odspResolvedUrl.driveId,\n            siteUrl: odspResolvedUrl.siteUrl,\n            filePath,\n            filename: odspResolvedUrl.fileName,\n            // set createLinkType to undefined if enableShareLinkWithCreate is set to false,\n            // so that share link creation with create file can be enabled\n            createLinkType: this.hostPolicy.enableShareLinkWithCreate ?\n            odspResolvedUrl.shareLinkInfo?.createLink?.type : undefined,\n        };\n\n        const odspLogger = createOdspLogger(logger);\n\n        const fileEntry: IFileEntry = { resolvedUrl: odspResolvedUrl, docId: odspResolvedUrl.hashedDocumentId };\n        const cacheAndTracker = createOdspCacheAndTracker(\n            this.persistedCache,\n            this.nonPersistentCache,\n            fileEntry,\n            odspLogger,\n            clientIsSummarizer);\n\n        return PerformanceEvent.timedExecAsync(\n            odspLogger,\n            {\n                eventName: \"CreateNew\",\n                isWithSummaryUpload: true,\n            },\n            async (event) => {\n                odspResolvedUrl = await createNewFluidFile(\n                    toInstrumentedOdspTokenFetcher(\n                        odspLogger,\n                        resolvedUrlData,\n                        this.getStorageToken,\n                        true /* throwOnNullToken */,\n                    ),\n                    newFileInfo,\n                    odspLogger,\n                    createNewSummary,\n                    cacheAndTracker.epochTracker,\n                    fileEntry,\n                    this.hostPolicy.cacheCreateNewSummary ?? true,\n                    !!this.hostPolicy.sessionOptions?.forceAccessTokenViaAuthorizationHeader,\n                    odspResolvedUrl.isClpCompliantApp,\n                );\n                const docService = this.createDocumentServiceCore(odspResolvedUrl, odspLogger,\n                    cacheAndTracker, clientIsSummarizer);\n                event.end({\n                    docId: odspResolvedUrl.hashedDocumentId,\n                });\n                return docService;\n            });\n    }\n\n    /**\n     * @param getStorageToken - function that can provide the storage token for a given site. This is\n     * is also referred to as the \"Vroom\" token in SPO.\n     * @param getWebsocketToken - function that can provide a token for accessing the web socket. This is also\n     * to as the \"Push\" token in SPO. If undefined then websocket token is expected to be returned with joinSession\n     * response payload.\n     * @param storageFetchWrapper - if not provided FetchWrapper will be used\n     * @param deltasFetchWrapper - if not provided FetchWrapper will be used\n     * @param persistedCache - PersistedCache provided by host for use in this session.\n     */\n    constructor(\n        private readonly getStorageToken: TokenFetcher<OdspResourceTokenFetchOptions>,\n        private readonly getWebsocketToken: TokenFetcher<OdspResourceTokenFetchOptions> | undefined,\n        private readonly getSocketIOClient: () => Promise<typeof SocketIOClientStatic>,\n        protected persistedCache: IPersistedCache = new LocalPersistentCache(),\n        private readonly hostPolicy: HostStoragePolicy = {},\n    ) {\n        if (this.hostPolicy.isolateSocketCache === true) {\n            // create the key to separate the socket reuse cache\n            this.socketReferenceKeyPrefix = uuid();\n        }\n        // Set enableRedeemFallback by default as true.\n        this.hostPolicy.enableRedeemFallback = this.hostPolicy.enableRedeemFallback ?? true;\n        this.hostPolicy.sessionOptions = {\n            forceAccessTokenViaAuthorizationHeader: true,\n            ...this.hostPolicy.sessionOptions,\n        };\n    }\n\n    public async createDocumentService(\n        resolvedUrl: IResolvedUrl,\n        logger?: ITelemetryBaseLogger,\n        clientIsSummarizer?: boolean,\n    ): Promise<IDocumentService> {\n        return this.createDocumentServiceCore(resolvedUrl, createOdspLogger(logger), undefined, clientIsSummarizer);\n    }\n\n    protected async createDocumentServiceCore(\n        resolvedUrl: IResolvedUrl,\n        odspLogger: TelemetryLogger,\n        cacheAndTrackerArg?: ICacheAndTracker,\n        clientIsSummarizer?: boolean,\n    ): Promise<IDocumentService> {\n        const odspResolvedUrl = getOdspResolvedUrl(resolvedUrl);\n        const resolvedUrlData: IOdspUrlParts = {\n            siteUrl: odspResolvedUrl.siteUrl,\n            driveId: odspResolvedUrl.driveId,\n            itemId: odspResolvedUrl.itemId,\n        };\n        const cacheAndTracker = cacheAndTrackerArg ?? createOdspCacheAndTracker(\n            this.persistedCache,\n            this.nonPersistentCache,\n            { resolvedUrl: odspResolvedUrl, docId: odspResolvedUrl.hashedDocumentId },\n            odspLogger,\n            clientIsSummarizer);\n\n        const storageTokenFetcher = toInstrumentedOdspTokenFetcher(\n            odspLogger,\n            resolvedUrlData,\n            this.getStorageToken,\n            true /* throwOnNullToken */,\n        );\n\n        const webSocketTokenFetcher = this.getWebsocketToken === undefined\n            ? undefined\n            : async (options: TokenFetchOptions) => toInstrumentedOdspTokenFetcher(\n                odspLogger,\n                resolvedUrlData,\n                this.getWebsocketToken!,\n                false /* throwOnNullToken */,\n            )(options, \"GetWebsocketToken\");\n\n        return OdspDocumentService.create(\n            resolvedUrl,\n            storageTokenFetcher,\n            webSocketTokenFetcher,\n            odspLogger,\n            this.getSocketIOClient,\n            cacheAndTracker.cache,\n            this.hostPolicy,\n            cacheAndTracker.epochTracker,\n            this.socketReferenceKeyPrefix,\n            clientIsSummarizer,\n        );\n    }\n}\n"]}
+{"version":3,"file":"odspDocumentServiceFactoryCore.js","sourceRoot":"","sources":["../src/odspDocumentServiceFactoryCore.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 { ITelemetryBaseLogger } from \"@fluidframework/common-definitions\";\nimport {\n    IDocumentService,\n    IDocumentServiceFactory,\n    IResolvedUrl,\n} from \"@fluidframework/driver-definitions\";\nimport { ISummaryTree } from \"@fluidframework/protocol-definitions\";\nimport {\n    TelemetryLogger,\n    PerformanceEvent,\n} from \"@fluidframework/telemetry-utils\";\nimport {\n    getDocAttributesFromProtocolSummary,\n    ensureFluidResolvedUrl,\n} from \"@fluidframework/driver-utils\";\nimport {\n    TokenFetchOptions,\n    OdspResourceTokenFetchOptions,\n    TokenFetcher,\n    IPersistedCache,\n    HostStoragePolicy,\n    IFileEntry,\n    IOdspUrlParts,\n    SharingLinkScope,\n    SharingLinkRole,\n    ShareLinkTypes,\n    ISharingLinkKind,\n} from \"@fluidframework/odsp-driver-definitions\";\nimport type { io as SocketIOClientStatic } from \"socket.io-client\";\nimport { v4 as uuid } from \"uuid\";\nimport {\n    LocalPersistentCache,\n    NonPersistentCache,\n} from \"./odspCache\";\nimport {\n    createOdspCacheAndTracker,\n    ICacheAndTracker,\n} from \"./epochTracker\";\nimport { OdspDocumentService } from \"./odspDocumentService\";\nimport { INewFileInfo, getOdspResolvedUrl, createOdspLogger, toInstrumentedOdspTokenFetcher } from \"./odspUtils\";\nimport { createNewFluidFile } from \"./createFile\";\n\n/**\n * Factory for creating the sharepoint document service. Use this if you want to\n * use the sharepoint implementation.\n *\n * This constructor should be used by environments that support dynamic imports and that wish\n * to leverage code splitting as a means to keep bundles as small as possible.\n */\nexport class OdspDocumentServiceFactoryCore implements IDocumentServiceFactory {\n    public readonly protocolName = \"fluid-odsp:\";\n\n    private readonly nonPersistentCache = new NonPersistentCache();\n    private readonly socketReferenceKeyPrefix?: string;\n\n    public async createContainer(\n        createNewSummary: ISummaryTree | undefined,\n        createNewResolvedUrl: IResolvedUrl,\n        logger?: ITelemetryBaseLogger,\n        clientIsSummarizer?: boolean,\n    ): Promise<IDocumentService> {\n        ensureFluidResolvedUrl(createNewResolvedUrl);\n\n        let odspResolvedUrl = getOdspResolvedUrl(createNewResolvedUrl);\n        const resolvedUrlData: IOdspUrlParts = {\n            siteUrl: odspResolvedUrl.siteUrl,\n            driveId: odspResolvedUrl.driveId,\n            itemId: odspResolvedUrl.itemId,\n        };\n        const [, queryString] = odspResolvedUrl.url.split(\"?\");\n\n        const searchParams = new URLSearchParams(queryString);\n        const filePath = searchParams.get(\"path\");\n        if (filePath === undefined || filePath === null) {\n            throw new Error(\"File path should be provided!!\");\n        }\n\n        const protocolSummary = createNewSummary?.tree[\".protocol\"];\n        if (protocolSummary) {\n            const documentAttributes = getDocAttributesFromProtocolSummary(protocolSummary as ISummaryTree);\n            if (documentAttributes?.sequenceNumber !== 0) {\n                throw new Error(\"Seq number in detached ODSP container should be 0\");\n            }\n        }\n\n        const createShareLinkParam = getSharingLinkParams(this.hostPolicy, searchParams);\n        const newFileInfo: INewFileInfo = {\n            driveId: odspResolvedUrl.driveId,\n            siteUrl: odspResolvedUrl.siteUrl,\n            filePath,\n            filename: odspResolvedUrl.fileName,\n            createLinkType: createShareLinkParam,\n        };\n\n        const odspLogger = createOdspLogger(logger);\n\n        const fileEntry: IFileEntry = { resolvedUrl: odspResolvedUrl, docId: odspResolvedUrl.hashedDocumentId };\n        const cacheAndTracker = createOdspCacheAndTracker(\n            this.persistedCache,\n            this.nonPersistentCache,\n            fileEntry,\n            odspLogger,\n            clientIsSummarizer);\n\n        return PerformanceEvent.timedExecAsync(\n            odspLogger,\n            {\n                eventName: \"CreateNew\",\n                isWithSummaryUpload: true,\n                createShareLinkParam: JSON.stringify(createShareLinkParam),\n                enableShareLinkWithCreate: this.hostPolicy.enableShareLinkWithCreate,\n                enableSingleRequestForShareLinkWithCreate:\n                    this.hostPolicy.enableSingleRequestForShareLinkWithCreate,\n            },\n            async (event) => {\n                odspResolvedUrl = await createNewFluidFile(\n                    toInstrumentedOdspTokenFetcher(\n                        odspLogger,\n                        resolvedUrlData,\n                        this.getStorageToken,\n                        true /* throwOnNullToken */,\n                    ),\n                    newFileInfo,\n                    odspLogger,\n                    createNewSummary,\n                    cacheAndTracker.epochTracker,\n                    fileEntry,\n                    this.hostPolicy.cacheCreateNewSummary ?? true,\n                    !!this.hostPolicy.sessionOptions?.forceAccessTokenViaAuthorizationHeader,\n                    odspResolvedUrl.isClpCompliantApp,\n                    this.hostPolicy.enableSingleRequestForShareLinkWithCreate,\n                    this.hostPolicy.enableShareLinkWithCreate,\n                );\n                const docService = this.createDocumentServiceCore(odspResolvedUrl, odspLogger,\n                    cacheAndTracker, clientIsSummarizer);\n                event.end({\n                    docId: odspResolvedUrl.hashedDocumentId,\n                });\n                return docService;\n            });\n    }\n\n    /**\n     * @param getStorageToken - function that can provide the storage token for a given site. This is\n     * is also referred to as the \"Vroom\" token in SPO.\n     * @param getWebsocketToken - function that can provide a token for accessing the web socket. This is also\n     * to as the \"Push\" token in SPO. If undefined then websocket token is expected to be returned with joinSession\n     * response payload.\n     * @param storageFetchWrapper - if not provided FetchWrapper will be used\n     * @param deltasFetchWrapper - if not provided FetchWrapper will be used\n     * @param persistedCache - PersistedCache provided by host for use in this session.\n     */\n    constructor(\n        private readonly getStorageToken: TokenFetcher<OdspResourceTokenFetchOptions>,\n        private readonly getWebsocketToken: TokenFetcher<OdspResourceTokenFetchOptions> | undefined,\n        private readonly getSocketIOClient: () => Promise<typeof SocketIOClientStatic>,\n        protected persistedCache: IPersistedCache = new LocalPersistentCache(),\n        private readonly hostPolicy: HostStoragePolicy = {},\n    ) {\n        if (this.hostPolicy.isolateSocketCache === true) {\n            // create the key to separate the socket reuse cache\n            this.socketReferenceKeyPrefix = uuid();\n        }\n        // Set enableRedeemFallback by default as true.\n        this.hostPolicy.enableRedeemFallback = this.hostPolicy.enableRedeemFallback ?? true;\n        this.hostPolicy.sessionOptions = {\n            forceAccessTokenViaAuthorizationHeader: true,\n            ...this.hostPolicy.sessionOptions,\n        };\n    }\n\n    public async createDocumentService(\n        resolvedUrl: IResolvedUrl,\n        logger?: ITelemetryBaseLogger,\n        clientIsSummarizer?: boolean,\n    ): Promise<IDocumentService> {\n        return this.createDocumentServiceCore(resolvedUrl, createOdspLogger(logger), undefined, clientIsSummarizer);\n    }\n\n    protected async createDocumentServiceCore(\n        resolvedUrl: IResolvedUrl,\n        odspLogger: TelemetryLogger,\n        cacheAndTrackerArg?: ICacheAndTracker,\n        clientIsSummarizer?: boolean,\n    ): Promise<IDocumentService> {\n        const odspResolvedUrl = getOdspResolvedUrl(resolvedUrl);\n        const resolvedUrlData: IOdspUrlParts = {\n            siteUrl: odspResolvedUrl.siteUrl,\n            driveId: odspResolvedUrl.driveId,\n            itemId: odspResolvedUrl.itemId,\n        };\n        const cacheAndTracker = cacheAndTrackerArg ?? createOdspCacheAndTracker(\n            this.persistedCache,\n            this.nonPersistentCache,\n            { resolvedUrl: odspResolvedUrl, docId: odspResolvedUrl.hashedDocumentId },\n            odspLogger,\n            clientIsSummarizer);\n\n        const storageTokenFetcher = toInstrumentedOdspTokenFetcher(\n            odspLogger,\n            resolvedUrlData,\n            this.getStorageToken,\n            true /* throwOnNullToken */,\n        );\n\n        const webSocketTokenFetcher = this.getWebsocketToken === undefined\n            ? undefined\n            : async (options: TokenFetchOptions) => toInstrumentedOdspTokenFetcher(\n                odspLogger,\n                resolvedUrlData,\n                this.getWebsocketToken!,\n                false /* throwOnNullToken */,\n            )(options, \"GetWebsocketToken\");\n\n        return OdspDocumentService.create(\n            resolvedUrl,\n            storageTokenFetcher,\n            webSocketTokenFetcher,\n            odspLogger,\n            this.getSocketIOClient,\n            cacheAndTracker.cache,\n            this.hostPolicy,\n            cacheAndTracker.epochTracker,\n            this.socketReferenceKeyPrefix,\n            clientIsSummarizer,\n        );\n    }\n}\n\n/**\n * Extract the sharing link kind from the resolved URL's query paramerters\n */\nfunction getSharingLinkParams(\n    hostPolicy: HostStoragePolicy,\n    searchParams: URLSearchParams,\n): ShareLinkTypes | ISharingLinkKind | undefined {\n    // extract request parameters for creation of sharing link (if provided) if the feature is enabled\n    let createShareLinkParam: ShareLinkTypes | ISharingLinkKind | undefined;\n    if (hostPolicy.enableSingleRequestForShareLinkWithCreate) {\n        const createLinkScope = searchParams.get(\"createLinkScope\");\n        const createLinkRole = searchParams.get(\"createLinkRole\");\n        if (createLinkScope && SharingLinkScope[createLinkScope]) {\n            createShareLinkParam = {\n                scope: SharingLinkScope[createLinkScope],\n                ...(createLinkRole && SharingLinkRole[createLinkRole] ?\n                    { role: SharingLinkRole[createLinkRole] } : {}),\n            };\n        }\n    } else if (hostPolicy.enableShareLinkWithCreate) {\n        const createLinkType = searchParams.get(\"createLinkType\");\n        if (createLinkType && ShareLinkTypes[createLinkType]) {\n            createShareLinkParam = ShareLinkTypes[createLinkType || \"\"];\n        }\n    }\n    return createShareLinkParam;\n}\n"]}

package/lib/odspDocumentStorageManager.d.ts

@@ -4,7 +4,7 @@
  */
 import { ITelemetryLogger } from "@fluidframework/common-definitions";
 import * as api from "@fluidframework/protocol-definitions";
-import { ISummaryContext } from "@fluidframework/driver-definitions";
+import { ISummaryContext, FetchSource } from "@fluidframework/driver-definitions";
 import { IOdspResolvedUrl, InstrumentedStorageTokenFetcher } from "@fluidframework/odsp-driver-definitions";
 import { HostStoragePolicyInternal } from "./contracts";
 import { SnapshotFormatSupportType } from "./fetchSnapshot";
@@ -17,11 +17,11 @@ export declare class OdspDocumentStorageService extends OdspDocumentStorageServi
     private readonly odspResolvedUrl;
     private readonly getStorageToken;
     private readonly logger;
-    private readonly fetchFullSnapshot;
     private readonly cache;
     private readonly hostPolicy;
     private readonly epochTracker;
     private readonly flushCallback;
+    private readonly relayServiceTenantAndSessionId;
     private readonly snapshotFormatFetchType?;
     private readonly odspSummaryUploadManager;
     private firstVersionCall;
@@ -37,11 +37,11 @@ export declare class OdspDocumentStorageService extends OdspDocumentStorageServi
     private readonly maxSnapshotSizeLimit;
     private readonly maxSnapshotFetchTimeout;
     private readonly createBlobRateLimiter;
-    constructor(odspResolvedUrl: IOdspResolvedUrl, getStorageToken: InstrumentedStorageTokenFetcher, logger: ITelemetryLogger, fetchFullSnapshot: boolean, cache: IOdspCache, hostPolicy: HostStoragePolicyInternal, epochTracker: EpochTracker, flushCallback: () => Promise<FlushResult>, snapshotFormatFetchType?: SnapshotFormatSupportType | undefined);
+    constructor(odspResolvedUrl: IOdspResolvedUrl, getStorageToken: InstrumentedStorageTokenFetcher, logger: ITelemetryLogger, cache: IOdspCache, hostPolicy: HostStoragePolicyInternal, epochTracker: EpochTracker, flushCallback: () => Promise<FlushResult>, relayServiceTenantAndSessionId: () => string, snapshotFormatFetchType?: SnapshotFormatSupportType | undefined);
     createBlob(file: ArrayBufferLike): Promise<api.ICreateBlobResponse>;
     protected fetchBlobFromStorage(blobId: string, evicted: boolean): Promise<ArrayBuffer>;
     getSnapshotTree(version?: api.IVersion, scenarioName?: string): Promise<api.ISnapshotTree | null>;
-    getVersions(blobid: string | null, count: number, scenarioName?: string): Promise<api.IVersion[]>;
+    getVersions(blobid: string | null, count: number, scenarioName?: string, fetchSource?: FetchSource): Promise<api.IVersion[]>;
     private fetchSnapshot;
     private fetchSnapshotCore;
     uploadSummaryWithContext(summary: api.ISummaryTree, context: ISummaryContext): Promise<string>;

package/lib/odspDocumentStorageManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"odspDocumentStorageManager.d.ts","sourceRoot":"","sources":["../src/odspDocumentStorageManager.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"odspDocumentStorageManager.d.ts","sourceRoot":"","sources":["../src/odspDocumentStorageManager.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EAAE,gBAAgB,EAAE,MAAM,oCAAoC,CAAC;AAQtE,OAAO,KAAK,GAAG,MAAM,sCAAsC,CAAC;AAC5D,OAAO,EACH,eAAe,EAEf,WAAW,EACd,MAAM,oCAAoC,CAAC;AAE5C,OAAO,EACH,gBAAgB,EAGhB,+BAA+B,EAClC,MAAM,yCAAyC,CAAC;AACjD,OAAO,EAEH,yBAAyB,EAG5B,MAAM,aAAa,CAAC;AACrB,OAAO,EAA4D,yBAAyB,EAAE,MAAM,iBAAiB,CAAC;AAEtH,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAMzC,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAE5D,OAAO,EAAE,8BAA8B,EAAE,MAAM,kCAAkC,CAAC;AAElF,eAAO,MAAM,mCAAmC,EAAE,MAAkB,CAAC;AAkBrE,qBAAa,0BAA2B,SAAQ,8BAA8B;IAsBtE,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,OAAO,CAAC,QAAQ,CAAC,8BAA8B;IAC/C,OAAO,CAAC,QAAQ,CAAC,uBAAuB,CAAC;IA7B7C,OAAO,CAAC,QAAQ,CAAC,wBAAwB,CAA2B;IAEpE,OAAO,CAAC,gBAAgB,CAAQ;IAEhC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;IACpC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAqB;IACjD,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAqB;IACvD,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAqB;IAEtD;;;;OAIG;IACH,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAa;IAClD,OAAO,CAAC,QAAQ,CAAC,uBAAuB,CAAU;IAGlD,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAsB;gBAGvC,eAAe,EAAE,gBAAgB,EACjC,eAAe,EAAE,+BAA+B,EAChD,MAAM,EAAE,gBAAgB,EACxB,KAAK,EAAE,UAAU,EACjB,UAAU,EAAE,yBAAyB,EACrC,YAAY,EAAE,YAAY,EAC1B,aAAa,EAAE,MAAM,OAAO,CAAC,WAAW,CAAC,EACzC,8BAA8B,EAAE,MAAM,MAAM,EAC5C,uBAAuB,CAAC,uCAA2B;IAmB3D,UAAU,CAAC,IAAI,EAAE,eAAe,GAAG,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC;cA0ChE,oBAAoB,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,WAAW,CAAC;IA6C/E,eAAe,CAAC,OAAO,CAAC,EAAE,GAAG,CAAC,QAAQ,EAAE,YAAY,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,aAAa,GAAG,IAAI,CAAC;IAOjG,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC;YAyK3H,aAAa;YAcb,iBAAiB;IAiFlB,wBAAwB,CAAC,OAAO,EAAE,GAAG,CAAC,YAAY,EAAE,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC;IAuC3G,OAAO,CAAC,gBAAgB;IASxB,OAAO,CAAC,sBAAsB;IAS9B,OAAO,CAAC,qBAAqB;cASb,qBAAqB,CAAC,EAAE,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,aAAa,GAAG,SAAS,CAAC;CAkCnH"}

package/lib/odspDocumentStorageManager.js

@@ -4,7 +4,7 @@
  */
 import { assert, delay, } from "@fluidframework/common-utils";
 import { PerformanceEvent, } from "@fluidframework/telemetry-utils";
-import { DriverErrorType, } from "@fluidframework/driver-definitions";
+import { DriverErrorType, FetchSource, } from "@fluidframework/driver-definitions";
 import { RateLimiter, NonRetryableError } from "@fluidframework/driver-utils";
 import { OdspErrorType, } from "@fluidframework/odsp-driver-definitions";
 import { downloadSnapshot, fetchSnapshot, fetchSnapshotWithRedeem } from "./fetchSnapshot";
@@ -24,17 +24,17 @@ async function promiseRaceWithWinner(promises) {
     });
 }
 export class OdspDocumentStorageService extends OdspDocumentStorageServiceBase {
-    constructor(odspResolvedUrl, getStorageToken, logger, fetchFullSnapshot, cache, hostPolicy, epochTracker, flushCallback, snapshotFormatFetchType) {
+    constructor(odspResolvedUrl, getStorageToken, logger, cache, hostPolicy, epochTracker, flushCallback, relayServiceTenantAndSessionId, snapshotFormatFetchType) {
         var _a;
         super();
         this.odspResolvedUrl = odspResolvedUrl;
         this.getStorageToken = getStorageToken;
         this.logger = logger;
-        this.fetchFullSnapshot = fetchFullSnapshot;
         this.cache = cache;
         this.hostPolicy = hostPolicy;
         this.epochTracker = epochTracker;
         this.flushCallback = flushCallback;
+        this.relayServiceTenantAndSessionId = relayServiceTenantAndSessionId;
         this.snapshotFormatFetchType = snapshotFormatFetchType;
         this.firstVersionCall = true;
         // Driver specified limits for snapshot size and time.
@@ -51,7 +51,7 @@ export class OdspDocumentStorageService extends OdspDocumentStorageServiceBase {
         this.snapshotUrl = this.odspResolvedUrl.endpoints.snapshotStorageUrl;
         this.attachmentPOSTUrl = this.odspResolvedUrl.endpoints.attachmentPOSTStorageUrl;
         this.attachmentGETUrl = this.odspResolvedUrl.endpoints.attachmentGETStorageUrl;
-        this.odspSummaryUploadManager = new OdspSummaryUploadManager(this.snapshotUrl, getStorageToken, logger, epochTracker, !!((_a = this.hostPolicy.sessionOptions) === null || _a === void 0 ? void 0 : _a.forceAccessTokenViaAuthorizationHeader));
+        this.odspSummaryUploadManager = new OdspSummaryUploadManager(this.snapshotUrl, getStorageToken, logger, epochTracker, !!((_a = this.hostPolicy.sessionOptions) === null || _a === void 0 ? void 0 : _a.forceAccessTokenViaAuthorizationHeader), this.relayServiceTenantAndSessionId);
     }
     async createBlob(file) {
         this.checkAttachmentPOSTUrl();
@@ -109,7 +109,7 @@ export class OdspDocumentStorageService extends OdspDocumentStorageServiceBase {
         }
         return super.getSnapshotTree(version, scenarioName);
     }
-    async getVersions(blobid, count, scenarioName) {
+    async getVersions(blobid, count, scenarioName, fetchSource) {
         // Regular load workflow uses blobId === documentID to indicate "latest".
         if (blobid !== this.documentId && blobid) {
             // FluidFetch & FluidDebugger tools use empty sting to query for versions
@@ -128,85 +128,103 @@ export class OdspDocumentStorageService extends OdspDocumentStorageServiceBase {
             return [];
         }
         // If count is one, we can use the trees/latest API, which returns the latest version and trees in a single request for better performance
-        // Do it only once - we might get more here due to summarizer - it needs only container tree, not full snapshot.
-        if (this.firstVersionCall && count === 1 && (blobid === null || blobid === this.documentId)) {
+        if (count === 1 && (blobid === null || blobid === this.documentId)) {
             const hostSnapshotOptions = this.hostPolicy.snapshotOptions;
-            const odspSnapshotCacheValue = await PerformanceEvent.timedExecAsync(this.logger, { eventName: "ObtainSnapshot" }, async (event) => {
+            const odspSnapshotCacheValue = await PerformanceEvent.timedExecAsync(this.logger, { eventName: "ObtainSnapshot", fetchSource }, async (event) => {
                 const props = {};
                 let retrievedSnapshot;
-                // Here's the logic to grab the persistent cache snapshot implemented by the host
-                // Epoch tracker is responsible for communicating with the persistent cache, handling epochs and cache versions
-                const cachedSnapshotP = this.epochTracker.get(createCacheSnapshotKey(this.odspResolvedUrl))
-                    .then(async (snapshotCachedEntry) => {
-                    var _a;
-                    if (snapshotCachedEntry !== undefined) {
-                        // If the cached entry does not contain the entry time, then assign it a default of 30 days old.
-                        const age = Date.now() - ((_a = snapshotCachedEntry.cacheEntryTime) !== null && _a !== void 0 ? _a : (Date.now() - 30 * 24 * 60 * 60 * 1000));
-                        // In order to decrease the number of times we have to execute a snapshot refresh,
-                        // if this is the summarizer and we have a cache entry but it is past the defaultSummarizerCacheExpiryTimeout,
-                        // force the network retrieval instead as there might be a more recent snapshot available.
-                        // See: https://github.com/microsoft/FluidFramework/issues/8995 for additional information.
-                        if (this.hostPolicy.summarizerClient) {
-                            if (age > defaultSummarizerCacheExpiryTimeout) {
-                                props.cacheSummarizerExpired = true;
-                                return undefined;
+                let method;
+                if (fetchSource === FetchSource.noCache) {
+                    retrievedSnapshot = await this.fetchSnapshot(hostSnapshotOptions, scenarioName);
+                    method = "networkOnly";
+                }
+                else {
+                    // Here's the logic to grab the persistent cache snapshot implemented by the host
+                    // Epoch tracker is responsible for communicating with the persistent cache, handling epochs and cache versions
+                    const cachedSnapshotP = this.epochTracker.get(createCacheSnapshotKey(this.odspResolvedUrl))
+                        .then(async (snapshotCachedEntry) => {
+                        var _a;
+                        if (snapshotCachedEntry !== undefined) {
+                            // If the cached entry does not contain the entry time, then assign it a default of 30 days old.
+                            const age = Date.now() - ((_a = snapshotCachedEntry.cacheEntryTime) !== null && _a !== void 0 ? _a : (Date.now() - 30 * 24 * 60 * 60 * 1000));
+                            // In order to decrease the number of times we have to execute a snapshot refresh,
+                            // if this is the summarizer and we have a cache entry but it is past the defaultSummarizerCacheExpiryTimeout,
+                            // force the network retrieval instead as there might be a more recent snapshot available.
+                            // See: https://github.com/microsoft/FluidFramework/issues/8995 for additional information.
+                            if (this.hostPolicy.summarizerClient) {
+                                if (age > defaultSummarizerCacheExpiryTimeout) {
+                                    props.cacheSummarizerExpired = true;
+                                    return undefined;
+                                }
+                                else {
+                                    props.cacheSummarizerExpired = false;
+                                }
                             }
-                            else {
-                                props.cacheSummarizerExpired = false;
+                            // Record the cache age
+                            props.cacheEntryAge = age;
+                        }
+                        return snapshotCachedEntry;
+                    });
+                    // Based on the concurrentSnapshotFetch policy:
+                    // Either retrieve both the network and cache snapshots concurrently and pick the first to return,
+                    // or grab the cache value and then the network value if the cache value returns undefined.
+                    // For summarizer which could call this during refreshing of summary parent, always use the cache
+                    // first. Also for other clients, if it is not critical path which is determined by firstVersionCall,
+                    // then also check the cache first.
+                    if (this.firstVersionCall && this.hostPolicy.concurrentSnapshotFetch && !this.hostPolicy.summarizerClient) {
+                        const networkSnapshotP = this.fetchSnapshot(hostSnapshotOptions, scenarioName);
+                        // Ensure that failures on both paths are ignored initially.
+                        // I.e. if cache fails for some reason, we will proceed with network result.
+                        // And vice versa - if (for example) client is offline and network request fails first, we
+                        // do want to attempt to succeed with cached data!
+                        const promiseRaceWinner = await promiseRaceWithWinner([
+                            cachedSnapshotP.catch(() => undefined),
+                            networkSnapshotP.catch(() => undefined),
+                        ]);
+                        retrievedSnapshot = promiseRaceWinner.value;
+                        method = promiseRaceWinner.index === 0 ? "cache" : "network";
+                        if (retrievedSnapshot === undefined) {
+                            // if network failed -> wait for cache ( then return network failure)
+                            // If cache returned empty or failed -> wait for network (success of failure)
+                            if (promiseRaceWinner.index === 1) {
+                                retrievedSnapshot = await cachedSnapshotP;
+                                method = "cache";
+                            }
+                            if (retrievedSnapshot === undefined) {
+                                retrievedSnapshot = await networkSnapshotP;
+                                method = "network";
                             }
                         }
-                        // Record the cache age
-                        props.cacheEntryAge = age;
                     }
-                    return snapshotCachedEntry;
-                });
-                // Based on the concurrentSnapshotFetch policy:
-                // Either retrieve both the network and cache snapshots concurrently and pick the first to return,
-                // or grab the cache value and then the network value if the cache value returns undefined.
-                let method;
-                if (this.hostPolicy.concurrentSnapshotFetch && !this.hostPolicy.summarizerClient) {
-                    const networkSnapshotP = this.fetchSnapshot(hostSnapshotOptions, scenarioName);
-                    // Ensure that failures on both paths are ignored initially.
-                    // I.e. if cache fails for some reason, we will proceed with network result.
-                    // And vice versa - if (for example) client is offline and network request fails first, we
-                    // do want to attempt to succeed with cached data!
-                    const promiseRaceWinner = await promiseRaceWithWinner([
-                        cachedSnapshotP.catch(() => undefined),
-                        networkSnapshotP.catch(() => undefined),
-                    ]);
-                    retrievedSnapshot = promiseRaceWinner.value;
-                    method = promiseRaceWinner.index === 0 ? "cache" : "network";
-                    if (retrievedSnapshot === undefined) {
-                        // if network failed -> wait for cache ( then return network failure)
-                        // If cache returned empty or failed -> wait for network (success of failure)
-                        if (promiseRaceWinner.index === 1) {
-                            retrievedSnapshot = await cachedSnapshotP;
+                    else {
+                        // Note: There's a race condition here - another caller may come past the undefined check
+                        // while the first caller is awaiting later async code in this block.
+                        retrievedSnapshot = await cachedSnapshotP;
+                        if (retrievedSnapshot !== undefined) {
                             method = "cache";
                         }
-                        if (retrievedSnapshot === undefined) {
-                            retrievedSnapshot = await networkSnapshotP;
+                        else {
                             method = "network";
+                            const options = Object.assign({}, hostSnapshotOptions);
+                            // Don't fetch the blobs/deltas if it is not the first call. By default server will add
+                            // blobs and deltas to the response.
+                            if (!this.firstVersionCall) {
+                                options.blobs = 0;
+                                options.deltas = 0;
+                            }
+                            retrievedSnapshot = await this.fetchSnapshot(options, scenarioName);
                         }
                     }
                 }
-                else {
-                    // Note: There's a race condition here - another caller may come past the undefined check
-                    // while the first caller is awaiting later async code in this block.
-                    retrievedSnapshot = await cachedSnapshotP;
-                    method = retrievedSnapshot !== undefined ? "cache" : "network";
-                    if (retrievedSnapshot === undefined) {
-                        retrievedSnapshot = await this.fetchSnapshot(hostSnapshotOptions, scenarioName);
-                    }
-                }
                 if (method === "network") {
                     props.cacheEntryAge = undefined;
                 }
                 event.end(Object.assign(Object.assign({}, props), { method }));
                 return retrievedSnapshot;
             });
-            // Successful call, make network calls only
+            // Don't override ops which were fetched during initial load, since we could still need them.
+            const id = this.initializeFromSnapshot(odspSnapshotCacheValue, this.firstVersionCall);
             this.firstVersionCall = false;
-            const id = this.initializeFromSnapshot(odspSnapshotCacheValue);
             return id ? [{ id, treeId: undefined }] : [];
         }
         return getWithRetryForTokenRefresh(async (options) => {
@@ -332,7 +350,7 @@ export class OdspDocumentStorageService extends OdspDocumentStorageServiceBase {
             const snapshotDownloader = async (url, fetchOptions) => {
                 return this.epochTracker.fetchAndParseAsJSON(url, fetchOptions, "snapshotTree", undefined, scenarioName);
             };
-            const snapshot = await fetchSnapshot(this.snapshotUrl, storageToken, id, this.fetchFullSnapshot, !!((_a = this.hostPolicy.sessionOptions) === null || _a === void 0 ? void 0 : _a.forceAccessTokenViaAuthorizationHeader), this.logger, snapshotDownloader);
+            const snapshot = await fetchSnapshot(this.snapshotUrl, storageToken, id, !!((_a = this.hostPolicy.sessionOptions) === null || _a === void 0 ? void 0 : _a.forceAccessTokenViaAuthorizationHeader), this.logger, snapshotDownloader);
             let treeId = "";
             if (snapshot.snapshotTree) {
                 assert(snapshot.snapshotTree.id !== undefined, 0x222 /* "Root tree should contain the id!!" */);