Fix music message handling to avoid stale metadata and ensure proper merging

Author: thinkpoop

apps/messagegui/lib.js

@@ -45,8 +45,7 @@ exports.listener = function(type, msg) {
       // messages app later shows active track & controls.
       // Mark as handled and save immediately (no buzzing / auto-open).
       msg.handled = true;
-      // Ensure music message ends up first (consistent with open())
-      let messages = require("messages").getMessages(msg);
+      let messages = require("messages").getMessages();
       // Apply current music state (will unshift if not present)
       require("messages").apply(msg, messages);
       require("messages").write(messages);
@@ -61,7 +60,9 @@ exports.listener = function(type, msg) {
     // save messages from RAM to flash if we decide not to launch app
     // We apply all of Bangle.MESSAGES here in one write
     if (!Bangle.MESSAGES || !Bangle.MESSAGES.length) return;
-    let messages = require("messages").getMessages(msg);
+    // Load saved messages without applying the current msg to avoid
+    // applying it twice (getMessages(msg) would apply it already).
+    let messages = require("messages").getMessages();
     (Bangle.MESSAGES || []).forEach(m => require("messages").apply(m, messages));
     require("messages").write(messages);
     delete Bangle.MESSAGES;

apps/messages/lib.js

@@ -24,15 +24,19 @@ exports.pushMessage = function(event) {
     if (event.t==="add") {
       if (event.new===undefined) event.new = true; // Assume it should be new
     } else if (event.t==="modify") {
-      const old = exports.getMessages().find(m => m.id===event.id);
-      if (old) event = Object.assign(old, event);
+      // For music messages, don't merge with old stored message to avoid stale metadata
+      if (event.id !== "music") {
+        const old = exports.getMessages().find(m => m.id===event.id);
+        if (old) event = Object.assign(old, event);
+      }
     }
 
     // combine musicinfo and musicstate events
     if (event.id==="music") {
       if (event.state==="play") event.new = true; // new track, or playback (re)started
+      // Always merge new event into current music state to preserve metadata
       exports.music = Object.assign({}, exports.music, event);
-      event = exports.music;
+      event = exports.music; //Object.assign({}, exports.music); // emit a copy
     }
   }
   // reset state (just in case)
@@ -75,8 +79,16 @@ exports.apply = function(event, messages) {
     if (mIdx>=0) messages.splice(mIdx, 1); // duplicate ID! erase previous version
     messages.unshift(event); // add at the beginning
   } else if (event.t==="modify") {
-    if (mIdx>=0) messages[mIdx] = Object.assign(messages[mIdx], event);
-    else messages.unshift(event);
+    if (mIdx>=0) {
+      // For music messages, completely replace instead of merging to avoid stale metadata
+      if (event.id === "music") {
+        messages[mIdx] = event;
+      } else {
+        messages[mIdx] = Object.assign(messages[mIdx], event);
+      }
+    } else {
+      messages.unshift(event);
+    }
   }
   return messages;
 };
@@ -139,7 +151,7 @@ exports.toggleWidget = function(show) {
 exports.write = function(messages) {
   if (!messages.length) require("Storage").erase("messages.json");
   else require("Storage").writeJSON("messages.json", messages.map(m => {
-    // we never want to save saved/handled status to file;
+    // we never want to save saved/handled status to file
     delete m.saved;
     delete m.handled;
     return m;