From f8f8df663f2aa01c6b3901c9c90ab8c167507fd2 Mon Sep 17 00:00:00 2001 From: xqvvu Date: Fri, 12 Dec 2025 16:46:10 +0800 Subject: [PATCH 1/4] chore: more logs --- modules/tool/api/upload/confirmUpload.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/tool/api/upload/confirmUpload.ts b/modules/tool/api/upload/confirmUpload.ts index cb119c7e..1f283535 100644 --- a/modules/tool/api/upload/confirmUpload.ts +++ b/modules/tool/api/upload/confirmUpload.ts @@ -13,6 +13,7 @@ export default s.route(contract.tool.upload.confirmUpload, async ({ body }) => { const toolIds = [...new Set(_toolIds)]; addLog.debug(`Confirming uploaded tools: ${toolIds}`); const pendingTools = await privateS3Server.getFiles(`${UploadToolsS3Path}/temp`); + addLog.debug(`Downloaded tools: ${pendingTools}`); const pendingToolIds = pendingTools .map((item) => item.split('/').at(-1)?.split('.').at(0)) .filter((item): item is string => !!item); From 8225fb6888a42b12af2277dbeb76ff0838b9565b Mon Sep 17 00:00:00 2001 From: xqvvu Date: Tue, 6 Jan 2026 15:35:51 +0800 Subject: [PATCH 2/4] clean code --- modules/tool/api/upload/confirmUpload.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/tool/api/upload/confirmUpload.ts b/modules/tool/api/upload/confirmUpload.ts index 1f283535..cb119c7e 100644 --- a/modules/tool/api/upload/confirmUpload.ts +++ b/modules/tool/api/upload/confirmUpload.ts @@ -13,7 +13,6 @@ export default s.route(contract.tool.upload.confirmUpload, async ({ body }) => { const toolIds = [...new Set(_toolIds)]; addLog.debug(`Confirming uploaded tools: ${toolIds}`); const pendingTools = await privateS3Server.getFiles(`${UploadToolsS3Path}/temp`); - addLog.debug(`Downloaded tools: ${pendingTools}`); const pendingToolIds = pendingTools .map((item) => item.split('/').at(-1)?.split('.').at(0)) .filter((item): item is string => !!item); From 4de01f0b5500e3b8d2d5c4139a441a4bb66ffc6f Mon Sep 17 00:00:00 2001 From: xqvvu Date: Tue, 6 Jan 2026 20:46:43 +0800 Subject: [PATCH 3/4] fix: remove log client when ensure public policy failed --- lib/s3/index.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/s3/index.ts b/lib/s3/index.ts index 15ca982b..40a66277 100644 --- a/lib/s3/index.ts +++ b/lib/s3/index.ts @@ -92,7 +92,6 @@ const createS3Service = async (bucket: string, isPublic: boolean) => { if (isPublic) await ensurePublicPolicy(client); } catch (error) { addLog.error(`Failed to ensure bucket "${bucket}" exists:`, error); - addLog.debug(`Storage client:`, client); } try { @@ -100,7 +99,6 @@ const createS3Service = async (bucket: string, isPublic: boolean) => { if (isPublic && externalClient) await ensurePublicPolicy(externalClient); } catch (error) { addLog.error(`Failed to ensure bucket "${bucket}" exists:`, error); - addLog.debug(`Storage client:`, externalClient); } return new S3Service(client, externalClient); From 5095811b0cd4822a1475c4f82b814aef35eccf1d Mon Sep 17 00:00:00 2001 From: xqvvu Date: Tue, 6 Jan 2026 21:53:31 +0800 Subject: [PATCH 4/4] fix: use minio client to delete files when using minio vendor --- bun.lock | 6 +++--- lib/package.json | 2 +- lib/s3/index.ts | 4 ++-- package.json | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/bun.lock b/bun.lock index 2880d8cb..0edf6a45 100644 --- a/bun.lock +++ b/bun.lock @@ -5,7 +5,7 @@ "": { "name": "fastgpt-plugins", "dependencies": { - "@fastgpt-sdk/storage": "^0.6.2", + "@fastgpt-sdk/storage": "^0.6.4", "@ts-rest/core": "3.52.1", "@ts-rest/express": "3.52.1", "@ts-rest/open-api": "3.52.1", @@ -42,7 +42,7 @@ "name": "@fastgpt-plugin/packages", "version": "1.0.0", "dependencies": { - "@fastgpt-sdk/storage": "0.6.2", + "@fastgpt-sdk/storage": "^0.6.4", "@opentelemetry/api": "^1.9.0", "@opentelemetry/api-logs": "^0.203.0", "@opentelemetry/exporter-logs-otlp-http": "^0.203.0", @@ -339,7 +339,7 @@ "@fastgpt-sdk/plugin": ["@fastgpt-sdk/plugin@workspace:sdk"], - "@fastgpt-sdk/storage": ["@fastgpt-sdk/storage@0.6.2", "", { "dependencies": { "@aws-sdk/client-s3": "^3.948.0", "@aws-sdk/lib-storage": "^3.948.0", "@aws-sdk/s3-request-presigner": "^3.952.0", "ali-oss": "^6.23.0", "cos-nodejs-sdk-v5": "^2.15.4", "es-toolkit": "^1.43.0", "minio": "^8.0.5", "vitest": "^4.0.16" } }, "sha512-n8dV7NIJuzRz+9Z33HxkN0CsHgh0rDGaZ1W3GJzeDVsdWvDeb+34Xi65XCnXImDs7Pe8RJd1nXLbLCT0uC7S4A=="], + "@fastgpt-sdk/storage": ["@fastgpt-sdk/storage@0.6.4", "", { "dependencies": { "@aws-sdk/client-s3": "^3.948.0", "@aws-sdk/lib-storage": "^3.948.0", "@aws-sdk/s3-request-presigner": "^3.952.0", "ali-oss": "^6.23.0", "cos-nodejs-sdk-v5": "^2.15.4", "es-toolkit": "^1.43.0", "minio": "^8.0.5", "vitest": "^4.0.16" } }, "sha512-3AfpomosObt+PD8c6v9cquTH8q4R0Jj5o7lgRt5lGcVkjImf3afraOsBRSdwgL/BXmgdN4qM4MIIxqGQEVwpIA=="], "@fastgpt/plugin-runtime": ["@fastgpt/plugin-runtime@workspace:runtime"], diff --git a/lib/package.json b/lib/package.json index 8f16df24..ea0e6ee1 100644 --- a/lib/package.json +++ b/lib/package.json @@ -4,7 +4,7 @@ "version": "1.0.0", "description": "FastGPT Plugins", "dependencies": { - "@fastgpt-sdk/storage": "0.6.2", + "@fastgpt-sdk/storage": "^0.6.4", "@opentelemetry/api": "^1.9.0", "@opentelemetry/api-logs": "^0.203.0", "@opentelemetry/exporter-logs-otlp-http": "^0.203.0", diff --git a/lib/s3/index.ts b/lib/s3/index.ts index 40a66277..de92d661 100644 --- a/lib/s3/index.ts +++ b/lib/s3/index.ts @@ -91,14 +91,14 @@ const createS3Service = async (bucket: string, isPublic: boolean) => { await client.ensureBucket(); if (isPublic) await ensurePublicPolicy(client); } catch (error) { - addLog.error(`Failed to ensure bucket "${bucket}" exists:`, error); + addLog.info(`Failed to ensure bucket "${bucket}" exists:`, { error }); } try { await externalClient?.ensureBucket(); if (isPublic && externalClient) await ensurePublicPolicy(externalClient); } catch (error) { - addLog.error(`Failed to ensure bucket "${bucket}" exists:`, error); + addLog.info(`Failed to ensure bucket "${bucket}" exists:`, { error }); } return new S3Service(client, externalClient); diff --git a/package.json b/package.json index 59850c68..2e1e9069 100644 --- a/package.json +++ b/package.json @@ -55,7 +55,7 @@ ] }, "dependencies": { - "@fastgpt-sdk/storage": "^0.6.2", + "@fastgpt-sdk/storage": "^0.6.4", "@ts-rest/core": "3.52.1", "@ts-rest/express": "3.52.1", "@ts-rest/open-api": "3.52.1",