Spaces:

CatPtain
/

VvvebJs

Paused

App Files Files Community

CatPtain commited on Jun 13, 2025

Commit

e67695a

verified ·

1 Parent(s): be8e331

Upload 3 files

Browse files

Files changed (2) hide show

config-check.php +216 -0
storage.php +161 -18

config-check.php ADDED Viewed

	@@ -0,0 +1,216 @@

+<?php
+require_once __DIR__ . '/storage.php';
+// 简单的测试认证
+$testAuth = false;
+if (isset($_SERVER['PHP_AUTH_USER']) && isset($_SERVER['PHP_AUTH_PW'])) {
+    $users = StorageConfig::getUsers();
+    $testAuth = isset($users[$_SERVER['PHP_AUTH_USER']]) &&
+                $users[$_SERVER['PHP_AUTH_USER']] === $_SERVER['PHP_AUTH_PW'];
+}
+if (!$testAuth) {
+    header('WWW-Authenticate: Basic realm="VvvebJs Config Check"');
+    header('HTTP/1.0 401 Unauthorized');
+    die('Authentication required for config check');
+}
+$github = StorageConfig::getGitHubConfig();
+$kv = StorageConfig::getKVConfig();
+$storageType = StorageConfig::getStorageType();
+// 检查配置状态
+function checkConfig() {
+    $github = StorageConfig::getGitHubConfig();
+    $issues = [];
+    // 检查GitHub Token
+    if (empty($github['token']) || $github['token'] === 'YOUR_ACTUAL_GITHUB_TOKEN') {
+        $issues[] = [
+            'type' => 'error',
+            'title' => 'GitHub Token 未配置',
+            'message' => 'GITHUB_TOKEN 仍然是占位符或为空，需要设置真实的GitHub Token'
+        ];
+    }
+    // 检查GitHub基本配置
+    if (empty($github['owner'])) {
+        $issues[] = [
+            'type' => 'error',
+            'title' => 'GitHub Owner 未配置',
+            'message' => 'GITHUB_OWNER 为空'
+        ];
+    }
+    if (empty($github['repo'])) {
+        $issues[] = [
+            'type' => 'error',
+            'title' => 'GitHub Repo 未配置',
+            'message' => 'GITHUB_REPO 为空'
+        ];
+    }
+    return $issues;
+}
+$configIssues = checkConfig();
+?>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>VvvebJs 配置检查</title>
+    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/css/bootstrap.min.css" rel="stylesheet">
+    <style>
+        .config-value { background-color: #f8f9fa; padding: 2px 6px; border-radius: 3px; font-family: monospace; }
+        .status-ok { color: #28a745; }
+        .status-error { color: #dc3545; }
+        .status-warning { color: #ffc107; }
+    </style>
+</head>
+<body>
+    <div class="container mt-5">
+        <div class="row">
+            <div class="col-md-10 mx-auto">
+                <h1 class="mb-4">🔧 VvvebJs 配置检查</h1>
+                <!-- 配置问题检查 -->
+                <?php if (!empty($configIssues)): ?>
+                <div class="card mb-4">
+                    <div class="card-header">
+                        <h3 class="status-error">❌ 发现配置问题</h3>
+                    </div>
+                    <div class="card-body">
+                        <?php foreach ($configIssues as $issue): ?>
+                        <div class="alert alert-<?= $issue['type'] === 'error' ? 'danger' : 'warning' ?> mb-3">
+                            <h5><?= htmlspecialchars($issue['title']) ?></h5>
+                            <p><?= htmlspecialchars($issue['message']) ?></p>
+                        </div>
+                        <?php endforeach; ?>
+                        <div class="alert alert-info">
+                            <h5>🔑 如何修复GitHub Token问题：</h5>
+                            <ol>
+                                <li>访问 <a href="https://github.com/settings/tokens" target="_blank">GitHub Token 设置页面</a></li>
+                                <li>点击 "Generate new token (classic)"</li>
+                                <li>选择 <strong>repo</strong> 权限（包括完整的仓库访问权限）</li>
+                                <li>复制生成的Token</li>
+                                <li>在 <code>.env</code> 文件中将 <code>GITHUB_TOKEN=YOUR_ACTUAL_GITHUB_TOKEN</code> 替换为 <code>GITHUB_TOKEN=你的真实Token</code></li>
+                            </ol>
+                        </div>
+                    </div>
+                </div>
+                <?php else: ?>
+                <div class="alert alert-success">
+                    <h3 class="status-ok">✅ 配置检查通过</h3>
+                    <p>基本配置项都已正确设置。</p>
+                </div>
+                <?php endif; ?>
+                <!-- 当前配置详情 -->
+                <div class="card mb-4">
+                    <div class="card-header">
+                        <h3>📋 当前配置详情</h3>
+                    </div>
+                    <div class="card-body">
+                        <div class="row">
+                            <div class="col-md-6">
+                                <h5>存储配置</h5>
+                                <p><strong>存储类型:</strong> <span class="config-value"><?= htmlspecialchars($storageType) ?></span></p>
+                                <h5 class="mt-4">GitHub 配置</h5>
+                                <p><strong>Token:</strong>
+                                    <span class="config-value <?= empty($github['token']) || $github['token'] === 'YOUR_ACTUAL_GITHUB_TOKEN' ? 'status-error' : 'status-ok' ?>">
+                                        <?php
+                                        if (empty($github['token'])) {
+                                            echo '❌ 未设置';
+                                        } elseif ($github['token'] === 'YOUR_ACTUAL_GITHUB_TOKEN') {
+                                            echo '❌ 占位符';
+                                        } else {
+                                            echo '✅ ' . substr($github['token'], 0, 8) . '...';
+                                        }
+                                        ?>
+                                    </span>
+                                </p>
+                                <p><strong>Owner:</strong> <span class="config-value"><?= htmlspecialchars($github['owner']) ?></span></p>
+                                <p><strong>Repo:</strong> <span class="config-value"><?= htmlspecialchars($github['repo']) ?></span></p>
+                                <p><strong>Branch:</strong> <span class="config-value"><?= htmlspecialchars($github['branch']) ?></span></p>
+                                <p><strong>Path:</strong> <span class="config-value"><?= htmlspecialchars($github['path']) ?></span></p>
+                            </div>
+                            <div class="col-md-6">
+                                <h5>EdgeOne KV 配置</h5>
+                                <p><strong>API Key:</strong>
+                                    <span class="config-value">
+                                        <?= !empty($kv['api_key']) ? '✅ ' . substr($kv['api_key'], 0, 8) . '...' : '❌ 未设置' ?>
+                                    </span>
+                                </p>
+                                <p><strong>Secret Key:</strong>
+                                    <span class="config-value">
+                                        <?= !empty($kv['secret_key']) ? '✅ ' . substr($kv['secret_key'], 0, 8) . '...' : '❌ 未设置' ?>
+                                    </span>
+                                </p>
+                                <p><strong>Zone ID:</strong> <span class="config-value"><?= htmlspecialchars($kv['zone_id']) ?></span></p>
+                                <p><strong>Namespace:</strong> <span class="config-value"><?= htmlspecialchars($kv['namespace']) ?></span></p>
+                                <p><strong>Endpoint:</strong> <span class="config-value"><?= htmlspecialchars($kv['endpoint']) ?></span></p>
+                                <h5 class="mt-4">用户配置</h5>
+                                <p><strong>当前用户:</strong> <span class="config-value"><?= htmlspecialchars(StorageConfig::getCurrentUser()) ?></span></p>
+                                <p><strong>用户路径:</strong> <span class="config-value"><?= htmlspecialchars(StorageConfig::getUserPath()) ?></span></p>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <!-- 测试连接 -->
+                <div class="card mb-4">
+                    <div class="card-header">
+                        <h3>🧪 快速测试</h3>
+                    </div>
+                    <div class="card-body">
+                        <div class="row">
+                            <div class="col-md-4">
+                                <a href="github-advanced-test.php" class="btn btn-primary w-100">GitHub 完整测试</a>
+                            </div>
+                            <div class="col-md-4">
+                                <a href="github-test.php" class="btn btn-info w-100">GitHub 基础测试</a>
+                            </div>
+                            <div class="col-md-4">
+                                <a href="editor.html" class="btn btn-success w-100">返回编辑器</a>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <!-- 环境变量文件状态 -->
+                <div class="card">
+                    <div class="card-header">
+                        <h3>📄 环境变量文件状态</h3>
+                    </div>
+                    <div class="card-body">
+                        <p><strong>.env 文件:</strong>
+                            <span class="<?= file_exists(__DIR__ . '/.env') ? 'status-ok' : 'status-error' ?>">
+                                <?= file_exists(__DIR__ . '/.env') ? '✅ 存在' : '❌ 不存在' ?>
+                            </span>
+                        </p>
+                        <p><strong>.env.example 文件:</strong>
+                            <span class="<?= file_exists(__DIR__ . '/.env.example') ? 'status-ok' : 'status-warning' ?>">
+                                <?= file_exists(__DIR__ . '/.env.example') ? '✅ 存在' : '⚠️ 不存在' ?>
+                            </span>
+                        </p>
+                        <?php if (!file_exists(__DIR__ . '/.env')): ?>
+                        <div class="alert alert-warning mt-3">
+                            <h5>⚠️ .env 文件不存在</h5>
+                            <p>请从 .env.example 复制创建 .env 文件：</p>
+                            <code>copy .env.example .env</code>
+                        </div>
+                        <?php endif; ?>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</body>
+</html>

storage.php CHANGED Viewed

@@ -126,63 +126,156 @@ class KVStorage {
     }
     public function save($key, $content) {
-        if (empty($this->config['api_key'])) return false;
         // Add user path to key
         $userKey = $this->userPath . $key;
-        $url = $this->config['endpoint'] . '/';
         $params = [
-            'Action' => 'ModifyApplicationProxyRule',
             'Version' => '2022-09-01',
             'Region' => 'ap-beijing',
             'ZoneId' => $this->config['zone_id'],
             'Key' => $userKey,
-            'Value' => base64_encode($content)
         ];
-        return $this->makeRequest($url, $params);
     }
     public function get($key) {
-        if (empty($this->config['api_key'])) return false;
         // Add user path to key
         $userKey = $this->userPath . $key;
-        $url = $this->config['endpoint'] . '/';
         $params = [
-            'Action' => 'DescribeApplicationProxyDetail',
             'Version' => '2022-09-01',
             'Region' => 'ap-beijing',
             'ZoneId' => $this->config['zone_id'],
             'Key' => $userKey
         ];
         $result = $this->makeRequest($url, $params);
-        return $result ? base64_decode($result) : false;
     }
     public function listUserFiles() {
-        // This would require additional API endpoints to list files
-        // Implementation depends on the KV storage provider's capabilities
         return [];
     }
     private function makeRequest($url, $params) {
         $ch = curl_init();
         curl_setopt($ch, CURLOPT_URL, $url);
         curl_setopt($ch, CURLOPT_POST, true);
         curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query($params));
         curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
         curl_setopt($ch, CURLOPT_HTTPHEADER, [
-            'Authorization: ' . $this->config['api_key'],
-            'Content-Type: application/x-www-form-urlencoded'
         ]);
         $result = curl_exec($ch);
         curl_close($ch);
-        return $result;
     }
 }
@@ -443,14 +536,43 @@ class StorageManager {
         // Ensure filename is safe and doesn't contain path traversal
         $filename = $this->sanitizeFilename($filename);
         $success = false;
         if ($this->githubStorage) {
-            $success = $this->githubStorage->save($filename, $content) || $success;
         }
         if ($this->kvStorage) {
-            $success = $this->kvStorage->save($filename, $content) || $success;
         }
         return $success;
@@ -460,16 +582,37 @@ class StorageManager {
         // Ensure filename is safe and doesn't contain path traversal
         $filename = $this->sanitizeFilename($filename);
         if ($this->githubStorage) {
             $content = $this->githubStorage->get($filename);
-            if ($content !== false) return $content;
         }
         if ($this->kvStorage) {
             $content = $this->kvStorage->get($filename);
-            if ($content !== false) return $content;
         }
         return false;
     }

     }
     public function save($key, $content) {
+        if (empty($this->config['api_key'])) {
+            error_log("KV Save Error: API key is missing");
+            return false;
+        }
+        if (empty($this->config['zone_id']) || empty($this->config['namespace'])) {
+            error_log("KV Save Error: Zone ID or namespace is missing");
+            return false;
+        }
         // Add user path to key
         $userKey = $this->userPath . $key;
+        // Use correct EdgeOne KV API endpoints
+        $url = $this->config['endpoint'];
         $params = [
+            'Action' => 'CreatePurgeTask',  // 这需要根据实际的EdgeOne KV API调整
             'Version' => '2022-09-01',
             'Region' => 'ap-beijing',
             'ZoneId' => $this->config['zone_id'],
+            'Namespace' => $this->config['namespace'],
             'Key' => $userKey,
+            'Value' => base64_encode($content),
+            'TTL' => 86400 // 24 hours TTL
         ];
+        error_log("KV Save Debug: Attempting to save key '$userKey' to namespace '{$this->config['namespace']}'");
+        $result = $this->makeRequest($url, $params);
+        if ($result) {
+            error_log("KV Save Success: Key saved successfully");
+            return true;
+        } else {
+            error_log("KV Save Error: API request failed");
+            return false;
+        }
     }
     public function get($key) {
+        if (empty($this->config['api_key'])) {
+            error_log("KV Get Error: API key is missing");
+            return false;
+        }
         // Add user path to key
         $userKey = $this->userPath . $key;
+        $url = $this->config['endpoint'];
         $params = [
+            'Action' => 'DescribeOriginGroup', // 这需要根据实际的EdgeOne KV API调整
             'Version' => '2022-09-01',
             'Region' => 'ap-beijing',
             'ZoneId' => $this->config['zone_id'],
+            'Namespace' => $this->config['namespace'],
             'Key' => $userKey
         ];
+        error_log("KV Get Debug: Attempting to get key '$userKey' from namespace '{$this->config['namespace']}'");
         $result = $this->makeRequest($url, $params);
+        if ($result && isset($result['Value'])) {
+            return base64_decode($result['Value']);
+        }
+        error_log("KV Get Error: Key not found or API request failed");
+        return false;
     }
     public function listUserFiles() {
+        if (empty($this->config['api_key'])) return [];
+        $url = $this->config['endpoint'];
+        $params = [
+            'Action' => 'DescribeOriginGroups', // 这需要根据实际的EdgeOne KV API调整
+            'Version' => '2022-09-01',
+            'Region' => 'ap-beijing',
+            'ZoneId' => $this->config['zone_id'],
+            'Namespace' => $this->config['namespace'],
+            'Prefix' => $this->userPath
+        ];
+        $result = $this->makeRequest($url, $params);
+        if ($result && isset($result['Keys']) && is_array($result['Keys'])) {
+            $files = [];
+            foreach ($result['Keys'] as $item) {
+                if (isset($item['Key'])) {
+                    $relativePath = str_replace($this->userPath, '', $item['Key']);
+                    $files[] = [
+                        'name' => basename($relativePath),
+                        'path' => $relativePath,
+                        'size' => $item['Size'] ?? 0,
+                        'url' => null
+                    ];
+                }
+            }
+            return $files;
+        }
         return [];
     }
     private function makeRequest($url, $params) {
+        // 添加通用的腾讯云API参数
+        $commonParams = [
+            'Timestamp' => time(),
+            'Nonce' => rand(10000, 99999),
+            'SecretId' => $this->config['api_key'],
+            'SignatureMethod' => 'HmacSHA256'
+        ];
+        $params = array_merge($params, $commonParams);
+        // 生成签名 (这是简化版本，实际需要按照腾讯云API签名规范)
+        ksort($params);
+        $queryString = http_build_query($params);
+        $signature = hash_hmac('sha256', $queryString, $this->config['secret_key'], true);
+        $params['Signature'] = base64_encode($signature);
         $ch = curl_init();
         curl_setopt($ch, CURLOPT_URL, $url);
         curl_setopt($ch, CURLOPT_POST, true);
         curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query($params));
         curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+        curl_setopt($ch, CURLOPT_TIMEOUT, 30);
         curl_setopt($ch, CURLOPT_HTTPHEADER, [
+            'Content-Type: application/x-www-form-urlencoded',
+            'User-Agent: VvvebJs-WebBuilder/1.0'
         ]);
         $result = curl_exec($ch);
+        $httpCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+        $error = curl_error($ch);
         curl_close($ch);
+        if ($error) {
+            error_log("KV API cURL Error: $error");
+            return false;
+        }
+        if ($httpCode >= 200 && $httpCode < 300) {
+            $decoded = json_decode($result, true);
+            if (json_last_error() === JSON_ERROR_NONE) {
+                return $decoded;
+            }
+            error_log("KV API JSON Error: " . json_last_error_msg());
+        } else {
+            error_log("KV API HTTP Error: $httpCode - Response: $result");
+        }
+        return false;
     }
 }
         // Ensure filename is safe and doesn't contain path traversal
         $filename = $this->sanitizeFilename($filename);
+        error_log("StorageManager saveFile: Starting save for file '$filename'");
+        error_log("StorageManager saveFile: Storage type is '{$this->storageType}'");
+        error_log("StorageManager saveFile: Current user is '{$this->currentUser}'");
         $success = false;
+        $errors = [];
         if ($this->githubStorage) {
+            error_log("StorageManager saveFile: Attempting GitHub save...");
+            $githubSuccess = $this->githubStorage->save($filename, $content);
+            if ($githubSuccess) {
+                error_log("StorageManager saveFile: GitHub save SUCCESS");
+                $success = true;
+            } else {
+                error_log("StorageManager saveFile: GitHub save FAILED");
+                $errors[] = "GitHub save failed";
+            }
+        } else {
+            error_log("StorageManager saveFile: GitHub storage not configured");
         }
         if ($this->kvStorage) {
+            error_log("StorageManager saveFile: Attempting KV save...");
+            $kvSuccess = $this->kvStorage->save($filename, $content);
+            if ($kvSuccess) {
+                error_log("StorageManager saveFile: KV save SUCCESS");
+                $success = true;
+            } else {
+                error_log("StorageManager saveFile: KV save FAILED");
+                $errors[] = "KV save failed";
+            }
+        } else {
+            error_log("StorageManager saveFile: KV storage not configured");
+        }
+        if (!$success && !empty($errors)) {
+            error_log("StorageManager saveFile: All saves failed: " . implode(", ", $errors));
         }
         return $success;
         // Ensure filename is safe and doesn't contain path traversal
         $filename = $this->sanitizeFilename($filename);
+        error_log("StorageManager getFile: Starting load for file '$filename'");
+        error_log("StorageManager getFile: Storage type is '{$this->storageType}'");
+        error_log("StorageManager getFile: Current user is '{$this->currentUser}'");
         if ($this->githubStorage) {
+            error_log("StorageManager getFile: Attempting GitHub load...");
             $content = $this->githubStorage->get($filename);
+            if ($content !== false) {
+                error_log("StorageManager getFile: GitHub load SUCCESS");
+                return $content;
+            } else {
+                error_log("StorageManager getFile: GitHub load FAILED");
+            }
+        } else {
+            error_log("StorageManager getFile: GitHub storage not configured");
         }
         if ($this->kvStorage) {
+            error_log("StorageManager getFile: Attempting KV load...");
             $content = $this->kvStorage->get($filename);
+            if ($content !== false) {
+                error_log("StorageManager getFile: KV load SUCCESS");
+                return $content;
+            } else {
+                error_log("StorageManager getFile: KV load FAILED");
+            }
+        } else {
+            error_log("StorageManager getFile: KV storage not configured");
         }
+        error_log("StorageManager getFile: All load attempts failed");
         return false;
     }