pipework 0.7.23 → 0.7.24
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +4 -0
- package/dist/async/pipeline/execute.d.ts.map +1 -1
- package/dist/async/pipeline/execute.js +4 -58
- package/dist/async/pipeline/execute.js.map +1 -1
- package/dist/async/pipeline/resume.d.ts.map +1 -1
- package/dist/async/pipeline/resume.js +5 -58
- package/dist/async/pipeline/resume.js.map +1 -1
- package/dist/async/pipeline/run-steps.d.ts +20 -0
- package/dist/async/pipeline/run-steps.d.ts.map +1 -0
- package/dist/async/pipeline/run-steps.js +67 -0
- package/dist/async/pipeline/run-steps.js.map +1 -0
- package/dist/auth/auth/multi-org.d.ts.map +1 -1
- package/dist/auth/auth/multi-org.js +1 -14
- package/dist/auth/auth/multi-org.js.map +1 -1
- package/dist/auth/auth/parse-expiry.d.ts +2 -0
- package/dist/auth/auth/parse-expiry.d.ts.map +1 -0
- package/dist/auth/auth/parse-expiry.js +15 -0
- package/dist/auth/auth/parse-expiry.js.map +1 -0
- package/dist/auth/auth/sessions.d.ts.map +1 -1
- package/dist/auth/auth/sessions.js +1 -14
- package/dist/auth/auth/sessions.js.map +1 -1
- package/dist/auth/rbac/create.d.ts +4 -0
- package/dist/auth/rbac/create.d.ts.map +1 -0
- package/dist/auth/rbac/create.js +29 -0
- package/dist/auth/rbac/create.js.map +1 -0
- package/dist/auth/rbac/index.d.ts +1 -3
- package/dist/auth/rbac/index.d.ts.map +1 -1
- package/dist/auth/rbac/index.js +1 -28
- package/dist/auth/rbac/index.js.map +1 -1
- package/dist/auth/rbac/resolve.d.ts.map +1 -1
- package/dist/auth/rbac/resolve.js +3 -7
- package/dist/auth/rbac/resolve.js.map +1 -1
- package/dist/auth/rbac/seed.d.ts.map +1 -1
- package/dist/auth/rbac/seed.js +7 -13
- package/dist/auth/rbac/seed.js.map +1 -1
- package/dist/auth/rbac/tables.d.ts +10 -0
- package/dist/auth/rbac/tables.d.ts.map +1 -0
- package/dist/auth/rbac/tables.js +21 -0
- package/dist/auth/rbac/tables.js.map +1 -0
- package/dist/cli/commands/check.js +1 -1
- package/dist/cli/commands/check.js.map +1 -1
- package/dist/core/config/discover.js +1 -1
- package/dist/core/config/discover.js.map +1 -1
- package/dist/core/config/env-resolve.js +1 -1
- package/dist/core/config/env-resolve.js.map +1 -1
- package/dist/core/config/errors.d.ts +5 -0
- package/dist/core/config/errors.d.ts.map +1 -0
- package/dist/core/config/errors.js +9 -0
- package/dist/core/config/errors.js.map +1 -0
- package/dist/core/config/index.d.ts +2 -1
- package/dist/core/config/index.d.ts.map +1 -1
- package/dist/core/config/index.js +2 -1
- package/dist/core/config/index.js.map +1 -1
- package/dist/core/config/load.d.ts.map +1 -1
- package/dist/core/config/load.js +2 -1
- package/dist/core/config/load.js.map +1 -1
- package/dist/core/config/resolve.d.ts +0 -4
- package/dist/core/config/resolve.d.ts.map +1 -1
- package/dist/core/config/resolve.js +1 -8
- package/dist/core/config/resolve.js.map +1 -1
- package/dist/core/errors/http.d.ts +29 -0
- package/dist/core/errors/http.d.ts.map +1 -0
- package/dist/core/errors/http.js +46 -0
- package/dist/core/errors/http.js.map +1 -0
- package/dist/core/errors/index.d.ts +1 -1
- package/dist/core/errors/index.d.ts.map +1 -1
- package/dist/core/errors/index.js +1 -1
- package/dist/core/errors/index.js.map +1 -1
- package/dist/core/logging/namespace.d.ts +15 -0
- package/dist/core/logging/namespace.d.ts.map +1 -0
- package/dist/core/logging/namespace.js +16 -0
- package/dist/core/logging/namespace.js.map +1 -0
- package/dist/core/surface/validate.d.ts +0 -2
- package/dist/core/surface/validate.d.ts.map +1 -1
- package/dist/core/surface/validate.js +0 -54
- package/dist/core/surface/validate.js.map +1 -1
- package/dist/core/validation/index.d.ts +1 -1
- package/dist/core/validation/index.d.ts.map +1 -1
- package/dist/core/validation/index.js +1 -1
- package/dist/core/validation/index.js.map +1 -1
- package/dist/core/validation/startup.js +1 -1
- package/dist/core/validation/startup.js.map +1 -1
- package/dist/core/validation/surfaces.d.ts +4 -0
- package/dist/core/validation/surfaces.d.ts.map +1 -0
- package/dist/core/validation/surfaces.js +56 -0
- package/dist/core/validation/surfaces.js.map +1 -0
- package/dist/data/db/composed.d.ts +1 -2
- package/dist/data/db/composed.d.ts.map +1 -1
- package/dist/data/db/composed.js.map +1 -1
- package/dist/data/db/expressions.d.ts +1 -2
- package/dist/data/db/expressions.d.ts.map +1 -1
- package/dist/data/domain/build-factory.d.ts +4 -0
- package/dist/data/domain/build-factory.d.ts.map +1 -0
- package/dist/data/domain/build-factory.js +138 -0
- package/dist/data/domain/build-factory.js.map +1 -0
- package/dist/data/domain/build-schema.d.ts +6 -0
- package/dist/data/domain/build-schema.d.ts.map +1 -0
- package/dist/data/domain/build-schema.js +123 -0
- package/dist/data/domain/build-schema.js.map +1 -0
- package/dist/data/domain/build-table.d.ts +30 -0
- package/dist/data/domain/build-table.d.ts.map +1 -0
- package/dist/data/domain/build-table.js +130 -0
- package/dist/data/domain/build-table.js.map +1 -0
- package/dist/data/domain/define.js +3 -3
- package/dist/data/domain/define.js.map +1 -1
- package/dist/data/domain/index.d.ts +1 -1
- package/dist/data/domain/index.d.ts.map +1 -1
- package/dist/data/domain/index.js +1 -1
- package/dist/data/domain/index.js.map +1 -1
- package/dist/data/migrate/generate.js +1 -1
- package/dist/data/migrate/generate.js.map +1 -1
- package/dist/data/temporal/close.d.ts.map +1 -1
- package/dist/data/temporal/close.js +3 -7
- package/dist/data/temporal/close.js.map +1 -1
- package/dist/data/temporal/get-current.d.ts.map +1 -1
- package/dist/data/temporal/get-current.js +3 -7
- package/dist/data/temporal/get-current.js.map +1 -1
- package/dist/data/temporal/resolve.d.ts +4 -0
- package/dist/data/temporal/resolve.d.ts.map +1 -0
- package/dist/data/temporal/resolve.js +12 -0
- package/dist/data/temporal/resolve.js.map +1 -0
- package/dist/data/temporal/revise.d.ts.map +1 -1
- package/dist/data/temporal/revise.js +3 -6
- package/dist/data/temporal/revise.js.map +1 -1
- package/dist/data/vector/columns.d.ts +19 -0
- package/dist/data/vector/columns.d.ts.map +1 -0
- package/dist/data/vector/columns.js +26 -0
- package/dist/data/vector/columns.js.map +1 -0
- package/dist/data/vector/index.d.ts +1 -1
- package/dist/data/vector/index.d.ts.map +1 -1
- package/dist/data/vector/index.js +1 -1
- package/dist/data/vector/index.js.map +1 -1
- package/dist/data/vector/namespace.d.ts +1 -1
- package/dist/data/vector/namespace.d.ts.map +1 -1
- package/dist/data/vector/namespace.js +1 -1
- package/dist/data/vector/namespace.js.map +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -1
- package/dist/index.js.map +1 -1
- package/dist/infra/cache/create.d.ts.map +1 -1
- package/dist/infra/cache/create.js +17 -53
- package/dist/infra/cache/create.js.map +1 -1
- package/dist/infra/cache/entry.d.ts +14 -0
- package/dist/infra/cache/entry.d.ts.map +1 -0
- package/dist/infra/cache/entry.js +49 -0
- package/dist/infra/cache/entry.js.map +1 -0
- package/dist/infra/cache/tenant.d.ts.map +1 -1
- package/dist/infra/cache/tenant.js +13 -48
- package/dist/infra/cache/tenant.js.map +1 -1
- package/dist/lint/doctrine.d.ts +13 -0
- package/dist/lint/doctrine.d.ts.map +1 -0
- package/dist/lint/doctrine.js +115 -0
- package/dist/lint/doctrine.js.map +1 -0
- package/dist/request/behavior/audited.d.ts.map +1 -1
- package/dist/request/behavior/audited.js +1 -9
- package/dist/request/behavior/audited.js.map +1 -1
- package/dist/request/fixture/to-handlers.d.ts.map +1 -1
- package/dist/request/fixture/to-handlers.js +1 -9
- package/dist/request/fixture/to-handlers.js.map +1 -1
- package/dist/request/internal/text.d.ts +2 -0
- package/dist/request/internal/text.d.ts.map +1 -0
- package/dist/request/internal/text.js +10 -0
- package/dist/request/internal/text.js.map +1 -0
- package/dist/test/vitest-config.d.ts +1 -0
- package/dist/test/vitest-config.d.ts.map +1 -1
- package/dist/test/vitest-config.js +14 -2
- package/dist/test/vitest-config.js.map +1 -1
- package/dist/test/vitest-plugin.d.ts +1 -1
- package/dist/test/vitest-plugin.d.ts.map +1 -1
- package/dist/test/vitest-plugin.js +1 -9
- package/dist/test/vitest-plugin.js.map +1 -1
- package/package.json +16 -24
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,9 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
## 0.7.24
|
|
4
|
+
|
|
5
|
+
- **Vitest 4 compatibility** — `defineTestConfig()` now injects `pipework/test/setup` directly instead of relying on a plugin `config()` hook that Vitest 4 silently ignores. Consumer `setupFiles` are merged, not replaced (#255).
|
|
6
|
+
|
|
3
7
|
## 0.7.23
|
|
4
8
|
|
|
5
9
|
- **`pipework db` command** — database lifecycle management: `pipework db setup` creates databases, roles, and extensions; `pipework db teardown` drops them; `pipework db reset` does both. Supports `--test` for isolated test databases, `--db` to scope to a single database, and `--admin-url` for admin connection override. Config accepts `adminUrl` per database (#236).
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execute.d.ts","sourceRoot":"","sources":["../../../src/async/pipeline/execute.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,wBAAwB,CAAA;AAChD,OAAO,KAAK,EAAE,cAAc,EAAE,WAAW,EAAE,sBAAsB,
|
|
1
|
+
{"version":3,"file":"execute.d.ts","sourceRoot":"","sources":["../../../src/async/pipeline/execute.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,wBAAwB,CAAA;AAChD,OAAO,KAAK,EAAE,cAAc,EAAE,WAAW,EAAE,sBAAsB,EAAE,MAAM,YAAY,CAAA;AAGrF,wBAAsB,eAAe,CACnC,EAAE,EAAE,EAAE,EACN,MAAM,EAAE,cAAc,EACtB,KAAK,EAAE,OAAO,EACd,OAAO,EAAE,sBAAsB,GAC9B,OAAO,CAAC,WAAW,CAAC,CA0CtB"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { sql } from '../../data/db/sql.js';
|
|
2
|
-
import {
|
|
2
|
+
import { executeStepsFrom } from './run-steps.js';
|
|
3
3
|
export async function executePipeline(db, config, input, context) {
|
|
4
4
|
const [runRow] = await db.execute(sql `
|
|
5
5
|
INSERT INTO pipework_pipeline_runs (pipeline_name, tenant_id, status, current_step, input, metadata)
|
|
@@ -15,63 +15,9 @@ export async function executePipeline(db, config, input, context) {
|
|
|
15
15
|
VALUES (${runId}::uuid, ${i}, ${step.name}, 'pending')
|
|
16
16
|
`);
|
|
17
17
|
}
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
if (step.async === true) {
|
|
22
|
-
await db.execute(sql `
|
|
23
|
-
UPDATE pipework_pipeline_runs SET status = 'waiting', current_step = ${i}
|
|
24
|
-
WHERE id = ${runId}::uuid
|
|
25
|
-
`);
|
|
26
|
-
return {
|
|
27
|
-
id: runId,
|
|
28
|
-
pipelineName: config.name,
|
|
29
|
-
status: 'waiting',
|
|
30
|
-
currentStep: i,
|
|
31
|
-
input,
|
|
32
|
-
startedAt,
|
|
33
|
-
completedAt: null,
|
|
34
|
-
error: null,
|
|
35
|
-
};
|
|
36
|
-
}
|
|
37
|
-
await db.execute(sql `
|
|
38
|
-
UPDATE pipework_pipeline_steps SET status = 'running', started_at = now()
|
|
39
|
-
WHERE run_id = ${runId}::uuid AND step_index = ${i}
|
|
40
|
-
`);
|
|
41
|
-
try {
|
|
42
|
-
const stepCtx = {
|
|
43
|
-
db,
|
|
44
|
-
input: lastOutput,
|
|
45
|
-
runId,
|
|
46
|
-
stepIndex: i,
|
|
47
|
-
tenant: context.tenant,
|
|
48
|
-
metadata: context.metadata ?? {},
|
|
49
|
-
};
|
|
50
|
-
lastOutput = await step.handler(stepCtx);
|
|
51
|
-
await db.execute(sql `
|
|
52
|
-
UPDATE pipework_pipeline_steps SET status = 'completed', output = ${JSON.stringify(lastOutput ?? null)}::jsonb, completed_at = now()
|
|
53
|
-
WHERE run_id = ${runId}::uuid AND step_index = ${i}
|
|
54
|
-
`);
|
|
55
|
-
await db.execute(sql `
|
|
56
|
-
UPDATE pipework_pipeline_runs SET current_step = ${i + 1}
|
|
57
|
-
WHERE id = ${runId}::uuid
|
|
58
|
-
`);
|
|
59
|
-
}
|
|
60
|
-
catch (error) {
|
|
61
|
-
const errorJson = error instanceof Error
|
|
62
|
-
? { message: error.message, stack: error.stack }
|
|
63
|
-
: { message: String(error) };
|
|
64
|
-
await db.execute(sql `
|
|
65
|
-
UPDATE pipework_pipeline_steps SET status = 'failed', error = ${JSON.stringify(errorJson)}::jsonb, completed_at = now()
|
|
66
|
-
WHERE run_id = ${runId}::uuid AND step_index = ${i}
|
|
67
|
-
`);
|
|
68
|
-
await db.execute(sql `
|
|
69
|
-
UPDATE pipework_pipeline_runs SET status = 'failed', error = ${JSON.stringify(errorJson)}::jsonb, completed_at = now()
|
|
70
|
-
WHERE id = ${runId}::uuid
|
|
71
|
-
`);
|
|
72
|
-
throw new PipelineStepError(config.name, step.name, i, error);
|
|
73
|
-
}
|
|
74
|
-
}
|
|
18
|
+
const result = await executeStepsFrom({ db, config, runId, input, startedAt, tenant: context.tenant, metadata: context.metadata ?? {} }, 0, input);
|
|
19
|
+
if (!result.done)
|
|
20
|
+
return result.waitingRun;
|
|
75
21
|
await db.execute(sql `
|
|
76
22
|
UPDATE pipework_pipeline_runs SET status = 'completed', completed_at = now()
|
|
77
23
|
WHERE id = ${runId}::uuid
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../../src/async/pipeline/execute.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,sBAAsB,CAAA;AAG1C,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../../src/async/pipeline/execute.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,sBAAsB,CAAA;AAG1C,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAA;AAEjD,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,EAAM,EACN,MAAsB,EACtB,KAAc,EACd,OAA+B;IAE/B,MAAM,CAAC,MAAM,CAAC,GAAG,MAAM,EAAE,CAAC,OAAO,CAAC,GAAG,CAAA;;cAEzB,MAAM,CAAC,IAAI,KAAK,OAAO,CAAC,MAAM,mBAAmB,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,YAAY,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,QAAQ,IAAI,EAAE,CAAC;;GAEnI,CAAC,CAAA;IAEF,MAAM,KAAK,GAAG,MAAM,CAAC,MAAO,CAAC,IAAI,CAAC,CAAC,CAAA;IACnC,MAAM,SAAS,GAAG,IAAI,IAAI,CAAC,MAAM,CAAC,MAAO,CAAC,YAAY,CAAC,CAAC,CAAC,CAAA;IAEzD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QAC7C,MAAM,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAE,CAAA;QAE7B,MAAM,EAAE,CAAC,OAAO,CAAC,GAAG,CAAA;;gBAER,KAAK,WAAW,CAAC,KAAK,IAAI,CAAC,IAAI;KAC1C,CAAC,CAAA;IACJ,CAAC;IAED,MAAM,MAAM,GAAG,MAAM,gBAAgB,CACnC,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,QAAQ,EAAE,OAAO,CAAC,QAAQ,IAAI,EAAE,EAAE,EACjG,CAAC,EACD,KAAK,CACN,CAAA;IAED,IAAI,CAAC,MAAM,CAAC,IAAI;QAAE,OAAO,MAAM,CAAC,UAAU,CAAA;IAE1C,MAAM,EAAE,CAAC,OAAO,CAAC,GAAG,CAAA;;iBAEL,KAAK;GACnB,CAAC,CAAA;IAEF,OAAO;QACL,EAAE,EAAE,KAAK;QACT,YAAY,EAAE,MAAM,CAAC,IAAI;QACzB,MAAM,EAAE,WAAW;QACnB,WAAW,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM;QAChC,KAAK;QACL,SAAS;QACT,WAAW,EAAE,IAAI,IAAI,EAAE;QACvB,KAAK,EAAE,IAAI;KACZ,CAAA;AACH,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resume.d.ts","sourceRoot":"","sources":["../../../src/async/pipeline/resume.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,wBAAwB,CAAA;AAChD,OAAO,KAAK,EAAE,cAAc,EAAE,WAAW,
|
|
1
|
+
{"version":3,"file":"resume.d.ts","sourceRoot":"","sources":["../../../src/async/pipeline/resume.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,wBAAwB,CAAA;AAChD,OAAO,KAAK,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,YAAY,CAAA;AAI7D,wBAAsB,cAAc,CAClC,EAAE,EAAE,EAAE,EACN,MAAM,EAAE,cAAc,EACtB,KAAK,EAAE,MAAM,EACb,UAAU,EAAE,OAAO,GAClB,OAAO,CAAC,WAAW,CAAC,CAuDtB"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { sql } from '../../data/db/sql.js';
|
|
2
|
-
import { PipelineResumeError
|
|
2
|
+
import { PipelineResumeError } from './errors.js';
|
|
3
|
+
import { executeStepsFrom } from './run-steps.js';
|
|
3
4
|
export async function resumePipeline(db, config, runId, stepOutput) {
|
|
4
5
|
const [runRow] = await db.execute(sql `
|
|
5
6
|
UPDATE pipework_pipeline_runs
|
|
@@ -25,63 +26,9 @@ export async function resumePipeline(db, config, runId, stepOutput) {
|
|
|
25
26
|
UPDATE pipework_pipeline_steps SET status = 'completed', output = ${JSON.stringify(stepOutput ?? null)}::jsonb, completed_at = now()
|
|
26
27
|
WHERE run_id = ${runId}::uuid AND step_index = ${currentStep}
|
|
27
28
|
`);
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
if (step.async === true) {
|
|
32
|
-
await db.execute(sql `
|
|
33
|
-
UPDATE pipework_pipeline_runs SET status = 'waiting', current_step = ${i}
|
|
34
|
-
WHERE id = ${runId}::uuid
|
|
35
|
-
`);
|
|
36
|
-
return {
|
|
37
|
-
id: runId,
|
|
38
|
-
pipelineName: config.name,
|
|
39
|
-
status: 'waiting',
|
|
40
|
-
currentStep: i,
|
|
41
|
-
input,
|
|
42
|
-
startedAt,
|
|
43
|
-
completedAt: null,
|
|
44
|
-
error: null,
|
|
45
|
-
};
|
|
46
|
-
}
|
|
47
|
-
await db.execute(sql `
|
|
48
|
-
UPDATE pipework_pipeline_steps SET status = 'running', started_at = now()
|
|
49
|
-
WHERE run_id = ${runId}::uuid AND step_index = ${i}
|
|
50
|
-
`);
|
|
51
|
-
try {
|
|
52
|
-
const stepCtx = {
|
|
53
|
-
db,
|
|
54
|
-
input: lastOutput,
|
|
55
|
-
runId,
|
|
56
|
-
stepIndex: i,
|
|
57
|
-
tenant,
|
|
58
|
-
metadata,
|
|
59
|
-
};
|
|
60
|
-
lastOutput = await step.handler(stepCtx);
|
|
61
|
-
await db.execute(sql `
|
|
62
|
-
UPDATE pipework_pipeline_steps SET status = 'completed', output = ${JSON.stringify(lastOutput ?? null)}::jsonb, completed_at = now()
|
|
63
|
-
WHERE run_id = ${runId}::uuid AND step_index = ${i}
|
|
64
|
-
`);
|
|
65
|
-
await db.execute(sql `
|
|
66
|
-
UPDATE pipework_pipeline_runs SET current_step = ${i + 1}
|
|
67
|
-
WHERE id = ${runId}::uuid
|
|
68
|
-
`);
|
|
69
|
-
}
|
|
70
|
-
catch (error) {
|
|
71
|
-
const errorJson = error instanceof Error
|
|
72
|
-
? { message: error.message, stack: error.stack }
|
|
73
|
-
: { message: String(error) };
|
|
74
|
-
await db.execute(sql `
|
|
75
|
-
UPDATE pipework_pipeline_steps SET status = 'failed', error = ${JSON.stringify(errorJson)}::jsonb, completed_at = now()
|
|
76
|
-
WHERE run_id = ${runId}::uuid AND step_index = ${i}
|
|
77
|
-
`);
|
|
78
|
-
await db.execute(sql `
|
|
79
|
-
UPDATE pipework_pipeline_runs SET status = 'failed', error = ${JSON.stringify(errorJson)}::jsonb, completed_at = now()
|
|
80
|
-
WHERE id = ${runId}::uuid
|
|
81
|
-
`);
|
|
82
|
-
throw new PipelineStepError(config.name, step.name, i, error);
|
|
83
|
-
}
|
|
84
|
-
}
|
|
29
|
+
const result = await executeStepsFrom({ db, config, runId, input, startedAt, tenant, metadata }, currentStep + 1, stepOutput);
|
|
30
|
+
if (!result.done)
|
|
31
|
+
return result.waitingRun;
|
|
85
32
|
await db.execute(sql `
|
|
86
33
|
UPDATE pipework_pipeline_runs SET status = 'completed', current_step = ${config.steps.length}, completed_at = now()
|
|
87
34
|
WHERE id = ${runId}::uuid
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resume.js","sourceRoot":"","sources":["../../../src/async/pipeline/resume.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,sBAAsB,CAAA;AAG1C,OAAO,EAAE,mBAAmB,EAAE,
|
|
1
|
+
{"version":3,"file":"resume.js","sourceRoot":"","sources":["../../../src/async/pipeline/resume.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,sBAAsB,CAAA;AAG1C,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAA;AACjD,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAA;AAEjD,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,EAAM,EACN,MAAsB,EACtB,KAAa,EACb,UAAmB;IAEnB,MAAM,CAAC,MAAM,CAAC,GAAG,MAAM,EAAE,CAAC,OAAO,CAAC,GAAG,CAAA;;;iBAGtB,KAAK;;GAEnB,CAAC,CAAA;IAEF,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;QACzB,MAAM,CAAC,WAAW,CAAC,GAAG,MAAM,EAAE,CAAC,OAAO,CAAC,GAAG,CAAA;6DACe,KAAK;KAC7D,CAAC,CAAA;QACF,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;YAC9B,MAAM,IAAI,mBAAmB,CAAC,KAAK,EAAE,yBAAyB,CAAC,CAAA;QACjE,CAAC;QACD,MAAM,IAAI,mBAAmB,CAC3B,KAAK,EACL,wCAAwC,MAAM,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,IAAI,CAC1E,CAAA;IACH,CAAC;IAED,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,CAAA;IAClD,MAAM,KAAK,GAAG,MAAM,CAAC,OAAO,CAAC,CAAA;IAC7B,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAA;IAC1C,MAAM,QAAQ,GAAI,MAAM,CAAC,UAAU,CAAoC,IAAI,EAAE,CAAA;IAC7E,MAAM,SAAS,GAAG,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAA;IAExD,MAAM,EAAE,CAAC,OAAO,CAAC,GAAG,CAAA;wEACkD,IAAI,CAAC,SAAS,CAAC,UAAU,IAAI,IAAI,CAAC;qBACrF,KAAK,2BAA2B,WAAW;GAC7D,CAAC,CAAA;IAEF,MAAM,MAAM,GAAG,MAAM,gBAAgB,CACnC,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,EACzD,WAAW,GAAG,CAAC,EACf,UAAU,CACX,CAAA;IAED,IAAI,CAAC,MAAM,CAAC,IAAI;QAAE,OAAO,MAAM,CAAC,UAAU,CAAA;IAE1C,MAAM,EAAE,CAAC,OAAO,CAAC,GAAG,CAAA;6EACuD,MAAM,CAAC,KAAK,CAAC,MAAM;iBAC/E,KAAK;GACnB,CAAC,CAAA;IAEF,OAAO;QACL,EAAE,EAAE,KAAK;QACT,YAAY,EAAE,MAAM,CAAC,IAAI;QACzB,MAAM,EAAE,WAAW;QACnB,WAAW,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM;QAChC,KAAK;QACL,SAAS;QACT,WAAW,EAAE,IAAI,IAAI,EAAE;QACvB,KAAK,EAAE,IAAI;KACZ,CAAA;AACH,CAAC"}
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
import type { DB } from '../../data/db/index.js';
|
|
2
|
+
import type { PipelineConfig, PipelineRun } from './types.js';
|
|
3
|
+
export interface StepLoopContext {
|
|
4
|
+
readonly db: DB;
|
|
5
|
+
readonly config: PipelineConfig;
|
|
6
|
+
readonly runId: string;
|
|
7
|
+
readonly input: unknown;
|
|
8
|
+
readonly startedAt: Date;
|
|
9
|
+
readonly tenant: string;
|
|
10
|
+
readonly metadata: Record<string, unknown>;
|
|
11
|
+
}
|
|
12
|
+
export type StepLoopResult = {
|
|
13
|
+
done: true;
|
|
14
|
+
lastOutput: unknown;
|
|
15
|
+
} | {
|
|
16
|
+
done: false;
|
|
17
|
+
waitingRun: PipelineRun;
|
|
18
|
+
};
|
|
19
|
+
export declare function executeStepsFrom(ctx: StepLoopContext, startIndex: number, initialOutput: unknown): Promise<StepLoopResult>;
|
|
20
|
+
//# sourceMappingURL=run-steps.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"run-steps.d.ts","sourceRoot":"","sources":["../../../src/async/pipeline/run-steps.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,wBAAwB,CAAA;AAChD,OAAO,KAAK,EAAE,cAAc,EAAE,WAAW,EAAe,MAAM,YAAY,CAAA;AAG1E,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAA;IACf,QAAQ,CAAC,MAAM,EAAE,cAAc,CAAA;IAC/B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;IACtB,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAA;IACvB,QAAQ,CAAC,SAAS,EAAE,IAAI,CAAA;IACxB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;IACvB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAC3C;AAED,MAAM,MAAM,cAAc,GACtB;IAAE,IAAI,EAAE,IAAI,CAAC;IAAC,UAAU,EAAE,OAAO,CAAA;CAAE,GACnC;IAAE,IAAI,EAAE,KAAK,CAAC;IAAC,UAAU,EAAE,WAAW,CAAA;CAAE,CAAA;AAE5C,wBAAsB,gBAAgB,CACpC,GAAG,EAAE,eAAe,EACpB,UAAU,EAAE,MAAM,EAClB,aAAa,EAAE,OAAO,GACrB,OAAO,CAAC,cAAc,CAAC,CA0EzB"}
|
|
@@ -0,0 +1,67 @@
|
|
|
1
|
+
import { sql } from '../../data/db/sql.js';
|
|
2
|
+
import { PipelineStepError } from './errors.js';
|
|
3
|
+
export async function executeStepsFrom(ctx, startIndex, initialOutput) {
|
|
4
|
+
const { db, config, runId, input, startedAt, tenant, metadata } = ctx;
|
|
5
|
+
let lastOutput = initialOutput;
|
|
6
|
+
for (let i = startIndex; i < config.steps.length; i++) {
|
|
7
|
+
const step = config.steps[i];
|
|
8
|
+
if (step.async === true) {
|
|
9
|
+
await db.execute(sql `
|
|
10
|
+
UPDATE pipework_pipeline_runs SET status = 'waiting', current_step = ${i}
|
|
11
|
+
WHERE id = ${runId}::uuid
|
|
12
|
+
`);
|
|
13
|
+
return {
|
|
14
|
+
done: false,
|
|
15
|
+
waitingRun: {
|
|
16
|
+
id: runId,
|
|
17
|
+
pipelineName: config.name,
|
|
18
|
+
status: 'waiting',
|
|
19
|
+
currentStep: i,
|
|
20
|
+
input,
|
|
21
|
+
startedAt,
|
|
22
|
+
completedAt: null,
|
|
23
|
+
error: null,
|
|
24
|
+
},
|
|
25
|
+
};
|
|
26
|
+
}
|
|
27
|
+
await db.execute(sql `
|
|
28
|
+
UPDATE pipework_pipeline_steps SET status = 'running', started_at = now()
|
|
29
|
+
WHERE run_id = ${runId}::uuid AND step_index = ${i}
|
|
30
|
+
`);
|
|
31
|
+
try {
|
|
32
|
+
const stepCtx = {
|
|
33
|
+
db,
|
|
34
|
+
input: lastOutput,
|
|
35
|
+
runId,
|
|
36
|
+
stepIndex: i,
|
|
37
|
+
tenant,
|
|
38
|
+
metadata,
|
|
39
|
+
};
|
|
40
|
+
lastOutput = await step.handler(stepCtx);
|
|
41
|
+
await db.execute(sql `
|
|
42
|
+
UPDATE pipework_pipeline_steps SET status = 'completed', output = ${JSON.stringify(lastOutput ?? null)}::jsonb, completed_at = now()
|
|
43
|
+
WHERE run_id = ${runId}::uuid AND step_index = ${i}
|
|
44
|
+
`);
|
|
45
|
+
await db.execute(sql `
|
|
46
|
+
UPDATE pipework_pipeline_runs SET current_step = ${i + 1}
|
|
47
|
+
WHERE id = ${runId}::uuid
|
|
48
|
+
`);
|
|
49
|
+
}
|
|
50
|
+
catch (error) {
|
|
51
|
+
const errorJson = error instanceof Error
|
|
52
|
+
? { message: error.message, stack: error.stack }
|
|
53
|
+
: { message: String(error) };
|
|
54
|
+
await db.execute(sql `
|
|
55
|
+
UPDATE pipework_pipeline_steps SET status = 'failed', error = ${JSON.stringify(errorJson)}::jsonb, completed_at = now()
|
|
56
|
+
WHERE run_id = ${runId}::uuid AND step_index = ${i}
|
|
57
|
+
`);
|
|
58
|
+
await db.execute(sql `
|
|
59
|
+
UPDATE pipework_pipeline_runs SET status = 'failed', error = ${JSON.stringify(errorJson)}::jsonb, completed_at = now()
|
|
60
|
+
WHERE id = ${runId}::uuid
|
|
61
|
+
`);
|
|
62
|
+
throw new PipelineStepError(config.name, step.name, i, error);
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
return { done: true, lastOutput };
|
|
66
|
+
}
|
|
67
|
+
//# sourceMappingURL=run-steps.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"run-steps.js","sourceRoot":"","sources":["../../../src/async/pipeline/run-steps.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,sBAAsB,CAAA;AAG1C,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAA;AAgB/C,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,GAAoB,EACpB,UAAkB,EAClB,aAAsB;IAEtB,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,GAAG,CAAA;IACrE,IAAI,UAAU,GAAY,aAAa,CAAA;IAEvC,KAAK,IAAI,CAAC,GAAG,UAAU,EAAE,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACtD,MAAM,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAE,CAAA;QAE7B,IAAI,IAAI,CAAC,KAAK,KAAK,IAAI,EAAE,CAAC;YACxB,MAAM,EAAE,CAAC,OAAO,CAAC,GAAG,CAAA;+EACqD,CAAC;qBAC3D,KAAK;OACnB,CAAC,CAAA;YAEF,OAAO;gBACL,IAAI,EAAE,KAAK;gBACX,UAAU,EAAE;oBACV,EAAE,EAAE,KAAK;oBACT,YAAY,EAAE,MAAM,CAAC,IAAI;oBACzB,MAAM,EAAE,SAAS;oBACjB,WAAW,EAAE,CAAC;oBACd,KAAK;oBACL,SAAS;oBACT,WAAW,EAAE,IAAI;oBACjB,KAAK,EAAE,IAAI;iBACZ;aACF,CAAA;QACH,CAAC;QAED,MAAM,EAAE,CAAC,OAAO,CAAC,GAAG,CAAA;;uBAED,KAAK,2BAA2B,CAAC;KACnD,CAAC,CAAA;QAEF,IAAI,CAAC;YACH,MAAM,OAAO,GAAgB;gBAC3B,EAAE;gBACF,KAAK,EAAE,UAAU;gBACjB,KAAK;gBACL,SAAS,EAAE,CAAC;gBACZ,MAAM;gBACN,QAAQ;aACT,CAAA;YAED,UAAU,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;YAExC,MAAM,EAAE,CAAC,OAAO,CAAC,GAAG,CAAA;4EACkD,IAAI,CAAC,SAAS,CAAC,UAAU,IAAI,IAAI,CAAC;yBACrF,KAAK,2BAA2B,CAAC;OACnD,CAAC,CAAA;YAEF,MAAM,EAAE,CAAC,OAAO,CAAC,GAAG,CAAA;2DACiC,CAAC,GAAG,CAAC;qBAC3C,KAAK;OACnB,CAAC,CAAA;QACJ,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,SAAS,GAAG,KAAK,YAAY,KAAK;gBACtC,CAAC,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE;gBAChD,CAAC,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,EAAE,CAAA;YAE9B,MAAM,EAAE,CAAC,OAAO,CAAC,GAAG,CAAA;wEAC8C,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC;yBACxE,KAAK,2BAA2B,CAAC;OACnD,CAAC,CAAA;YAEF,MAAM,EAAE,CAAC,OAAO,CAAC,GAAG,CAAA;uEAC6C,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC;qBAC3E,KAAK;OACnB,CAAC,CAAA;YAEF,MAAM,IAAI,iBAAiB,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,EAAE,KAAK,CAAC,CAAA;QAC/D,CAAC;IACH,CAAC;IAED,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,CAAA;AACnC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"multi-org.d.ts","sourceRoot":"","sources":["../../../src/auth/auth/multi-org.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"multi-org.d.ts","sourceRoot":"","sources":["../../../src/auth/auth/multi-org.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { SignJWT, jwtVerify, importPKCS8, importSPKI } from 'jose';
|
|
2
|
+
import { parseExpiry } from './parse-expiry.js';
|
|
2
3
|
import { sql } from '../../data/db/sql.js';
|
|
3
4
|
import { ForbiddenError, UnauthorizedError, ConflictError, NotFoundError } from '../../core/errors/index.js';
|
|
4
5
|
import { assertValidIdentifier } from '../../data/db/identifiers.js';
|
|
@@ -23,20 +24,6 @@ export function createMultiOrgSessions(config) {
|
|
|
23
24
|
}
|
|
24
25
|
return cachedPublicKey;
|
|
25
26
|
}
|
|
26
|
-
function parseExpiry(exp) {
|
|
27
|
-
const match = exp.match(/^(\d+)([smhd])$/);
|
|
28
|
-
if (match === null)
|
|
29
|
-
throw new Error(`Invalid expiry format: ${exp}`);
|
|
30
|
-
const value = parseInt(match[1], 10);
|
|
31
|
-
const unit = match[2];
|
|
32
|
-
switch (unit) {
|
|
33
|
-
case 's': return value;
|
|
34
|
-
case 'm': return value * 60;
|
|
35
|
-
case 'h': return value * 3600;
|
|
36
|
-
case 'd': return value * 86400;
|
|
37
|
-
default: return value;
|
|
38
|
-
}
|
|
39
|
-
}
|
|
40
27
|
async function signOrgSelectToken(userId) {
|
|
41
28
|
const key = await getPrivateKey();
|
|
42
29
|
const expiresInSeconds = parseExpiry(orgSelectExpiresIn);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"multi-org.js","sourceRoot":"","sources":["../../../src/auth/auth/multi-org.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,MAAM,CAAA;AAClE,OAAO,EAAE,GAAG,EAAE,MAAM,sBAAsB,CAAA;AAE1C,OAAO,EAAE,cAAc,EAAE,iBAAiB,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAA;AAC5G,OAAO,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAA;AAiGpE,6FAA6F;AAC7F,MAAM,UAAU,sBAAsB,CAAC,MAAsB;IAC3D,MAAM,SAAS,GAAG,MAAM,CAAC,KAAK,IAAI,oBAAoB,CAAA;IACtD,qBAAqB,CAAC,SAAS,EAAE,4BAA4B,CAAC,CAAA;IAC9D,MAAM,CAAC,GAAG,GAAG,CAAC,GAAG,CAAC,IAAI,SAAS,GAAG,CAAC,CAAA;IAEnC,MAAM,iBAAiB,GAAG,GAAG,MAAM,CAAC,QAAQ,aAAa,CAAA;IACzD,MAAM,kBAAkB,GAAG,MAAM,CAAC,cAAc,EAAE,SAAS,IAAI,KAAK,CAAA;IAEpE,IAAI,gBAAgB,GAAqB,IAAI,CAAA;IAC7C,IAAI,eAAe,GAAqB,IAAI,CAAA;IAE5C,KAAK,UAAU,aAAa;QAC1B,IAAI,gBAAgB,KAAK,IAAI,EAAE,CAAC;YAC9B,gBAAgB,GAAG,MAAM,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,UAAU,EAAE,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAA;QAC3F,CAAC;QACD,OAAO,gBAAgB,CAAA;IACzB,CAAC;IAED,KAAK,UAAU,YAAY;QACzB,IAAI,eAAe,KAAK,IAAI,EAAE,CAAC;YAC7B,eAAe,GAAG,MAAM,UAAU,CAAC,MAAM,CAAC,OAAO,CAAC,SAAS,EAAE,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAA;QACxF,CAAC;QACD,OAAO,eAAe,CAAA;IACxB,CAAC;
|
|
1
|
+
{"version":3,"file":"multi-org.js","sourceRoot":"","sources":["../../../src/auth/auth/multi-org.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"parse-expiry.d.ts","sourceRoot":"","sources":["../../../src/auth/auth/parse-expiry.ts"],"names":[],"mappings":"AAAA,wBAAgB,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAY/C"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
export function parseExpiry(exp) {
|
|
2
|
+
const match = exp.match(/^(\d+)([smhd])$/);
|
|
3
|
+
if (!match)
|
|
4
|
+
throw new Error(`Invalid expiry format: ${exp}`);
|
|
5
|
+
const value = parseInt(match[1], 10);
|
|
6
|
+
const unit = match[2];
|
|
7
|
+
switch (unit) {
|
|
8
|
+
case 's': return value;
|
|
9
|
+
case 'm': return value * 60;
|
|
10
|
+
case 'h': return value * 3600;
|
|
11
|
+
case 'd': return value * 86400;
|
|
12
|
+
default: return value;
|
|
13
|
+
}
|
|
14
|
+
}
|
|
15
|
+
//# sourceMappingURL=parse-expiry.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"parse-expiry.js","sourceRoot":"","sources":["../../../src/auth/auth/parse-expiry.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,WAAW,CAAC,GAAW;IACrC,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAA;IAC1C,IAAI,CAAC,KAAK;QAAE,MAAM,IAAI,KAAK,CAAC,0BAA0B,GAAG,EAAE,CAAC,CAAA;IAC5D,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAE,EAAE,EAAE,CAAC,CAAA;IACrC,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAA;IACrB,QAAQ,IAAI,EAAE,CAAC;QACb,KAAK,GAAG,CAAC,CAAC,OAAO,KAAK,CAAA;QACtB,KAAK,GAAG,CAAC,CAAC,OAAO,KAAK,GAAG,EAAE,CAAA;QAC3B,KAAK,GAAG,CAAC,CAAC,OAAO,KAAK,GAAG,IAAI,CAAA;QAC7B,KAAK,GAAG,CAAC,CAAC,OAAO,KAAK,GAAG,KAAK,CAAA;QAC9B,OAAO,CAAC,CAAC,OAAO,KAAK,CAAA;IACvB,CAAC;AACH,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sessions.d.ts","sourceRoot":"","sources":["../../../src/auth/auth/sessions.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"sessions.d.ts","sourceRoot":"","sources":["../../../src/auth/auth/sessions.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { SignJWT, jwtVerify, importPKCS8, importSPKI } from 'jose';
|
|
2
|
+
import { parseExpiry } from './parse-expiry.js';
|
|
2
3
|
import { sql } from '../../data/db/sql.js';
|
|
3
4
|
import { UnauthorizedError } from '../../core/errors/index.js';
|
|
4
5
|
import { resolveCookieConfig, buildSetCookieHeader, buildClearCookieHeader, parseCookieHeader } from './cookie.js';
|
|
@@ -22,20 +23,6 @@ export function createSessions(config) {
|
|
|
22
23
|
publicKey = await importSPKI(config.signing.publicKey, config.signing.algorithm);
|
|
23
24
|
return publicKey;
|
|
24
25
|
}
|
|
25
|
-
function parseExpiry(exp) {
|
|
26
|
-
const match = exp.match(/^(\d+)([smhd])$/);
|
|
27
|
-
if (!match)
|
|
28
|
-
throw new Error(`Invalid expiry format: ${exp}`);
|
|
29
|
-
const value = parseInt(match[1], 10);
|
|
30
|
-
const unit = match[2];
|
|
31
|
-
switch (unit) {
|
|
32
|
-
case 's': return value;
|
|
33
|
-
case 'm': return value * 60;
|
|
34
|
-
case 'h': return value * 3600;
|
|
35
|
-
case 'd': return value * 86400;
|
|
36
|
-
default: return value;
|
|
37
|
-
}
|
|
38
|
-
}
|
|
39
26
|
async function getOrCreateVersion(db, userId) {
|
|
40
27
|
const rows = await db.execute(sql `INSERT INTO pipework_auth_versions (user_id, version) VALUES (${userId}, 1)
|
|
41
28
|
ON CONFLICT (user_id) DO NOTHING
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sessions.js","sourceRoot":"","sources":["../../../src/auth/auth/sessions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,MAAM,CAAA;AAClE,OAAO,EAAE,GAAG,EAAE,MAAM,sBAAsB,CAAA;AAE1C,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAA;AAE9D,OAAO,EAAE,mBAAmB,EAAE,oBAAoB,EAAE,sBAAsB,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAA;AAuDlH,gHAAgH;AAChH,MAAM,UAAU,cAAc,CAAC,MAAqB;IAClD,MAAM,WAAW,GAAG,MAAM,CAAC,WAAW,IAAI,YAAY,CAAA;IACtD,IAAI,WAAW,KAAK,YAAY,EAAE,CAAC;QACjC,mBAAmB,CAAC,MAAM,CAAC,CAAA;IAC7B,CAAC;IAED,IAAI,UAAU,GAAqB,IAAI,CAAA;IACvC,IAAI,SAAS,GAAqB,IAAI,CAAA;IACtC,MAAM,YAAY,GAAG,IAAI,GAAG,EAAkD,CAAA;IAC9E,MAAM,QAAQ,GAAG,MAAM,CAAC,iBAAiB,IAAI,MAAM,CAAA;IAEnD,KAAK,UAAU,aAAa;QAC1B,IAAI,CAAC,UAAU;YAAE,UAAU,GAAG,MAAM,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,UAAU,EAAE,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAA;QACpG,OAAO,UAAU,CAAA;IACnB,CAAC;IAED,KAAK,UAAU,YAAY;QACzB,IAAI,CAAC,SAAS;YAAE,SAAS,GAAG,MAAM,UAAU,CAAC,MAAM,CAAC,OAAO,CAAC,SAAS,EAAE,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAA;QAChG,OAAO,SAAS,CAAA;IAClB,CAAC;
|
|
1
|
+
{"version":3,"file":"sessions.js","sourceRoot":"","sources":["../../../src/auth/auth/sessions.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"create.d.ts","sourceRoot":"","sources":["../../../src/auth/rbac/create.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,IAAI,EAA2B,MAAM,YAAY,CAAA;AAM3E,2GAA2G;AAC3G,wBAAgB,UAAU,CAAC,MAAM,EAAE,UAAU,GAAG,IAAI,CA0BnD"}
|
|
@@ -0,0 +1,29 @@
|
|
|
1
|
+
import { PermissionCache } from './cache.js';
|
|
2
|
+
import { resolveUserPermissions } from './resolve.js';
|
|
3
|
+
import { hasPermission } from './check.js';
|
|
4
|
+
import { seedRbac } from './seed.js';
|
|
5
|
+
/** Creates an Rbac instance from role/permission config — provides check, enforce, and seed operations. */
|
|
6
|
+
export function createRbac(config) {
|
|
7
|
+
const cache = new PermissionCache(config.cacheTtlMs ?? 60_000);
|
|
8
|
+
const scopes = config.scopes ?? ['own', 'team', 'territory', 'tenant'];
|
|
9
|
+
return {
|
|
10
|
+
async resolve(db, userId, tenantId, authVersion) {
|
|
11
|
+
const cached = cache.get(userId, tenantId, authVersion);
|
|
12
|
+
if (cached)
|
|
13
|
+
return cached;
|
|
14
|
+
const resolved = await resolveUserPermissions(db, userId, tenantId, authVersion, config);
|
|
15
|
+
cache.set(resolved);
|
|
16
|
+
return resolved;
|
|
17
|
+
},
|
|
18
|
+
check(permissions, resource, action, requiredScope) {
|
|
19
|
+
return hasPermission(permissions.permissions, resource, action, requiredScope, scopes);
|
|
20
|
+
},
|
|
21
|
+
invalidate(userId, tenantId) {
|
|
22
|
+
cache.invalidate(userId, tenantId);
|
|
23
|
+
},
|
|
24
|
+
async seed(db, data) {
|
|
25
|
+
await seedRbac(db, data, config);
|
|
26
|
+
},
|
|
27
|
+
};
|
|
28
|
+
}
|
|
29
|
+
//# sourceMappingURL=create.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../src/auth/rbac/create.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAC5C,OAAO,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAA;AACrD,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAA;AAC1C,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAA;AAEpC,2GAA2G;AAC3G,MAAM,UAAU,UAAU,CAAC,MAAkB;IAC3C,MAAM,KAAK,GAAG,IAAI,eAAe,CAAC,MAAM,CAAC,UAAU,IAAI,MAAM,CAAC,CAAA;IAC9D,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,QAAQ,CAAC,CAAA;IAEtE,OAAO;QACL,KAAK,CAAC,OAAO,CAAC,EAAM,EAAE,MAAc,EAAE,QAAgB,EAAE,WAAmB;YACzE,MAAM,MAAM,GAAG,KAAK,CAAC,GAAG,CAAC,MAAM,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAA;YACvD,IAAI,MAAM;gBAAE,OAAO,MAAM,CAAA;YAEzB,MAAM,QAAQ,GAAG,MAAM,sBAAsB,CAAC,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,CAAC,CAAA;YACxF,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;YACnB,OAAO,QAAQ,CAAA;QACjB,CAAC;QAED,KAAK,CAAC,WAA0B,EAAE,QAAgB,EAAE,MAAc,EAAE,aAAsB;YACxF,OAAO,aAAa,CAAC,WAAW,CAAC,WAAW,EAAE,QAAQ,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,CAAC,CAAA;QACxF,CAAC;QAED,UAAU,CAAC,MAAc,EAAE,QAAgB;YACzC,KAAK,CAAC,UAAU,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAA;QACpC,CAAC;QAED,KAAK,CAAC,IAAI,CAAC,EAAM,EAAE,IAAc;YAC/B,MAAM,QAAQ,CAAC,EAAE,EAAE,IAAI,EAAE,MAAM,CAAC,CAAA;QAClC,CAAC;KACF,CAAA;AACH,CAAC"}
|
|
@@ -1,8 +1,6 @@
|
|
|
1
|
-
import type { RbacConfig, Rbac } from './types.js';
|
|
2
1
|
export type { RbacConfig, Rbac, PermissionSet, ResolvedPermission, Scope, SeedData, SeedPermission, SeedRole, SeedRolePermission, SeedUserRole } from './types.js';
|
|
3
2
|
export { hasPermission, scopeSatisfies } from './check.js';
|
|
4
3
|
export { PermissionCache } from './cache.js';
|
|
5
4
|
export { enforcePermission } from './middleware.js';
|
|
6
|
-
|
|
7
|
-
export declare function createRbac(config: RbacConfig): Rbac;
|
|
5
|
+
export { createRbac } from './create.js';
|
|
8
6
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/auth/rbac/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/auth/rbac/index.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,UAAU,EAAE,IAAI,EAAE,aAAa,EAAE,kBAAkB,EAAE,KAAK,EAAE,QAAQ,EAAE,cAAc,EAAE,QAAQ,EAAE,kBAAkB,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAClK,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AAC1D,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAC5C,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAA;AACnD,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA"}
|
package/dist/auth/rbac/index.js
CHANGED
|
@@ -1,32 +1,5 @@
|
|
|
1
|
-
import { PermissionCache } from './cache.js';
|
|
2
|
-
import { resolveUserPermissions } from './resolve.js';
|
|
3
|
-
import { hasPermission } from './check.js';
|
|
4
|
-
import { seedRbac } from './seed.js';
|
|
5
1
|
export { hasPermission, scopeSatisfies } from './check.js';
|
|
6
2
|
export { PermissionCache } from './cache.js';
|
|
7
3
|
export { enforcePermission } from './middleware.js';
|
|
8
|
-
|
|
9
|
-
export function createRbac(config) {
|
|
10
|
-
const cache = new PermissionCache(config.cacheTtlMs ?? 60_000);
|
|
11
|
-
const scopes = config.scopes ?? ['own', 'team', 'territory', 'tenant'];
|
|
12
|
-
return {
|
|
13
|
-
async resolve(db, userId, tenantId, authVersion) {
|
|
14
|
-
const cached = cache.get(userId, tenantId, authVersion);
|
|
15
|
-
if (cached)
|
|
16
|
-
return cached;
|
|
17
|
-
const resolved = await resolveUserPermissions(db, userId, tenantId, authVersion, config);
|
|
18
|
-
cache.set(resolved);
|
|
19
|
-
return resolved;
|
|
20
|
-
},
|
|
21
|
-
check(permissions, resource, action, requiredScope) {
|
|
22
|
-
return hasPermission(permissions.permissions, resource, action, requiredScope, scopes);
|
|
23
|
-
},
|
|
24
|
-
invalidate(userId, tenantId) {
|
|
25
|
-
cache.invalidate(userId, tenantId);
|
|
26
|
-
},
|
|
27
|
-
async seed(db, data) {
|
|
28
|
-
await seedRbac(db, data, config);
|
|
29
|
-
},
|
|
30
|
-
};
|
|
31
|
-
}
|
|
4
|
+
export { createRbac } from './create.js';
|
|
32
5
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/auth/rbac/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/auth/rbac/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AAC1D,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAC5C,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAA;AACnD,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolve.d.ts","sourceRoot":"","sources":["../../../src/auth/rbac/resolve.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,wBAAwB,CAAA;AAChD,OAAO,KAAK,EAAE,UAAU,EAAE,aAAa,EAAsB,MAAM,YAAY,CAAA;
|
|
1
|
+
{"version":3,"file":"resolve.d.ts","sourceRoot":"","sources":["../../../src/auth/rbac/resolve.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,wBAAwB,CAAA;AAChD,OAAO,KAAK,EAAE,UAAU,EAAE,aAAa,EAAsB,MAAM,YAAY,CAAA;AAI/E,wBAAsB,sBAAsB,CAC1C,EAAE,EAAE,EAAE,EACN,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,UAAU,GACjB,OAAO,CAAC,aAAa,CAAC,CAkBxB"}
|