querysub 0.28.0 → 0.30.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "querysub",
-    "version": "0.28.0",
+    "version": "0.30.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/PathFunctionHelpers.ts

@@ -27,7 +27,7 @@ export async function replaceFunctions(config: {
         debugName: "replaceFunctions",
         watchFunction() {
             function debugFunction(func: FunctionSpec) {
-                return `${func.DomainName}:${func.FilePath}:${func.FunctionId}`;
+                return `${func.DomainName}:${func.FilePath}:${func.ModuleId}:${func.FunctionId}`;
             }
 
             let { domainName, functions } = config;

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

@@ -21,6 +21,7 @@ import { SocketFunction } from "socket-function/SocketFunction";
 import { requiresNetworkTrustHook } from "../-d-trust/NetworkTrust2";
 import { getControllerNodeId, getControllerNodeIdList } from "../-g-core-values/NodeCapabilities";
 import { sha256 } from "js-sha256";
+import os from "os";
 
 // Get localPathRemappings using yargs, so it is easy to configure in multiple entry points
 let yargObj = isNodeTrue() && yargs(process.argv)
@@ -118,6 +119,9 @@ export function setGitURLMapping(config: {
     spec: FunctionSpec;
     resolvedPath: string;
 }) {
+    if (os.platform() === "win32" && config.resolvedPath.startsWith("/root")) {
+        devDebugbreak();
+    }
     gitURLRefMappings.set(getSpecKey(config.spec), config.resolvedPath);
 }
 

package/src/4-querysub/querysubPrediction.ts

@@ -497,7 +497,7 @@ export async function getCallWrites(config: {
             // }
             let moduleObject = domainObject.PathFunctionRunner[call.ModuleId];
             if (!(call.FunctionId in moduleObject.Sources) && Querysub.isAllSynced()) {
-                throw new Error(`Function not found ${call.DomainName}.${call.ModuleId}.${call.FunctionId}`);
+                throw new Error(`Function not found in database ${call.DomainName}.${call.ModuleId}.${call.FunctionId}, have ${JSON.stringify(Object.keys(moduleObject.Sources))}`);
             }
             let functionSpec = atomicObjectRead(moduleObject.Sources[call.FunctionId]);
             return { functionSpec };

package/src/diagnostics/logs/diskLogger.ts

@@ -42,7 +42,9 @@ export type LogObj = {
     time: number;
 };
 
-export const noDiskLogPrefix = "\u200C";
+// NOTE: This is visible, otherwise it's easy to accidentally copy it, and not know why
+//  the text is behaving strangely (not === other seemingly equal text, etc).
+export const noDiskLogPrefix = "█ ";
 
 export const diskLog = logDisk;
 export function logDisk(...args: unknown[]) {

package/src/diagnostics/managementPages.tsx

@@ -35,17 +35,21 @@ let pages: {
 }[] = [];
 
 let __schema: SchemaObject<unknown, {
-    schemaIsManagementUser: () => boolean;
+    isManagementUser: () => boolean;
 }> | undefined = undefined;
 function getSchema() {
     if (!__schema) throw new Error(`registerManagementPages2 must be called for management functions to be accessed`);
     return __schema;
 }
 
+let functionId = "isManagementUser" as const;
+
 let registeredModule: NodeJS.Module | undefined = undefined;
 export async function registerManagementPages2(config: {
     module: NodeJS.Module;
-    isManagementUser: () => boolean;
+    schema: SchemaObject<unknown, {
+        isManagementUser: () => boolean;
+    }>;
     pages: {
         componentName: string;
         controllerName?: string;
@@ -94,13 +98,11 @@ export async function registerManagementPages2(config: {
     // NOTE: We don't store the UI in the database (here, or anywhere else, at least
     //  not yet), but we do want to store the permission function call, as we may
     //  need to update it immediately, across all servers.
-    __schema = Querysub.createSchema()({
-        module: config.module,
-        moduleId: "managementPages",
-        functions: {
-            schemaIsManagementUser: config.isManagementUser,
-        },
-    });
+    __schema = config.schema;
+
+    if (!__schema.functions[functionId]) {
+        throw new Error(`Required function isManagementUser not found in schema`);
+    }
 
     if (isServer()) {
         for (let page of inputPages) {
@@ -142,8 +144,6 @@ export async function isManagementUser() {
     //  have every endpoint protected by isManagementUser.
     if (await isTrusted(callerMachineId)) return true;
     let schema = getSchema();
-    let functionId = "schemaIsManagementUser" as const;
-    if (!schema.functions[functionId]) throw new Error(`Function ${functionId} not found in schema`);
 
     let testCall: CallSpec = {
         callerIP: IdentityController_getSecureIP(caller),