@dotdo/postgres 0.1.0 → 0.1.2

package/src/worker/auth.ts

@@ -737,9 +737,17 @@ const DEFAULT_CACHE_CONFIG: TokenCacheConfig = {
 
 /**
  * Global token validation cache instance.
+ * Lazy-initialized to avoid global scope async operations in Cloudflare Workers.
  * @internal
  */
-let tokenCache = new TokenCache(DEFAULT_CACHE_CONFIG)
+let tokenCache: TokenCache | null = null
+
+function getTokenCache(): TokenCache {
+  if (!tokenCache) {
+    tokenCache = new TokenCache(DEFAULT_CACHE_CONFIG)
+  }
+  return tokenCache
+}
 
 /**
  * Reconfigures the global token cache with new settings.
@@ -756,7 +764,9 @@ let tokenCache = new TokenCache(DEFAULT_CACHE_CONFIG)
  * ```
  */
 export function configureTokenCache(config: TokenCacheConfig): void {
-  tokenCache.dispose()
+  if (tokenCache) {
+    tokenCache.dispose()
+  }
   tokenCache = new TokenCache({
     ...DEFAULT_CACHE_CONFIG,
     ...config,
@@ -769,7 +779,7 @@ export function configureTokenCache(config: TokenCacheConfig): void {
  * @returns Cache stats including hits, misses, and size
  */
 export function getTokenCacheStats(): CacheStats {
-  return tokenCache.stats
+  return getTokenCache().stats
 }
 
 /**
@@ -779,7 +789,7 @@ export function getTokenCacheStats(): CacheStats {
  *           a thundering herd to the OAuth provider.
  */
 export function clearTokenCache(): void {
-  tokenCache.clear()
+  getTokenCache().clear()
 }
 
 export { extractBearerToken }
@@ -902,7 +912,8 @@ export function createAuthMiddleware(config: AuthConfig = {}): MiddlewareHandler
       )
     }
 
-    let validationResult = tokenCache.get(token)
+    const cache = getTokenCache()
+    let validationResult = cache.get(token)
 
     if (!validationResult) {
       validationResult = validateToken
@@ -910,7 +921,7 @@ export function createAuthMiddleware(config: AuthConfig = {}): MiddlewareHandler
         : await sharedValidateToken(token, { oauthUrl })
 
       if (validationResult.valid) {
-        tokenCache.set(token, validationResult, tokenCacheTTL)
+        cache.set(token, validationResult, tokenCacheTTL)
       }
     }
 

package/src/worker/entry.ts

@@ -152,42 +152,44 @@ function createApp() {
   app.post('/query', async (c) => {
     const dbId = c.req.query('db') || 'default'
 
-    // Get the Durable Object stub
-    const doId = c.env.POSTGRES_DO.idFromName(dbId)
-    const stub = c.env.POSTGRES_DO.get(doId)
-
-    // Forward to DO's /query endpoint
-    const url = new URL(c.req.url)
-    url.pathname = '/query'
-    url.searchParams.delete('db')
-
-    const doRequest = new Request(url.toString(), {
-      method: 'POST',
-      headers: c.req.raw.headers,
-      body: c.req.raw.body,
-    })
+    try {
+      const body = await c.req.json<{ sql: string; params?: unknown[] }>()
+      if (!body.sql) {
+        return c.json({ error: true, code: 'INVALID_REQUEST', message: 'Missing sql field' }, 400)
+      }
 
-    return stub.fetch(doRequest)
+      // Get the Durable Object stub and call RPC method directly
+      const doId = c.env.POSTGRES_DO.idFromName(dbId)
+      const stub = c.env.POSTGRES_DO.get(doId) as DurableObjectStub<PostgresDO>
+      const result = await stub.rpcQuery(body.sql, body.params)
+      return c.json(result)
+    } catch (error) {
+      const message = error instanceof Error ? error.message : 'Unknown error'
+      return c.json({ error: true, code: 'QUERY_ERROR', message }, 500)
+    }
   })
 
   // Batch queries
   app.post('/batch', async (c) => {
     const dbId = c.req.query('db') || 'default'
 
-    const doId = c.env.POSTGRES_DO.idFromName(dbId)
-    const stub = c.env.POSTGRES_DO.get(doId)
-
-    const url = new URL(c.req.url)
-    url.pathname = '/batch'
-    url.searchParams.delete('db')
-
-    const doRequest = new Request(url.toString(), {
-      method: 'POST',
-      headers: c.req.raw.headers,
-      body: c.req.raw.body,
-    })
+    try {
+      const body = await c.req.json<{ queries: Array<{ sql: string; params?: unknown[] }>; transaction?: boolean }>()
+      if (!body.queries || !Array.isArray(body.queries)) {
+        return c.json({ error: true, code: 'INVALID_REQUEST', message: 'Missing queries array' }, 400)
+      }
 
-    return stub.fetch(doRequest)
+      // Get the Durable Object stub and call RPC method directly
+      const doId = c.env.POSTGRES_DO.idFromName(dbId)
+      const stub = c.env.POSTGRES_DO.get(doId) as DurableObjectStub<PostgresDO>
+      const result = body.transaction
+        ? await stub.rpcBatchTransaction(body.queries)
+        : await stub.rpcBatch(body.queries)
+      return c.json(result)
+    } catch (error) {
+      const message = error instanceof Error ? error.message : 'Unknown error'
+      return c.json({ error: true, code: 'BATCH_ERROR', message }, 500)
+    }
   })
 
   // ==========================================================================
@@ -383,8 +385,88 @@ function createApp() {
     }
   })
 
-  // 404 handler
-  app.notFound((c) => {
+  // ==========================================================================
+  // Dynamic database routes (for postgres.do client compatibility)
+  // ==========================================================================
+  // This handles URLs like https://db.example.com.ai/neon-example/query
+  // where the first path segment is the database ID
+  // We use notFound to handle these since Hono matches more specific routes first
+
+  const RESERVED_PATHS = new Set(['ping', 'health', 'user', 'db', 'rpc', 'query', 'batch'])
+
+  // 404 handler - also handles dynamic database routes
+  // Supports postgres.do client URLs like https://db.api.qa/mydb/query
+  app.notFound(async (c) => {
+    // Try to handle as dynamic database route: /:dbId/...
+    const pathParts = c.req.path.split('/').filter(Boolean)
+    if (pathParts.length >= 1) {
+      const dbId = pathParts[0]
+
+      // Skip if it's a reserved path
+      if (!RESERVED_PATHS.has(dbId)) {
+        const remainingPath = '/' + pathParts.slice(1).join('/')
+
+        // Get the Durable Object stub
+        const doId = c.env.POSTGRES_DO.idFromName(dbId)
+        const stub = c.env.POSTGRES_DO.get(doId) as DurableObjectStub<PostgresDO>
+
+        // Handle specific paths via RPC
+        if (remainingPath === '/query' && c.req.method === 'POST') {
+          try {
+            const body = await c.req.json<{ sql: string; params?: unknown[] }>()
+            if (!body.sql) {
+              return c.json({ error: true, code: 'INVALID_REQUEST', message: 'Missing sql field' }, 400)
+            }
+            const result = await stub.rpcQuery(body.sql, body.params)
+            return c.json(result)
+          } catch (error) {
+            const message = error instanceof Error ? error.message : 'Unknown error'
+            return c.json({ error: true, code: 'QUERY_ERROR', message }, 500)
+          }
+        }
+
+        if (remainingPath === '/batch' && c.req.method === 'POST') {
+          try {
+            const body = await c.req.json<{ queries: Array<{ sql: string; params?: unknown[] }>; transaction?: boolean }>()
+            if (!body.queries || !Array.isArray(body.queries)) {
+              return c.json({ error: true, code: 'INVALID_REQUEST', message: 'Missing queries array' }, 400)
+            }
+            const result = body.transaction
+              ? await stub.rpcBatchTransaction(body.queries)
+              : await stub.rpcBatch(body.queries)
+            return c.json(result)
+          } catch (error) {
+            const message = error instanceof Error ? error.message : 'Unknown error'
+            return c.json({ error: true, code: 'BATCH_ERROR', message }, 500)
+          }
+        }
+
+        if (remainingPath === '/transaction' && c.req.method === 'POST') {
+          try {
+            const body = await c.req.json<{ queries: Array<{ sql: string; params?: unknown[] }>; options?: unknown }>()
+            if (!body.queries || !Array.isArray(body.queries)) {
+              return c.json({ error: true, code: 'INVALID_REQUEST', message: 'Missing queries array' }, 400)
+            }
+            const result = await stub.rpcBatchTransaction(body.queries)
+            return c.json(result)
+          } catch (error) {
+            const message = error instanceof Error ? error.message : 'Unknown error'
+            return c.json({ error: true, code: 'TRANSACTION_ERROR', message }, 500)
+          }
+        }
+
+        // For other paths, return database info
+        if (remainingPath === '/' || remainingPath === '') {
+          return c.json({
+            service: 'postgres.do',
+            database: dbId,
+            status: 'ready',
+            timestamp: new Date().toISOString(),
+          })
+        }
+      }
+    }
+
     return c.json({
       error: true,
       code: 'NOT_FOUND',