@ftptech/canton-agent-wallet 0.1.4 → 0.1.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.
- package/README.md +6 -2
- package/dist/cli-args.d.ts.map +1 -1
- package/dist/cli-args.js +1 -2
- package/dist/cli-args.js.map +1 -1
- package/dist/cli.js +32 -5
- package/dist/cli.js.map +1 -1
- package/dist/proxy.d.ts +39 -0
- package/dist/proxy.d.ts.map +1 -0
- package/dist/proxy.js +63 -0
- package/dist/proxy.js.map +1 -0
- package/package.json +2 -1
package/README.md
CHANGED
|
@@ -70,12 +70,16 @@ then retries the request with the on-ledger proof.
|
|
|
70
70
|
commands that talk to a relay (`create`, `pay`); there is intentionally no
|
|
71
71
|
built-in default (a stale default would silently send payments to a dead
|
|
72
72
|
host). Supply it here or via `--relay-url <url>`. The current FTP facilitator
|
|
73
|
-
is `
|
|
74
|
-
`facilitator.ftptech.xyz` is planned but not yet live).
|
|
73
|
+
is `https://facilitator.ftptech.xyz`.
|
|
75
74
|
- `CANTON_AGENT_NETWORK` — `canton:testnet` (default) or `canton:mainnet`; also
|
|
76
75
|
settable via `--network <net>`.
|
|
77
76
|
- `CANTON_AGENT_API_KEY` — only if the relay requires one (sent as the
|
|
78
77
|
`X-Agent-Key` header).
|
|
78
|
+
- `HTTPS_PROXY` / `HTTP_PROXY` (or `ALL_PROXY`) — if set, the CLI routes all
|
|
79
|
+
relay calls through that proxy. Node's `fetch` does NOT honor these on its
|
|
80
|
+
own, so behind a corporate/regional proxy you must set one of them or every
|
|
81
|
+
call fails with `fetch failed`. Credentials are supported
|
|
82
|
+
(`http://user:pass@host:port`) and never logged.
|
|
79
83
|
- `CANTON_AGENT_HOME` — override the wallet directory (default `~/.canton-agent`;
|
|
80
84
|
used by tests and power users).
|
|
81
85
|
|
package/dist/cli-args.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli-args.d.ts","sourceRoot":"","sources":["../src/cli-args.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,eAAO,MAAM,eAAe,mBAAmB,CAAC;AAEhD,8EAA8E;AAC9E,eAAO,MAAM,WAAW,EAAE,WAAW,CAAC,MAAM,CAK1C,CAAC;AAEH,gEAAgE;AAChE,wBAAgB,IAAI,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAG9E;AAED;;;;;GAKG;AACH,wBAAgB,WAAW,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,GAAG,MAAM,EAAE,CAW7D;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAC7B,IAAI,EAAE,SAAS,MAAM,EAAE,EACvB,GAAG,GAAE,MAAM,CAAC,UAAwB,GACnC,MAAM,GAAG,SAAS,CAEpB;AAED,+EAA+E;AAC/E,wBAAgB,cAAc,CAC5B,IAAI,EAAE,SAAS,MAAM,EAAE,EACvB,GAAG,GAAE,MAAM,CAAC,UAAwB,GACnC,MAAM,CAER;AAED,iEAAiE;AACjE,eAAO,MAAM,kBAAkB,
|
|
1
|
+
{"version":3,"file":"cli-args.d.ts","sourceRoot":"","sources":["../src/cli-args.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,eAAO,MAAM,eAAe,mBAAmB,CAAC;AAEhD,8EAA8E;AAC9E,eAAO,MAAM,WAAW,EAAE,WAAW,CAAC,MAAM,CAK1C,CAAC;AAEH,gEAAgE;AAChE,wBAAgB,IAAI,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAG9E;AAED;;;;;GAKG;AACH,wBAAgB,WAAW,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,GAAG,MAAM,EAAE,CAW7D;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAC7B,IAAI,EAAE,SAAS,MAAM,EAAE,EACvB,GAAG,GAAE,MAAM,CAAC,UAAwB,GACnC,MAAM,GAAG,SAAS,CAEpB;AAED,+EAA+E;AAC/E,wBAAgB,cAAc,CAC5B,IAAI,EAAE,SAAS,MAAM,EAAE,EACvB,GAAG,GAAE,MAAM,CAAC,UAAwB,GACnC,MAAM,CAER;AAED,iEAAiE;AACjE,eAAO,MAAM,kBAAkB,QAEkD,CAAC"}
|
package/dist/cli-args.js
CHANGED
|
@@ -51,6 +51,5 @@ export function resolveNetwork(args, env = process.env) {
|
|
|
51
51
|
}
|
|
52
52
|
/** Message shown when no relay URL is supplied (flag or env). */
|
|
53
53
|
export const MISSING_RELAY_HELP = "no relay URL — pass --relay-url <url> or set CANTON_AGENT_RELAY_URL.\n" +
|
|
54
|
-
" e.g. canton-agent-wallet create --relay-url
|
|
55
|
-
" (the FTP facilitator is currently plain HTTP by IP; a TLS domain is not yet live)";
|
|
54
|
+
" e.g. canton-agent-wallet create --relay-url https://facilitator.ftptech.xyz";
|
|
56
55
|
//# sourceMappingURL=cli-args.js.map
|
package/dist/cli-args.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli-args.js","sourceRoot":"","sources":["../src/cli-args.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,MAAM,CAAC,MAAM,eAAe,GAAG,gBAAgB,CAAC;AAEhD,8EAA8E;AAC9E,MAAM,CAAC,MAAM,WAAW,GAAwB,IAAI,GAAG,CAAC;IACtD,aAAa;IACb,WAAW;IACX,MAAM;IACN,UAAU;CACX,CAAC,CAAC;AAEH,gEAAgE;AAChE,MAAM,UAAU,IAAI,CAAC,IAAuB,EAAE,IAAY;IACxD,MAAM,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7B,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;AACjE,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,WAAW,CAAC,IAAuB;IACjD,MAAM,GAAG,GAAa,EAAE,CAAC;IACzB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;QACxC,MAAM,CAAC,GAAG,IAAI,CAAC,CAAC,CAAW,CAAC;QAC5B,IAAI,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;YACvB,CAAC,IAAI,CAAC,CAAC,CAAC,yBAAyB;YACjC,SAAS;QACX,CAAC;QACD,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACd,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,eAAe,CAC7B,IAAuB,EACvB,MAAyB,OAAO,CAAC,GAAG;IAEpC,OAAO,IAAI,CAAC,IAAI,EAAE,aAAa,CAAC,IAAI,GAAG,CAAC,sBAAsB,IAAI,SAAS,CAAC;AAC9E,CAAC;AAED,+EAA+E;AAC/E,MAAM,UAAU,cAAc,CAC5B,IAAuB,EACvB,MAAyB,OAAO,CAAC,GAAG;IAEpC,OAAO,IAAI,CAAC,IAAI,EAAE,WAAW,CAAC,IAAI,GAAG,CAAC,oBAAoB,IAAI,eAAe,CAAC;AAChF,CAAC;AAED,iEAAiE;AACjE,MAAM,CAAC,MAAM,kBAAkB,GAC7B,wEAAwE;IACxE,
|
|
1
|
+
{"version":3,"file":"cli-args.js","sourceRoot":"","sources":["../src/cli-args.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,MAAM,CAAC,MAAM,eAAe,GAAG,gBAAgB,CAAC;AAEhD,8EAA8E;AAC9E,MAAM,CAAC,MAAM,WAAW,GAAwB,IAAI,GAAG,CAAC;IACtD,aAAa;IACb,WAAW;IACX,MAAM;IACN,UAAU;CACX,CAAC,CAAC;AAEH,gEAAgE;AAChE,MAAM,UAAU,IAAI,CAAC,IAAuB,EAAE,IAAY;IACxD,MAAM,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7B,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;AACjE,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,WAAW,CAAC,IAAuB;IACjD,MAAM,GAAG,GAAa,EAAE,CAAC;IACzB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;QACxC,MAAM,CAAC,GAAG,IAAI,CAAC,CAAC,CAAW,CAAC;QAC5B,IAAI,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;YACvB,CAAC,IAAI,CAAC,CAAC,CAAC,yBAAyB;YACjC,SAAS;QACX,CAAC;QACD,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACd,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,eAAe,CAC7B,IAAuB,EACvB,MAAyB,OAAO,CAAC,GAAG;IAEpC,OAAO,IAAI,CAAC,IAAI,EAAE,aAAa,CAAC,IAAI,GAAG,CAAC,sBAAsB,IAAI,SAAS,CAAC;AAC9E,CAAC;AAED,+EAA+E;AAC/E,MAAM,UAAU,cAAc,CAC5B,IAAuB,EACvB,MAAyB,OAAO,CAAC,GAAG;IAEpC,OAAO,IAAI,CAAC,IAAI,EAAE,WAAW,CAAC,IAAI,GAAG,CAAC,oBAAoB,IAAI,eAAe,CAAC;AAChF,CAAC;AAED,iEAAiE;AACjE,MAAM,CAAC,MAAM,kBAAkB,GAC7B,wEAAwE;IACxE,+EAA+E,CAAC"}
|
package/dist/cli.js
CHANGED
|
@@ -14,10 +14,12 @@
|
|
|
14
14
|
* relay (`create`, `pay`). There is intentionally no built-in default — a
|
|
15
15
|
* wrong/stale default would silently send an agent's payments to a dead host.
|
|
16
16
|
* Supply it via `--relay-url <url>` or the `CANTON_AGENT_RELAY_URL` env var.
|
|
17
|
-
* The current FTP facilitator is `
|
|
18
|
-
*
|
|
19
|
-
*
|
|
20
|
-
*
|
|
17
|
+
* The current FTP facilitator is `https://facilitator.ftptech.xyz`. `address`,
|
|
18
|
+
* `balance`, `claim`, `withdraw` and `export` reuse the relay stored in the
|
|
19
|
+
* wallet at `create` time and do not need the flag.
|
|
20
|
+
*
|
|
21
|
+
* Behind a proxy? Node's fetch ignores HTTP(S)_PROXY by default; this CLI wires
|
|
22
|
+
* an undici ProxyAgent when HTTPS_PROXY/HTTP_PROXY/ALL_PROXY is set (see proxy.ts).
|
|
21
23
|
*
|
|
22
24
|
* Config via env: CANTON_AGENT_RELAY_URL, CANTON_AGENT_NETWORK,
|
|
23
25
|
* CANTON_AGENT_API_KEY. Wallet lives at ~/.canton-agent/wallet.json (0600).
|
|
@@ -29,6 +31,7 @@ import { makePayingFetch } from "./pay.js";
|
|
|
29
31
|
import { RelayClient } from "./relay-client.js";
|
|
30
32
|
import { claimAll } from "./tx.js";
|
|
31
33
|
import { withdraw } from "./withdraw.js";
|
|
34
|
+
import { installProxyFromEnv } from "./proxy.js";
|
|
32
35
|
import { flag, positionals, resolveNetwork, resolveRelayUrl, MISSING_RELAY_HELP, } from "./cli-args.js";
|
|
33
36
|
const API_KEY = process.env.CANTON_AGENT_API_KEY;
|
|
34
37
|
function fail(msg) {
|
|
@@ -40,6 +43,12 @@ function requireRelay(args) {
|
|
|
40
43
|
return resolveRelayUrl(args) ?? fail(MISSING_RELAY_HELP);
|
|
41
44
|
}
|
|
42
45
|
async function main() {
|
|
46
|
+
// Route outbound fetch through HTTP(S)_PROXY when set — node's fetch does not
|
|
47
|
+
// honor those env vars on its own, so an agent behind a proxy would otherwise
|
|
48
|
+
// see every relay call fail with an opaque `fetch failed`.
|
|
49
|
+
const proxy = installProxyFromEnv(process.env);
|
|
50
|
+
if (proxy)
|
|
51
|
+
console.error(`(using proxy ${proxy})`);
|
|
43
52
|
const [cmd, ...args] = process.argv.slice(2);
|
|
44
53
|
switch (cmd) {
|
|
45
54
|
case "create": {
|
|
@@ -117,7 +126,25 @@ async function main() {
|
|
|
117
126
|
}
|
|
118
127
|
}
|
|
119
128
|
main().catch((e) => {
|
|
120
|
-
|
|
129
|
+
const msg = e instanceof Error ? e.message : String(e);
|
|
130
|
+
// Surface the underlying cause — node's `fetch failed` is opaque without it;
|
|
131
|
+
// the cause carries the real reason (ENOTFOUND / ECONNREFUSED / proxy auth).
|
|
132
|
+
const rawCause = e && typeof e === "object" && "cause" in e
|
|
133
|
+
? e.cause
|
|
134
|
+
: undefined;
|
|
135
|
+
const causeMsg = rawCause instanceof Error
|
|
136
|
+
? rawCause.message
|
|
137
|
+
: rawCause != null
|
|
138
|
+
? String(rawCause)
|
|
139
|
+
: "";
|
|
140
|
+
console.error("error:", causeMsg ? `${msg} (cause: ${causeMsg})` : msg);
|
|
141
|
+
// Network-reachability hint: the most common real-world failure is a proxy /
|
|
142
|
+
// blocked egress, which the env-proxy support above fixes once configured.
|
|
143
|
+
if (/fetch failed|ENOTFOUND|ECONNREFUSED|ETIMEDOUT|EAI_AGAIN|UND_ERR/i.test(`${msg} ${causeMsg}`)) {
|
|
144
|
+
console.error(" could not reach the relay. If you are behind a proxy, export HTTPS_PROXY " +
|
|
145
|
+
"(e.g. HTTPS_PROXY=http://user:pass@host:port) — the CLI routes through it. " +
|
|
146
|
+
"Otherwise verify the relay URL is reachable from this machine (try: curl <relay-url>/health).");
|
|
147
|
+
}
|
|
121
148
|
process.exit(1);
|
|
122
149
|
});
|
|
123
150
|
//# sourceMappingURL=cli.js.map
|
package/dist/cli.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";AACA
|
|
1
|
+
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"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"}
|
package/dist/proxy.d.ts
ADDED
|
@@ -0,0 +1,39 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Proxy support for the CLI's outbound HTTP.
|
|
3
|
+
*
|
|
4
|
+
* Node's global `fetch` (undici) does NOT honor the conventional
|
|
5
|
+
* HTTP_PROXY/HTTPS_PROXY environment variables on its own — unlike curl/git.
|
|
6
|
+
* An agent running behind a corporate or regional proxy therefore sees every
|
|
7
|
+
* relay call fail with an opaque `fetch failed`, even after exporting
|
|
8
|
+
* HTTP_PROXY, because the request still goes out directly.
|
|
9
|
+
*
|
|
10
|
+
* We close that gap by installing an undici `ProxyAgent` as the global
|
|
11
|
+
* dispatcher whenever a proxy env var is present, so `fetch` (and thus every
|
|
12
|
+
* RelayClient call) is tunneled through it. No proxy env -> no-op, direct
|
|
13
|
+
* connections are unaffected.
|
|
14
|
+
*/
|
|
15
|
+
import { type Dispatcher } from "undici";
|
|
16
|
+
/**
|
|
17
|
+
* Pick the proxy URL from the conventional env vars, same precedence as curl:
|
|
18
|
+
* explicit HTTPS_PROXY/HTTP_PROXY (either case) win over the catch-all
|
|
19
|
+
* ALL_PROXY. Returns undefined when none is set.
|
|
20
|
+
*/
|
|
21
|
+
export declare function resolveProxyUrl(env: NodeJS.ProcessEnv): string | undefined;
|
|
22
|
+
/**
|
|
23
|
+
* Mask any `user:pass@` credentials in a proxy URL so it is safe to log.
|
|
24
|
+
* Falls back to a regex redaction if the URL does not parse.
|
|
25
|
+
*/
|
|
26
|
+
export declare function redactProxyUrl(url: string): string;
|
|
27
|
+
/** Injectable seams so tests can assert behavior without mutating the
|
|
28
|
+
* process-global dispatcher. Production calls leave these unset. */
|
|
29
|
+
export interface InstallProxyDeps {
|
|
30
|
+
makeAgent?: (url: string) => Dispatcher;
|
|
31
|
+
setDispatcher?: (d: Dispatcher) => void;
|
|
32
|
+
}
|
|
33
|
+
/**
|
|
34
|
+
* If a proxy env var is set, route all global `fetch` through it and return the
|
|
35
|
+
* REDACTED proxy URL (for logging). Returns undefined and touches nothing when
|
|
36
|
+
* no proxy env is present, so direct connections stay direct.
|
|
37
|
+
*/
|
|
38
|
+
export declare function installProxyFromEnv(env: NodeJS.ProcessEnv, deps?: InstallProxyDeps): string | undefined;
|
|
39
|
+
//# sourceMappingURL=proxy.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"proxy.d.ts","sourceRoot":"","sources":["../src/proxy.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AACH,OAAO,EAAmC,KAAK,UAAU,EAAE,MAAM,QAAQ,CAAC;AAE1E;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,CAAC,UAAU,GAAG,MAAM,GAAG,SAAS,CAgB1E;AAED;;;GAGG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAWlD;AAED;qEACqE;AACrE,MAAM,WAAW,gBAAgB;IAC/B,SAAS,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,UAAU,CAAC;IACxC,aAAa,CAAC,EAAE,CAAC,CAAC,EAAE,UAAU,KAAK,IAAI,CAAC;CACzC;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CACjC,GAAG,EAAE,MAAM,CAAC,UAAU,EACtB,IAAI,GAAE,gBAAqB,GAC1B,MAAM,GAAG,SAAS,CAQpB"}
|
package/dist/proxy.js
ADDED
|
@@ -0,0 +1,63 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Proxy support for the CLI's outbound HTTP.
|
|
3
|
+
*
|
|
4
|
+
* Node's global `fetch` (undici) does NOT honor the conventional
|
|
5
|
+
* HTTP_PROXY/HTTPS_PROXY environment variables on its own — unlike curl/git.
|
|
6
|
+
* An agent running behind a corporate or regional proxy therefore sees every
|
|
7
|
+
* relay call fail with an opaque `fetch failed`, even after exporting
|
|
8
|
+
* HTTP_PROXY, because the request still goes out directly.
|
|
9
|
+
*
|
|
10
|
+
* We close that gap by installing an undici `ProxyAgent` as the global
|
|
11
|
+
* dispatcher whenever a proxy env var is present, so `fetch` (and thus every
|
|
12
|
+
* RelayClient call) is tunneled through it. No proxy env -> no-op, direct
|
|
13
|
+
* connections are unaffected.
|
|
14
|
+
*/
|
|
15
|
+
import { ProxyAgent, setGlobalDispatcher } from "undici";
|
|
16
|
+
/**
|
|
17
|
+
* Pick the proxy URL from the conventional env vars, same precedence as curl:
|
|
18
|
+
* explicit HTTPS_PROXY/HTTP_PROXY (either case) win over the catch-all
|
|
19
|
+
* ALL_PROXY. Returns undefined when none is set.
|
|
20
|
+
*/
|
|
21
|
+
export function resolveProxyUrl(env) {
|
|
22
|
+
const pick = (...names) => {
|
|
23
|
+
for (const n of names) {
|
|
24
|
+
const v = env[n];
|
|
25
|
+
if (typeof v === "string" && v.trim() !== "")
|
|
26
|
+
return v.trim();
|
|
27
|
+
}
|
|
28
|
+
return undefined;
|
|
29
|
+
};
|
|
30
|
+
return pick("HTTPS_PROXY", "https_proxy", "HTTP_PROXY", "http_proxy", "ALL_PROXY", "all_proxy");
|
|
31
|
+
}
|
|
32
|
+
/**
|
|
33
|
+
* Mask any `user:pass@` credentials in a proxy URL so it is safe to log.
|
|
34
|
+
* Falls back to a regex redaction if the URL does not parse.
|
|
35
|
+
*/
|
|
36
|
+
export function redactProxyUrl(url) {
|
|
37
|
+
try {
|
|
38
|
+
const u = new URL(url);
|
|
39
|
+
if (u.username || u.password) {
|
|
40
|
+
u.username = "***";
|
|
41
|
+
u.password = "";
|
|
42
|
+
}
|
|
43
|
+
return u.toString();
|
|
44
|
+
}
|
|
45
|
+
catch {
|
|
46
|
+
return url.replace(/\/\/[^/@]*@/, "//***@");
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
/**
|
|
50
|
+
* If a proxy env var is set, route all global `fetch` through it and return the
|
|
51
|
+
* REDACTED proxy URL (for logging). Returns undefined and touches nothing when
|
|
52
|
+
* no proxy env is present, so direct connections stay direct.
|
|
53
|
+
*/
|
|
54
|
+
export function installProxyFromEnv(env, deps = {}) {
|
|
55
|
+
const url = resolveProxyUrl(env);
|
|
56
|
+
if (!url)
|
|
57
|
+
return undefined;
|
|
58
|
+
const makeAgent = deps.makeAgent ?? ((u) => new ProxyAgent(u));
|
|
59
|
+
const setDispatcher = deps.setDispatcher ?? ((d) => setGlobalDispatcher(d));
|
|
60
|
+
setDispatcher(makeAgent(url));
|
|
61
|
+
return redactProxyUrl(url);
|
|
62
|
+
}
|
|
63
|
+
//# sourceMappingURL=proxy.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"proxy.js","sourceRoot":"","sources":["../src/proxy.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AACH,OAAO,EAAE,UAAU,EAAE,mBAAmB,EAAmB,MAAM,QAAQ,CAAC;AAE1E;;;;GAIG;AACH,MAAM,UAAU,eAAe,CAAC,GAAsB;IACpD,MAAM,IAAI,GAAG,CAAC,GAAG,KAAe,EAAsB,EAAE;QACtD,KAAK,MAAM,CAAC,IAAI,KAAK,EAAE,CAAC;YACtB,MAAM,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;YACjB,IAAI,OAAO,CAAC,KAAK,QAAQ,IAAI,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE;gBAAE,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC;QAChE,CAAC;QACD,OAAO,SAAS,CAAC;IACnB,CAAC,CAAC;IACF,OAAO,IAAI,CACT,aAAa,EACb,aAAa,EACb,YAAY,EACZ,YAAY,EACZ,WAAW,EACX,WAAW,CACZ,CAAC;AACJ,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,cAAc,CAAC,GAAW;IACxC,IAAI,CAAC;QACH,MAAM,CAAC,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC;QACvB,IAAI,CAAC,CAAC,QAAQ,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC;YAC7B,CAAC,CAAC,QAAQ,GAAG,KAAK,CAAC;YACnB,CAAC,CAAC,QAAQ,GAAG,EAAE,CAAC;QAClB,CAAC;QACD,OAAO,CAAC,CAAC,QAAQ,EAAE,CAAC;IACtB,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,GAAG,CAAC,OAAO,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC;IAC9C,CAAC;AACH,CAAC;AASD;;;;GAIG;AACH,MAAM,UAAU,mBAAmB,CACjC,GAAsB,EACtB,OAAyB,EAAE;IAE3B,MAAM,GAAG,GAAG,eAAe,CAAC,GAAG,CAAC,CAAC;IACjC,IAAI,CAAC,GAAG;QAAE,OAAO,SAAS,CAAC;IAC3B,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,IAAI,CAAC,CAAC,CAAS,EAAE,EAAE,CAAC,IAAI,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;IACvE,MAAM,aAAa,GACjB,IAAI,CAAC,aAAa,IAAI,CAAC,CAAC,CAAa,EAAE,EAAE,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,CAAC;IACpE,aAAa,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC;IAC9B,OAAO,cAAc,CAAC,GAAG,CAAC,CAAC;AAC7B,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ftptech/canton-agent-wallet",
|
|
3
3
|
"private": false,
|
|
4
|
-
"version": "0.1.
|
|
4
|
+
"version": "0.1.5",
|
|
5
5
|
"description": "Self-custody Canton wallet + x402 autopay for AI agents. One CLI: create, pay, balance, withdraw, export. Backs the canton-x402-agent skill.",
|
|
6
6
|
"license": "Apache-2.0",
|
|
7
7
|
"author": "FTP team",
|
|
@@ -18,6 +18,7 @@
|
|
|
18
18
|
"dependencies": {
|
|
19
19
|
"@canton-network/core-tx-visualizer": "~1.4.0",
|
|
20
20
|
"@canton-network/core-ledger-proto": "~1.4.0",
|
|
21
|
+
"undici": "^7.1.0",
|
|
21
22
|
"@ftptech/x402-canton-client": "0.1.0",
|
|
22
23
|
"@ftptech/x402-canton-ledger": "0.1.0"
|
|
23
24
|
},
|