feat(scenario): split log args into message/data and add debug level
- context.log/warn/error and console.* split arguments: strings join into message, object/array args are kept out of it and stored as the log entry's new data column (JSON), so message stays a stable string regardless of an object's shape - added a debug log level alongside log/warn/error, including context.debug() and console.debug() (previously folded into log) - CSV/Markdown run log export include the data column/block - LogOutput renders data pretty-printed in a separate block below the message, and dims debug entries with a dedicated grey token calibrated to the WCAG AA contrast floor
This commit is contained in:
13 files changed
+198
-39
No files matched your search
@@ -17,6 +17,13 @@ export const Default: Story = {
|
||||
args: {
|
||||
startTime: secondsAgo(60),
|
||||
entries: [
|
||||
{
|
||||
id: 0,
|
||||
level: 'debug',
|
||||
context: 'step:1',
|
||||
message: 'Resolved credential alias "sdJwtKey" to a file credential',
|
||||
createdAt: secondsAgo(61),
|
||||
},
|
||||
{
|
||||
id: 1,
|
||||
level: 'log',
|
||||
@@ -35,39 +42,54 @@ export const Default: Story = {
|
||||
id: 3,
|
||||
level: 'log',
|
||||
context: 'snippet:loginWithPkcs',
|
||||
message: 'Navigating to ID login: https://id.example.com',
|
||||
message: 'Saved credential as run file:',
|
||||
data: JSON.stringify({
|
||||
id: '181d8ae2-4aee-4f33-a657-210efe7fe668',
|
||||
name: 'credential.sd-jwt',
|
||||
mimeType: 'application/octet-stream',
|
||||
size: 1657,
|
||||
sha256: '9c4226999c700a39bda30279907e4479a5b3920ccde5c75771ea0e264c638c0',
|
||||
path: 'data/files/18/181d/181d8ae2-4aee-4f33-a657-210efe7fe668',
|
||||
}),
|
||||
createdAt: secondsAgo(57),
|
||||
},
|
||||
{
|
||||
id: 4,
|
||||
level: 'log',
|
||||
context: 'snippet:loginWithPkcs',
|
||||
message: 'Navigating to ID login: https://id.example.com',
|
||||
createdAt: secondsAgo(57),
|
||||
},
|
||||
{
|
||||
id: 5,
|
||||
level: 'log',
|
||||
context: 'assertion:pass',
|
||||
message: 'Assertion passed: page must have redirected to cabinet URL',
|
||||
createdAt: secondsAgo(40),
|
||||
},
|
||||
{
|
||||
id: 5,
|
||||
id: 6,
|
||||
level: 'warn',
|
||||
context: 'snippet:loginWithPkcs',
|
||||
message: 'Retrying file upload after a transient error',
|
||||
createdAt: secondsAgo(39),
|
||||
},
|
||||
{
|
||||
id: 6,
|
||||
id: 7,
|
||||
level: 'log',
|
||||
context: 'step:1',
|
||||
message: 'Step 1 passed',
|
||||
createdAt: secondsAgo(30),
|
||||
},
|
||||
{
|
||||
id: 7,
|
||||
id: 8,
|
||||
level: 'error',
|
||||
context: 'assertion:fail',
|
||||
message: 'Assertion failed: Document validation must pass (got 422)',
|
||||
createdAt: secondsAgo(10),
|
||||
},
|
||||
{
|
||||
id: 8,
|
||||
id: 9,
|
||||
level: 'error',
|
||||
context: 'step:2',
|
||||
message: 'Step 2 failed: Document validation must pass (got 422)',
|
||||
|
||||
@@ -147,7 +147,7 @@ export interface RunDefaults {
|
||||
|
||||
export type RunStepStatus = 'waiting' | 'pending' | 'in_progress' | 'pass' | 'fail' | 'cancelled';
|
||||
|
||||
export type LogLevel = 'log' | 'warn' | 'error';
|
||||
export type LogLevel = 'debug' | 'log' | 'warn' | 'error';
|
||||
|
||||
export interface ScenarioRun {
|
||||
id: string;
|
||||
@@ -192,6 +192,8 @@ export interface ScenarioRunLog {
|
||||
/** Where the message was generated, e.g. "step:2", "snippet:login", "assertion:pass". */
|
||||
context: string | null;
|
||||
message: string;
|
||||
/** JSON payload attached to the message (e.g. a created file's metadata), as a raw string. */
|
||||
data: string | null;
|
||||
createdAt: string;
|
||||
}
|
||||
|
||||
|
||||
@@ -537,6 +537,7 @@ function RunDetail() {
|
||||
level: l.level,
|
||||
context: l.context,
|
||||
message: l.message,
|
||||
data: l.data,
|
||||
createdAt: l.createdAt,
|
||||
}))}
|
||||
emptyMessage=""
|
||||
|
||||
@@ -17,9 +17,8 @@
|
||||
|
||||
.line {
|
||||
display: flex;
|
||||
align-items: baseline;
|
||||
flex-wrap: wrap;
|
||||
gap: var(--space-2);
|
||||
flex-direction: column;
|
||||
gap: var(--space-1);
|
||||
padding: var(--space-1) var(--space-3);
|
||||
border-left: 3px solid transparent;
|
||||
border-bottom: 1px solid var(--color-border);
|
||||
@@ -29,6 +28,27 @@
|
||||
border-bottom: none;
|
||||
}
|
||||
|
||||
.lineHeader {
|
||||
display: flex;
|
||||
align-items: baseline;
|
||||
flex-wrap: wrap;
|
||||
gap: var(--space-2);
|
||||
}
|
||||
|
||||
.data {
|
||||
margin: 0 0 var(--space-1) calc(7em + var(--space-2));
|
||||
border: var(--border-width) solid var(--color-border);
|
||||
border-radius: var(--radius-sm);
|
||||
background: var(--color-bg);
|
||||
max-width: 100%;
|
||||
overflow-x: auto;
|
||||
}
|
||||
|
||||
.data > * {
|
||||
margin: 0;
|
||||
padding: var(--space-2) var(--space-3);
|
||||
}
|
||||
|
||||
.timestamp {
|
||||
flex: 0 0 auto;
|
||||
min-width: 7em;
|
||||
@@ -64,6 +84,17 @@
|
||||
word-break: break-word;
|
||||
}
|
||||
|
||||
.debug {
|
||||
border-left-color: var(--color-border);
|
||||
}
|
||||
|
||||
.debug .level,
|
||||
.debug .message,
|
||||
.debug .timestamp,
|
||||
.debug .context {
|
||||
color: var(--color-text-faint);
|
||||
}
|
||||
|
||||
.log {
|
||||
border-left-color: var(--color-border);
|
||||
}
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
import { CodeBlock } from '../CodeBlock/CodeBlock';
|
||||
import styles from './LogOutput.module.css';
|
||||
|
||||
export type LogOutputLevel = 'log' | 'warn' | 'error';
|
||||
export type LogOutputLevel = 'debug' | 'log' | 'warn' | 'error';
|
||||
|
||||
export interface LogOutputEntry {
|
||||
id: string | number;
|
||||
@@ -8,6 +9,8 @@ export interface LogOutputEntry {
|
||||
/** Where the message was generated, e.g. "step:2", "snippet:login", "assertion:pass". */
|
||||
context?: string | null;
|
||||
message: string;
|
||||
/** JSON payload attached to the message, as a raw string; rendered pretty-printed, separately from the message. */
|
||||
data?: string | null;
|
||||
createdAt: string | number | Date;
|
||||
}
|
||||
|
||||
@@ -27,6 +30,15 @@ function formatElapsed(deltaMs: number): string {
|
||||
return `${sign}${(Math.abs(deltaMs) / 1000).toFixed(3)}s`;
|
||||
}
|
||||
|
||||
/** Pretty-prints `data` if it's valid JSON, otherwise returns it as-is. */
|
||||
function prettyData(data: string): string {
|
||||
try {
|
||||
return JSON.stringify(JSON.parse(data), null, 2);
|
||||
} catch {
|
||||
return data;
|
||||
}
|
||||
}
|
||||
|
||||
/** Terminal-style log viewer: one line per entry, color-coded by level. */
|
||||
export function LogOutput({
|
||||
entries,
|
||||
@@ -52,6 +64,7 @@ export function LogOutput({
|
||||
const entryMs = new Date(entry.createdAt).getTime();
|
||||
return (
|
||||
<div key={entry.id} className={[styles.line, styles[entry.level]].join(' ')}>
|
||||
<div className={styles.lineHeader}>
|
||||
<span className={styles.timestamp} title={new Date(entryMs).toISOString()}>
|
||||
{formatElapsed(entryMs - startMs)}
|
||||
</span>
|
||||
@@ -59,6 +72,12 @@ export function LogOutput({
|
||||
{entry.context && <span className={styles.context}>{entry.context}</span>}
|
||||
<span className={styles.message}>{entry.message}</span>
|
||||
</div>
|
||||
{entry.data && (
|
||||
<div className={styles.data}>
|
||||
<CodeBlock code={prettyData(entry.data)} language="json" />
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
);
|
||||
})}
|
||||
</div>
|
||||
|
||||
@@ -46,6 +46,7 @@
|
||||
|
||||
--color-text: #2D3339;
|
||||
--color-text-muted: #634DBD; /* Kimberly, a touch darker for 4.5:1 on bg-subtle */
|
||||
--color-text-faint: #5C6063; /* desaturated grey, ~4.5:1 on bg-subtle - as washed out as WCAG AA allows */
|
||||
--color-border: #AFBFB9; /* Powder Ash */
|
||||
--color-bg: #E6EDEA; /* Powder Ash tint */
|
||||
--color-bg-subtle: #D8E2DE; /* Powder Ash tint, 1 step darker */
|
||||
@@ -158,6 +159,7 @@ a:hover {
|
||||
|
||||
--color-text: #E2EAE6;
|
||||
--color-text-muted: #A9A3C9; /* lightened Kimberly */
|
||||
--color-text-faint: #9A9A9A; /* desaturated grey, ~4.5:1 on dark bg-subtle - as washed out as WCAG AA allows */
|
||||
--color-border: #3D4850;
|
||||
--color-bg: #1A1F24; /* deeper than Outer Space */
|
||||
--color-bg-subtle: #2D3339; /* Outer Space */
|
||||
|
||||
+4
-2
@@ -34,7 +34,7 @@ Available on `context`:
|
||||
- `context.getCredential(alias)`: payload of the credential assigned to the scenario under `alias` (parsed JSON when the data is JSON; throws if missing)
|
||||
- `context.getStepOutput(order)`: output of a previous step by absolute order (`1`, `2`, ...) or relative (`-1` = previous step); `null` if there is none
|
||||
- `context.dumpDom(selector?)`: simplified DOM snapshot of the page (or of one element)
|
||||
- `context.log(...args)`, `context.warn(...args)`, `context.error(...args)`: run log entries
|
||||
- `context.log(...args)`, `context.warn(...args)`, `context.error(...args)`, `context.debug(...args)`: run log entries
|
||||
- `context.assert(() => boolean, description)`: runs the arrow function and requires it to return `true`. Logs `description` (as a `log` entry on success, as an `error` entry on failure or exception), then throws to stop the step if the function returned anything other than `true` or threw
|
||||
- `context.runSnippet(name, ...args)`: runs stored snippet code with the same context; the snippet receives the extra arguments as `...args`. `name` is the snippet alias for its latest version, or `alias@<version>` (e.g. `login@3`) to pin a specific version. Snippet start/finish/failure is logged
|
||||
- `context.getScenarioFiles(opts?)`: list files uploaded to the scenario (`limit`, `offset`), including their path on disk
|
||||
@@ -42,7 +42,7 @@ Available on `context`:
|
||||
|
||||
Also in scope:
|
||||
|
||||
- `console`: proxied to run logs (`log`, `warn`, `error`, etc.)
|
||||
- `console`: proxied to run logs (`log`/`info` → `log`, `warn`, `error`, `debug`)
|
||||
- `expect`: Playwright's `expect` (e.g. `await expect(context.page.locator("h1")).toHaveText("Done")`)
|
||||
|
||||
Code is syntax-checked before it runs, and executes in the server process: it's trusted code, not sandboxed.
|
||||
@@ -56,6 +56,8 @@ Each run log entry (`level`, `message`, `createdAt`) also carries a `context`: w
|
||||
- `assertion:pass` / `assertion:fail`: `context.assert()`'s own log entry
|
||||
- `run`: run-level entries not tied to a step (e.g. a scenario timeout, or the Playwright trace upload notice)
|
||||
|
||||
`context.log`/`warn`/`error` (and `console.log`/etc.) split their arguments: strings/numbers/booleans are joined into `message`, while object/array arguments are kept out of it and stored as `data` (JSON), so `message` stays a stable string regardless of an object's shape. With one object argument `data` is that object; with more than one, `data` is an array of them. E.g. `context.log("Saved credential as run file:", fileMeta)` logs `message: "Saved credential as run file:"` with `fileMeta` as `data`, shown pretty-printed and separately from the message in the UI.
|
||||
|
||||
`GET /scenarios/:id/runs/:runId?q=...` and the exported CSV/Markdown logs (`GET /scenarios/:id/runs/:runId/export`) match `q` against both `message` and `context`.
|
||||
|
||||
## Versioning
|
||||
|
||||
@@ -19,10 +19,12 @@ export interface ExecResult {
|
||||
}
|
||||
|
||||
export type ScriptLogger = (
|
||||
level: "log" | "warn" | "error",
|
||||
level: "debug" | "log" | "warn" | "error",
|
||||
message: string,
|
||||
/** Where the message was generated, e.g. "step:2", "snippet:login", "assertion:pass". */
|
||||
context?: string | null,
|
||||
/** Structured payload attached to the message (e.g. a created file's metadata). */
|
||||
data?: unknown,
|
||||
) => void;
|
||||
|
||||
/** The `context` object available inside user scripts as the sole argument. */
|
||||
@@ -44,6 +46,7 @@ export interface ScriptContext {
|
||||
log: (...args: unknown[]) => void;
|
||||
warn: (...args: unknown[]) => void;
|
||||
error: (...args: unknown[]) => void;
|
||||
debug: (...args: unknown[]) => void;
|
||||
/**
|
||||
* Runs `fn` and requires it to return `true`. Logs the outcome under
|
||||
* `description`, then throws if `fn` returned anything other than `true`
|
||||
@@ -125,10 +128,27 @@ export class CodeExecutorService {
|
||||
} = ctx;
|
||||
const scriptLog: ScriptLogger =
|
||||
log ?? ((level, msg) => this.logger[level](msg));
|
||||
const toStr = (args: unknown[]) =>
|
||||
args
|
||||
.map((a) => (typeof a === "object" ? JSON.stringify(a) : String(a)))
|
||||
.join(" ");
|
||||
|
||||
// Splits console/log args into a plain-text message (strings, numbers, ...)
|
||||
// and a structured data payload (objects/arrays), logged separately so the
|
||||
// message stays a stable string regardless of the object's shape.
|
||||
const splitLogArgs = (
|
||||
args: unknown[],
|
||||
): { message: string; data: unknown } => {
|
||||
const strings: string[] = [];
|
||||
const objects: unknown[] = [];
|
||||
for (const a of args) {
|
||||
if (a !== null && typeof a === "object") {
|
||||
objects.push(a);
|
||||
} else {
|
||||
strings.push(String(a));
|
||||
}
|
||||
}
|
||||
return {
|
||||
message: strings.join(" "),
|
||||
data: objects.length === 0 ? null : objects.length === 1 ? objects[0] : objects,
|
||||
};
|
||||
};
|
||||
|
||||
// Innermost running snippet (if any) tags log entries; falls back to
|
||||
// logContext (e.g. the current step) outside of any runSnippet call.
|
||||
@@ -136,10 +156,16 @@ export class CodeExecutorService {
|
||||
const currentContext = (): string | null =>
|
||||
contextStack.length > 0 ? contextStack[contextStack.length - 1] : null;
|
||||
const emit = (
|
||||
level: "log" | "warn" | "error",
|
||||
level: "debug" | "log" | "warn" | "error",
|
||||
message: string,
|
||||
contextOverride?: string,
|
||||
): void => scriptLog(level, message, contextOverride ?? currentContext());
|
||||
data?: unknown,
|
||||
): void =>
|
||||
scriptLog(level, message, contextOverride ?? currentContext(), data);
|
||||
const emitArgs = (level: "debug" | "log" | "warn" | "error", args: unknown[]): void => {
|
||||
const { message, data } = splitLogArgs(args);
|
||||
emit(level, message, undefined, data);
|
||||
};
|
||||
|
||||
const credMap: Record<string, unknown> = credentials ?? {};
|
||||
const envData: EnvironmentData = environment ?? {};
|
||||
@@ -149,11 +175,11 @@ export class CodeExecutorService {
|
||||
let scriptContext: ScriptContext;
|
||||
|
||||
const fakeConsole = {
|
||||
log: (...args: unknown[]) => emit("log", toStr(args)),
|
||||
warn: (...args: unknown[]) => emit("warn", toStr(args)),
|
||||
error: (...args: unknown[]) => emit("error", toStr(args)),
|
||||
info: (...args: unknown[]) => emit("log", toStr(args)),
|
||||
debug: (...args: unknown[]) => emit("log", toStr(args)),
|
||||
log: (...args: unknown[]) => emitArgs("log", args),
|
||||
warn: (...args: unknown[]) => emitArgs("warn", args),
|
||||
error: (...args: unknown[]) => emitArgs("error", args),
|
||||
info: (...args: unknown[]) => emitArgs("log", args),
|
||||
debug: (...args: unknown[]) => emitArgs("debug", args),
|
||||
};
|
||||
|
||||
try {
|
||||
@@ -161,9 +187,10 @@ export class CodeExecutorService {
|
||||
page,
|
||||
browser,
|
||||
dumpDom: (selector?: string) => dumpDom(page, selector),
|
||||
log: (...args: unknown[]) => emit("log", toStr(args)),
|
||||
warn: (...args: unknown[]) => emit("warn", toStr(args)),
|
||||
error: (...args: unknown[]) => emit("error", toStr(args)),
|
||||
log: (...args: unknown[]) => emitArgs("log", args),
|
||||
warn: (...args: unknown[]) => emitArgs("warn", args),
|
||||
error: (...args: unknown[]) => emitArgs("error", args),
|
||||
debug: (...args: unknown[]) => emitArgs("debug", args),
|
||||
assert: async (
|
||||
fn: () => boolean | Promise<boolean>,
|
||||
description: string,
|
||||
|
||||
@@ -0,0 +1,31 @@
|
||||
import { MigrationInterface, QueryRunner } from "typeorm";
|
||||
|
||||
export class AddRunLogData1790850734763 implements MigrationInterface {
|
||||
name = "AddRunLogData1790850734763";
|
||||
|
||||
public async up(queryRunner: QueryRunner): Promise<void> {
|
||||
await queryRunner.query(
|
||||
`CREATE TABLE "temporary_scenario_run_logs" ("id" varchar PRIMARY KEY NOT NULL, "runId" varchar NOT NULL, "stepRunId" varchar, "level" text NOT NULL DEFAULT ('log'), "message" text NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "seq" integer NOT NULL DEFAULT (0), "context" text, "data" text, CONSTRAINT "FK_62d82b9fce3a6a2947ed1136c67" FOREIGN KEY ("stepRunId") REFERENCES "scenario_run_steps" ("id") ON DELETE SET NULL ON UPDATE NO ACTION, CONSTRAINT "FK_dde48478a42823e583a360dd468" FOREIGN KEY ("runId") REFERENCES "scenario_runs" ("id") ON DELETE CASCADE ON UPDATE NO ACTION)`,
|
||||
);
|
||||
await queryRunner.query(
|
||||
`INSERT INTO "temporary_scenario_run_logs"("id", "runId", "stepRunId", "level", "message", "createdAt", "seq", "context") SELECT "id", "runId", "stepRunId", "level", "message", "createdAt", "seq", "context" FROM "scenario_run_logs"`,
|
||||
);
|
||||
await queryRunner.query(`DROP TABLE "scenario_run_logs"`);
|
||||
await queryRunner.query(
|
||||
`ALTER TABLE "temporary_scenario_run_logs" RENAME TO "scenario_run_logs"`,
|
||||
);
|
||||
}
|
||||
|
||||
public async down(queryRunner: QueryRunner): Promise<void> {
|
||||
await queryRunner.query(
|
||||
`ALTER TABLE "scenario_run_logs" RENAME TO "temporary_scenario_run_logs"`,
|
||||
);
|
||||
await queryRunner.query(
|
||||
`CREATE TABLE "scenario_run_logs" ("id" varchar PRIMARY KEY NOT NULL, "runId" varchar NOT NULL, "stepRunId" varchar, "level" text NOT NULL DEFAULT ('log'), "message" text NOT NULL, "createdAt" datetime NOT NULL DEFAULT (datetime('now')), "seq" integer NOT NULL DEFAULT (0), "context" text, CONSTRAINT "FK_62d82b9fce3a6a2947ed1136c67" FOREIGN KEY ("stepRunId") REFERENCES "scenario_run_steps" ("id") ON DELETE SET NULL ON UPDATE NO ACTION, CONSTRAINT "FK_dde48478a42823e583a360dd468" FOREIGN KEY ("runId") REFERENCES "scenario_runs" ("id") ON DELETE CASCADE ON UPDATE NO ACTION)`,
|
||||
);
|
||||
await queryRunner.query(
|
||||
`INSERT INTO "scenario_run_logs"("id", "runId", "stepRunId", "level", "message", "createdAt", "seq", "context") SELECT "id", "runId", "stepRunId", "level", "message", "createdAt", "seq", "context" FROM "temporary_scenario_run_logs"`,
|
||||
);
|
||||
await queryRunner.query(`DROP TABLE "temporary_scenario_run_logs"`);
|
||||
}
|
||||
}
|
||||
@@ -1,8 +1,13 @@
|
||||
import { Initial1790793447827 } from "./1790793447827-Initial";
|
||||
import { AddRunLogContext1790848194828 } from "./1790848194828-AddRunLogContext";
|
||||
import { AddRunLogData1790850734763 } from "./1790850734763-AddRunLogData";
|
||||
|
||||
/**
|
||||
* All migrations, oldest first. Listed explicitly (instead of a glob) so the
|
||||
* same list works from compiled JS, ts-jest and the TypeORM CLI.
|
||||
*/
|
||||
export const MIGRATIONS = [Initial1790793447827, AddRunLogContext1790848194828];
|
||||
export const MIGRATIONS = [
|
||||
Initial1790793447827,
|
||||
AddRunLogContext1790848194828,
|
||||
AddRunLogData1790850734763,
|
||||
];
|
||||
@@ -9,7 +9,7 @@ import {
|
||||
import { ScenarioRunStepEntity } from "./scenario-run-step.entity";
|
||||
import { ScenarioRunEntity } from "./scenario-run.entity";
|
||||
|
||||
export type LogLevel = "log" | "warn" | "error";
|
||||
export type LogLevel = "debug" | "log" | "warn" | "error";
|
||||
|
||||
@Entity("scenario_run_logs")
|
||||
export class ScenarioRunLogEntity {
|
||||
@@ -43,6 +43,11 @@ export class ScenarioRunLogEntity {
|
||||
@Column({ type: "text" })
|
||||
message: string;
|
||||
|
||||
// JSON payload attached to the message (e.g. a created file's metadata),
|
||||
// kept separate so message stays a stable, human-readable string.
|
||||
@Column({ type: "text", nullable: true })
|
||||
data: string | null;
|
||||
|
||||
// Assigned in call order per run, since concurrent unawaited writes can
|
||||
// otherwise persist out of order (createdAt alone isn't a reliable tiebreaker).
|
||||
@Column({ type: "int", default: 0 })
|
||||
|
||||
@@ -149,21 +149,30 @@ export class ScenarioSchedulerService implements OnModuleInit {
|
||||
private persistLog(
|
||||
runId: string,
|
||||
stepRunId: string | null,
|
||||
level: "log" | "warn" | "error",
|
||||
level: "debug" | "log" | "warn" | "error",
|
||||
message: string,
|
||||
context: string | null = null,
|
||||
data: unknown = null,
|
||||
): void {
|
||||
const seq = (this.runLogSeq.get(runId) ?? 0) + 1;
|
||||
this.runLogSeq.set(runId, seq);
|
||||
void this.runLogRepo.save(
|
||||
this.runLogRepo.create({ runId, stepRunId, level, message, context, seq }),
|
||||
this.runLogRepo.create({
|
||||
runId,
|
||||
stepRunId,
|
||||
level,
|
||||
message,
|
||||
context,
|
||||
data: data != null ? JSON.stringify(data) : null,
|
||||
seq,
|
||||
}),
|
||||
);
|
||||
}
|
||||
|
||||
private stepLogger(stepRunId: string, runId: string): ScriptLogger {
|
||||
return (level, msg, context) => {
|
||||
return (level, msg, context, data) => {
|
||||
this.logger[level](`StepRun #${stepRunId} script: ${msg}`);
|
||||
this.persistLog(runId, stepRunId, level, msg, context ?? null);
|
||||
this.persistLog(runId, stepRunId, level, msg, context ?? null, data ?? null);
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@@ -611,9 +611,9 @@ export class ScenarioService implements OnModuleInit {
|
||||
const escapeCsv = (value: string): string =>
|
||||
/[",\n]/.test(value) ? `"${value.replace(/"/g, '""')}"` : value;
|
||||
const rows = [
|
||||
["Timestamp", "Level", "Context", "Message"].map(escapeCsv).join(","),
|
||||
["Timestamp", "Level", "Context", "Message", "Data"].map(escapeCsv).join(","),
|
||||
...logs.map((l) =>
|
||||
[l.createdAt.toISOString(), l.level, l.context ?? "", l.message]
|
||||
[l.createdAt.toISOString(), l.level, l.context ?? "", l.message, l.data ?? ""]
|
||||
.map((v) => escapeCsv(String(v)))
|
||||
.join(","),
|
||||
),
|
||||
@@ -621,10 +621,13 @@ export class ScenarioService implements OnModuleInit {
|
||||
return rows.join("\n");
|
||||
}
|
||||
|
||||
const sections = logs.map(
|
||||
(l) =>
|
||||
`## [${l.level}]${l.context ? ` (${l.context})` : ""} ${l.createdAt.toISOString()}\n\n${l.message}`,
|
||||
);
|
||||
const sections = logs.map((l) => {
|
||||
const header = `## [${l.level}]${l.context ? ` (${l.context})` : ""} ${l.createdAt.toISOString()}`;
|
||||
const data = l.data
|
||||
? `\n\n\`\`\`json\n${JSON.stringify(JSON.parse(l.data), null, 2)}\n\`\`\``
|
||||
: "";
|
||||
return `${header}\n\n${l.message}${data}`;
|
||||
});
|
||||
return [`# Run ${runId} logs`, ...sections].join("\n\n");
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user