pixivflow 3.4.2 → 3.4.3

package/dist/delivery/HttpMultipartDelivery.js

@@ -43,6 +43,7 @@ const node_crypto_1 = require("node:crypto");
 const node_stream_1 = require("node:stream");
 const logger_1 = require("../logger");
 const DeliveryAck_1 = require("./DeliveryAck");
+const refetchProvenance_1 = require("./refetchProvenance");
 const redact_1 = require("../utils/redact");
 /** Render an ISO timestamp to YYYY-MM-DD (create_date is JST). */
 function formatPublishedDate(iso) {
@@ -476,7 +477,10 @@ function buildTemplateVariables(request) {
         // Remote manual replacement ("重抓") request UUID; empty for scheduled runs.
         // Carried through the delivery payload context (extraContext) so the
         // receiving service can correlate the review with its refetch attempt.
-        refetchRequestId: c.refetchRequestId ?? '',
+        // Canonicalized at this last boundary before the wire: the receiver accepts
+        // only a canonical dashed lowercase UUID and rejects the whole submission
+        // otherwise (see delivery/refetchProvenance.ts).
+        refetchRequestId: (0, refetchProvenance_1.canonicalRefetchRequestId)(c.refetchRequestId),
     };
 }
 /**

package/dist/delivery/refetchProvenance.d.ts

@@ -0,0 +1,38 @@
+/**
+ * The `refetch_request_id` wire contract.
+ *
+ * The receiving service (TelePost) validates this field as a *canonical* dashed
+ * lowercase UUID — `utils/api_server.py:706-715` answers HTTP 400
+ * `invalid_refetch_provenance` ("refetch_request_id 必须是 UUID") for anything
+ * else — and it rejects the whole submission, permanently, before any review
+ * exists. It is strict on purpose: the stored value must later match the
+ * refetch attempt's own `request_id`, which TelePost generates as
+ * `str(uuid.uuid4())`.
+ *
+ * Callers hand us their key in whatever spelling they generated it. Production
+ * incident 2026-09-27: a manual refetch arrived at the delivery with the bare
+ * 32-hex key `1e22b55cb33e47289f30c62e8ee1e11f` — a v4 UUID whose dashes were
+ * stripped — and the run ended in
+ * `permanent delivery failure: delivery endpoint HTTP 400:
+ *  {"code":"invalid_refetch_provenance","message":"refetch_request_id 必须是 UUID"}`.
+ *
+ * So the boundary canonicalizes instead of forwarding the raw key:
+ *
+ *   - a UUID in any spelling we can recognize (dashed, undashed, UPPER, braces,
+ *     `urn:uuid:` prefix) becomes the canonical dashed lowercase form, which
+ *     keeps the receiving service's identity match intact;
+ *   - a value that is not a UUID at all becomes `''` — an unusable provenance
+ *     must never fail an otherwise valid delivery, and the empty value is
+ *     already the documented shape of a scheduled (non-refetch) delivery.
+ *
+ * Identity is never touched here: the consumer's own idempotency key keeps its
+ * exact spelling as the durable `manual_request_id` (slot identity), and only
+ * the payload field that crosses the wire is normalized.
+ */
+/**
+ * Canonical dashed lowercase UUID for `value`, or `''` when `value` is not a
+ * UUID. Mirrors Python's `uuid.UUID()` leniency exactly: only hyphens may be
+ * removed, and what remains must be 32 hex digits.
+ */
+export declare function canonicalRefetchRequestId(value: unknown): string;
+//# sourceMappingURL=refetchProvenance.d.ts.map

package/dist/delivery/refetchProvenance.js

@@ -0,0 +1,55 @@
+"use strict";
+/**
+ * The `refetch_request_id` wire contract.
+ *
+ * The receiving service (TelePost) validates this field as a *canonical* dashed
+ * lowercase UUID — `utils/api_server.py:706-715` answers HTTP 400
+ * `invalid_refetch_provenance` ("refetch_request_id 必须是 UUID") for anything
+ * else — and it rejects the whole submission, permanently, before any review
+ * exists. It is strict on purpose: the stored value must later match the
+ * refetch attempt's own `request_id`, which TelePost generates as
+ * `str(uuid.uuid4())`.
+ *
+ * Callers hand us their key in whatever spelling they generated it. Production
+ * incident 2026-09-27: a manual refetch arrived at the delivery with the bare
+ * 32-hex key `1e22b55cb33e47289f30c62e8ee1e11f` — a v4 UUID whose dashes were
+ * stripped — and the run ended in
+ * `permanent delivery failure: delivery endpoint HTTP 400:
+ *  {"code":"invalid_refetch_provenance","message":"refetch_request_id 必须是 UUID"}`.
+ *
+ * So the boundary canonicalizes instead of forwarding the raw key:
+ *
+ *   - a UUID in any spelling we can recognize (dashed, undashed, UPPER, braces,
+ *     `urn:uuid:` prefix) becomes the canonical dashed lowercase form, which
+ *     keeps the receiving service's identity match intact;
+ *   - a value that is not a UUID at all becomes `''` — an unusable provenance
+ *     must never fail an otherwise valid delivery, and the empty value is
+ *     already the documented shape of a scheduled (non-refetch) delivery.
+ *
+ * Identity is never touched here: the consumer's own idempotency key keeps its
+ * exact spelling as the durable `manual_request_id` (slot identity), and only
+ * the payload field that crosses the wire is normalized.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.canonicalRefetchRequestId = canonicalRefetchRequestId;
+/**
+ * Canonical dashed lowercase UUID for `value`, or `''` when `value` is not a
+ * UUID. Mirrors Python's `uuid.UUID()` leniency exactly: only hyphens may be
+ * removed, and what remains must be 32 hex digits.
+ */
+function canonicalRefetchRequestId(value) {
+    if (typeof value !== 'string')
+        return '';
+    let candidate = value.trim().toLowerCase();
+    if (!candidate)
+        return '';
+    if (candidate.startsWith('urn:uuid:'))
+        candidate = candidate.slice('urn:uuid:'.length);
+    if (candidate.startsWith('{') && candidate.endsWith('}'))
+        candidate = candidate.slice(1, -1);
+    const hex = candidate.replace(/-/g, '');
+    if (!/^[0-9a-f]{32}$/.test(hex))
+        return '';
+    return `${hex.slice(0, 8)}-${hex.slice(8, 12)}-${hex.slice(12, 16)}-${hex.slice(16, 20)}-${hex.slice(20)}`;
+}
+//# sourceMappingURL=refetchProvenance.js.map

package/dist/download/handlers/deliveryContext.d.ts

@@ -10,7 +10,11 @@ import { TargetConfig } from '../../config';
  * `refetchRequestId` is the request UUID of a remote manual replacement ("重抓")
  * that produced this delivery; it is empty for scheduled occurrences. The
  * receiving service (TelePost) correlates the incoming review with the refetch
- * attempt on this id.
+ * attempt on this id, and validates it as a canonical UUID — see
+ * `delivery/refetchProvenance.ts` for why an unusable key becomes empty instead
+ * of failing the whole delivery. The consumer's idempotency key itself keeps its
+ * exact spelling as the durable slot identity; only this wire field is
+ * normalized.
  */
 export declare function deliveryContextFields(target: TargetConfig): Record<string, unknown>;
 //# sourceMappingURL=deliveryContext.d.ts.map

package/dist/download/handlers/deliveryContext.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.deliveryContextFields = deliveryContextFields;
+const logger_1 = require("../../logger");
+const refetchProvenance_1 = require("../../delivery/refetchProvenance");
 /**
  * Delivery payload context for one target run, merging schedule/slot provenance
  * with the optional remote manual replacement identity.
@@ -12,12 +14,34 @@ exports.deliveryContextFields = deliveryContextFields;
  * `refetchRequestId` is the request UUID of a remote manual replacement ("重抓")
  * that produced this delivery; it is empty for scheduled occurrences. The
  * receiving service (TelePost) correlates the incoming review with the refetch
- * attempt on this id.
+ * attempt on this id, and validates it as a canonical UUID — see
+ * `delivery/refetchProvenance.ts` for why an unusable key becomes empty instead
+ * of failing the whole delivery. The consumer's idempotency key itself keeps its
+ * exact spelling as the durable slot identity; only this wire field is
+ * normalized.
  */
 function deliveryContextFields(target) {
     const ec = target.delivery;
     const slotContext = ec?.slotContext;
     const executionContext = ec?.executionContext;
+    const manualRequestId = slotContext?.manualRequestId ?? '';
+    const refetchRequestId = (0, refetchProvenance_1.canonicalRefetchRequestId)(manualRequestId);
+    if (manualRequestId && !refetchRequestId) {
+        // Visible, not silent: the delivery still goes out (the receiving service
+        // treats an empty provenance as "not a refetch"), but the operator must be
+        // able to see that this manual run cannot be correlated remotely.
+        logger_1.logger.warn('Manual refetch request id is not a UUID; sending an empty refetch_request_id so the delivery is not rejected', {
+            slotId: slotContext?.slotId ?? '',
+            manualRequestIdLength: manualRequestId.length,
+            manualRequestIdPrefix: manualRequestId.slice(0, 8),
+        });
+    }
+    else if (manualRequestId && manualRequestId !== refetchRequestId) {
+        logger_1.logger.info('Canonicalized the manual refetch request id for the delivery payload', {
+            slotId: slotContext?.slotId ?? '',
+            canonicalRefetchRequestId: refetchRequestId,
+        });
+    }
     return {
         scheduleId: executionContext?.scheduleId ?? '',
         executionId: executionContext?.slotId ?? '',
@@ -26,7 +50,7 @@ function deliveryContextFields(target) {
         slotId: slotContext?.slotId ?? executionContext?.slotId ?? '',
         slotName: slotContext?.slotName ?? executionContext?.slotName ?? '',
         slotDate: slotContext?.slotDate ?? executionContext?.slotDate ?? '',
-        refetchRequestId: slotContext?.manualRequestId ?? '',
+        refetchRequestId,
     };
 }
 //# sourceMappingURL=deliveryContext.js.map

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "type": "commonjs",
   "name": "pixivflow",
-  "version": "3.4.2",
+  "version": "3.4.3",
   "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: '3.4.2', commit: '4db0bf21a785' };
+exports.BUILD = { version: '3.4.3', commit: '74ffa4d29ec2' };
 //# sourceMappingURL=version.js.map

package/dist/webui/package.json

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

package/package.json

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