fix: 修复由于 jm 解密逻辑变更造成的部分 gif 图片被解密问题

Author: Dedicatus546

electron/module/download.ts

@@ -14,6 +14,8 @@ export interface DownloadComicItem extends DownloadBaseItem {
   comicName: string
   chapterName: string
   picUrlList: Array<string>
+  scrambleId: number
+  speed: string
 }
 
 export type DownloadItem = DownloadComicItem

src/apis/ajax.ts

@@ -1090,59 +1090,96 @@ export const signInApi = (userId: number, dayId: number) => {
 
 // 获取图片列表，需要通过正则来解析 html 文件内容
 export const getComicPicListApi = (comicId: number, shuntKey: number | undefined) => {
-  return http.Get<{ list: string[] }, string>('chapter_view_template', {
-    params: {
-      id: comicId,
-      mode: 'vertical',
-      page: 0,
-      app_img_shunt: shuntKey,
-      express: 'off',
-      v: Math.floor(Date.now() / 1000),
-      // id=416130&mode=vertical&page=0&app_img_shunt=1&express=off&v=1727492089
-    },
-    async transform(htmlStr) {
-      // 2025.06.15 新版匹配方式
-      // 正则表达式匹配 result 对象
-      const resultRegex = /const result\s*=\s*({[\s\S]*?});/
-      const resultMatch = htmlStr.match(resultRegex)
-      let result: { images: Array<string> } | null = null
-      if (resultMatch) {
-        try {
-          // oxlint-disable-next-line
-          result = eval(`(${resultMatch[1]})`)
-        } catch (e) {
-          console.error('Error parsing result object:', e)
+  return http.Get<{ list: string[]; scrambleId: number; speed: string }, string>(
+    'chapter_view_template',
+    {
+      params: {
+        id: comicId,
+        mode: 'vertical',
+        page: 0,
+        app_img_shunt: shuntKey,
+        express: 'off',
+        v: Math.floor(Date.now() / 1000),
+        // id=416130&mode=vertical&page=0&app_img_shunt=1&express=off&v=1727492089
+      },
+      async transform(htmlStr) {
+        // 2025.06.15 新版匹配方式
+        // 正则表达式匹配 result 对象
+        const resultRegex = /const result\s*=\s*({[\s\S]*?});/
+        const resultMatch = htmlStr.match(resultRegex)
+        let result: { images: Array<string> } | null = null
+        if (resultMatch) {
+          try {
+            // oxlint-disable-next-line
+            result = eval(`(${resultMatch[1]})`)
+          } catch (e) {
+            console.error('Error parsing result object:', e)
+          }
         }
-      }
 
-      // 正则表达式匹配 config 对象
-      const configRegex = /const config\s*=\s*({[\s\S]*?});/
-      const configMatch = htmlStr.match(configRegex)
-      let config: {
-        cache: string
-        imghost: string
-        jmid: string
-      } | null = null
-      if (configMatch) {
-        try {
-          // oxlint-disable-next-line
-          config = eval(`(${configMatch[1]})`)
-        } catch (e) {
-          console.error('Error parsing config object:', e)
+        // 正则表达式匹配 config 对象
+        const configRegex = /const config\s*=\s*({[\s\S]*?});/
+        const configMatch = htmlStr.match(configRegex)
+        let config: {
+          cache: string
+          imghost: string
+          jmid: string
+        } | null = null
+        if (configMatch) {
+          try {
+            // oxlint-disable-next-line
+            config = eval(`(${configMatch[1]})`)
+          } catch (e) {
+            console.error('Error parsing config object:', e)
+          }
         }
-      }
-      if (!result || !config) {
-        return {
-          list: [],
+
+        // 2026.03.26
+        // 新增 scrambleId 和 speed 参数，用于判断是否需要解密
+        // 出现 gif 后缀图片
+        // 匹配 scrambleId
+        const scrambleIdRegex = /var scramble_id\s*=\s*(\d+);/
+        const scrambleIdMatch = htmlStr.match(scrambleIdRegex)
+        let scrambleId = 0
+        if (scrambleIdMatch) {
+          try {
+            scrambleId = Number.parseInt(scrambleIdMatch[1])
+          } catch (e) {
+            console.error('Error parsing scrambleId arg:', e)
+          }
         }
-      }
-      return {
-        list: result.images.map(
+
+        // 匹配 speed
+        const speedRegex = /var speed\s*=\s*'(.*)';/
+        const speedMatch = htmlStr.match(speedRegex)
+        let speed = ''
+        if (speedMatch) {
+          try {
+            speed = speedMatch[1]
+          } catch (e) {
+            console.error('Error parsing speed arg:', e)
+          }
+        }
+
+        if (!result || !config) {
+          return {
+            list: [],
+            scrambleId,
+            speed,
+          }
+        }
+        const list = result.images.map(
           (item) => `${config.imghost}/media/photos/${config.jmid}/${item}${config.cache}`,
-        ),
-      }
+        )
+        console.log('list', list)
+        return {
+          list,
+          scrambleId,
+          speed,
+        }
+      },
     },
-  })
+  )
   // .then(() => {
   //   return [
   //     "https://cdn-msp.jmapiproxy3.cc/media/photos/113592/00001.webp",

src/components/app-comic-detail-chapter.vue

@@ -36,6 +36,8 @@ const { data, send } = useRequest(
     immediate: false,
     initialData: {
       list: [],
+      scrambleId: 0,
+      speed: '',
     },
   },
 )
@@ -45,41 +47,37 @@ const downloadChapter = async (chapter: { id: number; name: string }) => {
     snackbar.warning('任务正在下载中，请勿重复点击')
     return
   }
+
+  const exec = async () => {
+    await send(chapter.id)
+    downloadStore.addDownloadTaskAction(
+      {
+        type: 'comic',
+        id: chapter.id,
+        comicName: props.comicName,
+        chapterName: chapter.name,
+        picUrlList: data.value.list,
+        filepath: '',
+        scrambleId: data.value.scrambleId,
+        speed: data.value.speed,
+      },
+      true,
+    )
+    snackbar.success('添加下载任务成功')
+    info('添加 %s %s 下载任务', props.comicName, chapter.name)
+  }
   if (downloadStore.completeMap[chapter.id]) {
     dialog({
       width: 300,
       title: '确认',
       content: '该漫画已下载，是否重新下载？',
       async onOk() {
-        await send(chapter.id)
-        downloadStore.addDownloadTaskAction(
-          {
-            type: 'comic',
-            id: chapter.id,
-            comicName: props.comicName,
-            chapterName: chapter.name,
-            picUrlList: data.value.list,
-            filepath: '',
-          },
-          true,
-        )
-        snackbar.success('添加下载任务成功')
-        info('添加 %s %s 下载任务', props.comicName, chapter.name)
+        exec()
       },
     })
     return
   }
-  await send(chapter.id)
-  downloadStore.addDownloadTaskAction({
-    type: 'comic',
-    id: chapter.id,
-    comicName: props.comicName,
-    chapterName: chapter.name,
-    picUrlList: data.value.list,
-    filepath: '',
-  })
-  snackbar.success('添加下载任务成功')
-  info('添加 %s %s 下载任务', props.comicName, chapter.name)
+  exec()
 }
 </script>
 

src/components/app-comic-page-read.vue

@@ -2,6 +2,8 @@
 const props = defineProps<{
   comicId: number
   picList: Array<string>
+  scrambleId: number
+  speed: string
 }>()
 
 const page = ref(0) // [0, picList.length - 1]
@@ -47,6 +49,8 @@ const onSliderEnd = (value: [number, number] | number) => {
           :key="picList[page]"
           :comic-id="comicId"
           :src="picList[page]"
+          :scramble-id="scrambleId"
+          :speed="speed"
           @decode-success="onDecodeSuccess(page)"
         />
       </div>

src/components/app-comic-scroll-read.vue

@@ -2,6 +2,8 @@
 defineProps<{
   comicId: number
   picList: Array<string>
+  scrambleId: number
+  speed: string
 }>()
 
 const sliderValue = ref(0)
@@ -24,6 +26,8 @@ const onDecodeSuccess = inject<(index: number) => void>('onDecodeSuccess', () =>
         :key="item"
         :comic-id="comicId"
         :src="item"
+        :scramble-id="scrambleId"
+        :speed="speed"
         @intersect="sliderValue = index + 1"
         @decode-success="onDecodeSuccess(index)"
       />

src/components/comic-pic/comic-page-pic.vue

@@ -4,6 +4,8 @@ import { decodeImage } from '@/utils/image-decode'
 const props = defineProps<{
   src: string
   comicId: number
+  scrambleId: number
+  speed: string
 }>()
 const emits = defineEmits<{
   (e: 'decodeSuccess'): void
@@ -13,7 +15,7 @@ const isLoaded = ref(false)
 const imgSrc = ref<string>('')
 
 onMounted(async () => {
-  imgSrc.value = await decodeImage(props.src, props.comicId)
+  imgSrc.value = await decodeImage(props.src, props.comicId, props.scrambleId, props.speed)
   emits('decodeSuccess')
 })
 </script>

src/components/comic-pic/comic-vertical-pic.vue

@@ -6,6 +6,8 @@ import { decodeImage } from '@/utils/image-decode'
 const props = defineProps<{
   src: string
   comicId: number
+  scrambleId: number
+  speed: string
 }>()
 const emits = defineEmits<{
   (e: 'intersect'): void
@@ -18,7 +20,7 @@ const imgSrc = ref<string>('')
 
 const onLoadImageIntersect = async (isIntersecting: boolean) => {
   if (isIntersecting) {
-    imgSrc.value = await decodeImage(props.src, props.comicId)
+    imgSrc.value = await decodeImage(props.src, props.comicId, props.scrambleId, props.speed)
     emits('decodeSuccess')
   }
 }

src/utils/image-decode.ts

@@ -1,11 +1,12 @@
 // jm 的从 220980 之后的图都经过混淆
 // 需要通过 canvas 重绘
 import { trpcClient } from '@/apis'
+import { info } from '@/logger'
 
 import { getLoadedImage } from '.'
 
-export const needDecode = (comicId: number): boolean => {
-  return comicId > 220980
+const isGif = (src: string): boolean => {
+  return src.endsWith('.gif')
 }
 
 const seedMap = [2, 4, 6, 8, 10, 12, 14, 16, 18, 20]
@@ -27,12 +28,36 @@ const getSeed = async (comicId: number, pageStr: string) => {
 
 const decodeSrcMap = new Map<string, string>()
 const decodePromiseMap = new Map<string, Promise<string>>()
-export const decodeImage = async (src: string, comicId: number) => {
+export const decodeImage = async (
+  src: string,
+  comicId: number,
+  scrambleId: number,
+  speed: string,
+) => {
+  info(
+    '开始解密地址 %s 图片，所属 comicId 为 %s ，scrambleId 为 %s ， speed 为 %s 。',
+    src,
+    comicId,
+    scrambleId,
+    speed,
+  )
+  if (comicId < scrambleId) {
+    info('comicId 小于 scrambleId ，跳过解密')
+  }
+  if (isGif(src)) {
+    info('gif 格式，跳过解密')
+  }
+  if (speed === '1') {
+    info('speed 参数为 1 ，跳过解密')
+  }
+  if (comicId < scrambleId || isGif(src) || speed === '1') {
+    return src
+  }
   const key = comicId + '-' + src.substring(src.lastIndexOf('/') + 1, src.lastIndexOf('.'))
+  info('全局解密 promise map key ：%s', key)
   if (decodeSrcMap.has(key)) {
-    return decodeSrcMap.get(key)!
-  }
-  if (!needDecode(comicId)) {
+    const src = decodeSrcMap.get(key)!
+    info('在 map 中存在数据，已解密过，直接返回解密后的 src ：%s', src)
     return src
   }
   // 确保只有一个 promise 被加载