Spaces:

CatPtain
/

VvvebJs

Paused

App Files Files Community

CatPtain commited on Jun 13, 2025

Commit

febd79b

verified ·

1 Parent(s): 49e02fa

Upload 2 files

Browse files

Files changed (2) hide show

github-advanced-test.php +106 -32
storage.php +1 -1

github-advanced-test.php CHANGED Viewed

@@ -23,28 +23,44 @@ function testGitHubAPI($token, $endpoint, $method = 'GET', $data = null) {
     curl_setopt($ch, CURLOPT_URL, $endpoint);
     curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
     curl_setopt($ch, CURLOPT_CUSTOMREQUEST, $method);
-    curl_setopt($ch, CURLOPT_TIMEOUT, 10);
-    curl_setopt($ch, CURLOPT_HTTPHEADER, [
         'Authorization: token ' . $token,
-        'User-Agent: VvvebJs-Diagnostic/1.0',
-        'Accept: application/vnd.github.v3+json'
-    ]);
     if ($data) {
         curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($data));
-        curl_setopt($ch, CURLOPT_HTTPHEADER, array_merge(curl_getinfo($ch, CURLINFO_HEADER_OUT) ?: [], ['Content-Type: application/json']));
     }
     $result = curl_exec($ch);
     $httpCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
     $error = curl_error($ch);
     curl_close($ch);
     return [
         'success' => $httpCode >= 200 && $httpCode < 300,
         'http_code' => $httpCode,
         'response' => $result,
-        'error' => $error
     ];
 }
@@ -62,15 +78,29 @@ if ($_POST['run_diagnostics'] ?? false) {
     $branchUrl = "https://api.github.com/repos/{$github['owner']}/{$github['repo']}/branches/{$github['branch']}";
     $diagnostics['branch_test'] = testGitHubAPI($github['token'], $branchUrl);
-    // 测试 4: 测试文件创建权限
-    $testFile = 'diagnostic-test-' . time() . '.txt';
-    $testContent = 'VvvebJs Diagnostic Test - ' . date('Y-m-d H:i:s');
     $createUrl = "https://api.github.com/repos/{$github['owner']}/{$github['repo']}/contents/{$github['path']}{$testFile}";
     $diagnostics['create_test'] = testGitHubAPI($github['token'], $createUrl, 'PUT', [
-        'message' => 'VvvebJs diagnostic test',
         'content' => base64_encode($testContent),
         'branch' => $github['branch']
     ]);
 }
 ?>
@@ -86,12 +116,13 @@ if ($_POST['run_diagnostics'] ?? false) {
         .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-8 mx-auto">
                 <h1 class="mb-4">🔍 VvvebJs GitHub 高级诊断</h1>
                 <!-- 当前配置 -->
@@ -102,14 +133,28 @@ if ($_POST['run_diagnostics'] ?? false) {
                     <div class="card-body">
                         <div class="row">
                             <div class="col-md-6">
-                                <p><strong>Token:</strong> <span class="diagnostic-result"><?= !empty($github['token']) ? substr($github['token'], 0, 8) . '...' : '❌ 缺失' ?></span></p>
-                                <p><strong>Owner:</strong> <span class="diagnostic-result"><?= htmlspecialchars($github['owner']) ?></span></p>
-                                <p><strong>Repo:</strong> <span class="diagnostic-result"><?= htmlspecialchars($github['repo']) ?></span></p>
                             </div>
                             <div class="col-md-6">
-                                <p><strong>Branch:</strong> <span class="diagnostic-result"><?= htmlspecialchars($github['branch']) ?></span></p>
-                                <p><strong>Path:</strong> <span class="diagnostic-result"><?= htmlspecialchars($github['path']) ?></span></p>
-                                <p><strong>API URL:</strong> <span class="diagnostic-result">https://api.github.com/repos/<?= htmlspecialchars($github['owner']) ?>/<?= htmlspecialchars($github['repo']) ?></span></p>
                             </div>
                         </div>
                     </div>
@@ -149,8 +194,10 @@ if ($_POST['run_diagnostics'] ?? false) {
                                     <?php $user = json_decode($test['response'], true); ?>
                                     <br><strong>用户信息:</strong> <?= htmlspecialchars($user['login'] ?? 'Unknown') ?>
                                     <br><strong>用户名:</strong> <?= htmlspecialchars($user['name'] ?? 'N/A') ?>
                                 <?php elseif (!$test['success']): ?>
-                                    <br><strong>错误:</strong> <?= htmlspecialchars($test['error'] ?: $test['response']) ?>
                                 <?php endif; ?>
                             </div>
                         </div>
@@ -171,8 +218,17 @@ if ($_POST['run_diagnostics'] ?? false) {
                                     <br><strong>仓库全名:</strong> <?= htmlspecialchars($repo['full_name'] ?? 'Unknown') ?>
                                     <br><strong>私有仓库:</strong> <?= $repo['private'] ? '是' : '否' ?>
                                     <br><strong>默认分支:</strong> <?= htmlspecialchars($repo['default_branch'] ?? 'Unknown') ?>
                                 <?php elseif ($test['http_code'] == 404): ?>
                                     <br><strong>错误:</strong> 仓库不存在或无访问权限
                                 <?php endif; ?>
                             </div>
                         </div>
@@ -192,6 +248,7 @@ if ($_POST['run_diagnostics'] ?? false) {
                                     <?php $branch = json_decode($test['response'], true); ?>
                                     <br><strong>分支名:</strong> <?= htmlspecialchars($branch['name'] ?? 'Unknown') ?>
                                     <br><strong>最��提交:</strong> <?= htmlspecialchars(substr($branch['commit']['sha'] ?? '', 0, 7)) ?>
                                 <?php endif; ?>
                             </div>
                         </div>
@@ -209,9 +266,13 @@ if ($_POST['run_diagnostics'] ?? false) {
                                 <?php if ($test['success']): ?>
                                     <br><strong>✅ 成功创建测试文件！GitHub 保存功能正常。</strong>
                                 <?php else: ?>
                                     <br><strong>错误详情:</strong>
                                     <pre class="diagnostic-result mt-2"><?= htmlspecialchars($test['response']) ?></pre>
                                 <?php endif; ?>
                             </div>
                         </div>
@@ -227,7 +288,9 @@ if ($_POST['run_diagnostics'] ?? false) {
                     <div class="card-body">
                         <?php
                         $hasErrors = false;
-                        foreach ($diagnostics as $test) {
                             if (!$test['success']) {
                                 $hasErrors = true;
                                 break;
@@ -238,12 +301,16 @@ if ($_POST['run_diagnostics'] ?? false) {
                         <?php if (!$hasErrors): ?>
                         <div class="alert alert-success">
                             <h5>🎉 所有测试通过！</h5>
-                            <p>GitHub 配置完全正常。如果编辑器保存仍有问题，请检查：</p>
                             <ul>
-                                <li>编辑器中的认证是否正确</li>
-                                <li>浏览器控制台是否有错误</li>
                                 <li>网络连接是否稳定</li>
                             </ul>
                         </div>
                         <?php else: ?>
                         <div class="alert alert-warning">
@@ -255,7 +322,8 @@ if ($_POST['run_diagnostics'] ?? false) {
                                 <ul>
                                     <li>检查 <code>GITHUB_TOKEN</code> 环境变量是否正确设置</li>
                                     <li>访问 <a href="https://github.com/settings/tokens" target="_blank">GitHub Token 设置</a> 重新生成</li>
-                                    <li>确保 Token 有 <code>repo</code> 权限</li>
                                 </ul>
                             </div>
                             <?php endif; ?>
@@ -264,9 +332,10 @@ if ($_POST['run_diagnostics'] ?? false) {
                             <div class="mb-3">
                                 <h6>📁 仓库问题</h6>
                                 <ul>
-                                    <li>检查 <code>GITHUB_OWNER</code> 是否是正确的用户名（区分大小写）</li>
-                                    <li>检查 <code>GITHUB_REPO</code> 是否是正确的仓库名</li>
                                     <li>确保仓库存在且 Token 有访���权限</li>
                                 </ul>
                             </div>
                             <?php endif; ?>
@@ -277,6 +346,7 @@ if ($_POST['run_diagnostics'] ?? false) {
                                 <ul>
                                     <li>检查 <code>GITHUB_BRANCH</code> 是否正确（通常是 <code>main</code> 或 <code>master</code>）</li>
                                     <li>在 GitHub 仓库中创建对应的分支</li>
                                 </ul>
                             </div>
                             <?php endif; ?>
@@ -285,9 +355,11 @@ if ($_POST['run_diagnostics'] ?? false) {
                             <div class="mb-3">
                                 <h6>✏️ 写入权限问题</h6>
                                 <ul>
-                                    <li>确保 Token 有 <code>repo</code> 的完整权限</li>
-                                    <li>检查仓库是否允许写入</li>
-                                    <li>检查 <code>GITHUB_PATH</code> 路径格式是否正确</li>
                                 </ul>
                             </div>
                             <?php endif; ?>
@@ -295,9 +367,11 @@ if ($_POST['run_diagnostics'] ?? false) {
                         <?php endif; ?>
                         <div class="mt-4">
-                            <a href="config.php" class="btn btn-secondary">返回配置页面</a>
-                            <a href="github-test.php" class="btn btn-info">基础测试</a>
-                            <a href="editor.html" class="btn btn-primary">返回编辑器</a>
                         </div>
                     </div>
                 </div>

     curl_setopt($ch, CURLOPT_URL, $endpoint);
     curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
     curl_setopt($ch, CURLOPT_CUSTOMREQUEST, $method);
+    curl_setopt($ch, CURLOPT_TIMEOUT, 30);
+    curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 10);
+    curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, true);
+    curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
+    // 修复：正确设置HTTP头部，包含必需的User-Agent
+    $headers = [
         'Authorization: token ' . $token,
+        'User-Agent: VvvebJs-WebBuilder/1.0 (https://github.com/givanz/VvvebJs)',
+        'Accept: application/vnd.github.v3+json',
+        'X-GitHub-Api-Version: 2022-11-28'
+    ];
     if ($data) {
         curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($data));
+        $headers[] = 'Content-Type: application/json';
     }
+    curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
     $result = curl_exec($ch);
     $httpCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
     $error = curl_error($ch);
     curl_close($ch);
+    // 详细日志记录
+    error_log("GitHub API Test: $method $endpoint - HTTP $httpCode");
+    if ($error) {
+        error_log("GitHub API cURL Error: $error");
+    }
     return [
         'success' => $httpCode >= 200 && $httpCode < 300,
         'http_code' => $httpCode,
         'response' => $result,
+        'error' => $error,
+        'endpoint' => $endpoint,
+        'method' => $method
     ];
 }
     $branchUrl = "https://api.github.com/repos/{$github['owner']}/{$github['repo']}/branches/{$github['branch']}";
     $diagnostics['branch_test'] = testGitHubAPI($github['token'], $branchUrl);
+    // 测试 4: 测试文件创建权限（使用更安全的测试文件名）
+    $testFile = 'test/diagnostic-test-' . time() . '.txt';
+    $testContent = 'VvvebJs Diagnostic Test - ' . date('Y-m-d H:i:s') . "\nThis is a test file created by VvvebJs diagnostic tool.";
     $createUrl = "https://api.github.com/repos/{$github['owner']}/{$github['repo']}/contents/{$github['path']}{$testFile}";
     $diagnostics['create_test'] = testGitHubAPI($github['token'], $createUrl, 'PUT', [
+        'message' => 'VvvebJs diagnostic test - ' . date('Y-m-d H:i:s'),
         'content' => base64_encode($testContent),
         'branch' => $github['branch']
     ]);
+    // 如果创建成功，尝试删除测试文件以保持整洁
+    if ($diagnostics['create_test']['success']) {
+        // 获取创建的文件的SHA以便删除
+        $createdFile = json_decode($diagnostics['create_test']['response'], true);
+        if (isset($createdFile['content']['sha'])) {
+            $deleteData = [
+                'message' => 'Clean up diagnostic test file - ' . date('Y-m-d H:i:s'),
+                'sha' => $createdFile['content']['sha'],
+                'branch' => $github['branch']
+            ];
+            $diagnostics['cleanup_test'] = testGitHubAPI($github['token'], $createUrl, 'DELETE', $deleteData);
+        }
+    }
 }
 ?>
         .status-ok { color: #28a745; }
         .status-error { color: #dc3545; }
         .status-warning { color: #ffc107; }
+        .config-value { background-color: #f8f9fa; padding: 2px 6px; border-radius: 3px; }
     </style>
 </head>
 <body>
     <div class="container mt-5">
         <div class="row">
+            <div class="col-md-10 mx-auto">
                 <h1 class="mb-4">🔍 VvvebJs GitHub 高级诊断</h1>
                 <!-- 当前配置 -->
                     <div class="card-body">
                         <div class="row">
                             <div class="col-md-6">
+                                <p><strong>Token:</strong>
+                                    <span class="diagnostic-result config-value">
+                                        <?= !empty($github['token']) ? substr($github['token'], 0, 8) . '...' : '❌ 缺失' ?>
+                                    </span>
+                                </p>
+                                <p><strong>Owner:</strong>
+                                    <span class="diagnostic-result config-value"><?= htmlspecialchars($github['owner']) ?></span>
+                                </p>
+                                <p><strong>Repo:</strong>
+                                    <span class="diagnostic-result config-value"><?= htmlspecialchars($github['repo']) ?></span>
+                                </p>
                             </div>
                             <div class="col-md-6">
+                                <p><strong>Branch:</strong>
+                                    <span class="diagnostic-result config-value"><?= htmlspecialchars($github['branch']) ?></span>
+                                </p>
+                                <p><strong>Path:</strong>
+                                    <span class="diagnostic-result config-value"><?= htmlspecialchars($github['path']) ?></span>
+                                </p>
+                                <p><strong>API URL:</strong>
+                                    <span class="diagnostic-result config-value">https://api.github.com/repos/<?= htmlspecialchars($github['owner']) ?>/<?= htmlspecialchars($github['repo']) ?></span>
+                                </p>
                             </div>
                         </div>
                     </div>
                                     <?php $user = json_decode($test['response'], true); ?>
                                     <br><strong>用户信息:</strong> <?= htmlspecialchars($user['login'] ?? 'Unknown') ?>
                                     <br><strong>用户名:</strong> <?= htmlspecialchars($user['name'] ?? 'N/A') ?>
+                                    <br><strong>API Rate Limit:</strong> <?= isset($user['id']) ? '✅ 正常' : '⚠️ 可能受限' ?>
                                 <?php elseif (!$test['success']): ?>
+                                    <br><strong>错误详情:</strong>
+                                    <pre class="diagnostic-result mt-2"><?= htmlspecialchars($test['error'] ?: $test['response']) ?></pre>
                                 <?php endif; ?>
                             </div>
                         </div>
                                     <br><strong>仓库全名:</strong> <?= htmlspecialchars($repo['full_name'] ?? 'Unknown') ?>
                                     <br><strong>私有仓库:</strong> <?= $repo['private'] ? '是' : '否' ?>
                                     <br><strong>默认分支:</strong> <?= htmlspecialchars($repo['default_branch'] ?? 'Unknown') ?>
+                                    <br><strong>权限:</strong>
+                                    <?php
+                                    $permissions = $repo['permissions'] ?? [];
+                                    $canPush = $permissions['push'] ?? false;
+                                    echo $canPush ? '✅ 可写入' : '⚠️ 只读';
+                                    ?>
                                 <?php elseif ($test['http_code'] == 404): ?>
                                     <br><strong>错误:</strong> 仓库不存在或无访问权限
+                                <?php else: ?>
+                                    <br><strong>错误详情:</strong>
+                                    <pre class="diagnostic-result mt-2"><?= htmlspecialchars($test['response']) ?></pre>
                                 <?php endif; ?>
                             </div>
                         </div>
                                     <?php $branch = json_decode($test['response'], true); ?>
                                     <br><strong>分支名:</strong> <?= htmlspecialchars($branch['name'] ?? 'Unknown') ?>
                                     <br><strong>最��提交:</strong> <?= htmlspecialchars(substr($branch['commit']['sha'] ?? '', 0, 7)) ?>
+                                    <br><strong>提交信息:</strong> <?= htmlspecialchars(substr($branch['commit']['commit']['message'] ?? '', 0, 50)) ?><?= strlen($branch['commit']['commit']['message'] ?? '') > 50 ? '...' : '' ?>
                                 <?php endif; ?>
                             </div>
                         </div>
                                 <?php if ($test['success']): ?>
                                     <br><strong>✅ 成功创建测试文件！GitHub 保存功能正常。</strong>
+                                    <?php if (isset($diagnostics['cleanup_test']) && $diagnostics['cleanup_test']['success']): ?>
+                                        <br><small class="text-muted">🧹 测试文件已自动清理</small>
+                                    <?php endif; ?>
                                 <?php else: ?>
                                     <br><strong>错误详情:</strong>
                                     <pre class="diagnostic-result mt-2"><?= htmlspecialchars($test['response']) ?></pre>
+                                    <br><strong>请求信息:</strong> <?= $test['method'] ?> <?= htmlspecialchars($test['endpoint']) ?>
                                 <?php endif; ?>
                             </div>
                         </div>
                     <div class="card-body">
                         <?php
                         $hasErrors = false;
+                        $hasWarnings = false;
+                        foreach ($diagnostics as $key => $test) {
+                            if ($key === 'cleanup_test') continue; // 跳过清理测试
                             if (!$test['success']) {
                                 $hasErrors = true;
                                 break;
                         <?php if (!$hasErrors): ?>
                         <div class="alert alert-success">
                             <h5>🎉 所有测试通过！</h5>
+                            <p>GitHub 配置完全正常，可以正常保存文件。如果编辑器保存仍有问题，请检查：</p>
                             <ul>
+                                <li>编辑器中的用户认证是否正确</li>
+                                <li>浏览器控制台是否有JavaScript错误</li>
                                 <li>网络连接是否稳定</li>
+                                <li>防火墙是否阻止了API请求</li>
                             </ul>
+                            <div class="mt-3">
+                                <a href="editor.html" class="btn btn-success">🚀 开始使用编辑器</a>
+                            </div>
                         </div>
                         <?php else: ?>
                         <div class="alert alert-warning">
                                 <ul>
                                     <li>检查 <code>GITHUB_TOKEN</code> 环境变量是否正确设置</li>
                                     <li>访问 <a href="https://github.com/settings/tokens" target="_blank">GitHub Token 设置</a> 重新生成</li>
+                                    <li>确保 Token 有 <code>repo</code> 权限（不仅是 <code>public_repo</code>）</li>
+                                    <li>如果是私有仓库，确保 Token 有完整的私有仓库访问权限</li>
                                 </ul>
                             </div>
                             <?php endif; ?>
                             <div class="mb-3">
                                 <h6>📁 仓库问题</h6>
                                 <ul>
+                                    <li>检查 <code>GITHUB_OWNER</code> 是否是正确的用户名或组织名（区分大小写）</li>
+                                    <li>检查 <code>GITHUB_REPO</code> 是否是正确的仓库名（区分大小写）</li>
                                     <li>确保仓库存在且 Token 有访���权限</li>
+                                    <li>如果是组织仓库，确保 Token 有组织权限</li>
                                 </ul>
                             </div>
                             <?php endif; ?>
                                 <ul>
                                     <li>检查 <code>GITHUB_BRANCH</code> 是否正确（通常是 <code>main</code> 或 <code>master</code>）</li>
                                     <li>在 GitHub 仓库中创建对应的分支</li>
+                                    <li>确保分支存在且不是空分支</li>
                                 </ul>
                             </div>
                             <?php endif; ?>
                             <div class="mb-3">
                                 <h6>✏️ 写入权限问题</h6>
                                 <ul>
+                                    <li><strong>确保 Token 有 <code>repo</code> 的完整权限</strong>（这是最常见的问题）</li>
+                                    <li>检查仓库是否允许写入（不是只读状态）</li>
+                                    <li>检查 <code>GITHUB_PATH</code> 路径格式是否正确（应以 <code>/</code> 结尾）</li>
+                                    <li>确保目标路径在仓库中存在或可以创建</li>
+                                    <li>检查是否有分支保护规则阻止直接推送</li>
                                 </ul>
                             </div>
                             <?php endif; ?>
                         <?php endif; ?>
                         <div class="mt-4">
+                            <a href="config.php" class="btn btn-secondary">⚙️ 返回配置页面</a>
+                            <a href="github-test.php" class="btn btn-info">🧪 基础测试</a>
+                            <?php if (!$hasErrors): ?>
+                                <a href="editor.html" class="btn btn-primary">📝 返回编辑器</a>
+                            <?php endif; ?>
                         </div>
                     </div>
                 </div>

storage.php CHANGED Viewed

@@ -359,7 +359,7 @@ class GitHubStorage {
         curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, true);
         curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
-        // Fix: Add proper User-Agent header as required by GitHub API
         $headers = [
             'Authorization: token ' . $this->config['token'],
             'User-Agent: VvvebJs-WebBuilder/1.0 (https://github.com/givanz/VvvebJs)',

         curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, true);
         curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
+        // 修复：添加GitHub API必需的User-Agent头部和其他必要头部
         $headers = [
             'Authorization: token ' . $this->config['token'],
             'User-Agent: VvvebJs-WebBuilder/1.0 (https://github.com/givanz/VvvebJs)',