querysub 0.433.0 → 0.437.0

package/src/library-components/DropdownSelector.tsx

@@ -1,32 +1,32 @@
-import preact from "preact";
-import { Querysub } from "../../src/4-querysub/QuerysubController";
-import { qreact } from "../../src/4-dom/qreact";
-
-
-export class DropdownSelector<T> extends qreact.Component<{
-    title?: string;
-    value: T;
-    onChange: (value: T) => void;
-    options: { value: T; label: string; }[];
-}> {
-    render() {
-        const { options, value, title, onChange } = this.props;
-        let optionValues = options.map(o => String(o.value));
-        return (
-            <label style={{ display: "flex", gap: 10, alignItems: "center" }}>
-                {title && <span>{title}</span>}
-                <select
-                    value={String(value)}
-                    onChange={e => {
-                        let option = options[optionValues.indexOf(e.currentTarget.value)];
-                        onChange(option ? option.value : e.currentTarget.value as T);
-                    }}
-                >
-                    {options.map(({ value, label }) =>
-                        <option value={String(value)}>{label}</option>
-                    )}
-                </select>
-            </label>
-        );
-    }
+import preact from "preact";
+import { Querysub } from "../../src/4-querysub/QuerysubController";
+import { qreact } from "../../src/4-dom/qreact";
+
+
+export class DropdownSelector<T> extends qreact.Component<{
+    title?: string;
+    value: T;
+    onChange: (value: T) => void;
+    options: { value: T; label: string; }[];
+}> {
+    render() {
+        const { options, value, title, onChange } = this.props;
+        let optionValues = options.map(o => String(o.value));
+        return (
+            <label style={{ display: "flex", gap: 10, alignItems: "center" }}>
+                {title && <span>{title}</span>}
+                <select
+                    value={String(value)}
+                    onChange={e => {
+                        let option = options[optionValues.indexOf(e.currentTarget.value)];
+                        onChange(option ? option.value : e.currentTarget.value as T);
+                    }}
+                >
+                    {options.map(({ value, label }) =>
+                        <option value={String(value)}>{label}</option>
+                    )}
+                </select>
+            </label>
+        );
+    }
 }

package/src/library-components/InlinePopup.tsx

@@ -1,67 +1,67 @@
-import preact from "preact";
-import { Querysub } from "../4-querysub/QuerysubController";
-import { qreact } from "../4-dom/qreact";
-import { Button } from "../library-components/Button";
-import { Icon } from "../library-components/icons";
-import { createURLSync } from "./URLParam";
-
-const popupURL = createURLSync<string>("popup", "");
-
-
-export class InlinePopup extends qreact.Component<{
-    type: string;
-    margin?: number;
-}> {
-    render() {
-        if (popupURL.value !== this.props.type) return undefined;
-        let margin = this.props.margin ?? 100;
-        return (
-            <div
-                style={{
-                    position: "fixed",
-                    left: 0, top: 0,
-                    width: "100vw", height: "100vh",
-                    zIndex: 1000,
-                }}
-                onClick={e => qreact.isTarget(e) && (popupURL.value = "")}
-            >
-                <div style={{
-                    margin,
-                    position: "relative",
-                    zIndex: 1,
-                }}>
-                    <Button
-                        hotkeys={["Escape"]}
-                        showHotkeys
-                        onClick={() => popupURL.value = ""}
-                        style={{
-                            position: "absolute",
-                            right: 0, top: -10,
-                            transform: "translate(0%, -100%)",
-                            border: "1px solid hsl(0, 0%, 7%)",
-                        }}
-                    >
-                        {Icon.close()}
-                    </Button>
-                    <div style={{
-                        maxHeight: `calc(100vh - ${margin * 2}px)`,
-                        overflow: "auto",
-                    }}>
-                        {this.props.children}
-                    </div>
-                </div>
-                <div
-                    className="button"
-                    style={{
-                        position: "absolute",
-                        left: 0, top: 0,
-                        width: "100%", height: "100%",
-                        background: "hsl(0, 0%, 50%, 0.5)",
-                        zIndex: 0,
-                    }}
-                    onClick={e => popupURL.value = ""}
-                />
-            </div>
-        );
-    }
+import preact from "preact";
+import { Querysub } from "../4-querysub/QuerysubController";
+import { qreact } from "../4-dom/qreact";
+import { Button } from "../library-components/Button";
+import { Icon } from "../library-components/icons";
+import { createURLSync } from "./URLParam";
+
+const popupURL = createURLSync<string>("popup", "");
+
+
+export class InlinePopup extends qreact.Component<{
+    type: string;
+    margin?: number;
+}> {
+    render() {
+        if (popupURL.value !== this.props.type) return undefined;
+        let margin = this.props.margin ?? 100;
+        return (
+            <div
+                style={{
+                    position: "fixed",
+                    left: 0, top: 0,
+                    width: "100vw", height: "100vh",
+                    zIndex: 1000,
+                }}
+                onClick={e => qreact.isTarget(e) && (popupURL.value = "")}
+            >
+                <div style={{
+                    margin,
+                    position: "relative",
+                    zIndex: 1,
+                }}>
+                    <Button
+                        hotkeys={["Escape"]}
+                        showHotkeys
+                        onClick={() => popupURL.value = ""}
+                        style={{
+                            position: "absolute",
+                            right: 0, top: -10,
+                            transform: "translate(0%, -100%)",
+                            border: "1px solid hsl(0, 0%, 7%)",
+                        }}
+                    >
+                        {Icon.close()}
+                    </Button>
+                    <div style={{
+                        maxHeight: `calc(100vh - ${margin * 2}px)`,
+                        overflow: "auto",
+                    }}>
+                        {this.props.children}
+                    </div>
+                </div>
+                <div
+                    className="button"
+                    style={{
+                        position: "absolute",
+                        left: 0, top: 0,
+                        width: "100%", height: "100%",
+                        background: "hsl(0, 0%, 50%, 0.5)",
+                        zIndex: 0,
+                    }}
+                    onClick={e => popupURL.value = ""}
+                />
+            </div>
+        );
+    }
 }

package/src/misc/color.ts

@@ -1,30 +1,30 @@
-
-/** hue: 0-360, saturation: 0-100, lightness: 0-100 */
-export function hslToRGB(color: { h: number; s: number; l: number }) {
-    let { h, s, l } = color;
-    h /= 360;
-    s /= 100;
-    l /= 100;
-    let r, g, b;
-    if (s === 0) {
-        r = g = b = l; // achromatic
-    } else {
-        const hue2rgb = (p: number, q: number, t: number) => {
-            if (t < 0) t += 1;
-            if (t > 1) t -= 1;
-            if (t < 1 / 6) return p + (q - p) * 6 * t;
-            if (t < 1 / 2) return q;
-            if (t < 2 / 3) return p + (q - p) * (2 / 3 - t) * 6;
-            return p;
-        };
-        const q = l < 0.5 ? l * (1 + s) : l + s - l * s;
-        const p = 2 * l - q;
-        r = hue2rgb(p, q, h + 1 / 3);
-        g = hue2rgb(p, q, h);
-        b = hue2rgb(p, q, h - 1 / 3);
-        if (b < 0) {
-            b = 0;
-        }
-    }
-    return { r: Math.floor(r * 255), g: Math.floor(g * 255), b: Math.floor(b * 255) };
+
+/** hue: 0-360, saturation: 0-100, lightness: 0-100 */
+export function hslToRGB(color: { h: number; s: number; l: number }) {
+    let { h, s, l } = color;
+    h /= 360;
+    s /= 100;
+    l /= 100;
+    let r, g, b;
+    if (s === 0) {
+        r = g = b = l; // achromatic
+    } else {
+        const hue2rgb = (p: number, q: number, t: number) => {
+            if (t < 0) t += 1;
+            if (t > 1) t -= 1;
+            if (t < 1 / 6) return p + (q - p) * 6 * t;
+            if (t < 1 / 2) return q;
+            if (t < 2 / 3) return p + (q - p) * (2 / 3 - t) * 6;
+            return p;
+        };
+        const q = l < 0.5 ? l * (1 + s) : l + s - l * s;
+        const p = 2 * l - q;
+        r = hue2rgb(p, q, h + 1 / 3);
+        g = hue2rgb(p, q, h);
+        b = hue2rgb(p, q, h - 1 / 3);
+        if (b < 0) {
+            b = 0;
+        }
+    }
+    return { r: Math.floor(r * 255), g: Math.floor(g * 255), b: Math.floor(b * 255) };
 }

package/src/misc/hash.ts

@@ -1,84 +1,84 @@
-import debugbreak from "debugbreak";
-
-/** Returns an integer */
-export function fastHash(text: string): number {
-    // Murmur, but we try to use more than 32 bits, as a double can store far more than 32 bits.
-    let hash1 = 5380942 ^ text.length;
-    let hash2 = 9143241 ^ text.length;
-    for (let i = 0; i < text.length; i++) {
-        let ch = text.charCodeAt(i);
-        hash1 = addToMurmurHash(hash1, ch);
-        hash2 = addToMurmurHash(hash2, ch);
-    }
-    hash1 = finishMurmurHash(hash1);
-    hash2 = finishMurmurHash(hash2);
-    return Math.abs(hash1 * (2 ** 20) + hash2);
-}
-
-/** Hashes an object so the result is the same independent of key order
- *      Ex, consistentHash({ x: 1, y: 2 }) === consistentHash({ y: 2, x: 1 })
- *      - Works with nested values
- *      - The hash isn't small, and is really just the JSON stringified re-ordered object
- */
-export function consistentHash(obj: unknown): string {
-    return JSON.stringify(orderObjectKeys(obj));
-}
-function orderObjectKeys(obj: unknown): unknown {
-    if (typeof obj !== "object" || obj === null) return obj;
-    if (Array.isArray(obj)) return obj.map(x => orderObjectKeys(x));
-    let keys = Object.keys(obj);
-    keys.sort();
-    let newObj: Record<string, unknown> = {};
-    for (let key of keys) {
-        newObj[key] = orderObjectKeys((obj as any)[key]);
-    }
-    return newObj;
-}
-
-function addToMurmurHash(curHash: number, next: number) {
-    // murmurhash, 32 bit 
-    // https://github.com/mikolalysenko/murmurhash-js/blob/master/murmurhash2_gc.js
-    let h = curHash;
-    let k = next;
-    k = (((k & 0xffff) * 0x5bd1e995) + ((((k >>> 16) * 0x5bd1e995) & 0xffff) << 16));
-    k ^= k >>> 24;
-    k = (((k & 0xffff) * 0x5bd1e995) + ((((k >>> 16) * 0x5bd1e995) & 0xffff) << 16));
-    h = (((h & 0xffff) * 0x5bd1e995) + ((((h >>> 16) * 0x5bd1e995) & 0xffff) << 16)) ^ k;
-
-    return h;
-}
-function finishMurmurHash(curHash: number) {
-    let h = curHash;
-    h ^= h >>> 13;
-    h = (((h & 0xffff) * 0x5bd1e995) + ((((h >>> 16) * 0x5bd1e995) & 0xffff) << 16));
-    h ^= h >>> 15;
-    return h;
-}
-
-export function hashBufferRange32(buffer: Buffer, start: number, end: number) {
-    if (start < 0) start = 0;
-    if (end > buffer.byteLength) end = buffer.byteLength;
-
-    let len = end - start;
-    let len4 = len - (len % 4);
-    let hash = end - start;
-    for (let i = 0; i < len4; i += 4) {
-        hash = addToMurmurHash(hash, buffer.readUInt32LE(i + start));
-    }
-    for (let i = len4; i < len; i++) {
-        hash = addToMurmurHash(hash, buffer[i + start]);
-    }
-
-    return hash;
-}
-
-export function hashBufferRange64(buffer: Buffer, start: number, end: number) {
-    if (start < 0) start = 0;
-    if (end > buffer.byteLength) end = buffer.byteLength;
-    let size = end - start;
-    let middle = start + Math.ceil(size / 2);
-
-    let hash1 = hashBufferRange32(buffer, start, middle);
-    let hash2 = hashBufferRange32(buffer, middle, end);
-    return Math.abs(hash1 * (2 ** 20) + hash2);
+import debugbreak from "debugbreak";
+
+/** Returns an integer */
+export function fastHash(text: string): number {
+    // Murmur, but we try to use more than 32 bits, as a double can store far more than 32 bits.
+    let hash1 = 5380942 ^ text.length;
+    let hash2 = 9143241 ^ text.length;
+    for (let i = 0; i < text.length; i++) {
+        let ch = text.charCodeAt(i);
+        hash1 = addToMurmurHash(hash1, ch);
+        hash2 = addToMurmurHash(hash2, ch);
+    }
+    hash1 = finishMurmurHash(hash1);
+    hash2 = finishMurmurHash(hash2);
+    return Math.abs(hash1 * (2 ** 20) + hash2);
+}
+
+/** Hashes an object so the result is the same independent of key order
+ *      Ex, consistentHash({ x: 1, y: 2 }) === consistentHash({ y: 2, x: 1 })
+ *      - Works with nested values
+ *      - The hash isn't small, and is really just the JSON stringified re-ordered object
+ */
+export function consistentHash(obj: unknown): string {
+    return JSON.stringify(orderObjectKeys(obj));
+}
+function orderObjectKeys(obj: unknown): unknown {
+    if (typeof obj !== "object" || obj === null) return obj;
+    if (Array.isArray(obj)) return obj.map(x => orderObjectKeys(x));
+    let keys = Object.keys(obj);
+    keys.sort();
+    let newObj: Record<string, unknown> = {};
+    for (let key of keys) {
+        newObj[key] = orderObjectKeys((obj as any)[key]);
+    }
+    return newObj;
+}
+
+function addToMurmurHash(curHash: number, next: number) {
+    // murmurhash, 32 bit 
+    // https://github.com/mikolalysenko/murmurhash-js/blob/master/murmurhash2_gc.js
+    let h = curHash;
+    let k = next;
+    k = (((k & 0xffff) * 0x5bd1e995) + ((((k >>> 16) * 0x5bd1e995) & 0xffff) << 16));
+    k ^= k >>> 24;
+    k = (((k & 0xffff) * 0x5bd1e995) + ((((k >>> 16) * 0x5bd1e995) & 0xffff) << 16));
+    h = (((h & 0xffff) * 0x5bd1e995) + ((((h >>> 16) * 0x5bd1e995) & 0xffff) << 16)) ^ k;
+
+    return h;
+}
+function finishMurmurHash(curHash: number) {
+    let h = curHash;
+    h ^= h >>> 13;
+    h = (((h & 0xffff) * 0x5bd1e995) + ((((h >>> 16) * 0x5bd1e995) & 0xffff) << 16));
+    h ^= h >>> 15;
+    return h;
+}
+
+export function hashBufferRange32(buffer: Buffer, start: number, end: number) {
+    if (start < 0) start = 0;
+    if (end > buffer.byteLength) end = buffer.byteLength;
+
+    let len = end - start;
+    let len4 = len - (len % 4);
+    let hash = end - start;
+    for (let i = 0; i < len4; i += 4) {
+        hash = addToMurmurHash(hash, buffer.readUInt32LE(i + start));
+    }
+    for (let i = len4; i < len; i++) {
+        hash = addToMurmurHash(hash, buffer[i + start]);
+    }
+
+    return hash;
+}
+
+export function hashBufferRange64(buffer: Buffer, start: number, end: number) {
+    if (start < 0) start = 0;
+    if (end > buffer.byteLength) end = buffer.byteLength;
+    let size = end - start;
+    let middle = start + Math.ceil(size / 2);
+
+    let hash1 = hashBufferRange32(buffer, start, middle);
+    let hash2 = hashBufferRange32(buffer, middle, end);
+    return Math.abs(hash1 * (2 ** 20) + hash2);
 }

package/src/misc/ipPong.js

@@ -1,13 +1,13 @@
-// HTTP response with the caller IP
-
-const http = require("http");
-const port = 4283;
-
-const server = http.createServer((req, res) => {
-    res.writeHead(200, { "Content-Type": "text/plain" });
-    res.end(req.socket.remoteAddress.split(":").pop());
-});
-
-server.listen(port, () => {
-    console.log(`Server running at http://localhost:${port}/`);
-});
+// HTTP response with the caller IP
+
+const http = require("http");
+const port = 4283;
+
+const server = http.createServer((req, res) => {
+    res.writeHead(200, { "Content-Type": "text/plain" });
+    res.end(req.socket.remoteAddress.split(":").pop());
+});
+
+server.listen(port, () => {
+    console.log(`Server running at http://localhost:${port}/`);
+});

package/src/misc/networking.ts

@@ -1,2 +1,2 @@
-import { testTCPIsListening, getExternalIP, getPublicIP } from "socket-function/src/networking";
+import { testTCPIsListening, getExternalIP, getPublicIP } from "socket-function/src/networking";
 export { testTCPIsListening, getExternalIP, getPublicIP };

package/src/misc/random.ts

@@ -1,45 +1,45 @@
-import { isNode } from "socket-function/src/misc";
-import crypto from "crypto";
-
-export function getSeededRandom(seed: number): () => number {
-    // Multiply seed by a large prime
-    seed = (seed + 0x1235234894) * 0x1fffffff % 0x7fffffff;
-    let rand = sfc32(seed, seed, seed, seed);
-    // Run a few time, to fully seed it
-    for (let i = 0; i < 10; i++) {
-        rand();
-    }
-    return rand;
-    function sfc32(a: number, b: number, c: number, d: number) {
-        return function () {
-            a >>>= 0; b >>>= 0; c >>>= 0; d >>>= 0;
-            var t = (a + b) | 0;
-            a = b ^ b >>> 9;
-            b = c + (c << 3) | 0;
-            c = (c << 21 | c >>> 11);
-            d = d + 1 | 0;
-            t = t + d | 0;
-            c = c + t | 0;
-            return (t >>> 0) / 4294967296;
-        };
-    }
-}
-
-export function shuffle<T>(array: T[], seed: number) {
-    let rand = getSeededRandom(seed);
-    let indexes = Array(array.length).fill(0).map((x, i) => i);
-    let shuffleValue = indexes.map(() => rand());
-    indexes.sort((a, b) => shuffleValue[a] - shuffleValue[b]);
-    return indexes.map(i => array[i]);
-}
-
-let randomData = new Uint8Array(8);
-let randomDataF64 = new Float64Array(randomData.buffer);
-export function secureRandom(): number {
-    if (!isNode()) {
-        window.crypto.getRandomValues(randomData);
-    } else {
-        crypto.getRandomValues(randomData);
-    }
-    return randomDataF64[0];
+import { isNode } from "socket-function/src/misc";
+import crypto from "crypto";
+
+export function getSeededRandom(seed: number): () => number {
+    // Multiply seed by a large prime
+    seed = (seed + 0x1235234894) * 0x1fffffff % 0x7fffffff;
+    let rand = sfc32(seed, seed, seed, seed);
+    // Run a few time, to fully seed it
+    for (let i = 0; i < 10; i++) {
+        rand();
+    }
+    return rand;
+    function sfc32(a: number, b: number, c: number, d: number) {
+        return function () {
+            a >>>= 0; b >>>= 0; c >>>= 0; d >>>= 0;
+            var t = (a + b) | 0;
+            a = b ^ b >>> 9;
+            b = c + (c << 3) | 0;
+            c = (c << 21 | c >>> 11);
+            d = d + 1 | 0;
+            t = t + d | 0;
+            c = c + t | 0;
+            return (t >>> 0) / 4294967296;
+        };
+    }
+}
+
+export function shuffle<T>(array: T[], seed: number) {
+    let rand = getSeededRandom(seed);
+    let indexes = Array(array.length).fill(0).map((x, i) => i);
+    let shuffleValue = indexes.map(() => rand());
+    indexes.sort((a, b) => shuffleValue[a] - shuffleValue[b]);
+    return indexes.map(i => array[i]);
+}
+
+let randomData = new Uint8Array(8);
+let randomDataF64 = new Float64Array(randomData.buffer);
+export function secureRandom(): number {
+    if (!isNode()) {
+        window.crypto.getRandomValues(randomData);
+    } else {
+        crypto.getRandomValues(randomData);
+    }
+    return randomDataF64[0];
 }