handle custom buckets properly in effect

Author: Brendonovich

apps/web/app/api/playlist/route.ts

@@ -41,7 +41,7 @@ class Api extends HttpApi.make("CapWebApi").add(
 			.addError(HttpApiError.InternalServerError)
 			.addError(HttpApiError.NotFound),
 	),
-) {}
+) { }
 
 const ApiLive = HttpApiBuilder.api(Api).pipe(
 	Layer.provide(
@@ -76,6 +76,7 @@ const ApiLive = HttpApiBuilder.api(Api).pipe(
 							PolicyDenied: () => new HttpApiError.Unauthorized(),
 							DatabaseError: () => new HttpApiError.InternalServerError(),
 							S3Error: () => new HttpApiError.InternalServerError(),
+							UnknownException: () => new HttpApiError.InternalServerError(),
 						}),
 					),
 				);
@@ -128,6 +129,8 @@ const getPlaylistResponse = (
 				);
 		}
 
+		yield* Effect.log("Resolving path with custom bucket");
+
 		const videoPrefix = `${video.ownerId}/${video.id}/video/`;
 		const audioPrefix = `${video.ownerId}/${video.id}/audio/`;
 
@@ -155,6 +158,9 @@ const getPlaylistResponse = (
 					headers: CACHE_CONTROL_HEADERS,
 				});
 			} else if (video.source.type === "desktopMP4") {
+				yield* Effect.log(
+					`Returning path ${`${video.ownerId}/${video.id}/result.mp4`}`,
+				);
 				return yield* s3
 					.getSignedObjectUrl(`${video.ownerId}/${video.id}/result.mp4`)
 					.pipe(Effect.map(HttpServerResponse.redirect));
@@ -192,13 +198,11 @@ const getPlaylistResponse = (
 				const generatedPlaylist = generateMasterPlaylist(
 					videoMetadata?.Metadata?.resolution ?? "",
 					videoMetadata?.Metadata?.bandwidth ?? "",
-					`${serverEnv().WEB_URL}/api/playlist?userId=${
-						video.ownerId
+					`${serverEnv().WEB_URL}/api/playlist?userId=${video.ownerId
 					}&videoId=${video.id}&videoType=video`,
 					audioMetadata
-						? `${serverEnv().WEB_URL}/api/playlist?userId=${
-								video.ownerId
-							}&videoId=${video.id}&videoType=audio`
+						? `${serverEnv().WEB_URL}/api/playlist?userId=${video.ownerId
+						}&videoId=${video.id}&videoType=audio`
 						: null,
 				);
 

apps/web/app/api/video/delete/route.ts

@@ -19,7 +19,7 @@ class Api extends HttpApi.make("Api").add(
 			.addError(HttpApiError.Forbidden)
 			.addError(HttpApiError.NotFound),
 	),
-) {}
+) { }
 
 const ApiLive = HttpApiBuilder.api(Api).pipe(
 	Layer.provide(
@@ -40,6 +40,10 @@ const ApiLive = HttpApiBuilder.api(Api).pipe(
 								Effect.logError(e).pipe(
 									Effect.andThen(() => new HttpApiError.InternalServerError()),
 								),
+							UnknownException: (e) =>
+								Effect.logError(e).pipe(
+									Effect.andThen(() => new HttpApiError.InternalServerError()),
+								),
 						}),
 					),
 				);

packages/database/crypto.ts

@@ -1,3 +1,5 @@
+// TODO: port this all to Effect
+
 import { timingSafeEqual } from "node:crypto";
 import { serverEnv } from "@cap/env";