@fluidframework/container-runtime 2.1.0-276326 → 2.1.0-276985

package/lib/containerRuntime.js

@@ -16,7 +16,7 @@ import { DataCorruptionError, DataProcessingError, GenericError, LoggingError, P
 TaggedLoggerAdapter, UsageError, createChildLogger, createChildMonitoringContext, createSampledLogger, loggerToMonitoringContext, raiseConnectedEvent, wrapError, tagCodeArtifacts, } from "@fluidframework/telemetry-utils/internal";
 import { v4 as uuid } from "uuid";
 import { BindBatchTracker } from "./batchTracker.js";
-import { BlobManager } from "./blobManager.js";
+import { BlobManager, blobManagerBasePath, blobsTreeName, isBlobPath, loadBlobManagerLoadInfo, } from "./blobManager/index.js";
 import { ChannelCollection, getSummaryForDatastores, wrapContext, } from "./channelCollection.js";
 import { ReportOpPerfTelemetry } from "./connectionTelemetry.js";
 import { ContainerFluidHandleContext } from "./containerHandleContext.js";
@@ -29,7 +29,7 @@ import { OpCompressor, OpDecompressor, OpGroupingManager, OpSplitter, Outbox, Re
 import { pkgVersion } from "./packageVersion.js";
 import { PendingStateManager, } from "./pendingStateManager.js";
 import { ScheduleManager } from "./scheduleManager.js";
-import { DocumentsSchemaController, OrderedClientCollection, OrderedClientElection, RetriableSummaryError, RunWhileConnectedCoordinator, Summarizer, SummarizerClientElection, SummaryCollection, SummaryManager, aliasBlobName, blobsTreeName, chunksBlobName, createRootSummarizerNodeWithGC, electedSummarizerBlobName, extractSummaryMetadataMessage, idCompressorBlobName, metadataBlobName, rootHasIsolatedChannels, summarizerClientType, wrapSummaryInChannelsTree, } from "./summary/index.js";
+import { DocumentsSchemaController, OrderedClientCollection, OrderedClientElection, RetriableSummaryError, RunWhileConnectedCoordinator, Summarizer, SummarizerClientElection, SummaryCollection, SummaryManager, aliasBlobName, chunksBlobName, createRootSummarizerNodeWithGC, electedSummarizerBlobName, extractSummaryMetadataMessage, idCompressorBlobName, metadataBlobName, rootHasIsolatedChannels, summarizerClientType, wrapSummaryInChannelsTree, } from "./summary/index.js";
 import { Throttler, formExponentialFn } from "./throttler.js";
 /**
  * Utility to implement compat behaviors given an unknown message type
@@ -277,12 +277,7 @@ export class ContainerRuntime extends TypedEventEmitter {
             tryFetchBlob(idCompressorBlobName),
         ]);
         // read snapshot blobs needed for BlobManager to load
-        const blobManagerSnapshot = await BlobManager.load(context.baseSnapshot?.trees[blobsTreeName], async (id) => {
-            // IContainerContext storage api return type still has undefined in 0.39 package version.
-            // So once we release 0.40 container-defn package we can remove this check.
-            assert(context.storage !== undefined, 0x256 /* "storage undefined in attached container" */);
-            return readAndParse(context.storage, id);
-        });
+        const blobManagerSnapshot = await loadBlobManagerLoadInfo(context);
         const messageAtLastSummary = lastMessageFromMetadata(metadata);
         // Verify summary runtime sequence number matches protocol sequence number.
         const runtimeSequenceNumber = messageAtLastSummary?.sequenceNumber;
@@ -1162,7 +1157,7 @@ export class ContainerRuntime extends TypedEventEmitter {
                 // eslint-disable-next-line @typescript-eslint/return-await -- Adding an await here causes test failures
                 return this.resolveHandle(requestParser.createSubRequest(1));
             }
-            if (id === BlobManager.basePath && requestParser.isLeaf(2)) {
+            if (id === blobManagerBasePath && requestParser.isLeaf(2)) {
                 const blob = await this.blobManager.getBlob(requestParser.pathParts[1]);
                 return blob
                     ? {
@@ -1476,7 +1471,13 @@ export class ContainerRuntime extends TypedEventEmitter {
         // but will not modify the contents object (likely it will replace it on the message).
         const messageCopy = { ...messageArg };
         const savedOp = messageCopy.metadata?.savedOp;
-        for (const message of this.remoteMessageProcessor.process(messageCopy)) {
+        const processResult = this.remoteMessageProcessor.process(messageCopy);
+        if (processResult === undefined) {
+            // This means the incoming message is an incomplete part of a message or batch
+            // and we need to process more messages before the rest of the system can understand it.
+            return;
+        }
+        for (const message of processResult.messages) {
             const msg = modernRuntimeMessage
                 ? {
                     // Cast it since we expect it to be this based on modernRuntimeMessage computation above.
@@ -1486,12 +1487,14 @@ export class ContainerRuntime extends TypedEventEmitter {
                     message: message,
                     local,
                     modernRuntimeMessage,
+                    batchStartCsn: processResult.batchStartCsn,
                 }
                 : // Unrecognized message will be ignored.
                     {
                         message,
                         local,
                         modernRuntimeMessage,
+                        batchStartCsn: processResult.batchStartCsn,
                     };
             msg.savedOp = savedOp;
             // ensure that we observe any re-entrancy, and if needed, rebase ops
@@ -1523,7 +1526,7 @@ export class ContainerRuntime extends TypedEventEmitter {
             assert(message.type !== ContainerMessageType.ChunkedOp, 0x93b /* we should never get here with chunked ops */);
             let localOpMetadata;
             if (local && messageWithContext.modernRuntimeMessage) {
-                localOpMetadata = this.pendingStateManager.processPendingLocalMessage(messageWithContext.message);
+                localOpMetadata = this.pendingStateManager.processPendingLocalMessage(messageWithContext.message, messageWithContext.batchStartCsn);
             }
             // If there are no more pending messages after processing a local message,
             // the document is no longer dirty.
@@ -2007,7 +2010,7 @@ export class ContainerRuntime extends TypedEventEmitter {
      * blob manager.
      */
     getNodeType(nodePath) {
-        if (this.isBlobPath(nodePath)) {
+        if (isBlobPath(nodePath)) {
             return GCNodeType.Blob;
         }
         return this.channelCollection.getGCNodeType(nodePath) ?? GCNodeType.Other;
@@ -2024,7 +2027,7 @@ export class ContainerRuntime extends TypedEventEmitter {
         }
         switch (this.getNodeType(nodePath)) {
             case GCNodeType.Blob:
-                return [BlobManager.basePath];
+                return [blobManagerBasePath];
             case GCNodeType.DataStore:
             case GCNodeType.SubDataStore:
                 return this.channelCollection.getDataStorePackagePath(nodePath);
@@ -2032,16 +2035,6 @@ export class ContainerRuntime extends TypedEventEmitter {
                 assert(false, 0x2de /* "Package path requested for unsupported node type." */);
         }
     }
-    /**
-     * Returns whether a given path is for attachment blobs that are in the format - "/BlobManager.basePath/...".
-     */
-    isBlobPath(path) {
-        const pathParts = path.split("/");
-        if (pathParts.length < 2 || pathParts[1] !== BlobManager.basePath) {
-            return false;
-        }
-        return true;
-    }
     /**
      * From a given list of routes, separate and return routes that belong to blob manager and data stores.
      * @param routes - A list of routes that can belong to data stores or blob manager.
@@ -2052,7 +2045,7 @@ export class ContainerRuntime extends TypedEventEmitter {
         const blobManagerRoutes = [];
         const dataStoreRoutes = [];
         for (const route of routes) {
-            if (this.isBlobPath(route)) {
+            if (isBlobPath(route)) {
                 blobManagerRoutes.push(route);
             }
             else {