querysub 0.161.0 → 0.162.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "querysub",
-  "version": "0.161.0",
+  "version": "0.162.0",
   "main": "index.js",
   "license": "MIT",
   "note1": "note on node-forge fork, see https://github.com/digitalbazaar/forge/issues/744 for details",

package/src/3-path-functions/pathFunctionLoader.ts

@@ -266,6 +266,19 @@ function getCallstackFiles(): string[] {
     return files;
 }
 
+let importBlockers = new Set<Promise<unknown>>();
+export function registerImportBlockers(blocker: Promise<unknown>) {
+    importBlockers.add(blocker);
+    void blocker.finally(() => {
+        importBlockers.delete(blocker);
+    });
+}
+export async function waitForImportBlockers() {
+    while (importBlockers.size > 0) {
+        await Promise.all(Array.from(importBlockers));
+    }
+}
+
 async function getModuleFromSpecBase(
     spec: LoadFunctionSpec
 ): Promise<NodeJS.Module> {
@@ -314,10 +327,7 @@ async function getModuleFromSpecBase(
                 // NOTE: The true tells require to not warn about the async loading
                 await (require as any)(path, true);
 
-                // Unfortunately... we have to wait for some delayed imports to finish.
-                //  This isn't great, but it is important to set LazyComponent imports
-                //  with the correct git hash.
-                await delay(0);
+                await waitForImportBlockers();
             });
         });
     } catch (e: any) {

package/src/4-deploy/deployMain.ts

@@ -25,6 +25,7 @@ import { timeInHour } from "socket-function/src/misc";
 import { preloadUI } from "./edgeNodes";
 import { shutdown } from "../diagnostics/periodic";
 import { delay } from "socket-function/src/batching";
+import { waitForImportBlockers } from "../3-path-functions/pathFunctionLoader";
 
 let yargObj = yargs(process.argv)
     .option("domain", { type: "string", required: true, desc: "Domain to deploy to" })
@@ -54,7 +55,7 @@ export async function deployMain() {
     require(deployPath);
 
     // Wait for Promise.resolve imports to import
-    await delay(0);
+    await waitForImportBlockers();
 
     const srcRoot = path.resolve(__dirname + "/../").replaceAll("\\", "/");
 

package/src/library-components/LazyComponent.tsx

@@ -3,6 +3,7 @@ import { cache, lazy } from "socket-function/src/caching";
 import { isNode, sort } from "socket-function/src/misc";
 import { Querysub } from "../4-querysub/QuerysubController";
 import { qreact } from "../4-dom/qreact";
+import { registerImportBlockers } from "../3-path-functions/pathFunctionLoader";
 
 let nextSeqNum = 0;
 let schema = Querysub.createLocalSchema<{
@@ -18,7 +19,7 @@ export function createLazyComponent<Module>(
     return (exportName) => {
         if (isNode()) {
             // Import it, asynchronously, so it isn't preloaded, but it is available for clientside imports.
-            void Promise.resolve().then(() => getImport());
+            registerImportBlockers(Promise.resolve().then(() => getImport()));
             // TOOD: We will need to support this serverside eventually.
             return class extends qreact.Component {
                 render(): preact.ComponentChild {