querysub 0.692.0 → 0.694.0

package/package.json

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

package/src/-f-node-discovery/LatencyTracking.ts

@@ -27,6 +27,8 @@ const LATENCY_SAMPLE_LIMIT = 20;
 const LATENCY_HISTORY_LIMIT = 100;
 // Forget nodes we haven't been able to reach for this long.
 const NODE_EXPIRY_TIME = LATENCY_POLL_INTERVAL * 5;
+// Each of the first pings to a node replaces the history instead of adding to it, so only the last of them survives into the real history.
+const LATENCY_WARMUP_PINGS = 3;
 
 export type NodeLatencyInfo = {
     averageLatency: number;
@@ -70,15 +72,19 @@ export function getOwnLatencies(): { [nodeId: string]: number } {
 
 function recordLatency(nodeId: string, latency: number) {
     let prev = latencyByNode.get(nodeId);
-    let sampleCount = Math.min(prev?.sampleCount || 0, LATENCY_SAMPLE_LIMIT);
+    let pingCount = prev?.sampleCount || 0;
     let history = prev?.history || [];
-    history.push(latency);
-    if (history.length > LATENCY_HISTORY_LIMIT) {
-        history.shift();
+    if (pingCount < LATENCY_WARMUP_PINGS) {
+        history = [latency];
+    } else {
+        history.push(latency);
+        if (history.length > LATENCY_HISTORY_LIMIT) {
+            history.shift();
+        }
     }
     latencyByNode.set(nodeId, {
-        averageLatency: ((prev?.averageLatency || 0) * sampleCount + latency) / (sampleCount + 1),
-        sampleCount: sampleCount + 1,
+        averageLatency: history.reduce((sum, x) => sum + x, 0) / history.length,
+        sampleCount: pingCount + 1,
         lastSeen: Date.now(),
         history,
     });

package/src/4-querysub/Querysub.ts

@@ -1075,6 +1075,11 @@ export class Querysub {
         if (isClient()) {
             throw new Error(`--client processes cannot host a service. Either stop passing --client and keep the process on the network and trusted, or stop calling hostServer and call Querysub.configRootDiscoveryLocation instead. You MUST provide configRootDiscoveryLocation a valid nodeId. Which means either you do server selection manually, or if you are developing, just point it to "127-0-0-1.${getDomain()}:your local port here"`);
         }
+        // Hot reloading on public servers breaks things when we update (as the git pull triggers a hot reload), so... don't do that.
+        if (!isPublic() || yargObj.hot) {
+            watchFilesAndTriggerHotReloading();
+        }
+
         await getIdentityCAPromise(getDomain());
         let times: {
             name: string;

package/src/library-components/InputLabel.tsx

@@ -30,6 +30,11 @@ export type InputLabelProps = Omit<InputProps, "label" | "title"> & {
     fillWidth?: boolean | number;
 };
 
+// A checkbox is a small square that reads as belonging to the words beside it, so it sits tight against
+// its label; every other input is a box of its own and wants room between the two.
+const LABEL_GAP = 8;
+const CHECKBOX_LABEL_GAP = 2;
+
 function roundToDecimals(value: number, decimals: number) {
     return Math.round(value * 10 ** decimals) / 10 ** decimals;
 }
@@ -148,7 +153,7 @@ export class InputLabel extends qreact.Component<InputLabelProps> {
         }
         return (
             <label onClick={onClick} class={
-                css.hbox(8).button.relative
+                css.hbox(props.checkbox ? CHECKBOX_LABEL_GAP : LABEL_GAP).button.relative
                 + " trigger-hover "
                 + props.outerClass
                 + (props.flavor === "large" && css.fontSize(18, "soft"))

package/src/user-implementation/userData.ts

@@ -6,7 +6,7 @@ import { isNode, sha256Hash, timeInHour } from "socket-function/src/misc";
 import { registerAliveChecker } from "../2-proxy/garbageCollection";
 import { generateLoginEmail } from "./loginEmail";
 import { logErrors } from "../errors";
-import { PermissionsParameters } from "../3-path-functions/syncSchema";
+import { PermissionsCallback, PermissionsParameters } from "../3-path-functions/syncSchema";
 import { sendEmail_postmark } from "../email_ims_notifications/postmark";
 import { isClient } from "../config2";
 import { getExternalIP } from "../misc/networking";
@@ -457,6 +457,17 @@ export function satisifiedUserType(currentType: UserType, minimumType: UserType)
     return currentType === minimumType || userTypeRanking[currentType] > userTypeRanking[minimumType];
 }
 
+export function createWildcardUserPERMISSIONS(config: { wildcardIndex: number; allowSuperUser?: boolean; }): PermissionsCallback {
+    let check: PermissionsCallback = permissionsConfig => {
+        if (config.allowSuperUser && isSuperUserPERMISSIONS()) return true;
+        let userId = getUserIdAllowUndefined();
+        if (!userId) return false;
+        return permissionsConfig.pathWildcards[config.wildcardIndex] === userId;
+    };
+    check.callImmutable = true;
+    return check;
+}
+
 export function createUserPERMISSIONS(userType: UserType) {
     return () => {
         let allowed = isCurrentUserType(userType);