@fluidframework/container-loader 2.0.0-internal.1.2.0.93071 → 2.0.0-internal.1.2.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluidframework/container-loader",
-  "version": "2.0.0-internal.1.2.0.93071",
+  "version": "2.0.0-internal.1.2.2",
   "description": "Fluid container loader",
   "homepage": "https://fluidframework.com",
   "repository": {
@@ -63,14 +63,14 @@
   "dependencies": {
     "@fluidframework/common-definitions": "^0.20.1",
     "@fluidframework/common-utils": "^1.0.0",
-    "@fluidframework/container-definitions": "2.0.0-internal.1.2.0.93071",
-    "@fluidframework/container-utils": "2.0.0-internal.1.2.0.93071",
-    "@fluidframework/core-interfaces": "2.0.0-internal.1.2.0.93071",
-    "@fluidframework/driver-definitions": "2.0.0-internal.1.2.0.93071",
-    "@fluidframework/driver-utils": "2.0.0-internal.1.2.0.93071",
-    "@fluidframework/protocol-base": "^0.1037.2000-91174",
+    "@fluidframework/container-definitions": "^2.0.0-internal.1.2.2",
+    "@fluidframework/container-utils": "^2.0.0-internal.1.2.2",
+    "@fluidframework/core-interfaces": "^2.0.0-internal.1.2.2",
+    "@fluidframework/driver-definitions": "^2.0.0-internal.1.2.2",
+    "@fluidframework/driver-utils": "^2.0.0-internal.1.2.2",
+    "@fluidframework/protocol-base": "^0.1037.2001",
     "@fluidframework/protocol-definitions": "^1.0.0",
-    "@fluidframework/telemetry-utils": "2.0.0-internal.1.2.0.93071",
+    "@fluidframework/telemetry-utils": "^2.0.0-internal.1.2.2",
     "abort-controller": "^3.0.0",
     "double-ended-queue": "^2.1.0-0",
     "lodash": "^4.17.21",
@@ -81,9 +81,9 @@
     "@fluidframework/build-common": "^1.0.0",
     "@fluidframework/build-tools": "^0.4.4000",
     "@fluidframework/container-loader-previous": "npm:@fluidframework/container-loader@^1.0.0",
-    "@fluidframework/eslint-config-fluid": "^0.28.2000",
-    "@fluidframework/mocha-test-setup": "2.0.0-internal.1.2.0.93071",
-    "@fluidframework/test-loader-utils": "2.0.0-internal.1.2.0.93071",
+    "@fluidframework/eslint-config-fluid": "^1.0.0",
+    "@fluidframework/mocha-test-setup": "^2.0.0-internal.1.2.2",
+    "@fluidframework/test-loader-utils": "^2.0.0-internal.1.2.2",
     "@microsoft/api-extractor": "^7.22.2",
     "@rushstack/eslint-config": "^2.5.1",
     "@types/double-ended-queue": "^2.1.0",

package/src/catchUpMonitor.ts

@@ -3,34 +3,29 @@
  * Licensed under the MIT License.
  */
 
-import { IDisposable, IEvent } from "@fluidframework/common-definitions";
-import { assert, TypedEventEmitter } from "@fluidframework/common-utils";
+import { IDisposable } from "@fluidframework/common-definitions";
+import { assert } from "@fluidframework/common-utils";
 import { IDeltaManager } from "@fluidframework/container-definitions";
 import { ISequencedDocumentMessage } from "@fluidframework/protocol-definitions";
 
-/** @see ICatchUpMonitor for usage */
+/** @see CatchUpMonitor for usage */
 type CaughtUpListener = () => void;
 
-/** @see ICatchUpMonitor for usage */
-export interface ICatchUpMonitorEvents extends IEvent {
-    (event: "caughtUp", listener: CaughtUpListener): void;
-}
-
 /** Monitor that emits an event when a Container has caught up to a given point in the op stream */
-export interface ICatchUpMonitor extends TypedEventEmitter<ICatchUpMonitorEvents>, IDisposable { }
+export type ICatchUpMonitor = IDisposable;
 
 /**
  * Monitors a Container's DeltaManager, notifying listeners when all ops have been processed
  * that were known at the time the monitor was created.
  */
-export class CatchUpMonitor extends TypedEventEmitter<ICatchUpMonitorEvents> implements ICatchUpMonitor {
+export class CatchUpMonitor implements ICatchUpMonitor {
     private readonly targetSeqNumber: number;
     private caughtUp: boolean = false;
 
     private readonly opHandler = (message: Pick<ISequencedDocumentMessage, "sequenceNumber">) => {
         if (!this.caughtUp && message.sequenceNumber >= this.targetSeqNumber) {
             this.caughtUp = true;
-            this.emit("caughtUp");
+            this.listener();
         }
     };
 
@@ -39,9 +34,8 @@ export class CatchUpMonitor extends TypedEventEmitter<ICatchUpMonitorEvents> imp
      */
     constructor(
         private readonly deltaManager: IDeltaManager<any, any>,
+        private readonly listener: CaughtUpListener,
     ) {
-        super();
-
         this.targetSeqNumber = this.deltaManager.lastKnownSeqNumber;
 
         assert(this.targetSeqNumber >= this.deltaManager.lastSequenceNumber,
@@ -51,16 +45,6 @@ export class CatchUpMonitor extends TypedEventEmitter<ICatchUpMonitorEvents> imp
 
         // Simulate the last processed op to set caughtUp in case we already are
         this.opHandler({ sequenceNumber: this.deltaManager.lastSequenceNumber });
-
-        // If a listener is added after we are already caught up, notify that new listener immediately
-        this.on("newListener", (event: string, listener) => {
-            if (event === "caughtUp") {
-                const caughtUpListener = listener as CaughtUpListener;
-                if (this.caughtUp) {
-                    caughtUpListener();
-                }
-            }
-        });
     }
 
     public disposed: boolean = false;
@@ -70,30 +54,6 @@ export class CatchUpMonitor extends TypedEventEmitter<ICatchUpMonitorEvents> imp
         }
         this.disposed = true;
 
-        this.removeAllListeners();
         this.deltaManager.off("op", this.opHandler);
     }
 }
-
-/** Monitor that always notifies listeners immediately */
-export class ImmediateCatchUpMonitor extends TypedEventEmitter<ICatchUpMonitorEvents> implements ICatchUpMonitor {
-    constructor() {
-        super();
-        this.on("newListener", (event: string, listener) => {
-            if (event === "caughtUp") {
-                const caughtUpListener = listener as CaughtUpListener;
-                caughtUpListener();
-            }
-        });
-    }
-
-    public disposed: boolean = false;
-    public dispose() {
-        if (this.disposed) {
-            return;
-        }
-        this.disposed = true;
-
-        this.removeAllListeners();
-    }
-}

package/src/connectionManager.ts

@@ -234,15 +234,13 @@ export class ConnectionManager implements IConnectionManager {
      * about current or last connection (if there is no connection at the moment)
     */
     public get connectionProps(): ITelemetryProperties {
-        if (this.connection !== undefined) {
-            return this._connectionProps;
-        } else {
-            return {
+        return this.connection !== undefined
+            ? this._connectionProps
+            : {
                 ...this._connectionProps,
                 // Report how many ops this client sent in last disconnected session
                 sentOps: this.clientSequenceNumber,
             };
-        }
     }
 
     public shouldJoinWrite(): boolean {