@fluidframework/container-loader 2.0.0-internal.2.1.1 → 2.0.0-internal.2.2.0

package/dist/container.js

@@ -7,7 +7,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Container = exports.waitContainerToCatchUp = void 0;
+exports.Container = exports.ReportIfTooLong = exports.waitContainerToCatchUp = void 0;
 // eslint-disable-next-line import/no-internal-modules
 const merge_1 = __importDefault(require("lodash/merge"));
 const uuid_1 = require("uuid");
@@ -121,10 +121,11 @@ const getCodeProposal =
 async function ReportIfTooLong(logger, eventName, action) {
     const event = telemetry_utils_1.PerformanceEvent.start(logger, { eventName });
     const props = await action();
-    if (event.duration > 1000) {
+    if (event.duration > 200) {
         event.end(props);
     }
 }
+exports.ReportIfTooLong = ReportIfTooLong;
 const summarizerClientType = "summarizer";
 class Container extends telemetry_utils_1.EventEmitterWithErrorHandling {
     constructor(loader, config, protocolHandlerBuilder) {
@@ -209,9 +210,23 @@ class Container extends telemetry_utils_1.EventEmitterWithErrorHandling {
             shouldClientJoinWrite: () => this._deltaManager.connectionManager.shouldJoinWrite(),
             maxClientLeaveWaitTime: this.loader.services.options.maxClientLeaveWaitTime,
             logConnectionIssue: (eventName, details) => {
+                const mode = this.connectionMode;
                 // We get here when socket does not receive any ops on "write" connection, including
                 // its own join op. Attempt recovery option.
-                this._deltaManager.logConnectionIssue(Object.assign({ eventName, duration: common_utils_1.performance.now() - this.connectionTransitionTimes[connectionState_1.ConnectionState.CatchingUp] }, (details === undefined ? {} : { details: JSON.stringify(details) })));
+                this._deltaManager.logConnectionIssue(Object.assign({ eventName,
+                    mode, duration: common_utils_1.performance.now() - this.connectionTransitionTimes[connectionState_1.ConnectionState.CatchingUp] }, (details === undefined ? {} : { details: JSON.stringify(details) })));
+                // If this is "write" connection, it took too long to receive join op. But in most cases that's due
+                // to very slow op fetches and we will eventually get there.
+                // For "read" connections, we get here due to self join signal not arriving on time. We will need to
+                // better understand when and why it may happen.
+                // For now, attempt to recover by reconnecting. In future, maybe we can query relay service for
+                // current state of audience.
+                // Other possible recovery path - move to connected state (i.e. ConnectionStateHandler.joinOpTimer
+                // to call this.applyForConnectedState("addMemberEvent") for "read" connections)
+                if (mode === "read") {
+                    this.disconnect();
+                    this.connect();
+                }
             },
         }, this.deltaManager, this._clientId);
         this.on(savedContainerEvent, () => {
@@ -1032,7 +1047,8 @@ class Container extends telemetry_utils_1.EventEmitterWithErrorHandling {
         // eslint-disable-next-line @typescript-eslint/no-floating-promises
         deltaManager.inboundSignal.pause();
         deltaManager.on("connect", (details, _opsBehind) => {
-            this.connectionStateHandler.receivedConnectEvent(this.connectionMode, details);
+            (0, common_utils_1.assert)(this.connectionMode === details.mode, 0x4b7 /* mismatch */);
+            this.connectionStateHandler.receivedConnectEvent(details);
         });
         deltaManager.on("disconnect", (reason) => {
             var _a;
@@ -1145,7 +1161,7 @@ class Container extends telemetry_utils_1.EventEmitterWithErrorHandling {
         let clientSequenceNumber = -1;
         for (const message of batch) {
             clientSequenceNumber = this.submitMessage(protocol_definitions_1.MessageType.Operation, message.contents, true, // batch
-            message.metadata);
+            message.metadata, message.compression);
         }
         this._deltaManager.flush();
         return clientSequenceNumber;
@@ -1162,7 +1178,7 @@ class Container extends telemetry_utils_1.EventEmitterWithErrorHandling {
             this.options.summarizeProtocolTree === true;
         return this.submitMessage(protocol_definitions_1.MessageType.Summarize, JSON.stringify(summary), false /* batch */);
     }
-    submitMessage(type, contents, batch, metadata) {
+    submitMessage(type, contents, batch, metadata, compression) {
         var _a;
         if (this.connectionState !== connectionState_1.ConnectionState.Connected) {
             this.mc.logger.sendErrorEvent({ eventName: "SubmitMessageWithNoConnection", type });
@@ -1170,7 +1186,7 @@ class Container extends telemetry_utils_1.EventEmitterWithErrorHandling {
         }
         this.messageCountAfterDisconnection += 1;
         (_a = this.collabWindowTracker) === null || _a === void 0 ? void 0 : _a.stopSequenceNumberUpdate();
-        return this._deltaManager.submit(type, contents, batch, metadata);
+        return this._deltaManager.submit(type, contents, batch, metadata, compression);
     }
     processRemoteMessage(message) {
         const local = this.clientId === message.clientId;