@fecommunity/reactpress-server 1.0.0-beta.3 → 1.0.0-beta.30

package/dist/main.js

@@ -1,44 +1,331 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const core_1 = require("@nestjs/core");
-const swagger_1 = require("@nestjs/swagger");
-const bodyParser = require("body-parser");
-const compression = require("compression");
-const express = require("express");
-const rateLimit = require("express-rate-limit");
-const helmet = require("helmet");
+const fs = require("fs");
 const path_1 = require("path");
+const express = require("express");
+const bodyParser = require("body-parser");
 const open = require("open");
-const app_module_1 = require("./app.module");
-const http_exception_filter_1 = require("./filters/http-exception.filter");
-const transform_interceptor_1 = require("./interceptors/transform.interceptor");
-async function bootstrap() {
-    const app = await core_1.NestFactory.create(app_module_1.AppModule);
-    const configService = app.get('ConfigService');
-    app.enableCors();
-    app.setGlobalPrefix(configService.get('SERVER_API_PREFIX', '/api'));
-    app.use(rateLimit({
-        windowMs: 60 * 1000,
-        max: 10000,
-    }));
-    const rootDir = path_1.join(__dirname, '../public');
-    app.use('/public', express.static(rootDir));
-    app.use(compression());
-    app.use(helmet());
-    app.useGlobalInterceptors(new transform_interceptor_1.TransformInterceptor());
-    app.useGlobalFilters(new http_exception_filter_1.HttpExceptionFilter());
-    app.use(bodyParser.json({ limit: '10mb' }));
-    app.use(bodyParser.urlencoded({ limit: '10mb', extended: true }));
-    const swaggerConfig = new swagger_1.DocumentBuilder()
-        .setTitle('ReactPress Open Api')
-        .setDescription('ReactPress Open Api Document')
-        .setVersion('1.0')
-        .build();
-    const document = swagger_1.SwaggerModule.createDocument(app, swaggerConfig);
-    swagger_1.SwaggerModule.setup('api', app, document);
-    await app.listen(configService.get('SERVER_PORT', 3002));
-    await open(`http://localhost:${configService.get('SERVER_PORT', 3002)}/api`);
-    console.log(`[ReactPress] 服务启动成功`);
-}
-bootstrap();
+const net = require("net");
+const INSTALLATION_PORT = 3002;
+const MAX_PORT_ATTEMPTS = 10;
+const serverState = {
+    server: null,
+    isClosing: false,
+    isListening: false
+};
+const checkPort = (port) => {
+    return new Promise((resolve) => {
+        const server = net.createServer();
+        server.once('error', (err) => {
+            if (err.code === 'EADDRINUSE') {
+                resolve(false);
+            }
+            else {
+                resolve(false);
+            }
+        });
+        server.once('listening', () => {
+            server.once('close', () => resolve(true)).close();
+        });
+        server.listen(port);
+    });
+};
+const findAvailablePort = async (startPort) => {
+    for (let port = startPort; port < startPort + MAX_PORT_ATTEMPTS; port++) {
+        if (await checkPort(port)) {
+            return port;
+        }
+    }
+    throw new Error(`No available ports found in range ${startPort}-${startPort + MAX_PORT_ATTEMPTS - 1}`);
+};
+const terminateProcessOnPort = async (port) => {
+    try {
+        if (process.platform === 'win32') {
+            const { exec } = require('child_process');
+            const { stdout } = await new Promise((resolve, reject) => {
+                exec(`netstat -ano | findstr :${port}`, (error, stdout, stderr) => {
+                    if (error)
+                        reject(error);
+                    else
+                        resolve({ stdout, stderr });
+                });
+            });
+            const lines = stdout.split('\n');
+            for (const line of lines) {
+                if (line.includes(`:${port}`)) {
+                    const parts = line.trim().split(/\s+/);
+                    const pid = parts[parts.length - 1];
+                    if (pid) {
+                        await new Promise((resolve) => {
+                            exec(`taskkill /PID ${pid} /F`, (error) => {
+                                resolve(!error);
+                            });
+                        });
+                        return true;
+                    }
+                }
+            }
+            return false;
+        }
+        else {
+            const { exec } = require('child_process');
+            const { stdout } = await new Promise((resolve, reject) => {
+                exec(`lsof -ti:${port}`, (error, stdout, stderr) => {
+                    if (error)
+                        resolve({ stdout: '', stderr });
+                    else
+                        resolve({ stdout, stderr });
+                });
+            });
+            if (stdout.trim()) {
+                const pids = stdout.trim().split('\n');
+                for (const pid of pids) {
+                    await new Promise((resolve) => {
+                        exec(`kill -9 ${pid}`, (error) => {
+                            resolve(!error);
+                        });
+                    });
+                }
+                return true;
+            }
+            return false;
+        }
+    }
+    catch (error) {
+        console.error('Error terminating process:', error);
+        return false;
+    }
+};
+const safelyCloseServer = async () => {
+    if (!serverState.server || serverState.isClosing) {
+        return;
+    }
+    serverState.isClosing = true;
+    return new Promise((resolve) => {
+        if (!serverState.isListening) {
+            serverState.server = null;
+            serverState.isClosing = false;
+            resolve();
+            return;
+        }
+        const timeout = setTimeout(() => {
+            console.log('[ReactPress] Force closing server due to timeout');
+            serverState.server = null;
+            serverState.isClosing = false;
+            serverState.isListening = false;
+            resolve();
+        }, 3000);
+        serverState.server.close((err) => {
+            clearTimeout(timeout);
+            if (err && err.code !== 'ERR_SERVER_NOT_RUNNING') {
+                console.warn('[ReactPress] Server close warning:', err.message);
+            }
+            serverState.server = null;
+            serverState.isClosing = false;
+            serverState.isListening = false;
+            resolve();
+        });
+        if (serverState.server.closeAllConnections) {
+            serverState.server.closeAllConnections();
+        }
+    });
+};
+const startServerWithState = (app, port) => {
+    return new Promise((resolve, reject) => {
+        if (serverState.server) {
+            reject(new Error('Server is already running'));
+            return;
+        }
+        const server = app.listen(port, () => {
+            serverState.server = server;
+            serverState.isListening = true;
+            global.installationPort = port;
+            console.log(`[ReactPress] Installation server running on http://localhost:${port}`);
+            resolve();
+        });
+        server.on('error', (error) => {
+            serverState.isListening = false;
+            reject(error);
+        });
+        server.on('close', () => {
+            serverState.isListening = false;
+        });
+    });
+};
+const setupSignalHandlers = () => {
+    const shutdown = async (signal) => {
+        console.log(`\n[ReactPress] Received ${signal}, shutting down gracefully...`);
+        await safelyCloseServer();
+        process.exit(0);
+    };
+    process.on('SIGINT', () => shutdown('SIGINT'));
+    process.on('SIGTERM', () => shutdown('SIGTERM'));
+    process.on('SIGHUP', () => shutdown('SIGHUP'));
+};
+const main = async () => {
+    try {
+        setupSignalHandlers();
+        const projectRoot = getProjectRoot();
+        const envPath = path_1.join(projectRoot, '.env');
+        if (fs.existsSync(envPath)) {
+            console.log('[ReactPress] Environment file exists, starting main application');
+            await startMainApplication();
+            return;
+        }
+        console.log('[ReactPress] Starting installation wizard');
+        await runInstallationWizard();
+    }
+    catch (error) {
+        console.error('[ReactPress] Fatal error:', error);
+        await safelyCloseServer();
+        process.exit(1);
+    }
+};
+const getProjectRoot = () => {
+    let currentDir = __dirname;
+    for (let i = 0; i < 5; i++) {
+        const packageJsonPath = path_1.join(currentDir, 'package.json');
+        if (fs.existsSync(packageJsonPath)) {
+            try {
+                const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'));
+                if (packageJson.name === 'reactpress') {
+                    return currentDir;
+                }
+            }
+            catch (e) {
+            }
+        }
+        currentDir = path_1.dirname(currentDir);
+    }
+    const traditionalRoot = path_1.join(__dirname, '../../');
+    if (fs.existsSync(path_1.join(traditionalRoot, 'package.json'))) {
+        return traditionalRoot;
+    }
+    return process.cwd();
+};
+const runInstallationWizard = async () => {
+    try {
+        const port = await findAvailablePort(INSTALLATION_PORT);
+        const app = express();
+        app.use(bodyParser.json({ limit: '10mb' }));
+        app.use(bodyParser.urlencoded({ limit: '10mb', extended: true }));
+        app.use('/public', express.static(path_1.join(__dirname, '../public')));
+        app.get('/', (req, res) => {
+            res.sendFile(path_1.join(__dirname, '../public/index.html'));
+        });
+        app.post('/test-db', async (req, res) => {
+            try {
+                const mysql = await Promise.resolve().then(() => require('mysql2/promise'));
+                const { host, port, user, password, database } = req.body;
+                const connection = await mysql.createConnection({
+                    host: host || 'localhost',
+                    port: parseInt(port) || 3306,
+                    user,
+                    password,
+                    database
+                });
+                await connection.execute('SELECT 1');
+                await connection.end();
+                res.json({ success: true, message: 'Database connection successful!' });
+            }
+            catch (error) {
+                res.status(400).json({
+                    success: false,
+                    message: `Database connection failed: ${error.message}`
+                });
+            }
+        });
+        app.post('/install', async (req, res) => {
+            try {
+                const { db, site } = req.body;
+                if (!db || !site) {
+                    return res.status(400).json({
+                        success: false,
+                        message: 'Missing configuration data'
+                    });
+                }
+                const mysql = await Promise.resolve().then(() => require('mysql2/promise'));
+                const connection = await mysql.createConnection({
+                    host: db.host || 'localhost',
+                    port: parseInt(db.port) || 3306,
+                    user: db.user,
+                    password: db.password,
+                    database: db.database
+                });
+                await connection.execute('SELECT 1');
+                await connection.end();
+                const envContent = `# Database Config
+DB_HOST=${db.host || '127.0.0.1'}
+DB_PORT=${db.port || 3306}
+DB_USER=${db.user}
+DB_PASSWD=${db.password}
+DB_DATABASE=${db.database}
+
+# Client Config
+CLIENT_SITE_URL=${site.clientUrl || 'http://localhost:3001'}
+
+# Server Config
+SERVER_SITE_URL=${site.serverUrl || 'http://localhost:3002'}
+SERVER_PORT=${site.serverPort || 3002}
+SERVER_API_PREFIX=/api`.trim();
+                const projectRoot = getProjectRoot();
+                const envPath = path_1.join(projectRoot, '.env');
+                fs.writeFileSync(envPath, envContent, 'utf8');
+                res.json({
+                    success: true,
+                    message: 'Installation completed! Server will restart.',
+                    serverUrl: site.serverUrl || 'http://localhost:3002'
+                });
+                res.on('finish', async () => {
+                    try {
+                        console.log('[ReactPress] Installation complete, restarting server...');
+                        await safelyCloseServer();
+                        await startMainApplication();
+                    }
+                    catch (error) {
+                        console.error('[ReactPress] Restart error:', error);
+                    }
+                });
+            }
+            catch (error) {
+                res.status(400).json({
+                    success: false,
+                    message: `Installation failed: ${error.message}`
+                });
+            }
+        });
+        await startServerWithState(app, port);
+        try {
+            await open(`http://localhost:${port}`);
+        }
+        catch (error) {
+            console.log(`[ReactPress] Please visit http://localhost:${port} manually`);
+        }
+    }
+    catch (error) {
+        console.error('[ReactPress] Installation wizard failed:', error);
+        await safelyCloseServer();
+        throw error;
+    }
+};
+const startMainApplication = async () => {
+    try {
+        console.log('[ReactPress] Starting main application...');
+        await safelyCloseServer();
+        global.isInstalling = false;
+        await new Promise(resolve => setTimeout(resolve, 1000));
+        const { bootstrap } = await Promise.resolve().then(() => require('./starter'));
+        if (typeof bootstrap === 'function') {
+            await bootstrap();
+        }
+        else {
+            throw new Error('Bootstrap function not found');
+        }
+    }
+    catch (error) {
+        console.error('[ReactPress] Failed to start main application:', error);
+        process.exit(1);
+    }
+};
+main();
 //# sourceMappingURL=main.js.map

package/dist/main.js.map

@@ -1 +1 @@
-{"version":3,"file":"main.js","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":";;AAAA,uCAA2C;AAC3C,6CAAiE;AACjE,0CAA0C;AAC1C,2CAA2C;AAC3C,mCAAmC;AACnC,gDAAgD;AAChD,iCAAiC;AACjC,+BAA4B;AAC5B,6BAA6B;AAE7B,6CAAyC;AACzC,2EAAsE;AACtE,gFAA4E;AAE5E,KAAK,UAAU,SAAS;IACtB,MAAM,GAAG,GAAG,MAAM,kBAAW,CAAC,MAAM,CAAC,sBAAS,CAAC,CAAC;IAChD,MAAM,aAAa,GAAG,GAAG,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;IAE/C,GAAG,CAAC,UAAU,EAAE,CAAC;IACjB,GAAG,CAAC,eAAe,CAAC,aAAa,CAAC,GAAG,CAAC,mBAAmB,EAAE,MAAM,CAAC,CAAC,CAAC;IACpE,GAAG,CAAC,GAAG,CACL,SAAS,CAAC;QACR,QAAQ,EAAE,EAAE,GAAG,IAAI;QACnB,GAAG,EAAE,KAAK;KACX,CAAC,CACH,CAAC;IAGF,MAAM,OAAO,GAAG,WAAI,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;IAC7C,GAAG,CAAC,GAAG,CAAC,SAAS,EAAE,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;IAE5C,GAAG,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,CAAC;IACvB,GAAG,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC;IAClB,GAAG,CAAC,qBAAqB,CAAC,IAAI,4CAAoB,EAAE,CAAC,CAAC;IACtD,GAAG,CAAC,gBAAgB,CAAC,IAAI,2CAAmB,EAAE,CAAC,CAAC;IAChD,GAAG,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;IAC5C,GAAG,CAAC,GAAG,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;IAClE,MAAM,aAAa,GAAG,IAAI,yBAAe,EAAE;SACxC,QAAQ,CAAC,qBAAqB,CAAC;SAC/B,cAAc,CAAC,8BAA8B,CAAC;SAC9C,UAAU,CAAC,KAAK,CAAC;SACjB,KAAK,EAAE,CAAC;IACX,MAAM,QAAQ,GAAG,uBAAa,CAAC,cAAc,CAAC,GAAG,EAAE,aAAa,CAAC,CAAC;IAClE,uBAAa,CAAC,KAAK,CAAC,KAAK,EAAE,GAAG,EAAE,QAAQ,CAAC,CAAC;IAE1C,MAAM,GAAG,CAAC,MAAM,CAAC,aAAa,CAAC,GAAG,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC,CAAC;IACzD,MAAM,IAAI,CAAC,oBAAoB,aAAa,CAAC,GAAG,CAAC,aAAa,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IAC7E,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC;AACrC,CAAC;AAED,SAAS,EAAE,CAAC"}
+{"version":3,"file":"main.js","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":"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"}

package/dist/modules/setting/setting.service.js

@@ -26,30 +26,54 @@ let SettingService = class SettingService {
         this.initGlobalConfig();
     }
     async initI18n() {
-        const items = await this.settingRepository.find();
-        const target = (items && items[0]) || {};
-        let data = {};
         try {
-            data = JSON.parse(target.i18n);
+            console.log('[SettingService] i18n constant keys:', Object.keys(setting_constant_1.i18n));
+            const items = await this.settingRepository.find();
+            const target = (items && items[0]) || {};
+            let data = {};
+            try {
+                if (target.i18n) {
+                    data = JSON.parse(target.i18n);
+                }
+            }
+            catch (e) {
+                console.warn('[SettingService] Error parsing i18n from DB:', e);
+                data = {};
+            }
+            const mergedI18n = merge({}, setting_constant_1.i18n, data);
+            const mergedI18nString = JSON.stringify(mergedI18n);
+            if (!target.i18n || target.i18n !== mergedI18nString) {
+                target.i18n = mergedI18nString;
+                await this.settingRepository.save(target);
+                console.log('[SettingService] i18n updated in database');
+            }
+            else {
+                console.log('[SettingService] i18n already up to date');
+            }
         }
-        catch (e) {
-            data = {};
+        catch (error) {
+            console.error('[SettingService] Error in initI18n:', error);
+            throw error;
         }
-        target.i18n = JSON.stringify(merge({}, setting_constant_1.i18n, data));
-        await this.settingRepository.save(target);
     }
     async initGlobalConfig() {
         const items = await this.settingRepository.find();
         const target = (items && items[0]) || {};
         let data = {};
         try {
-            data = JSON.parse(target.globalSetting);
+            if (target.globalSetting) {
+                data = JSON.parse(target.globalSetting);
+            }
         }
         catch (e) {
             data = {};
         }
-        target.globalSetting = JSON.stringify(merge({}, setting_constant_1.settings, data));
-        await this.settingRepository.save(target);
+        const mergedSettings = merge({}, setting_constant_1.settings, data);
+        const mergedSettingsString = JSON.stringify(mergedSettings);
+        if (!target.globalSetting || target.globalSetting !== mergedSettingsString) {
+            target.globalSetting = mergedSettingsString;
+            await this.settingRepository.save(target);
+        }
     }
     async findAll(innerInvoke = false, isAdmin = false) {
         const data = await this.settingRepository.find();

package/dist/modules/setting/setting.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"setting.service.js","sourceRoot":"","sources":["../../../src/modules/setting/setting.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"setting.service.js","sourceRoot":"","sources":["../../../src/modules/setting/setting.service.ts"],"names":[],"mappings":"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"}