unified runtime and framework adapters

app/src/adapter/cloudflare/modes/cached.ts

@@ -1,51 +1,42 @@
-import type { BkndConfig } from "adapter";
+import { createRuntimeApp } from "adapter";
 import { App } from "bknd";
-import type { Context } from "../index";
+import type { CloudflareBkndConfig, Context } from "../index";
 
-export async function getCached(config: BkndConfig, { env, html, ctx }: Context) {
-   const { kv } = config.cloudflare?.bindings?.(env)!;
+export async function getCached(config: CloudflareBkndConfig, { env, ctx }: Context) {
+   const { kv } = config.bindings?.(env)!;
    if (!kv) throw new Error("kv namespace is not defined in cloudflare.bindings");
-   const key = config.cloudflare?.key ?? "app";
+   const key = config.key ?? "app";
 
    const create_config = typeof config.app === "function" ? config.app(env) : config.app;
    const cachedConfig = await kv.get(key);
    const initialConfig = cachedConfig ? JSON.parse(cachedConfig) : undefined;
 
-   const app = App.create({ ...create_config, initialConfig });
-
    async function saveConfig(__config: any) {
       ctx.waitUntil(kv!.put(key, JSON.stringify(__config)));
    }
 
-   if (config.onBuilt) {
-      app.emgr.onEvent(
-         App.Events.AppBuiltEvent,
-         async ({ params: { app } }) => {
-            app.module.server.client.get("/__bknd/cache", async (c) => {
-               await kv.delete(key);
-               return c.json({ message: "Cache cleared" });
-            });
-            app.registerAdminController({ html });
-
-            config.onBuilt!(app);
-         },
-         "sync"
-      );
-   }
-
-   app.emgr.onEvent(
-      App.Events.AppConfigUpdatedEvent,
-      async ({ params: { app } }) => {
-         saveConfig(app.toJSON(true));
+   const app = await createRuntimeApp({
+      ...create_config,
+      initialConfig,
+      onBuilt: async (app) => {
+         app.module.server.client.get("/__bknd/cache", async (c) => {
+            await kv.delete(key);
+            return c.json({ message: "Cache cleared" });
+         });
+         await config.onBuilt?.(app);
       },
-      "sync"
-   );
-
-   await app.build();
-
-   if (config.setAdminHtml) {
-      app.registerAdminController({ html });
-   }
+      beforeBuild: async (app) => {
+         app.emgr.onEvent(
+            App.Events.AppConfigUpdatedEvent,
+            async ({ params: { app } }) => {
+               saveConfig(app.toJSON(true));
+            },
+            "sync"
+         );
+         await config.beforeBuild?.(app);
+      },
+      adminOptions: { html: config.html }
+   });
 
    if (!cachedConfig) {
       saveConfig(app.toJSON(true));

app/src/adapter/cloudflare/modes/durable.ts

@@ -1,15 +1,15 @@
 import { DurableObject } from "cloudflare:workers";
-import type { BkndConfig } from "adapter";
-import type { Context } from "adapter/cloudflare";
-import { App, type CreateAppConfig } from "bknd";
+import { createRuntimeApp } from "adapter";
+import type { CloudflareBkndConfig, Context } from "adapter/cloudflare";
+import type { App, CreateAppConfig } from "bknd";
 
-export async function getDurable(config: BkndConfig, ctx: Context) {
-   const { dobj } = config.cloudflare?.bindings?.(ctx.env)!;
+export async function getDurable(config: CloudflareBkndConfig, ctx: Context) {
+   const { dobj } = config.bindings?.(ctx.env)!;
    if (!dobj) throw new Error("durable object is not defined in cloudflare.bindings");
-   const key = config.cloudflare?.key ?? "app";
+   const key = config.key ?? "app";
 
-   if (config.onBuilt) {
-      console.log("onBuilt() is not supported with DurableObject mode");
+   if ([config.onBuilt, config.beforeBuild].some((x) => x)) {
+      console.log("onBuilt and beforeBuild are not supported with DurableObject mode");
    }
 
    const start = performance.now();
@@ -21,8 +21,8 @@ export async function getDurable(config: BkndConfig, ctx: Context) {
 
    const res = await stub.fire(ctx.request, {
       config: create_config,
-      html: ctx.html,
-      keepAliveSeconds: config.cloudflare?.keepAliveSeconds,
+      html: config.html,
+      keepAliveSeconds: config.keepAliveSeconds,
       setAdminHtml: config.setAdminHtml
    });
 
@@ -64,10 +64,9 @@ export class DurableBkndApp extends DurableObject {
             config.connection.config.protocol = "wss";
          }
 
-         this.app = App.create(config);
-         this.app.emgr.onEvent(
-            App.Events.AppBuiltEvent,
-            async ({ params: { app } }) => {
+         this.app = await createRuntimeApp({
+            ...config,
+            onBuilt: async (app) => {
                app.modules.server.get("/__do", async (c) => {
                   // @ts-ignore
                   const context: any = c.req.raw.cf ? c.req.raw.cf : c.env.cf;
@@ -80,14 +79,11 @@ export class DurableBkndApp extends DurableObject {
 
                await this.onBuilt(app);
             },
-            "sync"
-         );
-
-         await this.app.build();
-
-         if (options.setAdminHtml) {
-            this.app.registerAdminController({ html: options.html });
-         }
+            adminOptions: { html: options.html },
+            beforeBuild: async (app) => {
+               await this.beforeBuild(app);
+            }
+         });
 
          buildtime = performance.now() - start;
       }
@@ -110,6 +106,7 @@ export class DurableBkndApp extends DurableObject {
    }
 
    async onBuilt(app: App) {}
+   async beforeBuild(app: App) {}
 
    protected keepAlive(seconds: number) {
       console.log("keep alive for", seconds);

app/src/adapter/cloudflare/modes/fresh.ts

@@ -1,36 +1,23 @@
-import type { BkndConfig } from "adapter";
-import { App } from "bknd";
-import type { Context } from "../index";
+import { createRuntimeApp } from "adapter";
+import type { App } from "bknd";
+import type { CloudflareBkndConfig, Context } from "../index";
 
-export async function makeApp(config: BkndConfig, { env, html }: Context) {
+export async function makeApp(config: CloudflareBkndConfig, { env }: Context) {
    const create_config = typeof config.app === "function" ? config.app(env) : config.app;
-   const app = App.create(create_config);
-
-   if (config.onBuilt) {
-      app.emgr.onEvent(
-         App.Events.AppBuiltEvent,
-         async ({ params: { app } }) => {
-            config.onBuilt!(app);
-         },
-         "sync"
-      );
-   }
-   await app.build();
-
-   if (config.setAdminHtml) {
-      app.registerAdminController({ html });
-   }
-
-   return app;
+   return await createRuntimeApp({
+      ...config,
+      ...create_config,
+      adminOptions: config.html ? { html: config.html } : undefined
+   });
 }
 
-export async function getFresh(config: BkndConfig, ctx: Context) {
+export async function getFresh(config: CloudflareBkndConfig, ctx: Context) {
    const app = await makeApp(config, ctx);
    return app.fetch(ctx.request);
 }
 
 let warm_app: App;
-export async function getWarm(config: BkndConfig, ctx: Context) {
+export async function getWarm(config: CloudflareBkndConfig, ctx: Context) {
    if (!warm_app) {
       warm_app = await makeApp(config, ctx);
    }