querysub 0.685.0 → 0.688.0

package/package.json

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

package/src/deployManager/machineApplyMainCode.ts

@@ -483,21 +483,21 @@ let cachedConfigs: ServiceConfig[] | undefined;
 let cachedConfigsTime = 0;
 // Set when something tells us the configs actually changed, which no interval can predict
 let configRefreshRequested = false;
-async function getResyncConfigs(): Promise<{ configs: ServiceConfig[]; refreshed: boolean }> {
+async function getResyncConfigs(machineId: string): Promise<{ configs: ServiceConfig[]; refreshed: boolean }> {
     let force = configRefreshRequested;
     if (!force && cachedConfigs && Date.now() - cachedConfigsTime < CONFIG_REFRESH_INTERVAL) {
         return { configs: cachedConfigs, refreshed: false };
     }
     // Cleared before the read, so a change arriving DURING it is not swallowed by our own success
     configRefreshRequested = false;
-    cachedConfigs = await getEffectiveServiceConfigs();
+    cachedConfigs = await getEffectiveServiceConfigs(machineId);
     cachedConfigsTime = Date.now();
     return { configs: cachedConfigs, refreshed: true };
 }
 
 const resyncServicesBase = runInSerial(measureWrap(async function resyncServices() {
     let machineId = getOwnMachineId(getDomain());
-    let { configs: allConfigs, refreshed } = await getResyncConfigs();
+    let { configs: allConfigs, refreshed } = await getResyncConfigs(machineId);
     if (refreshed) {
         console.log(magenta("Resyncing services, with freshly read configs"));
     }

package/src/deployManager/machineSchema.ts

@@ -329,6 +329,7 @@ export class MachineServiceControllerBase {
     }
     public async setMachineConfig(machineId: string, config: MachineConfig) {
         await machineConfigs.set(machineId, config);
+        void this.notifyMachines([machineId], []);
     }
 
     private async notifyMachines(newMachineIds: string[], oldMachineIds: string[]) {
@@ -589,22 +590,19 @@ export class MachineServiceControllerBase {
     }
 }
 
-export async function getEffectiveServiceConfigs(): Promise<ServiceConfig[]> {
+/** The service configs as `machineId` should see them. The machine's own config is a modifier on top: a disabled machine sees every service as not deployed, so it takes them down through the ordinary undeploy path instead of needing a second way to stop things. */
+export async function getEffectiveServiceConfigs(machineId: string): Promise<ServiceConfig[]> {
     let configs = await serviceConfigs.values();
-    let allMachineConfigs = await machineConfigs.values();
-
-    let disabledMachineIds = new Set<string>();
-    for (let machineConfig of allMachineConfigs) {
-        if (machineConfig.disabled) {
-            disabledMachineIds.add(machineConfig.machineId);
-        }
-    }
+    let machineConfig = await machineConfigs.get(machineId);
+    let disabled = machineConfig?.disabled;
 
     return configs.map(config => {
         normalizeServiceConfig(config);
-        setMachineTargets(config.parameters, getMachineTargets(config.parameters).filter(target => !disabledMachineIds.has(target.machineId)));
-        if (config.oldParameters) {
-            setMachineTargets(config.oldParameters, getMachineTargets(config.oldParameters).filter(target => !disabledMachineIds.has(target.machineId)));
+        if (disabled) {
+            config.parameters.deploy = false;
+            if (config.oldParameters) {
+                config.oldParameters.deploy = false;
+            }
         }
         return config;
     });