collabdocchat 2.4.4 → 2.4.6

package/bin/cli.js

@@ -34,7 +34,7 @@ const npmCmd = isWindows ? 'npm.cmd' : 'npm';
 const startProcess = spawn(npmCmd, ['start'], {
   cwd: rootDir,
   stdio: 'inherit',
-  shell: true
+  shell: false
 });
 
 startProcess.on('error', (error) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "collabdocchat",
-  "version": "2.4.4",
+  "version": "2.4.6",
   "description": "开源的实时协作文档聊天平台 - 集成任务管理、多人文档编辑、智能点名功能",
   "main": "./server/index.js",
   "type": "module",
@@ -57,6 +57,7 @@
     "postinstall": "node scripts/postinstall.js",
     "dev": "concurrently \"npm run server\" \"npm run client\" \"npm run open-browser\"",
     "start": "node scripts/start-app.js",
+    "start:simple": "node scripts/start-simple.js",
     "quick-start": "node scripts/quick-start.js",
     "stop": "node scripts/stop-app.js",
     "server": "nodemon server/index.js",
@@ -65,6 +66,7 @@
     "build": "vite build",
     "preview": "vite preview",
     "serve": "node server/index.js",
+    "fix": "node scripts/fix-startup-issues.js",
     "prepack": "node scripts/pre-publish-check.js",
     "prepublishOnly": "node scripts/pre-publish-check.js"
   },
@@ -91,4 +93,4 @@
     "open": "^11.0.0",
     "vite": "^5.0.8"
   }
-}
+}

package/scripts/cleanup-scripts.js

@@ -0,0 +1,140 @@
+#!/usr/bin/env node
+
+/**
+ * 清理不需要的开发脚本
+ * 保留生产环境必需的脚本
+ */
+
+import { unlinkSync, existsSync } from 'fs';
+import { join, dirname } from 'path';
+import { fileURLToPath } from 'url';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+const scriptsDir = __dirname;
+
+console.log('🗑️  开始清理不需要的脚本...\n');
+
+// 需要保留的脚本（生产环境必需）
+const keepScripts = [
+  'postinstall.js',           // npm 安装后执行
+  'pre-publish-check.js',     // 发布前检查
+  'start-app.js',             // 标准启动脚本
+  'start-simple.js',          // 简化启动脚本
+  'quick-start.js',           // 快速启动
+  'stop-app.js',              // 停止应用
+  'open-browser.js',          // 打开浏览器
+  'fix-startup-issues.js',    // 修复启动问题
+  'generate-docs.js',         // 生成文档
+  'cleanup-scripts.js'        // 本脚本
+];
+
+// 需要删除的脚本（开发调试用的临时脚本）
+const scriptsToDelete = [
+  // 添加功能的临时脚本
+  'add-button-hover.js',
+  'add-missing-braces.js',
+  'add-missing-functions.js',
+  'add-more-features.js',
+  'add-user-functions.js',
+  
+  // 美化相关的临时脚本
+  'beautify-buttons.js',
+  'beautify-ui.js',
+  
+  // 检查相关的临时脚本
+  'check-brackets.js',
+  'check-encoding.js',
+  'check-syntax.js',
+  
+  // 查找相关的临时脚本
+  'find-buttons.js',
+  'find-duplicate.js',
+  'find-extra-brace.js',
+  'find-sidebar-buttons.js',
+  
+  // 修复相关的临时脚本
+  'fix-file-end.js',
+  'fix-help.js',
+  'fix-issues-step1.js',
+  'fix-issues-step2.js',
+  'fix-issues-step3.js',
+  'fix-issues-step4.js',
+  'fix-optimized-views.js',
+  'fix-ports.js',
+  'fix-settings.js',
+  'fix-syntax-error.js',
+  'fix-user-dashboard.js',
+  'fix-workflow.js',
+  
+  // 重构相关的临时脚本
+  'refactor-step1.js',
+  'refactor-step2.js',
+  'refactor-step3.js',
+  'refactor-step4.js',
+  'refactor-step5.js',
+  'refactor-step6.js',
+  'refactor-step7.js',
+  
+  // 删除相关的临时脚本
+  'delete-orphan-block.js',
+  'remove-bom.js',
+  'remove-orphan-code.js',
+  'remove-quill-from-user-dashboard.js',
+  'remove-quill-imports-only.js',
+  
+  // 更新相关的临时脚本
+  'update-port-user.js',
+  'update-port.js',
+  
+  // 自动发布脚本（已不需要）
+  'auto-publish.js'
+];
+
+let deletedCount = 0;
+let failedCount = 0;
+
+console.log('📋 将要删除的脚本：\n');
+
+scriptsToDelete.forEach((script, index) => {
+  const scriptPath = join(scriptsDir, script);
+  
+  if (existsSync(scriptPath)) {
+    try {
+      unlinkSync(scriptPath);
+      console.log(`   ${index + 1}. ✅ ${script}`);
+      deletedCount++;
+    } catch (error) {
+      console.log(`   ${index + 1}. ❌ ${script} - 删除失败: ${error.message}`);
+      failedCount++;
+    }
+  } else {
+    console.log(`   ${index + 1}. ⚠️  ${script} - 文件不存在`);
+  }
+});
+
+console.log('\n' + '='.repeat(60));
+console.log('📊 清理统计：\n');
+console.log(`   ✅ 成功删除: ${deletedCount} 个脚本`);
+console.log(`   ❌ 删除失败: ${failedCount} 个脚本`);
+console.log(`   📦 保留脚本: ${keepScripts.length} 个\n`);
+
+console.log('📝 保留的脚本：\n');
+keepScripts.forEach((script, index) => {
+  console.log(`   ${index + 1}. ${script}`);
+});
+
+console.log('\n' + '='.repeat(60));
+console.log('✅ 清理完成！\n');
+console.log('💡 保留的脚本说明：');
+console.log('   • postinstall.js - npm 安装后自动执行');
+console.log('   • pre-publish-check.js - 发布前检查');
+console.log('   • start-app.js - 标准启动（带端口检测）');
+console.log('   • start-simple.js - 简化启动（推荐）');
+console.log('   • quick-start.js - 快速启动');
+console.log('   • stop-app.js - 停止所有进程');
+console.log('   • open-browser.js - 自动打开浏览器');
+console.log('   • fix-startup-issues.js - 修复启动问题');
+console.log('   • generate-docs.js - 生成文档');
+console.log('\n');
+

package/scripts/fix-startup-issues.js

@@ -0,0 +1,136 @@
+#!/usr/bin/env node
+
+/**
+ * 修复启动问题脚本
+ * 解决：
+ * 1. 端口配置不一致
+ * 2. 安全警告（shell: true）
+ * 3. Mongoose 重复索引警告
+ */
+
+import { readFileSync, writeFileSync } from 'fs';
+import { join, dirname } from 'path';
+import { fileURLToPath } from 'url';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+const rootDir = join(__dirname, '..');
+
+console.log('🔧 开始修复启动问题...\n');
+
+let fixCount = 0;
+
+// 1. 修复 start-app.js 中的安全警告
+console.log('1️⃣ 修复 start-app.js 安全警告...');
+try {
+  const startAppPath = join(rootDir, 'scripts', 'start-app.js');
+  let content = readFileSync(startAppPath, 'utf-8');
+  
+  // 移除 shell: true 选项
+  content = content.replace(/shell: true/g, 'shell: false');
+  
+  // 修复 Windows 命令
+  content = content.replace(
+    /const npmCmd = isWindows \? 'npm\.cmd' : 'npm';/g,
+    "const npmCmd = isWindows ? 'npm.cmd' : 'npm';"
+  );
+  
+  writeFileSync(startAppPath, content, 'utf-8');
+  console.log('   ✅ start-app.js 已修复\n');
+  fixCount++;
+} catch (error) {
+  console.log('   ⚠️  start-app.js 修复失败:', error.message, '\n');
+}
+
+// 2. 修复 bin/cli.js 中的安全警告
+console.log('2️⃣ 修复 bin/cli.js 安全警告...');
+try {
+  const cliPath = join(rootDir, 'bin', 'cli.js');
+  let content = readFileSync(cliPath, 'utf-8');
+  
+  // 移除 shell: true 选项
+  content = content.replace(/shell: true/g, 'shell: false');
+  
+  writeFileSync(cliPath, content, 'utf-8');
+  console.log('   ✅ bin/cli.js 已修复\n');
+  fixCount++;
+} catch (error) {
+  console.log('   ⚠️  bin/cli.js 修复失败:', error.message, '\n');
+}
+
+// 3. 修复 User.js 中的重复索引
+console.log('3️⃣ 修复 User.js 重复索引警告...');
+try {
+  const userModelPath = join(rootDir, 'server', 'models', 'User.js');
+  let content = readFileSync(userModelPath, 'utf-8');
+  
+  // 移除 index: true，只保留 unique: true
+  content = content.replace(
+    /username: \{ type: String, required: true, unique: true, index: true \}/g,
+    'username: { type: String, required: true, unique: true }'
+  );
+  
+  content = content.replace(
+    /email: \{ type: String, required: true, unique: true, index: true \}/g,
+    'email: { type: String, required: true, unique: true }'
+  );
+  
+  writeFileSync(userModelPath, content, 'utf-8');
+  console.log('   ✅ User.js 已修复\n');
+  fixCount++;
+} catch (error) {
+  console.log('   ⚠️  User.js 修复失败:', error.message, '\n');
+}
+
+// 4. 创建 .env 文件（如果不存在）
+console.log('4️⃣ 检查 .env 配置...');
+try {
+  const envPath = join(rootDir, '.env');
+  const envExamplePath = join(rootDir, '.env.example');
+  
+  let envContent = '';
+  try {
+    envContent = readFileSync(envPath, 'utf-8');
+  } catch {
+    // .env 不存在，创建默认配置
+    envContent = `# MongoDB 配置
+MONGODB_URI=mongodb://localhost:27017/collabdocchat
+
+# JWT 密钥
+JWT_SECRET=your_jwt_secret_key_change_this_in_production
+
+# 服务器端口
+PORT=3000
+
+# Node 环境
+NODE_ENV=development
+`;
+    writeFileSync(envPath, envContent, 'utf-8');
+    console.log('   ✅ 已创建 .env 文件\n');
+    fixCount++;
+  }
+  
+  // 检查端口配置
+  if (!envContent.includes('PORT=')) {
+    envContent += '\n# 服务器端口\nPORT=3000\n';
+    writeFileSync(envPath, envContent, 'utf-8');
+    console.log('   ✅ 已添加 PORT 配置\n');
+    fixCount++;
+  } else {
+    console.log('   ✅ .env 配置正常\n');
+  }
+} catch (error) {
+  console.log('   ⚠️  .env 配置失败:', error.message, '\n');
+}
+
+// 总结
+console.log('='.repeat(50));
+console.log(`✅ 修复完成！共修复 ${fixCount} 个问题\n`);
+console.log('📝 修复内容：');
+console.log('   1. 移除不安全的 shell: true 选项');
+console.log('   2. 修复 Mongoose 重复索引警告');
+console.log('   3. 确保 .env 配置正确\n');
+console.log('🚀 现在可以重新启动应用：');
+console.log('   collabdocchat');
+console.log('   或: npm start\n');
+

package/scripts/start-app.js

@@ -3,12 +3,16 @@ import { platform } from 'os';
 import { fileURLToPath } from 'url';
 import { dirname, join } from 'path';
 import http from 'http';
-import { existsSync } from 'fs';
+import { existsSync, readFileSync } from 'fs';
+import dotenv from 'dotenv';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
 const rootDir = join(__dirname, '..');
 
+// 加载 .env 文件
+dotenv.config({ path: join(rootDir, '.env') });
+
 const PORT = process.env.PORT || 8765;
 const CLIENT_PORT = 5173;
 const CLIENT_URL = `http://localhost:${CLIENT_PORT}`;
@@ -29,7 +33,7 @@ function installDevDependencies() {
     const install = spawn(npmCmd, ['install'], {
       cwd: rootDir,
       stdio: 'inherit',
-      shell: true
+      shell: false
     });
 
     install.on('close', (code) => {
@@ -92,7 +96,7 @@ function openBrowser(url) {
     const browser = spawn(command, args, { 
       stdio: 'ignore', 
       detached: true,
-      shell: true 
+      shell: false 
     });
   browser.unref();
   } catch (error) {
@@ -146,7 +150,8 @@ function startServer() {
   const server = spawn('node', ['server/index.js'], {
     cwd: rootDir,
     stdio: 'inherit',
-    shell: true
+    shell: false,
+    env: { ...process.env }
   });
 
   return server;
@@ -159,7 +164,8 @@ function startClient() {
   const client = spawn(npmCmd, ['run', 'client'], {
     cwd: rootDir,
     stdio: 'inherit',
-    shell: true
+    shell: false,
+    env: { ...process.env }
   });
 
   return client;

package/scripts/start-simple.js

@@ -0,0 +1,96 @@
+#!/usr/bin/env node
+
+/**
+ * 简化的启动脚本 - 避免超时问题
+ */
+
+import { spawn } from 'child_process';
+import { platform } from 'os';
+import { fileURLToPath } from 'url';
+import { dirname, join } from 'path';
+import dotenv from 'dotenv';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+const rootDir = join(__dirname, '..');
+const isWindows = platform() === 'win32';
+
+// 加载环境变量
+dotenv.config({ path: join(rootDir, '.env') });
+
+const PORT = process.env.PORT || 8765;
+
+console.log('📦 CollabDocChat 正在启动...\n');
+
+// 启动服务器
+console.log('🚀 正在启动服务器...');
+const server = spawn('node', ['server/index.js'], {
+  cwd: rootDir,
+  stdio: 'inherit',
+  env: { ...process.env }
+});
+
+server.on('error', (error) => {
+  console.error('❌ 服务器启动失败:', error.message);
+  process.exit(1);
+});
+
+// 等待3秒后启动客户端
+setTimeout(() => {
+  console.log('\n🎨 正在启动客户端...\n');
+  const npmCmd = isWindows ? 'npm.cmd' : 'npm';
+  const client = spawn(npmCmd, ['run', 'client'], {
+    cwd: rootDir,
+    stdio: 'inherit',
+    env: { ...process.env }
+  });
+
+  client.on('error', (error) => {
+    console.error('❌ 客户端启动失败:', error.message);
+  });
+
+  // 再等待5秒后打开浏览器
+  setTimeout(() => {
+    console.log('\n✅ 应用启动成功！');
+    console.log('\n💡 访问地址：');
+    console.log(`   • 服务器: http://localhost:${PORT}`);
+    console.log('   • 客户端: http://localhost:5173');
+    console.log('   • 默认账号: admin / admin123');
+    console.log('\n⚠️  按 Ctrl+C 停止服务\n');
+
+    // 打开浏览器
+    try {
+      const openCmd = isWindows ? 'start' : (platform() === 'darwin' ? 'open' : 'xdg-open');
+      const url = 'http://localhost:5173';
+      
+      if (isWindows) {
+        spawn('cmd', ['/c', 'start', '', url], { 
+          stdio: 'ignore',
+          detached: true 
+        }).unref();
+      } else {
+        spawn(openCmd, [url], { 
+          stdio: 'ignore',
+          detached: true 
+        }).unref();
+      }
+    } catch (error) {
+      console.log('⚠️  无法自动打开浏览器，请手动访问: http://localhost:5173');
+    }
+  }, 5000);
+
+  // 处理退出信号
+  process.on('SIGINT', () => {
+    console.log('\n\n🛑 正在关闭服务器...');
+    server.kill();
+    client.kill();
+    process.exit(0);
+  });
+
+  process.on('SIGTERM', () => {
+    server.kill();
+    client.kill();
+    process.exit(0);
+  });
+}, 3000);
+

package/server/index.js

@@ -16,6 +16,8 @@ import knowledgeRoutes from './routes/knowledge.js';
 import workflowRoutes from './routes/workflows.js';
 import exportRoutes from './routes/export.js';
 import backupRoutes from './routes/backup.js';
+import pollRoutes from './routes/polls.js';
+import messageRoutes from './routes/messages.js';
 import { setupWebSocket } from './websocket/index.js';
 import { initDefaultAdmin } from './utils/initAdmin.js';
 import { errorHandler, notFoundHandler } from './middleware/errorHandler.js';
@@ -61,6 +63,8 @@ app.use('/api/knowledge', knowledgeRoutes);
 app.use('/api/workflows', workflowRoutes);
 app.use('/api/export', exportRoutes);
 app.use('/api/backup', backupRoutes);
+app.use('/api/polls', pollRoutes);
+app.use('/api/messages', messageRoutes);
 
 // WebSocket 设置
 setupWebSocket(wss);

package/server/index.js.bak

@@ -0,0 +1,97 @@
+import express from 'express';
+import { createServer } from 'http';
+import { WebSocketServer } from 'ws';
+import cors from 'cors';
+import dotenv from 'dotenv';
+import mongoose from 'mongoose';
+import authRoutes from './routes/auth.js';
+import taskRoutes from './routes/tasks.js';
+import documentRoutes from './routes/documents.js';
+import groupRoutes from './routes/groups.js';
+import auditRoutes from './routes/audit.js';
+import fileRoutes from './routes/files.js';
+import chunkedUploadRoutes from './routes/chunked-upload.js';
+import aiRoutes from './routes/ai.js';
+import knowledgeRoutes from './routes/knowledge.js';
+import workflowRoutes from './routes/workflows.js';
+import exportRoutes from './routes/export.js';
+import backupRoutes from './routes/backup.js';
+import pollRoutes from './routes/polls.js';
+import { setupWebSocket } from './websocket/index.js';
+import { initDefaultAdmin } from './utils/initAdmin.js';
+import { errorHandler, notFoundHandler } from './middleware/errorHandler.js';
+import backupService from './utils/backup.js';
+
+dotenv.config();
+
+const app = express();
+const server = createServer(app);
+const wss = new WebSocketServer({ server });
+
+// 中间件
+app.use(cors({
+  origin: ['http://localhost:5173', 'http://localhost:5174'],
+  credentials: true
+}));
+app.use(express.json());
+
+// 数据库连接
+mongoose.connect(process.env.MONGODB_URI || 'mongodb://localhost:27017/collabdocchat')
+  .then(async () => {
+    console.log('✅ MongoDB 连接成功');
+    // 初始化默认管理员账户
+    await initDefaultAdmin();
+    // 初始化自动备份
+    backupService.initAutoBackup();
+  })
+  .catch(err => console.error('❌ MongoDB 连接失败:', err));
+
+// 静态文件服务（用于文件下载）
+app.use('/uploads', express.static('uploads'));
+
+// API 路由
+app.use('/api/auth', authRoutes);
+app.use('/api/tasks', taskRoutes);
+app.use('/api/documents', documentRoutes);
+app.use('/api/groups', groupRoutes);
+app.use('/api/audit', auditRoutes);
+app.use('/api/files', fileRoutes);
+app.use('/api/files/chunked', chunkedUploadRoutes);
+app.use('/api/ai', aiRoutes);
+app.use('/api/knowledge', knowledgeRoutes);
+app.use('/api/workflows', workflowRoutes);
+app.use('/api/export', exportRoutes);
+app.use('/api/backup', backupRoutes);
+app.use('/api/polls', pollRoutes);
+
+// WebSocket 设置
+setupWebSocket(wss);
+
+// 健康检查
+app.get('/health', (req, res) => {
+  res.json({ status: 'ok', timestamp: new Date().toISOString() });
+});
+
+// 404 处理
+app.use(notFoundHandler);
+
+// 错误处理中间件（必须在所有路由之后）
+app.use(errorHandler);
+
+const PORT = process.env.PORT || 8765;
+server.listen(PORT, () => {
+  console.log(`\n${'='.repeat(60)}`);
+  console.log(`🚀 CollabDocChat 服务器启动成功！`);
+  console.log(`${'='.repeat(60)}`);
+  console.log(`📍 服务器地址: http://localhost:${PORT}`);
+  console.log(`🔌 WebSocket: ws://localhost:${PORT}`);
+  console.log(`\n✅ 已启用功能:`);
+  console.log(`   - 错误处理中间件`);
+  console.log(`   - 分片上传功能`);
+  console.log(`   - AI助手API`);
+  console.log(`   - 知识库系统`);
+  console.log(`   - 工作流引擎`);
+  console.log(`   - 数据导出功能`);
+  console.log(`   - 自动备份系统`);
+  console.log(`${'='.repeat(60)}\n`);
+});

package/server/models/Document.js

@@ -25,6 +25,11 @@ const documentSchema = new mongoose.Schema({
     enum: ['readonly', 'editable'],
     default: 'editable'
   },
+  // 可编辑成员列表（共享文档功能）
+  editableMembers: [{
+    type: mongoose.Schema.Types.ObjectId,
+    ref: 'User'
+  }],
   editors: [{
     user: {
       type: mongoose.Schema.Types.ObjectId,