querysub 0.252.0 → 0.254.0

package/src/deployManager/spec.txt

@@ -1,62 +1,4 @@
-Ugh...
-    1) Our local http server can't talk to the remote PathValueServer server?
-    2) The remote http server isn't loading the modules?
-        - Which... come from permissions, and so the PathValueServer?
-        - Ah, and, it can't find the PathValueServer either?
-
-OH! It is... that we keep picking the wrong server, thinking it is working, but it has an old config?
-
-bd6cf9eb4accffba8
-
-4) Add 2X redundancy to PathValueServer, and... FunctionRunner?
-
-
-5) Setup on our regular digital ocean server
-    - Setup all the services in the new UI
-        - Copy from the previous startup.sh, running the same services
-        - Changing the UI if anything is extremely annoying, but... I don't see how it would be...
-    tmux send-keys -t server1 "cd ~/cyoa && yarn server-public" Enter
-    tmux send-keys -t server2 "cd ~/cyoa && yarn server-public" Enter
-    tmux send-keys -t fnc "cd ~/cyoa && yarn function-public --verbosecalls" Enter
-
-    tmux send-keys -t http "cd ~/cyoa && yarn cyoa-public --verbosecalls" Enter
-    tmux send-keys -t watch "cd ~/cyoa && yarn gc-watch-public" Enter
-    tmux send-keys -t join "cd ~/cyoa && yarn join-public" Enter
-5) Verify the editor works
-
-
-
-
-8) REIMPLEMENT yarn do-update functionality, with UI on the configuration page
-    - Components
-        <UpdateButtons />
-            - Commit all (add, commit, push)
-                - Only shows up if there are unsaved changes
-            - Commit querysub (publish, add, commit, push querysub, update package.json of app, add, commit, push)
-                - Only shows up if there are unsaved changes
-            - Deploy all (set hash to latest and save)
-                - Only shows up if (any) deployed hashes differ from latest for app
-        <UpdateServiceButtons service={serviceConfig} />
-            - Commit (add, commit, push)
-                - Only shows up if there are unsaved changes
-            - Deploy (set hash to latest and save)
-                - Only shows up if deployed hash differ from latest for app
-    - Endpoints
-        - anyQuerysubUnsaved
-        - anyAppUnsaved
-        - querysubLatestHash
-        - appLatestHash (already have this)
-        - publish, add, commit, and push querysub (and update app package.json reference)
-        - add, commit and push app
-
-    - On services list page, and individual service page
-        - So... maybe the button a component
-        - MULTIPLE buttons, to just update the main site, just querysub, or both
-    - Button to update on each service where the repoUrl === the repoUrl of the server
-        - Only from a non-public server
-    - ALSO, button to update all (that match repoUrl)
-    - Commit, push, update hash
-        - Also with an option to also update querysub (it'll tell us if querysub has changes), updating package.json to
+OH, okay, so... we DO need machine update support, because... we will need to update them
 
 
 7) Quick node removal on process crash OR removal
@@ -67,6 +9,8 @@ bd6cf9eb4accffba8
 
 
 In general, hit our servers hard, to make sure we can launch them, they can talk to each other, etc. Even with entirely new folders (to somewhat emulate another machine), and they can all startup smoothly.
+
+AH, I think I fixed that bug. I think it was an issue with using old hosts?
 6) BUG! On startup, new nodes might take a poll interval to be fully ready? Hmm... we should restart our servers a lot again to make sure they come back up QUICKLY
     - OH! It might be that the identity takes some time to propagate (the DNS), which causes us to require a second poll to be alive? Maybe... our local machine deleted it, because it couldn't see the DNS? No... none of these are reasonable...
     - Try changing the key, so it syncs again, so we start fresh with the server
@@ -76,9 +20,6 @@ In general, hit our servers hard, to make sure we can launch them, they can talk
 FORTUNATELY, looking at logs is now very simple, as well as updating nodes, so... this shouldn't be too hard to debug
 
 
-6) Verify PathValueServer gracefully shutdowns, not losing any values (because it delays and flushes writes before shutting down, detecting the ctrl+c).
-
-
 8) Fix deploy user notification issue, where the refresh button doesn't work?
 
 9) Rolling service updates

package/src/deployManager/urlParams.ts

@@ -2,7 +2,6 @@ import { URLParam } from "../library-components/URLParam";
 
 export type ViewType = "services" | "machines" | "service-detail" | "machine-detail";
 
-// URL Parameters for navigation state
 export const currentViewParam = new URLParam<ViewType>("machineview", "machines");
 export const selectedServiceIdParam = new URLParam("serviceId", "");
 export const selectedMachineIdParam = new URLParam("machineId", ""); 

package/src/diagnostics/errorLogs/ErrorLogController.ts

@@ -140,6 +140,7 @@ let ensureBlocksFlushing = lazy(() => {
 let pendingLogs: { log: LogRaw; type: LogType }[] = [];
 let logClassifier: ((log: LogRaw, typeHint: LogType) => LogClass) | undefined;
 let initLogClassifier = lazy(async () => {
+    if (!isNode()) return null as never;
     let logClasses = await new ErrorLogControllerBase().getClasses();
     logClassifier = getLogClassCategorizer(logClasses);
     if (pendingLogs.length > 0) {

package/src/diagnostics/errorLogs/LogClassifiers.tsx

@@ -284,6 +284,12 @@ export class SuppressUntil extends qreact.Component<{
                         </>
                     )}
                 </div>
+                {type !== "info" && <Button
+                    onClick={() => updateClass({ suppressUntil: changeTime })}
+                    class={css.hsl(infoColor.h, infoColor.s, infoColor.l)}
+                >
+                    Fixed
+                </Button>}
                 {type !== "info" && <Button
                     onClick={() => updateClass({ type: "info" })}
                     class={css.hsl(infoColor.h, infoColor.s, infoColor.l)}

package/src/library-components/SyncedController.ts

@@ -8,12 +8,16 @@ import { formatTime } from "socket-function/src/formatting/format";
 import { nextId } from "socket-function/src/misc";
 import { getCallObj } from "socket-function/src/nodeProxy";
 import { MaybePromise } from "socket-function/src/types";
+import { isNode } from "typesafecss";
 
 // IMPORTANT! See cacheAsyncSynced if you just want to run promise functions
 
 let controllerIds = new Set<string>();
 
 module.hotreload = false;
+// NOTE: Most SyncedController are defined in files we don't hotreload anyways, so the page will refresh on changes. And if they aren't... they should be.
+//  - And if we reload all the calls on hot reload, it makes iterating on the UI extremely annoying. So... we don't anymore.
+/*
 onHotReload(() => {
     Querysub.commitLocal(() => {
         let root = syncedData();
@@ -31,14 +35,15 @@ onHotReload(() => {
         }
     });
 });
+*/
 
 export function syncedIsAnyLoading() {
     return Querysub.fastRead(() => {
         for (let controllerId in syncedData()) {
-            for (let nodeId in syncedData()[controllerId]) {
-                for (let fnc in syncedData()[controllerId][nodeId]) {
-                    for (let argsHash in syncedData()[controllerId][nodeId][fnc]) {
-                        if (atomic(syncedData()[controllerId][nodeId][fnc][argsHash].promise)) {
+            for (let fncs of Object.values(syncedData()[controllerId])) {
+                for (let fnc of Object.values(fncs)) {
+                    for (let obj of Object.values(fnc)) {
+                        if (atomic(obj.promise)) {
                             return true;
                         }
                     }
@@ -103,6 +108,58 @@ export function getSyncedController<T extends SocketRegistered>(
     refreshAll(): void;
     isAnyLoading(): boolean;
 } {
+    if (isNode()) {
+        let result = cache((nodeId: string) => {
+            let proxy = new Proxy({}, {
+                get: (target, fncNameUntyped) => {
+                    if (typeof fncNameUntyped !== "string") return undefined;
+                    if (fncNameUntyped === "resetAll" || fncNameUntyped === "refreshAll" || fncNameUntyped === "isAnyLoading") {
+                        return notAllowedOnServer;
+                    }
+                    let fncName = fncNameUntyped;
+                    function call(...args: any[]) {
+                        notAllowedOnServer();
+                    }
+                    call.promise = (...args: any[]) => {
+                        return controller.nodes[nodeId][fncName](...args);
+                    };
+                    call.reset = (...args: any[]) => {
+                        notAllowedOnServer();
+                    };
+                    call.resetAll = () => {
+                        notAllowedOnServer();
+                    };
+                    call.refresh = (...args: any[]) => {
+                        notAllowedOnServer();
+                    };
+                    call.refreshAll = () => {
+                        notAllowedOnServer();
+                    };
+                    call.isAnyLoading = () => {
+                        notAllowedOnServer();
+                    };
+                    call.setCache = (config: { args: any[], result: any }) => {
+                        notAllowedOnServer();
+                    };
+                    return call;
+                }
+            }) as any;
+            return proxy;
+        }) as any;
+        function notAllowedOnServer() {
+            throw new Error(`Syncing with getSyncedController is not allowed on the server. If we absolutely need this we can support it, but... you should just be using raw synced state anyways.`);
+        }
+        result.resetAll = () => {
+            notAllowedOnServer();
+        };
+        result.refreshAll = () => {
+            notAllowedOnServer();
+        };
+        result.isAnyLoading = () => {
+            notAllowedOnServer();
+        };
+        return result;
+    }
     let id = nextId();
     controllerIds.add(id);
 
@@ -151,9 +208,9 @@ export function getSyncedController<T extends SocketRegistered>(
                 if (fncNameUntyped === "refreshAll") {
                     return () => {
                         return Querysub.commitLocal(() => {
-                            for (let fnc in syncedData()[id][nodeId]) {
-                                for (let argsHash in syncedData()[id][nodeId][fnc]) {
-                                    syncedData()[id][nodeId][fnc][argsHash].invalidated = true;
+                            for (let fnc of Object.values(syncedData()[id][nodeId])) {
+                                for (let obj of Object.values(fnc)) {
+                                    obj.invalidated = true;
                                 }
                             }
                         });
@@ -162,9 +219,9 @@ export function getSyncedController<T extends SocketRegistered>(
                 if (fncNameUntyped === "isAnyLoading") {
                     return () => {
                         return Querysub.commitLocal(() => {
-                            for (let fnc in syncedData()[id][nodeId]) {
-                                for (let argsHash in syncedData()[id][nodeId][fnc]) {
-                                    if (atomic(syncedData()[id][nodeId][fnc][argsHash].promise)) {
+                            for (let fnc of Object.values(syncedData()[id][nodeId])) {
+                                for (let obj of Object.values(fnc)) {
+                                    if (atomic(obj.promise)) {
                                         return true;
                                     }
                                 }
@@ -195,14 +252,13 @@ export function getSyncedController<T extends SocketRegistered>(
                             doAtomicWrites(() => {
                                 obj.promise = promise;
                             });
-                            function invalidateAll() {
+                            function invalidateReaders() {
                                 let root = syncedData();
                                 for (let writesTo of config?.writes?.[fncName] || []) {
                                     for (let watcher of writeWatchers.get(writesTo) || []) {
-                                        for (let nodeId in root[watcher.controllerId]) {
-                                            for (let fnc in root[watcher.controllerId][nodeId]) {
-                                                for (let argsHash in root[watcher.controllerId][nodeId][fnc]) {
-                                                    let obj = root[watcher.controllerId][nodeId][fnc][argsHash];
+                                        for (let fncs of Object.values(root[watcher.controllerId])) {
+                                            for (let fnc of Object.values(fncs)) {
+                                                for (let obj of Object.values(fnc)) {
                                                     obj.invalidated = true;
                                                 }
                                             }
@@ -216,7 +272,7 @@ export function getSyncedController<T extends SocketRegistered>(
                                     Querysub.commitLocal(() => {
                                         obj.result = atomicObjectWriteNoFreeze({ result });
                                         obj.promise = undefined;
-                                        invalidateAll();
+                                        invalidateReaders();
                                     });
                                 },
                                 error => {
@@ -224,7 +280,7 @@ export function getSyncedController<T extends SocketRegistered>(
                                     Querysub.commitLocal(() => {
                                         obj.result = atomicObjectWriteNoFreeze({ error });
                                         obj.promise = undefined;
-                                        invalidateAll();
+                                        invalidateReaders();
                                     });
                                 }
                             );
@@ -243,9 +299,13 @@ export function getSyncedController<T extends SocketRegistered>(
                 }
                 call.promise = (...args: any[]) => {
                     return Querysub.fastRead(() => {
-                        call(...args);
                         let argsHash = JSON.stringify(args);
-                        let promise = atomic(syncedData()[id][nodeId][fncName][argsHash].promise);
+                        let obj = syncedData()[id][nodeId][fncName][argsHash];
+                        // Reset promise, to force it to not use the cache, as promise functions should never be cached. This might result in the results being set out of order, but... generally functions called with promise and accessed inside a watcher, so this should be fine.
+                        obj.promise = undefined;
+                        obj.invalidated = true;
+                        call(...args);
+                        let promise = atomic(obj.promise);
                         if (!promise) {
                             debugger;
                             throw new Error(`Impossible, called function, but promise is not found for ${fncName}`);
@@ -279,15 +339,15 @@ export function getSyncedController<T extends SocketRegistered>(
                 };
                 call.refreshAll = () => {
                     return Querysub.commitLocal(() => {
-                        for (let argsHash in syncedData()[id][nodeId][fncName]) {
-                            syncedData()[id][nodeId][fncName][argsHash].invalidated = true;
+                        for (let obj of Object.values(syncedData()[id][nodeId][fncName])) {
+                            obj.invalidated = true;
                         }
                     });
                 };
                 call.isAnyLoading = () => {
                     return Querysub.commitLocal(() => {
-                        for (let argsHash in syncedData()[id][nodeId][fncName]) {
-                            if (atomic(syncedData()[id][nodeId][fncName][argsHash].promise)) {
+                        for (let obj of Object.values(syncedData()[id][nodeId][fncName])) {
+                            if (atomic(obj.promise)) {
                                 return true;
                             }
                         }
@@ -320,10 +380,10 @@ export function getSyncedController<T extends SocketRegistered>(
     };
     result.refreshAll = () => {
         return Querysub.commitLocal(() => {
-            for (let nodeId in syncedData()[id]) {
-                for (let fnc in syncedData()[id][nodeId]) {
-                    for (let argsHash in syncedData()[id][nodeId][fnc]) {
-                        syncedData()[id][nodeId][fnc][argsHash].invalidated = true;
+            for (let fncs of Object.values(syncedData()[id])) {
+                for (let fnc of Object.values(fncs)) {
+                    for (let obj of Object.values(fnc)) {
+                        obj.invalidated = true;
                     }
                 }
             }
@@ -331,10 +391,10 @@ export function getSyncedController<T extends SocketRegistered>(
     };
     result.isAnyLoading = () => {
         return Querysub.commitLocal(() => {
-            for (let nodeId in syncedData()[id]) {
-                for (let fnc in syncedData()[id][nodeId]) {
-                    for (let argsHash in syncedData()[id][nodeId][fnc]) {
-                        if (atomic(syncedData()[id][nodeId][fnc][argsHash].promise)) {
+            for (let fncs of Object.values(syncedData()[id])) {
+                for (let fnc of Object.values(fncs)) {
+                    for (let obj of Object.values(fnc)) {
+                        if (atomic(obj.promise)) {
                             return true;
                         }
                     }

package/src/misc/formatJSX.tsx

@@ -0,0 +1,6 @@
+import { qreact } from "../4-dom/qreact";
+import { formatTime, formatVeryNiceDateTime } from "socket-function/src/formatting/format";
+
+export function formatTimeJSX(time: number) {
+    return <span title={formatVeryNiceDateTime(time)}>({formatTime(Date.now() - time)})</span>;
+}