querysub 0.432.0 → 0.436.0

package/src/-a-auth/node-forge-ed25519.d.ts

@@ -1,17 +1,17 @@
-
-
-declare module "node-forge" {
-    declare type Ed25519PublicKey = {
-        publicKeyBytes: Buffer;
-    } & Buffer;
-    declare type Ed25519PrivateKey = {
-        privateKeyBytes: Buffer;
-    } & Buffer;
-    class ed25519 {
-        static generateKeyPair(): { publicKey: Ed25519PublicKey, privateKey: Ed25519PrivateKey };
-        static privateKeyToPem(key: Ed25519PrivateKey): string;
-        static privateKeyFromPem(pem: string): Ed25519PrivateKey;
-        static publicKeyToPem(key: Ed25519PublicKey): string;
-        static publicKeyFromPem(pem: string): Ed25519PublicKey;
-    }
+
+
+declare module "node-forge" {
+    declare type Ed25519PublicKey = {
+        publicKeyBytes: Buffer;
+    } & Buffer;
+    declare type Ed25519PrivateKey = {
+        privateKeyBytes: Buffer;
+    } & Buffer;
+    class ed25519 {
+        static generateKeyPair(): { publicKey: Ed25519PublicKey, privateKey: Ed25519PrivateKey };
+        static privateKeyToPem(key: Ed25519PrivateKey): string;
+        static privateKeyFromPem(pem: string): Ed25519PrivateKey;
+        static publicKeyToPem(key: Ed25519PublicKey): string;
+        static publicKeyFromPem(pem: string): Ed25519PublicKey;
+    }
 }

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

@@ -1,139 +1,139 @@
-import os from "os";
-import * as fs from "fs";
-import { cache, lazy } from "socket-function/src/caching";
-import { isNode, isNodeTrue } from "socket-function/src/misc";
-import { httpsRequest } from "../https";
-import { getStorageDir } from "../fs";
-import { SocketFunction } from "socket-function/SocketFunction";
-import { delay } from "socket-function/src/batching";
-import debugbreak from "debugbreak";
-import { isClient } from "../config2";
-import { getArchives } from "../-a-archives/archives";
-import { cloudflareCall, cloudflareGETCall, cloudflarePOSTCall, getCloudflareCreds } from "./cloudflareHelpers";
-import { magenta } from "socket-function/src/formatting/logColors";
-
-const DNS_TTLSeconds = {
-    "TXT": 60,
-    "A": 60,
-};
-
-export const hasDNSWritePermissions = lazy(async () => {
-    if (!isNode()) return false;
-    if (isClient()) return false;
-    try {
-        await getCloudflareCreds();
-        return true;
-    } catch {
-        return false;
-    }
-});
-
-export const getZoneId = cache(async (rootDomain: string): Promise<string> => {
-    let zones = await cloudflareGETCall<{ id: string; name: string }[]>("/zones", {});
-    let selected = zones.find(x => x.name === rootDomain);
-    if (!selected) {
-        throw new Error(`Could not find zone for ${rootDomain}. Found ${zones.map(x => x.name).join(", ")}`);
-    }
-    return selected.id;
-});
-
-function getRootDomain(key: string) {
-    if (key.endsWith(".")) {
-        key = key.slice(0, -1);
-    }
-    return key.split(".").slice(-2).join(".");
-}
-
-export async function getRecordsRaw(type: string, key: string) {
-    if (key.endsWith(".")) key = key.slice(0, -1);
-    let zoneId = await getZoneId(getRootDomain(key));
-    let results = await cloudflareGETCall<{
-        id: string;
-        type: string;
-        name: string;
-        content: string;
-        proxied: boolean;
-    }[]>(`/zones/${zoneId}/dns_records`);
-    return results.filter(x => x.type === type && x.name === key);
-}
-export async function getRecords(type: string, key: string) {
-    if (key.endsWith(".")) key = key.slice(0, -1);
-    let raw = await getRecordsRaw(type, key);
-    return raw.map(x => x.content);
-}
-export async function deleteRecord(type: string, key: string, value: string) {
-    if (key.endsWith(".")) key = key.slice(0, -1);
-    let zoneId = await getZoneId(getRootDomain(key));
-    let prevValues = await getRecordsRaw(type, key);
-    prevValues = prevValues.filter(x => x.content === value);
-    if (prevValues.length === 0) {
-        if (!SocketFunction.silent) {
-            console.log(`No need to delete record, it was not found. ${JSON.stringify(value)} value was not in ${type} for ${key}, values ${JSON.stringify(prevValues.map(x => x.content))}`);
-        }
-        return;
-    }
-
-    console.log(`Removing records of ${type} for ${key}, values ${JSON.stringify(prevValues.map(x => x.content))}`);
-    for (let value of prevValues) {
-        await cloudflareCall(`/zones/${zoneId}/dns_records/${value.id}`, Buffer.from([]), "DELETE");
-    }
-}
-/** Removes all existing records (unless the record is already present) */
-export async function setRecord(type: string, key: string, value: string, proxied?: "proxied") {
-    let stack = new Error();
-    if (key.endsWith(".")) key = key.slice(0, -1);
-    let zoneId = await getZoneId(getRootDomain(key));
-    let prevValues = await getRecordsRaw(type, key);
-    // NOTE: Apparently if we try to update by just changing proxied, cloudflare complains and
-    //  says "an identical record already exists", even though it doesn't, we changed the proxied value...
-    if (prevValues.some(x => x.content === value)) return;
-
-    console.log(magenta(`Removing previous records of ${type} for ${key} ${JSON.stringify(prevValues.map(x => x.content))}`));
-    let didDeletions = false;
-    for (let value of prevValues) {
-        didDeletions = true;
-        await cloudflareCall(`/zones/${zoneId}/dns_records/${value.id}`, Buffer.from([]), "DELETE");
-    }
-
-    console.log(magenta(`Setting ${type} record for ${key} to ${value} (previously had ${JSON.stringify(prevValues.map(x => x.content))})`));
-    const ttl = DNS_TTLSeconds[type as "A"] || 60;
-    await cloudflarePOSTCall(`/zones/${zoneId}/dns_records`, {
-        type: type,
-        name: key,
-        content: value,
-        ttl,
-        proxied: proxied === "proxied",
-    });
-    // NOTE: Apparently... even if the record didn't exist, we still have to wait...
-    console.log(`Waiting ${ttl} seconds for DNS to propagate...`);
-    for (let ttlLeft = ttl; ttlLeft > 0; ttlLeft--) {
-        await delay(1000);
-        console.log(`${ttlLeft} seconds left...`);
-    }
-    console.log(`Done waiting for DNS to update.`);
-
-}
-/** Keeps existing records */
-export async function addRecord(type: string, key: string, value: string, proxied?: "proxied") {
-    if (key.endsWith(".")) key = key.slice(0, -1);
-    let zoneId = await getZoneId(getRootDomain(key));
-    let prevValues = await getRecordsRaw(type, key);
-    // NOTE: Apparently if we try to update by just changing proxied, cloudflare complains and
-    //  says "an identical record already exists", even though it doesn't, we changed the proxied value...
-    if (prevValues.some(x => x.content === value)) return;
-    console.log(`Adding ${type} record for ${key} to ${value} (previously had ${JSON.stringify(prevValues.map(x => x.content))})`);
-    const ttl = DNS_TTLSeconds[type as "A"] || 60;
-    await cloudflarePOSTCall(`/zones/${zoneId}/dns_records`, {
-        type: type,
-        name: key,
-        content: value,
-        ttl,
-        proxied: proxied === "proxied",
-    });
-    console.log(`Waiting ${ttl} seconds for DNS to propagate...`);
-    for (let ttlLeft = ttl; ttlLeft > 0; ttlLeft--) {
-        await delay(1000);
-        console.log(`${ttlLeft} seconds left...`);
-    }
-    console.log(`Done waiting for DNS to update.`);
+import os from "os";
+import * as fs from "fs";
+import { cache, lazy } from "socket-function/src/caching";
+import { isNode, isNodeTrue } from "socket-function/src/misc";
+import { httpsRequest } from "../https";
+import { getStorageDir } from "../fs";
+import { SocketFunction } from "socket-function/SocketFunction";
+import { delay } from "socket-function/src/batching";
+import debugbreak from "debugbreak";
+import { isClient } from "../config2";
+import { getArchives } from "../-a-archives/archives";
+import { cloudflareCall, cloudflareGETCall, cloudflarePOSTCall, getCloudflareCreds } from "./cloudflareHelpers";
+import { magenta } from "socket-function/src/formatting/logColors";
+
+const DNS_TTLSeconds = {
+    "TXT": 60,
+    "A": 60,
+};
+
+export const hasDNSWritePermissions = lazy(async () => {
+    if (!isNode()) return false;
+    if (isClient()) return false;
+    try {
+        await getCloudflareCreds();
+        return true;
+    } catch {
+        return false;
+    }
+});
+
+export const getZoneId = cache(async (rootDomain: string): Promise<string> => {
+    let zones = await cloudflareGETCall<{ id: string; name: string }[]>("/zones", {});
+    let selected = zones.find(x => x.name === rootDomain);
+    if (!selected) {
+        throw new Error(`Could not find zone for ${rootDomain}. Found ${zones.map(x => x.name).join(", ")}`);
+    }
+    return selected.id;
+});
+
+function getRootDomain(key: string) {
+    if (key.endsWith(".")) {
+        key = key.slice(0, -1);
+    }
+    return key.split(".").slice(-2).join(".");
+}
+
+export async function getRecordsRaw(type: string, key: string) {
+    if (key.endsWith(".")) key = key.slice(0, -1);
+    let zoneId = await getZoneId(getRootDomain(key));
+    let results = await cloudflareGETCall<{
+        id: string;
+        type: string;
+        name: string;
+        content: string;
+        proxied: boolean;
+    }[]>(`/zones/${zoneId}/dns_records`);
+    return results.filter(x => x.type === type && x.name === key);
+}
+export async function getRecords(type: string, key: string) {
+    if (key.endsWith(".")) key = key.slice(0, -1);
+    let raw = await getRecordsRaw(type, key);
+    return raw.map(x => x.content);
+}
+export async function deleteRecord(type: string, key: string, value: string) {
+    if (key.endsWith(".")) key = key.slice(0, -1);
+    let zoneId = await getZoneId(getRootDomain(key));
+    let prevValues = await getRecordsRaw(type, key);
+    prevValues = prevValues.filter(x => x.content === value);
+    if (prevValues.length === 0) {
+        if (!SocketFunction.silent) {
+            console.log(`No need to delete record, it was not found. ${JSON.stringify(value)} value was not in ${type} for ${key}, values ${JSON.stringify(prevValues.map(x => x.content))}`);
+        }
+        return;
+    }
+
+    console.log(`Removing records of ${type} for ${key}, values ${JSON.stringify(prevValues.map(x => x.content))}`);
+    for (let value of prevValues) {
+        await cloudflareCall(`/zones/${zoneId}/dns_records/${value.id}`, Buffer.from([]), "DELETE");
+    }
+}
+/** Removes all existing records (unless the record is already present) */
+export async function setRecord(type: string, key: string, value: string, proxied?: "proxied") {
+    let stack = new Error();
+    if (key.endsWith(".")) key = key.slice(0, -1);
+    let zoneId = await getZoneId(getRootDomain(key));
+    let prevValues = await getRecordsRaw(type, key);
+    // NOTE: Apparently if we try to update by just changing proxied, cloudflare complains and
+    //  says "an identical record already exists", even though it doesn't, we changed the proxied value...
+    if (prevValues.some(x => x.content === value)) return;
+
+    console.log(magenta(`Removing previous records of ${type} for ${key} ${JSON.stringify(prevValues.map(x => x.content))}`));
+    let didDeletions = false;
+    for (let value of prevValues) {
+        didDeletions = true;
+        await cloudflareCall(`/zones/${zoneId}/dns_records/${value.id}`, Buffer.from([]), "DELETE");
+    }
+
+    console.log(magenta(`Setting ${type} record for ${key} to ${value} (previously had ${JSON.stringify(prevValues.map(x => x.content))})`));
+    const ttl = DNS_TTLSeconds[type as "A"] || 60;
+    await cloudflarePOSTCall(`/zones/${zoneId}/dns_records`, {
+        type: type,
+        name: key,
+        content: value,
+        ttl,
+        proxied: proxied === "proxied",
+    });
+    // NOTE: Apparently... even if the record didn't exist, we still have to wait...
+    console.log(`Waiting ${ttl} seconds for DNS to propagate...`);
+    for (let ttlLeft = ttl; ttlLeft > 0; ttlLeft--) {
+        await delay(1000);
+        console.log(`${ttlLeft} seconds left...`);
+    }
+    console.log(`Done waiting for DNS to update.`);
+
+}
+/** Keeps existing records */
+export async function addRecord(type: string, key: string, value: string, proxied?: "proxied") {
+    if (key.endsWith(".")) key = key.slice(0, -1);
+    let zoneId = await getZoneId(getRootDomain(key));
+    let prevValues = await getRecordsRaw(type, key);
+    // NOTE: Apparently if we try to update by just changing proxied, cloudflare complains and
+    //  says "an identical record already exists", even though it doesn't, we changed the proxied value...
+    if (prevValues.some(x => x.content === value)) return;
+    console.log(`Adding ${type} record for ${key} to ${value} (previously had ${JSON.stringify(prevValues.map(x => x.content))})`);
+    const ttl = DNS_TTLSeconds[type as "A"] || 60;
+    await cloudflarePOSTCall(`/zones/${zoneId}/dns_records`, {
+        type: type,
+        name: key,
+        content: value,
+        ttl,
+        proxied: proxied === "proxied",
+    });
+    console.log(`Waiting ${ttl} seconds for DNS to propagate...`);
+    for (let ttlLeft = ttl; ttlLeft > 0; ttlLeft--) {
+        await delay(1000);
+        console.log(`${ttlLeft} seconds left...`);
+    }
+    console.log(`Done waiting for DNS to update.`);
 }