@spinajs/tasks 2.0.556 → 3.0.0
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/README.md +8 -8
- package/lib/cjs/config/tasks.d.ts +0 -5
- package/lib/cjs/config/tasks.d.ts.map +1 -1
- package/lib/cjs/config/tasks.js +0 -14
- package/lib/cjs/config/tasks.js.map +1 -1
- package/lib/cjs/decorators.d.ts.map +1 -1
- package/lib/cjs/decorators.js +23 -11
- package/lib/cjs/decorators.js.map +1 -1
- package/lib/cjs/index.d.ts +2 -0
- package/lib/cjs/index.d.ts.map +1 -1
- package/lib/cjs/index.js +2 -0
- package/lib/cjs/index.js.map +1 -1
- package/lib/cjs/migrations/Task_2024_12_03_11_41_00.d.ts +1 -1
- package/lib/cjs/migrations/Task_2024_12_03_11_41_00.d.ts.map +1 -1
- package/lib/cjs/migrations/Task_2024_12_03_11_41_00.js +7 -4
- package/lib/cjs/migrations/Task_2024_12_03_11_41_00.js.map +1 -1
- package/lib/mjs/config/tasks.d.ts +0 -5
- package/lib/mjs/config/tasks.d.ts.map +1 -1
- package/lib/mjs/config/tasks.js +0 -14
- package/lib/mjs/config/tasks.js.map +1 -1
- package/lib/mjs/decorators.d.ts.map +1 -1
- package/lib/mjs/decorators.js +23 -11
- package/lib/mjs/decorators.js.map +1 -1
- package/lib/mjs/index.d.ts +2 -0
- package/lib/mjs/index.d.ts.map +1 -1
- package/lib/mjs/index.js +2 -0
- package/lib/mjs/index.js.map +1 -1
- package/lib/mjs/migrations/Task_2024_12_03_11_41_00.d.ts +1 -1
- package/lib/mjs/migrations/Task_2024_12_03_11_41_00.d.ts.map +1 -1
- package/lib/mjs/migrations/Task_2024_12_03_11_41_00.js +7 -4
- package/lib/mjs/migrations/Task_2024_12_03_11_41_00.js.map +1 -1
- package/lib/tsconfig.cjs.tsbuildinfo +1 -1
- package/lib/tsconfig.mjs.tsbuildinfo +1 -1
- package/package.json +12 -9
package/README.md
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
|
-
# `@spinajs/
|
|
1
|
+
# `@spinajs/tasks`
|
|
2
2
|
|
|
3
|
-
|
|
3
|
+
Bookkeeping for recurring background work: the `@Task()` method decorator logs each run, records it in the `__tasks` table, optionally guards it with a mutex, and emits `TaskSuccess` / `TaskFailed` queue events. It does not schedule tasks.
|
|
4
4
|
|
|
5
|
-
##
|
|
5
|
+
## Documentation
|
|
6
6
|
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
7
|
+
- [Package overview](../../docs/tasks/README.md)
|
|
8
|
+
- [Task decorator](../../docs/tasks/01-task-decorator.md)
|
|
9
|
+
- [Task locking](../../docs/tasks/02-task-locking.md)
|
|
10
|
+
- [Task events](../../docs/tasks/03-task-events.md)
|
|
11
|
+
- [Task tables and migration](../../docs/tasks/04-task-tables-and-migration.md)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tasks.d.ts","sourceRoot":"","sources":["../../../src/config/tasks.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"tasks.d.ts","sourceRoot":"","sources":["../../../src/config/tasks.ts"],"names":[],"mappings":"AAAA,QAAA,MAAM,GAAG;;;YAIH,UAAU;gBAAI,UAAU;;YACxB,WAAW;gBAAI,UAAU;;;;;;;;;;CAc9B,CAAC;eAEa,GAAG"}
|
package/lib/cjs/config/tasks.js
CHANGED
|
@@ -1,20 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
const path_1 = require("path");
|
|
4
|
-
function dir(path) {
|
|
5
|
-
const inCommonJs = typeof module !== 'undefined';
|
|
6
|
-
return [
|
|
7
|
-
(0, path_1.resolve)((0, path_1.normalize)((0, path_1.join)(process.env.WORKSPACE_ROOT_PATH ?? process.cwd(), 'node_modules', '@spinajs', 'tasks', 'lib', inCommonJs ? 'cjs' : 'mjs', path))),
|
|
8
|
-
// one up if we run from app or build folder
|
|
9
|
-
(0, path_1.resolve)((0, path_1.normalize)((0, path_1.join)(process.env.WORKSPACE_ROOT_PATH ?? process.cwd(), '../', 'node_modules', '@spinajs', 'tasks', 'lib', inCommonJs ? 'cjs' : 'mjs', path))),
|
|
10
|
-
];
|
|
11
|
-
}
|
|
12
3
|
const cli = {
|
|
13
|
-
system: {
|
|
14
|
-
dirs: {
|
|
15
|
-
cli: [...dir('tasks')],
|
|
16
|
-
},
|
|
17
|
-
},
|
|
18
4
|
queue: {
|
|
19
5
|
routing: {
|
|
20
6
|
// task module events - inform when task fails or succeeds
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tasks.js","sourceRoot":"","sources":["../../../src/config/tasks.ts"],"names":[],"mappings":";;AAAA
|
|
1
|
+
{"version":3,"file":"tasks.js","sourceRoot":"","sources":["../../../src/config/tasks.ts"],"names":[],"mappings":";;AAAA,MAAM,GAAG,GAAG;IACV,KAAK,EAAE;QACL,OAAO,EAAE;YACP,0DAA0D;YAC1D,UAAU,EAAE,EAAE,UAAU,EAAE,kBAAkB,EAAE;YAC9C,WAAW,EAAE,EAAE,UAAU,EAAE,kBAAkB,EAAE;SAChD;QAED,6EAA6E;QAC7E,iDAAiD;QACjD,WAAW,EAAE;YACX;gBACE,IAAI,EAAE,kBAAkB;gBACxB,OAAO,EAAE,sBAAsB;gBAC/B,mBAAmB,EAAE,WAAW;gBAChC,mBAAmB,EAAE,aAAa;aACnC;SACF;KACF;CACF,CAAC;kBAEa,GAAG"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"decorators.d.ts","sourceRoot":"","sources":["../../src/decorators.ts"],"names":[],"mappings":"AAUA,eAAO,MAAM,YAAY,iBAAiB,CAAC;AAE3C,MAAM,WAAW,WAAW;IAC1B;;OAEG;IACH,YAAY,EAAE,OAAO,CAAC;IAEtB;;;OAGG;IACH,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,eAAO,MAAM,oBAAoB,EAAE,WAGlC,CAAC;AAqDF,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,WAAW,CAAC;IACrB,uFAAuF;IACvF,MAAM,EAAE,QAAQ,CAAC;IACjB,QAAQ,EAAE,OAAO,CAAC;IAClB,WAAW,EAAE,MAAM,GAAG,MAAM,CAAC;IAC7B,8BAA8B;IAC9B,MAAM,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,OAAO,CAAC;CACrC;AAED,MAAM,WAAW,cAAc;IAC7B,+GAA+G;IAC/G,IAAI,EAAE,OAAO,CAAC;IACd,4GAA4G;IAC5G,OAAO,EAAE,OAAO,CAAC;CAClB;AAID,wBAAgB,mBAAmB,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,eAAe,EAAE,CAKpE;AAQD;;;GAGG;AACH,wBAAsB,OAAO,CAC3B,IAAI,EAAE,eAAe,EACrB,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,OAAO,EAAE,EACf,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"decorators.d.ts","sourceRoot":"","sources":["../../src/decorators.ts"],"names":[],"mappings":"AAUA,eAAO,MAAM,YAAY,iBAAiB,CAAC;AAE3C,MAAM,WAAW,WAAW;IAC1B;;OAEG;IACH,YAAY,EAAE,OAAO,CAAC;IAEtB;;;OAGG;IACH,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,eAAO,MAAM,oBAAoB,EAAE,WAGlC,CAAC;AAqDF,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,WAAW,CAAC;IACrB,uFAAuF;IACvF,MAAM,EAAE,QAAQ,CAAC;IACjB,QAAQ,EAAE,OAAO,CAAC;IAClB,WAAW,EAAE,MAAM,GAAG,MAAM,CAAC;IAC7B,8BAA8B;IAC9B,MAAM,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,OAAO,CAAC;CACrC;AAED,MAAM,WAAW,cAAc;IAC7B,+GAA+G;IAC/G,IAAI,EAAE,OAAO,CAAC;IACd,4GAA4G;IAC5G,OAAO,EAAE,OAAO,CAAC;CAClB;AAID,wBAAgB,mBAAmB,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,eAAe,EAAE,CAKpE;AAQD;;;GAGG;AACH,wBAAsB,OAAO,CAC3B,IAAI,EAAE,eAAe,EACrB,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,OAAO,EAAE,EACf,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,OAAO,CAAC,CAkGlB;AAED;;;;;;;;;GASG;AACH,wBAAgB,IAAI,CAAC,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,YAK5D,GAAG,eAAe,MAAM,GAAG,MAAM,cAAc,kBAAkB,UAiB3F"}
|
package/lib/cjs/decorators.js
CHANGED
|
@@ -25,7 +25,7 @@ async function lockTask(name, opts, log) {
|
|
|
25
25
|
return async () => { };
|
|
26
26
|
}
|
|
27
27
|
if (runningInProcess.has(name)) {
|
|
28
|
-
log.warn(
|
|
28
|
+
log.warn({ taskName: name }, 'Task ${taskName} is already running in this process');
|
|
29
29
|
return null;
|
|
30
30
|
}
|
|
31
31
|
runningInProcess.add(name);
|
|
@@ -34,7 +34,7 @@ async function lockTask(name, opts, log) {
|
|
|
34
34
|
const lock = await (0, threading_1.mutex_acquire)({ Name: mutexName, ttl: opts.lockTtl });
|
|
35
35
|
if (!lock.Locked) {
|
|
36
36
|
runningInProcess.delete(name);
|
|
37
|
-
log.warn(
|
|
37
|
+
log.warn({ taskName: name }, 'Cannot acquire mutex for task ${taskName}, already locked !');
|
|
38
38
|
return null;
|
|
39
39
|
}
|
|
40
40
|
}
|
|
@@ -47,10 +47,10 @@ async function lockTask(name, opts, log) {
|
|
|
47
47
|
(0, threading_1.mutex_renew)({ Name: mutexName, ttl: opts.lockTtl })
|
|
48
48
|
.then((renewed) => {
|
|
49
49
|
if (!renewed) {
|
|
50
|
-
log.warn(
|
|
50
|
+
log.warn({ taskName: name }, 'Task ${taskName} lost its mutex, another process may run it now');
|
|
51
51
|
}
|
|
52
52
|
})
|
|
53
|
-
.catch((err) => log.error(err,
|
|
53
|
+
.catch((err) => log.error({ error: err, taskName: name }, 'Cannot renew mutex for task ${taskName}'));
|
|
54
54
|
}, Math.max(1, Math.floor(opts.lockTtl / 3)))
|
|
55
55
|
: undefined;
|
|
56
56
|
return async () => {
|
|
@@ -76,14 +76,26 @@ const NO_LOCK = () => Promise.resolve();
|
|
|
76
76
|
*/
|
|
77
77
|
async function runTask(decl, thisArg, args, opts) {
|
|
78
78
|
const log = di_1.DI.resolve('__log__', ['TASKS']);
|
|
79
|
-
log.info(
|
|
79
|
+
log.info({ taskName: decl.name }, 'Executing task ${taskName} ...');
|
|
80
80
|
let task;
|
|
81
81
|
let unlock;
|
|
82
82
|
try {
|
|
83
|
-
task = await __task_js_1.__task
|
|
83
|
+
task = await __task_js_1.__task
|
|
84
|
+
.getOrCreate(null, {
|
|
84
85
|
Name: decl.name,
|
|
85
86
|
Description: decl.description,
|
|
86
87
|
State: 'stopped',
|
|
88
|
+
})
|
|
89
|
+
.catch(async (err) => {
|
|
90
|
+
// another process may have inserted the row between getOrCreate's select and insert
|
|
91
|
+
const existing = await __task_js_1.__task
|
|
92
|
+
.where({ Name: decl.name })
|
|
93
|
+
.first()
|
|
94
|
+
.catch(() => undefined);
|
|
95
|
+
if (!existing) {
|
|
96
|
+
throw err;
|
|
97
|
+
}
|
|
98
|
+
return existing;
|
|
87
99
|
});
|
|
88
100
|
const lock = opts.lock ? await lockTask(decl.name, decl.options, log) : NO_LOCK;
|
|
89
101
|
if (!lock) {
|
|
@@ -101,7 +113,7 @@ async function runTask(decl, thisArg, args, opts) {
|
|
|
101
113
|
}
|
|
102
114
|
}
|
|
103
115
|
catch (err) {
|
|
104
|
-
log.error(err,
|
|
116
|
+
log.error({ error: err, taskName: decl.name }, 'Cannot start task ${taskName}');
|
|
105
117
|
throw err;
|
|
106
118
|
}
|
|
107
119
|
let taskResult = null;
|
|
@@ -113,7 +125,7 @@ async function runTask(decl, thisArg, args, opts) {
|
|
|
113
125
|
}
|
|
114
126
|
catch (err) {
|
|
115
127
|
failure = { error: err };
|
|
116
|
-
log.error(err,
|
|
128
|
+
log.error({ error: err, taskName: decl.name }, 'Cannot execute task ${taskName}');
|
|
117
129
|
taskResult = {
|
|
118
130
|
error: true,
|
|
119
131
|
message: errorMessage(err),
|
|
@@ -132,11 +144,11 @@ async function runTask(decl, thisArg, args, opts) {
|
|
|
132
144
|
await TaskSuccess_js_1.TaskSuccess.emit({
|
|
133
145
|
TaskName: decl.name,
|
|
134
146
|
});
|
|
135
|
-
log.success(
|
|
147
|
+
log.success({ taskName: decl.name }, 'Task ${taskName} executed !');
|
|
136
148
|
}
|
|
137
149
|
}
|
|
138
150
|
catch (emitErr) {
|
|
139
|
-
log.error(emitErr,
|
|
151
|
+
log.error({ error: emitErr, event: failure ? 'TaskFailed' : 'TaskSuccess', taskName: decl.name }, 'Cannot emit ${event} for ${taskName}');
|
|
140
152
|
}
|
|
141
153
|
}
|
|
142
154
|
finally {
|
|
@@ -152,7 +164,7 @@ async function runTask(decl, thisArg, args, opts) {
|
|
|
152
164
|
});
|
|
153
165
|
}
|
|
154
166
|
catch (err) {
|
|
155
|
-
log.error(err,
|
|
167
|
+
log.error({ error: err, taskName: decl.name }, 'Cannot finalize task ${taskName}');
|
|
156
168
|
}
|
|
157
169
|
}
|
|
158
170
|
if (failure && opts.rethrow) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"decorators.js","sourceRoot":"","sources":["../../src/decorators.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA+E;AAC/E,wCAA8D;AAC9D,oCAAiC;AACjC,kDAA4C;AAC5C,iCAAiC;AACjC,kEAA4D;AAE5D,4DAAsD;AACtD,0DAAoD;AAEvC,QAAA,YAAY,GAAG,cAAc,CAAC;AAe9B,QAAA,oBAAoB,GAAgB;IAC/C,YAAY,EAAE,KAAK;IACnB,OAAO,EAAE,KAAK;CACf,CAAC;AAIF,4EAA4E;AAC5E,8EAA8E;AAC9E,MAAM,gBAAgB,GAAG,IAAI,GAAG,EAAU,CAAC;AAE3C,KAAK,UAAU,QAAQ,CAAC,IAAY,EAAE,IAAiB,EAAE,GAAQ;IAC/D,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;QACtB,OAAO,KAAK,IAAI,EAAE,GAAE,CAAC,CAAC;IACxB,CAAC;IAED,IAAI,gBAAgB,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;QAC/B,GAAG,CAAC,IAAI,CAAC,QAAQ,IAAI,
|
|
1
|
+
{"version":3,"file":"decorators.js","sourceRoot":"","sources":["../../src/decorators.ts"],"names":[],"mappings":"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"}
|
package/lib/cjs/index.d.ts
CHANGED
|
@@ -2,4 +2,6 @@ export * from "./migrations/Task_2024_12_03_11_41_00.js";
|
|
|
2
2
|
export * from "./decorators.js";
|
|
3
3
|
export * from "./models/__task.js";
|
|
4
4
|
export * from "./models/__task_history.js";
|
|
5
|
+
export * from "./events/TaskSuccess.js";
|
|
6
|
+
export * from "./events/TaskFailed.js";
|
|
5
7
|
//# sourceMappingURL=index.d.ts.map
|
package/lib/cjs/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,0CAA0C,CAAC;AACzD,cAAc,iBAAiB,CAAC;AAChC,cAAc,oBAAoB,CAAC;AACnC,cAAc,4BAA4B,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,0CAA0C,CAAC;AACzD,cAAc,iBAAiB,CAAC;AAChC,cAAc,oBAAoB,CAAC;AACnC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,yBAAyB,CAAC;AACxC,cAAc,wBAAwB,CAAC"}
|
package/lib/cjs/index.js
CHANGED
|
@@ -18,4 +18,6 @@ __exportStar(require("./migrations/Task_2024_12_03_11_41_00.js"), exports);
|
|
|
18
18
|
__exportStar(require("./decorators.js"), exports);
|
|
19
19
|
__exportStar(require("./models/__task.js"), exports);
|
|
20
20
|
__exportStar(require("./models/__task_history.js"), exports);
|
|
21
|
+
__exportStar(require("./events/TaskSuccess.js"), exports);
|
|
22
|
+
__exportStar(require("./events/TaskFailed.js"), exports);
|
|
21
23
|
//# sourceMappingURL=index.js.map
|
package/lib/cjs/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2EAAyD;AACzD,kDAAgC;AAChC,qDAAmC;AACnC,6DAA2C"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2EAAyD;AACzD,kDAAgC;AAChC,qDAAmC;AACnC,6DAA2C;AAC3C,0DAAwC;AACxC,yDAAuC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { OrmMigration, OrmDriver } from '@spinajs/orm';
|
|
2
2
|
export declare class Task_2024_12_03_11_41_00 extends OrmMigration {
|
|
3
3
|
up(connection: OrmDriver): Promise<void>;
|
|
4
|
-
down(
|
|
4
|
+
down(connection: OrmDriver): Promise<void>;
|
|
5
5
|
}
|
|
6
6
|
//# sourceMappingURL=Task_2024_12_03_11_41_00.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Task_2024_12_03_11_41_00.d.ts","sourceRoot":"","sources":["../../../src/migrations/Task_2024_12_03_11_41_00.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,SAAS,EAAuB,MAAM,cAAc,CAAC;AAE5E,qBACa,wBAAyB,SAAQ,YAAY;IAC3C,EAAE,CAAC,UAAU,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"Task_2024_12_03_11_41_00.d.ts","sourceRoot":"","sources":["../../../src/migrations/Task_2024_12_03_11_41_00.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,SAAS,EAAuB,MAAM,cAAc,CAAC;AAE5E,qBACa,wBAAyB,SAAQ,YAAY;IAC3C,EAAE,CAAC,UAAU,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CA2BpD;IAEY,IAAI,CAAC,UAAU,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CAOtD;CACF"}
|
|
@@ -25,7 +25,6 @@ let Task_2024_12_03_11_41_00 = class Task_2024_12_03_11_41_00 extends orm_1.OrmM
|
|
|
25
25
|
table.dateTime('CreatedAt').notNull().default().dateTime();
|
|
26
26
|
table.int('Duration').default().value(0);
|
|
27
27
|
});
|
|
28
|
-
await connection.index().unique().table('__tasks').name('__tasks_unique_name').columns(['Name']);
|
|
29
28
|
// if driver supports task scheduling
|
|
30
29
|
// create orm task to clear old entries
|
|
31
30
|
if (connection.supportedFeatures().events) {
|
|
@@ -36,9 +35,13 @@ let Task_2024_12_03_11_41_00 = class Task_2024_12_03_11_41_00 extends orm_1.OrmM
|
|
|
36
35
|
});
|
|
37
36
|
}
|
|
38
37
|
}
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
38
|
+
async down(connection) {
|
|
39
|
+
if (connection.supportedFeatures().events) {
|
|
40
|
+
await connection.schema().dropEvent('__task_delete_old_entries');
|
|
41
|
+
}
|
|
42
|
+
await connection.schema().dropTable('__task_history');
|
|
43
|
+
await connection.schema().dropTable('__tasks');
|
|
44
|
+
}
|
|
42
45
|
};
|
|
43
46
|
exports.Task_2024_12_03_11_41_00 = Task_2024_12_03_11_41_00;
|
|
44
47
|
exports.Task_2024_12_03_11_41_00 = Task_2024_12_03_11_41_00 = __decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Task_2024_12_03_11_41_00.js","sourceRoot":"","sources":["../../../src/migrations/Task_2024_12_03_11_41_00.ts"],"names":[],"mappings":";;;;;;;;;AAAA,sDAAsD;AACtD,sCAA4E;AAGrE,IAAM,wBAAwB,GAA9B,MAAM,wBAAyB,SAAQ,kBAAY;IACjD,KAAK,CAAC,EAAE,CAAC,UAAqB;QACnC,MAAM,UAAU,CAAC,MAAM,EAAE,CAAC,WAAW,CAAC,SAAS,EAAE,CAAC,KAAK,EAAE,EAAE;YACzD,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,UAAU,EAAE,CAAC,aAAa,EAAE,CAAC;YAC7C,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,OAAO,EAAE,CAAC;YAC5C,KAAK,CAAC,MAAM,CAAC,aAAa,EAAE,GAAG,CAAC,CAAC,OAAO,EAAE,CAAC;YAC3C,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC,CAAC;YAC5C,KAAK,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;QAC9B,CAAC,CAAC,CAAC;QAEH,MAAM,UAAU,CAAC,MAAM,EAAE,CAAC,WAAW,CAAC,gBAAgB,EAAE,CAAC,KAAK,EAAE,EAAE;YAChE,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,UAAU,EAAE,CAAC,aAAa,EAAE,CAAC;YAC7C,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,OAAO,EAAE,CAAC;YAC9B,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YACrB,KAAK,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,OAAO,EAAE,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,CAAC;YAC3D,KAAK,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,OAAO,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAC3C,CAAC,CAAC,CAAC;QAEH,
|
|
1
|
+
{"version":3,"file":"Task_2024_12_03_11_41_00.js","sourceRoot":"","sources":["../../../src/migrations/Task_2024_12_03_11_41_00.ts"],"names":[],"mappings":";;;;;;;;;AAAA,sDAAsD;AACtD,sCAA4E;AAGrE,IAAM,wBAAwB,GAA9B,MAAM,wBAAyB,SAAQ,kBAAY;IACjD,KAAK,CAAC,EAAE,CAAC,UAAqB;QACnC,MAAM,UAAU,CAAC,MAAM,EAAE,CAAC,WAAW,CAAC,SAAS,EAAE,CAAC,KAAK,EAAE,EAAE;YACzD,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,UAAU,EAAE,CAAC,aAAa,EAAE,CAAC;YAC7C,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,OAAO,EAAE,CAAC;YAC5C,KAAK,CAAC,MAAM,CAAC,aAAa,EAAE,GAAG,CAAC,CAAC,OAAO,EAAE,CAAC;YAC3C,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC,CAAC;YAC5C,KAAK,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;QAC9B,CAAC,CAAC,CAAC;QAEH,MAAM,UAAU,CAAC,MAAM,EAAE,CAAC,WAAW,CAAC,gBAAgB,EAAE,CAAC,KAAK,EAAE,EAAE;YAChE,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,UAAU,EAAE,CAAC,aAAa,EAAE,CAAC;YAC7C,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,OAAO,EAAE,CAAC;YAC9B,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YACrB,KAAK,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,OAAO,EAAE,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,CAAC;YAC3D,KAAK,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,OAAO,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAC3C,CAAC,CAAC,CAAC;QAEH,qCAAqC;QACrC,uCAAuC;QAEvC,IAAI,UAAU,CAAC,iBAAiB,EAAE,CAAC,MAAM,EAAE,CAAC;YAC1C,oFAAoF;YACpF,yEAAyE;YACzE,MAAM,UAAU,CAAC,MAAM,EAAE,CAAC,WAAW,CAAC,2BAA2B,EAAE,CAAC,KAAK,EAAE,EAAE;gBAC3E,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,EAAE,CAAC,IAAI,cAAQ,CAAC,yEAAyE,CAAC,CAAC,CAAC;YACpH,CAAC,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAEM,KAAK,CAAC,IAAI,CAAC,UAAqB;QACrC,IAAI,UAAU,CAAC,iBAAiB,EAAE,CAAC,MAAM,EAAE,CAAC;YAC1C,MAAM,UAAU,CAAC,MAAM,EAAE,CAAC,SAAS,CAAC,2BAA2B,CAAC,CAAC;QACnE,CAAC;QAED,MAAM,UAAU,CAAC,MAAM,EAAE,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC;QACtD,MAAM,UAAU,CAAC,MAAM,EAAE,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;IACjD,CAAC;CACF,CAAA;;mCAtCY,wBAAwB;IADpC,IAAA,eAAS,EAAC,SAAS,CAAC;GACR,wBAAwB,CAsCpC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tasks.d.ts","sourceRoot":"","sources":["../../../src/config/tasks.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"tasks.d.ts","sourceRoot":"","sources":["../../../src/config/tasks.ts"],"names":[],"mappings":"AAAA,QAAA,MAAM,GAAG;;;YAIH,UAAU;gBAAI,UAAU;;YACxB,WAAW;gBAAI,UAAU;;;;;;;;;;CAc9B,CAAC;eAEa,GAAG"}
|
package/lib/mjs/config/tasks.js
CHANGED
|
@@ -1,18 +1,4 @@
|
|
|
1
|
-
import { join, normalize, resolve } from 'path';
|
|
2
|
-
function dir(path) {
|
|
3
|
-
const inCommonJs = typeof module !== 'undefined';
|
|
4
|
-
return [
|
|
5
|
-
resolve(normalize(join(process.env.WORKSPACE_ROOT_PATH ?? process.cwd(), 'node_modules', '@spinajs', 'tasks', 'lib', inCommonJs ? 'cjs' : 'mjs', path))),
|
|
6
|
-
// one up if we run from app or build folder
|
|
7
|
-
resolve(normalize(join(process.env.WORKSPACE_ROOT_PATH ?? process.cwd(), '../', 'node_modules', '@spinajs', 'tasks', 'lib', inCommonJs ? 'cjs' : 'mjs', path))),
|
|
8
|
-
];
|
|
9
|
-
}
|
|
10
1
|
const cli = {
|
|
11
|
-
system: {
|
|
12
|
-
dirs: {
|
|
13
|
-
cli: [...dir('tasks')],
|
|
14
|
-
},
|
|
15
|
-
},
|
|
16
2
|
queue: {
|
|
17
3
|
routing: {
|
|
18
4
|
// task module events - inform when task fails or succeeds
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tasks.js","sourceRoot":"","sources":["../../../src/config/tasks.ts"],"names":[],"mappings":"AAAA,
|
|
1
|
+
{"version":3,"file":"tasks.js","sourceRoot":"","sources":["../../../src/config/tasks.ts"],"names":[],"mappings":"AAAA,MAAM,GAAG,GAAG;IACV,KAAK,EAAE;QACL,OAAO,EAAE;YACP,0DAA0D;YAC1D,UAAU,EAAE,EAAE,UAAU,EAAE,kBAAkB,EAAE;YAC9C,WAAW,EAAE,EAAE,UAAU,EAAE,kBAAkB,EAAE;SAChD;QAED,6EAA6E;QAC7E,iDAAiD;QACjD,WAAW,EAAE;YACX;gBACE,IAAI,EAAE,kBAAkB;gBACxB,OAAO,EAAE,sBAAsB;gBAC/B,mBAAmB,EAAE,WAAW;gBAChC,mBAAmB,EAAE,aAAa;aACnC;SACF;KACF;CACF,CAAC;AAEF,eAAe,GAAG,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"decorators.d.ts","sourceRoot":"","sources":["../../src/decorators.ts"],"names":[],"mappings":"AAUA,eAAO,MAAM,YAAY,iBAAiB,CAAC;AAE3C,MAAM,WAAW,WAAW;IAC1B;;OAEG;IACH,YAAY,EAAE,OAAO,CAAC;IAEtB;;;OAGG;IACH,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,eAAO,MAAM,oBAAoB,EAAE,WAGlC,CAAC;AAqDF,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,WAAW,CAAC;IACrB,uFAAuF;IACvF,MAAM,EAAE,QAAQ,CAAC;IACjB,QAAQ,EAAE,OAAO,CAAC;IAClB,WAAW,EAAE,MAAM,GAAG,MAAM,CAAC;IAC7B,8BAA8B;IAC9B,MAAM,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,OAAO,CAAC;CACrC;AAED,MAAM,WAAW,cAAc;IAC7B,+GAA+G;IAC/G,IAAI,EAAE,OAAO,CAAC;IACd,4GAA4G;IAC5G,OAAO,EAAE,OAAO,CAAC;CAClB;AAID,wBAAgB,mBAAmB,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,eAAe,EAAE,CAKpE;AAQD;;;GAGG;AACH,wBAAsB,OAAO,CAC3B,IAAI,EAAE,eAAe,EACrB,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,OAAO,EAAE,EACf,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"decorators.d.ts","sourceRoot":"","sources":["../../src/decorators.ts"],"names":[],"mappings":"AAUA,eAAO,MAAM,YAAY,iBAAiB,CAAC;AAE3C,MAAM,WAAW,WAAW;IAC1B;;OAEG;IACH,YAAY,EAAE,OAAO,CAAC;IAEtB;;;OAGG;IACH,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,eAAO,MAAM,oBAAoB,EAAE,WAGlC,CAAC;AAqDF,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,WAAW,CAAC;IACrB,uFAAuF;IACvF,MAAM,EAAE,QAAQ,CAAC;IACjB,QAAQ,EAAE,OAAO,CAAC;IAClB,WAAW,EAAE,MAAM,GAAG,MAAM,CAAC;IAC7B,8BAA8B;IAC9B,MAAM,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,OAAO,CAAC;CACrC;AAED,MAAM,WAAW,cAAc;IAC7B,+GAA+G;IAC/G,IAAI,EAAE,OAAO,CAAC;IACd,4GAA4G;IAC5G,OAAO,EAAE,OAAO,CAAC;CAClB;AAID,wBAAgB,mBAAmB,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,eAAe,EAAE,CAKpE;AAQD;;;GAGG;AACH,wBAAsB,OAAO,CAC3B,IAAI,EAAE,eAAe,EACrB,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,OAAO,EAAE,EACf,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,OAAO,CAAC,CAkGlB;AAED;;;;;;;;;GASG;AACH,wBAAgB,IAAI,CAAC,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,YAK5D,GAAG,eAAe,MAAM,GAAG,MAAM,cAAc,kBAAkB,UAiB3F"}
|
package/lib/mjs/decorators.js
CHANGED
|
@@ -19,7 +19,7 @@ async function lockTask(name, opts, log) {
|
|
|
19
19
|
return async () => { };
|
|
20
20
|
}
|
|
21
21
|
if (runningInProcess.has(name)) {
|
|
22
|
-
log.warn(
|
|
22
|
+
log.warn({ taskName: name }, 'Task ${taskName} is already running in this process');
|
|
23
23
|
return null;
|
|
24
24
|
}
|
|
25
25
|
runningInProcess.add(name);
|
|
@@ -28,7 +28,7 @@ async function lockTask(name, opts, log) {
|
|
|
28
28
|
const lock = await mutex_acquire({ Name: mutexName, ttl: opts.lockTtl });
|
|
29
29
|
if (!lock.Locked) {
|
|
30
30
|
runningInProcess.delete(name);
|
|
31
|
-
log.warn(
|
|
31
|
+
log.warn({ taskName: name }, 'Cannot acquire mutex for task ${taskName}, already locked !');
|
|
32
32
|
return null;
|
|
33
33
|
}
|
|
34
34
|
}
|
|
@@ -41,10 +41,10 @@ async function lockTask(name, opts, log) {
|
|
|
41
41
|
mutex_renew({ Name: mutexName, ttl: opts.lockTtl })
|
|
42
42
|
.then((renewed) => {
|
|
43
43
|
if (!renewed) {
|
|
44
|
-
log.warn(
|
|
44
|
+
log.warn({ taskName: name }, 'Task ${taskName} lost its mutex, another process may run it now');
|
|
45
45
|
}
|
|
46
46
|
})
|
|
47
|
-
.catch((err) => log.error(err,
|
|
47
|
+
.catch((err) => log.error({ error: err, taskName: name }, 'Cannot renew mutex for task ${taskName}'));
|
|
48
48
|
}, Math.max(1, Math.floor(opts.lockTtl / 3)))
|
|
49
49
|
: undefined;
|
|
50
50
|
return async () => {
|
|
@@ -70,14 +70,26 @@ const NO_LOCK = () => Promise.resolve();
|
|
|
70
70
|
*/
|
|
71
71
|
export async function runTask(decl, thisArg, args, opts) {
|
|
72
72
|
const log = DI.resolve('__log__', ['TASKS']);
|
|
73
|
-
log.info(
|
|
73
|
+
log.info({ taskName: decl.name }, 'Executing task ${taskName} ...');
|
|
74
74
|
let task;
|
|
75
75
|
let unlock;
|
|
76
76
|
try {
|
|
77
|
-
task = await __task
|
|
77
|
+
task = await __task
|
|
78
|
+
.getOrCreate(null, {
|
|
78
79
|
Name: decl.name,
|
|
79
80
|
Description: decl.description,
|
|
80
81
|
State: 'stopped',
|
|
82
|
+
})
|
|
83
|
+
.catch(async (err) => {
|
|
84
|
+
// another process may have inserted the row between getOrCreate's select and insert
|
|
85
|
+
const existing = await __task
|
|
86
|
+
.where({ Name: decl.name })
|
|
87
|
+
.first()
|
|
88
|
+
.catch(() => undefined);
|
|
89
|
+
if (!existing) {
|
|
90
|
+
throw err;
|
|
91
|
+
}
|
|
92
|
+
return existing;
|
|
81
93
|
});
|
|
82
94
|
const lock = opts.lock ? await lockTask(decl.name, decl.options, log) : NO_LOCK;
|
|
83
95
|
if (!lock) {
|
|
@@ -95,7 +107,7 @@ export async function runTask(decl, thisArg, args, opts) {
|
|
|
95
107
|
}
|
|
96
108
|
}
|
|
97
109
|
catch (err) {
|
|
98
|
-
log.error(err,
|
|
110
|
+
log.error({ error: err, taskName: decl.name }, 'Cannot start task ${taskName}');
|
|
99
111
|
throw err;
|
|
100
112
|
}
|
|
101
113
|
let taskResult = null;
|
|
@@ -107,7 +119,7 @@ export async function runTask(decl, thisArg, args, opts) {
|
|
|
107
119
|
}
|
|
108
120
|
catch (err) {
|
|
109
121
|
failure = { error: err };
|
|
110
|
-
log.error(err,
|
|
122
|
+
log.error({ error: err, taskName: decl.name }, 'Cannot execute task ${taskName}');
|
|
111
123
|
taskResult = {
|
|
112
124
|
error: true,
|
|
113
125
|
message: errorMessage(err),
|
|
@@ -126,11 +138,11 @@ export async function runTask(decl, thisArg, args, opts) {
|
|
|
126
138
|
await TaskSuccess.emit({
|
|
127
139
|
TaskName: decl.name,
|
|
128
140
|
});
|
|
129
|
-
log.success(
|
|
141
|
+
log.success({ taskName: decl.name }, 'Task ${taskName} executed !');
|
|
130
142
|
}
|
|
131
143
|
}
|
|
132
144
|
catch (emitErr) {
|
|
133
|
-
log.error(emitErr,
|
|
145
|
+
log.error({ error: emitErr, event: failure ? 'TaskFailed' : 'TaskSuccess', taskName: decl.name }, 'Cannot emit ${event} for ${taskName}');
|
|
134
146
|
}
|
|
135
147
|
}
|
|
136
148
|
finally {
|
|
@@ -146,7 +158,7 @@ export async function runTask(decl, thisArg, args, opts) {
|
|
|
146
158
|
});
|
|
147
159
|
}
|
|
148
160
|
catch (err) {
|
|
149
|
-
log.error(err,
|
|
161
|
+
log.error({ error: err, taskName: decl.name }, 'Cannot finalize task ${taskName}');
|
|
150
162
|
}
|
|
151
163
|
}
|
|
152
164
|
if (failure && opts.rethrow) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"decorators.js","sourceRoot":"","sources":["../../src/decorators.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAC/E,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AAC9D,OAAO,EAAE,EAAE,EAAE,MAAM,aAAa,CAAC;AACjC,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACjC,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAE5D,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAEpD,MAAM,CAAC,MAAM,YAAY,GAAG,cAAc,CAAC;AAe3C,MAAM,CAAC,MAAM,oBAAoB,GAAgB;IAC/C,YAAY,EAAE,KAAK;IACnB,OAAO,EAAE,KAAK;CACf,CAAC;AAIF,4EAA4E;AAC5E,8EAA8E;AAC9E,MAAM,gBAAgB,GAAG,IAAI,GAAG,EAAU,CAAC;AAE3C,KAAK,UAAU,QAAQ,CAAC,IAAY,EAAE,IAAiB,EAAE,GAAQ;IAC/D,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;QACtB,OAAO,KAAK,IAAI,EAAE,GAAE,CAAC,CAAC;IACxB,CAAC;IAED,IAAI,gBAAgB,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;QAC/B,GAAG,CAAC,IAAI,CAAC,QAAQ,IAAI,
|
|
1
|
+
{"version":3,"file":"decorators.js","sourceRoot":"","sources":["../../src/decorators.ts"],"names":[],"mappings":"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"}
|
package/lib/mjs/index.d.ts
CHANGED
|
@@ -2,4 +2,6 @@ export * from "./migrations/Task_2024_12_03_11_41_00.js";
|
|
|
2
2
|
export * from "./decorators.js";
|
|
3
3
|
export * from "./models/__task.js";
|
|
4
4
|
export * from "./models/__task_history.js";
|
|
5
|
+
export * from "./events/TaskSuccess.js";
|
|
6
|
+
export * from "./events/TaskFailed.js";
|
|
5
7
|
//# sourceMappingURL=index.d.ts.map
|
package/lib/mjs/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,0CAA0C,CAAC;AACzD,cAAc,iBAAiB,CAAC;AAChC,cAAc,oBAAoB,CAAC;AACnC,cAAc,4BAA4B,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,0CAA0C,CAAC;AACzD,cAAc,iBAAiB,CAAC;AAChC,cAAc,oBAAoB,CAAC;AACnC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,yBAAyB,CAAC;AACxC,cAAc,wBAAwB,CAAC"}
|
package/lib/mjs/index.js
CHANGED
|
@@ -2,4 +2,6 @@ export * from "./migrations/Task_2024_12_03_11_41_00.js";
|
|
|
2
2
|
export * from "./decorators.js";
|
|
3
3
|
export * from "./models/__task.js";
|
|
4
4
|
export * from "./models/__task_history.js";
|
|
5
|
+
export * from "./events/TaskSuccess.js";
|
|
6
|
+
export * from "./events/TaskFailed.js";
|
|
5
7
|
//# sourceMappingURL=index.js.map
|
package/lib/mjs/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,0CAA0C,CAAC;AACzD,cAAc,iBAAiB,CAAC;AAChC,cAAc,oBAAoB,CAAC;AACnC,cAAc,4BAA4B,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,0CAA0C,CAAC;AACzD,cAAc,iBAAiB,CAAC;AAChC,cAAc,oBAAoB,CAAC;AACnC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,yBAAyB,CAAC;AACxC,cAAc,wBAAwB,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { OrmMigration, OrmDriver } from '@spinajs/orm';
|
|
2
2
|
export declare class Task_2024_12_03_11_41_00 extends OrmMigration {
|
|
3
3
|
up(connection: OrmDriver): Promise<void>;
|
|
4
|
-
down(
|
|
4
|
+
down(connection: OrmDriver): Promise<void>;
|
|
5
5
|
}
|
|
6
6
|
//# sourceMappingURL=Task_2024_12_03_11_41_00.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Task_2024_12_03_11_41_00.d.ts","sourceRoot":"","sources":["../../../src/migrations/Task_2024_12_03_11_41_00.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,SAAS,EAAuB,MAAM,cAAc,CAAC;AAE5E,qBACa,wBAAyB,SAAQ,YAAY;IAC3C,EAAE,CAAC,UAAU,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"Task_2024_12_03_11_41_00.d.ts","sourceRoot":"","sources":["../../../src/migrations/Task_2024_12_03_11_41_00.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,SAAS,EAAuB,MAAM,cAAc,CAAC;AAE5E,qBACa,wBAAyB,SAAQ,YAAY;IAC3C,EAAE,CAAC,UAAU,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CA2BpD;IAEY,IAAI,CAAC,UAAU,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CAOtD;CACF"}
|
|
@@ -22,7 +22,6 @@ let Task_2024_12_03_11_41_00 = class Task_2024_12_03_11_41_00 extends OrmMigrati
|
|
|
22
22
|
table.dateTime('CreatedAt').notNull().default().dateTime();
|
|
23
23
|
table.int('Duration').default().value(0);
|
|
24
24
|
});
|
|
25
|
-
await connection.index().unique().table('__tasks').name('__tasks_unique_name').columns(['Name']);
|
|
26
25
|
// if driver supports task scheduling
|
|
27
26
|
// create orm task to clear old entries
|
|
28
27
|
if (connection.supportedFeatures().events) {
|
|
@@ -33,9 +32,13 @@ let Task_2024_12_03_11_41_00 = class Task_2024_12_03_11_41_00 extends OrmMigrati
|
|
|
33
32
|
});
|
|
34
33
|
}
|
|
35
34
|
}
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
35
|
+
async down(connection) {
|
|
36
|
+
if (connection.supportedFeatures().events) {
|
|
37
|
+
await connection.schema().dropEvent('__task_delete_old_entries');
|
|
38
|
+
}
|
|
39
|
+
await connection.schema().dropTable('__task_history');
|
|
40
|
+
await connection.schema().dropTable('__tasks');
|
|
41
|
+
}
|
|
39
42
|
};
|
|
40
43
|
Task_2024_12_03_11_41_00 = __decorate([
|
|
41
44
|
Migration('default')
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Task_2024_12_03_11_41_00.js","sourceRoot":"","sources":["../../../src/migrations/Task_2024_12_03_11_41_00.ts"],"names":[],"mappings":";;;;;;AAAA,sDAAsD;AACtD,OAAO,EAAE,YAAY,EAAa,SAAS,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAGrE,IAAM,wBAAwB,GAA9B,MAAM,wBAAyB,SAAQ,YAAY;IACjD,KAAK,CAAC,EAAE,CAAC,UAAqB;QACnC,MAAM,UAAU,CAAC,MAAM,EAAE,CAAC,WAAW,CAAC,SAAS,EAAE,CAAC,KAAK,EAAE,EAAE;YACzD,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,UAAU,EAAE,CAAC,aAAa,EAAE,CAAC;YAC7C,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,OAAO,EAAE,CAAC;YAC5C,KAAK,CAAC,MAAM,CAAC,aAAa,EAAE,GAAG,CAAC,CAAC,OAAO,EAAE,CAAC;YAC3C,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC,CAAC;YAC5C,KAAK,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;QAC9B,CAAC,CAAC,CAAC;QAEH,MAAM,UAAU,CAAC,MAAM,EAAE,CAAC,WAAW,CAAC,gBAAgB,EAAE,CAAC,KAAK,EAAE,EAAE;YAChE,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,UAAU,EAAE,CAAC,aAAa,EAAE,CAAC;YAC7C,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,OAAO,EAAE,CAAC;YAC9B,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YACrB,KAAK,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,OAAO,EAAE,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,CAAC;YAC3D,KAAK,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,OAAO,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAC3C,CAAC,CAAC,CAAC;QAEH,
|
|
1
|
+
{"version":3,"file":"Task_2024_12_03_11_41_00.js","sourceRoot":"","sources":["../../../src/migrations/Task_2024_12_03_11_41_00.ts"],"names":[],"mappings":";;;;;;AAAA,sDAAsD;AACtD,OAAO,EAAE,YAAY,EAAa,SAAS,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAGrE,IAAM,wBAAwB,GAA9B,MAAM,wBAAyB,SAAQ,YAAY;IACjD,KAAK,CAAC,EAAE,CAAC,UAAqB;QACnC,MAAM,UAAU,CAAC,MAAM,EAAE,CAAC,WAAW,CAAC,SAAS,EAAE,CAAC,KAAK,EAAE,EAAE;YACzD,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,UAAU,EAAE,CAAC,aAAa,EAAE,CAAC;YAC7C,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,OAAO,EAAE,CAAC;YAC5C,KAAK,CAAC,MAAM,CAAC,aAAa,EAAE,GAAG,CAAC,CAAC,OAAO,EAAE,CAAC;YAC3C,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC,CAAC;YAC5C,KAAK,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;QAC9B,CAAC,CAAC,CAAC;QAEH,MAAM,UAAU,CAAC,MAAM,EAAE,CAAC,WAAW,CAAC,gBAAgB,EAAE,CAAC,KAAK,EAAE,EAAE;YAChE,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,UAAU,EAAE,CAAC,aAAa,EAAE,CAAC;YAC7C,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,OAAO,EAAE,CAAC;YAC9B,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YACrB,KAAK,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,OAAO,EAAE,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,CAAC;YAC3D,KAAK,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,OAAO,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAC3C,CAAC,CAAC,CAAC;QAEH,qCAAqC;QACrC,uCAAuC;QAEvC,IAAI,UAAU,CAAC,iBAAiB,EAAE,CAAC,MAAM,EAAE,CAAC;YAC1C,oFAAoF;YACpF,yEAAyE;YACzE,MAAM,UAAU,CAAC,MAAM,EAAE,CAAC,WAAW,CAAC,2BAA2B,EAAE,CAAC,KAAK,EAAE,EAAE;gBAC3E,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,EAAE,CAAC,IAAI,QAAQ,CAAC,yEAAyE,CAAC,CAAC,CAAC;YACpH,CAAC,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAEM,KAAK,CAAC,IAAI,CAAC,UAAqB;QACrC,IAAI,UAAU,CAAC,iBAAiB,EAAE,CAAC,MAAM,EAAE,CAAC;YAC1C,MAAM,UAAU,CAAC,MAAM,EAAE,CAAC,SAAS,CAAC,2BAA2B,CAAC,CAAC;QACnE,CAAC;QAED,MAAM,UAAU,CAAC,MAAM,EAAE,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC;QACtD,MAAM,UAAU,CAAC,MAAM,EAAE,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;IACjD,CAAC;CACF,CAAA;AAtCY,wBAAwB;IADpC,SAAS,CAAC,SAAS,CAAC;GACR,wBAAwB,CAsCpC"}
|