@envmanager-cli/cli 0.1.6 → 0.1.7

package/dist/bin/envmanager.js

@@ -1479,7 +1479,9 @@ async function subscribeToVariableChanges(environmentId, onEvent, onStatus) {
       table: "variables"
     },
     (payload) => {
-      const record = payload.new || payload.old;
+      const newRecord = payload.new;
+      const oldRecord = payload.old;
+      const record = newRecord && Object.keys(newRecord).length > 0 ? newRecord : oldRecord;
       if (!record) return;
       const recordEnvId = record.environment_id;
       if (recordEnvId !== environmentId) {
@@ -1493,8 +1495,7 @@ async function subscribeToVariableChanges(environmentId, onEvent, onStatus) {
         is_secret: record.is_secret,
         timestamp: Date.now() / 1e3
       };
-      if (payload.eventType === "UPDATE" && payload.old) {
-        const oldRecord = payload.old;
+      if (payload.eventType === "UPDATE" && oldRecord) {
         if (oldRecord.key !== record.key) {
           event.old_key = oldRecord.key;
         }
@@ -1664,9 +1665,12 @@ function mergeWithRemote(local, remoteVariables, strategy) {
         result.set(key, value);
       }
       break;
-    case "remote_wins":
+    case "remote_wins": {
+      const remoteKeys = new Set(remoteVariables.map((v) => v.key));
       for (const [key, value] of local) {
-        result.set(key, value);
+        if (remoteKeys.has(key)) {
+          result.set(key, value);
+        }
       }
       for (const v of remoteVariables) {
         if (v.value !== null) {
@@ -1674,6 +1678,7 @@ function mergeWithRemote(local, remoteVariables, strategy) {
         }
       }
       break;
+    }
     case "merge_new":
       for (const [key, value] of local) {
         result.set(key, value);