refactor(daemon): Synchronize provideWorker()

endojs · Mar 13, 2024 · 5f17afc · 5f17afc
1 parent 0d42e2b
commit 5f17afc
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 20 deletions.
diff --git a/packages/daemon/src/daemon.js b/packages/daemon/src/daemon.js
@@ -1011,9 +1011,22 @@ const makeDaemonCore = async (
   /**
    * @type {import('./types.js').DaemonCore['incarnateWorker']}
    */
-  const incarnateWorker = async () => {
-    const formulaNumber = await formulaGraphJobs.enqueue(randomHex512);
-    return incarnateNumberedWorker(formulaNumber);
+  const incarnateWorker = async deferredTasks => {
+    return incarnateNumberedWorker(
+      await formulaGraphJobs.enqueue(async () => {
+        const formulaNumber = await randomHex512();
+
+        await deferredTasks.execute({
+          workerFormulaIdentifier: formatId({
+            type: 'worker',
+            number: formulaNumber,
+            node: ownNodeIdentifier,
+          }),
+        });
+
+        return formulaNumber;
+      }),
+    );
   };
 
   /**

diff --git a/packages/daemon/src/host.js b/packages/daemon/src/host.js
@@ -122,23 +122,23 @@ export const makeHostMaker = ({
      * @param {string} workerName
      */
     const provideWorker = async workerName => {
-      if (typeof workerName !== 'string') {
-        throw new Error('worker name must be string');
-      }
-      let workerFormulaIdentifier = petStore.identifyLocal(workerName);
-      if (workerFormulaIdentifier === undefined) {
-        ({ formulaIdentifier: workerFormulaIdentifier } =
-          await incarnateWorker());
-        assertPetName(workerName);
-        await petStore.write(workerName, workerFormulaIdentifier);
-      } else if (!workerFormulaIdentifier.startsWith('worker:')) {
-        throw new Error(`Not a worker ${q(workerName)}`);
-      }
-      return /** @type {Promise<import('./types.js').EndoWorker>} */ (
-        // Behold, recursion:
-        // eslint-disable-next-line no-use-before-define
-        provideValueForFormulaIdentifier(workerFormulaIdentifier)
+      /** @type {import('./types.js').DeferredTasks<import('./types.js').WorkerDeferredTaskParams>} */
+      const tasks = makeDeferredTasks();
+      // eslint-disable-next-line no-use-before-define
+      const workerFormulaIdentifier = prepareWorkerFormulaIdentifier(
+        workerName,
+        tasks.push,
       );
+
+      if (workerFormulaIdentifier !== undefined) {
+        return /** @type {Promise<import('./types.js').EndoWorker>} */ (
+          // Behold, recursion:
+          provideValueForFormulaIdentifier(workerFormulaIdentifier)
+        );
+      }
+
+      const { value } = await incarnateWorker(tasks);
+      return value;
     };
 
     /**
@@ -159,6 +159,11 @@ export const makeHostMaker = ({
         deferTask(identifiers =>
           petStore.write(workerName, identifiers.workerFormulaIdentifier),
         );
+      } else {
+        const { type } = parseId(workerFormulaIdentifier);
+        if (type !== undefined && type !== 'worker') {
+          throw new Error(`Not a worker ${q(workerName)}`);
+        }
       }
       return workerFormulaIdentifier;
     };

diff --git a/packages/daemon/src/types.d.ts b/packages/daemon/src/types.d.ts
@@ -75,6 +75,13 @@ type WorkerFormula = {
   type: 'worker';
 };
 
+/**
+ * Deferred tasks parameters for `host` and `guest` formulas.
+ */
+export type WorkerDeferredTaskParams = {
+  workerFormulaIdentifier: string;
+};
+
 /**
  * Deferred tasks parameters for `host` and `guest` formulas.
  */
@@ -810,7 +817,9 @@ export interface DaemonCore {
   incarnateEndoBootstrap: (
     specifiedFormulaNumber: string,
   ) => IncarnateResult<FarEndoBootstrap>;
-  incarnateWorker: () => IncarnateResult<EndoWorker>;
+  incarnateWorker: (
+    deferredTasks: DeferredTasks<WorkerDeferredTaskParams>,
+  ) => IncarnateResult<EndoWorker>;
   incarnateDirectory: () => IncarnateResult<EndoDirectory>;
   incarnateHost: (
     endoFormulaIdentifier: string,