pixivflow 2.19.0 → 2.19.2

package/dist/commands/ExecuteSlotCommand.js

@@ -135,7 +135,7 @@ class ExecuteSlotCommand extends Command_1.BaseCommand {
                         (0, runDiagnostics_1.recordRunError)(outcome.error);
                 },
                 ...(excludedWorkIds ? { excludedWorkIds } : {}),
-            }), timeoutMs, () => runtime.cancelActive(`batch timeout after ${timeoutMs}ms`), `slot ${slotId}`);
+            }), timeoutMs, () => runtime.cancelActive(`batch timeout after ${timeoutMs}ms`, 'timeout'), `slot ${slotId}`);
             // Bounded drain: deliveries created by this run get one chance to confirm
             // before we report. Rows that cannot finish now stay durable and are
             // resolved by the control plane's reconciliation, never by a blind resend.

package/dist/commands/SchedulerCommand.js

@@ -57,7 +57,9 @@ class SchedulerCommand extends Command_1.BaseCommand {
                 telemetry: {
                     beginRun: () => runtime.database.getOverviewStats().totalDownloads,
                     endRun: () => runtime.database.getOverviewStats().totalDownloads,
-                    requestCancel: (reason) => runtime.cancelActive(reason),
+                    // `timeout`: the daemon stays alive, so the run's Slot must be taken
+                    // terminal (the abort path does that) instead of staying recoverable.
+                    requestCancel: (reason) => runtime.cancelActive(reason, 'timeout'),
                 },
             });
             const status = manager.start(runtime.config);

package/dist/commands/SchedulerRunOnceCommand.js

@@ -53,7 +53,7 @@ class SchedulerRunOnceCommand extends Command_1.BaseCommand {
                 // adhoc: a manual/operator run executes the download plan but never
                 // opens a scheduled Slot, so it can neither mark a scheduled
                 // occurrence complete nor be resumed as one. Explicit replacement.
-                runtime.runJob(runtime.config, plan, { adhoc: true, triggerSource: 'manual', onlyTarget: targetFilter }), timeoutMs, () => runtime.cancelActive(`run timeout after ${timeoutMs}ms`), `plan ${plan.id}`);
+                runtime.runJob(runtime.config, plan, { adhoc: true, triggerSource: 'manual', onlyTarget: targetFilter }), timeoutMs, () => runtime.cancelActive(`run timeout after ${timeoutMs}ms`, 'timeout'), `plan ${plan.id}`);
             }
             // Flush deliveries/notifications created by this one-shot before exit.
             // A bounded drain: durable rows survive if they cannot finish now and the

package/dist/commands/scheduler-runtime.d.ts

@@ -51,6 +51,29 @@ export type ExecutionMode = (typeof EXECUTION_MODES)[number];
 export declare function withDeliveryMode<T extends {
     delivery?: unknown;
 }>(targets: T[], mode: ExecutionMode | undefined): T[];
+/**
+ * Who asked for the cancellation, which decides whether the abandoned Slot is
+ * allowed to stay recoverable.
+ *
+ *  - `timeout`: a watchdog inside this process (scheduler timeout, run-once or
+ *    execute-slot bound). The process stays up, so nothing will ever finish the
+ *    Slot — it must be terminalised, or the recovery sweep re-dispatches the
+ *    same occurrence on every tick forever.
+ *  - `shutdown`: the process is going away. The Slot is deliberately left
+ *    non-terminal so recovery resumes the same occurrence after restart; no
+ *    worker survives to duplicate it.
+ */
+export type CancelOrigin = 'timeout' | 'shutdown';
+/**
+ * Decide a scheduled run's Slot fate when `runAllTargets()` aborts abnormally
+ * instead of reporting per-target failures.
+ *
+ * Returning `false` leaves the Slot recoverable, which is only correct when the
+ * process is genuinely going away — because `recoverableSlots()` treats a
+ * released/NULL lease as "recorded but never claimed", so a live process that
+ * merely drops its lease is re-dispatched on every recovery tick, forever.
+ */
+export declare function shouldTerminaliseAbortedSlot(origin: CancelOrigin | null, slotAbandoned: boolean): boolean;
 export interface SchedulerRuntime {
     config: StandaloneConfig;
     database: Database;
@@ -59,8 +82,14 @@ export interface SchedulerRuntime {
     tokenMaintenance: ReturnType<typeof createTokenMaintenanceService>;
     /** Run one schedule's enabled targets once (the same job the cron fires). */
     runJob(snapshot: StandaloneConfig, schedule: ScheduleConfig, options?: RunJobOptions): Promise<void>;
-    /** Cancel the in-flight download plan, if any. */
-    cancelActive(reason: string): void;
+    /**
+     * Cancel the in-flight download plan, if any holding a Slot.
+     *
+     * `origin` states whether this process is staying alive (`timeout`: the
+     * run is finished and its Slot must be terminalised) or going away
+     * (`shutdown`: leave the Slot non-terminal so recovery resumes it).
+     */
+    cancelActive(reason: string, origin?: CancelOrigin): void;
     /**
      * The active run never settled after its timeout and drain window. Stop
      * renewing its lease and take its Slot terminal so recovery cannot re-dispatch

package/dist/commands/scheduler-runtime.js

@@ -43,6 +43,7 @@ var __importStar = (this && this.__importStar) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EXECUTION_MODES = void 0;
 exports.withDeliveryMode = withDeliveryMode;
+exports.shouldTerminaliseAbortedSlot = shouldTerminaliseAbortedSlot;
 exports.notifyScheduleFailure = notifyScheduleFailure;
 exports.createSchedulerRuntime = createSchedulerRuntime;
 exports.runWithTimeout = runWithTimeout;
@@ -74,6 +75,23 @@ function withDeliveryMode(targets, mode) {
         return targets;
     return targets.map((target) => (target.delivery ? { ...target, delivery: undefined } : target));
 }
+/**
+ * Decide a scheduled run's Slot fate when `runAllTargets()` aborts abnormally
+ * instead of reporting per-target failures.
+ *
+ * Returning `false` leaves the Slot recoverable, which is only correct when the
+ * process is genuinely going away — because `recoverableSlots()` treats a
+ * released/NULL lease as "recorded but never claimed", so a live process that
+ * merely drops its lease is re-dispatched on every recovery tick, forever.
+ */
+function shouldTerminaliseAbortedSlot(origin, slotAbandoned) {
+    // The abandon path already wrote a terminal `failed`; rolling up again would
+    // only overwrite it when the wedged job finally settles.
+    if (slotAbandoned)
+        return false;
+    // Shutdown is not a failure: recovery is meant to resume this occurrence.
+    return origin !== 'shutdown';
+}
 /**
  * Open the pixivflow database with a startup integrity check. A structurally
  * corrupt file (quick_check failure) is isolated aside and replaced with a
@@ -209,6 +227,13 @@ async function createSchedulerRuntime(configPathArg) {
      * Set while a lease is held and cleared as soon as it is released.
      */
     let activeLeaseHooks = null;
+    /**
+     * Why the in-flight run was cancelled, if it was. This is what lets the abort
+     * path tell a CRASH (nothing runs here — the process is gone) apart from an
+     * ABANDONMENT (this process is alive and will never touch the Slot again).
+     * `null` while no cancellation has been requested for the current run.
+     */
+    let activeAbortOrigin = null;
     // Independently-pumped durable outbox (content + notifications). Started in
     // the long-running scheduler daemon; run-once drains explicitly before exit.
     const deliveryDispatcher = new DeliveryDispatcher_1.DeliveryDispatcher(config.delivery, buildProxyUrl(config.network));
@@ -311,6 +336,9 @@ async function createSchedulerRuntime(configPathArg) {
             // Only the process that actually owns the lease may report the slot as
             // running; the accepting adapter records it as pending instead.
             coordinator.markRunning(activeSlot.slotId);
+            // This run owns the Slot now: any cancellation recorded against a previous
+            // run must not decide how THIS run's abort is handled.
+            activeAbortOrigin = null;
             let cancelled = false;
             const heartbeat = setInterval(() => {
                 // A cancelled/timed-out run must stop renewing its lease. An infinitely
@@ -451,9 +479,24 @@ async function createSchedulerRuntime(configPathArg) {
         }
         catch (error) {
             if (!slotCtx || !(error instanceof Error) || !/^All \d+ target\(s\) failed\./.test(error.message)) {
-                // Abnormal abort: no roll-up is possible, so hand the slot back now
-                // instead of holding it until the lease TTL expires. Recovery sees a
-                // non-terminal slot with no live lease and resumes the SAME occurrence.
+                // Abnormal abort. Two very different situations land here, and treating
+                // them as one is what produced the production loop:
+                //
+                //  - this process cancelled itself (scheduler timeout / watchdog) and is
+                //    still alive. It will never touch the Slot again, so releasing the
+                //    lease while leaving the status `running` makes the Slot look exactly
+                //    like a crashed worker: `recoverableSlots()` matches a NULL lease on
+                //    purpose (its "recorded but never claimed" case), so the recovery
+                //    sweep re-dispatches the SAME occurrence on every tick, forever.
+                //    Terminalise it instead: the occurrence is finished, and failed.
+                //
+                //  - the process is going away (`shutdown`). Deliberately leave the Slot
+                //    non-terminal so recovery resumes the same occurrence after restart.
+                if (slotCtx && shouldTerminaliseAbortedSlot(activeAbortOrigin, slotAbandoned)) {
+                    coordinator.finish(slotCtx, schedule, targets);
+                }
+                // Hand the lease back either way: a terminal Slot cannot be re-dispatched,
+                // and a non-terminal one (shutdown) must not wait for its TTL to expire.
                 releaseLease?.();
                 throw error;
             }
@@ -491,12 +534,13 @@ async function createSchedulerRuntime(configPathArg) {
         });
         logger_1.logger.info('='.repeat(60));
     };
-    const cancelActive = (reason) => {
+    const cancelActive = (reason, origin = 'timeout') => {
+        activeAbortOrigin = origin;
         activeDownloadManager?.cancel(reason);
         // Scheduler timeout / process shutdown also stop the lease heartbeat. The run
         // is on its way out (or about to be killed with the process), so it must not
-        // keep the slot locked while it unwinds. A shutdown deliberately leaves the
-        // slot NON-terminal: recovery resumes the same occurrence after restart.
+        // keep the slot locked while it unwinds. Whether the Slot is then terminalised
+        // or left recoverable is decided by `origin` in the abort path of runJob.
         activeLeaseHooks?.stopHeartbeat();
     };
     const abandonActiveRun = (reason) => {
@@ -507,7 +551,7 @@ async function createSchedulerRuntime(configPathArg) {
     };
     const close = () => {
         outboxWorker.stop();
-        cancelActive('process shutdown');
+        cancelActive('process shutdown', 'shutdown');
         if (tokenMaintenance) {
             tokenMaintenance.stop();
         }

package/dist/delivery/OutboxWorker.d.ts

@@ -78,6 +78,8 @@ export declare class OutboxWorker {
     private recordMediaFallback;
     private recordEvent;
     private process;
+    /** Terminal delivery failure: audit it, release the delivery, notify the hooks. */
+    private deadLetter;
     private handleDeliveryAck;
     private cleanup;
 }

package/dist/delivery/OutboxWorker.js

@@ -245,24 +245,21 @@ class OutboxWorker {
             return 'done';
         }
         catch (error) {
-            // Transport-level error (fetch threw) or ack-classified failure: retryable.
             const message = (0, redact_1.redactError)(error).slice(0, 1000);
             const { errorClass } = (0, errorClass_1.classifyError)(error);
+            // A local configuration error is deterministic: every attempt re-reads the
+            // same config, so retrying only parks the row in `retry_wait` until its
+            // attempt budget runs out. Dead-letter it now so it is visible instead.
+            if (errorClass === 'configuration_error') {
+                this.database.outbox.markDead(row.id, message);
+                this.deadLetter(row, `${message} (configuration error)`, errorClass);
+                return 'dead';
+            }
+            // Transport-level error (fetch threw) or ack-classified failure: retryable.
             const delay = backoffDelayMs(row.attempts + 1, this.retryBaseMs, this.retryMaxMs);
             const status = this.database.outbox.markRetry(row.id, Date.now() + delay, message);
             if (status === 'dead') {
-                logger_1.logger.error('Outbox item dead after max attempts', { outboxId: row.id, kind: row.kind, error: message });
-                this.recordEvent(row, {
-                    event: 'outbox.dead',
-                    errorClass,
-                    retryable: false,
-                    countsAsAttempt: 1,
-                    detail: { attempt: row.attempts + 1 },
-                });
-                this.onDead?.(row, message);
-                if (row.deliveryId) {
-                    this.database.deliveries.recordAck(row.deliveryId, { status: 'failed', error: message });
-                }
+                this.deadLetter(row, message, errorClass);
             }
             else {
                 logger_1.logger.warn('Outbox item will retry', { outboxId: row.id, kind: row.kind, attempt: row.attempts + 1, delayMs: delay });
@@ -277,6 +274,21 @@ class OutboxWorker {
             return status;
         }
     }
+    /** Terminal delivery failure: audit it, release the delivery, notify the hooks. */
+    deadLetter(row, message, errorClass) {
+        logger_1.logger.error('Outbox item dead', { outboxId: row.id, kind: row.kind, errorClass, error: message });
+        this.recordEvent(row, {
+            event: 'outbox.dead',
+            errorClass,
+            retryable: false,
+            countsAsAttempt: 1,
+            detail: { attempt: row.attempts + 1 },
+        });
+        this.onDead?.(row, message);
+        if (row.deliveryId) {
+            this.database.deliveries.recordAck(row.deliveryId, { status: 'failed', error: message });
+        }
+    }
     async handleDeliveryAck(row, ack, payload) {
         if (!row.deliveryId)
             return;

package/dist/delivery/errorClass.d.ts

@@ -2,7 +2,7 @@
  * Tiny pure error classification for delivery attempts.
  * Maps a thrown error / HTTP status to a stable audit category.
  */
-export type DeliveryErrorClass = 'dependency_not_ready' | 'network_timeout' | 'rate_limited' | 'remote_5xx' | 'remote_4xx' | 'invalid_payload' | 'telegram_send_failed' | 'duplicate' | 'internal_error';
+export type DeliveryErrorClass = 'dependency_not_ready' | 'network_timeout' | 'rate_limited' | 'remote_5xx' | 'remote_4xx' | 'invalid_payload' | 'telegram_send_failed' | 'configuration_error' | 'duplicate' | 'internal_error';
 export interface ErrorClassification {
     errorClass: DeliveryErrorClass;
     retryable: boolean;

package/dist/delivery/errorClass.js

@@ -4,6 +4,13 @@ exports.classifyError = classifyError;
 /** Classify one failed delivery attempt from its thrown error and/or HTTP status. */
 function classifyError(error, status) {
     const message = error instanceof Error ? error.message : String(error ?? '');
+    // A local ConfigError is thrown before any network call and is deterministic:
+    // retrying re-reads the exact same config, so the attempt budget only parks the
+    // row in `retry_wait` for hours. Terminal for the outbox.
+    if (error?.name === 'ConfigError' ||
+        /does not configure|unsupported delivery target/i.test(message)) {
+        return { errorClass: 'configuration_error', retryable: false };
+    }
     // Explicit HTTP status wins when present.
     if (status === 429)
         return { errorClass: 'rate_limited', retryable: true };

package/dist/notification/NotificationPolicy.d.ts

@@ -16,6 +16,17 @@ export declare class NotificationPolicy {
     private readonly config;
     constructor(database: Database, config: StandaloneConfig);
     private targetName;
+    /**
+     * Delivery targets that can actually RECEIVE an operational notification.
+     *
+     * `delivery.target` names a SUBMISSION endpoint (multipart POST of a work).
+     * Only targets that also declare a `notificationUrl` accept notifications —
+     * the same rule `config/validation.ts` enforces for `noMatchPolicy.notify`
+     * and that `docs/CONFIG.md` documents. A submission endpoint without one
+     * rejects every notification, so enqueuing to it would only grow an outbox
+     * row that can never be delivered.
+     */
+    private notifiableTargets;
     /** Stable slot-scoped keys (two occurrences on one date never collide). */
     static keys: {
         noMatch: (slotId: string, targetId: string) => string;

package/dist/notification/NotificationPolicy.js

@@ -21,6 +21,23 @@ class NotificationPolicy {
     targetName(target) {
         return target.delivery?.target?.trim() || null;
     }
+    /**
+     * Delivery targets that can actually RECEIVE an operational notification.
+     *
+     * `delivery.target` names a SUBMISSION endpoint (multipart POST of a work).
+     * Only targets that also declare a `notificationUrl` accept notifications —
+     * the same rule `config/validation.ts` enforces for `noMatchPolicy.notify`
+     * and that `docs/CONFIG.md` documents. A submission endpoint without one
+     * rejects every notification, so enqueuing to it would only grow an outbox
+     * row that can never be delivered.
+     */
+    notifiableTargets() {
+        const targets = this.config.delivery?.targets ?? {};
+        return new Set(Object.keys(targets).filter((name) => {
+            const target = targets[name];
+            return target?.type === 'httpMultipart' && Boolean(target.notificationUrl?.trim());
+        }));
+    }
     /** Stable slot-scoped keys (two occurrences on one date never collide). */
     static keys = {
         noMatch: (slotId, targetId) => `notification:${slotId}:${targetId}:no-candidate`,
@@ -32,6 +49,10 @@ class NotificationPolicy {
         const name = this.targetName(target);
         if (!name)
             return;
+        // No notifiable endpoint configured: drop the notification instead of
+        // enqueuing it against a submission target that will reject it forever.
+        if (!this.notifiableTargets().has(name))
+            return;
         const label = target.id || target.filterTag || target.tag || target.type;
         if (outcome.kind === 'no_candidate' && target.noMatchPolicy?.notify === true) {
             this.send(name, NotificationPolicy.keys.noMatch(slotId, target.id ?? label), [
@@ -53,11 +74,7 @@ class NotificationPolicy {
     }
     /** One consolidated summary per slot, delivered to every notifying target's endpoint. */
     sendSlotSummary(slot, schedule, rows) {
-        const targets = this.config.delivery?.targets ?? {};
-        const notifiable = new Set(Object.keys(targets).filter((n) => {
-            const target = targets[n];
-            return target?.type === 'httpMultipart' && Boolean(target.notificationUrl?.trim());
-        }));
+        const notifiable = this.notifiableTargets();
         if (notifiable.size === 0 || rows.length === 0)
             return;
         const icon = (s) => s === 'submitted' ? '✅' : s === 'no_candidate' ? '⚠️' : s === 'duplicate' ? '♱' : s === 'delivery_pending' ? '🕓' : '❌';

package/dist/package.json

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

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

@@ -81,6 +81,12 @@ export declare class OutboxRepository extends BaseRepository {
      */
     claimDue(owner: string, leaseMs: number, limit: number, now?: number): OutboxRow[];
     markDone(id: string, now?: number): void;
+    /**
+     * Dead-letter a row whose failure cannot be fixed by retrying — a local
+     * configuration error is re-read identically on every attempt, so scheduling
+     * retries would only keep the row in `retry_wait` until the budget runs out.
+     */
+    markDead(id: string, error: string, now?: number): void;
     /** Schedule a later retry, or flip to dead once attempts are exhausted. */
     markRetry(id: string, nextAt: number, error: string, now?: number): OutboxStatus;
     /** Release a processing row back to pending without counting a retry. */

package/dist/storage/repositories/OutboxRepository.js

@@ -103,6 +103,20 @@ class OutboxRepository extends BaseRepository_1.BaseRepository {
          WHERE id=@id`)
             .run({ id, now });
     }
+    /**
+     * Dead-letter a row whose failure cannot be fixed by retrying — a local
+     * configuration error is re-read identically on every attempt, so scheduling
+     * retries would only keep the row in `retry_wait` until the budget runs out.
+     */
+    markDead(id, error, now = Date.now()) {
+        this.db
+            .prepare(`UPDATE outbox
+         SET attempts=attempts+1, status='dead',
+             lease_owner=NULL, lease_until=NULL,
+             last_error=@error, updated_at=@now
+         WHERE id=@id`)
+            .run({ id, error: error.slice(0, 1000), now });
+    }
     /** Schedule a later retry, or flip to dead once attempts are exhausted. */
     markRetry(id, nextAt, error, now = Date.now()) {
         const row = this.get(id);

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.19.0', commit: '4f4645d49dec' };
+exports.BUILD = { version: '2.19.2', commit: '4b6938041a10' };
 //# sourceMappingURL=version.js.map

package/dist/webui/package.json

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

package/node_modules/@redtidev/pixiv-client/dist/transport/transport.d.ts

@@ -59,6 +59,15 @@ export declare class Transport {
     private maybeTransientRetry;
     private linearBackoffMs;
     private waitRetry;
+    /**
+     * Effective per-attempt signal = the caller's/run cancellation **OR** the
+     * per-request timeout, whichever fires first.
+     *
+     * Both sources must stay armed. A caller signal may not replace the timeout:
+     * that would let a single hung socket wait for the whole schedule timeout
+     * (the caller only cancels at run level). The timeout may not replace the
+     * caller signal either: a cancelled run must not keep its request alive.
+     */
     private withTimeout;
     private safeText;
 }

package/node_modules/@redtidev/pixiv-client/dist/transport/transport.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"transport.d.ts","sourceRoot":"","sources":["../../src/transport/transport.ts"],"names":[],"mappings":"AAIA,OAAO,EAAiB,KAAK,mBAAmB,EAAE,MAAM,eAAe,CAAC;AAaxE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAC3C,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,KAAK,EACV,SAAS,EACT,gBAAgB,EAChB,YAAY,EACZ,cAAc,EAEf,MAAM,UAAU,CAAC;AAElB,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,YAAY,CAAC;IACrB,IAAI,EAAE,mBAAmB,CAAC;IAC1B,IAAI,EAAE,aAAa,CAAC;IACpB,MAAM,CAAC,EAAE,SAAS,CAAC;IACnB,IAAI,CAAC,EAAE,gBAAgB,CAAC;IACxB,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,QAAQ,EAAE,OAAO,CAAC;IAClB,KAAK,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,WAAW,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CAC7D;AAwBD;;;;GAIG;AACH,qBAAa,SAAS;IACpB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;IACjC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAS;IACpC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;IACnC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;IACjC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAe;IACtC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAsB;IAC3C,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAgB;IACrC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAY;IACpC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAmB;IACzC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAY;IACtC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAU;IACnC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAsD;IAE9E,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAa;IAC7C,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAgB;IAC/C,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAyC;gBAEtD,GAAG,EAAE,eAAe;IAiDhC,UAAU,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM;IASrC,qEAAqE;IAC/D,OAAO,CAAC,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,GAAE,cAAmB,GAAG,OAAO,CAAC,CAAC,CAAC;IAK7E,mDAAmD;IAC7C,WAAW,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,GAAE,cAAmB,GAAG,OAAO,CAAC,MAAM,CAAC;IAInF,gFAAgF;IAC1E,WAAW,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,GAAE,cAAmB,GAAG,OAAO,CAAC,WAAW,CAAC;IA0BxF,OAAO,CAAC,IAAI;IAaZ,OAAO,CAAC,WAAW;YAKL,gBAAgB;YAuChB,WAAW;YA6BX,aAAa;IAwB3B,sEAAsE;YACxD,UAAU;IAwCxB,OAAO,CAAC,cAAc;IAKtB,OAAO,CAAC,WAAW;YAoBL,eAAe;YA6Cf,eAAe;IAiD7B,OAAO,CAAC,mBAAmB;IAW3B,OAAO,CAAC,eAAe;YAIT,SAAS;IAWvB,OAAO,CAAC,WAAW;YAaL,QAAQ;CAOvB"}
+{"version":3,"file":"transport.d.ts","sourceRoot":"","sources":["../../src/transport/transport.ts"],"names":[],"mappings":"AAIA,OAAO,EAAiB,KAAK,mBAAmB,EAAE,MAAM,eAAe,CAAC;AAaxE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAC3C,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,KAAK,EACV,SAAS,EACT,gBAAgB,EAChB,YAAY,EACZ,cAAc,EAEf,MAAM,UAAU,CAAC;AAElB,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,YAAY,CAAC;IACrB,IAAI,EAAE,mBAAmB,CAAC;IAC1B,IAAI,EAAE,aAAa,CAAC;IACpB,MAAM,CAAC,EAAE,SAAS,CAAC;IACnB,IAAI,CAAC,EAAE,gBAAgB,CAAC;IACxB,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,QAAQ,EAAE,OAAO,CAAC;IAClB,KAAK,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,WAAW,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CAC7D;AAyCD;;;;GAIG;AACH,qBAAa,SAAS;IACpB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;IACjC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAS;IACpC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;IACnC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;IACjC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAe;IACtC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAsB;IAC3C,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAgB;IACrC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAY;IACpC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAmB;IACzC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAY;IACtC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAU;IACnC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAsD;IAE9E,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAa;IAC7C,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAgB;IAC/C,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAyC;gBAEtD,GAAG,EAAE,eAAe;IAiDhC,UAAU,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM;IASrC,qEAAqE;IAC/D,OAAO,CAAC,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,GAAE,cAAmB,GAAG,OAAO,CAAC,CAAC,CAAC;IAK7E,mDAAmD;IAC7C,WAAW,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,GAAE,cAAmB,GAAG,OAAO,CAAC,MAAM,CAAC;IAInF,gFAAgF;IAC1E,WAAW,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,GAAE,cAAmB,GAAG,OAAO,CAAC,WAAW,CAAC;IA0BxF,OAAO,CAAC,IAAI;IAaZ,OAAO,CAAC,WAAW;YAKL,gBAAgB;YAuChB,WAAW;YA6BX,aAAa;IAwB3B,sEAAsE;YACxD,UAAU;IAwCxB,OAAO,CAAC,cAAc;IAKtB,OAAO,CAAC,WAAW;YAoBL,eAAe;YA6Cf,eAAe;IA+D7B,OAAO,CAAC,mBAAmB;IAW3B,OAAO,CAAC,eAAe;YAIT,SAAS;IAgBvB;;;;;;;;OAQG;IACH,OAAO,CAAC,WAAW;YA+BL,QAAQ;CAOvB"}

package/node_modules/@redtidev/pixiv-client/dist/transport/transport.js

@@ -14,6 +14,20 @@ const APP_HEADERS = {
     'App-OS-Version': '14.6',
     'App-Version': '7.13.3',
 };
+/**
+ * Marker reason for the per-request timeout abort. `withTimeout()` aborts its
+ * own controller with it so the retry path can tell our own timeout apart from
+ * a caller/run cancellation: the caller reason is opaque (the downloader passes
+ * a plain string) and must not be inspected.
+ */
+const TIMEOUT_REASON = '__pixiv_timeout__';
+/** Structural AbortError test: also matches DOMException (not an Error subclass). */
+function isAbortErrorLike(e) {
+    return typeof e === 'object' && e !== null && e.name === 'AbortError';
+}
+function isTimeoutReason(e) {
+    return e instanceof Error && e.message === TIMEOUT_REASON;
+}
 function proxyUrl(p) {
     const protocol = (p.protocol ?? 'http').toLowerCase();
     const auth = p.username && p.password
@@ -341,17 +355,26 @@ class Transport {
         if (e instanceof errors_1.PixivAbortError) {
             return { action: 'throw', error: e };
         }
-        // AbortError from fetch/axios: distinguish our own timeout abort from a
-        // caller-provided signal abort. The internal timeout controller has NO
-        // external signal, so callerAborted cleanly separates the two cases
-        // (undici/axios attach different reasons; do not rely on their internals).
-        if (e instanceof Error && e.name === 'AbortError') {
-            const reason = e.cause;
-            const isOurTimeout = !callerAborted ||
-                (reason instanceof Error && reason.message === '__pixiv_timeout__');
-            if (isOurTimeout) {
-                return this.maybeTransientRetry(new errors_1.PixivTimeoutError(`Request timeout after ${this.timeoutMs}ms`, { endpoint: url, cause: e, code: 'timeout' }), attempt, url);
-            }
+        // Tell our own per-request timeout apart from a caller/run cancellation.
+        // The abort reason is authoritative, not the error shape:
+        //   - our timeout aborts with TIMEOUT_REASON; undici rejects the fetch with
+        //     that reason object directly (so it arrives as a plain Error, NOT an
+        //     AbortError), while abort-wrapping runtimes expose it via `cause`;
+        //   - the caller reason is opaque (a plain string from the downloader), so
+        //     it must be classified from the signal state.
+        const abortCause = e?.cause;
+        if (isTimeoutReason(e) || isTimeoutReason(abortCause)) {
+            return this.maybeTransientRetry(new errors_1.PixivTimeoutError(`Request timeout after ${this.timeoutMs}ms`, { endpoint: url, cause: e, code: 'timeout' }), attempt, url);
+        }
+        if (isAbortErrorLike(e) && !callerAborted) {
+            // An abort we cannot attribute to the caller can only be our own timeout
+            // (the only other abort source on this path).
+            return this.maybeTransientRetry(new errors_1.PixivTimeoutError(`Request timeout after ${this.timeoutMs}ms`, { endpoint: url, cause: e, code: 'timeout' }), attempt, url);
+        }
+        if (callerAborted) {
+            // Run/scheduler cancellation is terminal by definition and must never be
+            // charged to the retry budget (waitRetry would otherwise sit out the
+            // back-off before the next attempt noticed the cancel).
             return { action: 'throw', error: new errors_1.PixivAbortError('Request aborted', { cause: e, endpoint: url }) };
         }
         if (e instanceof errors_1.PixivTimeoutError) {
@@ -373,6 +396,11 @@ class Transport {
         return Math.min(1000 * (attempt + 1), 5000);
     }
     async waitRetry(waitMs, signal) {
+        // An already-aborted signal never fires 'abort' again, so the sleeper would
+        // sit out the entire back-off before the next attempt noticed the cancel.
+        if (signal?.aborted) {
+            throw new errors_1.PixivAbortError('aborted before retry back-off');
+        }
         if (waitMs <= 0)
             return;
         try {
@@ -383,17 +411,41 @@ class Transport {
         }
     }
     // -- helpers ---------------------------------------------------------------
+    /**
+     * Effective per-attempt signal = the caller's/run cancellation **OR** the
+     * per-request timeout, whichever fires first.
+     *
+     * Both sources must stay armed. A caller signal may not replace the timeout:
+     * that would let a single hung socket wait for the whole schedule timeout
+     * (the caller only cancels at run level). The timeout may not replace the
+     * caller signal either: a cancelled run must not keep its request alive.
+     */
     withTimeout(timeoutMs, external) {
-        if (external)
-            return { signal: external, cancel: () => { } };
         const controller = new AbortController();
-        const timer = setTimeout(() => controller.abort(new Error('__pixiv_timeout__')), timeoutMs);
+        const timer = setTimeout(() => controller.abort(new Error(TIMEOUT_REASON)), timeoutMs);
         if (typeof timer.unref === 'function')
             timer.unref();
+        if (!external) {
+            return {
+                signal: controller.signal,
+                cancel: () => {
+                    clearTimeout(timer);
+                },
+            };
+        }
+        // Forward the caller reason verbatim so cancellation stays observable.
+        const onExternalAbort = () => controller.abort(external.reason);
+        if (external.aborted) {
+            onExternalAbort();
+        }
+        else {
+            external.addEventListener('abort', onExternalAbort, { once: true });
+        }
         return {
             signal: controller.signal,
             cancel: () => {
                 clearTimeout(timer);
+                external.removeEventListener('abort', onExternalAbort);
             },
         };
     }

package/node_modules/@redtidev/pixiv-client/dist/transport/transport.js.map

@@ -1 +1 @@
-{"version":3,"file":"transport.js","sourceRoot":"","sources":["../../src/transport/transport.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"transport.js","sourceRoot":"","sources":["../../src/transport/transport.ts"],"names":[],"mappings":"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"}

package/node_modules/@redtidev/pixiv-client/src/transport/__tests__/transport-cancellation.test.ts

@@ -0,0 +1,257 @@
+/**
+ * Per-request timeout *composition* with a caller/run AbortSignal.
+ *
+ * Contract: the signal handed to `fetch` must abort when EITHER
+ *   - the caller's run signal aborts (scheduler cancellation), OR
+ *   - the per-request timeout elapses,
+ * whichever fires first. A caller signal must never *disable* the timeout.
+ *
+ * `TargetSearchRunner` threads the scheduler run signal into the kit search
+ * calls on the documented assumption that "the transport already combines a
+ * signal with its per-request timeout". These tests pin that assumption down
+ * with zero network access: the fake fetch below never settles on its own.
+ *
+ * Fidelity note (Node 24 / undici, verified empirically):
+ *   - `controller.abort(reason)` makes fetch reject with `reason` itself;
+ *   - `controller.abort()` makes fetch reject with a DOMException AbortError.
+ * The fake fetch mirrors both shapes so the transport classifies what it
+ * actually sees in production.
+ */
+import { PixivClient } from '../../client';
+import { StaticTokenProvider } from '../../auth/types';
+import type { FetchLike } from '../../types';
+import { PixivAbortError, PixivNetworkError, PixivTimeoutError } from '../../errors/errors';
+
+const PER_REQUEST_TIMEOUT_MS = 80;
+/** Generous relative to PER_REQUEST_TIMEOUT_MS, tiny relative to jest's 15s. */
+const SETTLE_BUDGET_MS = 1_200;
+
+type SettleOutcome = { settled: true; error?: unknown } | { settled: false };
+
+/** Resolves as soon as `p` settles; reports `settled: false` on the deadline. */
+function settleWithin(p: Promise<unknown>, ms: number): Promise<SettleOutcome> {
+  return new Promise<SettleOutcome>((resolve) => {
+    const timer = setTimeout(() => resolve({ settled: false }), ms);
+    p.then(
+      () => {
+        clearTimeout(timer);
+        resolve({ settled: true });
+      },
+      (error) => {
+        clearTimeout(timer);
+        resolve({ settled: true, error });
+      }
+    );
+  });
+}
+
+/**
+ * A fetch that hangs until its signal aborts, then rejects exactly the way
+ * undici rejects (with the signal reason, or a DOMException named AbortError).
+ * It never applies a timeout of its own: the transport must supply one.
+ */
+function hangingFetch(counter: { calls: number }): FetchLike {
+  return async (_url, init) => {
+    counter.calls++;
+    const signal = init.signal ?? undefined;
+    await new Promise<never>((_resolve, reject) => {
+      const rejectLikeUndici = (): void => {
+        const reason: unknown = signal?.reason;
+        if (reason !== undefined && reason !== null) {
+          reject(reason);
+          return;
+        }
+        const e = new Error('This operation was aborted');
+        e.name = 'AbortError';
+        reject(e);
+      };
+      if (signal?.aborted) {
+        rejectLikeUndici();
+        return;
+      }
+      signal?.addEventListener('abort', rejectLikeUndici, { once: true });
+    });
+    throw new Error('unreachable');
+  };
+}
+
+function makeClient(fetchImpl: FetchLike, retries = 0): PixivClient {
+  return new PixivClient({
+    auth: new StaticTokenProvider('test-token'),
+    fetchImpl,
+    retries,
+    timeoutMs: PER_REQUEST_TIMEOUT_MS,
+    rateLimit: {
+      minIntervalMs: 0,
+      jitterRatio: 0,
+      initialCooldownMs: 60_000,
+      maxCooldownMs: 900_000,
+      openThreshold: 10,
+      decaySuccesses: 99,
+      random: () => 0,
+    },
+  });
+}
+
+function errorOf(outcome: SettleOutcome): unknown {
+  return outcome.settled ? outcome.error : undefined;
+}
+
+describe('per-request timeout survives a caller/run signal', () => {
+  it('a hung search request still times out while a run signal is attached', async () => {
+    const counter = { calls: 0 };
+    const client = makeClient(hangingFetch(counter));
+    const run = new AbortController(); // attached, NOT aborted
+
+    const call = client.illustrations.searchPage({ word: 'test', limit: 1, signal: run.signal }, null);
+    const outcome = await settleWithin(call, SETTLE_BUDGET_MS);
+
+    // Regression: with a caller signal the per-request timeout used to be
+    // skipped entirely, so this promise stayed pending until the whole
+    // schedule timed out.
+    expect(outcome.settled).toBe(true);
+    expect(errorOf(outcome)).toBeInstanceOf(PixivTimeoutError);
+  });
+
+  it('a hung media fetch still times out while a run signal is attached', async () => {
+    const counter = { calls: 0 };
+    const client = makeClient(hangingFetch(counter));
+
+    const call = client.media.fetch('https://i.pximg.net/img-original/img/x.jpg', {
+      signal: new AbortController().signal,
+    });
+    const outcome = await settleWithin(call, SETTLE_BUDGET_MS);
+
+    expect(outcome.settled).toBe(true);
+    expect(errorOf(outcome)).toBeInstanceOf(PixivTimeoutError);
+  });
+
+  it('aborting the run signal still cancels the request, with no timeout masking it', async () => {
+    const counter = { calls: 0 };
+    const client = makeClient(hangingFetch(counter));
+    const run = new AbortController();
+
+    const call = client.illustrations.searchPage({ word: 'test', limit: 1, signal: run.signal }, null);
+    setTimeout(() => run.abort(), 10);
+
+    const outcome = await settleWithin(call, SETTLE_BUDGET_MS);
+    expect(outcome.settled).toBe(true);
+    expect(errorOf(outcome)).toBeInstanceOf(PixivAbortError);
+    expect(counter.calls).toBe(1);
+  });
+
+  it('cancels promptly when the run signal aborts during retry back-off', async () => {
+    let calls = 0;
+    const client = makeClient(
+      async () => {
+        calls++;
+        throw Object.assign(new Error('read ECONNRESET'), { code: 'ECONNRESET' });
+      },
+      3
+    );
+
+    const run = new AbortController();
+    const call = client.illustrations.searchPage({ word: 'test', limit: 1, signal: run.signal }, null);
+    setTimeout(() => run.abort(), 30);
+
+    const outcome = await settleWithin(call, SETTLE_BUDGET_MS);
+    expect(outcome.settled).toBe(true);
+    expect(errorOf(outcome)).toBeInstanceOf(PixivAbortError);
+    // The back-off must not be waited out and the retry budget must not be burned.
+    expect(calls).toBe(1);
+  });
+
+  it('keeps retrying transient network failures while the run signal stays active', async () => {
+    let calls = 0;
+    const client = makeClient(async () => {
+      calls++;
+      throw Object.assign(new Error('read ECONNRESET'), { code: 'ECONNRESET' });
+    }, 2);
+
+    const run = new AbortController();
+    const call = client.illustrations.searchPage({ word: 'test', limit: 1, signal: run.signal }, null);
+    const outcome = await settleWithin(call, 4_000);
+
+    expect(outcome.settled).toBe(true);
+    expect(errorOf(outcome)).toBeInstanceOf(PixivNetworkError);
+    expect(calls).toBe(3); // retries honoured: an attached signal is not a cancellation
+  });
+
+  it('removes its abort listener from the caller signal once the request settles', async () => {
+    const counter = { calls: 0 };
+    const client = makeClient(hangingFetch(counter));
+    const run = new AbortController();
+    const added = jest.spyOn(run.signal, 'addEventListener');
+    const removed = jest.spyOn(run.signal, 'removeEventListener');
+
+    const call = client.illustrations.searchPage({ word: 'test', limit: 1, signal: run.signal }, null);
+    const outcome = await settleWithin(call, SETTLE_BUDGET_MS);
+    expect(outcome.settled).toBe(true);
+
+    expect(added).toHaveBeenCalled();
+    // No listener leak: every abort listener added is taken off again.
+    expect(removed.mock.calls.length).toBe(added.mock.calls.length);
+
+    // Already settled: aborting afterwards must not reject anything a second time.
+    expect(() => run.abort()).not.toThrow();
+  });
+
+  it('without a caller signal the per-request timeout is unchanged', async () => {
+    const counter = { calls: 0 };
+    const client = makeClient(hangingFetch(counter));
+
+    const call = client.illustrations.searchPage({ word: 'test', limit: 1 });
+    const outcome = await settleWithin(call, SETTLE_BUDGET_MS);
+
+    expect(outcome.settled).toBe(true);
+    expect(errorOf(outcome)).toBeInstanceOf(PixivTimeoutError);
+  });
+
+  it('clears the per-request timer once the request settles', async () => {
+    jest.useFakeTimers();
+    try {
+      const counter = { calls: 0 };
+      const client = makeClient(hangingFetch(counter));
+      const baseline = jest.getTimerCount();
+
+      const call = client.illustrations.searchPage({ word: 'test', limit: 1 });
+      void call.catch(() => undefined); // observed below via rejects
+      expect(jest.getTimerCount()).toBeGreaterThan(baseline); // timeout armed
+
+      await jest.advanceTimersByTimeAsync(PER_REQUEST_TIMEOUT_MS);
+
+      await expect(call).rejects.toBeInstanceOf(PixivTimeoutError);
+      // No leaked timer: `cancel()` in the finally block cleared it.
+      expect(jest.getTimerCount()).toBe(baseline);
+    } finally {
+      jest.useRealTimers();
+    }
+  });
+
+  it('settles once and rejects nothing else when a run signal aborts first', async () => {
+    const counter = { calls: 0 };
+    const client = makeClient(hangingFetch(counter));
+    const run = new AbortController();
+    const unhandled: unknown[] = [];
+    const onUnhandled = (reason: unknown): void => {
+      unhandled.push(reason);
+    };
+    process.on('unhandledRejection', onUnhandled);
+    try {
+      // A plain string reason, exactly as DownloadManager.cancel() passes it.
+      const call = client.illustrations.searchPage({ word: 'test', limit: 1, signal: run.signal }, null);
+      run.abort('run cancelled');
+
+      const outcome = await settleWithin(call, SETTLE_BUDGET_MS);
+      expect(outcome.settled).toBe(true);
+      expect(errorOf(outcome)).toBeInstanceOf(PixivAbortError);
+
+      // Outlive the per-request deadline: the cleared timer must not abort (or
+      // reject) anything a second time.
+      await new Promise((resolve) => setTimeout(resolve, PER_REQUEST_TIMEOUT_MS * 2));
+      expect(unhandled).toEqual([]);
+    } finally {
+      process.off('unhandledRejection', onUnhandled);
+    }
+  });
+});

package/node_modules/@redtidev/pixiv-client/src/transport/transport.ts

@@ -46,6 +46,23 @@ const APP_HEADERS = {
   'App-Version': '7.13.3',
 };
 
+/**
+ * Marker reason for the per-request timeout abort. `withTimeout()` aborts its
+ * own controller with it so the retry path can tell our own timeout apart from
+ * a caller/run cancellation: the caller reason is opaque (the downloader passes
+ * a plain string) and must not be inspected.
+ */
+const TIMEOUT_REASON = '__pixiv_timeout__';
+
+/** Structural AbortError test: also matches DOMException (not an Error subclass). */
+function isAbortErrorLike(e: unknown): boolean {
+  return typeof e === 'object' && e !== null && (e as { name?: unknown }).name === 'AbortError';
+}
+
+function isTimeoutReason(e: unknown): boolean {
+  return e instanceof Error && e.message === TIMEOUT_REASON;
+}
+
 
 function proxyUrl(p: ProxyOptions): string {
   const protocol = (p.protocol ?? 'http').toLowerCase();
@@ -419,22 +436,36 @@ export class Transport {
       return { action: 'throw', error: e };
     }
 
-    // AbortError from fetch/axios: distinguish our own timeout abort from a
-    // caller-provided signal abort. The internal timeout controller has NO
-    // external signal, so callerAborted cleanly separates the two cases
-    // (undici/axios attach different reasons; do not rely on their internals).
-    if (e instanceof Error && e.name === 'AbortError') {
-      const reason = (e as { cause?: unknown }).cause;
-      const isOurTimeout =
-        !callerAborted ||
-        (reason instanceof Error && reason.message === '__pixiv_timeout__');
-      if (isOurTimeout) {
-        return this.maybeTransientRetry(
-          new PixivTimeoutError(`Request timeout after ${this.timeoutMs}ms`, { endpoint: url, cause: e, code: 'timeout' }),
-          attempt,
-          url
-        );
-      }
+    // Tell our own per-request timeout apart from a caller/run cancellation.
+    // The abort reason is authoritative, not the error shape:
+    //   - our timeout aborts with TIMEOUT_REASON; undici rejects the fetch with
+    //     that reason object directly (so it arrives as a plain Error, NOT an
+    //     AbortError), while abort-wrapping runtimes expose it via `cause`;
+    //   - the caller reason is opaque (a plain string from the downloader), so
+    //     it must be classified from the signal state.
+    const abortCause = (e as { cause?: unknown } | null)?.cause;
+    if (isTimeoutReason(e) || isTimeoutReason(abortCause)) {
+      return this.maybeTransientRetry(
+        new PixivTimeoutError(`Request timeout after ${this.timeoutMs}ms`, { endpoint: url, cause: e, code: 'timeout' }),
+        attempt,
+        url
+      );
+    }
+
+    if (isAbortErrorLike(e) && !callerAborted) {
+      // An abort we cannot attribute to the caller can only be our own timeout
+      // (the only other abort source on this path).
+      return this.maybeTransientRetry(
+        new PixivTimeoutError(`Request timeout after ${this.timeoutMs}ms`, { endpoint: url, cause: e, code: 'timeout' }),
+        attempt,
+        url
+      );
+    }
+
+    if (callerAborted) {
+      // Run/scheduler cancellation is terminal by definition and must never be
+      // charged to the retry budget (waitRetry would otherwise sit out the
+      // back-off before the next attempt noticed the cancel).
       return { action: 'throw', error: new PixivAbortError('Request aborted', { cause: e, endpoint: url }) };
     }
 
@@ -467,6 +498,11 @@ export class Transport {
   }
 
   private async waitRetry(waitMs: number, signal?: AbortSignal): Promise<void> {
+    // An already-aborted signal never fires 'abort' again, so the sleeper would
+    // sit out the entire back-off before the next attempt noticed the cancel.
+    if (signal?.aborted) {
+      throw new PixivAbortError('aborted before retry back-off');
+    }
     if (waitMs <= 0) return;
     try {
       await this.sleeper(waitMs, signal);
@@ -477,15 +513,42 @@ export class Transport {
 
   // -- helpers ---------------------------------------------------------------
 
+  /**
+   * Effective per-attempt signal = the caller's/run cancellation **OR** the
+   * per-request timeout, whichever fires first.
+   *
+   * Both sources must stay armed. A caller signal may not replace the timeout:
+   * that would let a single hung socket wait for the whole schedule timeout
+   * (the caller only cancels at run level). The timeout may not replace the
+   * caller signal either: a cancelled run must not keep its request alive.
+   */
   private withTimeout(timeoutMs: number, external?: AbortSignal): { signal: AbortSignal; cancel: () => void } {
-    if (external) return { signal: external, cancel: () => {} };
     const controller = new AbortController();
-    const timer = setTimeout(() => controller.abort(new Error('__pixiv_timeout__')), timeoutMs);
+    const timer = setTimeout(() => controller.abort(new Error(TIMEOUT_REASON)), timeoutMs);
     if (typeof timer.unref === 'function') timer.unref();
+
+    if (!external) {
+      return {
+        signal: controller.signal,
+        cancel: () => {
+          clearTimeout(timer);
+        },
+      };
+    }
+
+    // Forward the caller reason verbatim so cancellation stays observable.
+    const onExternalAbort = (): void => controller.abort(external.reason);
+    if (external.aborted) {
+      onExternalAbort();
+    } else {
+      external.addEventListener('abort', onExternalAbort, { once: true });
+    }
+
     return {
       signal: controller.signal,
       cancel: () => {
         clearTimeout(timer);
+        external.removeEventListener('abort', onExternalAbort);
       },
     };
   }

package/package.json

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