expxagents 0.14.3 → 0.14.5
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.
|
@@ -4,38 +4,52 @@ import fs from 'fs';
|
|
|
4
4
|
import { resolveServerPaths } from '../utils/server-paths.js';
|
|
5
5
|
import { findPackageRoot } from '../utils/config.js';
|
|
6
6
|
export async function serverCommand() {
|
|
7
|
-
const { serverEntry, dashboardDist } = resolveServerPaths();
|
|
8
7
|
const userProjectDir = process.cwd();
|
|
9
8
|
const port = process.env.PORT ?? '3001';
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
pkgVersion =
|
|
9
|
+
let stopping = false;
|
|
10
|
+
function startServer() {
|
|
11
|
+
const { serverEntry, dashboardDist } = resolveServerPaths();
|
|
12
|
+
// Re-read version on each start (picks up updates)
|
|
13
|
+
let pkgVersion = '0.0.0';
|
|
14
|
+
try {
|
|
15
|
+
const pkg = JSON.parse(fs.readFileSync(path.join(findPackageRoot(), 'package.json'), 'utf-8'));
|
|
16
|
+
pkgVersion = pkg.version ?? '0.0.0';
|
|
17
|
+
}
|
|
18
|
+
catch { /* ignore */ }
|
|
19
|
+
console.log(`Starting ExpxAgents server v${pkgVersion}...`);
|
|
20
|
+
const child = spawn('node', [serverEntry], {
|
|
21
|
+
cwd: userProjectDir,
|
|
22
|
+
stdio: 'inherit',
|
|
23
|
+
env: {
|
|
24
|
+
...process.env,
|
|
25
|
+
NODE_ENV: 'production',
|
|
26
|
+
DASHBOARD_DIST: dashboardDist,
|
|
27
|
+
SQUADS_DIR: path.join(userProjectDir, 'squads'),
|
|
28
|
+
DOTENV_PATH: path.join(userProjectDir, '.env'),
|
|
29
|
+
PORT: port,
|
|
30
|
+
EXPXAGENTS_VERSION: pkgVersion,
|
|
31
|
+
},
|
|
32
|
+
});
|
|
33
|
+
child.on('error', (err) => {
|
|
34
|
+
console.error(`Failed to start server: ${err.message}`);
|
|
35
|
+
console.error('Make sure you have the latest expxagents package installed.');
|
|
36
|
+
process.exit(1);
|
|
37
|
+
});
|
|
38
|
+
child.on('exit', (code) => {
|
|
39
|
+
if (stopping) {
|
|
40
|
+
process.exit(code ?? 0);
|
|
41
|
+
return;
|
|
42
|
+
}
|
|
43
|
+
// Exit code 0 = intentional restart (e.g. after auto-update)
|
|
44
|
+
if (code === 0) {
|
|
45
|
+
console.log('Server exited with code 0, restarting...');
|
|
46
|
+
setTimeout(() => startServer(), 1000);
|
|
47
|
+
return;
|
|
48
|
+
}
|
|
49
|
+
process.exit(code ?? 1);
|
|
50
|
+
});
|
|
51
|
+
process.on('SIGINT', () => { stopping = true; child.kill('SIGINT'); });
|
|
52
|
+
process.on('SIGTERM', () => { stopping = true; child.kill('SIGTERM'); });
|
|
15
53
|
}
|
|
16
|
-
|
|
17
|
-
console.log('Starting ExpxAgents server...');
|
|
18
|
-
const child = spawn('node', [serverEntry], {
|
|
19
|
-
cwd: userProjectDir,
|
|
20
|
-
stdio: 'inherit',
|
|
21
|
-
env: {
|
|
22
|
-
...process.env,
|
|
23
|
-
NODE_ENV: 'production',
|
|
24
|
-
DASHBOARD_DIST: dashboardDist,
|
|
25
|
-
SQUADS_DIR: path.join(userProjectDir, 'squads'),
|
|
26
|
-
DOTENV_PATH: path.join(userProjectDir, '.env'),
|
|
27
|
-
PORT: port,
|
|
28
|
-
EXPXAGENTS_VERSION: pkgVersion,
|
|
29
|
-
},
|
|
30
|
-
});
|
|
31
|
-
child.on('error', (err) => {
|
|
32
|
-
console.error(`Failed to start server: ${err.message}`);
|
|
33
|
-
console.error('Make sure you have the latest expxagents package installed.');
|
|
34
|
-
process.exit(1);
|
|
35
|
-
});
|
|
36
|
-
child.on('exit', (code) => {
|
|
37
|
-
process.exit(code ?? 0);
|
|
38
|
-
});
|
|
39
|
-
process.on('SIGINT', () => child.kill('SIGINT'));
|
|
40
|
-
process.on('SIGTERM', () => child.kill('SIGTERM'));
|
|
54
|
+
startServer();
|
|
41
55
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"system-routes.d.ts","sourceRoot":"","sources":["../../src/api/system-routes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"system-routes.d.ts","sourceRoot":"","sources":["../../src/api/system-routes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAC;AAWrE,UAAU,mBAAoB,SAAQ,oBAAoB;IACxD,cAAc,EAAE,MAAM,CAAC;CACxB;AAuDD,wBAAsB,YAAY,CAChC,GAAG,EAAE,eAAe,EACpB,IAAI,EAAE,mBAAmB,GACxB,OAAO,CAAC,IAAI,CAAC,CAsDf"}
|
|
@@ -1,6 +1,43 @@
|
|
|
1
1
|
import { execFile } from 'node:child_process';
|
|
2
2
|
import { promisify } from 'node:util';
|
|
3
|
+
import fs from 'node:fs';
|
|
4
|
+
import path from 'node:path';
|
|
5
|
+
import { fileURLToPath } from 'node:url';
|
|
3
6
|
const execFileAsync = promisify(execFile);
|
|
7
|
+
const __dirname = path.dirname(fileURLToPath(import.meta.url));
|
|
8
|
+
/** Resolve the current installed version from package.json */
|
|
9
|
+
function resolveCurrentVersion(envVersion) {
|
|
10
|
+
// 1. Env var set by CLI (production)
|
|
11
|
+
if (envVersion && envVersion !== '0.0.0')
|
|
12
|
+
return envVersion;
|
|
13
|
+
// 2. Walk up from this file to find expxagents package.json
|
|
14
|
+
// Production: server/dist/api/system-routes.js → ../../package.json (name=expxagents)
|
|
15
|
+
// Dev: server/src/api/system-routes.ts → ../../../cli/package.json
|
|
16
|
+
let dir = __dirname;
|
|
17
|
+
while (dir !== path.dirname(dir)) {
|
|
18
|
+
const pkgPath = path.join(dir, 'package.json');
|
|
19
|
+
if (fs.existsSync(pkgPath)) {
|
|
20
|
+
try {
|
|
21
|
+
const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf-8'));
|
|
22
|
+
if (pkg.name === 'expxagents')
|
|
23
|
+
return pkg.version ?? '0.0.0';
|
|
24
|
+
}
|
|
25
|
+
catch { /* continue */ }
|
|
26
|
+
}
|
|
27
|
+
dir = path.dirname(dir);
|
|
28
|
+
}
|
|
29
|
+
// 3. Dev fallback: try ../cli/package.json from project root
|
|
30
|
+
try {
|
|
31
|
+
const devCliPkg = path.join(__dirname, '..', '..', '..', 'cli', 'package.json');
|
|
32
|
+
if (fs.existsSync(devCliPkg)) {
|
|
33
|
+
const pkg = JSON.parse(fs.readFileSync(devCliPkg, 'utf-8'));
|
|
34
|
+
if (pkg.name === 'expxagents')
|
|
35
|
+
return pkg.version ?? '0.0.0';
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
catch { /* ignore */ }
|
|
39
|
+
return envVersion || '0.0.0';
|
|
40
|
+
}
|
|
4
41
|
async function fetchLatestVersion() {
|
|
5
42
|
try {
|
|
6
43
|
const { stdout } = await execFileAsync('npm', ['view', 'expxagents', 'version'], {
|
|
@@ -24,7 +61,7 @@ function compareVersions(current, latest) {
|
|
|
24
61
|
return false;
|
|
25
62
|
}
|
|
26
63
|
export async function systemRoutes(app, opts) {
|
|
27
|
-
const
|
|
64
|
+
const packageVersion = resolveCurrentVersion(opts.packageVersion);
|
|
28
65
|
// GET /api/system/version — check current vs latest
|
|
29
66
|
app.get('/api/system/version', {
|
|
30
67
|
preHandler: [app.requireAuth],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"system-routes.js","sourceRoot":"","sources":["../../src/api/system-routes.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"system-routes.js","sourceRoot":"","sources":["../../src/api/system-routes.ts"],"names":[],"mappings":"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"}
|