mira-app-server 1.0.8 → 1.0.12

package/.dockerignore

@@ -1,16 +1,91 @@
-node_modules
-npm-debug.log
-test
-plugins
-dist
-tools
-data
-*.tar
-*.ts
-!dist
-.idea
-.vscode
-.git
-.gitignore
-*.db
-*.md
+# Node modules 和包管理器文件
+node_modules
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+.npm
+.yarn-integrity
+
+# 构建输出（会在容器内重新构建）
+dist
+build
+
+# Docker 相关文件
+Dockerfile*
+.dockerignore
+docker-build*.sh
+docker-build*.bat
+*.tar
+
+# 测试相关
+test
+coverage
+.nyc_output
+
+# 开发工具配置
+.vscode
+.idea
+*.swp
+*.swo
+*~
+
+# Git相关
+.git
+.gitignore
+.gitattributes
+
+# 环境配置
+.env
+.env.local
+.env.*.local
+
+# 日志文件
+logs
+*.log
+
+# 临时文件
+.tmp
+.temp
+temp
+*.tmp
+
+# OS生成的文件
+.DS_Store
+Thumbs.db
+
+# 文档
+README.md
+*.md
+
+# 其他不需要的文件
+*.bat
+*.ps1
+.DS_Store?
+._*
+.Spotlight-V100
+.Trashes
+ehthumbs.db
+Thumbs.db
+
+# Docker相关
+Dockerfile*
+docker-compose*
+.dockerignore
+*.tar
+
+# 数据库文件
+*.db
+*.sqlite
+
+# 文档
+*.md
+README*
+
+# 脚本文件
+*.bat
+*.sh
+
+# 其他项目目录（如果不需要）
+tools
+data
+plugins

package/Dockerfile

@@ -1,38 +1,75 @@
 # 使用Node.js官方镜像作为基础
 FROM node:20-alpine
 
-# 安装构建依赖（用于编译native modules如sqlite3）
+# 安装构建依赖和 FFmpeg（用于编译native modules如sqlite3）
 RUN apk add --no-cache \
     python3 \
     py3-setuptools \
     make \
     g++ \
     sqlite \
-    sqlite-dev
+    sqlite-dev \
+    ffmpeg \
+    ffmpeg-dev
 
 # 创建工作目录
 WORKDIR /app
 
-# 复制package.json和package-lock.json
-COPY package*.json ./
+# 首先复制根目录的 package.json 和相关配置文件
+COPY packages/package*.json ./packages/
+COPY packages/mira-server/package*.json ./packages/mira-server/
+COPY packages/mira-core/package*.json ./packages/mira-core/
+COPY packages/mira-storage-sqlite/package*.json ./packages/mira-storage-sqlite/
 
-# 复制项目文件（需要在npm install之前复制，因为prepublish脚本会运行build）
-COPY . .
+# 复制 tsconfig 和其他配置文件
+COPY tsconfig.json ./
+COPY packages/mira-server/tsconfig.json ./packages/mira-server/
+COPY packages/mira-core/tsconfig.json ./packages/mira-core/
+COPY packages/mira-storage-sqlite/tsconfig.json ./packages/mira-storage-sqlite/
+
+# 复制源代码
+COPY packages/mira-core/src ./packages/mira-core/src
+COPY packages/mira-server/src ./packages/mira-server/src
+COPY packages/mira-storage-sqlite/src ./packages/mira-storage-sqlite/src
+
+# 复制插件目录（如果存在）
+COPY plugins ./plugins
 
 # 设置环境变量修复distutils问题并安装依赖
 ENV SETUPTOOLS_USE_DISTUTILS=stdlib
+ENV FFMPEG_PATH=/usr/bin/ffmpeg
+ENV FFPROBE_PATH=/usr/bin/ffprobe
 
 # 清理现有的node_modules和package-lock.json（如果存在）
-RUN rm -rf node_modules package-lock.json
+RUN rm -rf packages/*/node_modules packages/*/package-lock.json
+
+# 先安装根目录的依赖
+WORKDIR /app/packages
+RUN npm install
 
-# 先安装依赖
+# 安装并构建 mira-core
+WORKDIR /app/packages/mira-core
 RUN npm install
+RUN npm run build
 
-# 构建项目
+# 安装并构建 mira-storage-sqlite
+WORKDIR /app/packages/mira-storage-sqlite
+RUN npm install
 RUN npm run build
 
-# 清理构建依赖以减小镜像大小
-RUN apk del python3 make g++
+# 安装并构建 mira-server
+WORKDIR /app/packages/mira-server
+RUN npm install
+RUN npm run build
+
+# 验证 FFmpeg 安装
+RUN ffmpeg -version && ffprobe -version
+
+# 清理构建依赖以减小镜像大小（保留 ffmpeg）
+RUN apk del python3 make g++ ffmpeg-dev
+
+# 设置工作目录为 mira-server
+WORKDIR /app/packages/mira-server
 
 # 暴露端口
 EXPOSE 3000

package/Dockerfile.optimized

@@ -0,0 +1,80 @@
+# 多阶段构建的改进版Dockerfile
+FROM node:20-alpine as builder
+
+# 安装构建依赖
+RUN apk add --no-cache \
+    python3 \
+    py3-setuptools \
+    make \
+    g++
+
+# 设置工作目录
+WORKDIR /app
+
+# 复制根目录的依赖文件
+COPY package*.json ./
+COPY packages/package.json ./packages/
+COPY packages/mira-core/package*.json ./packages/mira-core/
+COPY packages/mira-server/package*.json ./packages/mira-server/
+COPY packages/mira-storage-sqlite/package*.json ./packages/mira-storage-sqlite/
+
+# 复制依赖切换脚本
+COPY dependency-*.json ./
+COPY switch-dependencies.js ./
+
+# 复制源代码
+COPY packages/mira-core/src ./packages/mira-core/src
+COPY packages/mira-core/tsconfig.json ./packages/mira-core/
+COPY packages/mira-server/src ./packages/mira-server/src
+COPY packages/mira-server/tsconfig.json ./packages/mira-server/
+COPY packages/mira-storage-sqlite/src ./packages/mira-storage-sqlite/src
+COPY packages/mira-storage-sqlite/tsconfig.json ./packages/mira-storage-sqlite/
+COPY tsconfig.json ./
+
+# 安装所有依赖并构建
+RUN cd packages && npm install
+RUN cd packages && npm run build:core
+RUN cd packages && npm run build:storage  
+RUN cd packages && npm run build:server
+
+# 生产阶段
+FROM node:20-alpine
+
+# 安装运行时依赖
+RUN apk add --no-cache \
+    sqlite \
+    ffmpeg
+
+# 设置环境变量
+ENV SETUPTOOLS_USE_DISTUTILS=stdlib
+ENV FFMPEG_PATH=/usr/bin/ffmpeg
+ENV FFPROBE_PATH=/usr/bin/ffprobe
+
+# 创建应用用户
+RUN addgroup -g 1001 -S nodejs
+RUN adduser -S nodejs -u 1001
+
+# 设置工作目录
+WORKDIR /app
+
+# 复制构建产物和运行时需要的文件
+COPY --from=builder --chown=nodejs:nodejs /app/packages/mira-server/dist ./dist
+COPY --from=builder --chown=nodejs:nodejs /app/packages/mira-server/package.json ./package.json
+COPY --from=builder --chown=nodejs:nodejs /app/packages/mira-server/node_modules ./node_modules
+
+# 验证 FFmpeg 安装
+RUN ffmpeg -version
+
+# 切换到非root用户
+USER nodejs
+
+# 暴露端口
+EXPOSE 3000
+EXPOSE 8081
+
+# 健康检查
+HEALTHCHECK --interval=30s --timeout=3s --start-period=5s --retries=3 \
+  CMD node -e "require('http').get('http://localhost:3000/health', (res) => { process.exit(res.statusCode === 200 ? 0 : 1) }).on('error', () => process.exit(1))"
+
+# 启动命令
+CMD ["node", "dist/index.js"]

package/docker-build.sh

@@ -1,37 +1,37 @@
-#!/bin/bash
-
-# Docker 构建脚本
-# 该脚本将处理插件依赖并构建 Docker 镜像
-
-echo "开始构建 Docker 镜像..."
-
-# 清理之前的构建
-echo "清理之前的构建..."
-docker rmi mira_server:latest 2>/dev/null || true
-
-# 构建 Docker 镜像
-echo "构建 Docker 镜像..."
-docker build -t mira_server:latest .
-
-if [ $? -eq 0 ]; then
-    echo "Docker 镜像构建成功！"
-    echo "保存 Docker 镜像到 mira_server.tar..."
-    docker save -o mira_server.tar mira_server:latest
-    echo "Docker 镜像已保存到 mira_server.tar"
-    read -p "是否启动 Docker 容器？(y/n): " start_container
-    if [[ "$start_container" =~ ^[Yy]$ ]]; then
-        echo "启动 Docker 容器..."
-        docker run -d \
-            -p 3000:3000 \
-            -p 8081:8081 \
-            -v /volume1/文件共享:/library \
-            --restart=always \
-            --name mira_server \
-            mira_server
-    else
-        echo "已跳过启动 Docker 容器。"
-    fi
-else
-    echo "Docker 镜像构建失败！"
-    exit 1
-fi
+#!/bin/bash
+
+# Docker 构建脚本
+# 该脚本将处理插件依赖并构建 Docker 镜像
+
+echo "开始构建 Docker 镜像..."
+
+# 清理之前的构建
+echo "清理之前的构建..."
+docker rmi mira_server:latest 2>/dev/null || true
+
+# 构建 Docker 镜像
+echo "构建 Docker 镜像..."
+docker build -t mira_server:latest .
+
+if [ $? -eq 0 ]; then
+    echo "Docker 镜像构建成功！"
+    echo "保存 Docker 镜像到 mira_server.tar..."
+    docker save -o mira_server.tar mira_server:latest
+    echo "Docker 镜像已保存到 mira_server.tar"
+    read -p "是否启动 Docker 容器？(y/n): " start_container
+    if [[ "$start_container" =~ ^[Yy]$ ]]; then
+        echo "启动 Docker 容器..."
+        docker run -d \
+            -p 3000:3000 \
+            -p 8081:8081 \
+            -v /volume1/文件共享:/library \
+            --restart=always \
+            --name mira_server \
+            mira_server
+    else
+        echo "已跳过启动 Docker 容器。"
+    fi
+else
+    echo "Docker 镜像构建失败！"
+    exit 1
+fi

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mira-app-server",
-  "version": "1.0.8",
+  "version": "1.0.12",
   "description": "Mira Server - standalone server application using mira-core",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -30,6 +30,6 @@
     "typescript": "^5.3.3"
   },
   "dependencies": {
-    "mira-app-core": "^1.0.8"
+    "mira-app-core": "file://Users/Zhuanz/mira_typescript/packages/mira-core/"
   }
 }