refactor: rewrite md-cli with express (#957)

* refactor: rewrite md-cli with express for mockm's security problem

* refactor: remove useless method

* feat: local upload fallback

Author: zeevenn

packages/md-cli/index.js

@@ -1,39 +1,57 @@
 #!/usr/bin/env node
 
-const { ProcessManager } = require(`@wll8/process-manager`);
-const {
-  handleSpace,
+import { readFileSync } from 'fs'
+import getPort from 'get-port'
+import {
   colors,
   parseArgv,
-} = require(`./util.js`)
+} from './util.js'
+import { createServer } from './server.js'
+
+const packageJson = JSON.parse(readFileSync(new URL('./package.json', import.meta.url), 'utf8'))
 
 const arg = parseArgv()
 
-new Promise(async () => {
-  const getPort = (await import("get-port")).default;
-  
-  let { port = 8800, testPort, replayPort } = arg
-  port = Number(port)
-  ;[port, testPort, replayPort] = await Promise.all([port, port+1, port+2].map(item => getPort({port: item}) )).catch(err => console.log(`err`, err))
-  const line = Object.entries({
-    ...arg,
-    proxy: `https://doocs-md.pages.dev`,
-    port,
-    testPort,
-    replayPort,
-    '--config': handleSpace(`${__dirname}/mm.config.js`),
-  }).map(([key, val]) => `${key}=${val}`)
-  const cliArg = [handleSpace(`${__dirname}/node_modules/mockm/run.js`), `--log-line`, ...line]
-  console.log(`doocs/md-cli v${require(`./package.json`).version}`)
-  console.log(`服务启动中...`)
-  const cp = new ProcessManager(cliArg)
-  cp.on(`stdout`, (info = ``) => {
-    if(info.match(`:${port}/`)) {
+async function startServer() {
+  try {
+    let { port = 8800 } = arg
+    port = Number(port)
+
+    port = await getPort({ port }).catch(_ => {
+      console.log(`端口 ${port} 被占用，正在寻找可用端口...`)
+      return getPort()
+    })
+
+    console.log(`doocs/md-cli v${packageJson.version}`)
+    console.log(`服务启动中...`)
+
+    const app = createServer(port)
+
+    app.listen(port, '127.0.0.1', () => {
       console.log(`服务已启动:`)
       console.log(`打开链接 ${colors.green(`http://127.0.0.1:${port}/md/`)} 即刻使用吧~`)
-    }
-    if(info.match(`Port is occupied`)) {
-      process.exit()
-    }
-  })
-}).catch(err => console.log(err))
+      console.log(``)
+
+      const { spaceId, clientSecret } = arg
+      if (spaceId && clientSecret) {
+        console.log(`${colors.green('✅ 云存储已配置，可通过自定义代码上传图片')}`)
+      }
+    })
+
+    process.once('SIGINT', () => {
+      console.log('\n服务器已关闭')
+      process.exit(0)
+    })
+
+    process.once('SIGTERM', () => {
+      console.log('\n服务器已关闭')
+      process.exit(0)
+    })
+
+  } catch (err) {
+    console.error('启动服务器失败:', err)
+    process.exit(1)
+  }
+}
+
+startServer()

packages/md-cli/mm.config.js

@@ -1,6 +1,7 @@
 {
   "name": "@doocs/md-cli",
   "version": "0.1.3",
+  "type": "module",
   "description": "WeChat Markdown Editor | 一款高度简洁的微信 Markdown 编辑器：支持 Markdown 语法、自定义主题样式、内容管理、多图床、AI 助手等特性",
   "main": "index.js",
   "scripts": {
@@ -13,17 +14,18 @@
     "dist",
     "public",
     "index.js",
-    "mm.config.js",
+    "server.js",
     "util.js"
   ],
   "keywords": [],
   "author": "wll8",
   "license": "ISC",
   "dependencies": {
-    "@wll8/process-manager": "^1.0.4",
+    "express": "^5.1.0",
+    "multer": "^2.0.2",
+    "http-proxy-middleware": "^3.0.5",
     "form-data": "4.0.4",
     "get-port": "7.1.0",
-    "mockm": "^1.1.27-alpha.12",
     "node-fetch": "^3.3.2"
   }
 }

packages/md-cli/package.json

@@ -0,0 +1,106 @@
+import express from 'express'
+import multer from 'multer'
+import path from 'path'
+import fs from 'fs'
+import { fileURLToPath } from 'url'
+import { dirname } from 'path'
+import { createProxyMiddleware } from 'http-proxy-middleware'
+import {
+  dcloud,
+  parseArgv,
+  colors
+} from './util.js'
+
+const __filename = fileURLToPath(import.meta.url)
+const __dirname = dirname(__filename)
+const arg = parseArgv()
+
+// unicloud 服务空间配置
+const spaceInfo = {
+  spaceId: ``,
+  clientSecret: ``,
+  ...arg,
+}
+
+/**
+ * 创建 Express 服务器
+ * @param {number} port - 服务器端口
+ */
+export function createServer(port = 8800) {
+  const app = express()
+
+  // 确保上传目录存在
+  const uploadDir = path.join(__dirname, 'public/upload')
+  if (!fs.existsSync(uploadDir)) {
+    fs.mkdirSync(uploadDir, { recursive: true })
+  }
+
+  // 配置 multer 用于文件上传
+  const storage = multer.diskStorage({
+    destination: (req, file, cb) => {
+      cb(null, uploadDir)
+    },
+    filename: (req, file, cb) => {
+      cb(null, file.originalname)
+    }
+  })
+
+  const upload = multer({ storage })
+
+  // 中间件
+  app.use(express.json())
+  app.use(express.urlencoded({ extended: true }))
+
+  app.use('/public', express.static(path.join(__dirname, 'public')))
+
+  // 文件上传 API
+  app.post('/upload', upload.single('file'), async (req, res) => {
+    try {
+      if (!req.file) {
+        return res.status(400).json({ error: 'No file uploaded' })
+      }
+
+      const file = req.file
+      let url = `http://127.0.0.1:${port}/public/upload/${file.filename}`
+
+      try {
+        if (spaceInfo.spaceId && spaceInfo.clientSecret) {
+          url = await dcloud(spaceInfo)({
+            name: file.originalname,
+            file: fs.createReadStream(file.path)
+          })
+
+          // 上传成功后删除本地临时文件
+          fs.unlinkSync(file.path)
+          console.log('文件已上传到云端:', url)
+        } else {
+          console.log(`${colors.yellow('未配置云存储，降级到本地存储')}`)
+        }
+      } catch (err) {
+        // 云上传失败，降级到本地存储
+        console.log('云存储上传失败，降级到本地存储:', err.message)
+      }
+
+      res.json({ url })
+    } catch (error) {
+      console.error('Upload error:', error)
+      res.status(500).json({ error: error.message })
+    }
+  })
+
+  app.get('/', (_, res) => {
+    res.redirect('/md/')
+  })
+
+  console.log('代理到: https://doocs-md.pages.dev')
+  app.use(createProxyMiddleware({
+    target: 'https://doocs-md.pages.dev',
+    changeOrigin: true,
+    onError: (err, req, res) => {
+      console.error(`代理错误 ${req.path}:`, err.message)
+      res.status(502).send('代理服务暂不可用，请检查网络连接')
+    },
+  }))
+
+  return app
+}