Merge branch 'dev' into ee-setup

Author: FalkWolsky

server/node-service/package.json

@@ -37,6 +37,7 @@
     "@aws-sdk/client-lambda": "^3.332.0",
     "@aws-sdk/client-s3": "^3.332.0",
     "@aws-sdk/s3-request-presigner": "^3.332.0",
+    "@duckdb/node-api": "^1.3.0-alpha.21",
     "@google-cloud/bigquery": "^6.1.0",
     "@google-cloud/storage": "^6.10.1",
     "@supabase/supabase-js": "^2.26.0",
@@ -52,7 +53,6 @@
     "base64-arraybuffer": "^1.0.2",
     "bluebird": "^3.7.2",
     "cors": "^2.8.5",
-    "duckdb-async": "^1.1.3",
     "dynamodb-data-types": "^4.0.1",
     "express": "^4.21.0",
     "express-async-errors": "^3.1.1",

server/node-service/src/plugins/duckdb/index.ts

@@ -1,7 +1,7 @@
 import { DataSourcePlugin } from "lowcoder-sdk/dataSource";
 import dataSourceConfig, { DataSourceDataType } from "./dataSourceConfig";
 import queryConfig, { ActionDataType } from "./queryConfig";
-import { Database } from "duckdb-async";
+import { DuckDBInstance } from "@duckdb/node-api";
 import { ServiceError } from "../../common/error";
 
 // Helper function to handle BigInt serialization
@@ -23,20 +23,22 @@ const duckdbPlugin: DataSourcePlugin<ActionDataType, DataSourceDataType> = {
     run: async function (actionData, dataSourceConfig): Promise<any> {
         const { databaseFile, options } = dataSourceConfig;
         const parsedOptions = JSON.parse(options);
-        const db = await Database.create(databaseFile, parsedOptions);
+        const instance = await DuckDBInstance.create(databaseFile, parsedOptions);
+        const db = await instance.connect();
 
         if (actionData.actionName === "Query") {
             try {
-                const result = await db.all(actionData.queryString);
+                const result = await db.runAndReadAll(actionData.queryString);
+                const data = await result.getRows();
                 // Apply BigInt serialization to each row
-                return result.map(serializeBigInts);
+                return data.map(serializeBigInts);
             } catch (error) {
                 throw new ServiceError((error as Error).message);
             } finally {
-                await db.close();
+                await db.closeSync();
             }
         }
     },
 };
 
-export default duckdbPlugin;
+export default duckdbPlugin;