feat(daemon): add incarnateEval

endojs · Feb 19, 2024 · 0bd689d · 0bd689d
1 parent 073d46d
commit 0bd689d
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 13 deletions.
diff --git a/packages/daemon/src/daemon.js b/packages/daemon/src/daemon.js
@@ -762,6 +762,33 @@ const makeDaemonCore = async (
     );
   };
 
+  /**
+   * @param {string} workerFormulaIdentifier
+   * @param {string} source
+   * @param {string[]} codeNames
+   * @param {string[]} endowmentFormulaIdentifiers
+   * @returns {Promise<{ formulaIdentifier: string, value: unknown }>}
+   */
+  const incarnateEval = async (
+    workerFormulaIdentifier,
+    source,
+    codeNames,
+    endowmentFormulaIdentifiers,
+  ) => {
+    const formulaNumber = await randomHex512();
+    /** @type {import('./types.js').EvalFormula} */
+    const formula = {
+      type: 'eval',
+      worker: workerFormulaIdentifier,
+      source,
+      names: codeNames,
+      values: endowmentFormulaIdentifiers,
+    };
+    return /** @type {Promise<{ formulaIdentifier: string, value: unknown }>} */ (
+      provideValueForNumberedFormula(formula.type, formulaNumber, formula)
+    );
+  };
+
   /**
    * @param {string} powersFormulaIdentifier
    * @param {string} workerFormulaIdentifier
@@ -830,6 +857,7 @@ const makeDaemonCore = async (
     provideControllerForFormulaIdentifier,
     incarnateHost,
     incarnateGuest,
+    incarnateEval,
     incarnateHandle,
     storeReaderRef,
     randomHex512,

diff --git a/packages/daemon/src/host.js b/packages/daemon/src/host.js
@@ -12,6 +12,7 @@ export const makeHostMaker = ({
   provideControllerForFormulaIdentifier,
   incarnateHost,
   incarnateGuest,
+  incarnateEval,
   incarnateHandle,
   storeReaderRef,
   makeSha512,
@@ -264,7 +265,7 @@ export const makeHostMaker = ({
         throw new Error('Evaluator requires one pet name for each code name');
       }
 
-      const formulaIdentifiers = await Promise.all(
+      const endowmentFormulaIdentifiers = await Promise.all(
         petNamePaths.map(async (petNameOrPath, index) => {
           if (typeof codeNames[index] !== 'string') {
             throw new Error(`Invalid endowment name: ${q(codeNames[index])}`);
@@ -285,20 +286,13 @@ export const makeHostMaker = ({
         }),
       );
 
-      const evalFormula = {
-        /** @type {'eval'} */
-        type: 'eval',
-        worker: workerFormulaIdentifier,
-        source,
-        names: codeNames,
-        values: formulaIdentifiers,
-      };
-
       // Behold, recursion:
       // eslint-disable-next-line no-use-before-define
-      const { formulaIdentifier, value } = await provideValueForFormula(
-        evalFormula,
-        'eval',
+      const { formulaIdentifier, value } = await incarnateEval(
+        workerFormulaIdentifier,
+        source,
+        codeNames,
+        endowmentFormulaIdentifiers,
       );
       if (resultName !== undefined) {
         await petStore.write(resultName, formulaIdentifier);