socket-function 0.10.3 → 0.10.4

package/SocketFunction.ts

@@ -65,6 +65,7 @@ export class SocketFunction {
         Shape extends SocketExposedShape<{
             [key in keyof ClassInstance]: (...args: any[]) => Promise<unknown>;
         }>,
+        Statics
     >(
         classGuid: string,
         instance: ClassInstance,
@@ -75,8 +76,9 @@ export class SocketFunction {
         config?: {
             /** @noAutoExpose If true SocketFunction.expose(Controller) must be called explicitly. */
             noAutoExpose?: boolean;
+            statics?: Statics;
         }
-    ): SocketRegistered<ExtractShape<ClassInstance, Shape>> {
+    ): SocketRegistered<ExtractShape<ClassInstance, Shape>> & Statics {
         let getDefaultHooks = defaultHooksFnc && lazy(defaultHooksFnc);
         const getShape = lazy(() => {
             let shape = shapeFnc() as SocketExposedShape;
@@ -146,7 +148,7 @@ export class SocketFunction {
         if (!config?.noAutoExpose) {
             this.expose(result);
         }
-        return result;
+        return Object.assign(result, config?.statics);
     }
 
     public static onNextDisconnect(nodeId: string, callback: () => void) {

package/package.json

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

package/require/RequireController.ts

@@ -64,6 +64,8 @@ const requireSeqNumProcessId = "requireSeqNumProcessId_" + Date.now() + "_" + Ma
 const htmlFile = isNodeTrue() && fs.readFileSync(__dirname + "/require.html").toString();
 const jsFile = isNodeTrue() && fs.readFileSync(__dirname + "/require.js").toString();
 const bufferShim = isNodeTrue() && fs.readFileSync(__dirname + "/buffer.js").toString();
+const BEFORE_ENTRY_TEMPLATE = "<!-- BEFORE_ENTRY_TEMPLATE -->";
+const ENTRY_TEMPLATE = "<!-- ENTRY_TEMPLATE -->";
 
 const resolvedHTMLFile = isNodeTrue() && (
     htmlFile
@@ -71,13 +73,30 @@ const resolvedHTMLFile = isNodeTrue() && (
         .replace(`<script src="./require.js"></script>`, `<script>${jsFile}</script>`)
 );
 
+let beforeEntryText: string[] = [];
+function injectHTMLBeforeStartup(text: string) {
+    beforeEntryText.push(text);
+}
+
+type GetModulesResult = ReturnType<RequireControllerBase["getModules"]> extends Promise<infer T> ? T : never;
+type GetModulesArgs = Parameters<RequireControllerBase["getModules"]>;
+let mapGetModules: {
+    remap(result: GetModulesResult, args: GetModulesArgs): Promise<GetModulesResult>
+}[] = [];
+function addMapGetModules(remap: typeof mapGetModules[number]["remap"]) {
+    mapGetModules.push({ remap });
+}
+
 class RequireControllerBase {
     public rootResolvePath = "";
 
     public async requireHTML(bootRequirePath?: string) {
         let result = resolvedHTMLFile;
+        if (beforeEntryText.length > 0) {
+            result = result.replace(BEFORE_ENTRY_TEMPLATE, beforeEntryText.join("\n"));
+        }
         if (bootRequirePath) {
-            result = result.replace(`<!-- ENTRY_TEMPLATE -->`, `<script>require(${JSON.stringify(bootRequirePath)});</script>`);
+            result = result.replace(ENTRY_TEMPLATE, `<script>require(${JSON.stringify(bootRequirePath)});</script>`);
         }
         return setHTTPResultHeaders(Buffer.from(result), { "Content-Type": "text/html" });
     }
@@ -101,6 +120,7 @@ class RequireControllerBase {
                 e?: number;
             }[];
         },
+        config?: {}
     ): Promise<{
         requestsResolvedPaths: string[];
         modules: {
@@ -232,10 +252,21 @@ class RequireControllerBase {
             addModule(clientModule, true);
         }
 
-        return { requestsResolvedPaths, modules, requireSeqNumProcessId };
+        let result: GetModulesResult = { requestsResolvedPaths, modules, requireSeqNumProcessId };
+        for (let remap of mapGetModules) {
+            result = await remap.remap(result, [pathRequests, alreadyHave, config]);
+        }
+        return result;
     }
 }
 
+type ClientRemapCallback = (args: GetModulesArgs) => Promise<GetModulesArgs>;
+declare global {
+    /** Must be set clientside BEFORE requests are made (so you likely want to use RequireController.addMapGetModules
+     *      to inject code that will use this) */
+    var remapImportRequestsClientside: undefined | ClientRemapCallback[];
+}
+
 let baseController = new RequireControllerBase();
 export function setRequireBootRequire(path: string) {
     baseController.rootResolvePath = path;
@@ -252,6 +283,10 @@ export const RequireController = SocketFunction.register(
     }),
     undefined,
     {
-        noAutoExpose: true
+        noAutoExpose: true,
+        statics: {
+            injectHTMLBeforeStartup,
+            addMapGetModules,
+        }
     }
 );

package/require/require.html

@@ -9,6 +9,7 @@
         <script src="./buffer.js"></script>
         <script src="./require.js"></script>
 
+        <!-- BEFORE_ENTRY_TEMPLATE -->
         <!-- ENTRY_TEMPLATE -->
     </body>
 </html>

package/require/require.js

@@ -166,6 +166,12 @@
             args.push(true);
         }
         let requestUrl = location.origin + location.pathname + `?classGuid=RequireController-e2f811f3-14b8-4759-b0d6-73f14516cf1d&functionName=getModules`;
+        let remapImportRequestsClientside = globalThis.remapImportRequestsClientside;
+        if (remapImportRequestsClientside) {
+            for (let fnc of remapImportRequestsClientside) {
+                args = await fnc(args);
+            }
+        }
         let rawText = await requestText(requestUrl, { args });
         let resultObj;
         try {