@fluidframework/container-loader 2.0.0-dev.4.1.0.148229 → 2.0.0-dev.4.2.0.153917

package/lib/container.js

@@ -4,6 +4,8 @@
  */
 // eslint-disable-next-line import/no-internal-modules
 import merge from "lodash/merge";
+// eslint-disable-next-line import/no-internal-modules
+import cloneDeep from "lodash/cloneDeep";
 import { v4 as uuid } from "uuid";
 import { assert, performance, unreachableCase } from "@fluidframework/common-utils";
 import { AttachState, isFluidCodeDetails, } from "@fluidframework/container-definitions";
@@ -25,7 +27,7 @@ import { initQuorumValuesFromCodeDetails, getCodeDetailsFromQuorumValues, Quorum
 import { CollabWindowTracker } from "./collabWindowTracker";
 import { ConnectionManager } from "./connectionManager";
 import { ConnectionState } from "./connectionState";
-import { ProtocolHandler } from "./protocol";
+import { OnlyValidTermValue, ProtocolHandler, } from "./protocol";
 const detachedContainerRefSeqNumber = 0;
 const dirtyContainerEvent = "dirty";
 const savedContainerEvent = "saved";
@@ -208,7 +210,7 @@ export class Container extends EventEmitterWithErrorHandling {
         });
         // Prefix all events in this file with container-loader
         this.mc = loggerToMonitoringContext(ChildLogger.create(this.subLogger, "Container"));
-        this.options = Object.assign({}, this.loader.services.options);
+        this.options = cloneDeep(this.loader.services.options);
         this._deltaManager = this.createDeltaManager();
         this.connectionStateHandler = createConnectionStateHandler({
             logger: this.mc.logger,
@@ -623,16 +625,15 @@ export class Container extends EventEmitterWithErrorHandling {
         assert(this.attachState === AttachState.Attached, 0x0d1 /* "Container should be attached before close" */);
         assert(this.resolvedUrl !== undefined && this.resolvedUrl.type === "fluid", 0x0d2 /* "resolved url should be valid Fluid url" */);
         assert(!!this._protocolHandler, 0x2e3 /* "Must have a valid protocol handler instance" */);
-        assert(this._protocolHandler.attributes.term !== undefined, 0x37e /* Must have a valid protocol handler instance */);
-        assert(!!this.baseSnapshot, "no base snapshot");
-        assert(!!this.baseSnapshotBlobs, "no snapshot blobs");
+        assert(!!this.baseSnapshot, 0x5d4 /* no base snapshot */);
+        assert(!!this.baseSnapshotBlobs, 0x5d5 /* no snapshot blobs */);
         const pendingState = {
             pendingRuntimeState: this.context.getPendingLocalState(),
             baseSnapshot: this.baseSnapshot,
             snapshotBlobs: this.baseSnapshotBlobs,
             savedOps: this.savedOps,
             url: this.resolvedUrl.url,
-            term: this._protocolHandler.attributes.term,
+            term: OnlyValidTermValue,
             clientId: this.clientId,
         };
         this.mc.logger.sendTelemetryEvent({ eventName: "CloseAndGetPendingLocalState" });
@@ -980,7 +981,7 @@ export class Container extends EventEmitterWithErrorHandling {
             }
             pendingLocalState.savedOps = [];
             // now set clientId to stashed clientId so live ops are correctly processed as local
-            assert(this.clientId === undefined, "Unexpected clientId when setting stashed clientId");
+            assert(this.clientId === undefined, 0x5d6 /* Unexpected clientId when setting stashed clientId */);
             this._clientId = pendingLocalState === null || pendingLocalState === void 0 ? void 0 : pendingLocalState.clientId;
         }
         // We might have hit some failure that did not manifest itself in exception in this flow,
@@ -1032,7 +1033,7 @@ export class Container extends EventEmitterWithErrorHandling {
     async createDetached(source) {
         const attributes = {
             sequenceNumber: detachedContainerRefSeqNumber,
-            term: 1,
+            term: OnlyValidTermValue,
             minimumSequenceNumber: 0,
         };
         await this.attachDeltaManagerOpHandler(attributes);
@@ -1075,7 +1076,7 @@ export class Container extends EventEmitterWithErrorHandling {
             return {
                 minimumSequenceNumber: 0,
                 sequenceNumber: 0,
-                term: 1,
+                term: OnlyValidTermValue,
             };
         }
         // Backward compatibility: old docs would have ".attributes" instead of "attributes"
@@ -1083,10 +1084,6 @@ export class Container extends EventEmitterWithErrorHandling {
             ? tree.trees[".protocol"].blobs.attributes
             : tree.blobs[".attributes"];
         const attributes = await readAndParse(storage, attributesHash);
-        // Backward compatibility for older summaries with no term
-        if (attributes.term === undefined) {
-            attributes.term = 1;
-        }
         return attributes;
     }
     async initializeProtocolStateFromSnapshot(attributes, storage, snapshot) {
@@ -1206,7 +1203,7 @@ export class Container extends EventEmitterWithErrorHandling {
     }
     createDeltaManager() {
         const serviceProvider = () => this.service;
-        const deltaManager = new DeltaManager(serviceProvider, ChildLogger.create(this.subLogger, "DeltaManager"), () => this.activeConnection(), (props) => new ConnectionManager(serviceProvider, this.client, this._canReconnect, ChildLogger.create(this.subLogger, "ConnectionManager"), props));
+        const deltaManager = new DeltaManager(serviceProvider, ChildLogger.create(this.subLogger, "DeltaManager"), () => this.activeConnection(), (props) => new ConnectionManager(serviceProvider, () => this.isDirty, this.client, this._canReconnect, ChildLogger.create(this.subLogger, "ConnectionManager"), props));
         // 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();
@@ -1245,8 +1242,7 @@ export class Container extends EventEmitterWithErrorHandling {
         return deltaManager;
     }
     async attachDeltaManagerOpHandler(attributes, prefetchType) {
-        var _a;
-        return this._deltaManager.attachOpHandler(attributes.minimumSequenceNumber, attributes.sequenceNumber, (_a = attributes.term) !== null && _a !== void 0 ? _a : 1, {
+        return this._deltaManager.attachOpHandler(attributes.minimumSequenceNumber, attributes.sequenceNumber, {
             process: (message) => this.processRemoteMessage(message),
             processSignal: (message) => {
                 this.processSignal(message);
@@ -1309,7 +1305,7 @@ export class Container extends EventEmitterWithErrorHandling {
             this.messageCountAfterDisconnection = 0;
         }
         // Both protocol and context should not be undefined if we got so far.
-        this.setContextConnectedState(state, (_a = this._deltaManager.connectionManager.readOnlyInfo.readonly) !== null && _a !== void 0 ? _a : false);
+        this.setContextConnectedState(state, (_a = this.readOnlyInfo.readonly) !== null && _a !== void 0 ? _a : false);
         this.protocolHandler.setConnectionState(state, this.clientId);
         raiseConnectedEvent(this.mc.logger, this, state, this.clientId, disconnectedReason);
         if (logOpsOnReconnect) {