@bigtyphoon/melo 1.7.6 → 1.8.1
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/bin/commands/add-server.ts +288 -0
- package/bin/commands/doctor.ts +514 -0
- package/bin/utils/constants.ts +4 -0
- package/dist/bin/commands/add-server.js +248 -0
- package/dist/bin/commands/doctor.js +439 -0
- package/dist/bin/utils/constants.js +5 -2
- package/dist/lib/melo.js +1 -1
- package/lib/melo.ts +0 -1
- package/package.json +2 -2
|
@@ -0,0 +1,248 @@
|
|
|
1
|
+
#!/usr/bin/env node
|
|
2
|
+
"use strict";
|
|
3
|
+
/**
|
|
4
|
+
* Add a new server type to the project
|
|
5
|
+
* Creates templates and updates all necessary configuration files
|
|
6
|
+
*/
|
|
7
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
8
|
+
const fs = require("fs");
|
|
9
|
+
const path = require("path");
|
|
10
|
+
const constants_1 = require("../utils/constants");
|
|
11
|
+
function default_1(program) {
|
|
12
|
+
program.command('add-server <server-name>')
|
|
13
|
+
.description('Add a new server type with templates and configurations')
|
|
14
|
+
.option('-f, --frontend', 'mark as frontend server', false)
|
|
15
|
+
.option('-p, --port <port>', 'default port number', '3050')
|
|
16
|
+
.option('-c, --client-port <port>', 'client port (for frontend)', '3010')
|
|
17
|
+
.action(function (serverName, opts) {
|
|
18
|
+
addServerType(serverName, opts);
|
|
19
|
+
});
|
|
20
|
+
}
|
|
21
|
+
exports.default = default_1;
|
|
22
|
+
function addServerType(serverName, opts) {
|
|
23
|
+
const cwd = process.cwd();
|
|
24
|
+
// Check if we're in a valid melo project
|
|
25
|
+
if (!isMeloProject(cwd)) {
|
|
26
|
+
console.error('Error: Not a valid melo project directory.');
|
|
27
|
+
console.info('Please run this command in a melo project root directory.');
|
|
28
|
+
process.exit(1);
|
|
29
|
+
}
|
|
30
|
+
// Check if server type already exists
|
|
31
|
+
if (serverTypeExists(cwd, serverName)) {
|
|
32
|
+
console.warn(`Server type '${serverName}' already exists.`);
|
|
33
|
+
console.info(constants_1.ADD_SERVER_TYPE_EXISTS);
|
|
34
|
+
// Ask if user wants to overwrite or update
|
|
35
|
+
const readline = require('readline');
|
|
36
|
+
const rl = readline.createInterface({
|
|
37
|
+
input: process.stdin,
|
|
38
|
+
output: process.stdout
|
|
39
|
+
});
|
|
40
|
+
rl.question(`Do you want to update existing '${serverName}' configuration? (y/N): `, (answer) => {
|
|
41
|
+
if (answer.toLowerCase() === 'y' || answer.toLowerCase() === 'yes') {
|
|
42
|
+
updateServerType(cwd, serverName, opts);
|
|
43
|
+
}
|
|
44
|
+
else {
|
|
45
|
+
console.info('Operation cancelled.');
|
|
46
|
+
}
|
|
47
|
+
rl.close();
|
|
48
|
+
});
|
|
49
|
+
return;
|
|
50
|
+
}
|
|
51
|
+
// Create new server type
|
|
52
|
+
createServerType(cwd, serverName, opts);
|
|
53
|
+
console.info(constants_1.ADD_SERVER_TYPE_INFO.replace('${serverName}', serverName));
|
|
54
|
+
}
|
|
55
|
+
function isMeloProject(cwd) {
|
|
56
|
+
// Check for key files/directories that indicate a melo project
|
|
57
|
+
const requiredPaths = [
|
|
58
|
+
'app.ts',
|
|
59
|
+
'config',
|
|
60
|
+
'app/servers'
|
|
61
|
+
];
|
|
62
|
+
return requiredPaths.every(p => fs.existsSync(path.join(cwd, p)));
|
|
63
|
+
}
|
|
64
|
+
function serverTypeExists(cwd, serverName) {
|
|
65
|
+
const serverDir = path.join(cwd, 'app', 'servers', serverName);
|
|
66
|
+
return fs.existsSync(serverDir);
|
|
67
|
+
}
|
|
68
|
+
function createServerType(cwd, serverName, opts) {
|
|
69
|
+
// 1. Create directory structure
|
|
70
|
+
const serverDir = path.join(cwd, 'app', 'servers', serverName);
|
|
71
|
+
const handlerDir = path.join(serverDir, 'handler');
|
|
72
|
+
const remoteDir = path.join(serverDir, 'remote');
|
|
73
|
+
fs.mkdirSync(handlerDir, { recursive: true });
|
|
74
|
+
fs.mkdirSync(remoteDir, { recursive: true });
|
|
75
|
+
// 2. Create handler template
|
|
76
|
+
createHandlerTemplate(handlerDir, serverName);
|
|
77
|
+
// 3. Create remote template
|
|
78
|
+
createRemoteTemplate(remoteDir, serverName);
|
|
79
|
+
// 4. Update adminServer.json
|
|
80
|
+
updateAdminServerJson(cwd, serverName);
|
|
81
|
+
// 5. Update servers.json
|
|
82
|
+
updateServersJson(cwd, serverName, opts);
|
|
83
|
+
// 6. Update app.ts (add configuration block if it doesn't exist)
|
|
84
|
+
updateAppTs(cwd, serverName, opts);
|
|
85
|
+
}
|
|
86
|
+
function updateServerType(cwd, serverName, opts) {
|
|
87
|
+
// Only update configuration files, don't overwrite handler/remote files
|
|
88
|
+
updateServersJson(cwd, serverName, opts);
|
|
89
|
+
updateAppTs(cwd, serverName, opts);
|
|
90
|
+
console.info(`Updated '${serverName}' configuration.`);
|
|
91
|
+
}
|
|
92
|
+
function createHandlerTemplate(handlerDir, serverName) {
|
|
93
|
+
const content = `import { Application, BackendSession, FrontendSession } from '@bigtyphoon/melo';
|
|
94
|
+
|
|
95
|
+
export default function (app: Application) {
|
|
96
|
+
return new Handler(app);
|
|
97
|
+
}
|
|
98
|
+
|
|
99
|
+
export class Handler {
|
|
100
|
+
constructor(private app: Application) {
|
|
101
|
+
|
|
102
|
+
}
|
|
103
|
+
|
|
104
|
+
/**
|
|
105
|
+
* Example handler method
|
|
106
|
+
*
|
|
107
|
+
* @param {Object} msg request message
|
|
108
|
+
* @param {Object} session current session object
|
|
109
|
+
*/
|
|
110
|
+
async example(msg: any, session: BackendSession | FrontendSession) {
|
|
111
|
+
return { code: 200, msg: '${serverName} handler is working.' };
|
|
112
|
+
}
|
|
113
|
+
}
|
|
114
|
+
`;
|
|
115
|
+
fs.writeFileSync(path.join(handlerDir, `${serverName}Handler.ts`), content);
|
|
116
|
+
}
|
|
117
|
+
function createRemoteTemplate(remoteDir, serverName) {
|
|
118
|
+
const content = `import { Application, BackendSession, RemoterClass } from '@bigtyphoon/melo';
|
|
119
|
+
|
|
120
|
+
export default function (app: Application) {
|
|
121
|
+
return new Remoter(app);
|
|
122
|
+
}
|
|
123
|
+
|
|
124
|
+
export class Remoter implements RemoterClass {
|
|
125
|
+
constructor(private app: Application) {
|
|
126
|
+
|
|
127
|
+
}
|
|
128
|
+
|
|
129
|
+
/**
|
|
130
|
+
* Example remote method
|
|
131
|
+
*
|
|
132
|
+
* @param {Object} msg request message
|
|
133
|
+
* @param {Object} session current session object
|
|
134
|
+
*/
|
|
135
|
+
async example(msg: any, session: BackendSession): Promise<any> {
|
|
136
|
+
return { code: 200, msg: '${serverName} remote is working.' };
|
|
137
|
+
}
|
|
138
|
+
}
|
|
139
|
+
`;
|
|
140
|
+
fs.writeFileSync(path.join(remoteDir, `${serverName}Remote.ts`), content);
|
|
141
|
+
}
|
|
142
|
+
function updateAdminServerJson(cwd, serverName) {
|
|
143
|
+
const adminServerPath = path.join(cwd, 'config', 'adminServer.json');
|
|
144
|
+
let adminServers = [];
|
|
145
|
+
if (fs.existsSync(adminServerPath)) {
|
|
146
|
+
try {
|
|
147
|
+
adminServers = JSON.parse(fs.readFileSync(adminServerPath, 'utf8'));
|
|
148
|
+
}
|
|
149
|
+
catch (e) {
|
|
150
|
+
adminServers = [];
|
|
151
|
+
}
|
|
152
|
+
}
|
|
153
|
+
// Check if server type already exists
|
|
154
|
+
const exists = adminServers.some(s => s.type === serverName);
|
|
155
|
+
if (!exists) {
|
|
156
|
+
adminServers.push({
|
|
157
|
+
type: serverName,
|
|
158
|
+
token: generateToken()
|
|
159
|
+
});
|
|
160
|
+
fs.writeFileSync(adminServerPath, JSON.stringify(adminServers, null, 2));
|
|
161
|
+
}
|
|
162
|
+
}
|
|
163
|
+
function updateServersJson(cwd, serverName, opts) {
|
|
164
|
+
var _a, _b, _c, _d;
|
|
165
|
+
const serversPath = path.join(cwd, 'config', 'servers.json');
|
|
166
|
+
let servers = {};
|
|
167
|
+
if (fs.existsSync(serversPath)) {
|
|
168
|
+
try {
|
|
169
|
+
servers = JSON.parse(fs.readFileSync(serversPath, 'utf8'));
|
|
170
|
+
}
|
|
171
|
+
catch (e) {
|
|
172
|
+
servers = {};
|
|
173
|
+
}
|
|
174
|
+
}
|
|
175
|
+
// Ensure development and production exist
|
|
176
|
+
if (!servers.development)
|
|
177
|
+
servers.development = {};
|
|
178
|
+
if (!servers.production)
|
|
179
|
+
servers.production = {};
|
|
180
|
+
const port = parseInt(((_b = (_a = opts.args) === null || _a === void 0 ? void 0 : _a.find(a => a.startsWith('--port'))) === null || _b === void 0 ? void 0 : _b.split('=')[1]) || '3050');
|
|
181
|
+
const clientPort = parseInt(((_d = (_c = opts.args) === null || _c === void 0 ? void 0 : _c.find(a => a.startsWith('--client-port'))) === null || _d === void 0 ? void 0 : _d.split('=')[1]) || '3010');
|
|
182
|
+
const serverConfig = {
|
|
183
|
+
id: `${serverName}-server-1`,
|
|
184
|
+
host: '127.0.0.1',
|
|
185
|
+
port: port,
|
|
186
|
+
frontend: opts.frontend || false,
|
|
187
|
+
args: ' --inspect=10003'
|
|
188
|
+
};
|
|
189
|
+
if (opts.frontend) {
|
|
190
|
+
serverConfig.clientHost = '127.0.0.1';
|
|
191
|
+
serverConfig.clientPort = clientPort;
|
|
192
|
+
}
|
|
193
|
+
// Add to both environments
|
|
194
|
+
servers.development[serverName] = [serverConfig];
|
|
195
|
+
// Production uses slightly different inspect port
|
|
196
|
+
const prodConfig = Object.assign({}, serverConfig);
|
|
197
|
+
prodConfig.args = ' --inspect=10004';
|
|
198
|
+
servers.production[serverName] = [prodConfig];
|
|
199
|
+
fs.writeFileSync(serversPath, JSON.stringify(servers, null, 2));
|
|
200
|
+
}
|
|
201
|
+
function updateAppTs(cwd, serverName, opts) {
|
|
202
|
+
const appTsPath = path.join(cwd, 'app.ts');
|
|
203
|
+
if (!fs.existsSync(appTsPath)) {
|
|
204
|
+
console.warn('Warning: app.ts not found, skipping app.ts update.');
|
|
205
|
+
return;
|
|
206
|
+
}
|
|
207
|
+
let content = fs.readFileSync(appTsPath, 'utf8');
|
|
208
|
+
// Check if configuration block already exists
|
|
209
|
+
const configPattern = new RegExp(`app\\.configure\\(['"].*['"],\\s*['"]${serverName}['"]`);
|
|
210
|
+
if (configPattern.test(content)) {
|
|
211
|
+
console.info(`Configuration for '${serverName}' already exists in app.ts`);
|
|
212
|
+
return;
|
|
213
|
+
}
|
|
214
|
+
// Find the last app.configure block and add after it
|
|
215
|
+
const configurePattern = /app\.configure\(['"].*['"],\s*['"].*['"],\s*function\s*\(\)\s*\{[\s\S]*?\}\);/g;
|
|
216
|
+
const matches = content.match(configurePattern);
|
|
217
|
+
let insertPosition = content.length;
|
|
218
|
+
if (matches && matches.length > 0) {
|
|
219
|
+
const lastMatch = matches[matches.length - 1];
|
|
220
|
+
insertPosition = content.lastIndexOf(lastMatch) + lastMatch.length;
|
|
221
|
+
}
|
|
222
|
+
else {
|
|
223
|
+
// Find position before // start app comment
|
|
224
|
+
const startAppMatch = content.match(/\/\/\s*start app/);
|
|
225
|
+
if (startAppMatch) {
|
|
226
|
+
insertPosition = content.indexOf(startAppMatch[0]);
|
|
227
|
+
}
|
|
228
|
+
}
|
|
229
|
+
const newConfig = `
|
|
230
|
+
|
|
231
|
+
// ${serverName} server configuration
|
|
232
|
+
app.configure('production|development', '${serverName}', function () {
|
|
233
|
+
// Add ${serverName} specific configuration here
|
|
234
|
+
// Example: app.set('${serverName}Config', { /* config */ });
|
|
235
|
+
});
|
|
236
|
+
`;
|
|
237
|
+
content = content.slice(0, insertPosition) + newConfig + content.slice(insertPosition);
|
|
238
|
+
fs.writeFileSync(appTsPath, content);
|
|
239
|
+
}
|
|
240
|
+
function generateToken() {
|
|
241
|
+
const chars = 'abcdefghijklmnopqrstuvwxyz0123456789';
|
|
242
|
+
let token = '';
|
|
243
|
+
for (let i = 0; i < 40; i++) {
|
|
244
|
+
token += chars.charAt(Math.floor(Math.random() * chars.length));
|
|
245
|
+
}
|
|
246
|
+
return token;
|
|
247
|
+
}
|
|
248
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"add-server.js","sourceRoot":"","sources":["../../../bin/commands/add-server.ts"],"names":[],"mappings":"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"}
|