querysub 0.605.0 → 0.606.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "querysub",
-  "version": "0.605.0",
+  "version": "0.606.0",
   "main": "index.js",
   "license": "MIT",
   "note1": "note on node-forge fork, see https://github.com/digitalbazaar/forge/issues/744 for details",

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

@@ -6,15 +6,15 @@ import { SetConfig } from "sliftutils/storage/IArchives";
 
 export type ArchiveT<T> = {
     get(key: string): Promise<T | undefined>;
-    set(key: string, value: T, setConfig?: SetConfig): Promise<void>;
+    set(key: string, value: T): Promise<void>;
     delete(key: string): Promise<void>;
-    keys(findConfig?: FindConfig): Promise<string[]>;
-    values(findConfig?: FindConfig): Promise<T[]>;
+    keys(): Promise<string[]>;
+    values(): Promise<T[]>;
     entries(): Promise<[string, T][]>;
     [Symbol.asyncIterator](): AsyncIterator<[string, T]>;
 };
 
-export function archiveJSONT<T>(archives: () => IArchives): ArchiveT<T> {
+export function archiveJSONT<T>(archives: () => IArchives, config?: { fallbacks?: boolean }): ArchiveT<T> {
     archives = lazy(archives);
 
     let valuesCache = new Map<string, {
@@ -28,21 +28,21 @@ export function archiveJSONT<T>(archives: () => IArchives): ArchiveT<T> {
         if (!buffer) return undefined;
         return JSON.parse(buffer.toString()) as T;
     }
-    async function set(key: string, value: T, setConfig?: SetConfig) {
+    async function set(key: string, value: T) {
         let a = archives();
         console.log(`In archiveJSONT ${a.getDebugName()}, setting ${key} to ${JSON.stringify(value)}`);
-        await a.set(key, Buffer.from(JSON.stringify(value)), setConfig);
+        await a.set(key, Buffer.from(JSON.stringify(value)), config);
     }
     async function deleteFnc(key: string) {
         let a = archives();
         console.log(`In archiveJSONT ${a.getDebugName()}, deleting ${key}`);
         await a.del(key);
     }
-    async function keys(findConfig?: FindConfig) {
-        return (await archives().find("", findConfig)).map(value => value.toString());
+    async function keys() {
+        return (await archives().find("", config)).map(value => value.toString());
     }
-    async function values(findConfig?: FindConfig) {
-        let infos = await archives().findInfo("", findConfig);
+    async function values() {
+        let infos = await archives().findInfo("", config);
 
         let needsUpdate = false;
         let currentKeys = new Set(infos.map(info => info.path));
@@ -64,7 +64,7 @@ export function archiveJSONT<T>(archives: () => IArchives): ArchiveT<T> {
             let maxRetries = 10;
             let updated = false;
             for (let attempt = 0; attempt < maxRetries; attempt++) {
-                infos = await archives().findInfo("", findConfig);
+                infos = await archives().findInfo("", config);
 
                 let newCache = new Map<string, {
                     createTime: number;
@@ -93,7 +93,7 @@ export function archiveJSONT<T>(archives: () => IArchives): ArchiveT<T> {
 
                 if (!allFound) continue;
 
-                let newInfos = await archives().findInfo("", findConfig);
+                let newInfos = await archives().findInfo("", config);
                 if (newInfos.length !== infos.length) continue;
                 function anyChanged() {
                     for (let i = 0; i < newInfos.length; i++) {

package/src/deployManager/machineSchema.ts

@@ -29,6 +29,16 @@ export const SERVICE_FOLDER = `${SERVICE_FOLDER_NAME}/`;
 export const MACHINE_RESYNC_INTERVAL = timeInMinute * 15;
 export const SERVICE_NODE_FILE_NAME = "serviceNodeId.txt";
 
+
+export type MachineConfig = {
+    machineId: string;
+    disabled: boolean;
+};
+// We want all of these to have very high availability. Even if they're wrong, it's better to have an old service deployed or even view information on an old service, or even set information only in back plays rather than have the server be completely down. 
+export const machineInfos = archiveJSONT<MachineInfo>(() => getArchives2("machines/machine-heartbeats/"), { fallbacks: true });
+export const serviceConfigs = archiveJSONT<ServiceConfig>(() => getArchives2("machines/service-configs/"), { fallbacks: true });
+export const machineConfigs = archiveJSONT<MachineConfig>(() => getArchives2("machines/machine-configs/"), { fallbacks: true });
+
 export type MachineInfo = {
     machineId: string;
 
@@ -182,13 +192,6 @@ function normalizeServiceConfig(config: ServiceConfig): ServiceConfig {
     return config;
 }
 
-export type MachineConfig = {
-    machineId: string;
-    disabled: boolean;
-};
-export const machineInfos = archiveJSONT<MachineInfo>(() => getArchives2("machines/machine-heartbeats/"));
-export const serviceConfigs = archiveJSONT<ServiceConfig>(() => getArchives2("machines/service-configs/"));
-export const machineConfigs = archiveJSONT<MachineConfig>(() => getArchives2("machines/machine-configs/"));
 
 export type LaunchRecord = {
     serviceId: string;
@@ -276,7 +279,7 @@ export class MachineServiceControllerBase {
 
     public async getMachineList() {
         return [...new Set([
-            ...(await machineInfos.keys({ fallbacks: true })),
+            ...(await machineInfos.keys()),
         ])];
     }
     public async deleteMachineIds(machineIds: string[]) {
@@ -303,7 +306,7 @@ export class MachineServiceControllerBase {
     }
     public async getServiceList(): Promise<string[]> {
         return [...new Set([
-            ...(await serviceConfigs.keys({ fallbacks: true })),
+            ...(await serviceConfigs.keys()),
         ])];
     }
     public async getServiceConfig(serviceId: string): Promise<ServiceConfig | undefined> {
@@ -312,7 +315,7 @@ export class MachineServiceControllerBase {
     }
 
     public async getMachineConfigList() {
-        return await machineConfigs.values({ fallbacks: true });
+        return await machineConfigs.values();
     }
     public async getMachineConfig(machineId: string): Promise<MachineConfig | undefined> {
         return await machineConfigs.get(machineId);
@@ -378,7 +381,7 @@ export class MachineServiceControllerBase {
             // NOTE: This is correct. This is obviously correct. For some reason, the AI wrote some really big, complicated thing here. I don't know why. This is the only way it should be done, obviously.
             config.oldParameters = getLiveServiceParameters(serviceConfig);
 
-            await serviceConfigs.set(serviceId, config, { fallbacks: true });
+            await serviceConfigs.set(serviceId, config);
             // Only notify we were or are deployed. If it's not deployed, this will be ignored anyways.
             if (config.parameters.deploy || serviceConfig.parameters.deploy) {
                 for (let machineId of getConfigMachineIds(config)) {