Skip to content

Commit 4e813fa

Browse files
sd0ric4sd0ric4
authored
Refactor package paths from 'packages/tool' to 'modules/tool' (#77)
* refactor: update package paths from 'packages/tool' to 'modules/tool' * fix: enable router and S3 server initialization in index.ts
1 parent 885afb2 commit 4e813fa

File tree

3 files changed

+47
-47
lines changed

3 files changed

+47
-47
lines changed

‎bun.lock

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"typescript": "^5.0.0",
3939
},
4040
},
41-
"packages/tool/packages/DingTalkWebhook": {
41+
"modules/tool/packages/DingTalkWebhook": {
4242
"name": "fastgpt-tools-DingTalkWebhook",
4343
"dependencies": {
4444
"zod": "^3.24.2",
@@ -50,7 +50,7 @@
5050
"typescript": "^5.0.0",
5151
},
5252
},
53-
"packages/tool/packages/Doc2X": {
53+
"modules/tool/packages/Doc2X": {
5454
"name": "doc2x",
5555
"dependencies": {
5656
"axios": "^1.9.0",
@@ -63,7 +63,7 @@
6363
"typescript": "^5.0.0",
6464
},
6565
},
66-
"packages/tool/packages/WeWorkWebhook": {
66+
"modules/tool/packages/WeWorkWebhook": {
6767
"name": "fastgpt-tools-WeWorkWebhook",
6868
"dependencies": {
6969
"zod": "^3.24.2",
@@ -75,7 +75,7 @@
7575
"typescript": "^5.0.0",
7676
},
7777
},
78-
"packages/tool/packages/arxiv": {
78+
"modules/tool/packages/arxiv": {
7979
"name": "fastgpt-tools-arxiv",
8080
"dependencies": {
8181
"node-fetch": "^3.3.2",
@@ -91,7 +91,7 @@
9191
"typescript": "^5.0.0",
9292
},
9393
},
94-
"packages/tool/packages/bing": {
94+
"modules/tool/packages/bing": {
9595
"name": "fastgpt-tools-bing",
9696
"dependencies": {
9797
"zod": "^3.24.2",
@@ -103,7 +103,7 @@
103103
"typescript": "^5.0.0",
104104
},
105105
},
106-
"packages/tool/packages/dalle3": {
106+
"modules/tool/packages/dalle3": {
107107
"name": "fastgpt-tools-dalle3",
108108
"dependencies": {
109109
"zod": "^3.24.2",
@@ -115,7 +115,7 @@
115115
"typescript": "^5.0.0",
116116
},
117117
},
118-
"packages/tool/packages/databaseConnection": {
118+
"modules/tool/packages/databaseConnection": {
119119
"name": "fastgpt-tools-database-connection",
120120
"dependencies": {
121121
"mssql": "^11.0.1",
@@ -132,7 +132,7 @@
132132
"typescript": "^5.0.0",
133133
},
134134
},
135-
"packages/tool/packages/delay": {
135+
"modules/tool/packages/delay": {
136136
"name": "fastgpt-tools-delay",
137137
"dependencies": {
138138
"zod": "^3.24.2",
@@ -144,7 +144,7 @@
144144
"typescript": "^5.0.0",
145145
},
146146
},
147-
"packages/tool/packages/drawing": {
147+
"modules/tool/packages/drawing": {
148148
"name": "drawing",
149149
"dependencies": {
150150
"echarts": "^5.6.0",
@@ -157,7 +157,7 @@
157157
"typescript": "^5.0.0",
158158
},
159159
},
160-
"packages/tool/packages/duckduckgo": {
160+
"modules/tool/packages/duckduckgo": {
161161
"name": "dockdockgo",
162162
"dependencies": {
163163
"duck-duck-scrape": "^2.2.7",
@@ -170,7 +170,7 @@
170170
"typescript": "^5.0.0",
171171
},
172172
},
173-
"packages/tool/packages/feishu": {
173+
"modules/tool/packages/feishu": {
174174
"name": "fastgpt-tools-feishu",
175175
"dependencies": {
176176
"zod": "^3.24.2",
@@ -182,7 +182,7 @@
182182
"typescript": "^5.0.0",
183183
},
184184
},
185-
"packages/tool/packages/fetchUrl": {
185+
"modules/tool/packages/fetchUrl": {
186186
"name": "fastgpt-tools-fetchUrl",
187187
"dependencies": {
188188
"axios": "^1.9.0",
@@ -199,7 +199,7 @@
199199
"typescript": "^5.0.0",
200200
},
201201
},
202-
"packages/tool/packages/firecrawl": {
202+
"modules/tool/packages/firecrawl": {
203203
"name": "fastgpt-tools-firecrawl",
204204
"dependencies": {
205205
"@mendable/firecrawl-js": "^1.27.0",
@@ -212,7 +212,7 @@
212212
"typescript": "^5.0.0",
213213
},
214214
},
215-
"packages/tool/packages/getTime": {
215+
"modules/tool/packages/getTime": {
216216
"name": "fastgpt-tools-get-current-time",
217217
"dependencies": {
218218
"zod": "^3.24.2",
@@ -224,7 +224,7 @@
224224
"typescript": "^5.0.0",
225225
},
226226
},
227-
"packages/tool/packages/github": {
227+
"modules/tool/packages/github": {
228228
"name": "fastgpt-tools-GitHub",
229229
"dependencies": {
230230
"zod": "^3.24.2",
@@ -236,7 +236,7 @@
236236
"typescript": "^5.0.0",
237237
},
238238
},
239-
"packages/tool/packages/google": {
239+
"modules/tool/packages/google": {
240240
"name": "fastgpt-tools-google",
241241
"dependencies": {
242242
"zod": "^3.24.2",
@@ -248,7 +248,7 @@
248248
"typescript": "^5.0.0",
249249
},
250250
},
251-
"packages/tool/packages/mathExprVal": {
251+
"modules/tool/packages/mathExprVal": {
252252
"name": "fastgpt-tools-mathExprVal",
253253
"dependencies": {
254254
"expr-eval": "^2.0.2",
@@ -261,7 +261,7 @@
261261
"typescript": "^5.0.0",
262262
},
263263
},
264-
"packages/tool/packages/searchApi": {
264+
"modules/tool/packages/searchApi": {
265265
"name": "fastgpt-tools-SearchApi",
266266
"dependencies": {
267267
"zod": "^3.24.2",
@@ -273,7 +273,7 @@
273273
"typescript": "^5.0.0",
274274
},
275275
},
276-
"packages/tool/packages/searchXNG": {
276+
"modules/tool/packages/searchXNG": {
277277
"name": "fastgpt-tools-searchXNG",
278278
"dependencies": {
279279
"cheerio": "^1.0.0",
@@ -286,7 +286,7 @@
286286
"typescript": "^5.0.0",
287287
},
288288
},
289-
"packages/tool/packages/silliconFlow": {
289+
"modules/tool/packages/silliconFlow": {
290290
"name": "fastgpt-tools-silliconFlow",
291291
"dependencies": {
292292
"zod": "^3.24.2",
@@ -298,7 +298,7 @@
298298
"typescript": "^5.0.0",
299299
},
300300
},
301-
"packages/tool/packages/smtpEmail": {
301+
"modules/tool/packages/smtpEmail": {
302302
"name": "fastgpt-tools-smtpEmail",
303303
"dependencies": {
304304
"nodemailer": "^7.0.3",
@@ -312,7 +312,7 @@
312312
"typescript": "^5.0.0",
313313
},
314314
},
315-
"packages/tool/packages/wiki": {
315+
"modules/tool/packages/wiki": {
316316
"name": "fastgpt-tools-wiki",
317317
"dependencies": {
318318
"wikijs": "^6.4.1",
@@ -327,7 +327,7 @@
327327
},
328328
"sdk": {
329329
"name": "@fastgpt-sdk/plugin",
330-
"version": "0.0.5",
330+
"version": "0.1.0",
331331
"dependencies": {
332332
"@ts-rest/core": "^3.52.1",
333333
"zod": "^3.25.40",
@@ -814,9 +814,9 @@
814814

815815
"depd": ["[email protected]", "", {}, "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw=="],
816816

817-
"doc2x": ["doc2x@workspace:packages/tool/packages/Doc2X"],
817+
"doc2x": ["doc2x@workspace:modules/tool/packages/Doc2X"],
818818

819-
"dockdockgo": ["dockdockgo@workspace:packages/tool/packages/duckduckgo"],
819+
"dockdockgo": ["dockdockgo@workspace:modules/tool/packages/duckduckgo"],
820820

821821
"dom-serializer": ["[email protected]", "https://registry.npmmirror.com/dom-serializer/-/dom-serializer-2.0.0.tgz", { "dependencies": { "domelementtype": "^2.3.0", "domhandler": "^5.0.2", "entities": "^4.2.0" } }, "sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg=="],
822822

@@ -826,7 +826,7 @@
826826

827827
"domutils": ["[email protected]", "https://registry.npmmirror.com/domutils/-/domutils-3.2.2.tgz", { "dependencies": { "dom-serializer": "^2.0.0", "domelementtype": "^2.3.0", "domhandler": "^5.0.3" } }, "sha512-6kZKyUajlDuqlHKVX1w7gyslj9MPIXzIFiz/rGu35uC1wMi+kMhQwGhl4lt9unC9Vb9INnY9Z3/ZA3+FhASLaw=="],
828828

829-
"drawing": ["drawing@workspace:packages/tool/packages/drawing"],
829+
"drawing": ["drawing@workspace:modules/tool/packages/drawing"],
830830

831831
"dts-bundle-generator": ["[email protected]", "", { "dependencies": { "typescript": ">=5.0.2", "yargs": "^17.6.0" }, "bin": { "dts-bundle-generator": "dist/bin/dts-bundle-generator.js" } }, "sha512-DxpJOb2FNnEyOzMkG11sxO2dmxPjthoVWxfKqWYJ/bI/rT1rvTMktF5EKjAYrRZu6Z6t3NhOUZ0sZ5ZXevOfbA=="],
832832

@@ -914,43 +914,43 @@
914914

915915
"fast-xml-parser": ["[email protected]", "", { "dependencies": { "strnum": "^1.1.1" }, "bin": { "fxparser": "src/cli/cli.js" } }, "sha512-RKihhV+SHsIUGXObeVy9AXiBbFwkVk7Syp8XgwN5U3JV416+Gwp/GO9i0JYKmikykgz/UHRrrV4ROuZEo/T0ig=="],
916916

917-
"fastgpt-tools-DingTalkWebhook": ["fastgpt-tools-DingTalkWebhook@workspace:packages/tool/packages/DingTalkWebhook"],
917+
"fastgpt-tools-DingTalkWebhook": ["fastgpt-tools-DingTalkWebhook@workspace:modules/tool/packages/DingTalkWebhook"],
918918

919-
"fastgpt-tools-GitHub": ["fastgpt-tools-GitHub@workspace:packages/tool/packages/github"],
919+
"fastgpt-tools-GitHub": ["fastgpt-tools-GitHub@workspace:modules/tool/packages/github"],
920920

921-
"fastgpt-tools-SearchApi": ["fastgpt-tools-SearchApi@workspace:packages/tool/packages/searchApi"],
921+
"fastgpt-tools-SearchApi": ["fastgpt-tools-SearchApi@workspace:modules/tool/packages/searchApi"],
922922

923-
"fastgpt-tools-WeWorkWebhook": ["fastgpt-tools-WeWorkWebhook@workspace:packages/tool/packages/WeWorkWebhook"],
923+
"fastgpt-tools-WeWorkWebhook": ["fastgpt-tools-WeWorkWebhook@workspace:modules/tool/packages/WeWorkWebhook"],
924924

925-
"fastgpt-tools-arxiv": ["fastgpt-tools-arxiv@workspace:packages/tool/packages/arxiv"],
925+
"fastgpt-tools-arxiv": ["fastgpt-tools-arxiv@workspace:modules/tool/packages/arxiv"],
926926

927-
"fastgpt-tools-bing": ["fastgpt-tools-bing@workspace:packages/tool/packages/bing"],
927+
"fastgpt-tools-bing": ["fastgpt-tools-bing@workspace:modules/tool/packages/bing"],
928928

929-
"fastgpt-tools-dalle3": ["fastgpt-tools-dalle3@workspace:packages/tool/packages/dalle3"],
929+
"fastgpt-tools-dalle3": ["fastgpt-tools-dalle3@workspace:modules/tool/packages/dalle3"],
930930

931-
"fastgpt-tools-database-connection": ["fastgpt-tools-database-connection@workspace:packages/tool/packages/databaseConnection"],
931+
"fastgpt-tools-database-connection": ["fastgpt-tools-database-connection@workspace:modules/tool/packages/databaseConnection"],
932932

933-
"fastgpt-tools-delay": ["fastgpt-tools-delay@workspace:packages/tool/packages/delay"],
933+
"fastgpt-tools-delay": ["fastgpt-tools-delay@workspace:modules/tool/packages/delay"],
934934

935-
"fastgpt-tools-feishu": ["fastgpt-tools-feishu@workspace:packages/tool/packages/feishu"],
935+
"fastgpt-tools-feishu": ["fastgpt-tools-feishu@workspace:modules/tool/packages/feishu"],
936936

937-
"fastgpt-tools-fetchUrl": ["fastgpt-tools-fetchUrl@workspace:packages/tool/packages/fetchUrl"],
937+
"fastgpt-tools-fetchUrl": ["fastgpt-tools-fetchUrl@workspace:modules/tool/packages/fetchUrl"],
938938

939-
"fastgpt-tools-firecrawl": ["fastgpt-tools-firecrawl@workspace:packages/tool/packages/firecrawl"],
939+
"fastgpt-tools-firecrawl": ["fastgpt-tools-firecrawl@workspace:modules/tool/packages/firecrawl"],
940940

941-
"fastgpt-tools-get-current-time": ["fastgpt-tools-get-current-time@workspace:packages/tool/packages/getTime"],
941+
"fastgpt-tools-get-current-time": ["fastgpt-tools-get-current-time@workspace:modules/tool/packages/getTime"],
942942

943-
"fastgpt-tools-google": ["fastgpt-tools-google@workspace:packages/tool/packages/google"],
943+
"fastgpt-tools-google": ["fastgpt-tools-google@workspace:modules/tool/packages/google"],
944944

945-
"fastgpt-tools-mathExprVal": ["fastgpt-tools-mathExprVal@workspace:packages/tool/packages/mathExprVal"],
945+
"fastgpt-tools-mathExprVal": ["fastgpt-tools-mathExprVal@workspace:modules/tool/packages/mathExprVal"],
946946

947-
"fastgpt-tools-searchXNG": ["fastgpt-tools-searchXNG@workspace:packages/tool/packages/searchXNG"],
947+
"fastgpt-tools-searchXNG": ["fastgpt-tools-searchXNG@workspace:modules/tool/packages/searchXNG"],
948948

949-
"fastgpt-tools-silliconFlow": ["fastgpt-tools-silliconFlow@workspace:packages/tool/packages/silliconFlow"],
949+
"fastgpt-tools-silliconFlow": ["fastgpt-tools-silliconFlow@workspace:modules/tool/packages/silliconFlow"],
950950

951-
"fastgpt-tools-smtpEmail": ["fastgpt-tools-smtpEmail@workspace:packages/tool/packages/smtpEmail"],
951+
"fastgpt-tools-smtpEmail": ["fastgpt-tools-smtpEmail@workspace:modules/tool/packages/smtpEmail"],
952952

953-
"fastgpt-tools-wiki": ["fastgpt-tools-wiki@workspace:packages/tool/packages/wiki"],
953+
"fastgpt-tools-wiki": ["fastgpt-tools-wiki@workspace:modules/tool/packages/wiki"],
954954

955955
"fastq": ["[email protected]", "", { "dependencies": { "reusify": "^1.0.4" } }, "sha512-GwLTyxkCXjXbxqIhTsMI2Nui8huMPtnxg7krajPJAjnEG/iiOS7i+zCtWGZR9G0NBKbXKh6X9m9UIsYX/N6vvQ=="],
956956

‎scripts/newTool/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ if (name.length > 20) {
3535
}
3636

3737
// 1. Create directory
38-
const toolDir = path.join(process.cwd(), 'packages', 'tool', 'packages', name);
38+
const toolDir = path.join(process.cwd(), 'modules', 'tool', 'packages', name);
3939
if (fs.existsSync(toolDir)) {
4040
console.error('Tool already exists');
4141
process.exit(1);

‎src/worker/worker.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ console.log = (...args: any[]) => {
1515

1616
const basePath = isProd
1717
? process.env.TOOLS_DIR || path.join(process.cwd(), 'dist', 'tools')
18-
: path.join(process.cwd(), 'packages', 'tool', 'packages');
18+
: path.join(process.cwd(), 'modules', 'tool', 'packages');
1919

2020
parentPort?.on('message', async (params: Main2WorkerMessageType) => {
2121
const { type, data } = params;

0 commit comments

Comments
 (0)