@fluidframework/odsp-driver 0.58.2002 → 0.59.1000

package/lib/odspDriverUrlResolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"odspDriverUrlResolver.js","sourceRoot":"","sources":["../src/odspDriverUrlResolver.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 { IFluidCodeDetails, IRequest, isFluidPackage } from \"@fluidframework/core-interfaces\";\nimport {\n    DriverHeader,\n    IContainerPackageInfo,\n    IResolvedUrl,\n    IUrlResolver,\n} from \"@fluidframework/driver-definitions\";\nimport { IOdspResolvedUrl, ShareLinkTypes, ShareLinkInfoType } from \"@fluidframework/odsp-driver-definitions\";\nimport { createOdspUrl } from \"./createOdspUrl\";\nimport { getApiRoot } from \"./odspUrlHelper\";\nimport { getOdspResolvedUrl } from \"./odspUtils\";\nimport { getHashedDocumentId } from \"./odspPublicUtils\";\nimport { ClpCompliantAppHeader } from \"./contractsPublic\";\n\nfunction getUrlBase(siteUrl: string, driveId: string, itemId: string, fileVersion?: string) {\n    const siteOrigin = new URL(siteUrl).origin;\n    const version = fileVersion ? `versions/${fileVersion}/` : \"\";\n    return `${getApiRoot(siteOrigin)}/drives/${driveId}/items/${itemId}/${version}`;\n}\n\nfunction getSnapshotUrl(siteUrl: string, driveId: string, itemId: string, fileVersion?: string) {\n    const urlBase = getUrlBase(siteUrl, driveId, itemId, fileVersion);\n    return `${urlBase}opStream/snapshots`;\n}\n\nfunction getAttachmentPOSTUrl(siteUrl: string, driveId: string, itemId: string, fileVersion?: string) {\n    const urlBase = getUrlBase(siteUrl, driveId, itemId, fileVersion);\n    return `${urlBase}opStream/attachment`;\n}\n\nfunction getAttachmentGETUrl(siteUrl: string, driveId: string, itemId: string, fileVersion?: string) {\n    const urlBase = getUrlBase(siteUrl, driveId, itemId, fileVersion);\n    return `${urlBase}opStream/attachments`;\n}\n\nfunction getDeltaStorageUrl(siteUrl: string, driveId: string, itemId: string, fileVersion?: string) {\n    const urlBase = getUrlBase(siteUrl, driveId, itemId, fileVersion);\n    return `${urlBase}opStream`;\n}\n\n/**\n * Utility that enables us to handle paths provided with a beginning slash.\n * For example if a value of '/id1/id2' is provided, id1/id2 is returned.\n */\nfunction removeBeginningSlash(str: string): string {\n    if (str.startsWith(\"/\")) {\n        return str.substr(1);\n    }\n\n    return str;\n}\n\n/**\n * Resolver to resolve urls like the ones created by createOdspUrl which is driver inner\n * url format. Ex: `${siteUrl}?driveId=${driveId}&itemId=${itemId}&path=${path}`\n */\nexport class OdspDriverUrlResolver implements IUrlResolver {\n    constructor() { }\n\n    public async resolve(request: IRequest): Promise<IOdspResolvedUrl> {\n        if (request.headers && request.headers[DriverHeader.createNew]) {\n            const [siteURL, queryString] = request.url.split(\"?\");\n\n            const searchParams = new URLSearchParams(queryString);\n            const fileName = request.headers[DriverHeader.createNew].fileName;\n            const driveID = searchParams.get(\"driveId\");\n            const filePath = searchParams.get(\"path\");\n            const packageName = searchParams.get(\"containerPackageName\");\n            const createLinkType = searchParams.get(\"createLinkType\");\n            if (!(fileName && siteURL && driveID && filePath !== null && filePath !== undefined)) {\n                throw new Error(\"Proper new file params should be there!!\");\n            }\n            let shareLinkInfo: ShareLinkInfoType | undefined;\n            if(createLinkType && createLinkType in ShareLinkTypes) {\n                shareLinkInfo = {\n                    createLink: {\n                        type: ShareLinkTypes[createLinkType],\n                    },\n                };\n            }\n            return {\n                endpoints: {\n                    snapshotStorageUrl: \"\",\n                    attachmentGETStorageUrl: \"\",\n                    attachmentPOSTStorageUrl: \"\",\n                    deltaStorageUrl: \"\",\n                },\n                tokens: {},\n                type: \"fluid\",\n                odspResolvedUrl: true,\n                id: \"odspCreateNew\",\n                url: `fluid-odsp://${siteURL}?${queryString}&version=null`,\n                siteUrl: siteURL,\n                hashedDocumentId: \"\",\n                driveId: driveID,\n                itemId: \"\",\n                fileName,\n                summarizer: false,\n                codeHint: {\n                    containerPackageName: packageName ? packageName : undefined,\n                },\n                fileVersion: undefined,\n                shareLinkInfo,\n                isClpCompliantApp: request.headers?.[ClpCompliantAppHeader.isClpCompliantApp],\n            };\n        }\n        const { siteUrl, driveId, itemId, path, containerPackageName, fileVersion } = decodeOdspUrl(request.url);\n        const hashedDocumentId = await getHashedDocumentId(driveId, itemId);\n        assert(!hashedDocumentId.includes(\"/\"), 0x0a8 /* \"Docid should not contain slashes!!\" */);\n\n        let documentUrl = `fluid-odsp://placeholder/placeholder/${hashedDocumentId}/${removeBeginningSlash(path)}`;\n\n        if (request.url.length > 0) {\n            // In case of any additional parameters add them back to the url\n            const requestURL = new URL(request.url);\n            const searchParams = requestURL.search;\n            if (searchParams) {\n                documentUrl += searchParams;\n            }\n        }\n\n        const summarizer = !!request.headers?.[DriverHeader.summarizingClient];\n\n        return {\n            type: \"fluid\",\n            odspResolvedUrl: true,\n            endpoints: {\n                snapshotStorageUrl: getSnapshotUrl(siteUrl, driveId, itemId, fileVersion),\n                attachmentPOSTStorageUrl: getAttachmentPOSTUrl(siteUrl, driveId, itemId, fileVersion),\n                attachmentGETStorageUrl: getAttachmentGETUrl(siteUrl, driveId, itemId, fileVersion),\n                deltaStorageUrl: getDeltaStorageUrl(siteUrl, driveId, itemId, fileVersion),\n            },\n            id: hashedDocumentId,\n            tokens: {},\n            url: documentUrl,\n            hashedDocumentId,\n            siteUrl,\n            driveId,\n            itemId,\n            fileName: \"\",\n            summarizer,\n            codeHint: {\n                containerPackageName,\n            },\n            fileVersion,\n            isClpCompliantApp: request.headers?.[ClpCompliantAppHeader.isClpCompliantApp],\n        };\n    }\n\n    public async getAbsoluteUrl(\n        resolvedUrl: IResolvedUrl,\n        relativeUrl: string,\n        packageInfoSource?: IContainerPackageInfo | IFluidCodeDetails,\n    ): Promise<string> {\n        let dataStorePath = relativeUrl;\n        if (dataStorePath.startsWith(\"/\")) {\n            dataStorePath = dataStorePath.substr(1);\n        }\n        const odspResolvedUrl = getOdspResolvedUrl(resolvedUrl);\n\n        // back-compat: IFluidCodeDetails usage to be removed in 0.58.0\n        let containerPackageName;\n        if (packageInfoSource && \"name\" in packageInfoSource) {\n            containerPackageName = packageInfoSource.name;\n        } else if (isFluidPackage(packageInfoSource?.package)) {\n            containerPackageName = packageInfoSource?.package.name;\n        } else {\n            containerPackageName = packageInfoSource?.package;\n        }\n        containerPackageName = containerPackageName ?? odspResolvedUrl.codeHint?.containerPackageName;\n\n        return createOdspUrl({\n            ... odspResolvedUrl,\n            containerPackageName,\n            dataStorePath,\n        });\n    }\n}\n\nfunction decodeOdspUrl(url: string): {\n    siteUrl: string;\n    driveId: string;\n    itemId: string;\n    path: string;\n    containerPackageName?: string;\n    fileVersion?: string;\n} {\n    const [siteUrl, queryString] = url.split(\"?\");\n\n    const searchParams = new URLSearchParams(queryString);\n\n    const driveId = searchParams.get(\"driveId\");\n    const itemId = searchParams.get(\"itemId\");\n    const path = searchParams.get(\"path\");\n    const containerPackageName = searchParams.get(\"containerPackageName\");\n    const fileVersion = searchParams.get(\"fileVersion\");\n\n    if (driveId === null) {\n        throw new Error(\"ODSP URL did not contain a drive id\");\n    }\n\n    if (itemId === null) {\n        throw new Error(\"ODSP Url did not contain an item id\");\n    }\n\n    if (path === null) {\n        throw new Error(\"ODSP Url did not contain a path\");\n    }\n\n    return {\n        siteUrl,\n        driveId: decodeURIComponent(driveId),\n        itemId: decodeURIComponent(itemId),\n        path: decodeURIComponent(path),\n        containerPackageName: containerPackageName ? decodeURIComponent(containerPackageName) : undefined,\n        fileVersion: fileVersion ? decodeURIComponent(fileVersion) : undefined,\n    };\n}\n"]}
+{"version":3,"file":"odspDriverUrlResolver.js","sourceRoot":"","sources":["../src/odspDriverUrlResolver.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 { assert } from \"@fluidframework/common-utils\";\nimport { IRequest } from \"@fluidframework/core-interfaces\";\nimport {\n    DriverErrorType,\n    DriverHeader,\n    IContainerPackageInfo,\n    IResolvedUrl,\n    IUrlResolver,\n} from \"@fluidframework/driver-definitions\";\nimport { IOdspResolvedUrl, ShareLinkTypes, ShareLinkInfoType } from \"@fluidframework/odsp-driver-definitions\";\nimport { NonRetryableError } from \"@fluidframework/driver-utils\";\nimport { createOdspUrl } from \"./createOdspUrl\";\nimport { getApiRoot } from \"./odspUrlHelper\";\nimport { getOdspResolvedUrl } from \"./odspUtils\";\nimport { getHashedDocumentId } from \"./odspPublicUtils\";\nimport { ClpCompliantAppHeader } from \"./contractsPublic\";\nimport { pkgVersion } from \"./packageVersion\";\n\nfunction getUrlBase(siteUrl: string, driveId: string, itemId: string, fileVersion?: string) {\n    const siteOrigin = new URL(siteUrl).origin;\n    const version = fileVersion ? `versions/${fileVersion}/` : \"\";\n    return `${getApiRoot(siteOrigin)}/drives/${driveId}/items/${itemId}/${version}`;\n}\n\nfunction getSnapshotUrl(siteUrl: string, driveId: string, itemId: string, fileVersion?: string) {\n    const urlBase = getUrlBase(siteUrl, driveId, itemId, fileVersion);\n    return `${urlBase}opStream/snapshots`;\n}\n\nfunction getAttachmentPOSTUrl(siteUrl: string, driveId: string, itemId: string, fileVersion?: string) {\n    const urlBase = getUrlBase(siteUrl, driveId, itemId, fileVersion);\n    return `${urlBase}opStream/attachment`;\n}\n\nfunction getAttachmentGETUrl(siteUrl: string, driveId: string, itemId: string, fileVersion?: string) {\n    const urlBase = getUrlBase(siteUrl, driveId, itemId, fileVersion);\n    return `${urlBase}opStream/attachments`;\n}\n\nfunction getDeltaStorageUrl(siteUrl: string, driveId: string, itemId: string, fileVersion?: string) {\n    const urlBase = getUrlBase(siteUrl, driveId, itemId, fileVersion);\n    return `${urlBase}opStream`;\n}\n\n/**\n * Utility that enables us to handle paths provided with a beginning slash.\n * For example if a value of '/id1/id2' is provided, id1/id2 is returned.\n */\nfunction removeBeginningSlash(str: string): string {\n    if (str.startsWith(\"/\")) {\n        return str.substr(1);\n    }\n\n    return str;\n}\n\n/**\n * Resolver to resolve urls like the ones created by createOdspUrl which is driver inner\n * url format. Ex: `${siteUrl}?driveId=${driveId}&itemId=${itemId}&path=${path}`\n */\nexport class OdspDriverUrlResolver implements IUrlResolver {\n    constructor() { }\n\n    public async resolve(request: IRequest): Promise<IOdspResolvedUrl> {\n        if (request.headers && request.headers[DriverHeader.createNew]) {\n            const [siteURL, queryString] = request.url.split(\"?\");\n\n            const searchParams = new URLSearchParams(queryString);\n            const fileName = request.headers[DriverHeader.createNew].fileName;\n            const driveID = searchParams.get(\"driveId\");\n            const filePath = searchParams.get(\"path\");\n            const packageName = searchParams.get(\"containerPackageName\");\n            const createLinkType = searchParams.get(\"createLinkType\");\n            if (!(fileName && siteURL && driveID && filePath !== null && filePath !== undefined)) {\n                throw new NonRetryableError(\n                    \"Proper new file params should be there!!\",\n                    DriverErrorType.genericError,\n                    { driverVersion: pkgVersion });\n            }\n            let shareLinkInfo: ShareLinkInfoType | undefined;\n            if(createLinkType && createLinkType in ShareLinkTypes) {\n                shareLinkInfo = {\n                    createLink: {\n                        type: ShareLinkTypes[createLinkType],\n                    },\n                };\n            }\n            return {\n                endpoints: {\n                    snapshotStorageUrl: \"\",\n                    attachmentGETStorageUrl: \"\",\n                    attachmentPOSTStorageUrl: \"\",\n                    deltaStorageUrl: \"\",\n                },\n                tokens: {},\n                type: \"fluid\",\n                odspResolvedUrl: true,\n                id: \"odspCreateNew\",\n                url: `fluid-odsp://${siteURL}?${queryString}&version=null`,\n                siteUrl: siteURL,\n                hashedDocumentId: \"\",\n                driveId: driveID,\n                itemId: \"\",\n                fileName,\n                summarizer: false,\n                codeHint: {\n                    containerPackageName: packageName ? packageName : undefined,\n                },\n                fileVersion: undefined,\n                shareLinkInfo,\n                isClpCompliantApp: request.headers?.[ClpCompliantAppHeader.isClpCompliantApp],\n            };\n        }\n        const { siteUrl, driveId, itemId, path, containerPackageName, fileVersion } = decodeOdspUrl(request.url);\n        const hashedDocumentId = await getHashedDocumentId(driveId, itemId);\n        assert(!hashedDocumentId.includes(\"/\"), 0x0a8 /* \"Docid should not contain slashes!!\" */);\n\n        let documentUrl = `fluid-odsp://placeholder/placeholder/${hashedDocumentId}/${removeBeginningSlash(path)}`;\n\n        if (request.url.length > 0) {\n            // In case of any additional parameters add them back to the url\n            const requestURL = new URL(request.url);\n            const searchParams = requestURL.search;\n            if (searchParams) {\n                documentUrl += searchParams;\n            }\n        }\n\n        const summarizer = !!request.headers?.[DriverHeader.summarizingClient];\n\n        return {\n            type: \"fluid\",\n            odspResolvedUrl: true,\n            endpoints: {\n                snapshotStorageUrl: getSnapshotUrl(siteUrl, driveId, itemId, fileVersion),\n                attachmentPOSTStorageUrl: getAttachmentPOSTUrl(siteUrl, driveId, itemId, fileVersion),\n                attachmentGETStorageUrl: getAttachmentGETUrl(siteUrl, driveId, itemId, fileVersion),\n                deltaStorageUrl: getDeltaStorageUrl(siteUrl, driveId, itemId, fileVersion),\n            },\n            id: hashedDocumentId,\n            tokens: {},\n            url: documentUrl,\n            hashedDocumentId,\n            siteUrl,\n            driveId,\n            itemId,\n            fileName: \"\",\n            summarizer,\n            codeHint: {\n                containerPackageName,\n            },\n            fileVersion,\n            isClpCompliantApp: request.headers?.[ClpCompliantAppHeader.isClpCompliantApp],\n        };\n    }\n\n    public async getAbsoluteUrl(\n        resolvedUrl: IResolvedUrl,\n        relativeUrl: string,\n        packageInfoSource?: IContainerPackageInfo,\n    ): Promise<string> {\n        let dataStorePath = relativeUrl;\n        if (dataStorePath.startsWith(\"/\")) {\n            dataStorePath = dataStorePath.substr(1);\n        }\n        const odspResolvedUrl = getOdspResolvedUrl(resolvedUrl);\n        // back-compat: GitHub #9653\n        const isFluidPackage = (pkg: any) =>\n            typeof pkg === \"object\"\n            && typeof pkg?.name === \"string\"\n            && typeof pkg?.fluid === \"object\";\n        let containerPackageName;\n        if (packageInfoSource && \"name\" in packageInfoSource) {\n            containerPackageName = packageInfoSource.name;\n            // packageInfoSource is cast to any as it is typed to IContainerPackageInfo instead of IFluidCodeDetails\n        } else if (isFluidPackage((packageInfoSource as any)?.package)) {\n            containerPackageName = (packageInfoSource as any)?.package.name;\n        } else {\n            containerPackageName = (packageInfoSource as any)?.package;\n        }\n        containerPackageName = containerPackageName ?? odspResolvedUrl.codeHint?.containerPackageName;\n\n        return createOdspUrl({\n            ... odspResolvedUrl,\n            containerPackageName,\n            dataStorePath,\n        });\n    }\n}\n\nfunction decodeOdspUrl(url: string): {\n    siteUrl: string;\n    driveId: string;\n    itemId: string;\n    path: string;\n    containerPackageName?: string;\n    fileVersion?: string;\n} {\n    const [siteUrl, queryString] = url.split(\"?\");\n\n    const searchParams = new URLSearchParams(queryString);\n\n    const driveId = searchParams.get(\"driveId\");\n    const itemId = searchParams.get(\"itemId\");\n    const path = searchParams.get(\"path\");\n    const containerPackageName = searchParams.get(\"containerPackageName\");\n    const fileVersion = searchParams.get(\"fileVersion\");\n\n    if (driveId === null) {\n        throw new Error(\"ODSP URL did not contain a drive id\");\n    }\n\n    if (itemId === null) {\n        throw new Error(\"ODSP Url did not contain an item id\");\n    }\n\n    if (path === null) {\n        throw new Error(\"ODSP Url did not contain a path\");\n    }\n\n    return {\n        siteUrl,\n        driveId: decodeURIComponent(driveId),\n        itemId: decodeURIComponent(itemId),\n        path: decodeURIComponent(path),\n        containerPackageName: containerPackageName ? decodeURIComponent(containerPackageName) : undefined,\n        fileVersion: fileVersion ? decodeURIComponent(fileVersion) : undefined,\n    };\n}\n"]}

package/lib/odspDriverUrlResolverForShareLink.d.ts

@@ -1,8 +1,4 @@
-/*!
- * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
- * Licensed under the MIT License.
- */
-import { IFluidCodeDetails, IRequest } from "@fluidframework/core-interfaces";
+import { IRequest } from "@fluidframework/core-interfaces";
 import { IContainerPackageInfo, IResolvedUrl, IUrlResolver } from "@fluidframework/driver-definitions";
 import { ITelemetryBaseLogger } from "@fluidframework/common-definitions";
 import { IOdspResolvedUrl, IdentityType, OdspResourceTokenFetchOptions, TokenFetcher } from "@fluidframework/odsp-driver-definitions";
@@ -59,7 +55,7 @@ export declare class OdspDriverUrlResolverForShareLink implements IUrlResolver {
      * @param resolvedUrl - The driver resolved URL
      * @param request - The relative data store path URL. For requesting a driver URL, this value should always be '/'
      */
-    getAbsoluteUrl(resolvedUrl: IResolvedUrl, dataStorePath: string, packageInfoSource?: IContainerPackageInfo | IFluidCodeDetails): Promise<string>;
+    getAbsoluteUrl(resolvedUrl: IResolvedUrl, dataStorePath: string, packageInfoSource?: IContainerPackageInfo): Promise<string>;
     /**
      * Crafts a supported document/driver URL
      */

package/lib/odspDriverUrlResolverForShareLink.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"odspDriverUrlResolverForShareLink.d.ts","sourceRoot":"","sources":["../src/odspDriverUrlResolverForShareLink.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EAAE,iBAAiB,EAAE,QAAQ,EAAkB,MAAM,iCAAiC,CAAC;AAC9F,OAAO,EACH,qBAAqB,EACrB,YAAY,EACZ,YAAY,EACf,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EAAE,oBAAoB,EAAoB,MAAM,oCAAoC,CAAC;AAC5F,OAAO,EACH,gBAAgB,EAChB,YAAY,EACZ,6BAA6B,EAC7B,YAAY,EACf,MAAM,yCAAyC,CAAC;AAOjD,OAAO,EAAE,yBAAyB,EAAqB,MAAM,mBAAmB,CAAC;AAMjF;;GAEG;AACH,MAAM,WAAW,qBAAqB;IAClC;;OAEG;IACH,YAAY,EAAE,YAAY,CAAC,6BAA6B,CAAC,CAAC;IAC1D;;OAEG;IACH,YAAY,EAAE,YAAY,CAAC;CAC9B;AAED;;;;GAIG;AACH,qBAAa,iCAAkC,YAAW,YAAY;IAkB9D,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC;IAjB7B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAmB;IAC1C,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAsC;IACvE,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAoC;IAE1E;;;;;;;;;OASG;gBAEC,qBAAqB,CAAC,EAAE,qBAAqB,GAAG,SAAS,EACzD,MAAM,CAAC,EAAE,oBAAoB,EACZ,OAAO,CAAC,oBAAQ;IAWrC;;;OAGG;IACI,mBAAmB,CAAC,UAAU,EAAE,GAAG,EAAE,YAAY,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAyBrF,OAAO,CAAC,MAAM;IAId;;OAEG;IACU,OAAO,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,gBAAgB,CAAC;IA+BlE,OAAO,CAAC,cAAc;YAQR,mBAAmB;IA8BjC;;;;;OAKG;IACU,cAAc,CACvB,WAAW,EAAE,YAAY,EACzB,aAAa,EAAE,MAAM,EACrB,iBAAiB,CAAC,EAAE,qBAAqB,GAAG,iBAAiB,GAC9D,OAAO,CAAC,MAAM,CAAC;IA6BlB;;OAEG;WACW,iBAAiB,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,yBAAyB;IAQtF;;OAEG;WACW,cAAc,CAAC,OAAO,EAAE,yBAAyB;CAGlE"}
+{"version":3,"file":"odspDriverUrlResolverForShareLink.d.ts","sourceRoot":"","sources":["../src/odspDriverUrlResolverForShareLink.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,QAAQ,EAAE,MAAM,iCAAiC,CAAC;AAC3D,OAAO,EACH,qBAAqB,EACrB,YAAY,EACZ,YAAY,EACf,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EAAE,oBAAoB,EAAoB,MAAM,oCAAoC,CAAC;AAC5F,OAAO,EACH,gBAAgB,EAChB,YAAY,EACZ,6BAA6B,EAC7B,YAAY,EACf,MAAM,yCAAyC,CAAC;AAOjD,OAAO,EAAE,yBAAyB,EAAqB,MAAM,mBAAmB,CAAC;AAMjF;;GAEG;AACH,MAAM,WAAW,qBAAqB;IAClC;;OAEG;IACH,YAAY,EAAE,YAAY,CAAC,6BAA6B,CAAC,CAAC;IAC1D;;OAEG;IACH,YAAY,EAAE,YAAY,CAAC;CAC9B;AAED;;;;GAIG;AACH,qBAAa,iCAAkC,YAAW,YAAY;IAkB9D,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC;IAjB7B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAmB;IAC1C,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAsC;IACvE,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAoC;IAE1E;;;;;;;;;OASG;gBAEC,qBAAqB,CAAC,EAAE,qBAAqB,GAAG,SAAS,EACzD,MAAM,CAAC,EAAE,oBAAoB,EACZ,OAAO,CAAC,oBAAQ;IAWrC;;;OAGG;IACI,mBAAmB,CAAC,UAAU,EAAE,GAAG,EAAE,YAAY,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAyBrF,OAAO,CAAC,MAAM;IAId;;OAEG;IACU,OAAO,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,gBAAgB,CAAC;IA+BlE,OAAO,CAAC,cAAc;YAQR,mBAAmB;IA8BjC;;;;;OAKG;IACU,cAAc,CACvB,WAAW,EAAE,YAAY,EACzB,aAAa,EAAE,MAAM,EACrB,iBAAiB,CAAC,EAAE,qBAAqB,GAC1C,OAAO,CAAC,MAAM,CAAC;IAiClB;;OAEG;WACW,iBAAiB,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,yBAAyB;IAQtF;;OAEG;WACW,cAAc,CAAC,OAAO,EAAE,yBAAyB;CAGlE"}

package/lib/odspDriverUrlResolverForShareLink.js

@@ -3,7 +3,6 @@
  * Licensed under the MIT License.
  */
 import { PromiseCache } from "@fluidframework/common-utils";
-import { isFluidPackage } from "@fluidframework/core-interfaces";
 import { getLocatorFromOdspUrl, storeLocatorInOdspUrl, encodeOdspFluidDataStoreLocator, locatorQueryParamName, } from "./odspFluidFileLink";
 import { SharingLinkHeader } from "./contractsPublic";
 import { createOdspUrl } from "./createOdspUrl";
@@ -128,22 +127,26 @@ export class OdspDriverUrlResolverForShareLink {
      * @param request - The relative data store path URL. For requesting a driver URL, this value should always be '/'
      */
     async getAbsoluteUrl(resolvedUrl, dataStorePath, packageInfoSource) {
-        var _a;
+        var _a, _b, _c, _d;
         const odspResolvedUrl = getOdspResolvedUrl(resolvedUrl);
         const shareLink = await this.getShareLinkPromise(odspResolvedUrl);
         const shareLinkUrl = new URL(shareLink);
-        // back-compat: IFluidCodeDetails usage to be removed in 0.58.0
+        // back-compat: GitHub #9653
+        const isFluidPackage = (pkg) => typeof pkg === "object"
+            && typeof (pkg === null || pkg === void 0 ? void 0 : pkg.name) === "string"
+            && typeof (pkg === null || pkg === void 0 ? void 0 : pkg.fluid) === "object";
         let containerPackageName;
         if (packageInfoSource && "name" in packageInfoSource) {
             containerPackageName = packageInfoSource.name;
+            // packageInfoSource is cast to any as it is typed to IContainerPackageInfo instead of IFluidCodeDetails
         }
-        else if (isFluidPackage(packageInfoSource === null || packageInfoSource === void 0 ? void 0 : packageInfoSource.package)) {
-            containerPackageName = packageInfoSource === null || packageInfoSource === void 0 ? void 0 : packageInfoSource.package.name;
+        else if (isFluidPackage((_a = packageInfoSource) === null || _a === void 0 ? void 0 : _a.package)) {
+            containerPackageName = (_b = packageInfoSource) === null || _b === void 0 ? void 0 : _b.package.name;
         }
         else {
-            containerPackageName = packageInfoSource === null || packageInfoSource === void 0 ? void 0 : packageInfoSource.package;
+            containerPackageName = (_c = packageInfoSource) === null || _c === void 0 ? void 0 : _c.package;
         }
-        containerPackageName = containerPackageName !== null && containerPackageName !== void 0 ? containerPackageName : (_a = odspResolvedUrl.codeHint) === null || _a === void 0 ? void 0 : _a.containerPackageName;
+        containerPackageName = containerPackageName !== null && containerPackageName !== void 0 ? containerPackageName : (_d = odspResolvedUrl.codeHint) === null || _d === void 0 ? void 0 : _d.containerPackageName;
         storeLocatorInOdspUrl(shareLinkUrl, {
             siteUrl: odspResolvedUrl.siteUrl,
             driveId: odspResolvedUrl.driveId,

package/lib/odspDriverUrlResolverForShareLink.js.map

@@ -1 +1 @@
-{"version":3,"file":"odspDriverUrlResolverForShareLink.js","sourceRoot":"","sources":["../src/odspDriverUrlResolverForShareLink.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAC5D,OAAO,EAA+B,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAa9F,OAAO,EACH,qBAAqB,EACrB,qBAAqB,EACrB,+BAA+B,EAC/B,qBAAqB,GACxB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAA6B,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AACjF,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AACnE,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAgB5C;;;;GAIG;AACH,MAAM,OAAO,iCAAiC;IAK1C;;;;;;;;;OASG;IACH,YACI,qBAAyD,EACzD,MAA6B,EACZ,OAAgB;QAAhB,YAAO,GAAP,OAAO,CAAS;QAhBpB,qBAAgB,GAAG,IAAI,YAAY,EAAkB,CAAC;QAkBnE,IAAI,CAAC,MAAM,GAAG,gBAAgB,CAAC,MAAM,CAAC,CAAC;QACvC,IAAI,qBAAqB,EAAE;YACvB,IAAI,CAAC,qBAAqB,mCACnB,qBAAqB,KACxB,YAAY,EAAE,qBAAqB,CAAC,YAAY,GACnD,CAAC;SACL;IACL,CAAC;IAED;;;OAGG;IACI,mBAAmB,CAAC,UAAe,EAAE,YAAoB;QAC5D,MAAM,SAAS,GAAG,qBAAqB,CAAC,UAAU,CAAC,CAAC;QAEpD,IAAI,CAAC,SAAS,EAAE;YACZ,OAAO,SAAS,CAAC;SACpB;QAED,MAAM,UAAU,GAAG,IAAI,GAAG,CAAC,SAAS,CAAC,aAAa,EAAE,GAAG,UAAU,CAAC,QAAQ,KAAK,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC;QACtG,mGAAmG;QACnG,IAAI,YAAY,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,YAAY,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;YAC/D,MAAM,WAAW,GAAG,IAAI,eAAe,CAAC,YAAY,CAAC,CAAC;YACtD,WAAW,CAAC,OAAO,CAAC,CAAC,KAAa,EAAE,GAAW,EAAE,EAAE;gBAC/C,UAAU,CAAC,YAAY,CAAC,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;YAC/C,CAAC,CAAC,CAAC;YACH,SAAS,CAAC,aAAa,GAAG,GAAG,UAAU,CAAC,QAAQ,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC;SAC1E;aAAM;YACH,SAAS,CAAC,aAAa,GAAG,GAAG,UAAU,CAAC,QAAQ,GAC5C,UAAU,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,YAAY,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAC7E,GAAG,YAAY,IAAI,UAAU,CAAC,MAAM,EAAE,CAAC;SAC1C;QACD,qBAAqB,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;QAE7C,OAAO,UAAU,CAAC,IAAI,CAAC;IAC3B,CAAC;IAEO,MAAM,CAAC,WAA6B;QACxC,OAAO,GAAG,WAAW,CAAC,OAAO,IAAI,WAAW,CAAC,OAAO,IAAI,WAAW,CAAC,MAAM,EAAE,CAAC;IACjF,CAAC;IAED;;OAEG;IACI,KAAK,CAAC,OAAO,CAAC,OAAiB;;QAClC,MAAM,mBAAmB,GAAG,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC;QAC3E,MAAM,qBAAqB,SAAG,mBAAmB,CAAC,OAAO,0CAAG,iBAAiB,CAAC,qBAAqB,CAAC,CAAC;QACrG,IAAI;YACA,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;YAEjC,MAAM,aAAa,GAAG,qBAAqB,CAAC,GAAG,CAAC,CAAC;YACjD,IAAI,aAAa,EAAE;gBACf,mBAAmB,CAAC,GAAG,GAAG,aAAa,CAAC,aAAa,CAAC,CAAC;aAC1D;SACJ;QAAC,WAAM;YACJ,8EAA8E;SACjF;QAED,MAAM,eAAe,GAAG,MAAM,IAAI,qBAAqB,EAAE,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAC;QAEvF,IAAI,qBAAqB,EAAE;YACvB,yGAAyG;YACzG,sGAAsG;YACtG,uBAAuB;YACvB,eAAe,CAAC,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC,eAAe,CAAC,aAAa,IAAI,EAAE,EAC7E,EAAC,mBAAmB,EAAE,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,GAAG,CAAC,EAAC,CAAC,CAAC;SAChE;QACD,IAAI,eAAe,CAAC,MAAM,EAAE;YACxB,iGAAiG;YACjG,mGAAmG;YACnG,IAAI,CAAC,mBAAmB,CAAC,eAAe,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;SAC7D;QACD,OAAO,eAAe,CAAC;IAC3B,CAAC;IAEO,cAAc,CAAC,IAAY;QAC/B,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,CAAC;QAC1B,MAAM,MAAM,GAAG,IAAI,eAAe,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAC/C,MAAM,CAAC,MAAM,CAAC,qBAAqB,CAAC,CAAC;QACrC,GAAG,CAAC,MAAM,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC;QAC/B,OAAO,GAAG,CAAC,IAAI,CAAC;IACpB,CAAC;IAEO,KAAK,CAAC,mBAAmB,CAAC,WAA6B;QAC3D,IAAI,IAAI,CAAC,qBAAqB,KAAK,SAAS,EAAE;YAC1C,MAAM,IAAI,KAAK,CAAC,uEAAuE,CAAC,CAAC;SAC5F;QAED,IAAI,CAAC,CAAC,WAAW,CAAC,OAAO,IAAI,WAAW,CAAC,OAAO,IAAI,WAAW,CAAC,MAAM,CAAC,EAAE;YACrE,MAAM,IAAI,KAAK,CAAC,oEAAoE;gBAChF,mCAAmC,CAAC,CAAC;SAC5C;QAED,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;QACrC,MAAM,iBAAiB,GAAG,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACzD,IAAI,iBAAiB,EAAE;YACnB,OAAO,iBAAiB,CAAC;SAC5B;QACD,MAAM,cAAc,GAAG,WAAW,CAC9B,IAAI,CAAC,qBAAqB,CAAC,YAAY,EACvC,WAAW,EACX,IAAI,CAAC,qBAAqB,CAAC,YAAY,EACvC,IAAI,CAAC,MAAM,CACd,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;YACd,yDAAyD;YACzD,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,EAAE,SAAS,EAAE,mBAAmB,EAAE,EAAE,KAAK,CAAC,CAAC;YACtE,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YAClC,MAAM,KAAK,CAAC;QAChB,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,IAAI,EAAE,CAAC,cAAc,CAAC,CAAC;QAC3D,OAAO,cAAc,CAAC;IAC1B,CAAC;IAED;;;;;OAKG;IACI,KAAK,CAAC,cAAc,CACvB,WAAyB,EACzB,aAAqB,EACrB,iBAA6D;;QAE7D,MAAM,eAAe,GAAG,kBAAkB,CAAC,WAAW,CAAC,CAAC;QACxD,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,eAAe,CAAC,CAAC;QAClE,MAAM,YAAY,GAAG,IAAI,GAAG,CAAC,SAAS,CAAC,CAAC;QAExC,+DAA+D;QAC/D,IAAI,oBAAoB,CAAC;QACzB,IAAI,iBAAiB,IAAI,MAAM,IAAI,iBAAiB,EAAE;YAClD,oBAAoB,GAAG,iBAAiB,CAAC,IAAI,CAAC;SACjD;aAAM,IAAI,cAAc,CAAC,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,OAAO,CAAC,EAAE;YACnD,oBAAoB,GAAG,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,OAAO,CAAC,IAAI,CAAC;SAC1D;aAAM;YACH,oBAAoB,GAAG,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,OAAO,CAAC;SACrD;QACD,oBAAoB,GAAG,oBAAoB,aAApB,oBAAoB,cAApB,oBAAoB,SAAI,eAAe,CAAC,QAAQ,0CAAE,oBAAoB,CAAC;QAE9F,qBAAqB,CAAC,YAAY,EAAE;YAChC,OAAO,EAAE,eAAe,CAAC,OAAO;YAChC,OAAO,EAAE,eAAe,CAAC,OAAO;YAChC,MAAM,EAAE,eAAe,CAAC,MAAM;YAC9B,aAAa;YACb,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,oBAAoB;YACpB,WAAW,EAAE,eAAe,CAAC,WAAW;SAC3C,CAAC,CAAC;QAEH,OAAO,YAAY,CAAC,IAAI,CAAC;IAC7B,CAAC;IAED;;OAEG;IACI,MAAM,CAAC,iBAAiB,CAAC,OAAe,EAAE,UAAqC;QAClF,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC;QAE7B,qBAAqB,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;QAEvC,OAAO,GAAG,CAAC,IAAI,CAAC;IACpB,CAAC;IAED;;OAEG;IACI,MAAM,CAAC,cAAc,CAAC,OAAkC;QAC3D,OAAO,+BAA+B,CAAC,OAAO,CAAC,CAAC;IACpD,CAAC;CACJ","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { PromiseCache } from \"@fluidframework/common-utils\";\nimport { IFluidCodeDetails, IRequest, isFluidPackage } from \"@fluidframework/core-interfaces\";\nimport {\n    IContainerPackageInfo,\n    IResolvedUrl,\n    IUrlResolver,\n} from \"@fluidframework/driver-definitions\";\nimport { ITelemetryBaseLogger, ITelemetryLogger } from \"@fluidframework/common-definitions\";\nimport {\n    IOdspResolvedUrl,\n    IdentityType,\n    OdspResourceTokenFetchOptions,\n    TokenFetcher,\n} from \"@fluidframework/odsp-driver-definitions\";\nimport {\n    getLocatorFromOdspUrl,\n    storeLocatorInOdspUrl,\n    encodeOdspFluidDataStoreLocator,\n    locatorQueryParamName,\n} from \"./odspFluidFileLink\";\nimport { OdspFluidDataStoreLocator, SharingLinkHeader } from \"./contractsPublic\";\nimport { createOdspUrl } from \"./createOdspUrl\";\nimport { OdspDriverUrlResolver } from \"./odspDriverUrlResolver\";\nimport { getOdspResolvedUrl, createOdspLogger } from \"./odspUtils\";\nimport { getFileLink } from \"./getFileLink\";\n\n/**\n * Properties passed to the code responsible for fetching share link for a file.\n */\nexport interface ShareLinkFetcherProps {\n    /**\n     * Callback method that is used to fetch access token necessary to call API that produces share link\n     */\n    tokenFetcher: TokenFetcher<OdspResourceTokenFetchOptions>;\n    /**\n     * Identity type determining the shape of share link as it differs for Enterprise and Consumer users.\n     */\n    identityType: IdentityType;\n}\n\n/**\n * Resolver to resolve urls like the ones created by createOdspUrl which is driver inner\n * url format and the ones which have things like driveId, siteId, itemId etc encoded in nav param.\n * This resolver also handles share links and try to generate one for the use by the app.\n */\nexport class OdspDriverUrlResolverForShareLink implements IUrlResolver {\n    private readonly logger: ITelemetryLogger;\n    private readonly sharingLinkCache = new PromiseCache<string, string>();\n    private readonly shareLinkFetcherProps: ShareLinkFetcherProps | undefined;\n\n    /**\n     * Creates url resolver instance\n     * @param shareLinkFetcherProps - properties used when fetching share link.\n     * Can be set as 'undefined' for cases where share link is not needed. Currently, only\n     * getAbsoluteUrl() method requires share link.\n     * @param logger - logger object that is used as telemetry sink\n     * @param appName - application name hint that is encoded with url produced by getAbsoluteUrl() method.\n     * This hint is used by link handling logic which determines which app to redirect to when user\n     * navigates directly to the link.\n     */\n    public constructor(\n        shareLinkFetcherProps?: ShareLinkFetcherProps | undefined,\n        logger?: ITelemetryBaseLogger,\n        private readonly appName?: string,\n    ) {\n        this.logger = createOdspLogger(logger);\n        if (shareLinkFetcherProps) {\n            this.shareLinkFetcherProps = {\n                ...shareLinkFetcherProps,\n                tokenFetcher: shareLinkFetcherProps.tokenFetcher,\n            };\n        }\n    }\n\n    /**\n     * Takes an already generated data store url (from requestUrl) and appends a path to the\n     * existing data store information.\n     */\n    public appendDataStorePath(requestUrl: URL, pathToAppend: string): string | undefined {\n        const fluidInfo = getLocatorFromOdspUrl(requestUrl);\n\n        if (!fluidInfo) {\n            return undefined;\n        }\n\n        const parsingUrl = new URL(fluidInfo.dataStorePath, `${requestUrl.protocol}//${requestUrl.hostname}`);\n        // Determine if the caller is passing a query parameter or path since processing will be different.\n        if (pathToAppend.startsWith(\"/?\") || pathToAppend.startsWith(\"?\")) {\n            const queryParams = new URLSearchParams(pathToAppend);\n            queryParams.forEach((value: string, key: string) => {\n                parsingUrl.searchParams.append(key, value);\n            });\n            fluidInfo.dataStorePath = `${parsingUrl.pathname}${parsingUrl.search}`;\n        } else {\n            fluidInfo.dataStorePath = `${parsingUrl.pathname}${\n                parsingUrl.pathname.endsWith(\"/\") || pathToAppend.startsWith(\"/\") ? \"\" : \"/\"\n            }${pathToAppend}/${parsingUrl.search}`;\n        }\n        storeLocatorInOdspUrl(requestUrl, fluidInfo);\n\n        return requestUrl.href;\n    }\n\n    private getKey(resolvedUrl: IOdspResolvedUrl): string {\n        return `${resolvedUrl.siteUrl},${resolvedUrl.driveId},${resolvedUrl.itemId}`;\n    }\n\n    /**\n     * Resolves request URL into driver details\n     */\n    public async resolve(request: IRequest): Promise<IOdspResolvedUrl> {\n        const requestToBeResolved = { headers: request.headers, url: request.url };\n        const isSharingLinkToRedeem = requestToBeResolved.headers?.[SharingLinkHeader.isSharingLinkToRedeem];\n        try {\n            const url = new URL(request.url);\n\n            const odspFluidInfo = getLocatorFromOdspUrl(url);\n            if (odspFluidInfo) {\n                requestToBeResolved.url = createOdspUrl(odspFluidInfo);\n            }\n        } catch {\n            // If the locator throws some error, then try to resolve the request as it is.\n        }\n\n        const odspResolvedUrl = await new OdspDriverUrlResolver().resolve(requestToBeResolved);\n\n        if (isSharingLinkToRedeem) {\n            // We need to remove the nav param if set by host when setting the sharelink as otherwise the shareLinkId\n            // when redeeming the share link during the redeem fallback for trees latest call becomes greater than\n            // the eligible length.\n            odspResolvedUrl.shareLinkInfo = Object.assign(odspResolvedUrl.shareLinkInfo || {},\n                {sharingLinkToRedeem: this.removeNavParam(request.url)});\n        }\n        if (odspResolvedUrl.itemId) {\n            // Kick start the sharing link request if we don't have it already as a performance optimization.\n            // For detached create new, we don't have an item id yet and therefore cannot generate a share link\n            this.getShareLinkPromise(odspResolvedUrl).catch(() => {});\n        }\n        return odspResolvedUrl;\n    }\n\n    private removeNavParam(link: string): string {\n        const url = new URL(link);\n        const params = new URLSearchParams(url.search);\n        params.delete(locatorQueryParamName);\n        url.search = params.toString();\n        return url.href;\n    }\n\n    private async getShareLinkPromise(resolvedUrl: IOdspResolvedUrl): Promise<string> {\n        if (this.shareLinkFetcherProps === undefined) {\n            throw new Error(\"Failed to get share link because share link fetcher props are missing\");\n        }\n\n        if (!(resolvedUrl.siteUrl && resolvedUrl.driveId && resolvedUrl.itemId)) {\n            throw new Error(\"Failed to get share link because necessary information is missing \" +\n                \"(e.g. siteUrl, driveId or itemId)\");\n        }\n\n        const key = this.getKey(resolvedUrl);\n        const cachedLinkPromise = this.sharingLinkCache.get(key);\n        if (cachedLinkPromise) {\n            return cachedLinkPromise;\n        }\n        const newLinkPromise = getFileLink(\n            this.shareLinkFetcherProps.tokenFetcher,\n            resolvedUrl,\n            this.shareLinkFetcherProps.identityType,\n            this.logger,\n        ).catch((error) => {\n            // This should imply that error is a non-retriable error.\n            this.logger.sendErrorEvent({ eventName: \"FluidFileUrlError\" }, error);\n            this.sharingLinkCache.remove(key);\n            throw error;\n        });\n        this.sharingLinkCache.add(key, async () => newLinkPromise);\n        return newLinkPromise;\n    }\n\n    /**\n     * Requests a driver + data store storage URL. Note that this method requires share link to be fetched\n     * and it will throw in case share link fetcher props were not specified when instance was created.\n     * @param resolvedUrl - The driver resolved URL\n     * @param request - The relative data store path URL. For requesting a driver URL, this value should always be '/'\n     */\n    public async getAbsoluteUrl(\n        resolvedUrl: IResolvedUrl,\n        dataStorePath: string,\n        packageInfoSource?: IContainerPackageInfo | IFluidCodeDetails,\n    ): Promise<string> {\n        const odspResolvedUrl = getOdspResolvedUrl(resolvedUrl);\n        const shareLink = await this.getShareLinkPromise(odspResolvedUrl);\n        const shareLinkUrl = new URL(shareLink);\n\n        // back-compat: IFluidCodeDetails usage to be removed in 0.58.0\n        let containerPackageName;\n        if (packageInfoSource && \"name\" in packageInfoSource) {\n            containerPackageName = packageInfoSource.name;\n        } else if (isFluidPackage(packageInfoSource?.package)) {\n            containerPackageName = packageInfoSource?.package.name;\n        } else {\n            containerPackageName = packageInfoSource?.package;\n        }\n        containerPackageName = containerPackageName ?? odspResolvedUrl.codeHint?.containerPackageName;\n\n        storeLocatorInOdspUrl(shareLinkUrl, {\n            siteUrl: odspResolvedUrl.siteUrl,\n            driveId: odspResolvedUrl.driveId,\n            itemId: odspResolvedUrl.itemId,\n            dataStorePath,\n            appName: this.appName,\n            containerPackageName,\n            fileVersion: odspResolvedUrl.fileVersion,\n        });\n\n        return shareLinkUrl.href;\n    }\n\n    /**\n     * Crafts a supported document/driver URL\n     */\n    public static createDocumentUrl(baseUrl: string, driverInfo: OdspFluidDataStoreLocator) {\n        const url = new URL(baseUrl);\n\n        storeLocatorInOdspUrl(url, driverInfo);\n\n        return url.href;\n    }\n\n    /**\n     * Crafts a supported data store nav param\n     */\n    public static createNavParam(locator: OdspFluidDataStoreLocator) {\n        return encodeOdspFluidDataStoreLocator(locator);\n    }\n}\n"]}
+{"version":3,"file":"odspDriverUrlResolverForShareLink.js","sourceRoot":"","sources":["../src/odspDriverUrlResolverForShareLink.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 { PromiseCache } from \"@fluidframework/common-utils\";\nimport { IRequest } from \"@fluidframework/core-interfaces\";\nimport {\n    IContainerPackageInfo,\n    IResolvedUrl,\n    IUrlResolver,\n} from \"@fluidframework/driver-definitions\";\nimport { ITelemetryBaseLogger, ITelemetryLogger } from \"@fluidframework/common-definitions\";\nimport {\n    IOdspResolvedUrl,\n    IdentityType,\n    OdspResourceTokenFetchOptions,\n    TokenFetcher,\n} from \"@fluidframework/odsp-driver-definitions\";\nimport {\n    getLocatorFromOdspUrl,\n    storeLocatorInOdspUrl,\n    encodeOdspFluidDataStoreLocator,\n    locatorQueryParamName,\n} from \"./odspFluidFileLink\";\nimport { OdspFluidDataStoreLocator, SharingLinkHeader } from \"./contractsPublic\";\nimport { createOdspUrl } from \"./createOdspUrl\";\nimport { OdspDriverUrlResolver } from \"./odspDriverUrlResolver\";\nimport { getOdspResolvedUrl, createOdspLogger } from \"./odspUtils\";\nimport { getFileLink } from \"./getFileLink\";\n\n/**\n * Properties passed to the code responsible for fetching share link for a file.\n */\nexport interface ShareLinkFetcherProps {\n    /**\n     * Callback method that is used to fetch access token necessary to call API that produces share link\n     */\n    tokenFetcher: TokenFetcher<OdspResourceTokenFetchOptions>;\n    /**\n     * Identity type determining the shape of share link as it differs for Enterprise and Consumer users.\n     */\n    identityType: IdentityType;\n}\n\n/**\n * Resolver to resolve urls like the ones created by createOdspUrl which is driver inner\n * url format and the ones which have things like driveId, siteId, itemId etc encoded in nav param.\n * This resolver also handles share links and try to generate one for the use by the app.\n */\nexport class OdspDriverUrlResolverForShareLink implements IUrlResolver {\n    private readonly logger: ITelemetryLogger;\n    private readonly sharingLinkCache = new PromiseCache<string, string>();\n    private readonly shareLinkFetcherProps: ShareLinkFetcherProps | undefined;\n\n    /**\n     * Creates url resolver instance\n     * @param shareLinkFetcherProps - properties used when fetching share link.\n     * Can be set as 'undefined' for cases where share link is not needed. Currently, only\n     * getAbsoluteUrl() method requires share link.\n     * @param logger - logger object that is used as telemetry sink\n     * @param appName - application name hint that is encoded with url produced by getAbsoluteUrl() method.\n     * This hint is used by link handling logic which determines which app to redirect to when user\n     * navigates directly to the link.\n     */\n    public constructor(\n        shareLinkFetcherProps?: ShareLinkFetcherProps | undefined,\n        logger?: ITelemetryBaseLogger,\n        private readonly appName?: string,\n    ) {\n        this.logger = createOdspLogger(logger);\n        if (shareLinkFetcherProps) {\n            this.shareLinkFetcherProps = {\n                ...shareLinkFetcherProps,\n                tokenFetcher: shareLinkFetcherProps.tokenFetcher,\n            };\n        }\n    }\n\n    /**\n     * Takes an already generated data store url (from requestUrl) and appends a path to the\n     * existing data store information.\n     */\n    public appendDataStorePath(requestUrl: URL, pathToAppend: string): string | undefined {\n        const fluidInfo = getLocatorFromOdspUrl(requestUrl);\n\n        if (!fluidInfo) {\n            return undefined;\n        }\n\n        const parsingUrl = new URL(fluidInfo.dataStorePath, `${requestUrl.protocol}//${requestUrl.hostname}`);\n        // Determine if the caller is passing a query parameter or path since processing will be different.\n        if (pathToAppend.startsWith(\"/?\") || pathToAppend.startsWith(\"?\")) {\n            const queryParams = new URLSearchParams(pathToAppend);\n            queryParams.forEach((value: string, key: string) => {\n                parsingUrl.searchParams.append(key, value);\n            });\n            fluidInfo.dataStorePath = `${parsingUrl.pathname}${parsingUrl.search}`;\n        } else {\n            fluidInfo.dataStorePath = `${parsingUrl.pathname}${\n                parsingUrl.pathname.endsWith(\"/\") || pathToAppend.startsWith(\"/\") ? \"\" : \"/\"\n            }${pathToAppend}/${parsingUrl.search}`;\n        }\n        storeLocatorInOdspUrl(requestUrl, fluidInfo);\n\n        return requestUrl.href;\n    }\n\n    private getKey(resolvedUrl: IOdspResolvedUrl): string {\n        return `${resolvedUrl.siteUrl},${resolvedUrl.driveId},${resolvedUrl.itemId}`;\n    }\n\n    /**\n     * Resolves request URL into driver details\n     */\n    public async resolve(request: IRequest): Promise<IOdspResolvedUrl> {\n        const requestToBeResolved = { headers: request.headers, url: request.url };\n        const isSharingLinkToRedeem = requestToBeResolved.headers?.[SharingLinkHeader.isSharingLinkToRedeem];\n        try {\n            const url = new URL(request.url);\n\n            const odspFluidInfo = getLocatorFromOdspUrl(url);\n            if (odspFluidInfo) {\n                requestToBeResolved.url = createOdspUrl(odspFluidInfo);\n            }\n        } catch {\n            // If the locator throws some error, then try to resolve the request as it is.\n        }\n\n        const odspResolvedUrl = await new OdspDriverUrlResolver().resolve(requestToBeResolved);\n\n        if (isSharingLinkToRedeem) {\n            // We need to remove the nav param if set by host when setting the sharelink as otherwise the shareLinkId\n            // when redeeming the share link during the redeem fallback for trees latest call becomes greater than\n            // the eligible length.\n            odspResolvedUrl.shareLinkInfo = Object.assign(odspResolvedUrl.shareLinkInfo || {},\n                {sharingLinkToRedeem: this.removeNavParam(request.url)});\n        }\n        if (odspResolvedUrl.itemId) {\n            // Kick start the sharing link request if we don't have it already as a performance optimization.\n            // For detached create new, we don't have an item id yet and therefore cannot generate a share link\n            this.getShareLinkPromise(odspResolvedUrl).catch(() => {});\n        }\n        return odspResolvedUrl;\n    }\n\n    private removeNavParam(link: string): string {\n        const url = new URL(link);\n        const params = new URLSearchParams(url.search);\n        params.delete(locatorQueryParamName);\n        url.search = params.toString();\n        return url.href;\n    }\n\n    private async getShareLinkPromise(resolvedUrl: IOdspResolvedUrl): Promise<string> {\n        if (this.shareLinkFetcherProps === undefined) {\n            throw new Error(\"Failed to get share link because share link fetcher props are missing\");\n        }\n\n        if (!(resolvedUrl.siteUrl && resolvedUrl.driveId && resolvedUrl.itemId)) {\n            throw new Error(\"Failed to get share link because necessary information is missing \" +\n                \"(e.g. siteUrl, driveId or itemId)\");\n        }\n\n        const key = this.getKey(resolvedUrl);\n        const cachedLinkPromise = this.sharingLinkCache.get(key);\n        if (cachedLinkPromise) {\n            return cachedLinkPromise;\n        }\n        const newLinkPromise = getFileLink(\n            this.shareLinkFetcherProps.tokenFetcher,\n            resolvedUrl,\n            this.shareLinkFetcherProps.identityType,\n            this.logger,\n        ).catch((error) => {\n            // This should imply that error is a non-retriable error.\n            this.logger.sendErrorEvent({ eventName: \"FluidFileUrlError\" }, error);\n            this.sharingLinkCache.remove(key);\n            throw error;\n        });\n        this.sharingLinkCache.add(key, async () => newLinkPromise);\n        return newLinkPromise;\n    }\n\n    /**\n     * Requests a driver + data store storage URL. Note that this method requires share link to be fetched\n     * and it will throw in case share link fetcher props were not specified when instance was created.\n     * @param resolvedUrl - The driver resolved URL\n     * @param request - The relative data store path URL. For requesting a driver URL, this value should always be '/'\n     */\n    public async getAbsoluteUrl(\n        resolvedUrl: IResolvedUrl,\n        dataStorePath: string,\n        packageInfoSource?: IContainerPackageInfo,\n    ): Promise<string> {\n        const odspResolvedUrl = getOdspResolvedUrl(resolvedUrl);\n        const shareLink = await this.getShareLinkPromise(odspResolvedUrl);\n        const shareLinkUrl = new URL(shareLink);\n        // back-compat: GitHub #9653\n        const isFluidPackage = (pkg: any) =>\n            typeof pkg === \"object\"\n            && typeof pkg?.name === \"string\"\n            && typeof pkg?.fluid === \"object\";\n        let containerPackageName;\n        if (packageInfoSource && \"name\" in packageInfoSource) {\n            containerPackageName = packageInfoSource.name;\n            // packageInfoSource is cast to any as it is typed to IContainerPackageInfo instead of IFluidCodeDetails\n        } else if (isFluidPackage((packageInfoSource as any)?.package)) {\n            containerPackageName = (packageInfoSource as any)?.package.name;\n        } else {\n            containerPackageName = (packageInfoSource as any)?.package;\n        }\n        containerPackageName = containerPackageName ?? odspResolvedUrl.codeHint?.containerPackageName;\n\n        storeLocatorInOdspUrl(shareLinkUrl, {\n            siteUrl: odspResolvedUrl.siteUrl,\n            driveId: odspResolvedUrl.driveId,\n            itemId: odspResolvedUrl.itemId,\n            dataStorePath,\n            appName: this.appName,\n            containerPackageName,\n            fileVersion: odspResolvedUrl.fileVersion,\n        });\n\n        return shareLinkUrl.href;\n    }\n\n    /**\n     * Crafts a supported document/driver URL\n     */\n    public static createDocumentUrl(baseUrl: string, driverInfo: OdspFluidDataStoreLocator) {\n        const url = new URL(baseUrl);\n\n        storeLocatorInOdspUrl(url, driverInfo);\n\n        return url.href;\n    }\n\n    /**\n     * Crafts a supported data store nav param\n     */\n    public static createNavParam(locator: OdspFluidDataStoreLocator) {\n        return encodeOdspFluidDataStoreLocator(locator);\n    }\n}\n"]}

package/lib/odspSnapshotParser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"odspSnapshotParser.d.ts","sourceRoot":"","sources":["../src/odspSnapshotParser.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,OAAO,EAAE,aAAa,EAAuB,MAAM,aAAa,CAAC;AACjE,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AA2ChD;;;GAGG;AACH,wBAAgB,yCAAyC,CACrD,YAAY,EAAE,aAAa,GAC5B,iBAAiB,CAgBnB"}
+{"version":3,"file":"odspSnapshotParser.d.ts","sourceRoot":"","sources":["../src/odspSnapshotParser.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,OAAO,EAAE,aAAa,EAAuB,MAAM,aAAa,CAAC;AACjE,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAwChD;;;GAGG;AACH,wBAAgB,yCAAyC,CACrD,YAAY,EAAE,aAAa,GAC5B,iBAAiB,CAgBnB"}

package/lib/odspSnapshotParser.js

@@ -13,7 +13,7 @@ import { assert, stringToBuffer } from "@fluidframework/common-utils";
 function buildHierarchy(flatTree) {
     const lookup = {};
     // id is required for root tree as it will be used to determine the version we loaded from.
-    const root = { id: flatTree.id, blobs: {}, commits: {}, trees: {} };
+    const root = { id: flatTree.id, blobs: {}, trees: {} };
     lookup[""] = root;
     for (const entry of flatTree.entries) {
         const lastIndex = entry.path.lastIndexOf("/");
@@ -25,7 +25,6 @@ function buildHierarchy(flatTree) {
         if (entry.type === "tree") {
             const newTree = {
                 blobs: {},
-                commits: {},
                 trees: {},
                 unreferenced: entry.unreferenced,
             };
@@ -35,9 +34,6 @@ function buildHierarchy(flatTree) {
         else if (entry.type === "blob") {
             node.blobs[decodeURIComponent(entryPathBase)] = entry.id;
         }
-        else if (entry.type === "commit") {
-            node.commits[decodeURIComponent(entryPathBase)] = entry.id;
-        }
     }
     return root;
 }

package/lib/odspSnapshotParser.js.map

@@ -1 +1 @@
-{"version":3,"file":"odspSnapshotParser.js","sourceRoot":"","sources":["../src/odspSnapshotParser.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, stringToBuffer } from \"@fluidframework/common-utils\";\nimport * as api from \"@fluidframework/protocol-definitions\";\nimport { IOdspSnapshot, IOdspSnapshotCommit } from \"./contracts\";\nimport { ISnapshotContents } from \"./odspUtils\";\n\n/**\n * Build a tree hierarchy base on a flat tree\n *\n * @param flatTree - a flat tree\n * @param blobsShaToPathCache - Map with blobs sha as keys and values as path of the blob.\n * @returns the hierarchical tree\n */\nfunction buildHierarchy(flatTree: IOdspSnapshotCommit): api.ISnapshotTree {\n    const lookup: { [path: string]: api.ISnapshotTree } = {};\n    // id is required for root tree as it will be used to determine the version we loaded from.\n    const root: api.ISnapshotTree = { id: flatTree.id, blobs: {}, commits: {}, trees: {} };\n    lookup[\"\"] = root;\n\n    for (const entry of flatTree.entries) {\n        const lastIndex = entry.path.lastIndexOf(\"/\");\n        const entryPathDir = entry.path.slice(0, Math.max(0, lastIndex));\n        const entryPathBase = entry.path.slice(lastIndex + 1);\n\n        // ODSP snapshots are created breadth-first so we can assume we see tree nodes prior to their contents\n        const node = lookup[entryPathDir];\n\n        // Add in either the blob or tree\n        if (entry.type === \"tree\") {\n            const newTree: api.ISnapshotTree = {\n                blobs: {},\n                commits: {},\n                trees: {},\n                unreferenced: entry.unreferenced,\n            };\n            node.trees[decodeURIComponent(entryPathBase)] = newTree;\n            lookup[entry.path] = newTree;\n        } else if (entry.type === \"blob\") {\n            node.blobs[decodeURIComponent(entryPathBase)] = entry.id;\n        } else if (entry.type === \"commit\") {\n            node.commits[decodeURIComponent(entryPathBase)] = entry.id;\n        }\n    }\n\n    return root;\n}\n\n/**\n * Converts existing IOdspSnapshot to snapshot tree, blob array and ops\n * @param odspSnapshot - snapshot\n */\nexport function convertOdspSnapshotToSnapsohtTreeAndBlobs(\n    odspSnapshot: IOdspSnapshot,\n): ISnapshotContents {\n    const blobsWithBufferContent = new Map<string, ArrayBuffer>();\n    if (odspSnapshot.blobs) {\n        odspSnapshot.blobs.forEach((blob) => {\n            assert(blob.encoding === \"base64\" || blob.encoding === undefined,\n                0x0a4 /* `Unexpected blob encoding type: '${blob.encoding}'` */);\n            blobsWithBufferContent.set(blob.id, stringToBuffer(blob.content, blob.encoding ?? \"utf8\"));\n        });\n    }\n    const val: ISnapshotContents = {\n        blobs: blobsWithBufferContent,\n        ops: odspSnapshot.ops?.map((op) => op.op) ?? [],\n        sequenceNumber: odspSnapshot.trees && (odspSnapshot.trees[0]).sequenceNumber,\n        snapshotTree: buildHierarchy(odspSnapshot.trees[0]),\n    };\n    return val;\n}\n"]}
+{"version":3,"file":"odspSnapshotParser.js","sourceRoot":"","sources":["../src/odspSnapshotParser.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAKtE;;;;;;GAMG;AACH,SAAS,cAAc,CAAC,QAA6B;IACjD,MAAM,MAAM,GAA0C,EAAE,CAAC;IACzD,2FAA2F;IAC3F,MAAM,IAAI,GAAsB,EAAE,EAAE,EAAE,QAAQ,CAAC,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC;IAC1E,MAAM,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC;IAElB,KAAK,MAAM,KAAK,IAAI,QAAQ,CAAC,OAAO,EAAE;QAClC,MAAM,SAAS,GAAG,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;QAC9C,MAAM,YAAY,GAAG,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC,CAAC;QACjE,MAAM,aAAa,GAAG,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,GAAG,CAAC,CAAC,CAAC;QAEtD,sGAAsG;QACtG,MAAM,IAAI,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC;QAElC,iCAAiC;QACjC,IAAI,KAAK,CAAC,IAAI,KAAK,MAAM,EAAE;YACvB,MAAM,OAAO,GAAsB;gBAC/B,KAAK,EAAE,EAAE;gBACT,KAAK,EAAE,EAAE;gBACT,YAAY,EAAE,KAAK,CAAC,YAAY;aACnC,CAAC;YACF,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,aAAa,CAAC,CAAC,GAAG,OAAO,CAAC;YACxD,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC;SAChC;aAAM,IAAI,KAAK,CAAC,IAAI,KAAK,MAAM,EAAE;YAC9B,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,aAAa,CAAC,CAAC,GAAG,KAAK,CAAC,EAAE,CAAC;SAC5D;KACJ;IAED,OAAO,IAAI,CAAC;AAChB,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,yCAAyC,CACrD,YAA2B;;IAE3B,MAAM,sBAAsB,GAAG,IAAI,GAAG,EAAuB,CAAC;IAC9D,IAAI,YAAY,CAAC,KAAK,EAAE;QACpB,YAAY,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;;YAChC,MAAM,CAAC,IAAI,CAAC,QAAQ,KAAK,QAAQ,IAAI,IAAI,CAAC,QAAQ,KAAK,SAAS,EAC5D,KAAK,CAAC,yDAAyD,CAAC,CAAC;YACrE,sBAAsB,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,cAAc,CAAC,IAAI,CAAC,OAAO,QAAE,IAAI,CAAC,QAAQ,mCAAI,MAAM,CAAC,CAAC,CAAC;QAC/F,CAAC,CAAC,CAAC;KACN;IACD,MAAM,GAAG,GAAsB;QAC3B,KAAK,EAAE,sBAAsB;QAC7B,GAAG,cAAE,YAAY,CAAC,GAAG,0CAAE,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,oCAAK,EAAE;QAC/C,cAAc,EAAE,YAAY,CAAC,KAAK,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,cAAc;QAC5E,YAAY,EAAE,cAAc,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;KACtD,CAAC;IACF,OAAO,GAAG,CAAC;AACf,CAAC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { assert, stringToBuffer } from \"@fluidframework/common-utils\";\nimport * as api from \"@fluidframework/protocol-definitions\";\nimport { IOdspSnapshot, IOdspSnapshotCommit } from \"./contracts\";\nimport { ISnapshotContents } from \"./odspUtils\";\n\n/**\n * Build a tree hierarchy base on a flat tree\n *\n * @param flatTree - a flat tree\n * @param blobsShaToPathCache - Map with blobs sha as keys and values as path of the blob.\n * @returns the hierarchical tree\n */\nfunction buildHierarchy(flatTree: IOdspSnapshotCommit): api.ISnapshotTree {\n    const lookup: { [path: string]: api.ISnapshotTree } = {};\n    // id is required for root tree as it will be used to determine the version we loaded from.\n    const root: api.ISnapshotTree = { id: flatTree.id, blobs: {}, trees: {} };\n    lookup[\"\"] = root;\n\n    for (const entry of flatTree.entries) {\n        const lastIndex = entry.path.lastIndexOf(\"/\");\n        const entryPathDir = entry.path.slice(0, Math.max(0, lastIndex));\n        const entryPathBase = entry.path.slice(lastIndex + 1);\n\n        // ODSP snapshots are created breadth-first so we can assume we see tree nodes prior to their contents\n        const node = lookup[entryPathDir];\n\n        // Add in either the blob or tree\n        if (entry.type === \"tree\") {\n            const newTree: api.ISnapshotTree = {\n                blobs: {},\n                trees: {},\n                unreferenced: entry.unreferenced,\n            };\n            node.trees[decodeURIComponent(entryPathBase)] = newTree;\n            lookup[entry.path] = newTree;\n        } else if (entry.type === \"blob\") {\n            node.blobs[decodeURIComponent(entryPathBase)] = entry.id;\n        }\n    }\n\n    return root;\n}\n\n/**\n * Converts existing IOdspSnapshot to snapshot tree, blob array and ops\n * @param odspSnapshot - snapshot\n */\nexport function convertOdspSnapshotToSnapsohtTreeAndBlobs(\n    odspSnapshot: IOdspSnapshot,\n): ISnapshotContents {\n    const blobsWithBufferContent = new Map<string, ArrayBuffer>();\n    if (odspSnapshot.blobs) {\n        odspSnapshot.blobs.forEach((blob) => {\n            assert(blob.encoding === \"base64\" || blob.encoding === undefined,\n                0x0a4 /* `Unexpected blob encoding type: '${blob.encoding}'` */);\n            blobsWithBufferContent.set(blob.id, stringToBuffer(blob.content, blob.encoding ?? \"utf8\"));\n        });\n    }\n    const val: ISnapshotContents = {\n        blobs: blobsWithBufferContent,\n        ops: odspSnapshot.ops?.map((op) => op.op) ?? [],\n        sequenceNumber: odspSnapshot.trees && (odspSnapshot.trees[0]).sequenceNumber,\n        snapshotTree: buildHierarchy(odspSnapshot.trees[0]),\n    };\n    return val;\n}\n"]}

package/lib/odspSummaryUploadManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"odspSummaryUploadManager.d.ts","sourceRoot":"","sources":["../src/odspSummaryUploadManager.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,gBAAgB,EAAE,MAAM,oCAAoC,CAAC;AAEtE,OAAO,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AAErE,OAAO,KAAK,GAAG,MAAM,sCAAsC,CAAC;AAC5D,OAAO,EAAE,+BAA+B,EAAE,MAAM,yCAAyC,CAAC;AAU1F,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAM9C;;;GAGG;AACH,qBAAa,wBAAwB;IAM7B,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,eAAe;IAEhC,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,sCAAsC;IAR3D,OAAO,CAAC,yBAAyB,CAAqB;IACtD,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAoB;gBAGlB,WAAW,EAAE,MAAM,EACnB,eAAe,EAAE,+BAA+B,EACjE,MAAM,EAAE,gBAAgB,EACP,YAAY,EAAE,YAAY,EAC1B,sCAAsC,EAAE,OAAO;IAKvD,gBAAgB,CAAC,IAAI,EAAE,GAAG,CAAC,YAAY,EAAE,OAAO,EAAE,eAAe;YAqBhE,oBAAoB;IA4DlC;;;;;;;;OAQG;YACW,4BAA4B;CAuG7C"}
+{"version":3,"file":"odspSummaryUploadManager.d.ts","sourceRoot":"","sources":["../src/odspSummaryUploadManager.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,gBAAgB,EAAE,MAAM,oCAAoC,CAAC;AAEtE,OAAO,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AAErE,OAAO,KAAK,GAAG,MAAM,sCAAsC,CAAC;AAC5D,OAAO,EAAE,+BAA+B,EAAE,MAAM,yCAAyC,CAAC;AAU1F,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAM9C;;;GAGG;AACH,qBAAa,wBAAwB;IAM7B,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,eAAe;IAEhC,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,sCAAsC;IAR3D,OAAO,CAAC,yBAAyB,CAAqB;IACtD,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAoB;gBAGlB,WAAW,EAAE,MAAM,EACnB,eAAe,EAAE,+BAA+B,EACjE,MAAM,EAAE,gBAAgB,EACP,YAAY,EAAE,YAAY,EAC1B,sCAAsC,EAAE,OAAO;IAKvD,gBAAgB,CAAC,IAAI,EAAE,GAAG,CAAC,YAAY,EAAE,OAAO,EAAE,eAAe;YAqBhE,oBAAoB;IAgElC;;;;;;;;OAQG;YACW,4BAA4B;CAoG7C"}

package/lib/odspSummaryUploadManager.js

@@ -42,14 +42,17 @@ export class OdspSummaryUploadManager {
         return id;
     }
     async writeSummaryTreeCore(parentHandle, referenceSequenceNumber, tree) {
-        const { snapshotTree, blobs } = await this.convertSummaryToSnapshotTree(parentHandle, tree, ".app", "");
+        const enableContainerTypeSummaryUpload = this.mc.config.getBoolean("Fluid.Driver.Odsp.EnableContainerTypeSummaryUpload");
+        const containsProtocolTree = enableContainerTypeSummaryUpload &&
+            Object.keys(tree.tree).includes(".protocol");
+        const { snapshotTree, blobs } = await this.convertSummaryToSnapshotTree(parentHandle, tree, ".app");
         const snapshot = {
             entries: snapshotTree.entries,
             message: "app",
             sequenceNumber: referenceSequenceNumber,
             // no ack handle implies this is initial summary after empty file creation.
             // send container payload so server will use it without a summary op
-            type: parentHandle === undefined ? "container" : "channel",
+            type: containsProtocolTree || parentHandle === undefined ? "container" : "channel",
         };
         return getWithRetryForTokenRefresh(async (options) => {
             const storageToken = await this.getStorageToken(options, "WriteSummaryTree");
@@ -68,6 +71,8 @@ export class OdspSummaryUploadManager {
                 blobs,
                 size: postBody.length,
                 referenceSequenceNumber,
+                type: snapshot.type,
+                enableContainerTypeSummaryUpload,
             }, async () => {
                 const response = await this.epochTracker.fetchAndParseAsJSON(url, {
                     body: postBody,
@@ -87,9 +92,8 @@ export class OdspSummaryUploadManager {
      * @param path - Current path of node which is getting evaluated.
      * @param markUnreferencedNodes - True if we should mark unreferenced nodes.
      */
-    async convertSummaryToSnapshotTree(parentHandle, tree, rootNodeName, path, markUnreferencedNodes) {
+    async convertSummaryToSnapshotTree(parentHandle, tree, rootNodeName, markUnreferencedNodes) {
         var _a;
-        if (path === void 0) { path = ""; }
         if (markUnreferencedNodes === void 0) { markUnreferencedNodes = (_a = this.mc.config.getBoolean("Fluid.Driver.Odsp.MarkUnreferencedNodes")) !== null && _a !== void 0 ? _a : true; }
         const snapshotTree = {
             type: "tree",
@@ -105,10 +109,9 @@ export class OdspSummaryUploadManager {
             // property is not present, the tree entry is considered referenced. If the property is present and is
             // true (which is the only value it can have), the tree entry is considered unreferenced.
             let unreferenced;
-            const currentPath = path === "" ? `${rootNodeName}/${key}` : `${path}/${key}`;
             switch (summaryObject.type) {
                 case api.SummaryType.Tree: {
-                    const result = await this.convertSummaryToSnapshotTree(parentHandle, summaryObject, rootNodeName, currentPath);
+                    const result = await this.convertSummaryToSnapshotTree(parentHandle, summaryObject, rootNodeName);
                     value = result.snapshotTree;
                     unreferenced = markUnreferencedNodes ? summaryObject.unreferenced : undefined;
                     blobs += result.blobs;

package/lib/odspSummaryUploadManager.js.map

@@ -1 +1 @@
-{"version":3,"file":"odspSummaryUploadManager.js","sourceRoot":"","sources":["../src/odspSummaryUploadManager.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 { ITelemetryLogger } from \"@fluidframework/common-definitions\";\nimport { assert, Uint8ArrayToString, unreachableCase } from \"@fluidframework/common-utils\";\nimport { ISummaryContext } from \"@fluidframework/driver-definitions\";\nimport { getGitType } from \"@fluidframework/protocol-base\";\nimport * as api from \"@fluidframework/protocol-definitions\";\nimport { InstrumentedStorageTokenFetcher } from \"@fluidframework/odsp-driver-definitions\";\nimport { loggerToMonitoringContext, MonitoringContext, PerformanceEvent } from \"@fluidframework/telemetry-utils\";\nimport {\n    IOdspSummaryPayload,\n    IWriteSummaryResponse,\n    IOdspSummaryTree,\n    IOdspSummaryTreeBaseEntry,\n    OdspSummaryTreeEntry,\n    OdspSummaryTreeValue,\n} from \"./contracts\";\nimport { EpochTracker } from \"./epochTracker\";\nimport { getUrlAndHeadersWithAuth } from \"./getUrlAndHeadersWithAuth\";\nimport { getWithRetryForTokenRefresh } from \"./odspUtils\";\n\n/* eslint-disable max-len */\n\n/**\n * This class manages a summary upload. When it receives a call to upload summary, it converts the summary tree into\n * a snapshot tree and then uploads that to the server.\n */\nexport class OdspSummaryUploadManager {\n    // Last proposed handle of the uploaded app summary.\n    private lastSummaryProposalHandle: string | undefined;\n    private readonly mc: MonitoringContext;\n\n    constructor(\n        private readonly snapshotUrl: string,\n        private readonly getStorageToken: InstrumentedStorageTokenFetcher,\n        logger: ITelemetryLogger,\n        private readonly epochTracker: EpochTracker,\n        private readonly forceAccessTokenViaAuthorizationHeader: boolean,\n    ) {\n        this.mc = loggerToMonitoringContext(logger);\n    }\n\n    public async writeSummaryTree(tree: api.ISummaryTree, context: ISummaryContext) {\n        // If the last proposed handle is not the proposed handle of the acked summary(could happen when the last summary get nacked),\n        // then re-initialize the caches with the previous ones else just update the previous caches with the caches from acked summary.\n        // Don't bother logging if lastSummaryProposalHandle hasn't been set before; only log on a positive mismatch.\n        if (this.lastSummaryProposalHandle !== undefined &&\n            this.lastSummaryProposalHandle !== context.proposalHandle) {\n            this.mc.logger.sendTelemetryEvent({\n                eventName: \"LastSummaryProposedHandleMismatch\",\n                ackedSummaryProposedHandle: context.proposalHandle,\n                lastSummaryProposalHandle: this.lastSummaryProposalHandle,\n            });\n        }\n        const result = await this.writeSummaryTreeCore(context.ackHandle, context.referenceSequenceNumber, tree);\n        const id = result ? result.id : undefined;\n        if (!result || !id) {\n            throw new Error(`Failed to write summary tree`);\n        }\n        this.lastSummaryProposalHandle = id;\n        return id;\n    }\n\n    private async writeSummaryTreeCore(\n        parentHandle: string | undefined,\n        referenceSequenceNumber: number,\n        tree: api.ISummaryTree,\n    ): Promise<IWriteSummaryResponse> {\n        const { snapshotTree, blobs } = await this.convertSummaryToSnapshotTree(\n            parentHandle,\n            tree,\n            \".app\",\n            \"\",\n        );\n        const snapshot: IOdspSummaryPayload = {\n            entries: snapshotTree.entries!,\n            message: \"app\",\n            sequenceNumber: referenceSequenceNumber,\n            // no ack handle implies this is initial summary after empty file creation.\n            // send container payload so server will use it without a summary op\n            type: parentHandle === undefined ? \"container\" : \"channel\",\n        };\n\n        return getWithRetryForTokenRefresh(async (options) => {\n            const storageToken = await this.getStorageToken(options, \"WriteSummaryTree\");\n\n            const { url, headers } = getUrlAndHeadersWithAuth(\n                `${this.snapshotUrl}/snapshot`,\n                storageToken,\n                this.forceAccessTokenViaAuthorizationHeader,\n            );\n            headers[\"Content-Type\"] = \"application/json\";\n            if (parentHandle) {\n                headers[\"If-Match\"] = `fluid:containerid=${parentHandle}`;\n            }\n\n            const postBody = JSON.stringify(snapshot);\n\n            return PerformanceEvent.timedExecAsync(this.mc.logger,\n                {\n                    eventName: \"uploadSummary\",\n                    attempt: options.refresh ? 2 : 1,\n                    hasClaims: !!options.claims,\n                    hasTenantId: !!options.tenantId,\n                    headers: Object.keys(headers).length !== 0 ? true : undefined,\n                    blobs,\n                    size: postBody.length,\n                    referenceSequenceNumber,\n                },\n                async () => {\n                    const response = await this.epochTracker.fetchAndParseAsJSON<IWriteSummaryResponse>(\n                        url,\n                        {\n                            body: postBody,\n                            headers,\n                            method: \"POST\",\n                        },\n                        \"uploadSummary\");\n                    return response.content;\n                });\n        });\n    }\n\n    /**\n     * Following are the goals of this function.\n     *  a.) Converts the summary tree to a snapshot/odsp tree to be uploaded. Always upload full snapshot tree.\n     * @param parentHandle - Handle of the last uploaded summary or detach new summary.\n     * @param tree - Summary Tree which will be converted to snapshot tree to be uploaded.\n     * @param rootNodeName - Root node name of the summary tree.\n     * @param path - Current path of node which is getting evaluated.\n     * @param markUnreferencedNodes - True if we should mark unreferenced nodes.\n     */\n    private async convertSummaryToSnapshotTree(\n        parentHandle: string | undefined,\n        tree: api.ISummaryTree,\n        rootNodeName: string,\n        path: string = \"\",\n        markUnreferencedNodes: boolean = this.mc.config.getBoolean(\"Fluid.Driver.Odsp.MarkUnreferencedNodes\") ?? true,\n    ) {\n        const snapshotTree: IOdspSummaryTree = {\n            type: \"tree\",\n            entries: [] as OdspSummaryTreeEntry[],\n        };\n\n        let blobs = 0;\n        const keys = Object.keys(tree.tree);\n        for (const key of keys) {\n            const summaryObject = tree.tree[key];\n\n            let id: string | undefined;\n            let value: OdspSummaryTreeValue | undefined;\n\n            // Tracks if an entry is unreferenced. Currently, only tree entries can be marked as unreferenced. If the\n            // property is not present, the tree entry is considered referenced. If the property is present and is\n            // true (which is the only value it can have), the tree entry is considered unreferenced.\n            let unreferenced: true | undefined;\n            const currentPath = path === \"\" ? `${rootNodeName}/${key}` : `${path}/${key}`;\n            switch (summaryObject.type) {\n                case api.SummaryType.Tree: {\n                    const result = await this.convertSummaryToSnapshotTree(\n                        parentHandle,\n                        summaryObject,\n                        rootNodeName,\n                        currentPath);\n                    value = result.snapshotTree;\n                    unreferenced = markUnreferencedNodes ? summaryObject.unreferenced : undefined;\n                    blobs += result.blobs;\n                    break;\n                }\n                case api.SummaryType.Blob: {\n                    if (typeof summaryObject.content === \"string\") {\n                        value = {\n                            type: \"blob\",\n                            content: summaryObject.content,\n                            encoding: \"utf-8\",\n                        };\n                    } else {\n                        value = {\n                            type: \"blob\",\n                            content: Uint8ArrayToString(summaryObject.content, \"base64\"),\n                            encoding: \"base64\",\n                        };\n                    }\n                    blobs++;\n                    break;\n                }\n                case api.SummaryType.Handle: {\n                    if (!parentHandle) {\n                        throw Error(\"Parent summary does not exist to reference by handle.\");\n                    }\n                    let handlePath = summaryObject.handle;\n                    if (handlePath.length > 0 && !handlePath.startsWith(\"/\")) {\n                        handlePath = `/${handlePath}`;\n                    }\n                    const pathKey = `${rootNodeName}${handlePath}`;\n                    id = `${parentHandle}/${pathKey}`;\n                    break;\n                }\n                case api.SummaryType.Attachment: {\n                    id = summaryObject.id;\n                    break;\n                }\n                default: {\n                    unreachableCase(summaryObject, `Unknown type: ${(summaryObject as any).type}`);\n                }\n            }\n\n            const baseEntry: IOdspSummaryTreeBaseEntry = {\n                path: encodeURIComponent(key),\n                type: getGitType(summaryObject),\n            };\n\n            let entry: OdspSummaryTreeEntry;\n\n            if (value) {\n                assert(id === undefined, 0x0ad /* \"Snapshot entry has both a tree value and a referenced id!\" */);\n                entry = {\n                    value,\n                    ...baseEntry,\n                    unreferenced,\n                };\n            } else if (id) {\n                entry = {\n                    ...baseEntry,\n                    id,\n                };\n            } else {\n                throw new Error(`Invalid tree entry for ${summaryObject.type}`);\n            }\n\n            snapshotTree.entries!.push(entry);\n        }\n\n        return { snapshotTree, blobs };\n    }\n}\n\n/* eslint-enable max-len */\n"]}
+{"version":3,"file":"odspSummaryUploadManager.js","sourceRoot":"","sources":["../src/odspSummaryUploadManager.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 { ITelemetryLogger } from \"@fluidframework/common-definitions\";\nimport { assert, Uint8ArrayToString, unreachableCase } from \"@fluidframework/common-utils\";\nimport { ISummaryContext } from \"@fluidframework/driver-definitions\";\nimport { getGitType } from \"@fluidframework/protocol-base\";\nimport * as api from \"@fluidframework/protocol-definitions\";\nimport { InstrumentedStorageTokenFetcher } from \"@fluidframework/odsp-driver-definitions\";\nimport { loggerToMonitoringContext, MonitoringContext, PerformanceEvent } from \"@fluidframework/telemetry-utils\";\nimport {\n    IOdspSummaryPayload,\n    IWriteSummaryResponse,\n    IOdspSummaryTree,\n    IOdspSummaryTreeBaseEntry,\n    OdspSummaryTreeEntry,\n    OdspSummaryTreeValue,\n} from \"./contracts\";\nimport { EpochTracker } from \"./epochTracker\";\nimport { getUrlAndHeadersWithAuth } from \"./getUrlAndHeadersWithAuth\";\nimport { getWithRetryForTokenRefresh } from \"./odspUtils\";\n\n/* eslint-disable max-len */\n\n/**\n * This class manages a summary upload. When it receives a call to upload summary, it converts the summary tree into\n * a snapshot tree and then uploads that to the server.\n */\nexport class OdspSummaryUploadManager {\n    // Last proposed handle of the uploaded app summary.\n    private lastSummaryProposalHandle: string | undefined;\n    private readonly mc: MonitoringContext;\n\n    constructor(\n        private readonly snapshotUrl: string,\n        private readonly getStorageToken: InstrumentedStorageTokenFetcher,\n        logger: ITelemetryLogger,\n        private readonly epochTracker: EpochTracker,\n        private readonly forceAccessTokenViaAuthorizationHeader: boolean,\n    ) {\n        this.mc = loggerToMonitoringContext(logger);\n    }\n\n    public async writeSummaryTree(tree: api.ISummaryTree, context: ISummaryContext) {\n        // If the last proposed handle is not the proposed handle of the acked summary(could happen when the last summary get nacked),\n        // then re-initialize the caches with the previous ones else just update the previous caches with the caches from acked summary.\n        // Don't bother logging if lastSummaryProposalHandle hasn't been set before; only log on a positive mismatch.\n        if (this.lastSummaryProposalHandle !== undefined &&\n            this.lastSummaryProposalHandle !== context.proposalHandle) {\n            this.mc.logger.sendTelemetryEvent({\n                eventName: \"LastSummaryProposedHandleMismatch\",\n                ackedSummaryProposedHandle: context.proposalHandle,\n                lastSummaryProposalHandle: this.lastSummaryProposalHandle,\n            });\n        }\n        const result = await this.writeSummaryTreeCore(context.ackHandle, context.referenceSequenceNumber, tree);\n        const id = result ? result.id : undefined;\n        if (!result || !id) {\n            throw new Error(`Failed to write summary tree`);\n        }\n        this.lastSummaryProposalHandle = id;\n        return id;\n    }\n\n    private async writeSummaryTreeCore(\n        parentHandle: string | undefined,\n        referenceSequenceNumber: number,\n        tree: api.ISummaryTree,\n    ): Promise<IWriteSummaryResponse> {\n        const enableContainerTypeSummaryUpload = this.mc.config.getBoolean(\"Fluid.Driver.Odsp.EnableContainerTypeSummaryUpload\");\n        const containsProtocolTree = enableContainerTypeSummaryUpload &&\n            Object.keys(tree.tree).includes(\".protocol\");\n        const { snapshotTree, blobs } = await this.convertSummaryToSnapshotTree(\n            parentHandle,\n            tree,\n            \".app\",\n        );\n        const snapshot: IOdspSummaryPayload = {\n            entries: snapshotTree.entries!,\n            message: \"app\",\n            sequenceNumber: referenceSequenceNumber,\n            // no ack handle implies this is initial summary after empty file creation.\n            // send container payload so server will use it without a summary op\n            type: containsProtocolTree || parentHandle === undefined ? \"container\" : \"channel\",\n        };\n\n        return getWithRetryForTokenRefresh(async (options) => {\n            const storageToken = await this.getStorageToken(options, \"WriteSummaryTree\");\n\n            const { url, headers } = getUrlAndHeadersWithAuth(\n                `${this.snapshotUrl}/snapshot`,\n                storageToken,\n                this.forceAccessTokenViaAuthorizationHeader,\n            );\n            headers[\"Content-Type\"] = \"application/json\";\n            if (parentHandle) {\n                headers[\"If-Match\"] = `fluid:containerid=${parentHandle}`;\n            }\n\n            const postBody = JSON.stringify(snapshot);\n\n            return PerformanceEvent.timedExecAsync(this.mc.logger,\n                {\n                    eventName: \"uploadSummary\",\n                    attempt: options.refresh ? 2 : 1,\n                    hasClaims: !!options.claims,\n                    hasTenantId: !!options.tenantId,\n                    headers: Object.keys(headers).length !== 0 ? true : undefined,\n                    blobs,\n                    size: postBody.length,\n                    referenceSequenceNumber,\n                    type: snapshot.type,\n                    enableContainerTypeSummaryUpload,\n                },\n                async () => {\n                    const response = await this.epochTracker.fetchAndParseAsJSON<IWriteSummaryResponse>(\n                        url,\n                        {\n                            body: postBody,\n                            headers,\n                            method: \"POST\",\n                        },\n                        \"uploadSummary\");\n                    return response.content;\n                });\n        });\n    }\n\n    /**\n     * Following are the goals of this function.\n     *  a.) Converts the summary tree to a snapshot/odsp tree to be uploaded. Always upload full snapshot tree.\n     * @param parentHandle - Handle of the last uploaded summary or detach new summary.\n     * @param tree - Summary Tree which will be converted to snapshot tree to be uploaded.\n     * @param rootNodeName - Root node name of the summary tree.\n     * @param path - Current path of node which is getting evaluated.\n     * @param markUnreferencedNodes - True if we should mark unreferenced nodes.\n     */\n    private async convertSummaryToSnapshotTree(\n        parentHandle: string | undefined,\n        tree: api.ISummaryTree,\n        rootNodeName: string,\n        markUnreferencedNodes: boolean = this.mc.config.getBoolean(\"Fluid.Driver.Odsp.MarkUnreferencedNodes\") ?? true,\n    ) {\n        const snapshotTree: IOdspSummaryTree = {\n            type: \"tree\",\n            entries: [] as OdspSummaryTreeEntry[],\n        };\n\n        let blobs = 0;\n        const keys = Object.keys(tree.tree);\n        for (const key of keys) {\n            const summaryObject = tree.tree[key];\n\n            let id: string | undefined;\n            let value: OdspSummaryTreeValue | undefined;\n\n            // Tracks if an entry is unreferenced. Currently, only tree entries can be marked as unreferenced. If the\n            // property is not present, the tree entry is considered referenced. If the property is present and is\n            // true (which is the only value it can have), the tree entry is considered unreferenced.\n            let unreferenced: true | undefined;\n            switch (summaryObject.type) {\n                case api.SummaryType.Tree: {\n                    const result = await this.convertSummaryToSnapshotTree(\n                        parentHandle,\n                        summaryObject,\n                        rootNodeName);\n                    value = result.snapshotTree;\n                    unreferenced = markUnreferencedNodes ? summaryObject.unreferenced : undefined;\n                    blobs += result.blobs;\n                    break;\n                }\n                case api.SummaryType.Blob: {\n                    if (typeof summaryObject.content === \"string\") {\n                        value = {\n                            type: \"blob\",\n                            content: summaryObject.content,\n                            encoding: \"utf-8\",\n                        };\n                    } else {\n                        value = {\n                            type: \"blob\",\n                            content: Uint8ArrayToString(summaryObject.content, \"base64\"),\n                            encoding: \"base64\",\n                        };\n                    }\n                    blobs++;\n                    break;\n                }\n                case api.SummaryType.Handle: {\n                    if (!parentHandle) {\n                        throw Error(\"Parent summary does not exist to reference by handle.\");\n                    }\n                    let handlePath = summaryObject.handle;\n                    if (handlePath.length > 0 && !handlePath.startsWith(\"/\")) {\n                        handlePath = `/${handlePath}`;\n                    }\n                    const pathKey = `${rootNodeName}${handlePath}`;\n                    id = `${parentHandle}/${pathKey}`;\n                    break;\n                }\n                case api.SummaryType.Attachment: {\n                    id = summaryObject.id;\n                    break;\n                }\n                default: {\n                    unreachableCase(summaryObject, `Unknown type: ${(summaryObject as any).type}`);\n                }\n            }\n\n            const baseEntry: IOdspSummaryTreeBaseEntry = {\n                path: encodeURIComponent(key),\n                type: getGitType(summaryObject),\n            };\n\n            let entry: OdspSummaryTreeEntry;\n\n            if (value) {\n                assert(id === undefined, 0x0ad /* \"Snapshot entry has both a tree value and a referenced id!\" */);\n                entry = {\n                    value,\n                    ...baseEntry,\n                    unreferenced,\n                };\n            } else if (id) {\n                entry = {\n                    ...baseEntry,\n                    id,\n                };\n            } else {\n                throw new Error(`Invalid tree entry for ${summaryObject.type}`);\n            }\n\n            snapshotTree.entries!.push(entry);\n        }\n\n        return { snapshotTree, blobs };\n    }\n}\n\n/* eslint-enable max-len */\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/odsp-driver";
-export declare const pkgVersion = "0.58.2002";
+export declare const pkgVersion = "0.59.1000";
 //# 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/odsp-driver";
-export const pkgVersion = "0.58.2002";
+export const pkgVersion = "0.59.1000";
 //# 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,6BAA6B,CAAC;AACrD,MAAM,CAAC,MAAM,UAAU,GAAG,WAAW,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/odsp-driver\";\nexport const pkgVersion = \"0.58.2002\";\n"]}
+{"version":3,"file":"packageVersion.js","sourceRoot":"","sources":["../src/packageVersion.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,MAAM,CAAC,MAAM,OAAO,GAAG,6BAA6B,CAAC;AACrD,MAAM,CAAC,MAAM,UAAU,GAAG,WAAW,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/odsp-driver\";\nexport const pkgVersion = \"0.59.1000\";\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluidframework/odsp-driver",
-  "version": "0.58.2002",
+  "version": "0.59.1000",
   "description": "Socket storage implementation for SPO and ODC",
   "homepage": "https://fluidframework.com",
   "repository": {
@@ -32,7 +32,7 @@
     "lint:fix": "npm run eslint:fix",
     "test": "npm run test:mocha",
     "test:coverage": "nyc npm test -- --reporter xunit --reporter-option output=nyc/junit-report.xml",
-    "test:mocha": "mocha --recursive dist/test -r node_modules/@fluidframework/mocha-test-setup --unhandled-rejections=strict",
+    "test:mocha": "mocha --ignore 'dist/test/types/*' --recursive dist/test -r node_modules/@fluidframework/mocha-test-setup --unhandled-rejections=strict",
     "test:mocha:verbose": "cross-env FLUID_TEST_VERBOSE=1 npm run test:mocha",
     "tsc": "tsc",
     "tsfmt": "tsfmt --verify",
@@ -61,16 +61,16 @@
   "dependencies": {
     "@fluidframework/common-definitions": "^0.20.1",
     "@fluidframework/common-utils": "^0.32.1",
-    "@fluidframework/core-interfaces": "^0.42.0",
-    "@fluidframework/driver-base": "^0.58.2002",
-    "@fluidframework/driver-definitions": "^0.45.1000",
-    "@fluidframework/driver-utils": "^0.58.2002",
-    "@fluidframework/gitresources": "^0.1035.1000",
-    "@fluidframework/odsp-doclib-utils": "^0.58.2002",
-    "@fluidframework/odsp-driver-definitions": "^0.58.2002",
-    "@fluidframework/protocol-base": "^0.1035.1000",
-    "@fluidframework/protocol-definitions": "^0.1027.1000",
-    "@fluidframework/telemetry-utils": "^0.58.2002",
+    "@fluidframework/core-interfaces": "^0.43.1000",
+    "@fluidframework/driver-base": "^0.59.1000",
+    "@fluidframework/driver-definitions": "^0.46.1000",
+    "@fluidframework/driver-utils": "^0.59.1000",
+    "@fluidframework/gitresources": "^0.1036.1000",
+    "@fluidframework/odsp-doclib-utils": "^0.59.1000",
+    "@fluidframework/odsp-driver-definitions": "^0.59.1000",
+    "@fluidframework/protocol-base": "^0.1036.1000",
+    "@fluidframework/protocol-definitions": "^0.1028.1000",
+    "@fluidframework/telemetry-utils": "^0.59.1000",
     "abort-controller": "^3.0.0",
     "node-fetch": "^2.6.1",
     "socket.io-client": "^4.4.1",
@@ -78,8 +78,9 @@
   },
   "devDependencies": {
     "@fluidframework/build-common": "^0.23.0",
-    "@fluidframework/eslint-config-fluid": "^0.27.0",
-    "@fluidframework/mocha-test-setup": "^0.58.2002",
+    "@fluidframework/eslint-config-fluid": "^0.28.1000",
+    "@fluidframework/mocha-test-setup": "^0.59.1000",
+    "@fluidframework/odsp-driver-previous": "npm:@fluidframework/odsp-driver@^0.58.0",
     "@microsoft/api-extractor": "^7.16.1",
     "@rushstack/eslint-config": "^2.5.1",
     "@types/mocha": "^8.2.2",
@@ -103,5 +104,9 @@
     "sinon": "^7.4.2",
     "typescript": "~4.1.3",
     "typescript-formatter": "7.1.0"
+  },
+  "typeValidation": {
+    "version": "0.59.1000",
+    "broken": {}
   }
 }

package/src/compactSnapshotParser.ts

@@ -14,10 +14,12 @@ import {
     assertNumberInstance,
     getAndValidateNodeProps,
     NodeCore,
+    NodeTypes,
     TreeBuilder,
 } from "./zipItDataRepresentationUtils";
 
 export const snapshotMinReadVersion = "1.0";
+export const currentReadVersion = "1.0";
 
 interface ISnapshotSection {
     snapshotTree: ISnapshotTree,
@@ -28,7 +30,8 @@ interface ISnapshotSection {
  * Recreates blobs section of the tree.
  * @param node - tree node to read blob section from
  */
-function readBlobSection(node: NodeCore) {
+function readBlobSection(node: NodeTypes) {
+    assertNodeCoreInstance(node, "TreeBlobs should be of type NodeCore");
     const blobs: Map<string, ArrayBuffer> = new Map();
     for (let count = 0; count < node.length; ++count) {
         const blob = node.getNode(count);
@@ -44,7 +47,8 @@ function readBlobSection(node: NodeCore) {
  * Recreates ops section of the tree.
  * @param node - tree node to read ops section from
  */
-function readOpsSection(node: NodeCore) {
+function readOpsSection(node: NodeTypes) {
+    assertNodeCoreInstance(node, "Deltas should be of type NodeCore");
     const ops: ISequencedDocumentMessage[] = [];
     const records = getAndValidateNodeProps(node, ["firstSequenceNumber", "deltas"]);
     assertNumberInstance(records.firstSequenceNumber, "Seq number should be a number");
@@ -52,7 +56,8 @@ function readOpsSection(node: NodeCore) {
     for (let i = 0; i < records.deltas.length; ++i) {
         ops.push(JSON.parse(records.deltas.getString(i)));
     }
-    assert(records.firstSequenceNumber.valueOf() === ops[0].sequenceNumber, 0x280 /* "Validate first op seq number" */);
+    assert(records.firstSequenceNumber.valueOf() === ops[0].sequenceNumber,
+        0x280 /* "Validate first op seq number" */);
     return ops;
 }
 
@@ -63,7 +68,6 @@ function readOpsSection(node: NodeCore) {
 function readTreeSection(node: NodeCore) {
     const snapshotTree: ISnapshotTree = {
         blobs: {},
-        commits: {},
         trees: {},
     };
     for (let count = 0; count < node.length; count++) {
@@ -93,7 +97,8 @@ function readTreeSection(node: NodeCore) {
  * Recreates snapshot tree out of tree representation.
  * @param node - tree node to de-serialize from
  */
-function readSnapshotSection(node: NodeCore): ISnapshotSection {
+function readSnapshotSection(node: NodeTypes): ISnapshotSection {
+    assertNodeCoreInstance(node, "Snapshot should be of type NodeCore");
     const records = getAndValidateNodeProps(node,
         ["id", "sequenceNumber", "treeNodes"]);
 
@@ -120,7 +125,7 @@ export function parseCompactSnapshotResponse(buffer: ReadBuffer): ISnapshotConte
     const root = builder.getNode(0);
 
     const records = getAndValidateNodeProps(root,
-        ["mrv", "cv", "snapshot", "blobs", "deltas"]);
+        ["mrv", "cv", "snapshot", "blobs", "deltas"], false);
 
     assertBlobCoreInstance(records.mrv, "minReadVersion should be of BlobCore type");
     assertBlobCoreInstance(records.cv, "createVersion should be of BlobCore type");
@@ -128,14 +133,11 @@ export function parseCompactSnapshotResponse(buffer: ReadBuffer): ISnapshotConte
         0x20f /* "Driver min read version should >= to server minReadVersion" */);
     assert(records.cv.toString() >= snapshotMinReadVersion,
         0x210 /* "Snapshot should be created with minReadVersion or above" */);
-
-    assertNodeCoreInstance(records.snapshot, "Snapshot should be of type NodeCore");
-    assertNodeCoreInstance(records.blobs, "TreeBlobs should be of type NodeCore");
-    assertNodeCoreInstance(records.deltas, "Deltas should be of type NodeCore");
-
+    assert(currentReadVersion === records.cv.toString(),
+        0x2c2 /* "Create Version should be equal to currentReadVersion" */);
     return {
         ...readSnapshotSection(records.snapshot),
         blobs: readBlobSection(records.blobs),
-        ops: readOpsSection(records.deltas),
+        ops: records.deltas !== undefined ? readOpsSection(records.deltas) : [],
     };
 }