refactor(server): update server initialization and plugin structure

Author: OXeu

server/src/_worker.ts

@@ -9,7 +9,7 @@ export default {
         request: Request,
         env: Env,
     ): Promise<Response> {
-        return await server
+        return await server()
             .handle(request)
     },
     async scheduled(

server/src/base.ts

@@ -1,13 +1,11 @@
 import cors from "@elysiajs/cors";
 import serverTiming from "@elysiajs/server-timing";
+import { env } from 'cloudflare:workers';
 import Elysia from "elysia";
-import { CloudflareAdapter } from "elysia/adapter/cloudflare-worker";
 import { createSetupPlugin } from "./setup";
-import { env } from 'cloudflare:workers'
 
-const basePlugin = new Elysia({
+const basePlugin = () => new Elysia({
     name: "base-plugin",
-    adapter: CloudflareAdapter
 })
     .use(cors({
         aot: false,
@@ -24,9 +22,9 @@ const basePlugin = new Elysia({
     .use(serverTiming({
         enabled: true,
     }))
-    .use(createSetupPlugin(env))
 
 export default () => new Elysia({
-    adapter: CloudflareAdapter
+    aot: false
 })
-    .use(basePlugin)
+    .use(basePlugin())
+    .use(createSetupPlugin(env))

server/src/server.ts

@@ -13,7 +13,7 @@ import { TagService } from './services/tag';
 import { UserService } from './services/user';
 
 
-const app = base()
+const app = () => base()
     .use(UserService)
     .use(FaviconService)
     .use(FeedService)
@@ -31,7 +31,6 @@ const app = base()
         if (code === 'NOT_FOUND')
             return `${path} ${JSON.stringify(params)} not found`
     })
-    .compile()
 
 
 export default app

server/src/setup.ts

@@ -7,6 +7,7 @@ import { CacheImpl } from "./utils/cache";
 import { drizzle } from "drizzle-orm/d1";
 import * as schema from './db/schema';
 import { createOAuthPlugin, GitHubProvider } from "./utils/oauth";
+import { CloudflareAdapter } from "elysia/adapter/cloudflare-worker";
 
 
 const anyUser = async (db: DB) => (await db.query.users.findMany())?.length > 0
@@ -47,7 +48,9 @@ export function createSetupPlugin(env: Env) {
         }),
     });
 
-    return new Elysia()
+    return new Elysia({
+        name: 'plugins',
+    })
         .state('db', db)
         .state('env', env)
         .state('cache', cache)