refactor(server): Remove dependency on common-utils

fluidBuild.config.cjs

@@ -322,7 +322,10 @@ module.exports = {
 				// TODO: AB#7630 uses lint only ts projects for coverage which don't have representative tsc scripts
 				"^packages/tools/fluid-runner/package.json",
 			],
-			"fluid-build-tasks-tsc": [],
+			"fluid-build-tasks-tsc": [
+				// Not seeing the dependencies it wants even when I add them
+				"^server/routerlicious/packages/services-client/package.json",
+			],
 			"html-copyright-file-header": [
 				// Tests generate HTML "snapshot" artifacts
 				"tools/api-markdown-documenter/src/test/snapshots/.*",

server/routerlicious/Dockerfile

@@ -57,6 +57,7 @@ COPY lerna.json ./
 COPY scripts/*.* ./scripts/
 COPY patches/*.* ./patches/
 
+COPY packages/common-utils/package*.json packages/common-utils/
 COPY packages/gitresources/package*.json packages/gitresources/
 COPY packages/kafka-orderer/package*.json packages/kafka-orderer/
 COPY packages/lambdas-driver/package*.json packages/lambdas-driver/

server/routerlicious/packages/lambdas-driver/package.json

@@ -52,7 +52,6 @@
 		"temp-directory": "nyc/.nyc_output"
 	},
 	"dependencies": {
-		"@fluidframework/common-utils": "^3.1.0",
 		"@fluidframework/server-services-client": "workspace:~",
 		"@fluidframework/server-services-core": "workspace:~",
 		"@fluidframework/server-services-telemetry": "workspace:~",

server/routerlicious/packages/lambdas-driver/src/kafka-service/checkpointManager.ts

@@ -4,8 +4,7 @@
  */
 
 import assert from "assert";
-import { Deferred } from "@fluidframework/common-utils";
-import { IConsumer, IQueuedMessage } from "@fluidframework/server-services-core";
+import { Deferred, IConsumer, IQueuedMessage } from "@fluidframework/server-services-core";
 import { Lumberjack } from "@fluidframework/server-services-telemetry";
 
 export class CheckpointManager {

server/routerlicious/packages/lambdas-driver/src/kafka-service/runner.ts

@@ -5,9 +5,9 @@
 
 import { inspect } from "util";
 import { serializeError } from "serialize-error";
-import { Deferred } from "@fluidframework/common-utils";
 import { promiseTimeout } from "@fluidframework/server-services-client";
 import {
+	Deferred,
 	IConsumer,
 	IContextErrorData,
 	ILogger,

server/routerlicious/packages/lambdas/package.json

@@ -52,7 +52,6 @@
 		"temp-directory": "nyc/.nyc_output"
 	},
 	"dependencies": {
-		"@fluidframework/common-utils": "^3.1.0",
 		"@fluidframework/gitresources": "workspace:~",
 		"@fluidframework/protocol-base": "workspace:~",
 		"@fluidframework/protocol-definitions": "^3.2.0",

server/routerlicious/packages/lambdas/src/deli/clientSeqManager.ts

@@ -3,7 +3,7 @@
  * Licensed under the MIT License.
  */
 
-import { Heap, IComparer, IHeapNode } from "@fluidframework/common-utils";
+import { Heap, IComparer, IHeapNode } from "./heap";
 import { IClientSequenceNumber } from "@fluidframework/server-services-core";
 
 const SequenceNumberComparer: IComparer<IClientSequenceNumber> = {

server/routerlicious/packages/lambdas/src/deli/heap.ts

@@ -0,0 +1,158 @@
+/*!
+ * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
+ * Licensed under the MIT License.
+ */
+
+/**
+ * Interface for a comparer.
+ */
+export interface IComparer<T> {
+	/**
+	 * The minimum value of type T.
+	 */
+	min: T;
+
+	/**
+	 * Compare the two value
+	 *
+	 * @returns 0 if the value is equal, negative number if a is smaller then b, positive number otherwise
+	 */
+	compare(a: T, b: T): number;
+}
+
+/**
+ * Interface to a node in {@link Heap}.
+ */
+export interface IHeapNode<T> {
+	value: T;
+	position: number;
+}
+
+/**
+ * Ordered {@link https://en.wikipedia.org/wiki/Heap_(data_structure) | Heap} data structure implementation.
+ */
+export class Heap<T> {
+	private L: IHeapNode<T>[];
+
+	/**
+	 * Creates an instance of `Heap` with comparer.
+	 * @param comp - A comparer that specify how elements are ordered.
+	 */
+	constructor(public comp: IComparer<T>) {
+		this.L = [{ value: comp.min, position: 0 }];
+	}
+
+	/**
+	 * Return the smallest element in the heap as determined by the order of the comparer
+	 *
+	 * @returns Heap node containing the smallest element
+	 */
+	public peek(): IHeapNode<T> {
+		return this.L[1];
+	}
+
+	/**
+	 * Get and remove the smallest element in the heap as determined by the order of the comparer
+	 *
+	 * @returns The smallest value in the heap
+	 */
+	public get(): T {
+		this.swap(1, this.count());
+		const x = this.L.pop();
+		this.fixdown(1);
+		// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+		return x!.value;
+	}
+
+	/**
+	 * Add a value to the heap
+	 *
+	 * @param x - value to add
+	 * @returns The heap node that contains the value
+	 */
+	public add(x: T): IHeapNode<T> {
+		const node = { value: x, position: this.L.length };
+		this.L.push(node);
+		this.fixup(this.count());
+
+		return node;
+	}
+
+	/**
+	 * Allows for the Heap to be updated after a node's value changes.
+	 */
+	public update(node: IHeapNode<T>): void {
+		const k = node.position;
+		if (this.isGreaterThanParent(k)) {
+			this.fixup(k);
+		} else {
+			this.fixdown(k);
+		}
+	}
+
+	/**
+	 * Removes the given node from the heap.
+	 *
+	 * @param node - The node to remove from the heap.
+	 */
+	public remove(node: IHeapNode<T>): void {
+		// Move the node we want to remove to the end of the array
+		const position = node.position;
+		this.swap(node.position, this.L.length - 1);
+		this.L.splice(-1);
+
+		// Update the swapped node assuming we didn't remove the end of the list
+		if (position !== this.L.length) {
+			this.update(this.L[position]);
+		}
+	}
+
+	/**
+	 * Get the number of elements in the Heap.
+	 *
+	 * @returns The number of elements in the Heap.
+	 */
+	public count(): number {
+		return this.L.length - 1;
+	}
+
+	private fixup(pos: number): void {
+		let k = pos;
+		while (this.isGreaterThanParent(k)) {
+			// eslint-disable-next-line no-bitwise
+			const parent = k >> 1;
+			this.swap(k, parent);
+			k = parent;
+		}
+	}
+
+	private isGreaterThanParent(k: number): boolean {
+		// eslint-disable-next-line no-bitwise
+		return k > 1 && this.comp.compare(this.L[k >> 1].value, this.L[k].value) > 0;
+	}
+
+	private fixdown(pos: number): void {
+		let k = pos;
+		// eslint-disable-next-line no-bitwise
+		while (k << 1 <= this.count()) {
+			// eslint-disable-next-line no-bitwise
+			let j = k << 1;
+			if (j < this.count() && this.comp.compare(this.L[j].value, this.L[j + 1].value) > 0) {
+				j++;
+			}
+			if (this.comp.compare(this.L[k].value, this.L[j].value) <= 0) {
+				break;
+			}
+			this.swap(k, j);
+			k = j;
+		}
+	}
+
+	private swap(k: number, j: number): void {
+		const tmp = this.L[k];
+		this.L[k] = this.L[j];
+		this.L[k].position = k;
+		this.L[j] = tmp;
+		this.L[j].position = j;
+	}
+}

server/routerlicious/packages/lambdas/src/deli/lambda.ts

@@ -55,6 +55,7 @@ import {
 	ISequencedSignalClient,
 	IClientManager,
 	ICheckpointService,
+	TypedEventEmitter,
 } from "@fluidframework/server-services-core";
 import {
 	CommonProperties,
@@ -64,7 +65,6 @@ import {
 	Lumberjack,
 } from "@fluidframework/server-services-telemetry";
 import { DocumentContext } from "@fluidframework/server-lambdas-driver";
-import { TypedEventEmitter } from "@fluidframework/common-utils";
 import { IEvent } from "../events";
 import {
 	logCommonSessionEndMetrics,

server/routerlicious/packages/lambdas/src/deli/lambdaFactory.ts

@@ -5,7 +5,6 @@
 
 import { EventEmitter } from "events";
 import { inspect } from "util";
-import { toUtf8 } from "@fluidframework/common-utils";
 import {
 	ICheckpointService,
 	IClientManager,
@@ -25,7 +24,7 @@ import {
 	MongoManager,
 	requestWithRetry,
 } from "@fluidframework/server-services-core";
-import { defaultHash, IGitManager } from "@fluidframework/server-services-client";
+import { defaultHash, IGitManager, toUtf8 } from "@fluidframework/server-services-client";
 import {
 	Lumber,
 	LumberEventName,

server/routerlicious/packages/lambdas/src/nexus/index.ts

@@ -3,7 +3,6 @@
  * Licensed under the MIT License.
  */
 
-import { TypedEventEmitter } from "@fluidframework/common-utils";
 import {
 	IClient,
 	IConnect,
@@ -112,7 +111,7 @@ export function configureWebSocketServices(
 	verifyMaxMessageSize?: boolean,
 	socketTracker?: core.IWebSocketTracker,
 	revokedTokenChecker?: core.IRevokedTokenChecker,
-	collaborationSessionEventEmitter?: TypedEventEmitter<ICollaborationSessionEvents>,
+	collaborationSessionEventEmitter?: core.TypedEventEmitter<ICollaborationSessionEvents>,
 	clusterDrainingChecker?: core.IClusterDrainingChecker,
 	collaborationSessionTracker?: core.ICollaborationSessionTracker,
 ): void {

server/routerlicious/packages/lambdas/src/nexus/interfaces.ts

@@ -3,7 +3,6 @@
  * Licensed under the MIT License.
  */
 
-import type { TypedEventEmitter } from "@fluidframework/common-utils";
 import type { IClient, IConnected } from "@fluidframework/protocol-definitions";
 import type {
 	IClientManager,
@@ -17,6 +16,7 @@ import type {
 	IThrottleAndUsageStorageManager,
 	IThrottler,
 	IWebSocketTracker,
+	TypedEventEmitter,
 } from "@fluidframework/server-services-core";
 import { IEvent } from "../events";
 import type { IRuntimeSignalEnvelope } from "../utils";

server/routerlicious/packages/lambdas/src/nexus/trace.ts

@@ -3,7 +3,6 @@
  * Licensed under the MIT License.
  */
 
-import { performance } from "@fluidframework/common-utils";
 import type { IDocumentMessage } from "@fluidframework/protocol-definitions";
 import { getRandomInt } from "@fluidframework/server-services-client";
 import { DefaultServiceConfiguration } from "@fluidframework/server-services-core";

server/routerlicious/packages/lambdas/src/scribe/checkpointManager.ts

@@ -3,8 +3,8 @@
  * Licensed under the MIT License.
  */
 
-import { delay } from "@fluidframework/common-utils";
 import {
+	delay,
 	ICollection,
 	IContext,
 	isRetryEnabled,

server/routerlicious/packages/lambdas/src/scribe/summaryReader.ts

@@ -3,7 +3,6 @@
  * Licensed under the MIT License.
  */
 
-import { bufferToString, toUtf8 } from "@fluidframework/common-utils";
 import {
 	IDocumentAttributes,
 	ISequencedDocumentMessage,
@@ -13,6 +12,8 @@ import {
 	IGitManager,
 	IWholeFlatSummary,
 	LatestSummaryId,
+	bufferToString,
+	toUtf8,
 } from "@fluidframework/server-services-client";
 import {
 	IDeliState,

server/routerlicious/packages/lambdas/src/scribe/summaryWriter.ts

@@ -3,7 +3,6 @@
  * Licensed under the MIT License.
  */
 
-import { fromBase64ToUtf8 } from "@fluidframework/common-utils";
 import { ICreateCommitParams, ICreateTreeEntry } from "@fluidframework/gitresources";
 import {
 	ISequencedDocumentMessage,
@@ -17,6 +16,7 @@ import {
 } from "@fluidframework/protocol-definitions";
 import {
 	buildTreePath,
+	fromBase64ToUtf8,
 	IGitManager,
 	ISummaryTree,
 	NetworkError,

server/routerlicious/packages/local-server/package.json

@@ -57,7 +57,6 @@
 		"temp-directory": "nyc/.nyc_output"
 	},
 	"dependencies": {
-		"@fluidframework/common-utils": "^3.1.0",
 		"@fluidframework/protocol-definitions": "^3.2.0",
 		"@fluidframework/server-lambdas": "workspace:~",
 		"@fluidframework/server-memory-orderer": "workspace:~",

server/routerlicious/packages/local-server/src/test/localDeltaConnectionServer.spec.ts

@@ -4,7 +4,6 @@
  */
 
 import { strict as assert } from "assert";
-import { Deferred } from "@fluidframework/common-utils";
 import {
 	ConnectionMode,
 	IClient,
@@ -17,7 +16,7 @@ import {
 	MessageType,
 	ScopeType,
 } from "@fluidframework/protocol-definitions";
-import { IWebSocket } from "@fluidframework/server-services-core";
+import { Deferred, IWebSocket } from "@fluidframework/server-services-core";
 import { KJUR as jsrsasign } from "jsrsasign";
 import { TestNotImplementedDocumentRepository } from "@fluidframework/server-test-utils";
 import Sinon from "sinon";

server/routerlicious/packages/memory-orderer/package.json

@@ -56,7 +56,6 @@
 		"temp-directory": "nyc/.nyc_output"
 	},
 	"dependencies": {
-		"@fluidframework/common-utils": "^3.1.0",
 		"@fluidframework/protocol-base": "workspace:~",
 		"@fluidframework/protocol-definitions": "^3.2.0",
 		"@fluidframework/server-lambdas": "workspace:~",

server/routerlicious/packages/memory-orderer/src/localOrdererConnection.ts

@@ -3,7 +3,6 @@
  * Licensed under the MIT License.
  */
 
-import { performance } from "@fluidframework/common-utils";
 import {
 	IClient,
 	IClientJoin,

server/routerlicious/packages/memory-orderer/src/localOrdererSetup.ts

@@ -3,9 +3,8 @@
  * Licensed under the MIT License.
  */
 
-import { fromBase64ToUtf8 } from "@fluidframework/common-utils";
 import { IDocumentAttributes } from "@fluidframework/protocol-definitions";
-import { IGitManager } from "@fluidframework/server-services-client";
+import { IGitManager, fromBase64ToUtf8 } from "@fluidframework/server-services-client";
 import {
 	CheckpointService,
 	ICheckpoint,