easy-devops 0.2.4 → 0.2.6
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/cli/managers/nginx-manager.js +5 -20
- package/cli/menus/update.js +55 -147
- package/package.json +1 -1
|
@@ -247,7 +247,7 @@ async function installNginx() {
|
|
|
247
247
|
if (hasWinget) {
|
|
248
248
|
spinner.text = 'Installing nginx via winget…';
|
|
249
249
|
const result = await run(
|
|
250
|
-
'winget install -e --id
|
|
250
|
+
'winget install -e --id Nginx.Nginx --accept-package-agreements --accept-source-agreements',
|
|
251
251
|
{ timeout: 120000 },
|
|
252
252
|
);
|
|
253
253
|
if (result.success) {
|
|
@@ -268,7 +268,7 @@ async function installNginx() {
|
|
|
268
268
|
let nginxVersion = FALLBACK_VERSION;
|
|
269
269
|
|
|
270
270
|
const fetchVersionResult = await run(
|
|
271
|
-
`
|
|
271
|
+
`try { $p=(Invoke-WebRequest -Uri 'https://nginx.org/en/download.html' -UseBasicParsing -TimeoutSec 15).Content; if($p -match 'nginx-(\\d+\\.\\d+\\.\\d+)\\.zip'){$Matches[1]}else{''} } catch { '' }`,
|
|
272
272
|
{ timeout: 20000 },
|
|
273
273
|
);
|
|
274
274
|
const fetched = (fetchVersionResult.stdout || '').trim();
|
|
@@ -276,30 +276,15 @@ async function installNginx() {
|
|
|
276
276
|
|
|
277
277
|
const { nginxDir } = loadConfig();
|
|
278
278
|
const zipUrl = `https://nginx.org/download/nginx-${nginxVersion}.zip`;
|
|
279
|
-
const zipDest = `$env:TEMP\\nginx-${nginxVersion}.zip`;
|
|
280
279
|
|
|
281
280
|
spinner.text = `Downloading nginx ${nginxVersion}…`;
|
|
282
281
|
|
|
283
|
-
|
|
284
|
-
|
|
285
|
-
let downloadResult = await run(
|
|
286
|
-
`[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $ProgressPreference='SilentlyContinue'; Invoke-WebRequest -Uri '${zipUrl}' -OutFile "${zipDest}" -UseBasicParsing -TimeoutSec 120`,
|
|
282
|
+
const downloadResult = await run(
|
|
283
|
+
`$ProgressPreference='SilentlyContinue'; Invoke-WebRequest -Uri '${zipUrl}' -OutFile "$env:TEMP\\nginx-${nginxVersion}.zip" -UseBasicParsing -TimeoutSec 120`,
|
|
287
284
|
{ timeout: 130000 },
|
|
288
285
|
);
|
|
289
|
-
if (downloadResult.success) {
|
|
290
|
-
downloadOk = true;
|
|
291
|
-
} else {
|
|
292
|
-
const hasCurl = (await run('where.exe curl.exe 2>$null')).success;
|
|
293
|
-
if (hasCurl) {
|
|
294
|
-
downloadResult = await run(
|
|
295
|
-
`curl.exe -L --silent --show-error --max-time 120 -o "${zipDest}" "${zipUrl}"`,
|
|
296
|
-
{ timeout: 130000 },
|
|
297
|
-
);
|
|
298
|
-
if (downloadResult.success) downloadOk = true;
|
|
299
|
-
}
|
|
300
|
-
}
|
|
301
286
|
|
|
302
|
-
if (!
|
|
287
|
+
if (!downloadResult.success) {
|
|
303
288
|
spinner.fail('Download failed');
|
|
304
289
|
console.log(chalk.red(downloadResult.stderr || downloadResult.stdout));
|
|
305
290
|
console.log(chalk.gray(`\n Download nginx manually from: https://nginx.org/en/download.html\n`));
|
package/cli/menus/update.js
CHANGED
|
@@ -4,37 +4,31 @@
|
|
|
4
4
|
* Check for updates and upgrade easy-devops in place.
|
|
5
5
|
*
|
|
6
6
|
* Flow:
|
|
7
|
-
*
|
|
8
|
-
*
|
|
9
|
-
*
|
|
10
|
-
*
|
|
11
|
-
*
|
|
12
|
-
*
|
|
13
|
-
*
|
|
14
|
-
*
|
|
15
|
-
* 7. This process exits; update script runs
|
|
16
|
-
* 8. On next launch, recoverIfNeeded restarts dashboard if needed
|
|
7
|
+
* 1. Fetch latest version from npm registry
|
|
8
|
+
* 2. If an update is available, offer to install it
|
|
9
|
+
* 3. Before installing: record dashboard running state in DB
|
|
10
|
+
* (key: 'update-pre-dashboard') so it survives a crash mid-update
|
|
11
|
+
* 4. Stop dashboard if it was running
|
|
12
|
+
* 5. Run: npm install -g easy-devops@<latest>
|
|
13
|
+
* 6. Re-start dashboard if it was running before
|
|
14
|
+
* 7. Clear the saved state key
|
|
17
15
|
*/
|
|
18
16
|
|
|
19
17
|
import chalk from 'chalk';
|
|
20
18
|
import inquirer from 'inquirer';
|
|
21
19
|
import ora from 'ora';
|
|
22
20
|
import path from 'path';
|
|
23
|
-
import fs from 'fs';
|
|
24
21
|
import { fileURLToPath } from 'url';
|
|
25
22
|
import { createRequire } from 'module';
|
|
26
|
-
import { spawn } from 'child_process';
|
|
27
23
|
import { run } from '../../core/shell.js';
|
|
28
|
-
import { dbGet, dbSet, closeDb } from '../../core/db.js';
|
|
24
|
+
import { dbGet, dbSet, closeDb, initDb } from '../../core/db.js';
|
|
29
25
|
import { loadConfig } from '../../core/config.js';
|
|
30
|
-
import { getDashboardStatus, stopDashboard } from './dashboard.js';
|
|
26
|
+
import { getDashboardStatus, startDashboard, stopDashboard } from './dashboard.js';
|
|
31
27
|
|
|
32
28
|
const __dirname = path.dirname(fileURLToPath(import.meta.url));
|
|
33
|
-
const require
|
|
29
|
+
const require = createRequire(import.meta.url);
|
|
34
30
|
const { version: currentVersion } = require('../../package.json');
|
|
35
31
|
|
|
36
|
-
const isWindows = process.platform === 'win32';
|
|
37
|
-
|
|
38
32
|
// ─── Version helpers ──────────────────────────────────────────────────────────
|
|
39
33
|
|
|
40
34
|
async function fetchLatestVersion() {
|
|
@@ -60,20 +54,18 @@ async function recoverIfNeeded() {
|
|
|
60
54
|
const saved = dbGet('update-pre-dashboard');
|
|
61
55
|
if (!saved?.wasRunning) return;
|
|
62
56
|
|
|
63
|
-
console.log(chalk.yellow('\n
|
|
57
|
+
console.log(chalk.yellow('\n A previous update left the dashboard stopped.'));
|
|
64
58
|
const { restart } = await inquirer.prompt([{
|
|
65
|
-
type:
|
|
66
|
-
name:
|
|
59
|
+
type: 'confirm',
|
|
60
|
+
name: 'restart',
|
|
67
61
|
message: 'Restart the dashboard now?',
|
|
68
62
|
default: true,
|
|
69
63
|
}]);
|
|
70
64
|
|
|
71
65
|
if (restart) {
|
|
72
|
-
// Dynamic import to avoid circular dependency and ensure fresh state
|
|
73
|
-
const { startDashboard } = await import('./dashboard.js');
|
|
74
66
|
const port = saved.port || loadConfig().dashboardPort;
|
|
75
|
-
const sp
|
|
76
|
-
const res
|
|
67
|
+
const sp = ora(`Starting dashboard on port ${port}...`).start();
|
|
68
|
+
const res = await startDashboard(port);
|
|
77
69
|
res.success
|
|
78
70
|
? sp.succeed(`Dashboard restarted on port ${port}`)
|
|
79
71
|
: sp.fail('Could not restart dashboard — use the Dashboard menu');
|
|
@@ -84,141 +76,54 @@ async function recoverIfNeeded() {
|
|
|
84
76
|
|
|
85
77
|
// ─── Perform update ───────────────────────────────────────────────────────────
|
|
86
78
|
|
|
87
|
-
/**
|
|
88
|
-
* Creates and spawns an external update script that runs after this process exits.
|
|
89
|
-
* This is necessary on Windows because better-sqlite3's native module stays locked
|
|
90
|
-
* as long as any Node.js process has the database open.
|
|
91
|
-
*/
|
|
92
79
|
async function performUpdate(latestVersion) {
|
|
93
80
|
// Step 1 — snapshot dashboard state and persist it
|
|
94
81
|
const status = await getDashboardStatus();
|
|
95
82
|
dbSet('update-pre-dashboard', {
|
|
96
83
|
wasRunning: status.running,
|
|
97
|
-
pid:
|
|
98
|
-
port:
|
|
84
|
+
pid: status.pid,
|
|
85
|
+
port: status.port,
|
|
99
86
|
});
|
|
100
87
|
|
|
101
|
-
// Step 2 — stop dashboard if running
|
|
88
|
+
// Step 2 — stop dashboard if running
|
|
102
89
|
if (status.running) {
|
|
103
90
|
const sp = ora('Stopping dashboard...').start();
|
|
104
91
|
await stopDashboard(status.pid);
|
|
105
92
|
sp.succeed('Dashboard stopped');
|
|
106
|
-
// Give the dashboard process a moment to fully terminate
|
|
107
|
-
await new Promise(r => setTimeout(r, 2000));
|
|
108
93
|
}
|
|
109
94
|
|
|
110
|
-
// Step 3 — close
|
|
95
|
+
// Step 3 — close the SQLite connection so npm can rename the db file (EBUSY on Windows)
|
|
111
96
|
closeDb();
|
|
112
97
|
|
|
113
|
-
// Step 4 —
|
|
114
|
-
|
|
115
|
-
const
|
|
116
|
-
$ProgressPreference = 'SilentlyContinue'
|
|
117
|
-
Write-Host ""
|
|
118
|
-
Write-Host "Installing easy-devops@${latestVersion}..." -ForegroundColor Cyan
|
|
119
|
-
Write-Host ""
|
|
120
|
-
npm install -g easy-devops@${latestVersion}
|
|
121
|
-
if ($LASTEXITCODE -eq 0) {
|
|
122
|
-
Write-Host ""
|
|
123
|
-
Write-Host "Successfully updated to v${latestVersion}" -ForegroundColor Green
|
|
124
|
-
Write-Host "Run 'easy-devops' to start the new version." -ForegroundColor Gray
|
|
125
|
-
} else {
|
|
126
|
-
Write-Host ""
|
|
127
|
-
Write-Host "Update failed. Please try again or update manually:" -ForegroundColor Red
|
|
128
|
-
Write-Host " npm install -g easy-devops@${latestVersion}" -ForegroundColor Yellow
|
|
129
|
-
}
|
|
130
|
-
Write-Host ""
|
|
131
|
-
Write-Host "Press any key to close this window..." -ForegroundColor Gray
|
|
132
|
-
$null = $Host.UI.RawUI.ReadKey('NoEcho,IncludeKeyDown')
|
|
133
|
-
`;
|
|
134
|
-
|
|
135
|
-
const updateScriptBash = `#!/bin/bash
|
|
136
|
-
echo ""
|
|
137
|
-
echo -e "\\033[36mInstalling easy-devops@${latestVersion}...\\033[0m"
|
|
138
|
-
echo ""
|
|
139
|
-
npm install -g easy-devops@${latestVersion}
|
|
140
|
-
if [ $? -eq 0 ]; then
|
|
141
|
-
echo ""
|
|
142
|
-
echo -e "\\033[32mSuccessfully updated to v${latestVersion}\\033[0m"
|
|
143
|
-
echo -e "\\033[90mRun 'easy-devops' to start the new version.\\033[0m"
|
|
144
|
-
else
|
|
145
|
-
echo ""
|
|
146
|
-
echo -e "\\033[31mUpdate failed. Please try again or update manually:\\033[0m"
|
|
147
|
-
echo -e "\\033[33m npm install -g easy-devops@${latestVersion}\\033[0m"
|
|
148
|
-
fi
|
|
149
|
-
echo ""
|
|
150
|
-
read -p "Press Enter to close this window..."
|
|
151
|
-
`;
|
|
98
|
+
// Step 4 — install new version
|
|
99
|
+
const sp = ora(`Installing easy-devops@${latestVersion}...`).start();
|
|
100
|
+
const result = await run(`npm install -g easy-devops@${latestVersion}`, { timeout: 120000 });
|
|
152
101
|
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
const tempDir = process.env.TEMP || 'C:\\Windows\\Temp';
|
|
160
|
-
const tempScript = path.join(tempDir, 'easy-devops-update.ps1');
|
|
161
|
-
fs.writeFileSync(tempScript, updateScriptPS, 'utf8');
|
|
162
|
-
|
|
163
|
-
// Run in a new window, this process will exit
|
|
164
|
-
spawn('powershell.exe', [
|
|
165
|
-
'-NoExit',
|
|
166
|
-
'-ExecutionPolicy', 'Bypass',
|
|
167
|
-
'-File', tempScript
|
|
168
|
-
], {
|
|
169
|
-
detached: true,
|
|
170
|
-
stdio: 'ignore',
|
|
171
|
-
windowsHide: false
|
|
172
|
-
}).unref();
|
|
102
|
+
if (!result.success) {
|
|
103
|
+
sp.fail('Update failed');
|
|
104
|
+
console.log(chalk.red('\n' + (result.stderr || result.stdout) + '\n'));
|
|
105
|
+
// Leave 'update-pre-dashboard' in DB so recovery runs on next launch
|
|
106
|
+
return false;
|
|
107
|
+
}
|
|
173
108
|
|
|
174
|
-
|
|
175
|
-
console.log(chalk.gray(` Update script: ${tempScript}`));
|
|
176
|
-
} else {
|
|
177
|
-
// On Linux/Mac, run in a new terminal window if possible
|
|
178
|
-
const tempScript = '/tmp/easy-devops-update.sh';
|
|
179
|
-
fs.writeFileSync(tempScript, updateScriptBash, 'utf8');
|
|
180
|
-
fs.chmodSync(tempScript, '755');
|
|
109
|
+
sp.succeed(`Updated to v${latestVersion}`);
|
|
181
110
|
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
['gnome-terminal', '--', 'bash', '-c', updateScriptBash],
|
|
185
|
-
['xterm', '-e', 'bash', '-c', updateScriptBash],
|
|
186
|
-
['konsole', '-e', 'bash', '-c', updateScriptBash],
|
|
187
|
-
];
|
|
188
|
-
let launched = false;
|
|
111
|
+
// Re-initialize the database connection after npm replaced the module
|
|
112
|
+
initDb();
|
|
189
113
|
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
detached: true,
|
|
194
|
-
stdio: 'ignore'
|
|
195
|
-
}).unref();
|
|
196
|
-
launched = true;
|
|
197
|
-
break;
|
|
198
|
-
} catch { /* try next */ }
|
|
199
|
-
}
|
|
114
|
+
// Step 5 — restart dashboard if it was running before
|
|
115
|
+
const saved = dbGet('update-pre-dashboard');
|
|
116
|
+
dbSet('update-pre-dashboard', null);
|
|
200
117
|
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
console.log(chalk.red('\n Update failed:'));
|
|
209
|
-
console.log(result.stderr || result.stdout);
|
|
210
|
-
}
|
|
211
|
-
return result.success;
|
|
212
|
-
}
|
|
118
|
+
if (saved?.wasRunning) {
|
|
119
|
+
const port = saved.port || loadConfig().dashboardPort;
|
|
120
|
+
const restSp = ora(`Restarting dashboard on port ${port}...`).start();
|
|
121
|
+
const res = await startDashboard(port);
|
|
122
|
+
res.success
|
|
123
|
+
? restSp.succeed(`Dashboard restarted on port ${port}`)
|
|
124
|
+
: restSp.fail('Could not restart dashboard — use the Dashboard menu');
|
|
213
125
|
}
|
|
214
126
|
|
|
215
|
-
// Give a moment for the external process to start
|
|
216
|
-
await new Promise(r => setTimeout(r, 1000));
|
|
217
|
-
|
|
218
|
-
console.log(chalk.green('\n Update process launched.'));
|
|
219
|
-
console.log(chalk.gray(' Complete the update in the new window, then run: easy-devops'));
|
|
220
|
-
console.log(chalk.gray(' If the dashboard was running, it will be restarted on next launch.\n'));
|
|
221
|
-
|
|
222
127
|
return true;
|
|
223
128
|
}
|
|
224
129
|
|
|
@@ -232,12 +137,12 @@ export default async function updateMenu() {
|
|
|
232
137
|
const latestVersion = await fetchLatestVersion();
|
|
233
138
|
spinner.stop();
|
|
234
139
|
|
|
235
|
-
console.log(chalk.bold('\n
|
|
236
|
-
console.log(chalk.gray('
|
|
237
|
-
console.log(`
|
|
140
|
+
console.log(chalk.bold('\n Check for Updates'));
|
|
141
|
+
console.log(chalk.gray(' ' + '─'.repeat(40)));
|
|
142
|
+
console.log(` Current version : ${chalk.cyan('v' + currentVersion)}`);
|
|
238
143
|
|
|
239
144
|
if (!latestVersion) {
|
|
240
|
-
console.log(chalk.yellow('
|
|
145
|
+
console.log(chalk.yellow(' Could not reach npm registry. Check your internet connection.\n'));
|
|
241
146
|
await inquirer.prompt([{ type: 'input', name: '_', message: 'Press Enter to go back...' }]);
|
|
242
147
|
return;
|
|
243
148
|
}
|
|
@@ -245,9 +150,9 @@ export default async function updateMenu() {
|
|
|
245
150
|
const updateAvailable = isNewer(latestVersion, currentVersion);
|
|
246
151
|
|
|
247
152
|
if (updateAvailable) {
|
|
248
|
-
console.log(`
|
|
153
|
+
console.log(` Latest version : ${chalk.green('v' + latestVersion)} ${chalk.yellow('← update available')}\n`);
|
|
249
154
|
} else {
|
|
250
|
-
console.log(`
|
|
155
|
+
console.log(` Latest version : ${chalk.green('v' + latestVersion)} ${chalk.gray('✓ up to date')}\n`);
|
|
251
156
|
}
|
|
252
157
|
|
|
253
158
|
const choices = updateAvailable
|
|
@@ -257,8 +162,8 @@ export default async function updateMenu() {
|
|
|
257
162
|
let choice;
|
|
258
163
|
try {
|
|
259
164
|
({ choice } = await inquirer.prompt([{
|
|
260
|
-
type:
|
|
261
|
-
name:
|
|
165
|
+
type: 'list',
|
|
166
|
+
name: 'choice',
|
|
262
167
|
message: 'Select an option:',
|
|
263
168
|
choices,
|
|
264
169
|
}]));
|
|
@@ -268,9 +173,12 @@ export default async function updateMenu() {
|
|
|
268
173
|
}
|
|
269
174
|
|
|
270
175
|
if (choice === `Update to v${latestVersion}`) {
|
|
271
|
-
await performUpdate(latestVersion);
|
|
176
|
+
const success = await performUpdate(latestVersion);
|
|
177
|
+
if (success) {
|
|
178
|
+
console.log(chalk.gray('\n Restart easy-devops to use the new version.\n'));
|
|
179
|
+
}
|
|
272
180
|
try {
|
|
273
|
-
await inquirer.prompt([{ type: 'input', name: '_', message: 'Press Enter to
|
|
181
|
+
await inquirer.prompt([{ type: 'input', name: '_', message: 'Press Enter to continue...' }]);
|
|
274
182
|
} catch { /* ExitPromptError */ }
|
|
275
183
|
}
|
|
276
184
|
}
|
package/package.json
CHANGED