querysub 0.120.0 → 0.121.0

package/package.json

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

package/src/4-deploy/edgeNodes.ts

@@ -110,7 +110,7 @@ export async function registerEdgeNode(config: {
             //todonext
             //  Testing
             //hash: gitHash,
-            hash: "7b1eb4934d5bdfe6d0f7076049c4b7decad4e645",
+            hash: "1c222aa091fac592012938172cc1f7d2ee99c7b9",
         });
     }
 
@@ -160,8 +160,6 @@ async function loadEntryPointsByHash(config: {
     let firstPath = path.resolve(module.filename);
     let rootPath = firstPath.replaceAll("\\", "/").split("/").slice(0, -depth).join("/") + "/";
 
-    debugbreak(2);
-    debugger;
     entryPaths = entryPaths.map(x => path.resolve(rootPath + x).replaceAll("\\", "/"));
 
     let nodeId = getOwnNodeId();

package/src/4-querysub/Querysub.ts

@@ -771,6 +771,8 @@ function createLocalSchema<T>(name: string): () => T;
 function createLocalSchema<SchemaDef extends Schema2>(name: string, schema: SchemaDef): () => Schema2T<SchemaDef>;
 function createLocalSchema<T>(name: string, schema2?: Schema2): () => T {
     if (localSchemaNames.has(name) && !isHotReloading() && !isDynamicallyLoading()) {
+        debugbreak(2);
+        debugger;
         throw new Error(`Already have local schema with name ${JSON.stringify(name)}`);
     }
     if (schema2) {

package/src/config.ts

@@ -1,81 +1,84 @@
-import { isNode, isNodeTrue } from "socket-function/src/misc";
-import yargs from "yargs";
-import debugbreak from "debugbreak";
-import { MaybePromise } from "socket-function/src/types";
-
-export const serverPort = 11748;
-
-let yargObj = isNodeTrue() && yargs(process.argv)
-    .option("nonetwork", { type: "boolean", desc: `Disables all network requirements. Reduces security, as this means we cannot use real certificates.` })
-    .option("domain", { type: "string", desc: `Sets the domain` })
-    .option("client", { type: "boolean", desc: `Drops permissions, acting as an unauthenticated node` })
-    .option("authority", { type: "string", desc: `Defines the base paths we are an authority on (the domain is prepended to them). Either a file path to a JSON(AuthorityPath[]), or a base64 representation of the JSON(AuthorityPath[]).` })
-    .option("debugbreak", { type: "boolean", desc: "Break and show a popup when there are fatal errors" })
-    .option("nobreak", { type: "boolean", desc: "Do not break on errors. Safer to set this than to just not set debugbreak, as some places might break without checking debugbreak, but nobreak works at a level where it is always used." })
-    .option("public", { type: "boolean", desc: "Expose on public ports." })
-    .option("local", { type: "boolean", desc: `If true, uses the local directory instead of the remote git repo. Also hotreloads from disk. Determines the repo to replace through the package.json "repository" property.` })
-    .argv || {}
-    ;
-
-export function isNoNetwork() {
-    return yargObj.nonetwork;
-}
-
-export function getDomain() {
-    if (!isNode()) {
-        return location.hostname.split(".").slice(-2).join(".");
-    }
-    return yargObj.domain || "querysub.com";
-}
-
-export function baseIsClient() {
-    return !isNode() || yargObj.client;
-}
-
-export function devDebugbreak() {
-    if (!isNode()) {
-        debugger;
-        return;
-    }
-    if (!yargObj.debugbreak) return;
-    debugbreak(2);
-    debugger;
-}
-let debuggedEnabled = false;
-export function isDevDebugbreak() {
-    return yargObj.debugbreak || !isNode() && location.hostname.startsWith("noproxy.") || debuggedEnabled;
-}
-export function enableDebugging() {
-    debuggedEnabled = true;
-}
-(globalThis as any).enableDebugging = enableDebugging;
-
-
-export function authorityRaw() {
-    return yargObj.authority;
-}
-
-export function isPublic() {
-    if (!isNode()) {
-        return !location.hostname.startsWith("noproxy.");
-    }
-    return !!yargObj.public;
-}
-
-export function isLocal() {
-    return !!yargObj.local;
-}
-
-
-let isDynamicallyLoadingCount = 0;
-export function isDynamicallyLoading() {
-    return isDynamicallyLoadingCount > 0;
-}
-export async function setIsDynamicallyLoading(code: () => MaybePromise<void>) {
-    isDynamicallyLoadingCount++;
-    try {
-        await code();
-    } finally {
-        isDynamicallyLoadingCount--;
-    }
+import { isNode, isNodeTrue } from "socket-function/src/misc";
+import yargs from "yargs";
+import debugbreak from "debugbreak";
+import { MaybePromise } from "socket-function/src/types";
+
+export const serverPort = 11748;
+
+let yargObj = isNodeTrue() && yargs(process.argv)
+    .option("nonetwork", { type: "boolean", desc: `Disables all network requirements. Reduces security, as this means we cannot use real certificates.` })
+    .option("domain", { type: "string", desc: `Sets the domain` })
+    .option("client", { type: "boolean", desc: `Drops permissions, acting as an unauthenticated node` })
+    .option("authority", { type: "string", desc: `Defines the base paths we are an authority on (the domain is prepended to them). Either a file path to a JSON(AuthorityPath[]), or a base64 representation of the JSON(AuthorityPath[]).` })
+    .option("debugbreak", { type: "boolean", desc: "Break and show a popup when there are fatal errors" })
+    .option("nobreak", { type: "boolean", desc: "Do not break on errors. Safer to set this than to just not set debugbreak, as some places might break without checking debugbreak, but nobreak works at a level where it is always used." })
+    .option("public", { type: "boolean", desc: "Expose on public ports." })
+    .option("local", { type: "boolean", desc: `If true, uses the local directory instead of the remote git repo. Also hotreloads from disk. Determines the repo to replace through the package.json "repository" property.` })
+    .argv || {}
+    ;
+
+export function isNoNetwork() {
+    return yargObj.nonetwork;
+}
+
+export function getDomain() {
+    if (!isNode()) {
+        return location.hostname.split(".").slice(-2).join(".");
+    }
+    return yargObj.domain || "querysub.com";
+}
+
+export function baseIsClient() {
+    return !isNode() || yargObj.client;
+}
+
+export function devDebugbreak() {
+    if (!isNode()) {
+        debugger;
+        return;
+    }
+    if (!yargObj.debugbreak) return;
+    debugbreak(2);
+    debugger;
+}
+let debuggedEnabled = false;
+export function isDevDebugbreak() {
+    return yargObj.debugbreak || !isNode() && location.hostname.startsWith("noproxy.") || debuggedEnabled;
+}
+export function enableDebugging() {
+    debuggedEnabled = true;
+}
+(globalThis as any).enableDebugging = enableDebugging;
+
+
+export function authorityRaw() {
+    return yargObj.authority;
+}
+
+export function isPublic() {
+    if (!isNode()) {
+        return !location.hostname.startsWith("noproxy.");
+    }
+    return !!yargObj.public;
+}
+
+export function isLocal() {
+    return !!yargObj.local;
+}
+
+
+declare global {
+    var isDynamicallyLoadingCount: number | undefined;
+}
+export function isDynamicallyLoading() {
+    globalThis.isDynamicallyLoadingCount = (globalThis.isDynamicallyLoadingCount ?? 0) + 1;
+    return globalThis.isDynamicallyLoadingCount > 0;
+}
+export async function setIsDynamicallyLoading(code: () => MaybePromise<void>) {
+    globalThis.isDynamicallyLoadingCount = (globalThis.isDynamicallyLoadingCount ?? 0) + 1;
+    try {
+        await code();
+    } finally {
+        globalThis.isDynamicallyLoadingCount = (globalThis.isDynamicallyLoadingCount ?? 0) - 1;
+    }
 }