@lage-run/scheduler 0.4.4 → 0.4.6
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/CHANGELOG.json +43 -1
- package/CHANGELOG.md +20 -2
- package/lib/SimpleScheduler.d.ts +6 -4
- package/lib/SimpleScheduler.js +16 -5
- package/lib/SimpleScheduler.js.map +1 -1
- package/lib/WrappedTarget.d.ts +8 -3
- package/lib/WrappedTarget.js +14 -7
- package/lib/WrappedTarget.js.map +1 -1
- package/package.json +6 -4
package/CHANGELOG.json
CHANGED
|
@@ -2,7 +2,49 @@
|
|
|
2
2
|
"name": "@lage-run/scheduler",
|
|
3
3
|
"entries": [
|
|
4
4
|
{
|
|
5
|
-
"date": "
|
|
5
|
+
"date": "Sat, 08 Oct 2022 17:43:23 GMT",
|
|
6
|
+
"tag": "@lage-run/scheduler_v0.4.6",
|
|
7
|
+
"version": "0.4.6",
|
|
8
|
+
"comments": {
|
|
9
|
+
"patch": [
|
|
10
|
+
{
|
|
11
|
+
"author": "ken@gizzar.com",
|
|
12
|
+
"package": "@lage-run/scheduler",
|
|
13
|
+
"commit": "1d21a0e79d11f86ec888f4893091940be4f3451b",
|
|
14
|
+
"comment": "adding a watch mode action"
|
|
15
|
+
},
|
|
16
|
+
{
|
|
17
|
+
"author": "beachball",
|
|
18
|
+
"package": "@lage-run/scheduler",
|
|
19
|
+
"comment": "Bump @lage-run/scheduler-types to v0.1.9",
|
|
20
|
+
"commit": "1d21a0e79d11f86ec888f4893091940be4f3451b"
|
|
21
|
+
}
|
|
22
|
+
]
|
|
23
|
+
}
|
|
24
|
+
},
|
|
25
|
+
{
|
|
26
|
+
"date": "Thu, 06 Oct 2022 16:07:29 GMT",
|
|
27
|
+
"tag": "@lage-run/scheduler_v0.4.5",
|
|
28
|
+
"version": "0.4.5",
|
|
29
|
+
"comments": {
|
|
30
|
+
"patch": [
|
|
31
|
+
{
|
|
32
|
+
"author": "beachball",
|
|
33
|
+
"package": "@lage-run/scheduler",
|
|
34
|
+
"comment": "Bump @lage-run/cache to v0.1.19",
|
|
35
|
+
"commit": "bd449545266b4a823e6e79beb2b75103cc3b3739"
|
|
36
|
+
},
|
|
37
|
+
{
|
|
38
|
+
"author": "beachball",
|
|
39
|
+
"package": "@lage-run/scheduler",
|
|
40
|
+
"comment": "Bump @lage-run/scheduler-types to v0.1.8",
|
|
41
|
+
"commit": "bd449545266b4a823e6e79beb2b75103cc3b3739"
|
|
42
|
+
}
|
|
43
|
+
]
|
|
44
|
+
}
|
|
45
|
+
},
|
|
46
|
+
{
|
|
47
|
+
"date": "Thu, 06 Oct 2022 04:37:18 GMT",
|
|
6
48
|
"tag": "@lage-run/scheduler_v0.4.4",
|
|
7
49
|
"version": "0.4.4",
|
|
8
50
|
"comments": {
|
package/CHANGELOG.md
CHANGED
|
@@ -1,12 +1,30 @@
|
|
|
1
1
|
# Change Log - @lage-run/scheduler
|
|
2
2
|
|
|
3
|
-
This log was last generated on
|
|
3
|
+
This log was last generated on Sat, 08 Oct 2022 17:43:23 GMT and should not be manually modified.
|
|
4
4
|
|
|
5
5
|
<!-- Start content -->
|
|
6
6
|
|
|
7
|
+
## 0.4.6
|
|
8
|
+
|
|
9
|
+
Sat, 08 Oct 2022 17:43:23 GMT
|
|
10
|
+
|
|
11
|
+
### Patches
|
|
12
|
+
|
|
13
|
+
- adding a watch mode action (ken@gizzar.com)
|
|
14
|
+
- Bump @lage-run/scheduler-types to v0.1.9
|
|
15
|
+
|
|
16
|
+
## 0.4.5
|
|
17
|
+
|
|
18
|
+
Thu, 06 Oct 2022 16:07:29 GMT
|
|
19
|
+
|
|
20
|
+
### Patches
|
|
21
|
+
|
|
22
|
+
- Bump @lage-run/cache to v0.1.19
|
|
23
|
+
- Bump @lage-run/scheduler-types to v0.1.8
|
|
24
|
+
|
|
7
25
|
## 0.4.4
|
|
8
26
|
|
|
9
|
-
Thu, 06 Oct 2022 04:37:
|
|
27
|
+
Thu, 06 Oct 2022 04:37:18 GMT
|
|
10
28
|
|
|
11
29
|
### Patches
|
|
12
30
|
|
package/lib/SimpleScheduler.d.ts
CHANGED
|
@@ -11,8 +11,8 @@ export interface SimpleSchedulerOptions {
|
|
|
11
11
|
logger: Logger;
|
|
12
12
|
concurrency: number;
|
|
13
13
|
continueOnError: boolean;
|
|
14
|
-
cacheProvider
|
|
15
|
-
hasher
|
|
14
|
+
cacheProvider?: CacheProvider;
|
|
15
|
+
hasher?: TargetHasher;
|
|
16
16
|
shouldCache: boolean;
|
|
17
17
|
shouldResetCache: boolean;
|
|
18
18
|
runners: TargetRunnerPickerOptions;
|
|
@@ -39,6 +39,7 @@ export declare class SimpleScheduler implements TargetScheduler {
|
|
|
39
39
|
abortSignal: AbortSignal;
|
|
40
40
|
dependencies: [string, string][];
|
|
41
41
|
pool: Pool;
|
|
42
|
+
runPromise: Promise<any>;
|
|
42
43
|
constructor(options: SimpleSchedulerOptions);
|
|
43
44
|
/**
|
|
44
45
|
* The job of the run method is to:
|
|
@@ -55,10 +56,11 @@ export declare class SimpleScheduler implements TargetScheduler {
|
|
|
55
56
|
* Used by consumers of the scheduler to notify that the inputs to the target has changed
|
|
56
57
|
* @param targetId
|
|
57
58
|
*/
|
|
58
|
-
onTargetChange(targetId: string): void
|
|
59
|
+
onTargetChange(targetId: string): Promise<void>;
|
|
59
60
|
getReadyTargets(): WrappedTarget[];
|
|
60
61
|
isAllDone(): boolean;
|
|
61
|
-
scheduleReadyTargets(): Promise<any
|
|
62
|
+
scheduleReadyTargets(): Promise<any>;
|
|
63
|
+
cleanup(): Promise<void>;
|
|
62
64
|
/**
|
|
63
65
|
* Abort the scheduler using the abort controller.
|
|
64
66
|
*/
|
package/lib/SimpleScheduler.js
CHANGED
|
@@ -27,6 +27,7 @@ class SimpleScheduler {
|
|
|
27
27
|
this.abortController = new abort_controller_1.AbortController();
|
|
28
28
|
this.abortSignal = this.abortController.signal;
|
|
29
29
|
this.dependencies = [];
|
|
30
|
+
this.runPromise = Promise.resolve();
|
|
30
31
|
this.pool =
|
|
31
32
|
(_a = options.pool) !== null && _a !== void 0 ? _a : new worker_threads_pool_1.WorkerPool({
|
|
32
33
|
maxWorkers: options.concurrency,
|
|
@@ -96,7 +97,6 @@ class SimpleScheduler {
|
|
|
96
97
|
results = "success";
|
|
97
98
|
}
|
|
98
99
|
}
|
|
99
|
-
await this.pool.close();
|
|
100
100
|
return {
|
|
101
101
|
targetRunByStatus,
|
|
102
102
|
targetRuns: this.targetRuns,
|
|
@@ -110,7 +110,9 @@ class SimpleScheduler {
|
|
|
110
110
|
* Used by consumers of the scheduler to notify that the inputs to the target has changed
|
|
111
111
|
* @param targetId
|
|
112
112
|
*/
|
|
113
|
-
onTargetChange(targetId) {
|
|
113
|
+
async onTargetChange(targetId) {
|
|
114
|
+
this.abortController.abort();
|
|
115
|
+
await this.runPromise;
|
|
114
116
|
const queue = [targetId];
|
|
115
117
|
while (queue.length > 0) {
|
|
116
118
|
const current = queue.shift();
|
|
@@ -123,7 +125,12 @@ class SimpleScheduler {
|
|
|
123
125
|
}
|
|
124
126
|
}
|
|
125
127
|
}
|
|
126
|
-
this.
|
|
128
|
+
this.abortController = new abort_controller_1.AbortController();
|
|
129
|
+
this.abortSignal = this.abortController.signal;
|
|
130
|
+
for (const targetRun of this.targetRuns.values()) {
|
|
131
|
+
targetRun.abortController = this.abortController;
|
|
132
|
+
}
|
|
133
|
+
this.runPromise = this.scheduleReadyTargets();
|
|
127
134
|
}
|
|
128
135
|
getReadyTargets() {
|
|
129
136
|
var _a, _b, _c;
|
|
@@ -164,7 +171,7 @@ class SimpleScheduler {
|
|
|
164
171
|
}
|
|
165
172
|
async scheduleReadyTargets() {
|
|
166
173
|
if (this.isAllDone() || this.abortSignal.aborted) {
|
|
167
|
-
return;
|
|
174
|
+
return Promise.resolve();
|
|
168
175
|
}
|
|
169
176
|
const promises = [];
|
|
170
177
|
for (const nextTarget of this.getReadyTargets()) {
|
|
@@ -186,7 +193,11 @@ class SimpleScheduler {
|
|
|
186
193
|
}
|
|
187
194
|
}));
|
|
188
195
|
}
|
|
189
|
-
|
|
196
|
+
this.runPromise = Promise.all(promises);
|
|
197
|
+
return this.runPromise;
|
|
198
|
+
}
|
|
199
|
+
async cleanup() {
|
|
200
|
+
await this.pool.close();
|
|
190
201
|
}
|
|
191
202
|
/**
|
|
192
203
|
* Abort the scheduler using the abort controller.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SimpleScheduler.js","sourceRoot":"","sources":["../src/SimpleScheduler.ts"],"names":[],"mappings":";;;AAAA,uDAAmD;AACnD,iEAA8D;AAC9D,yDAAiF;AACjF,mDAAgD;AAChD,uEAA2D;AAuB3D;;;;;;;;;;;GAWG;AACH,MAAa,eAAe;
|
|
1
|
+
{"version":3,"file":"SimpleScheduler.js","sourceRoot":"","sources":["../src/SimpleScheduler.ts"],"names":[],"mappings":"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"}
|
package/lib/WrappedTarget.d.ts
CHANGED
|
@@ -9,8 +9,8 @@ export interface WrappedTargetOptions {
|
|
|
9
9
|
root: string;
|
|
10
10
|
target: Target;
|
|
11
11
|
logger: Logger;
|
|
12
|
-
cacheProvider
|
|
13
|
-
hasher
|
|
12
|
+
cacheProvider?: CacheProvider;
|
|
13
|
+
hasher?: TargetHasher;
|
|
14
14
|
shouldCache: boolean;
|
|
15
15
|
shouldResetCache: boolean;
|
|
16
16
|
continueOnError: boolean;
|
|
@@ -30,6 +30,8 @@ export declare class WrappedTarget implements TargetRun {
|
|
|
30
30
|
duration: [number, number];
|
|
31
31
|
target: Target;
|
|
32
32
|
status: TargetStatus;
|
|
33
|
+
get abortController(): AbortController;
|
|
34
|
+
set abortController(abortController: AbortController);
|
|
33
35
|
constructor(options: WrappedTargetOptions);
|
|
34
36
|
onAbort(): void;
|
|
35
37
|
onStart(): void;
|
|
@@ -37,7 +39,10 @@ export declare class WrappedTarget implements TargetRun {
|
|
|
37
39
|
onFail(): void;
|
|
38
40
|
onSkipped(hash: string | null): void;
|
|
39
41
|
getCache(): Promise<{
|
|
40
|
-
hash:
|
|
42
|
+
hash: null;
|
|
43
|
+
cacheHit: boolean;
|
|
44
|
+
} | {
|
|
45
|
+
hash: string;
|
|
41
46
|
cacheHit: boolean;
|
|
42
47
|
}>;
|
|
43
48
|
saveCache(hash: string | null): Promise<void>;
|
package/lib/WrappedTarget.js
CHANGED
|
@@ -26,6 +26,12 @@ class WrappedTarget {
|
|
|
26
26
|
this.status = "pending";
|
|
27
27
|
this.target = options.target;
|
|
28
28
|
}
|
|
29
|
+
get abortController() {
|
|
30
|
+
return this.options.abortController;
|
|
31
|
+
}
|
|
32
|
+
set abortController(abortController) {
|
|
33
|
+
this.options.abortController = abortController;
|
|
34
|
+
}
|
|
29
35
|
onAbort() {
|
|
30
36
|
this.status = "aborted";
|
|
31
37
|
this.duration = process.hrtime(this.startTime);
|
|
@@ -72,19 +78,20 @@ class WrappedTarget {
|
|
|
72
78
|
let hash = null;
|
|
73
79
|
let cacheHit = false;
|
|
74
80
|
const { target, shouldCache, shouldResetCache } = this.options;
|
|
75
|
-
if (shouldCache
|
|
76
|
-
hash
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
81
|
+
if (!shouldCache || !target.cache || !cacheProvider || !hasher) {
|
|
82
|
+
return { hash, cacheHit };
|
|
83
|
+
}
|
|
84
|
+
hash = await hasher.hash(target);
|
|
85
|
+
if (hash && !shouldResetCache) {
|
|
86
|
+
cacheHit = await cacheProvider.fetch(hash, target);
|
|
80
87
|
}
|
|
81
88
|
return { hash, cacheHit };
|
|
82
89
|
}
|
|
83
90
|
async saveCache(hash) {
|
|
84
|
-
|
|
91
|
+
const { logger, target, cacheProvider } = this.options;
|
|
92
|
+
if (!hash || !cacheProvider) {
|
|
85
93
|
return;
|
|
86
94
|
}
|
|
87
|
-
const { logger, target, cacheProvider } = this.options;
|
|
88
95
|
logger.verbose(`hash put ${hash}`, { target });
|
|
89
96
|
await cacheProvider.put(hash, target);
|
|
90
97
|
}
|
package/lib/WrappedTarget.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WrappedTarget.js","sourceRoot":"","sources":["../src/WrappedTarget.ts"],"names":[],"mappings":";;;;;;AAAA,uDAAoD;AACpD,6EAA0E;AAC1E,qDAA+C;AAC/C,6CAA4C;AAE5C,4CAAoB;AACpB,gDAAwB;AACxB,0CAA+C;AAuB/C;;;;;;GAMG;AACH,MAAa,aAAa;
|
|
1
|
+
{"version":3,"file":"WrappedTarget.js","sourceRoot":"","sources":["../src/WrappedTarget.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@lage-run/scheduler",
|
|
3
|
-
"version": "0.4.
|
|
3
|
+
"version": "0.4.6",
|
|
4
4
|
"description": "Scheduler for Lage",
|
|
5
5
|
"repository": {
|
|
6
6
|
"url": "https://github.com/microsoft/lage"
|
|
@@ -17,15 +17,17 @@
|
|
|
17
17
|
"dependencies": {
|
|
18
18
|
"@lage-run/target-graph": "^0.4.2",
|
|
19
19
|
"@lage-run/logger": "^1.2.0",
|
|
20
|
-
"@lage-run/cache": "^0.1.
|
|
20
|
+
"@lage-run/cache": "^0.1.19",
|
|
21
21
|
"@lage-run/worker-threads-pool": "^0.1.7",
|
|
22
22
|
"p-graph": "^1.1.1",
|
|
23
23
|
"p-profiler": "^0.2.1",
|
|
24
24
|
"abort-controller": "^3.0.0",
|
|
25
|
-
"workspace-tools": "^0.28.0"
|
|
25
|
+
"workspace-tools": "^0.28.0",
|
|
26
|
+
"watchpack": "^2.4.0"
|
|
26
27
|
},
|
|
27
28
|
"devDependencies": {
|
|
28
|
-
"@
|
|
29
|
+
"@types/watchpack": "^2.4.0",
|
|
30
|
+
"@lage-run/scheduler-types": "^0.1.9",
|
|
29
31
|
"@lage-run/monorepo-fixture": "*",
|
|
30
32
|
"@types/workerpool": "6.1.0",
|
|
31
33
|
"monorepo-scripts": "*"
|