@fluidframework/container-loader 2.0.0-rc.1.0.3 → 2.0.0-rc.2.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluidframework/container-loader",
-  "version": "2.0.0-rc.1.0.3",
+  "version": "2.0.0-rc.2.0.0",
   "description": "Fluid container loader",
   "homepage": "https://fluidframework.com",
   "repository": {
@@ -11,11 +11,12 @@
   "license": "MIT",
   "author": "Microsoft and contributors",
   "sideEffects": false,
+  "type": "module",
   "exports": {
     ".": {
       "import": {
-        "types": "./lib/index.d.mts",
-        "default": "./lib/index.mjs"
+        "types": "./lib/index.d.ts",
+        "default": "./lib/index.js"
       },
       "require": {
         "types": "./dist/index.d.ts",
@@ -24,8 +25,8 @@
     },
     "./test/container": {
       "import": {
-        "types": "./lib/container.d.mts",
-        "default": "./lib/container.mjs"
+        "types": "./lib/container.d.ts",
+        "default": "./lib/container.js"
       },
       "require": {
         "types": "./dist/container.d.ts",
@@ -34,8 +35,8 @@
     },
     "./test/contracts": {
       "import": {
-        "types": "./lib/contracts.d.mts",
-        "default": "./lib/contracts.mjs"
+        "types": "./lib/contracts.d.ts",
+        "default": "./lib/contracts.js"
       },
       "require": {
         "types": "./dist/contracts.d.ts",
@@ -44,8 +45,8 @@
     },
     "./test/connectionManager": {
       "import": {
-        "types": "./lib/connectionManager.d.mts",
-        "default": "./lib/connectionManager.mjs"
+        "types": "./lib/connectionManager.d.ts",
+        "default": "./lib/connectionManager.js"
       },
       "require": {
         "types": "./dist/connectionManager.d.ts",
@@ -54,8 +55,8 @@
     },
     "./test/deltaManager": {
       "import": {
-        "types": "./lib/deltaManager.d.mts",
-        "default": "./lib/deltaManager.mjs"
+        "types": "./lib/deltaManager.d.ts",
+        "default": "./lib/deltaManager.js"
       },
       "require": {
         "types": "./dist/deltaManager.d.ts",
@@ -64,57 +65,46 @@
     },
     "./test/utils": {
       "import": {
-        "types": "./lib/utils.d.mts",
-        "default": "./lib/utils.mjs"
+        "types": "./lib/utils.d.ts",
+        "default": "./lib/utils.js"
       },
       "require": {
         "types": "./dist/utils.d.ts",
         "default": "./dist/utils.js"
       }
     },
-    "./alpha": {
+    "./public": {
       "import": {
-        "types": "./lib/container-loader-alpha.d.mts",
-        "default": "./lib/index.mjs"
+        "types": "./lib/container-loader-public.d.ts",
+        "default": "./lib/index.js"
       },
       "require": {
-        "types": "./dist/container-loader-alpha.d.ts",
+        "types": "./dist/container-loader-public.d.ts",
         "default": "./dist/index.js"
       }
     },
-    "./beta": {
+    "./alpha": {
       "import": {
-        "types": "./lib/container-loader-beta.d.mts",
-        "default": "./lib/index.mjs"
+        "types": "./lib/container-loader-alpha.d.ts",
+        "default": "./lib/index.js"
       },
       "require": {
-        "types": "./dist/container-loader-beta.d.ts",
+        "types": "./dist/container-loader-alpha.d.ts",
         "default": "./dist/index.js"
       }
     },
     "./internal": {
       "import": {
-        "types": "./lib/index.d.mts",
-        "default": "./lib/index.mjs"
+        "types": "./lib/index.d.ts",
+        "default": "./lib/index.js"
       },
       "require": {
         "types": "./dist/index.d.ts",
         "default": "./dist/index.js"
       }
-    },
-    "./public": {
-      "import": {
-        "types": "./lib/container-loader-public.d.mts",
-        "default": "./lib/index.mjs"
-      },
-      "require": {
-        "types": "./dist/container-loader-public.d.ts",
-        "default": "./dist/index.js"
-      }
     }
   },
   "main": "dist/index.js",
-  "module": "lib/index.mjs",
   "types": "dist/index.d.ts",
   "c8": {
     "all": true,
@@ -137,49 +127,48 @@
     "temp-directory": "nyc/.nyc_output"
   },
   "dependencies": {
-    "@fluid-internal/client-utils": ">=2.0.0-rc.1.0.3 <2.0.0-rc.1.1.0",
-    "@fluidframework/container-definitions": ">=2.0.0-rc.1.0.3 <2.0.0-rc.1.1.0",
-    "@fluidframework/core-interfaces": ">=2.0.0-rc.1.0.3 <2.0.0-rc.1.1.0",
-    "@fluidframework/core-utils": ">=2.0.0-rc.1.0.3 <2.0.0-rc.1.1.0",
-    "@fluidframework/driver-definitions": ">=2.0.0-rc.1.0.3 <2.0.0-rc.1.1.0",
-    "@fluidframework/driver-utils": ">=2.0.0-rc.1.0.3 <2.0.0-rc.1.1.0",
-    "@fluidframework/protocol-base": "^3.0.0",
-    "@fluidframework/protocol-definitions": "^3.1.0",
-    "@fluidframework/telemetry-utils": ">=2.0.0-rc.1.0.3 <2.0.0-rc.1.1.0",
+    "@fluid-internal/client-utils": ">=2.0.0-rc.2.0.0 <2.0.0-rc.2.1.0",
+    "@fluidframework/container-definitions": ">=2.0.0-rc.2.0.0 <2.0.0-rc.2.1.0",
+    "@fluidframework/core-interfaces": ">=2.0.0-rc.2.0.0 <2.0.0-rc.2.1.0",
+    "@fluidframework/core-utils": ">=2.0.0-rc.2.0.0 <2.0.0-rc.2.1.0",
+    "@fluidframework/driver-definitions": ">=2.0.0-rc.2.0.0 <2.0.0-rc.2.1.0",
+    "@fluidframework/driver-utils": ">=2.0.0-rc.2.0.0 <2.0.0-rc.2.1.0",
+    "@fluidframework/protocol-base": "^4.0.0",
+    "@fluidframework/protocol-definitions": "^3.2.0",
+    "@fluidframework/telemetry-utils": ">=2.0.0-rc.2.0.0 <2.0.0-rc.2.1.0",
+    "@ungap/structured-clone": "^1.2.0",
     "debug": "^4.3.4",
     "double-ended-queue": "^2.1.0-0",
-    "events": "^3.1.0",
-    "url": "^0.11.0",
     "uuid": "^9.0.0"
   },
   "devDependencies": {
     "@arethetypeswrong/cli": "^0.13.3",
-    "@fluid-private/test-loader-utils": ">=2.0.0-rc.1.0.3 <2.0.0-rc.1.1.0",
-    "@fluid-tools/build-cli": "^0.29.0",
+    "@fluid-internal/mocha-test-setup": ">=2.0.0-rc.2.0.0 <2.0.0-rc.2.1.0",
+    "@fluid-private/test-loader-utils": ">=2.0.0-rc.2.0.0 <2.0.0-rc.2.1.0",
+    "@fluid-tools/build-cli": "^0.34.0",
     "@fluidframework/build-common": "^2.0.3",
-    "@fluidframework/build-tools": "^0.29.0",
+    "@fluidframework/build-tools": "^0.34.0",
     "@fluidframework/container-loader-previous": "npm:@fluidframework/container-loader@2.0.0-internal.8.0.0",
-    "@fluidframework/eslint-config-fluid": "^3.2.0",
-    "@fluidframework/mocha-test-setup": ">=2.0.0-rc.1.0.3 <2.0.0-rc.1.1.0",
-    "@microsoft/api-extractor": "^7.38.3",
+    "@fluidframework/eslint-config-fluid": "^4.0.0",
+    "@microsoft/api-extractor": "^7.42.3",
     "@types/debug": "^4.1.5",
     "@types/double-ended-queue": "^2.1.0",
-    "@types/events": "^3.0.0",
     "@types/mocha": "^9.1.1",
     "@types/node": "^18.19.0",
-    "@types/sinon": "^7.0.13",
+    "@types/sinon": "^17.0.3",
+    "@types/ungap__structured-clone": "^1.2.0",
+    "@types/uuid": "^9.0.2",
     "c8": "^8.0.1",
     "copyfiles": "^2.4.1",
     "cross-env": "^7.0.3",
-    "eslint": "~8.50.0",
+    "eslint": "~8.55.0",
     "mocha": "^10.2.0",
     "mocha-json-output-reporter": "^2.0.1",
     "mocha-multi-reporters": "^1.5.1",
     "moment": "^2.21.0",
     "prettier": "~3.0.3",
     "rimraf": "^4.4.0",
-    "sinon": "^7.4.2",
-    "tsc-multi": "^1.1.0",
+    "sinon": "^17.0.1",
     "typescript": "~5.1.6"
   },
   "fluidBuild": {
@@ -195,19 +184,28 @@
     }
   },
   "typeValidation": {
-    "broken": {}
+    "broken": {
+      "InterfaceDeclaration_IContainerExperimental": {
+        "forwardCompat": false
+      },
+      "InterfaceDeclaration_IParsedUrl": {
+        "forwardCompat": false
+      }
+    }
   },
   "scripts": {
     "api": "fluid-build . --task api",
-    "api-extractor:commonjs": "api-extractor run --local",
-    "api-extractor:esnext": "api-extractor run --config ./api-extractor-esm.json",
+    "api-extractor:commonjs": "api-extractor run --config ./api-extractor-cjs.json",
+    "api-extractor:esnext": "api-extractor run --local",
     "build": "fluid-build . --task build",
     "build:commonjs": "fluid-build . --task commonjs",
     "build:compile": "fluid-build . --task compile",
     "build:docs": "fluid-build . --task api",
-    "build:esnext": "tsc-multi --config ../../../common/build/build-common/tsc-multi.esm.json",
+    "build:esnext": "tsc --project ./tsconfig.json",
     "build:genver": "gen-version",
-    "build:test": "tsc --project ./src/test/tsconfig.json",
+    "build:test": "npm run build:test:esm && npm run build:test:cjs",
+    "build:test:cjs": "fluid-tsc commonjs --project ./src/test/tsconfig.cjs.json",
+    "build:test:esm": "tsc --project ./src/test/tsconfig.json",
     "check:are-the-types-wrong": "attw --pack . --entrypoints .",
     "check:release-tags": "api-extractor run --local --config ./api-extractor-lint.json",
     "ci:build:docs": "api-extractor run",
@@ -221,9 +219,11 @@
     "prettier:fix": "prettier --write . --cache --ignore-path ../../../.prettierignore",
     "test": "npm run test:mocha",
     "test:coverage": "c8 npm test",
-    "test:mocha": "mocha --ignore \"dist/test/types/*\" --recursive dist/test -r node_modules/@fluidframework/mocha-test-setup",
+    "test:mocha": "npm run test:mocha:esm && echo skipping cjs to avoid overhead - npm run test:mocha:cjs",
+    "test:mocha:cjs": "mocha --recursive \"dist/test/**/*.spec.*js\" --exit",
+    "test:mocha:esm": "mocha --recursive \"lib/test/**/*.spec.*js\" --exit",
     "test:mocha:verbose": "cross-env FLUID_TEST_VERBOSE=1 npm run test:mocha",
-    "tsc": "tsc",
+    "tsc": "fluid-tsc commonjs --project ./tsconfig.cjs.json && copyfiles -f ../../../common/build/build-common/src/cjs/package.json ./dist",
     "tsc:watch": "tsc --watch",
     "typetests:gen": "fluid-type-test-generator",
     "typetests:prepare": "flub typetests --dir . --reset --previous --normalize"

package/src/attachment.ts

@@ -0,0 +1,222 @@
+/*!
+ * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
+ * Licensed under the MIT License.
+ */
+import { AttachState } from "@fluidframework/container-definitions";
+import { CombinedAppAndProtocolSummary } from "@fluidframework/driver-utils";
+import { ISnapshotTree, ISummaryTree } from "@fluidframework/protocol-definitions";
+import { assert } from "@fluidframework/core-utils";
+import { IDocumentStorageService } from "@fluidframework/driver-definitions";
+import { getSnapshotTreeAndBlobsFromSerializedContainer } from "./utils.js";
+import { ISerializableBlobContents } from "./containerStorageAdapter.js";
+import { IDetachedBlobStorage } from "./index.js";
+
+/**
+ * The default state a newly created detached container will have.
+ * All but the state are optional and undefined, they just exist
+ * to make the union easy to deal with for both Detached types
+ */
+export interface DetachedDefaultData {
+	readonly state: AttachState.Detached;
+	readonly blobs?: undefined;
+	readonly summary?: undefined;
+	readonly redirectTable?: undefined;
+}
+
+/**
+ * This always follows DetachedDefaultData when there are
+ * outstanding blobs in the detached blob storage.
+ * The redirect table will get filled up to include data
+ * about the blobs as they are uploaded.
+ */
+export interface DetachedDataWithOutstandingBlobs {
+	readonly state: AttachState.Detached;
+	readonly blobs: "outstanding";
+	readonly summary?: undefined;
+	readonly redirectTable: Map<string, string>;
+}
+
+/**
+ * This state always follows DetachedDataWithOutstandingBlobs.
+ * It signals that all outstanding blobs are done being uploaded,
+ * so the container can move to the attaching state.
+ */
+export interface AttachingDataWithBlobs {
+	readonly state: AttachState.Attaching;
+	readonly blobs: "done";
+	readonly summary: CombinedAppAndProtocolSummary;
+}
+
+/**
+ * This always follows DefaultDetachedState when there are
+ * no blobs in the detached blob storage. Because there are
+ * no blobs we can immediately get the summary and transition
+ * to the attaching state.
+ */
+export interface AttachingDataWithoutBlobs {
+	readonly state: AttachState.Attaching;
+	readonly summary: CombinedAppAndProtocolSummary;
+	readonly blobs: "none";
+}
+
+/**
+ * The final attachment state which signals the container is fully attached.
+ * The baseSnapshotAndBlobs will only be enabled when offline load is enabled.
+ */
+export interface AttachedData {
+	readonly state: AttachState.Attached;
+}
+
+/**
+ * A union of all the attachment data types for
+ * tracking across all container attachment states
+ */
+export type AttachmentData =
+	| DetachedDefaultData
+	| DetachedDataWithOutstandingBlobs
+	| AttachingDataWithoutBlobs
+	| AttachingDataWithBlobs
+	| AttachedData;
+
+/**
+ * The data and services necessary for runRetriableAttachProcess.
+ */
+export interface AttachProcessProps {
+	/**
+	 * The initial attachment data this call should start with
+	 */
+	readonly initialAttachmentData: Exclude<AttachmentData, AttachedData>;
+
+	/**
+	 * The caller should use this callback to keep track of the current
+	 * attachment data, and perform any other operations necessary
+	 * for dealing with attachment state changes, like emitting events
+	 *
+	 * @param attachmentData - the updated attachment data	 */
+	readonly setAttachmentData: (attachmentData: AttachmentData) => void;
+
+	/**
+	 * The caller should create and or get services based on the data, and its own information.
+	 * @param data - the data to create services from,
+	 * the summary property being the most relevant part of the data.
+	 * @returns A compatible storage service
+	 */
+	readonly createOrGetStorageService: (
+		data: ISummaryTree | undefined,
+	) => Promise<Pick<IDocumentStorageService, "createBlob" | "uploadSummaryWithContext">>;
+
+	/**
+	 * The detached blob storage if it exists.
+	 */
+	readonly detachedBlobStorage?: Pick<IDetachedBlobStorage, "getBlobIds" | "readBlob" | "size">;
+
+	/**
+	 * The caller should create the attachment summary for the container.
+	 * @param redirectTable - Maps local blob ids to remote blobs ids.
+	 * @returns The attachment summary for the container.
+	 */
+	readonly createAttachmentSummary: (
+		redirectTable?: Map<string, string>,
+	) => CombinedAppAndProtocolSummary;
+
+	/**
+	 * Whether offline load is enabled or not.
+	 */
+	readonly offlineLoadEnabled: boolean;
+}
+
+/**
+ * Executes the attach process state machine based on the provided data and services.
+ * This method is retriable on failure. Based on the provided initialAttachmentData
+ * this method will resume the attachment process and attempt to complete it.
+ *
+ * @param props - The data and services necessary to run the attachment process
+ */
+export const runRetriableAttachProcess = async (
+	props: AttachProcessProps,
+): Promise<{ tree: ISnapshotTree; blobs: ISerializableBlobContents } | undefined> => {
+	const {
+		detachedBlobStorage,
+		createOrGetStorageService,
+		setAttachmentData,
+		createAttachmentSummary,
+		offlineLoadEnabled,
+	} = props;
+	let currentData: AttachmentData = props.initialAttachmentData;
+
+	if (currentData.blobs === undefined) {
+		// If attachment blobs were uploaded in detached state we will go through a different attach flow
+		const outstandingAttachmentBlobs =
+			detachedBlobStorage !== undefined && detachedBlobStorage.size > 0;
+		// Determine the next phase of attaching which depends on if there are attachment blobs
+		// if there are, we will stay detached, so an empty file can be created, and the blobs
+		// uploaded, otherwise we will get the summary to create the file with and move to attaching
+		currentData = outstandingAttachmentBlobs
+			? {
+					state: AttachState.Detached,
+					blobs: "outstanding",
+					redirectTable: new Map<string, string>(),
+			  }
+			: {
+					state: AttachState.Attaching,
+					summary: props.createAttachmentSummary(),
+					blobs: "none",
+			  };
+		setAttachmentData(currentData);
+	}
+
+	// this has to run here, as it is what creates the file
+	// and we need to file for all possible cases after this point
+	const storage = await createOrGetStorageService(currentData.summary);
+
+	if (currentData.blobs === "outstanding") {
+		const { redirectTable } = currentData;
+		// upload blobs to storage
+		assert(!!detachedBlobStorage, 0x24e /* "assertion for type narrowing" */);
+
+		// build a table mapping IDs assigned locally to IDs assigned by storage and pass it to runtime to
+		// support blob handles that only know about the local IDs
+		while (redirectTable.size < detachedBlobStorage.size) {
+			const newIds = detachedBlobStorage.getBlobIds().filter((id) => !redirectTable.has(id));
+			for (const id of newIds) {
+				const blob = await detachedBlobStorage.readBlob(id);
+				const response = await storage.createBlob(blob);
+				redirectTable.set(id, response.id);
+			}
+		}
+		setAttachmentData(
+			(currentData = {
+				state: AttachState.Attaching,
+				summary: createAttachmentSummary(redirectTable),
+				blobs: "done",
+			}),
+		);
+	}
+
+	assert(
+		currentData.state === AttachState.Attaching,
+		0x8e2 /* must be attaching by this point */,
+	);
+
+	if (currentData.blobs === "done") {
+		// done means outstanding blobs were uploaded.
+		// in that case an empty file was created, the blobs were uploaded
+		// and now this finally uploads the summary
+		await storage.uploadSummaryWithContext(currentData.summary, {
+			referenceSequenceNumber: 0,
+			ackHandle: undefined,
+			proposalHandle: undefined,
+		});
+	}
+
+	const snapshot = offlineLoadEnabled
+		? getSnapshotTreeAndBlobsFromSerializedContainer(currentData.summary)
+		: undefined;
+
+	setAttachmentData(
+		(currentData = {
+			state: AttachState.Attached,
+		}),
+	);
+	return snapshot;
+};

package/src/audience.ts

@@ -2,7 +2,7 @@
  * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
  * Licensed under the MIT License.
  */
-import { EventEmitter } from "events";
+import { EventEmitter } from "@fluid-internal/client-utils";
 import { assert } from "@fluidframework/core-utils";
 import { IAudienceOwner } from "@fluidframework/container-definitions";
 import { IClient } from "@fluidframework/protocol-definitions";
@@ -61,14 +61,20 @@ export class Audience extends EventEmitter implements IAudienceOwner {
 	}
 
 	/**
-	 * Retrieves all the members in the audience
+	 * Retrieves all the members in the audience.
+	 *
+	 * @remarks When the container is disconnected, this will keep returning the audience as it was last seen before the
+	 * container disconnected.
 	 */
 	public getMembers(): Map<string, IClient> {
 		return new Map(this.members);
 	}
 
 	/**
-	 * Retrieves a specific member of the audience
+	 * Retrieves a specific member of the audience.
+	 *
+	 * @remarks When the container is disconnected, this will keep returning members from the audience as it was last seen
+	 * before the container disconnected.
 	 */
 	public getMember(clientId: string): IClient | undefined {
 		return this.members.get(clientId);

package/src/connectionManager.ts

@@ -3,7 +3,7 @@
  * Licensed under the MIT License.
  */
 
-import { IDisposable, ITelemetryProperties, LogLevel } from "@fluidframework/core-interfaces";
+import { IDisposable, ITelemetryBaseProperties, LogLevel } from "@fluidframework/core-interfaces";
 import { assert } from "@fluidframework/core-utils";
 import { performance, TypedEventEmitter } from "@fluid-internal/client-utils";
 import {
@@ -16,8 +16,7 @@ import {
 	IDocumentService,
 	IDocumentDeltaConnection,
 	IDocumentDeltaConnectionEvents,
-	// eslint-disable-next-line import/no-deprecated
-	DriverErrorType,
+	DriverErrorTypes,
 } from "@fluidframework/driver-definitions";
 import {
 	canRetryOnError,
@@ -58,10 +57,10 @@ import {
 	IConnectionManagerFactoryArgs,
 	IConnectionDetailsInternal,
 	IConnectionStateChangeReason,
-} from "./contracts";
-import { DeltaQueue } from "./deltaQueue";
-import { SignalType } from "./protocol";
-import { isDeltaStreamConnectionForbiddenError } from "./utils";
+} from "./contracts.js";
+import { DeltaQueue } from "./deltaQueue.js";
+import { SignalType } from "./protocol.js";
+import { isDeltaStreamConnectionForbiddenError } from "./utils.js";
 
 // We double this value in first try in when we calculate time to wait for in "calculateMaxWaitTime" function.
 const InitialReconnectDelayInMs = 500;
@@ -230,7 +229,7 @@ export class ConnectionManager implements IConnectionManager {
 
 	private _connectionVerboseProps: Record<string, string | number> = {};
 
-	private _connectionProps: ITelemetryProperties = {};
+	private _connectionProps: ITelemetryBaseProperties = {};
 
 	private _disposed = false;
 
@@ -291,7 +290,7 @@ export class ConnectionManager implements IConnectionManager {
 	 * Returns set of props that can be logged in telemetry that provide some insights / statistics
 	 * about current or last connection (if there is no connection at the moment)
 	 */
-	public get connectionProps(): ITelemetryProperties {
+	public get connectionProps(): ITelemetryBaseProperties {
 		return this.connection !== undefined
 			? this._connectionProps
 			: {
@@ -612,8 +611,7 @@ export class ConnectionManager implements IConnectionManager {
 					break;
 				} else if (
 					isFluidError(origError) &&
-					// eslint-disable-next-line import/no-deprecated
-					origError.errorType === DriverErrorType.outOfStorageError
+					origError.errorType === DriverErrorTypes.outOfStorageError
 				) {
 					// If we get out of storage error from calling joinsession, then use the NoDeltaStream object so
 					// that user can at least load the container.

package/src/connectionState.ts

@@ -4,6 +4,7 @@
  */
 
 /**
+ * The state of the Container's connection to the service.
  * @public
  */
 export enum ConnectionState {

package/src/connectionStateHandler.ts

@@ -3,7 +3,7 @@
  * Licensed under the MIT License.
  */
 
-import { ITelemetryProperties, TelemetryEventCategory } from "@fluidframework/core-interfaces";
+import { ITelemetryBaseProperties } from "@fluidframework/core-interfaces";
 import { assert, Timer } from "@fluidframework/core-utils";
 import { IDeltaManager } from "@fluidframework/container-definitions";
 import { ISequencedClient, IClient } from "@fluidframework/protocol-definitions";
@@ -11,12 +11,13 @@ import {
 	ITelemetryLoggerExt,
 	PerformanceEvent,
 	loggerToMonitoringContext,
+	type TelemetryEventCategory,
 } from "@fluidframework/telemetry-utils";
 import { IAnyDriverError } from "@fluidframework/driver-definitions";
-import { CatchUpMonitor, ICatchUpMonitor } from "./catchUpMonitor";
-import { ConnectionState } from "./connectionState";
-import { IConnectionDetailsInternal, IConnectionStateChangeReason } from "./contracts";
-import { IProtocolHandler } from "./protocol";
+import { CatchUpMonitor, ICatchUpMonitor } from "./catchUpMonitor.js";
+import { ConnectionState } from "./connectionState.js";
+import { IConnectionDetailsInternal, IConnectionStateChangeReason } from "./contracts.js";
+import { IProtocolHandler } from "./protocol.js";
 
 // Based on recent data, it looks like majority of cases where we get stuck are due to really slow or
 // timing out ops fetches. So attempt recovery infrequently. Also fetch uses 30 second timeout, so
@@ -43,7 +44,7 @@ export interface IConnectionStateHandlerInputs {
 	logConnectionIssue: (
 		eventName: string,
 		category: TelemetryEventCategory,
-		details?: ITelemetryProperties,
+		details?: ITelemetryBaseProperties,
 	) => void;
 	/** Callback to note that an old local client ID is still present in the Quorum that should have left and should now be considered invalid */
 	clientShouldHaveLeft: (clientId: string) => void;
@@ -188,7 +189,7 @@ class ConnectionStateHandlerPassThrough
 	public logConnectionIssue(
 		eventName: string,
 		category: TelemetryEventCategory,
-		details?: ITelemetryProperties,
+		details?: ITelemetryBaseProperties,
 	) {
 		return this.inputs.logConnectionIssue(eventName, category, details);
 	}