@tomorrowos/sdk 0.9.2 → 0.9.4

package/REPLIT_SETUP.md

@@ -232,7 +232,7 @@ Allowed extras (optional): `"build-player": "tomorrowos build --platform tizen"`
     "node": ">=20"
   },
   "dependencies": {
-    "@tomorrowos/sdk": "^0.9.2",
+    "@tomorrowos/sdk": "^0.9.4",
     "dotenv": "^17.2.3",
     "tsx": "^4.19.0"
   },

package/dist/playlist-catalog.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"playlist-catalog.d.ts","sourceRoot":"","sources":["../src/playlist-catalog.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,wBAAwB,EACxB,kBAAkB,EAClB,gBAAgB,EAChB,yBAAyB,EACzB,cAAc,EACd,eAAe,EAChB,MAAM,kBAAkB,CAAC;AAE1B,MAAM,WAAW,iBAAiB;IAChC,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,gBAAgB,CAAC;IAC5B,KAAK,EAAE,kBAAkB,EAAE,CAAC;CAC7B;AAED,MAAM,WAAW,iBAAiB;IAChC,MAAM,EAAE;QACN,SAAS,EAAE,yBAAyB,EAAE,CAAC;QACvC,QAAQ,EAAE;YAAE,IAAI,EAAE,OAAO,CAAA;SAAE,CAAC;QAC5B,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,QAAQ,CAAC,EAAE,QAAQ,GAAG,UAAU,CAAC;KAClC,CAAC;CACH;AAED,MAAM,WAAW,kBAAkB;IACjC,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AA8CD,qBAAa,eAAe;IACd,OAAO,CAAC,QAAQ,CAAC,KAAK;gBAAL,KAAK,EAAE,eAAe;IAE7C,aAAa,IAAI,OAAO,CAAC,cAAc,EAAE,CAAC;IAK1C,6BAA6B,IAAI,OAAO,CAAC,cAAc,EAAE,CAAC;IAI1D,WAAW,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,GAAG,SAAS,CAAC;IAI5D,YAAY,CAAC,KAAK,EAAE,iBAAiB,GAAG,OAAO,CAAC,cAAc,CAAC;IA8B/D,cAAc,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC;IAcnD,oBAAoB,CACxB,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,wBAAwB,EAAE,CAAC;IAIhC,wBAAwB,CAC5B,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,MAAM,EAAE,EACrB,OAAO,GAAE,kBAAuB,GAC/B,OAAO,CAAC,iBAAiB,CAAC;IA0CvB,wBAAwB,CAC5B,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,iBAAiB,CAAC;IAO7B,mFAAmF;IAC7E,6BAA6B,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAKjF;;;OAGG;IACG,+BAA+B,CACnC,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,EAClB,OAAO,GAAE,kBAAuB,GAC/B,OAAO,CAAC;QAAE,OAAO,EAAE,OAAO,CAAC;QAAC,KAAK,CAAC,EAAE,iBAAiB,CAAA;KAAE,CAAC;IA4BrD,oBAAoB,CACxB,QAAQ,EAAE,MAAM,EAChB,OAAO,GAAE,kBAAuB,GAC/B,OAAO,CAAC,iBAAiB,CAAC;YAKf,0BAA0B;IAgCxC,6BAA6B,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;CAGpE"}
+{"version":3,"file":"playlist-catalog.d.ts","sourceRoot":"","sources":["../src/playlist-catalog.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,wBAAwB,EACxB,kBAAkB,EAClB,gBAAgB,EAChB,yBAAyB,EACzB,cAAc,EACd,eAAe,EAChB,MAAM,kBAAkB,CAAC;AAE1B,MAAM,WAAW,iBAAiB;IAChC,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,gBAAgB,CAAC;IAC5B,KAAK,EAAE,kBAAkB,EAAE,CAAC;CAC7B;AAED,MAAM,WAAW,iBAAiB;IAChC,MAAM,EAAE;QACN,SAAS,EAAE,yBAAyB,EAAE,CAAC;QACvC,QAAQ,EAAE;YAAE,IAAI,EAAE,OAAO,CAAA;SAAE,CAAC;QAC5B,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,QAAQ,CAAC,EAAE,QAAQ,GAAG,UAAU,CAAC;KAClC,CAAC;CACH;AAED,MAAM,WAAW,kBAAkB;IACjC,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAyDD,qBAAa,eAAe;IACd,OAAO,CAAC,QAAQ,CAAC,KAAK;gBAAL,KAAK,EAAE,eAAe;IAE7C,aAAa,IAAI,OAAO,CAAC,cAAc,EAAE,CAAC;IAK1C,6BAA6B,IAAI,OAAO,CAAC,cAAc,EAAE,CAAC;IAI1D,WAAW,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,GAAG,SAAS,CAAC;IAI5D,YAAY,CAAC,KAAK,EAAE,iBAAiB,GAAG,OAAO,CAAC,cAAc,CAAC;IA8B/D,cAAc,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC;IAcnD,oBAAoB,CACxB,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,wBAAwB,EAAE,CAAC;IAIhC,wBAAwB,CAC5B,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,MAAM,EAAE,EACrB,OAAO,GAAE,kBAAuB,GAC/B,OAAO,CAAC,iBAAiB,CAAC;IAiEvB,wBAAwB,CAC5B,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,iBAAiB,CAAC;IAO7B,mFAAmF;IAC7E,6BAA6B,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAKjF;;;OAGG;IACG,+BAA+B,CACnC,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,EAClB,OAAO,GAAE,kBAAuB,GAC/B,OAAO,CAAC;QAAE,OAAO,EAAE,OAAO,CAAC;QAAC,KAAK,CAAC,EAAE,iBAAiB,CAAA;KAAE,CAAC;IA4BrD,oBAAoB,CACxB,QAAQ,EAAE,MAAM,EAChB,OAAO,GAAE,kBAAuB,GAC/B,OAAO,CAAC,iBAAiB,CAAC;YAKf,0BAA0B;IAgCxC,6BAA6B,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;CAGpE"}

package/dist/playlist-catalog.js

@@ -40,6 +40,15 @@ function cloneSnapshot(playlist, mediaBaseUrl) {
         items: absolutizePlaylistItems(playlist.items, mediaBaseUrl)
     };
 }
+/** True when the playlist has no start/end date or time (always-on / default content). */
+function isUnscheduledPlaylist(schedule) {
+    if (!schedule)
+        return true;
+    return !(schedule.startDate ||
+        schedule.endDate ||
+        schedule.start ||
+        schedule.end);
+}
 export class PlaylistCatalog {
     store;
     constructor(store) {
@@ -106,25 +115,40 @@ export class PlaylistCatalog {
         }
         const existing = await this.store.getDeviceAssignments(deviceId);
         const existingById = new Map(existing.map((a) => [a.playlistId, a]));
+        // Resolve incoming playlists first so we know whether this publish includes
+        // an always-on (no start/end) playlist that should override prior always-on ones.
+        const incomingSnapshots = new Map();
+        for (const playlistId of incoming) {
+            const playlist = await this.store.getPlaylist(playlistId);
+            if (!playlist || playlist.retired) {
+                throw Object.assign(new Error(`Playlist not available: ${playlistId}`), {
+                    code: "PLAYLIST_NOT_FOUND"
+                });
+            }
+            incomingSnapshots.set(playlistId, cloneSnapshot(playlist, options.mediaBaseUrl));
+        }
+        const incomingHasUnscheduled = [...incomingSnapshots.values()].some((snap) => isUnscheduledPlaylist(snap.schedule));
         const allIds = [...new Set([...existing.map((a) => a.playlistId), ...incoming])];
+        const publishedAt = new Date().toISOString();
         const assignments = [];
         for (const playlistId of allIds) {
             if (!incoming.includes(playlistId)) {
                 const kept = existingById.get(playlistId);
-                if (kept)
-                    assignments.push(kept);
+                if (!kept)
+                    continue;
+                // Later publish of an unscheduled playlist replaces earlier unscheduled ones.
+                // Scheduled (dated) assignments are preserved.
+                if (incomingHasUnscheduled &&
+                    isUnscheduledPlaylist(kept.snapshot.schedule)) {
+                    continue;
+                }
+                assignments.push(kept);
                 continue;
             }
-            const playlist = await this.store.getPlaylist(playlistId);
-            if (!playlist || playlist.retired) {
-                throw Object.assign(new Error(`Playlist not available: ${playlistId}`), {
-                    code: "PLAYLIST_NOT_FOUND"
-                });
-            }
             assignments.push({
                 playlistId,
-                publishedAt: new Date().toISOString(),
-                snapshot: cloneSnapshot(playlist, options.mediaBaseUrl)
+                publishedAt,
+                snapshot: incomingSnapshots.get(playlistId)
             });
         }
         await this.store.setDeviceAssignments(deviceId, assignments);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tomorrowos/sdk",
-  "version": "0.9.2",
+  "version": "0.9.4",
   "description": "TomorrowOS CMS server SDK - WebSocket transport, pairing, device commands, optional static CMS UI. Includes CLI (tomorrowos init / build) and starter templates.",
   "type": "module",
   "main": "./dist/index.js",

package/templates/cms-starter/package.json

@@ -1,6 +1,6 @@
 {
   "name": "my-cms",
-  "version": "0.9.2",
+  "version": "0.9.4",
   "description": "CMS server on @tomorrowos/sdk. Add your UI (React, static files, etc.) alongside this server.",
   "private": true,
   "type": "module",
@@ -13,7 +13,7 @@
     "build-player": "tomorrowos build --platform tizen"
   },
   "dependencies": {
-    "@tomorrowos/sdk": "^0.9.2",
+    "@tomorrowos/sdk": "^0.9.4",
     "dotenv": "^17.2.3",
     "tsx": "^4.19.0"
   },

package/templates/cms-starter/public/methods.js

@@ -566,21 +566,32 @@ function parseScheduleDateTimeMs(dateStr, timeStr, defaultTime) {
   return Number.isNaN(ms) ? null : ms;
 }
 
+/** True when the playlist has no start/end date or time (always-on / default content). */
+function isUnscheduledPublishedPlaylist(playlist) {
+  const schedule = playlist?.schedule;
+  if (!schedule) return true;
+  return !(
+    schedule.startDate ||
+    schedule.endDate ||
+    schedule.start ||
+    schedule.end
+  );
+}
+
 function getPublishedPlaylistStartMs(playlist) {
   const schedule = playlist?.schedule;
-  if (!schedule) return null;
+  if (isUnscheduledPublishedPlaylist(playlist) || !schedule) return null;
   return parseScheduleDateTimeMs(schedule.startDate, schedule.start, "00:00");
 }
 
 function getPublishedPlaylistEndMs(playlist) {
   const schedule = playlist?.schedule;
-  if (!schedule) return null;
+  if (isUnscheduledPublishedPlaylist(playlist) || !schedule) return null;
   return parseScheduleDateTimeMs(schedule.endDate, schedule.end, "23:59");
 }
 
 function isPublishedPlaylistActiveNow(playlist, now = new Date()) {
-  const schedule = playlist?.schedule;
-  if (!schedule) return true;
+  if (isUnscheduledPublishedPlaylist(playlist)) return true;
   const nowMs = now.getTime();
   const startMs = getPublishedPlaylistStartMs(playlist);
   const endMs = getPublishedPlaylistEndMs(playlist);
@@ -589,24 +600,39 @@ function isPublishedPlaylistActiveNow(playlist, now = new Date()) {
   return true;
 }
 
+/**
+ * Green-light target for the device card.
+ * - Prefer an in-window scheduled playlist (latest start wins).
+ * - Else among always-on (no schedule) playlists, prefer the latest publishedAt
+ *   so a later publish overrides earlier ones in the activity indicator.
+ */
 function pickScheduledPlaylistForIndicator(playlists, now = new Date()) {
-  const active = (Array.isArray(playlists) ? playlists : []).filter((playlist) =>
-    isPublishedPlaylistActiveNow(playlist, now)
-  );
+  const list = Array.isArray(playlists) ? playlists : [];
+  const active = list
+    .map((playlist, index) => ({ playlist, index }))
+    .filter(({ playlist }) => isPublishedPlaylistActiveNow(playlist, now));
   if (!active.length) return null;
 
-  active.sort((a, b) => {
-    const aStart = getPublishedPlaylistStartMs(a);
-    const bStart = getPublishedPlaylistStartMs(b);
-    const aScore = aStart === null ? -Infinity : aStart;
-    const bScore = bStart === null ? -Infinity : bStart;
-    if (aScore !== bScore) return bScore - aScore;
-    const aPublished = new Date(a?.publishedAt || 0).getTime() || 0;
-    const bPublished = new Date(b?.publishedAt || 0).getTime() || 0;
-    return bPublished - aPublished;
+  const scheduled = active.filter(
+    ({ playlist }) => !isUnscheduledPublishedPlaylist(playlist)
+  );
+  // Match player: scheduled takeovers beat always-on; always-on uses latest publish.
+  const pool = scheduled.length ? scheduled : active;
+
+  pool.sort((a, b) => {
+    if (scheduled.length) {
+      const aStart = getPublishedPlaylistStartMs(a.playlist) ?? 0;
+      const bStart = getPublishedPlaylistStartMs(b.playlist) ?? 0;
+      if (aStart !== bStart) return bStart - aStart;
+    }
+    const aPublished = new Date(a.playlist?.publishedAt || 0).getTime() || 0;
+    const bPublished = new Date(b.playlist?.publishedAt || 0).getTime() || 0;
+    if (aPublished !== bPublished) return bPublished - aPublished;
+    // Same publish time → later entry in the assignments list (last published) wins.
+    return b.index - a.index;
   });
 
-  return active[0] || null;
+  return pool[0]?.playlist || null;
 }
 
 function getSelectedPlaylist() {
@@ -1151,7 +1177,7 @@ function renderDeviceCards() {
         if (isPlaying) {
           const playingLight = document.createElement("span");
           playingLight.className = "playlist-playing-light";
-          playingLight.title = "Active now by schedule";
+          playingLight.title = "Active now";
           label.appendChild(playingLight);
         }
         const rm = document.createElement("button");
@@ -1292,7 +1318,9 @@ function openPublishModal(deviceId) {
     return;
   }
 
-  hint.textContent = `Device ${deviceId} — add playlists not yet on this device (snapshot at publish time).`;
+  hint.textContent =
+    `Device ${deviceId} — add playlists not yet on this device (snapshot at publish time). ` +
+    `Publishing a playlist with no start/end date/time replaces any previously published unscheduled playlist on this device.`;
   checklist.innerHTML = "";
 
   for (const pl of unpublished) {