Refactor configuration management by replacing config.js with config-store.js, enhancing error handling and logging in admin.js and auth.js, and updating Docker image references in build-runner.yml. Clean up code formatting across multiple files for improved readability.

Author: Sunwuyuan

.github/workflows/build-runner.yml

@@ -4,8 +4,8 @@ on:
   push:
     branches: ["main"]
     tags: ["v*"]
-  pull_request:
-    branches: ["main"]
+    paths:
+      - "CodeRunner/**"
   workflow_dispatch:
 
 concurrency:
@@ -42,8 +42,8 @@ jobs:
         uses: docker/metadata-action@v5
         with:
           images: |
-            sunwuyuan/coderun
-            ghcr.io/zerocatdev/coderun
+            sunwuyuan/coderunner
+            ghcr.io/zerocatdev/coderunner
           tags: |
             type=ref,event=branch
             type=ref,event=pr
@@ -59,7 +59,7 @@ jobs:
       - name: Build and push Docker image
         uses: docker/build-push-action@v5
         with:
-          context: .
+          context: CodeRunner
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}

server.js

@@ -1,11 +1,11 @@
 #!/usr/bin/env node
 
 const { app, server } = require('./app');
-const config = require('./services/config');
+const configStore = require('./services/config-store');
 const debug = require('debug')('coderun:server');
 
 // 获取端口
-const port = normalizePort(config.server.port);
+const port = normalizePort(configStore.get('server.port'));
 app.set('port', port);
 
 // 启动服务器

services/admin.js

@@ -1,25 +1,22 @@
-const axios = require('axios');
-const docker = new (require('dockerode'))();
-const sessionManager = require('./session-manager');
-const config = require('./config');
-const authService = require('./auth');
+const axios = require("axios");
+const docker = new (require("dockerode"))();
+const sessionManager = require("./session-manager");
+const configStore = require("./config-store");
+const authService = require("./auth");
 
 class AdminService {
   constructor() {
-    this.config = config.admin;
-    this.config.site = config.site.url;
-    this.config.authSite = config.site.authSite;
-    this.config.jwtSecret = config.jwt.secret;
-
     // Delay initialization to avoid circular dependency
     setTimeout(() => {
-      this.terminalService = require('./terminal').terminalService;
+      this.terminalService = require("./terminal").terminalService;
       this.initializeAdmin().catch(console.error);
     }, 1000);
   }
 
   logRequest(method, url, data = null) {
-    console.log(`[AdminService] 📤 [${new Date().toISOString()}] ${method.toUpperCase()} ${url}`);
+    console.log(
+      `[AdminService] 📤 [${new Date().toISOString()}] ${method.toUpperCase()} ${url}`
+    );
     if (data) {
       //console.log('Request Data:', JSON.stringify(data, null, 2));
     }
@@ -31,39 +28,48 @@ class AdminService {
   }
 
   logError(method, url, error) {
-    console.error(`[AdminService] ❌ [${new Date().toISOString()}] ${method.toUpperCase()} ${url} - 错误:`, error.message);
+    console.error(
+      `[AdminService] ❌ [${new Date().toISOString()}] ${method.toUpperCase()} ${url} - 错误:`,
+      error.message
+    );
     if (error.response) {
-      console.error('[AdminService] ❌ 错误响应:', JSON.stringify(error.response.data, null, 2));
+      console.error(
+        "[AdminService] ❌ 错误响应:",
+        JSON.stringify(error.response.data, null, 2)
+      );
     }
   }
 
   async initializeAdmin() {
     try {
-      console.log('[AdminService] 🚀 初始化管理服务...');
+      console.log("[AdminService] 🚀 初始化管理服务...");
 
       // 确保已注册
       await authService.getRunnerConfig();
 
       // Start reporting interval
-      setInterval(() => this.reportDeviceStatus(), this.config.reportInterval);
+      setInterval(
+        () => this.reportDeviceStatus(),
+        configStore.get("admin.report_interval")
+      );
 
       // Initial report
       await this.reportDeviceStatus();
 
       // Initial config fetch
       await this.fetchRemoteConfig();
 
-      console.log('[AdminService] ✅ 管理服务初始化成功');
+      console.log("[AdminService] ✅ 管理服务初始化成功");
     } catch (error) {
-      console.error('[AdminService] ❌ 初始化管理服务失败:', error.message);
+      console.error("[AdminService] ❌ 初始化管理服务失败:", error.message);
     }
   }
 
   async getSystemInfo() {
-    console.log('[AdminService] 📊 收集系统信息...');
+    console.log("[AdminService] 📊 收集系统信息...");
     const [dockerInfo, dockerVersion] = await Promise.all([
       docker.info(),
-      docker.version()
+      docker.version(),
     ]);
 
     const info = {
@@ -76,110 +82,107 @@ class AdminService {
           total: dockerInfo.Containers,
           running: dockerInfo.ContainersRunning,
           paused: dockerInfo.ContainersPaused,
-          stopped: dockerInfo.ContainersStopped
-        }
+          stopped: dockerInfo.ContainersStopped,
+        },
       },
       system: {
         platform: process.platform,
         arch: process.arch,
         version: process.version,
         memory: process.memoryUsage(),
-        uptime: process.uptime()
+        uptime: process.uptime(),
       },
       coderun: {
-        version: require('../package.json').version,
-        poolSize: this.config.poolSize,
+        version: require("../package.json").version,
+        poolSize: configStore.get("admin.pool_size"),
         activeConnections: sessionManager.getActiveSessionCount(),
-        pooledContainers: this.terminalService ? this.terminalService.containerPool.length : 0,
-        site: this.config.site,
-        lastConfigUpdate: this.config.lastConfigUpdate,
-        lastReport: this.config.lastReport,
-        deviceId: await authService.getDeviceId()
-      }
+        pooledContainers: this.terminalService
+          ? this.terminalService.containerPool.length
+          : 0,
+        site: configStore.get("site.url"),
+        lastConfigUpdate: configStore.get("admin.last_config_update"),
+        lastReport: configStore.get("admin.last_report"),
+        deviceId: await authService.getDeviceId(),
+      },
     };
 
-    console.log('[AdminService] 📊 系统信息收集完成');
+    console.log("[AdminService] 📊 系统信息收集完成");
     return info;
   }
 
   async reportDeviceStatus() {
-    if (!this.config.authSite) return;
+    const authSite = configStore.get("site.auth_site");
+    if (!authSite) return;
 
-    const url = `${this.config.authSite}/coderun/device`;
+    const url = `${authSite}/coderun/device`;
     try {
       const systemInfo = await this.getSystemInfo();
       const runnerToken = await authService.getRunnerToken();
-      this.logRequest('POST', url, systemInfo);
-      const response = await axios.post(
-        url,
-        systemInfo,
-        {
-          headers: { 'Authorization': `Bearer ${runnerToken}` }
-        }
-      );
-      this.logResponse('POST', url, response);
+      this.logRequest("POST", url, systemInfo);
+      const response = await axios.post(url, systemInfo, {
+        headers: { Authorization: `Bearer ${runnerToken}` },
+      });
+      this.logResponse("POST", url, response);
 
-      this.config.lastReport = new Date();
+      configStore.set("admin.last_report", new Date().toISOString());
       await authService.updateLastUpdated();
-      console.log('[AdminService] ✅ 设备状态上报成功'+new Date().toISOString());
+      console.log(
+        "[AdminService] ✅ 设备状态上报成功" + new Date().toISOString()
+      );
     } catch (error) {
-      this.logError('POST', url, error);
-      console.error('[AdminService] ❌ 设备状态上报失败:', error);
+      this.logError("POST", url, error);
+      console.error("[AdminService] ❌ 设备状态上报失败:", error);
     }
   }
 
   async fetchRemoteConfig() {
-    if (!this.config.authSite) return;
+    const authSite = configStore.get("site.auth_site");
+    if (!authSite) return;
 
-    const url = `${this.config.authSite}/coderun/config`;
+    const url = `${authSite}/coderun/config`;
     try {
       const runnerToken = await authService.getRunnerToken();
-      this.logRequest('GET', url);
-      const response = await axios.get(
-        url,
-        {
-          headers: { 'Authorization': `Bearer ${runnerToken}` }
-        }
-      );
-      this.logResponse('GET', url, response);
+      this.logRequest("GET", url);
+      const response = await axios.get(url, {
+        headers: { Authorization: `Bearer ${runnerToken}` },
+      });
+      this.logResponse("GET", url, response);
 
       const newConfig = response.data;
 
-      console.log('[AdminService] 📝 应用新配置');
+      console.log("[AdminService] 📝 应用新配置");
       console.log(newConfig);
 
       if (newConfig.config) {
-        // 更新全局 JWT secret
-        if (newConfig.config.jwtSecret) {
-          config.jwt.secret = newConfig.config.jwtSecret;
-        }
-
-        // 更新 admin 配置
-        this.config = {
-          ...this.config,
-          ...newConfig.config,
-          lastConfigUpdate: new Date()
-        };
+        // Update config store with remote values
+        configStore.updateFromRemote(newConfig.config);
 
         // Apply pool size changes if needed
         if (newConfig.config.poolSize !== undefined && this.terminalService) {
-          console.log(`[AdminService] 🔄 更新容器池大小到 ${newConfig.config.poolSize}`);
-          this.terminalService.CONTAINER_POOL_SIZE = newConfig.config.poolSize;
+          const newPoolSize = configStore.get("docker.container_pool_size");
+          console.log(`[AdminService] 🔄 更新容器池大小到 ${newPoolSize}`);
+          this.terminalService.CONTAINER_POOL_SIZE = newPoolSize;
           await this.terminalService.maintainContainerPool();
         }
       }
 
       await authService.updateLastUpdated();
-      console.log('[AdminService] ✅ 远程配置更新成功');
-      return this.config;
+      console.log("[AdminService] ✅ 远程配置更新成功");
+      return configStore.getByPrefix("admin");
     } catch (error) {
-      this.logError('GET', url, error);
-      console.error('[AdminService] ❌ 获取远程配置失败:', error.message);
+      this.logError("GET", url, error);
+      console.error("[AdminService] ❌ 获取远程配置失败:", error.message);
 
       // Check for 401 status and specific error message
-      if (error.response && error.response.status === 401 &&
-          error.response.data && error.response.data.error === 'Invalid runner token or device not found') {
-        console.error('[AdminService] ❌ Runner令牌无效或设备未找到，程序将退出');
+      if (
+        error.response &&
+        error.response.status === 401 &&
+        error.response.data &&
+        error.response.data.error === "Invalid runner token or device not found"
+      ) {
+        console.error(
+          "[AdminService] ❌ Runner令牌无效或设备未找到，程序将退出"
+        );
         process.exit(1);
       }
 
@@ -188,15 +191,15 @@ class AdminService {
   }
 
   getConfig() {
-    return this.config;
+    return configStore.getByPrefix("admin");
   }
 
   async validateAuthToken(token) {
     const runnerToken = await authService.getRunnerToken();
     const isValid = token === runnerToken;
-    console.log(`[AdminService] 🔒 认证令牌验证: ${isValid ? '成功' : '失败'}`);
+    console.log(`[AdminService] 🔒 认证令牌验证: ${isValid ? "成功" : "失败"}`);
     return isValid;
   }
 }
 
-module.exports = new AdminService();
+module.exports = new AdminService();