feat: php验证优化

确保二进制权限

Author: Taois

libs/php.js

@@ -5,6 +5,7 @@ import {execFile} from 'child_process';
 import {promisify} from 'util';
 import {getSitesMap} from "../utils/sites-map.js";
 import {computeHash, deepCopy, getNowTime, urljoin} from "../utils/utils.js";
+import {prepareBinary} from "../utils/binHelper.js";
 import {md5} from "../libs_drpy/crypto-util.js";
 import {fastify} from "../controllers/fastlogger.js";
 // import dotenv from 'dotenv';
@@ -51,7 +52,14 @@ function json2Object(json) {
 
 // Execute PHP bridge
 const callPhpMethod = async (filePath, methodName, env, ...args) => {
-    const phpPath = process.env.PHP_PATH || 'php';
+    let phpPath = process.env.PHP_PATH || 'php';
+    
+    const validPath = prepareBinary(phpPath);
+    if (!validPath) {
+         throw new Error(`PHP executable not found or invalid: ${phpPath}`);
+    }
+    phpPath = validPath;
+
     const phpMethodName = methodMapping[methodName] || methodName;
 
     const cliArgs = [

spider/php/config.php

@@ -42,7 +42,8 @@
     if (in_array($file, ['index.php', 'spider.php', 'example_t4.php', 'test_runner.php']) ||
         $file === $self ||
         strpos($file, '_') === 0 ||
-        fnmatch('config*.php', $file)) {
+        fnmatch('config*.php', $file) ||
+        stripos($file, 'test') !== false) {
         continue;
     }
 

utils/binHelper.js

@@ -0,0 +1,49 @@
+import fs from 'fs';
+import path from 'path';
+
+/**
+ * 确保文件具有执行权限 (Linux/macOS)
+ * @param {string} filePath 文件绝对路径
+ */
+export function ensureExecutable(filePath) {
+    if (process.platform === "win32") {
+        // Windows 不需要 chmod，直接返回
+        return;
+    }
+    try {
+        if (!fs.existsSync(filePath)) {
+             return;
+        }
+        const stats = fs.statSync(filePath);
+        if (!(stats.mode & 0o111)) {
+            fs.chmodSync(filePath, 0o755);
+            console.log(`[binHelper] 已为文件 ${filePath} 添加执行权限`);
+        }
+    } catch (err) {
+        console.error(`[binHelper] 无法设置执行权限: ${filePath}`, err.message);
+    }
+}
+
+/**
+ * 检查并准备二进制文件（检查存在性 + 赋予权限）
+ * @param {string} binPath 二进制文件路径或命令
+ * @returns {string|null} 如果是现有文件路径返回路径，如果是全局命令返回原命令，如果文件不存在返回 null
+ */
+export function prepareBinary(binPath) {
+    if (!binPath) return null;
+    
+    // 如果不包含路径分隔符，假定是全局命令（如 'php', 'node'），直接返回
+    // 注意：这里简单判断，如果用户写 ./php 或 /usr/bin/php 都会进入下面的 exist 检查
+    if (!binPath.includes('/') && !binPath.includes('\\')) {
+        return binPath;
+    }
+
+    // 如果是路径，检查是否存在
+    if (fs.existsSync(binPath)) {
+        ensureExecutable(binPath);
+        return binPath;
+    }
+    
+    // 路径不存在
+    return null;
+}

utils/phpEnv.js

@@ -1,19 +1,32 @@
 import { execFile } from 'child_process';
 import { promisify } from 'util';
+import { prepareBinary } from './binHelper.js';
 
 const execFileAsync = promisify(execFile);
 
 export let isPhpAvailable = false;
 
 export const checkPhpAvailable = async () => {
-    const phpPath = process.env.PHP_PATH || 'php';
+    let phpPath = process.env.PHP_PATH || 'php';
+    
+    // Check existence and permissions
+    const validPath = prepareBinary(phpPath);
+    if (!validPath) {
+        console.warn(`⚠️ PHP binary not found or invalid: ${phpPath}`);
+        isPhpAvailable = false;
+        return false;
+    }
+    phpPath = validPath;
+
     try {
+        console.log(`[phpEnv] Verifying PHP executable: ${phpPath}`);
         await execFileAsync(phpPath, ['-v']);
         isPhpAvailable = true;
-        console.log('✅ PHP environment check passed.');
+        console.log(`✅ PHP environment check passed (${phpPath}).`);
     } catch (e) {
         isPhpAvailable = false;
-        console.warn('⚠️ PHP environment check failed. PHP features will be disabled.');
+        console.warn(`⚠️ PHP environment check failed. PHP features will be disabled.`);
+        console.warn(`[phpEnv] Error details:`, e.message);
         // console.error(e);
     }
     return isPhpAvailable;

utils/pluginManager.js

@@ -2,6 +2,7 @@ import fs from "fs";
 import path from "path";
 import {spawn} from "child_process";
 import {fileURLToPath, pathToFileURL} from "url";
+import {ensureExecutable} from "./binHelper.js";
 
 // 获取 pluginManager.js 的目录
 const __filename = fileURLToPath(import.meta.url);
@@ -54,22 +55,6 @@ function getPluginBinary(rootDir, pluginPath, pluginName) {
     return path.join(binDir, binaryName);
 }
 
-function ensureExecutable(filePath) {
-    if (process.platform === "win32") {
-        // Windows 不需要 chmod，直接返回
-        return;
-    }
-    try {
-        const stats = fs.statSync(filePath);
-        if (!(stats.mode & 0o111)) {
-            fs.chmodSync(filePath, 0o755);
-            console.log(`[pluginManager] 已为插件 ${filePath} 添加执行权限`);
-        }
-    } catch (err) {
-        console.error(`[pluginManager] 无法设置执行权限: ${filePath}`, err.message);
-    }
-}
-
 /**
  * 启动插件
  * @param {Object} plugin 插件配置