Skip to content

Commit 38cab24

Browse files
committed
Improve handleApiCall logging
1 parent 1cb0b51 commit 38cab24

File tree

1 file changed

+10
-12
lines changed

1 file changed

+10
-12
lines changed

src/utils/api.mts

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -65,31 +65,29 @@ export async function handleApiCall<T extends SocketSdkOperations>(
6565
let sdkResult: SocketSdkResult<T>
6666
try {
6767
sdkResult = await value
68+
spinner?.stop()
6869
if (desc) {
69-
// TODO: info, not success (looks weird when response is non-200)
70-
spinner?.successAndStop(
71-
`Received API response (after requesting ${desc}).`,
72-
)
73-
} else {
74-
spinner?.stop()
70+
const message = `Received API response (after requesting ${desc}).`
71+
if (sdkResult.success) {
72+
logger.success(message)
73+
} else {
74+
logger.info(message)
75+
}
7576
}
7677
} catch (e) {
78+
spinner?.stop()
7779
if (desc) {
78-
spinner?.failAndStop(`An error was thrown while requesting ${desc}`)
80+
logger.fail(`An error was thrown while requesting ${desc}`)
7981
debugFn('error', `caught: ${desc} error`)
8082
} else {
81-
spinner?.stop()
82-
debugFn('error', `caught: error`)
83+
debugFn('error', `caught: API request error`)
8384
}
8485
debugDir('inspect', { error: e })
85-
8686
return {
8787
ok: false,
8888
message: 'Socket API returned an error',
8989
cause: messageWithCauses(e as Error),
9090
}
91-
} finally {
92-
spinner?.stop()
9391
}
9492

9593
// Note: TS can't narrow down the type of result due to generics.

0 commit comments

Comments
 (0)