querysub 0.660.0 → 0.662.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "querysub",
-  "version": "0.660.0",
+  "version": "0.662.0",
   "main": "index.js",
   "license": "MIT",
   "note1": "note on node-forge fork, see https://github.com/digitalbazaar/forge/issues/744 for details",
@@ -79,7 +79,7 @@
     "node-forge": "https://github.com/sliftist/forge#e618181b469b07bdc70b968b0391beb8ef5fecd6",
     "pako": "^2.1.0",
     "peggy": "^5.0.6",
-    "sliftutils": "^1.7.131",
+    "sliftutils": "^1.7.132",
     "socket-function": "^1.2.35",
     "terser": "^5.31.0",
     "typenode": "^6.6.1",

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

@@ -94,7 +94,7 @@ const archivesBuilderCache = cacheJSONArgsEqual((domain: string, overrides: Part
     domain = domain.toLowerCase().replaceAll(/[^a-z0-9-]/g, "-");
     return archiveBuilder(domain, overrides);
 });
-function nestBucket(folder: string, archives: ReturnType<typeof createArchives>) {
+export function nestBucket(folder: string, archives: ReturnType<typeof createArchives>) {
     if (!folder) return archives;
     folder = folder.replaceAll("\\", "/");
     if (!folder.endsWith("/")) {
@@ -136,7 +136,7 @@ function nestBucket(folder: string, archives: ReturnType<typeof createArchives>)
     };
 }
 
-function getSafeDomain() {
+export function getSafeDomain() {
     return getDomain().toLowerCase().replaceAll(/[^a-z0-9-]/g, "-");
 }
 

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

@@ -0,0 +1,19 @@
+import { createArchives } from "sliftutils/storage/remoteStorage/createArchives";
+import { cache } from "socket-function/src/caching";
+import { getSafeDomain, nestBucket } from "./archives2";
+
+// The absolute-minimum archives: one private accessor, one backblaze source, no striping, no storage servers. For the values that have to be readable when none of our infrastructure is up (ex, the repo trust config machine deploy needs to bootstrap a machine).
+
+const lowLevelBase = cache((bucket: string) => createArchives({
+    version: 1,
+    sources: [{
+        type: "backblaze",
+        url: `https://f002.backblazeb2.com/file/${bucket}/storage/storagerouting.json`,
+        name: "backblaze",
+        validWindow: [0, Number.MAX_SAFE_INTEGER],
+    }],
+}));
+
+export function getArchivesLowLevel(folder: string) {
+    return nestBucket(folder, lowLevelBase(getSafeDomain() + "-low-level"));
+}

package/src/deployManager/setupMachineMain.ts

@@ -403,10 +403,10 @@ async function main() {
 
     console.log("Setting up machine:", sshRemote);
 
-    // 0. Update apt
+    // 0. Update apt. nothrow, as apt update exits non-zero when ANY configured repo fails (ex, a stale third-party repo whose vendor rotated its GPG key), and setup only needs the main repos - if those are actually broken, the installs below fail loudly anyway.
     console.log("Updating apt...");
-    await runPromise(`ssh ${sshRemote} "sudo apt update"`);
-    console.log("✅ Apt updated");
+    await runPromise(`ssh ${sshRemote} "sudo apt update"`, { nothrow: true });
+    console.log("✅ Apt updated (any repo errors above are only fatal if the installs below fail)");
 
     // 1. Copy backblaze file to remote server (~/backblaze.json)
     console.log("Copying backblaze credentials...");
@@ -424,7 +424,7 @@ async function main() {
         console.log("✅ Git already installed");
     } catch {
         console.log("Installing git...");
-        await runPromise(`ssh ${sshRemote} "sudo apt update && sudo apt install -y git"`);
+        await runPromise(`ssh ${sshRemote} "sudo apt update; sudo apt install -y git"`);
         console.log("✅ Git installed");
     }
 
@@ -509,7 +509,8 @@ async function main() {
             }
 
             // Get the public key from remote machine
-            const sshPublicKey = await sshValue(sshRemote, "cat ~/.ssh/id_rsa.pub");
+            // Falls back to deriving from the private key, as the .pub file can be missing while the key itself is fine
+            const sshPublicKey = await sshValue(sshRemote, "cat ~/.ssh/id_rsa.pub 2>/dev/null || ssh-keygen -y -f ~/.ssh/id_rsa");
             const keyTitle = `Machine Setup - ${sshRemote} - ${new Date().toISOString()}`;
 
             // Add the deploy key to GitHub repository