From 4af8334f50ca11e630fc1aec27431f3dd1a4c305 Mon Sep 17 00:00:00 2001 From: xuncha <1658671838@qq.com> Date: Tue, 7 Apr 2026 22:45:15 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E8=A7=A3=E5=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- electron/imageSearchWorker.ts | 6 +- electron/services/imageDecryptService.ts | 80 +++++++++++++++--------- 2 files changed, 53 insertions(+), 33 deletions(-) diff --git a/electron/imageSearchWorker.ts b/electron/imageSearchWorker.ts index 429a00f..6107dd2 100644 --- a/electron/imageSearchWorker.ts +++ b/electron/imageSearchWorker.ts @@ -20,7 +20,7 @@ function looksLikeMd5(value: string): boolean { function stripDatVariantSuffix(base: string): string { const lower = base.toLowerCase() - const suffixes = ['_thumb', '.thumb', '_hd', '.hd', '_h', '.h', '_t', '.t', '_c', '.c'] + const suffixes = ['_thumb', '.thumb', '_hd', '.hd', '_h', '.h', '_b', '.b', '_w', '.w', '_t', '.t', '_c', '.c'] for (const suffix of suffixes) { if (lower.endsWith(suffix)) { return lower.slice(0, -suffix.length) @@ -71,8 +71,10 @@ function scoreDatName(fileName: string): number { const lower = fileName.toLowerCase() const baseLower = lower.endsWith('.dat') ? lower.slice(0, -4) : lower if (baseLower.endsWith('_h') || baseLower.endsWith('.h')) return 600 + if (baseLower.endsWith('_hd') || baseLower.endsWith('.hd')) return 550 + if (baseLower.endsWith('_b') || baseLower.endsWith('.b')) return 520 + if (baseLower.endsWith('_w') || baseLower.endsWith('.w')) return 510 if (!hasXVariant(baseLower)) return 500 - if (baseLower.endsWith('_hd') || baseLower.endsWith('.hd')) return 450 if (baseLower.endsWith('_c') || baseLower.endsWith('.c')) return 400 if (isThumbnailDat(lower)) return 100 return 350 diff --git a/electron/services/imageDecryptService.ts b/electron/services/imageDecryptService.ts index 4d40843..34f755c 100644 --- a/electron/services/imageDecryptService.ts +++ b/electron/services/imageDecryptService.ts @@ -676,41 +676,53 @@ export class ImageDecryptService { return null } - // 如果要求高清图但 hardlink 没找到，也不要搜索了（搜索太慢） - if (!allowThumbnail) { - return null - } + const searchNames = Array.from( + new Set([imageDatName, imageMd5].map((item) => String(item || '').trim()).filter(Boolean)) + ) + if (searchNames.length === 0) return null - if (!imageDatName) return null if (!skipResolvedCache) { - const cached = this.resolvedCache.get(imageDatName) - if (cached && existsSync(cached)) { - const preferred = this.getPreferredDatVariantPath(cached, allowThumbnail) - if (allowThumbnail || !this.isThumbnailPath(preferred)) return preferred - // 缓存的是缩略图，尝试找高清图 - const hdPath = this.findHdVariantInSameDir(preferred) - if (hdPath) return hdPath + for (const searchName of searchNames) { + const cached = this.resolvedCache.get(searchName) + if (cached && existsSync(cached)) { + const preferred = this.getPreferredDatVariantPath(cached, allowThumbnail) + if (allowThumbnail || !this.isThumbnailPath(preferred)) return preferred + // 缓存的是缩略图，尝试找高清图 + const hdPath = this.findHdVariantInSameDir(preferred) + if (hdPath) return hdPath + } } } - const datPath = await this.searchDatFile(accountDir, imageDatName, allowThumbnail) - if (datPath) { - this.logInfo('[ImageDecrypt] searchDatFile hit', { imageDatName, path: datPath }) - this.resolvedCache.set(imageDatName, datPath) - this.cacheDatPath(accountDir, imageDatName, datPath) - return datPath - } - const normalized = this.normalizeDatBase(imageDatName) - if (normalized !== imageDatName.toLowerCase()) { - const normalizedPath = await this.searchDatFile(accountDir, normalized, allowThumbnail) - if (normalizedPath) { - this.logInfo('[ImageDecrypt] searchDatFile hit (normalized)', { imageDatName, normalized, path: normalizedPath }) - this.resolvedCache.set(imageDatName, normalizedPath) - this.cacheDatPath(accountDir, imageDatName, normalizedPath) - return normalizedPath + for (const searchName of searchNames) { + const datPath = await this.searchDatFile(accountDir, searchName, allowThumbnail) + if (datPath) { + this.logInfo('[ImageDecrypt] searchDatFile hit', { imageDatName, searchName, path: datPath }) + if (imageDatName) this.resolvedCache.set(imageDatName, datPath) + if (imageMd5) this.resolvedCache.set(imageMd5, datPath) + this.cacheDatPath(accountDir, searchName, datPath) + if (imageDatName && imageDatName !== searchName) this.cacheDatPath(accountDir, imageDatName, datPath) + if (imageMd5 && imageMd5 !== searchName) this.cacheDatPath(accountDir, imageMd5, datPath) + return datPath } } - this.logInfo('[ImageDecrypt] resolveDatPath miss', { imageDatName, normalized }) + + for (const searchName of searchNames) { + const normalized = this.normalizeDatBase(searchName) + if (normalized !== searchName.toLowerCase()) { + const normalizedPath = await this.searchDatFile(accountDir, normalized, allowThumbnail) + if (normalizedPath) { + this.logInfo('[ImageDecrypt] searchDatFile hit (normalized)', { imageDatName, searchName, normalized, path: normalizedPath }) + if (imageDatName) this.resolvedCache.set(imageDatName, normalizedPath) + if (imageMd5) this.resolvedCache.set(imageMd5, normalizedPath) + this.cacheDatPath(accountDir, searchName, normalizedPath) + if (imageDatName && imageDatName !== searchName) this.cacheDatPath(accountDir, imageDatName, normalizedPath) + if (imageMd5 && imageMd5 !== searchName) this.cacheDatPath(accountDir, imageMd5, normalizedPath) + return normalizedPath + } + } + } + this.logInfo('[ImageDecrypt] resolveDatPath miss', { imageDatName, imageMd5, searchNames }) return null } @@ -1045,7 +1057,7 @@ export class ImageDecryptService { private stripDatVariantSuffix(base: string): string { const lower = base.toLowerCase() - const suffixes = ['_thumb', '.thumb', '_hd', '.hd', '_h', '.h', '_t', '.t', '_c', '.c'] + const suffixes = ['_thumb', '.thumb', '_hd', '.hd', '_h', '.h', '_b', '.b', '_w', '.w', '_t', '.t', '_c', '.c'] for (const suffix of suffixes) { if (lower.endsWith(suffix)) { return lower.slice(0, -suffix.length) @@ -1061,8 +1073,10 @@ export class ImageDecryptService { const lower = name.toLowerCase() const baseLower = lower.endsWith('.dat') || lower.endsWith('.jpg') ? lower.slice(0, -4) : lower if (baseLower.endsWith('_h') || baseLower.endsWith('.h')) return 600 + if (baseLower.endsWith('_hd') || baseLower.endsWith('.hd')) return 550 + if (baseLower.endsWith('_b') || baseLower.endsWith('.b')) return 520 + if (baseLower.endsWith('_w') || baseLower.endsWith('.w')) return 510 if (!this.hasXVariant(baseLower)) return 500 - if (baseLower.endsWith('_hd') || baseLower.endsWith('.hd')) return 450 if (baseLower.endsWith('_c') || baseLower.endsWith('.c')) return 400 if (this.isThumbnailDat(lower)) return 100 return 350 @@ -1073,9 +1087,13 @@ export class ImageDecryptService { const names = [ `${baseName}_h.dat`, `${baseName}.h.dat`, - `${baseName}.dat`, `${baseName}_hd.dat`, `${baseName}.hd.dat`, + `${baseName}_b.dat`, + `${baseName}.b.dat`, + `${baseName}_w.dat`, + `${baseName}.w.dat`, + `${baseName}.dat`, `${baseName}_c.dat`, `${baseName}.c.dat` ] From dcad30bc3909d645510da4c95dac05f6af251b97 Mon Sep 17 00:00:00 2001 From: xuncha <1658671838@qq.com> Date: Tue, 7 Apr 2026 22:58:41 +0800 Subject: [PATCH 2/2] =?UTF-8?q?x=E4=BF=AE=E5=A4=8D=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E6=B5=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/security-scan.yml | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/.github/workflows/security-scan.yml b/.github/workflows/security-scan.yml index e598698..11a1376 100644 --- a/.github/workflows/security-scan.yml +++ b/.github/workflows/security-scan.yml @@ -1,5 +1,8 @@ name: Security Scan +env: + FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true + on: schedule: - cron: '0 2 * * *' # 每天 UTC 02:00 @@ -24,15 +27,15 @@ jobs: steps: - name: Checkout ${{ matrix.branch }} - uses: actions/checkout@v4 + uses: actions/checkout@v5 with: ref: ${{ matrix.branch }} fetch-depth: 0 - name: Setup Node.js - uses: actions/setup-node@v4 + uses: actions/setup-node@v5 with: - node-version: '20' + node-version: '24' cache: 'npm' # 使用 npm 缓存加速 - name: Install dependencies @@ -71,10 +74,16 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout repo - uses: actions/checkout@v4 + uses: actions/checkout@v5 with: fetch-depth: 0 + - name: Setup Node.js + uses: actions/setup-node@v5 + with: + node-version: '24' + cache: 'npm' + - name: Run npm audit on all branches run: | git branch -r | grep -v HEAD | sed 's|origin/||' | tr -d ' ' | while read branch; do @@ -84,4 +93,4 @@ jobs: npm ci --ignore-scripts --silent 2>/dev/null || npm install --ignore-scripts --silent 2>/dev/null || true npm audit --audit-level=moderate 2>/dev/null || true done - continue-on-error: true \ No newline at end of file + continue-on-error: true