@tomorrowos/sdk 0.4.5 → 0.4.6

package/dist/media-probe.d.ts

@@ -1,6 +1,7 @@
 /**
- * Best-effort video duration from file bytes (no ffprobe).
- * Supports common MP4/MOV (mvhd) and WebM (Duration element).
+ * Video duration from file bytes (no ffprobe).
+ * MP4/MOV: ISO BMFF box walk (moov/mvhd only — never scans inside mdat).
+ * WebM: Duration element in the file header region only.
  */
 export declare function probeVideoDurationMs(body: Buffer, filename: string): number | null;
 //# sourceMappingURL=media-probe.d.ts.map

package/dist/media-probe.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"media-probe.d.ts","sourceRoot":"","sources":["../src/media-probe.ts"],"names":[],"mappings":"AAAA;;;GAGG;AA+DH,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,MAAM,GACf,MAAM,GAAG,IAAI,CAOf"}
+{"version":3,"file":"media-probe.d.ts","sourceRoot":"","sources":["../src/media-probe.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AA2IH,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,MAAM,GACf,MAAM,GAAG,IAAI,CAOf"}

package/dist/media-probe.js

@@ -1,54 +1,133 @@
 /**
- * Best-effort video duration from file bytes (no ffprobe).
- * Supports common MP4/MOV (mvhd) and WebM (Duration element).
+ * Video duration from file bytes (no ffprobe).
+ * MP4/MOV: ISO BMFF box walk (moov/mvhd only — never scans inside mdat).
+ * WebM: Duration element in the file header region only.
  */
 function isVideoFilename(name) {
     const lower = String(name || "").toLowerCase();
     return /\.(mp4|m4v|mov|webm|mkv|avi)$/.test(lower);
 }
-function probeMp4MvhdDurationMs(buf) {
-    let searchFrom = 0;
-    while (searchFrom < buf.length - 32) {
-        const idx = buf.indexOf("mvhd", searchFrom, "utf8");
-        if (idx < 8)
+function clampDurationMs(ms) {
+    if (!Number.isFinite(ms) || ms <= 0)
+        return 0;
+    return Math.min(3600 * 1000, Math.max(1000, Math.round(ms)));
+}
+function readBoxBounds(buf, offset) {
+    if (offset + 8 > buf.length)
+        return null;
+    let size = buf.readUInt32BE(offset);
+    const type = buf.toString("ascii", offset + 4, offset + 8);
+    let headerSize = 8;
+    if (size === 1) {
+        if (offset + 16 > buf.length)
+            return null;
+        const sizeBig = buf.readBigUInt64BE(offset + 8);
+        if (sizeBig < BigInt(headerSize))
+            return null;
+        if (sizeBig > BigInt(Number.MAX_SAFE_INTEGER)) {
+            // Box larger than JS can index; still validate against buffer length.
+            const endBig = BigInt(offset) + sizeBig;
+            if (endBig > BigInt(buf.length))
+                return null;
+            size = buf.length - offset;
+        }
+        else {
+            size = Number(sizeBig);
+        }
+        headerSize = 16;
+    }
+    else if (size === 0) {
+        size = buf.length - offset;
+    }
+    if (size < headerSize)
+        return null;
+    const end = offset + size;
+    if (end > buf.length)
+        return null;
+    return { type, contentStart: offset + headerSize, end };
+}
+function parseMvhdDurationMs(buf, contentStart, boxEnd) {
+    if (contentStart + 4 > boxEnd)
+        return null;
+    const version = buf[contentStart];
+    if (version === 0) {
+        if (contentStart + 28 > boxEnd)
+            return null;
+        const timescale = buf.readUInt32BE(contentStart + 20);
+        const duration = buf.readUInt32BE(contentStart + 24);
+        if (timescale <= 0 || duration <= 0)
+            return null;
+        return (duration / timescale) * 1000;
+    }
+    if (version === 1) {
+        if (contentStart + 40 > boxEnd)
+            return null;
+        const timescale = buf.readUInt32BE(contentStart + 28);
+        const durationHi = buf.readUInt32BE(contentStart + 32);
+        const durationLo = buf.readUInt32BE(contentStart + 36);
+        const duration = durationHi * 2 ** 32 + durationLo;
+        if (timescale <= 0 || duration <= 0)
+            return null;
+        return (duration / timescale) * 1000;
+    }
+    return null;
+}
+function findMvhdDurationInContainer(buf, start, end) {
+    let offset = start;
+    while (offset + 8 <= end) {
+        const box = readBoxBounds(buf, offset);
+        if (!box || box.end > end)
             break;
-        const boxStart = idx - 4;
-        if (boxStart < 0) {
-            searchFrom = idx + 4;
-            continue;
+        if (box.type === "mvhd") {
+            const ms = parseMvhdDurationMs(buf, box.contentStart, box.end);
+            if (ms != null)
+                return ms;
         }
-        const version = buf[boxStart + 8];
-        if (version === 0 && boxStart + 28 <= buf.length) {
-            const timescale = buf.readUInt32BE(boxStart + 20);
-            const duration = buf.readUInt32BE(boxStart + 24);
-            if (timescale > 0 && duration > 0) {
-                return clampDurationMs((duration / timescale) * 1000);
-            }
+        // moov/trak/mdia/minf/stbl can nest further boxes; only recurse into containers.
+        if (box.type === "moov" ||
+            box.type === "trak" ||
+            box.type === "mdia" ||
+            box.type === "minf" ||
+            box.type === "stbl") {
+            const nested = findMvhdDurationInContainer(buf, box.contentStart, box.end);
+            if (nested != null)
+                return nested;
         }
-        if (version === 1 && boxStart + 40 <= buf.length) {
-            const timescale = buf.readUInt32BE(boxStart + 28);
-            const duration = buf.readUInt32BE(boxStart + 32) * 2 ** 32 + buf.readUInt32BE(boxStart + 36);
-            if (timescale > 0 && duration > 0) {
-                return clampDurationMs((duration / timescale) * 1000);
-            }
+        offset = box.end;
+    }
+    return null;
+}
+/** Walk top-level ISO boxes; skip mdat without scanning its payload. */
+function probeMp4DurationMs(buf) {
+    let offset = 0;
+    while (offset + 8 <= buf.length) {
+        const box = readBoxBounds(buf, offset);
+        if (!box)
+            break;
+        if (box.type === "moov") {
+            const ms = findMvhdDurationInContainer(buf, box.contentStart, box.end);
+            if (ms != null)
+                return clampDurationMs(ms);
         }
-        searchFrom = idx + 4;
+        offset = box.end;
     }
     return null;
 }
+const WEBM_HEADER_PROBE_BYTES = 512 * 1024;
 function probeWebmDurationMs(buf) {
+    const header = buf.subarray(0, Math.min(buf.length, WEBM_HEADER_PROBE_BYTES));
     const marker = Buffer.from([0x44, 0x89]);
     let searchFrom = 0;
-    while (searchFrom < buf.length - 12) {
-        const idx = buf.indexOf(marker, searchFrom);
+    while (searchFrom < header.length - 12) {
+        const idx = header.indexOf(marker, searchFrom);
         if (idx < 0)
             break;
         const sizePos = idx + 2;
-        if (sizePos + 9 > buf.length)
+        if (sizePos + 9 > header.length)
             break;
-        const size = buf[sizePos];
-        if (size === 0x84 && sizePos + 9 <= buf.length) {
-            const duration = buf.readFloatBE(sizePos + 1);
+        const size = header[sizePos];
+        if (size === 0x84 && sizePos + 9 <= header.length) {
+            const duration = header.readFloatBE(sizePos + 1);
             if (Number.isFinite(duration) && duration > 0) {
                 return clampDurationMs(duration);
             }
@@ -57,17 +136,12 @@ function probeWebmDurationMs(buf) {
     }
     return null;
 }
-function clampDurationMs(ms) {
-    if (!Number.isFinite(ms) || ms <= 0)
-        return 0;
-    return Math.min(3600 * 1000, Math.max(1000, Math.round(ms)));
-}
 export function probeVideoDurationMs(body, filename) {
     if (!body?.length || !isVideoFilename(filename))
         return null;
     const lower = filename.toLowerCase();
     if (lower.endsWith(".webm")) {
-        return probeWebmDurationMs(body) ?? probeMp4MvhdDurationMs(body);
+        return probeWebmDurationMs(body) ?? probeMp4DurationMs(body);
     }
-    return probeMp4MvhdDurationMs(body) ?? probeWebmDurationMs(body);
+    return probeMp4DurationMs(body) ?? probeWebmDurationMs(body);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tomorrowos/sdk",
-  "version": "0.4.5",
+  "version": "0.4.6",
   "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.4.5",
+  "version": "0.4.6",
   "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.4.5"
+    "@tomorrowos/sdk": "^0.4.6"
   },
   "devDependencies": {
     "@types/node": "^20.0.0",
@@ -18,4 +18,4 @@
     "typescript": "^5.5.0"
   }
 }
-
+

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

@@ -273,14 +273,17 @@ function probeVideoDurationInBrowser(fileOrUrl) {
 async function resolveVideoDurationMs(file, type, uploadData) {
   if (type !== "video") return defaultDurationMs(type);
 
-  const fromServer = Number(uploadData?.durationMs);
-  if (Number.isFinite(fromServer) && fromServer > 0) {
-    return clampVideoDurationMs(fromServer) ?? defaultDurationMs(type);
-  }
-
+  // Local File metadata is the most reliable source during upload.
   const fromFile = await probeVideoDurationInBrowser(file);
   if (fromFile) return fromFile;
 
+  const fromServerRaw = Number(uploadData?.durationMs);
+  const fromServer =
+    Number.isFinite(fromServerRaw) && fromServerRaw > 0
+      ? clampVideoDurationMs(fromServerRaw)
+      : null;
+  if (fromServer) return fromServer;
+
   if (uploadData?.url) {
     try {
       const fromUrl = await probeVideoDurationInBrowser(absoluteMediaUrl(uploadData.url));