@dcupl/cli 1.4.0-beta.0 → 1.4.0-beta.10
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 +45 -0
- package/dist/cli.js +782 -149
- 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/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.d.ts +13 -0
- package/dist/functions/app/commands/fn/_fn-helpers.js +64 -0
- package/dist/functions/app/commands/fn/_fn-helpers.js.map +1 -1
- package/dist/functions/app/commands/fn/aggregate.d.ts +8 -1
- package/dist/functions/app/commands/fn/aggregate.js +32 -3
- package/dist/functions/app/commands/fn/aggregate.js.map +1 -1
- package/dist/functions/app/commands/fn/facets.d.ts +1 -0
- package/dist/functions/app/commands/fn/facets.js +2 -0
- package/dist/functions/app/commands/fn/facets.js.map +1 -1
- package/dist/functions/app/commands/fn/group-by.d.ts +6 -0
- package/dist/functions/app/commands/fn/group-by.js +13 -22
- package/dist/functions/app/commands/fn/group-by.js.map +1 -1
- package/dist/functions/app/commands/fn/pivot.d.ts +14 -0
- package/dist/functions/app/commands/fn/pivot.js +72 -0
- package/dist/functions/app/commands/fn/pivot.js.map +1 -0
- package/dist/functions/app/commands/fn/suggest.d.ts +17 -0
- package/dist/functions/app/commands/fn/suggest.js +34 -0
- package/dist/functions/app/commands/fn/suggest.js.map +1 -0
- 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/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 +5 -2
- 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/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 +29 -6
- package/dist/functions/app/commands/resolve-source.js.map +1 -1
- 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 +32 -14
- 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.js +17 -6
- package/dist/functions/app/daemon/controllers/data.controller.js.map +1 -1
- package/dist/functions/app/daemon/controllers/fn.controller.d.ts +8 -0
- package/dist/functions/app/daemon/controllers/fn.controller.js +20 -0
- package/dist/functions/app/daemon/controllers/fn.controller.js.map +1 -1
- package/dist/functions/app/daemon/controllers/lifecycle.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.d.ts +21 -0
- package/dist/functions/app/daemon/services/attribute-validation.js +164 -0
- package/dist/functions/app/daemon/services/attribute-validation.js.map +1 -0
- package/dist/functions/app/daemon/services/dcupl-host.service.d.ts +7 -0
- package/dist/functions/app/daemon/services/dcupl-host.service.js +93 -16
- package/dist/functions/app/daemon/services/dcupl-host.service.js.map +1 -1
- package/dist/functions/app/daemon/services/idle-watchdog.service.js.map +1 -1
- package/dist/functions/app/daemon/services/ingest.service.js +8 -4
- 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 +3 -1
- package/dist/functions/app/daemon/services/loaders.service.js +22 -6
- package/dist/functions/app/daemon/services/loaders.service.js.map +1 -1
- package/dist/functions/app/e2e/port-lock.d.ts +8 -0
- package/dist/functions/app/e2e/port-lock.js +66 -2
- 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/get.d.ts +3 -3
- package/dist/functions/config/commands/get.js +34 -16
- package/dist/functions/config/commands/get.js.map +1 -1
- package/dist/functions/config/commands/set.js +9 -4
- package/dist/functions/config/commands/set.js.map +1 -1
- package/dist/functions/config/io.d.ts +4 -1
- package/dist/functions/config/io.js +44 -11
- package/dist/functions/config/io.js.map +1 -1
- package/dist/functions/config/prompts.js +1 -3
- package/dist/functions/config/prompts.js.map +1 -1
- package/dist/functions/files/commands/copy.js +1 -1
- package/dist/functions/files/commands/copy.js.map +1 -1
- package/dist/functions/files/commands/delete.js +1 -1
- package/dist/functions/files/commands/delete.js.map +1 -1
- package/dist/functions/files/commands/list.js +6 -3
- package/dist/functions/files/commands/list.js.map +1 -1
- package/dist/functions/files/commands/move.js +1 -1
- package/dist/functions/files/commands/move.js.map +1 -1
- package/dist/functions/files/commands/pull.d.ts +16 -1
- package/dist/functions/files/commands/pull.js +135 -1
- 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 +25 -3
- package/dist/functions/files/commands/push.js.map +1 -1
- package/dist/functions/files/commands/read.js +3 -2
- package/dist/functions/files/commands/read.js.map +1 -1
- package/dist/functions/files/commands/render.d.ts +29 -0
- package/dist/functions/files/commands/render.js +8 -4
- package/dist/functions/files/commands/render.js.map +1 -1
- package/dist/functions/files/commands/status.js +1 -0
- package/dist/functions/files/commands/status.js.map +1 -1
- package/dist/functions/files/commands/versions/copy.js +1 -1
- package/dist/functions/files/commands/versions/copy.js.map +1 -1
- package/dist/functions/files/commands/versions/delete.js +1 -1
- package/dist/functions/files/commands/versions/delete.js.map +1 -1
- package/dist/functions/files/commands/versions/list.js +4 -0
- package/dist/functions/files/commands/versions/list.js.map +1 -1
- package/dist/functions/files/commands/write.js +13 -3
- package/dist/functions/files/commands/write.js.map +1 -1
- package/dist/functions/files/files-pull.js +10 -7
- package/dist/functions/files/files-pull.js.map +1 -1
- package/dist/functions/files/files-push.js +11 -8
- package/dist/functions/files/files-push.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/files/test-helpers.d.ts +11 -0
- package/dist/functions/files/test-helpers.js +28 -0
- package/dist/functions/files/test-helpers.js.map +1 -1
- package/dist/functions/generate/files/generate-code.d.ts +1 -1
- package/dist/functions/generate/files/generate-files.d.ts +7 -1
- package/dist/functions/generate/files/generate-files.js +63 -15
- package/dist/functions/generate/files/generate-files.js.map +1 -1
- package/dist/functions/generate/files/workflow-presets.d.ts +6 -0
- package/dist/functions/generate/files/workflow-presets.js +158 -0
- package/dist/functions/generate/files/workflow-presets.js.map +1 -0
- package/dist/functions/generate/model-from-data/generate-model-from-data.js +11 -5
- 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 +6 -3
- package/dist/functions/generate/model-from-data/infer-to-model.js.map +1 -1
- package/dist/functions/generate/projects/generate-project.d.ts +5 -0
- package/dist/functions/generate/projects/generate-project.js +29 -8
- package/dist/functions/generate/projects/generate-project.js.map +1 -1
- package/dist/functions/helper/api-client.d.ts +3 -0
- package/dist/functions/helper/api-client.js +19 -17
- 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.map +1 -1
- package/dist/functions/helper/credentials.helper.d.ts +21 -0
- package/dist/functions/helper/credentials.helper.js +39 -0
- package/dist/functions/helper/credentials.helper.js.map +1 -0
- package/dist/functions/helper/load-env.d.ts +1 -0
- package/dist/functions/helper/load-env.js +10 -0
- package/dist/functions/helper/load-env.js.map +1 -0
- package/dist/functions/helper/output.d.ts +1 -1
- package/dist/functions/helper/output.js +10 -12
- 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/schemas/command.js.map +1 -1
- package/dist/functions/schemas/examples/AppLoaderConfiguration.example.json +1 -3
- package/dist/functions/schemas/examples/AttributeQualityConfig.example.json +10 -0
- package/dist/functions/schemas/examples/DataMapperStepConfig.example.json +6 -1
- package/dist/functions/schemas/examples/ModelDefinition.example.json +29 -3
- 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 +4 -4
- package/dist/functions/schemas/format.js.map +1 -1
- package/dist/functions/schemas/registry.d.ts +14 -0
- package/dist/functions/schemas/registry.js +122 -30
- package/dist/functions/schemas/registry.js.map +1 -1
- package/dist/functions/schemas/resolve.js +1 -2
- package/dist/functions/schemas/resolve.js.map +1 -1
- package/dist/functions/schemas/validate.d.ts +22 -0
- package/dist/functions/schemas/validate.js +67 -0
- package/dist/functions/schemas/validate.js.map +1 -0
- 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 +145 -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 +90 -17
- 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.d.ts +12 -1
- package/dist/functions/version/command.js +55 -7
- package/dist/functions/version/command.js.map +1 -1
- package/dist/functions/workflow/commands/deploy.d.ts +9 -1
- package/dist/functions/workflow/commands/deploy.js +39 -10
- 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 +26 -0
- package/dist/functions/workflow/commands/run.js +101 -0
- package/dist/functions/workflow/commands/run.js.map +1 -0
- package/dist/functions/workflow/commands/runners-get.js.map +1 -1
- package/dist/functions/workflow/commands/runners.d.ts +2 -0
- package/dist/functions/workflow/commands/runners.js +10 -1
- package/dist/functions/workflow/commands/runners.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 +3 -0
- package/dist/functions/workflow/commands/test.js +22 -73
- package/dist/functions/workflow/commands/test.js.map +1 -1
- package/dist/functions/workflow/commands/trace.d.ts +4 -2
- package/dist/functions/workflow/commands/trace.js +22 -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 +16 -2
- 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.d.ts +11 -0
- package/dist/functions/workflow/run-failure.js +74 -0
- package/dist/functions/workflow/run-failure.js.map +1 -0
- package/dist/functions/workflow/runner-health.d.ts +16 -0
- package/dist/functions/workflow/runner-health.js +36 -0
- package/dist/functions/workflow/runner-health.js.map +1 -0
- package/dist/functions/workflow/script-lint.d.ts +10 -0
- package/dist/functions/workflow/script-lint.js +513 -0
- package/dist/functions/workflow/script-lint.js.map +1 -0
- package/dist/functions/workflow/template-io.js +1 -1
- package/dist/functions/workflow/template-io.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/validate.js +4 -1
- package/dist/functions/workflow/validate.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.js +3 -1
- package/dist/functions/workflow/workflow-api.js.map +1 -1
- package/dist/index.js +6 -3
- package/dist/index.js.map +1 -1
- package/files/common/.env.example +4 -0
- package/files/common/_gitignore +3 -1
- package/files/dev-server/index.html +2 -1
- package/package.json +45 -42
- 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
|
@@ -6,6 +6,7 @@ const common_1 = require("@nestjs/common");
|
|
|
6
6
|
const core_1 = require("@dcupl/core");
|
|
7
7
|
const init_options_js_1 = require("./init-options.js");
|
|
8
8
|
const normalize_query_js_1 = require("./normalize-query.js");
|
|
9
|
+
const attribute_validation_js_1 = require("./attribute-validation.js");
|
|
9
10
|
class ModelNotFoundError extends Error {
|
|
10
11
|
constructor(modelKey, hint) {
|
|
11
12
|
super(`Model with key ${modelKey} not found${hint ? `. ${hint}` : ''}`);
|
|
@@ -22,12 +23,14 @@ let DcuplHostService = class DcuplHostService {
|
|
|
22
23
|
this._initializedModels = new Set();
|
|
23
24
|
this._autoUpdate = false;
|
|
24
25
|
this._dirty = false;
|
|
26
|
+
this._dataKeyProperties = new Map();
|
|
25
27
|
}
|
|
26
28
|
async init(options = {}) {
|
|
27
29
|
this.autoGenerateProperties = options.autoGenerateProperties ?? false;
|
|
28
30
|
this._autoUpdate = options.autoUpdate ?? false;
|
|
29
31
|
this._dirty = false;
|
|
30
32
|
this._initializedModels.clear();
|
|
33
|
+
this._dataKeyProperties.clear();
|
|
31
34
|
this.dcupl = new core_1.Dcupl((0, init_options_js_1.buildDcuplInitOptions)(options.dcuplOptions));
|
|
32
35
|
await this.dcupl.init();
|
|
33
36
|
this.touch();
|
|
@@ -42,6 +45,55 @@ let DcuplHostService = class DcuplHostService {
|
|
|
42
45
|
throw new ModelNotFoundError(key);
|
|
43
46
|
}
|
|
44
47
|
}
|
|
48
|
+
trackKeyProperty(model, keyProperty) {
|
|
49
|
+
const columns = Array.isArray(keyProperty) ? keyProperty : keyProperty ? [keyProperty] : [];
|
|
50
|
+
if (columns.length === 0)
|
|
51
|
+
return;
|
|
52
|
+
const existing = this._dataKeyProperties.get(model) ?? new Set();
|
|
53
|
+
for (const column of columns) {
|
|
54
|
+
if (typeof column === 'string' && column.length > 0)
|
|
55
|
+
existing.add(column);
|
|
56
|
+
}
|
|
57
|
+
this._dataKeyProperties.set(model, existing);
|
|
58
|
+
}
|
|
59
|
+
keyPropertyColumns(modelKey) {
|
|
60
|
+
const columns = new Set();
|
|
61
|
+
const fromModel = this.d.models.get(modelKey)
|
|
62
|
+
?.keyProperty;
|
|
63
|
+
for (const column of Array.isArray(fromModel) ? fromModel : fromModel ? [fromModel] : []) {
|
|
64
|
+
if (typeof column === 'string' && column.length > 0)
|
|
65
|
+
columns.add(column);
|
|
66
|
+
}
|
|
67
|
+
for (const column of this._dataKeyProperties.get(modelKey) ?? [])
|
|
68
|
+
columns.add(column);
|
|
69
|
+
return [...columns];
|
|
70
|
+
}
|
|
71
|
+
attributeContext(modelKey) {
|
|
72
|
+
let knownAttributes;
|
|
73
|
+
try {
|
|
74
|
+
const meta = this.d.fn.metadata({ modelKey });
|
|
75
|
+
knownAttributes = (meta?.attributes ?? [])
|
|
76
|
+
.map((a) => a?.key)
|
|
77
|
+
.filter((k) => typeof k === 'string' && k.length > 0);
|
|
78
|
+
}
|
|
79
|
+
catch {
|
|
80
|
+
knownAttributes = [];
|
|
81
|
+
}
|
|
82
|
+
return { model: modelKey, knownAttributes, keyPropertyColumns: this.keyPropertyColumns(modelKey) };
|
|
83
|
+
}
|
|
84
|
+
guardAttributes(modelKey, candidates, run) {
|
|
85
|
+
const needsCheck = candidates.some((c) => typeof c === 'string' && c.length > 0);
|
|
86
|
+
if (needsCheck)
|
|
87
|
+
(0, attribute_validation_js_1.assertKnownAttributes)(candidates, this.attributeContext(modelKey));
|
|
88
|
+
try {
|
|
89
|
+
return run();
|
|
90
|
+
}
|
|
91
|
+
catch (err) {
|
|
92
|
+
if ((0, attribute_validation_js_1.isSdkAttributeNotFound)(err))
|
|
93
|
+
throw (0, attribute_validation_js_1.toAttributeNotFound)(candidates, this.attributeContext(modelKey));
|
|
94
|
+
throw err;
|
|
95
|
+
}
|
|
96
|
+
}
|
|
45
97
|
touch() {
|
|
46
98
|
this._lastActivity = Date.now();
|
|
47
99
|
}
|
|
@@ -76,6 +128,7 @@ let DcuplHostService = class DcuplHostService {
|
|
|
76
128
|
this.d.models.remove(key);
|
|
77
129
|
this._dirty = true;
|
|
78
130
|
this._initializedModels.delete(key);
|
|
131
|
+
this._dataKeyProperties.delete(key);
|
|
79
132
|
}
|
|
80
133
|
assertRegisteredOrAutoGen(model, override) {
|
|
81
134
|
if (this.d.models.get(model))
|
|
@@ -103,6 +156,7 @@ let DcuplHostService = class DcuplHostService {
|
|
|
103
156
|
dataUpdate(data, options) {
|
|
104
157
|
this.touch();
|
|
105
158
|
this.assertRegisteredOrAutoGen(options.model, options.autoGenerateProperties);
|
|
159
|
+
this.trackKeyProperty(options.model, options.keyProperty);
|
|
106
160
|
const { autoGenerateProperties } = this.resolveDataApplyOptions(options.model, options.autoGenerateProperties);
|
|
107
161
|
this.d.data.apply({
|
|
108
162
|
type: 'update',
|
|
@@ -117,6 +171,7 @@ let DcuplHostService = class DcuplHostService {
|
|
|
117
171
|
dataUpsert(data, options) {
|
|
118
172
|
this.touch();
|
|
119
173
|
this.assertRegisteredOrAutoGen(options.model, options.autoGenerateProperties);
|
|
174
|
+
this.trackKeyProperty(options.model, options.keyProperty);
|
|
120
175
|
const { useSetType, autoGenerateProperties } = this.resolveDataApplyOptions(options.model, options.autoGenerateProperties);
|
|
121
176
|
this.d.data.apply({
|
|
122
177
|
type: useSetType ? 'set' : 'upsert',
|
|
@@ -131,6 +186,7 @@ let DcuplHostService = class DcuplHostService {
|
|
|
131
186
|
dataSet(data, options) {
|
|
132
187
|
this.touch();
|
|
133
188
|
this.assertRegisteredOrAutoGen(options.model, options.autoGenerateProperties);
|
|
189
|
+
this.trackKeyProperty(options.model, options.keyProperty);
|
|
134
190
|
const { autoGenerateProperties } = this.resolveDataApplyOptions(options.model, options.autoGenerateProperties);
|
|
135
191
|
this.d.data.apply({
|
|
136
192
|
type: 'set',
|
|
@@ -145,6 +201,7 @@ let DcuplHostService = class DcuplHostService {
|
|
|
145
201
|
dataRemove(data, options) {
|
|
146
202
|
this.touch();
|
|
147
203
|
this.requireModel(options.model);
|
|
204
|
+
this.trackKeyProperty(options.model, options.keyProperty);
|
|
148
205
|
const { autoGenerateProperties } = this.resolveDataApplyOptions(options.model, options.autoGenerateProperties);
|
|
149
206
|
this.d.data.apply({
|
|
150
207
|
type: 'remove',
|
|
@@ -177,30 +234,52 @@ let DcuplHostService = class DcuplHostService {
|
|
|
177
234
|
this.requireModel(options.modelKey);
|
|
178
235
|
const { query, ...rest } = options;
|
|
179
236
|
const q = (0, normalize_query_js_1.normalizeQuery)(options.modelKey, query);
|
|
180
|
-
|
|
237
|
+
const candidates = [
|
|
238
|
+
...(0, attribute_validation_js_1.collectQueryAttributes)(q?.queries),
|
|
239
|
+
...(0, attribute_validation_js_1.collectSortAttributes)(options.sort),
|
|
240
|
+
...(0, attribute_validation_js_1.collectProjectionAttributes)(options.projection),
|
|
241
|
+
];
|
|
242
|
+
return this.guardAttributes(options.modelKey, candidates, () => this.d.query.execute(q ? { ...rest, groupKey: q.groupKey, groupType: q.groupType, queries: q.queries } : rest));
|
|
181
243
|
}
|
|
182
244
|
fnFacets(options) {
|
|
183
245
|
this.touch();
|
|
184
246
|
this.requireModel(options.modelKey);
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
247
|
+
const query = (0, normalize_query_js_1.normalizeQuery)(options.modelKey, options.query);
|
|
248
|
+
const candidates = [options?.options?.attribute, ...(0, attribute_validation_js_1.collectQueryAttributes)(query?.queries)];
|
|
249
|
+
return this.guardAttributes(options.modelKey, candidates, () => this.d.fn.facets({ ...options, query }).map((facet) => ({ ...facet, count: facet.size })));
|
|
188
250
|
}
|
|
189
251
|
fnAggregate(options) {
|
|
190
252
|
this.touch();
|
|
191
253
|
this.requireModel(options.modelKey);
|
|
192
|
-
|
|
254
|
+
const query = (0, normalize_query_js_1.normalizeQuery)(options.modelKey, options.query);
|
|
255
|
+
const candidates = [options?.options?.attribute, ...(0, attribute_validation_js_1.collectQueryAttributes)(query?.queries)];
|
|
256
|
+
return this.guardAttributes(options.modelKey, candidates, () => this.d.fn.aggregate({ ...options, query }));
|
|
193
257
|
}
|
|
194
258
|
fnGroupBy(options) {
|
|
195
259
|
this.touch();
|
|
196
260
|
this.requireModel(options.modelKey);
|
|
197
|
-
|
|
261
|
+
const query = (0, normalize_query_js_1.normalizeQuery)(options.modelKey, options.query);
|
|
262
|
+
const aggregateAttributes = Array.isArray(options?.options?.aggregates)
|
|
263
|
+
? options.options.aggregates.map((a) => a?.attribute)
|
|
264
|
+
: [];
|
|
265
|
+
const candidates = [options?.options?.attribute, ...aggregateAttributes, ...(0, attribute_validation_js_1.collectQueryAttributes)(query?.queries)];
|
|
266
|
+
return this.guardAttributes(options.modelKey, candidates, () => this.d.fn.groupBy({ ...options, query }));
|
|
198
267
|
}
|
|
199
268
|
fnMetadata(options) {
|
|
200
269
|
this.touch();
|
|
201
270
|
this.requireModel(options.modelKey);
|
|
202
271
|
return this.d.fn.metadata({ ...options, query: (0, normalize_query_js_1.normalizeQuery)(options.modelKey, options.query) });
|
|
203
272
|
}
|
|
273
|
+
fnPivot(options) {
|
|
274
|
+
this.touch();
|
|
275
|
+
this.requireModel(options.modelKey);
|
|
276
|
+
return this.d.fn.pivot({ ...options, query: (0, normalize_query_js_1.normalizeQuery)(options.modelKey, options.query) });
|
|
277
|
+
}
|
|
278
|
+
fnSuggest(options) {
|
|
279
|
+
this.touch();
|
|
280
|
+
this.requireModel(options.modelKey);
|
|
281
|
+
return this.d.fn.suggest({ ...options, query: (0, normalize_query_js_1.normalizeQuery)(options.modelKey, options.query) });
|
|
282
|
+
}
|
|
204
283
|
summary() {
|
|
205
284
|
this.touch();
|
|
206
285
|
const keys = this.d.models.keys();
|
|
@@ -218,22 +297,20 @@ let DcuplHostService = class DcuplHostService {
|
|
|
218
297
|
};
|
|
219
298
|
}
|
|
220
299
|
keyPropertyCollisions() {
|
|
221
|
-
const
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
.
|
|
226
|
-
|
|
227
|
-
.
|
|
228
|
-
model: c.model ?? '',
|
|
229
|
-
keyProperty: c.attribute ?? 'key',
|
|
230
|
-
duplicateCount: c.count,
|
|
300
|
+
const summary = this.d.quality?.errors?.summary?.() ?? [];
|
|
301
|
+
return summary
|
|
302
|
+
.filter((g) => g.errorType === 'NonUniqueKey')
|
|
303
|
+
.map((g) => ({
|
|
304
|
+
model: g.model ?? '',
|
|
305
|
+
keyProperty: g.attribute ?? 'key',
|
|
306
|
+
duplicateCount: g.totalCount,
|
|
231
307
|
}));
|
|
232
308
|
}
|
|
233
309
|
destroy() {
|
|
234
310
|
this.dcupl?.destroy();
|
|
235
311
|
this.dcupl = undefined;
|
|
236
312
|
this._initializedModels.clear();
|
|
313
|
+
this._dataKeyProperties.clear();
|
|
237
314
|
}
|
|
238
315
|
attachLoader(loader, key) {
|
|
239
316
|
this.touch();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dcupl-host.service.js","sourceRoot":"","sources":["../../../../../src/functions/app/daemon/services/dcupl-host.service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"dcupl-host.service.js","sourceRoot":"","sources":["../../../../../src/functions/app/daemon/services/dcupl-host.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"idle-watchdog.service.js","sourceRoot":"","sources":["../../../../../src/functions/app/daemon/services/idle-watchdog.service.ts"],"names":[],"mappings":";;;;AAAA,2CAA4C;AAUrC,IAAM,mBAAmB,GAAzB,MAAM,mBAAmB;IAAzB;QAEG,UAAK,GAAG,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"idle-watchdog.service.js","sourceRoot":"","sources":["../../../../../src/functions/app/daemon/services/idle-watchdog.service.ts"],"names":[],"mappings":";;;;AAAA,2CAA4C;AAUrC,IAAM,mBAAmB,GAAzB,MAAM,mBAAmB;IAAzB;QAEG,UAAK,GAAG,KAAK,CAAC;IAyBxB,CAAC;IAvBC,KAAK,CAAC,OAAwB;QAC5B,MAAM,QAAQ,GAAG,OAAO,CAAC,eAAe,IAAI,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,aAAa,GAAG,CAAC,EAAE,MAAM,CAAC,CAAC;QACxF,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,KAAK,GAAG,WAAW,CAAC,GAAG,EAAE;YAC5B,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,OAAO,CAAC,eAAe,EAAE,CAAC;YACvD,IAAI,CAAC,IAAI,CAAC,KAAK,IAAI,OAAO,IAAI,OAAO,CAAC,aAAa,EAAE,CAAC;gBACpD,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;gBAClB,IAAI,CAAC;oBACH,OAAO,CAAC,MAAM,EAAE,CAAC;gBACnB,CAAC;wBAAS,CAAC;oBACT,IAAI,CAAC,IAAI,EAAE,CAAC;gBACd,CAAC;YACH,CAAC;QACH,CAAC,EAAE,QAAQ,CAAC,CAAC;QACb,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,EAAE,CAAC;IACvB,CAAC;IAED,IAAI;QACF,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YACf,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAC1B,IAAI,CAAC,KAAK,GAAG,SAAS,CAAC;QACzB,CAAC;IACH,CAAC;CACF,CAAA;AA3BY,kDAAmB;8BAAnB,mBAAmB;IAD/B,IAAA,mBAAU,GAAE;GACA,mBAAmB,CA2B/B"}
|
|
@@ -46,7 +46,7 @@ let IngestService = class IngestService {
|
|
|
46
46
|
}
|
|
47
47
|
}
|
|
48
48
|
parse(text, fmt) {
|
|
49
|
-
if (text.charCodeAt(0) ===
|
|
49
|
+
if (text.charCodeAt(0) === 0xfeff) {
|
|
50
50
|
text = text.slice(1);
|
|
51
51
|
}
|
|
52
52
|
if (fmt === 'json') {
|
|
@@ -54,7 +54,8 @@ let IngestService = class IngestService {
|
|
|
54
54
|
return Array.isArray(parsed) ? parsed : [parsed];
|
|
55
55
|
}
|
|
56
56
|
if (fmt === 'ndjson') {
|
|
57
|
-
return text
|
|
57
|
+
return text
|
|
58
|
+
.split('\n')
|
|
58
59
|
.map((l) => l.trim())
|
|
59
60
|
.filter((l) => l.length > 0)
|
|
60
61
|
.map((l) => JSON.parse(l));
|
|
@@ -115,11 +116,14 @@ function parseCsv(text) {
|
|
|
115
116
|
if (rows.length === 0)
|
|
116
117
|
return [];
|
|
117
118
|
const header = rows[0];
|
|
118
|
-
return rows
|
|
119
|
+
return rows
|
|
120
|
+
.slice(1)
|
|
119
121
|
.filter((r) => !(r.length === 1 && r[0] === ''))
|
|
120
122
|
.map((r) => {
|
|
121
123
|
const obj = {};
|
|
122
|
-
header.forEach((h, i) => {
|
|
124
|
+
header.forEach((h, i) => {
|
|
125
|
+
obj[h] = r[i] ?? '';
|
|
126
|
+
});
|
|
123
127
|
return obj;
|
|
124
128
|
});
|
|
125
129
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ingest.service.js","sourceRoot":"","sources":["../../../../../src/functions/app/daemon/services/ingest.service.ts"],"names":[],"mappings":"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
|
|
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;
|
|
@@ -22,6 +23,7 @@ export declare class LoadersService {
|
|
|
22
23
|
remove(key: string): 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
|
}
|
|
@@ -94,12 +102,13 @@ let LoadersService = class LoadersService {
|
|
|
94
102
|
return { key, status: 'processed', resources: counts, errors: slot.errors };
|
|
95
103
|
}
|
|
96
104
|
list() {
|
|
97
|
-
return Array.from(this.map.values()).map((s) => s.entry);
|
|
105
|
+
return Array.from(this.map.values()).map((s) => ({ ...s.entry, source: redactSource(s.entry.source) }));
|
|
98
106
|
}
|
|
99
107
|
get(key) {
|
|
100
108
|
const slot = this.requireSlot(key);
|
|
101
109
|
return {
|
|
102
110
|
...slot.entry,
|
|
111
|
+
source: redactSource(slot.entry.source),
|
|
103
112
|
config: slot.loader.config.get(),
|
|
104
113
|
lastProcessOptions: slot.lastProcessOptions,
|
|
105
114
|
progress: [...slot.progress],
|
|
@@ -126,6 +135,10 @@ let LoadersService = class LoadersService {
|
|
|
126
135
|
loader.variables.global.set('apiKey', source.apiKey);
|
|
127
136
|
if (source.version)
|
|
128
137
|
loader.variables.global.set('version', source.version);
|
|
138
|
+
if (source.cdnBaseUrl)
|
|
139
|
+
loader.variables.global.set('cdnBaseUrl', source.cdnBaseUrl);
|
|
140
|
+
if (source.consoleApiUrl)
|
|
141
|
+
loader.variables.global.set('consoleApiUrl', source.consoleApiUrl);
|
|
129
142
|
return { baseUrl: undefined, loaderFileName: undefined };
|
|
130
143
|
}
|
|
131
144
|
return {
|
|
@@ -136,14 +149,17 @@ let LoadersService = class LoadersService {
|
|
|
136
149
|
: undefined,
|
|
137
150
|
};
|
|
138
151
|
}
|
|
152
|
+
attemptedConfigUrl(loader) {
|
|
153
|
+
const baseUrl = loader.variables.get('baseUrl')?.value ?? '';
|
|
154
|
+
const loaderFileName = loader.variables.get('loaderFileName')?.value ?? 'dcupl.lc.json';
|
|
155
|
+
return `${baseUrl}/${loaderFileName}`;
|
|
156
|
+
}
|
|
139
157
|
toProcessOptions(o) {
|
|
140
158
|
return {
|
|
141
159
|
applicationKey: o.applicationKey,
|
|
142
160
|
environmentKeys: o.environmentKeys,
|
|
143
161
|
resourceTags: o.resourceTags,
|
|
144
|
-
variables: o.variables
|
|
145
|
-
? Object.entries(o.variables).map(([k, value]) => ({ key: k, value }))
|
|
146
|
-
: undefined,
|
|
162
|
+
variables: o.variables ? Object.entries(o.variables).map(([k, value]) => ({ key: k, value })) : undefined,
|
|
147
163
|
options: o.options,
|
|
148
164
|
};
|
|
149
165
|
}
|
|
@@ -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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"}
|
|
@@ -1,2 +1,10 @@
|
|
|
1
|
+
export declare const DEFAULT_E2E_PORT = 8083;
|
|
2
|
+
export interface PortLockSession {
|
|
3
|
+
port: number;
|
|
4
|
+
externalHolder: boolean;
|
|
5
|
+
}
|
|
6
|
+
export declare function isPortTaken(port: number): Promise<boolean>;
|
|
7
|
+
export declare function pickFreePort(): Promise<number>;
|
|
1
8
|
export declare function acquirePortLock(timeoutMs?: number): Promise<void>;
|
|
9
|
+
export declare function acquirePortLockSession(timeoutMs?: number): Promise<PortLockSession>;
|
|
2
10
|
export declare function releasePortLock(): void;
|
|
@@ -1,11 +1,18 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.DEFAULT_E2E_PORT = void 0;
|
|
4
|
+
exports.isPortTaken = isPortTaken;
|
|
5
|
+
exports.pickFreePort = pickFreePort;
|
|
3
6
|
exports.acquirePortLock = acquirePortLock;
|
|
7
|
+
exports.acquirePortLockSession = acquirePortLockSession;
|
|
4
8
|
exports.releasePortLock = releasePortLock;
|
|
5
9
|
const fs_extra_1 = require("fs-extra");
|
|
10
|
+
const net_1 = require("net");
|
|
6
11
|
const os_1 = require("os");
|
|
7
12
|
const path_1 = require("path");
|
|
8
13
|
const LOCK_PATH = (0, path_1.join)((0, os_1.tmpdir)(), 'dcupl-e2e-port-8083.lock');
|
|
14
|
+
exports.DEFAULT_E2E_PORT = 8083;
|
|
15
|
+
const TEARDOWN_GRACE_MS = 5_000;
|
|
9
16
|
function isPidAlive(pid) {
|
|
10
17
|
try {
|
|
11
18
|
process.kill(pid, 0);
|
|
@@ -15,6 +22,47 @@ function isPidAlive(pid) {
|
|
|
15
22
|
return err.code === 'EPERM';
|
|
16
23
|
}
|
|
17
24
|
}
|
|
25
|
+
function isPortTaken(port) {
|
|
26
|
+
return new Promise((resolveP) => {
|
|
27
|
+
const socket = (0, net_1.createConnection)({ host: '127.0.0.1', port });
|
|
28
|
+
const cleanup = () => {
|
|
29
|
+
try {
|
|
30
|
+
socket.destroy();
|
|
31
|
+
}
|
|
32
|
+
catch {
|
|
33
|
+
}
|
|
34
|
+
};
|
|
35
|
+
socket.setTimeout(500);
|
|
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
|
+
});
|
|
48
|
+
});
|
|
49
|
+
}
|
|
50
|
+
function pickFreePort() {
|
|
51
|
+
return new Promise((resolveP, rejectP) => {
|
|
52
|
+
const srv = (0, net_1.createServer)();
|
|
53
|
+
srv.on('error', rejectP);
|
|
54
|
+
srv.listen(0, '127.0.0.1', () => {
|
|
55
|
+
const addr = srv.address();
|
|
56
|
+
if (!addr || typeof addr === 'string') {
|
|
57
|
+
srv.close();
|
|
58
|
+
rejectP(new Error('no port'));
|
|
59
|
+
return;
|
|
60
|
+
}
|
|
61
|
+
const p = addr.port;
|
|
62
|
+
srv.close(() => resolveP(p));
|
|
63
|
+
});
|
|
64
|
+
});
|
|
65
|
+
}
|
|
18
66
|
async function acquirePortLock(timeoutMs = 120_000) {
|
|
19
67
|
const deadline = Date.now() + timeoutMs;
|
|
20
68
|
while (Date.now() < deadline) {
|
|
@@ -34,12 +82,27 @@ async function acquirePortLock(timeoutMs = 120_000) {
|
|
|
34
82
|
continue;
|
|
35
83
|
}
|
|
36
84
|
}
|
|
37
|
-
catch {
|
|
85
|
+
catch {
|
|
86
|
+
}
|
|
38
87
|
await new Promise((r) => setTimeout(r, 500));
|
|
39
88
|
}
|
|
40
89
|
}
|
|
41
90
|
throw new Error(`acquirePortLock: could not acquire ${LOCK_PATH} within ${timeoutMs}ms`);
|
|
42
91
|
}
|
|
92
|
+
async function acquirePortLockSession(timeoutMs = 180_000) {
|
|
93
|
+
await acquirePortLock(timeoutMs);
|
|
94
|
+
const graceDeadline = Date.now() + TEARDOWN_GRACE_MS;
|
|
95
|
+
while (await isPortTaken(exports.DEFAULT_E2E_PORT)) {
|
|
96
|
+
if (Date.now() >= graceDeadline) {
|
|
97
|
+
const port = await pickFreePort();
|
|
98
|
+
console.warn(`[e2e port-lock] port ${exports.DEFAULT_E2E_PORT} is held by a process outside this test run ` +
|
|
99
|
+
`(e.g. a dcupl serve from another session); running this suite on free port ${port} instead.`);
|
|
100
|
+
return { port, externalHolder: true };
|
|
101
|
+
}
|
|
102
|
+
await new Promise((r) => setTimeout(r, 250));
|
|
103
|
+
}
|
|
104
|
+
return { port: exports.DEFAULT_E2E_PORT, externalHolder: false };
|
|
105
|
+
}
|
|
43
106
|
function releasePortLock() {
|
|
44
107
|
if (!(0, fs_extra_1.existsSync)(LOCK_PATH))
|
|
45
108
|
return;
|
|
@@ -48,6 +111,7 @@ function releasePortLock() {
|
|
|
48
111
|
if (holder === process.pid)
|
|
49
112
|
(0, fs_extra_1.unlinkSync)(LOCK_PATH);
|
|
50
113
|
}
|
|
51
|
-
catch {
|
|
114
|
+
catch {
|
|
115
|
+
}
|
|
52
116
|
}
|
|
53
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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"}
|