@fecommunity/reactpress-server 1.0.0-beta.13 â 1.0.0-beta.14
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +288 -33
- package/bin/reactpress-server.js +176 -599
- package/dist/app.module.js +2 -2
- package/dist/app.module.js.map +1 -1
- package/dist/generate-swagger.d.ts +1 -0
- package/dist/generate-swagger.js +73 -0
- package/dist/generate-swagger.js.map +1 -0
- package/dist/main.d.ts +5 -0
- package/dist/main.js +258 -39
- package/dist/main.js.map +1 -1
- package/dist/modules/setting/setting.constant.d.ts +2 -2
- package/dist/modules/setting/setting.constant.js +3 -3
- package/dist/modules/setting/setting.constant.js.map +1 -1
- package/dist/modules/setting/setting.service.js +34 -11
- package/dist/modules/setting/setting.service.js.map +1 -1
- package/dist/public/favicon.png +0 -0
- package/dist/public/index.html +439 -0
- package/dist/public/swagger/custom.css +11 -0
- package/dist/starter.d.ts +1 -0
- package/dist/starter.js +84 -0
- package/dist/starter.js.map +1 -0
- package/dist/tsconfig.build.tsbuildinfo +977 -48
- package/package.json +31 -23
- package/public/favicon.png +0 -0
- package/public/index.html +439 -0
- package/public/swagger/custom.css +11 -0
package/dist/app.module.js
CHANGED
|
@@ -7,7 +7,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
7
7
|
};
|
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
9
|
exports.AppModule = void 0;
|
|
10
|
-
const
|
|
10
|
+
const reactpress_toolkit_1 = require("@fecommunity/reactpress-toolkit");
|
|
11
11
|
const common_1 = require("@nestjs/common");
|
|
12
12
|
const config_1 = require("@nestjs/config");
|
|
13
13
|
const typeorm_1 = require("@nestjs/typeorm");
|
|
@@ -41,7 +41,7 @@ let AppModule = class AppModule {
|
|
|
41
41
|
AppModule = __decorate([
|
|
42
42
|
common_1.Module({
|
|
43
43
|
imports: [
|
|
44
|
-
config_1.ConfigModule.forRoot({ isGlobal: true, envFilePath: [
|
|
44
|
+
config_1.ConfigModule.forRoot({ isGlobal: true, envFilePath: [reactpress_toolkit_1.file] }),
|
|
45
45
|
typeorm_1.TypeOrmModule.forRootAsync({
|
|
46
46
|
imports: [config_1.ConfigModule],
|
|
47
47
|
inject: [config_1.ConfigService],
|
package/dist/app.module.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app.module.js","sourceRoot":"","sources":["../src/app.module.ts"],"names":[],"mappings":";;;;;;;;;AACA,
|
|
1
|
+
{"version":3,"file":"app.module.js","sourceRoot":"","sources":["../src/app.module.ts"],"names":[],"mappings":";;;;;;;;;AACA,wEAAsE;AACtE,2CAAwC;AACxC,2CAA6D;AAC7D,6CAAgD;AAEhD,qEAA2D;AAE3D,qEAAiE;AAEjE,4DAAwD;AACxD,wEAA8D;AAE9D,wEAAoE;AACpE,qEAA2D;AAE3D,qEAAiE;AACjE,4DAAkD;AAElD,4DAAwD;AACxD,2EAAiE;AAEjE,2EAAuE;AACvE,4DAAkD;AAElD,4DAAwD;AAExD,kEAAwD;AACxD,kEAA8D;AAC9D,qEAA2D;AAE3D,qEAAiE;AACjE,4DAAkD;AAElD,4DAAwD;AACxD,yDAA+C;AAE/C,yDAAqD;AACrD,4DAAkD;AAElD,4DAAwD;AACxD,4DAAkD;AAElD,4DAAwD;AAsCxD,IAAa,SAAS,GAAtB,MAAa,SAAS;CAAG,CAAA;AAAZ,SAAS;IApCrB,eAAM,CAAC;QACN,OAAO,EAAE;YACP,qBAAY,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,yBAAW,CAAC,EAAE,CAAC;YACpE,uBAAa,CAAC,YAAY,CAAC;gBACzB,OAAO,EAAE,CAAC,qBAAY,CAAC;gBACvB,MAAM,EAAE,CAAC,sBAAa,CAAC;gBACvB,UAAU,EAAE,KAAK,EAAE,aAA4B,EAAE,EAAE,CAAC,CAAC;oBACnD,IAAI,EAAE,OAAO;oBACb,QAAQ,EAAE,CAAC,kBAAI,EAAE,kBAAI,EAAE,4BAAS,EAAE,wBAAO,EAAE,0BAAQ,EAAE,gBAAG,EAAE,wBAAO,EAAE,wBAAO,EAAE,kBAAI,EAAE,kBAAI,EAAE,kBAAI,EAAE,sBAAM,CAAC;oBACrG,IAAI,EAAE,aAAa,CAAC,GAAG,CAAC,SAAS,EAAE,SAAS,CAAC;oBAC7C,IAAI,EAAE,aAAa,CAAC,GAAG,CAAS,SAAS,EAAE,IAAI,CAAC;oBAChD,QAAQ,EAAE,aAAa,CAAC,GAAG,CAAC,SAAS,EAAE,MAAM,CAAC;oBAC9C,QAAQ,EAAE,aAAa,CAAC,GAAG,CAAC,WAAW,EAAE,MAAM,CAAC;oBAChD,QAAQ,EAAE,aAAa,CAAC,GAAG,CAAC,aAAa,EAAE,YAAY,CAAC;oBACxD,OAAO,EAAE,SAAS;oBAClB,QAAQ,EAAE,QAAQ;oBAClB,WAAW,EAAE,IAAI;iBAClB,CAAC;aACH,CAAC;YACF,wBAAU;YACV,wBAAU;YACV,sBAAS;YACT,8BAAa;YACb,kCAAe;YACf,gCAAc;YACd,8BAAa;YACb,8BAAa;YACb,wBAAU;YACV,wBAAU;YACV,wBAAU;YACV,wBAAU;YACV,4BAAY;SACb;QACD,WAAW,EAAE,EAAE;QACf,SAAS,EAAE,EAAE;KACd,CAAC;GACW,SAAS,CAAG;AAAZ,8BAAS"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,73 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const core_1 = require("@nestjs/core");
|
|
4
|
+
const swagger_1 = require("@nestjs/swagger");
|
|
5
|
+
const fs_1 = require("fs");
|
|
6
|
+
const path_1 = require("path");
|
|
7
|
+
const app_module_1 = require("./app.module");
|
|
8
|
+
async function generateSwaggerJson() {
|
|
9
|
+
let app;
|
|
10
|
+
try {
|
|
11
|
+
console.log('đ Starting Swagger JSON generation...');
|
|
12
|
+
app = await core_1.NestFactory.createApplicationContext(app_module_1.AppModule, {
|
|
13
|
+
logger: ['error', 'warn'],
|
|
14
|
+
});
|
|
15
|
+
const configService = app.get('ConfigService');
|
|
16
|
+
const apiPrefix = configService.get('SERVER_API_PREFIX', '/api');
|
|
17
|
+
console.log('đ Configuring Swagger documentation...');
|
|
18
|
+
const swaggerConfig = new swagger_1.DocumentBuilder()
|
|
19
|
+
.setTitle('ReactPress API Documentation')
|
|
20
|
+
.setDescription('Comprehensive API documentation for ReactPress - A modern content management system built with NestJS')
|
|
21
|
+
.setVersion('2.0')
|
|
22
|
+
.setContact('ReactPress Team', 'https://github.com/fecommunity/reactpress', 'admin@gaoredu.com')
|
|
23
|
+
.setLicense('MIT', 'https://github.com/fecommunity/reactpress/blob/main/LICENSE')
|
|
24
|
+
.addServer(configService.get('SERVER_SITE_URL', 'http://localhost:3002'), 'API Server')
|
|
25
|
+
.build();
|
|
26
|
+
console.log('đ¨ Generating Swagger document...');
|
|
27
|
+
const document = swagger_1.SwaggerModule.createDocument(app, swaggerConfig);
|
|
28
|
+
const outputPath = path_1.join(__dirname, '../public/swagger.json');
|
|
29
|
+
const publicDir = path_1.join(__dirname, '../public');
|
|
30
|
+
if (!fs_1.existsSync(publicDir)) {
|
|
31
|
+
console.log('đ Creating public directory...');
|
|
32
|
+
require('fs').mkdirSync(publicDir, { recursive: true });
|
|
33
|
+
}
|
|
34
|
+
if (fs_1.existsSync(outputPath)) {
|
|
35
|
+
console.log('đī¸ Removing existing swagger.json file...');
|
|
36
|
+
fs_1.unlinkSync(outputPath);
|
|
37
|
+
}
|
|
38
|
+
console.log('đž Writing Swagger JSON to file...');
|
|
39
|
+
fs_1.writeFileSync(outputPath, JSON.stringify(document, null, 2));
|
|
40
|
+
console.log(`â
Success! Swagger JSON generated at: ${outputPath}`);
|
|
41
|
+
console.log('đ Swagger generation process completed successfully');
|
|
42
|
+
process.exit(0);
|
|
43
|
+
}
|
|
44
|
+
catch (error) {
|
|
45
|
+
console.error('â Error during Swagger generation:', error.message);
|
|
46
|
+
const existingPath = path_1.join(__dirname, '../public/swagger.json');
|
|
47
|
+
if (fs_1.existsSync(existingPath)) {
|
|
48
|
+
console.log('âšī¸ Using existing swagger.json file');
|
|
49
|
+
console.log('đ Swagger generation process completed successfully');
|
|
50
|
+
process.exit(0);
|
|
51
|
+
}
|
|
52
|
+
else {
|
|
53
|
+
console.error('â No existing swagger.json file found');
|
|
54
|
+
process.exit(1);
|
|
55
|
+
}
|
|
56
|
+
}
|
|
57
|
+
finally {
|
|
58
|
+
}
|
|
59
|
+
}
|
|
60
|
+
generateSwaggerJson().catch(e => {
|
|
61
|
+
console.error('đĨ Unhandled error in generateSwaggerJson:', e.message);
|
|
62
|
+
const existingPath = path_1.join(__dirname, '../public/swagger.json');
|
|
63
|
+
if (fs_1.existsSync(existingPath)) {
|
|
64
|
+
console.log('âšī¸ Using existing swagger.json file');
|
|
65
|
+
console.log('đ Swagger generation process completed successfully');
|
|
66
|
+
process.exit(0);
|
|
67
|
+
}
|
|
68
|
+
else {
|
|
69
|
+
console.error('â No existing swagger.json file found');
|
|
70
|
+
process.exit(1);
|
|
71
|
+
}
|
|
72
|
+
});
|
|
73
|
+
//# sourceMappingURL=generate-swagger.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"generate-swagger.js","sourceRoot":"","sources":["../src/generate-swagger.ts"],"names":[],"mappings":"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"}
|
package/dist/main.d.ts
CHANGED
package/dist/main.js
CHANGED
|
@@ -1,44 +1,263 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
const
|
|
4
|
-
const swagger_1 = require("@nestjs/swagger");
|
|
5
|
-
const bodyParser = require("body-parser");
|
|
6
|
-
const compression = require("compression");
|
|
7
|
-
const express = require("express");
|
|
8
|
-
const rateLimit = require("express-rate-limit");
|
|
9
|
-
const helmet = require("helmet");
|
|
3
|
+
const fs = require("fs");
|
|
10
4
|
const path_1 = require("path");
|
|
5
|
+
const express = require("express");
|
|
6
|
+
const bodyParser = require("body-parser");
|
|
11
7
|
const open = require("open");
|
|
12
|
-
const
|
|
13
|
-
const
|
|
14
|
-
const
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
.
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
}
|
|
43
|
-
|
|
8
|
+
const net = require("net");
|
|
9
|
+
const INSTALLATION_PORT = 3002;
|
|
10
|
+
const MAX_PORT_ATTEMPTS = 10;
|
|
11
|
+
const serverState = {
|
|
12
|
+
server: null,
|
|
13
|
+
isClosing: false,
|
|
14
|
+
isListening: false
|
|
15
|
+
};
|
|
16
|
+
const checkPort = (port) => {
|
|
17
|
+
return new Promise((resolve) => {
|
|
18
|
+
const server = net.createServer();
|
|
19
|
+
server.once('error', (err) => {
|
|
20
|
+
if (err.code === 'EADDRINUSE') {
|
|
21
|
+
resolve(false);
|
|
22
|
+
}
|
|
23
|
+
else {
|
|
24
|
+
resolve(false);
|
|
25
|
+
}
|
|
26
|
+
});
|
|
27
|
+
server.once('listening', () => {
|
|
28
|
+
server.once('close', () => resolve(true)).close();
|
|
29
|
+
});
|
|
30
|
+
server.listen(port);
|
|
31
|
+
});
|
|
32
|
+
};
|
|
33
|
+
const findAvailablePort = async (startPort) => {
|
|
34
|
+
for (let port = startPort; port < startPort + MAX_PORT_ATTEMPTS; port++) {
|
|
35
|
+
if (await checkPort(port)) {
|
|
36
|
+
return port;
|
|
37
|
+
}
|
|
38
|
+
}
|
|
39
|
+
throw new Error(`No available ports found in range ${startPort}-${startPort + MAX_PORT_ATTEMPTS - 1}`);
|
|
40
|
+
};
|
|
41
|
+
const safelyCloseServer = async () => {
|
|
42
|
+
if (!serverState.server || serverState.isClosing) {
|
|
43
|
+
return;
|
|
44
|
+
}
|
|
45
|
+
serverState.isClosing = true;
|
|
46
|
+
return new Promise((resolve) => {
|
|
47
|
+
if (!serverState.isListening) {
|
|
48
|
+
serverState.server = null;
|
|
49
|
+
serverState.isClosing = false;
|
|
50
|
+
resolve();
|
|
51
|
+
return;
|
|
52
|
+
}
|
|
53
|
+
const timeout = setTimeout(() => {
|
|
54
|
+
console.log('[ReactPress] Force closing server due to timeout');
|
|
55
|
+
serverState.server = null;
|
|
56
|
+
serverState.isClosing = false;
|
|
57
|
+
serverState.isListening = false;
|
|
58
|
+
resolve();
|
|
59
|
+
}, 3000);
|
|
60
|
+
serverState.server.close((err) => {
|
|
61
|
+
clearTimeout(timeout);
|
|
62
|
+
if (err && err.code !== 'ERR_SERVER_NOT_RUNNING') {
|
|
63
|
+
console.warn('[ReactPress] Server close warning:', err.message);
|
|
64
|
+
}
|
|
65
|
+
serverState.server = null;
|
|
66
|
+
serverState.isClosing = false;
|
|
67
|
+
serverState.isListening = false;
|
|
68
|
+
resolve();
|
|
69
|
+
});
|
|
70
|
+
if (serverState.server.closeAllConnections) {
|
|
71
|
+
serverState.server.closeAllConnections();
|
|
72
|
+
}
|
|
73
|
+
});
|
|
74
|
+
};
|
|
75
|
+
const startServerWithState = (app, port) => {
|
|
76
|
+
return new Promise((resolve, reject) => {
|
|
77
|
+
if (serverState.server) {
|
|
78
|
+
reject(new Error('Server is already running'));
|
|
79
|
+
return;
|
|
80
|
+
}
|
|
81
|
+
const server = app.listen(port, () => {
|
|
82
|
+
serverState.server = server;
|
|
83
|
+
serverState.isListening = true;
|
|
84
|
+
global.installationPort = port;
|
|
85
|
+
console.log(`[ReactPress] Installation server running on http://localhost:${port}`);
|
|
86
|
+
resolve();
|
|
87
|
+
});
|
|
88
|
+
server.on('error', (error) => {
|
|
89
|
+
serverState.isListening = false;
|
|
90
|
+
reject(error);
|
|
91
|
+
});
|
|
92
|
+
server.on('close', () => {
|
|
93
|
+
serverState.isListening = false;
|
|
94
|
+
});
|
|
95
|
+
});
|
|
96
|
+
};
|
|
97
|
+
const setupSignalHandlers = () => {
|
|
98
|
+
const shutdown = async (signal) => {
|
|
99
|
+
console.log(`\n[ReactPress] Received ${signal}, shutting down gracefully...`);
|
|
100
|
+
await safelyCloseServer();
|
|
101
|
+
process.exit(0);
|
|
102
|
+
};
|
|
103
|
+
process.on('SIGINT', () => shutdown('SIGINT'));
|
|
104
|
+
process.on('SIGTERM', () => shutdown('SIGTERM'));
|
|
105
|
+
process.on('SIGHUP', () => shutdown('SIGHUP'));
|
|
106
|
+
};
|
|
107
|
+
const main = async () => {
|
|
108
|
+
try {
|
|
109
|
+
setupSignalHandlers();
|
|
110
|
+
const projectRoot = getProjectRoot();
|
|
111
|
+
const envPath = path_1.join(projectRoot, '.env');
|
|
112
|
+
console.log(`[ReactPress] Checking for environment file at: ${envPath}`);
|
|
113
|
+
console.log(`[ReactPress] Project root determined to be: ${projectRoot}`);
|
|
114
|
+
if (fs.existsSync(envPath)) {
|
|
115
|
+
console.log('[ReactPress] Environment file exists, starting main application');
|
|
116
|
+
await startMainApplication();
|
|
117
|
+
return;
|
|
118
|
+
}
|
|
119
|
+
console.log('[ReactPress] Environment file not found, starting installation wizard');
|
|
120
|
+
console.log('[ReactPress] Current working directory:', process.cwd());
|
|
121
|
+
console.log('[ReactPress] __dirname:', __dirname);
|
|
122
|
+
await runInstallationWizard();
|
|
123
|
+
}
|
|
124
|
+
catch (error) {
|
|
125
|
+
console.error('[ReactPress] Fatal error:', error);
|
|
126
|
+
await safelyCloseServer();
|
|
127
|
+
process.exit(1);
|
|
128
|
+
}
|
|
129
|
+
};
|
|
130
|
+
const getProjectRoot = () => {
|
|
131
|
+
if (process.env.REACTPRESS_ORIGINAL_CWD) {
|
|
132
|
+
console.log(`[ReactPress] Using original working directory from npx execution: ${process.env.REACTPRESS_ORIGINAL_CWD}`);
|
|
133
|
+
return process.env.REACTPRESS_ORIGINAL_CWD;
|
|
134
|
+
}
|
|
135
|
+
const projectRoot = process.cwd();
|
|
136
|
+
console.log(`[ReactPress] Using current working directory as project root: ${projectRoot}`);
|
|
137
|
+
return projectRoot;
|
|
138
|
+
};
|
|
139
|
+
const runInstallationWizard = async () => {
|
|
140
|
+
try {
|
|
141
|
+
const port = await findAvailablePort(INSTALLATION_PORT);
|
|
142
|
+
const app = express();
|
|
143
|
+
app.use(bodyParser.json({ limit: '10mb' }));
|
|
144
|
+
app.use(bodyParser.urlencoded({ limit: '10mb', extended: true }));
|
|
145
|
+
app.use('/public', express.static(path_1.join(__dirname, '../public')));
|
|
146
|
+
app.get('/', (req, res) => {
|
|
147
|
+
res.sendFile(path_1.join(__dirname, '../public/index.html'));
|
|
148
|
+
});
|
|
149
|
+
app.post('/test-db', async (req, res) => {
|
|
150
|
+
try {
|
|
151
|
+
const mysql = await Promise.resolve().then(() => require('mysql2/promise'));
|
|
152
|
+
const { host, port, user, password, database } = req.body;
|
|
153
|
+
const connection = await mysql.createConnection({
|
|
154
|
+
host: host || 'localhost',
|
|
155
|
+
port: parseInt(port) || 3306,
|
|
156
|
+
user,
|
|
157
|
+
password,
|
|
158
|
+
database
|
|
159
|
+
});
|
|
160
|
+
await connection.execute('SELECT 1');
|
|
161
|
+
await connection.end();
|
|
162
|
+
res.json({ success: true, message: 'Database connection successful!' });
|
|
163
|
+
}
|
|
164
|
+
catch (error) {
|
|
165
|
+
res.status(400).json({
|
|
166
|
+
success: false,
|
|
167
|
+
message: `Database connection failed: ${error.message}`
|
|
168
|
+
});
|
|
169
|
+
}
|
|
170
|
+
});
|
|
171
|
+
app.post('/install', async (req, res) => {
|
|
172
|
+
try {
|
|
173
|
+
const { db, site } = req.body;
|
|
174
|
+
if (!db || !site) {
|
|
175
|
+
return res.status(400).json({
|
|
176
|
+
success: false,
|
|
177
|
+
message: 'Missing configuration data'
|
|
178
|
+
});
|
|
179
|
+
}
|
|
180
|
+
const mysql = await Promise.resolve().then(() => require('mysql2/promise'));
|
|
181
|
+
const connection = await mysql.createConnection({
|
|
182
|
+
host: db.host || 'localhost',
|
|
183
|
+
port: parseInt(db.port) || 3306,
|
|
184
|
+
user: db.user,
|
|
185
|
+
password: db.password,
|
|
186
|
+
database: db.database
|
|
187
|
+
});
|
|
188
|
+
await connection.execute('SELECT 1');
|
|
189
|
+
await connection.end();
|
|
190
|
+
const envContent = `# Database Config
|
|
191
|
+
DB_HOST=${db.host || '127.0.0.1'}
|
|
192
|
+
DB_PORT=${db.port || 3306}
|
|
193
|
+
DB_USER=${db.user}
|
|
194
|
+
DB_PASSWD=${db.password}
|
|
195
|
+
DB_DATABASE=${db.database}
|
|
196
|
+
|
|
197
|
+
# Client Config
|
|
198
|
+
CLIENT_SITE_URL=${site.clientUrl || 'http://localhost:3001'}
|
|
199
|
+
|
|
200
|
+
# Server Config
|
|
201
|
+
SERVER_SITE_URL=${site.serverUrl || 'http://localhost:3002'}
|
|
202
|
+
`.trim();
|
|
203
|
+
const projectRoot = getProjectRoot();
|
|
204
|
+
const envPath = path_1.join(projectRoot, '.env');
|
|
205
|
+
fs.writeFileSync(envPath, envContent, 'utf8');
|
|
206
|
+
res.json({
|
|
207
|
+
success: true,
|
|
208
|
+
message: 'Installation completed! Server will restart.',
|
|
209
|
+
serverUrl: site.serverUrl || 'http://localhost:3002'
|
|
210
|
+
});
|
|
211
|
+
res.on('finish', async () => {
|
|
212
|
+
try {
|
|
213
|
+
console.log('[ReactPress] Installation complete, restarting server...');
|
|
214
|
+
await safelyCloseServer();
|
|
215
|
+
await startMainApplication();
|
|
216
|
+
}
|
|
217
|
+
catch (error) {
|
|
218
|
+
console.error('[ReactPress] Restart error:', error);
|
|
219
|
+
}
|
|
220
|
+
});
|
|
221
|
+
}
|
|
222
|
+
catch (error) {
|
|
223
|
+
res.status(400).json({
|
|
224
|
+
success: false,
|
|
225
|
+
message: `Installation failed: ${error.message}`
|
|
226
|
+
});
|
|
227
|
+
}
|
|
228
|
+
});
|
|
229
|
+
await startServerWithState(app, port);
|
|
230
|
+
try {
|
|
231
|
+
await open(`http://localhost:${port}`);
|
|
232
|
+
}
|
|
233
|
+
catch (error) {
|
|
234
|
+
console.log(`[ReactPress] Please visit http://localhost:${port} manually`);
|
|
235
|
+
}
|
|
236
|
+
}
|
|
237
|
+
catch (error) {
|
|
238
|
+
console.error('[ReactPress] Installation wizard failed:', error);
|
|
239
|
+
await safelyCloseServer();
|
|
240
|
+
throw error;
|
|
241
|
+
}
|
|
242
|
+
};
|
|
243
|
+
const startMainApplication = async () => {
|
|
244
|
+
try {
|
|
245
|
+
console.log('[ReactPress] Starting main application...');
|
|
246
|
+
await safelyCloseServer();
|
|
247
|
+
global.isInstalling = false;
|
|
248
|
+
await new Promise(resolve => setTimeout(resolve, 1000));
|
|
249
|
+
const { bootstrap } = await Promise.resolve().then(() => require('./starter'));
|
|
250
|
+
if (typeof bootstrap === 'function') {
|
|
251
|
+
await bootstrap();
|
|
252
|
+
}
|
|
253
|
+
else {
|
|
254
|
+
throw new Error('Bootstrap function not found');
|
|
255
|
+
}
|
|
256
|
+
}
|
|
257
|
+
catch (error) {
|
|
258
|
+
console.error('[ReactPress] Failed to start main application:', error);
|
|
259
|
+
process.exit(1);
|
|
260
|
+
}
|
|
261
|
+
};
|
|
262
|
+
main();
|
|
44
263
|
//# sourceMappingURL=main.js.map
|
package/dist/main.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"main.js","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":";;AAAA,
|
|
1
|
+
{"version":3,"file":"main.js","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { messages } from '@fecommunity/reactpress-
|
|
1
|
+
import { messages } from '@fecommunity/reactpress-toolkit';
|
|
2
2
|
export { messages as i18n };
|
|
3
|
-
export declare const settings: import("@fecommunity/reactpress-config/
|
|
3
|
+
export declare const settings: import("@fecommunity/reactpress-toolkit/dist/config/global").GlobalSetting;
|
|
4
4
|
export declare const UNPROTECTED_KEYS: string[];
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.UNPROTECTED_KEYS = exports.settings = exports.i18n = void 0;
|
|
4
|
-
const
|
|
5
|
-
Object.defineProperty(exports, "i18n", { enumerable: true, get: function () { return
|
|
6
|
-
exports.settings =
|
|
4
|
+
const reactpress_toolkit_1 = require("@fecommunity/reactpress-toolkit");
|
|
5
|
+
Object.defineProperty(exports, "i18n", { enumerable: true, get: function () { return reactpress_toolkit_1.messages; } });
|
|
6
|
+
exports.settings = reactpress_toolkit_1.globalSetting;
|
|
7
7
|
exports.UNPROTECTED_KEYS = [
|
|
8
8
|
'i18n',
|
|
9
9
|
'systemUrl',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setting.constant.js","sourceRoot":"","sources":["../../../src/modules/setting/setting.constant.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"setting.constant.js","sourceRoot":"","sources":["../../../src/modules/setting/setting.constant.ts"],"names":[],"mappings":";;;AAAA,wEAA0E;AAKrD,qFALZ,6BAAQ,OAKQ;AAKZ,QAAA,QAAQ,GAAG,kCAAa,CAAC;AAEzB,QAAA,gBAAgB,GAAG;IAC9B,MAAM;IACN,WAAW;IACX,gBAAgB;IAChB,aAAa;IACb,gBAAgB;IAChB,UAAU;IACV,YAAY;IACZ,eAAe;IACf,kBAAkB;IAClB,kBAAkB;IAClB,YAAY;IACZ,SAAS;IACT,kBAAkB;IAClB,mBAAmB;IACnB,eAAe;CAChB,CAAC"}
|
|
@@ -26,30 +26,53 @@ let SettingService = class SettingService {
|
|
|
26
26
|
this.initGlobalConfig();
|
|
27
27
|
}
|
|
28
28
|
async initI18n() {
|
|
29
|
-
const items = await this.settingRepository.find();
|
|
30
|
-
const target = (items && items[0]) || {};
|
|
31
|
-
let data = {};
|
|
32
29
|
try {
|
|
33
|
-
|
|
30
|
+
const items = await this.settingRepository.find();
|
|
31
|
+
const target = (items && items[0]) || {};
|
|
32
|
+
let data = {};
|
|
33
|
+
try {
|
|
34
|
+
if (target.i18n) {
|
|
35
|
+
data = JSON.parse(target.i18n);
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
catch (e) {
|
|
39
|
+
console.warn('[SettingService] Error parsing i18n from DB:', e);
|
|
40
|
+
data = {};
|
|
41
|
+
}
|
|
42
|
+
const mergedI18n = merge({}, setting_constant_1.i18n, data);
|
|
43
|
+
const mergedI18nString = JSON.stringify(mergedI18n);
|
|
44
|
+
if (!target.i18n || target.i18n !== mergedI18nString) {
|
|
45
|
+
target.i18n = mergedI18nString;
|
|
46
|
+
await this.settingRepository.save(target);
|
|
47
|
+
console.log('[SettingService] i18n updated in database');
|
|
48
|
+
}
|
|
49
|
+
else {
|
|
50
|
+
console.log('[SettingService] i18n already up to date');
|
|
51
|
+
}
|
|
34
52
|
}
|
|
35
|
-
catch (
|
|
36
|
-
|
|
53
|
+
catch (error) {
|
|
54
|
+
console.error('[SettingService] Error in initI18n:', error);
|
|
55
|
+
throw error;
|
|
37
56
|
}
|
|
38
|
-
target.i18n = JSON.stringify(merge({}, setting_constant_1.i18n, data));
|
|
39
|
-
await this.settingRepository.save(target);
|
|
40
57
|
}
|
|
41
58
|
async initGlobalConfig() {
|
|
42
59
|
const items = await this.settingRepository.find();
|
|
43
60
|
const target = (items && items[0]) || {};
|
|
44
61
|
let data = {};
|
|
45
62
|
try {
|
|
46
|
-
|
|
63
|
+
if (target.globalSetting) {
|
|
64
|
+
data = JSON.parse(target.globalSetting);
|
|
65
|
+
}
|
|
47
66
|
}
|
|
48
67
|
catch (e) {
|
|
49
68
|
data = {};
|
|
50
69
|
}
|
|
51
|
-
|
|
52
|
-
|
|
70
|
+
const mergedSettings = merge({}, setting_constant_1.settings, data);
|
|
71
|
+
const mergedSettingsString = JSON.stringify(mergedSettings);
|
|
72
|
+
if (!target.globalSetting || target.globalSetting !== mergedSettingsString) {
|
|
73
|
+
target.globalSetting = mergedSettingsString;
|
|
74
|
+
await this.settingRepository.save(target);
|
|
75
|
+
}
|
|
53
76
|
}
|
|
54
77
|
async findAll(innerInvoke = false, isAdmin = false) {
|
|
55
78
|
const data = await this.settingRepository.find();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setting.service.js","sourceRoot":"","sources":["../../../src/modules/setting/setting.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA4C;AAC5C,6CAAmD;AACnD,mCAAmC;AACnC,qCAAqC;AAErC,yDAAsE;AACtE,qDAA2C;AAG3C,IAAa,cAAc,GAA3B,MAAa,cAAc;IACzB,YAEmB,iBAAsC;QAAtC,sBAAiB,GAAjB,iBAAiB,CAAqB;QAEvD,IAAI,CAAC,QAAQ,EAAE,CAAC;QAChB,IAAI,CAAC,gBAAgB,EAAE,CAAC;IAC1B,CAAC;IAKD,KAAK,CAAC,QAAQ;QACZ,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,IAAI,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"setting.service.js","sourceRoot":"","sources":["../../../src/modules/setting/setting.service.ts"],"names":[],"mappings":"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"}
|
|
Binary file
|