@rocicorp/zero 0.3.2024102600 → 0.3.2024102800
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/out/react.js +3 -3
- package/out/react.js.map +2 -2
- package/out/solid.js +3 -1
- package/out/solid.js.map +2 -2
- package/out/zero-cache/src/config/config-query.d.ts +1 -1
- package/out/zero-cache/src/config/config-query.d.ts.map +1 -1
- package/out/zero-cache/src/config/config-query.js +1 -1
- package/out/zero-cache/src/config/config-query.js.map +1 -1
- package/out/zero-cache/src/server/life-cycle.d.ts +2 -1
- package/out/zero-cache/src/server/life-cycle.d.ts.map +1 -1
- package/out/zero-cache/src/server/life-cycle.js +29 -14
- package/out/zero-cache/src/server/life-cycle.js.map +1 -1
- package/out/zero-cache/src/server/main.js +2 -9
- package/out/zero-cache/src/server/main.js.map +1 -1
- package/out/zero-cache/src/services/change-streamer/pg/schema/ddl.d.ts.map +1 -1
- package/out/zero-cache/src/services/change-streamer/pg/schema/ddl.js +9 -1
- package/out/zero-cache/src/services/change-streamer/pg/schema/ddl.js.map +1 -1
- package/out/zero-cache/src/services/dispatcher/dispatcher.d.ts +2 -2
- package/out/zero-cache/src/services/dispatcher/dispatcher.d.ts.map +1 -1
- package/out/zero-cache/src/services/dispatcher/dispatcher.js +1 -0
- package/out/zero-cache/src/services/dispatcher/dispatcher.js.map +1 -1
- package/out/zero-client/src/client/query-manager.d.ts.map +1 -1
- package/out/zero-client/src/client/query-manager.js +2 -5
- package/out/zero-client/src/client/query-manager.js.map +1 -1
- package/out/zero-internal/src/mod.d.ts +1 -0
- package/out/zero-internal/src/mod.d.ts.map +1 -1
- package/out/zero-protocol/src/ast-hash.d.ts +3 -0
- package/out/zero-protocol/src/ast-hash.d.ts.map +1 -0
- package/out/zero-protocol/src/ast-hash.js +14 -0
- package/out/zero-protocol/src/ast-hash.js.map +1 -0
- package/out/zero-protocol/src/ast.d.ts.map +1 -1
- package/out/zero-protocol/src/ast.js +8 -1
- package/out/zero-protocol/src/ast.js.map +1 -1
- package/out/zero-react/src/use-query.d.ts.map +1 -1
- package/out/zero-solid/src/use-query.d.ts +1 -2
- package/out/zero-solid/src/use-query.d.ts.map +1 -1
- package/out/zero.js +426 -400
- package/out/zero.js.map +4 -4
- package/out/zql/src/zql/query/query-impl.d.ts +10 -10
- package/out/zql/src/zql/query/query-impl.d.ts.map +1 -1
- package/out/zql/src/zql/query/query-impl.js +50 -41
- package/out/zql/src/zql/query/query-impl.js.map +1 -1
- package/out/zql/src/zql/query/query-internal.d.ts +11 -0
- package/out/zql/src/zql/query/query-internal.d.ts.map +1 -0
- package/out/zql/src/zql/query/query-internal.js +2 -0
- package/out/zql/src/zql/query/query-internal.js.map +1 -0
- package/out/zql/src/zql/query/query.d.ts +0 -2
- package/out/zql/src/zql/query/query.d.ts.map +1 -1
- package/package.json +1 -1
- package/out/zero-cache/src/server/task-state-watcher.d.ts +0 -14
- package/out/zero-cache/src/server/task-state-watcher.d.ts.map +0 -1
- package/out/zero-cache/src/server/task-state-watcher.js +0 -75
- package/out/zero-cache/src/server/task-state-watcher.js.map +0 -1
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
import type { AST } from '../../../../zero-protocol/src/ast.js';
|
|
2
2
|
import { type BuilderDelegate } from '../builder/builder.js';
|
|
3
|
+
import type { Format, ViewFactory } from '../ivm/view.js';
|
|
3
4
|
import { type NormalizedTableSchema } from './normalize-table-schema.js';
|
|
5
|
+
import type { QueryInternal } from './query-internal.js';
|
|
4
6
|
import type { AddSelections, AddSubselect, DefaultQueryResultRow, GetFieldTypeNoNullOrUndefined, MakeSingular, Operator, Parameter, Query, QueryType, SchemaToRow, Selector, Smash } from './query.js';
|
|
5
7
|
import { type PullSchemaForRelationship, type TableSchema } from './schema.js';
|
|
6
8
|
import type { TypedView } from './typed-view.js';
|
|
7
|
-
import type { Format } from '../ivm/view.js';
|
|
8
|
-
import type { ViewFactory } from '../ivm/view.js';
|
|
9
9
|
export declare function newQuery<TSchema extends TableSchema, TReturn extends QueryType = DefaultQueryResultRow<TSchema>>(delegate: QueryDelegate, tableSchema: TSchema): Query<TSchema, TReturn>;
|
|
10
10
|
export type CommitListener = () => void;
|
|
11
11
|
export type GotCallback = (got: boolean) => void;
|
|
@@ -14,10 +14,11 @@ export interface QueryDelegate extends BuilderDelegate {
|
|
|
14
14
|
onTransactionCommit(cb: CommitListener): () => void;
|
|
15
15
|
}
|
|
16
16
|
export declare function staticParam<TAnchor, TField extends keyof TAnchor>(anchorClass: 'authData' | 'preMutationRow', field: TField): Parameter<TAnchor, TField, TAnchor[TField]>;
|
|
17
|
-
export declare abstract class AbstractQuery<TSchema extends TableSchema, TReturn extends QueryType = DefaultQueryResultRow<TSchema>> implements
|
|
17
|
+
export declare abstract class AbstractQuery<TSchema extends TableSchema, TReturn extends QueryType = DefaultQueryResultRow<TSchema>> implements QueryInternal<TSchema, TReturn> {
|
|
18
18
|
#private;
|
|
19
|
-
constructor(schema: NormalizedTableSchema, ast
|
|
20
|
-
get
|
|
19
|
+
constructor(schema: NormalizedTableSchema, ast: AST, format?: Format | undefined);
|
|
20
|
+
get format(): Format;
|
|
21
|
+
hash(): string;
|
|
21
22
|
select<TFields extends Selector<TSchema>[]>(..._fields: TFields): Query<TSchema, AddSelections<TSchema, TFields, TReturn>>;
|
|
22
23
|
protected abstract _newQuery<TSchema extends TableSchema, TReturn extends QueryType>(schema: NormalizedTableSchema, ast: AST, format: Format | undefined): Query<TSchema, TReturn>;
|
|
23
24
|
one(): Query<TSchema, MakeSingular<TReturn>>;
|
|
@@ -36,14 +37,13 @@ export declare abstract class AbstractQuery<TSchema extends TableSchema, TReturn
|
|
|
36
37
|
complete: Promise<void>;
|
|
37
38
|
};
|
|
38
39
|
}
|
|
40
|
+
export declare const astForTestingSymbol: unique symbol;
|
|
39
41
|
export declare class QueryImpl<TSchema extends TableSchema, TReturn extends QueryType = DefaultQueryResultRow<TSchema>> extends AbstractQuery<TSchema, TReturn> {
|
|
40
42
|
#private;
|
|
41
|
-
constructor(delegate: QueryDelegate, schema: NormalizedTableSchema, ast?: AST
|
|
42
|
-
get
|
|
43
|
-
get singular(): TReturn['singular'];
|
|
43
|
+
constructor(delegate: QueryDelegate, schema: NormalizedTableSchema, ast?: AST, format?: Format | undefined);
|
|
44
|
+
get [astForTestingSymbol](): AST;
|
|
44
45
|
protected _newQuery<TSchema extends TableSchema, TReturn extends QueryType>(schema: NormalizedTableSchema, ast: AST, format: Format | undefined): Query<TSchema, TReturn>;
|
|
45
|
-
materialize():
|
|
46
|
-
materialize<T>(factory: ViewFactory<TSchema, TReturn, T>): T;
|
|
46
|
+
materialize<T>(factory?: ViewFactory<TSchema, TReturn, T>): T;
|
|
47
47
|
preload(): {
|
|
48
48
|
cleanup: () => void;
|
|
49
49
|
complete: Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"query-impl.d.ts","sourceRoot":"","sources":["../../../../../../zql/src/zql/query/query-impl.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"query-impl.d.ts","sourceRoot":"","sources":["../../../../../../zql/src/zql/query/query-impl.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,8 @@
|
|
|
2
2
|
/* eslint-disable @typescript-eslint/no-explicit-any */
|
|
3
3
|
import { resolver } from '@rocicorp/resolver';
|
|
4
4
|
import { assert } from '../../../../shared/src/asserts.js';
|
|
5
|
-
import {
|
|
5
|
+
import { hashOfAST } from '../../../../zero-protocol/src/ast-hash.js';
|
|
6
|
+
import { buildPipeline } from '../builder/builder.js';
|
|
6
7
|
import { ArrayView } from '../ivm/array-view.js';
|
|
7
8
|
import { normalizeTableSchema, } from './normalize-table-schema.js';
|
|
8
9
|
import { isFieldRelationship, isJunctionRelationship, } from './schema.js';
|
|
@@ -23,15 +24,22 @@ export class AbstractQuery {
|
|
|
23
24
|
#ast;
|
|
24
25
|
#schema;
|
|
25
26
|
#format;
|
|
27
|
+
#hash = '';
|
|
26
28
|
constructor(schema, ast, format) {
|
|
27
|
-
this.#ast = ast
|
|
28
|
-
table: schema.tableName,
|
|
29
|
-
};
|
|
29
|
+
this.#ast = ast;
|
|
30
30
|
this.#format = format ?? { singular: false, relationships: {} };
|
|
31
31
|
this.#schema = schema;
|
|
32
32
|
}
|
|
33
|
-
get
|
|
34
|
-
return this.#
|
|
33
|
+
get format() {
|
|
34
|
+
return this.#format;
|
|
35
|
+
}
|
|
36
|
+
hash() {
|
|
37
|
+
if (!this.#hash) {
|
|
38
|
+
const ast = this._completeAst();
|
|
39
|
+
const hash = hashOfAST(ast);
|
|
40
|
+
this.#hash = hash;
|
|
41
|
+
}
|
|
42
|
+
return this.#hash;
|
|
35
43
|
}
|
|
36
44
|
select(..._fields) {
|
|
37
45
|
// we return all columns for now so we ignore the selection set and only use it for type inference
|
|
@@ -67,14 +75,14 @@ export class AbstractQuery {
|
|
|
67
75
|
childField: related1.dest.field,
|
|
68
76
|
op: '=',
|
|
69
77
|
},
|
|
70
|
-
subquery: addPrimaryKeysToAst(destSchema, sq
|
|
78
|
+
subquery: addPrimaryKeysToAst(destSchema, sq.#ast),
|
|
71
79
|
},
|
|
72
80
|
],
|
|
73
81
|
}, {
|
|
74
82
|
...this.#format,
|
|
75
83
|
relationships: {
|
|
76
84
|
...this.#format.relationships,
|
|
77
|
-
[relationship]: sq
|
|
85
|
+
[relationship]: sq.#format,
|
|
78
86
|
},
|
|
79
87
|
});
|
|
80
88
|
}
|
|
@@ -107,7 +115,7 @@ export class AbstractQuery {
|
|
|
107
115
|
op: '=',
|
|
108
116
|
},
|
|
109
117
|
hidden: true,
|
|
110
|
-
subquery: addPrimaryKeysToAst(destSchema, sq
|
|
118
|
+
subquery: addPrimaryKeysToAst(destSchema, sq.#ast),
|
|
111
119
|
},
|
|
112
120
|
],
|
|
113
121
|
},
|
|
@@ -117,7 +125,7 @@ export class AbstractQuery {
|
|
|
117
125
|
...this.#format,
|
|
118
126
|
relationships: {
|
|
119
127
|
...this.#format.relationships,
|
|
120
|
-
[relationship]: sq
|
|
128
|
+
[relationship]: sq.#format,
|
|
121
129
|
},
|
|
122
130
|
});
|
|
123
131
|
}
|
|
@@ -172,42 +180,47 @@ export class AbstractQuery {
|
|
|
172
180
|
orderBy: [...(this.#ast.orderBy ?? []), [field, direction]],
|
|
173
181
|
}, this.#format);
|
|
174
182
|
}
|
|
183
|
+
#completedAST;
|
|
175
184
|
_completeAst() {
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
185
|
+
if (!this.#completedAST) {
|
|
186
|
+
const finalOrderBy = addPrimaryKeys(this.#schema, this.#ast.orderBy);
|
|
187
|
+
if (this.#ast.start) {
|
|
188
|
+
const { row } = this.#ast.start;
|
|
189
|
+
const narrowedRow = {};
|
|
190
|
+
for (const [field] of finalOrderBy) {
|
|
191
|
+
narrowedRow[field] = row[field];
|
|
192
|
+
}
|
|
193
|
+
this.#completedAST = {
|
|
194
|
+
...this.#ast,
|
|
195
|
+
start: {
|
|
196
|
+
...this.#ast.start,
|
|
197
|
+
row: narrowedRow,
|
|
198
|
+
},
|
|
199
|
+
orderBy: finalOrderBy,
|
|
200
|
+
};
|
|
201
|
+
}
|
|
202
|
+
else {
|
|
203
|
+
this.#completedAST = {
|
|
204
|
+
...this.#ast,
|
|
205
|
+
orderBy: addPrimaryKeys(this.#schema, this.#ast.orderBy),
|
|
206
|
+
};
|
|
182
207
|
}
|
|
183
|
-
return {
|
|
184
|
-
...this.#ast,
|
|
185
|
-
start: {
|
|
186
|
-
...this.#ast.start,
|
|
187
|
-
row: narrowedRow,
|
|
188
|
-
},
|
|
189
|
-
orderBy: finalOrderBy,
|
|
190
|
-
};
|
|
191
208
|
}
|
|
192
|
-
return
|
|
193
|
-
...this.#ast,
|
|
194
|
-
orderBy: addPrimaryKeys(this.#schema, this.#ast.orderBy),
|
|
195
|
-
};
|
|
209
|
+
return this.#completedAST;
|
|
196
210
|
}
|
|
197
211
|
}
|
|
212
|
+
export const astForTestingSymbol = Symbol();
|
|
198
213
|
export class QueryImpl extends AbstractQuery {
|
|
199
214
|
#delegate;
|
|
200
|
-
#
|
|
201
|
-
constructor(delegate, schema, ast, format) {
|
|
215
|
+
#ast;
|
|
216
|
+
constructor(delegate, schema, ast = { table: schema.tableName }, format) {
|
|
202
217
|
super(schema, ast, format);
|
|
203
|
-
this.#format = format ?? { singular: false, relationships: {} };
|
|
204
218
|
this.#delegate = delegate;
|
|
219
|
+
this.#ast = ast;
|
|
205
220
|
}
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
get singular() {
|
|
210
|
-
return this.#format.singular;
|
|
221
|
+
// Not part of Query or QueryInternal interface
|
|
222
|
+
get [astForTestingSymbol]() {
|
|
223
|
+
return this.#ast;
|
|
211
224
|
}
|
|
212
225
|
_newQuery(schema, ast, format) {
|
|
213
226
|
return newQueryWithDetails(this.#delegate, schema, ast, format);
|
|
@@ -216,17 +229,13 @@ export class QueryImpl extends AbstractQuery {
|
|
|
216
229
|
const ast = this._completeAst();
|
|
217
230
|
const removeServerQuery = this.#delegate.addServerQuery(ast);
|
|
218
231
|
const input = buildPipeline(ast, this.#delegate, undefined);
|
|
219
|
-
const schema = input.getSchema();
|
|
220
|
-
// TODO: Can this assert be removed this._completeAst above ensures this is
|
|
221
|
-
// true.
|
|
222
|
-
assertOrderingIncludesPK(schema.sort, schema.primaryKey);
|
|
223
232
|
let removeCommitObserver;
|
|
224
233
|
const onDestroy = () => {
|
|
225
234
|
input.destroy();
|
|
226
235
|
removeCommitObserver?.();
|
|
227
236
|
removeServerQuery();
|
|
228
237
|
};
|
|
229
|
-
const view = (factory ?? arrayViewFactory)(this, input, this
|
|
238
|
+
const view = (factory ?? arrayViewFactory)(this, input, this.format, onDestroy, cb => {
|
|
230
239
|
removeCommitObserver = this.#delegate.onTransactionCommit(cb);
|
|
231
240
|
});
|
|
232
241
|
return view;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"query-impl.js","sourceRoot":"","sources":["../../../../../../zql/src/zql/query/query-impl.ts"],"names":[],"mappings":"AAAA,yDAAyD;AACzD,uDAAuD;AACvD,OAAO,EAAC,QAAQ,EAAC,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EAAC,MAAM,EAAC,MAAM,mCAAmC,CAAC;
|
|
1
|
+
{"version":3,"file":"query-impl.js","sourceRoot":"","sources":["../../../../../../zql/src/zql/query/query-impl.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import type { Format, ViewFactory } from '../ivm/view.js';
|
|
2
|
+
import type { DefaultQueryResultRow, Query, QueryType, Smash } from './query.js';
|
|
3
|
+
import type { TableSchema } from './schema.js';
|
|
4
|
+
import type { TypedView } from './typed-view.js';
|
|
5
|
+
export interface QueryInternal<TSchema extends TableSchema, TReturn extends QueryType = DefaultQueryResultRow<TSchema>> extends Query<TSchema, TReturn> {
|
|
6
|
+
materialize(): TypedView<Smash<TReturn>>;
|
|
7
|
+
materialize<T>(factory: ViewFactory<TSchema, TReturn, T>): T;
|
|
8
|
+
get format(): Format;
|
|
9
|
+
hash(): string;
|
|
10
|
+
}
|
|
11
|
+
//# sourceMappingURL=query-internal.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"query-internal.d.ts","sourceRoot":"","sources":["../../../../../../zql/src/zql/query/query-internal.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,MAAM,EAAE,WAAW,EAAC,MAAM,gBAAgB,CAAC;AACxD,OAAO,KAAK,EAAC,qBAAqB,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,EAAC,MAAM,YAAY,CAAC;AAC/E,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,aAAa,CAAC;AAC7C,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,iBAAiB,CAAC;AAE/C,MAAM,WAAW,aAAa,CAC5B,OAAO,SAAS,WAAW,EAC3B,OAAO,SAAS,SAAS,GAAG,qBAAqB,CAAC,OAAO,CAAC,CAC1D,SAAQ,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC;IAC/B,WAAW,IAAI,SAAS,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;IACzC,WAAW,CAAC,CAAC,EAAE,OAAO,EAAE,WAAW,CAAC,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC;IAC7D,IAAI,MAAM,IAAI,MAAM,CAAC;IACrB,IAAI,IAAI,MAAM,CAAC;CAChB"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"query-internal.js","sourceRoot":"","sources":["../../../../../../zql/src/zql/query/query-internal.ts"],"names":[],"mappings":""}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import type { Row } from '../../../../zero-protocol/src/data.js';
|
|
2
2
|
import type { SchemaValue } from '../ivm/schema.js';
|
|
3
3
|
import type { Source } from '../ivm/source.js';
|
|
4
|
-
import type { ViewFactory } from '../ivm/view.js';
|
|
5
4
|
import type { PullSchemaForRelationship, TableSchema } from './schema.js';
|
|
6
5
|
import type { TypedView } from './typed-view.js';
|
|
7
6
|
/**
|
|
@@ -123,7 +122,6 @@ export interface Query<TSchema extends TableSchema, TReturn extends QueryType =
|
|
|
123
122
|
orderBy<TSelector extends Selector<TSchema>>(field: TSelector, direction: 'asc' | 'desc'): Query<TSchema, TReturn>;
|
|
124
123
|
one(): Query<TSchema, MakeSingular<TReturn>>;
|
|
125
124
|
materialize(): TypedView<Smash<TReturn>>;
|
|
126
|
-
materialize<T>(factory: ViewFactory<TSchema, TReturn, T>): T;
|
|
127
125
|
preload(): {
|
|
128
126
|
cleanup: () => void;
|
|
129
127
|
complete: Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"query.d.ts","sourceRoot":"","sources":["../../../../../../zql/src/zql/query/query.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,GAAG,EAAC,MAAM,uCAAuC,CAAC;AAC/D,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,kBAAkB,CAAC;AAClD,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,kBAAkB,CAAC;AAC7C,OAAO,KAAK,EAAC,
|
|
1
|
+
{"version":3,"file":"query.d.ts","sourceRoot":"","sources":["../../../../../../zql/src/zql/query/query.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@rocicorp/zero",
|
|
3
|
-
"version": "0.3.
|
|
3
|
+
"version": "0.3.2024102800+3110cf",
|
|
4
4
|
"scripts": {
|
|
5
5
|
"build": "rm -rf out && npm run build-server && npm run build-client",
|
|
6
6
|
"build-client": "tsc -p tsconfig.client.json && tsc-alias -p tsconfig.client.json && node tool/build.js",
|
|
@@ -1,14 +0,0 @@
|
|
|
1
|
-
import type { LogContext } from '@rocicorp/logger';
|
|
2
|
-
import type { Service } from '../services/service.js';
|
|
3
|
-
import type { Terminator } from './life-cycle.js';
|
|
4
|
-
export declare class TaskStateWatcher implements Service {
|
|
5
|
-
#private;
|
|
6
|
-
readonly id = "task-watcher";
|
|
7
|
-
constructor(lc: LogContext, terminator: Terminator, pollIntervalMs?: number);
|
|
8
|
-
updateDesiredStatus(metadata: {
|
|
9
|
-
DesiredStatus: string;
|
|
10
|
-
}): void;
|
|
11
|
-
run(): Promise<void>;
|
|
12
|
-
stop(): Promise<void>;
|
|
13
|
-
}
|
|
14
|
-
//# sourceMappingURL=task-state-watcher.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"task-state-watcher.d.ts","sourceRoot":"","sources":["../../../../../zero-cache/src/server/task-state-watcher.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAIjD,OAAO,KAAK,EAAC,OAAO,EAAC,MAAM,wBAAwB,CAAC;AACpD,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,iBAAiB,CAAC;AAgBhD,qBAAa,gBAAiB,YAAW,OAAO;;IAC9C,QAAQ,CAAC,EAAE,kBAAkB;gBAS3B,EAAE,EAAE,UAAU,EACd,UAAU,EAAE,UAAU,EACtB,cAAc,SAA2B;IAS3C,mBAAmB,CAAC,QAAQ,EAAE;QAAC,aAAa,EAAE,MAAM,CAAA;KAAC;IAoB/C,GAAG;IA4BT,IAAI;CAIL"}
|
|
@@ -1,75 +0,0 @@
|
|
|
1
|
-
import { promiseVoid } from '../../../shared/src/resolved-promises.js';
|
|
2
|
-
import { sleep } from '../../../shared/src/sleep.js';
|
|
3
|
-
import { RunningState } from '../services/running-state.js';
|
|
4
|
-
const DEFAULT_POLL_INTERVAL_MS = 5000;
|
|
5
|
-
// https://docs.aws.amazon.com/AmazonECS/latest/developerguide/task-lifecycle-explanation.html
|
|
6
|
-
const PRE_DRAIN_STATES = ['PROVISIONING', 'PENDING', 'ACTIVATING', 'RUNNING'];
|
|
7
|
-
const POST_DRAIN_STATES = [
|
|
8
|
-
'DEACTIVATING',
|
|
9
|
-
'STOPPING',
|
|
10
|
-
'DEPROVISIONING',
|
|
11
|
-
'STOPPED',
|
|
12
|
-
];
|
|
13
|
-
const ALL_STATES = new Set([...PRE_DRAIN_STATES, ...POST_DRAIN_STATES]);
|
|
14
|
-
export class TaskStateWatcher {
|
|
15
|
-
id = 'task-watcher';
|
|
16
|
-
#lc;
|
|
17
|
-
#terminator;
|
|
18
|
-
#pollIntervalMs;
|
|
19
|
-
#runningState = new RunningState(this.id);
|
|
20
|
-
#lastStatus = '';
|
|
21
|
-
constructor(lc, terminator, pollIntervalMs = DEFAULT_POLL_INTERVAL_MS) {
|
|
22
|
-
this.#lc = lc.withContext('component', 'task-state-watcher');
|
|
23
|
-
this.#terminator = terminator;
|
|
24
|
-
this.#pollIntervalMs = pollIntervalMs;
|
|
25
|
-
}
|
|
26
|
-
// https://docs.aws.amazon.com/AmazonECS/latest/developerguide/task-metadata-endpoint-v4-response.html
|
|
27
|
-
// eslint-disable-next-line @typescript-eslint/naming-convention
|
|
28
|
-
updateDesiredStatus(metadata) {
|
|
29
|
-
const { DesiredStatus: desiredStatus } = metadata;
|
|
30
|
-
if (!ALL_STATES.has(desiredStatus)) {
|
|
31
|
-
this.#lc.warn?.('unexpected DesiredStatus value in', metadata);
|
|
32
|
-
return;
|
|
33
|
-
}
|
|
34
|
-
if (this.#lastStatus !== desiredStatus) {
|
|
35
|
-
this.#lc.info?.(`desired task status:`, desiredStatus);
|
|
36
|
-
if (PRE_DRAIN_STATES.includes(this.#lastStatus) &&
|
|
37
|
-
POST_DRAIN_STATES.includes(desiredStatus)) {
|
|
38
|
-
this.#lc.info?.('initiating drain');
|
|
39
|
-
this.#terminator.startDrain();
|
|
40
|
-
}
|
|
41
|
-
this.#lastStatus = desiredStatus;
|
|
42
|
-
}
|
|
43
|
-
}
|
|
44
|
-
async run() {
|
|
45
|
-
const containerMetadataURI = process.env['ECS_CONTAINER_METADATA_URI_V4'];
|
|
46
|
-
if (!containerMetadataURI) {
|
|
47
|
-
this.#lc.debug?.(`no task state endpoint to watch`);
|
|
48
|
-
return;
|
|
49
|
-
}
|
|
50
|
-
// https://docs.aws.amazon.com/AmazonECS/latest/developerguide/task-metadata-endpoint-v4.html
|
|
51
|
-
this.#lc.info?.(`watching task state at ${containerMetadataURI}`);
|
|
52
|
-
const taskStateURI = `${containerMetadataURI}/task`;
|
|
53
|
-
while (this.#runningState.shouldRun()) {
|
|
54
|
-
try {
|
|
55
|
-
const resp = await fetch(taskStateURI);
|
|
56
|
-
if (resp.ok) {
|
|
57
|
-
const metadata = await resp.json();
|
|
58
|
-
this.updateDesiredStatus(metadata);
|
|
59
|
-
}
|
|
60
|
-
}
|
|
61
|
-
catch (e) {
|
|
62
|
-
this.#lc.warn?.(`error fetching task metadata`, e);
|
|
63
|
-
}
|
|
64
|
-
await Promise.race([
|
|
65
|
-
sleep(this.#pollIntervalMs),
|
|
66
|
-
this.#runningState.stopped(),
|
|
67
|
-
]);
|
|
68
|
-
}
|
|
69
|
-
}
|
|
70
|
-
stop() {
|
|
71
|
-
this.#runningState.stop(this.#lc);
|
|
72
|
-
return promiseVoid;
|
|
73
|
-
}
|
|
74
|
-
}
|
|
75
|
-
//# sourceMappingURL=task-state-watcher.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"task-state-watcher.js","sourceRoot":"","sources":["../../../../../zero-cache/src/server/task-state-watcher.ts"],"names":[],"mappings":"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"}
|