@apify/mcpc 0.2.1 → 0.2.2
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/CHANGELOG.md +7 -2
- package/README.md +18 -18
- package/dist/lib/auth/keychain.d.ts +7 -0
- package/dist/lib/auth/keychain.d.ts.map +1 -1
- package/dist/lib/auth/keychain.js +56 -0
- package/dist/lib/auth/keychain.js.map +1 -1
- package/dist/lib/wallets.d.ts.map +1 -1
- package/dist/lib/wallets.js +13 -0
- package/dist/lib/wallets.js.map +1 -1
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -7,8 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
|
|
7
7
|
|
|
8
8
|
## [Unreleased]
|
|
9
9
|
|
|
10
|
-
## [0.2.
|
|
10
|
+
## [0.2.2] - 2026-03-31
|
|
11
|
+
|
|
12
|
+
### Added
|
|
13
|
+
- Secure x402 wallet storage using OS keychain integration with fallback to `wallets.json` for compatibility
|
|
11
14
|
|
|
15
|
+
## [0.2.1] - 2026-03-30
|
|
12
16
|
### Added
|
|
13
17
|
|
|
14
18
|
- QR code display for wallet address in `x402 init`, `x402 import`, and `x402 info` commands, allowing users to scan and fund the wallet directly from the terminal
|
|
@@ -179,7 +183,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
|
|
179
183
|
- Interactive shell mode
|
|
180
184
|
- JSON output mode for scripting
|
|
181
185
|
|
|
182
|
-
[Unreleased]: https://github.com/apify/mcpc/compare/v0.2.
|
|
186
|
+
[Unreleased]: https://github.com/apify/mcpc/compare/v0.2.2...HEAD
|
|
187
|
+
[0.2.2]: https://github.com/apify/mcpc/compare/v0.2.1...v0.2.2
|
|
183
188
|
[0.2.1]: https://github.com/apify/mcpc/compare/v0.2.0...v0.2.1
|
|
184
189
|
[0.2.0]: https://github.com/apify/mcpc/compare/v0.1.10...v0.2.0
|
|
185
190
|
[0.1.10]: https://github.com/apify/mcpc/compare/v0.1.9...v0.1.10
|
package/README.md
CHANGED
|
@@ -1202,24 +1202,24 @@ See [CONTRIBUTING](./CONTRIBUTING.md) for development setup, architecture overvi
|
|
|
1202
1202
|
|
|
1203
1203
|
### MCP CLI clients
|
|
1204
1204
|
|
|
1205
|
-
<!-- Stars and activity as of March 2026. -->
|
|
1206
|
-
|
|
1207
|
-
| Tool | Lang | Stars | Active | Tools | Resources | Prompts | Tasks | Code mode | Sessions | OAuth | Stdio | HTTP | Tool search | LLM |
|
|
1208
|
-
| ----------------------------------------------------------------------- | ------ | ----: | ------ | ----- | --------- | ------- | ----- | --------- | -------- | ----- | ----- | ---- | ----------- | --- |
|
|
1209
|
-
| **[apify/mcpc](https://github.com/apify/mcpc)** | TS | ~
|
|
1210
|
-
| [steipete/mcporter](https://github.com/steipete/mcporter) | TS | ~3.
|
|
1211
|
-
| [IBM/mcp-cli](https://github.com/IBM/mcp-cli) | Python | ~1.9k | ✅ | ✅ | ✅ | ✅ | — | ✅ | ✅ | ✅ | ✅ | ✅ | — | ✅ |
|
|
1212
|
-
| [knowsuchagency/mcp2cli](https://github.com/knowsuchagency/mcp2cli) | Python | ~1.
|
|
1213
|
-
| [f/mcptools](https://github.com/f/mcptools) | Go | ~1.5k | ⚠️ | ✅ | ✅ | ✅ | — | ✅ | — | — | ✅ | ✅ | — | — |
|
|
1214
|
-
| [philschmid/mcp-cli](https://github.com/philschmid/mcp-cli) | TS | ~1.
|
|
1215
|
-
| [adhikasp/mcp-client-cli](https://github.com/adhikasp/mcp-client-cli) | Python | ~670 | ⚠️ | ✅ | ✅ | ✅ | — | — | — | — | ✅ | — | — | ✅ |
|
|
1216
|
-
| [thellimist/clihub](https://github.com/thellimist/clihub) | Go | ~640 | ✅ | ✅ | — | — | — | — | — | ✅ | ✅ | ✅ | ✅ | — |
|
|
1217
|
-
| [wong2/mcp-cli](https://github.com/wong2/mcp-cli) | JS | ~430 | ⚠️ | ✅ | ✅ | ✅ | — | — | — | ✅ | — | ✅ | — | — |
|
|
1218
|
-
| [mcpshim/mcpshim](https://github.com/mcpshim/mcpshim) | Go | ~
|
|
1219
|
-
| [evantahler/mcpx](https://github.com/evantahler/mcpx) | TS | ~
|
|
1220
|
-
| [EstebanForge/mcp-cli-ent](https://github.com/EstebanForge/mcp-cli-ent) | Go | ~15 | ✅ | ✅ | — | — | — | ✅ | ✅ | — | ✅ | ✅ | ✅ | — |
|
|
1221
|
-
|
|
1222
|
-
**Legend:** ✅ = supported, ⚠️ = stale (no commits in 3+ months), **Tasks** = [async tasks](https://modelcontextprotocol.io/specification/latest/server/utilities/tasks), **LLM** = requires/uses an LLM.
|
|
1205
|
+
<!-- Stars, contributors, commits, and activity as of March 2026. -->
|
|
1206
|
+
|
|
1207
|
+
| Tool | Lang | Stars | Contrib / Commits | Active | Tools | Resources | Prompts | Tasks | Code mode | Sessions | OAuth | Stdio | HTTP | Tool search | x402 | LLM |
|
|
1208
|
+
| ----------------------------------------------------------------------- | ------ | ----: | -----------------: | ------ | ----- | --------- | ------- | ----- | --------- | -------- | ----- | ----- | ---- | ----------- | ---- | --- |
|
|
1209
|
+
| **[apify/mcpc](https://github.com/apify/mcpc)** | TS | ~420 | 7 / ~510 | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | — |
|
|
1210
|
+
| [steipete/mcporter](https://github.com/steipete/mcporter) | TS | ~3.5k | 24 / ~570 | ✅ | ✅ | — | — | — | ✅ | ✅ | ✅ | ✅ | ✅ | — | — | — |
|
|
1211
|
+
| [IBM/mcp-cli](https://github.com/IBM/mcp-cli) | Python | ~1.9k | 22 / ~790 | ✅ | ✅ | ✅ | ✅ | — | ✅ | ✅ | ✅ | ✅ | ✅ | — | — | ✅ |
|
|
1212
|
+
| [knowsuchagency/mcp2cli](https://github.com/knowsuchagency/mcp2cli) | Python | ~1.8k | 5 / ~76 | ✅ | ✅ | ✅ | ✅ | — | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | — | — |
|
|
1213
|
+
| [f/mcptools](https://github.com/f/mcptools) | Go | ~1.5k | 15 / ~170 | ⚠️ | ✅ | ✅ | ✅ | — | ✅ | — | — | ✅ | ✅ | — | — | — |
|
|
1214
|
+
| [philschmid/mcp-cli](https://github.com/philschmid/mcp-cli) | TS | ~1.1k | 2 / ~30 | ✅ | ✅ | — | — | — | ✅ | ✅ | — | ✅ | ✅ | ✅ | — | — |
|
|
1215
|
+
| [adhikasp/mcp-client-cli](https://github.com/adhikasp/mcp-client-cli) | Python | ~670 | 6 / ~110 | ⚠️ | ✅ | ✅ | ✅ | — | — | — | — | ✅ | — | — | — | ✅ |
|
|
1216
|
+
| [thellimist/clihub](https://github.com/thellimist/clihub) | Go | ~640 | 1 / ~60 | ✅ | ✅ | — | — | — | — | — | ✅ | ✅ | ✅ | ✅ | — | — |
|
|
1217
|
+
| [wong2/mcp-cli](https://github.com/wong2/mcp-cli) | JS | ~430 | 4 / ~63 | ⚠️ | ✅ | ✅ | ✅ | — | — | — | ✅ | — | ✅ | — | — | — |
|
|
1218
|
+
| [mcpshim/mcpshim](https://github.com/mcpshim/mcpshim) | Go | ~54 | 1 / ~13 | ✅ | ✅ | — | — | — | ✅ | ✅ | ✅ | — | ✅ | ✅ | — | — |
|
|
1219
|
+
| [evantahler/mcpx](https://github.com/evantahler/mcpx) | TS | ~28 | 1 / ~64 | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | — | ✅ | ✅ | ✅ | ✅ | — | — |
|
|
1220
|
+
| [EstebanForge/mcp-cli-ent](https://github.com/EstebanForge/mcp-cli-ent) | Go | ~15 | ~2 / ~46 | ✅ | ✅ | — | — | — | ✅ | ✅ | — | ✅ | ✅ | ✅ | — | — |
|
|
1221
|
+
|
|
1222
|
+
**Legend:** ✅ = supported, ⚠️ = stale (no commits in 3+ months), **Contrib / Commits** = contributors / total commits, **Tasks** = [async tasks](https://modelcontextprotocol.io/specification/latest/server/utilities/tasks), **x402** = [x402 payment protocol](https://www.x402.org/) support, **LLM** = requires/uses an LLM.
|
|
1223
1223
|
|
|
1224
1224
|
**Notes:**
|
|
1225
1225
|
|
|
@@ -10,6 +10,10 @@ export interface OAuthTokenInfo {
|
|
|
10
10
|
expiresAt?: number;
|
|
11
11
|
scope?: string;
|
|
12
12
|
}
|
|
13
|
+
export declare function isKeychainAvailable(): Promise<boolean>;
|
|
14
|
+
export declare function setKeychainOnly(account: string, value: string): Promise<void>;
|
|
15
|
+
export declare function getKeychainOnly(account: string): Promise<string | null>;
|
|
16
|
+
export declare function deleteKeychainOnly(account: string): Promise<boolean>;
|
|
13
17
|
export declare function storeKeychainOAuthClientInfo(serverUrl: string, profileName: string, client: OAuthClientInfo): Promise<void>;
|
|
14
18
|
export declare function readKeychainOAuthClientInfo(serverUrl: string, profileName: string): Promise<OAuthClientInfo | undefined>;
|
|
15
19
|
export declare function removeKeychainOAuthClientInfo(serverUrl: string, profileName: string): Promise<boolean>;
|
|
@@ -22,4 +26,7 @@ export declare function removeKeychainSessionHeaders(sessionName: string): Promi
|
|
|
22
26
|
export declare function storeKeychainProxyBearerToken(sessionName: string, token: string): Promise<void>;
|
|
23
27
|
export declare function readKeychainProxyBearerToken(sessionName: string): Promise<string | undefined>;
|
|
24
28
|
export declare function removeKeychainProxyBearerToken(sessionName: string): Promise<boolean>;
|
|
29
|
+
export declare function storeKeychainX402Wallet<T>(wallet: T): Promise<void>;
|
|
30
|
+
export declare function readKeychainX402Wallet<T>(): Promise<T | undefined>;
|
|
31
|
+
export declare function removeKeychainX402Wallet(): Promise<boolean>;
|
|
25
32
|
//# sourceMappingURL=keychain.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"keychain.d.ts","sourceRoot":"","sources":["../../../src/lib/auth/keychain.ts"],"names":[],"mappings":"AA+KA,MAAM,WAAW,eAAe;IAC9B,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,cAAc;IAC7B,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;
|
|
1
|
+
{"version":3,"file":"keychain.d.ts","sourceRoot":"","sources":["../../../src/lib/auth/keychain.ts"],"names":[],"mappings":"AA+KA,MAAM,WAAW,eAAe;IAC9B,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,cAAc;IAC7B,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAuBD,wBAAsB,mBAAmB,IAAI,OAAO,CAAC,OAAO,CAAC,CAG5D;AAED,wBAAsB,eAAe,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAKnF;AAED,wBAAsB,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAK7E;AAED,wBAAsB,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAK1E;AAGD,wBAAsB,4BAA4B,CAChD,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,eAAe,GACtB,OAAO,CAAC,IAAI,CAAC,CAGf;AAGD,wBAAsB,2BAA2B,CAC/C,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,eAAe,GAAG,SAAS,CAAC,CAMtC;AAGD,wBAAsB,6BAA6B,CACjD,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,OAAO,CAAC,CAGlB;AAGD,wBAAsB,2BAA2B,CAC/C,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,cAAc,GACrB,OAAO,CAAC,IAAI,CAAC,CAGf;AAGD,wBAAsB,0BAA0B,CAC9C,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,cAAc,GAAG,SAAS,CAAC,CAMrC;AAGD,wBAAsB,4BAA4B,CAChD,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,OAAO,CAAC,CAGlB;AAGD,wBAAsB,2BAA2B,CAC/C,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAC9B,OAAO,CAAC,IAAI,CAAC,CAGf;AAGD,wBAAsB,0BAA0B,CAC9C,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,SAAS,CAAC,CAM7C;AAGD,wBAAsB,4BAA4B,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAGxF;AAGD,wBAAsB,6BAA6B,CACjD,WAAW,EAAE,MAAM,EACnB,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,IAAI,CAAC,CAGf;AAGD,wBAAsB,4BAA4B,CAChD,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAG7B;AAGD,wBAAsB,8BAA8B,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAG1F;AAGD,wBAAsB,uBAAuB,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAGzE;AAGD,wBAAsB,sBAAsB,CAAC,CAAC,KAAK,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC,CAWxE;AAGD,wBAAsB,wBAAwB,IAAI,OAAO,CAAC,OAAO,CAAC,CAQjE"}
|
|
@@ -112,6 +112,32 @@ const oauthClientAccount = (serverUrl, profileName) => `auth-profile:${getServer
|
|
|
112
112
|
const oauthTokensAccount = (serverUrl, profileName) => `auth-profile:${getServerHost(serverUrl)}:${profileName}:tokens`;
|
|
113
113
|
const sessionHeadersAccount = (sessionName) => `session:${sessionName}:headers`;
|
|
114
114
|
const proxyBearerTokenAccount = (sessionName) => `session:${sessionName}:proxy-bearer-token`;
|
|
115
|
+
const x402WalletAccount = () => `x402-wallet`;
|
|
116
|
+
export async function isKeychainAvailable() {
|
|
117
|
+
await ensureProbed();
|
|
118
|
+
return keychainAvailable === true;
|
|
119
|
+
}
|
|
120
|
+
export async function setKeychainOnly(account, value) {
|
|
121
|
+
await ensureProbed();
|
|
122
|
+
if (keychainAvailable !== true)
|
|
123
|
+
throw new Error('Keychain is not available');
|
|
124
|
+
const EntryClass = await getEntry();
|
|
125
|
+
new EntryClass(SERVICE_NAME, account).setPassword(value);
|
|
126
|
+
}
|
|
127
|
+
export async function getKeychainOnly(account) {
|
|
128
|
+
await ensureProbed();
|
|
129
|
+
if (keychainAvailable !== true)
|
|
130
|
+
throw new Error('Keychain is not available');
|
|
131
|
+
const EntryClass = await getEntry();
|
|
132
|
+
return new EntryClass(SERVICE_NAME, account).getPassword() ?? null;
|
|
133
|
+
}
|
|
134
|
+
export async function deleteKeychainOnly(account) {
|
|
135
|
+
await ensureProbed();
|
|
136
|
+
if (keychainAvailable !== true)
|
|
137
|
+
throw new Error('Keychain is not available');
|
|
138
|
+
const EntryClass = await getEntry();
|
|
139
|
+
return new EntryClass(SERVICE_NAME, account).deletePassword();
|
|
140
|
+
}
|
|
115
141
|
export async function storeKeychainOAuthClientInfo(serverUrl, profileName, client) {
|
|
116
142
|
logger.debug(`Storing OAuth client info for ${profileName} @ ${serverUrl}`);
|
|
117
143
|
await keychainSet(oauthClientAccount(serverUrl, profileName), JSON.stringify(client));
|
|
@@ -160,4 +186,34 @@ export async function removeKeychainProxyBearerToken(sessionName) {
|
|
|
160
186
|
logger.debug(`Deleting proxy bearer token for session ${sessionName}`);
|
|
161
187
|
return keychainDelete(proxyBearerTokenAccount(sessionName));
|
|
162
188
|
}
|
|
189
|
+
export async function storeKeychainX402Wallet(wallet) {
|
|
190
|
+
logger.debug(`Storing x402 wallet in OS keychain`);
|
|
191
|
+
await setKeychainOnly(x402WalletAccount(), JSON.stringify(wallet));
|
|
192
|
+
}
|
|
193
|
+
export async function readKeychainX402Wallet() {
|
|
194
|
+
logger.debug(`Retrieving x402 wallet from OS keychain`);
|
|
195
|
+
try {
|
|
196
|
+
const raw = await getKeychainOnly(x402WalletAccount());
|
|
197
|
+
if (!raw)
|
|
198
|
+
return undefined;
|
|
199
|
+
return JSON.parse(raw);
|
|
200
|
+
}
|
|
201
|
+
catch (error) {
|
|
202
|
+
if (error.message === 'Keychain is not available')
|
|
203
|
+
return undefined;
|
|
204
|
+
logger.error(`Failed to parse x402 wallet: ${error.message}`);
|
|
205
|
+
return undefined;
|
|
206
|
+
}
|
|
207
|
+
}
|
|
208
|
+
export async function removeKeychainX402Wallet() {
|
|
209
|
+
logger.debug(`Deleting x402 wallet from OS keychain`);
|
|
210
|
+
try {
|
|
211
|
+
return await deleteKeychainOnly(x402WalletAccount());
|
|
212
|
+
}
|
|
213
|
+
catch (error) {
|
|
214
|
+
if (error.message === 'Keychain is not available')
|
|
215
|
+
return false;
|
|
216
|
+
throw error;
|
|
217
|
+
}
|
|
218
|
+
}
|
|
163
219
|
//# sourceMappingURL=keychain.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"keychain.js","sourceRoot":"","sources":["../../../src/lib/auth/keychain.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"keychain.js","sourceRoot":"","sources":["../../../src/lib/auth/keychain.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wallets.d.ts","sourceRoot":"","sources":["../../src/lib/wallets.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,UAAU,EAAkB,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"wallets.d.ts","sourceRoot":"","sources":["../../src/lib/wallets.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,UAAU,EAAkB,MAAM,YAAY,CAAC;AA0D7D,wBAAsB,SAAS,IAAI,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,CAajE;AAED,wBAAsB,UAAU,CAAC,MAAM,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAgBlE;AAED,wBAAsB,YAAY,IAAI,OAAO,CAAC,OAAO,CAAC,CAoBrD"}
|
package/dist/lib/wallets.js
CHANGED
|
@@ -3,6 +3,7 @@ import { join } from 'path';
|
|
|
3
3
|
import { getWalletsFilePath, fileExists, ensureDir, getMcpcHome } from './utils.js';
|
|
4
4
|
import { withFileLock } from './file-lock.js';
|
|
5
5
|
import { ClientError } from './errors.js';
|
|
6
|
+
import { isKeychainAvailable, readKeychainX402Wallet, storeKeychainX402Wallet, removeKeychainX402Wallet, } from './auth/keychain.js';
|
|
6
7
|
const WALLETS_DEFAULT_CONTENT = JSON.stringify({ version: 1 }, null, 2);
|
|
7
8
|
async function loadStorageInternal() {
|
|
8
9
|
const filePath = getWalletsFilePath();
|
|
@@ -39,12 +40,19 @@ async function saveStorageInternal(storage) {
|
|
|
39
40
|
}
|
|
40
41
|
}
|
|
41
42
|
export async function getWallet() {
|
|
43
|
+
if (await isKeychainAvailable()) {
|
|
44
|
+
return readKeychainX402Wallet();
|
|
45
|
+
}
|
|
42
46
|
return withFileLock(getWalletsFilePath(), async () => {
|
|
43
47
|
const storage = await loadStorageInternal();
|
|
44
48
|
return storage.wallet;
|
|
45
49
|
}, WALLETS_DEFAULT_CONTENT);
|
|
46
50
|
}
|
|
47
51
|
export async function saveWallet(wallet) {
|
|
52
|
+
if (await isKeychainAvailable()) {
|
|
53
|
+
await storeKeychainX402Wallet(wallet);
|
|
54
|
+
return;
|
|
55
|
+
}
|
|
48
56
|
const filePath = getWalletsFilePath();
|
|
49
57
|
await withFileLock(filePath, async () => {
|
|
50
58
|
const storage = await loadStorageInternal();
|
|
@@ -53,7 +61,12 @@ export async function saveWallet(wallet) {
|
|
|
53
61
|
}, WALLETS_DEFAULT_CONTENT);
|
|
54
62
|
}
|
|
55
63
|
export async function removeWallet() {
|
|
64
|
+
if (await isKeychainAvailable()) {
|
|
65
|
+
return removeKeychainX402Wallet();
|
|
66
|
+
}
|
|
56
67
|
const filePath = getWalletsFilePath();
|
|
68
|
+
if (!(await fileExists(filePath)))
|
|
69
|
+
return false;
|
|
57
70
|
return withFileLock(filePath, async () => {
|
|
58
71
|
const storage = await loadStorageInternal();
|
|
59
72
|
if (!storage.wallet)
|
package/dist/lib/wallets.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wallets.js","sourceRoot":"","sources":["../../src/lib/wallets.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAClE,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAE5B,OAAO,EAAE,kBAAkB,EAAE,UAAU,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AACpF,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"wallets.js","sourceRoot":"","sources":["../../src/lib/wallets.ts"],"names":[],"mappings":"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"}
|