@tricoteuses/senat 2.19.2 → 2.19.3

package/lib/scripts/retrieve_videos.d.ts

@@ -1 +1 @@
-export {};
+export declare function buildSenatVodMasterM3u8FromNvs(nvsText: string): string | null;

package/lib/scripts/retrieve_videos.js

@@ -158,38 +158,13 @@ function parseDataNvs(nvs) {
     const firstChapterLabel = firstChapterLabelMatch ? decodeHtmlEntities(firstChapterLabelMatch[1]).trim() : undefined;
     return { epoch, organes, firstChapterLabel };
 }
-function buildSenatVodMasterM3u8FromNvs(nvsText, finalText) {
-    // 1) Base Akamai from data.nvs (mp4 "serverfiles://senat/YYYY/MM/encoderX_YYYYMMDDHHMMSS_1.mp4")
-    const baseMatch = nvsText.match(/serverfiles:\/\/senat\/(\d{4})\/(\d{2})\/(encoder\d)_(\d{14})/i);
-    if (!baseMatch)
+export function buildSenatVodMasterM3u8FromNvs(nvsText) {
+    // serverfiles://senat/2025/10/encoder10_20251022084451_2.mp4
+    const m = nvsText.match(/serverfiles:\/\/senat\/(\d{4})\/(\d{2})\/(encoder\d+)_([0-9]{14})/i);
+    if (!m)
         return null;
-    const [, yyyy, mm, encoder, stamp] = baseMatch;
+    const [, yyyy, mm, encoder, stamp] = m;
     const base = `https://vodsenat.akamaized.net/senat/${yyyy}/${mm}/${encoder}_${stamp}`;
-    // 2) start/end from finalplayer.nvs
-    let start = null, end = null;
-    const playerAttr = finalText.match(/player[^>]*\bstarttime="(\d+)"[^>]*\bendtime="(\d+)"/i);
-    if (playerAttr) {
-        start = parseInt(playerAttr[1], 10);
-        end = parseInt(playerAttr[2], 10);
-    }
-    else {
-        // fallback: take smallest timecode of <synchro timecode="...">
-        const tc = Array.from(finalText.matchAll(/timecode="(\d+)"/g)).map((m) => parseInt(m[1], 10));
-        if (tc.length)
-            start = Math.min(...tc);
-    }
-    if (end == null) {
-        const durMeta = nvsText.match(/<metadata[^>]*\bname="duree"[^>]*\bvalue="(\d+)"[^>]*>/i);
-        if (durMeta && start != null) {
-            const durMs = parseInt(durMeta[1], 10) * 1000; // sec → ms
-            end = start + durMs;
-        }
-    }
-    // 4) Construct URL
-    if (start != null && end != null && end > start) {
-        const pd = end - start;
-        return `${base}_ps${start}_pd${pd}.smil/master.m3u8`;
-    }
     return `${base}.smil/master.m3u8`;
 }
 function score(agenda, agendaTs, sameOrg, videoTitle, videoEpoch, videoOrganes) {
@@ -429,17 +404,23 @@ async function processGroupedReunion(agenda, session, dataDir) {
             await fsp.writeFile(path.join(baseDir, "data.nvs"), dataTxt, "utf-8");
         if (finalTxt)
             await fsp.writeFile(path.join(baseDir, "finalplayer.nvs"), finalTxt, "utf-8");
-        if (dataTxt && finalTxt)
-            master = buildSenatVodMasterM3u8FromNvs(dataTxt, finalTxt);
+        if (dataTxt) {
+            master = buildSenatVodMasterM3u8FromNvs(dataTxt);
+        }
+        else {
+            console.log("Cannot download data nvs");
+        }
     }
     else {
         // Skipped download, but need to read data.nvs for urlVideo
         try {
             const dataTxt = await fsp.readFile(path.join(baseDir, "data.nvs"), "utf-8");
             const finalTxt = await fsp.readFile(path.join(baseDir, "finalplayer.nvs"), "utf-8");
-            master = buildSenatVodMasterM3u8FromNvs(dataTxt, finalTxt);
+            master = buildSenatVodMasterM3u8FromNvs(dataTxt);
+        }
+        catch (e) {
+            console.warn(e);
         }
-        catch { }
     }
     // ==== 4) Update agenda file (only if accepted + m3u8) ====
     if ((accepted || skipDownload) && master) {
@@ -469,6 +450,9 @@ async function processGroupedReunion(agenda, session, dataDir) {
             console.warn(`[warn] agenda file not found for update: ${agendaJsonPath}`);
         }
     }
+    else {
+        console.warn(`[warn] The video url could not be built`);
+    }
 }
 async function processAll(dataDir, sessions) {
     console.log("Process all Agendas and fetch video's url");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tricoteuses/senat",
-  "version": "2.19.2",
+  "version": "2.19.3",
   "description": "Handle French Sénat's open data",
   "keywords": [
     "France",