@docker-digital/dockernet-agent 0.1.0 → 0.1.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/LICENSE +1 -1
- package/dist/agent/agent.module.js +4 -0
- package/dist/agent/agent.module.js.map +1 -1
- package/dist/agent/commands/run.command.d.ts +3 -1
- package/dist/agent/commands/run.command.js +39 -2
- package/dist/agent/commands/run.command.js.map +1 -1
- package/dist/agent/commands/stop.command.js +66 -10
- package/dist/agent/commands/stop.command.js.map +1 -1
- package/dist/agent/services/docker.service.d.ts +8 -0
- package/dist/agent/services/docker.service.js +87 -0
- package/dist/agent/services/docker.service.js.map +1 -1
- package/dist/agent/services/event.service.d.ts +4 -1
- package/dist/agent/services/event.service.js +18 -5
- package/dist/agent/services/event.service.js.map +1 -1
- package/dist/agent/services/nebula.service.js +1 -1
- package/dist/agent/services/nebula.service.js.map +1 -1
- package/dist/agent/services/profile.service.d.ts +1 -1
- package/dist/agent/services/profile.service.js +107 -48
- package/dist/agent/services/profile.service.js.map +1 -1
- package/dist/agent/services/terminal.service.d.ts +26 -0
- package/dist/agent/services/terminal.service.js +325 -0
- package/dist/agent/services/terminal.service.js.map +1 -0
- package/dist/agent/services/volume-backup.service.d.ts +14 -0
- package/dist/agent/services/volume-backup.service.js +180 -0
- package/dist/agent/services/volume-backup.service.js.map +1 -0
- package/dist/main.js +1 -1
- package/dist/main.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +2 -1
package/LICENSE
CHANGED
|
@@ -27,9 +27,11 @@ const log_service_1 = require("./services/log.service");
|
|
|
27
27
|
const machine_service_1 = require("./services/machine.service");
|
|
28
28
|
const profile_service_1 = require("./services/profile.service");
|
|
29
29
|
const volume_sync_service_1 = require("./services/volume-sync.service");
|
|
30
|
+
const volume_backup_service_1 = require("./services/volume-backup.service");
|
|
30
31
|
const websocket_client_service_1 = require("./services/websocket-client.service");
|
|
31
32
|
const event_websocket_client_service_1 = require("./services/event-websocket-client.service");
|
|
32
33
|
const nebula_service_1 = require("./services/nebula.service");
|
|
34
|
+
const terminal_service_1 = require("./services/terminal.service");
|
|
33
35
|
let AgentModule = class AgentModule {
|
|
34
36
|
};
|
|
35
37
|
exports.AgentModule = AgentModule;
|
|
@@ -55,9 +57,11 @@ exports.AgentModule = AgentModule = __decorate([
|
|
|
55
57
|
machine_service_1.MachineService,
|
|
56
58
|
profile_service_1.ProfileService,
|
|
57
59
|
volume_sync_service_1.VolumeSyncService,
|
|
60
|
+
volume_backup_service_1.VolumeBackupService,
|
|
58
61
|
websocket_client_service_1.WebSocketClientService,
|
|
59
62
|
event_websocket_client_service_1.EventWebSocketClientService,
|
|
60
63
|
nebula_service_1.NebulaService,
|
|
64
|
+
terminal_service_1.TerminalService,
|
|
61
65
|
],
|
|
62
66
|
exports: [
|
|
63
67
|
run_command_1.RunCommand,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent.module.js","sourceRoot":"","sources":["../../src/agent/agent.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAwC;AACxC,2CAA8C;AAC9C,wDAAoD;AACpD,0DAAsD;AACtD,gEAA4D;AAC5D,wDAAoD;AACpD,gEAA4D;AAC5D,8DAA0D;AAC1D,kEAA8D;AAC9D,8DAA0D;AAC1D,gEAA4D;AAC5D,wDAAoD;AACpD,8DAA0D;AAC1D,8DAA0D;AAC1D,0EAAqE;AACrE,4DAAwD;AACxD,wDAAoD;AACpD,gEAA4D;AAC5D,gEAA4D;AAC5D,wEAAmE;AACnE,kFAA6E;AAC7E,8FAAwF;AACxF,8DAA0D;
|
|
1
|
+
{"version":3,"file":"agent.module.js","sourceRoot":"","sources":["../../src/agent/agent.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAwC;AACxC,2CAA8C;AAC9C,wDAAoD;AACpD,0DAAsD;AACtD,gEAA4D;AAC5D,wDAAoD;AACpD,gEAA4D;AAC5D,8DAA0D;AAC1D,kEAA8D;AAC9D,8DAA0D;AAC1D,gEAA4D;AAC5D,wDAAoD;AACpD,8DAA0D;AAC1D,8DAA0D;AAC1D,0EAAqE;AACrE,4DAAwD;AACxD,wDAAoD;AACpD,gEAA4D;AAC5D,gEAA4D;AAC5D,wEAAmE;AACnE,4EAAuE;AACvE,kFAA6E;AAC7E,8FAAwF;AACxF,8DAA0D;AAC1D,kEAA8D;AA2CvD,IAAM,WAAW,GAAjB,MAAM,WAAW;CAAG,CAAA;AAAd,kCAAW;sBAAX,WAAW;IAzCvB,IAAA,eAAM,EAAC;QACN,OAAO,EAAE,CAAC,qBAAY,CAAC;QACvB,SAAS,EAAE;YAET,wBAAU;YACV,0BAAW;YACX,gCAAc;YACd,wBAAU;YACV,gCAAc;YACd,8BAAa;YACb,kCAAe;YACf,8BAAa;YACb,gCAAc;YAEd,wBAAU;YACV,8BAAa;YACb,8BAAa;YACb,yCAAkB;YAClB,4BAAY;YACZ,wBAAU;YACV,gCAAc;YACd,gCAAc;YACd,uCAAiB;YACjB,2CAAmB;YACnB,iDAAsB;YACtB,4DAA2B;YAC3B,8BAAa;YACb,kCAAe;SAChB;QACD,OAAO,EAAE;YACP,wBAAU;YACV,0BAAW;YACX,gCAAc;YACd,wBAAU;YACV,gCAAc;YACd,8BAAa;YACb,kCAAe;YACf,8BAAa;YACb,gCAAc;SACf;KACF,CAAC;GACW,WAAW,CAAG"}
|
|
@@ -9,6 +9,7 @@ import { MachineService } from '../services/machine.service';
|
|
|
9
9
|
import { ProfileService } from '../services/profile.service';
|
|
10
10
|
import { WebSocketClientService } from '../services/websocket-client.service';
|
|
11
11
|
import { NebulaService } from '../services/nebula.service';
|
|
12
|
+
import { TerminalService } from '../services/terminal.service';
|
|
12
13
|
export declare class RunCommand extends CommandRunner implements OnModuleInit {
|
|
13
14
|
private apiService;
|
|
14
15
|
private configService;
|
|
@@ -19,9 +20,10 @@ export declare class RunCommand extends CommandRunner implements OnModuleInit {
|
|
|
19
20
|
private profileService;
|
|
20
21
|
private websocketClientService;
|
|
21
22
|
private nebulaService;
|
|
23
|
+
private terminalService;
|
|
22
24
|
private readonly logger;
|
|
23
25
|
private isRunning;
|
|
24
|
-
constructor(apiService: ApiService, configService: ConfigService, dockerService: DockerService, eventService: EventService, logService: LogService, machineService: MachineService, profileService: ProfileService, websocketClientService: WebSocketClientService, nebulaService: NebulaService);
|
|
26
|
+
constructor(apiService: ApiService, configService: ConfigService, dockerService: DockerService, eventService: EventService, logService: LogService, machineService: MachineService, profileService: ProfileService, websocketClientService: WebSocketClientService, nebulaService: NebulaService, terminalService: TerminalService);
|
|
25
27
|
onModuleInit(): Promise<void>;
|
|
26
28
|
run(): Promise<void>;
|
|
27
29
|
private promptForApiKey;
|
|
@@ -22,9 +22,11 @@ const machine_service_1 = require("../services/machine.service");
|
|
|
22
22
|
const profile_service_1 = require("../services/profile.service");
|
|
23
23
|
const websocket_client_service_1 = require("../services/websocket-client.service");
|
|
24
24
|
const nebula_service_1 = require("../services/nebula.service");
|
|
25
|
+
const terminal_service_1 = require("../services/terminal.service");
|
|
25
26
|
const readline = require("readline");
|
|
27
|
+
const fs = require("fs-extra");
|
|
26
28
|
let RunCommand = RunCommand_1 = class RunCommand extends nest_commander_1.CommandRunner {
|
|
27
|
-
constructor(apiService, configService, dockerService, eventService, logService, machineService, profileService, websocketClientService, nebulaService) {
|
|
29
|
+
constructor(apiService, configService, dockerService, eventService, logService, machineService, profileService, websocketClientService, nebulaService, terminalService) {
|
|
28
30
|
super();
|
|
29
31
|
this.apiService = apiService;
|
|
30
32
|
this.configService = configService;
|
|
@@ -35,11 +37,13 @@ let RunCommand = RunCommand_1 = class RunCommand extends nest_commander_1.Comman
|
|
|
35
37
|
this.profileService = profileService;
|
|
36
38
|
this.websocketClientService = websocketClientService;
|
|
37
39
|
this.nebulaService = nebulaService;
|
|
40
|
+
this.terminalService = terminalService;
|
|
38
41
|
this.logger = new common_1.Logger(RunCommand_1.name);
|
|
39
42
|
this.isRunning = false;
|
|
40
43
|
}
|
|
41
44
|
async onModuleInit() {
|
|
42
45
|
await this.apiService.initialize();
|
|
46
|
+
this.logger.debug(`EventService initialized: ${this.eventService ? 'yes' : 'no'}`);
|
|
43
47
|
}
|
|
44
48
|
async run() {
|
|
45
49
|
await this.runDaemon();
|
|
@@ -118,6 +122,22 @@ let RunCommand = RunCommand_1 = class RunCommand extends nest_commander_1.Comman
|
|
|
118
122
|
catch (error) {
|
|
119
123
|
this.logger.warn(`WebSocket initialization failed: ${error.message}, continuing with polling`);
|
|
120
124
|
}
|
|
125
|
+
this.logger.log('Initializing Terminal WebSocket connection...');
|
|
126
|
+
try {
|
|
127
|
+
await this.terminalService.connect();
|
|
128
|
+
this.logger.log('Terminal WebSocket initialization completed');
|
|
129
|
+
}
|
|
130
|
+
catch (error) {
|
|
131
|
+
this.logger.warn(`Terminal WebSocket initialization failed: ${error.message}`);
|
|
132
|
+
}
|
|
133
|
+
const pidFile = this.configService.pidFilePath;
|
|
134
|
+
try {
|
|
135
|
+
await fs.writeFile(pidFile, process.pid.toString(), 'utf-8');
|
|
136
|
+
this.logger.log(`Agent PID (${process.pid}) written to ${pidFile}`);
|
|
137
|
+
}
|
|
138
|
+
catch (error) {
|
|
139
|
+
this.logger.warn(`Failed to write PID file: ${error.message}`);
|
|
140
|
+
}
|
|
121
141
|
this.logger.log('Checking and updating saved profiles status...');
|
|
122
142
|
try {
|
|
123
143
|
await this.profileService.updateAllProfilesStatus();
|
|
@@ -172,10 +192,18 @@ let RunCommand = RunCommand_1 = class RunCommand extends nest_commander_1.Comman
|
|
|
172
192
|
clearInterval(nebulaConfigInterval);
|
|
173
193
|
this.eventService.stopPolling();
|
|
174
194
|
this.websocketClientService.disconnect();
|
|
195
|
+
this.terminalService.disconnect();
|
|
175
196
|
if (this.nebulaService.isRunning()) {
|
|
176
197
|
await this.nebulaService.stopNebula();
|
|
177
198
|
}
|
|
178
199
|
await this.machineService.updateMachineStatus('exit');
|
|
200
|
+
try {
|
|
201
|
+
await fs.remove(pidFile);
|
|
202
|
+
this.logger.log('PID file removed');
|
|
203
|
+
}
|
|
204
|
+
catch (error) {
|
|
205
|
+
this.logger.warn(`Failed to remove PID file: ${error.message}`);
|
|
206
|
+
}
|
|
179
207
|
process.exit(0);
|
|
180
208
|
});
|
|
181
209
|
process.on('SIGINT', async () => {
|
|
@@ -186,10 +214,18 @@ let RunCommand = RunCommand_1 = class RunCommand extends nest_commander_1.Comman
|
|
|
186
214
|
clearInterval(nebulaConfigInterval);
|
|
187
215
|
this.eventService.stopPolling();
|
|
188
216
|
this.websocketClientService.disconnect();
|
|
217
|
+
this.terminalService.disconnect();
|
|
189
218
|
if (this.nebulaService.isRunning()) {
|
|
190
219
|
await this.nebulaService.stopNebula();
|
|
191
220
|
}
|
|
192
221
|
await this.machineService.updateMachineStatus('exit');
|
|
222
|
+
try {
|
|
223
|
+
await fs.remove(pidFile);
|
|
224
|
+
this.logger.log('PID file removed');
|
|
225
|
+
}
|
|
226
|
+
catch (error) {
|
|
227
|
+
this.logger.warn(`Failed to remove PID file: ${error.message}`);
|
|
228
|
+
}
|
|
193
229
|
process.exit(0);
|
|
194
230
|
});
|
|
195
231
|
this.logger.log('DockSplit Agent daemon is running...');
|
|
@@ -210,6 +246,7 @@ exports.RunCommand = RunCommand = RunCommand_1 = __decorate([
|
|
|
210
246
|
machine_service_1.MachineService,
|
|
211
247
|
profile_service_1.ProfileService,
|
|
212
248
|
websocket_client_service_1.WebSocketClientService,
|
|
213
|
-
nebula_service_1.NebulaService
|
|
249
|
+
nebula_service_1.NebulaService,
|
|
250
|
+
terminal_service_1.TerminalService])
|
|
214
251
|
], RunCommand);
|
|
215
252
|
//# sourceMappingURL=run.command.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run.command.js","sourceRoot":"","sources":["../../../src/agent/commands/run.command.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,2CAAkE;AAClE,mDAAwD;AACxD,yDAAqD;AACrD,+DAA2D;AAC3D,+DAA2D;AAC3D,6DAAyD;AACzD,yDAAqD;AACrD,iEAA6D;AAC7D,iEAA6D;AAC7D,mFAA8E;AAC9E,+DAA2D;AAC3D,qCAAqC;
|
|
1
|
+
{"version":3,"file":"run.command.js","sourceRoot":"","sources":["../../../src/agent/commands/run.command.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,6 +14,9 @@ const common_1 = require("@nestjs/common");
|
|
|
14
14
|
const nest_commander_1 = require("nest-commander");
|
|
15
15
|
const fs = require("fs-extra");
|
|
16
16
|
const config_service_1 = require("../services/config.service");
|
|
17
|
+
const child_process_1 = require("child_process");
|
|
18
|
+
const util_1 = require("util");
|
|
19
|
+
const execAsync = (0, util_1.promisify)(child_process_1.exec);
|
|
17
20
|
let StopCommand = class StopCommand extends nest_commander_1.CommandRunner {
|
|
18
21
|
constructor(configService) {
|
|
19
22
|
super();
|
|
@@ -21,21 +24,74 @@ let StopCommand = class StopCommand extends nest_commander_1.CommandRunner {
|
|
|
21
24
|
}
|
|
22
25
|
async run() {
|
|
23
26
|
const pidFile = this.configService.pidFilePath;
|
|
27
|
+
let stopped = false;
|
|
24
28
|
if (await fs.pathExists(pidFile)) {
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
29
|
+
try {
|
|
30
|
+
const pidContent = await fs.readFile(pidFile, 'utf-8');
|
|
31
|
+
const pid = parseInt(pidContent.trim(), 10);
|
|
32
|
+
if (pid && !isNaN(pid)) {
|
|
33
|
+
try {
|
|
34
|
+
process.kill(pid, 'SIGTERM');
|
|
35
|
+
console.log(`✓ Stopped DockSplit Agent (PID ${pid})`);
|
|
36
|
+
stopped = true;
|
|
37
|
+
}
|
|
38
|
+
catch (error) {
|
|
39
|
+
if (error.code === 'ESRCH') {
|
|
40
|
+
console.log(`Process with PID ${pid} not found. Trying to find by name...`);
|
|
41
|
+
}
|
|
42
|
+
else {
|
|
43
|
+
console.log(`Failed to kill PID ${pid}: ${error.message}`);
|
|
44
|
+
}
|
|
45
|
+
}
|
|
30
46
|
}
|
|
31
|
-
|
|
32
|
-
|
|
47
|
+
await fs.remove(pidFile);
|
|
48
|
+
}
|
|
49
|
+
catch (error) {
|
|
50
|
+
console.log(`Error reading PID file: ${error.message}`);
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
if (!stopped) {
|
|
54
|
+
console.log('PID file not found or process not running. Attempting to kill by process name...');
|
|
55
|
+
try {
|
|
56
|
+
const platform = process.platform;
|
|
57
|
+
let command;
|
|
58
|
+
let processName;
|
|
59
|
+
if (platform === 'win32') {
|
|
60
|
+
processName = 'dockernet-agent.exe';
|
|
61
|
+
command = `taskkill /F /IM ${processName}`;
|
|
62
|
+
}
|
|
63
|
+
else {
|
|
64
|
+
processName = 'dockernet-agent';
|
|
65
|
+
command = `pkill -TERM -f "${processName}" || killall -TERM ${processName} 2>/dev/null || true`;
|
|
33
66
|
}
|
|
67
|
+
const { stderr } = await execAsync(command);
|
|
68
|
+
if (platform === 'win32') {
|
|
69
|
+
if (stderr && !stderr.includes('not found')) {
|
|
70
|
+
console.log(`✓ Stopped DockSplit Agent (by name: ${processName})`);
|
|
71
|
+
stopped = true;
|
|
72
|
+
}
|
|
73
|
+
}
|
|
74
|
+
else {
|
|
75
|
+
try {
|
|
76
|
+
const { stdout: checkOutput } = await execAsync(`pgrep -f "${processName}"`);
|
|
77
|
+
if (!checkOutput.trim()) {
|
|
78
|
+
console.log(`✓ Stopped DockSplit Agent (by name: ${processName})`);
|
|
79
|
+
stopped = true;
|
|
80
|
+
}
|
|
81
|
+
}
|
|
82
|
+
catch (error) {
|
|
83
|
+
console.log(`✓ Stopped DockSplit Agent (by name: ${processName})`);
|
|
84
|
+
stopped = true;
|
|
85
|
+
}
|
|
86
|
+
}
|
|
87
|
+
}
|
|
88
|
+
catch (error) {
|
|
89
|
+
console.log(`Failed to kill by process name: ${error.message}`);
|
|
34
90
|
}
|
|
35
|
-
await fs.remove(pidFile);
|
|
36
91
|
}
|
|
37
|
-
|
|
38
|
-
console.log(
|
|
92
|
+
if (!stopped) {
|
|
93
|
+
console.log('⚠ Could not find or stop DockSplit Agent. It may not be running.');
|
|
94
|
+
process.exit(1);
|
|
39
95
|
}
|
|
40
96
|
process.exit(0);
|
|
41
97
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stop.command.js","sourceRoot":"","sources":["../../../src/agent/commands/stop.command.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,mDAAwD;AACxD,+BAA+B;AAC/B,+DAA2D;
|
|
1
|
+
{"version":3,"file":"stop.command.js","sourceRoot":"","sources":["../../../src/agent/commands/stop.command.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,4 +13,12 @@ export declare class DockerService {
|
|
|
13
13
|
dockerLogin(registryUrl: string, username: string, password: string): Promise<boolean>;
|
|
14
14
|
getProfileContainers(profileId: string): Promise<Docker.ContainerInfo[]>;
|
|
15
15
|
isContainerRunning(containerName: string): Promise<boolean>;
|
|
16
|
+
getContainerId(profileId: string, serviceName: string): Promise<string | null>;
|
|
17
|
+
createTerminalExec(containerId: string, command?: string[]): Promise<Docker.Exec>;
|
|
18
|
+
startExec(exec: Docker.Exec): Promise<{
|
|
19
|
+
stdin: NodeJS.WritableStream;
|
|
20
|
+
stdout: NodeJS.ReadableStream;
|
|
21
|
+
stderr: NodeJS.ReadableStream;
|
|
22
|
+
}>;
|
|
23
|
+
resizeExec(exec: Docker.Exec, cols: number, rows: number): Promise<void>;
|
|
16
24
|
}
|
|
@@ -161,6 +161,93 @@ let DockerService = DockerService_1 = class DockerService {
|
|
|
161
161
|
const status = await this.getContainerStatus(containerName);
|
|
162
162
|
return status === 'running';
|
|
163
163
|
}
|
|
164
|
+
async getContainerId(profileId, serviceName) {
|
|
165
|
+
try {
|
|
166
|
+
const containers = await this.docker.listContainers({
|
|
167
|
+
all: true,
|
|
168
|
+
filters: {
|
|
169
|
+
label: [
|
|
170
|
+
`com.docker.compose.service=${serviceName}`,
|
|
171
|
+
`com.docker.compose.project=${profileId}`,
|
|
172
|
+
],
|
|
173
|
+
},
|
|
174
|
+
});
|
|
175
|
+
if (containers.length > 0) {
|
|
176
|
+
return containers[0].Id;
|
|
177
|
+
}
|
|
178
|
+
const containersByService = await this.docker.listContainers({
|
|
179
|
+
all: true,
|
|
180
|
+
filters: {
|
|
181
|
+
label: [`com.docker.compose.service=${serviceName}`],
|
|
182
|
+
},
|
|
183
|
+
});
|
|
184
|
+
if (containersByService.length > 0) {
|
|
185
|
+
return containersByService[0].Id;
|
|
186
|
+
}
|
|
187
|
+
const allContainers = await this.docker.listContainers({
|
|
188
|
+
all: true,
|
|
189
|
+
});
|
|
190
|
+
const exactMatch = allContainers.find((c) => c.Names.some((n) => n.includes(`${profileId}-${serviceName}`) ||
|
|
191
|
+
n === `/${profileId}-${serviceName}-1` ||
|
|
192
|
+
n === `/${profileId}-${serviceName}`));
|
|
193
|
+
if (exactMatch) {
|
|
194
|
+
return exactMatch.Id;
|
|
195
|
+
}
|
|
196
|
+
return null;
|
|
197
|
+
}
|
|
198
|
+
catch (error) {
|
|
199
|
+
this.logger.error(`Error getting container ID for ${serviceName} in profile ${profileId}: ${error.message}`);
|
|
200
|
+
return null;
|
|
201
|
+
}
|
|
202
|
+
}
|
|
203
|
+
async createTerminalExec(containerId, command = ['/bin/sh']) {
|
|
204
|
+
try {
|
|
205
|
+
const container = this.docker.getContainer(containerId);
|
|
206
|
+
const exec = await container.exec({
|
|
207
|
+
Cmd: command,
|
|
208
|
+
AttachStdin: true,
|
|
209
|
+
AttachStdout: true,
|
|
210
|
+
AttachStderr: true,
|
|
211
|
+
Tty: true,
|
|
212
|
+
});
|
|
213
|
+
this.logger.log(`Created exec instance for container ${containerId}`);
|
|
214
|
+
return exec;
|
|
215
|
+
}
|
|
216
|
+
catch (error) {
|
|
217
|
+
this.logger.error(`Failed to create exec for container ${containerId}: ${error.message}`);
|
|
218
|
+
throw error;
|
|
219
|
+
}
|
|
220
|
+
}
|
|
221
|
+
async startExec(exec) {
|
|
222
|
+
return new Promise((resolve, reject) => {
|
|
223
|
+
exec.start({
|
|
224
|
+
hijack: true,
|
|
225
|
+
stdin: true,
|
|
226
|
+
}, (err, stream) => {
|
|
227
|
+
if (err) {
|
|
228
|
+
this.logger.error(`Failed to start exec: ${err.message}`);
|
|
229
|
+
return reject(err);
|
|
230
|
+
}
|
|
231
|
+
const stdin = stream;
|
|
232
|
+
const stdout = stream;
|
|
233
|
+
const stderr = stream;
|
|
234
|
+
this.logger.debug('Exec streams created (TTY mode: single combined stream)');
|
|
235
|
+
resolve({ stdin, stdout, stderr });
|
|
236
|
+
});
|
|
237
|
+
});
|
|
238
|
+
}
|
|
239
|
+
async resizeExec(exec, cols, rows) {
|
|
240
|
+
return new Promise((resolve, reject) => {
|
|
241
|
+
exec.resize({ h: rows, w: cols }, (err) => {
|
|
242
|
+
if (err) {
|
|
243
|
+
this.logger.error(`Failed to resize exec: ${err.message}`);
|
|
244
|
+
return reject(err);
|
|
245
|
+
}
|
|
246
|
+
this.logger.debug(`Exec resized to ${cols}x${rows}`);
|
|
247
|
+
resolve();
|
|
248
|
+
});
|
|
249
|
+
});
|
|
250
|
+
}
|
|
164
251
|
};
|
|
165
252
|
exports.DockerService = DockerService;
|
|
166
253
|
exports.DockerService = DockerService = DockerService_1 = __decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"docker.service.js","sourceRoot":"","sources":["../../../src/agent/services/docker.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,2CAAoD;AACpD,oCAAoC;AACpC,+BAA+B;AAC/B,6BAA6B;AAC7B,iDAAqC;AACrC,+BAAiC;
|
|
1
|
+
{"version":3,"file":"docker.service.js","sourceRoot":"","sources":["../../../src/agent/services/docker.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,10 @@
|
|
|
1
|
+
import { OnModuleInit } from '@nestjs/common';
|
|
1
2
|
import { ApiService } from './api.service';
|
|
2
3
|
import { ConfigService } from './config.service';
|
|
3
4
|
import { ProfileService } from './profile.service';
|
|
4
5
|
import { WebSocketClientService } from './websocket-client.service';
|
|
5
6
|
import { EventWebSocketClientService } from './event-websocket-client.service';
|
|
6
|
-
export declare class EventService {
|
|
7
|
+
export declare class EventService implements OnModuleInit {
|
|
7
8
|
private apiService;
|
|
8
9
|
private configService;
|
|
9
10
|
private profileService;
|
|
@@ -13,7 +14,9 @@ export declare class EventService {
|
|
|
13
14
|
private isPolling;
|
|
14
15
|
private useEventDrivenUpdates;
|
|
15
16
|
private isWebSocketListening;
|
|
17
|
+
private statusUpdateCounter;
|
|
16
18
|
constructor(apiService: ApiService, configService: ConfigService, profileService: ProfileService, websocketClientService: WebSocketClientService, eventWebSocketClientService: EventWebSocketClientService);
|
|
19
|
+
onModuleInit(): Promise<void>;
|
|
17
20
|
startPolling(): Promise<void>;
|
|
18
21
|
private startWebSocketListening;
|
|
19
22
|
private startPollingFallback;
|
|
@@ -29,9 +29,15 @@ let EventService = EventService_1 = class EventService {
|
|
|
29
29
|
this.isPolling = false;
|
|
30
30
|
this.useEventDrivenUpdates = false;
|
|
31
31
|
this.isWebSocketListening = false;
|
|
32
|
+
this.statusUpdateCounter = 0;
|
|
32
33
|
this.useEventDrivenUpdates =
|
|
33
34
|
this.websocketClientService.isWebSocketConnected();
|
|
34
35
|
}
|
|
36
|
+
async onModuleInit() {
|
|
37
|
+
this.logger.log('EventService initialized - cron jobs should be active');
|
|
38
|
+
this.logger.log(`updateSavedProfiles cron job registered: @Cron(${schedule_1.CronExpression.EVERY_5_SECONDS})`);
|
|
39
|
+
this.logger.debug(`EventService status: isPolling=${this.isPolling}, useEventDrivenUpdates=${this.useEventDrivenUpdates}`);
|
|
40
|
+
}
|
|
35
41
|
async startPolling() {
|
|
36
42
|
if (this.isPolling) {
|
|
37
43
|
return;
|
|
@@ -88,6 +94,7 @@ let EventService = EventService_1 = class EventService {
|
|
|
88
94
|
catch (error) {
|
|
89
95
|
this.logger.error(`Error polling events: ${error.message}`);
|
|
90
96
|
try {
|
|
97
|
+
await this.profileService.updateAllProfilesStatus();
|
|
91
98
|
}
|
|
92
99
|
catch (updateError) {
|
|
93
100
|
this.logger.error(`Error updating profiles after polling error: ${updateError.message}`);
|
|
@@ -140,6 +147,7 @@ let EventService = EventService_1 = class EventService {
|
|
|
140
147
|
if (!response) {
|
|
141
148
|
this.logger.log('No response from server, checking saved profiles status...');
|
|
142
149
|
try {
|
|
150
|
+
await this.profileService.updateAllProfilesStatus();
|
|
143
151
|
}
|
|
144
152
|
catch (error) {
|
|
145
153
|
this.logger.error(`Error updating saved profiles: ${error.message}`);
|
|
@@ -151,6 +159,7 @@ let EventService = EventService_1 = class EventService {
|
|
|
151
159
|
if (eventsCount === 0) {
|
|
152
160
|
this.logger.log('No new events, checking saved profiles status...');
|
|
153
161
|
try {
|
|
162
|
+
await this.profileService.updateAllProfilesStatus();
|
|
154
163
|
}
|
|
155
164
|
catch (error) {
|
|
156
165
|
this.logger.error(`Error updating saved profiles: ${error.message}`);
|
|
@@ -206,15 +215,19 @@ let EventService = EventService_1 = class EventService {
|
|
|
206
215
|
}
|
|
207
216
|
}
|
|
208
217
|
async updateSavedProfiles() {
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
218
|
+
const isWebSocketConnected = this.websocketClientService.isWebSocketConnected();
|
|
219
|
+
this.useEventDrivenUpdates = isWebSocketConnected;
|
|
220
|
+
this.statusUpdateCounter++;
|
|
221
|
+
if (isWebSocketConnected) {
|
|
222
|
+
if (this.statusUpdateCounter % 5 !== 0) {
|
|
213
223
|
return;
|
|
214
224
|
}
|
|
215
|
-
|
|
225
|
+
}
|
|
226
|
+
else {
|
|
216
227
|
}
|
|
217
228
|
try {
|
|
229
|
+
await this.profileService.updateAllProfilesStatus();
|
|
230
|
+
this.logger.debug('Successfully updated all profiles status');
|
|
218
231
|
}
|
|
219
232
|
catch (error) {
|
|
220
233
|
this.logger.error(`Error updating saved profiles: ${error.message}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"event.service.js","sourceRoot":"","sources":["../../../src/agent/services/event.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"event.service.js","sourceRoot":"","sources":["../../../src/agent/services/event.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -117,7 +117,7 @@ let NebulaService = NebulaService_1 = class NebulaService {
|
|
|
117
117
|
this.logger.warn(`⚠️ Invalid lighthouse port: ${lighthousePortStr}, using default 42000`);
|
|
118
118
|
lighthousePort = 42000;
|
|
119
119
|
}
|
|
120
|
-
const lighthousePublicIP = process.env.BACKEND_PUBLIC_IP || '
|
|
120
|
+
const lighthousePublicIP = process.env.BACKEND_PUBLIC_IP || 'lighthousedocksplit.duckdns.org';
|
|
121
121
|
this.lighthouseIP = lighthouseIP;
|
|
122
122
|
this.lighthousePublicIP = lighthousePublicIP;
|
|
123
123
|
this.lighthousePort = lighthousePort;
|