npm - @zuplo/cli - Versions diffs - 6.17.13 → 6.17.14 - Mend

@zuplo/cli 6.17.13 → 6.17.14

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.

Files changed (5) hide show

package/dist/common/worker-output.d.ts +4 -3
package/dist/common/worker-output.d.ts.map +1 -1
package/dist/common/worker-output.js +64 -38
package/dist/common/worker-output.js.map +1 -1
package/package.json +3 -3

package/dist/common/worker-output.d.ts CHANGED Viewed

@@ -9,7 +9,7 @@ export interface ConsoleLogEntry {
     loggingId: string;
     buildId: string;
     rayId: string | null;
-    messages: unknown[];
+    messages: string[];
     requestId: string;
     vectorClock: number;
     url: string;
@@ -17,7 +17,8 @@ export interface ConsoleLogEntry {
     method: string;
 }
 export declare function handleRuntimeStdio(stdout: Readable, stderr: Readable): void;
-export declare function logConsole(level: LogLevel, data: unknown): void;
-export declare function logStructured(logEntry: ConsoleLogEntry, message: unknown): Promise<void>;
+export declare function logConsole(level: LogLevel, data: string, callDepth?: number): void;
+export declare function logConsoleAsync(level: LogLevel, data: string, callDepth?: number): Promise<void>;
+export declare function logStructured(logEntry: ConsoleLogEntry, message: string): Promise<void>;
 export {};
 //# sourceMappingURL=worker-output.d.ts.map

package/dist/common/worker-output.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"worker-output.d.ts","sourceRoot":"","sources":["../../src/common/worker-output.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAKvC,KAAK,QAAQ,GAAG,OAAO,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC;AAKpD,MAAM,WAAW,eAAe;IAC9B,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,QAAQ,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,QAAQ,EAAE,~~OAAO~~,EAAE,CAAC;~~IACpB~~,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,~~QAoIpE~~;~~AAKD~~,wBAAgB,UAAU,CAAC,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,~~OAAO~~,~~QA2CxD~~;AAGD,wBAAsB,aAAa,CACjC,QAAQ,EAAE,eAAe,EACzB,OAAO,EAAE,~~OAAO~~,~~iBAqBjB~~"}
1	+ {"version":3,"file":"worker-output.d.ts","sourceRoot":"","sources":["../../src/common/worker-output.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAKvC,KAAK,QAAQ,GAAG,OAAO,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC;AAKpD,MAAM,WAAW,eAAe;IAC9B,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,QAAQ,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,QAkIpE;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,SAAI,QAEtE;AAKD,wBAAsB,eAAe,CACnC,KAAK,EAAE,QAAQ,EACf,IAAI,EAAE,MAAM,EACZ,SAAS,SAAI,iBAsDd;AAGD,wBAAsB,aAAa,CACjC,QAAQ,EAAE,eAAe,EACzB,OAAO,EAAE,MAAM,iBAqBhB"}

package/dist/common/worker-output.js CHANGED Viewed

@@ -70,44 +70,50 @@ export function handleRuntimeStdio(stdout, stderr) {
         }
     });
 }
-export function logConsole(level, data) {
-    void (async () => {
-        try {
-            if (!data) {
-                return;
-            }
-            if (typeof data !== "string") {
-                console[level](data);
-                return;
-            }
-            let message = data?.trim();
-            if (!message || message?.length === 0) {
-                return;
+export function logConsole(level, data, callDepth = 0) {
+    void logConsoleAsync(level, data, callDepth);
+}
+export async function logConsoleAsync(level, data, callDepth = 0) {
+    try {
+        if (!data) {
+            return;
+        }
+        if (typeof data !== "string") {
+            console[level](data);
+            return;
+        }
+        let message = data?.trim();
+        if (!message || message?.length === 0) {
+            return;
+        }
+        if (message.startsWith(`{`) && message.endsWith(`}`)) {
+            let logEntry;
+            try {
+                logEntry = JSON.parse(message);
             }
-            if (message.startsWith(`{"logId":"`)) {
-                let logEntry;
-                try {
-                    logEntry = JSON.parse(message);
-                }
-                catch (e) {
+            catch (e) {
+                if (callDepth === 1) {
                     const lines = message.split("\n");
-                    lines.forEach((line) => void logConsole(level, line));
+                    await Promise.all(lines.map(async (line) => logConsole(level, line, callDepth++)));
+                    return;
+                }
+                else {
+                    console[level](data);
                     return;
                 }
-                const messages = logEntry.messages;
-                messages.forEach((msg) => void logStructured(logEntry, msg));
-            }
-            else {
-                message = await formatMessage(message);
-                const line = `${getTimestamp()} ${levelFormats[level]} ${message}`;
-                console[level](line);
             }
+            await Promise.all(logEntry.messages.map((msg) => logStructured(logEntry, msg)));
         }
-        catch (err) {
-            console.log(err);
-            console[level](data);
+        else {
+            message = await formatMessage(message);
+            const line = `${getTimestamp()} ${levelFormats[level]} ${message}`;
+            console[level](line);
         }
-    })();
+    }
+    catch (err) {
+        const line = `${getTimestamp()} ${levelFormats[level]} ${JSON.stringify(data)}`;
+        console[level](line);
+    }
 }
 export async function logStructured(logEntry, message) {
     if (typeof message === "object" &&
@@ -151,14 +157,34 @@ function getTimestamp(timestamp) {
     return chalk.white(chalk.dim(`[${getTimeFormatter().format(timestamp ? new Date(timestamp) : new Date())}]`));
 }
 async function formatMessage(message) {
-    if (typeof message === "string" && isJavaScriptStackTrace(message)) {
-        const lines = message.split("\n");
-        const title = lines.shift();
-        return title + "\n" + (await formatError(lines.join("\n")));
+    const trimmed = message.trim();
+    if (trimmed.startsWith("{") && trimmed.endsWith("}")) {
+        try {
+            const data = JSON.parse(trimmed);
+            if ("stack" in data && isJavaScriptStackTrace(data.stack)) {
+                const { stack, message, name, ...err } = data;
+                const formatted = await formatError(stack);
+                let line;
+                if (name && message) {
+                    line = `${name}: ${message}`;
+                }
+                else if (message) {
+                    line = `Error: ${message}`;
+                }
+                else {
+                    line = "An error occurred";
+                }
+                if (Object.keys(err).length > 0) {
+                    line += "\n";
+                    line += JSON.stringify(err);
+                }
+                return `${line}\n${formatted}`;
+            }
+        }
+        catch (err) {
+        }
     }
-    return typeof message === "object"
-        ? JSON.stringify(message)
-        : String(message);
+    return message;
 }
 async function formatError(error) {
     const stack = await new StackTracey(error).cleanAsync();

package/dist/common/worker-output.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"worker-output.js","sourceRoot":"","sources":["../../src/common/worker-output.ts"],"names":[],"mappings":"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","sourcesContent":["/* eslint-disable no-console /\nimport chalk from \"chalk\";\nimport { Readable } from \"node:stream\";\nimport StackTracey from \"./errors/stacktracy.js\";\nimport forTerminal from \"./errors/youch-terminal.js\";\nimport Youch from \"./errors/youch.js\";\n\ntype LogLevel = \"error\" \| \"warn\" \| \"info\" \| \"debug\";\n\n/\n This is the structure of the runtime console log transport log entry\n /\nexport interface ConsoleLogEntry {\n logId: string;\n logOwner: string;\n logSource: string;\n level: LogLevel;\n timestamp: string;\n loggingId: string;\n buildId: string;\n rayId: string \| null;\n messages: unknown[];\n requestId: string;\n vectorClock: number;\n url: string;\n route: string;\n method: string;\n}\n\nexport function handleRuntimeStdio(stdout: Readable, stderr: Readable) {\n // ASSUMPTION: each chunk is a whole message from workerd\n // This may not hold across OSes/architectures, but it seems to work on macOS M-line\n // I'm going with this simple approach to avoid complicating this too early\n // We can iterate on this heuristic in the future if it causes issues\n const classifiers = {\n // Is this chunk a big chonky barf from workerd that we want to hijack to cleanup/ignore?\n isBarf(chunk: string) {\n const containsLlvmSymbolizerWarning = chunk.includes(\n \"Not symbolizing stack traces because $LLVM_SYMBOLIZER is not set\"\n );\n const containsRecursiveIsolateLockWarning = chunk.includes(\n \"took recursive isolate lock\"\n );\n // Matches stack traces from workerd\n // - on unix: groups of 9 hex digits separated by spaces\n // - on windows: groups of 12 hex digits, or a single digit 0, separated by spaces\n const containsHexStack = /stack:( (0\|[a-f\\d]{4,})){3,}/.test(chunk);\n\n return (\n containsLlvmSymbolizerWarning \|\|\n containsRecursiveIsolateLockWarning \|\|\n containsHexStack\n );\n },\n // Is this chunk an Address In Use error?\n isAddressInUse(chunk: string) {\n return chunk.includes(\"Address already in use; toString() = \");\n },\n isWarning(chunk: string) {\n return /\\.c\\+\\+:\\d+: warning:/.test(chunk);\n },\n isCodeMovedWarning(chunk: string) {\n return /CODE_MOVED for unknown code block/.test(chunk);\n },\n isAccessViolation(chunk: string) {\n return chunk.includes(\"access violation;\");\n },\n };\n\n stdout.on(\"data\", (chunk: Buffer \| string) => {\n chunk = chunk.toString().trim();\n\n if (classifiers.isBarf(chunk)) {\n // this is a big chonky barf from workerd that we want to hijack to cleanup/ignore\n\n // CLEANABLE:\n // there are no known cases to cleanup yet\n // but, as they are identified, we will do that here\n\n // IGNORABLE:\n // anything else not handled above is considered ignorable\n // so send it to the debug logs which are discarded unless\n // the user explicitly sets a logLevel indicating they care\n logConsole(\"debug\", chunk);\n }\n\n // known case: warnings are not info, log them as such\n else if (classifiers.isWarning(chunk)) {\n logConsole(\"warn\", chunk);\n }\n\n // anything not explicitly handled above should be logged as info (via stdout)\n else {\n //logger.info(getSourceMappedString(chunk));\n logConsole(\"error\", chunk);\n }\n });\n\n stderr.on(\"data\", (chunk: Buffer \| string) => {\n chunk = chunk.toString().trim();\n\n if (classifiers.isBarf(chunk)) {\n // this is a big chonky barf from workerd that we want to hijack to cleanup/ignore\n\n // CLEANABLE:\n // known case to cleanup: Address in use errors\n if (classifiers.isAddressInUse(chunk)) {\n const address = chunk.match(\n /Address already in use; toString\$\$ = (.+)\\n/\n )?.[1];\n\n logConsole(\n \"error\",\n `Address already in use (${address}). Please check that you are not already running a server on this address or specify a different port with --port.`\n );\n\n // Log the original error to the debug logs.\n logConsole(\"debug\", chunk);\n }\n // In the past we have seen Access Violation errors on Windows, which may be caused by an outdated\n // version of the Windows OS or the Microsoft Visual C++ Redistributable.\n // See https://github.com/cloudflare/workers-sdk/issues/6170#issuecomment-2245209918\n else if (classifiers.isAccessViolation(chunk)) {\n let error = \"There was an access violation in the runtime.\";\n if (process.platform === \"win32\") {\n error +=\n \"\\nOn Windows, this may be caused by an outdated Microsoft Visual C++ Redistributable library.\\n\" +\n \"Check that you have the latest version installed.\\n\" +\n \"See https://learn.microsoft.com/en-us/cpp/windows/latest-supported-vc-redist.\";\n }\n logConsole(\"error\", error);\n\n // Log the original error to the debug logs.\n logConsole(\"debug\", chunk);\n }\n\n // IGNORABLE:\n // anything else not handled above is considered ignorable\n // so send it to the debug logs which are discarded unless\n // the user explicitly sets a logLevel indicating they care\n else {\n logConsole(\"debug\", chunk);\n }\n }\n\n // known case: warnings are not errors, log them as such\n else if (classifiers.isWarning(chunk)) {\n logConsole(\"warn\", chunk);\n }\n\n // known case: \"error: CODE_MOVED for unknown code block?\", warning for workerd devs, not application devs\n else if (classifiers.isCodeMovedWarning(chunk)) {\n // ignore entirely, don't even send it to the debug log file\n }\n\n // anything not explicitly handled above should be logged as an error (via stderr)\n else {\n //logConsole(\"error\", getSourceMappedString(chunk));\n logConsole(\"error\", chunk);\n }\n });\n}\n\n/\n This is what is logged when the runtime calls console.log, etc.\n /\nexport function logConsole(level: LogLevel, data: unknown) {\n void (async () => {\n try {\n if (!data) {\n return;\n }\n\n // This shouldn't happen, but just in case\n if (typeof data !== \"string\") {\n console[level](data);\n return;\n }\n\n let message = data?.trim();\n if (!message \|\| message?.length === 0) {\n return;\n }\n\n if (message.startsWith(`{\"logId\":\"`)) {\n let logEntry: ConsoleLogEntry;\n try {\n logEntry = JSON.parse(message);\n } catch (e) {\n // We might have multiple log entries in a single chunk\n // so split them and log each one\n const lines = message.split(\"\\n\");\n lines.forEach((line) => void logConsole(level, line));\n return;\n }\n const messages = logEntry.messages;\n messages.forEach((msg) => void logStructured(logEntry, msg));\n } else {\n message = await formatMessage(message);\n\n const line = `${getTimestamp()} ${levelFormats[level]} ${message}`;\n\n console[level](line);\n }\n } catch (err) {\n console.log(err);\n console[level](data);\n }\n })();\n}\n\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\nexport async function logStructured(\n logEntry: ConsoleLogEntry,\n message: unknown\n) {\n if (\n typeof message === \"object\" &&\n message &&\n Object.keys(message).length === 0\n ) {\n return;\n }\n\n // Get the log properties we care about\n const { level, route, method, timestamp } = logEntry;\n\n const routeStr = route.endsWith(\"{/}?\") ? route.slice(0, -4) : route;\n\n const msg = await formatMessage(message);\n\n const line = `${getTimestamp(timestamp)} ${levelFormats[level]} [${methodFormats[method.toUpperCase() as HttpMethod]} ${chalk.blue(routeStr)}] ${msg}`;\n\n // Log the line\n console[level](line);\n}\n\ntype HttpMethod =\n \| \"GET\"\n \| \"POST\"\n \| \"PUT\"\n \| \"DELETE\"\n \| \"PATCH\"\n \| \"HEAD\"\n \| \"OPTIONS\";\nconst methodFormats: Record<HttpMethod, string> = {\n GET: chalk.green(chalk.bold(\"GET\")),\n POST: chalk.blue(chalk.bold(\"POST\")),\n PUT: chalk.yellow(chalk.bold(\"PUT\")),\n DELETE: chalk.red(chalk.bold(\"DELETE\")),\n PATCH: chalk.magenta(chalk.bold(\"PATCH\")),\n HEAD: chalk.cyan(chalk.bold(\"HEAD\")),\n OPTIONS: chalk.gray(chalk.bold(\"OPTIONS\")),\n};\n\nconst levelFormats: Record<LogLevel, string> = {\n error: chalk.red(chalk.bold(\"ERROR\".padEnd(5))),\n warn: chalk.yellow(chalk.bold(\"WARN\".padEnd(5))),\n info: chalk.blue(chalk.bold(\"INFO\".padEnd(5))),\n debug: chalk.gray(chalk.bold(\"DEBUG\".padEnd(5))),\n};\n\n// Only initialize the timeFormatter when the timestamp option is used, and\n// reuse it across all loggers\nlet timeFormatter: Intl.DateTimeFormat;\nfunction getTimeFormatter() {\n timeFormatter ??= new Intl.DateTimeFormat(undefined, {\n hour: \"2-digit\",\n minute: \"2-digit\",\n second: \"2-digit\",\n hour12: false,\n fractionalSecondDigits: 3,\n });\n return timeFormatter;\n}\n\nfunction getTimestamp(timestamp?: string) {\n return chalk.white(\n chalk.dim(\n `[${getTimeFormatter().format(timestamp ? new Date(timestamp) : new Date())}]`\n )\n );\n}\n\nasync function formatMessage(message: unknown): Promise<string> {\n if (typeof message === \"string\" && isJavaScriptStackTrace(message)) {\n const lines = message.split(\"\\n\");\n const title = lines.shift();\n return title + \"\\n\" + (await formatError(lines.join(\"\\n\")));\n }\n\n return typeof message === \"object\"\n ? JSON.stringify(message)\n : String(message);\n}\n\nasync function formatError(error: string) {\n const stack = await new StackTracey(error).cleanAsync();\n\n const jsonResponse = await new Youch(stack, {}).toJSON();\n\n const options = {\n // Defaults to false\n displayShortPath: false,\n\n fileShort: true,\n\n // Defaults to single whitspace\n prefix: \" \",\n\n // Defaults to false\n hideErrorTitle: false,\n\n // Defaults to false\n hideMessage: true,\n\n // Defaults to false\n displayMainFrameOnly: true,\n\n // Defaults to 3\n framesMaxLimit: 3,\n };\n\n return forTerminal(jsonResponse, options);\n}\n\nfunction isJavaScriptStackTrace(str: string): boolean {\n const stackTraceRegex =\n /at\\s+(.?)\\s+\$(.?):(\\d+):(\\d+)\$\|at\\s+(.?):(\\d+):(\\d+)/;\n return stackTraceRegex.test(str);\n}\n"]}
1	+ {"version":3,"file":"worker-output.js","sourceRoot":"","sources":["../../src/common/worker-output.ts"],"names":[],"mappings":"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","sourcesContent":["/* eslint-disable no-console /\nimport chalk from \"chalk\";\nimport { Readable } from \"node:stream\";\nimport StackTracey from \"./errors/stacktracy.js\";\nimport forTerminal from \"./errors/youch-terminal.js\";\nimport Youch from \"./errors/youch.js\";\n\ntype LogLevel = \"error\" \| \"warn\" \| \"info\" \| \"debug\";\n\n/\n This is the structure of the runtime console log transport log entry\n /\nexport interface ConsoleLogEntry {\n logId: string;\n logOwner: string;\n logSource: string;\n level: LogLevel;\n timestamp: string;\n loggingId: string;\n buildId: string;\n rayId: string \| null;\n messages: string[];\n requestId: string;\n vectorClock: number;\n url: string;\n route: string;\n method: string;\n}\n\nexport function handleRuntimeStdio(stdout: Readable, stderr: Readable) {\n // ASSUMPTION: each chunk is a whole message from workerd\n // This may not hold across OSes/architectures, but it seems to work on macOS M-line\n // I'm going with this simple approach to avoid complicating this too early\n // We can iterate on this heuristic in the future if it causes issues\n const classifiers = {\n // Is this chunk a big chonky barf from workerd that we want to hijack to cleanup/ignore?\n isBarf(chunk: string) {\n const containsLlvmSymbolizerWarning = chunk.includes(\n \"Not symbolizing stack traces because $LLVM_SYMBOLIZER is not set\"\n );\n const containsRecursiveIsolateLockWarning = chunk.includes(\n \"took recursive isolate lock\"\n );\n // Matches stack traces from workerd\n // - on unix: groups of 9 hex digits separated by spaces\n // - on windows: groups of 12 hex digits, or a single digit 0, separated by spaces\n const containsHexStack = /stack:( (0\|[a-f\\d]{4,})){3,}/.test(chunk);\n\n return (\n containsLlvmSymbolizerWarning \|\|\n containsRecursiveIsolateLockWarning \|\|\n containsHexStack\n );\n },\n // Is this chunk an Address In Use error?\n isAddressInUse(chunk: string) {\n return chunk.includes(\"Address already in use; toString() = \");\n },\n isWarning(chunk: string) {\n return /\\.c\\+\\+:\\d+: warning:/.test(chunk);\n },\n isCodeMovedWarning(chunk: string) {\n return /CODE_MOVED for unknown code block/.test(chunk);\n },\n isAccessViolation(chunk: string) {\n return chunk.includes(\"access violation;\");\n },\n };\n\n stdout.on(\"data\", (chunk: Buffer \| string) => {\n chunk = chunk.toString().trim();\n\n if (classifiers.isBarf(chunk)) {\n // this is a big chonky barf from workerd that we want to hijack to cleanup/ignore\n\n // CLEANABLE:\n // there are no known cases to cleanup yet\n // but, as they are identified, we will do that here\n\n // IGNORABLE:\n // anything else not handled above is considered ignorable\n // so send it to the debug logs which are discarded unless\n // the user explicitly sets a logLevel indicating they care\n logConsole(\"debug\", chunk);\n }\n\n // known case: warnings are not info, log them as such\n else if (classifiers.isWarning(chunk)) {\n logConsole(\"warn\", chunk);\n }\n\n // anything not explicitly handled above should be logged as info (via stdout)\n else {\n logConsole(\"error\", chunk);\n }\n });\n\n stderr.on(\"data\", (chunk: Buffer \| string) => {\n chunk = chunk.toString().trim();\n\n if (classifiers.isBarf(chunk)) {\n // this is a big chonky barf from workerd that we want to hijack to cleanup/ignore\n\n // CLEANABLE:\n // known case to cleanup: Address in use errors\n if (classifiers.isAddressInUse(chunk)) {\n const address = chunk.match(\n /Address already in use; toString\$\$ = (.+)\\n/\n )?.[1];\n\n logConsole(\n \"error\",\n `Address already in use (${address}). Please check that you are not already running a server on this address or specify a different port with --port.`\n );\n\n // Log the original error to the debug logs.\n logConsole(\"debug\", chunk);\n }\n // In the past we have seen Access Violation errors on Windows, which may be caused by an outdated\n // version of the Windows OS or the Microsoft Visual C++ Redistributable.\n // See https://github.com/cloudflare/workers-sdk/issues/6170#issuecomment-2245209918\n else if (classifiers.isAccessViolation(chunk)) {\n let error = \"There was an access violation in the runtime.\";\n if (process.platform === \"win32\") {\n error +=\n \"\\nOn Windows, this may be caused by an outdated Microsoft Visual C++ Redistributable library.\\n\" +\n \"Check that you have the latest version installed.\\n\" +\n \"See https://learn.microsoft.com/en-us/cpp/windows/latest-supported-vc-redist.\";\n }\n logConsole(\"error\", error);\n\n // Log the original error to the debug logs.\n logConsole(\"debug\", chunk);\n }\n\n // IGNORABLE:\n // anything else not handled above is considered ignorable\n // so send it to the debug logs which are discarded unless\n // the user explicitly sets a logLevel indicating they care\n else {\n logConsole(\"debug\", chunk);\n }\n }\n\n // known case: warnings are not errors, log them as such\n else if (classifiers.isWarning(chunk)) {\n logConsole(\"warn\", chunk);\n }\n\n // known case: \"error: CODE_MOVED for unknown code block?\", warning for workerd devs, not application devs\n else if (classifiers.isCodeMovedWarning(chunk)) {\n // ignore entirely, don't even send it to the debug log file\n }\n\n // anything not explicitly handled above should be logged as an error (via stderr)\n else {\n logConsole(\"error\", chunk);\n }\n });\n}\n\nexport function logConsole(level: LogLevel, data: string, callDepth = 0) {\n void logConsoleAsync(level, data, callDepth);\n}\n\n/\n This is what is logged when the runtime calls console.log, etc.\n /\nexport async function logConsoleAsync(\n level: LogLevel,\n data: string,\n callDepth = 0\n) {\n try {\n if (!data) {\n return;\n }\n\n // This shouldn't happen, but just in case\n if (typeof data !== \"string\") {\n console[level](data);\n return;\n }\n\n let message = data?.trim();\n if (!message \|\| message?.length === 0) {\n return;\n }\n\n // Probably a JSON object\n if (message.startsWith(`{`) && message.endsWith(`}`)) {\n let logEntry: ConsoleLogEntry;\n try {\n logEntry = JSON.parse(message);\n } catch (e) {\n // If we are at a depth of 1 it means we are trying to handle the case\n // where a chunk might be multiple JSON entries.\n if (callDepth === 1) {\n // We might have multiple log entries in a single chunk\n // so split them and log each one\n const lines = message.split(\"\\n\");\n await Promise.all(\n lines.map(async (line) => logConsole(level, line, callDepth++))\n );\n return;\n } else {\n console[level](data);\n return;\n }\n }\n await Promise.all(\n logEntry.messages.map((msg) => logStructured(logEntry, msg))\n );\n } else {\n message = await formatMessage(message);\n\n const line = `${getTimestamp()} ${levelFormats[level]} ${message}`;\n\n console[level](line);\n }\n } catch (err) {\n const line = `${getTimestamp()} ${levelFormats[level]} ${JSON.stringify(data)}`;\n\n console[level](line);\n }\n}\n\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\nexport async function logStructured(\n logEntry: ConsoleLogEntry,\n message: string\n) {\n if (\n typeof message === \"object\" &&\n message &&\n Object.keys(message).length === 0\n ) {\n return;\n }\n\n // Get the log properties we care about\n const { level, route, method, timestamp } = logEntry;\n\n const routeStr = route.endsWith(\"{/}?\") ? route.slice(0, -4) : route;\n\n const msg = await formatMessage(message);\n\n const line = `${getTimestamp(timestamp)} ${levelFormats[level]} [${methodFormats[method.toUpperCase() as HttpMethod]} ${chalk.blue(routeStr)}] ${msg}`;\n\n // Log the line\n console[level](line);\n}\n\ntype HttpMethod =\n \| \"GET\"\n \| \"POST\"\n \| \"PUT\"\n \| \"DELETE\"\n \| \"PATCH\"\n \| \"HEAD\"\n \| \"OPTIONS\";\nconst methodFormats: Record<HttpMethod, string> = {\n GET: chalk.green(chalk.bold(\"GET\")),\n POST: chalk.blue(chalk.bold(\"POST\")),\n PUT: chalk.yellow(chalk.bold(\"PUT\")),\n DELETE: chalk.red(chalk.bold(\"DELETE\")),\n PATCH: chalk.magenta(chalk.bold(\"PATCH\")),\n HEAD: chalk.cyan(chalk.bold(\"HEAD\")),\n OPTIONS: chalk.gray(chalk.bold(\"OPTIONS\")),\n};\n\nconst levelFormats: Record<LogLevel, string> = {\n error: chalk.red(chalk.bold(\"ERROR\".padEnd(5))),\n warn: chalk.yellow(chalk.bold(\"WARN\".padEnd(5))),\n info: chalk.blue(chalk.bold(\"INFO\".padEnd(5))),\n debug: chalk.gray(chalk.bold(\"DEBUG\".padEnd(5))),\n};\n\n// Only initialize the timeFormatter when the timestamp option is used, and\n// reuse it across all loggers\nlet timeFormatter: Intl.DateTimeFormat;\nfunction getTimeFormatter() {\n timeFormatter ??= new Intl.DateTimeFormat(undefined, {\n hour: \"2-digit\",\n minute: \"2-digit\",\n second: \"2-digit\",\n hour12: false,\n fractionalSecondDigits: 3,\n });\n return timeFormatter;\n}\n\nfunction getTimestamp(timestamp?: string) {\n return chalk.white(\n chalk.dim(\n `[${getTimeFormatter().format(timestamp ? new Date(timestamp) : new Date())}]`\n )\n );\n}\n\nasync function formatMessage(message: string): Promise<string> {\n const trimmed = message.trim();\n if (trimmed.startsWith(\"{\") && trimmed.endsWith(\"}\")) {\n try {\n const data = JSON.parse(trimmed);\n if (\"stack\" in data && isJavaScriptStackTrace(data.stack)) {\n const { stack, message, name, ...err } = data;\n\n const formatted = await formatError(stack);\n let line: string;\n if (name && message) {\n line = `${name}: ${message}`;\n } else if (message) {\n line = `Error: ${message}`;\n } else {\n line = \"An error occurred\";\n }\n\n if (Object.keys(err).length > 0) {\n line += \"\\n\";\n line += JSON.stringify(err);\n }\n\n return `${line}\\n${formatted}`;\n }\n } catch (err) {\n // Ignore\n }\n }\n\n return message;\n}\n\nasync function formatError(error: string \| Error) {\n const stack = await new StackTracey(error).cleanAsync();\n\n const jsonResponse = await new Youch(stack, {}).toJSON();\n\n const options = {\n // Defaults to false\n displayShortPath: false,\n\n fileShort: true,\n\n // Defaults to single whitspace\n prefix: \" \",\n\n // Defaults to false\n hideErrorTitle: false,\n\n // Defaults to false\n hideMessage: true,\n\n // Defaults to false\n displayMainFrameOnly: true,\n\n // Defaults to 3\n framesMaxLimit: 3,\n };\n\n return forTerminal(jsonResponse, options);\n}\n\nfunction isJavaScriptStackTrace(str: string): boolean {\n const stackTraceRegex =\n /at\\s+(.?)\\s+\$(.?):(\\d+):(\\d+)\$\|at\\s+(.?):(\\d+):(\\d+)/;\n return stackTraceRegex.test(str);\n}\n"]}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@zuplo/cli",
-  "version": "6.17.13",
+  "version": "6.17.14",
   "repository": "https://github.com/zuplo/zuplo",
   "author": "Zuplo, Inc.",
   "type": "module",
@@ -29,8 +29,8 @@
     "@opentelemetry/api": "^1.8.0",
     "@sentry/node": "^7.119.2",
     "@swc/core": "1.7.22",
-    "@zuplo/core": "^6.17.13",
-    "@zuplo/runtime": "^6.17.13",
+    "@zuplo/core": "^6.17.14",
+    "@zuplo/runtime": "^6.17.14",
     "as-table": "^1.0.55",
     "chalk": "^5.3.0",
     "chokidar": "^3.5.3",