@yellowpanther/shared 1.1.7 → 1.2.0

package/src/queue/pagePublishQueue.js

@@ -0,0 +1,164 @@
+// src/queue/pagePublishQueue.js
+// One-off *publish* scheduler for page items (BullMQ).
+// Strong upsert: purge any prior job for the same page before adding a new delayed job.
+
+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 DRIFT_MS = Math.max(0, Number(process.env.SCHEDULE_DRIFT_MS || 250));
+
+const pagePublishQueue = new Queue('pagePublishQueue', {
+  connection: redisClient,
+  defaultJobOptions: {
+    attempts: 5,
+    backoff: { type: 'exponential', delay: 2000 },
+    removeOnComplete: 500,
+    removeOnFail: 500,
+  },
+});
+
+// ── ID helpers ─────────────────────────────────────────────────────────────────
+
+function stableJobId(page_id) {
+  return `page:publish:${page_id}`;
+}
+function versionedJobId(page_id, runAtIso) {
+  return `page:publish:${page_id}:${runAtIso}`;
+}
+
+// ── Time helpers ───────────────────────────────────────────────────────────────
+
+/** 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 === '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}`);
+      return d;
+    }
+    // No timezone => treat as UTC
+    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}`);
+    return d;
+  }
+
+  throw new Error(`Unsupported runAtUtc type: ${typeof input}`);
+}
+
+// ── Purge helpers ─────────────────────────────────────────────────────────────
+
+async function findPendingPageJobs(page_id) {
+  const states = ['delayed', 'waiting', 'waiting-children', 'active'];
+  const jobs = await pagePublishQueue.getJobs(states);
+  return jobs.filter(
+    (j) => j?.name === 'page:publish' && j?.data?.page_id === String(page_id)
+  );
+}
+
+async function purgeExistingForPage(page_id) {
+  let removed = 0;
+
+  // Remove any pending/waiting/active jobs for this page
+  const pendings = await findPendingPageJobs(page_id);
+  for (const j of pendings) {
+    try {
+      await j.remove();
+      removed++;
+    } catch (e) {
+      if (DEBUG) console.warn(`[pagePublishQueue] failed to remove pending job ${j.id}: ${e.message}`);
+    }
+  }
+
+  // Also remove a leftover stable job if present
+  const last = await pagePublishQueue.getJob(stableJobId(page_id));
+  if (last) {
+    try {
+      await last.remove();
+      removed++;
+    } catch (e) {
+      if (DEBUG) console.warn(`[pagePublishQueue] failed to remove stable job ${last.id}: ${e.message}`);
+    }
+  }
+
+  if (DEBUG) {
+    console.info('[pagePublishQueue] purgeExistingForPage', {
+      page_id: String(page_id),
+      removed,
+    });
+  }
+  return removed;
+}
+
+// ── Public API ────────────────────────────────────────────────────────────────
+
+/**
+ * Upsert a one-off publish job for a page.
+ * - Purges any previous jobs for this page
+ * - Uses a versioned jobId by default (or stable if useStableId=true)
+ *
+ * @param {Object} params
+ * @param {string|number} params.page_id
+ * @param {string|number|Date} params.runAtUtc - ISO string, epoch ms, or Date (UTC)
+ * @param {object} [params.extra]
+ * @param {boolean} [params.useStableId=false] - if true, uses stable jobId
+ */
+async function addPagePublishJob({ page_id, runAtUtc, extra = {}, useStableId = false }) {
+  if (!page_id || !runAtUtc) {
+    throw new Error('addPagePublishJob: page_id and runAtUtc are required');
+  }
+
+  const runAt = normalizeToUtcDate(runAtUtc);
+  const runAtIso = runAt.toISOString();
+
+  // Drift guard to avoid immediate fire due to ms skew
+  const now = Date.now();
+  let delayMs = runAt.getTime() - now;
+  if (delayMs < DRIFT_MS) delayMs = Math.max(0, DRIFT_MS);
+
+  // Purge any prior jobs for this page (across states)
+  await purgeExistingForPage(page_id);
+
+  // Choose jobId strategy
+  const jobId = useStableId ? stableJobId(page_id) : versionedJobId(page_id, runAtIso);
+
+  const job = await pagePublishQueue.add(
+    'page:publish',
+    { page_id: String(page_id), runAtUtc: runAtIso, extra },
+    { jobId, delay: delayMs }
+  );
+
+  if (DEBUG) {
+    console.info('[pagePublishQueue] upsert', {
+      page_id: String(page_id),
+      jobId,
+      runAtIso,
+      delayMs,
+      nowIso: new Date(now).toISOString(),
+    });
+  }
+
+  return job;
+}
+
+/** Cancel any scheduled publish for a given page (if present). */
+async function cancelPagePublishJob(page_id) {
+  const removed = await purgeExistingForPage(page_id);
+  return removed > 0;
+}
+
+module.exports = {
+  pagePublishQueue,
+  addPagePublishJob,
+  cancelPagePublishJob,
+  // helpers for tooling/tests
+  stableJobId,
+  versionedJobId,
+  normalizeToUtcDate,
+};

package/src/queue/predictionPublishQueue.js

@@ -0,0 +1,164 @@
+// src/queue/predictionPublishQueue.js
+// One-off *publish* scheduler for prediction items (BullMQ).
+// Strong upsert: purge any prior job for the same prediction before adding a new delayed job.
+
+const { Queue } = require('bullmq');
+const redisClient = require('../redis/redisClient');
+// const logger = require('../logger'); // optional
+
+const DEBUG    = String(process.env.DEBUG_LOGGER || '').trim() === '1';
+const DRIFT_MS = Math.max(0, Number(process.env.SCHEDULE_DRIFT_MS || 250));
+
+const predictionPublishQueue = new Queue('predictionPublishQueue', {
+  connection: redisClient,
+  defaultJobOptions: {
+    attempts: 5,
+    backoff: { type: 'exponential', delay: 2000 },
+    removeOnComplete: 500,
+    removeOnFail: 500,
+  },
+});
+
+// ── ID helpers ─────────────────────────────────────────────────────────────────
+
+function stableJobId(prediction_id) {
+  return `prediction:publish:${prediction_id}`;
+}
+function versionedJobId(prediction_id, runAtIso) {
+  return `prediction:publish:${prediction_id}:${runAtIso}`;
+}
+
+// ── Time helpers ───────────────────────────────────────────────────────────────
+
+/** 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 === '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}`);
+      return d;
+    }
+    // No timezone => treat as UTC
+    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}`);
+    return d;
+  }
+
+  throw new Error(`Unsupported runAtUtc type: ${typeof input}`);
+}
+
+// ── Purge helpers ─────────────────────────────────────────────────────────────
+
+async function findPendingPredictionJobs(prediction_id) {
+  const states = ['delayed', 'waiting', 'waiting-children', 'active'];
+  const jobs = await predictionPublishQueue.getJobs(states);
+  return jobs.filter(
+    (j) => j?.name === 'prediction:publish' && j?.data?.prediction_id === String(prediction_id)
+  );
+}
+
+async function purgeExistingForPrediction(prediction_id) {
+  let removed = 0;
+
+  // Remove any pending/waiting/active jobs for this prediction
+  const pendings = await findPendingPredictionJobs(prediction_id);
+  for (const j of pendings) {
+    try {
+      await j.remove();
+      removed++;
+    } catch (e) {
+      if (DEBUG) console.warn(`[predictionPublishQueue] failed to remove pending job ${j.id}: ${e.message}`);
+    }
+  }
+
+  // Also remove a leftover stable job if present
+  const last = await predictionPublishQueue.getJob(stableJobId(prediction_id));
+  if (last) {
+    try {
+      await last.remove();
+      removed++;
+    } catch (e) {
+      if (DEBUG) console.warn(`[predictionPublishQueue] failed to remove stable job ${last.id}: ${e.message}`);
+    }
+  }
+
+  if (DEBUG) {
+    console.info('[predictionPublishQueue] purgeExistingForPrediction', {
+      prediction_id: String(prediction_id),
+      removed,
+    });
+  }
+  return removed;
+}
+
+// ── Public API ────────────────────────────────────────────────────────────────
+
+/**
+ * Upsert a one-off publish job for a prediction.
+ * - Purges any previous jobs for this prediction
+ * - Uses a versioned jobId by default (or stable if useStableId=true)
+ *
+ * @param {Object} params
+ * @param {string|number} params.prediction_id
+ * @param {string|number|Date} params.runAtUtc - ISO string, epoch ms, or Date (UTC)
+ * @param {object} [params.extra]
+ * @param {boolean} [params.useStableId=false] - if true, uses stable jobId
+ */
+async function addPredictionPublishJob({ prediction_id, runAtUtc, extra = {}, useStableId = false }) {
+  if (!prediction_id || !runAtUtc) {
+    throw new Error('addPredictionPublishJob: prediction_id and runAtUtc are required');
+  }
+
+  const runAt = normalizeToUtcDate(runAtUtc);
+  const runAtIso = runAt.toISOString();
+
+  // Drift guard to avoid immediate fire due to ms skew
+  const now = Date.now();
+  let delayMs = runAt.getTime() - now;
+  if (delayMs < DRIFT_MS) delayMs = Math.max(0, DRIFT_MS);
+
+  // Purge any prior jobs for this prediction (across states)
+  await purgeExistingForPrediction(prediction_id);
+
+  // Choose jobId strategy
+  const jobId = useStableId ? stableJobId(prediction_id) : versionedJobId(prediction_id, runAtIso);
+
+  const job = await predictionPublishQueue.add(
+    'prediction:publish',
+    { prediction_id: String(prediction_id), runAtUtc: runAtIso, extra },
+    { jobId, delay: delayMs }
+  );
+
+  if (DEBUG) {
+    console.info('[predictionPublishQueue] upsert', {
+      prediction_id: String(prediction_id),
+      jobId,
+      runAtIso,
+      delayMs,
+      nowIso: new Date(now).toISOString(),
+    });
+  }
+
+  return job;
+}
+
+/** Cancel any scheduled publish for a given prediction (if present). */
+async function cancelPredictionPublishJob(prediction_id) {
+  const removed = await purgeExistingForPrediction(prediction_id);
+  return removed > 0;
+}
+
+module.exports = {
+  predictionPublishQueue,
+  addPredictionPublishJob,
+  cancelPredictionPublishJob,
+  // helpers for tooling/tests
+  stableJobId,
+  versionedJobId,
+  normalizeToUtcDate,
+};

package/src/queue/productPublishQueue.js

@@ -0,0 +1,164 @@
+// src/queue/productPublishQueue.js
+// One-off *publish* scheduler for product items (BullMQ).
+// Strong upsert: purge any prior job for the same product before adding a new delayed job.
+
+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 DRIFT_MS = Math.max(0, Number(process.env.SCHEDULE_DRIFT_MS || 250));
+
+const productPublishQueue = new Queue('productPublishQueue', {
+  connection: redisClient,
+  defaultJobOptions: {
+    attempts: 5,
+    backoff: { type: 'exponential', delay: 2000 },
+    removeOnComplete: 500,
+    removeOnFail: 500,
+  },
+});
+
+// ── ID helpers ─────────────────────────────────────────────────────────────────
+
+function stableJobId(product_id) {
+  return `product:publish:${product_id}`;
+}
+function versionedJobId(product_id, runAtIso) {
+  return `product:publish:${product_id}:${runAtIso}`;
+}
+
+// ── Time helpers ───────────────────────────────────────────────────────────────
+
+/** 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 === '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}`);
+      return d;
+    }
+    // No timezone => treat as UTC
+    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}`);
+    return d;
+  }
+
+  throw new Error(`Unsupported runAtUtc type: ${typeof input}`);
+}
+
+// ── Purge helpers ─────────────────────────────────────────────────────────────
+
+async function findPendingProductJobs(product_id) {
+  const states = ['delayed', 'waiting', 'waiting-children', 'active'];
+  const jobs = await productPublishQueue.getJobs(states);
+  return jobs.filter(
+    (j) => j?.name === 'product:publish' && j?.data?.product_id === String(product_id)
+  );
+}
+
+async function purgeExistingForProduct(product_id) {
+  let removed = 0;
+
+  // Remove any pending/waiting/active jobs for this product
+  const pendings = await findPendingProductJobs(product_id);
+  for (const j of pendings) {
+    try {
+      await j.remove();
+      removed++;
+    } catch (e) {
+      if (DEBUG) console.warn(`[productPublishQueue] failed to remove pending job ${j.id}: ${e.message}`);
+    }
+  }
+
+  // Also remove a leftover stable job if present
+  const last = await productPublishQueue.getJob(stableJobId(product_id));
+  if (last) {
+    try {
+      await last.remove();
+      removed++;
+    } catch (e) {
+      if (DEBUG) console.warn(`[productPublishQueue] failed to remove stable job ${last.id}: ${e.message}`);
+    }
+  }
+
+  if (DEBUG) {
+    console.info('[productPublishQueue] purgeExistingForProduct', {
+      product_id: String(product_id),
+      removed,
+    });
+  }
+  return removed;
+}
+
+// ── Public API ────────────────────────────────────────────────────────────────
+
+/**
+ * Upsert a one-off publish job for a product.
+ * - Purges any previous jobs for this product
+ * - Uses a versioned jobId by default (or stable if useStableId=true)
+ *
+ * @param {Object} params
+ * @param {string|number} params.product_id
+ * @param {string|number|Date} params.runAtUtc - ISO string, epoch ms, or Date (UTC)
+ * @param {object} [params.extra]
+ * @param {boolean} [params.useStableId=false] - if true, uses stable jobId
+ */
+async function addProductPublishJob({ product_id, runAtUtc, extra = {}, useStableId = false }) {
+  if (!product_id || !runAtUtc) {
+    throw new Error('addProductPublishJob: product_id and runAtUtc are required');
+  }
+
+  const runAt = normalizeToUtcDate(runAtUtc);
+  const runAtIso = runAt.toISOString();
+
+  // Drift guard to avoid immediate fire due to ms skew
+  const now = Date.now();
+  let delayMs = runAt.getTime() - now;
+  if (delayMs < DRIFT_MS) delayMs = Math.max(0, DRIFT_MS);
+
+  // Purge any prior jobs for this product (across states)
+  await purgeExistingForProduct(product_id);
+
+  // Choose jobId strategy
+  const jobId = useStableId ? stableJobId(product_id) : versionedJobId(product_id, runAtIso);
+
+  const job = await productPublishQueue.add(
+    'product:publish',
+    { product_id: String(product_id), runAtUtc: runAtIso, extra },
+    { jobId, delay: delayMs }
+  );
+
+  if (DEBUG) {
+    console.info('[productPublishQueue] upsert', {
+      product_id: String(product_id),
+      jobId,
+      runAtIso,
+      delayMs,
+      nowIso: new Date(now).toISOString(),
+    });
+  }
+
+  return job;
+}
+
+/** Cancel any scheduled publish for a given product (if present). */
+async function cancelProductPublishJob(product_id) {
+  const removed = await purgeExistingForProduct(product_id);
+  return removed > 0;
+}
+
+module.exports = {
+  productPublishQueue,
+  addProductPublishJob,
+  cancelProductPublishJob,
+  // helpers for tooling/tests
+  stableJobId,
+  versionedJobId,
+  normalizeToUtcDate,
+};

package/src/queue/queueRegistry.js

@@ -1,5 +1,13 @@
 const { compressionQueue } = require('../queue/compressionQueue');
 const { newsTranslationQueue } = require('./newsTranslateQueue');
+const {newsPublishQueue} = require('./newsPublishQueue');
+const { articlePublishQueue } = require('./articlePublishQueue');
+const {videoPublishQueue} = require('./videoPublishQueue');
+const {imaagePublishQueue} = require('./imagePublishQueue');
+const {pagePublishQueue} = require('./pagePublishQueue');
+const {productPublishQueue} = require('./productPublishQueue');
+const {quizPublishQueue} = require('./quizPublishQueue');
+const {predictionPublishQueue} = require('./predictionPublishQueue');
 // You can register more queues here like translationQueue, videoProcessingQueue, etc.
 
 module.exports = [
@@ -10,6 +18,38 @@ module.exports = [
   {
     name: 'newsTranslationQueue',
     instance: newsTranslationQueue
+  },
+  {
+    name: 'newsPublishQueue',
+    instance: newsPublishQueue
+  },
+  {
+    name: 'articlePublishQueue',
+    instance: articlePublishQueue
+  },
+  {
+    name: 'videoPublishQueue',
+    instance: videoPublishQueue
+  },
+  {
+    name: 'imaagePublishQueue',
+    instance: imaagePublishQueue
+  },
+  {
+    name: 'pagePublishQueue',
+    instance: pagePublishQueue
+  },
+  {
+    name: 'productPublishQueue',
+    instance: productPublishQueue
+  },
+  {
+    name: 'quizPublishQueue',
+    instance: quizPublishQueue
+  },
+  {
+    name: 'predictionPublishQueue',
+    instance: predictionPublishQueue
   }
   // Add more { name, instance } here
 ];