pixivflow 3.2.0 → 3.4.0

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

@@ -38,6 +38,11 @@ export interface SlotRecord {
     recoveryRequestId: string | null;
     /** Recovery policy preset ('normal'|'relaxed'); null for non-recovery slots. */
     recoveryMode: string | null;
+    /**
+     * Occurrence-scoped retrieval view of a generic `candidate_search` job (JSON,
+     * §6); null means "run the plan exactly as configured".
+     */
+    paramsJson: string | null;
 }
 export interface SlotItemRecord {
     id: number;
@@ -83,6 +88,16 @@ export interface SlotItemRecord {
 export declare class SlotRepository extends BaseRepository {
     /** Exact manual request/target lookup for authenticated convergence checks. */
     findManualSlot(requestId: string, targetId: string): SlotRecord | null;
+    /**
+     * Manual request lookup WITHOUT a target id — the generic job surface resolves
+     * a job from its consumer-supplied idempotency key alone.
+     *
+     * A non-empty `manual_request_id` is unique per slot (partial unique index
+     * `idx_slots_manual_request`), so the first row IS the job; the ordering only
+     * makes the answer deterministic on a ledger that still holds historical
+     * duplicates.
+     */
+    findManualSlotByKey(requestId: string): SlotRecord | null;
     /** Exact manual RECOVERY request/target lookup (§manual-recovery). */
     findRecoverySlot(requestId: string, targetId: string): SlotRecord | null;
     /**
@@ -109,6 +124,8 @@ export declare class SlotRepository extends BaseRepository {
         recoveryRequestId?: string | null;
         /** Manual recovery policy preset ('normal' | 'relaxed'). */
         recoveryMode?: string | null;
+        /** Generic-job retrieval view (§6), stored as JSON; null = as configured. */
+        paramsJson?: string | null;
     }): {
         slot: SlotRecord;
         created: boolean;
@@ -220,6 +237,23 @@ export declare class SlotRepository extends BaseRepository {
      * a read-then-clear race.
      */
     recoverableSlots(now?: number): SlotRecord[];
+    /**
+     * Bounded liveness sweep candidates (§liveness): slots that are still
+     * `pending` (nothing ever claimed them) long after they were recorded. A live
+     * lease is never a candidate — a claimed slot is not stuck.
+     *
+     * `createdBefore` is a SQLite UTC datetime; the comparison stays in SQL so a
+     * large ledger never has to be loaded into memory to be filtered.
+     */
+    agedPendingSlots(createdBefore: string, now: number, limit: number): SlotRecord[];
+    /**
+     * Bounded liveness sweep candidates (§liveness): slots left `running` whose
+     * owner stopped heartbeating. The lease must be expired or absent (a live
+     * lease means a live worker, however long the work takes), and progress must
+     * be older than the stall budget — falling back to `started_at`, then
+     * `created_at`, for rows from before heartbeats were recorded.
+     */
+    stalledRunningSlots(progressBefore: string, now: number, limit: number): SlotRecord[];
     /**
      * Non-terminal Slots (pending/running): work this ledger still owes, whether
      * or not a live worker currently holds their lease.

package/dist/storage/repositories/SlotRepository.js

@@ -17,6 +17,21 @@ class SlotRepository extends BaseRepository_1.BaseRepository {
         const rows = this.db.prepare(`SELECT * FROM schedule_slots WHERE manual_request_id = ?`).all(requestId);
         return rows.map((row) => this.toSlot(row)).find((slot) => slot.targetIds.includes(targetId)) ?? null;
     }
+    /**
+     * Manual request lookup WITHOUT a target id — the generic job surface resolves
+     * a job from its consumer-supplied idempotency key alone.
+     *
+     * A non-empty `manual_request_id` is unique per slot (partial unique index
+     * `idx_slots_manual_request`), so the first row IS the job; the ordering only
+     * makes the answer deterministic on a ledger that still holds historical
+     * duplicates.
+     */
+    findManualSlotByKey(requestId) {
+        const row = this.db
+            .prepare(`SELECT * FROM schedule_slots WHERE manual_request_id = ? ORDER BY created_at, id LIMIT 1`)
+            .get(requestId);
+        return row ? this.toSlot(row) : null;
+    }
     /** Exact manual RECOVERY request/target lookup (§manual-recovery). */
     findRecoverySlot(requestId, targetId) {
         const rows = this.db.prepare(`SELECT * FROM schedule_slots WHERE recovery_request_id = ?`).all(requestId);
@@ -32,11 +47,11 @@ class SlotRepository extends BaseRepository_1.BaseRepository {
         const insert = this.db.prepare(`INSERT INTO schedule_slots
          (id, schedule_id, occurrence_at, occurrence_date, occurrence_label, timezone, target_ids,
           status, trigger_source, slot_date, slot_name, manual_request_id, correlation_id,
-          recovery_request_id, recovery_mode)
+          recovery_request_id, recovery_mode, params_json)
        VALUES
          (@id, @scheduleId, @occurrenceAt, @occurrenceDate, @occurrenceLabel, @timezone, @targetIds,
           'pending', @triggerSource, @slotDate, @slotName, @manualRequestId, @correlationId,
-          @recoveryRequestId, @recoveryMode)
+          @recoveryRequestId, @recoveryMode, @paramsJson)
        ON CONFLICT(id) DO NOTHING`);
         const info = insert.run({
             id,
@@ -53,6 +68,7 @@ class SlotRepository extends BaseRepository_1.BaseRepository {
             correlationId: data.correlationId ?? null,
             recoveryRequestId: data.recoveryRequestId ?? null,
             recoveryMode: data.recoveryMode ?? null,
+            paramsJson: data.paramsJson ?? null,
         });
         const created = info.changes > 0;
         return { slot: this.getSlot(id), created };
@@ -364,6 +380,48 @@ class SlotRepository extends BaseRepository_1.BaseRepository {
             .all({ now });
         return rows.map((r) => this.toSlot(r));
     }
+    /**
+     * Bounded liveness sweep candidates (§liveness): slots that are still
+     * `pending` (nothing ever claimed them) long after they were recorded. A live
+     * lease is never a candidate — a claimed slot is not stuck.
+     *
+     * `createdBefore` is a SQLite UTC datetime; the comparison stays in SQL so a
+     * large ledger never has to be loaded into memory to be filtered.
+     */
+    agedPendingSlots(createdBefore, now, limit) {
+        const rows = this.db
+            .prepare(`SELECT * FROM schedule_slots
+         WHERE status = 'pending'
+           AND (lease_until IS NULL OR lease_until <= @now)
+           AND created_at IS NOT NULL
+           AND created_at <= @createdBefore
+         ORDER BY created_at ASC
+         LIMIT @limit`)
+            .all({ createdBefore, now, limit });
+        return rows.map((r) => this.toSlot(r));
+    }
+    /**
+     * Bounded liveness sweep candidates (§liveness): slots left `running` whose
+     * owner stopped heartbeating. The lease must be expired or absent (a live
+     * lease means a live worker, however long the work takes), and progress must
+     * be older than the stall budget — falling back to `started_at`, then
+     * `created_at`, for rows from before heartbeats were recorded.
+     */
+    stalledRunningSlots(progressBefore, now, limit) {
+        const rows = this.db
+            .prepare(`SELECT * FROM schedule_slots
+         WHERE status = 'running'
+           AND (lease_until IS NULL OR lease_until <= @now)
+           AND COALESCE(
+                 CASE WHEN heartbeat_at IS NOT NULL THEN datetime(heartbeat_at / 1000, 'unixepoch') END,
+                 started_at,
+                 created_at
+               ) <= @progressBefore
+         ORDER BY COALESCE(started_at, created_at) ASC
+         LIMIT @limit`)
+            .all({ progressBefore, now, limit });
+        return rows.map((r) => this.toSlot(r));
+    }
     /**
      * Non-terminal Slots (pending/running): work this ledger still owes, whether
      * or not a live worker currently holds their lease.
@@ -442,6 +500,7 @@ class SlotRepository extends BaseRepository_1.BaseRepository {
             correlationId: row.correlation_id ?? null,
             recoveryRequestId: row.recovery_request_id ?? null,
             recoveryMode: row.recovery_mode ?? null,
+            paramsJson: row.params_json ?? null,
         };
     }
     toItem(row) {

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: '3.2.0', commit: 'c195b909063c' };
+exports.BUILD = { version: '3.4.0', commit: '5d231179a9b3' };
 //# sourceMappingURL=version.js.map

package/dist/webui/package.json

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

package/package.json

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