@glubean/cli 0.2.6 → 0.3.0
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 +2 -2
- package/dist/commands/init.d.ts +2 -0
- package/dist/commands/init.d.ts.map +1 -1
- package/dist/commands/init.js +267 -60
- package/dist/commands/init.js.map +1 -1
- package/dist/commands/redact.d.ts.map +1 -1
- package/dist/commands/redact.js +32 -8
- package/dist/commands/redact.js.map +1 -1
- package/dist/commands/run.d.ts +110 -2
- package/dist/commands/run.d.ts.map +1 -1
- package/dist/commands/run.js +483 -40
- package/dist/commands/run.js.map +1 -1
- package/dist/lib/config.d.ts +267 -43
- package/dist/lib/config.d.ts.map +1 -1
- package/dist/lib/config.js +744 -149
- package/dist/lib/config.js.map +1 -1
- package/dist/lib/env.d.ts +29 -0
- package/dist/lib/env.d.ts.map +1 -0
- package/dist/lib/env.js +59 -0
- package/dist/lib/env.js.map +1 -0
- package/dist/lib/print-plan.d.ts +21 -0
- package/dist/lib/print-plan.d.ts.map +1 -0
- package/dist/lib/print-plan.js +108 -0
- package/dist/lib/print-plan.js.map +1 -0
- package/dist/lib/upload.d.ts +36 -1
- package/dist/lib/upload.d.ts.map +1 -1
- package/dist/lib/upload.js +126 -19
- package/dist/lib/upload.js.map +1 -1
- package/dist/main.d.ts.map +1 -1
- package/dist/main.js +405 -27
- package/dist/main.js.map +1 -1
- package/package.json +5 -5
- package/templates/README.md +7 -13
- package/templates/demo/.env.example +7 -0
- package/templates/demo/.env.secrets.example +11 -0
- package/templates/demo/README.md +60 -0
- package/templates/demo/config/api.ts +24 -0
- package/templates/demo/gitignore.tpl +13 -0
- package/templates/demo/glubean.yaml +48 -0
- package/templates/demo/tests/api-flaky/search-flaky.test.ts +28 -0
- package/templates/demo/tests/api-stable/get-users.test.ts +30 -0
- package/templates/demo/tests/canary/synthetic-50pct-flaky.test.ts +23 -0
- package/templates/demo/tests/contracts/stable/users-contract.contract.ts +70 -0
- package/templates/demo/tsconfig.json +15 -0
- package/templates/AI-INSTRUCTIONS.md +0 -160
- package/templates/ci-config/ci.yaml +0 -13
- package/templates/ci-config/default.yaml +0 -9
- package/templates/ci-config/explore.yaml +0 -5
- package/templates/ci-config/staging.yaml +0 -9
package/dist/lib/config.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/lib/config.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/lib/config.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,29 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Shared .env file loading for the Glubean CLI.
|
|
3
|
+
*/
|
|
4
|
+
/**
|
|
5
|
+
* Load a single .env file and return its key-value pairs.
|
|
6
|
+
* Returns an empty object if the file doesn't exist or can't be read.
|
|
7
|
+
*/
|
|
8
|
+
export declare function loadEnvFile(envPath: string): Promise<Record<string, string>>;
|
|
9
|
+
/**
|
|
10
|
+
* Load `.env` + `.env.secrets` from a project root directory.
|
|
11
|
+
*
|
|
12
|
+
* The secrets file path follows the env file name:
|
|
13
|
+
* `.env` → `.env.secrets`
|
|
14
|
+
* `.env.staging` → `.env.staging.secrets`
|
|
15
|
+
*
|
|
16
|
+
* Secrets overlay env vars (later values win).
|
|
17
|
+
*/
|
|
18
|
+
export declare function loadProjectEnv(rootDir: string, envFileName?: string): Promise<Record<string, string>>;
|
|
19
|
+
/**
|
|
20
|
+
* Expand `${NAME}` references in env values.
|
|
21
|
+
*
|
|
22
|
+
* Lookup order:
|
|
23
|
+
* 1. Already-resolved values from the same pass (supports forward references
|
|
24
|
+
* only if the referenced key appears earlier in the file).
|
|
25
|
+
* 2. `process.env`
|
|
26
|
+
* 3. Empty string if not found.
|
|
27
|
+
*/
|
|
28
|
+
export declare function expandVars(vars: Record<string, string>): Record<string, string>;
|
|
29
|
+
//# sourceMappingURL=env.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"env.d.ts","sourceRoot":"","sources":["../../src/lib/env.ts"],"names":[],"mappings":"AAAA;;GAEG;AAMH;;;GAGG;AACH,wBAAsB,WAAW,CAC/B,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAWjC;AAED;;;;;;;;GAQG;AACH,wBAAsB,cAAc,CAClC,OAAO,EAAE,MAAM,EACf,WAAW,SAAS,GACnB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CASjC;AAED;;;;;;;;GAQG;AACH,wBAAgB,UAAU,CACxB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAC3B,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAQxB"}
|
package/dist/lib/env.js
ADDED
|
@@ -0,0 +1,59 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Shared .env file loading for the Glubean CLI.
|
|
3
|
+
*/
|
|
4
|
+
import { resolve } from "node:path";
|
|
5
|
+
import { readFile } from "node:fs/promises";
|
|
6
|
+
import { parse as parseDotenv } from "dotenv";
|
|
7
|
+
/**
|
|
8
|
+
* Load a single .env file and return its key-value pairs.
|
|
9
|
+
* Returns an empty object if the file doesn't exist or can't be read.
|
|
10
|
+
*/
|
|
11
|
+
export async function loadEnvFile(envPath) {
|
|
12
|
+
try {
|
|
13
|
+
const content = await readFile(envPath, "utf-8");
|
|
14
|
+
return parseDotenv(content);
|
|
15
|
+
}
|
|
16
|
+
catch (error) {
|
|
17
|
+
if (error.code === "ENOENT") {
|
|
18
|
+
return {};
|
|
19
|
+
}
|
|
20
|
+
console.warn(`Warning: Could not read env file ${envPath}: ${error.message}`);
|
|
21
|
+
return {};
|
|
22
|
+
}
|
|
23
|
+
}
|
|
24
|
+
/**
|
|
25
|
+
* Load `.env` + `.env.secrets` from a project root directory.
|
|
26
|
+
*
|
|
27
|
+
* The secrets file path follows the env file name:
|
|
28
|
+
* `.env` → `.env.secrets`
|
|
29
|
+
* `.env.staging` → `.env.staging.secrets`
|
|
30
|
+
*
|
|
31
|
+
* Secrets overlay env vars (later values win).
|
|
32
|
+
*/
|
|
33
|
+
export async function loadProjectEnv(rootDir, envFileName = ".env") {
|
|
34
|
+
const envPath = resolve(rootDir, envFileName);
|
|
35
|
+
const secretsPath = resolve(rootDir, `${envFileName}.secrets`);
|
|
36
|
+
const envVars = await loadEnvFile(envPath);
|
|
37
|
+
const secrets = await loadEnvFile(secretsPath);
|
|
38
|
+
const merged = { ...envVars, ...secrets };
|
|
39
|
+
return expandVars(merged);
|
|
40
|
+
}
|
|
41
|
+
/**
|
|
42
|
+
* Expand `${NAME}` references in env values.
|
|
43
|
+
*
|
|
44
|
+
* Lookup order:
|
|
45
|
+
* 1. Already-resolved values from the same pass (supports forward references
|
|
46
|
+
* only if the referenced key appears earlier in the file).
|
|
47
|
+
* 2. `process.env`
|
|
48
|
+
* 3. Empty string if not found.
|
|
49
|
+
*/
|
|
50
|
+
export function expandVars(vars) {
|
|
51
|
+
const result = {};
|
|
52
|
+
for (const [key, value] of Object.entries(vars)) {
|
|
53
|
+
result[key] = value.replace(/\$\{(\w+)\}/g, (_, name) => {
|
|
54
|
+
return result[name] ?? process.env[name] ?? "";
|
|
55
|
+
});
|
|
56
|
+
}
|
|
57
|
+
return result;
|
|
58
|
+
}
|
|
59
|
+
//# sourceMappingURL=env.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"env.js","sourceRoot":"","sources":["../../src/lib/env.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,KAAK,IAAI,WAAW,EAAE,MAAM,QAAQ,CAAC;AAE9C;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,WAAW,CAC/B,OAAe;IAEf,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QACjD,OAAO,WAAW,CAAC,OAAO,CAAC,CAAC;IAC9B,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAK,KAA+B,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YACvD,OAAO,EAAE,CAAC;QACZ,CAAC;QACD,OAAO,CAAC,IAAI,CAAC,oCAAoC,OAAO,KAAM,KAAe,CAAC,OAAO,EAAE,CAAC,CAAC;QACzF,OAAO,EAAE,CAAC;IACZ,CAAC;AACH,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,OAAe,EACf,WAAW,GAAG,MAAM;IAEpB,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;IAC9C,MAAM,WAAW,GAAG,OAAO,CAAC,OAAO,EAAE,GAAG,WAAW,UAAU,CAAC,CAAC;IAE/D,MAAM,OAAO,GAAG,MAAM,WAAW,CAAC,OAAO,CAAC,CAAC;IAC3C,MAAM,OAAO,GAAG,MAAM,WAAW,CAAC,WAAW,CAAC,CAAC;IAC/C,MAAM,MAAM,GAAG,EAAE,GAAG,OAAO,EAAE,GAAG,OAAO,EAAE,CAAC;IAE1C,OAAO,UAAU,CAAC,MAAM,CAAC,CAAC;AAC5B,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,UAAU,UAAU,CACxB,IAA4B;IAE5B,MAAM,MAAM,GAA2B,EAAE,CAAC;IAC1C,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;QAChD,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,OAAO,CAAC,cAAc,EAAE,CAAC,CAAC,EAAE,IAAY,EAAE,EAAE;YAC9D,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;QACjD,CAAC,CAAC,CAAC;IACL,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC"}
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Resolved plan printer — emits a human-readable summary of the
|
|
3
|
+
* ResolvedRunPlan that the CLI will execute. Per `04-config-profiles-
|
|
4
|
+
* public-demo-plan.zh.md` §"可见 plan 输出", the output must be a
|
|
5
|
+
* product-grade signal (not debug noise): users need to see exactly
|
|
6
|
+
* what profile + suites + selection + execution + reporters are in
|
|
7
|
+
* effect from the first screen of any CI log.
|
|
8
|
+
*
|
|
9
|
+
* Pure formatting: no I/O, no env reads, no console.log. Caller is
|
|
10
|
+
* responsible for piping `formatResolvedPlan(...)` to the user-visible
|
|
11
|
+
* stream and for picking up CLI-overridden fields (this formatter
|
|
12
|
+
* trusts that the ResolvedRunPlan it receives is already the post-
|
|
13
|
+
* override view).
|
|
14
|
+
*/
|
|
15
|
+
import type { ResolvedRunPlan } from "./config.js";
|
|
16
|
+
/**
|
|
17
|
+
* Format the plan into a printable multi-line string. No leading or
|
|
18
|
+
* trailing newline — caller composes spacing.
|
|
19
|
+
*/
|
|
20
|
+
export declare function formatResolvedPlan(plan: ResolvedRunPlan, cwd?: string): string;
|
|
21
|
+
//# sourceMappingURL=print-plan.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"print-plan.d.ts","sourceRoot":"","sources":["../../src/lib/print-plan.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAGH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAEnD;;;GAGG;AACH,wBAAgB,kBAAkB,CAChC,IAAI,EAAE,eAAe,EACrB,GAAG,GAAE,MAAsB,GAC1B,MAAM,CAiGR"}
|
|
@@ -0,0 +1,108 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Resolved plan printer — emits a human-readable summary of the
|
|
3
|
+
* ResolvedRunPlan that the CLI will execute. Per `04-config-profiles-
|
|
4
|
+
* public-demo-plan.zh.md` §"可见 plan 输出", the output must be a
|
|
5
|
+
* product-grade signal (not debug noise): users need to see exactly
|
|
6
|
+
* what profile + suites + selection + execution + reporters are in
|
|
7
|
+
* effect from the first screen of any CI log.
|
|
8
|
+
*
|
|
9
|
+
* Pure formatting: no I/O, no env reads, no console.log. Caller is
|
|
10
|
+
* responsible for piping `formatResolvedPlan(...)` to the user-visible
|
|
11
|
+
* stream and for picking up CLI-overridden fields (this formatter
|
|
12
|
+
* trusts that the ResolvedRunPlan it receives is already the post-
|
|
13
|
+
* override view).
|
|
14
|
+
*/
|
|
15
|
+
import { relative } from "node:path";
|
|
16
|
+
/**
|
|
17
|
+
* Format the plan into a printable multi-line string. No leading or
|
|
18
|
+
* trailing newline — caller composes spacing.
|
|
19
|
+
*/
|
|
20
|
+
export function formatResolvedPlan(plan, cwd = process.cwd()) {
|
|
21
|
+
const lines = [];
|
|
22
|
+
const configDisplay = relative(cwd, plan.configPath) || plan.configPath;
|
|
23
|
+
lines.push(`Profile: ${plan.profile}`);
|
|
24
|
+
lines.push(`Config: ${configDisplay}`);
|
|
25
|
+
lines.push("");
|
|
26
|
+
lines.push("Suites:");
|
|
27
|
+
if (plan.suites.length === 0) {
|
|
28
|
+
lines.push(" (none)");
|
|
29
|
+
}
|
|
30
|
+
else {
|
|
31
|
+
const nameWidth = Math.max(...plan.suites.map((s) => s.name.length));
|
|
32
|
+
for (const s of plan.suites) {
|
|
33
|
+
const kinds = (s.kinds ?? []).join(", ");
|
|
34
|
+
const kindsDisplay = kinds.length > 0 ? ` [${kinds}]` : "";
|
|
35
|
+
lines.push(` ${s.name.padEnd(nameWidth)} -> ${s.target}${kindsDisplay}`);
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
lines.push("");
|
|
39
|
+
lines.push("Selection:");
|
|
40
|
+
if (plan.selection.tags.length > 0) {
|
|
41
|
+
lines.push(` tags: ${plan.selection.tags.join(", ")}`);
|
|
42
|
+
}
|
|
43
|
+
if (plan.selection.excludeTags.length > 0) {
|
|
44
|
+
lines.push(` excludeTags: ${plan.selection.excludeTags.join(", ")}`);
|
|
45
|
+
}
|
|
46
|
+
lines.push(` tagMode: ${plan.selection.tagMode}`);
|
|
47
|
+
if (plan.selection.filter) {
|
|
48
|
+
lines.push(` filter: ${plan.selection.filter}`);
|
|
49
|
+
}
|
|
50
|
+
if (plan.selection.pick) {
|
|
51
|
+
lines.push(` pick: ${plan.selection.pick}`);
|
|
52
|
+
}
|
|
53
|
+
lines.push("");
|
|
54
|
+
lines.push("Execution:");
|
|
55
|
+
lines.push(` failFast: ${plan.execution.failFast}`);
|
|
56
|
+
lines.push(` failAfter: ${plan.execution.failAfter === null ? "none" : plan.execution.failAfter}`);
|
|
57
|
+
lines.push(` concurrency: ${plan.execution.concurrency}`);
|
|
58
|
+
lines.push(` timeoutMs: ${plan.execution.timeoutMs}`);
|
|
59
|
+
if (plan.execution.noSession) {
|
|
60
|
+
lines.push(` noSession: true`);
|
|
61
|
+
}
|
|
62
|
+
lines.push("");
|
|
63
|
+
lines.push("Reporters:");
|
|
64
|
+
// `reporters.console` (detailed | summary) is parsed from glubean.yaml
|
|
65
|
+
// but NOT yet forwarded into runCommand — runner still uses the legacy
|
|
66
|
+
// verbose flag. Suppressing the line here until the wiring lands keeps
|
|
67
|
+
// the plan output an accurate record of what runs. Re-enable when
|
|
68
|
+
// runCommand honors `printPlan.reporters.console`.
|
|
69
|
+
if (plan.reporters.junit) {
|
|
70
|
+
lines.push(` junit: ${plan.reporters.junit}`);
|
|
71
|
+
}
|
|
72
|
+
if (plan.reporters.resultJson) {
|
|
73
|
+
lines.push(` resultJson: ${plan.reporters.resultJson}`);
|
|
74
|
+
}
|
|
75
|
+
if (plan.reporters.emitFullTrace) {
|
|
76
|
+
lines.push(` emitFullTrace: true`);
|
|
77
|
+
}
|
|
78
|
+
if (plan.reporters.inferSchema) {
|
|
79
|
+
lines.push(` inferSchema: true`);
|
|
80
|
+
}
|
|
81
|
+
if (plan.reporters.truncateArrays) {
|
|
82
|
+
lines.push(` truncateArrays: true`);
|
|
83
|
+
}
|
|
84
|
+
const thresholdMetrics = Object.keys(plan.thresholds);
|
|
85
|
+
if (thresholdMetrics.length > 0) {
|
|
86
|
+
lines.push("");
|
|
87
|
+
lines.push("Thresholds:");
|
|
88
|
+
for (const metric of thresholdMetrics) {
|
|
89
|
+
const rules = plan.thresholds[metric];
|
|
90
|
+
const display = typeof rules === "string"
|
|
91
|
+
? rules
|
|
92
|
+
: Object.entries(rules)
|
|
93
|
+
.map(([agg, expr]) => `${agg} ${expr}`)
|
|
94
|
+
.join(", ");
|
|
95
|
+
lines.push(` ${metric}: ${display}`);
|
|
96
|
+
}
|
|
97
|
+
}
|
|
98
|
+
if (plan.upload?.enabled) {
|
|
99
|
+
lines.push("");
|
|
100
|
+
lines.push("Upload:");
|
|
101
|
+
lines.push(` enabled: true`);
|
|
102
|
+
if (plan.upload.projectAlias) {
|
|
103
|
+
lines.push(` projectAlias: ${plan.upload.projectAlias}`);
|
|
104
|
+
}
|
|
105
|
+
}
|
|
106
|
+
return lines.join("\n");
|
|
107
|
+
}
|
|
108
|
+
//# sourceMappingURL=print-plan.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"print-plan.js","sourceRoot":"","sources":["../../src/lib/print-plan.ts"],"names":[],"mappings":"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"}
|
package/dist/lib/upload.d.ts
CHANGED
|
@@ -59,6 +59,16 @@ export interface UploadResultPayload {
|
|
|
59
59
|
deferred?: string;
|
|
60
60
|
}>;
|
|
61
61
|
}>;
|
|
62
|
+
/**
|
|
63
|
+
* Phase 5 5a — run plan provenance. Cloud server projects this to
|
|
64
|
+
* top-level RunEntity.{profile, suites} for index-backed queries.
|
|
65
|
+
* Nested under `metadata` to clear the server DTO's
|
|
66
|
+
* `forbidNonWhitelisted` top-level whitelist.
|
|
67
|
+
*/
|
|
68
|
+
runPlan?: {
|
|
69
|
+
profile?: string;
|
|
70
|
+
suites?: string[];
|
|
71
|
+
};
|
|
62
72
|
};
|
|
63
73
|
}
|
|
64
74
|
export interface UploadOptions {
|
|
@@ -68,9 +78,34 @@ export interface UploadOptions {
|
|
|
68
78
|
envFile?: string;
|
|
69
79
|
rootDir: string;
|
|
70
80
|
}
|
|
81
|
+
export interface UploadReceipt {
|
|
82
|
+
schemaVersion: "glubean.upload-receipt.v1";
|
|
83
|
+
uploadedAt: string;
|
|
84
|
+
apiUrl: string;
|
|
85
|
+
projectId: string;
|
|
86
|
+
runId?: string;
|
|
87
|
+
url?: string;
|
|
88
|
+
resultUpload: {
|
|
89
|
+
status: "uploaded" | "failed";
|
|
90
|
+
runId?: string;
|
|
91
|
+
url?: string;
|
|
92
|
+
statusCode?: number;
|
|
93
|
+
error?: string;
|
|
94
|
+
};
|
|
95
|
+
artifactUpload: {
|
|
96
|
+
status: "skipped" | "uploaded" | "failed";
|
|
97
|
+
attempted: boolean;
|
|
98
|
+
count: number;
|
|
99
|
+
sizeBytes?: number;
|
|
100
|
+
archiveBytes?: number;
|
|
101
|
+
mode?: "inline" | "presigned";
|
|
102
|
+
statusCode?: number;
|
|
103
|
+
error?: string;
|
|
104
|
+
};
|
|
105
|
+
}
|
|
71
106
|
/**
|
|
72
107
|
* Upload run results and optionally artifacts to Glubean Cloud.
|
|
73
108
|
* All operations are best-effort — failures print a warning but never throw.
|
|
74
109
|
*/
|
|
75
|
-
export declare function uploadToCloud(resultPayload: UploadResultPayload, options: UploadOptions): Promise<
|
|
110
|
+
export declare function uploadToCloud(resultPayload: UploadResultPayload, options: UploadOptions): Promise<UploadReceipt>;
|
|
76
111
|
//# sourceMappingURL=upload.d.ts.map
|
package/dist/lib/upload.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upload.d.ts","sourceRoot":"","sources":["../../src/lib/upload.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAuDH,MAAM,WAAW,mBAAmB;IAClC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE;QACP,KAAK,EAAE,MAAM,CAAC;QACd,MAAM,EAAE,MAAM,CAAC;QACf,MAAM,EAAE,MAAM,CAAC;QACf,OAAO,EAAE,MAAM,CAAC;QAChB,UAAU,EAAE,MAAM,CAAC;QACnB,KAAK,CAAC,EAAE,OAAO,CAAC;KACjB,CAAC;IACF,KAAK,EAAE,KAAK,CAAC;QACX,MAAM,EAAE,MAAM,CAAC;QACf,QAAQ,EAAE,MAAM,CAAC;QACjB,OAAO,EAAE,OAAO,CAAC;QACjB,UAAU,EAAE,MAAM,CAAC;QACnB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;QAChB,MAAM,CAAC,EAAE,OAAO,EAAE,CAAC;KACpB,CAAC,CAAC;IACH,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACxC,QAAQ,CAAC,EAAE;QACT,aAAa,EAAE,MAAM,CAAC;QACtB,WAAW,EAAE,MAAM,CAAC;QACpB,WAAW,EAAE,MAAM,CAAC;QACpB,SAAS,EAAE,MAAM,CAAC;QAClB,SAAS,EAAE,MAAM,CAAC;QAClB,IAAI,EAAE,MAAM,EAAE,CAAC;QACf,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE;YACpB,IAAI,EAAE,MAAM,CAAC;YACb,OAAO,EAAE,KAAK,CAAC;gBACb,IAAI,EAAE,MAAM,CAAC;gBACb,EAAE,EAAE,MAAM,CAAC;gBACX,IAAI,CAAC,EAAE,MAAM,CAAC;gBACd,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;gBAChB,UAAU,EAAE,MAAM,CAAC;gBACnB,IAAI,CAAC,EAAE,OAAO,CAAC;aAChB,CAAC,CAAC;SACJ,CAAC,CAAC;QACH,uDAAuD;QACvD,SAAS,CAAC,EAAE,KAAK,CAAC;YAChB,UAAU,EAAE,MAAM,CAAC;YACnB,UAAU,EAAE,MAAM,CAAC;YACnB,QAAQ,EAAE,MAAM,CAAC;YACjB,QAAQ,EAAE,MAAM,CAAC;YACjB,KAAK,EAAE,KAAK,CAAC;gBACX,GAAG,EAAE,MAAM,CAAC;gBACZ,YAAY,CAAC,EAAE,MAAM,CAAC;gBACtB,QAAQ,CAAC,EAAE,MAAM,CAAC;aACnB,CAAC,CAAC;SACJ,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"upload.d.ts","sourceRoot":"","sources":["../../src/lib/upload.ts"],"names":[],"mappings":"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"}
|
package/dist/lib/upload.js
CHANGED
|
@@ -55,6 +55,19 @@ async function fetchWithRetry(url, init, retries = MAX_RETRIES) {
|
|
|
55
55
|
}
|
|
56
56
|
throw new Error("fetchWithRetry exhausted");
|
|
57
57
|
}
|
|
58
|
+
function createUploadReceipt(options) {
|
|
59
|
+
return {
|
|
60
|
+
schemaVersion: "glubean.upload-receipt.v1",
|
|
61
|
+
uploadedAt: new Date().toISOString(),
|
|
62
|
+
apiUrl: options.apiUrl,
|
|
63
|
+
projectId: options.projectId,
|
|
64
|
+
resultUpload: { status: "failed" },
|
|
65
|
+
artifactUpload: { status: "skipped", attempted: false, count: 0 },
|
|
66
|
+
};
|
|
67
|
+
}
|
|
68
|
+
function toErrorMessage(err) {
|
|
69
|
+
return err instanceof Error ? err.message : String(err);
|
|
70
|
+
}
|
|
58
71
|
function extToMime(ext) {
|
|
59
72
|
const map = {
|
|
60
73
|
".png": "image/png",
|
|
@@ -117,6 +130,7 @@ async function walkDir(dir) {
|
|
|
117
130
|
*/
|
|
118
131
|
export async function uploadToCloud(resultPayload, options) {
|
|
119
132
|
const { apiUrl, token, projectId, rootDir } = options;
|
|
133
|
+
const receipt = createUploadReceipt(options);
|
|
120
134
|
const ci = detectCiContext();
|
|
121
135
|
// ── Step 1: Upload results JSON ──
|
|
122
136
|
const body = {
|
|
@@ -152,21 +166,48 @@ export async function uploadToCloud(resultPayload, options) {
|
|
|
152
166
|
if (!resp.ok) {
|
|
153
167
|
const errText = await resp.text();
|
|
154
168
|
console.log(`${colors.yellow}Upload failed (${resp.status}): ${errText}${colors.reset}`);
|
|
155
|
-
|
|
169
|
+
receipt.resultUpload = {
|
|
170
|
+
status: "failed",
|
|
171
|
+
statusCode: resp.status,
|
|
172
|
+
error: errText,
|
|
173
|
+
};
|
|
174
|
+
return receipt;
|
|
156
175
|
}
|
|
157
176
|
const result = await resp.json();
|
|
158
|
-
runId = result.runId;
|
|
159
|
-
runUrl = result.url;
|
|
177
|
+
runId = typeof result.runId === "string" ? result.runId : "";
|
|
178
|
+
runUrl = typeof result.url === "string" ? result.url : "";
|
|
179
|
+
if (!runId || !runUrl) {
|
|
180
|
+
const error = "Cloud upload response was missing runId or url.";
|
|
181
|
+
console.log(`${colors.yellow}Upload failed: ${error}${colors.reset}`);
|
|
182
|
+
receipt.resultUpload = {
|
|
183
|
+
status: "failed",
|
|
184
|
+
statusCode: resp.status,
|
|
185
|
+
error,
|
|
186
|
+
};
|
|
187
|
+
return receipt;
|
|
188
|
+
}
|
|
189
|
+
receipt.runId = runId;
|
|
190
|
+
receipt.url = runUrl;
|
|
191
|
+
receipt.resultUpload = {
|
|
192
|
+
status: "uploaded",
|
|
193
|
+
runId,
|
|
194
|
+
url: runUrl,
|
|
195
|
+
statusCode: resp.status,
|
|
196
|
+
};
|
|
160
197
|
console.log(`${colors.green}Results uploaded${colors.reset} ${colors.dim}→ ${runUrl}${colors.reset}`);
|
|
161
198
|
}
|
|
162
199
|
catch (err) {
|
|
200
|
+
let error;
|
|
163
201
|
if (err instanceof DOMException && err.name === "AbortError") {
|
|
202
|
+
error = "Upload timed out";
|
|
164
203
|
console.log(`${colors.yellow}Upload timed out${colors.reset}`);
|
|
165
204
|
}
|
|
166
205
|
else {
|
|
167
|
-
|
|
206
|
+
error = toErrorMessage(err);
|
|
207
|
+
console.log(`${colors.yellow}Upload failed: ${error}${colors.reset}`);
|
|
168
208
|
}
|
|
169
|
-
|
|
209
|
+
receipt.resultUpload = { status: "failed", error };
|
|
210
|
+
return receipt;
|
|
170
211
|
}
|
|
171
212
|
// ── Step 2: Upload artifacts (if any) ──
|
|
172
213
|
const artifactDirs = [
|
|
@@ -184,7 +225,7 @@ export async function uploadToCloud(resultPayload, options) {
|
|
|
184
225
|
}
|
|
185
226
|
}
|
|
186
227
|
if (files.length === 0)
|
|
187
|
-
return;
|
|
228
|
+
return receipt;
|
|
188
229
|
let tmpDir;
|
|
189
230
|
try {
|
|
190
231
|
// Build manifest
|
|
@@ -199,6 +240,7 @@ export async function uploadToCloud(resultPayload, options) {
|
|
|
199
240
|
sizeBytes: s.size,
|
|
200
241
|
});
|
|
201
242
|
}
|
|
243
|
+
const totalSize = manifest.reduce((sum, e) => sum + e.sizeBytes, 0);
|
|
202
244
|
// Stage files + manifest into temp dir, then zip
|
|
203
245
|
tmpDir = await mkdtemp(join(tmpdir(), "glubean-artifacts-"));
|
|
204
246
|
const stagingDir = join(tmpDir, "staging");
|
|
@@ -217,29 +259,55 @@ export async function uploadToCloud(resultPayload, options) {
|
|
|
217
259
|
}
|
|
218
260
|
catch {
|
|
219
261
|
console.log(`${colors.yellow}Failed to create artifact archive${colors.reset}`);
|
|
220
|
-
|
|
262
|
+
receipt.artifactUpload = {
|
|
263
|
+
status: "failed",
|
|
264
|
+
attempted: true,
|
|
265
|
+
count: files.length,
|
|
266
|
+
sizeBytes: totalSize,
|
|
267
|
+
error: "Failed to create artifact archive",
|
|
268
|
+
};
|
|
269
|
+
return receipt;
|
|
221
270
|
}
|
|
222
271
|
const zipData = await readFile(zipPath);
|
|
223
272
|
const zipSize = zipData.byteLength;
|
|
224
|
-
|
|
225
|
-
await uploadArtifactsInline(apiUrl, token, runId, zipData)
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
273
|
+
const outcome = zipSize < INLINE_THRESHOLD
|
|
274
|
+
? await uploadArtifactsInline(apiUrl, token, runId, zipData)
|
|
275
|
+
: await uploadArtifactsPresigned(apiUrl, token, runId, zipData, zipSize);
|
|
276
|
+
receipt.artifactUpload = {
|
|
277
|
+
status: outcome.ok ? "uploaded" : "failed",
|
|
278
|
+
attempted: true,
|
|
279
|
+
count: files.length,
|
|
280
|
+
sizeBytes: totalSize,
|
|
281
|
+
archiveBytes: zipSize,
|
|
282
|
+
mode: outcome.mode,
|
|
283
|
+
...(outcome.statusCode !== undefined ? { statusCode: outcome.statusCode } : {}),
|
|
284
|
+
...(outcome.error ? { error: outcome.error } : {}),
|
|
285
|
+
};
|
|
286
|
+
if (!outcome.ok)
|
|
287
|
+
return receipt;
|
|
231
288
|
const sizeStr = totalSize > 1024 * 1024
|
|
232
289
|
? `${(totalSize / 1024 / 1024).toFixed(1)} MB`
|
|
233
290
|
: `${(totalSize / 1024).toFixed(1)} KB`;
|
|
234
291
|
console.log(`${colors.green}Artifacts uploaded${colors.reset} ${colors.dim}(${files.length} files, ${sizeStr})${colors.reset}`);
|
|
292
|
+
return receipt;
|
|
235
293
|
}
|
|
236
294
|
catch (err) {
|
|
295
|
+
let error;
|
|
237
296
|
if (err instanceof DOMException && err.name === "AbortError") {
|
|
297
|
+
error = "Artifact upload timed out";
|
|
238
298
|
console.log(`${colors.yellow}Artifact upload timed out${colors.reset}`);
|
|
239
299
|
}
|
|
240
300
|
else {
|
|
241
|
-
|
|
301
|
+
error = toErrorMessage(err);
|
|
302
|
+
console.log(`${colors.yellow}Artifact upload failed: ${error}${colors.reset}`);
|
|
242
303
|
}
|
|
304
|
+
receipt.artifactUpload = {
|
|
305
|
+
status: "failed",
|
|
306
|
+
attempted: true,
|
|
307
|
+
count: files.length,
|
|
308
|
+
error,
|
|
309
|
+
};
|
|
310
|
+
return receipt;
|
|
243
311
|
}
|
|
244
312
|
finally {
|
|
245
313
|
if (tmpDir) {
|
|
@@ -259,7 +327,14 @@ async function uploadArtifactsInline(apiUrl, token, runId, zipData) {
|
|
|
259
327
|
if (!resp.ok) {
|
|
260
328
|
const errText = await resp.text();
|
|
261
329
|
console.log(`${colors.yellow}Artifact upload failed (${resp.status}): ${errText}${colors.reset}`);
|
|
330
|
+
return {
|
|
331
|
+
ok: false,
|
|
332
|
+
mode: "inline",
|
|
333
|
+
statusCode: resp.status,
|
|
334
|
+
error: errText,
|
|
335
|
+
};
|
|
262
336
|
}
|
|
337
|
+
return { ok: true, mode: "inline", statusCode: resp.status };
|
|
263
338
|
}
|
|
264
339
|
async function uploadArtifactsPresigned(apiUrl, token, runId, zipData, zipSize) {
|
|
265
340
|
const form = new FormData();
|
|
@@ -273,9 +348,24 @@ async function uploadArtifactsPresigned(apiUrl, token, runId, zipData, zipSize)
|
|
|
273
348
|
if (!urlResp.ok) {
|
|
274
349
|
const errText = await urlResp.text();
|
|
275
350
|
console.log(`${colors.yellow}Artifact upload URL request failed (${urlResp.status}): ${errText}${colors.reset}`);
|
|
276
|
-
return
|
|
351
|
+
return {
|
|
352
|
+
ok: false,
|
|
353
|
+
mode: "presigned",
|
|
354
|
+
statusCode: urlResp.status,
|
|
355
|
+
error: errText,
|
|
356
|
+
};
|
|
277
357
|
}
|
|
278
358
|
const { signedUrl, archiveKey } = await urlResp.json();
|
|
359
|
+
if (typeof signedUrl !== "string" || typeof archiveKey !== "string") {
|
|
360
|
+
const error = "Artifact upload URL response was missing signedUrl or archiveKey.";
|
|
361
|
+
console.log(`${colors.yellow}${error}${colors.reset}`);
|
|
362
|
+
return {
|
|
363
|
+
ok: false,
|
|
364
|
+
mode: "presigned",
|
|
365
|
+
statusCode: urlResp.status,
|
|
366
|
+
error,
|
|
367
|
+
};
|
|
368
|
+
}
|
|
279
369
|
const putResp = await fetchWithRetry(signedUrl, {
|
|
280
370
|
method: "PUT",
|
|
281
371
|
headers: { "Content-Type": "application/zip" },
|
|
@@ -283,10 +373,16 @@ async function uploadArtifactsPresigned(apiUrl, token, runId, zipData, zipSize)
|
|
|
283
373
|
timeoutMs: ARTIFACT_TIMEOUT_MS,
|
|
284
374
|
});
|
|
285
375
|
if (!putResp.ok) {
|
|
286
|
-
|
|
287
|
-
|
|
376
|
+
const errText = await putResp.text().catch(() => "");
|
|
377
|
+
console.log(`${colors.yellow}Artifact upload failed (${putResp.status})${errText ? `: ${errText}` : ""}${colors.reset}`);
|
|
378
|
+
return {
|
|
379
|
+
ok: false,
|
|
380
|
+
mode: "presigned",
|
|
381
|
+
statusCode: putResp.status,
|
|
382
|
+
error: errText || `HTTP ${putResp.status}`,
|
|
383
|
+
};
|
|
288
384
|
}
|
|
289
|
-
await fetchWithRetry(`${apiUrl}/open/v1/cli-runs/${runId}/artifacts/upload/complete`, {
|
|
385
|
+
const completeResp = await fetchWithRetry(`${apiUrl}/open/v1/cli-runs/${runId}/artifacts/upload/complete`, {
|
|
290
386
|
method: "POST",
|
|
291
387
|
headers: {
|
|
292
388
|
"Content-Type": "application/json",
|
|
@@ -295,5 +391,16 @@ async function uploadArtifactsPresigned(apiUrl, token, runId, zipData, zipSize)
|
|
|
295
391
|
body: JSON.stringify({ archiveKey }),
|
|
296
392
|
timeoutMs: RESULTS_TIMEOUT_MS,
|
|
297
393
|
});
|
|
394
|
+
if (!completeResp.ok) {
|
|
395
|
+
const errText = await completeResp.text();
|
|
396
|
+
console.log(`${colors.yellow}Artifact upload completion failed (${completeResp.status}): ${errText}${colors.reset}`);
|
|
397
|
+
return {
|
|
398
|
+
ok: false,
|
|
399
|
+
mode: "presigned",
|
|
400
|
+
statusCode: completeResp.status,
|
|
401
|
+
error: errText,
|
|
402
|
+
};
|
|
403
|
+
}
|
|
404
|
+
return { ok: true, mode: "presigned", statusCode: completeResp.status };
|
|
298
405
|
}
|
|
299
406
|
//# sourceMappingURL=upload.js.map
|