update supabase result structure

sunlei · sunlei · commit 5ed2e0e8ec72 · 2023-03-07T12:24:23.000+08:00
diff --git a/server/node-service/package.json b/server/node-service/package.json
@@ -42,6 +42,7 @@
     "@types/lodash": "^4.14.190",
     "@types/morgan": "^1.9.3",
     "@types/node": "^18.11.18",
+    "@types/node-fetch": "^2.6.2",
     "axios": "^1.2.0",
     "base64-arraybuffer": "^1.0.2",
     "dynamodb-data-types": "^4.0.1",
@@ -55,10 +56,12 @@
     "lodash": "^4.17.21",
     "loglevel": "^1.8.1",
     "morgan": "^1.10.0",
+    "node-fetch": "2",
     "openapi-types": "^12.1.0",
     "openblocks-core": "^0.0.7",
     "openblocks-sdk": "0.0.38",
     "pino": "^8.11.0",
+    "proxy-agent": "^5.0.0",
     "stylis": "^4.1.3",
     "swagger-client": "^3.18.5",
     "typescript": "^4.9.3",
diff --git a/server/node-service/src/common/fetch.ts b/server/node-service/src/common/fetch.ts
@@ -0,0 +1,6 @@
+import nodeFetch, { RequestInit, RequestInfo } from "node-fetch";
+import proxyAgent from "proxy-agent";
+
+export function fetch(url: RequestInfo, init?: RequestInit) {
+  return nodeFetch(url, { agent: proxyAgent(), ...init });
+}
diff --git a/server/node-service/src/plugins/supabase/run.ts b/server/node-service/src/plugins/supabase/run.ts
@@ -1,11 +1,16 @@
 import { createClient, SupabaseClient } from "@supabase/supabase-js";
+import { fetch } from "../../common/fetch";
 import path from "path";
 import { ServiceError } from "../../common/error";
 import { DataSourceDataType } from "./dataSourceConfig";
 import { ActionDataType } from "./queryConfig";
 
 function getClient(params: DataSourceDataType) {
-  return createClient(params.projectUrl, params.apiKey);
+  return createClient(params.projectUrl, params.apiKey, {
+    global: {
+      fetch: fetch as any,
+    },
+  });
 }
 
 function getBucket(actionConfig: ActionDataType, dataSourceConfig: DataSourceDataType) {
@@ -115,7 +120,14 @@ export default async function run(action: ActionDataType, dataSourceConfig: Data
     if (ret.error) {
       throw ret.error;
     }
-    return ret;
+    let signedUrl;
+    if (action.returnSignedUrl) {
+      signedUrl = await getFileSignedUrl(bucket, action.fileName, client);
+    }
+    return {
+      ...ret.data,
+      signedUrl,
+    };
   }
 
   if (action.actionName === "deleteFile") {
@@ -129,6 +141,9 @@ export default async function run(action: ActionDataType, dataSourceConfig: Data
   }
 
   if (action.actionName === "createSignedUrl") {
-    return await getFileSignedUrl(bucket, action.fileName, client);
+    const signedUrl = await getFileSignedUrl(bucket, action.fileName, client);
+    return {
+      signedUrl,
+    };
   }
 }
diff --git a/server/node-service/yarn.lock b/server/node-service/yarn.lock
