@aliyun-rds/supabase-mcp-server 1.0.7 → 1.0.9

package/dist/index.js

@@ -813,6 +813,13 @@ var SelfhostedSupabaseClient = class _SelfhostedSupabaseClient {
   isRpcAvailable() {
     return this.rpcFunctionExists;
   }
+  /**
+   * Sets the RPC function availability status.
+   * Called after successfully installing the execute_sql function.
+   */
+  setRpcAvailable(available) {
+    this.rpcFunctionExists = available;
+  }
   /**
    * Gets the authentication mode this client was created with.
    */
@@ -865,6 +872,9 @@ import { z } from "zod";
 import { exec } from "node:child_process";
 import { promisify } from "node:util";
 var execAsync = promisify(exec);
+function isSqlErrorResponse(result) {
+  return result.error !== void 0;
+}
 function handleSqlResponse(result, schema) {
   if ("error" in result) {
     throw new Error(`SQL Error (${result.error.code}): ${result.error.message}`);
@@ -894,10 +904,10 @@ async function runExternalCommand(command) {
 }
 async function executeSqlWithFallback(client, sql, readOnly = true) {
   if (client.isPgAvailable()) {
-    console.info("Using direct database connection (bypassing JWT)...");
+    console.warn("Using direct database connection (bypassing JWT)...");
     return await client.executeSqlWithPg(sql);
   }
-  console.info("Falling back to RPC method...");
+  console.warn("Falling back to RPC method...");
   return await client.executeSqlViaRpc(sql, readOnly);
 }
 
@@ -1277,7 +1287,22 @@ var getDatabaseStatsTool = {
                 stats_reset::text
             FROM pg_stat_database
         `;
-    const getBgWriterStatsSql = `
+    const getBgWriterStatsSqlPg17 = `
+            SELECT
+                (SELECT num_timed::text FROM pg_stat_checkpointer) as checkpoints_timed,
+                (SELECT num_requested::text FROM pg_stat_checkpointer) as checkpoints_req,
+                (SELECT write_time FROM pg_stat_checkpointer) as checkpoint_write_time,
+                (SELECT sync_time FROM pg_stat_checkpointer) as checkpoint_sync_time,
+                (SELECT buffers_written::text FROM pg_stat_checkpointer) as buffers_checkpoint,
+                buffers_clean::text,
+                maxwritten_clean::text,
+                NULL::text as buffers_backend,
+                NULL::text as buffers_backend_fsync,
+                buffers_alloc::text,
+                stats_reset::text
+            FROM pg_stat_bgwriter
+        `;
+    const getBgWriterStatsSqlPg16 = `
             SELECT
                 checkpoints_timed::text,
                 checkpoints_req::text,
@@ -1292,10 +1317,12 @@ var getDatabaseStatsTool = {
                 stats_reset::text
             FROM pg_stat_bgwriter
         `;
-    const [dbStatsResult, bgWriterStatsResult] = await Promise.all([
-      executeSqlWithFallback(client, getDbStatsSql, true),
-      executeSqlWithFallback(client, getBgWriterStatsSql, true)
-    ]);
+    const dbStatsResult = await executeSqlWithFallback(client, getDbStatsSql, true);
+    let bgWriterStatsResult = await executeSqlWithFallback(client, getBgWriterStatsSqlPg17, true);
+    if (isSqlErrorResponse(bgWriterStatsResult)) {
+      console.error("PostgreSQL 17+ query failed, trying PostgreSQL 16 query...");
+      bgWriterStatsResult = await executeSqlWithFallback(client, getBgWriterStatsSqlPg16, true);
+    }
     const dbStats = handleSqlResponse(dbStatsResult, GetDbStatsOutputSchema.shape.database_stats);
     const bgWriterStats = handleSqlResponse(bgWriterStatsResult, GetDbStatsOutputSchema.shape.bgwriter_stats);
     return {
@@ -2315,6 +2342,7 @@ async function execute(input, context) {
     }
     context.log("execute_sql function installed successfully!", "info");
     context.log("You may need to wait a few seconds for PostgREST to reload the schema.", "info");
+    client.setRpcAvailable(true);
     return {
       success: true,
       message: "execute_sql function installed successfully. You can now use tools that require SQL execution (list_tables, execute_sql, etc.)."
@@ -2663,32 +2691,67 @@ function wrapAllRagAgentTools(ragClient) {
 import RdsAiPkg from "@alicloud/rdsai20250507/dist/client.js";
 import * as $RdsAi from "@alicloud/rdsai20250507";
 var RdsAiClient = RdsAiPkg.default || RdsAiPkg;
+var RDSAI_DEFAULT_ENDPOINT = "rdsai.aliyuncs.com";
+var RDSAI_CENTER_UNIT_REGIONS = /* @__PURE__ */ new Set([
+  "cn-beijing",
+  "cn-wulanchabu",
+  "cn-hangzhou",
+  "cn-shanghai",
+  "cn-shenzhen",
+  "cn-guangzhou"
+]);
+function resolveRdsAiEndpoint(regionId, explicitEndpoint) {
+  if (explicitEndpoint) {
+    return explicitEndpoint;
+  }
+  if (!regionId || RDSAI_CENTER_UNIT_REGIONS.has(regionId)) {
+    return RDSAI_DEFAULT_ENDPOINT;
+  }
+  return `rdsai.${regionId}.aliyuncs.com`;
+}
 var AliyunRdsAiClient = class {
-  client;
-  // RdsAi Client instance
+  clientCache;
   config;
   constructor(config) {
     this.config = config;
+    this.clientCache = /* @__PURE__ */ new Map();
+    const defaultEndpoint = resolveRdsAiEndpoint(config.regionId, config.endpoint);
+    this.clientCache.set(defaultEndpoint, this.createClient(defaultEndpoint, config.regionId));
+  }
+  createClient(endpoint, regionId) {
     const openApiConfig = {
-      accessKeyId: config.accessKeyId,
-      accessKeySecret: config.accessKeySecret,
-      endpoint: config.endpoint || "rdsai.aliyuncs.com"
+      accessKeyId: this.config.accessKeyId,
+      accessKeySecret: this.config.accessKeySecret,
+      endpoint,
+      regionId
     };
-    this.client = new RdsAiClient(openApiConfig);
+    return new RdsAiClient(openApiConfig);
+  }
+  getClientForRegion(regionId) {
+    const effectiveRegionId = regionId || this.config.regionId;
+    const endpoint = resolveRdsAiEndpoint(effectiveRegionId, this.config.endpoint);
+    const cached = this.clientCache.get(endpoint);
+    if (cached) {
+      return cached;
+    }
+    const client = this.createClient(endpoint, effectiveRegionId);
+    this.clientCache.set(endpoint, client);
+    return client;
   }
   /**
    * List all Supabase instances
    */
   async listSupabaseInstances(options) {
+    const regionId = options?.regionId || this.config.regionId;
     const request = new $RdsAi.DescribeAppInstancesRequest({
       appType: "supabase",
-      regionId: options?.regionId || this.config.regionId,
+      regionId,
       DBInstanceName: options?.dbInstanceName,
       pageSize: options?.pageSize || 50,
       pageNumber: options?.pageNumber || 1
     });
     try {
-      const response = await this.client.describeAppInstances(request);
+      const response = await this.getClientForRegion(regionId).describeAppInstances(request);
       if (!response.body) {
         throw new Error("Empty response from DescribeAppInstances API");
       }
@@ -2714,19 +2777,21 @@ var AliyunRdsAiClient = class {
         instances
       };
     } catch (error) {
-      console.error("Error calling DescribeAppInstances:", error);
+      console.error("Error calling DescribeAppInstances:", JSON.stringify(error, null, 2));
+      console.error("Error code:", error?.code);
+      console.error("Error data:", error?.data);
       throw new Error(`Failed to list Supabase instances: ${error instanceof Error ? error.message : String(error)}`);
     }
   }
   /**
    * Get authentication information for a specific instance
    */
-  async getInstanceAuthInfo(instanceName) {
+  async getInstanceAuthInfo(instanceName, regionId) {
     const request = new $RdsAi.DescribeInstanceAuthInfoRequest({
       instanceName
     });
     try {
-      const response = await this.client.describeInstanceAuthInfo(request);
+      const response = await this.getClientForRegion(regionId || this.config.regionId).describeInstanceAuthInfo(request);
       if (!response.body) {
         throw new Error("Empty response from DescribeInstanceAuthInfo API");
       }
@@ -2760,7 +2825,7 @@ var AliyunRdsAiClient = class {
     if (!instance) {
       throw new Error(`Instance ${instanceName} not found. Available instances: ${instancesResponse.instances.map((i) => i.instanceName).join(", ")}`);
     }
-    const authInfo = await this.getInstanceAuthInfo(instanceName);
+    const authInfo = await this.getInstanceAuthInfo(instanceName, instance.regionId || queryRegion);
     const connectionString = useVpc ? instance.vpcConnectionString : instance.publicConnectionString;
     const supabaseUrl = connectionString.startsWith("http") ? connectionString : `http://${connectionString}`;
     return {
@@ -2854,7 +2919,8 @@ import { z as z27 } from "zod";
 import { zodToJsonSchema as zodToJsonSchema3 } from "zod-to-json-schema";
 var ConnectInstanceInputZodSchema = z27.object({
   instance_name: z27.string().describe("The instance name (e.g., ra-supabase-8moov5lxba****)"),
-  use_vpc: z27.boolean().optional().default(false).describe("Whether to use VPC connection instead of public connection")
+  use_vpc: z27.boolean().optional().default(false).describe("Whether to use VPC connection instead of public connection"),
+  region_id: z27.string().optional().describe("Region ID of the instance (e.g., cn-hangzhou, cn-chengdu). Required when connecting to an instance in a different region than the default startup region.")
 });
 var ConnectInstanceOutputZodSchema = z27.object({
   success: z27.boolean(),
@@ -2869,7 +2935,7 @@ async function execute3(input, aliyunClient, createSupabaseClient, setCurrentIns
   }
   log(`Connecting to Supabase instance: ${input.instance_name}...`, "info");
   try {
-    const credentials = await aliyunClient.getSupabaseCredentials(input.instance_name, input.use_vpc);
+    const credentials = await aliyunClient.getSupabaseCredentials(input.instance_name, input.use_vpc, input.region_id);
     log(`Retrieved credentials for instance ${input.instance_name}`, "info");
     log(`Supabase URL: ${credentials.supabaseUrl}`, "info");
     const supabaseClient = await createSupabaseClient(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aliyun-rds/supabase-mcp-server",
-  "version": "1.0.7",
+  "version": "1.0.9",
   "description": "MCP (Model Context Protocol) server for self-hosted Supabase instances. Allows AI assistants to interact with your self-hosted Supabase database.",
   "main": "dist/index.js",
   "bin": {