@fluidframework/driver-base 2.0.0-rc.1.0.6 → 2.0.0-rc.2.0.1

package/lib/{driver-base-beta.d.mts → driver-base-beta.d.ts}

@@ -17,6 +17,8 @@ import type { Socket } from 'socket.io-client';
 
 /* Excluded from this release type: DocumentDeltaConnection */
 
+/* Excluded from this release type: EventEmitterWithErrorHandling */
+
 /* Excluded from this release type: getW3CData */
 
 /* Excluded from this release type: IDocumentDeltaConnection */

package/lib/{driver-base-public.d.mts → driver-base-public.d.ts}

@@ -17,6 +17,8 @@ import type { Socket } from 'socket.io-client';
 
 /* Excluded from this release type: DocumentDeltaConnection */
 
+/* Excluded from this release type: EventEmitterWithErrorHandling */
+
 /* Excluded from this release type: getW3CData */
 
 /* Excluded from this release type: IDocumentDeltaConnection */

package/lib/{driverUtils.d.mts → driverUtils.d.ts}

@@ -33,4 +33,4 @@ export declare function promiseRaceWithWinner<T>(promises: Promise<T>[]): Promis
  * @internal
  */
 export declare function validateMessages(reason: string, messages: ISequencedDocumentMessage[], from: number, logger: ITelemetryLoggerExt, strict?: boolean): void;
-//# sourceMappingURL=driverUtils.d.mts.map
+//# sourceMappingURL=driverUtils.d.ts.map

package/lib/driverUtils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"driverUtils.d.ts","sourceRoot":"","sources":["../src/driverUtils.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EAAE,yBAAyB,EAAE,MAAM,sCAAsC,CAAC;AACjF,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AAEtE;;;;;GAKG;AACH,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM;;;;;;;;;EA8E5D;AAED;;;;GAIG;AACH,wBAAsB,qBAAqB,CAAC,CAAC,EAC5C,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,GACpB,OAAO,CAAC;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,CAAC,CAAA;CAAE,CAAC,CAMtC;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAC/B,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,yBAAyB,EAAE,EACrC,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,mBAAmB,EAC3B,MAAM,GAAE,OAAc,QAwCtB"}

package/lib/{driverUtils.mjs → driverUtils.js}

@@ -137,4 +137,4 @@ export function validateMessages(reason, messages, from, logger, strict = true)
         }
     }
 }
-//# sourceMappingURL=driverUtils.mjs.map
+//# sourceMappingURL=driverUtils.js.map

package/lib/driverUtils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"driverUtils.js","sourceRoot":"","sources":["../src/driverUtils.ts"],"names":[],"mappings":"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","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { performance } from \"@fluid-internal/client-utils\";\nimport { ISequencedDocumentMessage } from \"@fluidframework/protocol-definitions\";\nimport { ITelemetryLoggerExt } from \"@fluidframework/telemetry-utils\";\n\n/**\n * Extract and return the w3c data.\n * @param url - request url for which w3c data needs to be reported.\n * @param initiatorType - type of the network call\n * @internal\n */\nexport function getW3CData(url: string, initiatorType: string) {\n\t// From: https://developer.mozilla.org/en-US/docs/Web/API/PerformanceResourceTiming\n\t// fetchStart: immediately before the browser starts to fetch the resource.\n\t// requestStart: immediately before the browser starts requesting the resource from the server\n\t// responseStart: immediately after the browser receives the first byte of the response from the server.\n\t// responseEnd: immediately after the browser receives the last byte of the resource\n\t//              or immediately before the transport connection is closed, whichever comes first.\n\t// secureConnectionStart: immediately before the browser starts the handshake process to secure the\n\t//              current connection. If a secure connection is not used, this property returns zero.\n\t// startTime: Time when the resource fetch started. This value is equivalent to fetchStart.\n\t// domainLookupStart: immediately before the browser starts the domain name lookup for the resource.\n\t// domainLookupEnd: immediately after the browser finishes the domain name lookup for the resource.\n\t// redirectStart: start time of the fetch which that initiates the redirect.\n\t// redirectEnd: immediately after receiving the last byte of the response of the last redirect.\n\n\t// Interval between start and finish of the domain name lookup for the resource.\n\tlet dnsLookupTime: number | undefined; // domainLookupEnd - domainLookupStart\n\t// Interval between the first fetch until the last byte of the last redirect.\n\tlet redirectTime: number | undefined; // redirectEnd - redirectStart\n\t// Time to establish the connection to the server to retrieve the resource.\n\tlet tcpHandshakeTime: number | undefined; // connectEnd  - connectStart\n\t// Time from the end of the connection until the inital handshake process to secure the connection.\n\t// If 0, then no time is spent here.\n\tlet secureConnectionTime: number | undefined; // connectEnd  - secureConnectionStart\n\t// Interval to receive all (first to last) bytes form the server.\n\tlet responseNetworkTime: number | undefined; // responsEnd - responseStart\n\t// Interval between the initial fetch until the last byte is received.\n\t// Likely same as fetchTime + receiveContentTime.\n\tlet fetchStartToResponseEndTime: number | undefined; // responseEnd  - fetchStart\n\t// reqStartToResponseEndTime = fetchStartToResponseEndTime - <initial TCP handshake>\n\t// Interval between starting the request for the resource until receiving the last byte.\n\tlet reqStartToResponseEndTime: number | undefined; // responseEnd - requestStart\n\tlet w3cStartTime: number | undefined; // W3C Start time = fetchStart time\n\n\t// getEntriesByType is only available in browser performance object\n\tconst resources1 = performance.getEntriesByType?.(\"resource\") ?? [];\n\t// Usually the latest fetch call is to the end of resources, so we start from the end.\n\tfor (let i = resources1.length - 1; i > 0; i--) {\n\t\tconst indResTime = resources1[i] as PerformanceResourceTiming;\n\t\tconst resource_name = indResTime.name.toString();\n\t\tconst resource_initiatortype = indResTime.initiatorType;\n\t\tif (\n\t\t\tresource_initiatortype.localeCompare(initiatorType) === 0 &&\n\t\t\tresource_name.includes(url)\n\t\t) {\n\t\t\tredirectTime = indResTime.redirectEnd - indResTime.redirectStart;\n\t\t\tw3cStartTime = indResTime.fetchStart;\n\t\t\tdnsLookupTime = indResTime.domainLookupEnd - indResTime.domainLookupStart;\n\t\t\ttcpHandshakeTime = indResTime.connectEnd - indResTime.connectStart;\n\t\t\tsecureConnectionTime =\n\t\t\t\tindResTime.secureConnectionStart > 0\n\t\t\t\t\t? indResTime.connectEnd - indResTime.secureConnectionStart\n\t\t\t\t\t: 0;\n\t\t\tresponseNetworkTime =\n\t\t\t\tindResTime.responseStart > 0\n\t\t\t\t\t? indResTime.responseEnd - indResTime.responseStart\n\t\t\t\t\t: undefined;\n\t\t\tfetchStartToResponseEndTime =\n\t\t\t\tindResTime.fetchStart > 0\n\t\t\t\t\t? indResTime.responseEnd - indResTime.fetchStart\n\t\t\t\t\t: undefined;\n\t\t\treqStartToResponseEndTime =\n\t\t\t\tindResTime.requestStart > 0\n\t\t\t\t\t? indResTime.responseEnd - indResTime.requestStart\n\t\t\t\t\t: undefined;\n\t\t\tbreak;\n\t\t}\n\t}\n\treturn {\n\t\tdnsLookupTime,\n\t\tw3cStartTime,\n\t\tredirectTime,\n\t\ttcpHandshakeTime,\n\t\tsecureConnectionTime,\n\t\tresponseNetworkTime,\n\t\tfetchStartToResponseEndTime,\n\t\treqStartToResponseEndTime,\n\t};\n}\n\n/**\n * An implementation of Promise.race that gives you the winner of the promise race.\n * If one of the promises is rejected before any other is resolved, this method will return the error/reason from that rejection.\n * @internal\n */\nexport async function promiseRaceWithWinner<T>(\n\tpromises: Promise<T>[],\n): Promise<{ index: number; value: T }> {\n\treturn new Promise((resolve, reject) => {\n\t\tpromises.forEach((p, index) => {\n\t\t\tp.then((v) => resolve({ index, value: v })).catch(reject);\n\t\t});\n\t});\n}\n\n/**\n * @internal\n */\nexport function validateMessages(\n\treason: string,\n\tmessages: ISequencedDocumentMessage[],\n\tfrom: number,\n\tlogger: ITelemetryLoggerExt,\n\tstrict: boolean = true,\n) {\n\tif (messages.length !== 0) {\n\t\tconst start = messages[0].sequenceNumber;\n\t\tconst length = messages.length;\n\t\tconst last = messages[length - 1].sequenceNumber;\n\t\tif (last + 1 !== from + length) {\n\t\t\t// If not strict, then return the first consecutive sub-block. If strict or start\n\t\t\t// seq number is not what we expected, then return no ops.\n\t\t\tif (strict || from !== start) {\n\t\t\t\tmessages.length = 0;\n\t\t\t} else {\n\t\t\t\tlet validOpsCount = 1;\n\t\t\t\twhile (\n\t\t\t\t\tvalidOpsCount < messages.length &&\n\t\t\t\t\tmessages[validOpsCount].sequenceNumber ===\n\t\t\t\t\t\tmessages[validOpsCount - 1].sequenceNumber + 1\n\t\t\t\t) {\n\t\t\t\t\tvalidOpsCount++;\n\t\t\t\t}\n\t\t\t\tmessages.length = validOpsCount;\n\t\t\t}\n\t\t\tlogger.sendErrorEvent({\n\t\t\t\teventName: \"OpsFetchViolation\",\n\t\t\t\treason,\n\t\t\t\tfrom,\n\t\t\t\tstart,\n\t\t\t\tlast,\n\t\t\t\tlength,\n\t\t\t\tdetails: JSON.stringify({\n\t\t\t\t\tvalidLength: messages.length,\n\t\t\t\t\tlastValidOpSeqNumber:\n\t\t\t\t\t\tmessages.length > 0\n\t\t\t\t\t\t\t? messages[messages.length - 1].sequenceNumber\n\t\t\t\t\t\t\t: undefined,\n\t\t\t\t\tstrict,\n\t\t\t\t}),\n\t\t\t});\n\t\t}\n\t}\n}\n"]}

package/lib/{index.mjs → index.d.ts}

@@ -2,6 +2,6 @@
  * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
  * Licensed under the MIT License.
  */
-export { DocumentDeltaConnection } from "./documentDeltaConnection.mjs";
-export { getW3CData, promiseRaceWithWinner, validateMessages } from "./driverUtils.mjs";
-//# sourceMappingURL=index.mjs.map
+export { DocumentDeltaConnection } from "./documentDeltaConnection.js";
+export { getW3CData, promiseRaceWithWinner, validateMessages } from "./driverUtils.js";
+//# sourceMappingURL=index.d.ts.map

package/lib/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AACvE,OAAO,EAAE,UAAU,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC"}

package/lib/{index.d.mts → index.js}

@@ -2,6 +2,6 @@
  * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
  * Licensed under the MIT License.
  */
-export { DocumentDeltaConnection } from "./documentDeltaConnection.mjs";
-export { getW3CData, promiseRaceWithWinner, validateMessages } from "./driverUtils.mjs";
-//# sourceMappingURL=index.d.mts.map
+export { DocumentDeltaConnection } from "./documentDeltaConnection.js";
+export { getW3CData, promiseRaceWithWinner, validateMessages } from "./driverUtils.js";
+//# sourceMappingURL=index.js.map

package/lib/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AACvE,OAAO,EAAE,UAAU,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nexport { DocumentDeltaConnection } from \"./documentDeltaConnection.js\";\nexport { getW3CData, promiseRaceWithWinner, validateMessages } from \"./driverUtils.js\";\n"]}

package/lib/{packageVersion.d.mts → packageVersion.d.ts}

@@ -5,5 +5,5 @@
  * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY
  */
 export declare const pkgName = "@fluidframework/driver-base";
-export declare const pkgVersion = "2.0.0-rc.1.0.6";
-//# sourceMappingURL=packageVersion.d.mts.map
+export declare const pkgVersion = "2.0.0-rc.2.0.1";
+//# sourceMappingURL=packageVersion.d.ts.map

package/lib/packageVersion.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"packageVersion.d.ts","sourceRoot":"","sources":["../src/packageVersion.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,eAAO,MAAM,OAAO,gCAAgC,CAAC;AACrD,eAAO,MAAM,UAAU,mBAAmB,CAAC"}

package/lib/{packageVersion.mjs → packageVersion.js}

@@ -5,5 +5,5 @@
  * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY
  */
 export const pkgName = "@fluidframework/driver-base";
-export const pkgVersion = "2.0.0-rc.1.0.6";
-//# sourceMappingURL=packageVersion.mjs.map
+export const pkgVersion = "2.0.0-rc.2.0.1";
+//# sourceMappingURL=packageVersion.js.map

package/lib/packageVersion.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"packageVersion.js","sourceRoot":"","sources":["../src/packageVersion.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,MAAM,CAAC,MAAM,OAAO,GAAG,6BAA6B,CAAC;AACrD,MAAM,CAAC,MAAM,UAAU,GAAG,gBAAgB,CAAC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n *\n * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY\n */\n\nexport const pkgName = \"@fluidframework/driver-base\";\nexport const pkgVersion = \"2.0.0-rc.2.0.1\";\n"]}

package/lib/test/driverUtilsTests.spec.js

@@ -0,0 +1,101 @@
+/*!
+ * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
+ * Licensed under the MIT License.
+ */
+import { assert } from "@fluidframework/core-utils";
+import { MockLogger } from "@fluidframework/telemetry-utils";
+import { validateMessages } from "../driverUtils.js";
+describe("driver utils tests", () => {
+    describe("validateMessagesTests", () => {
+        const mockLogger = new MockLogger();
+        const generateOps = (start, count) => {
+            const ops = [];
+            let i = 0;
+            while (i < count) {
+                ops.push({ sequenceNumber: start + i });
+                i++;
+            }
+            return ops;
+        };
+        beforeEach(() => {
+            mockLogger.clear();
+        });
+        it("from not equal to start", () => {
+            const ops = generateOps(1, 5);
+            validateMessages("test1", ops, 0, mockLogger.toTelemetryLogger(), true);
+            assert(ops.length === 0, "no ops should be returned");
+            assert(mockLogger.matchEventStrict([
+                {
+                    eventName: "OpsFetchViolation",
+                    reason: "test1",
+                    from: 0,
+                    start: 1,
+                    last: 5,
+                    length: 5,
+                    details: JSON.stringify({
+                        validLength: 0,
+                        lastValidOpSeqNumber: undefined,
+                        strict: true,
+                    }),
+                },
+            ]), "Ops fetch violation event not correctly recorded");
+        });
+        it("contiguous ops", () => {
+            const ops = generateOps(1, 5);
+            validateMessages("test2", ops, 1, mockLogger.toTelemetryLogger(), true);
+            assert(ops.length === 5, "ops should be returned");
+            assert(mockLogger.events.length === 0, "no events should be there");
+        });
+        it("non contiguous ops: strict = true", () => {
+            const ops = generateOps(1, 5);
+            // Change seq number of last op
+            ops[4].sequenceNumber = 7;
+            validateMessages("test", ops, 1, mockLogger.toTelemetryLogger(), true);
+            assert(ops.length === 0, "no ops should be returned as strict == true");
+            assert(mockLogger.matchEventStrict([
+                {
+                    eventName: "OpsFetchViolation",
+                    reason: "test",
+                    from: 1,
+                    start: 1,
+                    last: 7,
+                    length: 5,
+                    details: JSON.stringify({
+                        validLength: 0,
+                        lastValidOpSeqNumber: undefined,
+                        strict: true,
+                    }),
+                },
+            ]), "Ops fetch violation event not correctly recorded");
+        });
+        it("non contiguous ops: strict = false", () => {
+            const ops = generateOps(1, 5);
+            // Change seq number of last op
+            ops[4].sequenceNumber = 7;
+            validateMessages("test", ops, 1, mockLogger.toTelemetryLogger(), false);
+            assert(ops.length === 4, "some should be returned as strict == false");
+            assert(mockLogger.matchEventStrict([
+                {
+                    eventName: "OpsFetchViolation",
+                    reason: "test",
+                    from: 1,
+                    start: 1,
+                    last: 7,
+                    length: 5,
+                    details: JSON.stringify({
+                        validLength: 4,
+                        lastValidOpSeqNumber: 4,
+                        strict: false,
+                    }),
+                },
+            ]), "Ops fetch violation event not correctly recorded");
+        });
+        it("only 1 op: strict = false", () => {
+            const ops = generateOps(1, 1);
+            validateMessages("test", ops, 1, mockLogger.toTelemetryLogger(), false);
+            assert(ops.length === 1, "some should be returned as strict == false");
+            assert(mockLogger.events.length === 0, "no events should be there");
+        });
+    });
+});
+//# sourceMappingURL=driverUtilsTests.spec.js.map

package/lib/test/driverUtilsTests.spec.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"driverUtilsTests.spec.js","sourceRoot":"","sources":["../../src/test/driverUtilsTests.spec.ts"],"names":[],"mappings":"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","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n\nimport { assert } from \"@fluidframework/core-utils\";\nimport { MockLogger } from \"@fluidframework/telemetry-utils\";\nimport { ISequencedDocumentMessage } from \"@fluidframework/protocol-definitions\";\nimport { validateMessages } from \"../driverUtils.js\";\n\ndescribe(\"driver utils tests\", () => {\n\tdescribe(\"validateMessagesTests\", () => {\n\t\tconst mockLogger = new MockLogger();\n\t\tconst generateOps = (start: number, count: number) => {\n\t\t\tconst ops: ISequencedDocumentMessage[] = [];\n\t\t\tlet i = 0;\n\t\t\twhile (i < count) {\n\t\t\t\tops.push({ sequenceNumber: start + i } as any as ISequencedDocumentMessage);\n\t\t\t\ti++;\n\t\t\t}\n\t\t\treturn ops;\n\t\t};\n\n\t\tbeforeEach(() => {\n\t\t\tmockLogger.clear();\n\t\t});\n\n\t\tit(\"from not equal to start\", () => {\n\t\t\tconst ops = generateOps(1, 5);\n\t\t\tvalidateMessages(\"test1\", ops, 0, mockLogger.toTelemetryLogger(), true);\n\t\t\tassert(ops.length === 0, \"no ops should be returned\");\n\t\t\tassert(\n\t\t\t\tmockLogger.matchEventStrict([\n\t\t\t\t\t{\n\t\t\t\t\t\teventName: \"OpsFetchViolation\",\n\t\t\t\t\t\treason: \"test1\",\n\t\t\t\t\t\tfrom: 0,\n\t\t\t\t\t\tstart: 1,\n\t\t\t\t\t\tlast: 5,\n\t\t\t\t\t\tlength: 5,\n\t\t\t\t\t\tdetails: JSON.stringify({\n\t\t\t\t\t\t\tvalidLength: 0,\n\t\t\t\t\t\t\tlastValidOpSeqNumber: undefined,\n\t\t\t\t\t\t\tstrict: true,\n\t\t\t\t\t\t}),\n\t\t\t\t\t},\n\t\t\t\t]),\n\t\t\t\t\"Ops fetch violation event not correctly recorded\",\n\t\t\t);\n\t\t});\n\n\t\tit(\"contiguous ops\", () => {\n\t\t\tconst ops = generateOps(1, 5);\n\t\t\tvalidateMessages(\"test2\", ops, 1, mockLogger.toTelemetryLogger(), true);\n\t\t\tassert(ops.length === 5, \"ops should be returned\");\n\t\t\tassert(mockLogger.events.length === 0, \"no events should be there\");\n\t\t});\n\n\t\tit(\"non contiguous ops: strict = true\", () => {\n\t\t\tconst ops = generateOps(1, 5);\n\t\t\t// Change seq number of last op\n\t\t\tops[4].sequenceNumber = 7;\n\t\t\tvalidateMessages(\"test\", ops, 1, mockLogger.toTelemetryLogger(), true);\n\t\t\tassert(ops.length === 0, \"no ops should be returned as strict == true\");\n\t\t\tassert(\n\t\t\t\tmockLogger.matchEventStrict([\n\t\t\t\t\t{\n\t\t\t\t\t\teventName: \"OpsFetchViolation\",\n\t\t\t\t\t\treason: \"test\",\n\t\t\t\t\t\tfrom: 1,\n\t\t\t\t\t\tstart: 1,\n\t\t\t\t\t\tlast: 7,\n\t\t\t\t\t\tlength: 5,\n\t\t\t\t\t\tdetails: JSON.stringify({\n\t\t\t\t\t\t\tvalidLength: 0,\n\t\t\t\t\t\t\tlastValidOpSeqNumber: undefined,\n\t\t\t\t\t\t\tstrict: true,\n\t\t\t\t\t\t}),\n\t\t\t\t\t},\n\t\t\t\t]),\n\t\t\t\t\"Ops fetch violation event not correctly recorded\",\n\t\t\t);\n\t\t});\n\n\t\tit(\"non contiguous ops: strict = false\", () => {\n\t\t\tconst ops = generateOps(1, 5);\n\t\t\t// Change seq number of last op\n\t\t\tops[4].sequenceNumber = 7;\n\t\t\tvalidateMessages(\"test\", ops, 1, mockLogger.toTelemetryLogger(), false);\n\t\t\tassert(ops.length === 4, \"some should be returned as strict == false\");\n\t\t\tassert(\n\t\t\t\tmockLogger.matchEventStrict([\n\t\t\t\t\t{\n\t\t\t\t\t\teventName: \"OpsFetchViolation\",\n\t\t\t\t\t\treason: \"test\",\n\t\t\t\t\t\tfrom: 1,\n\t\t\t\t\t\tstart: 1,\n\t\t\t\t\t\tlast: 7,\n\t\t\t\t\t\tlength: 5,\n\t\t\t\t\t\tdetails: JSON.stringify({\n\t\t\t\t\t\t\tvalidLength: 4,\n\t\t\t\t\t\t\tlastValidOpSeqNumber: 4,\n\t\t\t\t\t\t\tstrict: false,\n\t\t\t\t\t\t}),\n\t\t\t\t\t},\n\t\t\t\t]),\n\t\t\t\t\"Ops fetch violation event not correctly recorded\",\n\t\t\t);\n\t\t});\n\n\t\tit(\"only 1 op: strict = false\", () => {\n\t\t\tconst ops = generateOps(1, 1);\n\t\t\tvalidateMessages(\"test\", ops, 1, mockLogger.toTelemetryLogger(), false);\n\t\t\tassert(ops.length === 1, \"some should be returned as strict == false\");\n\t\t\tassert(mockLogger.events.length === 0, \"no events should be there\");\n\t\t});\n\t});\n});\n"]}

package/lib/test/types/validateDriverBasePrevious.generated.js

@@ -0,0 +1,10 @@
+use_current_ClassDeclaration_DocumentDeltaConnection(get_old_ClassDeclaration_DocumentDeltaConnection());
+use_old_ClassDeclaration_DocumentDeltaConnection(get_current_ClassDeclaration_DocumentDeltaConnection());
+use_current_FunctionDeclaration_getW3CData(get_old_FunctionDeclaration_getW3CData());
+use_old_FunctionDeclaration_getW3CData(get_current_FunctionDeclaration_getW3CData());
+use_current_FunctionDeclaration_promiseRaceWithWinner(get_old_FunctionDeclaration_promiseRaceWithWinner());
+use_old_FunctionDeclaration_promiseRaceWithWinner(get_current_FunctionDeclaration_promiseRaceWithWinner());
+use_current_FunctionDeclaration_validateMessages(get_old_FunctionDeclaration_validateMessages());
+use_old_FunctionDeclaration_validateMessages(get_current_FunctionDeclaration_validateMessages());
+export {};
+//# sourceMappingURL=validateDriverBasePrevious.generated.js.map

package/lib/test/types/validateDriverBasePrevious.generated.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"validateDriverBasePrevious.generated.js","sourceRoot":"","sources":["../../../src/test/types/validateDriverBasePrevious.generated.ts"],"names":[],"mappings":"AAgCA,oDAAoD,CAChD,gDAAgD,EAAE,CAAC,CAAC;AAWxD,gDAAgD,CAC5C,oDAAoD,EAAE,CAAC,CAAC;AAW5D,0CAA0C,CACtC,sCAAsC,EAAE,CAAC,CAAC;AAW9C,sCAAsC,CAClC,0CAA0C,EAAE,CAAC,CAAC;AAWlD,qDAAqD,CACjD,iDAAiD,EAAE,CAAC,CAAC;AAWzD,iDAAiD,CAC7C,qDAAqD,EAAE,CAAC,CAAC;AAW7D,gDAAgD,CAC5C,4CAA4C,EAAE,CAAC,CAAC;AAWpD,4CAA4C,CACxC,gDAAgD,EAAE,CAAC,CAAC","sourcesContent":["/*!\n * Copyright (c) Microsoft Corporation and contributors. All rights reserved.\n * Licensed under the MIT License.\n */\n/*\n * THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.\n * Generated by fluid-type-test-generator in @fluidframework/build-tools.\n */\nimport type * as old from \"@fluidframework/driver-base-previous\";\nimport type * as current from \"../../index.js\";\n\n\n// See 'build-tools/src/type-test-generator/compatibility.ts' for more information.\ntype TypeOnly<T> = T extends number\n\t? number\n\t: T extends string\n\t? string\n\t: T extends boolean | bigint | symbol\n\t? T\n\t: {\n\t\t\t[P in keyof T]: TypeOnly<T[P]>;\n\t  };\n\n/*\n* Validate forward compat by using old type in place of current type\n* If breaking change required, add in package.json under typeValidation.broken:\n* \"ClassDeclaration_DocumentDeltaConnection\": {\"forwardCompat\": false}\n*/\ndeclare function get_old_ClassDeclaration_DocumentDeltaConnection():\n    TypeOnly<old.DocumentDeltaConnection>;\ndeclare function use_current_ClassDeclaration_DocumentDeltaConnection(\n    use: TypeOnly<current.DocumentDeltaConnection>): void;\nuse_current_ClassDeclaration_DocumentDeltaConnection(\n    get_old_ClassDeclaration_DocumentDeltaConnection());\n\n/*\n* Validate back compat by using current type in place of old type\n* If breaking change required, add in package.json under typeValidation.broken:\n* \"ClassDeclaration_DocumentDeltaConnection\": {\"backCompat\": false}\n*/\ndeclare function get_current_ClassDeclaration_DocumentDeltaConnection():\n    TypeOnly<current.DocumentDeltaConnection>;\ndeclare function use_old_ClassDeclaration_DocumentDeltaConnection(\n    use: TypeOnly<old.DocumentDeltaConnection>): void;\nuse_old_ClassDeclaration_DocumentDeltaConnection(\n    get_current_ClassDeclaration_DocumentDeltaConnection());\n\n/*\n* Validate forward compat by using old type in place of current type\n* If breaking change required, add in package.json under typeValidation.broken:\n* \"FunctionDeclaration_getW3CData\": {\"forwardCompat\": false}\n*/\ndeclare function get_old_FunctionDeclaration_getW3CData():\n    TypeOnly<typeof old.getW3CData>;\ndeclare function use_current_FunctionDeclaration_getW3CData(\n    use: TypeOnly<typeof current.getW3CData>): void;\nuse_current_FunctionDeclaration_getW3CData(\n    get_old_FunctionDeclaration_getW3CData());\n\n/*\n* Validate back compat by using current type in place of old type\n* If breaking change required, add in package.json under typeValidation.broken:\n* \"FunctionDeclaration_getW3CData\": {\"backCompat\": false}\n*/\ndeclare function get_current_FunctionDeclaration_getW3CData():\n    TypeOnly<typeof current.getW3CData>;\ndeclare function use_old_FunctionDeclaration_getW3CData(\n    use: TypeOnly<typeof old.getW3CData>): void;\nuse_old_FunctionDeclaration_getW3CData(\n    get_current_FunctionDeclaration_getW3CData());\n\n/*\n* Validate forward compat by using old type in place of current type\n* If breaking change required, add in package.json under typeValidation.broken:\n* \"FunctionDeclaration_promiseRaceWithWinner\": {\"forwardCompat\": false}\n*/\ndeclare function get_old_FunctionDeclaration_promiseRaceWithWinner():\n    TypeOnly<typeof old.promiseRaceWithWinner>;\ndeclare function use_current_FunctionDeclaration_promiseRaceWithWinner(\n    use: TypeOnly<typeof current.promiseRaceWithWinner>): void;\nuse_current_FunctionDeclaration_promiseRaceWithWinner(\n    get_old_FunctionDeclaration_promiseRaceWithWinner());\n\n/*\n* Validate back compat by using current type in place of old type\n* If breaking change required, add in package.json under typeValidation.broken:\n* \"FunctionDeclaration_promiseRaceWithWinner\": {\"backCompat\": false}\n*/\ndeclare function get_current_FunctionDeclaration_promiseRaceWithWinner():\n    TypeOnly<typeof current.promiseRaceWithWinner>;\ndeclare function use_old_FunctionDeclaration_promiseRaceWithWinner(\n    use: TypeOnly<typeof old.promiseRaceWithWinner>): void;\nuse_old_FunctionDeclaration_promiseRaceWithWinner(\n    get_current_FunctionDeclaration_promiseRaceWithWinner());\n\n/*\n* Validate forward compat by using old type in place of current type\n* If breaking change required, add in package.json under typeValidation.broken:\n* \"FunctionDeclaration_validateMessages\": {\"forwardCompat\": false}\n*/\ndeclare function get_old_FunctionDeclaration_validateMessages():\n    TypeOnly<typeof old.validateMessages>;\ndeclare function use_current_FunctionDeclaration_validateMessages(\n    use: TypeOnly<typeof current.validateMessages>): void;\nuse_current_FunctionDeclaration_validateMessages(\n    get_old_FunctionDeclaration_validateMessages());\n\n/*\n* Validate back compat by using current type in place of old type\n* If breaking change required, add in package.json under typeValidation.broken:\n* \"FunctionDeclaration_validateMessages\": {\"backCompat\": false}\n*/\ndeclare function get_current_FunctionDeclaration_validateMessages():\n    TypeOnly<typeof current.validateMessages>;\ndeclare function use_old_FunctionDeclaration_validateMessages(\n    use: TypeOnly<typeof old.validateMessages>): void;\nuse_old_FunctionDeclaration_validateMessages(\n    get_current_FunctionDeclaration_validateMessages());\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluidframework/driver-base",
-  "version": "2.0.0-rc.1.0.6",
+  "version": "2.0.0-rc.2.0.1",
   "description": "Shared driver code for Fluid driver implementations",
   "homepage": "https://fluidframework.com",
   "repository": {
@@ -11,60 +11,40 @@
   "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",
         "default": "./dist/index.js"
       }
     },
-    "./alpha": {
-      "import": {
-        "types": "./lib/driver-base-alpha.d.mts",
-        "default": "./lib/index.mjs"
-      },
-      "require": {
-        "types": "./dist/driver-base-alpha.d.ts",
-        "default": "./dist/index.js"
-      }
-    },
-    "./beta": {
+    "./public": {
       "import": {
-        "types": "./lib/driver-base-beta.d.mts",
-        "default": "./lib/index.mjs"
+        "types": "./lib/driver-base-public.d.ts",
+        "default": "./lib/index.js"
       },
       "require": {
-        "types": "./dist/driver-base-beta.d.ts",
+        "types": "./dist/driver-base-public.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/driver-base-public.d.mts",
-        "default": "./lib/index.mjs"
-      },
-      "require": {
-        "types": "./dist/driver-base-public.d.ts",
-        "default": "./dist/index.js"
-      }
     }
   },
   "main": "dist/index.js",
-  "module": "lib/index.mjs",
   "types": "dist/index.d.ts",
   "c8": {
     "all": true,
@@ -87,37 +67,36 @@
     "temp-directory": "nyc/.nyc_output"
   },
   "dependencies": {
-    "@fluid-internal/client-utils": ">=2.0.0-rc.1.0.6 <2.0.0-rc.1.1.0",
-    "@fluidframework/core-interfaces": ">=2.0.0-rc.1.0.6 <2.0.0-rc.1.1.0",
-    "@fluidframework/core-utils": ">=2.0.0-rc.1.0.6 <2.0.0-rc.1.1.0",
-    "@fluidframework/driver-definitions": ">=2.0.0-rc.1.0.6 <2.0.0-rc.1.1.0",
-    "@fluidframework/driver-utils": ">=2.0.0-rc.1.0.6 <2.0.0-rc.1.1.0",
-    "@fluidframework/protocol-definitions": "^3.1.0",
-    "@fluidframework/telemetry-utils": ">=2.0.0-rc.1.0.6 <2.0.0-rc.1.1.0"
+    "@fluid-internal/client-utils": ">=2.0.0-rc.2.0.1 <2.0.0-rc.2.1.0",
+    "@fluidframework/core-interfaces": ">=2.0.0-rc.2.0.1 <2.0.0-rc.2.1.0",
+    "@fluidframework/core-utils": ">=2.0.0-rc.2.0.1 <2.0.0-rc.2.1.0",
+    "@fluidframework/driver-definitions": ">=2.0.0-rc.2.0.1 <2.0.0-rc.2.1.0",
+    "@fluidframework/driver-utils": ">=2.0.0-rc.2.0.1 <2.0.0-rc.2.1.0",
+    "@fluidframework/protocol-definitions": "^3.2.0",
+    "@fluidframework/telemetry-utils": ">=2.0.0-rc.2.0.1 <2.0.0-rc.2.1.0"
   },
   "devDependencies": {
     "@arethetypeswrong/cli": "^0.13.3",
-    "@fluid-tools/build-cli": "^0.29.0",
+    "@fluid-internal/mocha-test-setup": ">=2.0.0-rc.2.0.1 <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/driver-base-previous": "npm:@fluidframework/driver-base@2.0.0-internal.8.0.0",
-    "@fluidframework/eslint-config-fluid": "^3.2.0",
-    "@fluidframework/mocha-test-setup": ">=2.0.0-rc.1.0.6 <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/mocha": "^9.1.1",
     "@types/node": "^18.19.0",
     "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",
-    "socket.io-client": "^4.6.1",
-    "tsc-multi": "^1.1.0",
+    "socket.io-client": "^4.7.3",
     "typescript": "~5.1.6"
   },
   "fluidBuild": {
@@ -129,11 +108,7 @@
           "api-extractor:esnext"
         ],
         "script": false
-      },
-      "tsc": [
-        "...",
-        "typetests:gen"
-      ]
+      }
     }
   },
   "typeValidation": {
@@ -141,15 +116,17 @@
   },
   "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",
@@ -163,9 +140,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",
     "typetests:gen": "fluid-type-test-generator",
     "typetests:prepare": "flub typetests --dir . --reset --previous --normalize"
   }

package/src/documentDeltaConnection.ts

@@ -22,7 +22,7 @@ import {
 	ITokenClaims,
 	ScopeType,
 } from "@fluidframework/protocol-definitions";
-import { IDisposable, ITelemetryProperties, LogLevel } from "@fluidframework/core-interfaces";
+import { IDisposable, ITelemetryBaseProperties, LogLevel } from "@fluidframework/core-interfaces";
 import {
 	ITelemetryLoggerExt,
 	extractLogSafeErrorProperties,
@@ -34,7 +34,7 @@ import {
 } from "@fluidframework/telemetry-utils";
 import type { Socket } from "socket.io-client";
 // For now, this package is versioned and released in unison with the specific drivers
-import { pkgVersion as driverVersion } from "./packageVersion";
+import { pkgVersion as driverVersion } from "./packageVersion.js";
 
 /**
  * Represents a connection to a stream of delta updates.
@@ -131,7 +131,9 @@ export class DocumentDeltaConnection
 			logger.sendErrorEvent(
 				{
 					eventName: "DeltaConnection:EventException",
-					name: name as string,
+					// Coerce to string as past typings also allowed symbols and number, but
+					// we want telemtry properties to be consistently string.
+					name: String(name),
 				},
 				error,
 			);
@@ -733,7 +735,7 @@ export class DocumentDeltaConnection
 	private createErrorObjectWithProps(
 		handler: string,
 		error?: any,
-		props?: ITelemetryProperties,
+		props?: ITelemetryBaseProperties,
 		canRetry = true,
 	): IAnyDriverError {
 		return createGenericNetworkError(

package/src/index.ts

@@ -3,5 +3,5 @@
  * Licensed under the MIT License.
  */
 
-export { DocumentDeltaConnection } from "./documentDeltaConnection";
-export { getW3CData, promiseRaceWithWinner, validateMessages } from "./driverUtils";
+export { DocumentDeltaConnection } from "./documentDeltaConnection.js";
+export { getW3CData, promiseRaceWithWinner, validateMessages } from "./driverUtils.js";

package/src/packageVersion.ts

@@ -6,4 +6,4 @@
  */
 
 export const pkgName = "@fluidframework/driver-base";
-export const pkgVersion = "2.0.0-rc.1.0.6";
+export const pkgVersion = "2.0.0-rc.2.0.1";

package/tsconfig.cjs.json

@@ -0,0 +1,7 @@
+{
+	// This config must be used in a "type": "commonjs" environment. (Use fluid-tsc commonjs.)
+	"extends": "./tsconfig.json",
+	"compilerOptions": {
+		"outDir": "./dist",
+	},
+}

package/tsconfig.json

@@ -1,12 +1,9 @@
 {
-	"extends": [
-		"../../../common/build/build-common/tsconfig.base.json",
-		"../../../common/build/build-common/tsconfig.cjs.json",
-	],
+	"extends": "../../../common/build/build-common/tsconfig.node16.json",
 	"include": ["src/**/*"],
 	"exclude": ["src/test/**/*"],
 	"compilerOptions": {
 		"rootDir": "./src",
-		"outDir": "./dist",
+		"outDir": "./lib",
 	},
 }

package/lib/documentDeltaConnection.d.mts.map

@@ -1 +0,0 @@
-{"version":3,"file":"documentDeltaConnection.d.mts","sourceRoot":"","sources":["../src/documentDeltaConnection.ts"],"names":[],"mappings":"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"}