querysub 0.182.0 → 0.185.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "querysub",
-  "version": "0.182.0",
+  "version": "0.185.0",
   "main": "index.js",
   "license": "MIT",
   "note1": "note on node-forge fork, see https://github.com/digitalbazaar/forge/issues/744 for details",
@@ -9,7 +9,6 @@
     "url": "https://github.com/sliftist/shard.git"
   },
   "dependencies": {
-    "@sendgrid/mail": "^7.7.0",
     "@types/fs-ext": "^2.0.3",
     "@types/node-forge": "^1.3.1",
     "@types/pako": "^2.0.3",
@@ -23,8 +22,7 @@
     "js-sha512": "^0.9.0",
     "node-forge": "https://github.com/sliftist/forge#e618181b469b07bdc70b968b0391beb8ef5fecd6",
     "pako": "^2.1.0",
-    "preact": "^10.11.3",
-    "socket-function": "^0.130.0",
+    "socket-function": "^0.132.0",
     "terser": "^5.31.0",
     "typesafecss": "^0.22.0",
     "yaml": "^2.5.0",
@@ -56,4 +54,4 @@
   "resolutions": {
     "node-forge": "https://github.com/sliftist/forge#e618181b469b07bdc70b968b0391beb8ef5fecd6"
   }
-}
+}

package/src/-a-auth/certs.ts

@@ -116,9 +116,9 @@ export function createX509(
 
         measureBlock(function sign() {
             if (issuer === "self") {
-                certObj.sign(keyPair.privateKey, forge.md.sha256.create());
+                certObj.sign(keyPair.privateKey as any, forge.md.sha256.create());
             } else {
-                certObj.sign(privateKeyFromPem(issuer.key.toString()), forge.md.sha256.create());
+                certObj.sign(privateKeyFromPem(issuer.key.toString()) as any, forge.md.sha256.create());
             }
         });
 

package/src/0-path-value-core/archiveLocks/ArchiveLocks2.ts

@@ -698,7 +698,7 @@ class TransactionLocker {
                     logNodeStats(`archives|TΔ Delete Old Rejected File`, formatNumber, unconfirmedOldFiles2.length);
                     // At the point the file was very old when we started reading, not part of the active transaction.
                     for (let file of unconfirmedOldFiles2) {
-                        await this.deleteDataFile(file.file, `old unconfirmed file (${getOwnNodeId()}, ${process.argv[1]})`);
+                        await this.deleteDataFile(file.file, `old unconfirmed file`);
                     }
                 }
             }

package/src/2-proxy/PathValueProxyWatcher.ts

@@ -181,10 +181,7 @@ export interface WatcherOptions<Result> {
     // Temporary indicates after becoming synchronizes it will immediately dispose itself
     temporary?: boolean;
 
-    // Allow returning proxies. Usually this would make the result unusable, but if the result is intended to
-    //  be used in another synced context this is fine.
-    //  - This is also faster, as it doesn't require a deep clone, and so in some cases this makes it
-    //      better, even if you don't have any proxies.
+    // MUCH faster for large data (which otherwise requires a deep clone), but if it does return a proxy, and you access it in non-commit, it will throw.
     allowProxyResults?: boolean;
 
     /** Prevents us from (ever) tracking this as a wasted evaluation.

package/src/2-proxy/schema2.ts

@@ -411,7 +411,10 @@ function typeDefTypeToInternalType(
         } else if (typeDef.path.includes("boolean")) {
             baseDefault = false;
         }
-        rootResult.defaultValue = recursiveFreeze(params[params.length - 1]?.callParams?.[0] ?? baseDefault);
+        //rootResult.defaultValue = recursiveFreeze(params[params.length - 1]?.callParams?.[0] ?? baseDefault);
+        // No longer recursively freeze it. This is okay for component singletons, and common. If users otherwise set the object to a default, and then mutate it... they are on their own.
+        //  - Basically, we often store very large objects in state, under the expectation it is never traversed. While defaults might not be large, the expectation that it isn't traversed is still there, and if we traverse it and freeze it, we are likely to break things.
+        rootResult.defaultValue = params[params.length - 1]?.callParams?.[0] ?? baseDefault;
     }
     return results;
 }

package/src/4-dom/qreact.tsx

@@ -1,5 +1,5 @@
 import type preact from "preact";
-import { compareArray, isNode, sort } from "socket-function/src/misc";
+import { compareArray, isNode, sort, timeInSecond } from "socket-function/src/misc";
 import { isDeploy } from "../4-deploy/deployCheck";
 import { PermissionsCheck } from "../4-querysub/permissions";
 import { ClientWatcher, clientWatcher } from "../1-path-client/pathValueClientWatcher";
@@ -531,7 +531,11 @@ class QRenderClass {
             let state = instance.state;
             registerSchemaPrefix({ schema: state, prefixPathStr: statePath });
             watchDispose(this, () => {
-                unregisterSchemaPrefix({ schema: state, prefixPathStr: statePath });
+                // Wait a bit to unregister, as there is no rush, and we want to allow any cleanup to occur that might still reference this state (which might break if we remove the schema).
+                //  - Don't wait too long though, as if we wait an hour, then it could cause REALLY hard to debug bugs.
+                setTimeout(() => {
+                    unregisterSchemaPrefix({ schema: state, prefixPathStr: statePath });
+                }, timeInSecond * 15);
             });
         } else {
             initialState = instance.state || {};
@@ -1107,6 +1111,22 @@ class QRenderClass {
                     }
                 }
 
+                const contextCommit = (callback: () => void) => {
+                    void Promise.resolve().finally(() => {
+                        logErrors(proxyWatcher.commitFunction({
+                            canWrite: true,
+                            watchFunction() {
+                                QRenderClass.renderingComponentId = self.id;
+                                try {
+                                    callback();
+                                } finally {
+                                    QRenderClass.renderingComponentId = undefined;
+                                }
+                            },
+                        }));
+                    });
+                };
+
                 // NOTE: This is a bit inefficient as it requires running twice, because the first run our child
                 //  components will have no rootDOMNodes. But... it's probably fine...
                 QRenderClass.diffVNodes({
@@ -1205,7 +1225,8 @@ class QRenderClass {
                         }
                         if (isVNode(vNode)) {
                             if (typeof vNode.ref === "function") {
-                                vNode.ref(null);
+                                let ref = vNode.ref;
+                                contextCommit(() => ref(null));
                             }
                         }
                     },
@@ -1315,22 +1336,6 @@ class QRenderClass {
                     );
                 }
 
-                const contextCommit = (callback: () => void) => {
-                    void Promise.resolve().finally(() => {
-                        logErrors(proxyWatcher.commitFunction({
-                            canWrite: true,
-                            watchFunction() {
-                                QRenderClass.renderingComponentId = self.id;
-                                try {
-                                    callback();
-                                } finally {
-                                    QRenderClass.renderingComponentId = undefined;
-                                }
-                            },
-                        }));
-                    });
-                };
-
                 let props = self.instance.props as qreact.JSX.IntrinsicClassAttributes<any>;
                 if (isFirstMount) {
                     isFirstMount = false;
@@ -1672,7 +1677,7 @@ class QRenderClass {
             disposeWatchers.delete(this);
             for (let disposer of disposers) {
                 try {
-                    disposer();
+                    Querysub.commit(disposer);
                 } catch (e: any) {
                     console.error(`Error in dispose callback for ${this.debugName}, ${disposer.name}, ${e.stack}`);
                 }

package/src/4-querysub/Querysub.ts

@@ -201,6 +201,8 @@ export class Querysub {
 
     public static now = getSyncedTime;
     public static time = getSyncedTime;
+    public static timeUnique = getSyncedTimeUnique;
+
     public static getCallTime = getSyncedTime;
     public static getFunctionCallTime = getSyncedTime;
     public static getCallId = () => Querysub.getCallerMachineId() + "_" + Querysub.getCallTime();
@@ -349,6 +351,13 @@ export class Querysub {
     }
     public static localCommit = Querysub.localRead;
     public static commitLocal = Querysub.localRead;
+    public static fastRead<T>(fnc: () => T, options?: Partial<WatcherOptions<T>>) {
+        return proxyWatcher.runOnce({
+            watchFunction: fnc,
+            ...options,
+            allowProxyResults: true,
+        });
+    }
     public static localRead<T>(fnc: () => T, options?: Partial<WatcherOptions<T>>) {
         return proxyWatcher.runOnce({
             watchFunction: fnc,
@@ -613,17 +622,20 @@ export class Querysub {
                 paintTime = performance.now() - paintTime;
                 // ALWAYS finish the profile, or we leak a lot of memory!
                 let profile = measureObj.finish();
-                if (paintTime > threshold && Object.keys(profile.entries).length > 0) {
+                let profiledTime = Object.values(profile.entries).reduce((a, b) => a + b.ownTime.sum, 0);
+                if (paintTime > threshold && profiledTime > threshold && Object.keys(profile.entries).length > 0) {
                     console.log(`Slow paint time: ${formatTime(paintTime)} (${formatNumber(1000 / paintTime)}fps), profile is:`);
                     logMeasureTable(profile, {
                         minTimeToLog: 0,
                         maxTableEntries: 100,
                         mergeDepth: 2,
+                        //thresholdInTable: 0.001,
                     });
                     logMeasureTable(profile, {
                         minTimeToLog: 0,
                         maxTableEntries: 100,
                         mergeDepth: 3,
+                        //thresholdInTable: 0.001,
                     });
                 }
             }
@@ -1045,6 +1057,17 @@ let initInterval = cache((interval: number) => {
         }
     }, interval);
 });
+
+let lastTime = 0;
+function getSyncedTimeUnique() {
+    let time = getSyncedTime();
+    if (time <= lastTime) {
+        time = addEpsilons(time, 1);
+    }
+    lastTime = time;
+    return time;
+}
+
 function getSyncedTime() {
     let call = getCurrentCallAllowUndefined();
     if (call) {
@@ -1136,4 +1159,5 @@ import { getEdgeBootstrapScript } from "../4-deploy/edgeBootstrap";
 import { formatNumber, formatTime } from "socket-function/src/formatting/format";
 import { css } from "../4-dom/css";
 import { getCountPerPaint } from "../functional/onNextPaint";
+import { addEpsilons } from "../bits";
 

package/src/library-components/ATag.tsx

@@ -12,6 +12,10 @@ export type ATagProps = (
     Omit<preact.JSX.HTMLAttributes<HTMLAnchorElement>, "href">
     & {
         values?: URLOverride[];
+
+        // Also selected if any of these combinations of values are visible
+        showAdditionalValues?: URLOverride[][];
+
         // TODO:
         /** For example: ["ArrowLeft", "ctrl+z", "shift+toggle"] */
         hotkeys?: string[];
@@ -34,6 +38,13 @@ export class ATag extends qreact.Component<ATagProps> {
             return <div {...props as any}>{children}</div>;
         }
         let isCurrent = values?.every(value => value.param.value === value.value);
+        if (this.props.showAdditionalValues) {
+            for (let additionalValues of this.props.showAdditionalValues) {
+                if (additionalValues.every(value => value.param.value === value.value)) {
+                    isCurrent = true;
+                }
+            }
+        }
         let lightness = props.lightMode ? 40 : 80;
         return (
             <a

package/src/library-components/Input.tsx

@@ -48,7 +48,6 @@ export type InputProps = (
 export class Input extends qreact.Component<InputProps> {
     state = {};
     onFocusText = "";
-    firstFocus = true;
 
     elem: HTMLInputElement | null = null;
     lastValue: unknown = null;
@@ -97,22 +96,21 @@ export class Input extends qreact.Component<InputProps> {
                 if (x) {
                     this.elem = x;
                 }
-                if (x && props.focusOnMount && this.firstFocus) {
-                    this.firstFocus = false;
-                    setTimeout(() => {
-                        x.focus();
-                        // I'm not sure why, but this initial focus isn't trigger onFocus, so we have to
-                        //      trigger it ourselves
-                        if (!props.noFocusSelect) {
-                            x.select();
-                        }
-                    }, 0);
-                }
+
                 let ref = props.inputRef || props.ref;
                 if (typeof ref === "function") {
                     ref(x);
                 }
             },
+            ["ref2" as any]: (x: HTMLInputElement) => {
+                if (props.focusOnMount) {
+                    x.focus();
+                    if (!props.noFocusSelect) {
+                        x.select();
+                    }
+                }
+                (props as any).ref2?.(x);
+            },
             class: undefined,
             className: (
                 (props.className || props.class || " ")

package/src/-b-authorities/emailAuthority.ts

@@ -1,57 +0,0 @@
-import fs from "fs";
-import os from "os";
-import { lazy } from "socket-function/src/caching";
-import { isNode } from "socket-function/src/misc";
-import sendGrid from "@sendgrid/mail";
-import { addRecord } from "./dnsAuthority";
-import debugbreak from "debugbreak";
-import { getStorageDir } from "../fs";
-import { red } from "socket-function/src/formatting/logColors";
-
-let sendGridPath = lazy(() => {
-    return getStorageDir() + "sendgrid.txt";
-});
-
-export const hasEmailSendPermissions = lazy(() => {
-    if (!isNode()) return undefined;
-    let path = sendGridPath();
-    if (!fs.existsSync(path)) return undefined;
-    let sendGridKey = fs.readFileSync(path, "utf8");
-    sendGrid.setApiKey(sendGridKey);
-    return sendGrid;
-});
-
-export async function sendEmail(config: {
-    from: string;
-    to: string[];
-    subject: string;
-    html: string;
-}) {
-    console.log(red(`!!! Sending email to ${config.to.join(", ")}, from ${config.from}, subject: ${JSON.stringify(config.subject)}`));
-    const sendGrid = hasEmailSendPermissions();
-    if (!sendGrid) {
-        throw new Error(`Sendgrid get not found at ${sendGridPath()}`);
-    }
-    await sendGrid.send(config);
-}
-
-// NOTE: Sending SMTP yourself is actually easy, but... the port will be blocked by all ISPs, and many
-//  hosting providing, including digital ocean. So... we're just going to have to use a service to do it...
-// SPF
-//  - Just adding a DNS entry for our IP?
-//  Ah, so... add a TXT record to point to a subdomain
-//  - Ex: "v=spf1 redirect=_spf.google.com"
-//      - With the subdomain record looking like: "v=spf1 ip4:35.190.247.0/24 ip4:64.233.160.0/19 ip4:66.102.0.0/20 ip4:66.249.80.0/20 ip4:72.14.192.0/18 ip4:74.125.0.0/16 ip4:108.177.8.0/21 ip4:173.194.0.0/16 ip4:209.85.128.0/17 ip4:216.58.192.0/19 ip4:216.239.32.0/19 -all"
-//          - Maybe ~all, but, -all seems safer?
-//  - This just makes it easier to update the record, as the redirect will be constant,
-//      and then the subdomain value can be clobbered every time (as it will only have 1 TXT record)
-// DKIM
-//  - Public key published in DNS
-//      - Under [selector]._domainkey.[domain]
-//          - Where selector is specified in the email
-//      - And then we sign the email, and pass the signature with it (somehow)
-// DMARC
-//  - A DNS entry specifying that we are using SPF and DKIM
-//      - Fairly simple, even constant, but I'm not sure why I can't see it in gmail.com or perspectanalytics.com
-//          TXT records. Oh well, we can probably just publish it ourselves
-//      - https://www.cloudflare.com/learning/dns/dns-records/dns-dmarc-record/