@fluidframework/container-runtime 2.0.0-internal.3.0.0 → 2.0.0-internal.3.1.0

package/package.json

@@ -1,151 +1,123 @@
 {
-  "name": "@fluidframework/container-runtime",
-  "version": "2.0.0-internal.3.0.0",
-  "description": "Fluid container runtime",
-  "homepage": "https://fluidframework.com",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/microsoft/FluidFramework.git",
-    "directory": "packages/runtime/container-runtime"
-  },
-  "license": "MIT",
-  "author": "Microsoft and contributors",
-  "sideEffects": false,
-  "main": "dist/index.js",
-  "module": "lib/index.js",
-  "types": "dist/index.d.ts",
-  "scripts": {
-    "build": "npm run build:genver && concurrently npm:build:compile npm:lint && npm run build:docs",
-    "build:commonjs": "npm run tsc && npm run typetests:gen && npm run build:test",
-    "build:compile": "concurrently npm:build:commonjs npm:build:esnext",
-    "build:docs": "api-extractor run --local --typescript-compiler-folder ../../../node_modules/typescript && copyfiles -u 1 ./_api-extractor-temp/doc-models/* ../../../_api-extractor-temp/",
-    "build:esnext": "tsc --project ./tsconfig.esnext.json",
-    "build:full": "npm run build",
-    "build:full:compile": "npm run build:compile",
-    "build:genver": "gen-version",
-    "build:test": "tsc --project ./src/test/tsconfig.json",
-    "ci:build:docs": "api-extractor run --typescript-compiler-folder ../../../node_modules/typescript && copyfiles -u 1 ./_api-extractor-temp/doc-models/* ../../../_api-extractor-temp/",
-    "clean": "rimraf dist lib *.tsbuildinfo *.build.log",
-    "eslint": "eslint --format stylish src",
-    "eslint:fix": "eslint --format stylish src --fix --fix-type problem,suggestion,layout",
-    "format": "npm run prettier:fix",
-    "lint": "npm run eslint",
-    "lint:fix": "npm run eslint:fix",
-    "prettier": "prettier --check . --ignore-path ../../../.prettierignore",
-    "prettier:fix": "prettier --write . --ignore-path ../../../.prettierignore",
-    "test": "npm run test:mocha",
-    "test:coverage": "nyc npm test -- --reporter xunit --reporter-option output=nyc/junit-report.xml",
-    "test:mocha": "mocha --ignore 'dist/test/types/*' --recursive dist/test -r node_modules/@fluidframework/mocha-test-setup --unhandled-rejections=strict",
-    "test:mocha:verbose": "cross-env FLUID_TEST_VERBOSE=1 npm run test:mocha",
-    "tsc": "tsc",
-    "tsc:watch": "tsc --watch",
-    "typetests:gen": "flub generate typetests --generate --dir .",
-    "typetests:prepare": "flub generate typetests --prepare --dir . --pin"
-  },
-  "nyc": {
-    "all": true,
-    "cache-dir": "nyc/.cache",
-    "exclude": [
-      "src/test/**/*.ts",
-      "dist/test/**/*.js"
-    ],
-    "exclude-after-remap": false,
-    "include": [
-      "src/**/*.ts",
-      "dist/**/*.js"
-    ],
-    "report-dir": "nyc/report",
-    "reporter": [
-      "cobertura",
-      "html",
-      "text"
-    ],
-    "temp-directory": "nyc/.nyc_output"
-  },
-  "dependencies": {
-    "@fluidframework/common-definitions": "^0.20.1",
-    "@fluidframework/common-utils": "^1.0.0",
-    "@fluidframework/container-definitions": ">=2.0.0-internal.3.0.0 <2.0.0-internal.4.0.0",
-    "@fluidframework/container-runtime-definitions": ">=2.0.0-internal.3.0.0 <2.0.0-internal.4.0.0",
-    "@fluidframework/container-utils": ">=2.0.0-internal.3.0.0 <2.0.0-internal.4.0.0",
-    "@fluidframework/core-interfaces": ">=2.0.0-internal.3.0.0 <2.0.0-internal.4.0.0",
-    "@fluidframework/datastore": ">=2.0.0-internal.3.0.0 <2.0.0-internal.4.0.0",
-    "@fluidframework/driver-definitions": ">=2.0.0-internal.3.0.0 <2.0.0-internal.4.0.0",
-    "@fluidframework/driver-utils": ">=2.0.0-internal.3.0.0 <2.0.0-internal.4.0.0",
-    "@fluidframework/garbage-collector": ">=2.0.0-internal.3.0.0 <2.0.0-internal.4.0.0",
-    "@fluidframework/protocol-base": "^0.1038.2000",
-    "@fluidframework/protocol-definitions": "^1.1.0",
-    "@fluidframework/runtime-definitions": ">=2.0.0-internal.3.0.0 <2.0.0-internal.4.0.0",
-    "@fluidframework/runtime-utils": ">=2.0.0-internal.3.0.0 <2.0.0-internal.4.0.0",
-    "@fluidframework/telemetry-utils": ">=2.0.0-internal.3.0.0 <2.0.0-internal.4.0.0",
-    "double-ended-queue": "^2.1.0-0",
-    "events": "^3.1.0",
-    "lz4js": "^0.2.0",
-    "uuid": "^8.3.1"
-  },
-  "devDependencies": {
-    "@fluid-tools/build-cli": "^0.8.0",
-    "@fluidframework/build-common": "^1.1.0",
-    "@fluidframework/build-tools": "^0.8.0",
-    "@fluidframework/container-runtime-previous": "npm:@fluidframework/container-runtime@2.0.0-internal.2.2.0",
-    "@fluidframework/eslint-config-fluid": "^2.0.0",
-    "@fluidframework/mocha-test-setup": ">=2.0.0-internal.3.0.0 <2.0.0-internal.4.0.0",
-    "@fluidframework/test-runtime-utils": ">=2.0.0-internal.3.0.0 <2.0.0-internal.4.0.0",
-    "@microsoft/api-extractor": "^7.22.2",
-    "@rushstack/eslint-config": "^2.5.1",
-    "@types/double-ended-queue": "^2.1.0",
-    "@types/events": "^3.0.0",
-    "@types/mocha": "^9.1.1",
-    "@types/sinon": "^7.0.13",
-    "@types/uuid": "^8.3.0",
-    "concurrently": "^6.2.0",
-    "copyfiles": "^2.4.1",
-    "cross-env": "^7.0.2",
-    "eslint": "~8.6.0",
-    "mocha": "^10.0.0",
-    "nyc": "^15.0.0",
-    "rimraf": "^2.6.2",
-    "sinon": "^7.4.2",
-    "typescript": "~4.5.5"
-  },
-  "typeValidation": {
-    "version": "2.0.0-internal.3.0.0",
-    "baselineRange": ">=2.0.0-internal.2.0.0 <2.0.0-internal.3.0.0",
-    "baselineVersion": "2.0.0-internal.2.2.0",
-    "broken": {
-      "RemovedVariableDeclaration_gcBlobPrefix": {
-        "forwardCompat": false,
-        "backCompat": false
-      },
-      "RemovedVariableDeclaration_gcTombstoneBlobKey": {
-        "forwardCompat": false,
-        "backCompat": false
-      },
-      "RemovedVariableDeclaration_gcTreeKey": {
-        "forwardCompat": false,
-        "backCompat": false
-      },
-      "VariableDeclaration_DefaultSummaryConfiguration": {
-        "backCompat": false
-      },
-      "InterfaceDeclaration_ISummaryBaseConfiguration": {
-        "backCompat": false
-      },
-      "TypeAliasDeclaration_ISummaryConfiguration": {
-        "backCompat": false
-      },
-      "InterfaceDeclaration_ISummaryConfigurationDisableHeuristics": {
-        "backCompat": false
-      },
-      "InterfaceDeclaration_ISummaryConfigurationHeuristics": {
-        "backCompat": false
-      },
-      "ClassDeclaration_ContainerRuntime": {
-        "forwardCompat": false
-      },
-      "InterfaceDeclaration_ISummarizerRuntime": {
-        "backCompat": false
-      }
-    }
-  }
+	"name": "@fluidframework/container-runtime",
+	"version": "2.0.0-internal.3.1.0",
+	"description": "Fluid container runtime",
+	"homepage": "https://fluidframework.com",
+	"repository": {
+		"type": "git",
+		"url": "https://github.com/microsoft/FluidFramework.git",
+		"directory": "packages/runtime/container-runtime"
+	},
+	"license": "MIT",
+	"author": "Microsoft and contributors",
+	"sideEffects": false,
+	"main": "dist/index.js",
+	"module": "lib/index.js",
+	"types": "dist/index.d.ts",
+	"scripts": {
+		"build": "npm run build:genver && concurrently npm:build:compile npm:lint && npm run build:docs",
+		"build:commonjs": "npm run tsc && npm run typetests:gen && npm run build:test",
+		"build:compile": "concurrently npm:build:commonjs npm:build:esnext",
+		"build:docs": "api-extractor run --local --typescript-compiler-folder ../../../node_modules/typescript && copyfiles -u 1 ./_api-extractor-temp/doc-models/* ../../../_api-extractor-temp/",
+		"build:esnext": "tsc --project ./tsconfig.esnext.json",
+		"build:full": "npm run build",
+		"build:full:compile": "npm run build:compile",
+		"build:genver": "gen-version",
+		"build:test": "tsc --project ./src/test/tsconfig.json",
+		"ci:build:docs": "api-extractor run --typescript-compiler-folder ../../../node_modules/typescript && copyfiles -u 1 ./_api-extractor-temp/doc-models/* ../../../_api-extractor-temp/",
+		"clean": "rimraf dist lib *.tsbuildinfo *.build.log",
+		"eslint": "eslint --format stylish src",
+		"eslint:fix": "eslint --format stylish src --fix --fix-type problem,suggestion,layout",
+		"format": "npm run prettier:fix",
+		"lint": "npm run prettier && npm run eslint",
+		"lint:fix": "npm run prettier:fix &&npm run eslint:fix",
+		"prettier": "prettier --check . --ignore-path ../../../.prettierignore",
+		"prettier:fix": "prettier --write . --ignore-path ../../../.prettierignore",
+		"test": "npm run test:mocha",
+		"test:coverage": "nyc npm test -- --reporter xunit --reporter-option output=nyc/junit-report.xml",
+		"test:mocha": "mocha --ignore 'dist/test/types/*' --recursive dist/test -r node_modules/@fluidframework/mocha-test-setup --unhandled-rejections=strict",
+		"test:mocha:verbose": "cross-env FLUID_TEST_VERBOSE=1 npm run test:mocha",
+		"tsc": "tsc",
+		"tsc:watch": "tsc --watch",
+		"typetests:gen": "flub generate typetests --generate --dir .",
+		"typetests:prepare": "flub generate typetests --prepare --dir . --pin"
+	},
+	"nyc": {
+		"all": true,
+		"cache-dir": "nyc/.cache",
+		"exclude": [
+			"src/test/**/*.ts",
+			"dist/test/**/*.js"
+		],
+		"exclude-after-remap": false,
+		"include": [
+			"src/**/*.ts",
+			"dist/**/*.js"
+		],
+		"report-dir": "nyc/report",
+		"reporter": [
+			"cobertura",
+			"html",
+			"text"
+		],
+		"temp-directory": "nyc/.nyc_output"
+	},
+	"dependencies": {
+		"@fluidframework/common-definitions": "^0.20.1",
+		"@fluidframework/common-utils": "^1.0.0",
+		"@fluidframework/container-definitions": ">=2.0.0-internal.3.1.0 <2.0.0-internal.4.0.0",
+		"@fluidframework/container-runtime-definitions": ">=2.0.0-internal.3.1.0 <2.0.0-internal.4.0.0",
+		"@fluidframework/container-utils": ">=2.0.0-internal.3.1.0 <2.0.0-internal.4.0.0",
+		"@fluidframework/core-interfaces": ">=2.0.0-internal.3.1.0 <2.0.0-internal.4.0.0",
+		"@fluidframework/datastore": ">=2.0.0-internal.3.1.0 <2.0.0-internal.4.0.0",
+		"@fluidframework/driver-definitions": ">=2.0.0-internal.3.1.0 <2.0.0-internal.4.0.0",
+		"@fluidframework/driver-utils": ">=2.0.0-internal.3.1.0 <2.0.0-internal.4.0.0",
+		"@fluidframework/garbage-collector": ">=2.0.0-internal.3.1.0 <2.0.0-internal.4.0.0",
+		"@fluidframework/protocol-base": "^0.1038.2000",
+		"@fluidframework/protocol-definitions": "^1.1.0",
+		"@fluidframework/runtime-definitions": ">=2.0.0-internal.3.1.0 <2.0.0-internal.4.0.0",
+		"@fluidframework/runtime-utils": ">=2.0.0-internal.3.1.0 <2.0.0-internal.4.0.0",
+		"@fluidframework/telemetry-utils": ">=2.0.0-internal.3.1.0 <2.0.0-internal.4.0.0",
+		"double-ended-queue": "^2.1.0-0",
+		"events": "^3.1.0",
+		"lz4js": "^0.2.0",
+		"uuid": "^8.3.1"
+	},
+	"devDependencies": {
+		"@fluid-tools/build-cli": "^0.9.0",
+		"@fluidframework/build-common": "^1.1.0",
+		"@fluidframework/build-tools": "^0.9.0",
+		"@fluidframework/container-runtime-previous": "npm:@fluidframework/container-runtime@2.0.0-internal.3.0.0",
+		"@fluidframework/eslint-config-fluid": "^2.0.0",
+		"@fluidframework/mocha-test-setup": ">=2.0.0-internal.3.1.0 <2.0.0-internal.4.0.0",
+		"@fluidframework/test-runtime-utils": ">=2.0.0-internal.3.1.0 <2.0.0-internal.4.0.0",
+		"@microsoft/api-extractor": "^7.22.2",
+		"@rushstack/eslint-config": "^2.5.1",
+		"@types/double-ended-queue": "^2.1.0",
+		"@types/events": "^3.0.0",
+		"@types/mocha": "^9.1.1",
+		"@types/sinon": "^7.0.13",
+		"@types/uuid": "^8.3.0",
+		"concurrently": "^6.2.0",
+		"copyfiles": "^2.4.1",
+		"cross-env": "^7.0.2",
+		"eslint": "~8.6.0",
+		"mocha": "^10.0.0",
+		"nyc": "^15.0.0",
+		"prettier": "~2.6.2",
+		"rimraf": "^2.6.2",
+		"sinon": "^7.4.2",
+		"typescript": "~4.5.5"
+	},
+	"typeValidation": {
+		"version": "2.0.0-internal.3.1.0",
+		"previousVersionStyle": "~previousMinor",
+		"baselineRange": ">=2.0.0-internal.3.0.0 <2.0.0-internal.3.1.0",
+		"baselineVersion": "2.0.0-internal.3.0.0",
+		"broken": {
+			"ClassDeclaration_ContainerRuntime": {
+				"forwardCompat": false
+			}
+		}
+	}
 }

package/prettier.config.cjs

@@ -4,5 +4,5 @@
  */
 
 module.exports = {
-    ...require("@fluidframework/build-common/prettier.config.cjs"),
+	...require("@fluidframework/build-common/prettier.config.cjs"),
 };

package/src/batchTracker.ts

@@ -10,57 +10,62 @@ import { ISequencedDocumentMessage } from "@fluidframework/protocol-definitions"
 import { ChildLogger } from "@fluidframework/telemetry-utils";
 
 export class BatchTracker {
-    private readonly logger: ITelemetryLogger;
-    private startBatchSequenceNumber: number | undefined;
-    private trackedBatchCount: number = 0;
-    private batchProcessingStartTimeStamp: number | undefined;
+	private readonly logger: ITelemetryLogger;
+	private startBatchSequenceNumber: number | undefined;
+	private trackedBatchCount: number = 0;
+	private batchProcessingStartTimeStamp: number | undefined;
 
-    constructor(
-        private readonly batchEventEmitter: EventEmitter,
-        logger: ITelemetryLogger,
-        batchLengthThreshold: number,
-        batchCountSamplingRate: number,
-        dateTimeProvider: () => number = () => performance.now(),
-    ) {
-        this.logger = ChildLogger.create(logger, "Batching");
+	constructor(
+		private readonly batchEventEmitter: EventEmitter,
+		logger: ITelemetryLogger,
+		batchLengthThreshold: number,
+		batchCountSamplingRate: number,
+		dateTimeProvider: () => number = () => performance.now(),
+	) {
+		this.logger = ChildLogger.create(logger, "Batching");
 
-        this.batchEventEmitter.on("batchBegin", (message: ISequencedDocumentMessage) => {
-            this.startBatchSequenceNumber = message.sequenceNumber;
-            this.batchProcessingStartTimeStamp = dateTimeProvider();
-            this.trackedBatchCount++;
-        });
+		this.batchEventEmitter.on("batchBegin", (message: ISequencedDocumentMessage) => {
+			this.startBatchSequenceNumber = message.sequenceNumber;
+			this.batchProcessingStartTimeStamp = dateTimeProvider();
+			this.trackedBatchCount++;
+		});
 
-        this.batchEventEmitter.on("batchEnd", (error: any | undefined, message: ISequencedDocumentMessage) => {
-            assert(
-                this.startBatchSequenceNumber !== undefined && this.batchProcessingStartTimeStamp !== undefined,
-                0x2ba /* "batchBegin must fire before batchEnd" */);
+		this.batchEventEmitter.on(
+			"batchEnd",
+			(error: any | undefined, message: ISequencedDocumentMessage) => {
+				assert(
+					this.startBatchSequenceNumber !== undefined &&
+						this.batchProcessingStartTimeStamp !== undefined,
+					0x2ba /* "batchBegin must fire before batchEnd" */,
+				);
 
-            const length = message.sequenceNumber - this.startBatchSequenceNumber + 1;
-            if (length >= batchLengthThreshold) {
-                this.logger.sendPerformanceEvent({
-                    eventName: "LengthTooBig",
-                    length,
-                    threshold: batchLengthThreshold,
-                    batchEndSequenceNumber: message.sequenceNumber,
-                    duration: dateTimeProvider() - this.batchProcessingStartTimeStamp,
-                    batchError: error !== undefined,
-                });
-            }
+				const length = message.sequenceNumber - this.startBatchSequenceNumber + 1;
+				if (length >= batchLengthThreshold) {
+					this.logger.sendPerformanceEvent({
+						eventName: "LengthTooBig",
+						length,
+						threshold: batchLengthThreshold,
+						batchEndSequenceNumber: message.sequenceNumber,
+						duration: dateTimeProvider() - this.batchProcessingStartTimeStamp,
+						batchError: error !== undefined,
+					});
+				}
 
-            if (this.trackedBatchCount % batchCountSamplingRate === 0) {
-                this.logger.sendPerformanceEvent({
-                    eventName: "Length",
-                    length,
-                    samplingRate: batchCountSamplingRate,
-                    batchEndSequenceNumber: message.sequenceNumber,
-                    duration: dateTimeProvider() - this.batchProcessingStartTimeStamp,
-                });
-            }
+				if (this.trackedBatchCount % batchCountSamplingRate === 0) {
+					this.logger.sendPerformanceEvent({
+						eventName: "Length",
+						length,
+						samplingRate: batchCountSamplingRate,
+						batchEndSequenceNumber: message.sequenceNumber,
+						duration: dateTimeProvider() - this.batchProcessingStartTimeStamp,
+					});
+				}
 
-            this.startBatchSequenceNumber = undefined;
-            this.batchProcessingStartTimeStamp = undefined;
-        });
-    }
+				this.startBatchSequenceNumber = undefined;
+				this.batchProcessingStartTimeStamp = undefined;
+			},
+		);
+	}
 }
 
 /**
@@ -72,8 +77,8 @@ export class BatchTracker {
  * @param batchCountSamplingRate - rate for batches for which to send an event with its characteristics
  */
 export const BindBatchTracker = (
-    batchEventEmitter: EventEmitter,
-    logger: ITelemetryLogger,
-    batchLengthThreshold: number = 1000,
-    batchCountSamplingRate: number = 1000,
+	batchEventEmitter: EventEmitter,
+	logger: ITelemetryLogger,
+	batchLengthThreshold: number = 1000,
+	batchCountSamplingRate: number = 1000,
 ) => new BatchTracker(batchEventEmitter, logger, batchLengthThreshold, batchCountSamplingRate);