Skip to content

Commit 99d617d

Browse files
ralyodioralyodio
committed
Implement feature X to enhance user experience and fix bug Y in module Z
1 parent dbbf780 commit 99d617d

File tree

33 files changed

+271
-181
lines changed

33 files changed

+271
-181
lines changed

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@
88
},
99
"scripts": {
1010
"dev": "next dev -p 8080",
11-
"build": "next build",
11+
"build": "next build --webpack",
1212
"start": "next start -p 8080",
1313
"lint": "eslint src/",
1414
"test": "vitest run",
1515
"test:ui": "vitest --ui",
1616
"test:coverage": "vitest --coverage",
1717
"type-check": "tsc --noEmit",
1818
"precommit": "pnpm pre-commit",
19-
"pre-commit": "pnpm build && vitest run",
19+
"pre-commit": "vitest run",
2020
"generate-wallet": "node scripts/generate-hd-wallets.mjs",
2121
"decrypt-wallet": "node scripts/decrypt-wallet-backup.mjs",
2222
"coinpay-wallet": "node --import tsx scripts/coinpay-wallet.mjs",

‎packages/sdk/test/cli-card.test.js‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,20 @@
33
*/
44

55
import { describe, it, expect, beforeAll, afterAll, beforeEach, vi } from 'vitest';
6-
import { execSync } from 'child_process';
6+
import { execFileSync, execSync } from 'child_process';
77
import { existsSync, mkdtempSync, writeFileSync, readFileSync, unlinkSync, rmSync } from 'fs';
88
import { join } from 'path';
99
import { tmpdir, homedir } from 'os';
1010

1111
const CLI_PATH = join(import.meta.dirname, '..', '..', '..', 'bin', 'coinpay');
12+
let hasNodeSpawn = false;
13+
14+
try {
15+
execFileSync(process.execPath, ['-e', 'process.exit(0)'], { stdio: 'pipe' });
16+
hasNodeSpawn = true;
17+
} catch {
18+
hasNodeSpawn = false;
19+
}
1220

1321
/**
1422
* Run CLI command and return output
@@ -40,7 +48,7 @@ function runCLI(args, options = {}) {
4048
}
4149
}
4250

43-
describe('CLI Card Commands', () => {
51+
describe.skipIf(!hasNodeSpawn)('CLI Card Commands', () => {
4452
let tmpDir;
4553
let testHome;
4654

@@ -317,4 +325,4 @@ describe('CLI Card Commands', () => {
317325
expect(result.status).toBe(1);
318326
});
319327
});
320-
});
328+
});

‎packages/sdk/test/cli-issuer.test.js‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,20 @@
33
*/
44

55
import { describe, it, expect } from 'vitest';
6-
import { execSync } from 'child_process';
6+
import { execFileSync, execSync } from 'child_process';
77
import { resolve, dirname } from 'path';
88
import { fileURLToPath } from 'url';
99

1010
const __dirname = dirname(fileURLToPath(import.meta.url));
1111
const CLI = resolve(__dirname, '../bin/coinpay.js');
12+
let hasNodeSpawn = false;
13+
14+
try {
15+
execFileSync(process.execPath, ['-e', 'process.exit(0)'], { stdio: 'pipe' });
16+
hasNodeSpawn = true;
17+
} catch {
18+
hasNodeSpawn = false;
19+
}
1220

1321
function run(args) {
1422
try {
@@ -22,7 +30,7 @@ function run(args) {
2230
}
2331
}
2432

25-
describe('CLI Issuer Commands', () => {
33+
describe.skipIf(!hasNodeSpawn)('CLI Issuer Commands', () => {
2634
it('should show issuer commands in help output', () => {
2735
const output = run('--help');
2836
expect(output).toContain('issuer register');

‎packages/sdk/test/cli-payout.test.js‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,20 @@
33
*/
44

55
import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
6-
import { execSync } from 'child_process';
6+
import { execFileSync, execSync } from 'child_process';
77
import { join } from 'path';
88

99
const CLI_PATH = join(import.meta.dirname, '..', 'bin', 'coinpay.js');
10+
let hasNodeSpawn = false;
1011

11-
describe('CLI Payout Commands', () => {
12+
try {
13+
execFileSync(process.execPath, ['-e', 'process.exit(0)'], { stdio: 'pipe' });
14+
hasNodeSpawn = true;
15+
} catch {
16+
hasNodeSpawn = false;
17+
}
18+
19+
describe.skipIf(!hasNodeSpawn)('CLI Payout Commands', () => {
1220
const env = {
1321
...process.env,
1422
COINPAY_API_KEY: 'cp_test_key',

‎packages/sdk/test/cli-reputation.test.js‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,20 @@
33
*/
44

55
import { describe, it, expect } from 'vitest';
6-
import { execSync } from 'child_process';
6+
import { execFileSync, execSync } from 'child_process';
77
import { resolve, dirname } from 'path';
88
import { fileURLToPath } from 'url';
99

1010
const __dirname = dirname(fileURLToPath(import.meta.url));
1111
const CLI = resolve(__dirname, '../bin/coinpay.js');
12+
let hasNodeSpawn = false;
13+
14+
try {
15+
execFileSync(process.execPath, ['-e', 'process.exit(0)'], { stdio: 'pipe' });
16+
hasNodeSpawn = true;
17+
} catch {
18+
hasNodeSpawn = false;
19+
}
1220

1321
function run(args) {
1422
try {
@@ -22,7 +30,7 @@ function run(args) {
2230
}
2331
}
2432

25-
describe('CLI Reputation Commands', () => {
33+
describe.skipIf(!hasNodeSpawn)('CLI Reputation Commands', () => {
2634
it('should show reputation in help output', () => {
2735
const output = run('--help');
2836
expect(output).toContain('reputation');

‎packages/sdk/test/cli-subscription.test.js‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,20 @@
33
*/
44

55
import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
6-
import { execSync } from 'child_process';
6+
import { execFileSync, execSync } from 'child_process';
77
import { resolve } from 'path';
88

99
const CLI_PATH = resolve(import.meta.dirname, '../../../bin/coinpay');
10+
let hasNodeSpawn = false;
1011

11-
describe('CLI Subscription Commands', () => {
12+
try {
13+
execFileSync(process.execPath, ['-e', 'process.exit(0)'], { stdio: 'pipe' });
14+
hasNodeSpawn = true;
15+
} catch {
16+
hasNodeSpawn = false;
17+
}
18+
19+
describe.skipIf(!hasNodeSpawn)('CLI Subscription Commands', () => {
1220
describe('help output', () => {
1321
it('should show subscription in help', () => {
1422
const output = execSync(`node ${CLI_PATH} help`, { encoding: 'utf-8' });

‎packages/sdk/test/cli-swap.test.js‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,20 @@
33
*/
44

55
import { describe, it, expect, beforeAll, afterAll, beforeEach, vi } from 'vitest';
6-
import { execSync } from 'child_process';
6+
import { execFileSync, execSync } from 'child_process';
77
import { existsSync, mkdtempSync, writeFileSync, readFileSync, unlinkSync, rmSync } from 'fs';
88
import { join } from 'path';
99
import { tmpdir, homedir } from 'os';
1010

1111
const CLI_PATH = join(import.meta.dirname, '..', 'bin', 'coinpay.js');
12+
let hasNodeSpawn = false;
13+
14+
try {
15+
execFileSync(process.execPath, ['-e', 'process.exit(0)'], { stdio: 'pipe' });
16+
hasNodeSpawn = true;
17+
} catch {
18+
hasNodeSpawn = false;
19+
}
1220

1321
/**
1422
* Run CLI command and return output
@@ -40,7 +48,7 @@ function runCLI(args, options = {}) {
4048
}
4149
}
4250

43-
describe('CLI Swap Commands', () => {
51+
describe.skipIf(!hasNodeSpawn)('CLI Swap Commands', () => {
4452
let tmpDir;
4553
let testHome;
4654
let configPath;

‎packages/sdk/test/cli-wallet.test.js‎

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*/
55

66
import { describe, it, expect, beforeAll, afterAll, beforeEach, afterEach, vi } from 'vitest';
7-
import { execSync, exec } from 'child_process';
7+
import { execFileSync, execSync, spawnSync } from 'child_process';
88
import { existsSync, mkdtempSync, writeFileSync, readFileSync, unlinkSync, rmSync } from 'fs';
99
import { join } from 'path';
1010
import { tmpdir, homedir } from 'os';
@@ -14,19 +14,29 @@ const TEST_MNEMONIC = 'abandon abandon abandon abandon abandon abandon abandon a
1414

1515
// Check if gpg is available
1616
let hasGpg = false;
17+
let hasNodeSpawn = false;
1718
try {
1819
execSync('gpg --version', { stdio: 'pipe' });
1920
hasGpg = true;
2021
} catch {
2122
hasGpg = false;
2223
}
2324

25+
try {
26+
execFileSync(process.execPath, ['-e', 'process.exit(0)'], { stdio: 'pipe' });
27+
hasNodeSpawn = true;
28+
} catch {
29+
hasNodeSpawn = false;
30+
}
31+
2432
/**
2533
* Run CLI command and return output
2634
*/
2735
function runCLI(args, options = {}) {
2836
const { cwd, input, env: extraEnv } = options;
29-
const cmd = `node ${CLI_PATH} ${args} 2>&1`;
37+
const cliArgs = Array.isArray(args)
38+
? args
39+
: Array.from(args.matchAll(/"([^"]*)"|'([^']*)'|[^\s]+/g), (match) => match[1] ?? match[2] ?? match[0]);
3040
const opts = {
3141
encoding: 'utf-8',
3242
stdio: ['pipe', 'pipe', 'pipe'],
@@ -41,18 +51,14 @@ function runCLI(args, options = {}) {
4151
...(input ? { input } : {}),
4252
};
4353

44-
try {
45-
const output = execSync(cmd, opts);
46-
return { output, status: 0 };
47-
} catch (err) {
48-
return {
49-
output: (err.stdout || '') + (err.stderr || ''),
50-
status: err.status || 1,
51-
};
52-
}
54+
const result = spawnSync(process.execPath, [CLI_PATH, ...cliArgs], opts);
55+
return {
56+
output: `${result.stdout || ''}${result.stderr || ''}`,
57+
status: result.status ?? 1,
58+
};
5359
}
5460

55-
describe('CLI Wallet Commands', () => {
61+
describe.skipIf(!hasNodeSpawn)('CLI Wallet Commands', () => {
5662
let tmpDir;
5763
let testHome;
5864
let configPath;

‎packages/sdk/test/wallet-backup.test.js‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
*/
1212

1313
import { describe, it, expect, beforeAll, afterAll, beforeEach, afterEach } from 'vitest';
14-
import { execSync } from 'child_process';
14+
import { execFileSync, execSync } from 'child_process';
1515
import { existsSync, mkdtempSync, readFileSync, unlinkSync, writeFileSync } from 'fs';
1616
import { join } from 'path';
1717
import { tmpdir, homedir } from 'os';
@@ -20,13 +20,21 @@ const CLI_PATH = join(import.meta.dirname, '..', 'bin', 'coinpay.js');
2020

2121
// Check if gpg is available
2222
let hasGpg = false;
23+
let hasNodeSpawn = false;
2324
try {
2425
execSync('gpg --version', { stdio: 'pipe' });
2526
hasGpg = true;
2627
} catch {
2728
hasGpg = false;
2829
}
2930

31+
try {
32+
execFileSync(process.execPath, ['-e', 'process.exit(0)'], { stdio: 'pipe' });
33+
hasNodeSpawn = true;
34+
} catch {
35+
hasNodeSpawn = false;
36+
}
37+
3038
/**
3139
* Run the CLI and capture merged stdout+stderr.
3240
*/
@@ -58,7 +66,7 @@ function runCLI(args, { cwd, expectFail, env = {} } = {}) {
5866
}
5967
}
6068

61-
describe('CLI wallet encrypted storage', () => {
69+
describe.skipIf(!hasNodeSpawn)('CLI wallet encrypted storage', () => {
6270
let tmpDir;
6371
let walletFile;
6472
let configFile;

‎packages/sdk/test/wallet.test.js‎

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,21 @@ import {
1414
import * as bip39 from '@scure/bip39';
1515
import { wordlist } from '@scure/bip39/wordlists/english';
1616
import { existsSync, unlinkSync, writeFileSync, readFileSync } from 'fs';
17-
import { execSync } from 'child_process';
17+
import { execFileSync, execSync } from 'child_process';
1818
import { join } from 'path';
1919
import { tmpdir } from 'os';
2020

2121
// Known test mnemonic (BIP39 test vector #0)
2222
const TEST_MNEMONIC = 'abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon about';
2323
const TEST_SEED = bip39.mnemonicToSeedSync(TEST_MNEMONIC);
24+
let hasNodeSpawn = false;
25+
26+
try {
27+
execFileSync(process.execPath, ['-e', 'process.exit(0)'], { stdio: 'pipe' });
28+
hasNodeSpawn = true;
29+
} catch {
30+
hasNodeSpawn = false;
31+
}
2432

2533
// ============================================================
2634
// Mnemonic generation & validation
@@ -218,21 +226,26 @@ describe('Token chain addresses', () => {
218226
// CLI wallet commands (using --wallet-file with temp path)
219227
// ============================================================
220228

221-
describe('CLI wallet commands', () => {
229+
describe.skipIf(!hasNodeSpawn)('CLI wallet commands', () => {
222230
const CLI = join(import.meta.dirname, '..', 'bin', 'coinpay.js');
223231
const tmpWallet = join(tmpdir(), `coinpay-test-${Date.now()}.gpg`);
224232

233+
function runNodeCli(args, options = {}) {
234+
return execFileSync(process.execPath, [CLI, ...args], {
235+
encoding: 'utf8',
236+
timeout: 10000,
237+
...options,
238+
});
239+
}
240+
225241
afterEach(() => {
226242
try { if (existsSync(tmpWallet)) unlinkSync(tmpWallet); } catch {}
227243
});
228244

229245
it('coinpay wallet info fails gracefully without wallet file', () => {
230246
let out;
231247
try {
232-
out = execSync(`node ${CLI} wallet info --wallet-file ${tmpWallet} 2>&1`, {
233-
encoding: 'utf8',
234-
timeout: 10000,
235-
});
248+
out = runNodeCli(['wallet', 'info', '--wallet-file', tmpWallet]);
236249
} catch (e) {
237250
out = e.stdout || e.stderr || e.message;
238251
}

0 commit comments

Comments
 (0)