@tracemarketplace/cli 0.0.15 → 0.0.18
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/dist/api-client.d.ts +7 -0
- package/dist/api-client.d.ts.map +1 -1
- package/dist/api-client.js +79 -14
- package/dist/api-client.js.map +1 -1
- package/dist/api-client.test.d.ts +2 -0
- package/dist/api-client.test.d.ts.map +1 -0
- package/dist/api-client.test.js +34 -0
- package/dist/api-client.test.js.map +1 -0
- package/dist/cli.js +9 -8
- package/dist/cli.js.map +1 -1
- package/dist/commands/daemon.d.ts.map +1 -1
- package/dist/commands/daemon.js +71 -6
- package/dist/commands/daemon.js.map +1 -1
- package/dist/commands/remove-daemon.d.ts +6 -0
- package/dist/commands/remove-daemon.d.ts.map +1 -0
- package/dist/commands/remove-daemon.js +66 -0
- package/dist/commands/remove-daemon.js.map +1 -0
- package/dist/commands/submit.d.ts +1 -0
- package/dist/commands/submit.d.ts.map +1 -1
- package/dist/commands/submit.js +25 -15
- package/dist/commands/submit.js.map +1 -1
- package/dist/config.d.ts +5 -0
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +12 -0
- package/dist/config.js.map +1 -1
- package/dist/flush.d.ts +5 -1
- package/dist/flush.d.ts.map +1 -1
- package/dist/flush.js +107 -27
- package/dist/flush.js.map +1 -1
- package/dist/flush.test.js +162 -7
- package/dist/flush.test.js.map +1 -1
- package/package.json +2 -2
- package/src/api-client.test.ts +47 -0
- package/src/api-client.ts +98 -14
- package/src/cli.ts +10 -9
- package/src/commands/daemon.ts +82 -6
- package/src/commands/remove-daemon.ts +75 -0
- package/src/commands/submit.ts +28 -18
- package/src/config.ts +18 -0
- package/src/flush.test.ts +187 -6
- package/src/flush.ts +140 -39
- package/src/commands/register.ts +0 -8
package/dist/api-client.d.ts
CHANGED
|
@@ -1,8 +1,15 @@
|
|
|
1
|
+
export declare class ApiError extends Error {
|
|
2
|
+
readonly status: number;
|
|
3
|
+
readonly body: unknown;
|
|
4
|
+
readonly retryAfterSeconds: number | null;
|
|
5
|
+
constructor(message: string, status: number, body: unknown, retryAfterSeconds: number | null);
|
|
6
|
+
}
|
|
1
7
|
export declare class ApiClient {
|
|
2
8
|
private baseUrl;
|
|
3
9
|
private apiKey?;
|
|
4
10
|
constructor(baseUrl: string, apiKey?: string | undefined);
|
|
5
11
|
get(path: string): Promise<unknown>;
|
|
6
12
|
post(path: string, body: unknown): Promise<unknown>;
|
|
13
|
+
private request;
|
|
7
14
|
}
|
|
8
15
|
//# sourceMappingURL=api-client.d.ts.map
|
package/dist/api-client.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api-client.d.ts","sourceRoot":"","sources":["../src/api-client.ts"],"names":[],"mappings":"AAAA,qBAAa,SAAS;IAElB,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,MAAM,CAAC;gBADP,OAAO,EAAE,MAAM,EACf,MAAM,CAAC,EAAE,MAAM,YAAA;IAGnB,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"api-client.d.ts","sourceRoot":"","sources":["../src/api-client.ts"],"names":[],"mappings":"AAAA,qBAAa,QAAS,SAAQ,KAAK;IAG/B,QAAQ,CAAC,MAAM,EAAE,MAAM;IACvB,QAAQ,CAAC,IAAI,EAAE,OAAO;IACtB,QAAQ,CAAC,iBAAiB,EAAE,MAAM,GAAG,IAAI;gBAHzC,OAAO,EAAE,MAAM,EACN,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,OAAO,EACb,iBAAiB,EAAE,MAAM,GAAG,IAAI;CAK5C;AAED,qBAAa,SAAS;IAElB,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,MAAM,CAAC;gBADP,OAAO,EAAE,MAAM,EACf,MAAM,CAAC,EAAE,MAAM,YAAA;IAGnB,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAInC,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;YAI3C,OAAO;CA2CtB"}
|
package/dist/api-client.js
CHANGED
|
@@ -1,3 +1,15 @@
|
|
|
1
|
+
export class ApiError extends Error {
|
|
2
|
+
status;
|
|
3
|
+
body;
|
|
4
|
+
retryAfterSeconds;
|
|
5
|
+
constructor(message, status, body, retryAfterSeconds) {
|
|
6
|
+
super(message);
|
|
7
|
+
this.status = status;
|
|
8
|
+
this.body = body;
|
|
9
|
+
this.retryAfterSeconds = retryAfterSeconds;
|
|
10
|
+
this.name = "ApiError";
|
|
11
|
+
}
|
|
12
|
+
}
|
|
1
13
|
export class ApiClient {
|
|
2
14
|
baseUrl;
|
|
3
15
|
apiKey;
|
|
@@ -6,29 +18,82 @@ export class ApiClient {
|
|
|
6
18
|
this.apiKey = apiKey;
|
|
7
19
|
}
|
|
8
20
|
async get(path) {
|
|
9
|
-
|
|
10
|
-
headers: this.apiKey ? { "X-Api-Key": this.apiKey } : {},
|
|
11
|
-
});
|
|
12
|
-
if (!res.ok) {
|
|
13
|
-
const text = await res.text();
|
|
14
|
-
throw new Error(`API error ${res.status}: ${text}`);
|
|
15
|
-
}
|
|
16
|
-
return res.json();
|
|
21
|
+
return this.request("GET", path);
|
|
17
22
|
}
|
|
18
23
|
async post(path, body) {
|
|
24
|
+
return this.request("POST", path, body);
|
|
25
|
+
}
|
|
26
|
+
async request(method, path, body) {
|
|
27
|
+
let reqBody;
|
|
28
|
+
const extraHeaders = {};
|
|
29
|
+
if (method === "POST" && body !== undefined) {
|
|
30
|
+
const json = JSON.stringify(body);
|
|
31
|
+
try {
|
|
32
|
+
const { gzip } = await import("zlib");
|
|
33
|
+
const buf = await new Promise((resolve, reject) => gzip(Buffer.from(json), (err, result) => err ? reject(err) : resolve(result)));
|
|
34
|
+
reqBody = new Uint8Array(buf);
|
|
35
|
+
extraHeaders["X-Content-Encoding"] = "gzip";
|
|
36
|
+
const ratio = Math.round((1 - buf.length / json.length) * 100);
|
|
37
|
+
console.error(`[gzip] ${Math.round(json.length / 1024)}KB → ${Math.round(buf.length / 1024)}KB (${ratio}% reduction)`);
|
|
38
|
+
}
|
|
39
|
+
catch (e) {
|
|
40
|
+
console.error(`[gzip] compression failed, sending uncompressed: ${e}`);
|
|
41
|
+
reqBody = json;
|
|
42
|
+
}
|
|
43
|
+
}
|
|
19
44
|
const res = await fetch(`${this.baseUrl}${path}`, {
|
|
20
|
-
method
|
|
45
|
+
method,
|
|
21
46
|
headers: {
|
|
22
|
-
"Content-Type": "application/json",
|
|
47
|
+
...(method === "POST" ? { "Content-Type": "application/json" } : {}),
|
|
23
48
|
...(this.apiKey ? { "X-Api-Key": this.apiKey } : {}),
|
|
49
|
+
...extraHeaders,
|
|
24
50
|
},
|
|
25
|
-
body:
|
|
51
|
+
body: reqBody,
|
|
26
52
|
});
|
|
53
|
+
const parsedBody = await parseResponseBody(res);
|
|
27
54
|
if (!res.ok) {
|
|
28
|
-
|
|
29
|
-
|
|
55
|
+
throw new ApiError(`API error ${res.status}: ${formatErrorBody(parsedBody)}`, res.status, parsedBody, parseRetryAfterHeader(res.headers.get("retry-after")));
|
|
56
|
+
}
|
|
57
|
+
return parsedBody;
|
|
58
|
+
}
|
|
59
|
+
}
|
|
60
|
+
async function parseResponseBody(res) {
|
|
61
|
+
const text = await res.text();
|
|
62
|
+
if (!text) {
|
|
63
|
+
return null;
|
|
64
|
+
}
|
|
65
|
+
try {
|
|
66
|
+
return JSON.parse(text);
|
|
67
|
+
}
|
|
68
|
+
catch {
|
|
69
|
+
return text;
|
|
70
|
+
}
|
|
71
|
+
}
|
|
72
|
+
function formatErrorBody(body) {
|
|
73
|
+
if (typeof body === "string") {
|
|
74
|
+
return body;
|
|
75
|
+
}
|
|
76
|
+
if (body && typeof body === "object") {
|
|
77
|
+
const error = body.error;
|
|
78
|
+
if (typeof error === "string") {
|
|
79
|
+
return error;
|
|
30
80
|
}
|
|
31
|
-
return res.json();
|
|
32
81
|
}
|
|
82
|
+
return JSON.stringify(body);
|
|
83
|
+
}
|
|
84
|
+
function parseRetryAfterHeader(value) {
|
|
85
|
+
if (!value) {
|
|
86
|
+
return null;
|
|
87
|
+
}
|
|
88
|
+
const numeric = Number.parseInt(value, 10);
|
|
89
|
+
if (Number.isFinite(numeric)) {
|
|
90
|
+
return Math.max(0, numeric);
|
|
91
|
+
}
|
|
92
|
+
const dateMs = Date.parse(value);
|
|
93
|
+
if (Number.isNaN(dateMs)) {
|
|
94
|
+
return null;
|
|
95
|
+
}
|
|
96
|
+
const seconds = Math.ceil((dateMs - Date.now()) / 1000);
|
|
97
|
+
return Math.max(0, seconds);
|
|
33
98
|
}
|
|
34
99
|
//# sourceMappingURL=api-client.js.map
|
package/dist/api-client.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api-client.js","sourceRoot":"","sources":["../src/api-client.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,SAAS;IAEV;IACA;IAFV,YACU,OAAe,EACf,MAAe;QADf,YAAO,GAAP,OAAO,CAAQ;QACf,WAAM,GAAN,MAAM,CAAS;IACtB,CAAC;IAEJ,KAAK,CAAC,GAAG,CAAC,IAAY;QACpB,
|
|
1
|
+
{"version":3,"file":"api-client.js","sourceRoot":"","sources":["../src/api-client.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"api-client.test.d.ts","sourceRoot":"","sources":["../src/api-client.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
import { afterEach, describe, expect, it, vi } from "vitest";
|
|
2
|
+
import { ApiClient } from "./api-client.js";
|
|
3
|
+
describe("ApiClient", () => {
|
|
4
|
+
const originalFetch = global.fetch;
|
|
5
|
+
afterEach(() => {
|
|
6
|
+
global.fetch = originalFetch;
|
|
7
|
+
vi.restoreAllMocks();
|
|
8
|
+
});
|
|
9
|
+
it("parses retry-after and json error bodies", async () => {
|
|
10
|
+
global.fetch = vi.fn().mockResolvedValue(new Response(JSON.stringify({ error: "busy" }), {
|
|
11
|
+
status: 503,
|
|
12
|
+
headers: {
|
|
13
|
+
"content-type": "application/json",
|
|
14
|
+
"retry-after": "12",
|
|
15
|
+
},
|
|
16
|
+
}));
|
|
17
|
+
const client = new ApiClient("https://example.test", "token");
|
|
18
|
+
await expect(client.post("/api/v1/traces/batch", {})).rejects.toEqual(expect.objectContaining({
|
|
19
|
+
name: "ApiError",
|
|
20
|
+
status: 503,
|
|
21
|
+
retryAfterSeconds: 12,
|
|
22
|
+
body: { error: "busy" },
|
|
23
|
+
}));
|
|
24
|
+
});
|
|
25
|
+
it("returns parsed json bodies on success", async () => {
|
|
26
|
+
global.fetch = vi.fn().mockResolvedValue(new Response(JSON.stringify({ ok: true }), {
|
|
27
|
+
status: 200,
|
|
28
|
+
headers: { "content-type": "application/json" },
|
|
29
|
+
}));
|
|
30
|
+
const client = new ApiClient("https://example.test", "token");
|
|
31
|
+
await expect(client.get("/health")).resolves.toEqual({ ok: true });
|
|
32
|
+
});
|
|
33
|
+
});
|
|
34
|
+
//# sourceMappingURL=api-client.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"api-client.test.js","sourceRoot":"","sources":["../src/api-client.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAC7D,OAAO,EAAE,SAAS,EAAY,MAAM,iBAAiB,CAAC;AAEtD,QAAQ,CAAC,WAAW,EAAE,GAAG,EAAE;IACzB,MAAM,aAAa,GAAG,MAAM,CAAC,KAAK,CAAC;IAEnC,SAAS,CAAC,GAAG,EAAE;QACb,MAAM,CAAC,KAAK,GAAG,aAAa,CAAC;QAC7B,EAAE,CAAC,eAAe,EAAE,CAAC;IACvB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,0CAA0C,EAAE,KAAK,IAAI,EAAE;QACxD,MAAM,CAAC,KAAK,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,iBAAiB,CACtC,IAAI,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,EAAE;YAC9C,MAAM,EAAE,GAAG;YACX,OAAO,EAAE;gBACP,cAAc,EAAE,kBAAkB;gBAClC,aAAa,EAAE,IAAI;aACpB;SACF,CAAC,CACa,CAAC;QAElB,MAAM,MAAM,GAAG,IAAI,SAAS,CAAC,sBAAsB,EAAE,OAAO,CAAC,CAAC;QAE9D,MAAM,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,sBAAsB,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CACnE,MAAM,CAAC,gBAAgB,CAAoB;YACzC,IAAI,EAAE,UAAU;YAChB,MAAM,EAAE,GAAG;YACX,iBAAiB,EAAE,EAAE;YACrB,IAAI,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE;SACxB,CAAC,CACH,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,uCAAuC,EAAE,KAAK,IAAI,EAAE;QACrD,MAAM,CAAC,KAAK,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,iBAAiB,CACtC,IAAI,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE;YACzC,MAAM,EAAE,GAAG;YACX,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE;SAChD,CAAC,CACa,CAAC;QAElB,MAAM,MAAM,GAAG,IAAI,SAAS,CAAC,sBAAsB,EAAE,OAAO,CAAC,CAAC;QAE9D,MAAM,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC;IACrE,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
package/dist/cli.js
CHANGED
|
@@ -4,7 +4,6 @@ import { dirname, join } from "path";
|
|
|
4
4
|
import { fileURLToPath } from "url";
|
|
5
5
|
import { program } from "commander";
|
|
6
6
|
import { loginCommand } from "./commands/login.js";
|
|
7
|
-
import { registerCommand } from "./commands/register.js";
|
|
8
7
|
import { whoamiCommand } from "./commands/whoami.js";
|
|
9
8
|
import { submitCommand } from "./commands/submit.js";
|
|
10
9
|
import { statusCommand } from "./commands/status.js";
|
|
@@ -13,6 +12,7 @@ import { autoSubmitCommand } from "./commands/auto-submit.js";
|
|
|
13
12
|
import { setupHookCommand } from "./commands/setup-hook.js";
|
|
14
13
|
import { daemonCommand } from "./commands/daemon.js";
|
|
15
14
|
import { removeHookCommand } from "./commands/remove-hook.js";
|
|
15
|
+
import { removeDaemonCommand } from "./commands/remove-daemon.js";
|
|
16
16
|
import { CLI_NAME, DEFAULT_PROFILE, PROD_SERVER_URL } from "./constants.js";
|
|
17
17
|
const profileOptionDescription = `Config profile (default: ${DEFAULT_PROFILE})`;
|
|
18
18
|
const packageVersion = JSON.parse(readFileSync(join(dirname(fileURLToPath(import.meta.url)), "../package.json"), "utf-8")).version;
|
|
@@ -26,12 +26,6 @@ program
|
|
|
26
26
|
.option("--profile <name>", profileOptionDescription)
|
|
27
27
|
.option("--server-url <url>", `Server URL (default prod: ${PROD_SERVER_URL})`)
|
|
28
28
|
.action((opts) => loginCommand({ profile: opts.profile, serverUrl: opts.serverUrl }).catch(handleError));
|
|
29
|
-
program
|
|
30
|
-
.command("register")
|
|
31
|
-
.description("Alias for login — signs in via browser and saves your API key")
|
|
32
|
-
.option("--profile <name>", profileOptionDescription)
|
|
33
|
-
.option("--server-url <url>", `Server URL (default prod: ${PROD_SERVER_URL})`)
|
|
34
|
-
.action((opts) => registerCommand({ profile: opts.profile, serverUrl: opts.serverUrl }).catch(handleError));
|
|
35
29
|
program
|
|
36
30
|
.command("whoami")
|
|
37
31
|
.description("Show your account info and balance")
|
|
@@ -44,12 +38,14 @@ program
|
|
|
44
38
|
.option("--tool <tool>", "Only submit from specific tool (claude-code|codex|cursor)")
|
|
45
39
|
.option("--session <id>", "Only submit a specific session ID")
|
|
46
40
|
.option("--dry-run", "Preview without submitting")
|
|
41
|
+
.option("--sync", "Wait for server acknowledgement instead of fire-and-forget")
|
|
47
42
|
.option("--created-since <duration>", "Only include sessions created within duration (e.g. 30d, 12h, 30m)", "30d")
|
|
48
43
|
.action((opts) => submitCommand({
|
|
49
44
|
profile: opts.profile,
|
|
50
45
|
tool: opts.tool,
|
|
51
46
|
session: opts.session,
|
|
52
47
|
dryRun: opts.dryRun,
|
|
48
|
+
sync: opts.sync,
|
|
53
49
|
since: opts.createdSince,
|
|
54
50
|
}).catch(handleError));
|
|
55
51
|
program
|
|
@@ -63,7 +59,7 @@ program
|
|
|
63
59
|
.option("--profile <name>", profileOptionDescription)
|
|
64
60
|
.action((opts) => historyCommand({ profile: opts.profile }).catch(handleError));
|
|
65
61
|
program
|
|
66
|
-
.command("auto-submit")
|
|
62
|
+
.command("auto-submit", { hidden: true })
|
|
67
63
|
.description("Submit the current session (called by tool hooks — do not run manually)")
|
|
68
64
|
.option("--profile <name>", profileOptionDescription)
|
|
69
65
|
.option("--tool <tool>", "Tool that triggered the hook (claude-code|cursor|codex)")
|
|
@@ -94,6 +90,11 @@ program
|
|
|
94
90
|
.description("Remove tracemp hooks from Claude Code, Cursor, and Codex CLI")
|
|
95
91
|
.option("--tool <tool>", "Only remove hook for specific tool (claude-code|cursor|codex)")
|
|
96
92
|
.action((opts) => removeHookCommand({ tool: opts.tool }).catch(handleError));
|
|
93
|
+
program
|
|
94
|
+
.command("remove-daemon")
|
|
95
|
+
.description("Stop a running tracemp daemon")
|
|
96
|
+
.option("--profile <name>", profileOptionDescription)
|
|
97
|
+
.action((opts) => removeDaemonCommand({ profile: opts.profile }).catch(handleError));
|
|
97
98
|
function handleError(e) {
|
|
98
99
|
console.error(e.message ?? String(e));
|
|
99
100
|
process.exit(1);
|
package/dist/cli.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,YAAY,EAAE,MAAM,IAAI,CAAC;AAClC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AACrC,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AACpC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"daemon.d.ts","sourceRoot":"","sources":["../../src/commands/daemon.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"daemon.d.ts","sourceRoot":"","sources":["../../src/commands/daemon.ts"],"names":[],"mappings":"AAiCA,UAAU,aAAa;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAC3B,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AA6GD,wBAAsB,aAAa,CAAC,IAAI,GAAE,aAAkB,GAAG,OAAO,CAAC,IAAI,CAAC,CAsD3E"}
|
package/dist/commands/daemon.js
CHANGED
|
@@ -6,19 +6,80 @@
|
|
|
6
6
|
* pass and exits. `--watch` preserves the old live-watch behavior.
|
|
7
7
|
*
|
|
8
8
|
* State: ~/.config/tracemarketplace/daemon-state(.<profile>).json
|
|
9
|
-
* { [filePath]: { mtime: number
|
|
9
|
+
* { [filePath]: { mtime: number; size: number } }
|
|
10
|
+
*
|
|
11
|
+
* PID: ~/.config/tracemarketplace/daemon(.<profile>).pid
|
|
10
12
|
*/
|
|
11
|
-
import { readFileSync, writeFileSync, mkdirSync, statSync, existsSync } from "fs";
|
|
13
|
+
import { readFileSync, writeFileSync, mkdirSync, statSync, existsSync, unlinkSync } from "fs";
|
|
12
14
|
import { homedir } from "os";
|
|
13
15
|
import { join } from "path";
|
|
14
16
|
import chalk from "chalk";
|
|
15
|
-
import { getConfigDir, getDaemonStatePath, loadConfig, resolveProfile } from "../config.js";
|
|
17
|
+
import { getConfigDir, getDaemonPidPath, getDaemonStatePath, loadConfig, resolveProfile, } from "../config.js";
|
|
16
18
|
import { findFiles, watchDirs } from "../sessions.js";
|
|
17
19
|
import { log } from "./auto-submit.js";
|
|
18
|
-
import { loginCommandForProfile } from "../constants.js";
|
|
20
|
+
import { CLI_NAME, DEFAULT_PROFILE, loginCommandForProfile } from "../constants.js";
|
|
19
21
|
import { buildFileSessionSource, flushTrackedSessions } from "../flush.js";
|
|
20
22
|
const DEFAULT_INTERVAL_SECONDS = 60;
|
|
21
23
|
const BACKFILL_LOOKBACK_DAYS = 7;
|
|
24
|
+
function readDaemonPid(profile) {
|
|
25
|
+
const pidPath = getDaemonPidPath(profile);
|
|
26
|
+
if (!existsSync(pidPath))
|
|
27
|
+
return null;
|
|
28
|
+
try {
|
|
29
|
+
const parsed = Number.parseInt(readFileSync(pidPath, "utf-8").trim(), 10);
|
|
30
|
+
return Number.isFinite(parsed) && parsed > 0 ? parsed : null;
|
|
31
|
+
}
|
|
32
|
+
catch {
|
|
33
|
+
return null;
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
function isProcessRunning(pid) {
|
|
37
|
+
try {
|
|
38
|
+
process.kill(pid, 0);
|
|
39
|
+
return true;
|
|
40
|
+
}
|
|
41
|
+
catch (err) {
|
|
42
|
+
return err.code === "EPERM";
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
function removeDaemonPidFile(profile, expectedPid) {
|
|
46
|
+
const pidPath = getDaemonPidPath(profile);
|
|
47
|
+
if (!existsSync(pidPath))
|
|
48
|
+
return;
|
|
49
|
+
try {
|
|
50
|
+
if (expectedPid !== undefined) {
|
|
51
|
+
const currentPid = Number.parseInt(readFileSync(pidPath, "utf-8").trim(), 10);
|
|
52
|
+
if (currentPid !== expectedPid)
|
|
53
|
+
return;
|
|
54
|
+
}
|
|
55
|
+
unlinkSync(pidPath);
|
|
56
|
+
}
|
|
57
|
+
catch { }
|
|
58
|
+
}
|
|
59
|
+
function reserveDaemonPid(profile) {
|
|
60
|
+
const existingPid = readDaemonPid(profile);
|
|
61
|
+
if (existingPid !== null) {
|
|
62
|
+
if (isProcessRunning(existingPid)) {
|
|
63
|
+
const profileArg = profile === DEFAULT_PROFILE ? "" : ` --profile ${profile}`;
|
|
64
|
+
throw new Error(`Daemon already running for profile '${profile}' (pid ${existingPid}). Run: ${CLI_NAME} remove-daemon${profileArg}`);
|
|
65
|
+
}
|
|
66
|
+
removeDaemonPidFile(profile);
|
|
67
|
+
}
|
|
68
|
+
else {
|
|
69
|
+
removeDaemonPidFile(profile);
|
|
70
|
+
}
|
|
71
|
+
mkdirSync(getConfigDir(), { recursive: true });
|
|
72
|
+
writeFileSync(getDaemonPidPath(profile), `${process.pid}\n`, "utf-8");
|
|
73
|
+
let released = false;
|
|
74
|
+
const release = () => {
|
|
75
|
+
if (released)
|
|
76
|
+
return;
|
|
77
|
+
released = true;
|
|
78
|
+
removeDaemonPidFile(profile, process.pid);
|
|
79
|
+
};
|
|
80
|
+
process.once("exit", release);
|
|
81
|
+
return release;
|
|
82
|
+
}
|
|
22
83
|
function loadState(profile) {
|
|
23
84
|
try {
|
|
24
85
|
return JSON.parse(readFileSync(getDaemonStatePath(profile), "utf-8"));
|
|
@@ -78,6 +139,7 @@ export async function daemonCommand(opts = {}) {
|
|
|
78
139
|
}
|
|
79
140
|
const intervalSeconds = parseIntervalSeconds(opts.interval);
|
|
80
141
|
let state = loadState(config.profile);
|
|
142
|
+
const releasePid = opts.once ? null : reserveDaemonPid(config.profile);
|
|
81
143
|
console.log(chalk.bold("tracemp daemon starting"));
|
|
82
144
|
console.log(chalk.gray(`Profile: ${config.profile}`));
|
|
83
145
|
console.log(chalk.gray(`Server: ${config.serverUrl}`));
|
|
@@ -85,7 +147,7 @@ export async function daemonCommand(opts = {}) {
|
|
|
85
147
|
if (opts.watch) {
|
|
86
148
|
console.log(chalk.gray("Mode: live watch"));
|
|
87
149
|
console.log(chalk.gray("Press Ctrl+C to stop\n"));
|
|
88
|
-
await runWatchLoop(config, tools, state);
|
|
150
|
+
await runWatchLoop(config, tools, state, releasePid ?? (() => { }));
|
|
89
151
|
return;
|
|
90
152
|
}
|
|
91
153
|
console.log(chalk.gray(`Mode: poll every ${intervalSeconds}s${opts.once ? " (one shot)" : ""}\n`));
|
|
@@ -97,6 +159,7 @@ export async function daemonCommand(opts = {}) {
|
|
|
97
159
|
if (shuttingDown)
|
|
98
160
|
return;
|
|
99
161
|
shuttingDown = true;
|
|
162
|
+
releasePid?.();
|
|
100
163
|
console.log(chalk.gray("\nDaemon stopped."));
|
|
101
164
|
process.exit(0);
|
|
102
165
|
};
|
|
@@ -133,7 +196,7 @@ async function runScanPass(config, tools, state, opts = {}) {
|
|
|
133
196
|
}
|
|
134
197
|
return nextState;
|
|
135
198
|
}
|
|
136
|
-
async function runWatchLoop(config, tools, state) {
|
|
199
|
+
async function runWatchLoop(config, tools, state, releasePid) {
|
|
137
200
|
let nextState = await runScanPass(config, tools, state, { logWhenEmpty: true });
|
|
138
201
|
const stop = watchDirs(tools, async (tool, filePath) => {
|
|
139
202
|
if (!hasChanged(filePath, nextState))
|
|
@@ -143,11 +206,13 @@ async function runWatchLoop(config, tools, state) {
|
|
|
143
206
|
});
|
|
144
207
|
process.on("SIGINT", () => {
|
|
145
208
|
stop();
|
|
209
|
+
releasePid();
|
|
146
210
|
console.log(chalk.gray("\nDaemon stopped."));
|
|
147
211
|
process.exit(0);
|
|
148
212
|
});
|
|
149
213
|
process.on("SIGTERM", () => {
|
|
150
214
|
stop();
|
|
215
|
+
releasePid();
|
|
151
216
|
process.exit(0);
|
|
152
217
|
});
|
|
153
218
|
await new Promise(() => { });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"daemon.js","sourceRoot":"","sources":["../../src/commands/daemon.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"daemon.js","sourceRoot":"","sources":["../../src/commands/daemon.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"remove-daemon.d.ts","sourceRoot":"","sources":["../../src/commands/remove-daemon.ts"],"names":[],"mappings":"AAKA,UAAU,mBAAmB;IAC3B,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AA0CD,wBAAsB,mBAAmB,CAAC,IAAI,GAAE,mBAAwB,GAAG,OAAO,CAAC,IAAI,CAAC,CAyBvF"}
|
|
@@ -0,0 +1,66 @@
|
|
|
1
|
+
import { existsSync, readFileSync, unlinkSync } from "fs";
|
|
2
|
+
import chalk from "chalk";
|
|
3
|
+
import { DEFAULT_PROFILE } from "../constants.js";
|
|
4
|
+
import { getDaemonPidPath, resolveProfile } from "../config.js";
|
|
5
|
+
function readDaemonPid(profile) {
|
|
6
|
+
const pidPath = getDaemonPidPath(profile);
|
|
7
|
+
if (!existsSync(pidPath))
|
|
8
|
+
return null;
|
|
9
|
+
try {
|
|
10
|
+
const parsed = Number.parseInt(readFileSync(pidPath, "utf-8").trim(), 10);
|
|
11
|
+
return Number.isFinite(parsed) && parsed > 0 ? parsed : null;
|
|
12
|
+
}
|
|
13
|
+
catch {
|
|
14
|
+
return null;
|
|
15
|
+
}
|
|
16
|
+
}
|
|
17
|
+
function isProcessRunning(pid) {
|
|
18
|
+
try {
|
|
19
|
+
process.kill(pid, 0);
|
|
20
|
+
return true;
|
|
21
|
+
}
|
|
22
|
+
catch (err) {
|
|
23
|
+
return err.code === "EPERM";
|
|
24
|
+
}
|
|
25
|
+
}
|
|
26
|
+
function removePidFile(profile) {
|
|
27
|
+
const pidPath = getDaemonPidPath(profile);
|
|
28
|
+
if (!existsSync(pidPath))
|
|
29
|
+
return;
|
|
30
|
+
try {
|
|
31
|
+
unlinkSync(pidPath);
|
|
32
|
+
}
|
|
33
|
+
catch { }
|
|
34
|
+
}
|
|
35
|
+
async function waitForExit(pid, timeoutMs = 3000) {
|
|
36
|
+
const deadline = Date.now() + timeoutMs;
|
|
37
|
+
while (Date.now() < deadline) {
|
|
38
|
+
if (!isProcessRunning(pid)) {
|
|
39
|
+
return true;
|
|
40
|
+
}
|
|
41
|
+
await new Promise((resolve) => setTimeout(resolve, 100));
|
|
42
|
+
}
|
|
43
|
+
return !isProcessRunning(pid);
|
|
44
|
+
}
|
|
45
|
+
export async function removeDaemonCommand(opts = {}) {
|
|
46
|
+
const profile = resolveProfile(opts.profile);
|
|
47
|
+
const pid = readDaemonPid(profile);
|
|
48
|
+
const profileLabel = profile === DEFAULT_PROFILE ? "default profile" : `profile '${profile}'`;
|
|
49
|
+
if (pid === null) {
|
|
50
|
+
console.log(chalk.gray(`No tracemp daemon found for ${profileLabel}.`));
|
|
51
|
+
return;
|
|
52
|
+
}
|
|
53
|
+
if (!isProcessRunning(pid)) {
|
|
54
|
+
removePidFile(profile);
|
|
55
|
+
console.log(chalk.gray(`Removed stale daemon PID file for ${profileLabel}.`));
|
|
56
|
+
return;
|
|
57
|
+
}
|
|
58
|
+
process.kill(pid, "SIGTERM");
|
|
59
|
+
if (await waitForExit(pid)) {
|
|
60
|
+
removePidFile(profile);
|
|
61
|
+
console.log(chalk.green(`✓ Stopped tracemp daemon for ${profileLabel}`));
|
|
62
|
+
return;
|
|
63
|
+
}
|
|
64
|
+
console.log(chalk.yellow(`Sent SIGTERM to tracemp daemon for ${profileLabel} (pid ${pid}), but it is still running.`));
|
|
65
|
+
}
|
|
66
|
+
//# sourceMappingURL=remove-daemon.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"remove-daemon.js","sourceRoot":"","sources":["../../src/commands/remove-daemon.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"submit.d.ts","sourceRoot":"","sources":["../../src/commands/submit.ts"],"names":[],"mappings":"AAmBA,UAAU,aAAa;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAmCD,wBAAsB,aAAa,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"submit.d.ts","sourceRoot":"","sources":["../../src/commands/submit.ts"],"names":[],"mappings":"AAmBA,UAAU,aAAa;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAmCD,wBAAsB,aAAa,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CA4PtE"}
|
package/dist/commands/submit.js
CHANGED
|
@@ -192,25 +192,35 @@ export async function submitCommand(opts) {
|
|
|
192
192
|
console.log(chalk.gray("Cancelled."));
|
|
193
193
|
return;
|
|
194
194
|
}
|
|
195
|
-
const uploadSpinner = ora(
|
|
195
|
+
const uploadSpinner = ora(opts.sync
|
|
196
|
+
? `Submitting ${readyChunkCount} finalized chunk(s) to ${config.profile}...`
|
|
197
|
+
: `Queuing ${readyChunkCount} finalized chunk(s) to ${config.profile}...`).start();
|
|
196
198
|
try {
|
|
197
|
-
const
|
|
199
|
+
const readySessions = plannedSessions.filter((session) => session.readyChunks > 0);
|
|
200
|
+
const prefetchedTraces = new Map(readySessions.map((s) => [`${s.source.tool}:${s.source.locator}`, s.trace]));
|
|
201
|
+
const result = await flushTrackedSessions(config, readySessions.map((session) => session.source), { includeIdleTracked: false, prefetchedTraces, sync: opts.sync });
|
|
198
202
|
uploadSpinner.stop();
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
203
|
+
if (opts.sync) {
|
|
204
|
+
const failedSessions = result.results.filter((session) => session.error && session.error !== "Empty session");
|
|
205
|
+
console.log(chalk.green("\nSubmission complete!"));
|
|
206
|
+
console.log(` Uploaded chunks: ${chalk.bold(result.uploadedChunks)}`);
|
|
207
|
+
console.log(` Duplicate chunks: ${chalk.gray(result.duplicateChunks)}`);
|
|
208
|
+
console.log(` Pending sessions: ${result.pendingSessions}`);
|
|
209
|
+
console.log(` Payout: ${chalk.green("$" + (result.payoutCents / 100).toFixed(2))}`);
|
|
210
|
+
if (failedSessions.length > 0) {
|
|
211
|
+
console.log(chalk.yellow(`\n${failedSessions.length} session(s) failed during submit:`));
|
|
212
|
+
failedSessions.slice(0, 3).forEach((session) => {
|
|
213
|
+
console.log(chalk.gray(` ${session.source.label}: ${session.error}`));
|
|
214
|
+
});
|
|
215
|
+
if (failedSessions.length > 3) {
|
|
216
|
+
console.log(chalk.gray(` ...and ${failedSessions.length - 3} more`));
|
|
217
|
+
}
|
|
212
218
|
}
|
|
213
219
|
}
|
|
220
|
+
else {
|
|
221
|
+
console.log(chalk.green(`\nQueued ${readyChunkCount} chunk(s) — processing in background.`));
|
|
222
|
+
console.log(chalk.gray(" Run again to check confirmation status."));
|
|
223
|
+
}
|
|
214
224
|
}
|
|
215
225
|
catch (e) {
|
|
216
226
|
uploadSpinner.fail("Submission failed");
|