refactor: improve do client on handling empty body response

edmundhung · May 25, 2022 · 4bb2395 · 4bb2395
1 parent b94f7af
commit 4bb2395
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 9 deletions.
diff --git a/worker/context/session.ts b/worker/context/session.ts
@@ -63,8 +63,13 @@ export function createSession(
 
 				try {
 					await userStore.updateProfile(userProfile);
-				} catch (e) {
-					console.log('Fail updating user profile:', e);
+				} catch (ex) {
+					console.log(
+						'Fail updating user profile:',
+						ex instanceof Error ? ex.message : ex,
+					);
+
+					throw ex;
 				}
 
 				return userProfile;

diff --git a/worker/store/UserStore.ts b/worker/store/UserStore.ts
@@ -171,7 +171,7 @@ export function getUserStore(
 		async updateProfile(profile: UserProfile): Promise<void> {
 			const client = createClient(env.USER_STORE, profile.id);
 
-			return await client.updateProfile(profile);
+			await client.updateProfile(profile);
 		},
 		async view(
 			userId: string | null,

diff --git a/worker/utils.ts b/worker/utils.ts
@@ -32,8 +32,10 @@ export function configureStore<Env, T extends Record<string, any>>(
 				const handler = this.handlers[method];
 
 				if (typeof handler === 'function') {
-					return new Response(JSON.stringify(await handler(...args)) ?? null, {
-						status: 200,
+					const result = JSON.stringify(await handler(...args)) ?? null;
+
+					return new Response(result, {
+						status: result !== null ? 200 : 204,
 					});
 				} else {
 					return new Response('Not Found', { status: 404 });
@@ -63,11 +65,9 @@ export function configureStore<Env, T extends Record<string, any>>(
 
 						switch (response.status) {
 							case 200:
-								if (!response.body) {
-									return;
-								}
-
 								return await response.json();
+							case 204:
+								return;
 							case 404:
 								throw new Error(`Method ${method.toString()} is not available`);
 							default: