@fluidframework/container-loader 2.63.0-359734 → 2.63.0

package/lib/container.js

@@ -31,7 +31,7 @@ import { pkgVersion } from "./packageVersion.js";
 import { ProtocolHandler, protocolHandlerShouldProcessSignal, } from "./protocol.js";
 import { initQuorumValuesFromCodeDetails } from "./quorum.js";
 import { SerializedStateManager, } from "./serializedStateManager.js";
-import { combineAppAndProtocolSummary, combineSnapshotTreeAndSnapshotBlobs, getDetachedContainerStateFromSerializedContainer, getDocumentAttributes, getProtocolSnapshotTree, getISnapshotFromSerializedContainer, runSingle, convertISnapshotToSnapshotWithBlobs, } from "./utils.js";
+import { combineAppAndProtocolSummary, combineSnapshotTreeAndSnapshotBlobs, getDetachedContainerStateFromSerializedContainer, getDocumentAttributes, getProtocolSnapshotTree, getISnapshotFromSerializedContainer, runSingle, convertISnapshotToSnapshotWithBlobs, convertSnapshotInfoToSnapshot, } from "./utils.js";
 const detachedContainerRefSeqNumber = 0;
 const dirtyContainerEvent = "dirty";
 const savedContainerEvent = "saved";
@@ -643,11 +643,11 @@ export class Container extends EventEmitterWithErrorHandling {
             this.attachState === AttachState.Attached
                 ? undefined
                 : createMemoryDetachedBlobStorage();
-        this.storageAdapter = new ContainerStorageAdapter(this.detachedBlobStorage, this.mc.logger, pendingLocalState?.snapshotBlobs, pendingLocalState?.loadedGroupIdSnapshots, addProtocolSummaryIfMissing, enableSummarizeProtocolTree);
+        this.storageAdapter = new ContainerStorageAdapter(this.detachedBlobStorage, this.mc.logger, pendingLocalState?.loadedGroupIdSnapshots, addProtocolSummaryIfMissing, enableSummarizeProtocolTree);
         const offlineLoadEnabled = this.isInteractiveClient &&
             (this.mc.config.getBoolean("Fluid.Container.enableOfflineLoad") ??
                 this.mc.config.getBoolean("Fluid.Container.enableOfflineFull") ??
-                options.enableOfflineLoad === true);
+                options.enableOfflineLoad !== false);
         this.serializedStateManager = new SerializedStateManager(this.subLogger, this.storageAdapter, offlineLoadEnabled, this, () => this._deltaManager.connectionManager.shouldJoinWrite(), () => this.supportGetSnapshotApi(), this.mc.config.getNumber("Fluid.Container.snapshotRefreshTimeoutMs"));
         const isDomAvailable = typeof document === "object" &&
             document !== null &&
@@ -1013,7 +1013,7 @@ export class Container extends EventEmitterWithErrorHandling {
         };
         timings.phase2 = performanceNow();
         // Fetch specified snapshot.
-        const { baseSnapshot, version, attributes } = await this.serializedStateManager.fetchSnapshot(specifiedVersion, pendingLocalState);
+        const { snapshot: baseSnapshot, version, attributes, } = await this.serializedStateManager.fetchSnapshot(specifiedVersion, pendingLocalState);
         const baseSnapshotTree = getSnapshotTree(baseSnapshot);
         this._loadedFromVersion = version;
         // If we saved ops, we will replay them and don't need DeltaManager to fetch them
@@ -1125,12 +1125,16 @@ export class Container extends EventEmitterWithErrorHandling {
             }
             assert(this.detachedBlobStorage !== undefined && this.detachedBlobStorage.size > 0, 0x250 /* "serialized container with attachment blobs must be rehydrated with detached blob storage" */);
         }
-        const snapshotTreeWithBlobContents = combineSnapshotTreeAndSnapshotBlobs(baseSnapshot, snapshotBlobs);
-        this.storageAdapter.loadSnapshotFromSnapshotBlobs(snapshotBlobs);
-        const attributes = await getDocumentAttributes(this.storageAdapter, snapshotTreeWithBlobContents);
+        const snapshot = convertSnapshotInfoToSnapshot({
+            baseSnapshot,
+            snapshotBlobs,
+            snapshotSequenceNumber: 0,
+        });
+        this.storageAdapter.cacheSnapshotBlobs(snapshot.blobContents);
+        const attributes = await getDocumentAttributes(this.storageAdapter, snapshot.snapshotTree);
         await this.attachDeltaManagerOpHandler(attributes);
         // Initialize the protocol handler
-        const baseTree = getProtocolSnapshotTree(snapshotTreeWithBlobContents);
+        const baseTree = getProtocolSnapshotTree(snapshot.snapshotTree);
         const qValues = await readAndParse(this.storageAdapter, baseTree.blobs.quorumValues);
         this.initializeProtocolState(attributes, {
             members: [],
@@ -1138,7 +1142,7 @@ export class Container extends EventEmitterWithErrorHandling {
             values: qValues,
         });
         const codeDetails = this.getCodeDetailsFromQuorum();
-        await this.instantiateRuntime(codeDetails, snapshotTreeWithBlobContents, pendingRuntimeState);
+        await this.instantiateRuntime(codeDetails, combineSnapshotTreeAndSnapshotBlobs(snapshot), pendingRuntimeState, snapshot);
         this.setLoaded();
     }
     async initializeProtocolStateFromSnapshot(attributes, storage, snapshot) {