Update postgate env

Author: max-lt

.env.example

@@ -1,23 +1,26 @@
-# Database
-POSTGRES_HOST=localhost
-POSTGRES_PORT=5432
-POSTGRES_USER=postgres
-POSTGRES_PASSWORD=password
-POSTGRES_DB=openworkers
+# Server
+PORT=7000
+NODE_ENV=development
 
 # JWT (must be at least 32 characters)
 JWT_ACCESS_SECRET=your-secret-key-here-must-be-at-least-32-chars-long
 JWT_REFRESH_SECRET=your-refresh-secret-here-must-be-at-least-32-chars
-JWT_ACCESS_EXP=15m
-JWT_REFRESH_EXP=18h
 
 # GitHub OAuth (optional)
 GITHUB_CLIENT_ID=your-github-oauth-app-client-id
 GITHUB_CLIENT_SECRET=your-github-oauth-app-client-secret
 
-# Server
-PORT=7000
-NODE_ENV=development
+# Postgate (SQL proxy to PostgreSQL)
+POSTGATE_URL=http://localhost:6080
+POSTGATE_TOKEN=pg_your-token-here
+
+# AI (optional)
+MISTRAL_API_KEY=your-mistral-api-key
+ANTHROPIC_API_KEY=your-anthropic-api-key
 
-# Engine
-ENGINE_URL=http://localhost:8080
+# Shared Storage (S3-compatible object storage)
+SHARED_STORAGE_BUCKET=your-shared-storage-bucket-name
+SHARED_STORAGE_ENDPOINT=https://your-shared-storage-endpoint
+SHARED_STORAGE_ACCESS_KEY_ID=your-shared-storage-access-key-id
+SHARED_STORAGE_SECRET_ACCESS_KEY=your-shared-storage-secret-access-key
+SHARED_STORAGE_PUBLIC_URL=https://your-shared-storage-public-url

package.json

@@ -1,6 +1,6 @@
 {
   "name": "openworkers-api",
-  "version": "1.1.6",
+  "version": "1.1.7",
   "license": "MIT",
   "module": "src/index.ts",
   "type": "module",

src/config/index.ts

@@ -37,10 +37,8 @@ const ConfigSchema = z.object({
   // Postgate (SQL proxy)
   postgate: z.object({
     url: z.string().url().default('http://localhost:6080'),
-    // Admin token (pg_xxx format) - for managing databases and creating tokens
-    adminToken: z.string().regex(/^pg_[a-f0-9]{64}$/, 'POSTGATE_ADMIN_TOKEN must be a valid pg_xxx token'),
-    // OpenWorkers token (pg_xxx format) - for openworkers API database access
-    openworkersToken: z.string().regex(/^pg_[a-f0-9]{64}$/, 'POSTGATE_OPENWORKERS_TOKEN must be a valid pg_xxx token')
+    // Token (pg_xxx format) - for accessing OpenWorkers database
+    token: z.string().regex(/^pg_[a-f0-9]{64}$/, 'POSTGATE_TOKEN must be a valid pg_xxx token')
   }),
 
   // Shared S3/R2 for assets and storage bindings
@@ -87,8 +85,7 @@ function loadConfig(): Config {
     },
     postgate: {
       url: process.env.POSTGATE_URL,
-      adminToken: process.env.POSTGATE_ADMIN_TOKEN,
-      openworkersToken: process.env.POSTGATE_OPENWORKERS_TOKEN
+      token: process.env.POSTGATE_TOKEN
     },
     sharedStorage: {
       bucket: process.env.SHARED_STORAGE_BUCKET,

src/index.ts

@@ -13,6 +13,7 @@ import kv from './routes/kv';
 import storage from './routes/storage';
 import ai from './routes/ai';
 import pkg from '../package.json';
+import { sql } from './services/db/client';
 
 export const app = new Hono();
 
@@ -24,11 +25,24 @@ if (nodeEnv === 'development') {
   app.use('*', cors());
 }
 
+// API routes (no version prefix for health checks)
+const api = new Hono();
+
 // Health check (no auth required)
-app.get('/health', (c) => {
+api.get('/health', (c) => {
   return c.json({ status: 'ok', timestamp: new Date().toISOString() });
 });
 
+// Postgate connection test (no auth required)
+api.get('/postgate', async (c) => {
+  try {
+    const result = await sql<{ result: number }>('SELECT 1 + 1 AS result');
+    return c.json({ status: 'ok', result: result[0]?.result });
+  } catch (error) {
+    return c.json({ status: 'error', error: String(error) }, 500);
+  }
+});
+
 // API v1 routes
 const v1 = new Hono();
 
@@ -55,7 +69,8 @@ v1.route('/storage', storage);
 v1.route('/ai', ai);
 v1.route('/', users);
 
-app.route('/api/v1', v1);
+api.route('/v1', v1);
+app.route('/api', api);
 
 import { nodeEnv, port } from './config';
 

src/services/db/client.ts

@@ -1,2 +1,2 @@
 // Re-export from sql-client
-export { sql, createSqlClient, createAdminSqlClient, type PostgateSqlClient, type SqlResult } from './sql-client';
+export { sql, createSqlClient, type PostgateSqlClient, type SqlResult } from './sql-client';

src/services/db/sql-client.ts

@@ -88,13 +88,5 @@ export function createSqlClient(token: string): PostgateSqlClient {
   return createPostgateClientFromToken(postgateConfig.url, token);
 }
 
-/**
- * Create a SQL client for the admin database (tenant management)
- * Uses the admin token from config
- */
-export function createAdminSqlClient(): PostgateSqlClient {
-  return createPostgateClientFromToken(postgateConfig.url, postgateConfig.adminToken);
-}
-
-// Default export: openworkers database client (uses openworkers token)
-export const sql = createPostgateClientFromToken(postgateConfig.url, postgateConfig.openworkersToken);
+// Default SQL client for OpenWorkers database
+export const sql = createPostgateClientFromToken(postgateConfig.url, postgateConfig.token);

src/services/postgate.ts

@@ -76,12 +76,9 @@ interface CreateTokenResult {
 
 /**
  * Admin client for postgate - manages tokens and databases via SQL
- * Uses admin token for authentication (access to public schema)
+ * Uses the main token for authentication (access to public schema)
  */
 export class PostgateAdminClient extends PostgateClient {
-  constructor(baseUrl: string, adminToken: string) {
-    super(baseUrl, adminToken);
-  }
 
   /**
    * Create a new token for a database using PL/pgSQL function
@@ -117,8 +114,8 @@ export class PostgateAdminClient extends PostgateClient {
   }
 }
 
-// Admin client singleton - uses admin token from config
+// Admin client singleton - uses token from config
 export const postgateAdminClient = new PostgateAdminClient(
   postgateConfig.url,
-  postgateConfig.adminToken
+  postgateConfig.token
 );