edge-city

edge-city is a next level meta-framework for react that runs only on edge runtimes

1142491c — pyrossh

Fix db client

Files changed (5) hide show

cli.js CHANGED Viewed

@@ -114,11 +114,13 @@ const bundlePages = async () => {
           const data = fs.readFileSync(args.path);
           const newSrc = `
             import renderPage from "edge-city/renderPage";
+            import init from "@/init";
             ${importAppComp}
             ${data.toString()}
-            export function onRequest(context) {
+            export async function onRequest(context) {
+              await init();
               return renderPage(Page, App, context.request);
             }
           `
@@ -219,13 +221,15 @@ const bundleServices = async () => {
           setup(build) {
             build.onLoad({ filter: /\\*.service.js/, namespace: undefined }, async (args) => {
               const newSrc = `
-            import renderApi from "edge-city/renderApi";
+                import renderApi from "edge-city/renderApi";
+                import init from "@/init";
-            ${src.toString()}
+                ${src.toString()}
-            export function onRequest(context) {
+                export async function onRequest(c) {
+                  await init();
-              return renderApi(${p}, context.request);
+                  return renderApi(${p}, c.request);
-            }
+                }
-          `
+              `
               return {
                 contents: newSrc,
                 loader: "js",

example/globals.d.ts ADDED Viewed

@@ -0,0 +1,5 @@
+import { NeonDatabase } from "drizzle-orm/neon-serverless"
+declare global {
+  const db: NeonDatabase;
+}

example/src/init.js ADDED Viewed

@@ -0,0 +1,18 @@
+import { drizzle } from 'drizzle-orm/neon-serverless';
+import { Pool } from '@neondatabase/serverless';
+import { highlight } from 'sql-highlight';
+const init = async () => {
+  const pool = new Pool({ connectionString: process.env.EDGE_PG_CONN_URL });
+  const db = drizzle(pool, {
+    logger: {
+      logQuery: (query, params) => {
+        const sqlString = params.reduce((acc, v, i) => acc.replaceAll("$" + (i + 1), v), query);
+        console.log(highlight(sqlString));
+      }
+    }
+  });
+  globalThis.db = db;
+}
+export default init;

example/src/services/db.js DELETED Viewed

@@ -1,15 +0,0 @@
-import { drizzle } from 'drizzle-orm/neon-serverless';
-import { Pool } from '@neondatabase/serverless';
-import { highlight } from 'sql-highlight';
-export const pool = new Pool({ connectionString: process.env.EDGE_PG_CONN_URL });
-const db = drizzle(pool, {
-  logger: {
-    logQuery: (query, params) => {
-      const sqlString = params.reduce((acc, v, i) => acc.replaceAll("$" + (i + 1), v), query);
-      console.log(highlight(sqlString));
-    }
-  }
-});
-export default db;

example/src/services/todos.service.js CHANGED Viewed

@@ -1,5 +1,4 @@
 import { eq, asc } from 'drizzle-orm';
-import db from "./db";
 import { boolean, date, pgTable, serial, text } from 'drizzle-orm/pg-core';
 import { z } from 'zod';