fix(edgedb-client): create a single client and expose it instead of recreating

Author: Tahul

src/module.ts

@@ -1,5 +1,5 @@
 import { existsSync } from 'node:fs'
-import { addComponentsDir, addImportsDir, addPlugin, addServerHandler, addServerImports, createResolver, defineNuxtModule } from '@nuxt/kit'
+import { addComponentsDir, addImportsDir, addPlugin, addServerHandler, addServerImports, addServerPlugin, createResolver, defineNuxtModule } from '@nuxt/kit'
 import { createConsola } from 'consola'
 import { join } from 'pathe'
 import chalk from 'chalk'
@@ -418,6 +418,9 @@ export default defineNuxtModule<ModuleOptions>({
     }
 
     if (options.composables) {
+      // Add server plugin for EdgeDB client
+      addServerPlugin(resolveLocal('./runtime/server/plugins/edgedb-client'))
+
       // Add server imports manually
       addServerImports([
         {
@@ -513,7 +516,7 @@ export default defineNuxtModule<ModuleOptions>({
 
       // Runtime
       addPlugin({
-        src: resolveLocal('./runtime/plugin/edgedb-auth'),
+        src: resolveLocal('./runtime/plugins/edgedb-auth'),
         mode: 'all',
       })
       addComponentsDir({

src/runtime/plugin/edgedb-auth.ts src/runtime/plugins/edgedb-auth.tssrc/runtime/plugin/edgedb-auth.ts renamed to src/runtime/plugins/edgedb-auth.ts

@@ -1,19 +1,16 @@
 import { getCookie } from 'h3'
 import type { EventHandlerRequest, H3Event } from 'h3'
-import { createClient } from 'edgedb'
-import type { ConnectOptions } from 'edgedb'
-import { useEdgeDbEnv } from './useEdgeDbEnv'
+import type { Client, ConnectOptions } from 'edgedb'
 
-export function useEdgeDb(
-  req: H3Event<EventHandlerRequest> | undefined = undefined,
-  clientOptions: ConnectOptions = {},
-) {
-  const { dsn } = useEdgeDbEnv()
+export function useEdgeDb(req: H3Event<EventHandlerRequest> | undefined = undefined) {
+  // @ts-expect-error - untyped global
+  const client = globalThis.__nuxt_edgedb_client__ as Client
 
-  if (dsn)
-    clientOptions.dsn = dsn
+  if (req) {
+    return client.withGlobals({
+      'ext::auth::client_token': req ? getCookie(req, 'edgedb-auth-token') : undefined,
+    })
+  }
 
-  return createClient(clientOptions).withGlobals({
-    'ext::auth::client_token': req ? getCookie(req, 'edgedb-auth-token') : undefined,
-  })
+  return client
 }

src/runtime/server/composables/useEdgeDb.ts

@@ -0,0 +1,11 @@
+import { createClient } from 'edgedb'
+import { defineNitroPlugin } from 'nitropack/dist/runtime/plugin'
+
+export default defineNitroPlugin(() => {
+  const { dsn } = useEdgeDbEnv()
+
+  const client = createClient({ dsn })
+
+  // @ts-expect-error - untyped global
+  globalThis.__nuxt_edgedb_client__ = client
+})