awal 2.10.0 → 2.12.1
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/README.md +3 -2
- package/dist/cli.d.ts.map +1 -1
- package/dist/cli.js +2 -0
- package/dist/cli.js.map +1 -1
- package/dist/commands/__tests__/address.test.d.ts +2 -0
- package/dist/commands/__tests__/address.test.d.ts.map +1 -0
- package/dist/commands/__tests__/address.test.js +90 -0
- package/dist/commands/__tests__/address.test.js.map +1 -0
- package/dist/commands/__tests__/balance.test.js +30 -1
- package/dist/commands/__tests__/balance.test.js.map +1 -1
- package/dist/commands/__tests__/pay.test.d.ts +2 -0
- package/dist/commands/__tests__/pay.test.d.ts.map +1 -0
- package/dist/commands/__tests__/pay.test.js +69 -0
- package/dist/commands/__tests__/pay.test.js.map +1 -0
- package/dist/commands/__tests__/trade.test.js +3 -0
- package/dist/commands/__tests__/trade.test.js.map +1 -1
- package/dist/commands/address.d.ts.map +1 -1
- package/dist/commands/address.js +27 -8
- package/dist/commands/address.js.map +1 -1
- package/dist/commands/auth.d.ts.map +1 -1
- package/dist/commands/auth.js +60 -11
- package/dist/commands/auth.js.map +1 -1
- package/dist/commands/balance.d.ts.map +1 -1
- package/dist/commands/balance.js +12 -4
- package/dist/commands/balance.js.map +1 -1
- package/dist/commands/bazaar.d.ts.map +1 -1
- package/dist/commands/bazaar.js +31 -15
- package/dist/commands/bazaar.js.map +1 -1
- package/dist/commands/details.d.ts.map +1 -1
- package/dist/commands/details.js +14 -6
- package/dist/commands/details.js.map +1 -1
- package/dist/commands/logout.d.ts +3 -0
- package/dist/commands/logout.d.ts.map +1 -0
- package/dist/commands/logout.js +52 -0
- package/dist/commands/logout.js.map +1 -0
- package/dist/commands/pay.d.ts.map +1 -1
- package/dist/commands/pay.js +72 -15
- package/dist/commands/pay.js.map +1 -1
- package/dist/commands/quit.d.ts.map +1 -1
- package/dist/commands/quit.js +15 -12
- package/dist/commands/quit.js.map +1 -1
- package/dist/commands/revoke.d.ts.map +1 -1
- package/dist/commands/revoke.js +28 -12
- package/dist/commands/revoke.js.map +1 -1
- package/dist/commands/send.d.ts.map +1 -1
- package/dist/commands/send.js +65 -24
- package/dist/commands/send.js.map +1 -1
- package/dist/commands/status.d.ts.map +1 -1
- package/dist/commands/status.js +11 -4
- package/dist/commands/status.js.map +1 -1
- package/dist/commands/trade.d.ts.map +1 -1
- package/dist/commands/trade.js +74 -23
- package/dist/commands/trade.js.map +1 -1
- package/dist/constants.d.ts +4 -0
- package/dist/constants.d.ts.map +1 -1
- package/dist/constants.js +10 -0
- package/dist/constants.js.map +1 -1
- package/dist/utils/__tests__/cliError.test.d.ts +2 -0
- package/dist/utils/__tests__/cliError.test.d.ts.map +1 -0
- package/dist/utils/__tests__/cliError.test.js +192 -0
- package/dist/utils/__tests__/cliError.test.js.map +1 -0
- package/dist/utils/chainValidation.d.ts +5 -0
- package/dist/utils/chainValidation.d.ts.map +1 -1
- package/dist/utils/chainValidation.js +12 -1
- package/dist/utils/chainValidation.js.map +1 -1
- package/dist/utils/cliError.d.ts +41 -0
- package/dist/utils/cliError.d.ts.map +1 -0
- package/dist/utils/cliError.js +46 -0
- package/dist/utils/cliError.js.map +1 -0
- package/dist/utils/errorCodes.d.ts +39 -0
- package/dist/utils/errorCodes.d.ts.map +1 -0
- package/dist/utils/errorCodes.js +42 -0
- package/dist/utils/errorCodes.js.map +1 -0
- package/dist/utils/logging.d.ts +12 -0
- package/dist/utils/logging.d.ts.map +1 -0
- package/dist/utils/logging.js +22 -0
- package/dist/utils/logging.js.map +1 -0
- package/dist/utils/serverManager.js +1 -1
- package/dist/utils/x402Schemes.d.ts +5 -0
- package/dist/utils/x402Schemes.d.ts.map +1 -0
- package/dist/utils/x402Schemes.js +11 -0
- package/dist/utils/x402Schemes.js.map +1 -0
- package/package.json +3 -3
- package/server-bundle/bundle-electron.js +45 -45
- package/server-bundle/package.json +1 -1
- package/server-bundle/preload.js +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../src/commands/auth.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,GAAG,MAAM,KAAK,CAAC;AACtB,OAAO,QAAQ,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,YAAY,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,IAAI,CAAC;AACpF,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,EAAE,WAAW,EAAE,
|
|
1
|
+
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../src/commands/auth.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"balance.d.ts","sourceRoot":"","sources":["../../src/commands/balance.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"balance.d.ts","sourceRoot":"","sources":["../../src/commands/balance.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAgCpC,wBAAgB,wBAAwB,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAIjE;AAED,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAKxD;AAWD,UAAU,eAAe;IACvB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE;QACR,CAAC,KAAK,EAAE,MAAM,GAAG;YACf,GAAG,EAAE,MAAM,CAAC;YACZ,SAAS,EAAE,MAAM,CAAC;YAClB,QAAQ,EAAE,MAAM,CAAC;SAClB,CAAC;KACH,CAAC;IACF,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,wBAAgB,mBAAmB,CACjC,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM,EAAE,EAChB,QAAQ,EAAE,eAAe,CAAC,UAAU,CAAC,GACpC,MAAM,EAAE,CASV;AA2BD,wBAAgB,oBAAoB,IAAI,OAAO,CAmG9C"}
|
package/dist/commands/balance.js
CHANGED
|
@@ -3,9 +3,11 @@ import chalk from 'chalk';
|
|
|
3
3
|
import ora from 'ora';
|
|
4
4
|
import { sendIpcRequest } from '../ipcClient.js';
|
|
5
5
|
import { requireAuth } from '../utils/authCheck.js';
|
|
6
|
-
import { formatError } from '../utils/errors.js';
|
|
7
6
|
import { formatJson, formatAssetBalance } from '../formatters/output.js';
|
|
7
|
+
import { cliErrorFromCatch } from '../utils/cliError.js';
|
|
8
|
+
import { CliErrorCode } from '../utils/errorCodes.js';
|
|
8
9
|
import { isSolanaChain, isPolygonChain } from '../utils/chainValidation.js';
|
|
10
|
+
import { safeLogEvent } from '../utils/logging.js';
|
|
9
11
|
const BASE_DEFAULT_ASSETS = ['USDC', 'ETH'];
|
|
10
12
|
const POLYGON_DEFAULT_ASSETS = ['USDC', 'POL'];
|
|
11
13
|
const SOLANA_DEFAULT_ASSETS = ['USDC', 'SOL'];
|
|
@@ -91,6 +93,7 @@ export function createBalanceCommand() {
|
|
|
91
93
|
console.log(formatJson(result));
|
|
92
94
|
return;
|
|
93
95
|
}
|
|
96
|
+
safeLogEvent('cli_balance_viewed', { chain: options.chain });
|
|
94
97
|
const chainDisplay = CHAIN_DISPLAY_NAMES[options.chain] ?? result.chain ?? options.chain;
|
|
95
98
|
printChainBalances(chainDisplay, options.chain, assets, result);
|
|
96
99
|
return;
|
|
@@ -110,6 +113,7 @@ export function createBalanceCommand() {
|
|
|
110
113
|
}),
|
|
111
114
|
]));
|
|
112
115
|
spinner.stop();
|
|
116
|
+
safeLogEvent('cli_balance_viewed', { chain: 'all' });
|
|
113
117
|
if (options.json) {
|
|
114
118
|
console.log(formatJson({ base: baseResult, polygon: polygonResult, solana: solanaResult }));
|
|
115
119
|
return;
|
|
@@ -134,9 +138,13 @@ export function createBalanceCommand() {
|
|
|
134
138
|
}
|
|
135
139
|
}
|
|
136
140
|
catch (error) {
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
141
|
+
cliErrorFromCatch({
|
|
142
|
+
spinner,
|
|
143
|
+
code: CliErrorCode.BALANCE_FETCH_FAILED,
|
|
144
|
+
error,
|
|
145
|
+
jsonMode: options.json,
|
|
146
|
+
spinnerText: 'Failed to fetch balances',
|
|
147
|
+
});
|
|
140
148
|
}
|
|
141
149
|
});
|
|
142
150
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"balance.js","sourceRoot":"","sources":["../../src/commands/balance.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,GAAG,MAAM,KAAK,CAAC;AACtB,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"balance.js","sourceRoot":"","sources":["../../src/commands/balance.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bazaar.d.ts","sourceRoot":"","sources":["../../src/commands/bazaar.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"bazaar.d.ts","sourceRoot":"","sources":["../../src/commands/bazaar.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AA2CpC,wBAAgB,mBAAmB,IAAI,OAAO,CAsM7C"}
|
package/dist/commands/bazaar.js
CHANGED
|
@@ -2,8 +2,10 @@ import { Command } from 'commander';
|
|
|
2
2
|
import chalk from 'chalk';
|
|
3
3
|
import ora from 'ora';
|
|
4
4
|
import { sendIpcRequest } from '../ipcClient.js';
|
|
5
|
-
import { formatError } from '../utils/errors.js';
|
|
6
5
|
import { formatJson, formatTable, formatUsdcAmount } from '../formatters/output.js';
|
|
6
|
+
import { cliError, cliErrorFromCatch } from '../utils/cliError.js';
|
|
7
|
+
import { CliErrorCode } from '../utils/errorCodes.js';
|
|
8
|
+
import { X402_SCHEME_LIST, isX402Scheme } from '../utils/x402Schemes.js';
|
|
7
9
|
export function createBazaarCommand() {
|
|
8
10
|
const bazaar = new Command('bazaar').description('Browse X402 payment-enabled services');
|
|
9
11
|
bazaar
|
|
@@ -86,9 +88,13 @@ export function createBazaarCommand() {
|
|
|
86
88
|
}
|
|
87
89
|
}
|
|
88
90
|
catch (error) {
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
91
|
+
cliErrorFromCatch({
|
|
92
|
+
spinner,
|
|
93
|
+
code: CliErrorCode.BAZAAR_FETCH_FAILED,
|
|
94
|
+
error,
|
|
95
|
+
jsonMode: options.json,
|
|
96
|
+
spinnerText: 'Failed to fetch bazaar resources',
|
|
97
|
+
});
|
|
92
98
|
}
|
|
93
99
|
});
|
|
94
100
|
bazaar
|
|
@@ -98,7 +104,7 @@ export function createBazaarCommand() {
|
|
|
98
104
|
.option('--json', 'Output as JSON')
|
|
99
105
|
.option('--network <network>', 'Filter by network (base, base-sepolia, polygon, solana, solana-devnet)')
|
|
100
106
|
.option('-k, --top <n>', 'Max number of results (1-20)', '20')
|
|
101
|
-
.option('--scheme <scheme>', 'Filter by payment scheme
|
|
107
|
+
.option('--scheme <scheme>', 'Filter by payment scheme')
|
|
102
108
|
.option('--max-price <usd>', 'Maximum price in USD (e.g. 0.01)')
|
|
103
109
|
.option('--asset <address>', 'Filter by payment asset address')
|
|
104
110
|
.option('--pay-to <address>', 'Filter by recipient wallet address')
|
|
@@ -111,19 +117,25 @@ export function createBazaarCommand() {
|
|
|
111
117
|
if (options.network)
|
|
112
118
|
searchParams.network = options.network;
|
|
113
119
|
if (options.scheme) {
|
|
114
|
-
if (!
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
120
|
+
if (!isX402Scheme(options.scheme)) {
|
|
121
|
+
cliError({
|
|
122
|
+
spinner,
|
|
123
|
+
code: CliErrorCode.INVALID_SCHEME,
|
|
124
|
+
message: `--scheme must be one of ${X402_SCHEME_LIST}`,
|
|
125
|
+
jsonMode: options.json,
|
|
126
|
+
});
|
|
118
127
|
}
|
|
119
128
|
searchParams.scheme = options.scheme;
|
|
120
129
|
}
|
|
121
130
|
if (options.maxPrice) {
|
|
122
131
|
const priceVal = parseFloat(options.maxPrice);
|
|
123
132
|
if (isNaN(priceVal) || priceVal <= 0) {
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
133
|
+
cliError({
|
|
134
|
+
spinner,
|
|
135
|
+
code: CliErrorCode.INVALID_MAX_PRICE,
|
|
136
|
+
message: '--max-price must be a positive number (e.g. 0.01)',
|
|
137
|
+
jsonMode: options.json,
|
|
138
|
+
});
|
|
127
139
|
}
|
|
128
140
|
searchParams.maxUsdPrice = priceVal;
|
|
129
141
|
}
|
|
@@ -164,9 +176,13 @@ export function createBazaarCommand() {
|
|
|
164
176
|
}
|
|
165
177
|
}
|
|
166
178
|
catch (error) {
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
179
|
+
cliErrorFromCatch({
|
|
180
|
+
spinner,
|
|
181
|
+
code: CliErrorCode.BAZAAR_SEARCH_FAILED,
|
|
182
|
+
error,
|
|
183
|
+
jsonMode: options.json,
|
|
184
|
+
spinnerText: 'Search failed',
|
|
185
|
+
});
|
|
170
186
|
}
|
|
171
187
|
});
|
|
172
188
|
return bazaar;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bazaar.js","sourceRoot":"","sources":["../../src/commands/bazaar.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,GAAG,MAAM,KAAK,CAAC;AACtB,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"bazaar.js","sourceRoot":"","sources":["../../src/commands/bazaar.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"details.d.ts","sourceRoot":"","sources":["../../src/commands/details.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"details.d.ts","sourceRoot":"","sources":["../../src/commands/details.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAuCpC,wBAAgB,oBAAoB,IAAI,OAAO,CA2G9C"}
|
package/dist/commands/details.js
CHANGED
|
@@ -2,8 +2,9 @@ import { Command } from 'commander';
|
|
|
2
2
|
import chalk from 'chalk';
|
|
3
3
|
import ora from 'ora';
|
|
4
4
|
import { decodePaymentRequiredHeader } from '@x402/core/http';
|
|
5
|
-
import { formatError } from '../utils/errors.js';
|
|
6
5
|
import { formatJson } from '../formatters/output.js';
|
|
6
|
+
import { cliError, cliErrorFromCatch } from '../utils/cliError.js';
|
|
7
|
+
import { CliErrorCode } from '../utils/errorCodes.js';
|
|
7
8
|
const HTTP_METHODS = ['GET', 'POST', 'PUT', 'DELETE', 'PATCH'];
|
|
8
9
|
function isEmpty(value) {
|
|
9
10
|
if (value == null)
|
|
@@ -88,8 +89,11 @@ export function createDetailsCommand() {
|
|
|
88
89
|
}
|
|
89
90
|
spinner.stop();
|
|
90
91
|
if (!paymentRequired || !matchedMethod) {
|
|
91
|
-
|
|
92
|
-
|
|
92
|
+
cliError({
|
|
93
|
+
code: CliErrorCode.NO_PAYMENT_REQUIREMENTS,
|
|
94
|
+
message: 'No X402 payment requirements found at that URL.',
|
|
95
|
+
jsonMode: options.json,
|
|
96
|
+
});
|
|
93
97
|
}
|
|
94
98
|
if (options.json) {
|
|
95
99
|
console.log(formatJson({ method: matchedMethod, url, ...paymentRequired }));
|
|
@@ -120,9 +124,13 @@ export function createDetailsCommand() {
|
|
|
120
124
|
}
|
|
121
125
|
}
|
|
122
126
|
catch (error) {
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
127
|
+
cliErrorFromCatch({
|
|
128
|
+
spinner,
|
|
129
|
+
code: CliErrorCode.DISCOVERY_FAILED,
|
|
130
|
+
error,
|
|
131
|
+
jsonMode: options.json,
|
|
132
|
+
spinnerText: 'Discovery failed',
|
|
133
|
+
});
|
|
126
134
|
}
|
|
127
135
|
});
|
|
128
136
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"details.js","sourceRoot":"","sources":["../../src/commands/details.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,GAAG,MAAM,KAAK,CAAC;AACtB,OAAO,EAAE,2BAA2B,EAAE,MAAM,iBAAiB,CAAC;AAE9D,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"details.js","sourceRoot":"","sources":["../../src/commands/details.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"logout.d.ts","sourceRoot":"","sources":["../../src/commands/logout.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAgCpC,wBAAgB,mBAAmB,IAAI,OAAO,CA6B7C"}
|
|
@@ -0,0 +1,52 @@
|
|
|
1
|
+
import { Command } from 'commander';
|
|
2
|
+
import chalk from 'chalk';
|
|
3
|
+
import ora from 'ora';
|
|
4
|
+
import envPaths from 'env-paths';
|
|
5
|
+
import { existsSync, unlinkSync } from 'fs';
|
|
6
|
+
import * as path from 'path';
|
|
7
|
+
import { sendIpcRequest } from '../ipcClient.js';
|
|
8
|
+
import { formatError } from '../utils/errors.js';
|
|
9
|
+
import { formatJson, formatSuccess } from '../formatters/output.js';
|
|
10
|
+
import { safeLogEvent } from '../utils/logging.js';
|
|
11
|
+
const paths = envPaths('awal');
|
|
12
|
+
const FLOW_ID_FILE = path.join(paths.data, 'pending-auth-flow.json');
|
|
13
|
+
/**
|
|
14
|
+
* Clear any pending auth flow file left over from an incomplete login.
|
|
15
|
+
*/
|
|
16
|
+
function clearPendingAuthFlow() {
|
|
17
|
+
try {
|
|
18
|
+
if (existsSync(FLOW_ID_FILE)) {
|
|
19
|
+
unlinkSync(FLOW_ID_FILE);
|
|
20
|
+
}
|
|
21
|
+
}
|
|
22
|
+
catch {
|
|
23
|
+
// ignore
|
|
24
|
+
}
|
|
25
|
+
}
|
|
26
|
+
export function createLogoutCommand() {
|
|
27
|
+
return new Command('logout')
|
|
28
|
+
.description('Sign out of the wallet and clear the authenticated session')
|
|
29
|
+
.option('--json', 'Output as JSON')
|
|
30
|
+
.action(async (options) => {
|
|
31
|
+
const spinner = ora('Signing out...').start();
|
|
32
|
+
try {
|
|
33
|
+
safeLogEvent('cli_logout_initiated');
|
|
34
|
+
const result = (await sendIpcRequest('sign-out', {}));
|
|
35
|
+
spinner.stop();
|
|
36
|
+
// Clean up any pending auth flow file
|
|
37
|
+
clearPendingAuthFlow();
|
|
38
|
+
safeLogEvent('cli_logout_success');
|
|
39
|
+
if (options.json) {
|
|
40
|
+
console.log(formatJson(result));
|
|
41
|
+
return;
|
|
42
|
+
}
|
|
43
|
+
console.log(formatSuccess(result.message));
|
|
44
|
+
}
|
|
45
|
+
catch (error) {
|
|
46
|
+
spinner.fail('Sign out failed');
|
|
47
|
+
console.error(chalk.red(formatError(error)));
|
|
48
|
+
process.exit(1);
|
|
49
|
+
}
|
|
50
|
+
});
|
|
51
|
+
}
|
|
52
|
+
//# sourceMappingURL=logout.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"logout.js","sourceRoot":"","sources":["../../src/commands/logout.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,GAAG,MAAM,KAAK,CAAC;AACtB,OAAO,QAAQ,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,IAAI,CAAC;AAC5C,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACpE,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAOnD,MAAM,KAAK,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC;AAC/B,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,wBAAwB,CAAC,CAAC;AAErE;;GAEG;AACH,SAAS,oBAAoB;IAC3B,IAAI,CAAC;QACH,IAAI,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;YAC7B,UAAU,CAAC,YAAY,CAAC,CAAC;QAC3B,CAAC;IACH,CAAC;IAAC,MAAM,CAAC;QACP,SAAS;IACX,CAAC;AACH,CAAC;AAED,MAAM,UAAU,mBAAmB;IACjC,OAAO,IAAI,OAAO,CAAC,QAAQ,CAAC;SACzB,WAAW,CAAC,4DAA4D,CAAC;SACzE,MAAM,CAAC,QAAQ,EAAE,gBAAgB,CAAC;SAClC,MAAM,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;QACxB,MAAM,OAAO,GAAG,GAAG,CAAC,gBAAgB,CAAC,CAAC,KAAK,EAAE,CAAC;QAE9C,IAAI,CAAC;YACH,YAAY,CAAC,sBAAsB,CAAC,CAAC;YACrC,MAAM,MAAM,GAAG,CAAC,MAAM,cAAc,CAAC,UAAU,EAAE,EAAE,CAAC,CAAkB,CAAC;YACvE,OAAO,CAAC,IAAI,EAAE,CAAC;YAEf,sCAAsC;YACtC,oBAAoB,EAAE,CAAC;YAEvB,YAAY,CAAC,oBAAoB,CAAC,CAAC;YAEnC,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;gBACjB,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC;gBAChC,OAAO;YACT,CAAC;YAED,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;QAC7C,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;YAChC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YAC7C,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;IACH,CAAC,CAAC,CAAC;AACP,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pay.d.ts","sourceRoot":"","sources":["../../src/commands/pay.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"pay.d.ts","sourceRoot":"","sources":["../../src/commands/pay.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AA0BpC,wBAAgB,gBAAgB,IAAI,OAAO,CA6J1C"}
|
package/dist/commands/pay.js
CHANGED
|
@@ -3,8 +3,11 @@ import chalk from 'chalk';
|
|
|
3
3
|
import ora from 'ora';
|
|
4
4
|
import { sendIpcRequest } from '../ipcClient.js';
|
|
5
5
|
import { requireAuth } from '../utils/authCheck.js';
|
|
6
|
-
import { formatError } from '../utils/errors.js';
|
|
7
6
|
import { formatJson, formatSuccess, formatUsdcAmount } from '../formatters/output.js';
|
|
7
|
+
import { cliError, cliErrorFromCatch } from '../utils/cliError.js';
|
|
8
|
+
import { CliErrorCode } from '../utils/errorCodes.js';
|
|
9
|
+
import { safeLogEvent } from '../utils/logging.js';
|
|
10
|
+
import { X402_SCHEME_LIST, isX402Scheme } from '../utils/x402Schemes.js';
|
|
8
11
|
function splitUrl(url) {
|
|
9
12
|
const parsed = new URL(url);
|
|
10
13
|
const baseURL = `${parsed.protocol}//${parsed.host}`;
|
|
@@ -20,6 +23,7 @@ export function createPayCommand() {
|
|
|
20
23
|
.option('-q, --query <params>', 'Query parameters as JSON')
|
|
21
24
|
.option('-h, --headers <json>', 'Custom headers as JSON')
|
|
22
25
|
.option('--max-amount <amount>', 'Maximum amount per request in USDC atomic units')
|
|
26
|
+
.option('--scheme <scheme>', 'Preferred payment scheme')
|
|
23
27
|
.option('--correlation-id <id>', 'Correlation ID to group related operations')
|
|
24
28
|
.option('--json', 'Output as JSON')
|
|
25
29
|
.action(async (url, options) => {
|
|
@@ -38,9 +42,13 @@ export function createPayCommand() {
|
|
|
38
42
|
data.body = JSON.parse(options.data);
|
|
39
43
|
}
|
|
40
44
|
catch {
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
45
|
+
cliError({
|
|
46
|
+
spinner,
|
|
47
|
+
code: CliErrorCode.INVALID_JSON_OPTION,
|
|
48
|
+
message: 'The --data option must be valid JSON',
|
|
49
|
+
jsonMode: options.json,
|
|
50
|
+
spinnerText: 'Invalid JSON in --data',
|
|
51
|
+
});
|
|
44
52
|
}
|
|
45
53
|
}
|
|
46
54
|
if (options.query) {
|
|
@@ -48,9 +56,13 @@ export function createPayCommand() {
|
|
|
48
56
|
data.queryParams = JSON.parse(options.query);
|
|
49
57
|
}
|
|
50
58
|
catch {
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
59
|
+
cliError({
|
|
60
|
+
spinner,
|
|
61
|
+
code: CliErrorCode.INVALID_JSON_OPTION,
|
|
62
|
+
message: 'The --query option must be valid JSON',
|
|
63
|
+
jsonMode: options.json,
|
|
64
|
+
spinnerText: 'Invalid JSON in --query',
|
|
65
|
+
});
|
|
54
66
|
}
|
|
55
67
|
}
|
|
56
68
|
if (options.headers) {
|
|
@@ -58,19 +70,50 @@ export function createPayCommand() {
|
|
|
58
70
|
data.headers = JSON.parse(options.headers);
|
|
59
71
|
}
|
|
60
72
|
catch {
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
73
|
+
cliError({
|
|
74
|
+
spinner,
|
|
75
|
+
code: CliErrorCode.INVALID_JSON_OPTION,
|
|
76
|
+
message: 'The --headers option must be valid JSON',
|
|
77
|
+
jsonMode: options.json,
|
|
78
|
+
spinnerText: 'Invalid JSON in --headers',
|
|
79
|
+
});
|
|
64
80
|
}
|
|
65
81
|
}
|
|
66
|
-
if (options.maxAmount) {
|
|
67
|
-
|
|
82
|
+
if (options.maxAmount !== undefined) {
|
|
83
|
+
const parsedMaxAmount = parseInt(options.maxAmount, 10);
|
|
84
|
+
if (isNaN(parsedMaxAmount) || parsedMaxAmount < 0) {
|
|
85
|
+
cliError({
|
|
86
|
+
spinner,
|
|
87
|
+
code: CliErrorCode.INVALID_AMOUNT,
|
|
88
|
+
message: '--max-amount must be a non-negative integer (USDC atomic units)',
|
|
89
|
+
jsonMode: options.json,
|
|
90
|
+
spinnerText: 'Invalid --max-amount',
|
|
91
|
+
});
|
|
92
|
+
}
|
|
93
|
+
data.maxAmountPerRequest = parsedMaxAmount;
|
|
94
|
+
}
|
|
95
|
+
if (options.scheme !== undefined) {
|
|
96
|
+
if (!isX402Scheme(options.scheme)) {
|
|
97
|
+
cliError({
|
|
98
|
+
spinner,
|
|
99
|
+
code: CliErrorCode.INVALID_SCHEME,
|
|
100
|
+
message: `--scheme must be one of ${X402_SCHEME_LIST}`,
|
|
101
|
+
jsonMode: options.json,
|
|
102
|
+
spinnerText: 'Invalid --scheme',
|
|
103
|
+
});
|
|
104
|
+
}
|
|
105
|
+
data.preferredScheme = options.scheme;
|
|
68
106
|
}
|
|
69
107
|
if (options.correlationId) {
|
|
70
108
|
data.correlationId = options.correlationId;
|
|
71
109
|
}
|
|
110
|
+
const host = new URL(url).hostname;
|
|
111
|
+
safeLogEvent('cli_x402_pay_initiated', { host });
|
|
72
112
|
const result = (await sendIpcRequest('make-x402-request', data));
|
|
73
113
|
spinner.stop();
|
|
114
|
+
if (result.paymentMade) {
|
|
115
|
+
safeLogEvent('cli_x402_pay_success', { host, amount_paid: result.amountPaid });
|
|
116
|
+
}
|
|
74
117
|
if (options.json) {
|
|
75
118
|
console.log(formatJson(result));
|
|
76
119
|
return;
|
|
@@ -86,9 +129,23 @@ export function createPayCommand() {
|
|
|
86
129
|
}
|
|
87
130
|
}
|
|
88
131
|
catch (error) {
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
132
|
+
safeLogEvent('cli_x402_pay_failed', {
|
|
133
|
+
host: (() => {
|
|
134
|
+
try {
|
|
135
|
+
return new URL(url).hostname;
|
|
136
|
+
}
|
|
137
|
+
catch {
|
|
138
|
+
return 'unknown';
|
|
139
|
+
}
|
|
140
|
+
})(),
|
|
141
|
+
});
|
|
142
|
+
cliErrorFromCatch({
|
|
143
|
+
spinner,
|
|
144
|
+
code: CliErrorCode.REQUEST_FAILED,
|
|
145
|
+
error,
|
|
146
|
+
jsonMode: options.json,
|
|
147
|
+
spinnerText: 'Request failed',
|
|
148
|
+
});
|
|
92
149
|
}
|
|
93
150
|
});
|
|
94
151
|
}
|
package/dist/commands/pay.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pay.js","sourceRoot":"","sources":["../../src/commands/pay.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,GAAG,MAAM,KAAK,CAAC;AACtB,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"pay.js","sourceRoot":"","sources":["../../src/commands/pay.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"quit.d.ts","sourceRoot":"","sources":["../../src/commands/quit.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"quit.d.ts","sourceRoot":"","sources":["../../src/commands/quit.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAkCpC,wBAAgB,iBAAiB,IAAI,OAAO,CAiE3C"}
|
package/dist/commands/quit.js
CHANGED
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
import { Command } from 'commander';
|
|
2
2
|
import ora from 'ora';
|
|
3
3
|
import { getPrimaryProcessPid } from '../utils/processCheck.js';
|
|
4
|
-
import {
|
|
5
|
-
import {
|
|
4
|
+
import { formatJson, formatSuccess, formatInfo } from '../formatters/output.js';
|
|
5
|
+
import { cliError, cliErrorFromCatch } from '../utils/cliError.js';
|
|
6
|
+
import { CliErrorCode } from '../utils/errorCodes.js';
|
|
6
7
|
/**
|
|
7
8
|
* Checks whether a process is still alive using kill signal 0.
|
|
8
9
|
*/
|
|
@@ -62,13 +63,11 @@ export function createQuitCommand() {
|
|
|
62
63
|
console.log(formatSuccess('Wallet stopped'));
|
|
63
64
|
}
|
|
64
65
|
else {
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
}
|
|
71
|
-
process.exit(1);
|
|
66
|
+
cliError({
|
|
67
|
+
code: CliErrorCode.QUIT_TIMEOUT,
|
|
68
|
+
message: 'Process may still be shutting down',
|
|
69
|
+
jsonMode: options.json,
|
|
70
|
+
});
|
|
72
71
|
}
|
|
73
72
|
}
|
|
74
73
|
catch (error) {
|
|
@@ -82,9 +81,13 @@ export function createQuitCommand() {
|
|
|
82
81
|
console.log(formatSuccess('Wallet stopped'));
|
|
83
82
|
return;
|
|
84
83
|
}
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
84
|
+
cliErrorFromCatch({
|
|
85
|
+
spinner,
|
|
86
|
+
code: CliErrorCode.QUIT_FAILED,
|
|
87
|
+
error,
|
|
88
|
+
jsonMode: options.json,
|
|
89
|
+
spinnerText: 'Failed to quit wallet',
|
|
90
|
+
});
|
|
88
91
|
}
|
|
89
92
|
});
|
|
90
93
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"quit.js","sourceRoot":"","sources":["../../src/commands/quit.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,GAAG,MAAM,KAAK,CAAC;AACtB,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"quit.js","sourceRoot":"","sources":["../../src/commands/quit.ts"],"names":[],"mappings":"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"}
|