pixivflow 2.36.0 → 2.37.0

package/dist/package.json

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

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.36.0', commit: '00a29ea41205' };
+exports.BUILD = { version: '2.37.0', commit: 'a17343519198' };
 //# sourceMappingURL=version.js.map

package/dist/webui/package.json

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

package/dist/webui/routes/handlers/scheduler-handlers.d.ts

@@ -5,6 +5,33 @@ import { Request, Response } from 'express';
  * projection of the existing Slot Ledger, not a second state system.
  */
 export declare function listRecentSlots(req: Request, res: Response): Promise<void>;
+/**
+ * Recovery admission projection (read-only). Retry semantics still live in the
+ * scheduler's own admission rules; this only labels what the WebUI may offer.
+ * - system `failed`    → retryable (normal / relaxed)
+ * - `no_candidate`/`duplicate` → normal business outcome; relaxed retry is the
+ *   only semantically useful action (soft-scope widening), never a blind retry
+ * - `submitted`/`pending`/`running` → not retryable
+ */
+export declare function recoveryAdmission(status: string, terminalReasonCode: string | null): {
+    retryable: boolean;
+    relaxedRetryAllowed: boolean;
+    retryableReason: string;
+};
+/**
+ * GET /api/scheduler/executions — read-only Execution projection over the
+ * durable Slot Ledger. Execution Truth stays in schedule_slots + items; this
+ * endpoint only shapes it for the WebUI (no new state source).
+ */
+export declare function listExecutions(req: Request, res: Response): Promise<void>;
+/**
+ * GET /api/scheduler/slots/:slotId/logs
+ *
+ * Correlated log view: filters the process log file by the slot id and its
+ * target ids so operators can replay exactly the lines for one occurrence.
+ * Pure filtering of existing structured logger output, no new store.
+ */
+export declare function getSlotLogs(req: Request, res: Response): Promise<void>;
 /**
  * POST /api/scheduler/targets/:targetId/recover
  *

package/dist/webui/routes/handlers/scheduler-handlers.js

@@ -1,8 +1,16 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.listRecentSlots = listRecentSlots;
+exports.recoveryAdmission = recoveryAdmission;
+exports.listExecutions = listExecutions;
+exports.getSlotLogs = getSlotLogs;
 exports.recoverTarget = recoverTarget;
 exports.recoverStatus = recoverStatus;
+const fs_1 = require("fs");
+const path_1 = __importDefault(require("path"));
 const Database_1 = require("../../../storage/Database");
 const config_1 = require("../../../config");
 const logger_1 = require("../../../logger");
@@ -82,14 +90,8 @@ async function listRecentSlots(req, res) {
             recoveryMode: slot.recoveryMode ?? null,
             startedAt: slot.startedAt,
             completedAt: slot.completedAt,
-            targets: database.slots.getCells(slot.id).map((cell) => ({
-                targetId: cell.targetId,
-                workType: cell.workType,
-                status: cell.status,
-                workId: cell.workId,
-                terminalReasonCode: cell.terminalReasonCode,
-                reason: cell.terminalReasonMessage ?? null,
-            })),
+            lastError: slot.lastError,
+            targets: database.slots.getCells(slot.id).map(cellProjection),
         }));
         database.close();
         database = null;
@@ -109,6 +111,182 @@ async function listRecentSlots(req, res) {
         res.status(500).json({ errorCode: error_codes_1.ErrorCode.SCHEDULER_LIST_FAILED });
     }
 }
+function parseCandidateReport(report) {
+    return report && typeof report === 'object' ? report : null;
+}
+function cellProjection(cell) {
+    return {
+        targetId: cell.targetId,
+        workType: cell.workType,
+        status: cell.status,
+        workId: cell.workId,
+        terminalReasonCode: cell.terminalReasonCode,
+        reason: cell.terminalReasonMessage ?? null,
+        candidateReport: parseCandidateReport(cell.candidateReport),
+        attemptCount: cell.attemptCount,
+        fallbackStage: cell.fallback_stage,
+        completedAt: cell.completedAt,
+    };
+}
+/**
+ * Recovery admission projection (read-only). Retry semantics still live in the
+ * scheduler's own admission rules; this only labels what the WebUI may offer.
+ * - system `failed`    → retryable (normal / relaxed)
+ * - `no_candidate`/`duplicate` → normal business outcome; relaxed retry is the
+ *   only semantically useful action (soft-scope widening), never a blind retry
+ * - `submitted`/`pending`/`running` → not retryable
+ */
+function recoveryAdmission(status, terminalReasonCode) {
+    const t = (terminalReasonCode ?? '').toLowerCase();
+    if (status === 'failed') {
+        return { retryable: true, relaxedRetryAllowed: true, retryableReason: 'system failure' };
+    }
+    if (status === 'no_candidate' || status === 'duplicate') {
+        const noContent = t === 'duplicate_exhausted' || t === 'no_candidate' || t === 'duplicate';
+        return {
+            retryable: !noContent,
+            relaxedRetryAllowed: true,
+            retryableReason: noContent
+                ? 'non-retryable business outcome (no new content)'
+                : 'normal retry applies',
+        };
+    }
+    return { retryable: false, relaxedRetryAllowed: false, retryableReason: 'non-terminal or already-submitted' };
+}
+/**
+ * GET /api/scheduler/executions — read-only Execution projection over the
+ * durable Slot Ledger. Execution Truth stays in schedule_slots + items; this
+ * endpoint only shapes it for the WebUI (no new state source).
+ */
+async function listExecutions(req, res) {
+    const limit = Math.min(Math.max(Number(req.query.limit ?? 20) || 20, 1), 100);
+    const targetFilter = typeof req.query.targetId === 'string' ? req.query.targetId.trim() : '';
+    const statusFilter = typeof req.query.status === 'string' ? req.query.status.trim().toLowerCase() : '';
+    let database = null;
+    try {
+        const configPath = (0, config_1.getConfigPath)();
+        const config = (0, config_1.loadConfig)(configPath);
+        if (!config.storage?.databasePath) {
+            res.status(400).json({ errorCode: error_codes_1.ErrorCode.SCHEDULER_LIST_FAILED, message: 'database not configured' });
+            return;
+        }
+        database = new Database_1.Database(config.storage.databasePath);
+        database.migrate();
+        const slots = database.slots.getRecentSlots(Math.max(limit, 50));
+        const executions = slots
+            .flatMap((slot) => database.slots.getCells(slot.id).map((cell) => {
+            const cellView = cellProjection(cell);
+            const admission = recoveryAdmission(cell.status, cell.terminalReasonCode);
+            return {
+                executionId: `${slot.id}:${cell.targetId}`,
+                slotId: slot.id,
+                scheduleId: slot.scheduleId,
+                targetId: cell.targetId,
+                workType: cell.workType,
+                status: cell.status,
+                terminalReasonCode: cell.terminalReasonCode,
+                message: cell.terminalReasonMessage,
+                startedAt: slot.startedAt,
+                endedAt: cell.completedAt ?? slot.completedAt,
+                triggerSource: slot.triggerSource,
+                recoveryRequestId: slot.recoveryRequestId ?? null,
+                recoveryMode: slot.recoveryMode ?? null,
+                occurrenceAt: slot.occurrenceAt,
+                candidateReport: cellView.candidateReport,
+                attemptCount: cell.attemptCount,
+                fallbackStage: cell.fallback_stage,
+                recovery: admission,
+                operatorHint: admission.retryable
+                    ? '可重试'
+                    : admission.relaxedRetryAllowed
+                        ? '正常完成的无新内容结果，仅在人工判断后可放宽条件重试'
+                        : '非终态或已成功，无需重试',
+            };
+        }))
+            .filter((e) => {
+            if (targetFilter && e.targetId !== targetFilter)
+                return false;
+            if (statusFilter && e.status.toLowerCase() !== statusFilter)
+                return false;
+            return true;
+        })
+            .slice(0, limit);
+        database.close();
+        database = null;
+        res.json({ data: { executions } });
+    }
+    catch (error) {
+        if (database) {
+            try {
+                database.close();
+            }
+            catch { /* ignore */ }
+        }
+        const message = error instanceof Error ? error.message : String(error);
+        logger_1.logger.error('Failed to list scheduler executions', { error: { message } });
+        res.status(500).json({ errorCode: error_codes_1.ErrorCode.SCHEDULER_LIST_FAILED });
+    }
+}
+/**
+ * GET /api/scheduler/slots/:slotId/logs
+ *
+ * Correlated log view: filters the process log file by the slot id and its
+ * target ids so operators can replay exactly the lines for one occurrence.
+ * Pure filtering of existing structured logger output, no new store.
+ */
+async function getSlotLogs(req, res) {
+    const slotId = req.params.slotId;
+    if (!slotId || slotId.length > 200) {
+        res.status(400).json({ errorCode: error_codes_1.ErrorCode.SCHEDULER_LIST_FAILED, message: 'invalid slotId' });
+        return;
+    }
+    let database = null;
+    try {
+        const configPath = (0, config_1.getConfigPath)();
+        const config = (0, config_1.loadConfig)(configPath);
+        if (!config.storage?.databasePath) {
+            res.status(400).json({ errorCode: error_codes_1.ErrorCode.SCHEDULER_LIST_FAILED, message: 'database not configured' });
+            return;
+        }
+        database = new Database_1.Database(config.storage.databasePath);
+        database.migrate();
+        const slot = database.slots.getSlot(slotId);
+        const targets = slot ? database.slots.getCells(slotId).map((c) => c.targetId) : [];
+        database.close();
+        database = null;
+        let logFile = '';
+        const dataDir = path_1.default.dirname(config.storage.databasePath);
+        for (const candidate of [
+            path_1.default.join(dataDir, 'pixiv-downloader.log'),
+            path_1.default.resolve(process.cwd(), 'data', 'pixiv-downloader.log'),
+        ]) {
+            if ((0, fs_1.existsSync)(candidate)) {
+                logFile = candidate;
+                break;
+            }
+        }
+        if (!logFile) {
+            res.json({ data: { logs: [], total: 0, slotId, targets } });
+            return;
+        }
+        const keywords = [slotId, ...targets];
+        const lines = (0, fs_1.readFileSync)(logFile, 'utf-8')
+            .split('\n')
+            .filter((line) => line.trim() && keywords.some((k) => line.toLowerCase().includes(k.toLowerCase())));
+        res.json({ data: { logs: lines.slice(-500), total: lines.length, slotId, targets } });
+    }
+    catch (error) {
+        if (database) {
+            try {
+                database.close();
+            }
+            catch { /* ignore */ }
+        }
+        const message = error instanceof Error ? error.message : String(error);
+        logger_1.logger.error('Failed to read slot logs', { slotId, error: { message } });
+        res.status(500).json({ errorCode: error_codes_1.ErrorCode.LOGS_GET_FAILED });
+    }
+}
 /**
  * POST /api/scheduler/targets/:targetId/recover
  *

package/dist/webui/routes/scheduler.js

@@ -4,6 +4,8 @@ const express_1 = require("express");
 const scheduler_handlers_1 = require("./handlers/scheduler-handlers");
 const router = (0, express_1.Router)();
 router.get('/', scheduler_handlers_1.listRecentSlots);
+router.get('/executions', scheduler_handlers_1.listExecutions);
+router.get('/slots/:slotId/logs', scheduler_handlers_1.getSlotLogs);
 router.post('/targets/:targetId/recover', scheduler_handlers_1.recoverTarget);
 router.get('/targets/:targetId/recover/:requestId', scheduler_handlers_1.recoverStatus);
 exports.default = router;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pixivflow",
-  "version": "2.36.0",
+  "version": "2.37.0",
   "description": "🎨 Pixiv 下载、筛选与自动收集工具 - 批量下载插画和小说、按标签/热度/日期筛选、定时任务与可靠 HTTP 交付 | Pixiv downloader and automation toolkit with filtering, scheduling and reliable HTTP delivery",
   "repository": {
     "type": "git",