@git.zone/cli 1.17.5 → 1.18.0

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.
@@ -3,7 +3,7 @@
3
3
  */
4
4
  export const commitinfo = {
5
5
  name: '@git.zone/cli',
6
- version: '1.17.5',
6
+ version: '1.18.0',
7
7
  description: 'A comprehensive CLI tool for enhancing and managing local development workflows with gitzone utilities, focusing on project setup, version control, code formatting, and template management.'
8
8
  };
9
9
  //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSxlQUFlO0lBQ3JCLE9BQU8sRUFBRSxRQUFRO0lBQ2pCLFdBQVcsRUFBRSwrTEFBK0w7Q0FDN00sQ0FBQSJ9
@@ -65,4 +65,10 @@ export declare class DockerContainer {
65
65
  * Get container information
66
66
  */
67
67
  inspect(containerName: string): Promise<any>;
68
+ /**
69
+ * Get port mappings for a container
70
+ */
71
+ getPortMappings(containerName: string): Promise<{
72
+ [key: string]: string;
73
+ } | null>;
68
74
  }
@@ -180,7 +180,7 @@ export class DockerContainer {
180
180
  */
181
181
  async inspect(containerName) {
182
182
  try {
183
- const result = await this.smartshell.exec(`docker inspect ${containerName}`);
183
+ const result = await this.smartshell.exec(`docker inspect ${containerName} 2>/dev/null`);
184
184
  if (result.exitCode === 0) {
185
185
  return JSON.parse(result.stdout);
186
186
  }
@@ -190,5 +190,36 @@ export class DockerContainer {
190
190
  return null;
191
191
  }
192
192
  }
193
+ /**
194
+ * Get port mappings for a container
195
+ */
196
+ async getPortMappings(containerName) {
197
+ try {
198
+ // Use docker inspect without format to get full JSON, then extract PortBindings
199
+ const result = await this.smartshell.exec(`docker inspect ${containerName} 2>/dev/null`);
200
+ if (result.exitCode === 0 && result.stdout) {
201
+ const inspectData = JSON.parse(result.stdout);
202
+ if (inspectData && inspectData[0] && inspectData[0].HostConfig && inspectData[0].HostConfig.PortBindings) {
203
+ const portBindings = inspectData[0].HostConfig.PortBindings;
204
+ const mappings = {};
205
+ // Convert Docker's port binding format to simple host:container mapping
206
+ for (const [containerPort, hostBindings] of Object.entries(portBindings)) {
207
+ if (Array.isArray(hostBindings) && hostBindings.length > 0) {
208
+ const hostPort = hostBindings[0].HostPort;
209
+ if (hostPort) {
210
+ mappings[containerPort.replace('/tcp', '').replace('/udp', '')] = hostPort;
211
+ }
212
+ }
213
+ }
214
+ return mappings;
215
+ }
216
+ }
217
+ return null;
218
+ }
219
+ catch (error) {
220
+ // Silently fail - container might not exist
221
+ return null;
222
+ }
223
+ }
193
224
  }
194
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xhc3Nlcy5kb2NrZXJjb250YWluZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi90cy9tb2Rfc2VydmljZXMvY2xhc3Nlcy5kb2NrZXJjb250YWluZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLE9BQU8sTUFBTSxrQkFBa0IsQ0FBQztBQUM1QyxPQUFPLEtBQUssT0FBTyxNQUFNLGNBQWMsQ0FBQztBQUN4QyxPQUFPLEVBQUUsTUFBTSxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFjL0MsTUFBTSxPQUFPLGVBQWU7SUFHMUI7UUFDRSxJQUFJLENBQUMsVUFBVSxHQUFHLElBQUksT0FBTyxDQUFDLFVBQVUsQ0FBQyxVQUFVLENBQUM7WUFDbEQsUUFBUSxFQUFFLE1BQU07U0FDakIsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztJQUVEOztPQUVHO0lBQ0ksS0FBSyxDQUFDLFdBQVc7UUFDdEIsSUFBSSxDQUFDO1lBQ0gsTUFBTSxNQUFNLEdBQUcsTUFBTSxJQUFJLENBQUMsVUFBVSxDQUFDLElBQUksQ0FBQyxrQkFBa0IsQ0FBQyxDQUFDO1lBQzlELE9BQU8sTUFBTSxDQUFDLFFBQVEsS0FBSyxDQUFDLENBQUM7UUFDL0IsQ0FBQztRQUFDLE9BQU8sS0FBSyxFQUFFLENBQUM7WUFDZixPQUFPLEtBQUssQ0FBQztRQUNmLENBQUM7SUFDSCxDQUFDO0lBRUQ7O09BRUc7SUFDSSxLQUFLLENBQUMsU0FBUyxDQUFDLGFBQXFCO1FBQzFDLElBQUksQ0FBQztZQUNILG1CQUFtQjtZQUNuQixNQUFNLGFBQWEsR0FBRyxNQUFNLElBQUksQ0FBQyxVQUFVLENBQUMsSUFBSSxDQUM5QywrQ0FBK0MsYUFBYSxJQUFJLENBQ2pFLENBQUM7WUFFRixJQUFJLGFBQWEsQ0FBQyxRQUFRLEtBQUssQ0FBQyxFQUFFLENBQUM7Z0JBQ2pDLE9BQU8sU0FBUyxDQUFDO1lBQ25CLENBQUM7WUFFRCw4QkFBOEI7WUFDOUIsTUFBTSxZQUFZLEdB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
225
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.dockercontainer.js","sourceRoot":"","sources":["../../ts/mod_services/classes.dockercontainer.ts"],"names":[],"mappings":"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"}
@@ -18,6 +18,7 @@ export interface IServiceConfig {
18
18
  export declare class ServiceConfiguration {
19
19
  private configPath;
20
20
  private config;
21
+ private docker;
21
22
  constructor();
22
23
  /**
23
24
  * Load or create the configuration
@@ -69,4 +70,16 @@ export declare class ServiceConfiguration {
69
70
  mongo: string;
70
71
  minio: string;
71
72
  };
73
+ /**
74
+ * Sync port configuration from existing Docker containers
75
+ */
76
+ private syncPortsFromDocker;
77
+ /**
78
+ * Validate and update ports if they're not available
79
+ */
80
+ validateAndUpdatePorts(): Promise<boolean>;
81
+ /**
82
+ * Force reconfigure all ports with new available ones
83
+ */
84
+ reconfigurePorts(): Promise<void>;
72
85
  }
@@ -1,9 +1,11 @@
1
1
  import * as plugins from './mod.plugins.js';
2
2
  import * as helpers from './helpers.js';
3
3
  import { logger } from '../gitzone.logging.js';
4
+ import { DockerContainer } from './classes.dockercontainer.js';
4
5
  export class ServiceConfiguration {
5
6
  constructor() {
6
7
  this.configPath = plugins.path.join(process.cwd(), '.nogit', 'env.json');
8
+ this.docker = new DockerContainer();
7
9
  }
8
10
  /**
9
11
  * Load or create the configuration
@@ -17,6 +19,8 @@ export class ServiceConfiguration {
17
19
  else {
18
20
  await this.createDefaultConfig();
19
21
  }
22
+ // Sync ports from existing Docker containers if they exist
23
+ await this.syncPortsFromDocker();
20
24
  return this.config;
21
25
  }
22
26
  /**
@@ -221,5 +225,127 @@ export class ServiceConfiguration {
221
225
  minio: plugins.path.join(process.cwd(), '.nogit', 'miniodata')
222
226
  };
223
227
  }
228
+ /**
229
+ * Sync port configuration from existing Docker containers
230
+ */
231
+ async syncPortsFromDocker() {
232
+ const containers = this.getContainerNames();
233
+ let updated = false;
234
+ // Check MongoDB container
235
+ const mongoStatus = await this.docker.getStatus(containers.mongo);
236
+ if (mongoStatus !== 'not_exists') {
237
+ const portMappings = await this.docker.getPortMappings(containers.mongo);
238
+ if (portMappings && portMappings['27017']) {
239
+ const dockerPort = portMappings['27017'];
240
+ if (this.config.MONGODB_PORT !== dockerPort) {
241
+ this.config.MONGODB_PORT = dockerPort;
242
+ updated = true;
243
+ }
244
+ }
245
+ }
246
+ // Check MinIO container
247
+ const minioStatus = await this.docker.getStatus(containers.minio);
248
+ if (minioStatus !== 'not_exists') {
249
+ const portMappings = await this.docker.getPortMappings(containers.minio);
250
+ if (portMappings) {
251
+ if (portMappings['9000']) {
252
+ const dockerPort = portMappings['9000'];
253
+ if (this.config.S3_PORT !== dockerPort) {
254
+ this.config.S3_PORT = dockerPort;
255
+ updated = true;
256
+ }
257
+ }
258
+ if (portMappings['9001']) {
259
+ const dockerPort = portMappings['9001'];
260
+ if (this.config.S3_CONSOLE_PORT !== dockerPort) {
261
+ this.config.S3_CONSOLE_PORT = dockerPort;
262
+ updated = true;
263
+ }
264
+ }
265
+ }
266
+ }
267
+ if (updated) {
268
+ // Update derived fields
269
+ this.config.MONGODB_URL = `mongodb://${this.config.MONGODB_USER}:${this.config.MONGODB_PASS}@${this.config.MONGODB_HOST}:${this.config.MONGODB_PORT}/${this.config.MONGODB_NAME}?authSource=admin`;
270
+ const protocol = this.config.S3_USESSL ? 'https' : 'http';
271
+ this.config.S3_ENDPOINT = `${protocol}://${this.config.S3_HOST}:${this.config.S3_PORT}`;
272
+ await this.saveConfig();
273
+ }
274
+ }
275
+ /**
276
+ * Validate and update ports if they're not available
277
+ */
278
+ async validateAndUpdatePorts() {
279
+ let updated = false;
280
+ const containers = this.getContainerNames();
281
+ // Check if containers exist - if they do, ports are fine
282
+ const mongoExists = await this.docker.exists(containers.mongo);
283
+ const minioExists = await this.docker.exists(containers.minio);
284
+ // Only check port availability if containers don't exist
285
+ if (!mongoExists) {
286
+ const mongoPort = parseInt(this.config.MONGODB_PORT);
287
+ if (!(await helpers.isPortAvailable(mongoPort))) {
288
+ logger.log('note', `⚠️ MongoDB port ${mongoPort} is in use, finding new port...`);
289
+ const newPort = await helpers.getRandomAvailablePort();
290
+ this.config.MONGODB_PORT = newPort.toString();
291
+ logger.log('ok', `✅ New MongoDB port: ${newPort}`);
292
+ updated = true;
293
+ }
294
+ }
295
+ if (!minioExists) {
296
+ const s3Port = parseInt(this.config.S3_PORT);
297
+ const s3ConsolePort = parseInt(this.config.S3_CONSOLE_PORT);
298
+ if (!(await helpers.isPortAvailable(s3Port))) {
299
+ logger.log('note', `⚠️ S3 API port ${s3Port} is in use, finding new port...`);
300
+ const newPort = await helpers.getRandomAvailablePort();
301
+ this.config.S3_PORT = newPort.toString();
302
+ logger.log('ok', `✅ New S3 API port: ${newPort}`);
303
+ updated = true;
304
+ }
305
+ if (!(await helpers.isPortAvailable(s3ConsolePort))) {
306
+ logger.log('note', `⚠️ S3 Console port ${s3ConsolePort} is in use, finding new port...`);
307
+ let newPort = parseInt(this.config.S3_PORT) + 1;
308
+ while (!(await helpers.isPortAvailable(newPort))) {
309
+ newPort++;
310
+ }
311
+ this.config.S3_CONSOLE_PORT = newPort.toString();
312
+ logger.log('ok', `✅ New S3 Console port: ${newPort}`);
313
+ updated = true;
314
+ }
315
+ }
316
+ if (updated) {
317
+ // Update derived fields
318
+ this.config.MONGODB_URL = `mongodb://${this.config.MONGODB_USER}:${this.config.MONGODB_PASS}@${this.config.MONGODB_HOST}:${this.config.MONGODB_PORT}/${this.config.MONGODB_NAME}?authSource=admin`;
319
+ const protocol = this.config.S3_USESSL ? 'https' : 'http';
320
+ this.config.S3_ENDPOINT = `${protocol}://${this.config.S3_HOST}:${this.config.S3_PORT}`;
321
+ await this.saveConfig();
322
+ }
323
+ return updated;
324
+ }
325
+ /**
326
+ * Force reconfigure all ports with new available ones
327
+ */
328
+ async reconfigurePorts() {
329
+ logger.log('note', '🔄 Finding new available ports...');
330
+ const mongoPort = await helpers.getRandomAvailablePort();
331
+ const s3Port = await helpers.getRandomAvailablePort();
332
+ let s3ConsolePort = s3Port + 1;
333
+ // Ensure console port is also available
334
+ while (!(await helpers.isPortAvailable(s3ConsolePort))) {
335
+ s3ConsolePort++;
336
+ }
337
+ this.config.MONGODB_PORT = mongoPort.toString();
338
+ this.config.S3_PORT = s3Port.toString();
339
+ this.config.S3_CONSOLE_PORT = s3ConsolePort.toString();
340
+ // Update derived fields
341
+ this.config.MONGODB_URL = `mongodb://${this.config.MONGODB_USER}:${this.config.MONGODB_PASS}@${this.config.MONGODB_HOST}:${this.config.MONGODB_PORT}/${this.config.MONGODB_NAME}?authSource=admin`;
342
+ const protocol = this.config.S3_USESSL ? 'https' : 'http';
343
+ this.config.S3_ENDPOINT = `${protocol}://${this.config.S3_HOST}:${this.config.S3_PORT}`;
344
+ await this.saveConfig();
345
+ logger.log('ok', '✅ New port configuration:');
346
+ logger.log('info', ` 📍 MongoDB: ${mongoPort}`);
347
+ logger.log('info', ` 📍 S3 API: ${s3Port}`);
348
+ logger.log('info', ` 📍 S3 Console: ${s3ConsolePort}`);
349
+ }
224
350
  }
225
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.serviceconfiguration.js","sourceRoot":"","sources":["../../ts/mod_services/classes.serviceconfiguration.ts"],"names":[],"mappings":"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"}
351
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.serviceconfiguration.js","sourceRoot":"","sources":["../../ts/mod_services/classes.serviceconfiguration.ts"],"names":[],"mappings":"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"}
@@ -46,4 +46,8 @@ export declare class ServiceManager {
46
46
  * Clean data directories
47
47
  */
48
48
  cleanData(): Promise<void>;
49
+ /**
50
+ * Reconfigure services with new ports
51
+ */
52
+ reconfigure(): Promise<void>;
49
53
  }
@@ -20,6 +20,8 @@ export class ServiceManager {
20
20
  // Load or create configuration
21
21
  await this.config.loadOrCreate();
22
22
  logger.log('info', `📋 Project: ${this.config.getConfig().PROJECT_NAME}`);
23
+ // Validate and update ports if needed
24
+ await this.config.validateAndUpdatePorts();
23
25
  }
24
26
  /**
25
27
  * Start MongoDB service
@@ -37,11 +39,44 @@ export class ServiceManager {
37
39
  logger.log('ok', ' Already running ✓');
38
40
  break;
39
41
  case 'stopped':
40
- if (await this.docker.start(containers.mongo)) {
41
- logger.log('ok', ' Started ✓');
42
+ // Check if port mapping matches config
43
+ const mongoPortMappings = await this.docker.getPortMappings(containers.mongo);
44
+ if (mongoPortMappings && mongoPortMappings['27017'] !== config.MONGODB_PORT) {
45
+ logger.log('note', ' Port configuration changed, recreating container...');
46
+ await this.docker.remove(containers.mongo, true);
47
+ // Fall through to create new container
48
+ const success = await this.docker.run({
49
+ name: containers.mongo,
50
+ image: 'mongo:7.0',
51
+ ports: {
52
+ [`0.0.0.0:${config.MONGODB_PORT}`]: '27017'
53
+ },
54
+ volumes: {
55
+ [directories.mongo]: '/data/db'
56
+ },
57
+ environment: {
58
+ MONGO_INITDB_ROOT_USERNAME: config.MONGODB_USER,
59
+ MONGO_INITDB_ROOT_PASSWORD: config.MONGODB_PASS,
60
+ MONGO_INITDB_DATABASE: config.MONGODB_NAME
61
+ },
62
+ restart: 'unless-stopped',
63
+ command: '--bind_ip_all'
64
+ });
65
+ if (success) {
66
+ logger.log('ok', ' Recreated with new port ✓');
67
+ }
68
+ else {
69
+ logger.log('error', ' Failed to recreate container');
70
+ }
42
71
  }
43
72
  else {
44
- logger.log('error', ' Failed to start');
73
+ // Ports match, just start the container
74
+ if (await this.docker.start(containers.mongo)) {
75
+ logger.log('ok', ' Started ✓');
76
+ }
77
+ else {
78
+ logger.log('error', ' Failed to start');
79
+ }
45
80
  }
46
81
  break;
47
82
  case 'not_exists':
@@ -95,11 +130,52 @@ export class ServiceManager {
95
130
  logger.log('ok', ' Already running ✓');
96
131
  break;
97
132
  case 'stopped':
98
- if (await this.docker.start(containers.minio)) {
99
- logger.log('ok', ' Started ✓');
133
+ // Check if port mapping matches config
134
+ const minioPortMappings = await this.docker.getPortMappings(containers.minio);
135
+ if (minioPortMappings &&
136
+ (minioPortMappings['9000'] !== config.S3_PORT ||
137
+ minioPortMappings['9001'] !== config.S3_CONSOLE_PORT)) {
138
+ logger.log('note', ' Port configuration changed, recreating container...');
139
+ await this.docker.remove(containers.minio, true);
140
+ // Fall through to create new container
141
+ const success = await this.docker.run({
142
+ name: containers.minio,
143
+ image: 'minio/minio',
144
+ ports: {
145
+ [config.S3_PORT]: '9000',
146
+ [config.S3_CONSOLE_PORT]: '9001'
147
+ },
148
+ volumes: {
149
+ [directories.minio]: '/data'
150
+ },
151
+ environment: {
152
+ MINIO_ROOT_USER: config.S3_ACCESSKEY,
153
+ MINIO_ROOT_PASSWORD: config.S3_SECRETKEY
154
+ },
155
+ restart: 'unless-stopped',
156
+ command: 'server /data --console-address ":9001"'
157
+ });
158
+ if (success) {
159
+ logger.log('ok', ' Recreated with new ports ✓');
160
+ // Wait for MinIO to be ready
161
+ await plugins.smartdelay.delayFor(3000);
162
+ // Create default bucket
163
+ await this.docker.exec(containers.minio, `mc alias set local http://localhost:9000 ${config.S3_ACCESSKEY} ${config.S3_SECRETKEY}`);
164
+ await this.docker.exec(containers.minio, `mc mb local/${config.S3_BUCKET}`);
165
+ logger.log('ok', ` Bucket '${config.S3_BUCKET}' created ✓`);
166
+ }
167
+ else {
168
+ logger.log('error', ' Failed to recreate container');
169
+ }
100
170
  }
101
171
  else {
102
- logger.log('error', ' Failed to start');
172
+ // Ports match, just start the container
173
+ if (await this.docker.start(containers.minio)) {
174
+ logger.log('ok', ' Started ✓');
175
+ }
176
+ else {
177
+ logger.log('error', ' Failed to start');
178
+ }
103
179
  }
104
180
  break;
105
181
  case 'not_exists':
@@ -194,6 +270,7 @@ export class ServiceManager {
194
270
  case 'running':
195
271
  logger.log('ok', '📦 MongoDB: 🟢 Running');
196
272
  logger.log('info', ` ├─ Container: ${containers.mongo}`);
273
+ logger.log('info', ` ├─ Port: ${config.MONGODB_PORT}`);
197
274
  logger.log('info', ` ├─ Connection: ${this.config.getMongoConnectionString()}`);
198
275
  // Show Compass connection string
199
276
  const networkIp = await helpers.getLocalNetworkIp();
@@ -202,10 +279,20 @@ export class ServiceManager {
202
279
  break;
203
280
  case 'stopped':
204
281
  logger.log('note', '📦 MongoDB: 🟡 Stopped');
205
- logger.log('info', ` └─ Container: ${containers.mongo}`);
282
+ logger.log('info', ` ├─ Container: ${containers.mongo}`);
283
+ logger.log('info', ` └─ Port: ${config.MONGODB_PORT}`);
206
284
  break;
207
285
  case 'not_exists':
208
286
  logger.log('info', '📦 MongoDB: ⚪ Not installed');
287
+ // Check port availability
288
+ const mongoPort = parseInt(config.MONGODB_PORT);
289
+ const mongoAvailable = await helpers.isPortAvailable(mongoPort);
290
+ if (!mongoAvailable) {
291
+ logger.log('error', ` └─ ⚠️ Port ${mongoPort} is in use by another process`);
292
+ }
293
+ else {
294
+ logger.log('info', ` └─ Port ${mongoPort} is available`);
295
+ }
209
296
  break;
210
297
  }
211
298
  // MinIO status
@@ -220,10 +307,35 @@ export class ServiceManager {
220
307
  break;
221
308
  case 'stopped':
222
309
  logger.log('note', '📦 S3/MinIO: 🟡 Stopped');
223
- logger.log('info', ` └─ Container: ${containers.minio}`);
310
+ logger.log('info', ` ├─ Container: ${containers.minio}`);
311
+ logger.log('info', ` ├─ API Port: ${config.S3_PORT}`);
312
+ logger.log('info', ` └─ Console Port: ${config.S3_CONSOLE_PORT}`);
224
313
  break;
225
314
  case 'not_exists':
226
315
  logger.log('info', '📦 S3/MinIO: ⚪ Not installed');
316
+ // Check port availability
317
+ const s3Port = parseInt(config.S3_PORT);
318
+ const s3ConsolePort = parseInt(config.S3_CONSOLE_PORT);
319
+ const s3Available = await helpers.isPortAvailable(s3Port);
320
+ const consoleAvailable = await helpers.isPortAvailable(s3ConsolePort);
321
+ if (!s3Available || !consoleAvailable) {
322
+ if (!s3Available) {
323
+ logger.log('error', ` ├─ ⚠️ API Port ${s3Port} is in use`);
324
+ }
325
+ else {
326
+ logger.log('info', ` ├─ API Port ${s3Port} is available`);
327
+ }
328
+ if (!consoleAvailable) {
329
+ logger.log('error', ` └─ ⚠️ Console Port ${s3ConsolePort} is in use`);
330
+ }
331
+ else {
332
+ logger.log('info', ` └─ Console Port ${s3ConsolePort} is available`);
333
+ }
334
+ }
335
+ else {
336
+ logger.log('info', ` ├─ API Port ${s3Port} is available`);
337
+ logger.log('info', ` └─ Console Port ${s3ConsolePort} is available`);
338
+ }
227
339
  break;
228
340
  }
229
341
  }
@@ -361,5 +473,37 @@ export class ServiceManager {
361
473
  logger.log('note', ' No data to clean');
362
474
  }
363
475
  }
476
+ /**
477
+ * Reconfigure services with new ports
478
+ */
479
+ async reconfigure() {
480
+ helpers.printHeader('Reconfiguring Services');
481
+ const containers = this.config.getContainerNames();
482
+ // Stop existing containers
483
+ logger.log('note', '🛑 Stopping existing containers...');
484
+ if (await this.docker.exists(containers.mongo)) {
485
+ await this.docker.stop(containers.mongo);
486
+ logger.log('ok', ' MongoDB stopped ✓');
487
+ }
488
+ if (await this.docker.exists(containers.minio)) {
489
+ await this.docker.stop(containers.minio);
490
+ logger.log('ok', ' S3/MinIO stopped ✓');
491
+ }
492
+ // Reconfigure ports
493
+ await this.config.reconfigurePorts();
494
+ // Ask if user wants to restart services
495
+ const smartinteract = new plugins.smartinteract.SmartInteract();
496
+ const response = await smartinteract.askQuestion({
497
+ name: 'restart',
498
+ type: 'confirm',
499
+ message: 'Do you want to start services with new ports?',
500
+ default: true
501
+ });
502
+ if (response.value) {
503
+ console.log();
504
+ await this.startMongoDB();
505
+ await this.startMinIO();
506
+ }
507
+ }
364
508
  }
365
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.servicemanager.js","sourceRoot":"","sources":["../../ts/mod_services/classes.servicemanager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,kBAAkB,CAAC;AAC5C,OAAO,KAAK,OAAO,MAAM,cAAc,CAAC;AACxC,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAC/D,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAE/C,MAAM,OAAO,cAAc;IAIzB;QACE,IAAI,CAAC,MAAM,GAAG,IAAI,oBAAoB,EAAE,CAAC;QACzC,IAAI,CAAC,MAAM,GAAG,IAAI,eAAe,EAAE,CAAC;IACtC,CAAC;IAED;;OAEG;IACI,KAAK,CAAC,IAAI;QACf,4BAA4B;QAC5B,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,EAAE,CAAC;YACvC,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,8DAA8D,CAAC,CAAC;YACpF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;QAED,+BAA+B;QAC/B,MAAM,IAAI,CAAC,MAAM,CAAC,YAAY,EAAE,CAAC;QACjC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,eAAe,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC,YAAY,EAAE,CAAC,CAAC;IAC5E,CAAC;IAED;;OAEG;IACI,KAAK,CAAC,YAAY;QACvB,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;QAElC,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC;QACvC,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,iBAAiB,EAAE,CAAC;QACnD,MAAM,WAAW,GAAG,IAAI,CAAC,MAAM,CAAC,kBAAkB,EAAE,CAAC;QAErD,+BAA+B;QAC/B,MAAM,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC,SAAS,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QAExD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;QAE7D,QAAQ,MAAM,EAAE,CAAC;YACf,KAAK,SAAS;gBACZ,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,qBAAqB,CAAC,CAAC;gBACxC,MAAM;YAER,KAAK,SAAS;gBACZ,IAAI,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC;oBAC9C,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;gBAClC,CAAC;qBAAM,CAAC;oBACN,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,mBAAmB,CAAC,CAAC;gBAC3C,CAAC;gBACD,MAAM;YAER,KAAK,YAAY;gBACf,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,yBAAyB,CAAC,CAAC;gBAE9C,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC;oBACpC,IAAI,EAAE,UAAU,CAAC,KAAK;oBACtB,KAAK,EAAE,WAAW;oBAClB,KAAK,EAAE;wBACL,CAAC,WAAW,MAAM,CAAC,YAAY,EAAE,CAAC,EAAE,OAAO;qBAC5C;oBACD,OAAO,EAAE;wBACP,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE,UAAU;qBAChC;oBACD,WAAW,EAAE;wBACX,0BAA0B,EAAE,MAAM,CAAC,YAAY;wBAC/C,0BAA0B,EAAE,MAAM,CAAC,YAAY;wBAC/C,qBAAqB,EAAE,MAAM,CAAC,YAAY;qBAC3C;oBACD,OAAO,EAAE,gBAAgB;oBACzB,OAAO,EAAE,eAAe;iBACzB,CAAC,CAAC;gBAEH,IAAI,OAAO,EAAE,CAAC;oBACZ,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,yBAAyB,CAAC,CAAC;gBAC9C,CAAC;qBAAM,CAAC;oBACN,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,8BAA8B,CAAC,CAAC;gBACtD,CAAC;gBACD,MAAM;QACV,CAAC;QAED,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,gBAAgB,UAAU,CAAC,KAAK,EAAE,CAAC,CAAC;QACvD,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,WAAW,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC;QACrD,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,iBAAiB,IAAI,CAAC,MAAM,CAAC,wBAAwB,EAAE,EAAE,CAAC,CAAC;QAE9E,iCAAiC;QACjC,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,iBAAiB,EAAE,CAAC;QACpD,MAAM,aAAa,GAAG,aAAa,MAAM,CAAC,YAAY,IAAI,MAAM,CAAC,YAAY,IAAI,SAAS,IAAI,MAAM,CAAC,YAAY,IAAI,MAAM,CAAC,YAAY,mBAAmB,CAAC;QAC5J,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,cAAc,aAAa,EAAE,CAAC,CAAC;IAClD,CAAC;IAED;;OAEG;IACI,KAAK,CAAC,UAAU;QACrB,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;QAEnC,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC;QACvC,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,iBAAiB,EAAE,CAAC;QACnD,MAAM,WAAW,GAAG,IAAI,CAAC,MAAM,CAAC,kBAAkB,EAAE,CAAC;QAErD,+BAA+B;QAC/B,MAAM,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC,SAAS,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QAExD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;QAE7D,QAAQ,MAAM,EAAE,CAAC;YACf,KAAK,SAAS;gBACZ,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,qBAAqB,CAAC,CAAC;gBACxC,MAAM;YAER,KAAK,SAAS;gBACZ,IAAI,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC;oBAC9C,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;gBAClC,CAAC;qBAAM,CAAC;oBACN,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,mBAAmB,CAAC,CAAC;gBAC3C,CAAC;gBACD,MAAM;YAER,KAAK,YAAY;gBACf,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,yBAAyB,CAAC,CAAC;gBAE9C,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC;oBACpC,IAAI,EAAE,UAAU,CAAC,KAAK;oBACtB,KAAK,EAAE,aAAa;oBACpB,KAAK,EAAE;wBACL,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,MAAM;wBACxB,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE,MAAM;qBACjC;oBACD,OAAO,EAAE;wBACP,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE,OAAO;qBAC7B;oBACD,WAAW,EAAE;wBACX,eAAe,EAAE,MAAM,CAAC,YAAY;wBACpC,mBAAmB,EAAE,MAAM,CAAC,YAAY;qBACzC;oBACD,OAAO,EAAE,gBAAgB;oBACzB,OAAO,EAAE,wCAAwC;iBAClD,CAAC,CAAC;gBAEH,IAAI,OAAO,EAAE,CAAC;oBACZ,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,yBAAyB,CAAC,CAAC;oBAE5C,6BAA6B;oBAC7B,MAAM,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;oBAExC,wBAAwB;oBACxB,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CACpB,UAAU,CAAC,KAAK,EAChB,4CAA4C,MAAM,CAAC,YAAY,IAAI,MAAM,CAAC,YAAY,EAAE,CACzF,CAAC;oBAEF,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CACpB,UAAU,CAAC,KAAK,EAChB,eAAe,MAAM,CAAC,SAAS,EAAE,CAClC,CAAC;oBAEF,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,aAAa,MAAM,CAAC,SAAS,aAAa,CAAC,CAAC;gBAC/D,CAAC;qBAAM,CAAC;oBACN,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,8BAA8B,CAAC,CAAC;gBACtD,CAAC;gBACD,MAAM;QACV,CAAC;QAED,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,gBAAgB,UAAU,CAAC,KAAK,EAAE,CAAC,CAAC;QACvD,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,WAAW,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC;QAChD,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,aAAa,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC;QACpD,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,iBAAiB,MAAM,CAAC,OAAO,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC;QACxE,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,qBAAqB,MAAM,CAAC,OAAO,IAAI,MAAM,CAAC,eAAe,YAAY,MAAM,CAAC,YAAY,OAAO,CAAC,CAAC;IAC1H,CAAC;IAED;;OAEG;IACI,KAAK,CAAC,WAAW;QACtB,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;QAElC,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,iBAAiB,EAAE,CAAC;QACnD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;QAE7D,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;YACzB,IAAI,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC;gBAC7C,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;YAClC,CAAC;iBAAM,CAAC;gBACN,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,kBAAkB,CAAC,CAAC;YAC1C,CAAC;QACH,CAAC;aAAM,CAAC;YACN,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;QACtC,CAAC;IACH,CAAC;IAED;;OAEG;IACI,KAAK,CAAC,SAAS;QACpB,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;QAEnC,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,iBAAiB,EAAE,CAAC;QACnD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;QAE7D,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;YACzB,IAAI,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC;gBAC7C,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;YAClC,CAAC;iBAAM,CAAC;gBACN,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,kBAAkB,CAAC,CAAC;YAC1C,CAAC;QACH,CAAC;aAAM,CAAC;YACN,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;QACtC,CAAC;IACH,CAAC;IAED;;OAEG;IACI,KAAK,CAAC,UAAU;QACrB,OAAO,CAAC,WAAW,CAAC,gBAAgB,CAAC,CAAC;QAEtC,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC;QACvC,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,iBAAiB,EAAE,CAAC;QAEnD,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,YAAY,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC;QACtD,OAAO,CAAC,GAAG,EAAE,CAAC;QAEd,iBAAiB;QACjB,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;QAClE,QAAQ,WAAW,EAAE,CAAC;YACpB,KAAK,SAAS;gBACZ,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,wBAAwB,CAAC,CAAC;gBAC3C,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,oBAAoB,UAAU,CAAC,KAAK,EAAE,CAAC,CAAC;gBAC3D,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,qBAAqB,IAAI,CAAC,MAAM,CAAC,wBAAwB,EAAE,EAAE,CAAC,CAAC;gBAElF,iCAAiC;gBACjC,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,iBAAiB,EAAE,CAAC;gBACpD,MAAM,aAAa,GAAG,aAAa,MAAM,CAAC,YAAY,IAAI,MAAM,CAAC,YAAY,IAAI,SAAS,IAAI,MAAM,CAAC,YAAY,IAAI,MAAM,CAAC,YAAY,mBAAmB,CAAC;gBAC5J,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,kBAAkB,aAAa,EAAE,CAAC,CAAC;gBACpD,MAAM;YACR,KAAK,SAAS;gBACZ,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,wBAAwB,CAAC,CAAC;gBAC7C,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,oBAAoB,UAAU,CAAC,KAAK,EAAE,CAAC,CAAC;gBAC3D,MAAM;YACR,KAAK,YAAY;gBACf,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,6BAA6B,CAAC,CAAC;gBAClD,MAAM;QACV,CAAC;QAED,eAAe;QACf,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;QAClE,QAAQ,WAAW,EAAE,CAAC;YACpB,KAAK,SAAS;gBACZ,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,yBAAyB,CAAC,CAAC;gBAC5C,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,oBAAoB,UAAU,CAAC,KAAK,EAAE,CAAC,CAAC;gBAC3D,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,qBAAqB,MAAM,CAAC,OAAO,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC;gBAC5E,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,yBAAyB,MAAM,CAAC,OAAO,IAAI,MAAM,CAAC,eAAe,EAAE,CAAC,CAAC;gBACxF,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,iBAAiB,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC;gBACxD,MAAM;YACR,KAAK,SAAS;gBACZ,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,yBAAyB,CAAC,CAAC;gBAC9C,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,oBAAoB,UAAU,CAAC,KAAK,EAAE,CAAC,CAAC;gBAC3D,MAAM;YACR,KAAK,YAAY;gBACf,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,8BAA8B,CAAC,CAAC;gBACnD,MAAM;QACV,CAAC;IACH,CAAC;IAED;;OAEG;IACI,KAAK,CAAC,UAAU;QACrB,OAAO,CAAC,WAAW,CAAC,uBAAuB,CAAC,CAAC;QAE7C,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC;QAEvC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,YAAY,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC;QACtD,OAAO,CAAC,GAAG,EAAE,CAAC;QAEd,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;QAC/B,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,WAAW,MAAM,CAAC,YAAY,IAAI,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC;QAC5E,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,eAAe,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC;QACzD,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,WAAW,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC;QACrD,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC;QACtC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,gBAAgB,IAAI,CAAC,MAAM,CAAC,iBAAiB,EAAE,CAAC,KAAK,EAAE,CAAC,CAAC;QAC5E,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,WAAW,IAAI,CAAC,MAAM,CAAC,kBAAkB,EAAE,CAAC,KAAK,EAAE,CAAC,CAAC;QACxE,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,iBAAiB,IAAI,CAAC,MAAM,CAAC,wBAAwB,EAAE,EAAE,CAAC,CAAC;QAE9E,OAAO,CAAC,GAAG,EAAE,CAAC;QACd,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;QAChC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,WAAW,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC;QAChD,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,eAAe,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC;QACpD,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,mBAAmB,MAAM,CAAC,eAAe,EAAE,CAAC,CAAC;QAChE,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,iBAAiB,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC;QAC3D,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC;QACxC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,aAAa,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC;QACpD,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,cAAc,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC;QACrD,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,gBAAgB,IAAI,CAAC,MAAM,CAAC,iBAAiB,EAAE,CAAC,KAAK,EAAE,CAAC,CAAC;QAC5E,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,WAAW,IAAI,CAAC,MAAM,CAAC,kBAAkB,EAAE,CAAC,KAAK,EAAE,CAAC,CAAC;QACxE,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,eAAe,MAAM,CAAC,WAAW,EAAE,CAAC,CAAC;QACxD,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,yBAAyB,MAAM,CAAC,OAAO,IAAI,MAAM,CAAC,eAAe,EAAE,CAAC,CAAC;IAC1F,CAAC;IAED;;OAEG;IACI,KAAK,CAAC,qBAAqB;QAChC,OAAO,CAAC,WAAW,CAAC,4BAA4B,CAAC,CAAC;QAElD,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC;QACvC,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,iBAAiB,EAAE,CAAC;QAEpD,MAAM,gBAAgB,GAAG,aAAa,MAAM,CAAC,YAAY,IAAI,MAAM,CAAC,YAAY,IAAI,SAAS,IAAI,MAAM,CAAC,YAAY,IAAI,MAAM,CAAC,YAAY,mBAAmB,CAAC;QAE/J,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,wDAAwD,CAAC,CAAC;QAC7E,OAAO,CAAC,GAAG,EAAE,CAAC;QACd,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,mCAAmC,CAAC,CAAC;QACxD,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,6CAA6C,CAAC,CAAC;QAClE,OAAO,CAAC,GAAG,EAAE,CAAC;QACd,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,mDAAmD,CAAC,CAAC;QACxE,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,MAAM,gBAAgB,EAAE,CAAC,CAAC;QAC3C,OAAO,CAAC,GAAG,EAAE,CAAC;QACd,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,qBAAqB,CAAC,CAAC;QAC1C,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,iBAAiB,SAAS,EAAE,CAAC,CAAC;QACjD,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,WAAW,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC;QACrD,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,eAAe,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC;QACzD,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,eAAe,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC;QACzD,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,sBAAsB,CAAC,CAAC;IAC7C,CAAC;IAED;;OAEG;IACI,KAAK,CAAC,QAAQ,CAAC,OAAe,EAAE,QAAgB,EAAE;QACvD,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,iBAAiB,EAAE,CAAC;QAEnD,QAAQ,OAAO,EAAE,CAAC;YAChB,KAAK,OAAO,CAAC;YACb,KAAK,SAAS;gBACZ,IAAI,MAAM,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC;oBAClD,OAAO,CAAC,WAAW,CAAC,sBAAsB,KAAK,SAAS,CAAC,CAAC;oBAC1D,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;oBAC7D,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;gBACpB,CAAC;qBAAM,CAAC;oBACN,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,kCAAkC,CAAC,CAAC;gBACzD,CAAC;gBACD,MAAM;YAER,KAAK,OAAO,CAAC;YACb,KAAK,IAAI;gBACP,IAAI,MAAM,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC;oBAClD,OAAO,CAAC,WAAW,CAAC,uBAAuB,KAAK,SAAS,CAAC,CAAC;oBAC3D,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;oBAC7D,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;gBACpB,CAAC;qBAAM,CAAC;oBACN,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,mCAAmC,CAAC,CAAC;gBAC1D,CAAC;gBACD,MAAM;YAER,KAAK,KAAK,CAAC;YACX,KAAK,EAAE;gBACL,MAAM,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;gBACpC,OAAO,CAAC,GAAG,EAAE,CAAC;gBACd,MAAM,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;gBACpC,MAAM;YAER;gBACE,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,qDAAqD,CAAC,CAAC;gBAC1E,MAAM;QACV,CAAC;IACH,CAAC;IAED;;OAEG;IACI,KAAK,CAAC,gBAAgB;QAC3B,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,iBAAiB,EAAE,CAAC;QACnD,IAAI,OAAO,GAAG,KAAK,CAAC;QAEpB,IAAI,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC;YAC/C,IAAI,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,KAAK,EAAE,IAAI,CAAC,EAAE,CAAC;gBACrD,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,+BAA+B,CAAC,CAAC;gBAClD,OAAO,GAAG,IAAI,CAAC;YACjB,CAAC;QACH,CAAC;QAED,IAAI,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC;YAC/C,IAAI,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,KAAK,EAAE,IAAI,CAAC,EAAE,CAAC;gBACrD,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,gCAAgC,CAAC,CAAC;gBACnD,OAAO,GAAG,IAAI,CAAC;YACjB,CAAC;QACH,CAAC;QAED,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,2BAA2B,CAAC,CAAC;QAClD,CAAC;IACH,CAAC;IAED;;OAEG;IACI,KAAK,CAAC,SAAS;QACpB,MAAM,WAAW,GAAG,IAAI,CAAC,MAAM,CAAC,kBAAkB,EAAE,CAAC;QACrD,IAAI,OAAO,GAAG,KAAK,CAAC;QAEpB,IAAI,MAAM,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC,UAAU,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC;YAC7D,MAAM,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;YACrD,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,0BAA0B,CAAC,CAAC;YAC7C,OAAO,GAAG,IAAI,CAAC;QACjB,CAAC;QAED,IAAI,MAAM,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC,UAAU,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC;YAC7D,MAAM,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;YACrD,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,2BAA2B,CAAC,CAAC;YAC9C,OAAO,GAAG,IAAI,CAAC;QACjB,CAAC;QAED,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,oBAAoB,CAAC,CAAC;QAC3C,CAAC;IACH,CAAC;CACF"}
509
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.servicemanager.js","sourceRoot":"","sources":["../../ts/mod_services/classes.servicemanager.ts"],"names":[],"mappings":"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"}
@@ -36,6 +36,9 @@ export const run = async (argvArg) => {
36
36
  case 'clean':
37
37
  await handleClean(serviceManager);
38
38
  break;
39
+ case 'reconfigure':
40
+ await serviceManager.reconfigure();
41
+ break;
39
42
  case 'help':
40
43
  default:
41
44
  showHelp();
@@ -161,6 +164,7 @@ function showHelp() {
161
164
  logger.log('info', ' config Show current configuration');
162
165
  logger.log('info', ' compass Show MongoDB Compass connection string');
163
166
  logger.log('info', ' logs [service] Show logs (mongo|s3|all) [lines]');
167
+ logger.log('info', ' reconfigure Reassign ports and restart services');
164
168
  logger.log('info', ' remove Remove all containers');
165
169
  logger.log('info', ' clean Remove all containers and data ⚠️');
166
170
  logger.log('info', ' help Show this help message');
@@ -181,4 +185,4 @@ function showHelp() {
181
185
  logger.log('info', ' gitzone services compass # Get MongoDB Compass connection');
182
186
  logger.log('info', ' gitzone services logs mongo 50 # Show last 50 lines of MongoDB logs');
183
187
  }
184
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi90cy9tb2Rfc2VydmljZXMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLE9BQU8sTUFBTSxrQkFBa0IsQ0FBQztBQUM1QyxPQUFPLEtBQUssT0FBTyxNQUFNLGNBQWMsQ0FBQztBQUN4QyxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFDN0QsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBRS9DLE1BQU0sQ0FBQyxNQUFNLEdBQUcsR0FBRyxLQUFLLEVBQUUsT0FBWSxFQUFFLEVBQUU7SUFDeEMsTUFBTSxjQUFjLEdBQUcsSUFBSSxjQUFjLEVBQUUsQ0FBQztJQUM1QyxNQUFNLGNBQWMsQ0FBQyxJQUFJLEVBQUUsQ0FBQztJQUU1QixNQUFNLE9BQU8sR0FBRyxPQUFPLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxJQUFJLE1BQU0sQ0FBQztJQUN2QyxNQUFNLE9BQU8sR0FBRyxPQUFPLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxJQUFJLEtBQUssQ0FBQztJQUV0QyxRQUFRLE9BQU8sRUFBRSxDQUFDO1FBQ2hCLEtBQUssT0FBTztZQUNWLE1BQU0sV0FBVyxDQUFDLGNBQWMsRUFBRSxPQUFPLENBQUMsQ0FBQztZQUMzQyxNQUFNO1FBRVIsS0FBSyxNQUFNO1lBQ1QsTUFBTSxVQUFVLENBQUMsY0FBYyxFQUFFLE9BQU8sQ0FBQyxDQUFDO1lBQzFDLE1BQU07UUFFUixLQUFLLFNBQVM7WUFDWixNQUFNLGFBQWEsQ0FBQyxjQUFjLEVBQUUsT0FBTyxDQUFDLENBQUM7WUFDN0MsTUFBTTtRQUVSLEtBQUssUUFBUTtZQUNYLE1BQU0sY0FBYyxDQUFDLFVBQVUsRUFBRSxDQUFDO1lBQ2xDLE1BQU07UUFFUixLQUFLLFFBQVE7WUFDWCxNQUFNLGNBQWMsQ0FBQyxVQUFVLEVBQUUsQ0FBQztZQUNsQyxNQUFN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
188
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../ts/mod_services/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,kBAAkB,CAAC;AAC5C,OAAO,KAAK,OAAO,MAAM,cAAc,CAAC;AACxC,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAE/C,MAAM,CAAC,MAAM,GAAG,GAAG,KAAK,EAAE,OAAY,EAAE,EAAE;IACxC,MAAM,cAAc,GAAG,IAAI,cAAc,EAAE,CAAC;IAC5C,MAAM,cAAc,CAAC,IAAI,EAAE,CAAC;IAE5B,MAAM,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,MAAM,CAAC;IACvC,MAAM,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC;IAEtC,QAAQ,OAAO,EAAE,CAAC;QAChB,KAAK,OAAO;YACV,MAAM,WAAW,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;YAC3C,MAAM;QAER,KAAK,MAAM;YACT,MAAM,UAAU,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;YAC1C,MAAM;QAER,KAAK,SAAS;YACZ,MAAM,aAAa,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;YAC7C,MAAM;QAER,KAAK,QAAQ;YACX,MAAM,cAAc,CAAC,UAAU,EAAE,CAAC;YAClC,MAAM;QAER,KAAK,QAAQ;YACX,MAAM,cAAc,CAAC,UAAU,EAAE,CAAC;YAClC,MAAM;QAER,KAAK,SAAS;YACZ,MAAM,cAAc,CAAC,qBAAqB,EAAE,CAAC;YAC7C,MAAM;QAER,KAAK,MAAM;YACT,MAAM,KAAK,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;YAC3C,MAAM,cAAc,CAAC,QAAQ,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;YAC9C,MAAM;QAER,KAAK,QAAQ;YACX,MAAM,YAAY,CAAC,cAAc,CAAC,CAAC;YACnC,MAAM;QAER,KAAK,OAAO;YACV,MAAM,WAAW,CAAC,cAAc,CAAC,CAAC;YAClC,MAAM;QAER,KAAK,aAAa;YAChB,MAAM,cAAc,CAAC,WAAW,EAAE,CAAC;YACnC,MAAM;QAER,KAAK,MAAM,CAAC;QACZ;YACE,QAAQ,EAAE,CAAC;YACX,MAAM;IACV,CAAC;AACH,CAAC,CAAC;AAEF,KAAK,UAAU,WAAW,CAAC,cAA8B,EAAE,OAAe;IACxE,OAAO,CAAC,WAAW,CAAC,mBAAmB,CAAC,CAAC;IAEzC,QAAQ,OAAO,EAAE,CAAC;QAChB,KAAK,OAAO,CAAC;QACb,KAAK,SAAS;YACZ,MAAM,cAAc,CAAC,YAAY,EAAE,CAAC;YACpC,MAAM;QAER,KAAK,OAAO,CAAC;QACb,KAAK,IAAI;YACP,MAAM,cAAc,CAAC,UAAU,EAAE,CAAC;YAClC,MAAM;QAER,KAAK,KAAK,CAAC;QACX,KAAK,EAAE;YACL,MAAM,cAAc,CAAC,YAAY,EAAE,CAAC;YACpC,OAAO,CAAC,GAAG,EAAE,CAAC;YACd,MAAM,cAAc,CAAC,UAAU,EAAE,CAAC;YAClC,MAAM;QAER;YACE,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,oBAAoB,OAAO,EAAE,CAAC,CAAC;YACnD,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,wBAAwB,CAAC,CAAC;YAC7C,MAAM;IACV,CAAC;AACH,CAAC;AAED,KAAK,UAAU,UAAU,CAAC,cAA8B,EAAE,OAAe;IACvE,OAAO,CAAC,WAAW,CAAC,mBAAmB,CAAC,CAAC;IAEzC,QAAQ,OAAO,EAAE,CAAC;QAChB,KAAK,OAAO,CAAC;QACb,KAAK,SAAS;YACZ,MAAM,cAAc,CAAC,WAAW,EAAE,CAAC;YACnC,MAAM;QAER,KAAK,OAAO,CAAC;QACb,KAAK,IAAI;YACP,MAAM,cAAc,CAAC,SAAS,EAAE,CAAC;YACjC,MAAM;QAER,KAAK,KAAK,CAAC;QACX,KAAK,EAAE;YACL,MAAM,cAAc,CAAC,WAAW,EAAE,CAAC;YACnC,OAAO,CAAC,GAAG,EAAE,CAAC;YACd,MAAM,cAAc,CAAC,SAAS,EAAE,CAAC;YACjC,MAAM;QAER;YACE,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,oBAAoB,OAAO,EAAE,CAAC,CAAC;YACnD,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,wBAAwB,CAAC,CAAC;YAC7C,MAAM;IACV,CAAC;AACH,CAAC;AAED,KAAK,UAAU,aAAa,CAAC,cAA8B,EAAE,OAAe;IAC1E,OAAO,CAAC,WAAW,CAAC,qBAAqB,CAAC,CAAC;IAE3C,QAAQ,OAAO,EAAE,CAAC;QAChB,KAAK,OAAO,CAAC;QACb,KAAK,SAAS;YACZ,MAAM,cAAc,CAAC,WAAW,EAAE,CAAC;YACnC,MAAM,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YACxC,MAAM,cAAc,CAAC,YAAY,EAAE,CAAC;YACpC,MAAM;QAER,KAAK,OAAO,CAAC;QACb,KAAK,IAAI;YACP,MAAM,cAAc,CAAC,SAAS,EAAE,CAAC;YACjC,MAAM,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YACxC,MAAM,cAAc,CAAC,UAAU,EAAE,CAAC;YAClC,MAAM;QAER,KAAK,KAAK,CAAC;QACX,KAAK,EAAE;YACL,MAAM,cAAc,CAAC,WAAW,EAAE,CAAC;YACnC,MAAM,cAAc,CAAC,SAAS,EAAE,CAAC;YACjC,MAAM,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YACxC,MAAM,cAAc,CAAC,YAAY,EAAE,CAAC;YACpC,OAAO,CAAC,GAAG,EAAE,CAAC;YACd,MAAM,cAAc,CAAC,UAAU,EAAE,CAAC;YAClC,MAAM;QAER;YACE,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,oBAAoB,OAAO,EAAE,CAAC,CAAC;YACnD,MAAM;IACV,CAAC;AACH,CAAC;AAED,KAAK,UAAU,YAAY,CAAC,cAA8B;IACxD,OAAO,CAAC,WAAW,CAAC,qBAAqB,CAAC,CAAC;IAC3C,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,mDAAmD,CAAC,CAAC;IAExE,MAAM,cAAc,GAAG,MAAM,OAAO,CAAC,aAAa,CAAC,aAAa,CAAC,kBAAkB,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;IAExG,IAAI,cAAc,EAAE,CAAC;QACnB,MAAM,cAAc,CAAC,gBAAgB,EAAE,CAAC;IAC1C,CAAC;SAAM,CAAC;QACN,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IAClC,CAAC;AACH,CAAC;AAED,KAAK,UAAU,WAAW,CAAC,cAA8B;IACvD,OAAO,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;IACjC,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,wDAAwD,CAAC,CAAC;IAC9E,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,+BAA+B,CAAC,CAAC;IAErD,MAAM,gBAAgB,GAAG,IAAI,OAAO,CAAC,aAAa,CAAC,aAAa,EAAE,CAAC;IACnE,MAAM,aAAa,GAAG,MAAM,gBAAgB,CAAC,WAAW,CAAC;QACvD,IAAI,EAAE,SAAS;QACf,IAAI,EAAE,OAAO;QACb,OAAO,EAAE,wBAAwB;QACjC,OAAO,EAAE,IAAI;KACd,CAAC,CAAC;IAEH,IAAI,aAAa,CAAC,KAAK,KAAK,KAAK,EAAE,CAAC;QAClC,MAAM,cAAc,CAAC,gBAAgB,EAAE,CAAC;QACxC,OAAO,CAAC,GAAG,EAAE,CAAC;QACd,MAAM,cAAc,CAAC,SAAS,EAAE,CAAC;QACjC,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;IACpC,CAAC;SAAM,CAAC;QACN,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IAClC,CAAC;AACH,CAAC;AAED,SAAS,QAAQ;IACf,OAAO,CAAC,WAAW,CAAC,0BAA0B,CAAC,CAAC;IAEhD,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,6CAA6C,CAAC,CAAC;IAChE,OAAO,CAAC,GAAG,EAAE,CAAC;IAEd,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IAChC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,mDAAmD,CAAC,CAAC;IACxE,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,kDAAkD,CAAC,CAAC;IACvE,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,qDAAqD,CAAC,CAAC;IAC1E,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,yCAAyC,CAAC,CAAC;IAC9D,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,gDAAgD,CAAC,CAAC;IACrE,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,4DAA4D,CAAC,CAAC;IACjF,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,sDAAsD,CAAC,CAAC;IAC3E,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,yDAAyD,CAAC,CAAC;IAC9E,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,2CAA2C,CAAC,CAAC;IAChE,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,uDAAuD,CAAC,CAAC;IAC5E,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,4CAA4C,CAAC,CAAC;IACjE,OAAO,CAAC,GAAG,EAAE,CAAC;IAEd,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IAChC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,sDAAsD,CAAC,CAAC;IAC3E,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,mDAAmD,CAAC,CAAC;IACxE,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,2DAA2D,CAAC,CAAC;IAChF,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,2CAA2C,CAAC,CAAC;IAChE,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,wCAAwC,CAAC,CAAC;IAC7D,OAAO,CAAC,GAAG,EAAE,CAAC;IAEd,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IAChC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,wDAAwD,CAAC,CAAC;IAC7E,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,wDAAwD,CAAC,CAAC;IAC7E,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,uDAAuD,CAAC,CAAC;IAC5E,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,0DAA0D,CAAC,CAAC;IAC/E,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,wDAAwD,CAAC,CAAC;IAC7E,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,oEAAoE,CAAC,CAAC;IACzF,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,wEAAwE,CAAC,CAAC;AAC/F,CAAC"}
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@git.zone/cli",
3
3
  "private": false,
4
- "version": "1.17.5",
4
+ "version": "1.18.0",
5
5
  "description": "A comprehensive CLI tool for enhancing and managing local development workflows with gitzone utilities, focusing on project setup, version control, code formatting, and template management.",
6
6
  "main": "dist_ts/index.ts",
7
7
  "typings": "dist_ts/index.d.ts",
@@ -3,6 +3,6 @@
3
3
  */
4
4
  export const commitinfo = {
5
5
  name: '@git.zone/cli',
6
- version: '1.17.5',
6
+ version: '1.18.0',
7
7
  description: 'A comprehensive CLI tool for enhancing and managing local development workflows with gitzone utilities, focusing on project setup, version control, code formatting, and template management.'
8
8
  }
@@ -215,7 +215,7 @@ export class DockerContainer {
215
215
  */
216
216
  public async inspect(containerName: string): Promise<any> {
217
217
  try {
218
- const result = await this.smartshell.exec(`docker inspect ${containerName}`);
218
+ const result = await this.smartshell.exec(`docker inspect ${containerName} 2>/dev/null`);
219
219
  if (result.exitCode === 0) {
220
220
  return JSON.parse(result.stdout);
221
221
  }
@@ -224,4 +224,38 @@ export class DockerContainer {
224
224
  return null;
225
225
  }
226
226
  }
227
+
228
+ /**
229
+ * Get port mappings for a container
230
+ */
231
+ public async getPortMappings(containerName: string): Promise<{ [key: string]: string } | null> {
232
+ try {
233
+ // Use docker inspect without format to get full JSON, then extract PortBindings
234
+ const result = await this.smartshell.exec(`docker inspect ${containerName} 2>/dev/null`);
235
+
236
+ if (result.exitCode === 0 && result.stdout) {
237
+ const inspectData = JSON.parse(result.stdout);
238
+ if (inspectData && inspectData[0] && inspectData[0].HostConfig && inspectData[0].HostConfig.PortBindings) {
239
+ const portBindings = inspectData[0].HostConfig.PortBindings;
240
+ const mappings: { [key: string]: string } = {};
241
+
242
+ // Convert Docker's port binding format to simple host:container mapping
243
+ for (const [containerPort, hostBindings] of Object.entries(portBindings)) {
244
+ if (Array.isArray(hostBindings) && hostBindings.length > 0) {
245
+ const hostPort = (hostBindings[0] as any).HostPort;
246
+ if (hostPort) {
247
+ mappings[containerPort.replace('/tcp', '').replace('/udp', '')] = hostPort;
248
+ }
249
+ }
250
+ }
251
+
252
+ return mappings;
253
+ }
254
+ }
255
+ return null;
256
+ } catch (error) {
257
+ // Silently fail - container might not exist
258
+ return null;
259
+ }
260
+ }
227
261
  }
@@ -1,6 +1,7 @@
1
1
  import * as plugins from './mod.plugins.js';
2
2
  import * as helpers from './helpers.js';
3
3
  import { logger } from '../gitzone.logging.js';
4
+ import { DockerContainer } from './classes.dockercontainer.js';
4
5
 
5
6
  export interface IServiceConfig {
6
7
  PROJECT_NAME: string;
@@ -23,9 +24,11 @@ export interface IServiceConfig {
23
24
  export class ServiceConfiguration {
24
25
  private configPath: string;
25
26
  private config: IServiceConfig;
27
+ private docker: DockerContainer;
26
28
 
27
29
  constructor() {
28
30
  this.configPath = plugins.path.join(process.cwd(), '.nogit', 'env.json');
31
+ this.docker = new DockerContainer();
29
32
  }
30
33
 
31
34
  /**
@@ -41,6 +44,9 @@ export class ServiceConfiguration {
41
44
  await this.createDefaultConfig();
42
45
  }
43
46
 
47
+ // Sync ports from existing Docker containers if they exist
48
+ await this.syncPortsFromDocker();
49
+
44
50
  return this.config;
45
51
  }
46
52
 
@@ -280,4 +286,147 @@ export class ServiceConfiguration {
280
286
  minio: plugins.path.join(process.cwd(), '.nogit', 'miniodata')
281
287
  };
282
288
  }
289
+
290
+ /**
291
+ * Sync port configuration from existing Docker containers
292
+ */
293
+ private async syncPortsFromDocker(): Promise<void> {
294
+ const containers = this.getContainerNames();
295
+ let updated = false;
296
+
297
+ // Check MongoDB container
298
+ const mongoStatus = await this.docker.getStatus(containers.mongo);
299
+ if (mongoStatus !== 'not_exists') {
300
+ const portMappings = await this.docker.getPortMappings(containers.mongo);
301
+ if (portMappings && portMappings['27017']) {
302
+ const dockerPort = portMappings['27017'];
303
+ if (this.config.MONGODB_PORT !== dockerPort) {
304
+ this.config.MONGODB_PORT = dockerPort;
305
+ updated = true;
306
+ }
307
+ }
308
+ }
309
+
310
+ // Check MinIO container
311
+ const minioStatus = await this.docker.getStatus(containers.minio);
312
+ if (minioStatus !== 'not_exists') {
313
+ const portMappings = await this.docker.getPortMappings(containers.minio);
314
+ if (portMappings) {
315
+ if (portMappings['9000']) {
316
+ const dockerPort = portMappings['9000'];
317
+ if (this.config.S3_PORT !== dockerPort) {
318
+ this.config.S3_PORT = dockerPort;
319
+ updated = true;
320
+ }
321
+ }
322
+ if (portMappings['9001']) {
323
+ const dockerPort = portMappings['9001'];
324
+ if (this.config.S3_CONSOLE_PORT !== dockerPort) {
325
+ this.config.S3_CONSOLE_PORT = dockerPort;
326
+ updated = true;
327
+ }
328
+ }
329
+ }
330
+ }
331
+
332
+ if (updated) {
333
+ // Update derived fields
334
+ this.config.MONGODB_URL = `mongodb://${this.config.MONGODB_USER}:${this.config.MONGODB_PASS}@${this.config.MONGODB_HOST}:${this.config.MONGODB_PORT}/${this.config.MONGODB_NAME}?authSource=admin`;
335
+ const protocol = this.config.S3_USESSL ? 'https' : 'http';
336
+ this.config.S3_ENDPOINT = `${protocol}://${this.config.S3_HOST}:${this.config.S3_PORT}`;
337
+
338
+ await this.saveConfig();
339
+ }
340
+ }
341
+
342
+ /**
343
+ * Validate and update ports if they're not available
344
+ */
345
+ public async validateAndUpdatePorts(): Promise<boolean> {
346
+ let updated = false;
347
+ const containers = this.getContainerNames();
348
+
349
+ // Check if containers exist - if they do, ports are fine
350
+ const mongoExists = await this.docker.exists(containers.mongo);
351
+ const minioExists = await this.docker.exists(containers.minio);
352
+
353
+ // Only check port availability if containers don't exist
354
+ if (!mongoExists) {
355
+ const mongoPort = parseInt(this.config.MONGODB_PORT);
356
+ if (!(await helpers.isPortAvailable(mongoPort))) {
357
+ logger.log('note', `⚠️ MongoDB port ${mongoPort} is in use, finding new port...`);
358
+ const newPort = await helpers.getRandomAvailablePort();
359
+ this.config.MONGODB_PORT = newPort.toString();
360
+ logger.log('ok', `✅ New MongoDB port: ${newPort}`);
361
+ updated = true;
362
+ }
363
+ }
364
+
365
+ if (!minioExists) {
366
+ const s3Port = parseInt(this.config.S3_PORT);
367
+ const s3ConsolePort = parseInt(this.config.S3_CONSOLE_PORT);
368
+
369
+ if (!(await helpers.isPortAvailable(s3Port))) {
370
+ logger.log('note', `⚠️ S3 API port ${s3Port} is in use, finding new port...`);
371
+ const newPort = await helpers.getRandomAvailablePort();
372
+ this.config.S3_PORT = newPort.toString();
373
+ logger.log('ok', `✅ New S3 API port: ${newPort}`);
374
+ updated = true;
375
+ }
376
+
377
+ if (!(await helpers.isPortAvailable(s3ConsolePort))) {
378
+ logger.log('note', `⚠️ S3 Console port ${s3ConsolePort} is in use, finding new port...`);
379
+ let newPort = parseInt(this.config.S3_PORT) + 1;
380
+ while (!(await helpers.isPortAvailable(newPort))) {
381
+ newPort++;
382
+ }
383
+ this.config.S3_CONSOLE_PORT = newPort.toString();
384
+ logger.log('ok', `✅ New S3 Console port: ${newPort}`);
385
+ updated = true;
386
+ }
387
+ }
388
+
389
+ if (updated) {
390
+ // Update derived fields
391
+ this.config.MONGODB_URL = `mongodb://${this.config.MONGODB_USER}:${this.config.MONGODB_PASS}@${this.config.MONGODB_HOST}:${this.config.MONGODB_PORT}/${this.config.MONGODB_NAME}?authSource=admin`;
392
+ const protocol = this.config.S3_USESSL ? 'https' : 'http';
393
+ this.config.S3_ENDPOINT = `${protocol}://${this.config.S3_HOST}:${this.config.S3_PORT}`;
394
+
395
+ await this.saveConfig();
396
+ }
397
+
398
+ return updated;
399
+ }
400
+
401
+ /**
402
+ * Force reconfigure all ports with new available ones
403
+ */
404
+ public async reconfigurePorts(): Promise<void> {
405
+ logger.log('note', '🔄 Finding new available ports...');
406
+
407
+ const mongoPort = await helpers.getRandomAvailablePort();
408
+ const s3Port = await helpers.getRandomAvailablePort();
409
+ let s3ConsolePort = s3Port + 1;
410
+
411
+ // Ensure console port is also available
412
+ while (!(await helpers.isPortAvailable(s3ConsolePort))) {
413
+ s3ConsolePort++;
414
+ }
415
+
416
+ this.config.MONGODB_PORT = mongoPort.toString();
417
+ this.config.S3_PORT = s3Port.toString();
418
+ this.config.S3_CONSOLE_PORT = s3ConsolePort.toString();
419
+
420
+ // Update derived fields
421
+ this.config.MONGODB_URL = `mongodb://${this.config.MONGODB_USER}:${this.config.MONGODB_PASS}@${this.config.MONGODB_HOST}:${this.config.MONGODB_PORT}/${this.config.MONGODB_NAME}?authSource=admin`;
422
+ const protocol = this.config.S3_USESSL ? 'https' : 'http';
423
+ this.config.S3_ENDPOINT = `${protocol}://${this.config.S3_HOST}:${this.config.S3_PORT}`;
424
+
425
+ await this.saveConfig();
426
+
427
+ logger.log('ok', '✅ New port configuration:');
428
+ logger.log('info', ` 📍 MongoDB: ${mongoPort}`);
429
+ logger.log('info', ` 📍 S3 API: ${s3Port}`);
430
+ logger.log('info', ` 📍 S3 Console: ${s3ConsolePort}`);
431
+ }
283
432
  }
@@ -26,6 +26,9 @@ export class ServiceManager {
26
26
  // Load or create configuration
27
27
  await this.config.loadOrCreate();
28
28
  logger.log('info', `📋 Project: ${this.config.getConfig().PROJECT_NAME}`);
29
+
30
+ // Validate and update ports if needed
31
+ await this.config.validateAndUpdatePorts();
29
32
  }
30
33
 
31
34
  /**
@@ -49,10 +52,42 @@ export class ServiceManager {
49
52
  break;
50
53
 
51
54
  case 'stopped':
52
- if (await this.docker.start(containers.mongo)) {
53
- logger.log('ok', ' Started ✓');
55
+ // Check if port mapping matches config
56
+ const mongoPortMappings = await this.docker.getPortMappings(containers.mongo);
57
+ if (mongoPortMappings && mongoPortMappings['27017'] !== config.MONGODB_PORT) {
58
+ logger.log('note', ' Port configuration changed, recreating container...');
59
+ await this.docker.remove(containers.mongo, true);
60
+ // Fall through to create new container
61
+ const success = await this.docker.run({
62
+ name: containers.mongo,
63
+ image: 'mongo:7.0',
64
+ ports: {
65
+ [`0.0.0.0:${config.MONGODB_PORT}`]: '27017'
66
+ },
67
+ volumes: {
68
+ [directories.mongo]: '/data/db'
69
+ },
70
+ environment: {
71
+ MONGO_INITDB_ROOT_USERNAME: config.MONGODB_USER,
72
+ MONGO_INITDB_ROOT_PASSWORD: config.MONGODB_PASS,
73
+ MONGO_INITDB_DATABASE: config.MONGODB_NAME
74
+ },
75
+ restart: 'unless-stopped',
76
+ command: '--bind_ip_all'
77
+ });
78
+
79
+ if (success) {
80
+ logger.log('ok', ' Recreated with new port ✓');
81
+ } else {
82
+ logger.log('error', ' Failed to recreate container');
83
+ }
54
84
  } else {
55
- logger.log('error', ' Failed to start');
85
+ // Ports match, just start the container
86
+ if (await this.docker.start(containers.mongo)) {
87
+ logger.log('ok', ' Started ✓');
88
+ } else {
89
+ logger.log('error', ' Failed to start');
90
+ }
56
91
  }
57
92
  break;
58
93
 
@@ -116,10 +151,60 @@ export class ServiceManager {
116
151
  break;
117
152
 
118
153
  case 'stopped':
119
- if (await this.docker.start(containers.minio)) {
120
- logger.log('ok', ' Started ✓');
154
+ // Check if port mapping matches config
155
+ const minioPortMappings = await this.docker.getPortMappings(containers.minio);
156
+ if (minioPortMappings &&
157
+ (minioPortMappings['9000'] !== config.S3_PORT ||
158
+ minioPortMappings['9001'] !== config.S3_CONSOLE_PORT)) {
159
+ logger.log('note', ' Port configuration changed, recreating container...');
160
+ await this.docker.remove(containers.minio, true);
161
+ // Fall through to create new container
162
+ const success = await this.docker.run({
163
+ name: containers.minio,
164
+ image: 'minio/minio',
165
+ ports: {
166
+ [config.S3_PORT]: '9000',
167
+ [config.S3_CONSOLE_PORT]: '9001'
168
+ },
169
+ volumes: {
170
+ [directories.minio]: '/data'
171
+ },
172
+ environment: {
173
+ MINIO_ROOT_USER: config.S3_ACCESSKEY,
174
+ MINIO_ROOT_PASSWORD: config.S3_SECRETKEY
175
+ },
176
+ restart: 'unless-stopped',
177
+ command: 'server /data --console-address ":9001"'
178
+ });
179
+
180
+ if (success) {
181
+ logger.log('ok', ' Recreated with new ports ✓');
182
+
183
+ // Wait for MinIO to be ready
184
+ await plugins.smartdelay.delayFor(3000);
185
+
186
+ // Create default bucket
187
+ await this.docker.exec(
188
+ containers.minio,
189
+ `mc alias set local http://localhost:9000 ${config.S3_ACCESSKEY} ${config.S3_SECRETKEY}`
190
+ );
191
+
192
+ await this.docker.exec(
193
+ containers.minio,
194
+ `mc mb local/${config.S3_BUCKET}`
195
+ );
196
+
197
+ logger.log('ok', ` Bucket '${config.S3_BUCKET}' created ✓`);
198
+ } else {
199
+ logger.log('error', ' Failed to recreate container');
200
+ }
121
201
  } else {
122
- logger.log('error', ' Failed to start');
202
+ // Ports match, just start the container
203
+ if (await this.docker.start(containers.minio)) {
204
+ logger.log('ok', ' Started ✓');
205
+ } else {
206
+ logger.log('error', ' Failed to start');
207
+ }
123
208
  }
124
209
  break;
125
210
 
@@ -233,6 +318,7 @@ export class ServiceManager {
233
318
  case 'running':
234
319
  logger.log('ok', '📦 MongoDB: 🟢 Running');
235
320
  logger.log('info', ` ├─ Container: ${containers.mongo}`);
321
+ logger.log('info', ` ├─ Port: ${config.MONGODB_PORT}`);
236
322
  logger.log('info', ` ├─ Connection: ${this.config.getMongoConnectionString()}`);
237
323
 
238
324
  // Show Compass connection string
@@ -242,10 +328,19 @@ export class ServiceManager {
242
328
  break;
243
329
  case 'stopped':
244
330
  logger.log('note', '📦 MongoDB: 🟡 Stopped');
245
- logger.log('info', ` └─ Container: ${containers.mongo}`);
331
+ logger.log('info', ` ├─ Container: ${containers.mongo}`);
332
+ logger.log('info', ` └─ Port: ${config.MONGODB_PORT}`);
246
333
  break;
247
334
  case 'not_exists':
248
335
  logger.log('info', '📦 MongoDB: ⚪ Not installed');
336
+ // Check port availability
337
+ const mongoPort = parseInt(config.MONGODB_PORT);
338
+ const mongoAvailable = await helpers.isPortAvailable(mongoPort);
339
+ if (!mongoAvailable) {
340
+ logger.log('error', ` └─ ⚠️ Port ${mongoPort} is in use by another process`);
341
+ } else {
342
+ logger.log('info', ` └─ Port ${mongoPort} is available`);
343
+ }
249
344
  break;
250
345
  }
251
346
 
@@ -261,10 +356,33 @@ export class ServiceManager {
261
356
  break;
262
357
  case 'stopped':
263
358
  logger.log('note', '📦 S3/MinIO: 🟡 Stopped');
264
- logger.log('info', ` └─ Container: ${containers.minio}`);
359
+ logger.log('info', ` ├─ Container: ${containers.minio}`);
360
+ logger.log('info', ` ├─ API Port: ${config.S3_PORT}`);
361
+ logger.log('info', ` └─ Console Port: ${config.S3_CONSOLE_PORT}`);
265
362
  break;
266
363
  case 'not_exists':
267
364
  logger.log('info', '📦 S3/MinIO: ⚪ Not installed');
365
+ // Check port availability
366
+ const s3Port = parseInt(config.S3_PORT);
367
+ const s3ConsolePort = parseInt(config.S3_CONSOLE_PORT);
368
+ const s3Available = await helpers.isPortAvailable(s3Port);
369
+ const consoleAvailable = await helpers.isPortAvailable(s3ConsolePort);
370
+
371
+ if (!s3Available || !consoleAvailable) {
372
+ if (!s3Available) {
373
+ logger.log('error', ` ├─ ⚠️ API Port ${s3Port} is in use`);
374
+ } else {
375
+ logger.log('info', ` ├─ API Port ${s3Port} is available`);
376
+ }
377
+ if (!consoleAvailable) {
378
+ logger.log('error', ` └─ ⚠️ Console Port ${s3ConsolePort} is in use`);
379
+ } else {
380
+ logger.log('info', ` └─ Console Port ${s3ConsolePort} is available`);
381
+ }
382
+ } else {
383
+ logger.log('info', ` ├─ API Port ${s3Port} is available`);
384
+ logger.log('info', ` └─ Console Port ${s3ConsolePort} is available`);
385
+ }
268
386
  break;
269
387
  }
270
388
  }
@@ -422,4 +540,44 @@ export class ServiceManager {
422
540
  logger.log('note', ' No data to clean');
423
541
  }
424
542
  }
543
+
544
+ /**
545
+ * Reconfigure services with new ports
546
+ */
547
+ public async reconfigure(): Promise<void> {
548
+ helpers.printHeader('Reconfiguring Services');
549
+
550
+ const containers = this.config.getContainerNames();
551
+
552
+ // Stop existing containers
553
+ logger.log('note', '🛑 Stopping existing containers...');
554
+
555
+ if (await this.docker.exists(containers.mongo)) {
556
+ await this.docker.stop(containers.mongo);
557
+ logger.log('ok', ' MongoDB stopped ✓');
558
+ }
559
+
560
+ if (await this.docker.exists(containers.minio)) {
561
+ await this.docker.stop(containers.minio);
562
+ logger.log('ok', ' S3/MinIO stopped ✓');
563
+ }
564
+
565
+ // Reconfigure ports
566
+ await this.config.reconfigurePorts();
567
+
568
+ // Ask if user wants to restart services
569
+ const smartinteract = new plugins.smartinteract.SmartInteract();
570
+ const response = await smartinteract.askQuestion({
571
+ name: 'restart',
572
+ type: 'confirm',
573
+ message: 'Do you want to start services with new ports?',
574
+ default: true
575
+ });
576
+
577
+ if (response.value) {
578
+ console.log();
579
+ await this.startMongoDB();
580
+ await this.startMinIO();
581
+ }
582
+ }
425
583
  }
@@ -48,6 +48,10 @@ export const run = async (argvArg: any) => {
48
48
  await handleClean(serviceManager);
49
49
  break;
50
50
 
51
+ case 'reconfigure':
52
+ await serviceManager.reconfigure();
53
+ break;
54
+
51
55
  case 'help':
52
56
  default:
53
57
  showHelp();
@@ -195,6 +199,7 @@ function showHelp() {
195
199
  logger.log('info', ' config Show current configuration');
196
200
  logger.log('info', ' compass Show MongoDB Compass connection string');
197
201
  logger.log('info', ' logs [service] Show logs (mongo|s3|all) [lines]');
202
+ logger.log('info', ' reconfigure Reassign ports and restart services');
198
203
  logger.log('info', ' remove Remove all containers');
199
204
  logger.log('info', ' clean Remove all containers and data ⚠️');
200
205
  logger.log('info', ' help Show this help message');