@fluidframework/container-loader 2.51.0 → 2.52.0

package/dist/container.js

@@ -508,10 +508,14 @@ class Container extends internal_5.EventEmitterWithErrorHandling {
             this._dirtyContainer = dirty;
             this.emit(dirty ? dirtyContainerEvent : savedContainerEvent);
         };
-        const { canReconnect, clientDetailsOverride, urlResolver, documentServiceFactory, codeLoader, options, scope, subLogger, protocolHandlerBuilder, } = createProps;
+        const { canReconnect, clientDetailsOverride, urlResolver, documentServiceFactory, codeLoader, options, scope, subLogger, protocolHandlerBuilder, retryConnectionTimeoutMs, } = createProps;
+        // Validate that the Driver is compatible with this Loader.
+        const maybeDriverCompatDetails = documentServiceFactory;
+        (0, loaderLayerCompatState_js_1.validateDriverCompatibility)(maybeDriverCompatDetails.ILayerCompatDetails, (error) => { } /* disposeFn */);
         this.connectionTransitionTimes[connectionState_js_1.ConnectionState.Disconnected] = (0, client_utils_1.performanceNow)();
         const pendingLocalState = loadProps?.pendingLocalState;
         this._canReconnect = canReconnect ?? true;
+        this._retryConnectionTimeoutMs = retryConnectionTimeoutMs;
         this.clientDetailsOverride = clientDetailsOverride;
         this.urlResolver = urlResolver;
         this.serviceFactory = documentServiceFactory;
@@ -783,32 +787,18 @@ class Container extends internal_5.EventEmitterWithErrorHandling {
             this._lifecycleEvents.emit("disposed");
         }
     }
-    async closeAndGetPendingLocalState(stopBlobAttachingSignal) {
-        // runtime matches pending ops to successful ones by clientId and client seq num, so we need to close the
-        // container at the same time we get pending state, otherwise this container could reconnect and resubmit with
-        // a new clientId and a future container using stale pending state without the new clientId would resubmit them
-        const pendingState = await this.getPendingLocalStateCore({
-            notifyImminentClosure: true,
-            stopBlobAttachingSignal,
-        });
-        this.close();
-        return pendingState;
-    }
     /**
      * Serialize current container state required to rehydrate to the same position without dataloss.
      * Note: The container must already be attached. For detached containers use {@link serialize}
      * @returns stringified {@link IPendingContainerState} for the container
      */
     async getPendingLocalState() {
-        return this.getPendingLocalStateCore({ notifyImminentClosure: false });
-    }
-    async getPendingLocalStateCore(props) {
         if (this.closed || this._disposed) {
             throw new internal_5.UsageError("Pending state cannot be retried if the container is closed or disposed");
         }
         (0, internal_2.assert)(this.attachmentData.state === container_definitions_1.AttachState.Attached, 0x0d1 /* "Container should be attached before close" */);
         (0, internal_2.assert)(this.resolvedUrl !== undefined && this.resolvedUrl.type === "fluid", 0x0d2 /* "resolved url should be valid Fluid url" */);
-        const pendingState = await this.serializedStateManager.getPendingLocalState(props, this.clientId, this.runtime, this.resolvedUrl);
+        const pendingState = await this.serializedStateManager.getPendingLocalState(this.clientId, this.runtime, this.resolvedUrl);
         return pendingState;
     }
     get attachState() {
@@ -817,7 +807,7 @@ class Container extends internal_5.EventEmitterWithErrorHandling {
     /**
      * Serialize current container state required to rehydrate to the same position without dataloss.
      * Note: The container must be detached and not closed. For attached containers use
-     * {@link getPendingLocalState} or {@link closeAndGetPendingLocalState}
+     * {@link getPendingLocalState}
      * @returns stringified {@link IPendingDetachedContainerState} for the container
      */
     serialize() {
@@ -1001,9 +991,6 @@ class Container extends internal_5.EventEmitterWithErrorHandling {
                 cancel: this._deltaManager.closeAbortController.signal,
             });
         }
-        // Validate that the Driver is compatible with this Loader.
-        const maybeDriverCompatDetails = service;
-        (0, loaderLayerCompatState_js_1.validateDriverCompatibility)(maybeDriverCompatDetails.ILayerCompatDetails, (error) => this.dispose(error));
         return service;
     }
     /**
@@ -1287,7 +1274,7 @@ class Container extends internal_5.EventEmitterWithErrorHandling {
     }
     createDeltaManager() {
         const serviceProvider = () => this.service;
-        const deltaManager = new deltaManager_js_1.DeltaManager(serviceProvider, (0, internal_5.createChildLogger)({ logger: this.subLogger, namespace: "DeltaManager" }), () => this.activeConnection(), (props) => new connectionManager_js_1.ConnectionManager(serviceProvider, () => this.isDirty, this.client, this._canReconnect, (0, internal_5.createChildLogger)({ logger: this.subLogger, namespace: "ConnectionManager" }), props));
+        const deltaManager = new deltaManager_js_1.DeltaManager(serviceProvider, (0, internal_5.createChildLogger)({ logger: this.subLogger, namespace: "DeltaManager" }), () => this.activeConnection(), (props) => new connectionManager_js_1.ConnectionManager(serviceProvider, () => this.isDirty, this.client, this._canReconnect, (0, internal_5.createChildLogger)({ logger: this.subLogger, namespace: "ConnectionManager" }), props, this._retryConnectionTimeoutMs));
         // Disable inbound queues as Container is not ready to accept any ops until we are fully loaded!
         // eslint-disable-next-line @typescript-eslint/no-floating-promises
         deltaManager.inbound.pause();
@@ -1547,7 +1534,35 @@ class Container extends internal_5.EventEmitterWithErrorHandling {
                 throw new Error(packageNotFactoryError);
             }
             const existing = snapshotTree !== undefined;
-            const context = new containerContext_js_1.ContainerContext(this.options, this.scope, snapshotTree, this._loadedFromVersion, this._deltaManager, this.storageAdapter, this.protocolHandler.quorum, this.protocolHandler.audience, loader, (type, contents, batch, metadata) => this.submitContainerMessage(type, contents, batch, metadata), (summaryOp, referenceSequenceNumber) => this.submitSummaryMessage(summaryOp, referenceSequenceNumber), (batch, referenceSequenceNumber) => this.submitBatch(batch, referenceSequenceNumber), (content, targetClientId) => this.submitSignal(content, targetClientId), (error) => this.dispose(error), (error) => this.close(error), this.updateDirtyContainerState, this.getAbsoluteUrl, () => this.resolvedUrl?.id, () => this.clientId, () => this.attachState, () => this.connected, this._deltaManager.clientDetails, existing, this.subLogger, pendingLocalState, snapshot);
+            const context = new containerContext_js_1.ContainerContext({
+                options: this.options,
+                scope: this.scope,
+                baseSnapshot: snapshotTree,
+                version: this._loadedFromVersion,
+                deltaManager: this._deltaManager,
+                storage: this.storageAdapter,
+                quorum: this.protocolHandler.quorum,
+                audience: this.protocolHandler.audience,
+                loader,
+                submitFn: (type, contents, batch, metadata) => this.submitContainerMessage(type, contents, batch, metadata),
+                submitSummaryFn: (summaryOp, referenceSequenceNumber) => this.submitSummaryMessage(summaryOp, referenceSequenceNumber),
+                submitBatchFn: (batch, referenceSequenceNumber) => this.submitBatch(batch, referenceSequenceNumber),
+                submitSignalFn: (content, targetClientId) => this.submitSignal(content, targetClientId),
+                disposeFn: (error) => this.dispose(error),
+                closeFn: (error) => this.close(error),
+                updateDirtyContainerState: this.updateDirtyContainerState,
+                getAbsoluteUrl: this.getAbsoluteUrl,
+                getContainerDiagnosticId: () => this.resolvedUrl?.id,
+                getClientId: () => this.clientId,
+                getAttachState: () => this.attachState,
+                getConnected: () => this.connected,
+                getConnectionState: () => this.connectionState,
+                clientDetails: this._deltaManager.clientDetails,
+                existing,
+                taggedLogger: this.subLogger,
+                pendingLocalState,
+                snapshotWithContents: snapshot,
+            });
             const runtime = await internal_5.PerformanceEvent.timedExecAsync(this.subLogger, { eventName: "InstantiateRuntime" }, async () => runtimeFactory.instantiateRuntime(context, existing));
             // Validate that the Runtime is compatible with this Loader.
             const maybeRuntimeCompatDetails = runtime;