querysub 0.270.0 → 0.272.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "querysub",
-  "version": "0.270.0",
+  "version": "0.272.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-querysub/Querysub.ts

@@ -41,7 +41,7 @@ import { waitForFirstTimeSync } from "socket-function/time/trueTimeShim";
 import { logMeasureTable, measureBlock, measureFnc, measureWrap, startMeasure } from "socket-function/src/profiling/measure";
 import { delay } from "socket-function/src/batching";
 import { MaybePromise } from "socket-function/src/types";
-import { devDebugbreak, getDomain, isDynamicallyLoading, isPublic, noSyncing } from "../config";
+import { devDebugbreak, getDomain, isBootstrapOnly, isDynamicallyLoading, isPublic, noSyncing } from "../config";
 import { Schema2, Schema2T, t } from "../2-proxy/schema2";
 import { CALL_PERMISSIONS_KEY } from "./permissionsShared";
 import yargs, { check } from "yargs";
@@ -67,8 +67,6 @@ let yargObj = parseArgsFactory()
     .option("verbosenetwork", { type: "boolean", desc: "Log all network activity" })
     .option("verboseframework", { type: "boolean", desc: "Log internal SocketFunction framework" })
     .option("nodelay", { type: "boolean", desc: "Don't delay committing functions, even ones that are marked to be delayed." })
-    // TODO: The bootstrapper is a single file. Maybe we shouldn't run the entire service just for that. Although... maybe it's fine, as services are light?
-    .option("bootstraponly", { type: "boolean", desc: "Don't register as an edge node, so we serve the bootstrap files, but we don't need up to date code because we are not used for endpoints or the UI." })
     .argv
     ;
 setImmediate(() => {
@@ -769,7 +767,7 @@ export class Querysub {
         }
         allowHostnames.push("127-0-0-1." + getDomain());
 
-        if (yargObj.bootstraponly && isPublic()) {
+        if (isBootstrapOnly() && isPublic()) {
             if (config.port !== 443) {
                 throw new Error(`--bootstraponly requires you to set port 443. There can only be one  bootstrap node per server.`);
             }
@@ -790,7 +788,7 @@ export class Querysub {
 
         let { ip, ipDomain } = await publishMachineARecords();
 
-        if (!yargObj.bootstraponly) {
+        if (!isBootstrapOnly()) {
             await registerEdgeNode({
                 host: ipDomain + ":" + config.port,
                 entryPaths,

package/src/4-querysub/QuerysubController.ts

@@ -43,7 +43,7 @@ setFlag(require, "preact", "allowclient", true);
 import yargs from "yargs";
 import { mergeFilterables, parseFilterable, serializeFilterable } from "../misc/filterable";
 import { isManagementUser, onAllPredictionsFinished } from "../-0-hooks/hooks";
-import { isLocal } from "../config";
+import { isBootstrapOnly, isLocal } from "../config";
 
 let yargObj = isNodeTrue() && yargs(process.argv)
     .option("fncfilter", { type: "string", default: "", desc: `Sets the filterable state for function calls, causing them to target specific FunctionRunners. If no FunctionRunner matches, all functions will fail to run. For example: "devtestserver" will match a FunctionRunner that uses the "devtestserver" filter. Merges with the existing filterable state if a client sets it explicitly.` })
@@ -262,6 +262,7 @@ export async function baseAddCall(call: CallSpec, nodeId: string, cancel: () =>
 
 export class QuerysubControllerBase {
     public async watch(config: WatchConfig) {
+        if (isBootstrapOnly()) throw new Error(`Cannot watch on bootstrap only server`);
         for (let path of config.paths) {
             Querysub.assertDomainAllowed(path);
         }
@@ -485,6 +486,7 @@ export class QuerysubControllerBase {
         };
     }
     public async unwatch(config: WatchConfig) {
+        if (isBootstrapOnly()) throw new Error(`Cannot unwatch on bootstrap only server`);
         let pHash = permissionsHash(SocketFunction.getCaller());
         let callerId = SocketFunction.getCaller().nodeId;
         let permissionsObjIn = permissionsPerNode.get(pHash);
@@ -516,6 +518,7 @@ export class QuerysubControllerBase {
     }
 
     public async addCall(call: CallSpec) {
+        if (isBootstrapOnly()) throw new Error(`Cannot add calls to bootstrap only server`);
         if (Querysub.DEBUG_CALLS) {
             console.log(`[Querysub] addCall @${debugTime(call.runAtTime)}: ${call.DomainName}.${call.ModuleId}.${call.FunctionId}`);
         }
@@ -600,6 +603,7 @@ export class QuerysubControllerBase {
             FunctionId: string;
         };
     }): Promise<string> {
+        if (isBootstrapOnly()) throw new Error(`Cannot get module path on bootstrap only server`);
         let spec = config.functionSpec;
         Querysub.assertDomainAllowed(getPathStr1(spec.DomainName));
 
@@ -620,6 +624,7 @@ export class QuerysubControllerBase {
         ModuleId: string;
         FunctionId: string;
     }) {
+        if (isBootstrapOnly()) throw new Error(`Cannot get dev function spec from call on bootstrap only server`);
         let functionSpec = getDevFunctionSpecFromCall(call);
         if (!functionSpec) return undefined;
         let modulePath = (await getModuleFromConfig(functionSpec)).filename;

package/src/config.ts

@@ -18,6 +18,8 @@ let yargObj = parseArgsFactory()
     .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.` })
     .option("nosyncing", { type: "boolean", desc: `Disabled any syncing code, just using HTTP. Still manages routing via backblaze though.` })
     .option("recovery", { type: "boolean", desc: `Allows any localhost connections to act like a superuser (and a trusted node), to help recover the database (as you need permission to access the snapshot page).` })
+    // TODO: The bootstrapper is a single file. Maybe we shouldn't run the entire service just for that. Although... maybe it's fine, as services are light?
+    .option("bootstraponly", { type: "boolean", desc: "Don't register as an edge node, so we serve the bootstrap files, but we don't need up to date code because we are not used for endpoints or the UI." })
     .argv
     ;
 
@@ -41,6 +43,10 @@ export function isNoNetwork() {
     return yargObj.nonetwork;
 }
 
+export function isBootstrapOnly() {
+    return yargObj.bootstraponly;
+}
+
 export function getDomain() {
     if (!isNode()) {
         return location.hostname.split(".").slice(-2).join(".");

package/src/deployManager/components/deployButtons.tsx

@@ -22,13 +22,15 @@ export class RenderGitRefInfo extends qreact.Component<{
 }> {
     render() {
         let controller = MachineServiceController(SocketFunction.browserNodeId());
+        let gitRef = this.props.gitRef;
         let gitRefInfo = controller.getGitRefInfo({
-            ref: this.props.gitRef,
+            ref: gitRef,
             useQuerysub: this.props.isQuerysub,
         });
         if (!gitRefInfo) return undefined;
+        let { description, time } = gitRefInfo;
         return <div className={css.fontWeight("normal")}>
-            {formatDateJSX(gitRefInfo.time)} AGO <span className={css.hsl(0, 0, 80).pad2(5, 2).italic}>{gitRefInfo.description}</span> ({this.props.gitRef.slice(0, 6)})
+            {formatDateJSX(time)} AGO <span className={css.hsl(0, 0, 80).pad2(5, 2).italic}>{description}</span> ({gitRef.slice(0, 6)})
         </div>;
     }
 }

package/src/deployManager/machineSchema.ts

@@ -259,6 +259,18 @@ export class MachineServiceControllerBase {
     }
 
     public async commitPushService(commitMessage: string) {
+        if (commitMessage.toLowerCase().includes("querysub")) {
+            let querysubFolder = path.resolve("../querysub");
+            if (fs.existsSync(querysubFolder)) {
+                let querysubLastCommit = await getGitRefInfo({
+                    gitDir: querysubFolder,
+                    ref: "origin/main",
+                });
+                if (querysubLastCommit) {
+                    commitMessage += `\n\n(querysub commit): ${querysubLastCommit.description}`;
+                }
+            }
+        }
         await commitAndPush({
             gitDir: ".",
             message: commitMessage,