@dcupl/cli 1.4.0-beta.2 → 1.4.0-beta.20
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 +30 -23
- package/dist/cli.d.ts +2 -0
- package/dist/cli.js +740 -205
- package/dist/cli.js.map +1 -1
- package/dist/functions/app/app-id.js +34 -2
- package/dist/functions/app/app-id.js.map +1 -1
- package/dist/functions/app/client/daemon-client.js.map +1 -1
- package/dist/functions/app/commands/cdn-host.d.ts +16 -0
- package/dist/functions/app/commands/cdn-host.js +47 -0
- package/dist/functions/app/commands/cdn-host.js.map +1 -0
- package/dist/functions/app/commands/create.js +50 -34
- package/dist/functions/app/commands/create.js.map +1 -1
- package/dist/functions/app/commands/data/render.d.ts +3 -1
- package/dist/functions/app/commands/data/render.js +9 -1
- package/dist/functions/app/commands/data/render.js.map +1 -1
- package/dist/functions/app/commands/destroy.js +10 -4
- package/dist/functions/app/commands/destroy.js.map +1 -1
- package/dist/functions/app/commands/detect-serve.js +17 -6
- package/dist/functions/app/commands/detect-serve.js.map +1 -1
- package/dist/functions/app/commands/fn/_fn-helpers.js +11 -3
- package/dist/functions/app/commands/fn/_fn-helpers.js.map +1 -1
- package/dist/functions/app/commands/fn/aggregate.js +4 -1
- package/dist/functions/app/commands/fn/aggregate.js.map +1 -1
- package/dist/functions/app/commands/fn/group-by.js +4 -2
- package/dist/functions/app/commands/fn/group-by.js.map +1 -1
- package/dist/functions/app/commands/fn/pivot.js.map +1 -1
- package/dist/functions/app/commands/list.js +6 -2
- package/dist/functions/app/commands/list.js.map +1 -1
- package/dist/functions/app/commands/loader-hash.js.map +1 -1
- package/dist/functions/app/commands/loaders/add.js +6 -0
- package/dist/functions/app/commands/loaders/add.js.map +1 -1
- package/dist/functions/app/commands/loaders/process-flags.js +4 -1
- package/dist/functions/app/commands/loaders/process-flags.js.map +1 -1
- package/dist/functions/app/commands/loaders/process.js +3 -1
- package/dist/functions/app/commands/loaders/process.js.map +1 -1
- package/dist/functions/app/commands/loaders/remove.js +2 -0
- package/dist/functions/app/commands/loaders/remove.js.map +1 -1
- package/dist/functions/app/commands/models/get.js.map +1 -1
- package/dist/functions/app/commands/models/keys.js.map +1 -1
- package/dist/functions/app/commands/models/remove.js.map +1 -1
- package/dist/functions/app/commands/models/set.js +3 -1
- package/dist/functions/app/commands/models/set.js.map +1 -1
- package/dist/functions/app/commands/query/execute.js +7 -15
- package/dist/functions/app/commands/query/execute.js.map +1 -1
- package/dist/functions/app/commands/query/one.js +3 -1
- package/dist/functions/app/commands/query/one.js.map +1 -1
- package/dist/functions/app/commands/query-input.d.ts +1 -0
- package/dist/functions/app/commands/query-input.js +15 -2
- package/dist/functions/app/commands/query-input.js.map +1 -1
- package/dist/functions/app/commands/render.js +10 -4
- package/dist/functions/app/commands/render.js.map +1 -1
- package/dist/functions/app/commands/resolve-app.js.map +1 -1
- package/dist/functions/app/commands/resolve-source.d.ts +1 -0
- package/dist/functions/app/commands/resolve-source.js +20 -5
- package/dist/functions/app/commands/resolve-source.js.map +1 -1
- package/dist/functions/app/commands/sort-input.d.ts +5 -0
- package/dist/functions/app/commands/sort-input.js +34 -0
- package/dist/functions/app/commands/sort-input.js.map +1 -0
- package/dist/functions/app/commands/validate-report.d.ts +31 -0
- package/dist/functions/app/commands/validate-report.js +20 -1
- package/dist/functions/app/commands/validate-report.js.map +1 -1
- package/dist/functions/app/commands/validate.d.ts +1 -0
- package/dist/functions/app/commands/validate.js +31 -10
- package/dist/functions/app/commands/validate.js.map +1 -1
- package/dist/functions/app/daemon/app-server.module.js +6 -1
- package/dist/functions/app/daemon/app-server.module.js.map +1 -1
- package/dist/functions/app/daemon/controllers/data.controller.d.ts +3 -4
- package/dist/functions/app/daemon/controllers/data.controller.js +18 -7
- package/dist/functions/app/daemon/controllers/data.controller.js.map +1 -1
- package/dist/functions/app/daemon/controllers/lifecycle.controller.js.map +1 -1
- package/dist/functions/app/daemon/controllers/loaders.controller.js +1 -1
- package/dist/functions/app/daemon/controllers/loaders.controller.js.map +1 -1
- package/dist/functions/app/daemon/controllers/query.controller.js +4 -1
- package/dist/functions/app/daemon/controllers/query.controller.js.map +1 -1
- package/dist/functions/app/daemon/daemon-args.js +2 -2
- package/dist/functions/app/daemon/daemon-args.js.map +1 -1
- package/dist/functions/app/daemon/filters/envelope-exception.filter.js +6 -1
- package/dist/functions/app/daemon/filters/envelope-exception.filter.js.map +1 -1
- package/dist/functions/app/daemon/main.js +14 -7
- package/dist/functions/app/daemon/main.js.map +1 -1
- package/dist/functions/app/daemon/services/attribute-validation.js +6 -3
- package/dist/functions/app/daemon/services/attribute-validation.js.map +1 -1
- package/dist/functions/app/daemon/services/csv-delimiter.d.ts +15 -0
- package/dist/functions/app/daemon/services/csv-delimiter.js +99 -0
- package/dist/functions/app/daemon/services/csv-delimiter.js.map +1 -0
- package/dist/functions/app/daemon/services/dcupl-host.service.d.ts +15 -2
- package/dist/functions/app/daemon/services/dcupl-host.service.js +132 -24
- package/dist/functions/app/daemon/services/dcupl-host.service.js.map +1 -1
- package/dist/functions/app/daemon/services/group-sort.d.ts +25 -0
- package/dist/functions/app/daemon/services/group-sort.js +128 -0
- package/dist/functions/app/daemon/services/group-sort.js.map +1 -0
- package/dist/functions/app/daemon/services/idle-watchdog.service.js.map +1 -1
- package/dist/functions/app/daemon/services/ingest.service.d.ts +1 -0
- package/dist/functions/app/daemon/services/ingest.service.js +17 -11
- package/dist/functions/app/daemon/services/ingest.service.js.map +1 -1
- package/dist/functions/app/daemon/services/init-options.js.map +1 -1
- package/dist/functions/app/daemon/services/loaders.service.d.ts +4 -2
- package/dist/functions/app/daemon/services/loaders.service.js +29 -7
- package/dist/functions/app/daemon/services/loaders.service.js.map +1 -1
- package/dist/functions/app/daemon/services/normalize-query.d.ts +1 -1
- package/dist/functions/app/daemon/services/normalize-query.js +44 -3
- package/dist/functions/app/daemon/services/normalize-query.js.map +1 -1
- package/dist/functions/app/daemon/services/staged-keys.d.ts +12 -0
- package/dist/functions/app/daemon/services/staged-keys.js +72 -0
- package/dist/functions/app/daemon/services/staged-keys.js.map +1 -0
- package/dist/functions/app/e2e/port-lock.js +23 -9
- package/dist/functions/app/e2e/port-lock.js.map +1 -1
- package/dist/functions/app/registry/registry.js +11 -10
- package/dist/functions/app/registry/registry.js.map +1 -1
- package/dist/functions/app/registry/serve-registry.js +13 -9
- package/dist/functions/app/registry/serve-registry.js.map +1 -1
- package/dist/functions/app/types.d.ts +2 -0
- package/dist/functions/config/commands/set.js +4 -4
- package/dist/functions/config/commands/set.js.map +1 -1
- package/dist/functions/config/io.js +1 -3
- package/dist/functions/config/io.js.map +1 -1
- package/dist/functions/config/prompts.d.ts +2 -1
- package/dist/functions/config/prompts.js +1 -3
- package/dist/functions/config/prompts.js.map +1 -1
- package/dist/functions/files/commands/pull.d.ts +2 -0
- package/dist/functions/files/commands/pull.js +40 -16
- package/dist/functions/files/commands/pull.js.map +1 -1
- package/dist/functions/files/commands/push.d.ts +1 -0
- package/dist/functions/files/commands/push.js +20 -0
- package/dist/functions/files/commands/push.js.map +1 -1
- package/dist/functions/files/commands/read.js +2 -1
- package/dist/functions/files/commands/read.js.map +1 -1
- package/dist/functions/files/commands/write.js +12 -2
- package/dist/functions/files/commands/write.js.map +1 -1
- package/dist/functions/files/files-push.js +1 -1
- package/dist/functions/files/files-push.js.map +1 -1
- package/dist/functions/files/helper/confirm.js +2 -3
- package/dist/functions/files/helper/confirm.js.map +1 -1
- package/dist/functions/files/helper/text-policy.d.ts +5 -0
- package/dist/functions/files/helper/text-policy.js +31 -0
- package/dist/functions/files/helper/text-policy.js.map +1 -0
- package/dist/functions/files/sync/large-upload.d.ts +20 -0
- package/dist/functions/files/sync/large-upload.js +140 -0
- package/dist/functions/files/sync/large-upload.js.map +1 -0
- package/dist/functions/files/sync/manifest.js +2 -1
- package/dist/functions/files/sync/manifest.js.map +1 -1
- package/dist/functions/files/sync/transfer.d.ts +5 -0
- package/dist/functions/files/sync/transfer.js +47 -10
- package/dist/functions/files/sync/transfer.js.map +1 -1
- package/dist/functions/generate/files/generate-code.js +0 -1
- package/dist/functions/generate/files/generate-code.js.map +1 -1
- package/dist/functions/generate/files/generate-files.d.ts +10 -1
- package/dist/functions/generate/files/generate-files.js +154 -43
- package/dist/functions/generate/files/generate-files.js.map +1 -1
- package/dist/functions/generate/files/generate-schema.js +1 -1
- package/dist/functions/generate/files/generate-schema.js.map +1 -1
- package/dist/functions/generate/files/generate.helper.d.ts +9 -3
- package/dist/functions/generate/files/generate.helper.js +11 -8
- package/dist/functions/generate/files/generate.helper.js.map +1 -1
- package/dist/functions/generate/files/rest-api-template.d.ts +16 -0
- package/dist/functions/generate/files/rest-api-template.js +63 -0
- package/dist/functions/generate/files/rest-api-template.js.map +1 -0
- package/dist/functions/generate/files/script-starters.d.ts +7 -0
- package/dist/functions/generate/files/script-starters.js +75 -0
- package/dist/functions/generate/files/script-starters.js.map +1 -0
- package/dist/functions/generate/files/workflow-presets.js +2 -1
- package/dist/functions/generate/files/workflow-presets.js.map +1 -1
- package/dist/functions/generate/model-from-data/generate-model-from-data.d.ts +1 -0
- package/dist/functions/generate/model-from-data/generate-model-from-data.js +74 -6
- package/dist/functions/generate/model-from-data/generate-model-from-data.js.map +1 -1
- package/dist/functions/generate/model-from-data/infer-key.js +1 -4
- package/dist/functions/generate/model-from-data/infer-key.js.map +1 -1
- package/dist/functions/generate/model-from-data/infer-to-model.js +1 -2
- package/dist/functions/generate/model-from-data/infer-to-model.js.map +1 -1
- package/dist/functions/generate/projects/generate-project.js +18 -13
- package/dist/functions/generate/projects/generate-project.js.map +1 -1
- package/dist/functions/helper/api-client.d.ts +4 -0
- package/dist/functions/helper/api-client.js +18 -5
- package/dist/functions/helper/api-client.js.map +1 -1
- package/dist/functions/helper/config.helper.d.ts +1 -0
- package/dist/functions/helper/config.helper.js +1 -1
- package/dist/functions/helper/config.helper.js.map +1 -1
- package/dist/functions/helper/output.js +3 -1
- package/dist/functions/helper/output.js.map +1 -1
- package/dist/functions/helper/parse-fail.js +4 -1
- package/dist/functions/helper/parse-fail.js.map +1 -1
- package/dist/functions/helper/prompt.d.ts +2 -0
- package/dist/functions/helper/prompt.js +8 -0
- package/dist/functions/helper/prompt.js.map +1 -0
- package/dist/functions/schemas/command.js.map +1 -1
- package/dist/functions/schemas/examples/AppLoaderConfiguration.example.json +1 -3
- package/dist/functions/schemas/examples/DataMapperStepConfig.example.json +6 -1
- package/dist/functions/schemas/examples/ModelDefinition.example.json +8 -1
- package/dist/functions/schemas/examples/ResponseScriptConfig.example.json +1 -1
- package/dist/functions/schemas/examples/RestApiTemplate.example.json +30 -0
- package/dist/functions/schemas/examples/ScriptStepConfig.example.json +3 -1
- package/dist/functions/schemas/examples/TemplateV3.example.json +5 -1
- package/dist/functions/schemas/extract.js +1 -1
- package/dist/functions/schemas/extract.js.map +1 -1
- package/dist/functions/schemas/format.js +7 -5
- package/dist/functions/schemas/format.js.map +1 -1
- package/dist/functions/schemas/registry.d.ts +2 -1
- package/dist/functions/schemas/registry.js +95 -31
- package/dist/functions/schemas/registry.js.map +1 -1
- package/dist/functions/schemas/resolve.d.ts +1 -0
- package/dist/functions/schemas/resolve.js +31 -1
- package/dist/functions/schemas/resolve.js.map +1 -1
- package/dist/functions/schemas/validate.js.map +1 -1
- package/dist/functions/serve/commands/list.js +2 -1
- package/dist/functions/serve/commands/list.js.map +1 -1
- package/dist/functions/serve/commands/stop.js +10 -5
- package/dist/functions/serve/commands/stop.js.map +1 -1
- package/dist/functions/serve/dev-server/dev-server-access.guard.d.ts +11 -0
- package/dist/functions/serve/dev-server/dev-server-access.guard.js +41 -0
- package/dist/functions/serve/dev-server/dev-server-access.guard.js.map +1 -0
- package/dist/functions/serve/dev-server/dev-server.controller.d.ts +3 -0
- package/dist/functions/serve/dev-server/dev-server.controller.js +20 -0
- package/dist/functions/serve/dev-server/dev-server.controller.js.map +1 -1
- package/dist/functions/serve/dev-server/dev-server.module.d.ts +3 -0
- package/dist/functions/serve/dev-server/dev-server.module.js +34 -23
- package/dist/functions/serve/dev-server/dev-server.module.js.map +1 -1
- package/dist/functions/serve/dev-server/dev-server.options.d.ts +8 -0
- package/dist/functions/serve/dev-server/dev-server.options.js +5 -0
- package/dist/functions/serve/dev-server/dev-server.options.js.map +1 -0
- package/dist/functions/serve/dev-server/dev-server.service.d.ts +11 -3
- package/dist/functions/serve/dev-server/dev-server.service.js +72 -65
- package/dist/functions/serve/dev-server/dev-server.service.js.map +1 -1
- package/dist/functions/serve/dev-server/path-scope.d.ts +5 -0
- package/dist/functions/serve/dev-server/path-scope.js +88 -0
- package/dist/functions/serve/dev-server/path-scope.js.map +1 -0
- package/dist/functions/serve/dev-server/request-security.d.ts +34 -0
- package/dist/functions/serve/dev-server/request-security.js +146 -0
- package/dist/functions/serve/dev-server/request-security.js.map +1 -0
- package/dist/functions/serve/main.d.ts +13 -0
- package/dist/functions/serve/main.js +84 -12
- package/dist/functions/serve/main.js.map +1 -1
- package/dist/functions/serve/serve-self-register.js +2 -1
- package/dist/functions/serve/serve-self-register.js.map +1 -1
- package/dist/functions/version/command.js +1 -6
- package/dist/functions/version/command.js.map +1 -1
- package/dist/functions/workflow/commands/deploy.d.ts +1 -0
- package/dist/functions/workflow/commands/deploy.js +18 -13
- package/dist/functions/workflow/commands/deploy.js.map +1 -1
- package/dist/functions/workflow/commands/get.js.map +1 -1
- package/dist/functions/workflow/commands/history.js.map +1 -1
- package/dist/functions/workflow/commands/run.d.ts +2 -8
- package/dist/functions/workflow/commands/run.js +29 -22
- package/dist/functions/workflow/commands/run.js.map +1 -1
- package/dist/functions/workflow/commands/runners-get.js.map +1 -1
- package/dist/functions/workflow/commands/status.d.ts +1 -1
- package/dist/functions/workflow/commands/status.js +7 -1
- package/dist/functions/workflow/commands/status.js.map +1 -1
- package/dist/functions/workflow/commands/template.js.map +1 -1
- package/dist/functions/workflow/commands/test.d.ts +2 -8
- package/dist/functions/workflow/commands/test.js +19 -21
- package/dist/functions/workflow/commands/test.js.map +1 -1
- package/dist/functions/workflow/commands/trace.js.map +1 -1
- package/dist/functions/workflow/commands/undeploy.js +3 -1
- package/dist/functions/workflow/commands/undeploy.js.map +1 -1
- package/dist/functions/workflow/commands/validate.d.ts +2 -0
- package/dist/functions/workflow/commands/validate.js +8 -1
- package/dist/functions/workflow/commands/validate.js.map +1 -1
- package/dist/functions/workflow/resolve-runner.d.ts +17 -0
- package/dist/functions/workflow/resolve-runner.js +41 -0
- package/dist/functions/workflow/resolve-runner.js.map +1 -0
- package/dist/functions/workflow/run-failure.js +1 -1
- package/dist/functions/workflow/run-failure.js.map +1 -1
- package/dist/functions/workflow/runner-health.js.map +1 -1
- package/dist/functions/workflow/script-lint.js +32 -7
- package/dist/functions/workflow/script-lint.js.map +1 -1
- package/dist/functions/workflow/trace.js.map +1 -1
- package/dist/functions/workflow/types.d.ts +11 -2
- package/dist/functions/workflow/types.js +4 -0
- package/dist/functions/workflow/types.js.map +1 -1
- package/dist/functions/workflow/wait-for-swap.d.ts +24 -1
- package/dist/functions/workflow/wait-for-swap.js +58 -0
- package/dist/functions/workflow/wait-for-swap.js.map +1 -1
- package/dist/functions/workflow/workflow-api.d.ts +7 -7
- package/dist/functions/workflow/workflow-api.js +31 -16
- package/dist/functions/workflow/workflow-api.js.map +1 -1
- package/files/common/_gitignore +2 -1
- package/files/dev-server/index.html +2 -1
- package/package.json +24 -15
- package/dist/functions/serve/guards/apiKey.guard.d.ts +0 -4
- package/dist/functions/serve/guards/apiKey.guard.js +0 -23
- package/dist/functions/serve/guards/apiKey.guard.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ingest.service.js","sourceRoot":"","sources":["../../../../../src/functions/app/daemon/services/ingest.service.ts"],"names":[],"mappings":";;;;AAAA,2CAA4C;AAC5C,uCAAwC;AACxC,+BAA+B;AAC/B,0DAA0B;
|
|
1
|
+
{"version":3,"file":"ingest.service.js","sourceRoot":"","sources":["../../../../../src/functions/app/daemon/services/ingest.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init-options.js","sourceRoot":"","sources":["../../../../../src/functions/app/daemon/services/init-options.ts"],"names":[],"mappings":";;;AAyCA,sDAuBC;AAOD,
|
|
1
|
+
{"version":3,"file":"init-options.js","sourceRoot":"","sources":["../../../../../src/functions/app/daemon/services/init-options.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { DcuplAppLoader } from '@dcupl/loader';
|
|
2
2
|
import { DcuplHostService } from './dcupl-host.service.js';
|
|
3
|
-
import type { AddLoaderRequest, AddLoaderResponse, LoaderDetail, LoaderEntry, ProcessLoaderResponse, ProcessOptionsWire } from '../../types.js';
|
|
3
|
+
import type { AddLoaderRequest, AddLoaderResponse, LoaderDetail, LoaderEntry, LoaderSource, ProcessLoaderResponse, ProcessOptionsWire } from '../../types.js';
|
|
4
|
+
export declare function redactSource(source: LoaderSource): LoaderSource;
|
|
4
5
|
export declare class LoaderError_ extends Error {
|
|
5
6
|
readonly code: string;
|
|
6
7
|
readonly details?: unknown | undefined;
|
|
@@ -19,9 +20,10 @@ export declare class LoadersService {
|
|
|
19
20
|
process(key: string, opts: ProcessOptionsWire): Promise<ProcessLoaderResponse>;
|
|
20
21
|
list(): LoaderEntry[];
|
|
21
22
|
get(key: string): LoaderDetail;
|
|
22
|
-
remove(key: string): void
|
|
23
|
+
remove(key: string): Promise<void>;
|
|
23
24
|
private requireSlot;
|
|
24
25
|
private toFetchOptions;
|
|
26
|
+
private attemptedConfigUrl;
|
|
25
27
|
private toProcessOptions;
|
|
26
28
|
private countResources;
|
|
27
29
|
}
|
|
@@ -1,10 +1,17 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.LoadersService = exports.LOADERS_SERVICE_DEPS = exports.LoaderError_ = void 0;
|
|
4
|
+
exports.redactSource = redactSource;
|
|
4
5
|
const tslib_1 = require("tslib");
|
|
5
6
|
const common_1 = require("@nestjs/common");
|
|
6
7
|
const loader_1 = require("@dcupl/loader");
|
|
7
8
|
const dcupl_host_service_js_1 = require("./dcupl-host.service.js");
|
|
9
|
+
function redactSource(source) {
|
|
10
|
+
if (source.type !== 'cdn' || source.apiKey === undefined)
|
|
11
|
+
return source;
|
|
12
|
+
const { apiKey: _apiKey, ...rest } = source;
|
|
13
|
+
return { ...rest, apiKey: '<redacted>' };
|
|
14
|
+
}
|
|
8
15
|
class LoaderError_ extends Error {
|
|
9
16
|
constructor(code, message, details) {
|
|
10
17
|
super(message);
|
|
@@ -32,8 +39,9 @@ let LoadersService = class LoadersService {
|
|
|
32
39
|
await loader.config.fetch(fetchOptions);
|
|
33
40
|
}
|
|
34
41
|
catch (err) {
|
|
42
|
+
const url = this.attemptedConfigUrl(loader);
|
|
35
43
|
this.host.detachLoader(key);
|
|
36
|
-
throw new LoaderError_('LOADER_CONFIG_FETCH_FAILED', err?.message ?? '
|
|
44
|
+
throw new LoaderError_('LOADER_CONFIG_FETCH_FAILED', `Failed to fetch loader configuration from ${url}: ${err?.message ?? 'unknown error'}`, { url, source: redactSource(input.source) });
|
|
37
45
|
}
|
|
38
46
|
const config = loader.config.get();
|
|
39
47
|
const resourceCount = config?.resources?.length ?? 0;
|
|
@@ -66,7 +74,7 @@ let LoadersService = class LoadersService {
|
|
|
66
74
|
return {
|
|
67
75
|
key,
|
|
68
76
|
status: 'added',
|
|
69
|
-
source: input.source,
|
|
77
|
+
source: redactSource(input.source),
|
|
70
78
|
config: { resourceCount, applicationKeys, environmentKeys },
|
|
71
79
|
};
|
|
72
80
|
}
|
|
@@ -86,6 +94,9 @@ let LoadersService = class LoadersService {
|
|
|
86
94
|
}
|
|
87
95
|
catch (err) {
|
|
88
96
|
slot.entry.status = 'error';
|
|
97
|
+
if (err?.name === 'SharedModelKeyError') {
|
|
98
|
+
throw new LoaderError_('LOADER_SHARED_MODEL_KEY', err.message, { loader: key });
|
|
99
|
+
}
|
|
89
100
|
throw new LoaderError_('LOADER_PROCESS_FAILED', err?.message ?? 'process() failed');
|
|
90
101
|
}
|
|
91
102
|
const counts = this.countResources(slot.progress);
|
|
@@ -94,23 +105,27 @@ let LoadersService = class LoadersService {
|
|
|
94
105
|
return { key, status: 'processed', resources: counts, errors: slot.errors };
|
|
95
106
|
}
|
|
96
107
|
list() {
|
|
97
|
-
return Array.from(this.map.values()).map((s) => s.entry);
|
|
108
|
+
return Array.from(this.map.values()).map((s) => ({ ...s.entry, source: redactSource(s.entry.source) }));
|
|
98
109
|
}
|
|
99
110
|
get(key) {
|
|
100
111
|
const slot = this.requireSlot(key);
|
|
101
112
|
return {
|
|
102
113
|
...slot.entry,
|
|
114
|
+
source: redactSource(slot.entry.source),
|
|
103
115
|
config: slot.loader.config.get(),
|
|
104
116
|
lastProcessOptions: slot.lastProcessOptions,
|
|
105
117
|
progress: [...slot.progress],
|
|
106
118
|
errors: [...slot.errors],
|
|
107
119
|
};
|
|
108
120
|
}
|
|
109
|
-
remove(key) {
|
|
121
|
+
async remove(key) {
|
|
110
122
|
const slot = this.requireSlot(key);
|
|
111
123
|
slot.unsub();
|
|
112
124
|
this.host.detachLoader(key);
|
|
113
125
|
this.map.delete(key);
|
|
126
|
+
this.host.markDirty();
|
|
127
|
+
if (this.host.autoUpdate)
|
|
128
|
+
await this.host.update();
|
|
114
129
|
}
|
|
115
130
|
requireSlot(key) {
|
|
116
131
|
const slot = this.map.get(key);
|
|
@@ -126,6 +141,10 @@ let LoadersService = class LoadersService {
|
|
|
126
141
|
loader.variables.global.set('apiKey', source.apiKey);
|
|
127
142
|
if (source.version)
|
|
128
143
|
loader.variables.global.set('version', source.version);
|
|
144
|
+
if (source.cdnBaseUrl)
|
|
145
|
+
loader.variables.global.set('cdnBaseUrl', source.cdnBaseUrl);
|
|
146
|
+
if (source.consoleApiUrl)
|
|
147
|
+
loader.variables.global.set('consoleApiUrl', source.consoleApiUrl);
|
|
129
148
|
return { baseUrl: undefined, loaderFileName: undefined };
|
|
130
149
|
}
|
|
131
150
|
return {
|
|
@@ -136,14 +155,17 @@ let LoadersService = class LoadersService {
|
|
|
136
155
|
: undefined,
|
|
137
156
|
};
|
|
138
157
|
}
|
|
158
|
+
attemptedConfigUrl(loader) {
|
|
159
|
+
const baseUrl = loader.variables.get('baseUrl')?.value ?? '';
|
|
160
|
+
const loaderFileName = loader.variables.get('loaderFileName')?.value ?? 'dcupl.lc.json';
|
|
161
|
+
return `${baseUrl}/${loaderFileName}`;
|
|
162
|
+
}
|
|
139
163
|
toProcessOptions(o) {
|
|
140
164
|
return {
|
|
141
165
|
applicationKey: o.applicationKey,
|
|
142
166
|
environmentKeys: o.environmentKeys,
|
|
143
167
|
resourceTags: o.resourceTags,
|
|
144
|
-
variables: o.variables
|
|
145
|
-
? Object.entries(o.variables).map(([k, value]) => ({ key: k, value }))
|
|
146
|
-
: undefined,
|
|
168
|
+
variables: o.variables ? Object.entries(o.variables).map(([k, value]) => ({ key: k, value })) : undefined,
|
|
147
169
|
options: o.options,
|
|
148
170
|
};
|
|
149
171
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loaders.service.js","sourceRoot":"","sources":["../../../../../src/functions/app/daemon/services/loaders.service.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"loaders.service.js","sourceRoot":"","sources":["../../../../../src/functions/app/daemon/services/loaders.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,7 @@ export interface NormalizedQuery {
|
|
|
5
5
|
queries: unknown[];
|
|
6
6
|
}
|
|
7
7
|
export declare class BadQueryError extends Error {
|
|
8
|
-
readonly code = "
|
|
8
|
+
readonly code = "PARSE_ERROR";
|
|
9
9
|
constructor(message: string);
|
|
10
10
|
}
|
|
11
11
|
export declare function normalizeQuery(modelKey: string, raw: unknown): NormalizedQuery | undefined;
|
|
@@ -2,28 +2,69 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.BadQueryError = void 0;
|
|
4
4
|
exports.normalizeQuery = normalizeQuery;
|
|
5
|
+
const SHAPE = 'Expected a condition { operator, attribute, value } or a group { groupType, queries: [...] } (groupType "and" or "or")';
|
|
5
6
|
class BadQueryError extends Error {
|
|
6
7
|
constructor(message) {
|
|
7
8
|
super(message);
|
|
8
|
-
this.code = '
|
|
9
|
+
this.code = 'PARSE_ERROR';
|
|
9
10
|
this.name = 'BadQueryError';
|
|
10
11
|
}
|
|
11
12
|
}
|
|
12
13
|
exports.BadQueryError = BadQueryError;
|
|
14
|
+
function isGroup(obj) {
|
|
15
|
+
return 'queries' in obj || 'groupKey' in obj;
|
|
16
|
+
}
|
|
17
|
+
function shapeHints(obj) {
|
|
18
|
+
const hints = [];
|
|
19
|
+
for (const alias of ['filters', 'conditions']) {
|
|
20
|
+
if (alias in obj)
|
|
21
|
+
hints.push(`use "queries" instead of "${alias}"`);
|
|
22
|
+
}
|
|
23
|
+
const op = obj.operator;
|
|
24
|
+
if (op === 'and' || op === 'or') {
|
|
25
|
+
hints.push(`"${op}" belongs in groupType (groupType: "${op}", queries: [...]), not in operator`);
|
|
26
|
+
}
|
|
27
|
+
return hints;
|
|
28
|
+
}
|
|
29
|
+
function fail(path, what, obj) {
|
|
30
|
+
const hints = obj ? shapeHints(obj) : [];
|
|
31
|
+
const where = path ? ` at ${path}` : '';
|
|
32
|
+
throw new BadQueryError(`Invalid query${where}: ${what}. ${SHAPE}.${hints.length ? ` Hint: ${hints.join('; ')}.` : ''}`);
|
|
33
|
+
}
|
|
34
|
+
function assertQueryNode(node, path) {
|
|
35
|
+
if (node === null || typeof node !== 'object' || Array.isArray(node)) {
|
|
36
|
+
fail(path, `${Array.isArray(node) ? 'an array' : JSON.stringify(node)} is not a condition or group`);
|
|
37
|
+
}
|
|
38
|
+
const obj = node;
|
|
39
|
+
if (isGroup(obj)) {
|
|
40
|
+
if (!Array.isArray(obj.queries))
|
|
41
|
+
fail(path, 'a group needs a "queries" array', obj);
|
|
42
|
+
obj.queries.forEach((child, i) => assertQueryNode(child, `${path ? path + '.' : ''}queries[${i}]`));
|
|
43
|
+
return;
|
|
44
|
+
}
|
|
45
|
+
if (typeof obj.attribute !== 'string' || !obj.attribute) {
|
|
46
|
+
fail(path, 'a condition needs a string "attribute"', obj);
|
|
47
|
+
}
|
|
48
|
+
if (typeof obj.operator !== 'string' || !obj.operator) {
|
|
49
|
+
fail(path, 'a condition needs a string "operator"', obj);
|
|
50
|
+
}
|
|
51
|
+
}
|
|
13
52
|
function normalizeQuery(modelKey, raw) {
|
|
14
53
|
if (raw === undefined || raw === null)
|
|
15
54
|
return undefined;
|
|
16
55
|
if (Array.isArray(raw)) {
|
|
56
|
+
raw.forEach((entry, i) => assertQueryNode(entry, `[${i}]`));
|
|
17
57
|
return { modelKey, groupKey: 'root', groupType: 'and', queries: raw };
|
|
18
58
|
}
|
|
19
59
|
if (typeof raw === 'object') {
|
|
60
|
+
assertQueryNode(raw, '');
|
|
20
61
|
const obj = raw;
|
|
21
|
-
if (
|
|
62
|
+
if (isGroup(obj)) {
|
|
22
63
|
const groupType = obj.groupType === 'or' ? 'or' : 'and';
|
|
23
64
|
return { modelKey, groupKey: 'root', groupType, queries: obj.queries };
|
|
24
65
|
}
|
|
25
66
|
return { modelKey, groupKey: 'root', groupType: 'and', queries: [raw] };
|
|
26
67
|
}
|
|
27
|
-
|
|
68
|
+
fail('', `${JSON.stringify(raw)} is not a condition, an array of conditions, or a query group`);
|
|
28
69
|
}
|
|
29
70
|
//# sourceMappingURL=normalize-query.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"normalize-query.js","sourceRoot":"","sources":["../../../../../src/functions/app/daemon/services/normalize-query.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"normalize-query.js","sourceRoot":"","sources":["../../../../../src/functions/app/daemon/services/normalize-query.ts"],"names":[],"mappings":";;;AA2EA,wCAgBC;AApFD,MAAM,KAAK,GACT,wHAAwH,CAAC;AAO3H,MAAa,aAAc,SAAQ,KAAK;IAEtC,YAAY,OAAe;QACzB,KAAK,CAAC,OAAO,CAAC,CAAC;QAFR,SAAI,GAAG,aAAa,CAAC;QAG5B,IAAI,CAAC,IAAI,GAAG,eAAe,CAAC;IAC9B,CAAC;CACF;AAND,sCAMC;AAGD,SAAS,OAAO,CAAC,GAA4B;IAC3C,OAAO,SAAS,IAAI,GAAG,IAAI,UAAU,IAAI,GAAG,CAAC;AAC/C,CAAC;AAGD,SAAS,UAAU,CAAC,GAA4B;IAC9C,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,KAAK,MAAM,KAAK,IAAI,CAAC,SAAS,EAAE,YAAY,CAAC,EAAE,CAAC;QAC9C,IAAI,KAAK,IAAI,GAAG;YAAE,KAAK,CAAC,IAAI,CAAC,6BAA6B,KAAK,GAAG,CAAC,CAAC;IACtE,CAAC;IACD,MAAM,EAAE,GAAG,GAAG,CAAC,QAAQ,CAAC;IACxB,IAAI,EAAE,KAAK,KAAK,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC;QAChC,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,uCAAuC,EAAE,qCAAqC,CAAC,CAAC;IACnG,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAS,IAAI,CAAC,IAAY,EAAE,IAAY,EAAE,GAA6B;IACrE,MAAM,KAAK,GAAG,GAAG,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IACzC,MAAM,KAAK,GAAG,IAAI,CAAC,CAAC,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IACxC,MAAM,IAAI,aAAa,CACrB,gBAAgB,KAAK,KAAK,IAAI,KAAK,KAAK,IAAI,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,UAAU,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAChG,CAAC;AACJ,CAAC;AAGD,SAAS,eAAe,CAAC,IAAa,EAAE,IAAY;IAClD,IAAI,IAAI,KAAK,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;QACrE,IAAI,CAAC,IAAI,EAAE,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,8BAA8B,CAAC,CAAC;IACvG,CAAC;IACD,MAAM,GAAG,GAAG,IAA+B,CAAC;IAC5C,IAAI,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;QACjB,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC;YAAE,IAAI,CAAC,IAAI,EAAE,iCAAiC,EAAE,GAAG,CAAC,CAAC;QACpF,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,KAAK,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,GAAG,GAAG,CAAC,CAAC,CAAC,EAAE,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC;QACpG,OAAO;IACT,CAAC;IACD,IAAI,OAAO,GAAG,CAAC,SAAS,KAAK,QAAQ,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC;QACxD,IAAI,CAAC,IAAI,EAAE,wCAAwC,EAAE,GAAG,CAAC,CAAC;IAC5D,CAAC;IACD,IAAI,OAAO,GAAG,CAAC,QAAQ,KAAK,QAAQ,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC;QACtD,IAAI,CAAC,IAAI,EAAE,uCAAuC,EAAE,GAAG,CAAC,CAAC;IAC3D,CAAC;AACH,CAAC;AASD,SAAgB,cAAc,CAAC,QAAgB,EAAE,GAAY;IAC3D,IAAI,GAAG,KAAK,SAAS,IAAI,GAAG,KAAK,IAAI;QAAE,OAAO,SAAS,CAAC;IACxD,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;QACvB,GAAG,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,KAAK,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;QAC5D,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC;IACxE,CAAC;IACD,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE,CAAC;QAC5B,eAAe,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;QACzB,MAAM,GAAG,GAAG,GAA8B,CAAC;QAC3C,IAAI,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;YACjB,MAAM,SAAS,GAAG,GAAG,CAAC,SAAS,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC;YACxD,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,CAAC,OAAoB,EAAE,CAAC;QACtF,CAAC;QACD,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC;IAC1E,CAAC;IACD,IAAI,CAAC,EAAE,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,+DAA+D,CAAC,CAAC;AAClG,CAAC"}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
export declare const DEFAULT_KEY_PROPERTY_SEPARATOR = "::";
|
|
2
|
+
export declare function deriveRowKeys(rows: Record<string, unknown>[], keyProperty: string | readonly string[] | undefined, separator?: string): (string | undefined)[];
|
|
3
|
+
export declare class StagedKeys {
|
|
4
|
+
private models;
|
|
5
|
+
private entry;
|
|
6
|
+
set(model: string, keys: (string | undefined)[]): void;
|
|
7
|
+
upsert(model: string, keys: (string | undefined)[]): void;
|
|
8
|
+
remove(model: string, keys: (string | undefined)[]): void;
|
|
9
|
+
has(model: string, key: string): boolean | undefined;
|
|
10
|
+
drop(model: string): void;
|
|
11
|
+
clear(): void;
|
|
12
|
+
}
|
|
@@ -0,0 +1,72 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.StagedKeys = exports.DEFAULT_KEY_PROPERTY_SEPARATOR = void 0;
|
|
4
|
+
exports.deriveRowKeys = deriveRowKeys;
|
|
5
|
+
exports.DEFAULT_KEY_PROPERTY_SEPARATOR = '::';
|
|
6
|
+
function deriveRowKeys(rows, keyProperty, separator = exports.DEFAULT_KEY_PROPERTY_SEPARATOR) {
|
|
7
|
+
const named = typeof keyProperty === 'string'
|
|
8
|
+
? keyProperty !== '' && keyProperty !== 'key'
|
|
9
|
+
: Array.isArray(keyProperty) && keyProperty.length > 0;
|
|
10
|
+
return rows.map((row) => {
|
|
11
|
+
if (!row || typeof row !== 'object')
|
|
12
|
+
return undefined;
|
|
13
|
+
if (named) {
|
|
14
|
+
if (typeof keyProperty === 'string')
|
|
15
|
+
return String(row[keyProperty]);
|
|
16
|
+
const parts = keyProperty;
|
|
17
|
+
return parts.length === 1 ? String(row[parts[0]]) : parts.map((p) => String(row[p])).join(separator);
|
|
18
|
+
}
|
|
19
|
+
return row.key === undefined || row.key === null ? undefined : String(row.key);
|
|
20
|
+
});
|
|
21
|
+
}
|
|
22
|
+
class StagedKeys {
|
|
23
|
+
constructor() {
|
|
24
|
+
this.models = new Map();
|
|
25
|
+
}
|
|
26
|
+
entry(model) {
|
|
27
|
+
let e = this.models.get(model);
|
|
28
|
+
if (!e) {
|
|
29
|
+
e = { replaced: false, present: new Set(), removed: new Set() };
|
|
30
|
+
this.models.set(model, e);
|
|
31
|
+
}
|
|
32
|
+
return e;
|
|
33
|
+
}
|
|
34
|
+
set(model, keys) {
|
|
35
|
+
this.models.set(model, { replaced: true, present: new Set(keys.filter(isKey)), removed: new Set() });
|
|
36
|
+
}
|
|
37
|
+
upsert(model, keys) {
|
|
38
|
+
const e = this.entry(model);
|
|
39
|
+
for (const k of keys.filter(isKey)) {
|
|
40
|
+
e.present.add(k);
|
|
41
|
+
e.removed.delete(k);
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
remove(model, keys) {
|
|
45
|
+
const e = this.entry(model);
|
|
46
|
+
for (const k of keys.filter(isKey)) {
|
|
47
|
+
e.present.delete(k);
|
|
48
|
+
e.removed.add(k);
|
|
49
|
+
}
|
|
50
|
+
}
|
|
51
|
+
has(model, key) {
|
|
52
|
+
const e = this.models.get(model);
|
|
53
|
+
if (!e)
|
|
54
|
+
return undefined;
|
|
55
|
+
if (e.present.has(key))
|
|
56
|
+
return true;
|
|
57
|
+
if (e.replaced || e.removed.has(key))
|
|
58
|
+
return false;
|
|
59
|
+
return undefined;
|
|
60
|
+
}
|
|
61
|
+
drop(model) {
|
|
62
|
+
this.models.delete(model);
|
|
63
|
+
}
|
|
64
|
+
clear() {
|
|
65
|
+
this.models.clear();
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
exports.StagedKeys = StagedKeys;
|
|
69
|
+
function isKey(k) {
|
|
70
|
+
return typeof k === 'string';
|
|
71
|
+
}
|
|
72
|
+
//# sourceMappingURL=staged-keys.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"staged-keys.js","sourceRoot":"","sources":["../../../../../src/functions/app/daemon/services/staged-keys.ts"],"names":[],"mappings":"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"}
|
|
@@ -25,14 +25,26 @@ function isPidAlive(pid) {
|
|
|
25
25
|
function isPortTaken(port) {
|
|
26
26
|
return new Promise((resolveP) => {
|
|
27
27
|
const socket = (0, net_1.createConnection)({ host: '127.0.0.1', port });
|
|
28
|
-
const cleanup = () => {
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
28
|
+
const cleanup = () => {
|
|
29
|
+
try {
|
|
30
|
+
socket.destroy();
|
|
31
|
+
}
|
|
32
|
+
catch {
|
|
33
|
+
}
|
|
34
|
+
};
|
|
32
35
|
socket.setTimeout(500);
|
|
33
|
-
socket.once('connect', () => {
|
|
34
|
-
|
|
35
|
-
|
|
36
|
+
socket.once('connect', () => {
|
|
37
|
+
cleanup();
|
|
38
|
+
resolveP(true);
|
|
39
|
+
});
|
|
40
|
+
socket.once('error', () => {
|
|
41
|
+
cleanup();
|
|
42
|
+
resolveP(false);
|
|
43
|
+
});
|
|
44
|
+
socket.once('timeout', () => {
|
|
45
|
+
cleanup();
|
|
46
|
+
resolveP(false);
|
|
47
|
+
});
|
|
36
48
|
});
|
|
37
49
|
}
|
|
38
50
|
function pickFreePort() {
|
|
@@ -70,7 +82,8 @@ async function acquirePortLock(timeoutMs = 120_000) {
|
|
|
70
82
|
continue;
|
|
71
83
|
}
|
|
72
84
|
}
|
|
73
|
-
catch {
|
|
85
|
+
catch {
|
|
86
|
+
}
|
|
74
87
|
await new Promise((r) => setTimeout(r, 500));
|
|
75
88
|
}
|
|
76
89
|
}
|
|
@@ -98,6 +111,7 @@ function releasePortLock() {
|
|
|
98
111
|
if (holder === process.pid)
|
|
99
112
|
(0, fs_extra_1.unlinkSync)(LOCK_PATH);
|
|
100
113
|
}
|
|
101
|
-
catch {
|
|
114
|
+
catch {
|
|
115
|
+
}
|
|
102
116
|
}
|
|
103
117
|
//# sourceMappingURL=port-lock.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"port-lock.js","sourceRoot":"","sources":["../../../../src/functions/app/e2e/port-lock.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"port-lock.js","sourceRoot":"","sources":["../../../../src/functions/app/e2e/port-lock.ts"],"names":[],"mappings":"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"}
|
|
@@ -78,12 +78,14 @@ function classify(pid, isAlive = isPidAlive) {
|
|
|
78
78
|
}
|
|
79
79
|
function reapOrphans(dir = exports.DEFAULT_REGISTRY_DIR, deps = {}) {
|
|
80
80
|
const alive = deps.isPidAlive ?? isPidAlive;
|
|
81
|
-
const killFn = deps.kill ??
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
81
|
+
const killFn = deps.kill ??
|
|
82
|
+
((pid, sig) => {
|
|
83
|
+
try {
|
|
84
|
+
process.kill(pid, sig);
|
|
85
|
+
}
|
|
86
|
+
catch {
|
|
87
|
+
}
|
|
88
|
+
});
|
|
87
89
|
const serveDir = deps.serveDir ?? serve_registry_js_1.DEFAULT_SERVE_REGISTRY_DIR;
|
|
88
90
|
const daemons = listEntries(dir);
|
|
89
91
|
for (const entry of (0, serve_registry_js_1.listServeEntries)(serveDir)) {
|
|
@@ -96,14 +98,13 @@ function reapOrphans(dir = exports.DEFAULT_REGISTRY_DIR, deps = {}) {
|
|
|
96
98
|
}
|
|
97
99
|
if (!current.autoSpawned)
|
|
98
100
|
continue;
|
|
99
|
-
const refs = daemons.filter((d) => d.serveKey?.port === current.port &&
|
|
100
|
-
d.serveKey?.cwd === current.cwd &&
|
|
101
|
-
alive(d.pid));
|
|
101
|
+
const refs = daemons.filter((d) => d.serveKey?.port === current.port && d.serveKey?.cwd === current.cwd && alive(d.pid));
|
|
102
102
|
if (refs.length === 0) {
|
|
103
103
|
try {
|
|
104
104
|
killFn(current.pid, 'SIGTERM');
|
|
105
105
|
}
|
|
106
|
-
catch {
|
|
106
|
+
catch {
|
|
107
|
+
}
|
|
107
108
|
(0, serve_registry_js_1.removeServeEntry)(current.port, serveDir);
|
|
108
109
|
}
|
|
109
110
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"registry.js","sourceRoot":"","sources":["../../../../src/functions/app/registry/registry.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"registry.js","sourceRoot":"","sources":["../../../../src/functions/app/registry/registry.ts"],"names":[],"mappings":"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"}
|
|
@@ -55,7 +55,8 @@ function listServeEntries(dir = exports.DEFAULT_SERVE_REGISTRY_DIR) {
|
|
|
55
55
|
try {
|
|
56
56
|
out.push(JSON.parse((0, fs_extra_1.readFileSync)((0, path_1.join)(dir, name), 'utf-8')));
|
|
57
57
|
}
|
|
58
|
-
catch {
|
|
58
|
+
catch {
|
|
59
|
+
}
|
|
59
60
|
}
|
|
60
61
|
return out;
|
|
61
62
|
}
|
|
@@ -68,13 +69,15 @@ function releaseServe(serveKey, deps = {}) {
|
|
|
68
69
|
const daemonDir = deps.daemonDir ?? registry_js_1.DEFAULT_REGISTRY_DIR;
|
|
69
70
|
const serveDir = deps.serveDir ?? exports.DEFAULT_SERVE_REGISTRY_DIR;
|
|
70
71
|
const alive = deps.isPidAlive ?? registry_js_1.isPidAlive;
|
|
71
|
-
const kill = deps.kill ??
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
72
|
+
const kill = deps.kill ??
|
|
73
|
+
((pid, sig) => {
|
|
74
|
+
try {
|
|
75
|
+
process.kill(pid, sig);
|
|
76
|
+
}
|
|
77
|
+
catch {
|
|
78
|
+
}
|
|
79
|
+
});
|
|
80
|
+
const stillNeeded = (0, registry_js_1.listEntries)(daemonDir).some((e) => e.serveKey?.port === serveKey.port && e.serveKey?.cwd === serveKey.cwd && alive(e.pid));
|
|
78
81
|
if (stillNeeded)
|
|
79
82
|
return;
|
|
80
83
|
const entry = readServeEntry(serveKey.port, serveDir);
|
|
@@ -87,7 +90,8 @@ function releaseServe(serveKey, deps = {}) {
|
|
|
87
90
|
try {
|
|
88
91
|
kill(entry.pid, 'SIGTERM');
|
|
89
92
|
}
|
|
90
|
-
catch {
|
|
93
|
+
catch {
|
|
94
|
+
}
|
|
91
95
|
removeServeEntry(serveKey.port, serveDir);
|
|
92
96
|
}
|
|
93
97
|
//# sourceMappingURL=serve-registry.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serve-registry.js","sourceRoot":"","sources":["../../../../src/functions/app/registry/serve-registry.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"serve-registry.js","sourceRoot":"","sources":["../../../../src/functions/app/registry/serve-registry.ts"],"names":[],"mappings":"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"}
|