llm-content-creator 0.1.0 → 0.1.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/application/workflow/SyncExecutor.d.ts.map +1 -1
- package/dist/application/workflow/SyncExecutor.js +1 -0
- package/dist/application/workflow/SyncExecutor.js.map +1 -1
- package/dist/config/index.d.ts +2 -2
- package/dist/config/index.js +3 -3
- package/dist/config/index.js.map +1 -1
- package/dist/domain/repositories/TaskRepository.d.ts +1 -0
- package/dist/domain/repositories/TaskRepository.d.ts.map +1 -1
- package/dist/infrastructure/database/MemoryTaskRepository.d.ts +17 -1
- package/dist/infrastructure/database/MemoryTaskRepository.d.ts.map +1 -1
- package/dist/infrastructure/database/MemoryTaskRepository.js +76 -1
- package/dist/infrastructure/database/MemoryTaskRepository.js.map +1 -1
- package/dist/infrastructure/database/SQLiteQualityCheckRepository.d.ts +27 -0
- package/dist/infrastructure/database/SQLiteQualityCheckRepository.d.ts.map +1 -0
- package/dist/infrastructure/database/SQLiteQualityCheckRepository.js +80 -0
- package/dist/infrastructure/database/SQLiteQualityCheckRepository.js.map +1 -0
- package/dist/infrastructure/database/SQLiteResultRepository.d.ts +31 -0
- package/dist/infrastructure/database/SQLiteResultRepository.d.ts.map +1 -0
- package/dist/infrastructure/database/SQLiteResultRepository.js +77 -0
- package/dist/infrastructure/database/SQLiteResultRepository.js.map +1 -0
- package/dist/infrastructure/database/SQLiteTaskRepository.d.ts +12 -0
- package/dist/infrastructure/database/SQLiteTaskRepository.d.ts.map +1 -1
- package/dist/infrastructure/database/SQLiteTaskRepository.js +69 -2
- package/dist/infrastructure/database/SQLiteTaskRepository.js.map +1 -1
- package/dist/infrastructure/database/index.d.ts +23 -2
- package/dist/infrastructure/database/index.d.ts.map +1 -1
- package/dist/infrastructure/database/index.js +33 -2
- package/dist/infrastructure/database/index.js.map +1 -1
- package/dist/infrastructure/redis/connection.d.ts.map +1 -1
- package/dist/infrastructure/redis/connection.js +14 -3
- package/dist/infrastructure/redis/connection.js.map +1 -1
- package/dist/presentation/cli/commands/cancel.d.ts.map +1 -1
- package/dist/presentation/cli/commands/cancel.js +1 -0
- package/dist/presentation/cli/commands/cancel.js.map +1 -1
- package/dist/presentation/cli/commands/create.d.ts.map +1 -1
- package/dist/presentation/cli/commands/create.js +29 -14
- package/dist/presentation/cli/commands/create.js.map +1 -1
- package/dist/presentation/cli/commands/list.d.ts +8 -0
- package/dist/presentation/cli/commands/list.d.ts.map +1 -0
- package/dist/presentation/cli/commands/list.js +154 -0
- package/dist/presentation/cli/commands/list.js.map +1 -0
- package/dist/presentation/cli/commands/result.d.ts.map +1 -1
- package/dist/presentation/cli/commands/result.js +33 -3
- package/dist/presentation/cli/commands/result.js.map +1 -1
- package/dist/presentation/cli/commands/retry.d.ts +8 -0
- package/dist/presentation/cli/commands/retry.d.ts.map +1 -0
- package/dist/presentation/cli/commands/retry.js +203 -0
- package/dist/presentation/cli/commands/retry.js.map +1 -0
- package/dist/presentation/cli/commands/status.d.ts.map +1 -1
- package/dist/presentation/cli/commands/status.js +3 -2
- package/dist/presentation/cli/commands/status.js.map +1 -1
- package/dist/presentation/cli/index.js +4 -0
- package/dist/presentation/cli/index.js.map +1 -1
- package/dist/presentation/cli/utils/cleanup.d.ts +1 -3
- package/dist/presentation/cli/utils/cleanup.d.ts.map +1 -1
- package/dist/presentation/cli/utils/cleanup.js.map +1 -1
- package/dist/presentation/monitor-cli.js +2 -4
- package/dist/presentation/monitor-cli.js.map +1 -1
- package/dist/presentation/worker-cli.js +8 -5
- package/dist/presentation/worker-cli.js.map +1 -1
- package/dist/schedulers/TaskScheduler.d.ts.map +1 -1
- package/dist/schedulers/TaskScheduler.js +13 -5
- package/dist/schedulers/TaskScheduler.js.map +1 -1
- package/dist/workers/TaskWorker.d.ts.map +1 -1
- package/dist/workers/TaskWorker.js +39 -21
- package/dist/workers/TaskWorker.js.map +1 -1
- package/docs/cli-reference.md +623 -0
- package/docs/quick-start.md +47 -0
- package/docs/user-guide.md +191 -24
- package/package.json +3 -1
- package/src/application/workflow/SyncExecutor.ts +1 -0
- package/src/config/index.ts +3 -3
- package/src/domain/repositories/TaskRepository.ts +1 -0
- package/src/infrastructure/database/MemoryTaskRepository.ts +89 -1
- package/src/infrastructure/database/SQLiteQualityCheckRepository.ts +102 -0
- package/src/infrastructure/database/SQLiteResultRepository.ts +95 -0
- package/src/infrastructure/database/SQLiteTaskRepository.ts +80 -2
- package/src/infrastructure/database/index.ts +39 -2
- package/src/infrastructure/redis/connection.ts +16 -3
- package/src/presentation/cli/commands/cancel.ts +1 -0
- package/src/presentation/cli/commands/create.ts +30 -14
- package/src/presentation/cli/commands/list.ts +172 -0
- package/src/presentation/cli/commands/result.ts +33 -3
- package/src/presentation/cli/commands/retry.ts +241 -0
- package/src/presentation/cli/commands/status.ts +3 -2
- package/src/presentation/cli/index.ts +4 -0
- package/src/presentation/cli/utils/cleanup.ts +1 -1
- package/src/presentation/monitor-cli.ts +2 -4
- package/src/presentation/worker-cli.ts +8 -5
- package/src/schedulers/TaskScheduler.ts +13 -5
- package/src/workers/TaskWorker.ts +47 -22
|
@@ -5,10 +5,9 @@
|
|
|
5
5
|
* 启动 TaskWorker 处理任务
|
|
6
6
|
*/
|
|
7
7
|
import { Command } from 'commander';
|
|
8
|
-
|
|
9
|
-
import { createTaskWorker } from '
|
|
10
|
-
|
|
11
|
-
import { createLogger } from '../../infrastructure/logging/logger';
|
|
8
|
+
import { v4 as uuidv4 } from 'uuid';
|
|
9
|
+
import { createTaskWorker } from '../workers/TaskWorker.js';
|
|
10
|
+
import { createLogger } from '../infrastructure/logging/logger.js';
|
|
12
11
|
const logger = createLogger('WorkerCLI');
|
|
13
12
|
const program = new Command();
|
|
14
13
|
program
|
|
@@ -18,7 +17,7 @@ program
|
|
|
18
17
|
program
|
|
19
18
|
.command('start')
|
|
20
19
|
.description('启动 Worker')
|
|
21
|
-
.option('-w, --worker-id <id>', 'Worker ID', process.env.WORKER_ID || `worker-${
|
|
20
|
+
.option('-w, --worker-id <id>', 'Worker ID', process.env.WORKER_ID || `worker-${uuidv4()}`)
|
|
22
21
|
.option('-c, --concurrency <number>', '并发数', '2')
|
|
23
22
|
.action(async (options) => {
|
|
24
23
|
try {
|
|
@@ -44,6 +43,10 @@ program
|
|
|
44
43
|
}
|
|
45
44
|
catch (error) {
|
|
46
45
|
logger.error('Failed to start worker', error);
|
|
46
|
+
console.error('Detailed error:', error);
|
|
47
|
+
if (error instanceof Error) {
|
|
48
|
+
console.error('Stack trace:', error.stack);
|
|
49
|
+
}
|
|
47
50
|
process.exit(1);
|
|
48
51
|
}
|
|
49
52
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worker-cli.js","sourceRoot":"","sources":["../../src/presentation/worker-cli.ts"],"names":[],"mappings":";AACA;;;;GAIG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,
|
|
1
|
+
{"version":3,"file":"worker-cli.js","sourceRoot":"","sources":["../../src/presentation/worker-cli.ts"],"names":[],"mappings":";AACA;;;;GAIG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,EAAE,IAAI,MAAM,EAAE,MAAM,MAAM,CAAC;AACpC,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,qCAAqC,CAAC;AAEnE,MAAM,MAAM,GAAG,YAAY,CAAC,WAAW,CAAC,CAAC;AACzC,MAAM,OAAO,GAAG,IAAI,OAAO,EAAE,CAAC;AAE9B,OAAO;KACJ,IAAI,CAAC,QAAQ,CAAC;KACd,WAAW,CAAC,6BAA6B,CAAC;KAC1C,OAAO,CAAC,OAAO,CAAC,CAAC;AAEpB,OAAO;KACJ,OAAO,CAAC,OAAO,CAAC;KAChB,WAAW,CAAC,WAAW,CAAC;KACxB,MAAM,CAAC,sBAAsB,EAAE,WAAW,EAAE,OAAO,CAAC,GAAG,CAAC,SAAS,IAAI,UAAU,MAAM,EAAE,EAAE,CAAC;KAC1F,MAAM,CAAC,4BAA4B,EAAE,KAAK,EAAE,GAAG,CAAC;KAChD,MAAM,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;IACxB,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,gBAAgB,CAC7B,OAAO,CAAC,QAAQ,EAChB,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,CAC9B,CAAC;QAEF,MAAM,CAAC,IAAI,CAAC,iBAAiB,EAAE;YAC7B,QAAQ,EAAE,OAAO,CAAC,QAAQ;YAC1B,WAAW,EAAE,OAAO,CAAC,WAAW;SACjC,CAAC,CAAC;QAEH,MAAM,MAAM,CAAC,KAAK,EAAE,CAAC;QAErB,SAAS;QACT,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,KAAK,IAAI,EAAE;YAC/B,MAAM,CAAC,IAAI,CAAC,wCAAwC,CAAC,CAAC;YACtD,MAAM,MAAM,CAAC,KAAK,EAAE,CAAC;YACrB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC,CAAC,CAAC;QAEH,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,KAAK,IAAI,EAAE;YAC9B,MAAM,CAAC,IAAI,CAAC,uCAAuC,CAAC,CAAC;YACrD,MAAM,MAAM,CAAC,KAAK,EAAE,CAAC;YACrB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC,CAAC,CAAC;QAEH,SAAS;QACT,MAAM,CAAC,IAAI,CAAC,sCAAsC,CAAC,CAAC;IACtD,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,CAAC,KAAK,CAAC,wBAAwB,EAAE,KAAc,CAAC,CAAC;QACvD,OAAO,CAAC,KAAK,CAAC,iBAAiB,EAAE,KAAK,CAAC,CAAC;QACxC,IAAI,KAAK,YAAY,KAAK,EAAE,CAAC;YAC3B,OAAO,CAAC,KAAK,CAAC,cAAc,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;QAC7C,CAAC;QACD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;AACH,CAAC,CAAC,CAAC;AAEL,OAAO,CAAC,KAAK,EAAE,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TaskScheduler.d.ts","sourceRoot":"","sources":["../../src/schedulers/TaskScheduler.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAWH;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC;IACvB,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,MAAM,CAAC;IACrB,eAAe,CAAC,EAAE;QAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;KACrB,CAAC;IACF,UAAU,CAAC,EAAE,IAAI,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED;;GAEG;AACH,MAAM,WAAW,uBAAuB;IACtC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,KAAK,CAAC;QACX,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC;QACvB,KAAK,EAAE,MAAM,CAAC;QACd,YAAY,EAAE,MAAM,CAAC;QACrB,eAAe,CAAC,EAAE;YAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;YAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;YAClB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;SACrB,CAAC;KACH,CAAC,CAAC;CACJ;AAED;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,SAAS,GAAG,WAAW,CAAC;IAChC,WAAW,CAAC,EAAE,IAAI,CAAC;CACpB;AAED;;;;GAIG;AACH,qBAAa,aAAa;IACxB,OAAO,CAAC,KAAK,CAAqB;IAClC,OAAO,CAAC,UAAU,CAA0B;IAC5C,OAAO,CAAC,WAAW,CAAS;IAE5B;;OAEG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAejC;;OAEG;YACW,iBAAiB;IAM/B;;OAEG;IACG,YAAY,CAAC,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"TaskScheduler.d.ts","sourceRoot":"","sources":["../../src/schedulers/TaskScheduler.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAWH;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC;IACvB,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,MAAM,CAAC;IACrB,eAAe,CAAC,EAAE;QAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;KACrB,CAAC;IACF,UAAU,CAAC,EAAE,IAAI,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED;;GAEG;AACH,MAAM,WAAW,uBAAuB;IACtC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,KAAK,CAAC;QACX,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC;QACvB,KAAK,EAAE,MAAM,CAAC;QACd,YAAY,EAAE,MAAM,CAAC;QACrB,eAAe,CAAC,EAAE;YAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;YAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;YAClB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;SACrB,CAAC;KACH,CAAC,CAAC;CACJ;AAED;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,SAAS,GAAG,WAAW,CAAC;IAChC,WAAW,CAAC,EAAE,IAAI,CAAC;CACpB;AAED;;;;GAIG;AACH,qBAAa,aAAa;IACxB,OAAO,CAAC,KAAK,CAAqB;IAClC,OAAO,CAAC,UAAU,CAA0B;IAC5C,OAAO,CAAC,WAAW,CAAS;IAE5B;;OAEG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAejC;;OAEG;YACW,iBAAiB;IAM/B;;OAEG;IACG,YAAY,CAAC,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,MAAM,CAAC;IAgG/D;;OAEG;IACG,kBAAkB,CACtB,OAAO,EAAE,uBAAuB,GAC/B,OAAO,CAAC,MAAM,EAAE,CAAC;IA6BpB;;OAEG;IACH,OAAO,CAAC,mBAAmB;IAsB3B;;OAEG;IACG,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IA+BlD;;OAEG;IACG,aAAa,IAAI,OAAO,CAAC;QAC7B,OAAO,EAAE,MAAM,CAAC;QAChB,MAAM,EAAE,MAAM,CAAC;QACf,SAAS,EAAE,MAAM,CAAC;QAClB,MAAM,EAAE,MAAM,CAAC;QACf,OAAO,EAAE,MAAM,CAAC;QAChB,MAAM,EAAE,MAAM,CAAC;KAChB,CAAC;IAKF;;OAEG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;CAO7B;AAED;;GAEG;AACH,wBAAsB,mBAAmB,IAAI,OAAO,CAAC,aAAa,CAAC,CAIlE"}
|
|
@@ -71,7 +71,17 @@ export class TaskScheduler {
|
|
|
71
71
|
updatedAt: new Date(),
|
|
72
72
|
};
|
|
73
73
|
// 4. 保存到数据库
|
|
74
|
-
await this.repository.create(
|
|
74
|
+
await this.repository.create({
|
|
75
|
+
id: task.id,
|
|
76
|
+
traceId: undefined,
|
|
77
|
+
mode: task.mode,
|
|
78
|
+
type: task.type || 'article',
|
|
79
|
+
topic: task.topic,
|
|
80
|
+
requirements: task.requirements,
|
|
81
|
+
hardConstraints: task.hardConstraints,
|
|
82
|
+
priority: task.priority,
|
|
83
|
+
maxRetries: 3,
|
|
84
|
+
});
|
|
75
85
|
logger.info('Task created', {
|
|
76
86
|
taskId,
|
|
77
87
|
mode: request.mode,
|
|
@@ -192,10 +202,8 @@ export class TaskScheduler {
|
|
|
192
202
|
});
|
|
193
203
|
return false;
|
|
194
204
|
}
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
updatedAt: new Date().toISOString(),
|
|
198
|
-
});
|
|
205
|
+
// 使用 delete 方法标记任务为已取消
|
|
206
|
+
await this.repository.delete(taskId);
|
|
199
207
|
logger.info('Task cancelled', { taskId });
|
|
200
208
|
return true;
|
|
201
209
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TaskScheduler.js","sourceRoot":"","sources":["../../src/schedulers/TaskScheduler.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,EAAE,IAAI,MAAM,EAAE,MAAM,MAAM,CAAC;AACpC,OAAO,EAAE,eAAe,EAAE,MAAM,sCAAsC,CAAC;AACvE,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAC3E,OAAO,EAAE,YAAY,EAAE,MAAM,qCAAqC,CAAC;AAInE,MAAM,MAAM,GAAG,YAAY,CAAC,eAAe,CAAC,CAAC;AA6C7C;;;;GAIG;AACH,MAAM,OAAO,aAAa;IAChB,KAAK,GAAG,eAAe,EAAE,CAAC;IAC1B,UAAU,GAAG,oBAAoB,EAAE,CAAC;IACpC,WAAW,GAAG,KAAK,CAAC;IAE5B;;OAEG;IACH,KAAK,CAAC,UAAU;QACd,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;YACrB,OAAO;QACT,CAAC;QAED,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,KAAK,CAAC;YACjB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;YACxB,MAAM,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAC;QAC3C,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,KAAK,CAAC,oCAAoC,EAAE,KAAc,CAAC,CAAC;YACnE,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;IAED;;OAEG;IACK,KAAK,CAAC,iBAAiB;QAC7B,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;YACtB,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC;QAC1B,CAAC;IACH,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,YAAY,CAAC,OAA0B;QAC3C,MAAM,IAAI,CAAC,iBAAiB,EAAE,CAAC;QAE/B,IAAI,CAAC;YACH,YAAY;YACZ,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC;YAElC,aAAa;YACb,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC;YAExB,YAAY;YACZ,MAAM,IAAI,GAAkB;gBAC1B,EAAE,EAAE,MAAM;gBACV,MAAM,EAAE,MAAM;gBACd,IAAI,EAAE,OAAO,CAAC,IAAW;gBACzB,IAAI,EAAE,SAAgB;gBACtB,KAAK,EAAE,OAAO,CAAC,KAAK;gBACpB,YAAY,EAAE,OAAO,CAAC,YAAY;gBAClC,eAAe,EAAE,OAAO,CAAC,eAAe;gBACxC,MAAM,EAAE,SAAgB;gBACxB,QAAQ,EAAE,CAAC;gBACX,OAAO,EAAE,CAAC;gBACV,cAAc,EAAE,CAAC;gBACjB,eAAe,EAAE,CAAC;gBAClB,cAAc,EAAE,SAAS;gBACzB,SAAS,EAAE,IAAI,IAAI,EAAE;gBACrB,SAAS,EAAE,IAAI,IAAI,EAAE;aACtB,CAAC;YAEF,YAAY;YACZ,MAAM,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,IAAY,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"TaskScheduler.js","sourceRoot":"","sources":["../../src/schedulers/TaskScheduler.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TaskWorker.d.ts","sourceRoot":"","sources":["../../src/workers/TaskWorker.ts"],"names":[],"mappings":"AAAA;;;;GAIG;
|
|
1
|
+
{"version":3,"file":"TaskWorker.d.ts","sourceRoot":"","sources":["../../src/workers/TaskWorker.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAaH;;;;GAIG;AACH,qBAAa,UAAU;IACrB,OAAO,CAAC,MAAM,CAAoC;IAClD,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,UAAU,CAA0B;gBAEhC,QAAQ,EAAE,MAAM,EAAE,WAAW,GAAE,MAAU;IAKrD;;OAEG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAmC5B;;OAEG;YACW,UAAU;IA0IxB;;OAEG;IACH,OAAO,CAAC,mBAAmB;IA+C3B;;OAEG;IACG,QAAQ,IAAI,OAAO,CAAC;QACxB,SAAS,EAAE,OAAO,CAAC;QACnB,SAAS,EAAE,OAAO,CAAC;KACpB,CAAC;IAcF;;OAEG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAS5B;;OAEG;IACG,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAS7B;;OAEG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAW5B;;OAEG;IACH,WAAW,IAAI,MAAM;IAIrB;;OAEG;IACH,cAAc,IAAI,MAAM;CAGzB;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAC9B,QAAQ,CAAC,EAAE,MAAM,EACjB,WAAW,CAAC,EAAE,MAAM,GACnB,UAAU,CAGZ"}
|
|
@@ -4,9 +4,10 @@
|
|
|
4
4
|
* 从队列获取任务并执行工作流逻辑
|
|
5
5
|
*/
|
|
6
6
|
import { Worker, Job } from 'bullmq';
|
|
7
|
+
import { v4 as uuidv4 } from 'uuid';
|
|
7
8
|
import { getRedisClient } from '../infrastructure/redis/connection.js';
|
|
8
|
-
import { createTaskRepository } from '../infrastructure/database/index.js';
|
|
9
|
-
import {
|
|
9
|
+
import { createTaskRepository, createResultRepository } from '../infrastructure/database/index.js';
|
|
10
|
+
import { createContentCreatorGraph, createInitialState } from '../domain/workflow/index.js';
|
|
10
11
|
import { createLogger } from '../infrastructure/logging/logger.js';
|
|
11
12
|
import { ExecutionMode } from '../domain/entities/Task.js';
|
|
12
13
|
const logger = createLogger('TaskWorker');
|
|
@@ -67,17 +68,24 @@ export class TaskWorker {
|
|
|
67
68
|
});
|
|
68
69
|
// 更新任务进度
|
|
69
70
|
await job.updateProgress(0);
|
|
71
|
+
let task = null;
|
|
70
72
|
try {
|
|
71
73
|
// 1. 抢占任务（使用乐观锁）
|
|
72
|
-
|
|
74
|
+
task = await this.repository.findById(data.taskId);
|
|
75
|
+
if (!task) {
|
|
76
|
+
throw new Error(`Task not found: ${data.taskId}`);
|
|
77
|
+
}
|
|
78
|
+
const claimed = await this.repository.claimTask(data.taskId, this.workerId, task.version);
|
|
73
79
|
if (!claimed) {
|
|
74
|
-
throw new Error(`Failed to claim task ${data.taskId}`);
|
|
80
|
+
throw new Error(`Failed to claim task ${data.taskId} (version mismatch or already claimed)`);
|
|
75
81
|
}
|
|
82
|
+
// 更新任务版本号（claimTask 会将版本号 +1）
|
|
83
|
+
task.version = task.version + 1;
|
|
76
84
|
logger.info('Task claimed', { taskId: data.taskId });
|
|
77
85
|
// 更新进度 10%
|
|
78
86
|
await job.updateProgress(10);
|
|
79
87
|
// 2. 创建工作流图
|
|
80
|
-
const graph =
|
|
88
|
+
const graph = createContentCreatorGraph();
|
|
81
89
|
// 3. 创建初始状态
|
|
82
90
|
const initialState = createInitialState({
|
|
83
91
|
taskId: data.taskId,
|
|
@@ -96,16 +104,28 @@ export class TaskWorker {
|
|
|
96
104
|
// 更新进度 90%
|
|
97
105
|
await job.updateProgress(90);
|
|
98
106
|
// 5. 保存结果
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
107
|
+
const resultRepo = createResultRepository();
|
|
108
|
+
if (result.articleContent) {
|
|
109
|
+
await resultRepo.create({
|
|
110
|
+
taskId: data.taskId,
|
|
111
|
+
resultType: 'article',
|
|
112
|
+
content: result.articleContent,
|
|
113
|
+
metadata: {
|
|
114
|
+
wordCount: result.articleContent.length,
|
|
115
|
+
},
|
|
116
|
+
});
|
|
117
|
+
}
|
|
118
|
+
if (result.images && result.images.length > 0) {
|
|
119
|
+
for (const image of result.images) {
|
|
120
|
+
await resultRepo.create({
|
|
121
|
+
taskId: data.taskId,
|
|
122
|
+
resultType: 'image',
|
|
123
|
+
content: image.url,
|
|
124
|
+
metadata: image.metadata,
|
|
125
|
+
});
|
|
126
|
+
}
|
|
127
|
+
}
|
|
128
|
+
await this.repository.markAsCompleted(data.taskId, task.version);
|
|
109
129
|
const duration = Date.now() - startTime;
|
|
110
130
|
logger.info('Job completed successfully', {
|
|
111
131
|
jobId: job.id,
|
|
@@ -130,11 +150,9 @@ export class TaskWorker {
|
|
|
130
150
|
});
|
|
131
151
|
// 保存错误信息
|
|
132
152
|
try {
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
completedAt: new Date().toISOString(),
|
|
137
|
-
});
|
|
153
|
+
if (task) {
|
|
154
|
+
await this.repository.markAsFailed(data.taskId, errorMessage, task.version);
|
|
155
|
+
}
|
|
138
156
|
}
|
|
139
157
|
catch (updateError) {
|
|
140
158
|
logger.error('Failed to update task error status', updateError, {
|
|
@@ -250,7 +268,7 @@ export class TaskWorker {
|
|
|
250
268
|
* 创建 TaskWorker 实例
|
|
251
269
|
*/
|
|
252
270
|
export function createTaskWorker(workerId, concurrency) {
|
|
253
|
-
const id = workerId || process.env.WORKER_ID || `worker-${
|
|
271
|
+
const id = workerId || process.env.WORKER_ID || `worker-${uuidv4()}`;
|
|
254
272
|
return new TaskWorker(id, concurrency);
|
|
255
273
|
}
|
|
256
274
|
//# sourceMappingURL=TaskWorker.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TaskWorker.js","sourceRoot":"","sources":["../../src/workers/TaskWorker.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAC;AACrC,OAAO,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAC;AACvE,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;
|
|
1
|
+
{"version":3,"file":"TaskWorker.js","sourceRoot":"","sources":["../../src/workers/TaskWorker.ts"],"names":[],"mappings":"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"}
|