chore: clean up changes

Author: justandras

packages/corelib/src/error.ts

@@ -182,6 +182,11 @@ export class UserError extends Error {
 
 		if (this.isSerializedUserErrorObject(err)) {
 			return new UserError(err.rawError, err.key, err.userMessage, err.errorCode)
+		} else if (typeof err === 'string') {
+			const errorFromJson = this.tryFromJSON(err)
+			if (errorFromJson) {
+				return errorFromJson
+			}
 		}
 		const err2 = err instanceof Error ? err : new Error(stringifyError(err))
 		return new UserError(
@@ -249,4 +254,8 @@ export class UserError extends Error {
 	toErrorString(): string {
 		return `${translateMessage(this.userMessage, interpollateTranslation)}\n${stringifyError(this)}`
 	}
+
+	toString(): string {
+		return UserError.toJSON(this)
+	}
 }

packages/shared-lib/src/lib/stringifyError.ts

@@ -12,8 +12,8 @@ export function stringifyError(error: unknown, noStack = false): string {
 			str = `${(error as any).toString()}`
 		} else {
 			const strings: (string | undefined)[] = [
-				stringify((error as any).rawError), // UserError
-				stringify((error as Error).message), // Error
+				stringify((error as any).rawError?.message), // SerializedUserError
+				stringify((error as any).message), // UserError or Error
 				stringify((error as any).reason), // Meteor.Error
 				stringify((error as any).details),
 			]
@@ -38,8 +38,12 @@ export function stringifyError(error: unknown, noStack = false): string {
 	}
 
 	if (!noStack) {
-		if (error && typeof error === 'object' && typeof (error as any).stack === 'string') {
-			str += ', ' + (error as any).stack
+		if (error && typeof error === 'object') {
+			if (typeof (error as any).stack === 'string') {
+				str += ', ' + (error as any).stack
+			} else if (typeof (error as any).rawError?.stack === 'string') {
+				str += ', ' + (error as any).rawError.stack
+			}
 		}
 	}
 

packages/webui/src/client/ui/i18n.ts

@@ -15,6 +15,7 @@ import { TranslationsBundleId } from '@sofie-automation/corelib/dist/dataModel/I
 import { TranslationsBundles } from '../collections/index.js'
 import { catchError } from '../lib/lib.js'
 import { relativeToSiteRootUrl } from '../url.js'
+import { UserError } from '@sofie-automation/corelib/dist/error.js'
 
 const i18nOptions = {
 	fallbackLng: {
@@ -71,7 +72,7 @@ async function getAndCacheTranslationBundle(bundleId: TranslationsBundleId) {
 					localStorage.setItem(`i18n.translationBundles.${bundleId}`, JSON.stringify(response.result))
 					resolve(response.result)
 				} else {
-					reject(response.error)
+					reject(UserError.fromUnknown(response.error))
 				}
 			},
 			(reason) => {