@fluidframework/odsp-driver 1.1.0 → 1.2.0-77818

package/lib/odspDocumentStorageManager.d.ts

@@ -4,15 +4,16 @@
  */
 import { ITelemetryLogger } from "@fluidframework/common-definitions";
 import * as api from "@fluidframework/protocol-definitions";
-import { ISummaryContext, IDocumentStorageService, LoaderCachingPolicy } from "@fluidframework/driver-definitions";
+import { ISummaryContext } from "@fluidframework/driver-definitions";
 import { IOdspResolvedUrl, InstrumentedStorageTokenFetcher } from "@fluidframework/odsp-driver-definitions";
 import { HostStoragePolicyInternal } from "./contracts";
 import { SnapshotFormatSupportType } from "./fetchSnapshot";
 import { IOdspCache } from "./odspCache";
 import { EpochTracker } from "./epochTracker";
 import { FlushResult } from "./odspDocumentDeltaConnection";
+import { OdspDocumentStorageServiceBase } from "./odspDocumentStorageServiceBase";
 export declare const defaultSummarizerCacheExpiryTimeout: number;
-export declare class OdspDocumentStorageService implements IDocumentStorageService {
+export declare class OdspDocumentStorageService extends OdspDocumentStorageServiceBase {
     private readonly odspResolvedUrl;
     private readonly getStorageToken;
     private readonly logger;
@@ -22,17 +23,8 @@ export declare class OdspDocumentStorageService implements IDocumentStorageServi
     private readonly epochTracker;
     private readonly flushCallback;
     private readonly snapshotFormatFetchType?;
-    readonly policies: {
-        caching: LoaderCachingPolicy;
-        minBlobSize: number;
-        maximumCacheDurationMs: number;
-    };
-    private readonly commitCache;
-    private readonly attributesBlobHandles;
     private readonly odspSummaryUploadManager;
-    private _ops;
     private firstVersionCall;
-    private _snapshotSequenceNumber;
     private readonly documentId;
     private readonly snapshotUrl;
     private readonly attachmentPOSTUrl;
@@ -45,27 +37,17 @@ export declare class OdspDocumentStorageService implements IDocumentStorageServi
     private readonly maxSnapshotSizeLimit;
     private readonly maxSnapshotFetchTimeout;
     private readonly createBlobRateLimiter;
-    private readonly blobCache;
-    set ops(ops: api.ISequencedDocumentMessage[] | undefined);
-    get ops(): api.ISequencedDocumentMessage[] | undefined;
-    get snapshotSequenceNumber(): number | undefined;
     constructor(odspResolvedUrl: IOdspResolvedUrl, getStorageToken: InstrumentedStorageTokenFetcher, logger: ITelemetryLogger, fetchFullSnapshot: boolean, cache: IOdspCache, hostPolicy: HostStoragePolicyInternal, epochTracker: EpochTracker, flushCallback: () => Promise<FlushResult>, snapshotFormatFetchType?: SnapshotFormatSupportType | undefined);
-    get repositoryUrl(): string;
     createBlob(file: ArrayBufferLike): Promise<api.ICreateBlobResponse>;
-    private readBlobCore;
-    readBlob(blobId: string): Promise<ArrayBufferLike>;
+    protected fetchBlobFromStorage(blobId: string, evicted: boolean): Promise<ArrayBuffer>;
     getSnapshotTree(version?: api.IVersion, scenarioName?: string): Promise<api.ISnapshotTree | null>;
     getVersions(blobid: string | null, count: number, scenarioName?: string): Promise<api.IVersion[]>;
     private fetchSnapshot;
     private fetchSnapshotCore;
     uploadSummaryWithContext(summary: api.ISummaryTree, context: ISummaryContext): Promise<string>;
-    downloadSummary(commit: api.ISummaryHandle): Promise<api.ISummaryTree>;
-    private setRootTree;
-    private initBlobsCache;
     private checkSnapshotUrl;
     private checkAttachmentPOSTUrl;
     private checkAttachmentGETUrl;
-    private readTree;
-    private combineProtocolAndAppSnapshotTree;
+    protected fetchTreeFromSnapshot(id: string, scenarioName?: string): Promise<api.ISnapshotTree | undefined>;
 }
 //# sourceMappingURL=odspDocumentStorageManager.d.ts.map

package/lib/odspDocumentStorageManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"odspDocumentStorageManager.d.ts","sourceRoot":"","sources":["../src/odspDocumentStorageManager.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"odspDocumentStorageManager.d.ts","sourceRoot":"","sources":["../src/odspDocumentStorageManager.ts"],"names":[],"mappings":"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"}

package/lib/odspDocumentStorageManager.js

@@ -4,15 +4,15 @@
  */
 import { assert, delay, } from "@fluidframework/common-utils";
 import { PerformanceEvent, } from "@fluidframework/telemetry-utils";
-import { LoaderCachingPolicy, DriverErrorType, } from "@fluidframework/driver-definitions";
+import { DriverErrorType, } from "@fluidframework/driver-definitions";
 import { RateLimiter, NonRetryableError } from "@fluidframework/driver-utils";
 import { OdspErrorType, } from "@fluidframework/odsp-driver-definitions";
 import { downloadSnapshot, fetchSnapshot, fetchSnapshotWithRedeem } from "./fetchSnapshot";
 import { getUrlAndHeadersWithAuth } from "./getUrlAndHeadersWithAuth";
 import { createCacheSnapshotKey, getWithRetryForTokenRefresh, } from "./odspUtils";
-import { defaultCacheExpiryTimeoutMs } from "./epochTracker";
 import { OdspSummaryUploadManager } from "./odspSummaryUploadManager";
 import { pkgVersion as driverVersion } from "./packageVersion";
+import { OdspDocumentStorageServiceBase } from "./odspDocumentStorageServiceBase";
 export const defaultSummarizerCacheExpiryTimeout = 60 * 1000; // 60 seconds.
 /* eslint-disable max-len */
 // An implementation of Promise.race that gives you the winner of the promise race
@@ -23,98 +23,10 @@ async function promiseRaceWithWinner(promises) {
         });
     });
 }
-class BlobCache {
-    constructor() {
-        // If the defer flag is set when the timeout fires, we'll reschedule rather than clear immediately
-        // This deferral approach is used (rather than clearing/resetting the timer) as current calling patterns trigger
-        // too many calls to setTimeout/clearTimeout.
-        this.deferBlobCacheClear = false;
-        this._blobCache = new Map();
-        // Tracks all blob IDs evicted from cache
-        this.blobsEvicted = new Set();
-        // Initial time-out to purge data from cache
-        // If this time out is very small, then we purge blobs from cache too soon and that results in a lot of
-        // requests to storage, which brings down perf and may trip protection limits causing 429s
-        this.blobCacheTimeoutDuration = 2 * 60 * 1000;
-        // SPO does not keep old snapshots around for long, so we are running chances of not
-        // being able to rehydrate data store / DDS in the future if we purge anything (and with blob de-duping,
-        // even if blob read by runtime, it could be read again in the future)
-        // So for now, purging is disabled.
-        this.purgeEnabled = false;
-    }
-    get value() {
-        return this._blobCache;
-    }
-    addBlobs(blobs) {
-        blobs.forEach((value, blobId) => {
-            this._blobCache.set(blobId, value);
-        });
-        // Reset the timer on cache set
-        this.scheduleClearBlobsCache();
-    }
-    /**
-     * Schedule a timer for clearing the blob cache or defer the current one.
-     */
-    scheduleClearBlobsCache() {
-        if (this.blobCacheTimeout !== undefined) {
-            // If we already have an outstanding timer, just signal that we should defer the clear
-            this.deferBlobCacheClear = true;
-        }
-        else if (this.purgeEnabled) {
-            // If we don't have an outstanding timer, set a timer
-            // When the timer runs out, we'll decide whether to proceed with the cache clear or reset the timer
-            const clearCacheOrDefer = () => {
-                this.blobCacheTimeout = undefined;
-                if (this.deferBlobCacheClear) {
-                    this.deferBlobCacheClear = false;
-                    this.scheduleClearBlobsCache();
-                }
-                else {
-                    // NOTE: Slightly better algorithm here would be to purge either only big blobs,
-                    // or sort them by size and purge enough big blobs to leave only 256Kb of small blobs in cache
-                    // Purging is optimizing memory footprint. But count controls potential number of storage requests
-                    // We want to optimize both - memory footprint and number of future requests to storage.
-                    // Note that Container can realize data store or DDS on-demand at any point in time, so we do not
-                    // control when blobs will be used.
-                    this._blobCache.forEach((_, blobId) => this.blobsEvicted.add(blobId));
-                    this._blobCache.clear();
-                }
-            };
-            this.blobCacheTimeout = setTimeout(clearCacheOrDefer, this.blobCacheTimeoutDuration);
-            // any future storage reads that get into the cache should be cleared from cache rather quickly -
-            // there is not much value in keeping them longer
-            this.blobCacheTimeoutDuration = 10 * 1000;
-        }
-    }
-    getBlob(blobId) {
-        // Reset the timer on attempted cache read
-        this.scheduleClearBlobsCache();
-        const blobContent = this._blobCache.get(blobId);
-        const evicted = this.blobsEvicted.has(blobId);
-        return { blobContent, evicted };
-    }
-    setBlob(blobId, blob) {
-        // This API is called as result of cache miss and reading blob from storage.
-        // Runtime never reads same blob twice.
-        // The only reason we may get read request for same blob is blob de-duping in summaries.
-        // Note that the bigger the size, the less likely blobs are the same, so there is very little benefit of caching big blobs.
-        // Images are the only exception - user may insert same image twice. But we currently do not de-dup them - only snapshot
-        // blobs are de-duped.
-        const size = blob.byteLength;
-        if (size < 256 * 1024) {
-            // Reset the timer on cache set
-            this.scheduleClearBlobsCache();
-            return this._blobCache.set(blobId, blob);
-        }
-        else {
-            // we evicted it here by not caching.
-            this.blobsEvicted.add(blobId);
-        }
-    }
-}
-export class OdspDocumentStorageService {
+export class OdspDocumentStorageService extends OdspDocumentStorageServiceBase {
     constructor(odspResolvedUrl, getStorageToken, logger, fetchFullSnapshot, cache, hostPolicy, epochTracker, flushCallback, snapshotFormatFetchType) {
         var _a;
+        super();
         this.odspResolvedUrl = odspResolvedUrl;
         this.getStorageToken = getStorageToken;
         this.logger = logger;
@@ -124,24 +36,6 @@ export class OdspDocumentStorageService {
         this.epochTracker = epochTracker;
         this.flushCallback = flushCallback;
         this.snapshotFormatFetchType = snapshotFormatFetchType;
-        this.policies = {
-            // By default, ODSP tells the container not to prefetch/cache.
-            caching: LoaderCachingPolicy.NoCaching,
-            // ODSP storage works better if it has less number of blobs / edges
-            // Runtime creating many small blobs results in sub-optimal perf.
-            // 2K seems like the sweat spot:
-            // The smaller the number, less blobs we aggregate. Most storages are very likely to have notion
-            // of minimal "cluster" size, so having small blobs is wasteful
-            // At the same time increasing the limit ensure that more blobs with user content are aggregated,
-            // reducing possibility for de-duping of same blobs (i.e. .attributes rolled into aggregate blob
-            // are not reused across data stores, or even within data store, resulting in duplication of content)
-            // Note that duplication of content should not have significant impact for bytes over wire as
-            // compression of http payload mostly takes care of it, but it does impact storage size and in-memory sizes.
-            minBlobSize: 2048,
-            maximumCacheDurationMs: defaultCacheExpiryTimeoutMs,
-        };
-        this.commitCache = new Map();
-        this.attributesBlobHandles = new Set();
         this.firstVersionCall = true;
         // Driver specified limits for snapshot size and time.
         /**
@@ -153,26 +47,12 @@ export class OdspDocumentStorageService {
         this.maxSnapshotFetchTimeout = 120000; // 2 min
         // limits the amount of parallel "attachment" blob uploads
         this.createBlobRateLimiter = new RateLimiter(1);
-        this.blobCache = new BlobCache();
         this.documentId = this.odspResolvedUrl.hashedDocumentId;
         this.snapshotUrl = this.odspResolvedUrl.endpoints.snapshotStorageUrl;
         this.attachmentPOSTUrl = this.odspResolvedUrl.endpoints.attachmentPOSTStorageUrl;
         this.attachmentGETUrl = this.odspResolvedUrl.endpoints.attachmentGETStorageUrl;
         this.odspSummaryUploadManager = new OdspSummaryUploadManager(this.snapshotUrl, getStorageToken, logger, epochTracker, !!((_a = this.hostPolicy.sessionOptions) === null || _a === void 0 ? void 0 : _a.forceAccessTokenViaAuthorizationHeader));
     }
-    set ops(ops) {
-        assert(this._ops === undefined, 0x0a5 /* "Trying to set ops when they are already set!" */);
-        this._ops = ops;
-    }
-    get ops() {
-        return this._ops;
-    }
-    get snapshotSequenceNumber() {
-        return this._snapshotSequenceNumber;
-    }
-    get repositoryUrl() {
-        return "";
-    }
     async createBlob(file) {
         this.checkAttachmentPOSTUrl();
         const response = await getWithRetryForTokenRefresh(async (options) => {
@@ -196,70 +76,38 @@ export class OdspDocumentStorageService {
         });
         return response.content;
     }
-    async readBlobCore(blobId) {
-        const { blobContent, evicted } = this.blobCache.getBlob(blobId);
-        let blob = blobContent;
-        if (blob === undefined) {
-            this.checkAttachmentGETUrl();
-            blob = await getWithRetryForTokenRefresh(async (options) => {
-                var _a;
-                const storageToken = await this.getStorageToken(options, "GetBlob");
-                const unAuthedUrl = `${this.attachmentGETUrl}/${encodeURIComponent(blobId)}/content`;
-                const { url, headers } = getUrlAndHeadersWithAuth(unAuthedUrl, storageToken, !!((_a = this.hostPolicy.sessionOptions) === null || _a === void 0 ? void 0 : _a.forceAccessTokenViaAuthorizationHeader));
-                return PerformanceEvent.timedExecAsync(this.logger, {
-                    eventName: "readDataBlob",
-                    blobId,
-                    evicted,
-                    headers: Object.keys(headers).length !== 0 ? true : undefined,
-                    waitQueueLength: this.epochTracker.rateLimiter.waitQueueLength,
-                }, async (event) => {
-                    const res = await this.epochTracker.fetchArray(url, { headers }, "blob");
-                    event.end(Object.assign(Object.assign({ waitQueueLength: this.epochTracker.rateLimiter.waitQueueLength }, res.propsToLog), { attempts: options.refresh ? 2 : 1 }));
-                    const cacheControl = res.headers.get("cache-control");
-                    if (cacheControl === undefined || !(cacheControl.includes("private") || cacheControl.includes("public"))) {
-                        this.logger.sendErrorEvent(Object.assign({ eventName: "NonCacheableBlob", cacheControl,
-                            blobId }, res.propsToLog));
-                    }
-                    return res.content;
-                });
+    async fetchBlobFromStorage(blobId, evicted) {
+        this.checkAttachmentGETUrl();
+        const blob = await getWithRetryForTokenRefresh(async (options) => {
+            var _a;
+            const storageToken = await this.getStorageToken(options, "GetBlob");
+            const unAuthedUrl = `${this.attachmentGETUrl}/${encodeURIComponent(blobId)}/content`;
+            const { url, headers } = getUrlAndHeadersWithAuth(unAuthedUrl, storageToken, !!((_a = this.hostPolicy.sessionOptions) === null || _a === void 0 ? void 0 : _a.forceAccessTokenViaAuthorizationHeader));
+            return PerformanceEvent.timedExecAsync(this.logger, {
+                eventName: "readDataBlob",
+                blobId,
+                evicted,
+                headers: Object.keys(headers).length !== 0 ? true : undefined,
+                waitQueueLength: this.epochTracker.rateLimiter.waitQueueLength,
+            }, async (event) => {
+                const res = await this.epochTracker.fetchArray(url, { headers }, "blob");
+                event.end(Object.assign(Object.assign({ waitQueueLength: this.epochTracker.rateLimiter.waitQueueLength }, res.propsToLog), { attempts: options.refresh ? 2 : 1 }));
+                const cacheControl = res.headers.get("cache-control");
+                if (cacheControl === undefined || !(cacheControl.includes("private") || cacheControl.includes("public"))) {
+                    this.logger.sendErrorEvent(Object.assign({ eventName: "NonCacheableBlob", cacheControl,
+                        blobId }, res.propsToLog));
+                }
+                return res.content;
             });
-            this.blobCache.setBlob(blobId, blob);
-        }
+        });
+        this.blobCache.setBlob(blobId, blob);
         return blob;
     }
-    async readBlob(blobId) {
-        return this.readBlobCore(blobId);
-    }
     async getSnapshotTree(version, scenarioName) {
         if (!this.snapshotUrl) {
             return null;
         }
-        let id;
-        if (!version || !version.id) {
-            const versions = await this.getVersions(null, 1, scenarioName);
-            if (!versions || versions.length === 0) {
-                return null;
-            }
-            id = versions[0].id;
-        }
-        else {
-            id = version.id;
-        }
-        const snapshotTree = await this.readTree(id, scenarioName);
-        if (!snapshotTree) {
-            return null;
-        }
-        if (snapshotTree.blobs) {
-            const attributesBlob = snapshotTree.blobs.attributes;
-            if (attributesBlob) {
-                this.attributesBlobHandles.add(attributesBlob);
-            }
-        }
-        // When we upload the container snapshot, we upload appTree in ".app" and protocol tree in ".protocol"
-        // So when we request the snapshot we get ".app" as tree and not as commit node as in the case just above.
-        const appTree = snapshotTree.trees[".app"];
-        const protocolTree = snapshotTree.trees[".protocol"];
-        return this.combineProtocolAndAppSnapshotTree(appTree, protocolTree);
+        return super.getSnapshotTree(version, scenarioName);
     }
     async getVersions(blobid, count, scenarioName) {
         // Regular load workflow uses blobId === documentID to indicate "latest".
@@ -358,19 +206,7 @@ export class OdspDocumentStorageService {
             });
             // Successful call, make network calls only
             this.firstVersionCall = false;
-            this._snapshotSequenceNumber = odspSnapshotCacheValue.sequenceNumber;
-            const { snapshotTree, blobs, ops } = odspSnapshotCacheValue;
-            // id should be undefined in case of just ops in snapshot.
-            let id;
-            if (snapshotTree) {
-                id = snapshotTree.id;
-                assert(id !== undefined, 0x221 /* "Root tree should contain the id" */);
-                this.setRootTree(id, snapshotTree);
-            }
-            if (blobs) {
-                this.initBlobsCache(blobs);
-            }
-            this.ops = ops;
+            const id = this.initializeFromSnapshot(odspSnapshotCacheValue);
             return id ? [{ id, treeId: undefined }] : [];
         }
         return getWithRetryForTokenRefresh(async (options) => {
@@ -455,34 +291,25 @@ export class OdspDocumentStorageService {
         this.checkSnapshotUrl();
         // Enable flushing only if we have single commit summary and this is not the initial summary for an empty file
         if (".protocol" in summary.tree && context.ackHandle !== undefined) {
-            let retry = 0;
+            let retry = 1;
             for (;;) {
                 const result = await this.flushCallback();
                 const seq = result.lastPersistedSequenceNumber;
                 if (seq !== undefined && seq >= context.referenceSequenceNumber) {
                     break;
                 }
-                retry++;
                 if (retry > 3) {
                     this.logger.sendErrorEvent(Object.assign(Object.assign({ eventName: "FlushFailure" }, result), { retry, referenceSequenceNumber: context.referenceSequenceNumber }));
                     break;
                 }
                 this.logger.sendPerformanceEvent(Object.assign(Object.assign({ eventName: "FlushExtraCall" }, result), { retry, referenceSequenceNumber: context.referenceSequenceNumber }));
+                retry++;
                 await delay(1000 * ((_a = result.retryAfter) !== null && _a !== void 0 ? _a : 1));
             }
         }
         const id = await this.odspSummaryUploadManager.writeSummaryTree(summary, context);
         return id;
     }
-    async downloadSummary(commit) {
-        throw new Error("Not implemented yet");
-    }
-    setRootTree(id, tree) {
-        this.commitCache.set(id, tree);
-    }
-    initBlobsCache(blobs) {
-        this.blobCache.addBlobs(blobs);
-    }
     checkSnapshotUrl() {
         if (!this.snapshotUrl) {
             throw new NonRetryableError("Method failed because no snapshot url was available", DriverErrorType.genericError, { driverVersion });
@@ -498,47 +325,27 @@ export class OdspDocumentStorageService {
             throw new NonRetryableError("Method failed because no attachment GET url was available", DriverErrorType.genericError, { driverVersion });
         }
     }
-    async readTree(id, scenarioName) {
-        if (!this.snapshotUrl) {
-            return null;
-        }
-        let tree = this.commitCache.get(id);
-        if (!tree) {
-            tree = await getWithRetryForTokenRefresh(async (options) => {
-                var _a, _b;
-                const storageToken = await this.getStorageToken(options, "ReadCommit");
-                const snapshotDownloader = async (url, fetchOptions) => {
-                    return this.epochTracker.fetchAndParseAsJSON(url, fetchOptions, "snapshotTree", undefined, scenarioName);
-                };
-                const snapshot = await fetchSnapshot(this.snapshotUrl, storageToken, id, this.fetchFullSnapshot, !!((_a = this.hostPolicy.sessionOptions) === null || _a === void 0 ? void 0 : _a.forceAccessTokenViaAuthorizationHeader), this.logger, snapshotDownloader);
-                let treeId = "";
-                if (snapshot.snapshotTree) {
-                    assert(snapshot.snapshotTree.id !== undefined, 0x222 /* "Root tree should contain the id!!" */);
-                    treeId = snapshot.snapshotTree.id;
-                    this.setRootTree(treeId, snapshot.snapshotTree);
-                }
-                if (snapshot.blobs) {
-                    this.initBlobsCache(snapshot.blobs);
-                }
-                // If the version id doesn't match with the id of the tree, then use the id of first tree which in that case
-                // will be the actual id of tree to be fetched.
-                return (_b = this.commitCache.get(id)) !== null && _b !== void 0 ? _b : this.commitCache.get(treeId);
-            });
-        }
-        if (!tree) {
-            return null;
-        }
-        return tree;
-    }
-    combineProtocolAndAppSnapshotTree(hierarchicalAppTree, hierarchicalProtocolTree) {
-        const summarySnapshotTree = {
-            blobs: Object.assign({}, hierarchicalAppTree.blobs),
-            trees: Object.assign(Object.assign({}, hierarchicalAppTree.trees), { 
-                // the app tree could have a .protocol
-                // in that case we want to server protocol to override it
-                ".protocol": hierarchicalProtocolTree }),
-        };
-        return summarySnapshotTree;
+    async fetchTreeFromSnapshot(id, scenarioName) {
+        return getWithRetryForTokenRefresh(async (options) => {
+            var _a, _b;
+            const storageToken = await this.getStorageToken(options, "ReadCommit");
+            const snapshotDownloader = async (url, fetchOptions) => {
+                return this.epochTracker.fetchAndParseAsJSON(url, fetchOptions, "snapshotTree", undefined, scenarioName);
+            };
+            const snapshot = await fetchSnapshot(this.snapshotUrl, storageToken, id, this.fetchFullSnapshot, !!((_a = this.hostPolicy.sessionOptions) === null || _a === void 0 ? void 0 : _a.forceAccessTokenViaAuthorizationHeader), this.logger, snapshotDownloader);
+            let treeId = "";
+            if (snapshot.snapshotTree) {
+                assert(snapshot.snapshotTree.id !== undefined, 0x222 /* "Root tree should contain the id!!" */);
+                treeId = snapshot.snapshotTree.id;
+                this.setRootTree(treeId, snapshot.snapshotTree);
+            }
+            if (snapshot.blobs) {
+                this.initBlobsCache(snapshot.blobs);
+            }
+            // If the version id doesn't match with the id of the tree, then use the id of first tree which in that case
+            // will be the actual id of tree to be fetched.
+            return (_b = this.commitCache.get(id)) !== null && _b !== void 0 ? _b : this.commitCache.get(treeId);
+        });
     }
 }
 /* eslint-enable max-len */