querysub 0.528.0 → 0.529.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "querysub",
-  "version": "0.528.0",
+  "version": "0.529.0",
   "main": "index.js",
   "license": "MIT",
   "note1": "note on node-forge fork, see https://github.com/digitalbazaar/forge/issues/744 for details",
@@ -70,8 +70,8 @@
     "node-forge": "https://github.com/sliftist/forge#e618181b469b07bdc70b968b0391beb8ef5fecd6",
     "pako": "^2.1.0",
     "peggy": "^5.0.6",
-    "sliftutils": "^1.7.5",
-    "socket-function": "^1.2.16",
+    "sliftutils": "^1.7.13",
+    "socket-function": "^1.2.21",
     "terser": "^5.31.0",
     "typenode": "^6.6.1",
     "typesafecss": "^0.32.0",

package/src/-a-archives/archivesBackBlaze.ts

@@ -1,17 +1,12 @@
-import { cache, lazy } from "socket-function/src/caching";
+import { cache } from "socket-function/src/caching";
 import { getStorageDir } from "../fs";
 import { Archives } from "./archives";
 import fs from "fs";
 import os from "os";
-import { isNode, sort, timeInHour, timeInMinute } from "socket-function/src/misc";
-import { httpsRequest } from "../https";
-import { delay } from "socket-function/src/batching";
-import { devDebugbreak, isLogBackblaze } from "../config";
-import { formatNumber, formatTime } from "socket-function/src/formatting/format";
-import { blue, green, magenta } from "socket-function/src/formatting/logColors";
-import debugbreak from "debugbreak";
-import { onTimeProfile } from "../-0-hooks/hooks";
-import dns from "dns";
+import { isNode, timeInMinute } from "socket-function/src/misc";
+import { isLogBackblaze } from "../config";
+import { ArchivesBackblaze as ArchivesBackblazeBase } from "sliftutils/storage/backblaze";
+import type { IArchives, ArchivesConfig } from "sliftutils/storage/IArchives";
 
 export function hasBackblazePermissions() {
     return isNode() && fs.existsSync(getBackblazePath());
@@ -29,913 +24,64 @@ export function getBackblazePath() {
     return testPaths[0];
 }
 
-type BackblazeCreds = {
-    applicationKeyId: string;
-    applicationKey: string;
-};
-
-let backblazeCreds = lazy((): BackblazeCreds => (
-    JSON.parse(fs.readFileSync(getBackblazePath(), "utf8")) as {
-        applicationKeyId: string;
-        applicationKey: string;
-    }
-));
-const getAPI = lazy(async () => {
-    let creds = backblazeCreds();
-
-    // NOTE: On errors, our retry code resets this lazy, so we DO get new authorize when needed.
-    // TODO: Maybe we should get new authorization periodically at well?
-    let authorizeRaw = await httpsRequest("https://api.backblazeb2.com/b2api/v2/b2_authorize_account", undefined, "GET", undefined, {
-        headers: {
-            Authorization: "Basic " + Buffer.from(creds.applicationKeyId + ":" + creds.applicationKey).toString("base64"),
-        }
-    });
-
-    let auth = JSON.parse(authorizeRaw.toString()) as {
-        accountId: string;
-        authorizationToken: string;
-        apiUrl: string;
-        downloadUrl: string;
-        allowed: {
-            bucketId: string;
-            bucketName: string;
-            capabilities: string[];
-            namePrefix: string;
-        }[];
-    };
-
-    function createB2Function<Arg, Result>(name: string, type: "POST" | "GET", noAccountId?: "noAccountId"): (arg: Arg) => Promise<Result> {
-        return async (arg: Arg) => {
-            if (!noAccountId) {
-                arg = { accountId: auth.accountId, ...arg };
-            }
-            try {
-                let url = auth.apiUrl + "/b2api/v2/" + name;
-                let time = Date.now();
-                let result = await httpsRequest(url, Buffer.from(JSON.stringify(arg)), type, undefined, {
-                    headers: {
-                        Authorization: auth.authorizationToken,
-                    }
-                });
-                onTimeProfile("Backblaze API", time);
-                return JSON.parse(result.toString());
-            } catch (e: any) {
-                throw new Error(`Error in ${name}, arg ${JSON.stringify(arg).slice(0, 1000)}: ${e.stack}`);
-            }
-        };
-    }
-
-    const createBucket = createB2Function<{
-        bucketName: string;
-        bucketType: "allPrivate" | "allPublic";
-        lifecycleRules?: any[];
-        corsRules?: unknown[];
-        bucketInfo?: {
-            [key: string]: unknown;
-        };
-    }, {
-        accountId: string;
-        bucketId: string;
-        bucketName: string;
-        bucketType: "allPrivate" | "allPublic";
-        bucketInfo: {
-            lifecycleRules: any[];
-        };
-        corsRules: any[];
-        lifecycleRules: any[];
-        revision: number;
-    }>("b2_create_bucket", "POST");
-
-    const updateBucket = createB2Function<{
-        accountId: string;
-        bucketId: string;
-        bucketType?: "allPrivate" | "allPublic";
-        lifecycleRules?: any[];
-        bucketInfo?: {
-            [key: string]: unknown;
-        };
-        corsRules?: unknown[];
-    }, {
-        accountId: string;
-        bucketId: string;
-        bucketName: string;
-        bucketType: "allPrivate" | "allPublic";
-        bucketInfo: {
-            lifecycleRules: any[];
-        };
-        corsRules: any[];
-        lifecycleRules: any[];
-        revision: number;
-    }>("b2_update_bucket", "POST");
-
-    // https://www.backblaze.com/apidocs/b2-update-bucket
-    //  TODO: b2_update_bucket, so we can update CORS, etc
-
-    const listBuckets = createB2Function<{
-        bucketName?: string;
-    }, {
-        buckets: {
-            accountId: string;
-            bucketId: string;
-            bucketName: string;
-            bucketType: "allPrivate" | "allPublic";
-            bucketInfo: {
-                lifecycleRules: any[];
-            };
-            corsRules: any[];
-            lifecycleRules: any[];
-            revision: number;
-        }[];
-    }>("b2_list_buckets", "POST");
-
-    function encodePath(path: string) {
-        // Preserve slashes, but encode everything else
-        path = path.split("/").map(encodeURIComponent).join("/");
-        if (path.startsWith("/")) path = "%2F" + path.slice(1);
-        if (path.endsWith("/")) path = path.slice(0, -1) + "%2F";
-        // NOTE: For some reason, this won't render in the web UI correctly. BUT, it'll
-        //  work get get/set and find
-        //  - ALSO, it seems to add duplicate files? This might also be a web UI thing. It
-        //      seems to work though.
-        while (path.includes("//")) {
-            path = path.replaceAll("//", "/%2F");
-        }
-        return path;
-    }
-
-    async function downloadFileByName(config: {
-        bucketName: string;
-        fileName: string;
-        range?: { start: number; end: number; };
-    }) {
-        let fileName = encodePath(config.fileName);
-
-        let result = await httpsRequest(auth.apiUrl + "/file/" + config.bucketName + "/" + fileName, Buffer.from(JSON.stringify({
-            accountId: auth.accountId,
-            responseType: "arraybuffer",
-        })), "GET", undefined, {
-            headers: Object.fromEntries(Object.entries({
-                Authorization: auth.authorizationToken,
-                "Content-Type": "application/json",
-                Range: config.range ? `bytes=${config.range.start}-${config.range.end - 1}` : undefined,
-            }).filter(x => x[1] !== undefined)),
-        });
-        return result;
-    }
-
-    // Oh... apparently, we can't reuse these? Huh...
-    const getUploadURL = (async (bucketId: string) => {
-        //setTimeout(() => getUploadURL.clear(bucketId), timeInHour * 1);
-        let getUploadUrlRaw = await httpsRequest(auth.apiUrl + "/b2api/v2/b2_get_upload_url?bucketId=" + bucketId, undefined, "GET", undefined, {
-            headers: {
-                Authorization: auth.authorizationToken,
-            }
-        });
-
-        return JSON.parse(getUploadUrlRaw.toString()) as {
-            bucketId: string;
-            uploadUrl: string;
-            authorizationToken: string;
-        };
-    });
-
-    async function uploadFile(config: {
-        bucketId: string;
-        fileName: string;
-        data: Buffer;
-    }) {
-        let getUploadUrl = await getUploadURL(config.bucketId);
-
-        await httpsRequest(getUploadUrl.uploadUrl, config.data, "POST", undefined, {
-            headers: {
-                Authorization: getUploadUrl.authorizationToken,
-                "X-Bz-File-Name": encodePath(config.fileName),
-                "Content-Type": "b2/x-auto",
-                "X-Bz-Content-Sha1": "do_not_verify",
-                "Content-Length": config.data.length + "",
-            }
-        });
-    }
-
-    const hideFile = createB2Function<{
-        bucketId: string;
-        fileName: string;
-    }, {}>("b2_hide_file", "POST", "noAccountId");
-
-    const getFileInfo = createB2Function<{
-        bucketName: string;
-        fileId: string;
-    }, {
-        fileId: string;
-        fileName: string;
-        accountId: string;
-        bucketId: string;
-        contentLength: number;
-        contentSha1: string;
-        contentType: string;
-        fileInfo: {
-            src_last_modified_millis: number;
-        };
-        action: string;
-        uploadTimestamp: number;
-    }>("b2_get_file_info", "POST", "noAccountId");
-
-    const listFileNames = createB2Function<{
-        bucketId: string;
-        prefix: string;
-        startFileName?: string;
-        maxFileCount?: number;
-        delimiter?: string;
-    }, {
-        files: {
-            fileId: string;
-            fileName: string;
-            accountId: string;
-            bucketId: string;
-            contentLength: number;
-            contentSha1: string;
-            contentType: string;
-            fileInfo: {
-                src_last_modified_millis: number;
-            };
-            action: string;
-            uploadTimestamp: number;
-        }[];
-        nextFileName: string;
-    }>("b2_list_file_names", "POST", "noAccountId");
-
-    const copyFile = createB2Function<{
-        sourceFileId: string;
-        fileName: string;
-        destinationBucketId: string;
-    }, {}>("b2_copy_file", "POST", "noAccountId");
-
-    const startLargeFile = createB2Function<{
-        bucketId: string;
-        fileName: string;
-        contentType: string;
-        fileInfo: { [key: string]: string };
-    }, {
-        fileId: string;
-        fileName: string;
-        accountId: string;
-        bucketId: string;
-        contentType: string;
-        fileInfo: any;
-        uploadTimestamp: number;
-    }>("b2_start_large_file", "POST", "noAccountId");
-
-    // Apparently we can't reuse these?
-    const getUploadPartURL = (async (fileId: string) => {
-        let uploadPartRaw = await httpsRequest(auth.apiUrl + "/b2api/v2/b2_get_upload_part_url?fileId=" + fileId, undefined, "GET", undefined, {
-            headers: {
-                Authorization: auth.authorizationToken,
-            }
-        });
-        return JSON.parse(uploadPartRaw.toString()) as {
-            fileId: string;
-            partNumber: number;
-            uploadUrl: string;
-            authorizationToken: string;
-        };
-    });
-    async function uploadPart(config: {
-        fileId: string;
-        partNumber: number;
-        data: Buffer;
-        sha1: string;
-    }): Promise<{
-        fileId: string;
-        partNumber: number;
-        contentLength: number;
-        contentSha1: string;
-    }> {
-        let uploadPart = await getUploadPartURL(config.fileId);
-
-        let result = await httpsRequest(uploadPart.uploadUrl, config.data, "POST", undefined, {
-            headers: {
-                Authorization: uploadPart.authorizationToken,
-                "X-Bz-Part-Number": config.partNumber + "",
-                "X-Bz-Content-Sha1": config.sha1,
-                "Content-Length": config.data.length + "",
-
-            }
-        });
-        return JSON.parse(result.toString());
-    }
-
-    const finishLargeFile = createB2Function<{
-        fileId: string;
-        partSha1Array: string[];
-    }, {
-        fileId: string;
-        fileName: string;
-        accountId: string;
-        bucketId: string;
-        contentLength: number;
-        contentSha1: string;
-        contentType: string;
-        fileInfo: any;
-        uploadTimestamp: number;
-    }>("b2_finish_large_file", "POST", "noAccountId");
-
-    const cancelLargeFile = createB2Function<{
-        fileId: string;
-    }, {}>("b2_cancel_large_file", "POST", "noAccountId");
-
-    const getDownloadAuthorization = createB2Function<{
-        bucketId: string;
-        fileNamePrefix: string;
-        validDurationInSeconds: number;
-        b2ContentDisposition?: string;
-        b2ContentLanguage?: string;
-        b2Expires?: string;
-        b2CacheControl?: string;
-        b2ContentEncoding?: string;
-        b2ContentType?: string;
-    }, {
-        bucketId: string;
-        fileNamePrefix: string;
-        authorizationToken: string;
-    }>("b2_get_download_authorization", "POST", "noAccountId");
-
-    async function getDownloadURL(path: string) {
-        if (!path.startsWith("/")) {
-            path = "/" + path;
-        }
-        return auth.downloadUrl + path;
-    }
-
-
-    return {
-        createBucket,
-        updateBucket,
-        listBuckets,
-        downloadFileByName,
-        uploadFile,
-        hideFile,
-        getFileInfo,
-        listFileNames,
-        copyFile,
-        startLargeFile,
-        uploadPart,
-        finishLargeFile,
-        cancelLargeFile,
-        getDownloadAuthorization,
-        getDownloadURL,
-        apiUrl: auth.apiUrl,
-    };
-});
-
-type B2Api = (typeof getAPI) extends () => Promise<infer T> ? T : never;
-
-
+// The implementation lives in sliftutils (it reads credentials via getSecret, which our appSecrets.ts serves from getBackblazePath). We forward to an inner instance instead of subclassing, because our Archives interface's move/copy take a querysub Archives target (with getBaseArchives unwrapping) which is type-incompatible with the base class's IArchives signatures.
 export class ArchivesBackblaze {
-    public constructor(private config: {
+    private archives: ArchivesBackblazeBase;
+
+    public constructor(config: {
         bucketName: string;
         public?: boolean;
         immutable?: boolean;
         cacheTime?: number;
         allowedOrigins?: string[];
     }) {
-        // Get the api, to setup cors
-        void this.getBucketAPI();
+        this.archives = new ArchivesBackblazeBase(config);
+        if (isLogBackblaze()) {
+            this.archives.enableLogging();
+        }
     }
 
-    private bucketName = this.config.bucketName.replaceAll(/[^\w\d]/g, "-");
-    private bucketId = "";
-
-    private logging = isLogBackblaze();
-    public enableLogging() {
-        this.logging = true;
+    public enableLogging(): void {
+        this.archives.enableLogging();
     }
-    private log(text: string) {
-        if (!this.logging) return;
-        console.log(text);
+    public getDebugName(): string {
+        return this.archives.getDebugName();
     }
-
-    public getDebugName() {
-        return "backblaze/" + this.config.bucketName;
+    public async hasWriteAccess(): Promise<boolean> {
+        return this.archives.hasWriteAccess();
     }
-
-    private getBucketAPI = lazy(async () => {
-        let api = await getAPI();
-
-        let cacheTime = this.config.cacheTime ?? 0;
-        if (this.config.immutable) {
-            cacheTime = 86400 * 1000;
-        }
-
-        // ALWAYS set access control, as we can make urls for private buckets with getDownloadAuthorization
-        let desiredCorsRules = [{
-            corsRuleName: "allowAll",
-            allowedOrigins: this.config.allowedOrigins ?? ["https"],
-            allowedOperations: ["b2_download_file_by_id", "b2_download_file_by_name"],
-            allowedHeaders: ["range"],
-            exposeHeaders: ["x-bz-content-sha1"],
-            maxAgeSeconds: cacheTime / 1000,
-        }];
-        let bucketInfo: Record<string, unknown> = {};
-        if (cacheTime) {
-            bucketInfo["cache-control"] = `max-age=${cacheTime / 1000}`;
-        }
-
-
-        let exists = false;
-        let retries = 0;
-        while (true) {
-            try {
-                await api.createBucket({
-                    bucketName: this.bucketName,
-                    bucketType: this.config.public ? "allPublic" : "allPrivate",
-                    lifecycleRules: [{
-                        "daysFromUploadingToHiding": null,
-                        // Keep files for 7 days, which should be enough time to recover accidental hiding.
-                        "daysFromHidingToDeleting": 7,
-                        "fileNamePrefix": ""
-                    }],
-                    corsRules: desiredCorsRules,
-                    bucketInfo
-                });
-            } catch (e: any) {
-                if (!e.stack.includes(`"duplicate_bucket_name"`)) {
-                    if (retries < 3) {
-                        console.error(`Backblaze create bucket failed, retrying in 5s: ${e.stack}`);
-                        await delay(5000);
-                        retries++;
-                        continue;
-                    }
-                    throw e;
-                }
-                exists = true;
-            }
-            break;
-        }
-
-        let bucketList = await api.listBuckets({
-            bucketName: this.bucketName,
-        });
-        if (bucketList.buckets.length === 0) {
-            throw new Error(`Bucket name "${this.bucketName}" is being used by someone else. Bucket names have to be globally unique. Try a different name until you find a free one.`);
-        }
-        this.bucketId = bucketList.buckets[0].bucketId;
-
-        if (exists) {
-            let bucket = bucketList.buckets[0];
-            function normalize(obj: Record<string, unknown>) {
-                let kvps = Object.entries(obj);
-                sort(kvps, x => x[0]);
-                return Object.fromEntries(kvps);
-            }
-            function orderIndependentEqual(lhs: Record<string, unknown>, rhs: Record<string, unknown>) {
-                return JSON.stringify(normalize(lhs)) === JSON.stringify(normalize(rhs));
-            }
-            function orderIndependentEqualArray(lhs: unknown[], rhs: unknown[]) {
-                if (lhs.length !== rhs.length) return false;
-                for (let i = 0; i < lhs.length; i++) {
-                    if (!orderIndependentEqual(lhs[i] as Record<string, unknown>, rhs[i] as Record<string, unknown>)) return false;
-                }
-                return true;
-            }
-            if (
-                !orderIndependentEqualArray(bucket.corsRules, desiredCorsRules)
-                || !orderIndependentEqual(bucket.bucketInfo, bucketInfo)
-            ) {
-                console.log(magenta(`Updating CORS rules for ${this.bucketName}`), bucket.corsRules, desiredCorsRules);
-                await api.updateBucket({
-                    accountId: bucket.accountId,
-                    bucketId: bucket.bucketId,
-                    bucketType: bucket.bucketType,
-                    lifecycleRules: bucket.lifecycleRules,
-                    corsRules: desiredCorsRules,
-                    bucketInfo: bucketInfo,
-                });
-            }
-        }
-        return api;
-    });
-
-    private currentReset: Promise<void> | undefined;
-
-    // Keep track of when we last reset because of a 503
-    private last503Reset = 0;
-    // IMPORTANT! We must always CATCH AROUND the apiRetryLogic, NEVER inside of fnc. Otherwise we won't
-    //  be able to recreate the auth token.
-    //  `context` is a short label (verb + file path) included in every retry/error log so a stuck
-    //   silent-retry loop is identifiable from the logs.
-    private async apiRetryLogic<T>(
-        context: string,
-        fnc: (api: B2Api) => Promise<T>,
-        retries = 3
-    ): Promise<T> {
-        let api: B2Api | undefined;
-        try {
-            api = await this.getBucketAPI();
-            return await fnc(api);
-        } catch (err: any) {
-            if (retries <= 0) throw err;
-
-            // If it's a 503 and it's been a minute since we last reset, then Wait and reset.
-            if (
-                (err.stack.includes(`"status": 503`)
-                    || err.stack.includes(`"service_unavailable"`)
-                    || err.stack.includes(`"internal_error"`)
-                    || err.stack.includes(`ENOBUFS`)
-                ) && Date.now() - this.last503Reset > 60 * 1000) {
-                // Backblades is so flaky that we're just going to warn here. 
-                console.warn(`[${context}] Backblaze error, waiting and resetting: ${err.message}`);
-                this.log(`[${context}] Backblaze error, waiting and resetting: ${err.message}`);
-                this.currentReset = this.currentReset || (async () => {
-                    await delay(10 * 1000);
-                    // We check again in case, and in the very likely case that this is being run in parallel, we only want to reset once.
-                    if (Date.now() - this.last503Reset > 60 * 1000) {
-                        this.log(`[${context}] Resetting getAPI and getBucketAPI: ${err.message}`);
-                        this.last503Reset = Date.now();
-                        getAPI.reset();
-                        this.getBucketAPI.reset();
-                    }
-                })().finally(() => this.currentReset = undefined);
-                await this.currentReset;
-                return this.apiRetryLogic(context, fnc, retries - 1);
-            }
-
-            // If the error is that the authorization token is invalid, reset getBucketAPI and getAPI
-            // If the error is that the bucket isn't found, reset getBucketAPI
-            if (err.stack.includes(`"expired_auth_token"`)) {
-                this.log(`[${context}] Authorization token expired`);
-                getAPI.reset();
-                this.getBucketAPI.reset();
-                return this.apiRetryLogic(context, fnc, retries - 1);
-            }
-
-            if (
-                err.stack.includes(`no tomes available`)
-                || err.stack.includes(`ETIMEDOUT`)
-                || err.stack.includes(`socket hang up`)
-                // Eh... this might be bad, but... I think we just get random 400 errors. If this spams errors,
-                //  we can remove this line.
-                || err.stack.includes(`400 Bad Request`)
-                || err.stack.includes(`getaddrinfo ENOTFOUND`)
-                || err.stack.includes(`ECONNRESET`)
-                || err.stack.includes(`ECONNREFUSED`)
-                || err.stack.includes(`ENOBUFS`)
-            ) {
-                console.warn(`[${context}] Retrying in 5s: ${err.message}`);
-                this.log(`[${context}] ${err.message} retrying in 5s`);
-                await delay(5000);
-                return this.apiRetryLogic(context, fnc, retries - 1);
-            }
-
-            if (err.stack.includes(`getaddrinfo ENOTFOUND`)) {
-                if (api) {
-                    let urlObj = new URL(api.apiUrl);
-                    let hostname = urlObj.hostname;
-                    let lookupAddresses = await new Promise(resolve => {
-                        dns.lookup(hostname, (err, addresses) => {
-                            resolve(addresses);
-                        });
-                    });
-                    let resolveAddresses = await new Promise(resolve => {
-                        dns.resolve4(hostname, (err, addresses) => {
-                            resolve(addresses);
-                        });
-                    });
-                    console.error(`[${context}] getaddrinfo ENOTFOUND ${hostname}`, { lookupAddresses, resolveAddresses, apiUrl: api.apiUrl, fullError: err.stack });
-                }
-            }
-
-            // NOTE: The AI thought case that happens when we run out of retries, that's stupid. This obviously isn't the case. This is the case when it's a normal error, as in the file doesn't exist, we need to throw. We absolutely should not warn here. Warning here wouldn't be anything. It would just be saying, oh, we checked if a file and it didn't, which is normal, which is why we check if a file exists. 
-
-            throw err;
-        }
+    public async getConfig(): Promise<ArchivesConfig> {
+        return this.archives.getConfig();
     }
-
     public async get(fileName: string, config?: { range?: { start: number; end: number; }; retryCount?: number }): Promise<Buffer | undefined> {
-        let downloading = true;
-        try {
-            let time = Date.now();
-            const downloadPoll = () => {
-                if (!downloading) return;
-                this.log(`Backblaze download in progress ${fileName}`);
-                setTimeout(downloadPoll, 5000);
-            };
-            setTimeout(downloadPoll, 5000);
-            let result = await this.apiRetryLogic(`get ${fileName}`, async (api) => {
-                let range = config?.range;
-                if (range) {
-                    let fileInfo = await this.getInfo(fileName);
-                    if (!fileInfo) throw new Error(`File ${fileName} not found`);
-                    let rangeStart = range.start;
-                    let rangeEnd = Math.min(range.end, fileInfo.size);
-                    // NOTE: I think if we request nothing, it confuses Backblaze and ends up giving us the entire file.
-                    if (rangeEnd <= rangeStart) return Buffer.alloc(0);
-                    let result = await api.downloadFileByName({
-                        bucketName: this.bucketName,
-                        fileName,
-                        range: { start: rangeStart, end: rangeEnd },
-                    });
-                    if (result.length !== rangeEnd - rangeStart) {
-                        let afterLength = await this.getInfo(fileName);
-                        if (afterLength && afterLength.size >= fileInfo.size) {
-                            console.error(`Backblaze range download return the correct number of bytes. Tried to get ${rangeStart}-${rangeEnd}, but received ${rangeStart}-${rangeStart + result.length}. For file: ${fileName}`);
-                            // I'm not sure if it's a bug that where we get extra data if we try to read beyond the end of the file, or if the bug is due to some kind of lag that will resolve itself if we wait a little bit. 
-                            setTimeout(async () => {
-                                let resultAgain = await api.downloadFileByName({
-                                    bucketName: this.bucketName,
-                                    fileName,
-                                    range: { start: rangeStart, end: rangeEnd },
-                                });
-                                devDebugbreak();
-                                let didResultFixItSelf = resultAgain.length === rangeEnd - rangeStart;
-
-                                console.log({ didResultFixItSelf }, resultAgain);
-                            }, timeInMinute * 2);
-                        }
-                    }
-                }
-                return await api.downloadFileByName({
-                    bucketName: this.bucketName,
-                    fileName,
-                });
-            });
-            let timeStr = formatTime(Date.now() - time);
-            let rateStr = formatNumber(result.length / (Date.now() - time) * 1000) + "B/s";
-            this.log(`backblaze download (${formatNumber(result.length)}B${config?.range && `, ${formatNumber(config.range.start)} - ${formatNumber(config.range.end)}` || ""}) in ${timeStr} (${rateStr}, ${fileName})`);
-            return result;
-        } catch (e) {
-            this.log(`backblaze file does not exist ${fileName}`);
-            return undefined;
-        } finally {
-            downloading = false;
-        }
+        return this.archives.get(fileName, config);
     }
-    public async set(fileName: string, data: Buffer): Promise<void> {
-        this.log(`backblaze upload (${formatNumber(data.length)}B) ${fileName}`);
-        let f = fileName;
-        await this.apiRetryLogic(`uploadFile ${fileName}`, async (api) => {
-            await api.uploadFile({ bucketId: this.bucketId, fileName, data: data, });
-        });
-        let existsChecks = 30;
-        while (existsChecks > 0) {
-            let exists = await this.getInfo(fileName);
-            if (exists) break;
-            await delay(1000);
-            existsChecks--;
-        }
-        if (existsChecks === 0) {
-            let exists = await this.getInfo(fileName);
-            devDebugbreak();
-            console.warn(`File ${fileName}/${f} was uploaded, but could not be found afterwards. Hopefully it was just deleted, very quickly? If backblaze is taking too long for files to propagate, then we might run into issues with the database atomicity.`);
-        }
-
+    public async get2(fileName: string, config?: { range?: { start: number; end: number; } }): Promise<{ data: Buffer; writeTime: number; size: number } | undefined> {
+        return this.archives.get2(fileName, config);
+    }
+    public async set(fileName: string, data: Buffer, config?: { lastModified?: number }): Promise<void> {
+        return this.archives.set(fileName, data, config);
     }
     public async append(fileName: string, data: Buffer): Promise<void> {
         throw new Error(`ArchivesBackblaze does not support append. Use set instead.`);
-        // this.log(`backblaze append (${formatNumber(data.length)}B) ${fileName}`);
-        // // Backblaze doesn't have native append, so we need to get, concatenate, and set
-        // let existing = await this.get(fileName);
-        // let newData = existing ? Buffer.concat([existing, data]) : data;
-        // await this.set(fileName, newData);
     }
     public async del(fileName: string): Promise<void> {
-        this.log(`backblaze delete ${fileName}`);
-        try {
-            await this.apiRetryLogic(`hideFile ${fileName}`, async (api) => {
-                await api.hideFile({ bucketId: this.bucketId, fileName: fileName });
-            });
-        } catch (e: any) {
-            this.log(`backblaze error in hide, possibly already hidden ${fileName}\n${e.stack}`);
-        }
-
-        // NOTE: Deletion SEEMS to work. This DOES break if we delete a file which keeps being recreated,
-        //  ex, the heartbeat.
-        // let existsChecks = 10;
-        // while (existsChecks > 0) {
-        //     let exists = await this.getInfo(fileName);
-        //     if (!exists) break;
-        //     await delay(1000);
-        //     existsChecks--;
-        // }
-        // if (existsChecks === 0) {
-        //     let exists = await this.getInfo(fileName);
-        //     devDebugbreak();
-        //     console.warn(`File ${fileName} was deleted, but was still found afterwards`);
-        //     exists = await this.getInfo(fileName);
-        // }
+        return this.archives.del(fileName);
     }
-
     public async setLargeFile(config: { path: string; getNextData(): Promise<Buffer | undefined>; }): Promise<void> {
-
-        let onError: (() => Promise<void>)[] = [];
-        let time = Date.now();
-        try {
-            let { path } = config;
-            // Backblaze requires 5MB chunks. But, larger is more efficient for us.
-            const MIN_CHUNK_SIZE = 32 * 1024 * 1024;
-            let dataQueue: Buffer[] = [];
-            async function getNextData(): Promise<Buffer | undefined> {
-                if (dataQueue.length) return dataQueue.shift();
-                // Get buffers until we get 5MB, OR, end. Backblaze requires this for large files.
-                let totalBytes = 0;
-                let buffers: Buffer[] = [];
-                while (totalBytes < MIN_CHUNK_SIZE) {
-                    let data = await config.getNextData();
-                    if (!data) break;
-                    totalBytes += data.length;
-                    buffers.push(data);
-                }
-                if (!buffers.length) return undefined;
-                return Buffer.concat(buffers);
-            }
-
-            let fileName = path;
-            let data = await getNextData();
-            if (!data?.length) return;
-            // Backblaze disallows overly small files
-            if (data.length < MIN_CHUNK_SIZE) {
-                return await this.set(fileName, data);
-            }
-            // Backblaze disallows less than 2 chunks
-            let secondData = await getNextData();
-            if (!secondData?.length) {
-                return await this.set(fileName, data);
-            }
-            // ALSO, if there are two chunks, but one is too small, combine it. This helps allow us never
-            //  send small chunks.
-            if (secondData.length < MIN_CHUNK_SIZE) {
-                return await this.set(fileName, Buffer.concat([data, secondData]));
-            }
-            this.log(`Uploading large file ${config.path}`);
-            dataQueue.unshift(data, secondData);
-
-
-            let uploadInfo = await this.apiRetryLogic(`startLargeFile ${fileName}`, async (api) => {
-                return await api.startLargeFile({
-                    bucketId: this.bucketId,
-                    fileName: fileName,
-                    contentType: "b2/x-auto",
-                    fileInfo: {},
-                });
-            });
-            onError.push(async () => {
-                await this.apiRetryLogic(`cancelLargeFile ${fileName}`, async (api) => {
-                    await api.cancelLargeFile({ fileId: uploadInfo.fileId });
-                });
-            });
-
-            const LOG_INTERVAL = timeInMinute;
-            let nextLogTime = Date.now() + LOG_INTERVAL;
-
-            let partNumber = 1;
-            let partSha1Array: string[] = [];
-            let totalBytes = 0;
-            while (true) {
-                data = await getNextData();
-                if (!data) break;
-                // So... if the next chunk is the last one, combine it with the current one. This
-                //  prevents ANY uploads from being < the threshold, as apparently the "last part"
-                //  check in backblaze fails when we have to retry an upload (due to "no tomes available").
-                //  Well it can't fail if even the last part is > 5MB, now can it!
-                // BUT, only if this isn't the first chunk, otherwise we might try to send
-                //  a single chunk, which we can't do.
-                if (partSha1Array.length > 0) {
-                    let maybeLastData = await getNextData();
-                    if (maybeLastData) {
-                        if (maybeLastData.length < MIN_CHUNK_SIZE) {
-                            // It's the last one, so consume it now
-                            data = Buffer.concat([data, maybeLastData]);
-                        } else {
-                            // It's not the last one. Put it back, in case the one AFTER is the last
-                            //  one, in which case we need to merge maybeLastData with the next next data.
-                            dataQueue.unshift(maybeLastData);
-                        }
-                    }
-                }
-                let sha1 = require("crypto").createHash("sha1");
-                sha1.update(data);
-                let sha1Hex = sha1.digest("hex");
-                partSha1Array.push(sha1Hex);
-                await this.apiRetryLogic(`uploadPart#${partNumber} ${fileName}`, async (api) => {
-                    if (!data) throw new Error("Impossible, data is undefined");
-
-                    let timeStr = formatTime(Date.now() - time);
-                    let rateStr = formatNumber(totalBytes / (Date.now() - time) * 1000) + "B/s";
-                    this.log(`Uploading large file part ${partNumber}, uploaded ${blue(formatNumber(totalBytes) + "B")} in ${blue(timeStr)} (${blue(rateStr)}). ${config.path}`);
-                    totalBytes += data.length;
-
-                    await api.uploadPart({
-                        fileId: uploadInfo.fileId,
-                        partNumber: partNumber,
-                        data: data,
-                        sha1: sha1Hex,
-                    });
-                });
-                partNumber++;
-
-                if (Date.now() > nextLogTime) {
-                    nextLogTime = Date.now() + LOG_INTERVAL;
-                    let timeStr = formatTime(Date.now() - time);
-                    let rateStr = formatNumber(totalBytes / (Date.now() - time) * 1000) + "B/s";
-                    console.log(`Still uploading large file at ${Date.now()}. Uploaded ${formatNumber(totalBytes)}B in ${timeStr} (${rateStr}). ${config.path}`);
-                }
-            }
-            this.log(`Finished uploading large file uploaded ${green(formatNumber(totalBytes))}B`);
-
-            await this.apiRetryLogic(`finishLargeFile ${fileName}`, async (api) => {
-                await api.finishLargeFile({
-                    fileId: uploadInfo.fileId,
-                    partSha1Array: partSha1Array,
-                });
-            });
-        } catch (e: any) {
-            for (let c of onError) {
-                try {
-                    await c();
-                } catch (e) {
-                    console.error(`Error during error clean. Ignoring, we will rethrow the original error, path ${config.path}`, e);
-                }
-            }
-
-            throw new Error(`Error in setLargeFile for ${config.path}: ${e.stack}`);
-        }
+        return this.archives.setLargeFile(config);
     }
-
     public async getInfo(fileName: string): Promise<{ writeTime: number; size: number; } | undefined> {
-        return await this.apiRetryLogic(`getInfo ${fileName}`, async (api) => {
-            try {
-                // NOTE: Apparently, there's no other way to do this, as the file name does not equal the file ID, and git file info requires the file ID. 
-                let info = await api.listFileNames({ bucketId: this.bucketId, prefix: fileName, maxFileCount: 10 });
-                let file = info.files.find(x => x.fileName === fileName && x.action === "upload");
-                if (!file) {
-                    this.log(`Backblaze file not exists ${fileName}`);
-                    return undefined;
-                }
-                this.log(`Backblaze file exists ${fileName}`);
-                return {
-                    writeTime: file.uploadTimestamp,
-                    size: file.contentLength,
-                };
-            } catch (e: any) {
-                if (e.stack.includes(`file_not_found`)) {
-                    this.log(`Backblaze file not exists ${fileName}`);
-                    return undefined;
-                }
-                throw e;
-            }
-        });
+        return this.archives.getInfo(fileName);
     }
-
-    // For example findFileNames("ips/")
     public async find(prefix: string, config?: { shallow?: boolean; type: "files" | "folders" }): Promise<string[]> {
-        let result = await this.findInfo(prefix, config);
-        return result.map(x => x.path);
+        return this.archives.find(prefix, config);
     }
     public async findInfo(prefix: string, config?: { shallow?: boolean; type: "files" | "folders" }): Promise<{ path: string; createTime: number; size: number; }[]> {
-        return await this.apiRetryLogic(`findInfo ${prefix}`, async (api) => {
-            if (!config?.shallow && config?.type === "folders") {
-                let allFiles = await this.findInfo(prefix);
-                let allFolders = new Map<string, { path: string; createTime: number; size: number }>();
-                for (let { path, createTime, size } of allFiles) {
-                    let folder = path.split("/").slice(0, -1).join("/");
-                    if (!folder) continue;
-                    allFolders.set(folder, { path: folder, createTime, size });
-                }
-                return Array.from(allFolders.values());
-            }
-            let files = new Map<string, { path: string; createTime: number; size: number; }>();
-            let startFileName = "";
-            while (true) {
-                let result = await api.listFileNames({
-                    bucketId: this.bucketId,
-                    prefix: prefix,
-                    startFileName,
-                    maxFileCount: 1000,
-                    delimiter: config?.shallow ? "/" : undefined,
-                });
-                for (let file of result.files) {
-                    if (file.action === "upload" && config?.type !== "folders") {
-                        files.set(file.fileName, { path: file.fileName, createTime: file.uploadTimestamp, size: file.contentLength });
-                    } else if (file.action === "folder" && config?.type === "folders") {
-                        let folder = file.fileName;
-                        if (folder.endsWith("/")) {
-                            folder = folder.slice(0, -1);
-                        }
-                        files.set(folder, { path: folder, createTime: file.uploadTimestamp, size: file.contentLength });
-                    }
-
-                }
-                startFileName = result.nextFileName;
-                if (!startFileName) break;
-            }
-            return Array.from(files.values());
-        });
+        return this.archives.findInfo(prefix, config);
     }
-
-    public async assertPathValid(path: string) {
-        let bytes = Buffer.from(path, "utf8");
-        if (bytes.length > 1000) {
-            throw new Error(`Path too long: ${path.length} characters > 1000 characters. Path: ${path}`);
-        }
+    public async assertPathValid(path: string): Promise<void> {
+        return this.archives.assertPathValid(path);
     }
 
     public async move(config: {
@@ -943,49 +89,23 @@ export class ArchivesBackblaze {
         target: Archives;
         targetPath: string;
         copyInstead?: boolean;
-    }) {
-        let { path, target, targetPath } = config;
+    }): Promise<void> {
+        let { target, targetPath } = config;
         let base = target.getBaseArchives?.();
         if (base) {
             target = base.archives;
             targetPath = base.parentPath + targetPath;
         }
-        // A self move should NOOP (and definitely not copy, and then delete itself!)
-        if (target === this && path === targetPath) {
-            this.log(`Backblaze move path to itself. Skipping move, as there is no work to do. ${path}`);
-            return;
-        }
-        if (target instanceof ArchivesBackblaze) {
-            let targetBucketId = target.bucketId;
-            if (targetBucketId === this.bucketId && path === targetPath) return;
-            await this.apiRetryLogic(`move ${path} -> ${targetPath}`, async (api) => {
-                // Ugh... listing the file name sucks, but... I guess it's still better than
-                //  downloading and re-uploading the entire file.
-                let info = await api.listFileNames({ bucketId: this.bucketId, prefix: path, maxFileCount: 10 });
-                let file = info.files.find(x => x.fileName === path);
-                if (!file) throw new Error(`File not found to move: ${path}`);
-                await api.copyFile({
-                    sourceFileId: file.fileId,
-                    fileName: targetPath,
-                    destinationBucketId: targetBucketId,
-                });
-            });
-        } else {
-            let data = await this.get(path);
-            if (!data) throw new Error(`File not found to move: ${path}`);
-            await target.set(targetPath, data);
-        }
-
-        if (!config.copyInstead) {
-            let exists = await this.getInfo(targetPath);
-            if (!exists) {
-                debugbreak(2);
-                debugger;
-                console.error(`File not found after move. Leaving BOTH files. ${targetPath} was not found. Being moved from ${path}`);
-            } else {
-                await this.del(path);
-            }
-        }
+        // Hand the inner instance across so the base implementation's bucket-to-bucket copyFile fast path (an instanceof check on its own class) still triggers.
+        let innerTarget: IArchives = target instanceof ArchivesBackblaze
+            ? target.archives
+            : target as unknown as IArchives;
+        return this.archives.move({
+            path: config.path,
+            target: innerTarget,
+            targetPath,
+            copyInstead: config.copyInstead,
+        });
     }
 
     public async copy(config: {
@@ -996,13 +116,8 @@ export class ArchivesBackblaze {
         return this.move({ ...config, copyInstead: true });
     }
 
-    public async getURL(path: string) {
-        return await this.apiRetryLogic(`getURL ${path}`, async (api) => {
-            if (path.startsWith("/")) {
-                path = path.slice(1);
-            }
-            return await api.getDownloadURL("file/" + this.bucketName + "/" + path);
-        });
+    public async getURL(path: string): Promise<string> {
+        return this.archives.getURL(path);
     }
 
     public async getDownloadAuthorization(config: {
@@ -1019,25 +134,10 @@ export class ArchivesBackblaze {
         fileNamePrefix: string;
         authorizationToken: string;
     }> {
-        return await this.apiRetryLogic(`getDownloadAuthorization ${config.fileNamePrefix ?? ""}`, async (api) => {
-            return await api.getDownloadAuthorization({
-                bucketId: this.bucketId,
-                fileNamePrefix: config.fileNamePrefix ?? "",
-                ...config,
-            });
-        });
+        return this.archives.getDownloadAuthorization(config);
     }
 }
 
-/*
-Names should be a UTF-8 string up to 1024 bytes with the following exceptions:
-    Character codes below 32 are not allowed.
-    DEL characters (127) are not allowed.
-    Backslashes are not allowed.
-    File names cannot start with /, end with /, or contain //.
-*/
-
-
 export const getArchivesBackblaze = cache((domain: string) => {
     return new ArchivesBackblaze({ bucketName: domain });
 });
@@ -1066,4 +166,4 @@ export const getArchivesBackblazePublic = cache((domain: string) => {
         cacheTime: timeInMinute,
         allowedOrigins: [`https://${domain}`, `https://127-0-0-1.${domain}:7007`],
     });
-});
+});

package/src/4-dom/qreactGlobal.d.ts

@@ -0,0 +1,17 @@
+import type { qreact as qreactType } from "./qreact";
+
+// qreact.tsx assigns itself onto globalThis at runtime, but only files that import { qreact } see it in the type system. Sliftutils' .tsx sources get pulled into our program (its .d.ts files' relative imports resolve to the neighboring sources) and compile under our qreact jsxFactory without importing it — this ambient declaration gives them the global qreact value and the global JSX fallback namespace.
+declare global {
+    const qreact: typeof qreactType;
+    namespace JSX {
+        type IntrinsicElements = qreactType.JSX.IntrinsicElements;
+        type Element = qreactType.JSX.Element;
+        type IntrinsicClassAttributes<T = unknown> = qreactType.JSX.IntrinsicClassAttributes<T>;
+        interface ElementClass {
+            render: any;
+        }
+        interface ElementAttributesProperty {
+            props: {};
+        }
+    }
+}

package/src/deployManager/setupMachineMain.ts

@@ -264,6 +264,33 @@ async function main() {
         console.log(`✅ Swap configured: ${swapCheck.split(/\s+/)[1]}MB total vs ${ramMB}MB REAL MEMORY`);
     }
 
+    // Enable TCP BBR congestion control (with fq qdisc, which BBR is designed to pair with)
+    console.log("Checking TCP congestion control...");
+    const currentCongestion = (await runPromise(`ssh ${sshRemote} "sysctl -n net.ipv4.tcp_congestion_control"`)).trim();
+    if (currentCongestion === "bbr") {
+        console.log("✅ TCP BBR already enabled");
+    } else {
+        await runPromise(`ssh ${sshRemote} "sudo modprobe tcp_bbr"`, { nothrow: true });
+        const availableCongestion = await runPromise(`ssh ${sshRemote} "sysctl -n net.ipv4.tcp_available_congestion_control"`);
+        if (!availableCongestion.split(/\s+/).includes("bbr")) {
+            console.warn(`⚠️  TCP BBR not available on this kernel (current: ${currentCongestion}, available: ${availableCongestion.trim()}). Skipping.`);
+        } else {
+            console.log(`Enabling TCP BBR (current: ${currentCongestion})...`);
+            // Persist across reboots (modules-load.d so tcp_bbr is loaded before sysctl.d is applied)
+            await runPromise(`ssh ${sshRemote} "echo 'tcp_bbr' | sudo tee /etc/modules-load.d/bbr.conf"`);
+            await runPromise(`ssh ${sshRemote} "printf 'net.core.default_qdisc=fq\\nnet.ipv4.tcp_congestion_control=bbr\\n' | sudo tee /etc/sysctl.d/99-bbr.conf"`);
+            // Enable immediately
+            await runPromise(`ssh ${sshRemote} "sudo sysctl -w net.core.default_qdisc=fq"`);
+            await runPromise(`ssh ${sshRemote} "sudo sysctl -w net.ipv4.tcp_congestion_control=bbr"`);
+            const newCongestion = (await runPromise(`ssh ${sshRemote} "sysctl -n net.ipv4.tcp_congestion_control"`)).trim();
+            if (newCongestion === "bbr") {
+                console.log("✅ TCP BBR enabled");
+            } else {
+                console.warn(`⚠️  Tried to enable TCP BBR, but congestion control is still: ${newCongestion}`);
+            }
+        }
+    }
+
     let backblazePath = getBackblazePath();
 
     console.log("Setting up machine:", sshRemote);

package/tsconfig.json

@@ -24,6 +24,13 @@
             ],
             "socket-function/*": [
                 "./node_modules/socket-function/*"
+            ],
+            // Resolve to the emitted declarations instead of the linked sources: sliftutils compiles its JSX with preact.createElement, so its .tsx files cannot compile under our qreact jsxFactory.
+            "sliftutils": [
+                "./node_modules/sliftutils/index.d.ts"
+            ],
+            "sliftutils/*": [
+                "./node_modules/sliftutils/*.d.ts"
             ]
         },
         "experimentalDecorators": true,