fix(registry): isolate deferred plugin loads

packages/oc/src/registry/domain/plugins-initialiser.ts

@@ -48,8 +48,6 @@ function checkDependencies(plugins: Plugin[]) {
   return graph.overallOrder();
 }
 
-let deferredLoads: Plugin[] = [];
-
 const isPromiseLike = (value: unknown): value is PromiseLike<void> =>
   typeof (value as PromiseLike<void> | undefined)?.then === 'function';
 
@@ -102,6 +100,7 @@ const registerPlugin = (
 
 export async function init(pluginsToRegister: unknown[]): Promise<Plugins> {
   const registered: Plugins = {};
+  const deferredLoads: Plugin[] = [];
 
   validatePlugins(pluginsToRegister);
   checkDependencies(pluginsToRegister);
@@ -157,7 +156,7 @@ export async function init(pluginsToRegister: unknown[]): Promise<Plugins> {
   const terminator = async (): Promise<Plugins> => {
     if (deferredLoads.length > 0) {
       const deferredPlugins = [...deferredLoads];
-      deferredLoads = [];
+      deferredLoads.length = 0;
 
       await Promise.all(
         deferredPlugins.map((plugin) => onSeries(() => loadPlugin(plugin)))

packages/oc/test/unit/registry-domain-plugins-initialiser.js

@@ -399,4 +399,55 @@ describe('registry : domain : plugins-initialiser', () => {
       expect(result.doSomething.handler()).to.eql(true);
     });
   });
+
+  it('should keep deferred plugins isolated across concurrent initialisations', async () => {
+    let resolveBaseRegistration;
+    let signalBaseRegistrationStarted;
+    const baseRegistrationStarted = new Promise((resolve) => {
+      signalBaseRegistrationStarted = resolve;
+    });
+
+    const firstBasePlugin = {
+      name: 'base',
+      register: {
+        register: () =>
+          new Promise((resolve) => {
+            resolveBaseRegistration = resolve;
+            signalBaseRegistrationStarted();
+          }),
+        execute: () => 'first'
+      }
+    };
+    const firstDependentPlugin = {
+      name: 'firstDependent',
+      register: {
+        register: async () => {},
+        execute: () => 'dependent',
+        dependencies: ['base']
+      }
+    };
+
+    const firstInitialisation = pluginsInitialiser.init([
+      firstDependentPlugin,
+      firstBasePlugin
+    ]);
+    await baseRegistrationStarted;
+
+    const secondInitialisation = pluginsInitialiser.init([
+      {
+        name: 'base',
+        register: {
+          register: async () => {},
+          execute: () => 'second'
+        }
+      }
+    ]);
+
+    const secondResult = await secondInitialisation;
+    resolveBaseRegistration();
+    const firstResult = await firstInitialisation;
+
+    expect(secondResult).to.not.have.property('firstDependent');
+    expect(firstResult).to.have.all.keys('base', 'firstDependent');
+  });
 });