@1ly/mcp-server 0.1.0 → 0.1.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/README.md +574 -166
- package/dist/config.d.ts +7 -0
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +19 -3
- package/dist/config.js.map +1 -1
- package/dist/index.js +18 -2
- package/dist/index.js.map +1 -1
- package/dist/keys.d.ts +13 -0
- package/dist/keys.d.ts.map +1 -0
- package/dist/keys.js +52 -0
- package/dist/keys.js.map +1 -0
- package/dist/selftest.d.ts.map +1 -1
- package/dist/selftest.js +14 -9
- package/dist/selftest.js.map +1 -1
- package/dist/tools/call.d.ts.map +1 -1
- package/dist/tools/call.js +48 -16
- package/dist/tools/call.js.map +1 -1
- package/dist/tools/create-key.d.ts +21 -0
- package/dist/tools/create-key.d.ts.map +1 -0
- package/dist/tools/create-key.js +38 -0
- package/dist/tools/create-key.js.map +1 -0
- package/dist/tools/create-store.d.ts +27 -0
- package/dist/tools/create-store.d.ts.map +1 -0
- package/dist/tools/create-store.js +99 -0
- package/dist/tools/create-store.js.map +1 -0
- package/dist/tools/list-keys.d.ts +17 -0
- package/dist/tools/list-keys.d.ts.map +1 -0
- package/dist/tools/list-keys.js +29 -0
- package/dist/tools/list-keys.js.map +1 -0
- package/dist/tools/review.d.ts.map +1 -1
- package/dist/tools/review.js +45 -20
- package/dist/tools/review.js.map +1 -1
- package/dist/tools/revoke-key.d.ts +22 -0
- package/dist/tools/revoke-key.d.ts.map +1 -0
- package/dist/tools/revoke-key.js +37 -0
- package/dist/tools/revoke-key.js.map +1 -0
- package/dist/wallet/evm.d.ts.map +1 -1
- package/dist/wallet/evm.js +4 -4
- package/dist/wallet/evm.js.map +1 -1
- package/dist/wallet/solana.d.ts.map +1 -1
- package/dist/wallet/solana.js +2 -1
- package/dist/wallet/solana.js.map +1 -1
- package/package.json +3 -3
package/dist/config.d.ts
CHANGED
|
@@ -11,6 +11,8 @@ export declare const ConfigSchema: z.ZodObject<{
|
|
|
11
11
|
type: "solana" | "evm";
|
|
12
12
|
key: string;
|
|
13
13
|
}>>>;
|
|
14
|
+
walletSolana: z.ZodNullable<z.ZodOptional<z.ZodString>>;
|
|
15
|
+
walletEvm: z.ZodNullable<z.ZodOptional<z.ZodString>>;
|
|
14
16
|
budgets: z.ZodObject<{
|
|
15
17
|
perCall: z.ZodDefault<z.ZodNumber>;
|
|
16
18
|
daily: z.ZodDefault<z.ZodNumber>;
|
|
@@ -34,6 +36,8 @@ export declare const ConfigSchema: z.ZodObject<{
|
|
|
34
36
|
type: "solana" | "evm";
|
|
35
37
|
key: string;
|
|
36
38
|
} | null | undefined;
|
|
39
|
+
walletSolana?: string | null | undefined;
|
|
40
|
+
walletEvm?: string | null | undefined;
|
|
37
41
|
apiKey?: string | null | undefined;
|
|
38
42
|
}, {
|
|
39
43
|
budgets: {
|
|
@@ -45,9 +49,12 @@ export declare const ConfigSchema: z.ZodObject<{
|
|
|
45
49
|
type: "solana" | "evm";
|
|
46
50
|
key: string;
|
|
47
51
|
} | null | undefined;
|
|
52
|
+
walletSolana?: string | null | undefined;
|
|
53
|
+
walletEvm?: string | null | undefined;
|
|
48
54
|
network?: "solana" | "base" | undefined;
|
|
49
55
|
apiKey?: string | null | undefined;
|
|
50
56
|
}>;
|
|
51
57
|
export type Config = z.infer<typeof ConfigSchema>;
|
|
52
58
|
export declare function loadConfig(): Config;
|
|
59
|
+
export declare function loadConfigWithStoredKey(): Promise<Config>;
|
|
53
60
|
//# sourceMappingURL=config.d.ts.map
|
package/dist/config.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGxB,eAAO,MAAM,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAiBvB,CAAC;AAEH,MAAM,MAAM,MAAM,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,YAAY,CAAC,CAAC;AAElD,wBAAgB,UAAU,IAAI,MAAM,CAoBnC;AAED,wBAAsB,uBAAuB,IAAI,OAAO,CAAC,MAAM,CAAC,CAK/D"}
|
package/dist/config.js
CHANGED
|
@@ -2,7 +2,9 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.ConfigSchema = void 0;
|
|
4
4
|
exports.loadConfig = loadConfig;
|
|
5
|
+
exports.loadConfigWithStoredKey = loadConfigWithStoredKey;
|
|
5
6
|
const zod_1 = require("zod");
|
|
7
|
+
const keys_js_1 = require("./keys.js");
|
|
6
8
|
exports.ConfigSchema = zod_1.z.object({
|
|
7
9
|
apiBase: zod_1.z.string().url().default("https://1ly.store"),
|
|
8
10
|
wallet: zod_1.z
|
|
@@ -12,6 +14,8 @@ exports.ConfigSchema = zod_1.z.object({
|
|
|
12
14
|
})
|
|
13
15
|
.optional()
|
|
14
16
|
.nullable(),
|
|
17
|
+
walletSolana: zod_1.z.string().optional().nullable(),
|
|
18
|
+
walletEvm: zod_1.z.string().optional().nullable(),
|
|
15
19
|
budgets: zod_1.z.object({
|
|
16
20
|
perCall: zod_1.z.number().positive().default(1.0),
|
|
17
21
|
daily: zod_1.z.number().positive().default(50.0),
|
|
@@ -22,16 +26,28 @@ exports.ConfigSchema = zod_1.z.object({
|
|
|
22
26
|
function loadConfig() {
|
|
23
27
|
const walletType = process.env.ONELY_WALLET_TYPE;
|
|
24
28
|
const walletKey = process.env.ONELY_WALLET_KEY;
|
|
25
|
-
const
|
|
29
|
+
const walletSolana = process.env.ONELY_WALLET_SOLANA_KEY || null;
|
|
30
|
+
const walletEvm = process.env.ONELY_WALLET_EVM_KEY || null;
|
|
31
|
+
const apiKeyEnv = process.env.ONELY_API_KEY || null;
|
|
32
|
+
const apiBase = process.env.ONELY_API_BASE || "https://1ly.store";
|
|
26
33
|
return exports.ConfigSchema.parse({
|
|
27
|
-
apiBase
|
|
34
|
+
apiBase,
|
|
28
35
|
wallet: walletType && walletKey ? { type: walletType, key: walletKey } : null,
|
|
36
|
+
walletSolana: walletSolana || (walletType === "solana" ? walletKey : null),
|
|
37
|
+
walletEvm: walletEvm || (walletType === "evm" ? walletKey : null),
|
|
29
38
|
budgets: {
|
|
30
39
|
perCall: parseFloat(process.env.ONELY_BUDGET_PER_CALL || "1.0"),
|
|
31
40
|
daily: parseFloat(process.env.ONELY_BUDGET_DAILY || "50.0"),
|
|
32
41
|
},
|
|
33
42
|
network: process.env.ONELY_NETWORK || "solana",
|
|
34
|
-
apiKey,
|
|
43
|
+
apiKey: apiKeyEnv,
|
|
35
44
|
});
|
|
36
45
|
}
|
|
46
|
+
async function loadConfigWithStoredKey() {
|
|
47
|
+
const config = loadConfig();
|
|
48
|
+
if (config.apiKey)
|
|
49
|
+
return config;
|
|
50
|
+
const stored = await (0, keys_js_1.loadStoredApiKey)();
|
|
51
|
+
return { ...config, apiKey: stored };
|
|
52
|
+
}
|
|
37
53
|
//# sourceMappingURL=config.js.map
|
package/dist/config.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"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"}
|
package/dist/index.js
CHANGED
|
@@ -13,6 +13,10 @@ const list_links_js_1 = require("./tools/list-links.js");
|
|
|
13
13
|
const update_link_js_1 = require("./tools/update-link.js");
|
|
14
14
|
const delete_link_js_1 = require("./tools/delete-link.js");
|
|
15
15
|
const get_stats_js_1 = require("./tools/get-stats.js");
|
|
16
|
+
const create_store_js_1 = require("./tools/create-store.js");
|
|
17
|
+
const list_keys_js_1 = require("./tools/list-keys.js");
|
|
18
|
+
const create_key_js_1 = require("./tools/create-key.js");
|
|
19
|
+
const revoke_key_js_1 = require("./tools/revoke-key.js");
|
|
16
20
|
const config_js_1 = require("./config.js");
|
|
17
21
|
const selftest_js_1 = require("./selftest.js");
|
|
18
22
|
const mcp_js_1 = require("./mcp.js");
|
|
@@ -23,10 +27,9 @@ async function main() {
|
|
|
23
27
|
const code = await (0, selftest_js_1.runSelfTest)(argv);
|
|
24
28
|
process.exit(code);
|
|
25
29
|
}
|
|
26
|
-
const config = (0, config_js_1.loadConfig)();
|
|
27
30
|
const server = new index_js_1.Server({
|
|
28
31
|
name: "1ly",
|
|
29
|
-
version: "0.1.
|
|
32
|
+
version: "0.1.2",
|
|
30
33
|
}, {
|
|
31
34
|
capabilities: {
|
|
32
35
|
tools: {},
|
|
@@ -43,11 +46,16 @@ async function main() {
|
|
|
43
46
|
update_link_js_1.updateLinkTool,
|
|
44
47
|
delete_link_js_1.deleteLinkTool,
|
|
45
48
|
get_stats_js_1.getStatsTool,
|
|
49
|
+
create_store_js_1.createStoreTool,
|
|
50
|
+
list_keys_js_1.listKeysTool,
|
|
51
|
+
create_key_js_1.createKeyTool,
|
|
52
|
+
revoke_key_js_1.revokeKeyTool,
|
|
46
53
|
],
|
|
47
54
|
}));
|
|
48
55
|
server.setRequestHandler(types_js_1.CallToolRequestSchema, async (request) => {
|
|
49
56
|
const { name, arguments: args } = request.params;
|
|
50
57
|
try {
|
|
58
|
+
const config = await (0, config_js_1.loadConfigWithStoredKey)();
|
|
51
59
|
switch (name) {
|
|
52
60
|
case "1ly_search":
|
|
53
61
|
return await (0, search_js_1.handleSearch)(args, config);
|
|
@@ -67,6 +75,14 @@ async function main() {
|
|
|
67
75
|
return await (0, delete_link_js_1.handleDeleteLink)(args, config);
|
|
68
76
|
case "1ly_get_stats":
|
|
69
77
|
return await (0, get_stats_js_1.handleGetStats)(args, config);
|
|
78
|
+
case "1ly_create_store":
|
|
79
|
+
return await (0, create_store_js_1.handleCreateStore)(args, config);
|
|
80
|
+
case "1ly_list_keys":
|
|
81
|
+
return await (0, list_keys_js_1.handleListKeys)(args, config);
|
|
82
|
+
case "1ly_create_key":
|
|
83
|
+
return await (0, create_key_js_1.handleCreateKey)(args, config);
|
|
84
|
+
case "1ly_revoke_key":
|
|
85
|
+
return await (0, revoke_key_js_1.handleRevokeKey)(args, config);
|
|
70
86
|
default:
|
|
71
87
|
return {
|
|
72
88
|
content: [{ type: "text", text: `Unknown tool: ${name}` }],
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAEA,wEAAmE;AACnE,wEAAiF;AACjF,iEAG4C;AAE5C,iDAA6D;AAC7D,mDAAgE;AAChE,6CAAuD;AACvD,iDAA6D;AAC7D,2DAA0E;AAC1E,yDAAuE;AACvE,2DAA0E;AAC1E,2DAA0E;AAC1E,uDAAoE;AACpE,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/dist/keys.d.ts
ADDED
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
type StoredKeys = {
|
|
2
|
+
apiKey?: string;
|
|
3
|
+
updatedAt?: string;
|
|
4
|
+
store?: {
|
|
5
|
+
username?: string;
|
|
6
|
+
createdBy?: string;
|
|
7
|
+
};
|
|
8
|
+
};
|
|
9
|
+
export declare function getDefaultKeyPath(): string;
|
|
10
|
+
export declare function loadStoredApiKey(path?: string): Promise<string | null>;
|
|
11
|
+
export declare function saveApiKey(apiKey: string, store?: StoredKeys["store"], path?: string): Promise<string>;
|
|
12
|
+
export {};
|
|
13
|
+
//# sourceMappingURL=keys.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"keys.d.ts","sourceRoot":"","sources":["../src/keys.ts"],"names":[],"mappings":"AAIA,KAAK,UAAU,GAAG;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE;QACN,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,SAAS,CAAC,EAAE,MAAM,CAAC;KACpB,CAAC;CACH,CAAC;AAEF,wBAAgB,iBAAiB,IAAI,MAAM,CAW1C;AAED,wBAAsB,gBAAgB,CAAC,IAAI,SAAsB,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAQzF;AAED,wBAAsB,UAAU,CAC9B,MAAM,EAAE,MAAM,EACd,KAAK,CAAC,EAAE,UAAU,CAAC,OAAO,CAAC,EAC3B,IAAI,SAAsB,GACzB,OAAO,CAAC,MAAM,CAAC,CAkBjB"}
|
package/dist/keys.js
ADDED
|
@@ -0,0 +1,52 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.getDefaultKeyPath = getDefaultKeyPath;
|
|
7
|
+
exports.loadStoredApiKey = loadStoredApiKey;
|
|
8
|
+
exports.saveApiKey = saveApiKey;
|
|
9
|
+
const promises_1 = require("node:fs/promises");
|
|
10
|
+
const node_path_1 = require("node:path");
|
|
11
|
+
const node_os_1 = __importDefault(require("node:os"));
|
|
12
|
+
function getDefaultKeyPath() {
|
|
13
|
+
const home = node_os_1.default.homedir();
|
|
14
|
+
const platform = process.platform;
|
|
15
|
+
if (platform === "darwin") {
|
|
16
|
+
return (0, node_path_1.join)(home, "Library", "Application Support", "1ly", "onely_api_key.json");
|
|
17
|
+
}
|
|
18
|
+
if (platform === "win32") {
|
|
19
|
+
const appData = process.env.APPDATA || (0, node_path_1.join)(home, "AppData", "Roaming");
|
|
20
|
+
return (0, node_path_1.join)(appData, "1ly", "onely_api_key.json");
|
|
21
|
+
}
|
|
22
|
+
return (0, node_path_1.join)(home, ".config", "1ly", "onely_api_key.json");
|
|
23
|
+
}
|
|
24
|
+
async function loadStoredApiKey(path = getDefaultKeyPath()) {
|
|
25
|
+
try {
|
|
26
|
+
const raw = await (0, promises_1.readFile)(path, "utf-8");
|
|
27
|
+
const data = JSON.parse(raw);
|
|
28
|
+
return data.apiKey || null;
|
|
29
|
+
}
|
|
30
|
+
catch {
|
|
31
|
+
return null;
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
async function saveApiKey(apiKey, store, path = getDefaultKeyPath()) {
|
|
35
|
+
await (0, promises_1.mkdir)((0, node_path_1.dirname)(path), { recursive: true });
|
|
36
|
+
const payload = {
|
|
37
|
+
apiKey,
|
|
38
|
+
store,
|
|
39
|
+
updatedAt: new Date().toISOString(),
|
|
40
|
+
};
|
|
41
|
+
await (0, promises_1.writeFile)(path, JSON.stringify(payload, null, 2), "utf-8");
|
|
42
|
+
if (process.platform !== "win32") {
|
|
43
|
+
try {
|
|
44
|
+
await import("node:fs/promises").then((fs) => fs.chmod(path, 0o600));
|
|
45
|
+
}
|
|
46
|
+
catch {
|
|
47
|
+
// Best-effort; ignore chmod failures
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
return path;
|
|
51
|
+
}
|
|
52
|
+
//# sourceMappingURL=keys.js.map
|
package/dist/keys.js.map
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"keys.js","sourceRoot":"","sources":["../src/keys.ts"],"names":[],"mappings":";;;;;AAaA,8CAWC;AAED,4CAQC;AAED,gCAsBC;AA1DD,+CAA8D;AAC9D,yCAA0C;AAC1C,sDAAyB;AAWzB,SAAgB,iBAAiB;IAC/B,MAAM,IAAI,GAAG,iBAAE,CAAC,OAAO,EAAE,CAAC;IAC1B,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;IAClC,IAAI,QAAQ,KAAK,QAAQ,EAAE,CAAC;QAC1B,OAAO,IAAA,gBAAI,EAAC,IAAI,EAAE,SAAS,EAAE,qBAAqB,EAAE,KAAK,EAAE,oBAAoB,CAAC,CAAC;IACnF,CAAC;IACD,IAAI,QAAQ,KAAK,OAAO,EAAE,CAAC;QACzB,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,OAAO,IAAI,IAAA,gBAAI,EAAC,IAAI,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC;QACxE,OAAO,IAAA,gBAAI,EAAC,OAAO,EAAE,KAAK,EAAE,oBAAoB,CAAC,CAAC;IACpD,CAAC;IACD,OAAO,IAAA,gBAAI,EAAC,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,oBAAoB,CAAC,CAAC;AAC5D,CAAC;AAEM,KAAK,UAAU,gBAAgB,CAAC,IAAI,GAAG,iBAAiB,EAAE;IAC/D,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,MAAM,IAAA,mBAAQ,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC1C,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAe,CAAC;QAC3C,OAAO,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC;IAC7B,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAEM,KAAK,UAAU,UAAU,CAC9B,MAAc,EACd,KAA2B,EAC3B,IAAI,GAAG,iBAAiB,EAAE;IAE1B,MAAM,IAAA,gBAAK,EAAC,IAAA,mBAAO,EAAC,IAAI,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAChD,MAAM,OAAO,GAAe;QAC1B,MAAM;QACN,KAAK;QACL,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;KACpC,CAAC;IACF,MAAM,IAAA,oBAAS,EAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;IAEjE,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC;QACjC,IAAI,CAAC;YACH,MAAM,MAAM,CAAC,kBAAkB,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC;QACvE,CAAC;QAAC,MAAM,CAAC;YACP,qCAAqC;QACvC,CAAC;IACH,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC"}
|
package/dist/selftest.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"selftest.d.ts","sourceRoot":"","sources":["../src/selftest.ts"],"names":[],"mappings":"AASA,wBAAsB,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"selftest.d.ts","sourceRoot":"","sources":["../src/selftest.ts"],"names":[],"mappings":"AASA,wBAAsB,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAoDjE"}
|
package/dist/selftest.js
CHANGED
|
@@ -14,11 +14,15 @@ async function runSelfTest(argv) {
|
|
|
14
14
|
log("1ly-mcp --self-test");
|
|
15
15
|
log("");
|
|
16
16
|
log("Required env:");
|
|
17
|
+
log("- ONELY_WALLET_SOLANA_KEY=/path/to/solana.json (or inline json array)");
|
|
18
|
+
log("- ONELY_WALLET_EVM_KEY=/path/to/evm.key (or inline 0x...)");
|
|
19
|
+
log("");
|
|
20
|
+
log("Legacy env (still supported):");
|
|
17
21
|
log("- ONELY_WALLET_TYPE=solana|evm");
|
|
18
22
|
log("- ONELY_WALLET_KEY=/path/to/key (or inline key)");
|
|
19
23
|
log("");
|
|
20
24
|
log("Optional env:");
|
|
21
|
-
log("- ONELY_API_BASE
|
|
25
|
+
log("- ONELY_API_BASE=https://1ly.store (optional override)");
|
|
22
26
|
log("- ONELY_BUDGET_PER_CALL=1.00");
|
|
23
27
|
log("- ONELY_BUDGET_DAILY=50.00");
|
|
24
28
|
log("- ONELY_BUDGET_STATE_FILE=/path/to/state.json");
|
|
@@ -28,17 +32,18 @@ async function runSelfTest(argv) {
|
|
|
28
32
|
log("[self-test] loading config");
|
|
29
33
|
const config = (0, config_js_1.loadConfig)();
|
|
30
34
|
log(`[self-test] apiBase=${config.apiBase}`);
|
|
31
|
-
|
|
32
|
-
|
|
35
|
+
const solanaKey = config.walletSolana || (config.wallet?.type === "solana" ? config.wallet.key : null);
|
|
36
|
+
const evmKey = config.walletEvm || (config.wallet?.type === "evm" ? config.wallet.key : null);
|
|
37
|
+
if (!solanaKey && !evmKey) {
|
|
38
|
+
throw new Error("Missing wallet config: set ONELY_WALLET_SOLANA_KEY or ONELY_WALLET_EVM_KEY");
|
|
33
39
|
}
|
|
34
|
-
log(
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
const kp = await (0, solana_js_1.loadSolanaWallet)(config.wallet.key);
|
|
40
|
+
log("[self-test] loading wallets");
|
|
41
|
+
if (solanaKey) {
|
|
42
|
+
const kp = await (0, solana_js_1.loadSolanaWallet)(solanaKey);
|
|
38
43
|
log(`[self-test] solana pubkey=${kp.publicKey.toBase58()}`);
|
|
39
44
|
}
|
|
40
|
-
|
|
41
|
-
const account = await (0, evm_js_1.loadEvmWallet)(
|
|
45
|
+
if (evmKey) {
|
|
46
|
+
const account = await (0, evm_js_1.loadEvmWallet)(evmKey);
|
|
42
47
|
log(`[self-test] evm address=${account.address}`);
|
|
43
48
|
}
|
|
44
49
|
log("[self-test] checking 1ly.store reachability");
|
package/dist/selftest.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"selftest.js","sourceRoot":"","sources":["../src/selftest.ts"],"names":[],"mappings":";;AASA,
|
|
1
|
+
{"version":3,"file":"selftest.js","sourceRoot":"","sources":["../src/selftest.ts"],"names":[],"mappings":"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"}
|
package/dist/tools/call.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"call.d.ts","sourceRoot":"","sources":["../../src/tools/call.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAS3C,eAAO,MAAM,QAAQ;;;;;;;;;;;;;;;;;;;;;;;;;;CA4BpB,CAAC;AAiBF,wBAAsB,UAAU,CAAC,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM;;;;;;
|
|
1
|
+
{"version":3,"file":"call.d.ts","sourceRoot":"","sources":["../../src/tools/call.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAS3C,eAAO,MAAM,QAAQ;;;;;;;;;;;;;;;;;;;;;;;;;;CA4BpB,CAAC;AAiBF,wBAAsB,UAAU,CAAC,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM;;;;;;GAmJ7D"}
|
package/dist/tools/call.js
CHANGED
|
@@ -52,8 +52,10 @@ function parseEndpoint(endpoint) {
|
|
|
52
52
|
}
|
|
53
53
|
async function handleCall(args, config) {
|
|
54
54
|
const input = InputSchema.parse(args);
|
|
55
|
-
|
|
56
|
-
|
|
55
|
+
const solanaKey = config.walletSolana || (config.wallet?.type === "solana" ? config.wallet.key : null);
|
|
56
|
+
const evmKey = config.walletEvm || (config.wallet?.type === "evm" ? config.wallet.key : null);
|
|
57
|
+
if (!solanaKey && !evmKey) {
|
|
58
|
+
throw new Error("Missing wallet config: set ONELY_WALLET_SOLANA_KEY or ONELY_WALLET_EVM_KEY (or legacy ONELY_WALLET_TYPE/KEY)");
|
|
57
59
|
}
|
|
58
60
|
const endpointPath = parseEndpoint(input.endpoint);
|
|
59
61
|
const fullUrl = `${config.apiBase}${endpointPath}`;
|
|
@@ -73,15 +75,36 @@ async function handleCall(args, config) {
|
|
|
73
75
|
// Non-402 failure
|
|
74
76
|
await (0, http_js_1.assertOk)(initialResponse, "API call failed");
|
|
75
77
|
}
|
|
76
|
-
// Parse 402 response body for payment requirements
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
78
|
+
// Parse 402 response body for payment requirements (best-effort; may be empty/non-JSON)
|
|
79
|
+
let body402 = {};
|
|
80
|
+
try {
|
|
81
|
+
body402 = (await initialResponse.json());
|
|
82
|
+
}
|
|
83
|
+
catch {
|
|
84
|
+
// Some 402 responses only include headers
|
|
85
|
+
}
|
|
86
|
+
const preferredNetwork = solanaKey && !evmKey
|
|
87
|
+
? "solana"
|
|
88
|
+
: evmKey && !solanaKey
|
|
89
|
+
? "eip155"
|
|
90
|
+
: config.network === "solana"
|
|
91
|
+
? "solana"
|
|
92
|
+
: "eip155";
|
|
93
|
+
const accepts = body402.accepts?.find((entry) => {
|
|
94
|
+
const network = String(entry.network);
|
|
95
|
+
if (preferredNetwork === "solana")
|
|
96
|
+
return network.startsWith("solana:");
|
|
97
|
+
return network.startsWith("eip155:");
|
|
98
|
+
}) || body402.accepts?.[0];
|
|
80
99
|
if (!accepts) {
|
|
81
100
|
throw new Error("402 response missing payment requirements in body");
|
|
82
101
|
}
|
|
83
102
|
// Price is in smallest unit (e.g., 10000 = 0.01 USDC with 6 decimals)
|
|
84
|
-
const
|
|
103
|
+
const rawAmount = accepts.amount || accepts.maxAmountRequired;
|
|
104
|
+
const priceInSmallestUnit = rawAmount ? Number(rawAmount) : NaN;
|
|
105
|
+
if (!Number.isFinite(priceInSmallestUnit) || priceInSmallestUnit <= 0) {
|
|
106
|
+
throw new Error("Invalid or missing payment amount in 402 requirements");
|
|
107
|
+
}
|
|
85
108
|
const priceUsd = priceInSmallestUnit / 1_000_000;
|
|
86
109
|
if (priceUsd > config.budgets.perCall) {
|
|
87
110
|
throw new Error(`Price $${priceUsd} exceeds per-call budget limit of $${config.budgets.perCall}`);
|
|
@@ -90,8 +113,17 @@ async function handleCall(args, config) {
|
|
|
90
113
|
(0, budget_js_1.checkAndRecordDailySpend)(config, priceUsd);
|
|
91
114
|
// Build x402 payment signature header (v2)
|
|
92
115
|
let paymentSignature;
|
|
93
|
-
|
|
94
|
-
|
|
116
|
+
const network = String(accepts.network || "");
|
|
117
|
+
const shouldUseSolana = network.startsWith("solana:")
|
|
118
|
+
? true
|
|
119
|
+
: network.startsWith("eip155:")
|
|
120
|
+
? false
|
|
121
|
+
: preferredNetwork === "solana";
|
|
122
|
+
if (shouldUseSolana) {
|
|
123
|
+
if (!solanaKey) {
|
|
124
|
+
throw new Error("Solana wallet not configured for this payment");
|
|
125
|
+
}
|
|
126
|
+
const wallet = await (0, solana_js_1.loadSolanaWallet)(solanaKey);
|
|
95
127
|
const coreClient = new client_1.x402Client((_, acceptsList) => {
|
|
96
128
|
return (acceptsList.find((entry) => String(entry.network).startsWith("solana:")) ||
|
|
97
129
|
acceptsList[0]);
|
|
@@ -100,24 +132,24 @@ async function handleCall(args, config) {
|
|
|
100
132
|
const paymentRequired = httpClient.getPaymentRequiredResponse((name) => initialResponse.headers.get(name), body402);
|
|
101
133
|
paymentSignature = await (0, solana_js_1.buildSolanaPaymentSignature)(paymentRequired, wallet);
|
|
102
134
|
}
|
|
103
|
-
else
|
|
135
|
+
else {
|
|
136
|
+
if (!evmKey) {
|
|
137
|
+
throw new Error("EVM wallet not configured for this payment");
|
|
138
|
+
}
|
|
104
139
|
const coreClient = new client_1.x402Client((_, acceptsList) => {
|
|
105
140
|
return (acceptsList.find((entry) => String(entry.network).startsWith("eip155:")) ||
|
|
106
141
|
acceptsList[0]);
|
|
107
142
|
});
|
|
108
143
|
const httpClient = new http_1.x402HTTPClient(coreClient);
|
|
109
144
|
const paymentRequired = httpClient.getPaymentRequiredResponse((name) => initialResponse.headers.get(name), body402);
|
|
110
|
-
paymentSignature = await (0, evm_js_1.buildEvmPaymentSignature)(paymentRequired,
|
|
111
|
-
}
|
|
112
|
-
else {
|
|
113
|
-
throw new Error(`Unsupported wallet type: ${config.wallet.type}`);
|
|
145
|
+
paymentSignature = await (0, evm_js_1.buildEvmPaymentSignature)(paymentRequired, evmKey);
|
|
114
146
|
}
|
|
115
|
-
const paidResponse = await
|
|
147
|
+
const paidResponse = await (0, http_js_1.fetchWithTimeout)(fullUrl, {
|
|
116
148
|
method: input.method,
|
|
117
149
|
headers: {
|
|
118
150
|
"Content-Type": "application/json",
|
|
119
|
-
"payment-signature": paymentSignature,
|
|
120
151
|
...input.headers,
|
|
152
|
+
"payment-signature": paymentSignature,
|
|
121
153
|
},
|
|
122
154
|
body: input.body ? JSON.stringify(input.body) : undefined,
|
|
123
155
|
});
|
package/dist/tools/call.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"call.js","sourceRoot":"","sources":["../../src/tools/call.ts"],"names":[],"mappings":";;;AAuDA,
|
|
1
|
+
{"version":3,"file":"call.js","sourceRoot":"","sources":["../../src/tools/call.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
import type { Config } from "../config.js";
|
|
2
|
+
export declare const createKeyTool: {
|
|
3
|
+
name: string;
|
|
4
|
+
description: string;
|
|
5
|
+
inputSchema: {
|
|
6
|
+
type: "object";
|
|
7
|
+
properties: {
|
|
8
|
+
name: {
|
|
9
|
+
type: string;
|
|
10
|
+
};
|
|
11
|
+
};
|
|
12
|
+
};
|
|
13
|
+
};
|
|
14
|
+
export declare function handleCreateKey(args: unknown, config: Config): Promise<{
|
|
15
|
+
isError?: true | undefined;
|
|
16
|
+
content: {
|
|
17
|
+
type: "text";
|
|
18
|
+
text: string;
|
|
19
|
+
}[];
|
|
20
|
+
}>;
|
|
21
|
+
//# sourceMappingURL=create-key.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"create-key.d.ts","sourceRoot":"","sources":["../../src/tools/create-key.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAI3C,eAAO,MAAM,aAAa;;;;;;;;;;;CASzB,CAAC;AAMF,wBAAsB,eAAe,CAAC,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM;;;;;;GAkBlE"}
|
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.createKeyTool = void 0;
|
|
4
|
+
exports.handleCreateKey = handleCreateKey;
|
|
5
|
+
const zod_1 = require("zod");
|
|
6
|
+
const http_js_1 = require("../http.js");
|
|
7
|
+
const mcp_js_1 = require("../mcp.js");
|
|
8
|
+
exports.createKeyTool = {
|
|
9
|
+
name: "1ly_create_key",
|
|
10
|
+
description: "Create a new API key for the authenticated agent store (requires ONELY_API_KEY).",
|
|
11
|
+
inputSchema: {
|
|
12
|
+
type: "object",
|
|
13
|
+
properties: {
|
|
14
|
+
name: { type: "string" },
|
|
15
|
+
},
|
|
16
|
+
},
|
|
17
|
+
};
|
|
18
|
+
const InputSchema = zod_1.z.object({
|
|
19
|
+
name: zod_1.z.string().min(1).max(64).optional(),
|
|
20
|
+
});
|
|
21
|
+
async function handleCreateKey(args, config) {
|
|
22
|
+
const input = InputSchema.parse(args);
|
|
23
|
+
if (!config.apiKey) {
|
|
24
|
+
throw new Error("Missing ONELY_API_KEY for creating keys");
|
|
25
|
+
}
|
|
26
|
+
const res = await (0, http_js_1.fetchWithTimeout)(`${config.apiBase}/api/agent/keys`, {
|
|
27
|
+
method: "POST",
|
|
28
|
+
headers: {
|
|
29
|
+
"Content-Type": "application/json",
|
|
30
|
+
Authorization: `Bearer ${config.apiKey}`,
|
|
31
|
+
},
|
|
32
|
+
body: JSON.stringify({ name: input.name }),
|
|
33
|
+
});
|
|
34
|
+
await (0, http_js_1.assertOk)(res, "Create key failed");
|
|
35
|
+
const data = await res.json();
|
|
36
|
+
return (0, mcp_js_1.mcpOk)(data);
|
|
37
|
+
}
|
|
38
|
+
//# sourceMappingURL=create-key.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"create-key.js","sourceRoot":"","sources":["../../src/tools/create-key.ts"],"names":[],"mappings":";;;AAoBA,0CAkBC;AAtCD,6BAAwB;AAExB,wCAAwD;AACxD,sCAAkC;AAErB,QAAA,aAAa,GAAG;IAC3B,IAAI,EAAE,gBAAgB;IACtB,WAAW,EAAE,kFAAkF;IAC/F,WAAW,EAAE;QACX,IAAI,EAAE,QAAiB;QACvB,UAAU,EAAE;YACV,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;SACzB;KACF;CACF,CAAC;AAEF,MAAM,WAAW,GAAG,OAAC,CAAC,MAAM,CAAC;IAC3B,IAAI,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,QAAQ,EAAE;CAC3C,CAAC,CAAC;AAEI,KAAK,UAAU,eAAe,CAAC,IAAa,EAAE,MAAc;IACjE,MAAM,KAAK,GAAG,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACtC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;QACnB,MAAM,IAAI,KAAK,CAAC,yCAAyC,CAAC,CAAC;IAC7D,CAAC;IAED,MAAM,GAAG,GAAG,MAAM,IAAA,0BAAgB,EAAC,GAAG,MAAM,CAAC,OAAO,iBAAiB,EAAE;QACrE,MAAM,EAAE,MAAM;QACd,OAAO,EAAE;YACP,cAAc,EAAE,kBAAkB;YAClC,aAAa,EAAE,UAAU,MAAM,CAAC,MAAM,EAAE;SACzC;QACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC;KAC3C,CAAC,CAAC;IAEH,MAAM,IAAA,kBAAQ,EAAC,GAAG,EAAE,mBAAmB,CAAC,CAAC;IACzC,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC;IAC9B,OAAO,IAAA,cAAK,EAAC,IAAI,CAAC,CAAC;AACrB,CAAC"}
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
import type { Config } from "../config.js";
|
|
2
|
+
export declare const createStoreTool: {
|
|
3
|
+
name: string;
|
|
4
|
+
description: string;
|
|
5
|
+
inputSchema: {
|
|
6
|
+
type: "object";
|
|
7
|
+
properties: {
|
|
8
|
+
username: {
|
|
9
|
+
type: string;
|
|
10
|
+
};
|
|
11
|
+
displayName: {
|
|
12
|
+
type: string;
|
|
13
|
+
};
|
|
14
|
+
avatarUrl: {
|
|
15
|
+
type: string;
|
|
16
|
+
};
|
|
17
|
+
};
|
|
18
|
+
};
|
|
19
|
+
};
|
|
20
|
+
export declare function handleCreateStore(args: unknown, config: Config): Promise<{
|
|
21
|
+
isError?: true | undefined;
|
|
22
|
+
content: {
|
|
23
|
+
type: "text";
|
|
24
|
+
text: string;
|
|
25
|
+
}[];
|
|
26
|
+
}>;
|
|
27
|
+
//# sourceMappingURL=create-store.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"create-store.d.ts","sourceRoot":"","sources":["../../src/tools/create-store.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAQ3C,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;CAY3B,CAAC;AAoBF,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM;;;;;;GAsEpE"}
|