@fluidframework/routerlicious-driver 2.0.0-dev.2.3.0.115467 → 2.0.0-dev.4.1.0.148229

package/src/urlUtils.ts

@@ -8,7 +8,7 @@ import URLParse from "url-parse";
 import { ISession } from "@fluidframework/server-services-client";
 
 export const parseFluidUrl = (fluidUrl: string): URLParse => {
-    return new URLParse(fluidUrl, true);
+	return new URLParse(fluidUrl, true);
 };
 
 /**
@@ -18,29 +18,32 @@ export const parseFluidUrl = (fluidUrl: string): URLParse => {
  * TODO: Ideally we would be able to regenerate the resolvedUrl, rather than patching the current one.
  */
 export const replaceDocumentIdInPath = (urlPath: string, documentId: string): string =>
-    urlPath.split("/").slice(0, -1).concat([documentId]).join("/");
+	urlPath.split("/").slice(0, -1).concat([documentId]).join("/");
 
-export const getDiscoveredFluidResolvedUrl = (resolvedUrl: IFluidResolvedUrl, session: ISession): IFluidResolvedUrl => {
-    const discoveredOrdererUrl = new URLParse(session.ordererUrl);
-    const deltaStorageUrl = new URLParse(resolvedUrl.endpoints.deltaStorageUrl);
-    deltaStorageUrl.set("host", discoveredOrdererUrl.host);
+export const getDiscoveredFluidResolvedUrl = (
+	resolvedUrl: IFluidResolvedUrl,
+	session: ISession,
+): IFluidResolvedUrl => {
+	const discoveredOrdererUrl = new URLParse(session.ordererUrl);
+	const deltaStorageUrl = new URLParse(resolvedUrl.endpoints.deltaStorageUrl);
+	deltaStorageUrl.set("host", discoveredOrdererUrl.host);
 
-    const discoveredStorageUrl = new URLParse(session.historianUrl);
-    const storageUrl = new URLParse(resolvedUrl.endpoints.storageUrl);
-    storageUrl.set("host", discoveredStorageUrl.host);
+	const discoveredStorageUrl = new URLParse(session.historianUrl);
+	const storageUrl = new URLParse(resolvedUrl.endpoints.storageUrl);
+	storageUrl.set("host", discoveredStorageUrl.host);
 
-    const parsedUrl = parseFluidUrl(resolvedUrl.url);
-    const discoveredResolvedUrl: IFluidResolvedUrl = {
-        endpoints: {
-            deltaStorageUrl: deltaStorageUrl.toString(),
-            ordererUrl: session.ordererUrl,
-            deltaStreamUrl: session.deltaStreamUrl,
-            storageUrl: storageUrl.toString(),
-        },
-        id: resolvedUrl.id,
-        tokens: resolvedUrl.tokens,
-        type: resolvedUrl.type,
-        url: new URLParse(`fluid://${discoveredOrdererUrl.host}${parsedUrl.pathname}`).toString(),
-    };
-    return discoveredResolvedUrl;
+	const parsedUrl = parseFluidUrl(resolvedUrl.url);
+	const discoveredResolvedUrl: IFluidResolvedUrl = {
+		endpoints: {
+			deltaStorageUrl: deltaStorageUrl.toString(),
+			ordererUrl: session.ordererUrl,
+			deltaStreamUrl: session.deltaStreamUrl,
+			storageUrl: storageUrl.toString(),
+		},
+		id: resolvedUrl.id,
+		tokens: resolvedUrl.tokens,
+		type: resolvedUrl.type,
+		url: new URLParse(`fluid://${discoveredOrdererUrl.host}${parsedUrl.pathname}`).toString(),
+	};
+	return discoveredResolvedUrl;
 };

package/src/wholeSummaryDocumentStorageService.ts

@@ -4,269 +4,289 @@
  */
 
 import type { ITelemetryLogger } from "@fluidframework/common-definitions";
+import { assert, stringToBuffer, Uint8ArrayToString } from "@fluidframework/common-utils";
 import {
-    assert,
-    stringToBuffer,
-    Uint8ArrayToString,
-} from "@fluidframework/common-utils";
-import {
-    IDocumentStorageService,
-    ISummaryContext,
-    IDocumentStorageServicePolicies,
+	IDocumentStorageService,
+	ISummaryContext,
+	IDocumentStorageServicePolicies,
 } from "@fluidframework/driver-definitions";
 import {
-    convertSnapshotAndBlobsToSummaryTree,
-} from "@fluidframework/driver-utils";
-import {
-    ICreateBlobResponse,
-    ISnapshotTree,
-    ISummaryHandle,
-    ISummaryTree,
-    IVersion,
+	ICreateBlobResponse,
+	ISnapshotTree,
+	ISummaryHandle,
+	ISummaryTree,
+	IVersion,
 } from "@fluidframework/protocol-definitions";
 import {
-    convertWholeFlatSummaryToSnapshotTreeAndBlobs,
-    GitManager,
-    ISummaryUploadManager,
-    WholeSummaryUploadManager,
+	convertWholeFlatSummaryToSnapshotTreeAndBlobs,
+	GitManager,
+	ISummaryUploadManager,
+	WholeSummaryUploadManager,
 } from "@fluidframework/server-services-client";
 import { PerformanceEvent } from "@fluidframework/telemetry-utils";
 import { ICache, InMemoryCache } from "./cache";
 import { ISnapshotTreeVersion } from "./definitions";
 import { IRouterliciousDriverPolicies } from "./policies";
+import { convertSnapshotAndBlobsToSummaryTree } from "./treeUtils";
 
 const latestSnapshotId: string = "latest";
 
 export class WholeSummaryDocumentStorageService implements IDocumentStorageService {
-    private firstVersionsCall: boolean = true;
+	private firstVersionsCall: boolean = true;
 
-    public get repositoryUrl(): string {
-        return "";
-    }
+	public get repositoryUrl(): string {
+		return "";
+	}
 
-    private async getSummaryUploadManager(): Promise<ISummaryUploadManager> {
-        const manager = await this.getStorageManager();
-        return new WholeSummaryUploadManager(manager);
-    }
+	private async getSummaryUploadManager(): Promise<ISummaryUploadManager> {
+		const manager = await this.getStorageManager();
+		return new WholeSummaryUploadManager(manager);
+	}
 
-    constructor(
-        protected readonly id: string,
-        protected readonly manager: GitManager,
-        protected readonly logger: ITelemetryLogger,
-        public readonly policies: IDocumentStorageServicePolicies = {},
-        private readonly driverPolicies?: IRouterliciousDriverPolicies,
-        private readonly blobCache: ICache<ArrayBufferLike> = new InMemoryCache(),
-        private readonly snapshotTreeCache: ICache<ISnapshotTreeVersion> = new InMemoryCache(),
-        private readonly noCacheGitManager?: GitManager,
-        private readonly getStorageManager: (disableCache?: boolean) => Promise<GitManager> = async (disableCache) =>
-            disableCache && this.noCacheGitManager !== undefined ? this.noCacheGitManager : this.manager,
-    ) {
-    }
+	constructor(
+		protected readonly id: string,
+		protected readonly manager: GitManager,
+		protected readonly logger: ITelemetryLogger,
+		public readonly policies: IDocumentStorageServicePolicies,
+		private readonly driverPolicies?: IRouterliciousDriverPolicies,
+		private readonly blobCache: ICache<ArrayBufferLike> = new InMemoryCache(),
+		private readonly snapshotTreeCache: ICache<ISnapshotTreeVersion> = new InMemoryCache(),
+		private readonly noCacheGitManager?: GitManager,
+		private readonly getStorageManager: (
+			disableCache?: boolean,
+		) => Promise<GitManager> = async (disableCache) =>
+			disableCache && this.noCacheGitManager !== undefined
+				? this.noCacheGitManager
+				: this.manager,
+	) {}
 
-    public async getVersions(versionId: string | null, count: number): Promise<IVersion[]> {
-        if (versionId !== this.id && versionId !== null) {
-            // Blobs/Trees in this scenario will never have multiple versions, so return versionId as is
-            return [{
-                id: versionId,
-                treeId: undefined!,
-            }];
-        }
-        // If this is the first versions call for the document, we know we will want the latest summary.
-        // Fetch latest summary, cache it, and return its id.
-        if (this.firstVersionsCall && count === 1) {
-            this.firstVersionsCall = false;
-            const { id: _id, snapshotTree } = !this.driverPolicies?.enableDiscovery ?
-                await this.fetchAndCacheSnapshotTree(latestSnapshotId, false) :
-                await this.fetchAndCacheSnapshotTree(latestSnapshotId, true);
-            return [{
-                id: _id,
-                treeId: snapshotTree.id!,
-            }];
-        }
+	public async getVersions(versionId: string | null, count: number): Promise<IVersion[]> {
+		if (versionId !== this.id && versionId !== null) {
+			// Blobs/Trees in this scenario will never have multiple versions, so return versionId as is
+			return [
+				{
+					id: versionId,
+					treeId: undefined!,
+				},
+			];
+		}
+		// If this is the first versions call for the document, we know we will want the latest summary.
+		// Fetch latest summary, cache it, and return its id.
+		if (this.firstVersionsCall && count === 1) {
+			this.firstVersionsCall = false;
+			const { id: _id, snapshotTree } = !this.driverPolicies?.enableDiscovery
+				? await this.fetchAndCacheSnapshotTree(latestSnapshotId, false)
+				: await this.fetchAndCacheSnapshotTree(latestSnapshotId, true);
+			return [
+				{
+					id: _id,
+					treeId: snapshotTree.id!,
+				},
+			];
+		}
 
-        // Otherwise, get the latest version of the document as normal.
-        const id = versionId ? versionId : this.id;
-        const commits = await PerformanceEvent.timedExecAsync(
-            this.logger,
-            {
-                eventName: "getVersions",
-                versionId: id,
-                count,
-            },
-            async () => {
-                const manager = await this.getStorageManager();
-                return manager.getCommits(id, count);
-            },
-        );
-        return commits.map((commit) => ({
-            date: commit.commit.author.date,
-            id: commit.sha,
-            treeId: commit.commit.tree.sha,
-        }));
-    }
+		// Otherwise, get the latest version of the document as normal.
+		const id = versionId ? versionId : this.id;
+		const commits = await PerformanceEvent.timedExecAsync(
+			this.logger,
+			{
+				eventName: "getVersions",
+				versionId: id,
+				count,
+			},
+			async () => {
+				const manager = await this.getStorageManager();
+				return manager.getCommits(id, count);
+			},
+		);
+		return commits.map((commit) => ({
+			date: commit.commit.author.date,
+			id: commit.sha,
+			treeId: commit.commit.tree.sha,
+		}));
+	}
 
-    public async getSnapshotTree(version?: IVersion): Promise<ISnapshotTree | null> {
-        let requestVersion = version;
-        if (!requestVersion) {
-            const versions = await this.getVersions(this.id, 1);
-            if (versions.length === 0) {
-                return null;
-            }
+	public async getSnapshotTree(version?: IVersion): Promise<ISnapshotTree | null> {
+		let requestVersion = version;
+		if (!requestVersion) {
+			const versions = await this.getVersions(this.id, 1);
+			if (versions.length === 0) {
+				return null;
+			}
 
-            requestVersion = versions[0];
-        }
+			requestVersion = versions[0];
+		}
 
-        return (await this.fetchAndCacheSnapshotTree(requestVersion.id)).snapshotTree;
-    }
+		return (await this.fetchAndCacheSnapshotTree(requestVersion.id)).snapshotTree;
+	}
 
-    public async readBlob(blobId: string): Promise<ArrayBufferLike> {
-        const cachedBlob = await this.blobCache.get(this.getCacheKey(blobId));
-        if (cachedBlob !== undefined) {
-            return cachedBlob;
-        }
+	public async readBlob(blobId: string): Promise<ArrayBufferLike> {
+		const cachedBlob = await this.blobCache.get(this.getCacheKey(blobId));
+		if (cachedBlob !== undefined) {
+			return cachedBlob;
+		}
 
-        const blob = await PerformanceEvent.timedExecAsync(
-            this.logger,
-            {
-                eventName: "readBlob",
-                blobId,
-            },
-            async (event) => {
-                const manager = await this.getStorageManager();
-                const response = await manager.getBlob(blobId);
-                event.end({
-                    size: response.size,
-                });
-                return response;
-            },
-        );
-        const bufferValue = stringToBuffer(blob.content, blob.encoding);
+		const blob = await PerformanceEvent.timedExecAsync(
+			this.logger,
+			{
+				eventName: "readBlob",
+				blobId,
+			},
+			async (event) => {
+				const manager = await this.getStorageManager();
+				const response = await manager.getBlob(blobId);
+				event.end({
+					size: response.size,
+				});
+				return response;
+			},
+		);
+		const bufferValue = stringToBuffer(blob.content, blob.encoding);
 
-        await this.blobCache.put(this.getCacheKey(blob.sha), bufferValue);
+		await this.blobCache.put(this.getCacheKey(blob.sha), bufferValue);
 
-        return bufferValue;
-    }
+		return bufferValue;
+	}
 
-    public async uploadSummaryWithContext(summary: ISummaryTree, context: ISummaryContext): Promise<string> {
-        const summaryHandle = await PerformanceEvent.timedExecAsync(
-            this.logger,
-            {
-                eventName: "uploadSummaryWithContext",
-                proposalHandle: context.proposalHandle,
-                ackHandle: context.ackHandle,
-                referenceSequenceNumber: context.referenceSequenceNumber,
-            },
-            async () => {
-                const summaryUploadManager = await this.getSummaryUploadManager();
-                return summaryUploadManager.writeSummaryTree(summary, context.ackHandle ?? "", "channel");
-            },
-        );
-        return summaryHandle;
-    }
+	public async uploadSummaryWithContext(
+		summary: ISummaryTree,
+		context: ISummaryContext,
+	): Promise<string> {
+		const summaryHandle = await PerformanceEvent.timedExecAsync(
+			this.logger,
+			{
+				eventName: "uploadSummaryWithContext",
+				proposalHandle: context.proposalHandle,
+				ackHandle: context.ackHandle,
+				referenceSequenceNumber: context.referenceSequenceNumber,
+			},
+			async () => {
+				const summaryUploadManager = await this.getSummaryUploadManager();
+				return summaryUploadManager.writeSummaryTree(
+					summary,
+					context.ackHandle ?? "",
+					"channel",
+				);
+			},
+		);
+		return summaryHandle;
+	}
 
-    public async downloadSummary(summaryHandle: ISummaryHandle): Promise<ISummaryTree> {
-        const wholeFlatSummary = await PerformanceEvent.timedExecAsync(
-            this.logger,
-            {
-                eventName: "getWholeFlatSummary",
-                treeId: summaryHandle.handle,
-            },
-            async (event) => {
-                const manager = await this.getStorageManager();
-                const response = await manager.getSummary(summaryHandle.handle);
-                event.end({
-                    size: response.trees[0]?.entries.length,
-                });
-                return response;
-            },
-        );
+	public async downloadSummary(summaryHandle: ISummaryHandle): Promise<ISummaryTree> {
+		const wholeFlatSummary = await PerformanceEvent.timedExecAsync(
+			this.logger,
+			{
+				eventName: "getWholeFlatSummary",
+				treeId: summaryHandle.handle,
+			},
+			async (event) => {
+				const manager = await this.getStorageManager();
+				const response = await manager.getSummary(summaryHandle.handle);
+				event.end({
+					size: response.trees[0]?.entries.length,
+				});
+				return response;
+			},
+		);
 
-        const { blobs, snapshotTree } = convertWholeFlatSummaryToSnapshotTreeAndBlobs(wholeFlatSummary, "");
-        return convertSnapshotAndBlobsToSummaryTree(snapshotTree, blobs);
-    }
+		const { blobs, snapshotTree } = convertWholeFlatSummaryToSnapshotTreeAndBlobs(
+			wholeFlatSummary,
+			"",
+		);
+		return convertSnapshotAndBlobsToSummaryTree(snapshotTree, blobs);
+	}
 
-    public async createBlob(file: ArrayBufferLike): Promise<ICreateBlobResponse> {
-        const uint8ArrayFile = new Uint8Array(file);
-        return PerformanceEvent.timedExecAsync(
-            this.logger,
-            {
-                eventName: "createBlob",
-                size: uint8ArrayFile.length,
-            },
-            async (event) => {
-                const manager = await this.getStorageManager();
-                const response = await manager.createBlob(
-                    Uint8ArrayToString(
-                        uint8ArrayFile, "base64"),
-                    "base64").then((r) => ({ id: r.sha, url: r.url }));
-                event.end({
-                    blobId: response.id,
-                });
-                return response;
-            },
-        );
-    }
+	public async createBlob(file: ArrayBufferLike): Promise<ICreateBlobResponse> {
+		const uint8ArrayFile = new Uint8Array(file);
+		return PerformanceEvent.timedExecAsync(
+			this.logger,
+			{
+				eventName: "createBlob",
+				size: uint8ArrayFile.length,
+			},
+			async (event) => {
+				const manager = await this.getStorageManager();
+				const response = await manager
+					.createBlob(Uint8ArrayToString(uint8ArrayFile, "base64"), "base64")
+					.then((r) => ({ id: r.sha, url: r.url }));
+				event.end({
+					blobId: response.id,
+				});
+				return response;
+			},
+		);
+	}
 
-    private async fetchAndCacheSnapshotTree(versionId: string, disableCache?: boolean): Promise<ISnapshotTreeVersion> {
-        const cachedSnapshotTreeVersion = await this.snapshotTreeCache.get(this.getCacheKey(versionId));
-        if (cachedSnapshotTreeVersion !== undefined) {
-            return { id: cachedSnapshotTreeVersion.id, snapshotTree: cachedSnapshotTreeVersion.snapshotTree };
-        }
+	private async fetchAndCacheSnapshotTree(
+		versionId: string,
+		disableCache?: boolean,
+	): Promise<ISnapshotTreeVersion> {
+		const cachedSnapshotTreeVersion = await this.snapshotTreeCache.get(
+			this.getCacheKey(versionId),
+		);
+		if (cachedSnapshotTreeVersion !== undefined) {
+			return {
+				id: cachedSnapshotTreeVersion.id,
+				snapshotTree: cachedSnapshotTreeVersion.snapshotTree,
+			};
+		}
 
-        const wholeFlatSummary = await PerformanceEvent.timedExecAsync(
-            this.logger,
-            {
-                eventName: "getWholeFlatSummary",
-                treeId: versionId,
-            },
-            async (event) => {
-                const manager = await this.getStorageManager(disableCache);
-                const response = await manager.getSummary(versionId);
-                event.end({
-                    size: response.trees[0]?.entries.length,
-                });
-                return response;
-            },
-        );
-        const normalizedWholeSummary = convertWholeFlatSummaryToSnapshotTreeAndBlobs(wholeFlatSummary);
-        const wholeFlatSummaryId: string = wholeFlatSummary.id;
-        const snapshotTreeId = normalizedWholeSummary.snapshotTree.id;
-        assert(snapshotTreeId !== undefined, 0x275 /* "Root tree should contain the id" */);
-        const snapshotTreeVersion = { id: wholeFlatSummaryId, snapshotTree: normalizedWholeSummary.snapshotTree };
+		const wholeFlatSummary = await PerformanceEvent.timedExecAsync(
+			this.logger,
+			{
+				eventName: "getWholeFlatSummary",
+				treeId: versionId,
+			},
+			async (event) => {
+				const manager = await this.getStorageManager(disableCache);
+				const response = await manager.getSummary(versionId);
+				event.end({
+					size: response.trees[0]?.entries.length,
+				});
+				return response;
+			},
+		);
+		const normalizedWholeSummary =
+			convertWholeFlatSummaryToSnapshotTreeAndBlobs(wholeFlatSummary);
+		assert(
+			normalizedWholeSummary.snapshotTree.id !== undefined,
+			0x275 /* "Root tree should contain the id" */,
+		);
+		const wholeFlatSummaryId: string = wholeFlatSummary.id;
+		const snapshotTreeVersion = {
+			id: wholeFlatSummaryId,
+			snapshotTree: normalizedWholeSummary.snapshotTree,
+		};
 
-        const cachePs: Promise<any>[] = [
-            this.snapshotTreeCache.put(
-                this.getCacheKey(snapshotTreeId),
-                snapshotTreeVersion,
-            ),
-            this.initBlobCache(normalizedWholeSummary.blobs),
-        ];
-        if (snapshotTreeId !== versionId) {
-            // versionId could be "latest". When summarizer checks cache for "latest", we want it to be available.
-            // TODO: For in-memory cache, <latest,snapshotTree> will be a shared pointer with <snapshotId,snapshotTree>,
-            // However, for something like Redis, this will cache the same value twice. Alternatively, could we simply
-            // cache with versionId?
-            cachePs.push(this.snapshotTreeCache.put(
-                this.getCacheKey(versionId),
-                snapshotTreeVersion,
-            ));
-        }
+		const cachePs: Promise<any>[] = [
+			this.snapshotTreeCache.put(this.getCacheKey(wholeFlatSummaryId), snapshotTreeVersion),
+			this.initBlobCache(normalizedWholeSummary.blobs),
+		];
+		if (wholeFlatSummaryId !== versionId) {
+			// versionId could be "latest". When summarizer checks cache for "latest", we want it to be available.
+			// TODO: For in-memory cache, <latest,snapshotTree> will be a shared pointer with <snapshotId,snapshotTree>,
+			// However, for something like Redis, this will cache the same value twice. Alternatively, could we simply
+			// cache with versionId?
+			cachePs.push(
+				this.snapshotTreeCache.put(this.getCacheKey(versionId), snapshotTreeVersion),
+			);
+		}
 
-        await Promise.all(cachePs);
+		await Promise.all(cachePs);
 
-        return snapshotTreeVersion;
-    }
+		return snapshotTreeVersion;
+	}
 
-    private async initBlobCache(blobs: Map<string, ArrayBuffer>): Promise<void> {
-        const blobCachePutPs: Promise<void>[] = [];
-        blobs.forEach((value, id) => {
-            const cacheKey = this.getCacheKey(id);
-            blobCachePutPs.push(this.blobCache.put(cacheKey, value));
-        });
-        await Promise.all(blobCachePutPs);
-    }
+	private async initBlobCache(blobs: Map<string, ArrayBuffer>): Promise<void> {
+		const blobCachePutPs: Promise<void>[] = [];
+		blobs.forEach((value, id) => {
+			const cacheKey = this.getCacheKey(id);
+			blobCachePutPs.push(this.blobCache.put(cacheKey, value));
+		});
+		await Promise.all(blobCachePutPs);
+	}
 
-    private getCacheKey(blobId: string): string {
-        return `${this.id}:${blobId}`;
-    }
+	private getCacheKey(blobId: string): string {
+		return `${this.id}:${blobId}`;
+	}
 }

package/tsconfig.esnext.json

@@ -1,7 +1,7 @@
 {
-    "extends": "./tsconfig.json",
-    "compilerOptions": {
-        "outDir": "./lib",
-        "module": "esnext"
-    },
-}
+	"extends": "./tsconfig.json",
+	"compilerOptions": {
+		"outDir": "./lib",
+		"module": "esnext",
+	},
+}

package/tsconfig.json

@@ -1,15 +1,11 @@
 {
-    "extends": "@fluidframework/build-common/ts-common-config.json",
-    "exclude": [
-        "src/test/**/*"
-    ],
-    "compilerOptions": {
-        "rootDir": "./src",
-        "outDir": "./dist",
-        "composite": true,
-        "types": ["node"]
-    },
-    "include": [
-        "src/**/*"
-    ]
+	"extends": "@fluidframework/build-common/ts-common-config.json",
+	"exclude": ["src/test/**/*"],
+	"compilerOptions": {
+		"rootDir": "./src",
+		"outDir": "./dist",
+		"composite": true,
+		"types": ["node"],
+	},
+	"include": ["src/**/*"],
 }