@tomorrowos/sdk 0.6.7 → 0.6.9

package/dist/tomorrowos.d.ts

@@ -52,9 +52,13 @@ export interface DeviceListItem {
         name: string;
         version: number;
         publishedAt: string;
+        schedule?: {
+            startDate?: string;
+            endDate?: string;
+            start?: string;
+            end?: string;
+        };
     }>;
-    currentPlaylistId: string | null;
-    currentPlaylistName: string | null;
     latestErrorAt: string | null;
     latestErrorMessage: string | null;
 }
@@ -80,7 +84,6 @@ export declare class TomorrowOS extends EventEmitter {
     private readonly devices;
     private readonly pendingDeviceMeta;
     private readonly deviceLogs;
-    private readonly livePlaybackByDevice;
     private httpServer;
     private wss;
     private staticRoot;
@@ -112,7 +115,6 @@ export declare class TomorrowOS extends EventEmitter {
     };
     /** List paired devices with live connection + timing fields for the CMS panel. */
     listDevices(): Promise<DeviceListItem[]>;
-    private refreshLivePlaybackState;
     setDeviceName(deviceId: string, deviceName: string): Promise<{
         deviceId: string;
         deviceName: string;

package/dist/tomorrowos.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tomorrowos.d.ts","sourceRoot":"","sources":["../src/tomorrowos.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"tomorrowos.d.ts","sourceRoot":"","sources":["../src/tomorrowos.ts"],"names":[],"mappings":"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"}

package/dist/tomorrowos.js

@@ -186,7 +186,6 @@ export class TomorrowOS extends EventEmitter {
     devices = new Map();
     pendingDeviceMeta = new Map();
     deviceLogs = new Map();
-    livePlaybackByDevice = new Map();
     httpServer = null;
     wss = null;
     staticRoot = null;
@@ -313,13 +312,6 @@ export class TomorrowOS extends EventEmitter {
             const connected = this.isDeviceConnected(deviceId);
             const reg = await this.store.getDeviceRegistry(deviceId);
             const assignments = await this.store.getDeviceAssignments(deviceId);
-            if (connected) {
-                await this.refreshLivePlaybackState(deviceId);
-            }
-            else {
-                this.livePlaybackByDevice.delete(deviceId);
-            }
-            const playback = this.livePlaybackByDevice.get(deviceId);
             let screenOnlineActive = false;
             let screenOnlineLabel = "Not active";
             if (connected && record.lastBootAt) {
@@ -339,10 +331,9 @@ export class TomorrowOS extends EventEmitter {
                     playlistId: a.playlistId,
                     name: a.snapshot.name,
                     version: a.publishedVersion,
-                    publishedAt: a.publishedAt
+                    publishedAt: a.publishedAt,
+                    schedule: a.snapshot.schedule
                 })),
-                currentPlaylistId: playback?.playlistId ?? null,
-                currentPlaylistName: playback?.playlistName ?? null,
                 connected,
                 deviceName: record.deviceName ?? null,
                 platform: record.platform ?? null,
@@ -362,35 +353,6 @@ export class TomorrowOS extends EventEmitter {
             };
         }));
     }
-    async refreshLivePlaybackState(deviceId) {
-        const ws = this.devices.get(deviceId);
-        if (!ws || ws.readyState !== WebSocket.OPEN)
-            return;
-        try {
-            const result = await this.sendCommandToSocket(ws, deviceId, "device.info.get", {}, 5_000);
-            if (result.status !== "success" || !result.data || typeof result.data !== "object") {
-                return;
-            }
-            const info = result.data;
-            const playback = info.currentPlayback && typeof info.currentPlayback === "object"
-                ? info.currentPlayback
-                : info;
-            const playlistId = typeof playback.activePlaylistId === "string" && playback.activePlaylistId.trim()
-                ? playback.activePlaylistId.trim()
-                : null;
-            const playlistName = typeof playback.activePlaylistName === "string" && playback.activePlaylistName.trim()
-                ? playback.activePlaylistName.trim()
-                : null;
-            this.livePlaybackByDevice.set(deviceId, {
-                playlistId,
-                playlistName,
-                updatedAt: new Date().toISOString()
-            });
-        }
-        catch {
-            // Best-effort only; keep previous value on intermittent timeouts.
-        }
-    }
     async setDeviceName(deviceId, deviceName) {
         const id = String(deviceId || "").trim();
         if (!id) {
@@ -1428,6 +1390,7 @@ export class TomorrowOS extends EventEmitter {
                 if (level === "error") {
                     console.error(`[TomorrowOS][device-log][${deviceId}] ${message}`);
                 }
+                return;
             }
         });
         ws.on("close", () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tomorrowos/sdk",
-  "version": "0.6.7",
+  "version": "0.6.9",
   "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.6.7",
+  "version": "0.6.9",
   "description": "CMS server on @tomorrowos/sdk. Add your UI (React, static files, etc.) alongside this server.",
   "private": true,
   "type": "module",
@@ -10,7 +10,7 @@
     "build-player": "tomorrowos build --platform tizen"
   },
   "dependencies": {
-    "@tomorrowos/sdk": "^0.6.7",
+    "@tomorrowos/sdk": "^0.6.9",
     "dotenv": "^17.2.3"
   },
   "devDependencies": {

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

@@ -503,6 +503,58 @@ function loadScheduleIntoForm(schedule) {
   document.getElementById("scheduleEndTime").value = s.end || "";
 }
 
+function parseScheduleDateTimeMs(dateStr, timeStr, defaultTime) {
+  const date = String(dateStr || "").trim();
+  if (!date) return null;
+  const time = String(timeStr || "").trim() || defaultTime;
+  const value = new Date(`${date}T${time}:00`);
+  const ms = value.getTime();
+  return Number.isNaN(ms) ? null : ms;
+}
+
+function getPublishedPlaylistStartMs(playlist) {
+  const schedule = playlist?.schedule;
+  if (!schedule) return null;
+  return parseScheduleDateTimeMs(schedule.startDate, schedule.start, "00:00");
+}
+
+function getPublishedPlaylistEndMs(playlist) {
+  const schedule = playlist?.schedule;
+  if (!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;
+  const nowMs = now.getTime();
+  const startMs = getPublishedPlaylistStartMs(playlist);
+  const endMs = getPublishedPlaylistEndMs(playlist);
+  if (startMs !== null && nowMs < startMs) return false;
+  if (endMs !== null && nowMs >= endMs) return false;
+  return true;
+}
+
+function pickScheduledPlaylistForIndicator(playlists, now = new Date()) {
+  const active = (Array.isArray(playlists) ? playlists : []).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;
+  });
+
+  return active[0] || null;
+}
+
 function getSelectedPlaylist() {
   return playlistsCatalog.find((p) => p.id === selectedPlaylistId) || null;
 }
@@ -902,8 +954,8 @@ function renderDeviceCards() {
     const published = document.createElement("ul");
     published.className = "device-published-list";
     const pubs = Array.isArray(device.publishedPlaylists) ? device.publishedPlaylists : [];
-    const activePlaylistId = typeof device.currentPlaylistId === "string" ? device.currentPlaylistId : "";
-    const activePlaylistName = typeof device.currentPlaylistName === "string" ? device.currentPlaylistName : "";
+    const indicatorPlaylist = pickScheduledPlaylistForIndicator(pubs);
+    const indicatorPlaylistId = indicatorPlaylist?.playlistId || "";
     if (pubs.length === 0) {
       const li = document.createElement("li");
       li.textContent = "No playlists published";
@@ -914,13 +966,11 @@ function renderDeviceCards() {
         const label = document.createElement("span");
         label.className = "device-published-label";
         label.textContent = p.name;
-        const isPlaying =
-          (activePlaylistId && p.playlistId === activePlaylistId) ||
-          (!activePlaylistId && activePlaylistName && p.name === activePlaylistName);
+        const isPlaying = !!indicatorPlaylistId && p.playlistId === indicatorPlaylistId;
         if (isPlaying) {
           const playingLight = document.createElement("span");
           playingLight.className = "playlist-playing-light";
-          playingLight.title = "Currently playing";
+          playingLight.title = "Active now by schedule";
           label.appendChild(playingLight);
         }
         const rm = document.createElement("button");