querysub 0.332.0 → 0.334.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "querysub",
-  "version": "0.332.0",
+  "version": "0.334.0",
   "main": "index.js",
   "license": "MIT",
   "note1": "note on node-forge fork, see https://github.com/digitalbazaar/forge/issues/744 for details",
@@ -22,7 +22,7 @@
     "js-sha512": "^0.9.0",
     "node-forge": "https://github.com/sliftist/forge#e618181b469b07bdc70b968b0391beb8ef5fecd6",
     "pako": "^2.1.0",
-    "socket-function": "^0.140.0",
+    "socket-function": "^0.141.0",
     "terser": "^5.31.0",
     "typesafecss": "^0.22.0",
     "yaml": "^2.5.0",

package/src/4-querysub/Querysub.ts

@@ -713,6 +713,8 @@ export class Querysub {
         justHTTP?: boolean;
         debugName?: string;
 
+        staticRoots?: string[];
+
         sourceCheck?: MachineSourceCheck<any>;
     }) {
         console.log(`Hosting server with config: ${JSON.stringify(config)}`);
@@ -769,6 +771,9 @@ export class Querysub {
             });
             return `<script>${edgeBootstrapFile}</script>`;
         });
+        for (let root of config.staticRoots || []) {
+            RequireController.addStaticRoot(root);
+        }
 
         if (!noSyncing() && !isBootstrapOnly()) {
             SocketFunction.expose(QuerysubController);

package/src/deployManager/components/deployButtons.tsx

@@ -68,6 +68,7 @@ export class UpdateButtons extends qreact.Component<{
                                     let value = e.currentTarget.value;
                                     if (!value) return;
                                     if (e.key === "Enter" && e.shiftKey || e.key === "Tab" && e.shiftKey) {
+                                        e.preventDefault();
                                         await controller.commitPushAndPublishQuerysub.promise(value);
                                         closeAllModals();
                                     }
@@ -110,6 +111,7 @@ export class UpdateButtons extends qreact.Component<{
                                     let value = e.currentTarget.value;
                                     if (!value) return;
                                     if (e.key === "Enter" && e.shiftKey || e.key === "Tab" && e.shiftKey) {
+                                        e.preventDefault();
                                         await controller.commitPushService.promise(value);
                                         closeAllModals();
                                     }

package/src/diagnostics/logs/errorNotifications/ErrorSuppressionUI.tsx

@@ -12,6 +12,7 @@ import { formatDateJSX } from "../../../misc/formatJSX";
 import { LogDatum } from "../diskLogger";
 import { measureFnc } from "socket-function/src/profiling/measure";
 import { throttleRender } from "../../../functional/throttleRender";
+import { matchFilter } from "../../../misc";
 
 export class ErrorSuppressionUI extends qreact.Component<{
     dataSeqNum: number;
@@ -22,7 +23,8 @@ export class ErrorSuppressionUI extends qreact.Component<{
 }> {
     state = t.state({
         matchedInput: t.string(""),
-        renderLimit: t.number(10)
+        renderLimit: t.number(10),
+        filter: t.string(""),
     });
 
     @measureFnc
@@ -58,22 +60,25 @@ export class ErrorSuppressionUI extends qreact.Component<{
 
         this.props.dataSeqNum;
         const controller = SuppressionListController(SocketFunction.browserNodeId());
-        const entries = (controller.getSuppressionList() || []);
+        let entries = (controller.getSuppressionList() || []);
         sort(entries, x => -x.lastUpdateTime);
         sort(entries, x => -(this.props.suppressionCounts.get(x.key) ? 1 : 0));
         sort(entries, x => -(this.props.expiredSuppressionCounts.get(x.key) ? 1 : 0));
 
+        let totalCount = entries.length;
+        entries = entries.filter(x => matchFilter({ value: this.state.filter }, x.match));
+
         const previewMatchCount = this.calculatePreviewMatchCount(this.state.matchedInput);
 
         return <div className={css.vbox(16).pad2(16).fillWidth.bord2(0, 0, 50, 5).hsl(0, 0, 80)}>
-            <div className={css.fontSize(18)}>Error Suppression List ({formatNumber(entries.length)})</div>
+            <div className={css.fontSize(18)}>Error Suppression List ({formatNumber(entries.length)} / {formatNumber(totalCount)})</div>
 
             <div className={css.hbox(8).fillWidth}>
                 <InputLabel
                     label="Add Match"
                     value={this.state.matchedInput}
                     hot
-                    onChangeValue={(value: string) => this.state.matchedInput = value}
+                    onChangeValue={(value) => this.state.matchedInput = value}
                     onKeyDown={e => {
                         if (e.key === "Enter") {
                             let value = e.currentTarget.value;
@@ -97,7 +102,6 @@ export class ErrorSuppressionUI extends qreact.Component<{
                     fillWidth
                     placeholder="* is supported as a wildcard (enter to submit and refresh, shift+enter to submit and do not refresh)"
                 />
-
                 {this.state.matchedInput.trim() && <span className={css.opacity(0.6).fontSize(12).flexShrink0}>
                     matches {formatNumber(previewMatchCount)} (in top 1000)
                 </span>}
@@ -164,6 +168,16 @@ export class ErrorSuppressionUI extends qreact.Component<{
                 </Button>
             </div>
 
+
+            <InputLabel
+                label="Filter"
+                value={this.state.filter}
+                hot
+                onChangeValue={value => this.state.filter = value}
+                fillWidth
+            />
+
+
             <div className={css.pad2(12).bord2(200, 40, 85).hsl(200, 40, 95).fillWidth}>
                 <strong>Note:</strong> Suppression time updates don't automatically rerun the search. Click Run to rerun the search.
             </div>

package/src/diagnostics/logs/errorNotifications/errorWatchEntry.tsx

@@ -84,9 +84,11 @@ function canSendNow(info: IMInfo) {
     let historyInHour = historyInDay.filter(x => x.time > hourThreshold);
 
     if (historyInDay.length >= MAX_IMS_PER_DAY) {
+        console.log(magenta(`Not sending IM, because we've sent ${historyInDay.length} > ${MAX_IMS_PER_DAY} IMs in the last day`));
         return false;
     }
     if (historyInHour.length >= MAX_IMS_PER_HOURS) {
+        console.log(magenta(`Not sending IM, because we've sent ${historyInHour.length} > ${MAX_IMS_PER_HOURS} IMs in the last hour`));
         return false;
     }
     return true;