pixivflow 2.20.3 → 2.20.4

package/dist/commands/scheduler-runtime.js

@@ -252,6 +252,7 @@ async function createSchedulerRuntime(configPathArg) {
     const deliveryDispatcher = new DeliveryDispatcher_1.DeliveryDispatcher(config.delivery, buildProxyUrl(config.network));
     const notificationPolicy = new NotificationPolicy_1.NotificationPolicy(database, config);
     const outboxWorker = new OutboxWorker_1.OutboxWorker(database, deliveryDispatcher, {
+        beforeDrain: () => notificationPolicy.reconcileScheduleSummaries(),
         retryBaseMs: config.delivery?.outboxRetryBaseMs,
         retryMaxMs: config.delivery?.outboxRetryMaxMs,
         // A confirmed ACK settles the owning Slot cell (submitted / duplicate /
@@ -462,12 +463,13 @@ async function createSchedulerRuntime(configPathArg) {
         // as a degraded (partial) terminal result.
         const maxFallbackStages = Math.max(0, Math.min(10, Number(runtimeConfig.download?.maxFallbackStages ?? 3)));
         const boostScanLimit = fallbackScanLimit;
-        const boostedTargets = (list, stage) => stage === 0
-            ? list
-            : list.map((t) => ({
+        const boostedTargets = (list) => list.map((t) => {
+            const stage = scheduleSlot && t.id ? coordinator.cellFallbackStage(scheduleSlot.slotId, t.id) : 0;
+            return stage === 0 ? t : {
                 ...t,
                 candidateScanLimit: boostScanLimit(t.candidateScanLimit ?? runtimeConfig.download?.candidateScanLimit, stage),
-            }));
+            };
+        });
         const buildManager = (list) => {
             const scoped = {
                 ...runtimeConfig,
@@ -534,7 +536,7 @@ async function createSchedulerRuntime(configPathArg) {
                 notificationPolicy.noteRefetchOutcome(scheduleSlot, schedule, target, scheduleSlot.manualRequestId, outcome);
             }
         };
-        let downloadManager = buildManager(boostedTargets(runTargets, 0));
+        let downloadManager = buildManager(boostedTargets(runTargets));
         activeDownloadManager = downloadManager;
         await downloadManager.initialise();
         // Apply initial delay if configured
@@ -573,7 +575,7 @@ async function createSchedulerRuntime(configPathArg) {
                     p.cell.fallback_stage < maxFallbackStages);
                 if (pendingFallback.length === 0)
                     break;
-                downloadManager = buildManager(boostedTargets(pendingFallback.map((p) => p.target), pass + 1));
+                downloadManager = buildManager(boostedTargets(pendingFallback.map((p) => p.target)));
                 activeDownloadManager = downloadManager;
                 await downloadManager.initialise();
             }
@@ -619,17 +621,22 @@ async function createSchedulerRuntime(configPathArg) {
             for (const target of targets)
                 if (target.id)
                     notificationPolicy.noteTerminalRefetchCell(slotCtx.slotId, target.id);
-            notificationPolicy.sendSlotSummary(slotCtx, schedule, summary.cells.map((c) => {
-                const t = targets.find((x) => x.id === c.targetId);
-                return {
-                    targetId: c.targetId,
-                    label: c.targetId,
-                    workType: t?.type ?? 'unknown',
-                    status: c.status,
-                    workId: c.workId,
-                    error: c.error ?? null,
-                };
-            }));
+            // Terminal summaries are for SCHEDULED occurrences (P0-B). Remote manual
+            // replacements already report through their own verdict channel
+            // (refetchOutcomeUrl); a schedule summary would double-notify the group.
+            if (!slotCtx.manualRequestId) {
+                notificationPolicy.sendSlotSummary(slotCtx, schedule, summary.cells.map((c) => {
+                    const t = targets.find((x) => x.id === c.targetId);
+                    return {
+                        targetId: c.targetId,
+                        label: c.targetId,
+                        workType: t?.type ?? 'unknown',
+                        status: c.status,
+                        workId: c.workId,
+                        error: c.error ?? null,
+                    };
+                }));
+            }
             releaseLease();
         }
         if (!slotCtx && allTargetsFailed)

package/dist/delivery/OutboxWorker.d.ts

@@ -3,6 +3,8 @@ import { OutboxRow } from '../storage/repositories/OutboxRepository';
 import { DeliveryDispatcher } from './DeliveryDispatcher';
 import { DeliveryAck } from './DeliveryAck';
 export interface OutboxWorkerOptions {
+    /** Reconcile durable notification intents before consuming due rows. */
+    beforeDrain?: () => void;
     /** How often to scan for due rows. */
     pollIntervalMs?: number;
     /** Row lease duration while one attempt is in flight. */
@@ -45,6 +47,7 @@ export declare function backoffDelayMs(attempt: number, base: number, max: numbe
 export declare class OutboxWorker {
     private readonly database;
     private readonly dispatcher;
+    private readonly options;
     private timer;
     private running;
     private stopped;

package/dist/delivery/OutboxWorker.js

@@ -23,6 +23,7 @@ function backoffDelayMs(attempt, base, max) {
 class OutboxWorker {
     database;
     dispatcher;
+    options;
     timer = null;
     running = false;
     stopped = false;
@@ -37,6 +38,7 @@ class OutboxWorker {
     constructor(database, dispatcher, options = {}) {
         this.database = database;
         this.dispatcher = dispatcher;
+        this.options = options;
         this.pollIntervalMs = options.pollIntervalMs ?? 10_000;
         this.leaseMs = options.leaseMs ?? 120_000;
         this.batchSize = options.batchSize ?? 4;
@@ -73,6 +75,7 @@ class OutboxWorker {
         let retried = 0;
         let dead = 0;
         for (let round = 0; round < maxRounds; round++) {
+            this.options.beforeDrain?.();
             const rows = this.database.outbox.claimDue(this.owner, this.leaseMs, this.batchSize);
             if (rows.length === 0)
                 break;
@@ -104,6 +107,7 @@ class OutboxWorker {
             return;
         this.running = true;
         try {
+            this.options.beforeDrain?.();
             const rows = this.database.outbox.claimDue(this.owner, this.leaseMs, this.batchSize);
             for (const row of rows) {
                 if (this.stopped) {

package/dist/notification/NotificationPolicy.d.ts

@@ -51,6 +51,8 @@ export declare class NotificationPolicy {
      * use `refetchOutcomeUrl`; generic notifications use `notificationUrl`.
      */
     private targetsWithUrl;
+    /** The durable cells remain the notification intent across crashes and late ACKs. */
+    reconcileScheduleSummaries(): void;
     private send;
     /**
      * Report the terminal verdict of a REMOTE MANUAL replacement ("重抓") back to

package/dist/notification/NotificationPolicy.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NotificationPolicy = void 0;
 const DeliveryService_1 = require("../delivery/DeliveryService");
+const SlotCoordinator_1 = require("../scheduler/SlotCoordinator");
 const logger_1 = require("../logger");
 /**
  * Central policy for all operational notifications. Handlers/scheduler do not
@@ -76,8 +77,11 @@ class NotificationPolicy {
     }
     /** One consolidated summary per slot, delivered to every notifying target's endpoint. */
     sendSlotSummary(slot, schedule, rows) {
-        const targets = this.targetsWithUrl('scheduleOutcomeUrl');
-        if (targets.size === 0 || rows.length === 0)
+        if (slot.manualRequestId || rows.length === 0 || rows.some((r) => !['submitted', 'no_candidate', 'duplicate', 'failed'].includes(r.status)))
+            return;
+        const memberIds = new Set(rows.map((r) => r.targetId));
+        const targets = this.targetsWithUrl('scheduleOutcomeUrl', memberIds);
+        if (targets.size === 0)
             return;
         const icon = (s) => s === 'submitted' ? '✅' : s === 'no_candidate' ? '⚠️' : s === 'duplicate' ? '♱' : s === 'delivery_pending' ? '🕓' : '❌';
         const lines = rows.map((r) => `${icon(r.status)} ${r.label}（${r.workType === 'novel' ? '小说' : '插画'}）` +
@@ -93,8 +97,8 @@ class NotificationPolicy {
         ].join('\n');
         const outcomeStatus = submitted === rows.length ? 'success' : submitted > 0 ? 'partial' : 'failed';
         const service = new DeliveryService_1.DeliveryService(this.database);
-        for (const name of targets) {
-            service.enqueueNotification(name, text, NotificationPolicy.keys.summary(slot.slotId), undefined, {
+        for (const [index, name] of [...targets].entries()) {
+            service.enqueueNotification(name, text, NotificationPolicy.keys.summary(slot.slotId) + (index === 0 ? '' : `:${name}`), undefined, {
                 scheduleId: schedule.id,
                 slotId: slot.slotId,
                 status: outcomeStatus,
@@ -112,9 +116,11 @@ class NotificationPolicy {
      * Schedule summaries require `scheduleOutcomeUrl`; manual refetch outcomes
      * use `refetchOutcomeUrl`; generic notifications use `notificationUrl`.
      */
-    targetsWithUrl(urlKey) {
+    targetsWithUrl(urlKey, memberIds) {
         const result = new Set();
         for (const target of this.config.targets ?? []) {
+            if (memberIds && !memberIds.has(target.id ?? ''))
+                continue;
             const deliveryTarget = target.delivery?.target;
             if (!deliveryTarget)
                 continue;
@@ -125,6 +131,26 @@ class NotificationPolicy {
         }
         return result;
     }
+    /** The durable cells remain the notification intent across crashes and late ACKs. */
+    reconcileScheduleSummaries() {
+        for (const record of this.database.slots.getUnreportedTerminalSchedules()) {
+            const slot = {
+                slotId: record.id, scheduleId: record.scheduleId,
+                occurrenceAt: record.occurrenceAt ?? 0, occurrenceDate: record.occurrenceDate,
+                occurrenceLabel: record.occurrenceLabel, timezone: record.timezone,
+                triggerSource: 'http', slotName: record.slotName, slotDate: record.slotDate,
+            };
+            const schedule = this.config.schedules?.find((item) => item.id === record.scheduleId)
+                ?? { id: record.scheduleId };
+            const targets = this.config.targets.filter((target) => record.targetIds.includes(target.id ?? ''));
+            const summary = new SlotCoordinator_1.SlotCoordinator(this.database).finish(slot, schedule, targets);
+            this.sendSlotSummary(slot, schedule, summary.cells.map((cell) => ({
+                ...cell, label: cell.targetId,
+                workType: targets.find((target) => target.id === cell.targetId)?.type ?? 'unknown',
+                error: cell.error ?? null,
+            })));
+        }
+    }
     send(targetName, key, text) {
         try {
             new DeliveryService_1.DeliveryService(this.database).enqueueNotification(targetName, text, key);

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "type": "commonjs",
   "name": "pixivflow",
-  "version": "2.20.3",
+  "version": "2.20.4",
   "private": true
 }

package/dist/storage/repositories/SlotRepository.d.ts

@@ -89,6 +89,8 @@ export declare class SlotRepository extends BaseRepository {
     /** Target ids materialized for a slot (stable membership; falls back to []). */
     getSlotTargetIds(id: string): string[];
     getRecentSlots(limit?: number): SlotRecord[];
+    /** Completed cells whose summary enqueue or aggregate rollup was interrupted. */
+    getUnreportedTerminalSchedules(): SlotRecord[];
     markSlotStatus(id: string, status: SlotStatus, error?: string): void;
     /** All cells for a slot (one per target). */
     getCells(slotId: string): SlotItemRecord[];

package/dist/storage/repositories/SlotRepository.js

@@ -71,6 +71,18 @@ class SlotRepository extends BaseRepository_1.BaseRepository {
             .all(limit);
         return rows.map((r) => this.toSlot(r));
     }
+    /** Completed cells whose summary enqueue or aggregate rollup was interrupted. */
+    getUnreportedTerminalSchedules() {
+        const rows = this.db.prepare(`SELECT s.* FROM schedule_slots s
+      WHERE s.manual_request_id IS NULL AND s.status != 'expired'
+        AND EXISTS (SELECT 1 FROM schedule_slot_items c WHERE c.slot_id = s.id)
+        AND NOT EXISTS (SELECT 1 FROM schedule_slot_items c WHERE c.slot_id = s.id
+          AND c.status NOT IN ('submitted', 'no_candidate', 'duplicate', 'failed'))
+        AND (s.status IN ('pending', 'running') OR NOT EXISTS (
+          SELECT 1 FROM outbox o WHERE o.idempotency_key = 'notification:' || s.id || ':summary'
+        ))`).all();
+        return rows.map((row) => this.toSlot(row));
+    }
     markSlotStatus(id, status, error) {
         const stamp = status === 'running' ? 'started_at' : status === 'success' || status === 'partial' || status === 'failed' ? 'completed_at' : null;
         const sets = ['status = @status', 'last_error = @error'];

package/dist/version.js

@@ -2,5 +2,5 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BUILD = void 0;
 // GENERATED by scripts/write-version.js — do not edit manually.
-exports.BUILD = { version: '2.20.3', commit: '6ebffc579194' };
+exports.BUILD = { version: '2.20.4', commit: '5bb73436b670' };
 //# sourceMappingURL=version.js.map

package/dist/webui/package.json

@@ -1,6 +1,6 @@
 {
   "type": "commonjs",
   "name": "pixivflow-webui-backend",
-  "version": "2.20.3",
+  "version": "2.20.4",
   "description": "PixivFlow WebUI Backend - CommonJS module"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pixivflow",
-  "version": "2.20.3",
+  "version": "2.20.4",
   "description": "🎨 智能的 Pixiv 自动化下载工具 - 支持批量下载插画和小说、定时任务、Docker部署 | Intelligent Pixiv Automation Downloader with batch download, scheduler, and Docker support",
   "repository": {
     "type": "git",