更新客户端 SDK 示例，修复连接 URL；增强数据查询功能，支持分页和排序；添加 CRUD 操作示例

Author: hotlong

examples/todo/src/client-test.ts

@@ -5,7 +5,7 @@ async function main() {
 
   // 1. Initialize Client
   const client = new ObjectStackClient({
-    baseUrl: 'http://localhost:3004'
+    baseUrl: 'http://127.0.0.1:3004'
   });
 
   try {
@@ -21,12 +21,40 @@ async function main() {
 
     // 4. Query Data
     console.log('💾 Querying Data...');
-    const result = await client.data.find('todo_task', {});
+    const result = await client.data.find('todo_task', {
+       top: 10,
+       sort: 'status'
+    });
 
-    console.log(`🎉 Found ${result.data.length} tasks:`);
-    result.data.forEach((task: any) => {
-      console.log(` - [${task.status}] ${task.title}`);
+    console.log(`🎉 Found ${result.count} tasks:`);
+    result.value.forEach((task: any) => {
+      console.log(` - [${task.is_completed ? 'x' : ' '}] ${task.subject} (Priority: ${task.priority})`);
+    });
+
+    // 5. CRUD Operations
+    console.log('\n✨ Creating new task...');
+    const newTask = await client.data.create('todo_task', {
+      subject: 'Test SDK Create',
+      is_completed: false,
+      priority: 3
     });
+    console.log('✅ Created:', newTask);
+
+    // Update
+    if (newTask && (newTask as any).id) {
+       console.log('🔄 Updating task...');
+       const updated = await client.data.update('todo_task', (newTask as any).id, {
+         subject: 'Test SDK Create (Updated)',
+         is_completed: true
+       });
+       console.log('✅ Updated:', updated);
+
+       // Delete
+       console.log('🗑️ Deleting task...');
+       const deleted = await client.data.delete('todo_task', (newTask as any).id);
+       console.log('✅ Deleted:', deleted);
+    }
+
 
   } catch (error) {
     console.error('❌ Error during test:', error);

packages/client-sdk/src/index.ts

@@ -1,6 +1,10 @@
 export interface ClientConfig {
   baseUrl: string;
   token?: string;
+  /**
+   * Custom fetch implementation (e.g. node-fetch or for Next.js caching)
+   */
+  fetch?: (input: RequestInfo | URL, init?: RequestInit) => Promise<Response>;
 }
 
 export interface DiscoveryResult {
@@ -9,29 +13,48 @@ export interface DiscoveryResult {
     metadata: string;
     data: string;
     auth: string;
+    ui: string;
   };
   capabilities?: Record<string, boolean>;
 }
 
+export interface QueryOptions {
+  select?: string[];
+  filters?: Record<string, any>;
+  sort?: string | string[]; // 'name' or ['-created_at', 'name']
+  top?: number;
+  skip?: number;
+}
+
+export interface PaginatedResult<T = any> {
+  value: T[];
+  count: number;
+}
+
 export class ObjectStackClient {
   private baseUrl: string;
   private token?: string;
+  private fetchImpl: (input: RequestInfo | URL, init?: RequestInit) => Promise<Response>;
   private routes?: DiscoveryResult['routes'];
 
   constructor(config: ClientConfig) {
     this.baseUrl = config.baseUrl.replace(/\/$/, ''); // Remove trailing slash
     this.token = config.token;
+    this.fetchImpl = config.fetch || globalThis.fetch.bind(globalThis);
   }
 
   /**
    * Initialize the client by discovering server capabilities and routes.
    */
   async connect() {
     try {
+      // Connect to the discovery endpoint
+      // During boot, we might not know routes, so we check convention /api/v1 first
       const res = await this.fetch(`${this.baseUrl}/api/v1`);
+      
       const data = await res.json();
       this.routes = data.routes;
-      return data;
+      return data as DiscoveryResult;
     } catch (e) {
       console.error('Failed to connect to ObjectStack Server', e);
       throw e;
@@ -49,9 +72,8 @@ export class ObjectStackClient {
     },
 
     getView: async (object: string, type: 'list' | 'form' = 'list') => {
-        // UI routes might not be in discovery map yet, assume convention or add to server
-        // Convention from server/src/index.ts: /api/v1/ui/view/:object
-        const res = await this.fetch(`${this.baseUrl}/api/v1/ui/view/${object}?type=${type}`);
+        const route = this.getRoute('ui');
+        const res = await this.fetch(`${this.baseUrl}${route}/view/${object}?type=${type}`);
         return res.json();
     }
   };
@@ -60,20 +82,37 @@ export class ObjectStackClient {
    * Data Operations
    */
   data = {
-    find: async (object: string, query: any = {}) => {
+    find: async <T = any>(object: string, options: QueryOptions = {}): Promise<PaginatedResult<T>> => {
         const route = this.getRoute('data');
-        const queryString = new URLSearchParams(query).toString();
-        const res = await this.fetch(`${this.baseUrl}${route}/${object}?${queryString}`);
+        const queryParams = new URLSearchParams();
+        
+        if (options.top) queryParams.set('top', options.top.toString());
+        if (options.skip) queryParams.set('skip', options.skip.toString());
+        if (options.sort) {
+            const sortVal = Array.isArray(options.sort) ? options.sort.join(',') : options.sort;
+            queryParams.set('sort', sortVal);
+        }
+        
+        // Flatten simple KV pairs if filters exists
+        if (options.filters) {
+             Object.entries(options.filters).forEach(([k, v]) => {
+                 if (v !== undefined && v !== null) {
+                    queryParams.append(k, String(v));
+                 }
+             });
+        }
+
+        const res = await this.fetch(`${this.baseUrl}${route}/${object}?${queryParams.toString()}`);
         return res.json();
     },
 
-    get: async (object: string, id: string) => {
+    get: async <T = any>(object: string, id: string): Promise<T> => {
         const route = this.getRoute('data');
         const res = await this.fetch(`${this.baseUrl}${route}/${object}/${id}`);
         return res.json();
     },
 
-    create: async (object: string, data: any) => {
+    create: async <T = any>(object: string, data: Partial<T>): Promise<T> => {
         const route = this.getRoute('data');
         const res = await this.fetch(`${this.baseUrl}${route}/${object}`, {
             method: 'POST',
@@ -82,7 +121,7 @@ export class ObjectStackClient {
         return res.json();
     },
 
-    update: async (object: string, id: string, data: any) => {
+    update: async <T = any>(object: string, id: string, data: Partial<T>): Promise<T> => {
         const route = this.getRoute('data');
         const res = await this.fetch(`${this.baseUrl}${route}/${object}/${id}`, {
             method: 'PATCH',
@@ -91,7 +130,7 @@ export class ObjectStackClient {
         return res.json();
     },
 
-    delete: async (object: string, id: string) => {
+    delete: async (object: string, id: string): Promise<{ success: boolean }> => {
         const route = this.getRoute('data');
         const res = await this.fetch(`${this.baseUrl}${route}/${object}/${id}`, {
             method: 'DELETE'
@@ -100,32 +139,41 @@ export class ObjectStackClient {
     }
   };
 
-  private getRoute(key: keyof DiscoveryResult['routes']): string {
-    if (!this.routes) {
-        throw new Error('Client not connected. Call client.connect() first.');
-    }
-    return this.routes[key];
-  }
+  /**
+   * Private Helpers
+   */
 
-  private async fetch(url: string, options: RequestInit = {}) {
+  private async fetch(url: string, options: RequestInit = {}): Promise<Response> {
     const headers: Record<string, string> = {
-        'Content-Type': 'application/json',
-        ...(options.headers as any || {})
+      'Content-Type': 'application/json',
+      ...(options.headers as Record<string, string> || {}),
     };
 
     if (this.token) {
         headers['Authorization'] = `Bearer ${this.token}`;
     }
 
-    const res = await fetch(url, {
-        ...options,
-        headers
-    });
-
-    if (res.status >= 400) {
-        throw new Error(`API Error ${res.status}: ${res.statusText}`);
+    const res = await this.fetchImpl(url, { ...options, headers });
+    
+    if (!res.ok) {
+        let errorBody;
+        try {
+            errorBody = await res.json();
+        } catch {
+            errorBody = { message: res.statusText };
+        }
+        throw new Error(`[ObjectStack] Request failed: ${res.status} ${JSON.stringify(errorBody)}`);
     }
-
+    
     return res;
   }
+
+  private getRoute(key: keyof DiscoveryResult['routes']): string {
+    if (!this.routes) {
+        // Fallback for strictness, but we allow bootstrapping
+        console.warn(`[ObjectStackClient] Accessing ${key} route before connect(). Using default /api/v1/${key}`);
+        return `/api/v1/${key}`;
+    }
+    return this.routes[key] || `/api/v1/${key}`; 
+  }
 }