diff --git a/lib/Onyx.ts b/lib/Onyx.ts index 4356ec36d..29a1d20ab 100644 --- a/lib/Onyx.ts +++ b/lib/Onyx.ts @@ -301,7 +301,7 @@ function merge(key: TKey, changes: OnyxMergeInput): OnyxUtils.sendActionToDevTools(OnyxUtils.METHOD.MERGE, key, changes, mergedValue); }); } catch (error) { - Logger.logAlert(`An error occurred while applying merge for key: ${key}, Error: ${error}`); + Logger.logAlert(`An error occurred while applying merge for key: ${key}, Error: ${error instanceof Error ? error.toString() : String(error)}`); return Promise.resolve(); } }); diff --git a/lib/OnyxConnectionManager.ts b/lib/OnyxConnectionManager.ts index 1eae1cdc5..ddf7ff00f 100644 --- a/lib/OnyxConnectionManager.ts +++ b/lib/OnyxConnectionManager.ts @@ -138,7 +138,7 @@ class OnyxConnectionManager { (callback as DefaultConnectCallback)(connection.cachedCallbackValue, connection.cachedCallbackKey as OnyxKey); } } catch (error) { - Logger.logAlert(`[ConnectionManager] Subscriber callback threw an error for key '${connection.onyxKey}': ${error}`); + Logger.logAlert(`[ConnectionManager] Subscriber callback threw an error for key '${connection.onyxKey}': ${String(error)}`); } } } diff --git a/lib/OnyxUtils.ts b/lib/OnyxUtils.ts index c4ac63f61..519a1d8dc 100644 --- a/lib/OnyxUtils.ts +++ b/lib/OnyxUtils.ts @@ -62,6 +62,10 @@ function resetDiskPressureLogThrottle(): void { lastDiskPressureLogTime = 0; } +function formatCaughtError(error: unknown): string { + return error instanceof Error ? error.toString() : String(error); +} + type OnyxMethod = ValueOf; /** Result of `prepareKeyValuePairsForStorage`: pairs to write and keys whose `null` value marks them for removal. */ @@ -598,7 +602,7 @@ function keysChanged( lastConnectionCallbackData.set(subscriber.subscriptionID, {value: cachedCollection, matchedKey: subscriber.key}); subscriber.callback(cachedCollection, subscriber.key); } catch (error) { - Logger.logAlert(`[OnyxUtils.keysChanged] Subscriber callback threw an error for key '${collectionKey}': ${error}`); + Logger.logAlert(`[OnyxUtils.keysChanged] Subscriber callback threw an error for key '${collectionKey}': ${formatCaughtError(error)}`); } } @@ -621,7 +625,7 @@ function keysChanged( matchedKey: subscriber.key, }); } catch (error) { - Logger.logAlert(`[OnyxUtils.keysChanged] Subscriber callback threw an error for key '${collectionKey}': ${error}`); + Logger.logAlert(`[OnyxUtils.keysChanged] Subscriber callback threw an error for key '${collectionKey}': ${formatCaughtError(error)}`); } } } @@ -694,7 +698,7 @@ function keyChanged(key: TKey, value: OnyxValue, can }); continue; } catch (error) { - Logger.logAlert(`[OnyxUtils.keyChanged] Subscriber callback threw an error for key '${key}': ${error}`); + Logger.logAlert(`[OnyxUtils.keyChanged] Subscriber callback threw an error for key '${key}': ${formatCaughtError(error)}`); } continue;