@fluidframework/driver-utils 2.0.0-dev.4.4.0.162574 → 2.0.0-dev.5.2.0.169897

package/src/insecureUrlResolver.ts

@@ -6,12 +6,7 @@
 import { parse } from "url";
 import { assert } from "@fluidframework/common-utils";
 import { IRequest } from "@fluidframework/core-interfaces";
-import {
-	IFluidResolvedUrl,
-	IResolvedUrl,
-	IUrlResolver,
-	DriverHeader,
-} from "@fluidframework/driver-definitions";
+import { IResolvedUrl, IUrlResolver, DriverHeader } from "@fluidframework/driver-definitions";
 import Axios from "axios";
 
 /**
@@ -98,7 +93,7 @@ export class InsecureUrlResolver implements IUrlResolver {
 		// the actual container ID will be generated by the driver.
 		// eslint-disable-next-line @typescript-eslint/strict-boolean-expressions
 		if (!documentId) {
-			const createNewResponse: IFluidResolvedUrl = {
+			const createNewResponse: IResolvedUrl = {
 				endpoints: {
 					deltaStorageUrl: `${this.ordererUrl}/deltas/${encodedTenantId}/new`,
 					ordererUrl: this.ordererUrl,
@@ -122,7 +117,7 @@ export class InsecureUrlResolver implements IUrlResolver {
 		const deltaStorageUrl = `${this.ordererUrl}/deltas/${encodedTenantId}/${encodedDocId}`;
 		const storageUrl = `${this.storageUrl}/repos/${encodedTenantId}`;
 
-		const response: IFluidResolvedUrl = {
+		const response: IResolvedUrl = {
 			endpoints: {
 				deltaStorageUrl,
 				ordererUrl: this.ordererUrl,
@@ -137,9 +132,7 @@ export class InsecureUrlResolver implements IUrlResolver {
 	}
 
 	public async getAbsoluteUrl(resolvedUrl: IResolvedUrl, relativeUrl: string): Promise<string> {
-		const fluidResolvedUrl = resolvedUrl as IFluidResolvedUrl;
-
-		const parsedUrl = parse(fluidResolvedUrl.url);
+		const parsedUrl = parse(resolvedUrl.url);
 		const [, , documentId] = parsedUrl.pathname?.split("/") ?? [];
 		// eslint-disable-next-line @typescript-eslint/strict-boolean-expressions
 		assert(!!documentId, 0x273 /* "Invalid document id from parsed URL" */);

package/src/network.ts

@@ -72,9 +72,11 @@ export class DeltaStreamConnectionForbiddenError
 	static readonly errorType = DriverErrorType.deltaStreamConnectionForbidden;
 	readonly errorType = DeltaStreamConnectionForbiddenError.errorType;
 	readonly canRetry = false;
+	readonly storageOnlyReason: string | undefined;
 
-	constructor(message: string, props: DriverErrorTelemetryProps) {
+	constructor(message: string, props: DriverErrorTelemetryProps, storageOnlyReason?: string) {
 		super(message, { ...props, statusCode: 400 });
+		this.storageOnlyReason = storageOnlyReason;
 	}
 }
 

package/src/networkUtils.ts

@@ -3,17 +3,18 @@
  * Licensed under the MIT License.
  */
 
-import { ITelemetryErrorEvent, ITelemetryLogger } from "@fluidframework/common-definitions";
+import { ITelemetryErrorEvent } from "@fluidframework/common-definitions";
+import { ITelemetryLoggerExt } from "@fluidframework/telemetry-utils";
 import { isOnline, OnlineStatus, canRetryOnError } from "./network";
 
 export function logNetworkFailure(
-	logger: ITelemetryLogger,
+	logger: ITelemetryLoggerExt,
 	event: ITelemetryErrorEvent,
 	error?: any,
 ) {
 	const newEvent = { ...event };
 
-	const errorOnlineProp = error.online;
+	const errorOnlineProp = error?.online;
 	newEvent.online =
 		typeof errorOnlineProp === "string" ? errorOnlineProp : OnlineStatus[isOnline()];
 

package/src/packageVersion.ts

@@ -6,4 +6,4 @@
  */
 
 export const pkgName = "@fluidframework/driver-utils";
-export const pkgVersion = "2.0.0-dev.4.4.0.162574";
+export const pkgVersion = "2.0.0-dev.5.2.0.169897";

package/src/parallelRequests.ts

@@ -3,8 +3,8 @@
  * Licensed under the MIT License.
  */
 import { assert, Deferred, performance } from "@fluidframework/common-utils";
-import { ITelemetryLogger, ITelemetryProperties } from "@fluidframework/common-definitions";
-import { PerformanceEvent } from "@fluidframework/telemetry-utils";
+import { ITelemetryProperties } from "@fluidframework/common-definitions";
+import { ITelemetryLoggerExt, PerformanceEvent } from "@fluidframework/telemetry-utils";
 import { ISequencedDocumentMessage } from "@fluidframework/protocol-definitions";
 import { IDeltasFetchResult, IStream, IStreamResult } from "@fluidframework/driver-definitions";
 import { getRetryDelayFromError, canRetryOnError, createGenericNetworkError } from "./network";
@@ -50,7 +50,7 @@ export class ParallelRequests<T> {
 		from: number,
 		private to: number | undefined,
 		private readonly payloadSize: number,
-		private readonly logger: ITelemetryLogger,
+		private readonly logger: ITelemetryLoggerExt,
 		private readonly requestCallback: (
 			request: number,
 			from: number,
@@ -409,7 +409,7 @@ async function getSingleOpBatch(
 	get: (telemetryProps: ITelemetryProperties) => Promise<IDeltasFetchResult>,
 	props: ITelemetryProperties,
 	strongTo: boolean,
-	logger: ITelemetryLogger,
+	logger: ITelemetryLoggerExt,
 	signal?: AbortSignal,
 	scenarioName?: string,
 ): Promise<{ partial: boolean; cancel: boolean; payload: ISequencedDocumentMessage[] }> {
@@ -540,7 +540,7 @@ export function requestOps(
 	fromTotal: number,
 	toTotal: number | undefined,
 	payloadSize: number,
-	logger: ITelemetryLogger,
+	logger: ITelemetryLoggerExt,
 	signal?: AbortSignal,
 	scenarioName?: string,
 ): IStream<ISequencedDocumentMessage[]> {

package/src/runWithRetry.ts

@@ -3,7 +3,7 @@
  * Licensed under the MIT License.
  */
 
-import { ITelemetryLogger } from "@fluidframework/common-definitions";
+import { ITelemetryLoggerExt } from "@fluidframework/telemetry-utils";
 import { delay, performance } from "@fluidframework/common-utils";
 import { DriverErrorType } from "@fluidframework/driver-definitions";
 import { canRetryOnError, getRetryDelayFromError } from "./network";
@@ -45,7 +45,7 @@ export interface IProgress {
 export async function runWithRetry<T>(
 	api: (cancel?: AbortSignal) => Promise<T>,
 	fetchCallName: string,
-	logger: ITelemetryLogger,
+	logger: ITelemetryLoggerExt,
 	progress: IProgress,
 ): Promise<T> {
 	let result: T | undefined;

package/src/treeConversions.ts

@@ -4,8 +4,8 @@
  */
 
 import { Uint8ArrayToString, unreachableCase } from "@fluidframework/common-utils";
-import { AttachmentTreeEntry, BlobTreeEntry, TreeTreeEntry } from "@fluidframework/protocol-base";
 import { ISummaryTree, ITree, ITreeEntry, SummaryType } from "@fluidframework/protocol-definitions";
+import { AttachmentTreeEntry, BlobTreeEntry, TreeTreeEntry } from "./blob";
 import { isCombinedAppAndProtocolSummary } from "./summaryForCreateNew";
 
 /**

package/dist/fluidResolvedUrl.d.ts

@@ -1,16 +0,0 @@
-/*!
- * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
- * Licensed under the MIT License.
- */
-import { IResolvedUrl, IFluidResolvedUrl } from "@fluidframework/driver-definitions";
-/**
- * @deprecated In the next major release all IResolvedUrl will be IFluidResolvedUrl,
- * so this method is no longer necessary.
- */
-export declare const isFluidResolvedUrl: (resolved: IResolvedUrl | undefined) => resolved is IFluidResolvedUrl;
-/**
- * @deprecated In the next major release all IResolvedUrl will be IFluidResolvedUrl,
- * so this method is no longer necessary.
- */
-export declare function ensureFluidResolvedUrl(resolved: IResolvedUrl | undefined): asserts resolved is IFluidResolvedUrl;
-//# sourceMappingURL=fluidResolvedUrl.d.ts.map

package/dist/fluidResolvedUrl.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"fluidResolvedUrl.d.ts","sourceRoot":"","sources":["../src/fluidResolvedUrl.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAC;AAErF;;;GAGG;AACH,eAAO,MAAM,kBAAkB,aACpB,YAAY,GAAG,SAAS,kCAC2B,CAAC;AAE/D;;;GAGG;AACH,wBAAgB,sBAAsB,CACrC,QAAQ,EAAE,YAAY,GAAG,SAAS,GAChC,OAAO,CAAC,QAAQ,IAAI,iBAAiB,CAIvC"}

package/dist/fluidResolvedUrl.js

@@ -1,24 +0,0 @@
-"use strict";
-/*!
- * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
- * Licensed under the MIT License.
- */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ensureFluidResolvedUrl = exports.isFluidResolvedUrl = void 0;
-/**
- * @deprecated In the next major release all IResolvedUrl will be IFluidResolvedUrl,
- * so this method is no longer necessary.
- */
-const isFluidResolvedUrl = (resolved) => (resolved === null || resolved === void 0 ? void 0 : resolved.type) === "fluid";
-exports.isFluidResolvedUrl = isFluidResolvedUrl;
-/**
- * @deprecated In the next major release all IResolvedUrl will be IFluidResolvedUrl,
- * so this method is no longer necessary.
- */
-function ensureFluidResolvedUrl(resolved) {
-    if (!(0, exports.isFluidResolvedUrl)(resolved)) {
-        throw new Error(`resolved is not a Fluid url. Type: ${resolved === null || resolved === void 0 ? void 0 : resolved.type}`);
-    }
-}
-exports.ensureFluidResolvedUrl = ensureFluidResolvedUrl;
-//# sourceMappingURL=fluidResolvedUrl.js.map

package/dist/fluidResolvedUrl.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"fluidResolvedUrl.js","sourceRoot":"","sources":["../src/fluidResolvedUrl.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;AAIH;;;GAGG;AACI,MAAM,kBAAkB,GAAG,CACjC,QAAkC,EACF,EAAE,CAAC,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,IAAI,MAAK,OAAO,CAAC;AAFlD,QAAA,kBAAkB,sBAEgC;AAE/D;;;GAGG;AACH,SAAgB,sBAAsB,CACrC,QAAkC;IAElC,IAAI,CAAC,IAAA,0BAAkB,EAAC,QAAQ,CAAC,EAAE;QAClC,MAAM,IAAI,KAAK,CAAC,sCAAsC,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,IAAI,EAAE,CAAC,CAAC;KACxE;AACF,CAAC;AAND,wDAMC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { IResolvedUrl, IFluidResolvedUrl } from \"@fluidframework/driver-definitions\";\n\n/**\n * @deprecated In the next major release all IResolvedUrl will be IFluidResolvedUrl,\n * so this method is no longer necessary.\n */\nexport const isFluidResolvedUrl = (\n\tresolved: IResolvedUrl | undefined,\n): resolved is IFluidResolvedUrl => resolved?.type === \"fluid\";\n\n/**\n * @deprecated In the next major release all IResolvedUrl will be IFluidResolvedUrl,\n * so this method is no longer necessary.\n */\nexport function ensureFluidResolvedUrl(\n\tresolved: IResolvedUrl | undefined,\n): asserts resolved is IFluidResolvedUrl {\n\tif (!isFluidResolvedUrl(resolved)) {\n\t\tthrow new Error(`resolved is not a Fluid url. Type: ${resolved?.type}`);\n\t}\n}\n"]}

package/lib/fluidResolvedUrl.d.ts

@@ -1,16 +0,0 @@
-/*!
- * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
- * Licensed under the MIT License.
- */
-import { IResolvedUrl, IFluidResolvedUrl } from "@fluidframework/driver-definitions";
-/**
- * @deprecated In the next major release all IResolvedUrl will be IFluidResolvedUrl,
- * so this method is no longer necessary.
- */
-export declare const isFluidResolvedUrl: (resolved: IResolvedUrl | undefined) => resolved is IFluidResolvedUrl;
-/**
- * @deprecated In the next major release all IResolvedUrl will be IFluidResolvedUrl,
- * so this method is no longer necessary.
- */
-export declare function ensureFluidResolvedUrl(resolved: IResolvedUrl | undefined): asserts resolved is IFluidResolvedUrl;
-//# sourceMappingURL=fluidResolvedUrl.d.ts.map

package/lib/fluidResolvedUrl.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"fluidResolvedUrl.d.ts","sourceRoot":"","sources":["../src/fluidResolvedUrl.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAC;AAErF;;;GAGG;AACH,eAAO,MAAM,kBAAkB,aACpB,YAAY,GAAG,SAAS,kCAC2B,CAAC;AAE/D;;;GAGG;AACH,wBAAgB,sBAAsB,CACrC,QAAQ,EAAE,YAAY,GAAG,SAAS,GAChC,OAAO,CAAC,QAAQ,IAAI,iBAAiB,CAIvC"}

package/lib/fluidResolvedUrl.js

@@ -1,19 +0,0 @@
-/*!
- * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
- * Licensed under the MIT License.
- */
-/**
- * @deprecated In the next major release all IResolvedUrl will be IFluidResolvedUrl,
- * so this method is no longer necessary.
- */
-export const isFluidResolvedUrl = (resolved) => (resolved === null || resolved === void 0 ? void 0 : resolved.type) === "fluid";
-/**
- * @deprecated In the next major release all IResolvedUrl will be IFluidResolvedUrl,
- * so this method is no longer necessary.
- */
-export function ensureFluidResolvedUrl(resolved) {
-    if (!isFluidResolvedUrl(resolved)) {
-        throw new Error(`resolved is not a Fluid url. Type: ${resolved === null || resolved === void 0 ? void 0 : resolved.type}`);
-    }
-}
-//# sourceMappingURL=fluidResolvedUrl.js.map

package/lib/fluidResolvedUrl.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"fluidResolvedUrl.js","sourceRoot":"","sources":["../src/fluidResolvedUrl.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH;;;GAGG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,CACjC,QAAkC,EACF,EAAE,CAAC,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,IAAI,MAAK,OAAO,CAAC;AAE/D;;;GAGG;AACH,MAAM,UAAU,sBAAsB,CACrC,QAAkC;IAElC,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC,EAAE;QAClC,MAAM,IAAI,KAAK,CAAC,sCAAsC,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,IAAI,EAAE,CAAC,CAAC;KACxE;AACF,CAAC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { IResolvedUrl, IFluidResolvedUrl } from \"@fluidframework/driver-definitions\";\n\n/**\n * @deprecated In the next major release all IResolvedUrl will be IFluidResolvedUrl,\n * so this method is no longer necessary.\n */\nexport const isFluidResolvedUrl = (\n\tresolved: IResolvedUrl | undefined,\n): resolved is IFluidResolvedUrl => resolved?.type === \"fluid\";\n\n/**\n * @deprecated In the next major release all IResolvedUrl will be IFluidResolvedUrl,\n * so this method is no longer necessary.\n */\nexport function ensureFluidResolvedUrl(\n\tresolved: IResolvedUrl | undefined,\n): asserts resolved is IFluidResolvedUrl {\n\tif (!isFluidResolvedUrl(resolved)) {\n\t\tthrow new Error(`resolved is not a Fluid url. Type: ${resolved?.type}`);\n\t}\n}\n"]}

package/src/fluidResolvedUrl.ts

@@ -1,26 +0,0 @@
-/*!
- * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
- * Licensed under the MIT License.
- */
-
-import { IResolvedUrl, IFluidResolvedUrl } from "@fluidframework/driver-definitions";
-
-/**
- * @deprecated In the next major release all IResolvedUrl will be IFluidResolvedUrl,
- * so this method is no longer necessary.
- */
-export const isFluidResolvedUrl = (
-	resolved: IResolvedUrl | undefined,
-): resolved is IFluidResolvedUrl => resolved?.type === "fluid";
-
-/**
- * @deprecated In the next major release all IResolvedUrl will be IFluidResolvedUrl,
- * so this method is no longer necessary.
- */
-export function ensureFluidResolvedUrl(
-	resolved: IResolvedUrl | undefined,
-): asserts resolved is IFluidResolvedUrl {
-	if (!isFluidResolvedUrl(resolved)) {
-		throw new Error(`resolved is not a Fluid url. Type: ${resolved?.type}`);
-	}
-}