querysub 0.622.0 → 0.624.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "querysub",
-  "version": "0.622.0",
+  "version": "0.624.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.90",
+    "sliftutils": "^1.7.92",
     "socket-function": "^1.2.30",
     "terser": "^5.31.0",
     "typenode": "^6.6.1",

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

@@ -76,14 +76,14 @@ function archiveBuilder(bucket: string, overrides: Partial<RemoteConfigBase>) {
                 // NOTE: Once we add new sources, we need to add something at a new start time in the future so we have time to move the files. 
                 // TODO: EVENTUALLY, Once we have enough data, instead of restriping, we need to bisect the data. That way we can slowly move over the data instead of trying to rewrite all of our data all at once. However, for the moment, moving all the data is probably fine. On the data center, we should be able to move terabytes of data every hour, so we should be able to handle quite a bit, especially if we have a few days to run the restriping. 
                 // IMPORTANT! Every time we re-stripe, we need to increment the route version. Otherwise, we could reuse a folder that we previously used that's no longer in sync. which will cause us to resurrect old data, which is very bad. We don't want to do that...
-                ...stripeSources([ONTARIO, HETZNER], { routeVersion: 1 }),
+                ...stripeSources([ONTARIO, HETZNER], { routeVersion: 2 }),
                 { type: "backblaze", url: BACKBLAZE, name: "backblaze" },
             ]
         },
     ]);
 
     return createArchives({
-        version: 23,
+        version: 25,
         sources,
     });
 }

package/src/storageSetup.ts

@@ -1,15 +1,14 @@
 process.env.PRODUCTION = "true";
-// TODO: Add this back
-//import "./inject";
+import "./inject";
 
 // The storage server entry point (see bin/storageserve.js): sets up the CLI args the sliftutils storage server expects, synchronizes our network trust list into its trust store, and runs its CLI.
 
 async function main() {
-    // TODO: Add this back
-    // let trustedMachineIds = await getTrustedMachineIds();
-    // let { setTrustedMachines } = await import("sliftutils/storage/remoteStorage/serverConfig");
-    // await setTrustedMachines({ account: "root", machineIds: trustedMachineIds });
-    // console.log(`Synchronized ${trustedMachineIds.length} trusted machines`);
+    const { getTrustedMachineIds } = await import("./-d-trust/NetworkTrust2");
+    let trustedMachineIds = await getTrustedMachineIds();
+    let { setTrustedMachines } = await import("sliftutils/storage/remoteStorage/serverConfig");
+    await setTrustedMachines({ account: "root", machineIds: trustedMachineIds });
+    console.log(`Synchronized ${trustedMachineIds.length} trusted machines`);
 
     await import("sliftutils/storage/remoteStorage/storageServerCli");
 }