socket-function 0.62.0 → 0.64.0

package/package.json

@@ -1,15 +1,13 @@
 {
 	"name": "socket-function",
-	"version": "0.62.0",
+	"version": "0.64.0",
 	"main": "index.js",
 	"license": "MIT",
-	"note1": "note on node-forge fork, see https://github.com/digitalbazaar/forge/issues/744 for details",
 	"dependencies": {
 		"@types/pako": "^2.0.3",
 		"@types/ws": "^8.5.3",
 		"cbor-x": "^1.6.0",
 		"mobx": "^6.6.2",
-		"node-forge": "https://github.com/sliftist/forge#name",
 		"pako": "^2.1.0",
 		"preact": "10.24.3",
 		"typenode": "^5.7.0",
@@ -22,7 +20,6 @@
 	},
 	"devDependencies": {
 		"@types/cookie": "^0.5.1",
-		"@types/node-forge": "^1.3.1",
 		"debugbreak": "^0.6.5",
 		"pegjs": "^0.10.0",
 		"typedev": "^0.1.3"

package/require/RequireController.ts

@@ -110,8 +110,8 @@ const resolvedHTMLFile = isNodeTrue() && (
         .replace(`<script src="./require.js"></script>`, `<script>${jsFile}</script>`)
 );
 
-let beforeEntryText: string[] = [];
-function injectHTMLBeforeStartup(text: string) {
+let beforeEntryText: (string | (() => Promise<string>))[] = [];
+function injectHTMLBeforeStartup(text: string | (() => Promise<string>)) {
     beforeEntryText.push(text);
 }
 
@@ -133,7 +133,15 @@ class RequireControllerBase {
         let { requireCalls } = config || {};
         let result = resolvedHTMLFile;
         if (beforeEntryText.length > 0) {
-            result = result.replace(BEFORE_ENTRY_TEMPLATE, beforeEntryText.join("\n"));
+            let resolved: string[] = [];
+            for (let text of beforeEntryText) {
+                if (typeof text === "string") {
+                    resolved.push(text);
+                } else {
+                    resolved.push(await text());
+                }
+            }
+            result = result.replace(BEFORE_ENTRY_TEMPLATE, resolved.join("\n"));
         }
         if (requireCalls) {
             async function requireAll(calls: string[]) {
@@ -150,6 +158,8 @@ class RequireControllerBase {
                 }
             }
             result = result.replace(ENTRY_TEMPLATE, `<script>\n(${requireAll.toString()})(${JSON.stringify(requireCalls)});\n</script>`);
+        } else {
+            result = result.replace(ENTRY_TEMPLATE, "");
         }
         return setHTTPResultHeaders(Buffer.from(result), { "Content-Type": "text/html" });
     }

package/src/misc.ts

@@ -377,6 +377,13 @@ export function compare(lhs: unknown, rhs: unknown): number {
     if (lhs as any < (rhs as any)) return -1;
     return 1;
 }
+export function compareArray(lhs: unknown[], rhs: unknown[]): number {
+    for (let i = 0; i < Math.min(lhs.length, rhs.length); i++) {
+        let comparison = compare(lhs[i], rhs[i]);
+        if (comparison !== 0) return comparison;
+    }
+    return lhs.length - rhs.length;
+}
 
 export function insertIntoSortedList<T>(list: T[], map: (val: T) => string | number, element: T) {
     let searchValue = map(element);