@fluidframework/container-loader 2.0.0-internal.5.4.0 → 2.0.0-internal.6.1.0

package/CHANGELOG.md

@@ -1,5 +1,90 @@
 # @fluidframework/container-loader
 
+## 2.0.0-internal.6.1.0
+
+Dependency updates only.
+
+## 2.0.0-internal.6.0.0
+
+### Major Changes
+
+-   Removed IContainerContext.existing [8abce8cdb4](https://github.com/microsoft/FluidFramework/commits/8abce8cdb4e2832fb6405fb44e393bef03d5648a)
+
+    The recommended means of checking for existing changed to the instantiateRuntime param in 2021, and the IContainerContext.existing member was formally deprecated in 2.0.0-internal.2.0.0. This member is now removed.
+
+-   Remove closeAndGetPendingLocalState from IContainer [8abce8cdb4](https://github.com/microsoft/FluidFramework/commits/8abce8cdb4e2832fb6405fb44e393bef03d5648a)
+
+    This change removes the deprecated and experimental method closeAndGetPendingLocalState from IContainer. It continues to
+    exist on IContainerExperimental.
+
+    IContainerExperimental is an interface that is easily casted to, which enables partners to access experimental features for testing and evaluation.
+    Moving the experimental method off IContainer will reduce exposure and churn on that production interface as we iterate
+    on and finalize our experimental features.
+
+    Experimental features should not be used in production environments.
+
+-   Loader container caching off by default [8abce8cdb4](https://github.com/microsoft/FluidFramework/commits/8abce8cdb4e2832fb6405fb44e393bef03d5648a)
+
+    Loader container caching will now be off by default and the ability to control it is deprecated. Loader caching is deprecated and will be removed in a future release, as well as all caching functionality of containers. Please try not to rely on caching and inform us if you cannot do so.
+
+    If you run into trouble with this behavior, please report it ASAP to the FluidFramework team and use the following options (available in this release only) to unblock you:
+
+    -   set `ILoaderProps.options.cache` to `true` when constructing a `Loader` object (see the `ILoaderOptions` interface)
+    -   set `[LoaderHeader.cache]` header to `true` when requesting a container
+
+-   getPendingLocalState and closeAndGetPendingLocalState are now async [8abce8cdb4](https://github.com/microsoft/FluidFramework/commits/8abce8cdb4e2832fb6405fb44e393bef03d5648a)
+
+    getPendingLocalState and closeAndGetPendingLocalState are now async to allow uploading blobs to attach to a DDS (in closing scenario). There is a new parameter in those methods at the container/runtime layer "notifyImminentClosure" which is true only when closing and ensures uploading blobs fast resolve and get attached. Once we apply stashed ops to new container, blob will try to reupload and we will know where to place its references.
+
+-   Upgraded typescript transpilation target to ES2020 [8abce8cdb4](https://github.com/microsoft/FluidFramework/commits/8abce8cdb4e2832fb6405fb44e393bef03d5648a)
+
+    Upgraded typescript transpilation target to ES2020. This is done in order to decrease the bundle sizes of Fluid Framework packages. This has provided size improvements across the board for ex. Loader, Driver, Runtime etc. Reduced bundle sizes helps to load lesser code in apps and hence also helps to improve the perf.If any app wants to target any older versions of browsers with which this target version is not compatible, then they can use packages like babel to transpile to a older target.
+
+-   `Loader.resolve()` throws if `LoaderHeader.sequenceNumber` and `IContainerLoadMode.opsBeforeReturn` do not match [8abce8cdb4](https://github.com/microsoft/FluidFramework/commits/8abce8cdb4e2832fb6405fb44e393bef03d5648a)
+
+    Calling `Loader.resolve()` will now throw an error if `LoaderHeader.sequenceNumber` is defined but `IContainerLoadMode.opsBeforeReturn` is not set to "sequenceNumber". Vice versa, `Loader.resolve()` will also throw an error if `IContainerLoadMode.opsBeforeReturn` is set to "sequenceNumber" but `LoaderHeader.sequenceNumber` is not defined.
+
+-   IDeltaManager members disposed and dispose() removed [8abce8cdb4](https://github.com/microsoft/FluidFramework/commits/8abce8cdb4e2832fb6405fb44e393bef03d5648a)
+
+    IDeltaManager members disposed and dispose() were deprecated in 2.0.0-internal.5.3.0 and have now been removed.
+
+-   Request APIs deprecated on ILoader [8abce8cdb4](https://github.com/microsoft/FluidFramework/commits/8abce8cdb4e2832fb6405fb44e393bef03d5648a)
+
+    The `request` API (associated with the `IFluidRouter` interface) has been deprecated on `ILoader` and `Loader`.
+    Please migrate all usage to using the `IContainer.request(...)` method if using a dynamic request URL, or to the `IContainer.getEntryPoint()` method if trying to obtain the application-specified root object.
+
+    **Note:** The `IContainer.request(...)` method will be deprecated in an upcoming release, so do not rely on this method for a long-term solution (the APIs around `entryPoint` and `getEntryPoint()` will become required and available for usage in its place).
+
+    After calling `ILoader.resolve(...)`, call the `request(...)` method on the returned `IContainer` with a corresponding request URL. For converting a request URL from `Loader` to `Container`, use the `IUrlResolver` passed into the `Loader`'s constructor.
+    The following is an example of what this change may look like:
+
+    ```
+    // OLD
+    const request: IRequest;
+    const urlResolver = new YourUrlResolver();
+    const loader = new Loader({ urlResolver, ... });
+
+    await loader.resolve(request);
+    const response = loader.request(request);
+    ```
+
+    ```
+    // NEW
+    const request: IRequest;
+    const urlResolver = new YourUrlResolver();
+    const loader = new Loader({ urlResolver, ... });
+
+    const container = await loader.resolve(request);
+    const resolvedUrl: IRequest = urlResolver.resolve(request);
+
+    // Parse the `resolvedUrl.url` property as necessary before passing to `container.request(...)`
+    // For an example, see the `Loader.resolveCore(...)` method
+    const parsedResolvedUrl = // implement parse logic here
+    const response = container.request(parsedResolvedUrl);
+    ```
+
+    Status on removal of the request pattern is tracked in [Removing-IFluidRouter.md](https://github.com/microsoft/FluidFramework/blob/main/packages/common/core-interfaces/Removing-IFluidRouter.md)
+
 ## 2.0.0-internal.5.4.0
 
 Dependency updates only.

package/dist/connectionManager.d.ts

@@ -3,11 +3,11 @@
  * Licensed under the MIT License.
  */
 import { ITelemetryProperties } from "@fluidframework/core-interfaces";
-import { IDeltaQueue, ReadOnlyInfo, ICriticalContainerError } from "@fluidframework/container-definitions";
+import { ICriticalContainerError, IDeltaQueue, ReadOnlyInfo } from "@fluidframework/container-definitions";
 import { IDocumentService } from "@fluidframework/driver-definitions";
 import { ConnectionMode, IClient, IClientConfiguration, IClientDetails, IDocumentMessage, ISequencedDocumentMessage } from "@fluidframework/protocol-definitions";
 import { ITelemetryLoggerExt } from "@fluidframework/telemetry-utils";
-import { ReconnectMode, IConnectionManager, IConnectionManagerFactoryArgs } from "./contracts";
+import { ReconnectMode, IConnectionManager, IConnectionManagerFactoryArgs, IConnectionStateChangeReason } from "./contracts";
 /**
  * Implementation of IConnectionManager, used by Container class
  * Implements constant connectivity to relay service, by reconnecting in case of lost connection or error.
@@ -91,7 +91,7 @@ export declare class ConnectionManager implements IConnectionManager {
      * Enables or disables automatic reconnecting.
      * Will throw an error if reconnectMode set to Never.
      */
-    setAutoReconnect(mode: ReconnectMode): void;
+    setAutoReconnect(mode: ReconnectMode, reason: IConnectionStateChangeReason): void;
     /**
      * Sends signal to runtime (and data stores) to be read-only.
      * Hosts may have read only views, indicating to data stores that no edits are allowed.
@@ -111,7 +111,7 @@ export declare class ConnectionManager implements IConnectionManager {
      */
     forceReadonly(readonly: boolean): void;
     private set_readonlyPermissions;
-    connect(reason: string, connectionMode?: ConnectionMode): void;
+    connect(reason: IConnectionStateChangeReason, connectionMode?: ConnectionMode): void;
     private connectCore;
     /**
      * Start the connection. Any error should result in container being closed.

package/dist/connectionManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"connectionManager.d.ts","sourceRoot":"","sources":["../src/connectionManager.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAe,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AAEpF,OAAO,EACN,WAAW,EACX,YAAY,EAEZ,uBAAuB,EACvB,MAAM,uCAAuC,CAAC;AAE/C,OAAO,EAEN,gBAAgB,EAGhB,MAAM,oCAAoC,CAAC;AAU5C,OAAO,EACN,cAAc,EACd,OAAO,EACP,oBAAoB,EACpB,cAAc,EACd,gBAAgB,EAGhB,yBAAyB,EAOzB,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EAAE,mBAAmB,EAA8B,MAAM,iCAAiC,CAAC;AAClG,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,6BAA6B,EAAE,MAAM,aAAa,CAAC;AAwH/F;;;;GAIG;AACH,qBAAa,iBAAkB,YAAW,kBAAkB;IAoL1D,OAAO,CAAC,QAAQ,CAAC,eAAe;aAChB,cAAc,EAAE,MAAM,OAAO;IAC7C,OAAO,CAAC,MAAM;IAEd,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,KAAK;IAxLvB,qEAAqE;IACrE,OAAO,CAAC,QAAQ,CAAC,uBAAuB,CAAiB;IAEzD;;;;OAIG;IACH,OAAO,CAAC,iBAAiB,CAAiC;IAC1D,OAAO,CAAC,UAAU,CAAuC;IAEzD,kEAAkE;IAClE,OAAO,CAAC,oBAAoB,CAAsB;IAElD,4CAA4C;IAC5C,OAAO,CAAC,cAAc,CAAS;IAE/B;;OAEG;IACH,OAAO,CAAC,cAAc,CAAgB;IAEtC,2EAA2E;IAC3E,OAAO,CAAC,gBAAgB,CAAS;IAEjC,OAAO,CAAC,oBAAoB,CAAK;IACjC,OAAO,CAAC,4BAA4B,CAAK;IACzC,sFAAsF;IACtF,OAAO,CAAC,gBAAgB,CAAK;IAE7B,yDAAyD;IACzD,OAAO,CAAC,qBAAqB,CAAqB;IAElD,OAAO,CAAC,sBAAsB,CAAQ;IAEtC,OAAO,CAAC,uBAAuB,CAAuC;IAEtE,OAAO,CAAC,gBAAgB,CAA4B;IAEpD,OAAO,CAAC,SAAS,CAAS;IAE1B,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAiC;IAE3D,IAAW,sBAAsB,oCAEhC;IAED,SAAgB,aAAa,EAAE,cAAc,CAAC;IAE9C;;OAEG;IACH,IAAW,cAAc,IAAI,cAAc,CAE1C;IAED,IAAW,SAAS,YAEnB;IAED,IAAW,QAAQ,uBAElB;IACD;;;OAGG;IACH,IAAW,aAAa,IAAI,aAAa,CAExC;IAED,IAAW,cAAc,IAAI,MAAM,CAElC;IAED,IAAW,OAAO,IAAI,MAAM,CAK3B;IAED,IAAW,oBAAoB,IAAI,oBAAoB,GAAG,SAAS,CAElE;IAED,IAAW,MAAM,IAAI,MAAM,EAAE,GAAG,SAAS,CAExC;IAED,IAAW,QAAQ,IAAI,WAAW,CAAC,gBAAgB,EAAE,CAAC,CAErD;IAED;;;OAGG;IACH,IAAW,eAAe,IAAI,oBAAoB,CAQjD;IAEM,eAAe,IAAI,OAAO;IAmBjC;;;;;;;;OAQG;IACH,OAAO,KAAK,QAAQ,GAEnB;IAED,IAAW,YAAY,IAAI,YAAY,CAkBtC;IAED,OAAO,CAAC,MAAM,CAAC,qBAAqB;gBAmBlB,eAAe,EAAE,MAAM,gBAAgB,GAAG,SAAS,EACpD,cAAc,EAAE,MAAM,OAAO,EACrC,MAAM,EAAE,OAAO,EACvB,gBAAgB,EAAE,OAAO,EACR,MAAM,EAAE,mBAAmB,EAC3B,KAAK,EAAE,6BAA6B;IAoB/C,OAAO,CAAC,KAAK,CAAC,EAAE,uBAAuB,EAAE,gBAAgB,GAAE,OAAc;IAwBhF;;;OAGG;IACI,gBAAgB,CAAC,IAAI,EAAE,aAAa,GAAG,IAAI;IAclD;;;;;;;;;;;;;;;;OAgBG;IACI,aAAa,CAAC,QAAQ,EAAE,OAAO;IAoCtC,OAAO,CAAC,uBAAuB;IAQxB,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,cAAc,CAAC,EAAE,cAAc;YAOhD,WAAW;IA2KzB;;;;OAIG;IACH,OAAO,CAAC,cAAc;IActB;;;;;OAKG;IACH,OAAO,CAAC,yBAAyB;IAwCjC;;OAEG;IACH,OAAO,CAAC,gBAAgB;IAWxB;;;;OAIG;IACH,OAAO,CAAC,4BAA4B;IA+IpC;;;;;;OAMG;IACH,OAAO,CAAC,gBAAgB;IAIxB;;;;;;OAMG;YACW,SAAS;IA2DhB,oBAAoB,CAC1B,OAAO,EAAE,IAAI,CAAC,gBAAgB,EAAE,sBAAsB,CAAC,GACrD,gBAAgB,GAAG,SAAS;IAuCxB,YAAY,CAAC,OAAO,EAAE,GAAG;IAQzB,YAAY,CAAC,QAAQ,EAAE,gBAAgB,EAAE;IA+BzC,0BAA0B,CAAC,OAAO,EAAE,yBAAyB;IAgDpE,OAAO,CAAC,QAAQ,CAAC,SAAS,CAGxB;IAGF,OAAO,CAAC,QAAQ,CAAC,WAAW,CAkB1B;IAGF,OAAO,CAAC,QAAQ,CAAC,yBAAyB,CAIxC;IAEF,OAAO,CAAC,QAAQ,CAAC,YAAY,CAE3B;CACF"}
+{"version":3,"file":"connectionManager.d.ts","sourceRoot":"","sources":["../src/connectionManager.ts"],"names":[],"mappings":"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"}

package/dist/connectionManager.js

@@ -84,9 +84,8 @@ function isNoDeltaStreamConnection(connection) {
     return connection instanceof NoDeltaStream;
 }
 const waitForOnline = async () => {
-    var _a;
     // Only wait if we have a strong signal that we're offline - otherwise assume we're online.
-    if (((_a = globalThis.navigator) === null || _a === void 0 ? void 0 : _a.onLine) === false && globalThis.addEventListener !== undefined) {
+    if (globalThis.navigator?.onLine === false && globalThis.addEventListener !== undefined) {
         return new Promise((resolve) => {
             const resolveAndRemoveListener = () => {
                 resolve();
@@ -170,15 +169,13 @@ class ConnectionManager {
      * The current connection mode, initially read.
      */
     get connectionMode() {
-        var _a, _b;
-        return (_b = (_a = this.connection) === null || _a === void 0 ? void 0 : _a.mode) !== null && _b !== void 0 ? _b : "read";
+        return this.connection?.mode ?? "read";
     }
     get connected() {
         return this.connection !== undefined;
     }
     get clientId() {
-        var _a;
-        return (_a = this.connection) === null || _a === void 0 ? void 0 : _a.clientId;
+        return this.connection?.clientId;
     }
     /**
      * Automatic reconnecting enabled or disabled.
@@ -188,8 +185,7 @@ class ConnectionManager {
         return this._reconnectMode;
     }
     get maxMessageSize() {
-        var _a, _b, _c;
-        return (_c = (_b = (_a = this.connection) === null || _a === void 0 ? void 0 : _a.serviceConfiguration) === null || _b === void 0 ? void 0 : _b.maxMessageSize) !== null && _c !== void 0 ? _c : DefaultChunkSize;
+        return this.connection?.serviceConfiguration?.maxMessageSize ?? DefaultChunkSize;
     }
     get version() {
         if (this.connection === undefined) {
@@ -198,12 +194,10 @@ class ConnectionManager {
         return this.connection.version;
     }
     get serviceConfiguration() {
-        var _a;
-        return (_a = this.connection) === null || _a === void 0 ? void 0 : _a.serviceConfiguration;
+        return this.connection?.serviceConfiguration;
     }
     get scopes() {
-        var _a;
-        return (_a = this.connection) === null || _a === void 0 ? void 0 : _a.claims.scopes;
+        return this.connection?.claims.scopes;
     }
     get outbound() {
         return this._outbound;
@@ -215,9 +209,11 @@ class ConnectionManager {
     get connectionProps() {
         return this.connection !== undefined
             ? this._connectionProps
-            : Object.assign(Object.assign({}, this._connectionProps), { 
+            : {
+                ...this._connectionProps,
                 // Report how many ops this client sent in last disconnected session
-                sentOps: this.clientSequenceNumber });
+                sentOps: this.clientSequenceNumber,
+            };
     }
     shouldJoinWrite() {
         // We don't have to wait for ack for topmost NoOps. So subtract those.
@@ -287,7 +283,10 @@ class ConnectionManager {
         // Ensure that things like triggerConnect() will short circuit
         this._reconnectMode = contracts_1.ReconnectMode.Never;
         this._outbound.clear();
-        const disconnectReason = "Closing DeltaManager";
+        const disconnectReason = {
+            text: "Closing DeltaManager",
+            error,
+        };
         // This raises "disconnect" event if we have active connection.
         this.disconnectFromDeltaStream(disconnectReason);
         if (switchToReadonly) {
@@ -301,12 +300,12 @@ class ConnectionManager {
      * Enables or disables automatic reconnecting.
      * Will throw an error if reconnectMode set to Never.
      */
-    setAutoReconnect(mode) {
+    setAutoReconnect(mode, reason) {
         (0, common_utils_1.assert)(mode !== contracts_1.ReconnectMode.Never && this._reconnectMode !== contracts_1.ReconnectMode.Never, 0x278 /* "API is not supported for non-connecting or closed container" */);
         this._reconnectMode = mode;
         if (mode !== contracts_1.ReconnectMode.Enabled) {
             // immediately disconnect - do not rely on service eventually dropping connection.
-            this.disconnectFromDeltaStream("setAutoReconnect");
+            this.disconnectFromDeltaStream(reason);
         }
     }
     /**
@@ -349,12 +348,12 @@ class ConnectionManager {
                     // host logic error.
                     this.logger.sendErrorEvent({ eventName: "ForceReadonlyPendingChanged" });
                 }
-                reconnect = this.disconnectFromDeltaStream("Force readonly");
+                reconnect = this.disconnectFromDeltaStream({ text: "Force readonly" });
             }
             this.props.readonlyChangeHandler(this.readonly);
             if (reconnect) {
                 // reconnect if we disconnected from before.
-                this.triggerConnect("Force Readonly", "read");
+                this.triggerConnect({ text: "Force Readonly" }, "read");
             }
         }
     }
@@ -366,13 +365,12 @@ class ConnectionManager {
         }
     }
     connect(reason, connectionMode) {
-        this.connectCore(reason, connectionMode).catch((error) => {
-            const normalizedError = (0, telemetry_utils_1.normalizeError)(error, { props: fatalConnectErrorProp });
+        this.connectCore(reason, connectionMode).catch((e) => {
+            const normalizedError = (0, telemetry_utils_1.normalizeError)(e, { props: fatalConnectErrorProp });
             this.props.closeHandler(normalizedError);
         });
     }
     async connectCore(reason, connectionMode) {
-        var _a, _b, _c;
         (0, common_utils_1.assert)(!this._disposed, 0x26a /* "not closed" */);
         if (this.connection !== undefined) {
             return; // Connection attempt already completed successfully
@@ -384,7 +382,7 @@ class ConnectionManager {
             (0, common_utils_1.assert)(this.pendingConnection === undefined, 0x344 /* this.pendingConnection should be undefined */);
         }
         // If there is no specified ConnectionMode, try the previous mode, if there is no previous mode use default
-        let requestedMode = (_a = connectionMode !== null && connectionMode !== void 0 ? connectionMode : pendingConnectionMode) !== null && _a !== void 0 ? _a : this.defaultReconnectionMode;
+        let requestedMode = connectionMode ?? pendingConnectionMode ?? this.defaultReconnectionMode;
         // if we have any non-acked ops from last connection, reconnect as "write".
         // without that we would connect in view-only mode, which will result in immediate
         // firing of "connected" event from Container and switch of current clientId (as tracked
@@ -396,7 +394,7 @@ class ConnectionManager {
         const docService = this.serviceProvider();
         (0, common_utils_1.assert)(docService !== undefined, 0x2a7 /* "Container is not attached" */);
         let connection;
-        if (((_b = docService.policies) === null || _b === void 0 ? void 0 : _b.storageOnly) === true) {
+        if (docService.policies?.storageOnly === true) {
             connection = new NoDeltaStream();
             this.setupNewSuccessfulConnection(connection, "read", reason);
             (0, common_utils_1.assert)(this.pendingConnection === undefined, 0x2b3 /* "logic error" */);
@@ -432,7 +430,10 @@ class ConnectionManager {
             connectRepeatCount++;
             try {
                 this.client.mode = requestedMode;
-                connection = await docService.connectToDeltaStream(Object.assign(Object.assign({}, this.client), { mode: requestedMode }));
+                connection = await docService.connectToDeltaStream({
+                    ...this.client,
+                    mode: requestedMode,
+                });
                 if (connection.disposed) {
                     // Nobody observed this connection, so drop it on the floor and retry.
                     this.logger.sendTelemetryEvent({ eventName: "ReceivedClosedConnection" });
@@ -468,7 +469,7 @@ class ConnectionManager {
                         setTimeout(resolve, retryDelayFromError);
                     });
                 }
-                else if (((_c = globalThis.navigator) === null || _c === void 0 ? void 0 : _c.onLine) !== false) {
+                else if (globalThis.navigator?.onLine !== false) {
                     // If the error didn't tell us to wait, let's still wait a little bit before retrying.
                     // We skip this delay if we're confident we're offline, because we probably just need to wait to come back online.
                     await new Promise((resolve) => {
@@ -534,7 +535,7 @@ class ConnectionManager {
      * @param error - Error causing the disconnect if any.
      * @returns A boolean that indicates if there was an existing connection (or pending connection) to disconnect
      */
-    disconnectFromDeltaStream(reason, error) {
+    disconnectFromDeltaStream(reason) {
         this.pendingReconnect = false;
         if (this.connection === undefined) {
             if (this.pendingConnection !== undefined) {
@@ -558,7 +559,7 @@ class ConnectionManager {
         this._outbound.pause();
         this._outbound.clear();
         connection.dispose();
-        this.props.disconnectHandler(reason, error);
+        this.props.disconnectHandler(reason);
         this._connectionVerboseProps = {};
         return true;
     }
@@ -570,7 +571,10 @@ class ConnectionManager {
         this.pendingConnection.abort();
         this.pendingConnection = undefined;
         this.logger.sendTelemetryEvent({ eventName: "ConnectionCancelReceived" });
-        this.props.cancelConnectionHandler(`Cancel Pending Connection due to ${reason}`);
+        this.props.cancelConnectionHandler({
+            text: `Cancel Pending Connection due to ${reason.text}`,
+            error: reason.error,
+        });
     }
     /**
      * Once we've successfully gotten a connection, we need to set up state, attach event listeners, and process
@@ -578,7 +582,6 @@ class ConnectionManager {
      * @param connection - The newly established connection
      */
     setupNewSuccessfulConnection(connection, requestedMode, reason) {
-        var _a;
         // Old connection should have been cleaned up before establishing a new one
         (0, common_utils_1.assert)(this.connection === undefined, 0x0e6 /* "old connection exists on new connection setup" */);
         (0, common_utils_1.assert)(!connection.disposed, 0x28a /* "can't be disposed - Callers need to ensure that!" */);
@@ -602,7 +605,7 @@ class ConnectionManager {
         this.set_readonlyPermissions(readonly);
         if (this._disposed) {
             // Raise proper events, Log telemetry event and close connection.
-            this.disconnectFromDeltaStream("ConnectionManager already closed");
+            this.disconnectFromDeltaStream({ text: "ConnectionManager already closed" });
             return;
         }
         this._outbound.resume();
@@ -659,7 +662,7 @@ class ConnectionManager {
             }),
         };
         this.props.signalHandler(clearSignal);
-        for (const priorClient of (_a = connection.initialClients) !== null && _a !== void 0 ? _a : []) {
+        for (const priorClient of connection.initialClients ?? []) {
             const joinSignal = {
                 clientId: null,
                 content: JSON.stringify({
@@ -687,7 +690,7 @@ class ConnectionManager {
      * @returns A promise that resolves when the connection is reestablished or we stop trying
      */
     reconnectOnError(requestedMode, error) {
-        this.reconnect(requestedMode, error.message, error).catch(this.props.closeHandler);
+        this.reconnect(requestedMode, { text: error.message, error }).catch(this.props.closeHandler);
     }
     /**
      * Disconnect the current connection and reconnect.
@@ -696,20 +699,20 @@ class ConnectionManager {
      * @param error - Error reconnect information including whether or not to reconnect
      * @returns A promise that resolves when the connection is reestablished or we stop trying
      */
-    async reconnect(requestedMode, disconnectMessage, error) {
+    async reconnect(requestedMode, reason) {
         // We quite often get protocol errors before / after observing nack/disconnect
         // we do not want to run through same sequence twice.
         // If we're already disconnected/disconnecting it's not appropriate to call this again.
         (0, common_utils_1.assert)(this.connection !== undefined, 0x0eb /* "Missing connection for reconnect" */);
-        this.disconnectFromDeltaStream(disconnectMessage, error);
+        this.disconnectFromDeltaStream(reason);
         // We will always trigger reconnect, even if canRetry is false.
         // Any truly fatal error state will result in container close upon attempted reconnect,
         // which is a preferable to closing abruptly when a live connection fails.
-        if (error !== undefined && !error.canRetry) {
+        if (reason.error?.canRetry === false) {
             this.logger.sendTelemetryEvent({
                 eventName: "reconnectingDespiteFatalError",
                 reconnectMode: this.reconnectMode,
-            }, error);
+            }, reason.error);
         }
         if (this.reconnectMode === contracts_1.ReconnectMode.Never) {
             // Do not raise container error if we are closing just because we lost connection.
@@ -722,9 +725,9 @@ class ConnectionManager {
             return;
         }
         // If the error tells us to wait before retrying, then do so.
-        const delayMs = (0, driver_utils_1.getRetryDelayFromError)(error);
-        if (error !== undefined && delayMs !== undefined) {
-            this.props.reconnectionDelayHandler(delayMs, error);
+        const delayMs = (0, driver_utils_1.getRetryDelayFromError)(reason.error);
+        if (reason.error !== undefined && delayMs !== undefined) {
+            this.props.reconnectionDelayHandler(delayMs, reason.error);
             await new Promise((resolve) => {
                 setTimeout(resolve, delayMs);
             });
@@ -733,12 +736,14 @@ class ConnectionManager {
         // NOTE: This isn't strictly true for drivers that don't require network (e.g. local driver).  Really this logic
         // should probably live in the driver.
         await waitForOnline();
-        this.triggerConnect(error !== undefined
-            ? "Reconnecting due to Error"
-            : `Reconnecting due to: ${disconnectMessage}`, requestedMode);
+        this.triggerConnect({
+            text: reason.error !== undefined
+                ? "Reconnecting due to Error"
+                : `Reconnecting due to: ${reason.text}`,
+            error: reason.error,
+        }, requestedMode);
     }
     prepareMessageToSend(message) {
-        var _a, _b;
         if (this.readonly === true) {
             (0, common_utils_1.assert)(this.readOnlyInfo.readonly === true, 0x1f0 /* "Unexpected mismatch in readonly" */);
             const error = new container_utils_1.GenericError("deltaManagerReadonlySubmit", undefined /* error */, {
@@ -755,8 +760,8 @@ class ConnectionManager {
         // we keep info about old connection as long as possible to be able to account for all non-acked ops
         // that we pick up on next connection.
         (0, common_utils_1.assert)(!!this.connection, 0x0e4 /* "Lost old connection!" */);
-        if (this.lastSubmittedClientId !== ((_a = this.connection) === null || _a === void 0 ? void 0 : _a.clientId)) {
-            this.lastSubmittedClientId = (_b = this.connection) === null || _b === void 0 ? void 0 : _b.clientId;
+        if (this.lastSubmittedClientId !== this.connection?.clientId) {
+            this.lastSubmittedClientId = this.connection?.clientId;
             this.clientSequenceNumber = 0;
             this.clientSequenceNumberObserved = 0;
         }
@@ -766,7 +771,10 @@ class ConnectionManager {
         else {
             this.localOpsToIgnore = 0;
         }
-        return Object.assign(Object.assign({}, message), { clientSequenceNumber: ++this.clientSequenceNumber });
+        return {
+            ...message,
+            clientSequenceNumber: ++this.clientSequenceNumber,
+        };
     }
     submitSignal(content) {
         if (this.connection !== undefined) {
@@ -792,7 +800,7 @@ class ConnectionManager {
                     if (this.pendingReconnect) {
                         // still valid?
                         await this.reconnect("write", // connectionMode
-                        "Switch to write");
+                        { text: "Switch to write" });
                     }
                 })
                     .catch(() => { });
@@ -825,7 +833,7 @@ class ConnectionManager {
                 // Clients need to be able to transition to "read" state after some time of inactivity!
                 // Note - this may close container!
                 this.reconnect("read", // connectionMode
-                "Switch to read").catch((error) => {
+                { text: "Switch to read" }).catch((error) => {
                     this.logger.sendErrorEvent({ eventName: "SwitchToReadConnection" }, error);
                 });
             }