Upload githubService.js

backend/src/services/githubService.js

@@ -159,35 +159,93 @@ class GitHubService {
       console.log(`Successfully saved to GitHub: ${response.data.commit.sha}`);
       return response.data;
     } catch (error) {
-      console.error(`GitHub save failed: ${error.message}`);
+      console.error(`GitHub save failed:`, error.response?.data || error.message);
       
-      // 如果是404错误，可能是目录不存在，尝试创建
+      // 详细的错误处理
       if (error.response?.status === 404) {
+        console.log('404 error - attempting to create directory structure...');
+        
         try {
-          console.log('Attempting to create directory structure...');
+          // 方法1: 先检查仓库是否存在和可访问
+          const repoCheckResponse = await axios.get(`${this.apiUrl}/repos/${owner}/${repo}`, {
+            headers: {
+              'Authorization': `token ${this.token}`,
+              'Accept': 'application/vnd.github.v3+json'
+            }
+          });
+          console.log(`Repository exists: ${repoCheckResponse.data.full_name}`);
           
-          // 先创建用户目录的README
-          const readmePath = `users/${userId}/README.md`;
-          const readmeContent = Buffer.from(`# PPT Files for User ${userId}\n\nThis directory contains PPT files for user ${userId}.\n`).toString('base64');
+          // 方法2: 检查users目录是否存在
+          try {
+            await axios.get(`${this.apiUrl}/repos/${owner}/${repo}/contents/users`, {
+              headers: {
+                'Authorization': `token ${this.token}`,
+                'Accept': 'application/vnd.github.v3+json'
+              }
+            });
+            console.log('Users directory exists');
+          } catch (usersDirError) {
+            console.log('Users directory does not exist, creating...');
+            
+            // 创建users目录的README
+            const usersReadmePath = 'users/README.md';
+            const usersReadmeContent = Buffer.from('# Users Directory\n\nThis directory contains user-specific PPT files.\n').toString('base64');
+            
+            await axios.put(
+              `${this.apiUrl}/repos/${owner}/${repo}/contents/${usersReadmePath}`,
+              {
+                message: 'Create users directory',
+                content: usersReadmeContent,
+                branch: 'main'
+              },
+              {
+                headers: {
+                  'Authorization': `token ${this.token}`,
+                  'Accept': 'application/vnd.github.v3+json'
+                }
+              }
+            );
+            console.log('Users directory created');
+          }
           
-          await axios.put(
-            `${this.apiUrl}/repos/${owner}/${repo}/contents/${readmePath}`,
-            {
-              message: `Create user directory for ${userId}`,
-              content: readmeContent,
-              branch: 'main'
-            },
-            {
+          // 方法3: 检查用户目录是否存在
+          try {
+            await axios.get(`${this.apiUrl}/repos/${owner}/${repo}/contents/users/${userId}`, {
               headers: {
                 'Authorization': `token ${this.token}`,
                 'Accept': 'application/vnd.github.v3+json'
               }
-            }
-          );
+            });
+            console.log(`User directory exists: users/${userId}`);
+          } catch (userDirError) {
+            console.log(`User directory does not exist, creating: users/${userId}`);
+            
+            // 创建用户目录的README
+            const userReadmePath = `users/${userId}/README.md`;
+            const userReadmeContent = Buffer.from(`# PPT Files for User ${userId}\n\nThis directory contains PPT files for user ${userId}.\n`).toString('base64');
+            
+            await axios.put(
+              `${this.apiUrl}/repos/${owner}/${repo}/contents/${userReadmePath}`,
+              {
+                message: `Create user directory for ${userId}`,
+                content: userReadmeContent,
+                branch: 'main'
+              },
+              {
+                headers: {
+                  'Authorization': `token ${this.token}`,
+                  'Accept': 'application/vnd.github.v3+json'
+                }
+              }
+            );
+            console.log(`User directory created: users/${userId}`);
+          }
           
-          console.log('User directory created, retrying PPT save...');
+          // 等待一小会儿让GitHub同步
+          await new Promise(resolve => setTimeout(resolve, 1000));
           
           // 重试保存PPT文件
+          console.log('Retrying PPT file save...');
           const retryResponse = await axios.put(
             `${this.apiUrl}/repos/${owner}/${repo}/contents/${path}`,
             payload,
@@ -203,11 +261,26 @@ class GitHubService {
           return retryResponse.data;
           
         } catch (retryError) {
-          console.error(`Retry also failed: ${retryError.message}`);
-          throw new Error(`Failed to save to GitHub: ${retryError.message}`);
+          console.error(`Comprehensive retry also failed:`, retryError.response?.data || retryError.message);
+          
+          // 如果GitHub彻底失败，fallback到内存存储
+          console.log('GitHub save completely failed, falling back to memory storage...');
+          try {
+            const memoryResult = await memoryStorageService.saveFile(userId, fileName, data);
+            console.log('Successfully saved to memory storage as fallback');
+            return {
+              ...memoryResult,
+              warning: 'Saved to temporary memory storage due to GitHub issues'
+            };
+          } catch (memoryError) {
+            console.error('Memory storage fallback also failed:', memoryError.message);
+            throw new Error(`All storage methods failed. GitHub: ${retryError.message}, Memory: ${memoryError.message}`);
+          }
         }
+      } else if (error.response?.status === 403) {
+        throw new Error(`GitHub permission denied. Check if the token has 'repo' permissions: ${error.response.data.message}`);
       } else {
-        throw new Error(`GitHub API error: ${error.response?.data?.message || error.message}`);
+        throw new Error(`GitHub API error (${error.response?.status}): ${error.response?.data?.message || error.message}`);
       }
     }
   }