pixivflow 2.24.0 → 2.26.0

package/dist/download/NovelDownloader.js

@@ -38,6 +38,7 @@ const logger_1 = require("../logger");
 const node_path_1 = require("node:path");
 const language_detection_1 = require("../utils/language-detection");
 const novelMarkers_1 = require("./novelMarkers");
+const zip_1 = require("../utils/zip");
 const LANGUAGE_CACHE_TTL_MS = 7 * 24 * 60 * 60 * 1000;
 class NovelDownloader {
     client;
@@ -185,6 +186,20 @@ class NovelDownloader {
                 logger_1.logger.info(`Novel ${detail.id} inline images: ${assets.filter((a) => a.status === 'downloaded').length}/${assets.length} downloaded`, { novelId: detail.id });
             }
         }
+        // Rich-media markdown sidecar (RFC 1 Phase 2): same path as the .txt
+        // (compat format stays), inline images become relative ![](images/x.jpg)
+        // refs so a later TelePress/TelePost phase can render the Telegraph page.
+        let richMediaPath;
+        if (assets.some((a) => a.status === 'downloaded')) {
+            try {
+                const mdPath = await this.fileService.saveText(`${header}\n${(0, novelMarkers_1.renderNovelMarkdown)(text, assets)}`, fileName.replace(/\.txt$/, '.md'), metadata);
+                richMediaPath = mdPath;
+                logger_1.logger.info(`Saved novel ${detail.id} rich-media markdown sidecar`, { filePath: mdPath });
+            }
+            catch (error) {
+                logger_1.logger.warn(`Failed to save rich-media markdown sidecar for novel ${detail.id}: ${error instanceof Error ? error.message : String(error)}`);
+            }
+        }
         const pixivMetadata = {
             pixiv_id: detail.id,
             title: detail.title,
@@ -231,6 +246,33 @@ class NovelDownloader {
         catch (error) {
             logger_1.logger.warn(`Failed to save metadata for novel ${detail.id}: ${error instanceof Error ? error.message : String(error)}`);
         }
+        // Rich-media ZIP archive (Phase 3): a save-only download package carrying
+        // txt + md + metadata + images. The md stays an internal render input, never
+        // a user-facing attachment; txt remains the authoritative/compat file.
+        let archivePath;
+        if (assets.some((a) => a.status === 'downloaded')) {
+            const zipName = this.fileService.sanitizeFileName(`${detail.id}_${detail.title}.zip`);
+            const dest = (0, node_path_1.join)((0, node_path_1.dirname)(filePath), zipName);
+            const entries = [
+                { name: fileName, sourcePath: filePath },
+            ];
+            if (richMediaPath)
+                entries.push({ name: `${fileName.replace(/\.txt$/, '.md')}`, sourcePath: richMediaPath });
+            if (metadataPath)
+                entries.push({ name: `${fileName}.json`, sourcePath: metadataPath });
+            for (const a of assets) {
+                if (a.status === 'downloaded' && a.localPath) {
+                    entries.push({ name: `images/${(0, node_path_1.basename)(a.localPath)}`, sourcePath: a.localPath });
+                }
+            }
+            try {
+                archivePath = await (0, zip_1.createZipArchive)(dest, entries);
+                logger_1.logger.info(`Saved novel ${detail.id} zip archive`, { filePath: archivePath });
+            }
+            catch (error) {
+                logger_1.logger.warn(`Failed to save zip archive for novel ${detail.id}: ${error instanceof Error ? error.message : String(error)}`);
+            }
+        }
         this.database.insertDownload({
             pixivId: String(detail.id),
             type: 'novel',
@@ -252,7 +294,7 @@ class NovelDownloader {
             type: 'novel',
             title: detail.title,
             tags: tags.map((item) => item.name).filter(Boolean),
-            files: [filePath],
+            files: archivePath ? [filePath, archivePath] : [filePath],
             cleanupFiles: metadataPath ? [metadataPath] : [],
             spoiler: (detail.x_restrict ?? 0) > 0,
             xRestrict: detail.x_restrict,

package/dist/download/novelMarkers.d.ts

@@ -51,4 +51,12 @@ export declare function scanNovelMarkers(source: string): NovelMarker[];
 export declare function extractNovelAssets(text: string, response?: Pick<PixivNovelTextResponse, 'images' | 'illusts'>): NovelAsset[];
 /** Minimal self-check for the scanner's double-bracket handling. */
 export declare function demo(): void;
+/**
+ * Rich-media Markdown sidecar (RFC 1 Phase 2). Rebuilds the novel body with
+ * each downloaded inline resource as a relative `![](images/xxx.jpg)` reference
+ * (the `.txt` file remains the authoritative/compat format and its path is
+ * unchanged). Markers whose asset is `unavailable`/`failed` are left in the
+ * original text so nothing is silently dropped (partial success).
+ */
+export declare function renderNovelMarkdown(source: string, assets: NovelAsset[]): string;
 //# sourceMappingURL=novelMarkers.d.ts.map

package/dist/download/novelMarkers.js

@@ -3,6 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.scanNovelMarkers = scanNovelMarkers;
 exports.extractNovelAssets = extractNovelAssets;
 exports.demo = demo;
+exports.renderNovelMarkdown = renderNovelMarkdown;
+const node_path_1 = require("node:path");
 const linkRegex = /https?:\/\/\S+/;
 function parseMarker(span) {
     if (span.startsWith('[newpage]'))
@@ -119,4 +121,24 @@ function demo() {
         assert(Array.isArray(scanNovelMarkers(s)) && scanNovelMarkers(s).length > 0, 'markers parsed');
     }
 }
+/**
+ * Rich-media Markdown sidecar (RFC 1 Phase 2). Rebuilds the novel body with
+ * each downloaded inline resource as a relative `![](images/xxx.jpg)` reference
+ * (the `.txt` file remains the authoritative/compat format and its path is
+ * unchanged). Markers whose asset is `unavailable`/`failed` are left in the
+ * original text so nothing is silently dropped (partial success).
+ */
+function renderNovelMarkdown(source, assets) {
+    const downloaded = new Map(assets
+        .filter((a) => a.status === 'downloaded' && Boolean(a.localPath))
+        .map((a) => [a.marker, a]));
+    return scanNovelMarkers(source)
+        .map((marker) => {
+        if (marker.type === 'text')
+            return marker.value;
+        const asset = downloaded.get(marker.raw);
+        return asset ? `![](images/${(0, node_path_1.basename)(asset.localPath)})` : marker.raw;
+    })
+        .join('');
+}
 //# sourceMappingURL=novelMarkers.js.map

package/dist/package.json

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

package/dist/utils/zip.d.ts

@@ -0,0 +1,14 @@
+export interface ArchiveEntry {
+    /** Path the file is stored under inside the zip (e.g. "images/001.jpg"). */
+    name: string;
+    /** Absolute path of the file on disk. */
+    sourcePath: string;
+}
+/**
+ * Create a zip archive at `destPath` containing `entries` (order preserved).
+ * Returns destPath on success; on failure removes a partial destination so a
+ * caller never hands a half-written archive to a delivery. Pure FS helper — no
+ * domain logic.
+ */
+export declare function createZipArchive(destPath: string, entries: ArchiveEntry[]): Promise<string>;
+//# sourceMappingURL=zip.d.ts.map

package/dist/utils/zip.js

@@ -0,0 +1,44 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createZipArchive = createZipArchive;
+const node_fs_1 = require("node:fs");
+const node_fs_2 = require("node:fs");
+const node_module_1 = require("node:module");
+// archiver ships no matching TS factory types; bind it at runtime via
+// createRequire and keep a minimal local contract (nothing Pixiv-specific).
+const archiver = (0, node_module_1.createRequire)(__filename)('archiver');
+/**
+ * Create a zip archive at `destPath` containing `entries` (order preserved).
+ * Returns destPath on success; on failure removes a partial destination so a
+ * caller never hands a half-written archive to a delivery. Pure FS helper — no
+ * domain logic.
+ */
+async function createZipArchive(destPath, entries) {
+    const output = (0, node_fs_1.createWriteStream)(destPath);
+    const archive = archiver('zip', { zlib: { level: 9 } });
+    const settled = new Promise((resolve, reject) => {
+        output.on('close', () => resolve(destPath));
+        output.on('error', reject);
+        archive.on('error', reject);
+    });
+    try {
+        archive.pipe(output);
+        for (const e of entries) {
+            archive.file(e.sourcePath, { name: e.name });
+        }
+        await archive.finalize();
+        await settled;
+        await node_fs_2.promises.access(destPath);
+        return destPath;
+    }
+    catch (error) {
+        try {
+            await node_fs_2.promises.rm(destPath, { force: true });
+        }
+        catch {
+            /* best-effort cleanup */
+        }
+        throw new Error(`Failed to create zip archive: ${error instanceof Error ? error.message : String(error)}`);
+    }
+}
+//# sourceMappingURL=zip.js.map

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.24.0', commit: '8c7fa0a4b74b' };
+exports.BUILD = { version: '2.26.0', commit: '299b0e29cecb' };
 //# sourceMappingURL=version.js.map

package/dist/webui/package.json

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

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "pixivflow",
-  "version": "2.24.0",
-  "description": "\ud83c\udfa8 Pixiv \u4e0b\u8f7d\u3001\u7b5b\u9009\u4e0e\u81ea\u52a8\u6536\u96c6\u5de5\u5177 - \u6279\u91cf\u4e0b\u8f7d\u63d2\u753b\u548c\u5c0f\u8bf4\u3001\u6309\u6807\u7b7e/\u70ed\u5ea6/\u65e5\u671f\u7b5b\u9009\u3001\u5b9a\u65f6\u4efb\u52a1\u4e0e\u53ef\u9760 HTTP \u4ea4\u4ed8 | Pixiv downloader and automation toolkit with filtering, scheduling and reliable HTTP delivery",
+  "version": "2.26.0",
+  "description": "🎨 Pixiv 下载、筛选与自动收集工具 - 批量下载插画和小说、按标签/热度/日期筛选、定时任务与可靠 HTTP 交付 | Pixiv downloader and automation toolkit with filtering, scheduling and reliable HTTP delivery",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/redtidev1918/PixivFlow.git"
@@ -116,6 +116,7 @@
   },
   "dependencies": {
     "@redtidev/pixiv-client": "0.1.0",
+    "archiver": "^7.0.1",
     "axios": "^1.20.0",
     "cors": "^2.8.6",
     "cron-parser": "^4.9.0",