@fluidframework/test-utils 0.49.0 → 0.50.0-41540

package/dist/testObjectProvider.js.map

@@ -1 +1 @@
-{"version":3,"file":"testObjectProvider.js","sourceRoot":"","sources":["../src/testObjectProvider.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 { IContainer, IHostLoader, ILoaderOptions } from \"@fluidframework/container-definitions\";\nimport { ITelemetryBaseLogger } from \"@fluidframework/common-definitions\";\nimport { Container, IDetachedBlobStorage, Loader, waitContainerToCatchUp } from \"@fluidframework/container-loader\";\nimport { IContainerRuntimeOptions } from \"@fluidframework/container-runtime\";\nimport { IFluidCodeDetails, IRequestHeader } from \"@fluidframework/core-interfaces\";\nimport { IDocumentServiceFactory, IUrlResolver } from \"@fluidframework/driver-definitions\";\nimport { ITestDriver } from \"@fluidframework/test-driver-definitions\";\nimport { v4 as uuid } from \"uuid\";\nimport { ChildLogger, MultiSinkLogger } from \"@fluidframework/telemetry-utils\";\nimport { LoaderContainerTracker } from \"./loaderContainerTracker\";\nimport { fluidEntryPoint, LocalCodeLoader } from \"./localCodeLoader\";\nimport { createAndAttachContainer } from \"./localLoader\";\nimport { ChannelFactoryRegistry } from \"./testFluidObject\";\n\nconst defaultCodeDetails: IFluidCodeDetails = {\n    package: \"defaultTestPackage\",\n    config: {},\n};\n\nexport interface IOpProcessingController {\n    processIncoming(...containers: IContainer[]): Promise<void>;\n    processOutgoing(...containers: IContainer[]): Promise<void>;\n    pauseProcessing(...containers: IContainer[]): Promise<void>;\n    resumeProcessing(...containers: IContainer[]): void;\n}\n\nexport interface ITestObjectProvider {\n    createLoader(\n        packageEntries: Iterable<[IFluidCodeDetails, fluidEntryPoint]>,\n        options?: ITestLoaderOptions,\n        detachedBlobStorage?: IDetachedBlobStorage,\n    ): IHostLoader;\n    createContainer(entryPoint: fluidEntryPoint, options?: ITestLoaderOptions): Promise<IContainer>;\n    loadContainer(\n        entryPoint: fluidEntryPoint,\n        options?: ITestLoaderOptions,\n        requestHeader?: IRequestHeader,\n    ): Promise<IContainer>;\n\n    /**\n     * Used to create a test Container. The Loader/ContainerRuntime/DataRuntime might be different versioned.\n     * In generateLocalCompatTest(), this Container and its runtime will be arbitrarily-versioned.\n     */\n    makeTestLoader(testContainerConfig?: ITestContainerConfig, detachedBlobStorage?: IDetachedBlobStorage): IHostLoader,\n    makeTestContainer(testContainerConfig?: ITestContainerConfig): Promise<IContainer>,\n    loadTestContainer(testContainerConfig?: ITestContainerConfig): Promise<IContainer>,\n\n    logger: ITelemetryBaseLogger,\n    documentServiceFactory: IDocumentServiceFactory,\n    urlResolver: IUrlResolver,\n    defaultCodeDetails: IFluidCodeDetails,\n    opProcessingController: IOpProcessingController,\n\n    ensureSynchronized(): Promise<void>;\n    reset(): void,\n\n    documentId: string,\n    driver: ITestDriver;\n}\n\nexport enum DataObjectFactoryType {\n    Primed, // default\n    Test,\n}\n\nexport interface ITestContainerConfig {\n    // TestFluidDataObject instead of PrimedDataStore\n    fluidDataObjectType?: DataObjectFactoryType,\n\n    // And array of channel name and DDS factory pair to create on container creation time\n    registry?: ChannelFactoryRegistry,\n\n    // Container runtime options for the container instance\n    runtimeOptions?: IContainerRuntimeOptions,\n}\n\n// new interface to help inject custom loggers to tests\nexport interface ITestLoaderOptions extends ILoaderOptions {\n    logger?: ITelemetryBaseLogger;\n}\nexport const createDocumentId = (): string => uuid();\n\n/**\n * Shared base class for test object provider.  Contain code for loader and container creation and loading\n */\nexport class TestObjectProvider {\n    private readonly _loaderContainerTracker = new LoaderContainerTracker();\n    private _documentServiceFactory: IDocumentServiceFactory | undefined;\n    private _urlResolver: IUrlResolver | undefined;\n    private _documentId?: string;\n    private _logger: ITelemetryBaseLogger | undefined;\n\n    /**\n     * Manage objects for loading and creating container, including the driver, loader, and OpProcessingController\n     * @param createFluidEntryPoint - callback to create a fluidEntryPoint, with an optiona; set of channel name\n     * and factory for TestFluidObject\n     */\n    constructor(\n        public readonly LoaderConstructor: typeof Loader,\n        public readonly driver: ITestDriver,\n        private readonly createFluidEntryPoint: (testContainerConfig?: ITestContainerConfig) => fluidEntryPoint,\n    ) {\n\n    }\n\n    get logger() {\n        if (this._logger === undefined) {\n            this._logger = ChildLogger.create(getTestLogger?.(), undefined,\n                {\n                    all: {\n                        driverType: this.driver.type,\n                        driverEndpointName: this.driver.endpointName,\n                    },\n                });\n        }\n        return this._logger;\n    }\n\n    get documentServiceFactory() {\n        if (!this._documentServiceFactory) {\n            this._documentServiceFactory = this.driver.createDocumentServiceFactory();\n        }\n        return this._documentServiceFactory;\n    }\n\n    get urlResolver() {\n        if (!this._urlResolver) {\n            this._urlResolver = this.driver.createUrlResolver();\n        }\n        return this._urlResolver;\n    }\n\n    get documentId() {\n        if (this._documentId === undefined) {\n            this._documentId = createDocumentId();\n        }\n        return this._documentId;\n    }\n\n    get defaultCodeDetails() {\n        return defaultCodeDetails;\n    }\n\n    get opProcessingController(): IOpProcessingController {\n        return this._loaderContainerTracker;\n    }\n\n    /**\n     * Create a loader.  Container created/loaded thru this loader will not be automatically added\n     * to the OpProcessingController, and will need to be added manually if needed.\n     *\n     * Only the version of the loader will vary based on compat config. The version of\n     * containerRuntime/dataRuntime used in fluidEntryPoint will be used as is from what is passed in.\n     *\n     * @param packageEntries - list of code details and fluidEntryPoint pairs.\n     */\n    public createLoader(\n        packageEntries: Iterable<[IFluidCodeDetails, fluidEntryPoint]>,\n        options?: ITestLoaderOptions,\n        detachedBlobStorage?: IDetachedBlobStorage,\n    ) {\n        const multiSinkLogger = new MultiSinkLogger();\n        multiSinkLogger.addLogger(this.logger);\n        if (options?.logger !== undefined) {\n            multiSinkLogger.addLogger(options.logger);\n        }\n\n        const codeLoader = new LocalCodeLoader(packageEntries);\n        const loader = new this.LoaderConstructor({\n            urlResolver: this.urlResolver,\n            documentServiceFactory: this.documentServiceFactory,\n            codeLoader,\n            logger: multiSinkLogger,\n            options,\n            detachedBlobStorage,\n        });\n        this._loaderContainerTracker.add(loader);\n        return loader;\n    }\n\n    /**\n     * Create a container using a default document id and code details.\n     * Container created is automatically added to the OpProcessingController to manage op flow\n     *\n     * Only the version of the loader will vary based on compat config. The version of\n     * containerRuntime/dataRuntime used in fluidEntryPoint will be used as is from what is passed in.\n     *\n     * @param packageEntries - list of code details and fluidEntryPoint pairs.\n     */\n    public async createContainer(entryPoint: fluidEntryPoint, options?: ITestLoaderOptions) {\n        const loader = this.createLoader([[defaultCodeDetails, entryPoint]], options);\n        const container = await createAndAttachContainer(\n            defaultCodeDetails,\n            loader,\n            this.driver.createCreateNewRequest(this.documentId),\n        );\n        return container;\n    }\n\n    public async loadContainer(entryPoint: fluidEntryPoint, options?: ITestLoaderOptions,\n        requestHeader?: IRequestHeader) {\n        const loader = this.createLoader([[defaultCodeDetails, entryPoint]], options);\n        return loader.resolve({ url: await this.driver.createContainerUrl(this.documentId), headers: requestHeader });\n    }\n\n    /**\n     * Make a test loader.  Container created/loaded thru this loader will not be automatically added\n     * to the OpProcessingController, and will need to be added manually if needed.\n     * The version of the loader/containerRuntime/dataRuntime may vary based on compat config of the current run\n     * @param testContainerConfig - optional configuring the test Container\n     */\n    public makeTestLoader(testContainerConfig?: ITestContainerConfig, detachedBlobStorage?: IDetachedBlobStorage) {\n        return this.createLoader(\n            [[defaultCodeDetails, this.createFluidEntryPoint(testContainerConfig)]],\n            undefined,\n            detachedBlobStorage,\n        );\n    }\n\n    /**\n     * Make a container using a default document id and code details\n     * Container loaded is automatically added to the OpProcessingController to manage op flow\n     * @param testContainerConfig - optional configuring the test Container\n     */\n    public async makeTestContainer(testContainerConfig?: ITestContainerConfig): Promise<IContainer> {\n        const loader = this.makeTestLoader(testContainerConfig);\n        const container =\n            await createAndAttachContainer(\n                defaultCodeDetails,\n                loader,\n                this.driver.createCreateNewRequest(this.documentId));\n        return container;\n    }\n\n    /**\n     * Load a container using a default document id and code details.\n     * Container loaded is automatically added to the OpProcessingController to manage op flow\n     * @param testContainerConfig - optional configuring the test Container\n     */\n    public async loadTestContainer(testContainerConfig?: ITestContainerConfig): Promise<Container> {\n        const loader = this.makeTestLoader(testContainerConfig);\n        const container = await loader.resolve({ url: await this.driver.createContainerUrl(this.documentId) });\n        await waitContainerToCatchUp(container);\n        return container;\n    }\n\n    public reset() {\n        this._loaderContainerTracker.reset();\n        this._documentServiceFactory = undefined;\n        this._urlResolver = undefined;\n        this._documentId = undefined;\n        this._logger = undefined;\n    }\n\n    public async ensureSynchronized() {\n        return this._loaderContainerTracker.ensureSynchronized();\n    }\n}\n"]}
+{"version":3,"file":"testObjectProvider.js","sourceRoot":"","sources":["../src/testObjectProvider.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 { IContainer, IHostLoader, ILoaderOptions } from \"@fluidframework/container-definitions\";\nimport { ITelemetryBaseLogger } from \"@fluidframework/common-definitions\";\nimport { Container, IDetachedBlobStorage, Loader, waitContainerToCatchUp } from \"@fluidframework/container-loader\";\nimport { IContainerRuntimeOptions } from \"@fluidframework/container-runtime\";\nimport { IFluidCodeDetails, IRequestHeader } from \"@fluidframework/core-interfaces\";\nimport { IDocumentServiceFactory, IResolvedUrl, IUrlResolver } from \"@fluidframework/driver-definitions\";\nimport { ensureFluidResolvedUrl } from \"@fluidframework/driver-utils\";\nimport { ITestDriver, TestDriverTypes } from \"@fluidframework/test-driver-definitions\";\nimport { v4 as uuid } from \"uuid\";\nimport { ChildLogger, MultiSinkLogger } from \"@fluidframework/telemetry-utils\";\nimport { LoaderContainerTracker } from \"./loaderContainerTracker\";\nimport { fluidEntryPoint, LocalCodeLoader } from \"./localCodeLoader\";\nimport { createAndAttachContainer } from \"./localLoader\";\nimport { ChannelFactoryRegistry } from \"./testFluidObject\";\n\nconst defaultCodeDetails: IFluidCodeDetails = {\n    package: \"defaultTestPackage\",\n    config: {},\n};\n\nexport interface IOpProcessingController {\n    processIncoming(...containers: IContainer[]): Promise<void>;\n    processOutgoing(...containers: IContainer[]): Promise<void>;\n    pauseProcessing(...containers: IContainer[]): Promise<void>;\n    resumeProcessing(...containers: IContainer[]): void;\n}\n\nexport interface ITestObjectProvider {\n    createLoader(\n        packageEntries: Iterable<[IFluidCodeDetails, fluidEntryPoint]>,\n        options?: ITestLoaderOptions,\n        detachedBlobStorage?: IDetachedBlobStorage,\n    ): IHostLoader;\n    createContainer(entryPoint: fluidEntryPoint, options?: ITestLoaderOptions): Promise<IContainer>;\n    loadContainer(\n        entryPoint: fluidEntryPoint,\n        options?: ITestLoaderOptions,\n        requestHeader?: IRequestHeader,\n    ): Promise<IContainer>;\n\n    /**\n     * Used to create a test Container. The Loader/ContainerRuntime/DataRuntime might be different versioned.\n     * In generateLocalCompatTest(), this Container and its runtime will be arbitrarily-versioned.\n     */\n    makeTestLoader(testContainerConfig?: ITestContainerConfig, detachedBlobStorage?: IDetachedBlobStorage): IHostLoader,\n    makeTestContainer(testContainerConfig?: ITestContainerConfig): Promise<IContainer>,\n    loadTestContainer(testContainerConfig?: ITestContainerConfig): Promise<IContainer>,\n    /**\n     *\n     * @param url - Resolved container URL\n     */\n    updateDocumentId(url: IResolvedUrl | undefined): void,\n\n    logger: ITelemetryBaseLogger,\n    documentServiceFactory: IDocumentServiceFactory,\n    urlResolver: IUrlResolver,\n    defaultCodeDetails: IFluidCodeDetails,\n    opProcessingController: IOpProcessingController,\n\n    ensureSynchronized(): Promise<void>;\n    reset(): void,\n\n    documentId: string,\n    driver: ITestDriver;\n}\n\nexport enum DataObjectFactoryType {\n    Primed, // default\n    Test,\n}\n\nexport interface ITestContainerConfig {\n    /** TestFluidDataObject instead of PrimedDataStore */\n    fluidDataObjectType?: DataObjectFactoryType,\n\n    /** An array of channel name and DDS factory pair to create on container creation time */\n    registry?: ChannelFactoryRegistry,\n\n    /** Container runtime options for the container instance */\n    runtimeOptions?: IContainerRuntimeOptions,\n\n    /** Loader options for the loader used to create containers */\n    loaderOptions?: ITestLoaderOptions,\n}\n\n// new interface to help inject custom loggers to tests\nexport interface ITestLoaderOptions extends ILoaderOptions {\n    logger?: ITelemetryBaseLogger;\n}\n\nexport const createDocumentId = (): string => uuid();\n\ninterface IDocumentIdStrategy {\n    get(): string;\n    update(resolvedUrl?: IResolvedUrl): void;\n    reset(): void;\n}\n\n/**\n * Document ID is treated differently by test drivers. The key difference is in generating\n * a new container ID and accessing the container in multi-instance test cases.\n */\nfunction getDocumentIdStrategy(type?: TestDriverTypes): IDocumentIdStrategy {\n    let documentId = createDocumentId();\n    switch (type) {\n        case \"odsp\":\n            return {\n                get: () => documentId,\n                update: () => { }, // do not update the document ID in odsp test cases\n                reset: () => documentId = createDocumentId(),\n            };\n        default:\n            return {\n                get: () => documentId,\n                update: (resolvedUrl?: IResolvedUrl) => {\n                    // Extract the document ID from the resolved container's URL and reset the ID property\n                    ensureFluidResolvedUrl(resolvedUrl);\n                    documentId = resolvedUrl.id ?? documentId;\n                },\n                reset: () => documentId = createDocumentId(),\n            };\n    }\n}\n\n/**\n * Shared base class for test object provider.  Contain code for loader and container creation and loading\n */\nexport class TestObjectProvider {\n    private readonly _loaderContainerTracker = new LoaderContainerTracker();\n    private _documentServiceFactory: IDocumentServiceFactory | undefined;\n    private _urlResolver: IUrlResolver | undefined;\n    private _logger: ITelemetryBaseLogger | undefined;\n    private readonly _documentIdStrategy: IDocumentIdStrategy;\n\n    /**\n     * Manage objects for loading and creating container, including the driver, loader, and OpProcessingController\n     * @param createFluidEntryPoint - callback to create a fluidEntryPoint, with an optional set of channel name\n     * and factory for TestFluidObject\n     */\n    constructor(\n        public readonly LoaderConstructor: typeof Loader,\n        public readonly driver: ITestDriver,\n        private readonly createFluidEntryPoint: (testContainerConfig?: ITestContainerConfig) => fluidEntryPoint,\n    ) {\n        this._documentIdStrategy = getDocumentIdStrategy(driver.type);\n    }\n\n    get logger() {\n        if (this._logger === undefined) {\n            this._logger = ChildLogger.create(getTestLogger?.(), undefined,\n                {\n                    all: {\n                        driverType: this.driver.type,\n                        driverEndpointName: this.driver.endpointName,\n                        driverTenantName: this.driver.tenantName,\n                        driverUserIndex: this.driver.userIndex,\n                    },\n                });\n        }\n        return this._logger;\n    }\n\n    get documentServiceFactory() {\n        if (!this._documentServiceFactory) {\n            this._documentServiceFactory = this.driver.createDocumentServiceFactory();\n        }\n        return this._documentServiceFactory;\n    }\n\n    get urlResolver() {\n        if (!this._urlResolver) {\n            this._urlResolver = this.driver.createUrlResolver();\n        }\n        return this._urlResolver;\n    }\n\n    get documentId() {\n        return this._documentIdStrategy.get();\n    }\n\n    get defaultCodeDetails() {\n        return defaultCodeDetails;\n    }\n\n    get opProcessingController(): IOpProcessingController {\n        return this._loaderContainerTracker;\n    }\n\n    /**\n     * Create a loader. Containers created/loaded through this loader will be added to the OpProcessingController.\n     *\n     * Only the version of the loader will vary based on compat config. The version of\n     * containerRuntime/dataRuntime used in fluidEntryPoint will be used as is from what is passed in.\n     *\n     * @param packageEntries - list of code details and fluidEntryPoint pairs.\n     */\n    public createLoader(\n        packageEntries: Iterable<[IFluidCodeDetails, fluidEntryPoint]>,\n        options?: ITestLoaderOptions,\n        detachedBlobStorage?: IDetachedBlobStorage,\n    ) {\n        const multiSinkLogger = new MultiSinkLogger();\n        multiSinkLogger.addLogger(this.logger);\n        if (options?.logger !== undefined) {\n            multiSinkLogger.addLogger(options.logger);\n        }\n\n        const codeLoader = new LocalCodeLoader(packageEntries);\n        const loader = new this.LoaderConstructor({\n            urlResolver: this.urlResolver,\n            documentServiceFactory: this.documentServiceFactory,\n            codeLoader,\n            logger: multiSinkLogger,\n            options,\n            detachedBlobStorage,\n        });\n        this._loaderContainerTracker.add(loader);\n        return loader;\n    }\n\n    /**\n     * Create a container using a default document id and code details.\n     * Container created is automatically added to the OpProcessingController to manage op flow\n     *\n     * Only the version of the loader will vary based on compat config. The version of\n     * containerRuntime/dataRuntime used in fluidEntryPoint will be used as is from what is passed in.\n     *\n     * @param packageEntries - list of code details and fluidEntryPoint pairs.\n     */\n    public async createContainer(entryPoint: fluidEntryPoint, options?: ITestLoaderOptions) {\n        const loader = this.createLoader([[defaultCodeDetails, entryPoint]], options);\n        const container = await createAndAttachContainer(\n            defaultCodeDetails,\n            loader,\n            this.driver.createCreateNewRequest(this.documentId),\n        );\n        // r11s driver will generate a new ID for the new container.\n        // update the document ID with the actual ID of the attached container.\n        this._documentIdStrategy.update(container.resolvedUrl);\n        return container;\n    }\n\n    public async loadContainer(entryPoint: fluidEntryPoint, options?: ITestLoaderOptions,\n        requestHeader?: IRequestHeader) {\n        const loader = this.createLoader([[defaultCodeDetails, entryPoint]], options);\n        return loader.resolve({ url: await this.driver.createContainerUrl(this.documentId), headers: requestHeader });\n    }\n\n    /**\n     * Make a test loader. Containers created/loaded through this loader will be added to the OpProcessingController.\n     * The version of the loader/containerRuntime/dataRuntime may vary based on compat config of the current run\n     * @param testContainerConfig - optional configuring the test Container\n     */\n    public makeTestLoader(testContainerConfig?: ITestContainerConfig, detachedBlobStorage?: IDetachedBlobStorage) {\n        return this.createLoader(\n            [[defaultCodeDetails, this.createFluidEntryPoint(testContainerConfig)]],\n            testContainerConfig?.loaderOptions,\n            detachedBlobStorage,\n        );\n    }\n\n    /**\n     * Make a container using a default document id and code details\n     * Container loaded is automatically added to the OpProcessingController to manage op flow\n     * @param testContainerConfig - optional configuring the test Container\n     */\n    public async makeTestContainer(testContainerConfig?: ITestContainerConfig): Promise<IContainer> {\n        const loader = this.makeTestLoader(testContainerConfig);\n        const container =\n            await createAndAttachContainer(\n                defaultCodeDetails,\n                loader,\n                this.driver.createCreateNewRequest(this.documentId));\n        // r11s driver will generate a new ID for the new container.\n        // update the document ID with the actual ID of the attached container.\n        this._documentIdStrategy.update(container.resolvedUrl);\n        return container;\n    }\n\n    /**\n     * Load a container using a default document id and code details.\n     * Container loaded is automatically added to the OpProcessingController to manage op flow\n     * @param testContainerConfig - optional configuring the test Container\n     */\n    public async loadTestContainer(testContainerConfig?: ITestContainerConfig): Promise<Container> {\n        const loader = this.makeTestLoader(testContainerConfig);\n        const container = await loader.resolve({ url: await this.driver.createContainerUrl(this.documentId) });\n        await waitContainerToCatchUp(container);\n        return container;\n    }\n\n    public reset() {\n        this._loaderContainerTracker.reset();\n        this._documentServiceFactory = undefined;\n        this._urlResolver = undefined;\n        this._documentIdStrategy.reset();\n        this._logger = undefined;\n    }\n\n    public async ensureSynchronized() {\n        return this._loaderContainerTracker.ensureSynchronized();\n    }\n\n    updateDocumentId(resolvedUrl: IResolvedUrl | undefined) {\n        this._documentIdStrategy.update(resolvedUrl);\n    }\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluidframework/test-utils",
-  "version": "0.49.0",
+  "version": "0.50.0-41540",
   "description": "Utilities for Fluid tests",
   "homepage": "https://fluidframework.com",
   "repository": "https://github.com/microsoft/FluidFramework",
@@ -49,26 +49,27 @@
     "temp-directory": "nyc/.nyc_output"
   },
   "dependencies": {
-    "@fluidframework/aqueduct": "^0.49.0",
+    "@fluidframework/aqueduct": "0.50.0-41540",
     "@fluidframework/common-definitions": "^0.20.1",
-    "@fluidframework/container-definitions": "^0.40.0",
-    "@fluidframework/container-loader": "^0.49.0",
-    "@fluidframework/container-runtime": "^0.49.0",
-    "@fluidframework/container-runtime-definitions": "^0.49.0",
-    "@fluidframework/core-interfaces": "^0.39.7",
-    "@fluidframework/datastore": "^0.49.0",
-    "@fluidframework/datastore-definitions": "^0.49.0",
-    "@fluidframework/driver-definitions": "^0.40.0",
-    "@fluidframework/local-driver": "^0.49.0",
-    "@fluidframework/map": "^0.49.0",
+    "@fluidframework/container-definitions": "^0.41.0-0",
+    "@fluidframework/container-loader": "0.50.0-41540",
+    "@fluidframework/container-runtime": "0.50.0-41540",
+    "@fluidframework/container-runtime-definitions": "0.50.0-41540",
+    "@fluidframework/core-interfaces": "^0.40.0-0",
+    "@fluidframework/datastore": "0.50.0-41540",
+    "@fluidframework/datastore-definitions": "0.50.0-41540",
+    "@fluidframework/driver-definitions": "^0.41.0-0",
+    "@fluidframework/driver-utils": "0.50.0-41540",
+    "@fluidframework/local-driver": "0.50.0-41540",
+    "@fluidframework/map": "0.50.0-41540",
     "@fluidframework/protocol-definitions": "^0.1025.0",
-    "@fluidframework/request-handler": "^0.49.0",
-    "@fluidframework/routerlicious-driver": "^0.49.0",
-    "@fluidframework/runtime-definitions": "^0.49.0",
-    "@fluidframework/runtime-utils": "^0.49.0",
-    "@fluidframework/telemetry-utils": "^0.49.0",
-    "@fluidframework/test-driver-definitions": "^0.49.0",
-    "@fluidframework/test-runtime-utils": "^0.49.0",
+    "@fluidframework/request-handler": "0.50.0-41540",
+    "@fluidframework/routerlicious-driver": "0.50.0-41540",
+    "@fluidframework/runtime-definitions": "0.50.0-41540",
+    "@fluidframework/runtime-utils": "0.50.0-41540",
+    "@fluidframework/telemetry-utils": "0.50.0-41540",
+    "@fluidframework/test-driver-definitions": "0.50.0-41540",
+    "@fluidframework/test-runtime-utils": "0.50.0-41540",
     "debug": "^4.1.1",
     "uuid": "^8.3.1"
   },

package/src/index.ts

@@ -8,7 +8,6 @@ export * from "./testObjectProvider";
 export * from "./loaderContainerTracker";
 export * from "./localLoader";
 export * from "./localCodeLoader";
-export * from "./opProcessingController";
 export * from "./testContainerRuntimeFactory";
 export * from "./testFluidObject";
 export * from "./timeoutUtils";

package/src/loaderContainerTracker.ts

@@ -91,31 +91,35 @@ export class LoaderContainerTracker implements IOpProcessingController {
             for (const msg of messages) {
                 if (msg.type === MessageType.NoOp) {
                     // Track the NoOp that was sent.
-                    if (record.startTrailingNoOps === 0) {
+                    if (record.trailingNoOps === 0) {
+                        // record the starting sequence number of the trailing no ops if we haven't been tracking yet.
                         record.startTrailingNoOps = msg.clientSequenceNumber;
                     }
                     record.trailingNoOps++;
                 } else {
                     // Other ops has been sent. We would like to see those ack'ed, so no more need to track NoOps
-                    record.startTrailingNoOps = 0;
                     record.trailingNoOps = 0;
                 }
             }
         });
 
         container.deltaManager.inbound.on("push", (message) => {
-            // Received the no op back, update the record.
+            // Received the no op back, update the record if we are tracking
             if (message.type === MessageType.NoOp
                 && message.clientId === (container as Container).clientId
-                && message.clientSequenceNumber === record.startTrailingNoOps) {
-                record.trailingNoOps--;
-                record.startTrailingNoOps++;
+                && record.trailingNoOps !== 0
+                && record.startTrailingNoOps <= message.clientSequenceNumber
+            ) {
+                // NoOp might have coalesced and skipped ahead some sequence number
+                // update the record and skip ahead as well
+                const oldStartTrailingNoOps = record.startTrailingNoOps;
+                record.startTrailingNoOps = message.clientSequenceNumber + 1;
+                record.trailingNoOps -= (record.startTrailingNoOps - oldStartTrailingNoOps);
             }
         });
 
         container.on("disconnected", () => {
             // reset on disconnect.
-            record.startTrailingNoOps = 0;
             record.trailingNoOps = 0;
         });
     }

package/src/packageVersion.ts

@@ -6,4 +6,4 @@
  */
 
 export const pkgName = "@fluidframework/test-utils";
-export const pkgVersion = "0.49.0";
+export const pkgVersion = "0.50.0-41540";

package/src/testObjectProvider.ts

@@ -8,8 +8,9 @@ import { ITelemetryBaseLogger } from "@fluidframework/common-definitions";
 import { Container, IDetachedBlobStorage, Loader, waitContainerToCatchUp } from "@fluidframework/container-loader";
 import { IContainerRuntimeOptions } from "@fluidframework/container-runtime";
 import { IFluidCodeDetails, IRequestHeader } from "@fluidframework/core-interfaces";
-import { IDocumentServiceFactory, IUrlResolver } from "@fluidframework/driver-definitions";
-import { ITestDriver } from "@fluidframework/test-driver-definitions";
+import { IDocumentServiceFactory, IResolvedUrl, IUrlResolver } from "@fluidframework/driver-definitions";
+import { ensureFluidResolvedUrl } from "@fluidframework/driver-utils";
+import { ITestDriver, TestDriverTypes } from "@fluidframework/test-driver-definitions";
 import { v4 as uuid } from "uuid";
 import { ChildLogger, MultiSinkLogger } from "@fluidframework/telemetry-utils";
 import { LoaderContainerTracker } from "./loaderContainerTracker";
@@ -49,6 +50,11 @@ export interface ITestObjectProvider {
     makeTestLoader(testContainerConfig?: ITestContainerConfig, detachedBlobStorage?: IDetachedBlobStorage): IHostLoader,
     makeTestContainer(testContainerConfig?: ITestContainerConfig): Promise<IContainer>,
     loadTestContainer(testContainerConfig?: ITestContainerConfig): Promise<IContainer>,
+    /**
+     *
+     * @param url - Resolved container URL
+     */
+    updateDocumentId(url: IResolvedUrl | undefined): void,
 
     logger: ITelemetryBaseLogger,
     documentServiceFactory: IDocumentServiceFactory,
@@ -69,22 +75,58 @@ export enum DataObjectFactoryType {
 }
 
 export interface ITestContainerConfig {
-    // TestFluidDataObject instead of PrimedDataStore
+    /** TestFluidDataObject instead of PrimedDataStore */
     fluidDataObjectType?: DataObjectFactoryType,
 
-    // And array of channel name and DDS factory pair to create on container creation time
+    /** An array of channel name and DDS factory pair to create on container creation time */
     registry?: ChannelFactoryRegistry,
 
-    // Container runtime options for the container instance
+    /** Container runtime options for the container instance */
     runtimeOptions?: IContainerRuntimeOptions,
+
+    /** Loader options for the loader used to create containers */
+    loaderOptions?: ITestLoaderOptions,
 }
 
 // new interface to help inject custom loggers to tests
 export interface ITestLoaderOptions extends ILoaderOptions {
     logger?: ITelemetryBaseLogger;
 }
+
 export const createDocumentId = (): string => uuid();
 
+interface IDocumentIdStrategy {
+    get(): string;
+    update(resolvedUrl?: IResolvedUrl): void;
+    reset(): void;
+}
+
+/**
+ * Document ID is treated differently by test drivers. The key difference is in generating
+ * a new container ID and accessing the container in multi-instance test cases.
+ */
+function getDocumentIdStrategy(type?: TestDriverTypes): IDocumentIdStrategy {
+    let documentId = createDocumentId();
+    switch (type) {
+        case "odsp":
+            return {
+                get: () => documentId,
+                update: () => { }, // do not update the document ID in odsp test cases
+                reset: () => documentId = createDocumentId(),
+            };
+        default:
+            return {
+                get: () => documentId,
+                update: (resolvedUrl?: IResolvedUrl) => {
+                    // Extract the document ID from the resolved container's URL and reset the ID property
+                    ensureFluidResolvedUrl(resolvedUrl);
+                    documentId = resolvedUrl.id ?? documentId;
+                },
+                reset: () => documentId = createDocumentId(),
+            };
+    }
+}
+
 /**
  * Shared base class for test object provider.  Contain code for loader and container creation and loading
  */
@@ -92,12 +134,12 @@ export class TestObjectProvider {
     private readonly _loaderContainerTracker = new LoaderContainerTracker();
     private _documentServiceFactory: IDocumentServiceFactory | undefined;
     private _urlResolver: IUrlResolver | undefined;
-    private _documentId?: string;
     private _logger: ITelemetryBaseLogger | undefined;
+    private readonly _documentIdStrategy: IDocumentIdStrategy;
 
     /**
      * Manage objects for loading and creating container, including the driver, loader, and OpProcessingController
-     * @param createFluidEntryPoint - callback to create a fluidEntryPoint, with an optiona; set of channel name
+     * @param createFluidEntryPoint - callback to create a fluidEntryPoint, with an optional set of channel name
      * and factory for TestFluidObject
      */
     constructor(
@@ -105,7 +147,7 @@ export class TestObjectProvider {
         public readonly driver: ITestDriver,
         private readonly createFluidEntryPoint: (testContainerConfig?: ITestContainerConfig) => fluidEntryPoint,
     ) {
-
+        this._documentIdStrategy = getDocumentIdStrategy(driver.type);
     }
 
     get logger() {
@@ -115,6 +157,8 @@ export class TestObjectProvider {
                     all: {
                         driverType: this.driver.type,
                         driverEndpointName: this.driver.endpointName,
+                        driverTenantName: this.driver.tenantName,
+                        driverUserIndex: this.driver.userIndex,
                     },
                 });
         }
@@ -136,10 +180,7 @@ export class TestObjectProvider {
     }
 
     get documentId() {
-        if (this._documentId === undefined) {
-            this._documentId = createDocumentId();
-        }
-        return this._documentId;
+        return this._documentIdStrategy.get();
     }
 
     get defaultCodeDetails() {
@@ -151,8 +192,7 @@ export class TestObjectProvider {
     }
 
     /**
-     * Create a loader.  Container created/loaded thru this loader will not be automatically added
-     * to the OpProcessingController, and will need to be added manually if needed.
+     * Create a loader. Containers created/loaded through this loader will be added to the OpProcessingController.
      *
      * Only the version of the loader will vary based on compat config. The version of
      * containerRuntime/dataRuntime used in fluidEntryPoint will be used as is from what is passed in.
@@ -199,6 +239,9 @@ export class TestObjectProvider {
             loader,
             this.driver.createCreateNewRequest(this.documentId),
         );
+        // r11s driver will generate a new ID for the new container.
+        // update the document ID with the actual ID of the attached container.
+        this._documentIdStrategy.update(container.resolvedUrl);
         return container;
     }
 
@@ -209,15 +252,14 @@ export class TestObjectProvider {
     }
 
     /**
-     * Make a test loader.  Container created/loaded thru this loader will not be automatically added
-     * to the OpProcessingController, and will need to be added manually if needed.
+     * Make a test loader. Containers created/loaded through this loader will be added to the OpProcessingController.
      * The version of the loader/containerRuntime/dataRuntime may vary based on compat config of the current run
      * @param testContainerConfig - optional configuring the test Container
      */
     public makeTestLoader(testContainerConfig?: ITestContainerConfig, detachedBlobStorage?: IDetachedBlobStorage) {
         return this.createLoader(
             [[defaultCodeDetails, this.createFluidEntryPoint(testContainerConfig)]],
-            undefined,
+            testContainerConfig?.loaderOptions,
             detachedBlobStorage,
         );
     }
@@ -234,6 +276,9 @@ export class TestObjectProvider {
                 defaultCodeDetails,
                 loader,
                 this.driver.createCreateNewRequest(this.documentId));
+        // r11s driver will generate a new ID for the new container.
+        // update the document ID with the actual ID of the attached container.
+        this._documentIdStrategy.update(container.resolvedUrl);
         return container;
     }
 
@@ -253,11 +298,15 @@ export class TestObjectProvider {
         this._loaderContainerTracker.reset();
         this._documentServiceFactory = undefined;
         this._urlResolver = undefined;
-        this._documentId = undefined;
+        this._documentIdStrategy.reset();
         this._logger = undefined;
     }
 
     public async ensureSynchronized() {
         return this._loaderContainerTracker.ensureSynchronized();
     }
+
+    updateDocumentId(resolvedUrl: IResolvedUrl | undefined) {
+        this._documentIdStrategy.update(resolvedUrl);
+    }
 }

package/dist/opProcessingController.d.ts

@@ -1,104 +0,0 @@
-/*!
- * Copyright (c) Microsoft Corporation and contributors. All rights reserved.
- * Licensed under the MIT License.
- */
-import { IDeltaManager } from "@fluidframework/container-definitions";
-import { IDocumentMessage, ISequencedDocumentMessage } from "@fluidframework/protocol-definitions";
-export declare type DeltaManager = IDeltaManager<ISequencedDocumentMessage, IDocumentMessage>;
-/**
- * @deprecated OpProcessingController has been improved to not need server information and work against other servers.
- *      So this is no longer necessary, and allows this and test to be run against different endpoints.
- */
-export interface IDeltaConnectionServerMonitor {
-    hasPendingWork(): Promise<boolean>;
-}
-/**
- * Class with access to the local delta connection server and delta managers that can control op processing.
- *
- * @deprecated Can be removed \>=0.38. Replaced with LoaderContainerTracker
- */
-export declare class OpProcessingController {
-    private readonly deltaConnectionServerMonitor?;
-    /**
-     * Yields control in the JavaScript event loop.
-     */
-    static yield(): Promise<void>;
-    private readonly deltaManagerMonitors;
-    private isNormalProcessingPaused;
-    get isProcessingControlled(): boolean;
-    /**
-     * @param deltaConnectionServerMonitor - delta connection server monitor to tell whether we have
-     *  pending work
-     */
-    constructor(deltaConnectionServerMonitor?: IDeltaConnectionServerMonitor | undefined);
-    /**
-     * Add a collection of delta managers by adding them to the local collection.
-     * @param deltaManagers - Array of deltaManagers to add
-     */
-    addDeltaManagers(...deltaManagers: DeltaManager[]): void;
-    /**
-      * Processes incoming and outgoing op) of the given delta managers.
-      * It validates the delta managers and resumes its inbound and outbound queues. It then keeps yielding
-      * the JS event loop until all the ops have been processed by the server and by the delta managers.
-      *
-      * @param deltaMangers - Array of delta managers whose ops to process. If no delta manager is provided, it
-      * processes the ops for all the delta managers in our collection.
-      */
-    process(...deltaMangers: DeltaManager[]): Promise<void>;
-    /**
-     * Processes incoming ops of the given delta managers.
-     * It validates the delta managers and resumes its inbound queue. It then keeps yielding the JS event loop until
-     * all the ops have been processed by the server and by the delta managers.
-     *
-     * @param deltaMangers - Array of delta managers whose incoming ops to process. If no delta manager is provided, it
-     * processes the ops for all the delta managers in our collection.
-     */
-    processIncoming(...deltaMangers: DeltaManager[]): Promise<void>;
-    /**
-     * Processes outgoing ops of the given delta managers.
-     * It validates the delta managers and resumes its outbound queue. It then keeps yielding the JS event loop until
-     * all the ops have been processed by the server and by the delta managers.
-     *
-     * @param deltaMangers - Array of delta managers whose outgoing ops to process. If no delta manager is provided, it
-     * processes the ops for all the delta managers in our collection.
-     */
-    processOutgoing(...deltaMangers: DeltaManager[]): Promise<void>;
-    /**
-     * Pauses the delta processing for controlled testing by pausing the inbound and outbound queues of the delta
-     * managers.
-     *
-     * @param deltaMangers - Array of delta managers whose processing to pause. If no delta manager is provided, it
-     * pauses the processing of all the delta managers in our collection.
-     */
-    pauseProcessing(...deltaMangers: DeltaManager[]): Promise<void>;
-    /**
-     * Resumes the delta processing after a pauseProcessing calls by resuming the inbound and outbound queues of
-     * the delta managers.
-     *
-     * @param deltaMangers - Array of delta managers whose processing to resume. If no delta manager is provided, it
-     * resumes the processing of all the delta managers in our collection.
-     */
-    resumeProcessing(...deltaMangers: DeltaManager[]): void;
-    /**
-     * Map a list of DeltaManager to its monitor.  Throw an error if the delta manager is not in our collection
-     * @param deltaMangers - The delta managers to get the monitors for
-     */
-    private mapDeltaManagerMonitor;
-    /**
-     * It keeps yielding the JS event loop until  all the ops have been processed by the server and by the passed
-     * delta managers.
-     * @param monitors - The delta managers should ops have to be processed.
-     * @param hasWork - Function that tells if the delta manager has pending work or not.
-     */
-    private yieldWhileDeltaManagersHaveWork;
-    /**
-     * Pauses the inbound and outbound queues of all the delta managers given
-     * @param monitors - The delta managers should ops have to be processed.
-     */
-    private pauseDeltaManagerQueues;
-    /**
-     * Pauses the inbound and outbound queues of all the delta managers in our collection.
-     */
-    private pauseAllDeltaManagerQueues;
-}
-//# sourceMappingURL=opProcessingController.d.ts.map

package/dist/opProcessingController.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"opProcessingController.d.ts","sourceRoot":"","sources":["../src/opProcessingController.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EAAE,aAAa,EAAE,MAAM,uCAAuC,CAAC;AACtE,OAAO,EACH,gBAAgB,EAChB,yBAAyB,EAG5B,MAAM,sCAAsC,CAAC;AAI9C,oBAAY,YAAY,GAAG,aAAa,CAAC,yBAAyB,EAAE,gBAAgB,CAAC,CAAC;AAqOtF;;;GAGG;AACH,MAAM,WAAW,6BAA6B;IAC1C,cAAc,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;CACtC;AAED;;;;GAIG;AACH,qBAAa,sBAAsB;IAyBZ,OAAO,CAAC,QAAQ,CAAC,4BAA4B,CAAC;IAxBjE;;OAEG;WACiB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAM1C,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAgD;IAErF,OAAO,CAAC,wBAAwB,CAAS;IAKzC,IAAW,sBAAsB,IAAI,OAAO,CAE3C;IAED;;;OAGG;gBACiC,4BAA4B,CAAC,2CAA+B;IAEhG;;;OAGG;IACI,gBAAgB,CAAC,GAAG,aAAa,EAAE,YAAY,EAAE;IA6BxD;;;;;;;QAOI;IACS,OAAO,CAAC,GAAG,YAAY,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAgBpE;;;;;;;OAOG;IACU,eAAe,CAAC,GAAG,YAAY,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAkB5E;;;;;;;OAOG;IACU,eAAe,CAAC,GAAG,YAAY,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAkB5E;;;;;;OAMG;IACU,eAAe,CAAC,GAAG,YAAY,EAAE,YAAY,EAAE;IAS5D;;;;;;OAMG;IACI,gBAAgB,CAAC,GAAG,YAAY,EAAE,YAAY,EAAE;IASvD;;;OAGG;IACH,OAAO,CAAC,sBAAsB;IAa9B;;;;;OAKG;YACW,+BAA+B;IAwC7C;;;OAGG;YACW,uBAAuB;IAQrC;;OAEG;YACW,0BAA0B;CAG3C"}