spooder 3.2.5 → 3.2.7

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "spooder",
 	"type": "module",
-	"version": "3.2.5",
+	"version": "3.2.7",
 	"exports": {
 		".": {
 			"bun": "./src/api.ts",

package/src/api.ts

@@ -6,17 +6,27 @@ import fs from 'node:fs/promises';
 export class ErrorWithMetadata extends Error {
 	constructor(message: string, public metadata: Record<string, unknown>) {
 		super(message);
+		
+		if (this.stack)
+			this.stack = this.stack.split('\n').slice(1).join('\n');
 	}
 
 	async resolve_metadata(): Promise<object> {
 		const metadata = Object.assign({}, this.metadata);
 		for (const [key, value] of Object.entries(metadata)) {
+			let resolved_value = value;
+
 			if (value instanceof Promise)
-				metadata[key] = await value;
+				resolved_value = await value;
 			else if (typeof value === 'function')
-				metadata[key] = value();
+				resolved_value = value();
 			else if (value instanceof ReadableStream)
-				metadata[key] = await new Response(value).text();
+				resolved_value = await new Response(value).text();
+
+			if (typeof resolved_value === 'string' && resolved_value.includes('\n'))
+				resolved_value = resolved_value.split(/\r?\n/);
+
+			metadata[key] = resolved_value;
 		}
 
 		return metadata;

package/src/config.ts

@@ -1,5 +1,5 @@
 import path from 'node:path';
-import { warn } from './utils';
+import { log } from './utils';
 
 const internal_config = {
 	run: 'bun run index.ts',
@@ -27,7 +27,7 @@ function validate_config_option(source: ConfigObject, target: ConfigObject, root
 			const actual_type = typeof value;
 
 			if (actual_type !== expected_type) {
-				warn('ignoring invalid configuration value `%s` (expected %s, got %s)', key_name, expected_type, actual_type);
+				log('ignoring invalid configuration value `%s` (expected %s, got %s)', key_name, expected_type, actual_type);
 				continue;
 			}
 
@@ -37,14 +37,14 @@ function validate_config_option(source: ConfigObject, target: ConfigObject, root
 
 				if (is_default_array) {
 					if (!is_actual_array) {
-						warn('ignoring invalid configuration value `%s` (expected array)', key_name);
+						log('ignoring invalid configuration value `%s` (expected array)', key_name);
 						continue;
 					}
 
 					source[key as keyof Config] = value as Config[keyof Config];
 				} else {
 					if (is_actual_array) {
-						warn('ignoring invalid configuration value `%s` (expected object)', key_name);
+						log('ignoring invalid configuration value `%s` (expected object)', key_name);
 						continue;
 					}
 
@@ -54,7 +54,7 @@ function validate_config_option(source: ConfigObject, target: ConfigObject, root
 				source[key as keyof Config] = value as Config[keyof Config];
 			}
 		} else {
-			warn('ignoring unknown configuration key `%s`', key_name);	
+			log('ignoring unknown configuration key `%s`', key_name);	
 		}
 	}
 }
@@ -65,13 +65,13 @@ export async function get_config(): Promise<Config> {
 		const json = await config_file.json();
 
 		if (json.spooder === null || typeof json.spooder !== 'object') {
-			warn('failed to parse spooder configuration in package.json, using defaults');
+			log('failed to parse spooder configuration in package.json, using defaults');
 			return internal_config;
 		}
 
 		validate_config_option(internal_config, json.spooder, 'spooder');
 	} catch (e) {
-		warn('failed to read package.json, using configuration defaults');
+		log('failed to read package.json, using configuration defaults');
 	}
 
 	return internal_config;

package/src/dispatch.ts

@@ -1,6 +1,6 @@
 import { App } from '@octokit/app';
 import { get_config } from './config';
-import { warn, log } from './utils';
+import { log } from './utils';
 import fs from 'node:fs';
 import path from 'node:path';
 import os from 'node:os';
@@ -93,9 +93,9 @@ async function check_cache_table(key: string, repository: string, expiry: number
 			}
 		}
 	} catch (e) {
-		warn('Failed to read canary cache file ' + cache_file_path);
-		warn('Error: ' + (e as Error).message);
-		warn('You should resolve this issue to prevent spamming GitHub with canary reports.');
+		log('Failed to read canary cache file ' + cache_file_path);
+		log('Error: ' + (e as Error).message);
+		log('You should resolve this issue to prevent spamming GitHub with canary reports.');
 	}
 
 	if (cache_table.has(key_hash)) {
@@ -158,7 +158,7 @@ export async function dispatch_report(report_title: string, report_body: Array<u
 
 		const is_cached = await check_cache_table(report_title, canary_repostiory, config.canary.throttle);
 		if (is_cached) {
-			warn('Throttled canary report: ' + report_title);
+			log('Throttled canary report: ' + report_title);
 			return;
 		}
 
@@ -218,6 +218,6 @@ export async function dispatch_report(report_title: string, report_body: Array<u
 			}
 		}
 	} catch (e) {
-		warn('Failed to dispatch canary report: ' + (e as Error)?.message ?? 'unspecified error');
+		log('Failed to dispatch canary report: ' + (e as Error)?.message ?? 'unspecified error');
 	}
 }

package/src/utils.d.ts

@@ -1,7 +1,5 @@
 /** Logs a message to stdout with the prefix `[spooder] ` */
 export declare function log(message: string, ...args: unknown[]): void;
-/** Logs a message to stderr with the prefix `[spooder] ` */
-export declare function warn(message: string, ...args: unknown[]): void;
 /** Strips ANSI color codes from a string */
 export declare function strip_color_codes(str: string): string;
 /** Converts a command line string into an array of arguments */

package/src/utils.ts

@@ -3,11 +3,6 @@ export function log(message: string, ...args: unknown[]): void {
 	console.log('[spooder] ' + message, ...args);
 }
 
-/** Logs a message to stderr with the prefix `[spooder] ` */
-export function warn(message: string, ...args: unknown[]): void {
-	console.error('[spooder] ' + message, ...args);
-}
-
 /** Strips ANSI color codes from a string */
 export function strip_color_codes(str: string): string {
 	return str.replace(/\x1b\[[0-9;]*m/g, '');