fix: 修复猫爪使用bug

Author: Taois

controllers/config.js

@@ -15,6 +15,22 @@ import batchExecute from '../libs_drpy/batchExecute.js';
 
 const {jsEncoder} = drpyS;
 
+function parseExt(str) {
+    try {
+        const parsed = JSON.parse(str);
+        if (Array.isArray(parsed) || (typeof parsed === 'object' && parsed !== null)) {
+            return parsed;
+        }
+    } catch (e) {
+        // 忽略错误
+    }
+    return str;
+}
+
+function logExt(_ext) {
+    return Array.isArray(_ext) || typeof _ext == "object" ? JSON.stringify(_ext) : _ext
+}
+
 // 工具函数：生成 JSON 数据
 async function generateSiteJSON(options, requestHost, sub, pwd) {
     const jsDir = options.jsDir;
@@ -373,11 +389,8 @@ async function generateSiteJSON(options, requestHost, sub, pwd) {
                             let key = `hipy_py_${it.alias}`;
                             let name = `${it.alias}(hipy)`;
                             let _ext = it.queryStr;
-                            try {
-                                _ext = JSON.parse(_ext);
-                            } catch (err) {
-                            }
-                            console.log(`[HIPY-${baseName}] alias name: ${name},typeof _ext:${typeof _ext},_ext: ${_ext}`);
+                            _ext = parseExt(_ext);
+                            console.log(`[HIPY-${baseName}] alias name: ${name},typeof _ext:${typeof _ext},_ext: ${logExt(_ext)}`);
                             fileSites.push({key, name, ext: _ext});
                         });
                     } else {
@@ -468,12 +481,8 @@ async function generateSiteJSON(options, requestHost, sub, pwd) {
                             let key = `catvod_${it.alias}`;
                             let name = `${it.alias}(cat)`;
                             let _ext = it.queryStr;
-
-                            try {
-                                _ext = JSON.parse(_ext);
-                            } catch (err) {
-                            }
-                            console.log(`[CAT-${baseName}] alias name: ${name},typeof _ext:${typeof _ext},_ext: ${_ext}`);
+                            _ext = parseExt(_ext);
+                            console.log(`[CAT-${baseName}] alias name: ${name},typeof _ext:${typeof _ext},_ext: ${logExt(_ext)}`);
                             fileSites.push({key, name, ext: _ext});
                         });
                     } else {
@@ -753,10 +762,13 @@ export default (fastify, options, done) => {
             //     }
             // }
             const getFilePath = (cfgPath, rootDir, fileName) => path.join(rootDir, `data/cat/${fileName}`);
-            const processContent = (content, cfgPath, requestUrl) =>
-                content.replace('$config_url', requestUrl.replace(cfgPath, `/1?sub=all&pwd=${process.env.API_PWD || ''}`));
+            const processContent = (content, cfgPath, requestUrl, requestHost) => {
+                const $config_url = requestUrl.replace(cfgPath, `/1?sub=all&pwd=${process.env.API_PWD || ''}`);
+                return content.replaceAll('$config_url', $config_url).replaceAll('$host', requestHost);
+            }
+
 
-            const handleJavaScript = (cfgPath, requestUrl, options, reply) => {
+            const handleJavaScript = (cfgPath, requestUrl, requestHost, options, reply) => {
                 const fileMap = {
                     'index.js': 'index.js',
                     'index.config.js': 'index.config.js'
@@ -766,7 +778,7 @@ export default (fastify, options, done) => {
                     if (cfgPath.includes(key)) {
                         const filePath = getFilePath(cfgPath, options.rootDir, fileName);
                         let content = readFileSync(filePath, 'utf-8');
-                        content = processContent(content, cfgPath, requestUrl);
+                        content = processContent(content, cfgPath, requestUrl, requestHost);
                         return reply.type('application/javascript;charset=utf-8').send(content);
                     }
                 }
@@ -790,7 +802,7 @@ export default (fastify, options, done) => {
                 }
             };
             if (cfg_path.endsWith('.js')) {
-                return handleJavaScript(cfg_path, requestUrl, options, reply);
+                return handleJavaScript(cfg_path, requestUrl, requestHost, options, reply);
             }
 
             if (cfg_path.endsWith('.js.md5')) {

data/cat/index.config.js

@@ -27,7 +27,7 @@ var index_config_default = {
     config_url: "$config_url",
     // 本地ds 支持
     // config_url: 'http://localhost:5707/config/0?sub=dzyyds', // 本地hipy-t4 支持
-    home_site: "http://localhost:5757/api/设置中心",
+    home_site: "$host/api/设置中心",
     enable_dspush: 1,
     enable_home_site: 0,
     sniffer_rule: "http((?!http).){12,}?\\.(m3u8|mp4|flv|avi|mkv|rm|wmv|mpg|m4a|mp3)\\?.*|http((?!http).){12,}\\.(m3u8|mp4|flv|avi|mkv|rm|wmv|mpg|m4a|mp3)|http((?!http).)*?video/tos*|http((?!http).)*?obj/tos*",

data/cat/index.js

@@ -8,6 +8,7 @@
 2. 增加 `live2cms.json` 增加一条本代线路
 3. 猫源解析引擎默认 0 和 1 都视为url模式，以前base64模式有Bug调整 `CAT_DEBUG=2` 开启
 4. 完善hipy源和cat源的map传参机制，map里传参分发源，不用手写配置文件的ext
+5. 修复 `猫爪` 软件不支持 源的ext为object对象的问题
 
 已知bug(待壳子适配):