@fluidframework/local-driver 2.0.0-dev.5.2.0.169897 → 2.0.0-dev.6.4.0.191258

package/src/localDocumentDeltaConnection.ts

@@ -10,10 +10,11 @@ import {
 	IDocumentMessage,
 	NackErrorType,
 } from "@fluidframework/protocol-definitions";
-import { TelemetryNullLogger } from "@fluidframework/telemetry-utils";
+import { createChildLogger } from "@fluidframework/telemetry-utils";
 import { LocalWebSocketServer } from "@fluidframework/server-local-server";
 import { IWebSocketServer } from "@fluidframework/server-services-core";
 import type { Socket } from "socket.io-client";
+import { ITelemetryBaseLogger } from "@fluidframework/core-interfaces";
 
 const testProtocolVersions = ["^0.3.0", "^0.2.0", "^0.1.0"];
 
@@ -38,6 +39,7 @@ export class LocalDocumentDeltaConnection extends DocumentDeltaConnection {
 		client: IClient,
 		webSocketServer: IWebSocketServer,
 		timeoutMs = 60000,
+		logger?: ITelemetryBaseLogger,
 	): Promise<LocalDocumentDeltaConnection> {
 		const socket = (webSocketServer as LocalWebSocketServer).createConnection();
 
@@ -45,7 +47,7 @@ export class LocalDocumentDeltaConnection extends DocumentDeltaConnection {
 		// but should be fine because this delta connection is for local use only.
 		const socketWithListener = socket as unknown as Socket;
 
-		const deltaConnection = new LocalDocumentDeltaConnection(socketWithListener, id);
+		const deltaConnection = new LocalDocumentDeltaConnection(socketWithListener, id, logger);
 
 		const connectMessage: IConnect = {
 			client,
@@ -59,8 +61,8 @@ export class LocalDocumentDeltaConnection extends DocumentDeltaConnection {
 		return deltaConnection;
 	}
 
-	constructor(socket: Socket, documentId: string) {
-		super(socket, documentId, new TelemetryNullLogger());
+	constructor(socket: Socket, documentId: string, logger?: ITelemetryBaseLogger) {
+		super(socket, documentId, createChildLogger({ logger }));
 	}
 
 	/**

package/src/localDocumentService.ts

@@ -16,6 +16,7 @@ import { ITokenProvider } from "@fluidframework/routerlicious-driver";
 import { GitManager } from "@fluidframework/server-services-client";
 import { TestHistorian } from "@fluidframework/server-test-utils";
 import { ILocalDeltaConnectionServer } from "@fluidframework/server-local-server";
+import { ITelemetryBaseLogger } from "@fluidframework/core-interfaces";
 import { LocalDocumentStorageService } from "./localDocumentStorageService";
 import { LocalDocumentDeltaConnection } from "./localDocumentDeltaConnection";
 import { LocalDeltaStorageService } from "./localDeltaStorageService";
@@ -39,6 +40,7 @@ export class LocalDocumentService implements IDocumentService {
 		private readonly documentDeltaConnectionsMap: Map<string, LocalDocumentDeltaConnection>,
 		public readonly policies: IDocumentServicePolicies = {},
 		private readonly innerDocumentService?: IDocumentService,
+		private readonly logger?: ITelemetryBaseLogger,
 	) {}
 
 	public dispose() {}
@@ -96,6 +98,8 @@ export class LocalDocumentService implements IDocumentService {
 			ordererToken.jwt,
 			client,
 			this.localDeltaConnectionServer.webSocketServer,
+			undefined,
+			this.logger,
 		);
 		const clientId = documentDeltaConnection.clientId;
 
@@ -127,6 +131,7 @@ export function createLocalDocumentService(
 	documentDeltaConnectionsMap: Map<string, LocalDocumentDeltaConnection>,
 	policies?: IDocumentServicePolicies,
 	innerDocumentService?: IDocumentService,
+	logger?: ITelemetryBaseLogger,
 ): IDocumentService {
 	return new LocalDocumentService(
 		resolvedUrl,
@@ -137,5 +142,6 @@ export function createLocalDocumentService(
 		documentDeltaConnectionsMap,
 		policies,
 		innerDocumentService,
+		logger,
 	);
 }

package/src/localDocumentServiceFactory.ts

@@ -10,7 +10,7 @@ import {
 	IDocumentServicePolicies,
 	IResolvedUrl,
 } from "@fluidframework/driver-definitions";
-import { ITelemetryBaseLogger } from "@fluidframework/common-definitions";
+import { ITelemetryBaseLogger } from "@fluidframework/core-interfaces";
 import { DefaultTokenProvider } from "@fluidframework/routerlicious-driver";
 import { ILocalDeltaConnectionServer } from "@fluidframework/server-local-server";
 import { ISummaryTree, NackErrorType } from "@fluidframework/protocol-definitions";
@@ -85,6 +85,7 @@ export class LocalDocumentServiceFactory implements IDocumentServiceFactory {
 			this.documentDeltaConnectionsMap,
 			this.policies,
 			this.innerDocumentService,
+			logger,
 		);
 	}
 

package/src/localDocumentStorageService.ts

@@ -3,7 +3,7 @@
  * Licensed under the MIT License.
  */
 
-import { stringToBuffer, Uint8ArrayToString } from "@fluidframework/common-utils";
+import { stringToBuffer, Uint8ArrayToString } from "@fluid-internal/client-utils";
 import {
 	IDocumentStorageService,
 	IDocumentStorageServicePolicies,
@@ -17,7 +17,7 @@ import {
 	ISummaryTree,
 	IVersion,
 } from "@fluidframework/protocol-definitions";
-import { buildHierarchy } from "@fluidframework/protocol-base";
+import { buildGitTreeHierarchy } from "@fluidframework/protocol-base";
 import {
 	GitManager,
 	ISummaryUploadManager,
@@ -73,7 +73,7 @@ export class LocalDocumentStorageService implements IDocumentStorageService {
 		}
 
 		const rawTree = await this.manager.getTree(requestVersion.treeId);
-		const tree = buildHierarchy(rawTree, this.blobsShaCache, true);
+		const tree = buildGitTreeHierarchy(rawTree, this.blobsShaCache, true);
 		return tree;
 	}
 

package/src/localResolver.ts

@@ -4,7 +4,7 @@
  */
 
 import { parse } from "url";
-import { assert } from "@fluidframework/common-utils";
+import { assert } from "@fluidframework/core-utils";
 import { IRequest } from "@fluidframework/core-interfaces";
 import { IResolvedUrl, IUrlResolver, DriverHeader } from "@fluidframework/driver-definitions";
 import { ScopeType } from "@fluidframework/protocol-definitions";