@fluidframework/container-loader 0.59.3003 → 0.59.4000-71128

package/lib/container.js

@@ -27,24 +27,10 @@ import { getProtocolSnapshotTree, getSnapshotTreeFromSerializedContainer } from
 import { initQuorumValuesFromCodeDetails, getCodeDetailsFromQuorumValues, QuorumProxy } from "./quorum";
 import { CollabWindowTracker } from "./collabWindowTracker";
 import { ConnectionManager } from "./connectionManager";
+import { ConnectionState } from "./connectionState";
 const detachedContainerRefSeqNumber = 0;
 const dirtyContainerEvent = "dirty";
 const savedContainerEvent = "saved";
-export var ConnectionState;
-(function (ConnectionState) {
-    /**
-     * The document is no longer connected to the delta server
-     */
-    ConnectionState[ConnectionState["Disconnected"] = 0] = "Disconnected";
-    /**
-     * The document has an inbound connection but is still pending for outbound deltas
-     */
-    ConnectionState[ConnectionState["Connecting"] = 1] = "Connecting";
-    /**
-     * The document is fully connected
-     */
-    ConnectionState[ConnectionState["Connected"] = 2] = "Connected";
-})(ConnectionState || (ConnectionState = {}));
 /**
  * Waits until container connects to delta storage and gets up-to-date
  * Useful when resolving URIs and hitting 404, due to container being loaded from (stale) snapshot and not being
@@ -114,7 +100,7 @@ const getCodeProposal =
 const summarizerClientType = "summarizer";
 export class Container extends EventEmitterWithErrorHandling {
     constructor(loader, config) {
-        var _a, _b, _c;
+        var _a;
         super((name, error) => {
             this.mc.logger.sendErrorEvent({
                 eventName: "ContainerEventHandlerException",
@@ -134,7 +120,6 @@ export class Container extends EventEmitterWithErrorHandling {
         this.attachStarted = false;
         this._dirtyContainer = false;
         this.setAutoReconnectTime = performance.now();
-        this.collabWindowTracker = new CollabWindowTracker((type, contents) => this.submitMessage(type, contents), () => this.activeConnection(), (_a = this.loader.services.options) === null || _a === void 0 ? void 0 : _a.noopTimeFrequency, (_b = this.loader.services.options) === null || _b === void 0 ? void 0 : _b.noopCountFrequency);
         this._audience = new Audience();
         this.clientDetailsOverride = config.clientDetailsOverride;
         this._resolvedUrl = config.resolvedUrl;
@@ -175,7 +160,7 @@ export class Container extends EventEmitterWithErrorHandling {
         });
         // Prefix all events in this file with container-loader
         this.mc = loggerToMonitoringContext(ChildLogger.create(this.subLogger, "Container"));
-        const summarizeProtocolTree = (_c = this.mc.config.getBoolean("Fluid.Container.summarizeProtocolTree")) !== null && _c !== void 0 ? _c : this.loader.services.options.summarizeProtocolTree;
+        const summarizeProtocolTree = (_a = this.mc.config.getBoolean("Fluid.Container.summarizeProtocolTree")) !== null && _a !== void 0 ? _a : this.loader.services.options.summarizeProtocolTree;
         this.options = Object.assign(Object.assign({}, this.loader.services.options), { summarizeProtocolTree });
         this.connectionStateHandler = new ConnectionStateHandler({
             quorumClients: () => { var _a; return (_a = this._protocolHandler) === null || _a === void 0 ? void 0 : _a.quorum; },
@@ -1069,7 +1054,8 @@ export class Container extends EventEmitterWithErrorHandling {
             this.connectionStateHandler.receivedConnectEvent(this.connectionMode, details);
         });
         deltaManager.on("disconnect", (reason) => {
-            this.collabWindowTracker.stopSequenceNumberUpdate();
+            var _a;
+            (_a = this.collabWindowTracker) === null || _a === void 0 ? void 0 : _a.stopSequenceNumberUpdate();
             this.connectionStateHandler.receivedDisconnectEvent(reason);
         });
         deltaManager.on("throttled", (warning) => {
@@ -1183,12 +1169,13 @@ export class Container extends EventEmitterWithErrorHandling {
         return this.submitMessage(type, contents, batch, metadata);
     }
     submitMessage(type, contents, batch, metadata) {
+        var _a;
         if (this.connectionState !== ConnectionState.Connected) {
             this.mc.logger.sendErrorEvent({ eventName: "SubmitMessageWithNoConnection", type });
             return -1;
         }
         this.messageCountAfterDisconnection += 1;
-        this.collabWindowTracker.stopSequenceNumberUpdate();
+        (_a = this.collabWindowTracker) === null || _a === void 0 ? void 0 : _a.stopSequenceNumberUpdate();
         return this._deltaManager.submit(type, contents, batch, metadata);
     }
     processRemoteMessage(message) {
@@ -1217,10 +1204,42 @@ export class Container extends EventEmitterWithErrorHandling {
         }
         // Allow the protocol handler to process the message
         const result = this.protocolHandler.processMessage(message, local);
-        this.collabWindowTracker.scheduleSequenceNumberUpdate(message, result.immediateNoOp === true);
+        // Inactive (not in quorum or not writers) clients don't take part in the minimum sequence number calculation.
+        if (this.activeConnection()) {
+            if (this.collabWindowTracker === undefined) {
+                // Note that config from first connection will be used for this container's lifetime.
+                // That means that if relay service changes settings, such changes will impact only newly booted
+                // clients.
+                // All existing will continue to use settings they got earlier.
+                const [noopTimeFrequency, noopCountFrequency] = this.getNoopConfig();
+                this.collabWindowTracker = new CollabWindowTracker((type, contents) => {
+                    assert(this.activeConnection(), 0x241 /* "disconnect should result in stopSequenceNumberUpdate() call" */);
+                    this.submitMessage(type, contents);
+                }, noopTimeFrequency, noopCountFrequency);
+            }
+            this.collabWindowTracker.scheduleSequenceNumberUpdate(message, result.immediateNoOp === true);
+        }
         this.emit("op", message);
         return result;
     }
+    /**
+     *  #260 (ADO)
+     * back-compat: noopTimeFrequency & noopCountFrequency properties were added to
+     * IClientConfiguration in 0.59.3000. During the integration, we must read the
+     * available configuration from the loader options.
+     */
+    getNoopConfig() {
+        var _a, _b;
+        assert(this.serviceConfiguration !== undefined, 0x2e2);
+        if (this.serviceConfiguration.noopTimeFrequency !== undefined ||
+            this.serviceConfiguration.noopCountFrequency !== undefined) {
+            return [
+                this.serviceConfiguration.noopTimeFrequency,
+                this.serviceConfiguration.noopCountFrequency,
+            ];
+        }
+        return [(_a = this.loader.services.options) === null || _a === void 0 ? void 0 : _a.noopTimeFrequency, (_b = this.loader.services.options) === null || _b === void 0 ? void 0 : _b.noopCountFrequency];
+    }
     submitSignal(message) {
         this._deltaManager.submitSignal(JSON.stringify(message));
     }