@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.
@@ -0,0 +1,439 @@
1
+ #!/usr/bin/env node
2
+ "use strict";
3
+ /**
4
+ * Check and validate project configuration
5
+ * Reports errors and warnings for common configuration issues
6
+ */
7
+ Object.defineProperty(exports, "__esModule", { value: true });
8
+ const fs = require("fs");
9
+ const path = require("path");
10
+ function default_1(program) {
11
+ program.command('doctor')
12
+ .description('Check project configuration for errors and warnings')
13
+ .option('-f, --fix', 'attempt to fix minor issues automatically', false)
14
+ .action(function (opts) {
15
+ runDoctor(opts.fix);
16
+ });
17
+ }
18
+ exports.default = default_1;
19
+ function runDoctor(autoFix) {
20
+ const cwd = process.cwd();
21
+ const results = [];
22
+ console.info('šŸ” Checking melo project configuration...\n');
23
+ // Check 1: Is this a valid melo project?
24
+ if (!isMeloProject(cwd)) {
25
+ results.push({
26
+ type: 'error',
27
+ message: 'Not a valid melo project.',
28
+ fix: 'Run "melo init" to create a new project.'
29
+ });
30
+ printResults(results);
31
+ process.exit(1);
32
+ }
33
+ results.push({
34
+ type: 'success',
35
+ message: 'Valid melo project structure found.'
36
+ });
37
+ // Check 2: Validate adminServer.json
38
+ results.push(...checkAdminServerJson(cwd));
39
+ // Check 3: Validate servers.json
40
+ results.push(...checkServersJson(cwd));
41
+ // Check 4: Validate app.ts
42
+ results.push(...checkAppTs(cwd));
43
+ // Check 5: Check server directories consistency
44
+ results.push(...checkServerDirectories(cwd));
45
+ // Check 6: Check for duplicate server IDs
46
+ results.push(...checkDuplicateServerIds(cwd));
47
+ // Check 7: Check port conflicts
48
+ results.push(...checkPortConflicts(cwd));
49
+ // Check 8: Check for missing handler/remote files
50
+ results.push(...checkMissingHandlers(cwd));
51
+ printResults(results);
52
+ const errors = results.filter(r => r.type === 'error').length;
53
+ const warnings = results.filter(r => r.type === 'warning').length;
54
+ const fixes = results.filter(r => r.fix).length;
55
+ console.info(`\nšŸ“Š Summary: ${errors} errors, ${warnings} warnings`);
56
+ if (errors === 0 && warnings === 0) {
57
+ console.info('āœ… All checks passed! Your project looks good.');
58
+ }
59
+ else if (errors === 0) {
60
+ console.info('āš ļø Project has some warnings but should work.');
61
+ }
62
+ else {
63
+ console.info('āŒ Please fix the errors above before starting the server.');
64
+ }
65
+ if (fixes > 0 && !autoFix) {
66
+ console.info(`\nšŸ’” Run "melo doctor --fix" to attempt automatic fixes for some issues.`);
67
+ }
68
+ process.exit(errors > 0 ? 1 : 0);
69
+ }
70
+ function isMeloProject(cwd) {
71
+ const requiredPaths = ['app.ts', 'config', 'app/servers'];
72
+ return requiredPaths.every(p => fs.existsSync(path.join(cwd, p)));
73
+ }
74
+ function checkAdminServerJson(cwd) {
75
+ const results = [];
76
+ const filePath = path.join(cwd, 'config', 'adminServer.json');
77
+ if (!fs.existsSync(filePath)) {
78
+ results.push({
79
+ type: 'error',
80
+ message: 'adminServer.json not found.',
81
+ file: 'config/adminServer.json',
82
+ fix: 'Create adminServer.json with at least master server configuration.'
83
+ });
84
+ return results;
85
+ }
86
+ let adminServers;
87
+ try {
88
+ adminServers = JSON.parse(fs.readFileSync(filePath, 'utf8'));
89
+ }
90
+ catch (e) {
91
+ results.push({
92
+ type: 'error',
93
+ message: 'adminServer.json is not valid JSON.',
94
+ file: 'config/adminServer.json',
95
+ fix: 'Fix JSON syntax errors.'
96
+ });
97
+ return results;
98
+ }
99
+ if (!Array.isArray(adminServers)) {
100
+ results.push({
101
+ type: 'error',
102
+ message: 'adminServer.json must be an array.',
103
+ file: 'config/adminServer.json'
104
+ });
105
+ return results;
106
+ }
107
+ // Check for master
108
+ const hasMaster = adminServers.some(s => s.type === 'master');
109
+ if (!hasMaster) {
110
+ results.push({
111
+ type: 'error',
112
+ message: 'Missing "master" server type in adminServer.json.',
113
+ file: 'config/adminServer.json',
114
+ fix: 'Add master server configuration.'
115
+ });
116
+ }
117
+ // Check for connector
118
+ const hasConnector = adminServers.some(s => s.type === 'connector');
119
+ if (!hasConnector) {
120
+ results.push({
121
+ type: 'warning',
122
+ message: 'Missing "connector" server type. Project may not accept client connections.',
123
+ file: 'config/adminServer.json'
124
+ });
125
+ }
126
+ // Check for duplicate types
127
+ const types = adminServers.map(s => s.type);
128
+ const duplicates = types.filter((item, index) => types.indexOf(item) !== index);
129
+ if (duplicates.length > 0) {
130
+ results.push({
131
+ type: 'error',
132
+ message: `Duplicate server types found: ${[...new Set(duplicates)].join(', ')}`,
133
+ file: 'config/adminServer.json'
134
+ });
135
+ }
136
+ // Check for missing tokens
137
+ adminServers.forEach(server => {
138
+ if (!server.token) {
139
+ results.push({
140
+ type: 'warning',
141
+ message: `Server type "${server.type}" is missing a token.`,
142
+ file: 'config/adminServer.json',
143
+ fix: 'Add a secure token for this server type.'
144
+ });
145
+ }
146
+ });
147
+ return results;
148
+ }
149
+ function checkServersJson(cwd) {
150
+ const results = [];
151
+ const filePath = path.join(cwd, 'config', 'servers.json');
152
+ if (!fs.existsSync(filePath)) {
153
+ results.push({
154
+ type: 'error',
155
+ message: 'servers.json not found.',
156
+ file: 'config/servers.json'
157
+ });
158
+ return results;
159
+ }
160
+ let servers;
161
+ try {
162
+ servers = JSON.parse(fs.readFileSync(filePath, 'utf8'));
163
+ }
164
+ catch (e) {
165
+ results.push({
166
+ type: 'error',
167
+ message: 'servers.json is not valid JSON.',
168
+ file: 'config/servers.json'
169
+ });
170
+ return results;
171
+ }
172
+ // Check environments
173
+ ['development', 'production'].forEach(env => {
174
+ if (!servers[env]) {
175
+ results.push({
176
+ type: 'warning',
177
+ message: `Missing "${env}" environment configuration.`,
178
+ file: 'config/servers.json'
179
+ });
180
+ }
181
+ });
182
+ // Check each environment
183
+ Object.keys(servers).forEach(env => {
184
+ const envConfig = servers[env];
185
+ // Check for master
186
+ if (!envConfig.master || envConfig.master.length === 0) {
187
+ results.push({
188
+ type: 'error',
189
+ message: `Missing master server in "${env}" environment.`,
190
+ file: 'config/servers.json'
191
+ });
192
+ }
193
+ // Validate server entries
194
+ Object.keys(envConfig).forEach(serverType => {
195
+ const serverList = envConfig[serverType];
196
+ if (!Array.isArray(serverList)) {
197
+ results.push({
198
+ type: 'error',
199
+ message: `Server type "${serverType}" in "${env}" must be an array.`,
200
+ file: 'config/servers.json'
201
+ });
202
+ return;
203
+ }
204
+ serverList.forEach((server, index) => {
205
+ if (!server.id) {
206
+ results.push({
207
+ type: 'error',
208
+ message: `Server #${index + 1} of type "${serverType}" in "${env}" is missing an ID.`,
209
+ file: 'config/servers.json'
210
+ });
211
+ }
212
+ if (!server.host) {
213
+ results.push({
214
+ type: 'warning',
215
+ message: `Server "${server.id || index}" in "${env}" is missing host.`,
216
+ file: 'config/servers.json'
217
+ });
218
+ }
219
+ if (!server.port && server.port !== 0) {
220
+ results.push({
221
+ type: 'error',
222
+ message: `Server "${server.id || index}" in "${env}" is missing port.`,
223
+ file: 'config/servers.json'
224
+ });
225
+ }
226
+ // Check frontend servers have clientPort
227
+ if (server.frontend && !server.clientPort && server.clientPort !== 0) {
228
+ results.push({
229
+ type: 'warning',
230
+ message: `Frontend server "${server.id}" in "${env}" is missing clientPort.`,
231
+ file: 'config/servers.json'
232
+ });
233
+ }
234
+ });
235
+ });
236
+ });
237
+ return results;
238
+ }
239
+ function checkAppTs(cwd) {
240
+ const results = [];
241
+ const filePath = path.join(cwd, 'app.ts');
242
+ if (!fs.existsSync(filePath)) {
243
+ return results;
244
+ }
245
+ const content = fs.readFileSync(filePath, 'utf8');
246
+ // Check for app.start()
247
+ if (!content.includes('app.start()')) {
248
+ results.push({
249
+ type: 'error',
250
+ message: 'app.ts is missing app.start() call.',
251
+ file: 'app.ts'
252
+ });
253
+ }
254
+ // Check for melo import
255
+ if (!content.includes('@bigtyphoon/melo') && !content.includes('melo')) {
256
+ results.push({
257
+ type: 'error',
258
+ message: 'app.ts is missing melo import.',
259
+ file: 'app.ts'
260
+ });
261
+ }
262
+ // Check for app.createApp()
263
+ if (!content.includes('createApp')) {
264
+ results.push({
265
+ type: 'error',
266
+ message: 'app.ts should call melo.createApp().',
267
+ file: 'app.ts'
268
+ });
269
+ }
270
+ return results;
271
+ }
272
+ function checkServerDirectories(cwd) {
273
+ const results = [];
274
+ const serversDir = path.join(cwd, 'app', 'servers');
275
+ if (!fs.existsSync(serversDir)) {
276
+ return results;
277
+ }
278
+ const serverTypes = fs.readdirSync(serversDir).filter(f => {
279
+ return fs.statSync(path.join(serversDir, f)).isDirectory();
280
+ });
281
+ // Check if each server type has handler or remote directory
282
+ serverTypes.forEach(serverType => {
283
+ const serverPath = path.join(serversDir, serverType);
284
+ const hasHandler = fs.existsSync(path.join(serverPath, 'handler'));
285
+ const hasRemote = fs.existsSync(path.join(serverPath, 'remote'));
286
+ if (!hasHandler && !hasRemote) {
287
+ results.push({
288
+ type: 'warning',
289
+ message: `Server type "${serverType}" has neither handler nor remote directory.`,
290
+ file: `app/servers/${serverType}`
291
+ });
292
+ }
293
+ // Check handler directory is not empty
294
+ if (hasHandler) {
295
+ const handlerFiles = fs.readdirSync(path.join(serverPath, 'handler'))
296
+ .filter(f => f.endsWith('.ts') || f.endsWith('.js'));
297
+ if (handlerFiles.length === 0) {
298
+ results.push({
299
+ type: 'warning',
300
+ message: `Handler directory for "${serverType}" is empty.`,
301
+ file: `app/servers/${serverType}/handler`
302
+ });
303
+ }
304
+ }
305
+ });
306
+ return results;
307
+ }
308
+ function checkDuplicateServerIds(cwd) {
309
+ const results = [];
310
+ const filePath = path.join(cwd, 'config', 'servers.json');
311
+ if (!fs.existsSync(filePath)) {
312
+ return results;
313
+ }
314
+ let servers;
315
+ try {
316
+ servers = JSON.parse(fs.readFileSync(filePath, 'utf8'));
317
+ }
318
+ catch (e) {
319
+ return results;
320
+ }
321
+ Object.keys(servers).forEach(env => {
322
+ const envConfig = servers[env];
323
+ const ids = [];
324
+ Object.keys(envConfig).forEach(serverType => {
325
+ const serverList = envConfig[serverType];
326
+ if (Array.isArray(serverList)) {
327
+ serverList.forEach((server) => {
328
+ if (server.id) {
329
+ if (ids.includes(server.id)) {
330
+ results.push({
331
+ type: 'error',
332
+ message: `Duplicate server ID "${server.id}" in "${env}" environment.`,
333
+ file: 'config/servers.json'
334
+ });
335
+ }
336
+ ids.push(server.id);
337
+ }
338
+ });
339
+ }
340
+ });
341
+ });
342
+ return results;
343
+ }
344
+ function checkPortConflicts(cwd) {
345
+ const results = [];
346
+ const filePath = path.join(cwd, 'config', 'servers.json');
347
+ if (!fs.existsSync(filePath)) {
348
+ return results;
349
+ }
350
+ let servers;
351
+ try {
352
+ servers = JSON.parse(fs.readFileSync(filePath, 'utf8'));
353
+ }
354
+ catch (e) {
355
+ return results;
356
+ }
357
+ Object.keys(servers).forEach(env => {
358
+ const envConfig = servers[env];
359
+ const ports = [];
360
+ Object.keys(envConfig).forEach(serverType => {
361
+ const serverList = envConfig[serverType];
362
+ if (Array.isArray(serverList)) {
363
+ serverList.forEach((server) => {
364
+ if (server.port) {
365
+ const existing = ports.find(p => p.port === server.port);
366
+ if (existing) {
367
+ results.push({
368
+ type: 'error',
369
+ message: `Port conflict: "${server.id}" and "${existing.server}" both use port ${server.port} in "${env}".`,
370
+ file: 'config/servers.json'
371
+ });
372
+ }
373
+ ports.push({ port: server.port, server: server.id });
374
+ }
375
+ if (server.clientPort) {
376
+ const existingClient = ports.find(p => p.port === server.clientPort);
377
+ if (existingClient) {
378
+ results.push({
379
+ type: 'error',
380
+ message: `Client port conflict: "${server.id}" and "${existingClient.server}" both use clientPort ${server.clientPort} in "${env}".`,
381
+ file: 'config/servers.json'
382
+ });
383
+ }
384
+ ports.push({ port: server.clientPort, server: server.id });
385
+ }
386
+ });
387
+ }
388
+ });
389
+ });
390
+ return results;
391
+ }
392
+ function checkMissingHandlers(cwd) {
393
+ const results = [];
394
+ const adminServerPath = path.join(cwd, 'config', 'adminServer.json');
395
+ if (!fs.existsSync(adminServerPath)) {
396
+ return results;
397
+ }
398
+ let adminServers;
399
+ try {
400
+ adminServers = JSON.parse(fs.readFileSync(adminServerPath, 'utf8'));
401
+ }
402
+ catch (e) {
403
+ return results;
404
+ }
405
+ const serversDir = path.join(cwd, 'app', 'servers');
406
+ adminServers.forEach(server => {
407
+ if (server.type === 'master')
408
+ return; // master doesn't need handler
409
+ const serverPath = path.join(serversDir, server.type);
410
+ if (!fs.existsSync(serverPath)) {
411
+ results.push({
412
+ type: 'warning',
413
+ message: `Server type "${server.type}" is defined in adminServer.json but has no directory.`,
414
+ file: `app/servers/${server.type}`,
415
+ fix: `Run "melo add-server ${server.type}" to create the server directory.`
416
+ });
417
+ }
418
+ });
419
+ return results;
420
+ }
421
+ function printResults(results) {
422
+ const icons = {
423
+ error: 'āŒ',
424
+ warning: 'āš ļø ',
425
+ info: 'ā„¹ļø ',
426
+ success: 'āœ…'
427
+ };
428
+ results.forEach(result => {
429
+ console.info(`${icons[result.type]} ${result.message}`);
430
+ if (result.file) {
431
+ console.info(` šŸ“ ${result.file}`);
432
+ }
433
+ if (result.fix) {
434
+ console.info(` šŸ’” ${result.fix}`);
435
+ }
436
+ console.info('');
437
+ });
438
+ }
439
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"doctor.js","sourceRoot":"","sources":["../../../bin/commands/doctor.ts"],"names":[],"mappings":"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"}
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- 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;
3
+ 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;
4
4
  /**
5
5
  * Constant Variables
6
6
  */
@@ -25,4 +25,7 @@ exports.SCRIPT_NOT_FOUND = 'Fail to find an appropriate script to run,\nplease c
25
25
  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;
26
26
  exports.COMMAND_ERROR = 'Illegal command format. Use `melo --help` to get more info.\n'.red;
27
27
  exports.DAEMON_INFO = 'The application is running in the background now.\n';
28
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uc3RhbnRzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vYmluL3V0aWxzL2NvbnN0YW50cy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFDQTs7R0FFRztBQUNRLFFBQUEsU0FBUyxHQUFHLENBQUMsR0FBRyxJQUFJLENBQUM7QUFDckIsUUFBQSxjQUFjLEdBQUcsQ0FBQyxHQUFHLElBQUksQ0FBQztBQUMxQixRQUFBLFlBQVksR0FBRywrQ0FBK0MsQ0FBQztBQUMvRCxRQUFBLFlBQVksR0FBRywwQkFBMEIsQ0FBQztBQUUxQyxRQUFBLE9BQU8sR0FBRyxPQUFPLENBQUMsR0FBRyxFQUFFLENBQUM7QUFDeEIsUUFBQSx1QkFBdUIsR0FBRyxlQUFPLENBQUM7QUFDbEMsUUFBQSxnQkFBZ0IsR0FBRyxPQUFPLENBQUM7QUFDM0IsUUFBQSxXQUFXLEdBQUcsT0FBTyxDQUFDO0FBQ3RCLFFBQUEsV0FBVyxHQUFHLGFBQWEsQ0FBQztBQUM1QixRQUFBLG1CQUFtQixHQUFHLFdBQVcsQ0FBQztBQUNsQyxRQUFBLG1CQUFtQixHQUFHLElBQUksQ0FBQztBQUUzQixRQUFBLGFBQWEsR0FBRywwQ0FBMEMsQ0FBQztBQUMzRCxRQUFBLGNBQWMsR0FBRyw0RUFBNEUsQ0FBQztBQUM5RixRQUFBLGFBQWEsR0FBRyxrREFBa0QsQ0FBQztBQUNuRSxRQUFBLGVBQWUsR0FBRywwQkFBMEIsQ0FBQztBQUM3QyxRQUFBLG1CQUFtQixHQUFHLDhCQUE4QixDQUFDO0FBQ3JELFFBQUEsZ0JBQWdCLEdBQUcsQ0FBQyxtQ0FBbUMsR0FBRyxZQUFvQixDQUFBLENBQUMsS0FBSyxHQUFHLGFBQWEsR0FBSSxVQUFrQixDQUFDLEtBQUssR0FBRyw4RUFBOEUsQ0FBQztBQUNsTixRQUFBLGdCQUFnQixHQUFJLDJJQUFtSixDQUFDLEdBQUcsQ0FBQztBQUM1SyxRQUFBLG1CQUFtQixHQUFJLDJIQUFtSSxDQUFDLEdBQUcsQ0FBQztBQUMvSixRQUFBLGFBQWEsR0FBSSwrREFBdUUsQ0FBQyxHQUFHLENBQUM7QUFDN0YsUUFBQSxXQUFXLEdBQUcscURBQXFELENBQUMifQ==
28
+ // Add server type command
29
+ 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.';
30
+ exports.ADD_SERVER_TYPE_EXISTS = 'Server type already exists. Use --force to overwrite or choose a different name.';
31
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uc3RhbnRzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vYmluL3V0aWxzL2NvbnN0YW50cy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFDQTs7R0FFRztBQUNRLFFBQUEsU0FBUyxHQUFHLENBQUMsR0FBRyxJQUFJLENBQUM7QUFDckIsUUFBQSxjQUFjLEdBQUcsQ0FBQyxHQUFHLElBQUksQ0FBQztBQUMxQixRQUFBLFlBQVksR0FBRywrQ0FBK0MsQ0FBQztBQUMvRCxRQUFBLFlBQVksR0FBRywwQkFBMEIsQ0FBQztBQUUxQyxRQUFBLE9BQU8sR0FBRyxPQUFPLENBQUMsR0FBRyxFQUFFLENBQUM7QUFDeEIsUUFBQSx1QkFBdUIsR0FBRyxlQUFPLENBQUM7QUFDbEMsUUFBQSxnQkFBZ0IsR0FBRyxPQUFPLENBQUM7QUFDM0IsUUFBQSxXQUFXLEdBQUcsT0FBTyxDQUFDO0FBQ3RCLFFBQUEsV0FBVyxHQUFHLGFBQWEsQ0FBQztBQUM1QixRQUFBLG1CQUFtQixHQUFHLFdBQVcsQ0FBQztBQUNsQyxRQUFBLG1CQUFtQixHQUFHLElBQUksQ0FBQztBQUUzQixRQUFBLGFBQWEsR0FBRywwQ0FBMEMsQ0FBQztBQUMzRCxRQUFBLGNBQWMsR0FBRyw0RUFBNEUsQ0FBQztBQUM5RixRQUFBLGFBQWEsR0FBRyxrREFBa0QsQ0FBQztBQUNuRSxRQUFBLGVBQWUsR0FBRywwQkFBMEIsQ0FBQztBQUM3QyxRQUFBLG1CQUFtQixHQUFHLDhCQUE4QixDQUFDO0FBQ3JELFFBQUEsZ0JBQWdCLEdBQUcsQ0FBQyxtQ0FBbUMsR0FBRyxZQUFvQixDQUFBLENBQUMsS0FBSyxHQUFHLGFBQWEsR0FBSSxVQUFrQixDQUFDLEtBQUssR0FBRyw4RUFBOEUsQ0FBQztBQUNsTixRQUFBLGdCQUFnQixHQUFJLDJJQUFtSixDQUFDLEdBQUcsQ0FBQztBQUM1SyxRQUFBLG1CQUFtQixHQUFJLDJIQUFtSSxDQUFDLEdBQUcsQ0FBQztBQUMvSixRQUFBLGFBQWEsR0FBSSwrREFBdUUsQ0FBQyxHQUFHLENBQUM7QUFDN0YsUUFBQSxXQUFXLEdBQUcscURBQXFELENBQUM7QUFFL0UsMEJBQTBCO0FBQ2YsUUFBQSxvQkFBb0IsR0FBRyx1VkFBdVYsQ0FBQztBQUMvVyxRQUFBLHNCQUFzQixHQUFHLGtGQUFrRixDQUFDIn0=
package/dist/lib/melo.js CHANGED
@@ -122,4 +122,4 @@ class Melo {
122
122
  }
123
123
  exports.Melo = Melo;
124
124
  exports.melo = new Melo();
125
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWVsby5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL2xpYi9tZWxvLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTs7OztHQUlHOzs7QUFPSCwrQ0FBZ0U7QUFHaEUsa0VBQStEO0FBQy9ELDREQUF5RDtBQUN6RCw4REFBMkQ7QUFDM0QsNERBQXlEO0FBQ3pELG9EQUE4RDtBQUM5RCxvREFBOEQ7QUFHOUQsd0RBQThEO0FBQzlELHNEQUE0RDtBQUM1RCx3REFBOEQ7QUFDOUQsZ0RBQXNEO0FBQ3RELGtEQUF3RDtBQUN4RCxvREFBMEQ7QUFDMUQsOENBQW9EO0FBQ3BELDhEQUFvRTtBQUNwRSxnREFBc0Q7QUFDdEQsZ0RBQXNEO0FBQ3RELGtEQUF1RDtBQUd2RCxtREFBeUQ7QUFDekQsaURBQW9EO0FBQ3BELHVEQUEwRDtBQUMxRCxpREFBb0Q7QUFDcEQscURBQXdEO0FBQ3hELHVEQUEwRDtBQUMxRCxJQUFJLE9BQU8sR0FBRyxPQUFPLENBQUMsZUFBZSxDQUFDLENBQUM7QUFFdkMsMENBQWdEO0FBQ2hELGdFQUFzRTtBQUN0RSxrREFBd0Q7QUFDeEQ7Ozs7R0FJRztBQUVILE1BQWEsSUFBSTtJQTBFYjtRQXhFQTs7V0FFRztRQUVILFlBQU8sR0FBRyxPQUFPLENBQUMsT0FBTyxDQUFDO1FBRTFCOztXQUVHO1FBQ0gsV0FBTSxHQUFHLGdCQUFNLENBQUM7UUFFaEI7O1dBRUc7UUFDSCxlQUFVLEdBQ1Y7WUFDSSxjQUFjLEVBQUcsd0NBQXVCO1lBQ3hDLE9BQU8sRUFBRywwQkFBZ0I7WUFDMUIsVUFBVSxFQUFHLGdDQUFtQjtZQUNoQyxTQUFTLEVBQUcsOEJBQWtCO1lBQzlCLFVBQVUsRUFBRyxnQ0FBbUI7WUFDaEMsTUFBTSxFQUFHLHdCQUFlO1lBQ3hCLE9BQU8sRUFBRywwQkFBZ0I7WUFDMUIsUUFBUSxFQUFHLDRCQUFpQjtZQUM1QixLQUFLLEVBQUcsc0JBQWM7WUFDdEIsYUFBYSxFQUFHLHNDQUFzQjtZQUN0QyxNQUFNLEVBQUcsd0JBQWU7WUFDeEIsTUFBTSxFQUFHLHdCQUFlO1lBQ3hCLE9BQU8sRUFBRywwQkFBZ0I7U0FDN0IsQ0FBQztRQUVGOztXQUVHO1FBQ0gsWUFBTyxHQUNQO1lBQ0ksTUFBTSxFQUFHLHFCQUFZO1lBQ3JCLElBQUksRUFBRyxpQkFBVTtZQUNqQixPQUFPLEVBQUcsdUJBQWE7WUFDdkIsT0FBTyxFQUFHLHVCQUFhO1NBQzFCLENBQUM7UUFFRjs7V0FFRztRQUNILGVBQVUsR0FDVDtZQUNHLE1BQU0sRUFBRyxxQkFBWTtZQUNyQixPQUFPLEVBQUcsMEJBQWdCO1NBQzdCLENBQUM7UUFHRjs7V0FFRztRQUNILGVBQVUsR0FDVDtZQUNHLFlBQVksRUFBRywyQkFBWTtZQUMzQixlQUFlLEVBQUcsaUNBQWU7WUFDakMsWUFBWSxFQUFHLDJCQUFZO1lBQzNCLGFBQWEsRUFBRyw2QkFBYTtTQUNoQyxDQUFDO1FBRUY7O1dBRUc7UUFDSCxtQkFBYyxHQUNkO1lBQ0ksTUFBTSxFQUFHLDRCQUFtQjtZQUM1QixNQUFNLEVBQUcsNEJBQW1CO1NBQy9CLENBQUM7SUFHRixDQUFDO0lBRUQ7Ozs7OztPQU1HO0lBQ0gsU0FBUyxDQUFDLElBQTBCO1FBQ2hDLElBQUksR0FBRyxHQUFHLElBQUkseUJBQVcsRUFBRSxDQUFDO1FBQzVCLEdBQUcsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDZixJQUFJLENBQUMsSUFBSSxHQUFHLEdBQUcsQ0FBQztRQUNoQixPQUFPLEdBQUcsQ0FBQztJQUNmLENBQUM7SUFFRDs7T0FFRztJQUNILElBQUksR0FBRztRQUNILE9BQU8sSUFBSSxDQUFDLElBQUksQ0FBQztJQUNyQixDQUFDO0NBQ0o7QUFqR0Qsb0JBaUdDO0FBRVUsUUFBQSxJQUFJLEdBQUcsSUFBSSxJQUFJLEVBQUUsQ0FBQyJ9
125
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWVsby5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL2xpYi9tZWxvLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTs7OztHQUlHOzs7QUFPSCwrQ0FBZ0U7QUFFaEUsa0VBQStEO0FBQy9ELDREQUF5RDtBQUN6RCw4REFBMkQ7QUFDM0QsNERBQXlEO0FBQ3pELG9EQUE4RDtBQUM5RCxvREFBOEQ7QUFHOUQsd0RBQThEO0FBQzlELHNEQUE0RDtBQUM1RCx3REFBOEQ7QUFDOUQsZ0RBQXNEO0FBQ3RELGtEQUF3RDtBQUN4RCxvREFBMEQ7QUFDMUQsOENBQW9EO0FBQ3BELDhEQUFvRTtBQUNwRSxnREFBc0Q7QUFDdEQsZ0RBQXNEO0FBQ3RELGtEQUF1RDtBQUd2RCxtREFBeUQ7QUFDekQsaURBQW9EO0FBQ3BELHVEQUEwRDtBQUMxRCxpREFBb0Q7QUFDcEQscURBQXdEO0FBQ3hELHVEQUEwRDtBQUMxRCxJQUFJLE9BQU8sR0FBRyxPQUFPLENBQUMsZUFBZSxDQUFDLENBQUM7QUFFdkMsMENBQWdEO0FBQ2hELGdFQUFzRTtBQUN0RSxrREFBd0Q7QUFDeEQ7Ozs7R0FJRztBQUVILE1BQWEsSUFBSTtJQTBFYjtRQXhFQTs7V0FFRztRQUVILFlBQU8sR0FBRyxPQUFPLENBQUMsT0FBTyxDQUFDO1FBRTFCOztXQUVHO1FBQ0gsV0FBTSxHQUFHLGdCQUFNLENBQUM7UUFFaEI7O1dBRUc7UUFDSCxlQUFVLEdBQ1Y7WUFDSSxjQUFjLEVBQUcsd0NBQXVCO1lBQ3hDLE9BQU8sRUFBRywwQkFBZ0I7WUFDMUIsVUFBVSxFQUFHLGdDQUFtQjtZQUNoQyxTQUFTLEVBQUcsOEJBQWtCO1lBQzlCLFVBQVUsRUFBRyxnQ0FBbUI7WUFDaEMsTUFBTSxFQUFHLHdCQUFlO1lBQ3hCLE9BQU8sRUFBRywwQkFBZ0I7WUFDMUIsUUFBUSxFQUFHLDRCQUFpQjtZQUM1QixLQUFLLEVBQUcsc0JBQWM7WUFDdEIsYUFBYSxFQUFHLHNDQUFzQjtZQUN0QyxNQUFNLEVBQUcsd0JBQWU7WUFDeEIsTUFBTSxFQUFHLHdCQUFlO1lBQ3hCLE9BQU8sRUFBRywwQkFBZ0I7U0FDN0IsQ0FBQztRQUVGOztXQUVHO1FBQ0gsWUFBTyxHQUNQO1lBQ0ksTUFBTSxFQUFHLHFCQUFZO1lBQ3JCLElBQUksRUFBRyxpQkFBVTtZQUNqQixPQUFPLEVBQUcsdUJBQWE7WUFDdkIsT0FBTyxFQUFHLHVCQUFhO1NBQzFCLENBQUM7UUFFRjs7V0FFRztRQUNILGVBQVUsR0FDVDtZQUNHLE1BQU0sRUFBRyxxQkFBWTtZQUNyQixPQUFPLEVBQUcsMEJBQWdCO1NBQzdCLENBQUM7UUFHRjs7V0FFRztRQUNILGVBQVUsR0FDVDtZQUNHLFlBQVksRUFBRywyQkFBWTtZQUMzQixlQUFlLEVBQUcsaUNBQWU7WUFDakMsWUFBWSxFQUFHLDJCQUFZO1lBQzNCLGFBQWEsRUFBRyw2QkFBYTtTQUNoQyxDQUFDO1FBRUY7O1dBRUc7UUFDSCxtQkFBYyxHQUNkO1lBQ0ksTUFBTSxFQUFHLDRCQUFtQjtZQUM1QixNQUFNLEVBQUcsNEJBQW1CO1NBQy9CLENBQUM7SUFHRixDQUFDO0lBRUQ7Ozs7OztPQU1HO0lBQ0gsU0FBUyxDQUFDLElBQTBCO1FBQ2hDLElBQUksR0FBRyxHQUFHLElBQUkseUJBQVcsRUFBRSxDQUFDO1FBQzVCLEdBQUcsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDZixJQUFJLENBQUMsSUFBSSxHQUFHLEdBQUcsQ0FBQztRQUNoQixPQUFPLEdBQUcsQ0FBQztJQUNmLENBQUM7SUFFRDs7T0FFRztJQUNILElBQUksR0FBRztRQUNILE9BQU8sSUFBSSxDQUFDLElBQUksQ0FBQztJQUNyQixDQUFDO0NBQ0o7QUFqR0Qsb0JBaUdDO0FBRVUsUUFBQSxJQUFJLEdBQUcsSUFBSSxJQUFJLEVBQUUsQ0FBQyJ9
package/lib/melo.ts CHANGED
@@ -10,7 +10,6 @@
10
10
  import * as fs from 'fs';
11
11
  import * as path from 'path';
12
12
  import { Application, ApplicationOptions } from './application';
13
- import { isFunction } from 'util';
14
13
  import { BackendSession } from './common/service/backendSessionService';
15
14
  import { HybridConnector } from './connectors/hybridconnector';
16
15
  import { UDPConnector } from './connectors/udpconnector';
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@bigtyphoon/melo",
3
- "version": "1.7.6",
3
+ "version": "1.8.1",
4
4
  "private": false,
5
5
  "homepage": "https://github.com/node-melo/melo",
6
6
  "repository": {
@@ -89,5 +89,5 @@
89
89
  "publishConfig": {
90
90
  "access": "public"
91
91
  },
92
- "gitHead": "87c4ea8724fa27baf22c0a669a7d89ef6f426af4"
92
+ "gitHead": "7dfd3ca78ed6b051e34da595269efb623cd58d1b"
93
93
  }