@yellowpanther/shared 1.2.5 → 1.2.7

package/src/queue/videoPublishQueue.js

@@ -2,18 +2,18 @@
 // One-off *publish* scheduler for video items (BullMQ).
 // Strong upsert: purge any prior job for the same video before adding a new delayed job.
 
-const { Queue } = require('bullmq');
-const redisClient = require('../redis/redisClient');
+const { Queue } = require("bullmq");
+const redisClient = require("../redis/redisClient");
 // const logger = require('../logger'); // uncomment if you have a shared logger
 
-const DEBUG   = String(process.env.DEBUG_LOGGER || '').trim() === '1';
+const DEBUG = String(process.env.DEBUG_LOGGER || "").trim() === "1";
 const DRIFT_MS = Math.max(0, Number(process.env.SCHEDULE_DRIFT_MS || 250));
 
-const videoPublishQueue = new Queue('videoPublishQueue', {
+const videoPublishQueue = new Queue("videoPublishQueue", {
   connection: redisClient,
   defaultJobOptions: {
     attempts: 5,
-    backoff: { type: 'exponential', delay: 2000 },
+    backoff: { type: "exponential", delay: 2000 },
     removeOnComplete: 500,
     removeOnFail: 500,
   },
@@ -21,11 +21,19 @@ const videoPublishQueue = new Queue('videoPublishQueue', {
 
 // ── ID helpers ─────────────────────────────────────────────────────────────────
 
+/** Replace invalid chars for BullMQ IDs */
+function sanitizeId(str) {
+  return str.replace(/[:.]/g, "-");
+}
+
+/** Stable id (latest schedule) */
 function stableJobId(video_id) {
-  return `video:publish:${video_id}`;
+  return sanitizeId(`video:publish:${video_id}`);
 }
+
+/** Versioned id (keeps history distinct) */
 function versionedJobId(video_id, runAtIso) {
-  return `video:publish:${video_id}:${runAtIso}`;
+  return sanitizeId(`video:publish:${video_id}:${runAtIso}`);
 }
 
 // ── Time helpers ───────────────────────────────────────────────────────────────
@@ -33,19 +41,21 @@ function versionedJobId(video_id, runAtIso) {
 /** Parse anything into a UTC Date. Strings without timezone are treated as UTC. */
 function normalizeToUtcDate(input) {
   if (input instanceof Date) return new Date(input.getTime());
-  if (typeof input === 'number') return new Date(input); // epoch ms
+  if (typeof input === "number") return new Date(input); // epoch ms
 
-  if (typeof input === 'string') {
+  if (typeof input === "string") {
     // Has timezone (Z or ±hh:mm)
     if (/[zZ]|[+\-]\d{2}:\d{2}$/.test(input)) {
       const d = new Date(input);
-      if (Number.isNaN(d.getTime())) throw new Error(`Invalid ISO datetime: ${input}`);
+      if (Number.isNaN(d.getTime()))
+        throw new Error(`Invalid ISO datetime: ${input}`);
       return d;
     }
     // No timezone => treat as UTC
-    const s = input.trim().replace(' ', 'T');
+    const s = input.trim().replace(" ", "T");
     const d = new Date(`${s}Z`);
-    if (Number.isNaN(d.getTime())) throw new Error(`Invalid datetime (no tz): ${input}`);
+    if (Number.isNaN(d.getTime()))
+      throw new Error(`Invalid datetime (no tz): ${input}`);
     return d;
   }
 
@@ -55,10 +65,10 @@ function normalizeToUtcDate(input) {
 // ── Purge helpers ─────────────────────────────────────────────────────────────
 
 async function findPendingVideoJobs(video_id) {
-  const states = ['delayed', 'waiting', 'waiting-children', 'active'];
+  const states = ["delayed", "waiting", "waiting-children", "active"];
   const jobs = await videoPublishQueue.getJobs(states);
   return jobs.filter(
-    (j) => j?.name === 'video:publish' && j?.data?.video_id === String(video_id)
+    (j) => j?.name === "video:publish" && j?.data?.video_id === String(video_id)
   );
 }
 
@@ -72,7 +82,10 @@ async function purgeExistingForVideo(video_id) {
       await j.remove();
       removed++;
     } catch (e) {
-      if (DEBUG) console.warn(`[videoPublishQueue] failed to remove pending job ${j.id}: ${e.message}`);
+      if (DEBUG)
+        console.warn(
+          `[videoPublishQueue] failed to remove pending job ${j.id}: ${e.message}`
+        );
     }
   }
 
@@ -83,12 +96,15 @@ async function purgeExistingForVideo(video_id) {
       await last.remove();
       removed++;
     } catch (e) {
-      if (DEBUG) console.warn(`[videoPublishQueue] failed to remove stable job ${last.id}: ${e.message}`);
+      if (DEBUG)
+        console.warn(
+          `[videoPublishQueue] failed to remove stable job ${last.id}: ${e.message}`
+        );
     }
   }
 
   if (DEBUG) {
-    console.info('[videoPublishQueue] purgeExistingForVideo', {
+    console.info("[videoPublishQueue] purgeExistingForVideo", {
       video_id: String(video_id),
       removed,
     });
@@ -109,9 +125,14 @@ async function purgeExistingForVideo(video_id) {
  * @param {object} [params.extra]
  * @param {boolean} [params.useStableId=false] - if true, uses stable jobId
  */
-async function addVideoPublishJob({ video_id, runAtUtc, extra = {}, useStableId = false }) {
+async function addVideoPublishJob({
+  video_id,
+  runAtUtc,
+  extra = {},
+  useStableId = false,
+}) {
   if (!video_id || !runAtUtc) {
-    throw new Error('addVideoPublishJob: video_id and runAtUtc are required');
+    throw new Error("addVideoPublishJob: video_id and runAtUtc are required");
   }
 
   const runAt = normalizeToUtcDate(runAtUtc);
@@ -126,16 +147,18 @@ async function addVideoPublishJob({ video_id, runAtUtc, extra = {}, useStableId
   await purgeExistingForVideo(video_id);
 
   // Choose jobId strategy
-  const jobId = useStableId ? stableJobId(video_id) : versionedJobId(video_id, runAtIso);
+  const jobId = useStableId
+    ? stableJobId(video_id)
+    : versionedJobId(video_id, runAtIso);
 
   const job = await videoPublishQueue.add(
-    'video:publish',
+    "video:publish",
     { video_id: String(video_id), runAtUtc: runAtIso, extra },
     { jobId, delay: delayMs }
   );
 
   if (DEBUG) {
-    console.info('[videoPublishQueue] upsert', {
+    console.info("[videoPublishQueue] upsert", {
       video_id: String(video_id),
       jobId,
       runAtIso,
@@ -161,4 +184,4 @@ module.exports = {
   stableJobId,
   versionedJobId,
   normalizeToUtcDate,
-};
+};