@bigtyphoon/melo 1.7.6 → 1.8.0

package/dist/bin/commands/doctor.js

@@ -0,0 +1,439 @@
+#!/usr/bin/env node
+"use strict";
+/**
+ * Check and validate project configuration
+ * Reports errors and warnings for common configuration issues
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+const fs = require("fs");
+const path = require("path");
+function default_1(program) {
+    program.command('doctor')
+        .description('Check project configuration for errors and warnings')
+        .option('-f, --fix', 'attempt to fix minor issues automatically', false)
+        .action(function (opts) {
+        runDoctor(opts.fix);
+    });
+}
+exports.default = default_1;
+function runDoctor(autoFix) {
+    const cwd = process.cwd();
+    const results = [];
+    console.info('🔍 Checking melo project configuration...\n');
+    // Check 1: Is this a valid melo project?
+    if (!isMeloProject(cwd)) {
+        results.push({
+            type: 'error',
+            message: 'Not a valid melo project.',
+            fix: 'Run "melo init" to create a new project.'
+        });
+        printResults(results);
+        process.exit(1);
+    }
+    results.push({
+        type: 'success',
+        message: 'Valid melo project structure found.'
+    });
+    // Check 2: Validate adminServer.json
+    results.push(...checkAdminServerJson(cwd));
+    // Check 3: Validate servers.json
+    results.push(...checkServersJson(cwd));
+    // Check 4: Validate app.ts
+    results.push(...checkAppTs(cwd));
+    // Check 5: Check server directories consistency
+    results.push(...checkServerDirectories(cwd));
+    // Check 6: Check for duplicate server IDs
+    results.push(...checkDuplicateServerIds(cwd));
+    // Check 7: Check port conflicts
+    results.push(...checkPortConflicts(cwd));
+    // Check 8: Check for missing handler/remote files
+    results.push(...checkMissingHandlers(cwd));
+    printResults(results);
+    const errors = results.filter(r => r.type === 'error').length;
+    const warnings = results.filter(r => r.type === 'warning').length;
+    const fixes = results.filter(r => r.fix).length;
+    console.info(`\n📊 Summary: ${errors} errors, ${warnings} warnings`);
+    if (errors === 0 && warnings === 0) {
+        console.info('✅ All checks passed! Your project looks good.');
+    }
+    else if (errors === 0) {
+        console.info('⚠️  Project has some warnings but should work.');
+    }
+    else {
+        console.info('❌ Please fix the errors above before starting the server.');
+    }
+    if (fixes > 0 && !autoFix) {
+        console.info(`\n💡 Run "melo doctor --fix" to attempt automatic fixes for some issues.`);
+    }
+    process.exit(errors > 0 ? 1 : 0);
+}
+function isMeloProject(cwd) {
+    const requiredPaths = ['app.ts', 'config', 'app/servers'];
+    return requiredPaths.every(p => fs.existsSync(path.join(cwd, p)));
+}
+function checkAdminServerJson(cwd) {
+    const results = [];
+    const filePath = path.join(cwd, 'config', 'adminServer.json');
+    if (!fs.existsSync(filePath)) {
+        results.push({
+            type: 'error',
+            message: 'adminServer.json not found.',
+            file: 'config/adminServer.json',
+            fix: 'Create adminServer.json with at least master server configuration.'
+        });
+        return results;
+    }
+    let adminServers;
+    try {
+        adminServers = JSON.parse(fs.readFileSync(filePath, 'utf8'));
+    }
+    catch (e) {
+        results.push({
+            type: 'error',
+            message: 'adminServer.json is not valid JSON.',
+            file: 'config/adminServer.json',
+            fix: 'Fix JSON syntax errors.'
+        });
+        return results;
+    }
+    if (!Array.isArray(adminServers)) {
+        results.push({
+            type: 'error',
+            message: 'adminServer.json must be an array.',
+            file: 'config/adminServer.json'
+        });
+        return results;
+    }
+    // Check for master
+    const hasMaster = adminServers.some(s => s.type === 'master');
+    if (!hasMaster) {
+        results.push({
+            type: 'error',
+            message: 'Missing "master" server type in adminServer.json.',
+            file: 'config/adminServer.json',
+            fix: 'Add master server configuration.'
+        });
+    }
+    // Check for connector
+    const hasConnector = adminServers.some(s => s.type === 'connector');
+    if (!hasConnector) {
+        results.push({
+            type: 'warning',
+            message: 'Missing "connector" server type. Project may not accept client connections.',
+            file: 'config/adminServer.json'
+        });
+    }
+    // Check for duplicate types
+    const types = adminServers.map(s => s.type);
+    const duplicates = types.filter((item, index) => types.indexOf(item) !== index);
+    if (duplicates.length > 0) {
+        results.push({
+            type: 'error',
+            message: `Duplicate server types found: ${[...new Set(duplicates)].join(', ')}`,
+            file: 'config/adminServer.json'
+        });
+    }
+    // Check for missing tokens
+    adminServers.forEach(server => {
+        if (!server.token) {
+            results.push({
+                type: 'warning',
+                message: `Server type "${server.type}" is missing a token.`,
+                file: 'config/adminServer.json',
+                fix: 'Add a secure token for this server type.'
+            });
+        }
+    });
+    return results;
+}
+function checkServersJson(cwd) {
+    const results = [];
+    const filePath = path.join(cwd, 'config', 'servers.json');
+    if (!fs.existsSync(filePath)) {
+        results.push({
+            type: 'error',
+            message: 'servers.json not found.',
+            file: 'config/servers.json'
+        });
+        return results;
+    }
+    let servers;
+    try {
+        servers = JSON.parse(fs.readFileSync(filePath, 'utf8'));
+    }
+    catch (e) {
+        results.push({
+            type: 'error',
+            message: 'servers.json is not valid JSON.',
+            file: 'config/servers.json'
+        });
+        return results;
+    }
+    // Check environments
+    ['development', 'production'].forEach(env => {
+        if (!servers[env]) {
+            results.push({
+                type: 'warning',
+                message: `Missing "${env}" environment configuration.`,
+                file: 'config/servers.json'
+            });
+        }
+    });
+    // Check each environment
+    Object.keys(servers).forEach(env => {
+        const envConfig = servers[env];
+        // Check for master
+        if (!envConfig.master || envConfig.master.length === 0) {
+            results.push({
+                type: 'error',
+                message: `Missing master server in "${env}" environment.`,
+                file: 'config/servers.json'
+            });
+        }
+        // Validate server entries
+        Object.keys(envConfig).forEach(serverType => {
+            const serverList = envConfig[serverType];
+            if (!Array.isArray(serverList)) {
+                results.push({
+                    type: 'error',
+                    message: `Server type "${serverType}" in "${env}" must be an array.`,
+                    file: 'config/servers.json'
+                });
+                return;
+            }
+            serverList.forEach((server, index) => {
+                if (!server.id) {
+                    results.push({
+                        type: 'error',
+                        message: `Server #${index + 1} of type "${serverType}" in "${env}" is missing an ID.`,
+                        file: 'config/servers.json'
+                    });
+                }
+                if (!server.host) {
+                    results.push({
+                        type: 'warning',
+                        message: `Server "${server.id || index}" in "${env}" is missing host.`,
+                        file: 'config/servers.json'
+                    });
+                }
+                if (!server.port && server.port !== 0) {
+                    results.push({
+                        type: 'error',
+                        message: `Server "${server.id || index}" in "${env}" is missing port.`,
+                        file: 'config/servers.json'
+                    });
+                }
+                // Check frontend servers have clientPort
+                if (server.frontend && !server.clientPort && server.clientPort !== 0) {
+                    results.push({
+                        type: 'warning',
+                        message: `Frontend server "${server.id}" in "${env}" is missing clientPort.`,
+                        file: 'config/servers.json'
+                    });
+                }
+            });
+        });
+    });
+    return results;
+}
+function checkAppTs(cwd) {
+    const results = [];
+    const filePath = path.join(cwd, 'app.ts');
+    if (!fs.existsSync(filePath)) {
+        return results;
+    }
+    const content = fs.readFileSync(filePath, 'utf8');
+    // Check for app.start()
+    if (!content.includes('app.start()')) {
+        results.push({
+            type: 'error',
+            message: 'app.ts is missing app.start() call.',
+            file: 'app.ts'
+        });
+    }
+    // Check for melo import
+    if (!content.includes('@bigtyphoon/melo') && !content.includes('melo')) {
+        results.push({
+            type: 'error',
+            message: 'app.ts is missing melo import.',
+            file: 'app.ts'
+        });
+    }
+    // Check for app.createApp()
+    if (!content.includes('createApp')) {
+        results.push({
+            type: 'error',
+            message: 'app.ts should call melo.createApp().',
+            file: 'app.ts'
+        });
+    }
+    return results;
+}
+function checkServerDirectories(cwd) {
+    const results = [];
+    const serversDir = path.join(cwd, 'app', 'servers');
+    if (!fs.existsSync(serversDir)) {
+        return results;
+    }
+    const serverTypes = fs.readdirSync(serversDir).filter(f => {
+        return fs.statSync(path.join(serversDir, f)).isDirectory();
+    });
+    // Check if each server type has handler or remote directory
+    serverTypes.forEach(serverType => {
+        const serverPath = path.join(serversDir, serverType);
+        const hasHandler = fs.existsSync(path.join(serverPath, 'handler'));
+        const hasRemote = fs.existsSync(path.join(serverPath, 'remote'));
+        if (!hasHandler && !hasRemote) {
+            results.push({
+                type: 'warning',
+                message: `Server type "${serverType}" has neither handler nor remote directory.`,
+                file: `app/servers/${serverType}`
+            });
+        }
+        // Check handler directory is not empty
+        if (hasHandler) {
+            const handlerFiles = fs.readdirSync(path.join(serverPath, 'handler'))
+                .filter(f => f.endsWith('.ts') || f.endsWith('.js'));
+            if (handlerFiles.length === 0) {
+                results.push({
+                    type: 'warning',
+                    message: `Handler directory for "${serverType}" is empty.`,
+                    file: `app/servers/${serverType}/handler`
+                });
+            }
+        }
+    });
+    return results;
+}
+function checkDuplicateServerIds(cwd) {
+    const results = [];
+    const filePath = path.join(cwd, 'config', 'servers.json');
+    if (!fs.existsSync(filePath)) {
+        return results;
+    }
+    let servers;
+    try {
+        servers = JSON.parse(fs.readFileSync(filePath, 'utf8'));
+    }
+    catch (e) {
+        return results;
+    }
+    Object.keys(servers).forEach(env => {
+        const envConfig = servers[env];
+        const ids = [];
+        Object.keys(envConfig).forEach(serverType => {
+            const serverList = envConfig[serverType];
+            if (Array.isArray(serverList)) {
+                serverList.forEach((server) => {
+                    if (server.id) {
+                        if (ids.includes(server.id)) {
+                            results.push({
+                                type: 'error',
+                                message: `Duplicate server ID "${server.id}" in "${env}" environment.`,
+                                file: 'config/servers.json'
+                            });
+                        }
+                        ids.push(server.id);
+                    }
+                });
+            }
+        });
+    });
+    return results;
+}
+function checkPortConflicts(cwd) {
+    const results = [];
+    const filePath = path.join(cwd, 'config', 'servers.json');
+    if (!fs.existsSync(filePath)) {
+        return results;
+    }
+    let servers;
+    try {
+        servers = JSON.parse(fs.readFileSync(filePath, 'utf8'));
+    }
+    catch (e) {
+        return results;
+    }
+    Object.keys(servers).forEach(env => {
+        const envConfig = servers[env];
+        const ports = [];
+        Object.keys(envConfig).forEach(serverType => {
+            const serverList = envConfig[serverType];
+            if (Array.isArray(serverList)) {
+                serverList.forEach((server) => {
+                    if (server.port) {
+                        const existing = ports.find(p => p.port === server.port);
+                        if (existing) {
+                            results.push({
+                                type: 'error',
+                                message: `Port conflict: "${server.id}" and "${existing.server}" both use port ${server.port} in "${env}".`,
+                                file: 'config/servers.json'
+                            });
+                        }
+                        ports.push({ port: server.port, server: server.id });
+                    }
+                    if (server.clientPort) {
+                        const existingClient = ports.find(p => p.port === server.clientPort);
+                        if (existingClient) {
+                            results.push({
+                                type: 'error',
+                                message: `Client port conflict: "${server.id}" and "${existingClient.server}" both use clientPort ${server.clientPort} in "${env}".`,
+                                file: 'config/servers.json'
+                            });
+                        }
+                        ports.push({ port: server.clientPort, server: server.id });
+                    }
+                });
+            }
+        });
+    });
+    return results;
+}
+function checkMissingHandlers(cwd) {
+    const results = [];
+    const adminServerPath = path.join(cwd, 'config', 'adminServer.json');
+    if (!fs.existsSync(adminServerPath)) {
+        return results;
+    }
+    let adminServers;
+    try {
+        adminServers = JSON.parse(fs.readFileSync(adminServerPath, 'utf8'));
+    }
+    catch (e) {
+        return results;
+    }
+    const serversDir = path.join(cwd, 'app', 'servers');
+    adminServers.forEach(server => {
+        if (server.type === 'master')
+            return; // master doesn't need handler
+        const serverPath = path.join(serversDir, server.type);
+        if (!fs.existsSync(serverPath)) {
+            results.push({
+                type: 'warning',
+                message: `Server type "${server.type}" is defined in adminServer.json but has no directory.`,
+                file: `app/servers/${server.type}`,
+                fix: `Run "melo add-server ${server.type}" to create the server directory.`
+            });
+        }
+    });
+    return results;
+}
+function printResults(results) {
+    const icons = {
+        error: '❌',
+        warning: '⚠️ ',
+        info: 'ℹ️ ',
+        success: '✅'
+    };
+    results.forEach(result => {
+        console.info(`${icons[result.type]} ${result.message}`);
+        if (result.file) {
+            console.info(`   📁 ${result.file}`);
+        }
+        if (result.fix) {
+            console.info(`   💡 ${result.fix}`);
+        }
+        console.info('');
+    });
+}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"doctor.js","sourceRoot":"","sources":["../../../bin/commands/doctor.ts"],"names":[],"mappings":"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"}

package/dist/bin/utils/constants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DAEMON_INFO = exports.COMMAND_ERROR = exports.MASTER_HA_NOT_FOUND = exports.SCRIPT_NOT_FOUND = exports.INIT_PROJ_NOTICE = exports.RESTART_SERVER_INFO = exports.ADD_SERVER_INFO = exports.CLOSEAPP_INFO = exports.FILEREAD_ERROR = exports.CONNECT_ERROR = exports.DEFAULT_MASTER_PORT = exports.DEFAULT_MASTER_HOST = exports.DEFAULT_ENV = exports.DEFAULT_PWD = exports.DEFAULT_USERNAME = exports.DEFAULT_GAME_SERVER_DIR = exports.CUR_DIR = exports.KILL_CMD_WIN = exports.KILL_CMD_LUX = exports.TIME_KILL_WAIT = exports.TIME_INIT = void 0;
+exports.ADD_SERVER_TYPE_EXISTS = exports.ADD_SERVER_TYPE_INFO = exports.DAEMON_INFO = exports.COMMAND_ERROR = exports.MASTER_HA_NOT_FOUND = exports.SCRIPT_NOT_FOUND = exports.INIT_PROJ_NOTICE = exports.RESTART_SERVER_INFO = exports.ADD_SERVER_INFO = exports.CLOSEAPP_INFO = exports.FILEREAD_ERROR = exports.CONNECT_ERROR = exports.DEFAULT_MASTER_PORT = exports.DEFAULT_MASTER_HOST = exports.DEFAULT_ENV = exports.DEFAULT_PWD = exports.DEFAULT_USERNAME = exports.DEFAULT_GAME_SERVER_DIR = exports.CUR_DIR = exports.KILL_CMD_WIN = exports.KILL_CMD_LUX = exports.TIME_KILL_WAIT = exports.TIME_INIT = void 0;
 /**
  *  Constant Variables
  */
@@ -25,4 +25,7 @@ exports.SCRIPT_NOT_FOUND = 'Fail to find an appropriate script to run,\nplease c
 exports.MASTER_HA_NOT_FOUND = 'Fail to find an appropriate masterha config file, \nplease check the current work directory or the arguments passed to.\n'.red;
 exports.COMMAND_ERROR = 'Illegal command format. Use `melo --help` to get more info.\n'.red;
 exports.DAEMON_INFO = 'The application is running in the background now.\n';
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uc3RhbnRzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vYmluL3V0aWxzL2NvbnN0YW50cy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFDQTs7R0FFRztBQUNRLFFBQUEsU0FBUyxHQUFHLENBQUMsR0FBRyxJQUFJLENBQUM7QUFDckIsUUFBQSxjQUFjLEdBQUcsQ0FBQyxHQUFHLElBQUksQ0FBQztBQUMxQixRQUFBLFlBQVksR0FBRywrQ0FBK0MsQ0FBQztBQUMvRCxRQUFBLFlBQVksR0FBRywwQkFBMEIsQ0FBQztBQUUxQyxRQUFBLE9BQU8sR0FBRyxPQUFPLENBQUMsR0FBRyxFQUFFLENBQUM7QUFDeEIsUUFBQSx1QkFBdUIsR0FBRyxlQUFPLENBQUM7QUFDbEMsUUFBQSxnQkFBZ0IsR0FBRyxPQUFPLENBQUM7QUFDM0IsUUFBQSxXQUFXLEdBQUcsT0FBTyxDQUFDO0FBQ3RCLFFBQUEsV0FBVyxHQUFHLGFBQWEsQ0FBQztBQUM1QixRQUFBLG1CQUFtQixHQUFHLFdBQVcsQ0FBQztBQUNsQyxRQUFBLG1CQUFtQixHQUFHLElBQUksQ0FBQztBQUUzQixRQUFBLGFBQWEsR0FBRywwQ0FBMEMsQ0FBQztBQUMzRCxRQUFBLGNBQWMsR0FBRyw0RUFBNEUsQ0FBQztBQUM5RixRQUFBLGFBQWEsR0FBRyxrREFBa0QsQ0FBQztBQUNuRSxRQUFBLGVBQWUsR0FBRywwQkFBMEIsQ0FBQztBQUM3QyxRQUFBLG1CQUFtQixHQUFHLDhCQUE4QixDQUFDO0FBQ3JELFFBQUEsZ0JBQWdCLEdBQUcsQ0FBQyxtQ0FBbUMsR0FBRyxZQUFvQixDQUFBLENBQUMsS0FBSyxHQUFHLGFBQWEsR0FBSSxVQUFrQixDQUFDLEtBQUssR0FBRyw4RUFBOEUsQ0FBQztBQUNsTixRQUFBLGdCQUFnQixHQUFJLDJJQUFtSixDQUFDLEdBQUcsQ0FBQztBQUM1SyxRQUFBLG1CQUFtQixHQUFJLDJIQUFtSSxDQUFDLEdBQUcsQ0FBQztBQUMvSixRQUFBLGFBQWEsR0FBSSwrREFBdUUsQ0FBQyxHQUFHLENBQUM7QUFDN0YsUUFBQSxXQUFXLEdBQUcscURBQXFELENBQUMifQ==
+// Add server type command
+exports.ADD_SERVER_TYPE_INFO = 'Successfully added server type "${serverName}".\n\nGenerated files:\n  - app/servers/${serverName}/handler/${serverName}Handler.ts\n  - app/servers/${serverName}/remote/${serverName}Remote.ts\n  - Updated config/adminServer.json\n  - Updated config/servers.json\n  - Updated app.ts\n\nYou can now add server instances to config/servers.json.';
+exports.ADD_SERVER_TYPE_EXISTS = 'Server type already exists. Use --force to overwrite or choose a different name.';
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uc3RhbnRzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vYmluL3V0aWxzL2NvbnN0YW50cy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFDQTs7R0FFRztBQUNRLFFBQUEsU0FBUyxHQUFHLENBQUMsR0FBRyxJQUFJLENBQUM7QUFDckIsUUFBQSxjQUFjLEdBQUcsQ0FBQyxHQUFHLElBQUksQ0FBQztBQUMxQixRQUFBLFlBQVksR0FBRywrQ0FBK0MsQ0FBQztBQUMvRCxRQUFBLFlBQVksR0FBRywwQkFBMEIsQ0FBQztBQUUxQyxRQUFBLE9BQU8sR0FBRyxPQUFPLENBQUMsR0FBRyxFQUFFLENBQUM7QUFDeEIsUUFBQSx1QkFBdUIsR0FBRyxlQUFPLENBQUM7QUFDbEMsUUFBQSxnQkFBZ0IsR0FBRyxPQUFPLENBQUM7QUFDM0IsUUFBQSxXQUFXLEdBQUcsT0FBTyxDQUFDO0FBQ3RCLFFBQUEsV0FBVyxHQUFHLGFBQWEsQ0FBQztBQUM1QixRQUFBLG1CQUFtQixHQUFHLFdBQVcsQ0FBQztBQUNsQyxRQUFBLG1CQUFtQixHQUFHLElBQUksQ0FBQztBQUUzQixRQUFBLGFBQWEsR0FBRywwQ0FBMEMsQ0FBQztBQUMzRCxRQUFBLGNBQWMsR0FBRyw0RUFBNEUsQ0FBQztBQUM5RixRQUFBLGFBQWEsR0FBRyxrREFBa0QsQ0FBQztBQUNuRSxRQUFBLGVBQWUsR0FBRywwQkFBMEIsQ0FBQztBQUM3QyxRQUFBLG1CQUFtQixHQUFHLDhCQUE4QixDQUFDO0FBQ3JELFFBQUEsZ0JBQWdCLEdBQUcsQ0FBQyxtQ0FBbUMsR0FBRyxZQUFvQixDQUFBLENBQUMsS0FBSyxHQUFHLGFBQWEsR0FBSSxVQUFrQixDQUFDLEtBQUssR0FBRyw4RUFBOEUsQ0FBQztBQUNsTixRQUFBLGdCQUFnQixHQUFJLDJJQUFtSixDQUFDLEdBQUcsQ0FBQztBQUM1SyxRQUFBLG1CQUFtQixHQUFJLDJIQUFtSSxDQUFDLEdBQUcsQ0FBQztBQUMvSixRQUFBLGFBQWEsR0FBSSwrREFBdUUsQ0FBQyxHQUFHLENBQUM7QUFDN0YsUUFBQSxXQUFXLEdBQUcscURBQXFELENBQUM7QUFFL0UsMEJBQTBCO0FBQ2YsUUFBQSxvQkFBb0IsR0FBRyx1VkFBdVYsQ0FBQztBQUMvVyxRQUFBLHNCQUFzQixHQUFHLGtGQUFrRixDQUFDIn0=

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bigtyphoon/melo",
-  "version": "1.7.6",
+  "version": "1.8.0",
   "private": false,
   "homepage": "https://github.com/node-melo/melo",
   "repository": {
@@ -89,5 +89,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "87c4ea8724fa27baf22c0a669a7d89ef6f426af4"
+  "gitHead": "7dfd3ca78ed6b051e34da595269efb623cd58d1b"
 }