@docker-digital/dockernet-agent 0.1.5 → 0.1.7

package/dist/apps/agent/src/agent/services/log.service.d.ts

@@ -1,6 +1,6 @@
 import { EventEmitter } from 'events';
 import { ApiService } from './api.service';
-import { ConfigService } from './config.service';
+import { ConfigAgentService } from './config.service';
 import { DockerService } from './docker.service';
 export declare class LogService extends EventEmitter {
     private apiService;
@@ -9,11 +9,18 @@ export declare class LogService extends EventEmitter {
     private readonly logger;
     private readonly logPidDir;
     private readonly streamedContainers;
-    constructor(apiService: ApiService, configService: ConfigService, dockerService: DockerService);
-    startLogStreamsForProfile(profileId: string, workspaceId: string): Promise<void>;
+    constructor(apiService: ApiService, configService: ConfigAgentService, dockerService: DockerService);
+    startLogStreamsForProfile(profileId: string): Promise<void>;
     stopLogStreamsForProfile(profileId: string): Promise<void>;
-    streamLogForContainer(containerName: string, profileId: string, serviceName: string, workspaceId: string): Promise<void>;
+    streamLogForContainer(containerName: string, profileId: string, serviceName: string): Promise<void>;
     autoStreamLogsForAllContainers(): Promise<void>;
+    streamLogsForProfiles(profiles: Array<{
+        key: string;
+        services?: Array<{
+            name: string;
+            key: string;
+        }>;
+    }>): Promise<void>;
     private processLogStream;
     private sendLogBatch;
 }

package/dist/apps/agent/src/agent/services/log.service.js

@@ -18,6 +18,7 @@ const path = require("path");
 const api_service_1 = require("./api.service");
 const config_service_1 = require("./config.service");
 const docker_service_1 = require("./docker.service");
+const utils_1 = require("../../../../../shared/common/utils");
 let LogService = LogService_1 = class LogService extends events_1.EventEmitter {
     constructor(apiService, configService, dockerService) {
         super();
@@ -29,7 +30,7 @@ let LogService = LogService_1 = class LogService extends events_1.EventEmitter {
         this.logPidDir = path.join(this.configService.workDirPath, '.log_pids');
         fs.ensureDirSync(this.logPidDir);
     }
-    async startLogStreamsForProfile(profileId, workspaceId) {
+    async startLogStreamsForProfile(profileId) {
         const profileDir = path.join(this.configService.workDirPath, profileId);
         const composeFile = path.join(profileDir, `docker-compose_${profileId}.yaml`);
         if (!fs.existsSync(composeFile)) {
@@ -44,7 +45,7 @@ let LogService = LogService_1 = class LogService extends events_1.EventEmitter {
             const containerName = container.Names[0]?.replace(/^\//, '') || '';
             const serviceName = container.Labels['com.docker.compose.service'] || containerName;
             if (containerName && container.State === 'running') {
-                await this.streamLogForContainer(containerName, profileId, serviceName, workspaceId);
+                await this.streamLogForContainer(containerName, profileId, serviceName);
             }
         }
     }
@@ -71,7 +72,7 @@ let LogService = LogService_1 = class LogService extends events_1.EventEmitter {
         await fs.remove(pidFile);
         this.logger.log(`Stopped log streams for profile: ${profileId}`);
     }
-    async streamLogForContainer(containerName, profileId, serviceName, workspaceId) {
+    async streamLogForContainer(containerName, profileId, serviceName) {
         if (this.streamedContainers.has(containerName)) {
             return;
         }
@@ -79,7 +80,7 @@ let LogService = LogService_1 = class LogService extends events_1.EventEmitter {
         this.logger.log(`Starting log stream for container: ${containerName} (profile: ${profileId}, service: ${serviceName})`);
         try {
             const logStream = await this.dockerService.getContainerLogs(containerName, 50);
-            this.processLogStream(logStream, containerName, profileId, serviceName, workspaceId).catch((error) => {
+            this.processLogStream(logStream, containerName, profileId, serviceName).catch((error) => {
                 this.logger.error(`Error processing log stream for ${containerName}: ${error.message}`);
                 this.streamedContainers.delete(containerName);
             });
@@ -116,11 +117,41 @@ let LogService = LogService_1 = class LogService extends events_1.EventEmitter {
                         workspaceId = match[1].trim();
                     }
                 }
-                await this.streamLogForContainer(containerName, profileId, serviceName || containerName, workspaceId);
+                await this.streamLogForContainer(containerName, profileId, serviceName || containerName);
             }
         }
     }
-    async processLogStream(stream, containerName, profileId, serviceName, workspaceId) {
+    async streamLogsForProfiles(profiles) {
+        for (const profile of profiles) {
+            const profileId = profile.key;
+            const containers = await this.dockerService.listContainers({
+                label: [`com.docker.compose.project=${profileId}`],
+                status: ['running'],
+            });
+            utils_1.cliLogger.block({
+                title: `Found ${containers.length} containers for profile: ${profileId}`,
+                context: 'LogService',
+                func: 'streamLogsForProfiles',
+                type: 'info',
+                metadata: { profileId: profileId, containerCount: containers.length, label: [`com.docker.compose.project=${profileId}`], },
+            });
+            for (const container of containers) {
+                utils_1.cliLogger.block({
+                    title: `Streaming logs for profile: ${profileId}`,
+                    context: 'LogService',
+                    func: 'streamLogsForProfiles',
+                    type: 'info',
+                    metadata: { profileId: profileId, containerName: container.Names[0]?.replace(/^\//, '') || '' },
+                });
+                const containerName = container.Names[0]?.replace(/^\//, '') || '';
+                const serviceName = container.Labels['com.docker.compose.service'] || containerName;
+                if (containerName && container.State === 'running') {
+                    await this.streamLogForContainer(containerName, profileId, serviceName);
+                }
+            }
+        }
+    }
+    async processLogStream(stream, containerName, profileId, serviceName) {
         const lines = [];
         let buffer = '';
         stream.on('data', async (chunk) => {
@@ -133,14 +164,14 @@ let LogService = LogService_1 = class LogService extends events_1.EventEmitter {
                 }
             }
             if (lines.length >= 10) {
-                await this.sendLogBatch(lines.splice(0), containerName, profileId, serviceName, workspaceId);
+                await this.sendLogBatch(lines.splice(0), containerName, profileId, serviceName);
             }
         });
         stream.on('end', async () => {
             if (lines.length > 0 || buffer) {
                 if (buffer)
                     lines.push(buffer);
-                await this.sendLogBatch(lines, containerName, profileId, serviceName, workspaceId);
+                await this.sendLogBatch(lines, containerName, profileId, serviceName);
             }
             this.streamedContainers.delete(containerName);
         });
@@ -149,13 +180,12 @@ let LogService = LogService_1 = class LogService extends events_1.EventEmitter {
             this.streamedContainers.delete(containerName);
         });
     }
-    async sendLogBatch(lines, containerName, profileId, serviceName, workspaceId) {
+    async sendLogBatch(lines, containerName, profileId, serviceName) {
         for (const line of lines) {
             if (!line.trim())
                 continue;
             const payload = {
                 profile_id: profileId,
-                workspace_id: workspaceId,
                 service_name: serviceName,
                 container_name: containerName,
                 line: line,
@@ -170,7 +200,7 @@ exports.LogService = LogService;
 exports.LogService = LogService = LogService_1 = __decorate([
     (0, common_1.Injectable)(),
     __metadata("design:paramtypes", [api_service_1.ApiService,
-        config_service_1.ConfigService,
+        config_service_1.ConfigAgentService,
         docker_service_1.DockerService])
 ], LogService);
 //# sourceMappingURL=log.service.js.map

package/dist/apps/agent/src/agent/services/log.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"log.service.js","sourceRoot":"","sources":["../../../../../../src/agent/services/log.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"log.service.js","sourceRoot":"","sources":["../../../../../../src/agent/services/log.service.ts"],"names":[],"mappings":"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"}

package/dist/apps/agent/src/agent/services/machine.service.d.ts

@@ -1,10 +1,10 @@
 import { ApiService } from './api.service';
-import { ConfigService } from './config.service';
+import { ConfigAgentService } from './config.service';
 export declare class MachineService {
     private apiService;
     private configService;
     private readonly logger;
-    constructor(apiService: ApiService, configService: ConfigService);
+    constructor(apiService: ApiService, configService: ConfigAgentService);
     generateMachineKey(): string;
     getOsInfo(): string;
     getCurrentUser(): string;

package/dist/apps/agent/src/agent/services/machine.service.js

@@ -126,66 +126,166 @@ let MachineService = MachineService_1 = class MachineService {
             payload.tailscale_ip = tailscaleIp;
             utils_1.cliLogger.info(`Tailscale IP detected: ${tailscaleIp}`);
         }
-        this.logger.log(`Registering machine with key: ${machineKey}`);
+        utils_1.cliLogger.block({
+            title: 'Registering machine',
+            context: 'MachineService',
+            func: 'registerMachine',
+            type: 'info',
+            metadata: {
+                machineKey: machineKey,
+            },
+        });
         utils_1.cliLogger.step(2, 2, 'Sending registration request to server...');
         const response = await this.apiService.callApi('POST', '/machines', payload, -1, 5000);
         if (response) {
-            utils_1.cliLogger.success('Machine registered successfully');
-            this.logger.log('Machine registered successfully');
-            this.logger.debug(`Machine registration response: ${JSON.stringify(response, null, 2)}`);
+            utils_1.cliLogger.block({
+                title: 'Machine registered successfully',
+                context: 'MachineService',
+                func: 'registerMachine',
+                type: 'success',
+                metadata: {
+                    machineKey: machineKey,
+                },
+            });
+            utils_1.cliLogger.block({
+                title: `Machine registration response: ${JSON.stringify(response, null, 2)}`,
+                context: 'MachineService',
+                func: 'registerMachine',
+                type: 'debug',
+                metadata: {
+                    response: response,
+                },
+            });
             const responseData = response.data || response;
             const nebulaConfig = responseData.nebula_config;
             if (nebulaConfig) {
                 utils_1.cliLogger.info(`Nebula config received: IP ${nebulaConfig.ip}`);
-                this.logger.log(`✅ Received Nebula config: IP ${nebulaConfig.ip}`);
-                this.logger.log(`   Lighthouse: ${nebulaConfig.lighthouse}, Groups: ${nebulaConfig.groups?.join(', ') || 'none'}`);
-                utils_1.cliLogger.completeProcess('Machine registration completed!', {
-                    'Machine Key': machineKey.substring(0, 8) + '...',
-                    'OS': osInfo,
-                    'Hostname': hostname,
-                    'Tailscale IP': tailscaleIp || 'N/A',
-                    'Nebula IP': nebulaConfig.ip || 'N/A',
+                utils_1.cliLogger.block({
+                    title: `Received Nebula config: IP ${nebulaConfig.ip}`,
+                    context: 'MachineService',
+                    func: 'registerMachine',
+                    type: 'success',
+                    metadata: {
+                        nebulaConfig: nebulaConfig,
+                    },
+                });
+                utils_1.cliLogger.block({
+                    title: `Lighthouse: ${nebulaConfig.lighthouse}, Groups: ${nebulaConfig.groups?.join(', ') || 'none'}`,
+                    context: 'MachineService',
+                    func: 'registerMachine',
+                    type: 'debug',
+                    metadata: {
+                        nebulaConfig: nebulaConfig,
+                    },
+                });
+                utils_1.cliLogger.block({
+                    title: 'Machine registration completed!',
+                    context: 'MachineService',
+                    func: 'registerMachine',
+                    type: 'success',
+                    metadata: {
+                        machineKey: machineKey,
+                    },
                 });
                 return { success: true, nebula_config: nebulaConfig };
             }
             else {
-                utils_1.cliLogger.warning('No Nebula config received');
-                this.logger.warn('⚠️  No Nebula config received in registration response');
-                this.logger.warn('   This may be normal if:');
-                this.logger.warn('   - Machine already has Nebula config');
-                this.logger.warn('   - No workspace found for this machine');
-                this.logger.warn('   - Workspace does not have Nebula network configured');
-                utils_1.cliLogger.completeProcess('Machine registration completed!', {
-                    'Machine Key': machineKey.substring(0, 8) + '...',
-                    'OS': osInfo,
-                    'Hostname': hostname,
-                    'Tailscale IP': tailscaleIp || 'N/A',
-                    'Note': 'No Nebula config (may be normal)',
+                utils_1.cliLogger.block({
+                    title: 'No Nebula config received',
+                    context: 'MachineService',
+                    func: 'registerMachine',
+                    type: 'warning',
+                    metadata: {},
+                });
+                utils_1.cliLogger.block({
+                    title: 'No Nebula config received in registration response',
+                    context: 'MachineService',
+                    func: 'registerMachine',
+                    type: 'warning',
+                    metadata: {},
+                });
+                utils_1.cliLogger.block({
+                    title: 'Machine registration completed!',
+                    context: 'MachineService',
+                    func: 'registerMachine',
+                    type: 'success',
+                    metadata: {
+                        machineKey: machineKey,
+                    },
                 });
             }
             return { success: true };
         }
         else {
-            utils_1.cliLogger.error('Failed to register machine');
-            this.logger.warn('Failed to register machine, will retry later');
+            utils_1.cliLogger.block({
+                title: 'Failed to register machine',
+                context: 'MachineService',
+                func: 'registerMachine',
+                type: 'error',
+                metadata: {},
+            });
+            utils_1.cliLogger.block({
+                title: 'Failed to register machine, will retry later',
+                context: 'MachineService',
+                func: 'registerMachine',
+                type: 'warning',
+                metadata: {},
+            });
             return { success: false };
         }
     }
     async updateMachineStatus(status) {
         const machineKey = await this.configService.getMachineKey();
         if (!machineKey) {
+            utils_1.cliLogger.block({
+                title: 'Machine key not found in config',
+                context: 'MachineService',
+                func: 'updateMachineStatus',
+                type: 'warning',
+                metadata: {},
+            });
             return;
         }
         const payload = { status };
         const response = await this.apiService.callApiWithStatus('POST', `/machines/${machineKey}/status`, payload, 3, 5000);
         if (response.status === 404) {
-            this.logger.error(`⚠️  Machine ${machineKey} not found on server (404)`);
-            this.logger.error('   This machine may have been deleted from the backend');
-            this.logger.error('   Cleaning up local configuration...');
+            utils_1.cliLogger.block({
+                title: `Machine ${machineKey} not found on server (404)`,
+                context: 'MachineService',
+                func: 'updateMachineStatus',
+                type: 'error',
+                metadata: {},
+            });
+            utils_1.cliLogger.block({
+                title: 'This machine may have been deleted from the backend',
+                context: 'MachineService',
+                func: 'updateMachineStatus',
+                type: 'warning',
+                metadata: {},
+            });
+            utils_1.cliLogger.block({
+                title: 'Cleaning up local configuration...',
+                context: 'MachineService',
+                func: 'updateMachineStatus',
+                type: 'warning',
+                metadata: {},
+            });
             try {
                 await this.configService.deleteConfig();
-                this.logger.log('✓ Local configuration deleted');
-                this.logger.log('   Please restart the agent to re-register with a new machine key');
+                utils_1.cliLogger.block({
+                    title: 'Local configuration deleted',
+                    context: 'MachineService',
+                    func: 'updateMachineStatus',
+                    type: 'success',
+                    metadata: {},
+                });
+                utils_1.cliLogger.block({
+                    title: 'Please restart the agent to re-register with a new machine key',
+                    context: 'MachineService',
+                    func: 'updateMachineStatus',
+                    type: 'warning',
+                    metadata: {},
+                });
                 process.exit(1);
             }
             catch (error) {
@@ -196,19 +296,53 @@ let MachineService = MachineService_1 = class MachineService {
     async validateApiKey() {
         const isValid = await this.apiService.validateApiKey();
         if (!isValid) {
-            utils_1.cliLogger.error('API key is invalid or has been deleted');
-            this.logger.error('⚠️  API key is invalid or has been deleted');
-            this.logger.error('   Cleaning up local configuration...');
+            utils_1.cliLogger.block({
+                title: 'API key is invalid or has been deleted',
+                context: 'MachineService',
+                func: 'validateApiKey',
+                type: 'error',
+                metadata: {},
+            });
+            utils_1.cliLogger.block({
+                title: 'API key is invalid or has been deleted',
+                context: 'MachineService',
+                func: 'validateApiKey',
+                type: 'error',
+                metadata: {},
+            });
+            utils_1.cliLogger.block({
+                title: 'Cleaning up local configuration...',
+                context: 'MachineService',
+                func: 'validateApiKey',
+                type: 'warning',
+                metadata: {},
+            });
             try {
                 await this.configService.deleteConfig();
-                utils_1.cliLogger.warning('Local configuration deleted');
-                this.logger.log('✓ Local configuration deleted');
-                this.logger.log('   Please restart the agent and provide a valid API key');
+                utils_1.cliLogger.block({
+                    title: 'Local configuration deleted',
+                    context: 'MachineService',
+                    func: 'validateApiKey',
+                    type: 'success',
+                    metadata: {},
+                });
+                utils_1.cliLogger.block({
+                    title: 'Please restart the agent and provide a valid API key',
+                    context: 'MachineService',
+                    func: 'validateApiKey',
+                    type: 'warning',
+                    metadata: {},
+                });
                 process.exit(1);
             }
             catch (error) {
-                utils_1.cliLogger.error(`Failed to delete local config: ${error.message}`);
-                this.logger.error(`Failed to delete local config: ${error.message}`);
+                utils_1.cliLogger.block({
+                    title: `Failed to delete local config: ${error.message}`,
+                    context: 'MachineService',
+                    func: 'validateApiKey',
+                    type: 'error',
+                    metadata: {},
+                });
             }
         }
     }
@@ -217,6 +351,6 @@ exports.MachineService = MachineService;
 exports.MachineService = MachineService = MachineService_1 = __decorate([
     (0, common_1.Injectable)(),
     __metadata("design:paramtypes", [api_service_1.ApiService,
-        config_service_1.ConfigService])
+        config_service_1.ConfigAgentService])
 ], MachineService);
 //# sourceMappingURL=machine.service.js.map

package/dist/apps/agent/src/agent/services/machine.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"machine.service.js","sourceRoot":"","sources":["../../../../../../src/agent/services/machine.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"machine.service.js","sourceRoot":"","sources":["../../../../../../src/agent/services/machine.service.ts"],"names":[],"mappings":"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"}

package/dist/apps/agent/src/agent/services/nebula.service.d.ts

@@ -1,4 +1,4 @@
-import { ConfigService } from './config.service';
+import { ConfigAgentService } from './config.service';
 export interface NebulaConfig {
     ip: string;
     cert: string;
@@ -21,7 +21,7 @@ export declare class NebulaService {
     private get CONFIG_PATH();
     private getMachineCertPath;
     private getMachineKeyPath;
-    constructor(configService: ConfigService);
+    constructor(configService: ConfigAgentService);
     initializeNebula(nebulaConfig: NebulaConfig): Promise<void>;
     startNebula(): Promise<void>;
     stopNebula(): Promise<void>;