From b41008c82b9099167421f45a5dc7191d76abac4f Mon Sep 17 00:00:00 2001 From: xqvvu Date: Fri, 12 Dec 2025 16:46:10 +0800 Subject: [PATCH 1/3] 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 1f859e383bb3784dee88237b5e1ae34223905c53 Mon Sep 17 00:00:00 2001 From: xqvvu Date: Tue, 6 Jan 2026 15:35:51 +0800 Subject: [PATCH 2/3] 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 62f5857de320d7a519794fcdc421f82f14ea582c Mon Sep 17 00:00:00 2001 From: xqvvu Date: Fri, 23 Jan 2026 18:11:14 +0800 Subject: [PATCH 3/3] chore: bump storage sdk version --- bun.lock | 9 ++++++--- lib/package.json | 2 +- lib/s3/config.ts | 2 +- lib/s3/index.ts | 2 +- package.json | 3 ++- 5 files changed, 11 insertions(+), 7 deletions(-) diff --git a/bun.lock b/bun.lock index baa005d5..981e6aec 100644 --- a/bun.lock +++ b/bun.lock @@ -5,13 +5,14 @@ "": { "name": "fastgpt-plugins", "dependencies": { - "@fastgpt-sdk/storage": "^0.6.6", + "@fastgpt-sdk/storage": "^0.6.14", "@ts-rest/core": "3.52.1", "@ts-rest/express": "3.52.1", "@ts-rest/open-api": "3.52.1", "@types/cheerio": "^0.22.35", "@types/marked": "^5.0.2", "cheerio": "^1.1.0", + "fastgpt-plugins": ".", "marked": "^17.0.1", "proxy-agent": "^6.5.0", }, @@ -42,7 +43,7 @@ "name": "@fastgpt-plugin/packages", "version": "1.0.0", "dependencies": { - "@fastgpt-sdk/storage": "^0.6.6", + "@fastgpt-sdk/storage": "^0.6.14", "@opentelemetry/api": "^1.9.0", "@opentelemetry/api-logs": "^0.203.0", "@opentelemetry/exporter-logs-otlp-http": "^0.203.0", @@ -342,7 +343,7 @@ "@fastgpt-sdk/plugin": ["@fastgpt-sdk/plugin@workspace:sdk"], - "@fastgpt-sdk/storage": ["@fastgpt-sdk/storage@0.6.6", "", { "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-nG+DWwyJS6upfEbJ+FgTc8CGhzpW1JiPEWGO1luhm6lgYRitm0HBBeX3m0j17lYTa2S0ZTDRGJgnXYzOWpYOLg=="], + "@fastgpt-sdk/storage": ["@fastgpt-sdk/storage@0.6.14", "", { "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-CR2Yn91itOJaz/92ApS155nnzV0YoW9AHMf4unRWKks7jRjoXoSRjlvMMrevOZ8goiAMRhL4DOvzVhUsDWopiw=="], "@fastgpt/plugin-runtime": ["@fastgpt/plugin-runtime@workspace:runtime"], @@ -1036,6 +1037,8 @@ "fast-xml-parser": ["fast-xml-parser@4.5.3", "", { "dependencies": { "strnum": "^1.1.1" }, "bin": { "fxparser": "src/cli/cli.js" } }, "sha512-RKihhV+SHsIUGXObeVy9AXiBbFwkVk7Syp8XgwN5U3JV416+Gwp/GO9i0JYKmikykgz/UHRrrV4ROuZEo/T0ig=="], + "fastgpt-plugins": ["fastgpt-plugins@root:", {}], + "fastq": ["fastq@1.19.1", "", { "dependencies": { "reusify": "^1.0.4" } }, "sha512-GwLTyxkCXjXbxqIhTsMI2Nui8huMPtnxg7krajPJAjnEG/iiOS7i+zCtWGZR9G0NBKbXKh6X9m9UIsYX/N6vvQ=="], "fdir": ["fdir@6.5.0", "", { "peerDependencies": { "picomatch": "^3 || ^4" }, "optionalPeers": ["picomatch"] }, "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg=="], diff --git a/lib/package.json b/lib/package.json index f66fb755..34f6972f 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.6", + "@fastgpt-sdk/storage": "^0.6.14", "@opentelemetry/api": "^1.9.0", "@opentelemetry/api-logs": "^0.203.0", "@opentelemetry/exporter-logs-otlp-http": "^0.203.0", diff --git a/lib/s3/config.ts b/lib/s3/config.ts index 001e4e82..391de736 100644 --- a/lib/s3/config.ts +++ b/lib/s3/config.ts @@ -27,7 +27,7 @@ export function createDefaultStorageOptions() { case 'minio': { return { vendor: 'minio', - forcePathStyle: true, + forcePathStyle: process.env.STORAGE_S3_FORCE_PATH_STYLE === 'true' ? true : false, externalBaseUrl: process.env.STORAGE_EXTERNAL_ENDPOINT || undefined, endpoint: process.env.STORAGE_S3_ENDPOINT || 'http://localhost:9000', region: process.env.STORAGE_REGION || 'us-east-1', diff --git a/lib/s3/index.ts b/lib/s3/index.ts index de92d661..43d0be07 100644 --- a/lib/s3/index.ts +++ b/lib/s3/index.ts @@ -31,7 +31,7 @@ const getConfig = () => { region, vendor, credentials, - forcePathStyle: vendor === 'minio' ? true : options.forcePathStyle, + forcePathStyle: options.forcePathStyle, endpoint: options.endpoint!, maxRetries: options.maxRetries! }; diff --git a/package.json b/package.json index 17d75c41..b0f478ea 100644 --- a/package.json +++ b/package.json @@ -55,13 +55,14 @@ ] }, "dependencies": { - "@fastgpt-sdk/storage": "^0.6.6", + "@fastgpt-sdk/storage": "^0.6.14", "@ts-rest/core": "3.52.1", "@ts-rest/express": "3.52.1", "@ts-rest/open-api": "3.52.1", "@types/cheerio": "^0.22.35", "@types/marked": "^5.0.2", "cheerio": "^1.1.0", + "fastgpt-plugins": ".", "marked": "^17.0.1", "proxy-agent": "^6.5.0" }