fix: cleanup

ndom91 · May 18, 2024 · d905485 · d905485
1 parent 3d5708d
commit d905485
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 29 deletions.
diff --git a/apps/backend/src/index.ts b/apps/backend/src/index.ts
@@ -10,7 +10,7 @@ import feed from "./routes/feed/index.js"
 import root from "./routes/root.js"
 
 const app = new Hono<{ Bindings: HttpBindings }>({ strict: false }).basePath(
-  "/api/v0",
+  "/worker/v1",
 )
 app.use(logger())
 app.use(prettyJSON())

diff --git a/apps/backend/src/plugins/storage.ts b/apps/backend/src/plugins/storage.ts
@@ -1,3 +1,4 @@
+import type { Buffer } from "node:buffer"
 import { PutObjectCommand, S3Client } from "@aws-sdk/client-s3"
 
 interface UploadImageArgs {

diff --git a/apps/backend/src/routes/bookmark/schema.ts b/apps/backend/src/routes/bookmark/schema.ts
@@ -1,14 +1,6 @@
 import { z } from "zod"
 import { zValidator } from "@hono/zod-validator"
 
-const MAX_FILE_SIZE = 5 * 1024 * 1024 // 5MB
-const ACCEPTED_IMAGE_TYPES = [
-  "image/jpeg",
-  "image/jpg",
-  "image/png",
-  "image/webp",
-]
-
 const bookmarkImageSchema = z.object({
   data: z.array(
     z
@@ -18,13 +10,6 @@ const bookmarkImageSchema = z.object({
             required_error: "URL is required.",
           })
           .url(),
-        // image: z
-        //   .any()
-        //   .optional()
-        //   .refine((file) => file?.size <= MAX_FILE_SIZE, { message: `Max file size is 5MB.` })
-        //   .refine((file) => ACCEPTED_IMAGE_TYPES.includes(file?.type), {
-        //     message: ".jpg, .jpeg, .png and .webp files are accepted.",
-        //   }),
       })
       .passthrough(),
   ),
@@ -45,6 +30,7 @@ export const bookmarkImageCookieValidator = zValidator(
   "cookie",
   bookmarkCookieSchema,
 )
+
 export const bookmarkImageBodyValidator = zValidator(
   "json",
   bookmarkImageSchema,

diff --git a/apps/backend/src/routes/feed/index.ts b/apps/backend/src/routes/feed/index.ts
@@ -12,8 +12,8 @@ api.get("/", async (c) => {
     const queueList = feedQueue.getQueue()
 
     return c.json({ queueList })
-  } catch (e) {
-    return c.json({ error: e }, 500)
+  } catch (error) {
+    return c.json({ error }, 500)
   }
 })
 
@@ -38,7 +38,7 @@ api.post("/", feedBodySchema, async (c) => {
     return c.text("ok")
   } catch (error) {
     console.error(error)
-    return c.json(error)
+    return c.json({ error }, 500)
   }
 })
 

diff --git a/apps/backend/src/routes/root.ts b/apps/backend/src/routes/root.ts
@@ -3,14 +3,12 @@ import type { HttpBindings } from "@hono/node-server"
 
 const api = new Hono<{ Bindings: HttpBindings }>()
 
-api.get("/", (c) => {
-  return c.text("Hello Hono!")
-})
-
-api.get("/remote", (c) => {
-  return c.json({
-    remoteAddress: c.env.incoming.socket.remoteAddress,
+if (process.env.NODE_ENV !== "production") {
+  api.get("/remote", (c) => {
+    return c.json({
+      remoteAddress: c.env.incoming.socket.remoteAddress,
+    })
   })
-})
+}
 
 export default api
diff --git a/apps/web/.env.example b/apps/web/.env.example
@@ -1,7 +1,7 @@
 NODE_ENV=development
 
 # Backend Container - External URL to API
-WORKER_URL=http://app.company.com/api/v0
+WORKER_URL=http://app.company.com/worker/v1
 
 # Prisma - Default docker-compose.storage
 DATABASE_URL=postgres://postgres:postgres@database:5432/briefkasten

diff --git a/apps/web/src/routes/(dashboard)/bookmarks/+page.server.ts b/apps/web/src/routes/(dashboard)/bookmarks/+page.server.ts
@@ -180,7 +180,6 @@ export const actions: Actions = {
 export const load: PageServerLoad = async (event) => {
   event.depends("app:bookmarks")
   const session = await event.locals?.auth()
-  console.log("bookmark.load.session", { session })
 
   if (!session && event.url.pathname !== "/login") {
     const fromUrl = event.url.pathname + event.url.search