javdict 1.3.0 → 1.3.1

package/index.js

@@ -24,29 +24,32 @@ program
     .option('-l, --lang <lang>', '显示语言 zh/en/jp/kr/de', 'zh')
     .action(async (id, options) => {
 
+        const lang = options.lang || 'zh';
+        const t = getLang(lang);   // 统一获取语言包
+
         if (options.setup) {
             console.log('');
-            console.log(chalk.yellow('=== 配置 JAVDB Cookie（可选）==='));
+            console.log(chalk.yellow('=== ' + (t.setupTitle || '配置 JAVDB Cookie（可选）') + ' ==='));
             console.log('');
-            console.log('不配置也可以正常使用，配置后覆盖率更高。');
+            console.log(t.setupDesc || '不配置也可以正常使用，配置后覆盖率更高。');
             console.log('');
-            console.log('获取步骤：');
-            console.log('  1. Chrome 打开 https://javdb.com 并登录账号');
-            console.log('  2. 安装插件 "Get cookies.txt LOCALLY"');
-            console.log('  3. 导出 Cookie 文件，找到 _jdb_session 那行');
-            console.log('  4. 复制最后一列的值粘贴到下面');
+            console.log(t.setupSteps || '获取步骤：');
+            console.log('  1. ' + (t.setupStep1 || 'Chrome 打开 https://javdb.com 并登录账号'));
+            console.log('  2. ' + (t.setupStep2 || '安装插件 "Get cookies.txt LOCALLY"'));
+            console.log('  3. ' + (t.setupStep3 || '导出 Cookie 文件，找到 _jdb_session 那行'));
+            console.log('  4. ' + (t.setupStep4 || '复制最后一列的值粘贴到下面'));
             console.log('');
 
             const rl = createInterface({ input: process.stdin, output: process.stdout });
             await new Promise((resolve) => {
-                rl.question(chalk.cyan('请粘贴 _jdb_session 的值（直接回车跳过）: '), (session) => {
+                rl.question(chalk.cyan((t.setupPrompt || '请粘贴 _jdb_session 的值（直接回车跳过）: ')), (session) => {
                     rl.close();
                     if (!session.trim()) {
-                        console.log(chalk.gray('\n已跳过，使用 JAVBUS + JavLibrary 作为数据源。'));
+                        console.log(chalk.gray('\n' + (t.setupSkipped || '已跳过，使用 JAVBUS + JavLibrary 作为数据源。')));
                     } else {
                         setConfig({ session: session.trim() });
-                        console.log(chalk.green('\n✅ 配置保存成功！'));
-                        console.log(chalk.gray('保存位置: ~/.config/javinfo/config.json'));
+                        console.log(chalk.green('\n✅ ' + (t.setupSuccess || '配置保存成功！')));
+                        console.log(chalk.gray((t.setupSavePath || '保存位置: ~/.config/javinfo/config.json')));
                     }
                     console.log('');
                     resolve();
@@ -56,7 +59,7 @@ program
         }
 
         if (options.clearCache) {
-            clearCache();
+            clearCache(lang);
             process.exit(0);
         }
 
@@ -65,11 +68,10 @@ program
             process.exit(0);
         }
 
-        const t = getLang(options.lang || 'zh');
         const spinner = ora(`${t.searching} ${id.toUpperCase()} ...`).start();
 
         try {
-            const result = await search(id.toUpperCase());
+            const result = await search(id.toUpperCase(), lang);
             spinner.stop();
 
             if (!result) {
@@ -81,7 +83,7 @@ program
                 process.exit(1);
             }
 
-            display(result, options.raw, options.lang || 'zh');
+            display(result, options.raw, lang);
         } catch (err) {
             spinner.stop();
             console.error(`\n${t.queryFailed}:`, err.message);

package/lib/cache.js

@@ -1,6 +1,7 @@
 import { readFileSync, writeFileSync, existsSync, mkdirSync } from 'fs';
 import { homedir } from 'os';
 import { join } from 'path';
+import { getLang } from './i18n.js';
 
 // 缓存文件存放在用户主目录下，和 yddict 的做法一致
 const CACHE_DIR = join(homedir(), '.config', 'javinfo');
@@ -14,7 +15,6 @@ function loadCache() {
     try {
         return JSON.parse(readFileSync(CACHE_FILE, 'utf-8'));
     } catch {
-        // 文件损坏就当缓存不存在
         return {};
     }
 }
@@ -31,7 +31,6 @@ export function getCache(id) {
     const entry = cache[id];
     if (!entry) return null;
 
-    // 检查是否过期
     const isExpired = Date.now() - entry.cachedAt > TTL;
     if (isExpired) return null;
 
@@ -47,10 +46,20 @@ export function setCache(id, data) {
     saveCache(cache);
 }
 
-export function clearCache() {
-    if (existsSync(CACHE_FILE)) {
-        writeFileSync(CACHE_FILE, '{}', 'utf-8');
-        console.log('缓存已清空');
+// 清空缓存（已支持多语言）
+export function clearCache(lang = 'zh') {
+    const t = getLang(lang);
+
+    try {
+        if (existsSync(CACHE_FILE)) {
+            writeFileSync(CACHE_FILE, '{}', 'utf-8');
+            console.log(t.cacheCleared);
+        } else {
+            console.log(t.cacheCleared);
+        }
+    } catch (err) {
+        console.error(`${t.cacheClearFailed}: ${err.message}`);
+        console.error(`${t.cachePath}: ${CACHE_FILE}`);
     }
 }
 

package/lib/fetcher.js

@@ -2,6 +2,7 @@ import { execSync } from 'child_process';
 import * as cheerio from 'cheerio';
 import { getCache, setCache, getConfig } from './cache.js';
 import chalk from 'chalk';
+import {getLang} from "./i18n.js";
 
 // ─── 通用请求函数（JAVBUS / JavLibrary 使用）────────────
 function fetchHtml(url, cookie = '') {
@@ -322,13 +323,15 @@ function parseJavdb(html, queryId) {
     return result.title ? result : null;
 }
 
-// ─── 主入口：依次尝试三个数据源 ─────────────────────────
-export async function search(id) {
-    // FC2 格式识别：031926-100 → 031926_100（JAVDB 存储格式）
+// ─── 主入口：依次尝试数据源 ─────────────────────────
+export async function search(id, lang = 'zh') {
+    const t = getLang(lang);
+
+    // FC2 格式识别：031926-100 → 031926_100
     let searchId = id;
     if (/^\d{5,6}-\d+$/.test(id)) {
-        searchId = id.replace(/-/g, '_');  // 全局替换，更安全
-        console.log(chalk.gray(`  识别为FC2格式的车牌号: ${id}`));
+        searchId = id.replace(/-/g, '_');
+        console.log(chalk.gray(`  ${t.fc2Detected}: ${id} → ${searchId}`));
     }
 
     const cached = getCache(id);

package/lib/i18n.js

@@ -17,8 +17,21 @@ export const messages = {
         notFound: '未找到番号',
         queryFailed: '查询失败',
         cacheCleared: '缓存已清空',
-        fc2Detected: 'FC2番号已转换为',
+        cacheClearFailed: '清空缓存失败',
+        cachePath: '缓存路径',
+        fc2Detected: '识别为FC2格式的车牌号',
         windowsHint: '温馨提示: 此番号需要JAVDB数据源，Windows暂不支持~',
+        setupTitle: '配置 JAVDB Cookie（可选）',
+        setupDesc: '不配置也可以正常使用，配置后覆盖率更高。',
+        setupSteps: '获取步骤：',
+        setupStep1: 'Chrome 打开 https://javdb.com 并登录账号',
+        setupStep2: '安装插件 "Get cookies.txt LOCALLY"',
+        setupStep3: '导出 Cookie 文件，找到 _jdb_session 那行',
+        setupStep4: '复制最后一列的值粘贴到下面',
+        setupPrompt: '请粘贴 _jdb_session 的值（直接回车跳过）: ',
+        setupSkipped: '已跳过，使用 JAVBUS + JavLibrary 作为数据源。',
+        setupSuccess: '配置保存成功！',
+        setupSavePath: '保存位置: ~/.config/javinfo/config.json',
     },
     en: {
         actress: 'Actress',
@@ -38,8 +51,21 @@ export const messages = {
         notFound: 'Title not found',
         queryFailed: 'Query failed',
         cacheCleared: 'Cache cleared',
+        cacheClearFailed: 'Failed to clear cache',
+        cachePath: 'Cache path',
         fc2Detected: 'FC2 format detected',
         windowsHint: 'Note: This title requires JAVDB, which is unavailable on Windows.',
+        setupTitle: 'Setup JAVDB Cookie (Optional)',
+        setupDesc: 'You can use without configuration, but adding it improves coverage.',
+        setupSteps: 'Steps to get cookie:',
+        setupStep1: 'Open https://javdb.com in Chrome and log in',
+        setupStep2: 'Install extension "Get cookies.txt LOCALLY"',
+        setupStep3: 'Export cookies and find the _jdb_session line',
+        setupStep4: 'Copy the last column value and paste below',
+        setupPrompt: 'Paste the value of _jdb_session (press Enter to skip): ',
+        setupSkipped: 'Skipped. Using JAVBUS + JavLibrary as data sources.',
+        setupSuccess: 'Configuration saved successfully!',
+        setupSavePath: 'Saved to: ~/.config/javinfo/config.json',
     },
     jp: {
         actress: '女優',
@@ -59,8 +85,21 @@ export const messages = {
         notFound: '番号が見つかりません',
         queryFailed: '検索失敗',
         cacheCleared: 'キャッシュを削除しました',
-        fc2Detected: 'FC2番号を変換しました',
+        cacheClearFailed: 'キャッシュの削除に失敗しました',
+        cachePath: 'キャッシュパス',
+        fc2Detected: 'FC2番号を検出しました',
         windowsHint: '注意: この番号はJAVDBが必要ですが、WindowsではJAVDBが利用できません。',
+        setupTitle: 'JAVDB Cookieの設定（オプション）',
+        setupDesc: '設定しなくても使用できますが、設定すると検索範囲が広がります。',
+        setupSteps: '取得手順：',
+        setupStep1: 'Chromeで https://javdb.com を開いてログイン',
+        setupStep2: '拡張機能 "Get cookies.txt LOCALLY" をインストール',
+        setupStep3: 'Cookieをエクスポートし、_jdb_session の行を探す',
+        setupStep4: '最後の列の値をコピーして以下に貼り付け',
+        setupPrompt: '_jdb_session の値を貼り付けてください（Enterでスキップ）: ',
+        setupSkipped: 'スキップしました。JAVBUS + JavLibrary をデータソースとして使用します。',
+        setupSuccess: '設定を保存しました！',
+        setupSavePath: '保存場所: ~/.config/javinfo/config.json',
     },
     kr: {
         actress: '여배우',
@@ -80,8 +119,21 @@ export const messages = {
         notFound: '번호를 찾을 수 없습니다',
         queryFailed: '검색 실패',
         cacheCleared: '캐시가 삭제되었습니다',
-        fc2Detected: 'FC2 번호 변환됨',
+        cacheClearFailed: '캐시 삭제 실패',
+        cachePath: '캐시 경로',
+        fc2Detected: 'FC2 형식 감지됨',
         windowsHint: '알림: 이 번호는 JAVDB가 필요하지만 Windows에서는 사용할 수 없습니다.',
+        setupTitle: 'JAVDB Cookie 설정 (선택사항)',
+        setupDesc: '설정하지 않아도 사용할 수 있지만, 설정하면 검색 범위가 넓어집니다.',
+        setupSteps: '획득 단계:',
+        setupStep1: 'Chrome에서 https://javdb.com 을 열고 로그인',
+        setupStep2: '확장 프로그램 "Get cookies.txt LOCALLY" 설치',
+        setupStep3: '쿠키를 내보내고 _jdb_session 줄을 찾기',
+        setupStep4: '마지막 열의 값을 복사하여 아래에 붙여넣기',
+        setupPrompt: '_jdb_session 값을 붙여넣어주세요 (Enter로 건너뛰기): ',
+        setupSkipped: '건너뛰었습니다. JAVBUS + JavLibrary를 데이터 소스로 사용합니다.',
+        setupSuccess: '설정이 성공적으로 저장되었습니다!',
+        setupSavePath: '저장 위치: ~/.config/javinfo/config.json',
     },
     de: {
         actress: 'Darstellerin',
@@ -101,8 +153,21 @@ export const messages = {
         notFound: 'Titel nicht gefunden',
         queryFailed: 'Suche fehlgeschlagen',
         cacheCleared: 'Cache geleert',
+        cacheClearFailed: 'Cache konnte nicht geleert werden',
+        cachePath: 'Cache-Pfad',
         fc2Detected: 'FC2-Format erkannt',
         windowsHint: 'Hinweis: Dieser Titel benötigt JAVDB, das unter Windows nicht verfügbar ist.',
+        setupTitle: 'JAVDB Cookie einrichten (optional)',
+        setupDesc: 'Ohne Konfiguration funktioniert es auch, aber mit Cookie ist die Abdeckung besser.',
+        setupSteps: 'Schritte zum Abrufen:',
+        setupStep1: 'Chrome öffnen, https://javdb.com aufrufen und anmelden',
+        setupStep2: 'Erweiterung "Get cookies.txt LOCALLY" installieren',
+        setupStep3: 'Cookies exportieren und die _jdb_session Zeile finden',
+        setupStep4: 'Den Wert der letzten Spalte kopieren und unten einfügen',
+        setupPrompt: 'Wert von _jdb_session einfügen (Enter zum Überspringen): ',
+        setupSkipped: 'Übersprungen. JAVBUS + JavLibrary werden als Datenquellen verwendet.',
+        setupSuccess: 'Konfiguration erfolgreich gespeichert!',
+        setupSavePath: 'Gespeichert unter: ~/.config/javinfo/config.json',
     },
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "javdict",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "description": "AV番号命令行查询工具",
   "main": "./index.js",
   "type": "module",