socket-function 0.12.14 → 0.12.16

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "socket-function",
-	"version": "0.12.14",
+	"version": "0.12.16",
 	"main": "index.js",
 	"license": "MIT",
 	"note1": "note on node-forge fork, see https://github.com/digitalbazaar/forge/issues/744 for details",
@@ -13,7 +13,7 @@
 		"node-forge": "https://github.com/sliftist/forge#name",
 		"pako": "^2.1.0",
 		"preact": "^10.10.6",
-		"typenode": "^5.4.0",
+		"typenode": "^5.4.1",
 		"ws": "^8.8.0"
 	},
 	"optionalDependencies": {

package/require/RequireController.ts

@@ -53,6 +53,7 @@ export interface SerializedModule {
         // request => resolvedPath
         [request: string]: string;
     };
+    asyncRequests: { [request: string]: true };
     // NOTE: IF !allowclient && !serveronly, it might just mean we didn't add allowclient
     //  to the module yet. BUT, if serveronly, then we know for sure we don't want it client.
     //  So the messages and behavior will be different.
@@ -201,6 +202,7 @@ class RequireControllerBase {
                 seqNum: module.requireControllerSeqNum,
                 size: module.size,
                 version: module.version,
+                asyncRequests: module.asyncRequires,
             };
             let moduleObj = modules[module.filename];
             if (moduleObj.allowclient) {
@@ -218,11 +220,16 @@ class RequireControllerBase {
             //      - And now it increases the size by much less, as we ignore any subtree which are entirely
             //          not allowed on the client.
             for (let request in module.requires) {
+
                 let requireResolvedPath = module.requires[request];
                 let requiredModule = require.cache[requireResolvedPath];
 
                 if (requiredModule) {
-                    addModule(requiredModule);
+                    // Only include synchronous modules. BUT, DO include the requests, so when/if the request is made
+                    //  it can be resolved correctly.
+                    if (!module.asyncRequires[request]) {
+                        addModule(requiredModule);
+                    }
                     moduleObj.requests[request] = requiredModule.filename;
                 } else {
                     moduleObj.requests[request] = "";
@@ -266,6 +273,7 @@ class RequireControllerBase {
                     path: "",
                     paths: [],
                     requires: {},
+                    asyncRequires: {},
                     allowclient: true,
                     moduleContents: `console.warn(${JSON.stringify(error)})`,
                 };

package/require/require.js

@@ -74,6 +74,7 @@
                 // request => resolvedPath
                 [request: string]: string;
             };
+            asyncRequests: { [request: string]: true };
             // NOTE: IF !allowclient && !serveronly, it might just mean we didn't add allowclient
             //  to the module yet. BUT, if serveronly, then we know for sure we don't want it client.
             //  So the messages and behavior will be different.
@@ -255,6 +256,9 @@
             if (typeof asyncIsFine !== "boolean") {
                 asyncIsFine = false;
             }
+            if (request in serializedModule.asyncRequests) {
+                asyncIsFine = true;
+            }
             if (request in builtInModuleExports) {
                 return builtInModuleExports[request];
             }
@@ -292,8 +296,8 @@
                         "color: red", "color: unset",
                         "color: red", "color: unset",
                     );
+                    debugger;
                 }
-                debugger;
                 return rootRequire(resolvedPath);
             }
 
@@ -427,7 +431,10 @@
 
             // Import children, as the children may be allowed clientside, and may have side-effects!
             if (!source) {
-                let requests = Object.keys(serializedModule.requests).filter(x => x !== "NOTALLOWEDCLIENTSIDE");
+                let requests = Object.keys(serializedModule.requests)
+                    .filter(x => x !== "NOTALLOWEDCLIENTSIDE")
+                    .filter(x => !(x in serializedModule.asyncRequests))
+                    ;
                 source = requests.map(id => `require(${JSON.stringify(id)});\n`).join("");
             }