@myclaw163/clawclaw-cli 0.6.60 → 0.6.61
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 +440 -440
- package/package.json +48 -48
- package/personas//347/220/206/346/231/272/346/270/251/345/222/214.md +23 -23
- package/personas//350/200/201/350/260/213/346/267/261/347/256/227.md +22 -22
- package/personas//350/257/232/346/201/263/347/233/264/347/216/207.md +22 -22
- package/personas//350/275/273/346/235/276/346/264/273/346/263/274.md +22 -22
- package/personas//351/207/216/346/200/247/345/217/233/351/200/206.md +23 -23
- package/scripts/postinstall.mjs +20 -20
- package/scripts/sync-bundled-skill.mjs +244 -244
- package/scripts/sync-bundled-skill.test.mjs +152 -152
- package/skills/clawclaw/SKILL.md +244 -244
- package/skills/clawclaw/references/CHATTERBOX.md +142 -142
- package/skills/clawclaw/references/COMMANDS.md +129 -129
- package/skills/clawclaw/references/GAME-MECHANICS.md +186 -186
- package/skills/clawclaw/references/HUB.md +48 -48
- package/skills/clawclaw/references/KNOWLEDGE.md +43 -43
- package/skills/clawclaw/references/STRATEGIES.md +57 -57
- package/skills/clawclaw/references/STREAM.md +59 -59
- package/skills/clawclaw/references/TACTICS.md +65 -65
- package/src/assets/clawclaw-ascii-map.txt +40 -40
- package/src/cli.ts +110 -110
- package/src/commands/_schema.ts +109 -109
- package/src/commands/account.ts +209 -209
- package/src/commands/config.ts +30 -30
- package/src/commands/do.test.ts +73 -73
- package/src/commands/do.ts +126 -126
- package/src/commands/events.ts +22 -22
- package/src/commands/game-map.test.ts +28 -28
- package/src/commands/game-start-plan.test.ts +84 -84
- package/src/commands/game.ts +1027 -1027
- package/src/commands/history-player.test.ts +102 -102
- package/src/commands/history.ts +573 -573
- package/src/commands/hub.test.ts +96 -96
- package/src/commands/hub.ts +234 -234
- package/src/commands/knowledge.test.ts +19 -19
- package/src/commands/knowledge.ts +168 -168
- package/src/commands/load.test.ts +51 -51
- package/src/commands/load.ts +13 -13
- package/src/commands/meeting-history.test.ts +106 -106
- package/src/commands/memory.ts +40 -40
- package/src/commands/peek.ts +45 -45
- package/src/commands/persona.ts +57 -57
- package/src/commands/setup/codex.ts +248 -248
- package/src/commands/setup/hermes.test.ts +96 -96
- package/src/commands/setup/hermes.ts +76 -76
- package/src/commands/setup/index.ts +13 -13
- package/src/commands/setup/openclaw.test.ts +114 -114
- package/src/commands/setup/openclaw.ts +147 -147
- package/src/commands/skill.ts +128 -128
- package/src/commands/state.ts +46 -46
- package/src/commands/strategy.test.ts +135 -135
- package/src/commands/strategy.ts +180 -180
- package/src/commands/tts.ts +128 -128
- package/src/commands/upgrade.test.ts +82 -82
- package/src/commands/upgrade.ts +148 -148
- package/src/commands/watch.test.ts +969 -969
- package/src/commands/watch.ts +720 -720
- package/src/lib/auth.test.ts +59 -59
- package/src/lib/auth.ts +186 -186
- package/src/lib/command-meta.ts +37 -37
- package/src/lib/game-client.ts +391 -391
- package/src/lib/host-config-patcher.test.ts +130 -130
- package/src/lib/host-config-patcher.ts +151 -151
- package/src/lib/http-keepalive.ts +15 -15
- package/src/lib/http-transport.test.ts +42 -42
- package/src/lib/http-transport.ts +113 -113
- package/src/lib/hub-client.test.ts +56 -56
- package/src/lib/hub-client.ts +88 -88
- package/src/lib/hub-install.test.ts +98 -98
- package/src/lib/hub-install.ts +121 -121
- package/src/lib/hub-reminder.ts +56 -56
- package/src/lib/hub-unzip.test.ts +69 -69
- package/src/lib/hub-unzip.ts +62 -62
- package/src/lib/init-command.test.ts +75 -75
- package/src/lib/init-command.ts +120 -120
- package/src/lib/knowledge-store.test.ts +180 -180
- package/src/lib/knowledge-store.ts +374 -374
- package/src/lib/load-context.test.ts +52 -52
- package/src/lib/load-context.ts +52 -52
- package/src/lib/match-state.test.ts +134 -134
- package/src/lib/match-state.ts +94 -94
- package/src/lib/netease-tts.ts +83 -83
- package/src/lib/normalize.ts +42 -42
- package/src/lib/persona.test.ts +41 -41
- package/src/lib/persona.ts +72 -72
- package/src/lib/server-registry.ts +152 -152
- package/src/lib/skill-version.test.ts +48 -48
- package/src/lib/skill-version.ts +19 -19
- package/src/lib/strategy-export.test.ts +232 -232
- package/src/lib/strategy-export.ts +242 -242
- package/src/lib/tts-keys.ts +7 -7
- package/src/lib/tts-speech.test.ts +63 -63
- package/src/lib/tts-speech.ts +76 -76
- package/src/lib/workspace-argv.test.ts +49 -49
- package/src/lib/workspace-argv.ts +44 -44
- package/src/perception/player-history-store.test.ts +87 -87
- package/src/perception/player-history-store.ts +194 -194
- package/src/pipeline/event-store.ts +124 -124
- package/src/pipeline/pipeline.ts +35 -35
- package/src/runtime/auto-upgrade.test.ts +66 -66
- package/src/runtime/auto-upgrade.ts +31 -31
- package/src/runtime/event-daemon.test.ts +107 -107
- package/src/runtime/event-daemon.ts +409 -409
- package/src/runtime/owner-control.ts +150 -150
- package/src/runtime/raw-ws-log.test.ts +33 -33
- package/src/runtime/raw-ws-log.ts +32 -32
- package/src/runtime/runtime-logger.ts +107 -107
- package/src/runtime/ws-client.test.ts +104 -104
- package/src/runtime/ws-client.ts +272 -272
- package/src/sdk/action.ts +166 -166
- package/src/sdk/index.ts +110 -110
- package/src/sdk/types.ts +146 -146
- package/src/strategies/avoid-lone.ts +11 -11
- package/src/strategies/avoid-players.knowledge.md +20 -20
- package/src/strategies/avoid-players.ts +15 -15
- package/src/strategies/corpse-patrol.ts +22 -22
- package/src/strategies/crab-sabotage.ts +21 -21
- package/src/strategies/custom-module.test.ts +269 -269
- package/src/strategies/find-player.ts +16 -16
- package/src/strategies/game-utils.test.ts +190 -190
- package/src/strategies/game-utils.ts +782 -744
- package/src/strategies/goals/avoid-lone-top.ts +168 -168
- package/src/strategies/goals/avoid-players-top.test.ts +83 -83
- package/src/strategies/goals/avoid-players-top.ts +121 -121
- package/src/strategies/goals/conversation-goal.ts +51 -51
- package/src/strategies/goals/corpse-patrol-top.ts +91 -91
- package/src/strategies/goals/crab-octopus-reflexes.ts +93 -93
- package/src/strategies/goals/crab-sabotage-top.ts +197 -197
- package/src/strategies/goals/emergency-hunt-goal.ts +28 -28
- package/src/strategies/goals/find-player-top.ts +93 -93
- package/src/strategies/goals/flee-players-goal.ts +53 -53
- package/src/strategies/goals/goal-manager.ts +41 -41
- package/src/strategies/goals/goal-root-strategy.ts +49 -49
- package/src/strategies/goals/goal.ts +28 -28
- package/src/strategies/goals/keep-away-goal.ts +209 -209
- package/src/strategies/goals/kill-frenzy-top.ts +80 -80
- package/src/strategies/goals/kill-lone-top.ts +160 -160
- package/src/strategies/goals/kill-target-goal.ts +59 -59
- package/src/strategies/goals/kill-target-top.ts +109 -109
- package/src/strategies/goals/leaf-goal.ts +25 -25
- package/src/strategies/goals/linger-corpse-goal.ts +79 -79
- package/src/strategies/goals/lone-kill-core.ts +82 -82
- package/src/strategies/goals/lone-kill-goal.ts +24 -24
- package/src/strategies/goals/lone-kill-task-top.test.ts +85 -85
- package/src/strategies/goals/lone-kill-task-top.ts +86 -86
- package/src/strategies/goals/move-room-goal.ts +60 -60
- package/src/strategies/goals/normal-shrimp-top.test.ts +80 -80
- package/src/strategies/goals/normal-shrimp-top.ts +242 -242
- package/src/strategies/goals/paradise-fish-top.test.ts +126 -126
- package/src/strategies/goals/paradise-fish-top.ts +219 -219
- package/src/strategies/goals/patrol-top.ts +57 -57
- package/src/strategies/goals/report-patrol-top.ts +80 -80
- package/src/strategies/goals/safe-task-goal.ts +102 -102
- package/src/strategies/goals/social-task-top.ts +161 -161
- package/src/strategies/goals/task-kill-report-top.ts +163 -163
- package/src/strategies/goals/task-only-top.ts +57 -57
- package/src/strategies/goals/task-or-patrol-goal.ts +41 -41
- package/src/strategies/goals/task-report-top.ts +57 -57
- package/src/strategies/goals/wander-task-goal.ts +33 -33
- package/src/strategies/goals/warrior-shrimp-top.test.ts +86 -86
- package/src/strategies/goals/warrior-shrimp-top.ts +248 -248
- package/src/strategies/greeting.ts +53 -53
- package/src/strategies/kill-frenzy.ts +12 -12
- package/src/strategies/kill-lone.knowledge.md +20 -20
- package/src/strategies/kill-lone.ts +13 -13
- package/src/strategies/kill-target.ts +18 -18
- package/src/strategies/loader.test.ts +678 -678
- package/src/strategies/loader.ts +172 -172
- package/src/strategies/lone-kill-task.ts +21 -21
- package/src/strategies/meeting-gate.test.ts +59 -59
- package/src/strategies/meeting-gate.ts +23 -23
- package/src/strategies/move-room.ts +15 -15
- package/src/strategies/new-events-backfill.ts +98 -98
- package/src/strategies/paradise-fish.knowledge.md +20 -20
- package/src/strategies/paradise-fish.ts +25 -25
- package/src/strategies/pathfind/distance-field.ts +150 -150
- package/src/strategies/pathfind/escape-planner.test.ts +197 -197
- package/src/strategies/pathfind/escape-planner.ts +355 -355
- package/src/strategies/pathfind/walkable-grid.ts +117 -117
- package/src/strategies/patrol.ts +11 -11
- package/src/strategies/player-targets.ts +13 -13
- package/src/strategies/report-patrol.ts +11 -11
- package/src/strategies/shrimp-memory.knowledge.md +20 -20
- package/src/strategies/shrimp-memory.ts +25 -25
- package/src/strategies/social-task.test.ts +28 -28
- package/src/strategies/social-task.ts +49 -49
- package/src/strategies/spawn.ts +82 -82
- package/src/strategies/speech-module.ts +123 -123
- package/src/strategies/strategy-loop.ts +767 -763
- package/src/strategies/task-kill-report.ts +17 -17
- package/src/strategies/task-only.ts +11 -11
- package/src/strategies/task-report.ts +22 -22
- package/src/strategies/types.ts +96 -96
- package/src/strategies/warrior-memory.knowledge.md +20 -20
- package/src/strategies/warrior-memory.ts +16 -16
|
@@ -1,42 +1,42 @@
|
|
|
1
|
-
// src/lib/http-transport.test.ts
|
|
2
|
-
import { describe, it, expect, vi, afterEach } from 'vitest';
|
|
3
|
-
import { HttpTransport, ApiError } from './http-transport.js';
|
|
4
|
-
|
|
5
|
-
const registry: any = { baseUrlFor: () => 'https://hub.example' };
|
|
6
|
-
|
|
7
|
-
afterEach(() => { vi.restoreAllMocks(); });
|
|
8
|
-
|
|
9
|
-
describe('HttpTransport.getBytes', () => {
|
|
10
|
-
it('returns response bytes as a Buffer', async () => {
|
|
11
|
-
const bytes = new Uint8Array([1, 2, 3, 4]);
|
|
12
|
-
vi.stubGlobal('fetch', vi.fn(async () => new Response(bytes, { status: 200 })));
|
|
13
|
-
const t = new HttpTransport('key', registry);
|
|
14
|
-
const buf = await t.getBytes('/api/v1/hub/x');
|
|
15
|
-
expect(Buffer.isBuffer(buf)).toBe(true);
|
|
16
|
-
expect([...buf]).toEqual([1, 2, 3, 4]);
|
|
17
|
-
});
|
|
18
|
-
|
|
19
|
-
it('throws ApiError on non-ok', async () => {
|
|
20
|
-
vi.stubGlobal('fetch', vi.fn(async () => new Response('nope', { status: 404 })));
|
|
21
|
-
const t = new HttpTransport('key', registry);
|
|
22
|
-
await expect(t.getBytes('/api/v1/hub/x')).rejects.toBeInstanceOf(ApiError);
|
|
23
|
-
});
|
|
24
|
-
});
|
|
25
|
-
|
|
26
|
-
describe('HttpTransport extraHeaders', () => {
|
|
27
|
-
it('merges extraHeaders into request() headers', async () => {
|
|
28
|
-
let captured: any;
|
|
29
|
-
vi.stubGlobal('fetch', vi.fn(async (_url: string, init: any) => { captured = init.headers; return new Response('{}', { status: 200 }); }));
|
|
30
|
-
const t = new HttpTransport('key', registry, { 'X-Hub-Auth-Type': 'clawkey' });
|
|
31
|
-
await t.request('GET', '/x');
|
|
32
|
-
expect(captured['X-Hub-Auth-Type']).toBe('clawkey');
|
|
33
|
-
expect(captured['Authorization']).toBe('Bearer key');
|
|
34
|
-
});
|
|
35
|
-
it('merges extraHeaders into getBytes() headers', async () => {
|
|
36
|
-
let captured: any;
|
|
37
|
-
vi.stubGlobal('fetch', vi.fn(async (_url: string, init: any) => { captured = init.headers; return new Response(new Uint8Array([1]), { status: 200 }); }));
|
|
38
|
-
const t = new HttpTransport('key', registry, { 'X-Hub-Auth-Type': 'clawkey' });
|
|
39
|
-
await t.getBytes('/x');
|
|
40
|
-
expect(captured['X-Hub-Auth-Type']).toBe('clawkey');
|
|
41
|
-
});
|
|
42
|
-
});
|
|
1
|
+
// src/lib/http-transport.test.ts
|
|
2
|
+
import { describe, it, expect, vi, afterEach } from 'vitest';
|
|
3
|
+
import { HttpTransport, ApiError } from './http-transport.js';
|
|
4
|
+
|
|
5
|
+
const registry: any = { baseUrlFor: () => 'https://hub.example' };
|
|
6
|
+
|
|
7
|
+
afterEach(() => { vi.restoreAllMocks(); });
|
|
8
|
+
|
|
9
|
+
describe('HttpTransport.getBytes', () => {
|
|
10
|
+
it('returns response bytes as a Buffer', async () => {
|
|
11
|
+
const bytes = new Uint8Array([1, 2, 3, 4]);
|
|
12
|
+
vi.stubGlobal('fetch', vi.fn(async () => new Response(bytes, { status: 200 })));
|
|
13
|
+
const t = new HttpTransport('key', registry);
|
|
14
|
+
const buf = await t.getBytes('/api/v1/hub/x');
|
|
15
|
+
expect(Buffer.isBuffer(buf)).toBe(true);
|
|
16
|
+
expect([...buf]).toEqual([1, 2, 3, 4]);
|
|
17
|
+
});
|
|
18
|
+
|
|
19
|
+
it('throws ApiError on non-ok', async () => {
|
|
20
|
+
vi.stubGlobal('fetch', vi.fn(async () => new Response('nope', { status: 404 })));
|
|
21
|
+
const t = new HttpTransport('key', registry);
|
|
22
|
+
await expect(t.getBytes('/api/v1/hub/x')).rejects.toBeInstanceOf(ApiError);
|
|
23
|
+
});
|
|
24
|
+
});
|
|
25
|
+
|
|
26
|
+
describe('HttpTransport extraHeaders', () => {
|
|
27
|
+
it('merges extraHeaders into request() headers', async () => {
|
|
28
|
+
let captured: any;
|
|
29
|
+
vi.stubGlobal('fetch', vi.fn(async (_url: string, init: any) => { captured = init.headers; return new Response('{}', { status: 200 }); }));
|
|
30
|
+
const t = new HttpTransport('key', registry, { 'X-Hub-Auth-Type': 'clawkey' });
|
|
31
|
+
await t.request('GET', '/x');
|
|
32
|
+
expect(captured['X-Hub-Auth-Type']).toBe('clawkey');
|
|
33
|
+
expect(captured['Authorization']).toBe('Bearer key');
|
|
34
|
+
});
|
|
35
|
+
it('merges extraHeaders into getBytes() headers', async () => {
|
|
36
|
+
let captured: any;
|
|
37
|
+
vi.stubGlobal('fetch', vi.fn(async (_url: string, init: any) => { captured = init.headers; return new Response(new Uint8Array([1]), { status: 200 }); }));
|
|
38
|
+
const t = new HttpTransport('key', registry, { 'X-Hub-Auth-Type': 'clawkey' });
|
|
39
|
+
await t.getBytes('/x');
|
|
40
|
+
expect(captured['X-Hub-Auth-Type']).toBe('clawkey');
|
|
41
|
+
});
|
|
42
|
+
});
|
|
@@ -1,113 +1,113 @@
|
|
|
1
|
-
// src/lib/http-transport.ts
|
|
2
|
-
import type { ServerRegistry } from './server-registry.js';
|
|
3
|
-
|
|
4
|
-
export class ApiError extends Error {
|
|
5
|
-
constructor(
|
|
6
|
-
public readonly status: number,
|
|
7
|
-
public readonly body: string,
|
|
8
|
-
public readonly method: string,
|
|
9
|
-
public readonly path: string,
|
|
10
|
-
) {
|
|
11
|
-
super(`API error ${status}: ${body}`);
|
|
12
|
-
this.name = 'ApiError';
|
|
13
|
-
}
|
|
14
|
-
}
|
|
15
|
-
|
|
16
|
-
function parseJsonBody(body: string): any | null {
|
|
17
|
-
try {
|
|
18
|
-
return JSON.parse(body);
|
|
19
|
-
} catch {
|
|
20
|
-
return null;
|
|
21
|
-
}
|
|
22
|
-
}
|
|
23
|
-
|
|
24
|
-
export function formatApiError(err: ApiError): string {
|
|
25
|
-
if (err.status === 429) {
|
|
26
|
-
const data = parseJsonBody(err.body);
|
|
27
|
-
const error = data?.error ?? {};
|
|
28
|
-
const code = error?.code ?? data?.code ?? 'RATE_LIMITED';
|
|
29
|
-
const retryAfter = error?.retry_after ?? error?.['retry after'] ?? data?.retry_after ?? data?.['retry after'];
|
|
30
|
-
const hint = error?.hint ?? data?.hint;
|
|
31
|
-
const message = error?.message ?? data?.message ?? 'Too many requests.';
|
|
32
|
-
const retryText = retryAfter !== undefined ? ` Retry after ${retryAfter}s.` : '';
|
|
33
|
-
const hintText = hint ? ` Hint: ${hint}.` : '';
|
|
34
|
-
return `Rate limited (${code}). ${message}.${retryText}${hintText}`;
|
|
35
|
-
}
|
|
36
|
-
return `Request failed (${err.status}): ${err.body}`;
|
|
37
|
-
}
|
|
38
|
-
|
|
39
|
-
export class HttpTransport {
|
|
40
|
-
private apiKey: string;
|
|
41
|
-
private registry: ServerRegistry;
|
|
42
|
-
private extraHeaders: Record<string, string>;
|
|
43
|
-
|
|
44
|
-
constructor(apiKey: string, registry: ServerRegistry, extraHeaders: Record<string, string> = {}) {
|
|
45
|
-
this.apiKey = apiKey;
|
|
46
|
-
this.registry = registry;
|
|
47
|
-
this.extraHeaders = extraHeaders;
|
|
48
|
-
}
|
|
49
|
-
|
|
50
|
-
/**
|
|
51
|
-
* Generic HTTP request. Supports JSON body and FormData.
|
|
52
|
-
* Adds Authorization header when apiKey is non-empty.
|
|
53
|
-
*/
|
|
54
|
-
async request<T = any>(method: string, path: string, body?: any): Promise<T> {
|
|
55
|
-
const url = this.registry.baseUrlFor(path) + path;
|
|
56
|
-
const headers: Record<string, string> = {};
|
|
57
|
-
|
|
58
|
-
// Only add auth header if apiKey is present (register endpoint has no auth)
|
|
59
|
-
if (this.apiKey) {
|
|
60
|
-
headers['Authorization'] = `Bearer ${this.apiKey}`;
|
|
61
|
-
}
|
|
62
|
-
|
|
63
|
-
for (const [k, v] of Object.entries(this.extraHeaders)) headers[k] = v;
|
|
64
|
-
|
|
65
|
-
let fetchBody: BodyInit | undefined;
|
|
66
|
-
if (body !== undefined) {
|
|
67
|
-
if (body instanceof FormData) {
|
|
68
|
-
fetchBody = body;
|
|
69
|
-
// Let fetch set Content-Type with boundary for FormData
|
|
70
|
-
} else {
|
|
71
|
-
headers['Content-Type'] = 'application/json; charset=utf-8';
|
|
72
|
-
fetchBody = JSON.stringify(body);
|
|
73
|
-
}
|
|
74
|
-
}
|
|
75
|
-
|
|
76
|
-
const res = await fetch(url, { method, headers, body: fetchBody, signal: AbortSignal.timeout(10_000) });
|
|
77
|
-
if (!res.ok) {
|
|
78
|
-
throw new ApiError(res.status, await res.text(), method, path);
|
|
79
|
-
}
|
|
80
|
-
return res.json() as Promise<T>;
|
|
81
|
-
}
|
|
82
|
-
|
|
83
|
-
/** GET with one fast retry for transient network failures. */
|
|
84
|
-
async get<T = any>(path: string): Promise<T> {
|
|
85
|
-
try {
|
|
86
|
-
return await this.request<T>('GET', path);
|
|
87
|
-
} catch (err) {
|
|
88
|
-
// Only retry network errors, not HTTP errors
|
|
89
|
-
if (err instanceof ApiError) throw err;
|
|
90
|
-
await new Promise(r => setTimeout(r, 500));
|
|
91
|
-
return this.request<T>('GET', path);
|
|
92
|
-
}
|
|
93
|
-
}
|
|
94
|
-
|
|
95
|
-
async post<T = any>(path: string, body?: any): Promise<T> {
|
|
96
|
-
return this.request<T>('POST', path, body);
|
|
97
|
-
}
|
|
98
|
-
|
|
99
|
-
/** GET raw bytes (binary artifacts). Throws ApiError on non-ok. */
|
|
100
|
-
async getBytes(path: string): Promise<Buffer> {
|
|
101
|
-
const url = this.registry.baseUrlFor(path) + path;
|
|
102
|
-
const headers: Record<string, string> = {};
|
|
103
|
-
if (this.apiKey) {
|
|
104
|
-
headers['Authorization'] = `Bearer ${this.apiKey}`;
|
|
105
|
-
}
|
|
106
|
-
for (const [k, v] of Object.entries(this.extraHeaders)) headers[k] = v;
|
|
107
|
-
const res = await fetch(url, { method: 'GET', headers, signal: AbortSignal.timeout(30_000) });
|
|
108
|
-
if (!res.ok) {
|
|
109
|
-
throw new ApiError(res.status, await res.text(), 'GET', path);
|
|
110
|
-
}
|
|
111
|
-
return Buffer.from(await res.arrayBuffer());
|
|
112
|
-
}
|
|
113
|
-
}
|
|
1
|
+
// src/lib/http-transport.ts
|
|
2
|
+
import type { ServerRegistry } from './server-registry.js';
|
|
3
|
+
|
|
4
|
+
export class ApiError extends Error {
|
|
5
|
+
constructor(
|
|
6
|
+
public readonly status: number,
|
|
7
|
+
public readonly body: string,
|
|
8
|
+
public readonly method: string,
|
|
9
|
+
public readonly path: string,
|
|
10
|
+
) {
|
|
11
|
+
super(`API error ${status}: ${body}`);
|
|
12
|
+
this.name = 'ApiError';
|
|
13
|
+
}
|
|
14
|
+
}
|
|
15
|
+
|
|
16
|
+
function parseJsonBody(body: string): any | null {
|
|
17
|
+
try {
|
|
18
|
+
return JSON.parse(body);
|
|
19
|
+
} catch {
|
|
20
|
+
return null;
|
|
21
|
+
}
|
|
22
|
+
}
|
|
23
|
+
|
|
24
|
+
export function formatApiError(err: ApiError): string {
|
|
25
|
+
if (err.status === 429) {
|
|
26
|
+
const data = parseJsonBody(err.body);
|
|
27
|
+
const error = data?.error ?? {};
|
|
28
|
+
const code = error?.code ?? data?.code ?? 'RATE_LIMITED';
|
|
29
|
+
const retryAfter = error?.retry_after ?? error?.['retry after'] ?? data?.retry_after ?? data?.['retry after'];
|
|
30
|
+
const hint = error?.hint ?? data?.hint;
|
|
31
|
+
const message = error?.message ?? data?.message ?? 'Too many requests.';
|
|
32
|
+
const retryText = retryAfter !== undefined ? ` Retry after ${retryAfter}s.` : '';
|
|
33
|
+
const hintText = hint ? ` Hint: ${hint}.` : '';
|
|
34
|
+
return `Rate limited (${code}). ${message}.${retryText}${hintText}`;
|
|
35
|
+
}
|
|
36
|
+
return `Request failed (${err.status}): ${err.body}`;
|
|
37
|
+
}
|
|
38
|
+
|
|
39
|
+
export class HttpTransport {
|
|
40
|
+
private apiKey: string;
|
|
41
|
+
private registry: ServerRegistry;
|
|
42
|
+
private extraHeaders: Record<string, string>;
|
|
43
|
+
|
|
44
|
+
constructor(apiKey: string, registry: ServerRegistry, extraHeaders: Record<string, string> = {}) {
|
|
45
|
+
this.apiKey = apiKey;
|
|
46
|
+
this.registry = registry;
|
|
47
|
+
this.extraHeaders = extraHeaders;
|
|
48
|
+
}
|
|
49
|
+
|
|
50
|
+
/**
|
|
51
|
+
* Generic HTTP request. Supports JSON body and FormData.
|
|
52
|
+
* Adds Authorization header when apiKey is non-empty.
|
|
53
|
+
*/
|
|
54
|
+
async request<T = any>(method: string, path: string, body?: any): Promise<T> {
|
|
55
|
+
const url = this.registry.baseUrlFor(path) + path;
|
|
56
|
+
const headers: Record<string, string> = {};
|
|
57
|
+
|
|
58
|
+
// Only add auth header if apiKey is present (register endpoint has no auth)
|
|
59
|
+
if (this.apiKey) {
|
|
60
|
+
headers['Authorization'] = `Bearer ${this.apiKey}`;
|
|
61
|
+
}
|
|
62
|
+
|
|
63
|
+
for (const [k, v] of Object.entries(this.extraHeaders)) headers[k] = v;
|
|
64
|
+
|
|
65
|
+
let fetchBody: BodyInit | undefined;
|
|
66
|
+
if (body !== undefined) {
|
|
67
|
+
if (body instanceof FormData) {
|
|
68
|
+
fetchBody = body;
|
|
69
|
+
// Let fetch set Content-Type with boundary for FormData
|
|
70
|
+
} else {
|
|
71
|
+
headers['Content-Type'] = 'application/json; charset=utf-8';
|
|
72
|
+
fetchBody = JSON.stringify(body);
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
|
+
|
|
76
|
+
const res = await fetch(url, { method, headers, body: fetchBody, signal: AbortSignal.timeout(10_000) });
|
|
77
|
+
if (!res.ok) {
|
|
78
|
+
throw new ApiError(res.status, await res.text(), method, path);
|
|
79
|
+
}
|
|
80
|
+
return res.json() as Promise<T>;
|
|
81
|
+
}
|
|
82
|
+
|
|
83
|
+
/** GET with one fast retry for transient network failures. */
|
|
84
|
+
async get<T = any>(path: string): Promise<T> {
|
|
85
|
+
try {
|
|
86
|
+
return await this.request<T>('GET', path);
|
|
87
|
+
} catch (err) {
|
|
88
|
+
// Only retry network errors, not HTTP errors
|
|
89
|
+
if (err instanceof ApiError) throw err;
|
|
90
|
+
await new Promise(r => setTimeout(r, 500));
|
|
91
|
+
return this.request<T>('GET', path);
|
|
92
|
+
}
|
|
93
|
+
}
|
|
94
|
+
|
|
95
|
+
async post<T = any>(path: string, body?: any): Promise<T> {
|
|
96
|
+
return this.request<T>('POST', path, body);
|
|
97
|
+
}
|
|
98
|
+
|
|
99
|
+
/** GET raw bytes (binary artifacts). Throws ApiError on non-ok. */
|
|
100
|
+
async getBytes(path: string): Promise<Buffer> {
|
|
101
|
+
const url = this.registry.baseUrlFor(path) + path;
|
|
102
|
+
const headers: Record<string, string> = {};
|
|
103
|
+
if (this.apiKey) {
|
|
104
|
+
headers['Authorization'] = `Bearer ${this.apiKey}`;
|
|
105
|
+
}
|
|
106
|
+
for (const [k, v] of Object.entries(this.extraHeaders)) headers[k] = v;
|
|
107
|
+
const res = await fetch(url, { method: 'GET', headers, signal: AbortSignal.timeout(30_000) });
|
|
108
|
+
if (!res.ok) {
|
|
109
|
+
throw new ApiError(res.status, await res.text(), 'GET', path);
|
|
110
|
+
}
|
|
111
|
+
return Buffer.from(await res.arrayBuffer());
|
|
112
|
+
}
|
|
113
|
+
}
|
|
@@ -1,56 +1,56 @@
|
|
|
1
|
-
import { describe, it, expect } from 'vitest';
|
|
2
|
-
import { HubClient, parseResourceRef } from './hub-client.js';
|
|
3
|
-
|
|
4
|
-
function fakeTransport() {
|
|
5
|
-
const calls: any[] = [];
|
|
6
|
-
const transport: any = {
|
|
7
|
-
calls,
|
|
8
|
-
async get(path: string) {
|
|
9
|
-
calls.push(['GET', path]);
|
|
10
|
-
if (path.includes('/resources/')) return { data: { id: 'abc', type: 'strategy', title: 'T' } };
|
|
11
|
-
return { data: { items: [], total: 0, pagination: { mode: 'page', page: 1, limit: 20, hasMore: false } } };
|
|
12
|
-
},
|
|
13
|
-
async getBytes(path: string) { calls.push(['GETBYTES', path]); return Buffer.from('raw'); },
|
|
14
|
-
};
|
|
15
|
-
return transport;
|
|
16
|
-
}
|
|
17
|
-
|
|
18
|
-
describe('parseResourceRef', () => {
|
|
19
|
-
it('splits type/id', () => {
|
|
20
|
-
expect(parseResourceRef('strategy/ab12cd')).toEqual({ type: 'strategy', id: 'ab12cd' });
|
|
21
|
-
expect(parseResourceRef('skill/xyz')).toEqual({ type: 'skill', id: 'xyz' });
|
|
22
|
-
});
|
|
23
|
-
it('rejects bad type', () => {
|
|
24
|
-
expect(() => parseResourceRef('plugin/abc')).toThrow(/invalid resource ref/);
|
|
25
|
-
});
|
|
26
|
-
it('rejects missing id', () => {
|
|
27
|
-
expect(() => parseResourceRef('strategy/')).toThrow(/invalid resource ref/);
|
|
28
|
-
});
|
|
29
|
-
});
|
|
30
|
-
|
|
31
|
-
describe('HubClient', () => {
|
|
32
|
-
it('list builds query and unwraps data', async () => {
|
|
33
|
-
const t = fakeTransport();
|
|
34
|
-
const res = await new HubClient(t).list({ type: 'skill', sort: 'downloads', q: '抢刀', limit: 10 });
|
|
35
|
-
expect(t.calls[0][1]).toBe('/api/client/v1/resources?type=skill&q=%E6%8A%A2%E5%88%80&sort=downloads&limit=10');
|
|
36
|
-
expect(res.total).toBe(0);
|
|
37
|
-
expect(res.items).toEqual([]);
|
|
38
|
-
});
|
|
39
|
-
it('list with no opts hits bare endpoint', async () => {
|
|
40
|
-
const t = fakeTransport();
|
|
41
|
-
await new HubClient(t).list();
|
|
42
|
-
expect(t.calls[0][1]).toBe('/api/client/v1/resources');
|
|
43
|
-
});
|
|
44
|
-
it('getResource builds typed path and unwraps data', async () => {
|
|
45
|
-
const t = fakeTransport();
|
|
46
|
-
const d = await new HubClient(t).getResource('strategy', 'ab12');
|
|
47
|
-
expect(t.calls[0]).toEqual(['GET', '/api/client/v1/resources/strategy/ab12']);
|
|
48
|
-
expect(d.id).toBe('abc');
|
|
49
|
-
});
|
|
50
|
-
it('downloadArtifact hits the /download endpoint (encoding id)', async () => {
|
|
51
|
-
const t = fakeTransport();
|
|
52
|
-
const buf = await new HubClient(t).downloadArtifact('skill', 'xy z');
|
|
53
|
-
expect(t.calls[0]).toEqual(['GETBYTES', '/api/client/v1/resources/skill/xy%20z/download']);
|
|
54
|
-
expect(Buffer.isBuffer(buf)).toBe(true);
|
|
55
|
-
});
|
|
56
|
-
});
|
|
1
|
+
import { describe, it, expect } from 'vitest';
|
|
2
|
+
import { HubClient, parseResourceRef } from './hub-client.js';
|
|
3
|
+
|
|
4
|
+
function fakeTransport() {
|
|
5
|
+
const calls: any[] = [];
|
|
6
|
+
const transport: any = {
|
|
7
|
+
calls,
|
|
8
|
+
async get(path: string) {
|
|
9
|
+
calls.push(['GET', path]);
|
|
10
|
+
if (path.includes('/resources/')) return { data: { id: 'abc', type: 'strategy', title: 'T' } };
|
|
11
|
+
return { data: { items: [], total: 0, pagination: { mode: 'page', page: 1, limit: 20, hasMore: false } } };
|
|
12
|
+
},
|
|
13
|
+
async getBytes(path: string) { calls.push(['GETBYTES', path]); return Buffer.from('raw'); },
|
|
14
|
+
};
|
|
15
|
+
return transport;
|
|
16
|
+
}
|
|
17
|
+
|
|
18
|
+
describe('parseResourceRef', () => {
|
|
19
|
+
it('splits type/id', () => {
|
|
20
|
+
expect(parseResourceRef('strategy/ab12cd')).toEqual({ type: 'strategy', id: 'ab12cd' });
|
|
21
|
+
expect(parseResourceRef('skill/xyz')).toEqual({ type: 'skill', id: 'xyz' });
|
|
22
|
+
});
|
|
23
|
+
it('rejects bad type', () => {
|
|
24
|
+
expect(() => parseResourceRef('plugin/abc')).toThrow(/invalid resource ref/);
|
|
25
|
+
});
|
|
26
|
+
it('rejects missing id', () => {
|
|
27
|
+
expect(() => parseResourceRef('strategy/')).toThrow(/invalid resource ref/);
|
|
28
|
+
});
|
|
29
|
+
});
|
|
30
|
+
|
|
31
|
+
describe('HubClient', () => {
|
|
32
|
+
it('list builds query and unwraps data', async () => {
|
|
33
|
+
const t = fakeTransport();
|
|
34
|
+
const res = await new HubClient(t).list({ type: 'skill', sort: 'downloads', q: '抢刀', limit: 10 });
|
|
35
|
+
expect(t.calls[0][1]).toBe('/api/client/v1/resources?type=skill&q=%E6%8A%A2%E5%88%80&sort=downloads&limit=10');
|
|
36
|
+
expect(res.total).toBe(0);
|
|
37
|
+
expect(res.items).toEqual([]);
|
|
38
|
+
});
|
|
39
|
+
it('list with no opts hits bare endpoint', async () => {
|
|
40
|
+
const t = fakeTransport();
|
|
41
|
+
await new HubClient(t).list();
|
|
42
|
+
expect(t.calls[0][1]).toBe('/api/client/v1/resources');
|
|
43
|
+
});
|
|
44
|
+
it('getResource builds typed path and unwraps data', async () => {
|
|
45
|
+
const t = fakeTransport();
|
|
46
|
+
const d = await new HubClient(t).getResource('strategy', 'ab12');
|
|
47
|
+
expect(t.calls[0]).toEqual(['GET', '/api/client/v1/resources/strategy/ab12']);
|
|
48
|
+
expect(d.id).toBe('abc');
|
|
49
|
+
});
|
|
50
|
+
it('downloadArtifact hits the /download endpoint (encoding id)', async () => {
|
|
51
|
+
const t = fakeTransport();
|
|
52
|
+
const buf = await new HubClient(t).downloadArtifact('skill', 'xy z');
|
|
53
|
+
expect(t.calls[0]).toEqual(['GETBYTES', '/api/client/v1/resources/skill/xy%20z/download']);
|
|
54
|
+
expect(Buffer.isBuffer(buf)).toBe(true);
|
|
55
|
+
});
|
|
56
|
+
});
|
package/src/lib/hub-client.ts
CHANGED
|
@@ -1,88 +1,88 @@
|
|
|
1
|
-
// src/lib/hub-client.ts
|
|
2
|
-
import { AuthStore } from './auth.js';
|
|
3
|
-
import { ServerRegistry } from './server-registry.js';
|
|
4
|
-
import { HttpTransport } from './http-transport.js';
|
|
5
|
-
|
|
6
|
-
export type ResourceType = 'skill' | 'strategy';
|
|
7
|
-
|
|
8
|
-
export interface ResourceStats { downloadCount: number; starCount: number; commentCount: number; }
|
|
9
|
-
|
|
10
|
-
export interface ResourceSummary {
|
|
11
|
-
id: string;
|
|
12
|
-
type: ResourceType;
|
|
13
|
-
title: string;
|
|
14
|
-
description: string;
|
|
15
|
-
creator: string;
|
|
16
|
-
creatorType: string;
|
|
17
|
-
creatorDisplayName: string;
|
|
18
|
-
creatorAvatarUrl: string | null;
|
|
19
|
-
fileName: string;
|
|
20
|
-
stats: ResourceStats;
|
|
21
|
-
downloadUrl: string;
|
|
22
|
-
likedByMe: boolean;
|
|
23
|
-
createdAt: string;
|
|
24
|
-
updatedAt: string;
|
|
25
|
-
}
|
|
26
|
-
|
|
27
|
-
export interface ResourceDetail extends ResourceSummary {
|
|
28
|
-
artifact: { fileName: string; downloadUrl: string };
|
|
29
|
-
}
|
|
30
|
-
|
|
31
|
-
export interface Pagination { mode: 'page' | 'none'; page?: number; limit?: number; hasMore: boolean; }
|
|
32
|
-
export interface ResourceListResult { items: ResourceSummary[]; total: number; pagination: Pagination; }
|
|
33
|
-
|
|
34
|
-
export interface ListOptions {
|
|
35
|
-
type?: ResourceType;
|
|
36
|
-
q?: string;
|
|
37
|
-
sort?: 'latest' | 'downloads' | 'stars';
|
|
38
|
-
pagination?: 'page' | 'none';
|
|
39
|
-
page?: number;
|
|
40
|
-
limit?: number;
|
|
41
|
-
}
|
|
42
|
-
|
|
43
|
-
const BASE = '/api/client/v1';
|
|
44
|
-
const DEFAULT_HUB_URL = 'https://myclaw.163.com/hub';
|
|
45
|
-
|
|
46
|
-
/** Parse a `<type>/<id>` resource ref (type ∈ skill|strategy). */
|
|
47
|
-
export function parseResourceRef(ref: string): { type: ResourceType; id: string } {
|
|
48
|
-
const m = ref.match(/^(skill|strategy)\/([^/\s]+)$/);
|
|
49
|
-
if (!m) throw new Error(`invalid resource ref '${ref}' (expected <skill|strategy>/<id>)`);
|
|
50
|
-
return { type: m[1] as ResourceType, id: m[2] };
|
|
51
|
-
}
|
|
52
|
-
|
|
53
|
-
interface Envelope<T> { data: T; }
|
|
54
|
-
|
|
55
|
-
export class HubClient {
|
|
56
|
-
constructor(private readonly http: HttpTransport) {}
|
|
57
|
-
|
|
58
|
-
static fromAuth(opts?: { authStore?: AuthStore }): HubClient {
|
|
59
|
-
const store = opts?.authStore ?? new AuthStore();
|
|
60
|
-
const profile = store.getActive();
|
|
61
|
-
const apiKey = profile?.apiKey ?? '';
|
|
62
|
-
const hubUrl = process.env.CLAWCLAW_HUB_URL || DEFAULT_HUB_URL;
|
|
63
|
-
const registry = new ServerRegistry({ lobbyUrl: hubUrl });
|
|
64
|
-
return new HubClient(new HttpTransport(apiKey, registry, { 'X-Hub-Auth-Type': 'clawkey' }));
|
|
65
|
-
}
|
|
66
|
-
|
|
67
|
-
async list(opts: ListOptions = {}): Promise<ResourceListResult> {
|
|
68
|
-
const qs = new URLSearchParams();
|
|
69
|
-
if (opts.type) qs.set('type', opts.type);
|
|
70
|
-
if (opts.q) qs.set('q', opts.q);
|
|
71
|
-
if (opts.sort) qs.set('sort', opts.sort);
|
|
72
|
-
if (opts.pagination) qs.set('pagination', opts.pagination);
|
|
73
|
-
if (opts.page !== undefined) qs.set('page', String(opts.page));
|
|
74
|
-
if (opts.limit !== undefined) qs.set('limit', String(opts.limit));
|
|
75
|
-
const suffix = qs.toString() ? `?${qs.toString()}` : '';
|
|
76
|
-
const res = await this.http.get<Envelope<ResourceListResult>>(`${BASE}/resources${suffix}`);
|
|
77
|
-
return res.data;
|
|
78
|
-
}
|
|
79
|
-
|
|
80
|
-
async getResource(type: ResourceType, id: string): Promise<ResourceDetail> {
|
|
81
|
-
const res = await this.http.get<Envelope<ResourceDetail>>(`${BASE}/resources/${type}/${encodeURIComponent(id)}`);
|
|
82
|
-
return res.data;
|
|
83
|
-
}
|
|
84
|
-
|
|
85
|
-
async downloadArtifact(type: ResourceType, id: string): Promise<Buffer> {
|
|
86
|
-
return this.http.getBytes(`${BASE}/resources/${type}/${encodeURIComponent(id)}/download`);
|
|
87
|
-
}
|
|
88
|
-
}
|
|
1
|
+
// src/lib/hub-client.ts
|
|
2
|
+
import { AuthStore } from './auth.js';
|
|
3
|
+
import { ServerRegistry } from './server-registry.js';
|
|
4
|
+
import { HttpTransport } from './http-transport.js';
|
|
5
|
+
|
|
6
|
+
export type ResourceType = 'skill' | 'strategy';
|
|
7
|
+
|
|
8
|
+
export interface ResourceStats { downloadCount: number; starCount: number; commentCount: number; }
|
|
9
|
+
|
|
10
|
+
export interface ResourceSummary {
|
|
11
|
+
id: string;
|
|
12
|
+
type: ResourceType;
|
|
13
|
+
title: string;
|
|
14
|
+
description: string;
|
|
15
|
+
creator: string;
|
|
16
|
+
creatorType: string;
|
|
17
|
+
creatorDisplayName: string;
|
|
18
|
+
creatorAvatarUrl: string | null;
|
|
19
|
+
fileName: string;
|
|
20
|
+
stats: ResourceStats;
|
|
21
|
+
downloadUrl: string;
|
|
22
|
+
likedByMe: boolean;
|
|
23
|
+
createdAt: string;
|
|
24
|
+
updatedAt: string;
|
|
25
|
+
}
|
|
26
|
+
|
|
27
|
+
export interface ResourceDetail extends ResourceSummary {
|
|
28
|
+
artifact: { fileName: string; downloadUrl: string };
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
export interface Pagination { mode: 'page' | 'none'; page?: number; limit?: number; hasMore: boolean; }
|
|
32
|
+
export interface ResourceListResult { items: ResourceSummary[]; total: number; pagination: Pagination; }
|
|
33
|
+
|
|
34
|
+
export interface ListOptions {
|
|
35
|
+
type?: ResourceType;
|
|
36
|
+
q?: string;
|
|
37
|
+
sort?: 'latest' | 'downloads' | 'stars';
|
|
38
|
+
pagination?: 'page' | 'none';
|
|
39
|
+
page?: number;
|
|
40
|
+
limit?: number;
|
|
41
|
+
}
|
|
42
|
+
|
|
43
|
+
const BASE = '/api/client/v1';
|
|
44
|
+
const DEFAULT_HUB_URL = 'https://myclaw.163.com/hub';
|
|
45
|
+
|
|
46
|
+
/** Parse a `<type>/<id>` resource ref (type ∈ skill|strategy). */
|
|
47
|
+
export function parseResourceRef(ref: string): { type: ResourceType; id: string } {
|
|
48
|
+
const m = ref.match(/^(skill|strategy)\/([^/\s]+)$/);
|
|
49
|
+
if (!m) throw new Error(`invalid resource ref '${ref}' (expected <skill|strategy>/<id>)`);
|
|
50
|
+
return { type: m[1] as ResourceType, id: m[2] };
|
|
51
|
+
}
|
|
52
|
+
|
|
53
|
+
interface Envelope<T> { data: T; }
|
|
54
|
+
|
|
55
|
+
export class HubClient {
|
|
56
|
+
constructor(private readonly http: HttpTransport) {}
|
|
57
|
+
|
|
58
|
+
static fromAuth(opts?: { authStore?: AuthStore }): HubClient {
|
|
59
|
+
const store = opts?.authStore ?? new AuthStore();
|
|
60
|
+
const profile = store.getActive();
|
|
61
|
+
const apiKey = profile?.apiKey ?? '';
|
|
62
|
+
const hubUrl = process.env.CLAWCLAW_HUB_URL || DEFAULT_HUB_URL;
|
|
63
|
+
const registry = new ServerRegistry({ lobbyUrl: hubUrl });
|
|
64
|
+
return new HubClient(new HttpTransport(apiKey, registry, { 'X-Hub-Auth-Type': 'clawkey' }));
|
|
65
|
+
}
|
|
66
|
+
|
|
67
|
+
async list(opts: ListOptions = {}): Promise<ResourceListResult> {
|
|
68
|
+
const qs = new URLSearchParams();
|
|
69
|
+
if (opts.type) qs.set('type', opts.type);
|
|
70
|
+
if (opts.q) qs.set('q', opts.q);
|
|
71
|
+
if (opts.sort) qs.set('sort', opts.sort);
|
|
72
|
+
if (opts.pagination) qs.set('pagination', opts.pagination);
|
|
73
|
+
if (opts.page !== undefined) qs.set('page', String(opts.page));
|
|
74
|
+
if (opts.limit !== undefined) qs.set('limit', String(opts.limit));
|
|
75
|
+
const suffix = qs.toString() ? `?${qs.toString()}` : '';
|
|
76
|
+
const res = await this.http.get<Envelope<ResourceListResult>>(`${BASE}/resources${suffix}`);
|
|
77
|
+
return res.data;
|
|
78
|
+
}
|
|
79
|
+
|
|
80
|
+
async getResource(type: ResourceType, id: string): Promise<ResourceDetail> {
|
|
81
|
+
const res = await this.http.get<Envelope<ResourceDetail>>(`${BASE}/resources/${type}/${encodeURIComponent(id)}`);
|
|
82
|
+
return res.data;
|
|
83
|
+
}
|
|
84
|
+
|
|
85
|
+
async downloadArtifact(type: ResourceType, id: string): Promise<Buffer> {
|
|
86
|
+
return this.http.getBytes(`${BASE}/resources/${type}/${encodeURIComponent(id)}/download`);
|
|
87
|
+
}
|
|
88
|
+
}
|