@shivaedev/admin 0.23.6 → 0.24.0
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 +13 -0
- package/README.md +9 -0
- package/dist/adapters/validateAdminRoutes.d.ts +2 -1
- package/dist/adapters/validateAdminRoutes.d.ts.map +1 -1
- package/dist/adapters/validateAdminRoutes.js +18 -18
- package/dist/adapters/validateAdminRoutes.js.map +1 -1
- package/dist/client/adapters/JobDetail.d.ts.map +1 -1
- package/dist/client/adapters/JobDetail.js +13 -3
- package/dist/client/adapters/JobDetail.js.map +1 -1
- package/dist/client/adapters/JobList.d.ts.map +1 -1
- package/dist/client/adapters/JobList.js +16 -2
- package/dist/client/adapters/JobList.js.map +1 -1
- package/dist/jobs/retryPage.d.ts +60 -60
- package/dist/registry.d.ts +2 -0
- package/dist/registry.d.ts.map +1 -1
- package/dist/registry.js +14 -11
- package/dist/registry.js.map +1 -1
- package/dist/server/jobsHandlers.d.ts +9 -9
- package/dist/server/jobsHandlers.d.ts.map +1 -1
- package/dist/server/jobsHandlers.js +9 -13
- package/dist/server/jobsHandlers.js.map +1 -1
- package/dist/server/jobsHandlersWithRetry.d.ts +2 -2
- package/dist/server/jobsHandlersWithRetry.d.ts.map +1 -1
- package/dist/server/jobsHandlersWithRetry.js +7 -4
- package/dist/server/jobsHandlersWithRetry.js.map +1 -1
- package/dist/server/registerAdmin.d.ts +1 -1
- package/dist/server/registerAdmin.d.ts.map +1 -1
- package/dist/server/registerAdmin.js +3 -2
- package/dist/server/registerAdmin.js.map +1 -1
- package/dist/users/page.d.ts +5 -5
- package/package.json +13 -13
- package/src/adapters/validateAdminRoutes.ts +18 -19
- package/src/client/adapters/JobDetail.tsx +23 -13
- package/src/client/adapters/JobList.tsx +28 -24
- package/src/registry.ts +15 -11
- package/src/server/jobsHandlers.ts +16 -16
- package/src/server/jobsHandlersWithRetry.ts +45 -35
- package/src/server/registerAdmin.ts +21 -15
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,18 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
## 0.24.0 - 2026-11-08
|
|
4
|
+
|
|
5
|
+
### Breaking
|
|
6
|
+
|
|
7
|
+
- `jobsReadHandlers` now takes only the page and reads the `PgBossInspection` service from its Effect environment. Direct callers migrate from `jobsReadHandlers(JobsPage, JobsService)` to `jobsReadHandlers(JobsPage)` and provide `PgBossInspection`; `jobsHandlers` and `jobsHandlersWithRetry` keep their existing service-tag parameters and provide inspection internally.
|
|
8
|
+
- duplicate page ids, RPC tags and routes now fail with the same messages when the handler Layer is built, rather than while `adminRegistry` is called. `validateAdminRoutes` now returns an Effect; direct callers should yield it instead of calling synchronously.
|
|
9
|
+
|
|
10
|
+
## 0.23.7 - 2026-11-08
|
|
11
|
+
|
|
12
|
+
### Changed
|
|
13
|
+
|
|
14
|
+
- Update `@shivaedev/react` from 0.46.5 to 0.46.6.
|
|
15
|
+
|
|
3
16
|
## 0.23.6 - 2026-11-07
|
|
4
17
|
|
|
5
18
|
### Changed
|
package/README.md
CHANGED
|
@@ -174,6 +174,8 @@ const registration = registerAdmin(Admin, {
|
|
|
174
174
|
});
|
|
175
175
|
```
|
|
176
176
|
|
|
177
|
+
`jobsHandlers` uses the shared `PgBossInspection` service internally and provides it from the application-specific jobs service tag. Direct calls to `jobsReadHandlers` use the `PgBossInspection` service from the caller's Effect environment.
|
|
178
|
+
|
|
177
179
|
The queries are `admin.jobs.health`, `admin.jobs.counts`, `admin.jobs.failed`, `admin.jobs.deadLettered` and `admin.jobs.job`. Counts take `{ queue }`; listings take `{ queue, limit, cursor? }` and return `{ jobs, next }`, where `next` is an `Option<string>`. Job lookup takes `{ queue, id }` and returns `Option<Job>`. Each job carries its queue, decoded payload, state, attempt and retry counts, output and timestamps. Dead-letter listings also carry `sourceQueue`, `sourceId` and `sourceOutput`. `sourceQueue` names the original queue, so readers can route to it directly. Once the original succeeds, its copies leave the dead-letter listing. Output and source output use the jobs package's `JobFailure | null` shape (`_tag` and redacted `message`). A zero page limit or malformed listing cursor is rejected as `BadRequest`. Timestamps use UTC `DateTime` values; the RPC encodes timestamps as strings and Options as nullable values. Jobs decodes the durable payload and masks native `Redacted` values and sensitive keys before the RPC response. Payloads are diagnostic `data: unknown`; narrow them before reading fields. Result serialization does not run the queue's payload encoder or require its encoding services.
|
|
178
180
|
|
|
179
181
|
Schedule definitions from `defineSchedule` can be passed beside queues. For a worker-only schedule, share a browser-safe object such as `const Cleanup = { name: "cleanup" } as const`. Pass `Cleanup` to `jobsPage` and spread it into the worker's `defineSchedule({ ...Cleanup, cron: "17 3 * * *" })`. The page needs no server import or worker registration. Scheduled runs use a null payload schema for failed and dead-letter listings and job lookup. Calling `jobsPage()` with no arguments registers the same read-only page and serves health with no jobs and zero totals.
|
|
@@ -205,12 +207,19 @@ Use `jobsPageWithRetry` and `jobsHandlersWithRetry` when administrators should b
|
|
|
205
207
|
```ts
|
|
206
208
|
import { jobsPageWithRetry } from "@shivaedev/admin/jobs/retryPage.ts";
|
|
207
209
|
import { jobsHandlersWithRetry } from "@shivaedev/admin/server/jobsHandlersWithRetry.ts";
|
|
210
|
+
import { Effect, Layer } from "effect";
|
|
211
|
+
import { PgBossInspection } from "@shivaedev/jobs/server/inspection.ts";
|
|
208
212
|
|
|
209
213
|
const JobsPage = jobsPageWithRetry({ name: "mail", schema: MailPayload });
|
|
210
214
|
const Admin = adminRegistry(JobsPage);
|
|
211
215
|
const registration = registerAdmin(Admin, {
|
|
212
216
|
jobs: jobsHandlersWithRetry(JobsPage, JobsService),
|
|
213
217
|
});
|
|
218
|
+
const inspection = Layer.effect(
|
|
219
|
+
PgBossInspection,
|
|
220
|
+
Effect.flatMap(JobsService, (jobs) => jobs.inspection()),
|
|
221
|
+
);
|
|
222
|
+
const handlers = registration.handlers.pipe(Layer.provide(inspection));
|
|
214
223
|
```
|
|
215
224
|
|
|
216
225
|
This variant adds `admin.jobs.retry`, taking `{ queue, id }` and returning void. It requires `ReadJobs` (`jobs.read`) through the page middleware and `RetryJobs` (`jobs.retry`) from `@shivaedev/admin/permissions.ts` in the handler. A caller with only `jobs.read` receives `Forbidden` and the job stays failed. The handler uses the jobs package's existing retry for a failed job in a declared queue. Missing jobs and jobs in other states fail with `JobsNotFailed`; unregistered queue names, including dead-letter queues, fail with `JobsQueueUnregistered`. A dead-letter copy's id cannot retry its original.
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { Effect } from "effect";
|
|
1
2
|
import type { AdminRoute } from "#page.ts";
|
|
2
|
-
export declare
|
|
3
|
+
export declare const validateAdminRoutes: (routes: readonly AdminRoute[]) => Effect.Effect<void, never, never>;
|
|
3
4
|
//# sourceMappingURL=validateAdminRoutes.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validateAdminRoutes.d.ts","sourceRoot":"","sources":["../../src/adapters/validateAdminRoutes.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"validateAdminRoutes.d.ts","sourceRoot":"","sources":["../../src/adapters/validateAdminRoutes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAa3C,eAAO,MAAM,mBAAmB,sEAoB9B,CAAC"}
|
|
@@ -1,29 +1,29 @@
|
|
|
1
|
+
import { Effect } from "effect";
|
|
1
2
|
function overlaps(left, right) {
|
|
2
3
|
const expected = left.split("/");
|
|
3
4
|
const actual = right.split("/");
|
|
4
5
|
return (expected.length === actual.length
|
|
5
6
|
&& expected.every((segment, index) => segment === actual[index] || (segment === "$" && actual[index] !== "") || (actual[index] === "$" && segment !== "")));
|
|
6
7
|
}
|
|
7
|
-
function
|
|
8
|
-
const page = route.path.replace(/\/$/u, "");
|
|
9
|
-
const detail = route.detail?.replace(/\/$/u, "");
|
|
10
|
-
if (detail !== undefined && !detail.startsWith(`${page}/`)) {
|
|
11
|
-
throw new Error(`Admin detail path ${route.detail} must be under page path ${route.path}`);
|
|
12
|
-
}
|
|
13
|
-
return detail === undefined ? [page] : [page, detail];
|
|
14
|
-
}
|
|
15
|
-
export function validateAdminRoutes(routes) {
|
|
8
|
+
export const validateAdminRoutes = Effect.fnUntraced(function* (routes) {
|
|
16
9
|
const paths = [];
|
|
17
|
-
for (const
|
|
18
|
-
const
|
|
19
|
-
|
|
20
|
-
|
|
10
|
+
for (const route of routes) {
|
|
11
|
+
const page = route.path.replace(/\/$/u, "");
|
|
12
|
+
const detail = route.detail?.replace(/\/$/u, "");
|
|
13
|
+
if (detail !== undefined && !detail.startsWith(`${page}/`)) {
|
|
14
|
+
yield* Effect.die(new Error(`Admin detail path ${route.detail} must be under page path ${route.path}`));
|
|
21
15
|
}
|
|
22
|
-
const
|
|
23
|
-
|
|
24
|
-
|
|
16
|
+
for (const path of detail === undefined ? [page] : [page, detail]) {
|
|
17
|
+
const normalized = path.replace(/\$[^/]+/gu, "$");
|
|
18
|
+
if (paths.includes(normalized)) {
|
|
19
|
+
yield* Effect.die(new Error(`Duplicate admin path: ${normalized}`));
|
|
20
|
+
}
|
|
21
|
+
const existing = paths.find((candidate) => overlaps(candidate, normalized));
|
|
22
|
+
if (existing !== undefined) {
|
|
23
|
+
yield* Effect.die(new Error(`Overlapping admin paths: ${existing} and ${normalized}`));
|
|
24
|
+
}
|
|
25
|
+
paths.push(normalized);
|
|
25
26
|
}
|
|
26
|
-
paths.push(normalized);
|
|
27
27
|
}
|
|
28
|
-
}
|
|
28
|
+
});
|
|
29
29
|
//# sourceMappingURL=validateAdminRoutes.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validateAdminRoutes.js","sourceRoot":"","sources":["../../src/adapters/validateAdminRoutes.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"validateAdminRoutes.js","sourceRoot":"","sources":["../../src/adapters/validateAdminRoutes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAGhC,SAAS,QAAQ,CAAC,IAAY,EAAE,KAAa;IAC5C,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACjC,MAAM,MAAM,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAChC,OAAO,CACN,QAAQ,CAAC,MAAM,KAAK,MAAM,CAAC,MAAM;WAC9B,QAAQ,CAAC,KAAK,CAChB,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE,CAAC,OAAO,KAAK,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,KAAK,GAAG,IAAI,MAAM,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,GAAG,IAAI,OAAO,KAAK,EAAE,CAAC,CACvI,CACD,CAAC;AACH,CAAC;AAED,MAAM,CAAC,MAAM,mBAAmB,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,MAA6B;IAC5F,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QAC5B,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;QAC5C,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;QACjD,IAAI,MAAM,KAAK,SAAS,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,IAAI,GAAG,CAAC,EAAE,CAAC;YAC5D,KAAK,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC,qBAAqB,KAAK,CAAC,MAAM,4BAA4B,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;QACzG,CAAC;QACD,KAAK,MAAM,IAAI,IAAI,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE,CAAC;YACnE,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC;YAClD,IAAI,KAAK,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;gBAChC,KAAK,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC,yBAAyB,UAAU,EAAE,CAAC,CAAC,CAAC;YACrE,CAAC;YACD,MAAM,QAAQ,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,QAAQ,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC,CAAC;YAC5E,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;gBAC5B,KAAK,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC,4BAA4B,QAAQ,QAAQ,UAAU,EAAE,CAAC,CAAC,CAAC;YACxF,CAAC;YACD,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACxB,CAAC;IACF,CAAC;AACF,CAAC,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"JobDetail.d.ts","sourceRoot":"","sources":["../../../src/client/adapters/JobDetail.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,QAAQ,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AAExF,wBAAgB,SAAS,CAAC,EACzB,GAAG,EACH,KAAK,EACL,EAAE,EACF,KAAK,GACL,EAAE;IACF,QAAQ,CAAC,GAAG,EAAE,cAAc,CAAC;IAC7B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,KAAK,EAAE,QAAQ,GAAG,SAAS,CAAC;CACrC,+
|
|
1
|
+
{"version":3,"file":"JobDetail.d.ts","sourceRoot":"","sources":["../../../src/client/adapters/JobDetail.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,QAAQ,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AAExF,wBAAgB,SAAS,CAAC,EACzB,GAAG,EACH,KAAK,EACL,EAAE,EACF,KAAK,GACL,EAAE;IACF,QAAQ,CAAC,GAAG,EAAE,cAAc,CAAC;IAC7B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,KAAK,EAAE,QAAQ,GAAG,SAAS,CAAC;CACrC,+BAQA;AASD,wBAAgB,SAAS,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE;IAAE,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAC;IAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,QAAQ,GAAG,SAAS,CAAA;CAAE,+BA0C1G"}
|
|
@@ -5,10 +5,18 @@ import { JobButton } from "#client/adapters/JobButton.tsx";
|
|
|
5
5
|
import { JobsQueryPanel } from "#client/adapters/JobsQueryPanel.tsx";
|
|
6
6
|
export function JobDetail({ api, queue, id, retry, }) {
|
|
7
7
|
const state = useQuery(api.job.query({ id, queue }));
|
|
8
|
-
return (_jsxs("section", { "aria-label": "Job detail", children: [_jsx("h2", { className: "mb-4 text-xl font-semibold", children: "Job detail" }), _jsx(JobsQueryPanel, { state: state, children: (job) =>
|
|
8
|
+
return (_jsxs("section", { "aria-label": "Job detail", children: [_jsx("h2", { className: "mb-4 text-xl font-semibold", children: "Job detail" }), _jsx(JobsQueryPanel, { state: state, children: (job) => _jsx(JobResult, { job: job, retry: retry }) })] }));
|
|
9
|
+
}
|
|
10
|
+
function JobResult({ job, retry }) {
|
|
11
|
+
if (Option.isNone(job)) {
|
|
12
|
+
return _jsx("p", { children: "Job not found." });
|
|
13
|
+
}
|
|
14
|
+
return _jsx(JobRecord, { job: job.value, retry: retry });
|
|
9
15
|
}
|
|
10
16
|
export function JobRecord({ job, retry }) {
|
|
11
17
|
const failure = ("sourceOutput" in job ? job.sourceOutput : job.output)?.message ?? "No failure recorded.";
|
|
18
|
+
const deadLetterDetails = "sourceId" in job ? (_jsxs(_Fragment, { children: [_jsx("h3", { className: "font-medium", children: "Dead-letter source" }), _jsx("p", { className: "text-sm break-all", children: Option.getOrElse(job.sourceId, () => "Unknown original") }), _jsx("pre", { className: "bg-muted max-w-full overflow-auto rounded-md p-3 text-xs", children: JSON.stringify(job.sourceOutput, null, 2) })] })) : null;
|
|
19
|
+
const retryControl = retry !== undefined && job.state === "failed" && !("sourceId" in job) ? _jsx(RetryControl, { job: job, retry: retry }) : null;
|
|
12
20
|
return (_jsx("div", { className: "min-w-0 rounded-md border p-4", children: _jsxs("div", { className: "min-w-0 space-y-4", children: [_jsx("dl", { className: "grid min-w-0 gap-3 text-sm wrap-anywhere sm:grid-cols-2", children: Object.entries({
|
|
13
21
|
Attempt: job.attempt,
|
|
14
22
|
Completed: Option.match(job.completedOn, { onNone: () => "—", onSome: DateTime.formatIso }),
|
|
@@ -18,10 +26,12 @@ export function JobRecord({ job, retry }) {
|
|
|
18
26
|
"Retry count / limit": `${job.retryCount} / ${job.retryLimit}`,
|
|
19
27
|
Started: Option.match(job.startedOn, { onNone: () => "—", onSome: DateTime.formatIso }),
|
|
20
28
|
State: job.state,
|
|
21
|
-
}).map(([label, value]) => (_jsxs("div", { children: [_jsx("dt", { className: "text-muted-foreground", children: label }), _jsx("dd", { children: value })] }, label))) }), _jsx("h3", { className: "font-medium", children: "Payload" }), _jsx("pre", { className: "bg-muted max-w-full overflow-auto rounded-md p-3 text-xs", children: JSON.stringify(job.data, null, 2) }), _jsx("h3", { className: "font-medium", children: "Failure" }), _jsx("p", { className: "wrap-anywhere", children: failure }), _jsx("h3", { className: "font-medium", children: "Output" }), _jsx("pre", { className: "bg-muted max-w-full overflow-auto rounded-md p-3 text-xs", children: JSON.stringify(job.output, null, 2) }),
|
|
29
|
+
}).map(([label, value]) => (_jsxs("div", { children: [_jsx("dt", { className: "text-muted-foreground", children: label }), _jsx("dd", { children: value })] }, label))) }), _jsx("h3", { className: "font-medium", children: "Payload" }), _jsx("pre", { className: "bg-muted max-w-full overflow-auto rounded-md p-3 text-xs", children: JSON.stringify(job.data, null, 2) }), _jsx("h3", { className: "font-medium", children: "Failure" }), _jsx("p", { className: "wrap-anywhere", children: failure }), _jsx("h3", { className: "font-medium", children: "Output" }), _jsx("pre", { className: "bg-muted max-w-full overflow-auto rounded-md p-3 text-xs", children: JSON.stringify(job.output, null, 2) }), deadLetterDetails, retryControl] }) }));
|
|
22
30
|
}
|
|
23
31
|
function RetryControl({ job, retry }) {
|
|
24
32
|
const action = useAction(retry);
|
|
25
|
-
|
|
33
|
+
const failureMessage = Option.isSome(action.cause) ? _jsx("p", { role: "alert", children: "Could not retry this job. Refresh and try again." }) : null;
|
|
34
|
+
const resultMessage = Option.isSome(action.data) ? _jsx("p", { role: "status", children: "Retry requested." }) : null;
|
|
35
|
+
return (_jsxs("div", { className: "space-y-2", children: [_jsx(JobButton, { disabled: action.pending, onClick: () => action.dispatch({ id: job.id, queue: job.queue }), children: action.pending ? "Retrying…" : "Retry job" }), failureMessage, resultMessage] }));
|
|
26
36
|
}
|
|
27
37
|
//# sourceMappingURL=JobDetail.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"JobDetail.js","sourceRoot":"","sources":["../../../src/client/adapters/JobDetail.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC1C,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,wCAAwC,CAAC;AAC7E,OAAO,EAAE,SAAS,EAAE,MAAM,gCAAgC,CAAC;AAC3D,OAAO,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAC;AAGrE,MAAM,UAAU,SAAS,CAAC,EACzB,GAAG,EACH,KAAK,EACL,EAAE,EACF,KAAK,GAML;IACA,MAAM,KAAK,GAAG,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;IACrD,OAAO,CACN,iCAAoB,YAAY,aAC/B,aAAI,SAAS,EAAC,4BAA4B,2BAAgB,EAC1D,KAAC,cAAc,IAAC,KAAK,EAAE,KAAK,
|
|
1
|
+
{"version":3,"file":"JobDetail.js","sourceRoot":"","sources":["../../../src/client/adapters/JobDetail.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"JobList.d.ts","sourceRoot":"","sources":["../../../src/client/adapters/JobList.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAM/D,OAAO,KAAK,EAAY,cAAc,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AAExF,wBAAgB,OAAO,CAAC,EACvB,GAAG,EACH,KAAK,EACL,IAAI,EACJ,KAAK,EACL,OAAO,GACP,EAAE;IACF,QAAQ,CAAC,GAAG,EAAE,cAAc,CAAC;IAC7B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,IAAI,EAAE,QAAQ,GAAG,cAAc,CAAC;IACzC,QAAQ,CAAC,KAAK,EAAE,QAAQ,GAAG,SAAS,CAAC;IACrC,QAAQ,CAAC,OAAO,CAAC,EAAE,YAAY,CAAC,SAAS,CAAC,CAAC;CAC3C,+
|
|
1
|
+
{"version":3,"file":"JobList.d.ts","sourceRoot":"","sources":["../../../src/client/adapters/JobList.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAM/D,OAAO,KAAK,EAAY,cAAc,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AAExF,wBAAgB,OAAO,CAAC,EACvB,GAAG,EACH,KAAK,EACL,IAAI,EACJ,KAAK,EACL,OAAO,GACP,EAAE;IACF,QAAQ,CAAC,GAAG,EAAE,cAAc,CAAC;IAC7B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,IAAI,EAAE,QAAQ,GAAG,cAAc,CAAC;IACzC,QAAQ,CAAC,KAAK,EAAE,QAAQ,GAAG,SAAS,CAAC;IACrC,QAAQ,CAAC,OAAO,CAAC,EAAE,YAAY,CAAC,SAAS,CAAC,CAAC;CAC3C,+BA4CA"}
|
|
@@ -12,6 +12,15 @@ export function JobList({ api, queue, kind, retry, subject, }) {
|
|
|
12
12
|
const cursor = cursors.at(-1);
|
|
13
13
|
const state = useQuery(api[kind].query({ ...(cursor === undefined ? {} : { cursor }), limit: 10, queue }));
|
|
14
14
|
const selected = Option.flatMap(state.data, (page) => Option.fromUndefinedOr(page.jobs.find((job) => job.id === selectedId)));
|
|
15
|
+
let selectedDetail = null;
|
|
16
|
+
if (selectedId !== undefined) {
|
|
17
|
+
if (kind === "failed") {
|
|
18
|
+
selectedDetail = _jsx(JobDetail, { api: api, id: selectedId, queue: queue, retry: retry }, selectedId);
|
|
19
|
+
}
|
|
20
|
+
else if (Option.isSome(selected)) {
|
|
21
|
+
selectedDetail = (_jsxs("section", { "aria-label": "Dead-letter detail", children: [_jsx("h2", { className: "mb-4 text-xl font-semibold", children: "Dead-letter detail" }), _jsx(JobRecord, { job: selected.value })] }));
|
|
22
|
+
}
|
|
23
|
+
}
|
|
15
24
|
function selectJob(job) {
|
|
16
25
|
select(job.id);
|
|
17
26
|
}
|
|
@@ -19,7 +28,12 @@ export function JobList({ api, queue, kind, retry, subject, }) {
|
|
|
19
28
|
setCursors(next);
|
|
20
29
|
select(undefined);
|
|
21
30
|
}
|
|
22
|
-
|
|
23
|
-
|
|
31
|
+
function renderPage(page) {
|
|
32
|
+
const kindLabel = kind === "failed" ? "failed" : "dead-lettered";
|
|
33
|
+
const emptyMessage = page.jobs.length === 0 ? _jsxs("p", { children: ["No ", kindLabel, " jobs."] }) : null;
|
|
34
|
+
const table = page.jobs.length === 0 ? null : _jsx(JobTable, { jobs: page.jobs, select: selectJob, subject: subject });
|
|
35
|
+
return (_jsxs(_Fragment, { children: [emptyMessage, table, _jsx(JobPagination, { change: changePage, cursors: cursors, next: page.next, pending: state.pending })] }));
|
|
36
|
+
}
|
|
37
|
+
return (_jsxs("div", { className: "space-y-6", children: [_jsx(JobsQueryPanel, { state: state, children: renderPage }), selectedDetail] }));
|
|
24
38
|
}
|
|
25
39
|
//# sourceMappingURL=JobList.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"JobList.js","sourceRoot":"","sources":["../../../src/client/adapters/JobList.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,
|
|
1
|
+
{"version":3,"file":"JobList.js","sourceRoot":"","sources":["../../../src/client/adapters/JobList.tsx"],"names":[],"mappings":"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"}
|
package/dist/jobs/retryPage.d.ts
CHANGED
|
@@ -195,35 +195,7 @@ export declare function jobsPageWithRetry<const TQueues extends readonly JobsEnt
|
|
|
195
195
|
readonly JobsQueueUnregistered: typeof import("#jobs/schemas.ts").JobsQueueUnregistered;
|
|
196
196
|
readonly JobsUnavailable: typeof import("#jobs/schemas.ts").JobsUnavailable;
|
|
197
197
|
readonly Forbidden: typeof Forbidden;
|
|
198
|
-
}>>], import("effect/rpc/Rpc").Rpc<"admin.jobs
|
|
199
|
-
queue: Schema.String;
|
|
200
|
-
}>, Schema.OptionFromNullOr<Schema.String>, Schema.Union<readonly (typeof Forbidden | typeof import("@shivaedev/errors/taxonomy.ts").BadRequest | typeof import("#jobs/schemas.ts").JobsUnavailable | typeof import("#jobs/schemas.ts").JobsPayloadInvalid | typeof import("#jobs/schemas.ts").JobsQueueUnregistered)[]>, typeof JobsPermission, never> | import("effect/rpc/Rpc").Rpc<"admin.jobs.job", Schema.Struct<{
|
|
201
|
-
id: Schema.String;
|
|
202
|
-
queue: Schema.String;
|
|
203
|
-
}>, Schema.OptionFromNullOr<Schema.Union<Schema.Struct<{
|
|
204
|
-
readonly attempt: Schema.Number;
|
|
205
|
-
readonly completedOn: Schema.OptionFromNullOr<Schema.DateTimeUtcFromString>;
|
|
206
|
-
readonly createdOn: Schema.DateTimeUtcFromString;
|
|
207
|
-
readonly id: Schema.String;
|
|
208
|
-
readonly output: Schema.NullOr<Schema.Struct<{
|
|
209
|
-
readonly _tag: Schema.withDecodingDefaultKey<Schema.String, never>;
|
|
210
|
-
readonly message: Schema.decodeTo<Schema.String, Schema.String, never, never>;
|
|
211
|
-
}>>;
|
|
212
|
-
readonly retryCount: Schema.Number;
|
|
213
|
-
readonly retryLimit: Schema.Number;
|
|
214
|
-
readonly startedOn: Schema.OptionFromNullOr<Schema.DateTimeUtcFromString>;
|
|
215
|
-
readonly state: Schema.Literals<readonly ["created", "retry", "active", "completed", "cancelled", "failed"]>;
|
|
216
|
-
readonly data: Schema.Unknown;
|
|
217
|
-
readonly queue: Schema.Literal<string>;
|
|
218
|
-
}>[]>>, Schema.Union<readonly [Schema.Union<readonly (typeof import("@shivaedev/errors/taxonomy.ts").BadRequest | typeof import("#jobs/schemas.ts").JobsUnavailable | typeof import("#jobs/schemas.ts").JobsPayloadInvalid | typeof import("#jobs/schemas.ts").JobsQueueUnregistered)[]>, typeof import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied]>, typeof JobsPermission | (import("effect/Context").Reference<<A, E, R>(effect: import("effect/Effect").Effect<A, E, R>, request: {
|
|
219
|
-
readonly rpc: import("effect/rpc/Rpc").Any;
|
|
220
|
-
readonly payload: unknown;
|
|
221
|
-
}) => import("effect/Effect").Effect<A, E | import("@shivaedev/contract/readPolicyErrors.ts").MissingReadPolicy | import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied | import("@shivaedev/contract/WebSocketRequired.ts").WebSocketRequired | import("effect/Types").unhandled, R>> & {
|
|
222
|
-
"~effect/rpc/RpcMiddleware": "~effect/rpc/RpcMiddleware";
|
|
223
|
-
"~ClientError": never;
|
|
224
|
-
error: Schema.Union<readonly [typeof import("@shivaedev/contract/readPolicyErrors.ts").MissingReadPolicy, typeof import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied, typeof import("@shivaedev/contract/WebSocketRequired.ts").WebSocketRequired]>;
|
|
225
|
-
requiredForClient: false;
|
|
226
|
-
}), never> | import("effect/rpc/Rpc").Rpc<"admin.jobs.$changes", Schema.Struct<{
|
|
198
|
+
}>>], import("effect/rpc/Rpc").Rpc<"admin.jobs.$changes", Schema.Struct<{
|
|
227
199
|
queries: Schema.$Array<Schema.Union<readonly (Schema.Struct<{
|
|
228
200
|
query: Schema.Literal<"counts">;
|
|
229
201
|
payload: Schema.Struct<{
|
|
@@ -380,29 +352,7 @@ export declare function jobsPageWithRetry<const TQueues extends readonly JobsEnt
|
|
|
380
352
|
"~ClientError": never;
|
|
381
353
|
error: Schema.Union<readonly [typeof import("@shivaedev/contract/readPolicyErrors.ts").MissingReadPolicy, typeof import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied, typeof import("@shivaedev/contract/WebSocketRequired.ts").WebSocketRequired]>;
|
|
382
354
|
requiredForClient: false;
|
|
383
|
-
}), never> | import("effect/rpc/Rpc").Rpc<"admin.jobs.
|
|
384
|
-
readonly activeTotal: Schema.Number;
|
|
385
|
-
readonly deadLetteredTotal: Schema.Number;
|
|
386
|
-
readonly failedTotal: Schema.Number;
|
|
387
|
-
readonly jobs: Schema.$Array<Schema.Struct<{
|
|
388
|
-
readonly activeCount: Schema.Number;
|
|
389
|
-
readonly deadLetteredCount: Schema.Number;
|
|
390
|
-
readonly failedCount: Schema.Number;
|
|
391
|
-
readonly name: Schema.String;
|
|
392
|
-
readonly queuedCount: Schema.Number;
|
|
393
|
-
readonly readyCount: Schema.Number;
|
|
394
|
-
}>>;
|
|
395
|
-
readonly queuedTotal: Schema.Number;
|
|
396
|
-
readonly readyTotal: Schema.Number;
|
|
397
|
-
}>, Schema.Union<readonly [Schema.Union<readonly (typeof import("@shivaedev/errors/taxonomy.ts").BadRequest | typeof import("#jobs/schemas.ts").JobsUnavailable | typeof import("#jobs/schemas.ts").JobsPayloadInvalid | typeof import("#jobs/schemas.ts").JobsQueueUnregistered)[]>, typeof import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied]>, typeof JobsPermission | (import("effect/Context").Reference<<A, E, R>(effect: import("effect/Effect").Effect<A, E, R>, request: {
|
|
398
|
-
readonly rpc: import("effect/rpc/Rpc").Any;
|
|
399
|
-
readonly payload: unknown;
|
|
400
|
-
}) => import("effect/Effect").Effect<A, E | import("@shivaedev/contract/readPolicyErrors.ts").MissingReadPolicy | import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied | import("@shivaedev/contract/WebSocketRequired.ts").WebSocketRequired | import("effect/Types").unhandled, R>> & {
|
|
401
|
-
"~effect/rpc/RpcMiddleware": "~effect/rpc/RpcMiddleware";
|
|
402
|
-
"~ClientError": never;
|
|
403
|
-
error: Schema.Union<readonly [typeof import("@shivaedev/contract/readPolicyErrors.ts").MissingReadPolicy, typeof import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied, typeof import("@shivaedev/contract/WebSocketRequired.ts").WebSocketRequired]>;
|
|
404
|
-
requiredForClient: false;
|
|
405
|
-
}), never> | import("effect/rpc/Rpc").Rpc<"admin.jobs.failed", Schema.Struct<{
|
|
355
|
+
}), never> | import("effect/rpc/Rpc").Rpc<"admin.jobs.deadLettered", Schema.Struct<{
|
|
406
356
|
cursor: Schema.optionalKey<Schema.String>;
|
|
407
357
|
limit: Schema.Number;
|
|
408
358
|
queue: Schema.String;
|
|
@@ -422,6 +372,12 @@ export declare function jobsPageWithRetry<const TQueues extends readonly JobsEnt
|
|
|
422
372
|
readonly state: Schema.Literals<readonly ["created", "retry", "active", "completed", "cancelled", "failed"]>;
|
|
423
373
|
readonly data: Schema.Unknown;
|
|
424
374
|
readonly queue: Schema.Literal<string>;
|
|
375
|
+
readonly sourceId: Schema.OptionFromNullOr<Schema.String>;
|
|
376
|
+
readonly sourceOutput: Schema.NullOr<Schema.Struct<{
|
|
377
|
+
readonly _tag: Schema.withDecodingDefaultKey<Schema.String, never>;
|
|
378
|
+
readonly message: Schema.decodeTo<Schema.String, Schema.String, never, never>;
|
|
379
|
+
}>>;
|
|
380
|
+
readonly sourceQueue: Schema.Literal<string>;
|
|
425
381
|
}>[]>>;
|
|
426
382
|
readonly next: Schema.OptionFromNullOr<Schema.String>;
|
|
427
383
|
}>, Schema.Union<readonly [Schema.Union<readonly (typeof import("@shivaedev/errors/taxonomy.ts").BadRequest | typeof import("#jobs/schemas.ts").JobsUnavailable | typeof import("#jobs/schemas.ts").JobsPayloadInvalid | typeof import("#jobs/schemas.ts").JobsQueueUnregistered)[]>, typeof import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied]>, typeof JobsPermission | (import("effect/Context").Reference<<A, E, R>(effect: import("effect/Effect").Effect<A, E, R>, request: {
|
|
@@ -432,7 +388,7 @@ export declare function jobsPageWithRetry<const TQueues extends readonly JobsEnt
|
|
|
432
388
|
"~ClientError": never;
|
|
433
389
|
error: Schema.Union<readonly [typeof import("@shivaedev/contract/readPolicyErrors.ts").MissingReadPolicy, typeof import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied, typeof import("@shivaedev/contract/WebSocketRequired.ts").WebSocketRequired]>;
|
|
434
390
|
requiredForClient: false;
|
|
435
|
-
}), never> | import("effect/rpc/Rpc").Rpc<"admin.jobs.
|
|
391
|
+
}), never> | import("effect/rpc/Rpc").Rpc<"admin.jobs.failed", Schema.Struct<{
|
|
436
392
|
cursor: Schema.optionalKey<Schema.String>;
|
|
437
393
|
limit: Schema.Number;
|
|
438
394
|
queue: Schema.String;
|
|
@@ -452,12 +408,6 @@ export declare function jobsPageWithRetry<const TQueues extends readonly JobsEnt
|
|
|
452
408
|
readonly state: Schema.Literals<readonly ["created", "retry", "active", "completed", "cancelled", "failed"]>;
|
|
453
409
|
readonly data: Schema.Unknown;
|
|
454
410
|
readonly queue: Schema.Literal<string>;
|
|
455
|
-
readonly sourceId: Schema.OptionFromNullOr<Schema.String>;
|
|
456
|
-
readonly sourceOutput: Schema.NullOr<Schema.Struct<{
|
|
457
|
-
readonly _tag: Schema.withDecodingDefaultKey<Schema.String, never>;
|
|
458
|
-
readonly message: Schema.decodeTo<Schema.String, Schema.String, never, never>;
|
|
459
|
-
}>>;
|
|
460
|
-
readonly sourceQueue: Schema.Literal<string>;
|
|
461
411
|
}>[]>>;
|
|
462
412
|
readonly next: Schema.OptionFromNullOr<Schema.String>;
|
|
463
413
|
}>, Schema.Union<readonly [Schema.Union<readonly (typeof import("@shivaedev/errors/taxonomy.ts").BadRequest | typeof import("#jobs/schemas.ts").JobsUnavailable | typeof import("#jobs/schemas.ts").JobsPayloadInvalid | typeof import("#jobs/schemas.ts").JobsQueueUnregistered)[]>, typeof import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied]>, typeof JobsPermission | (import("effect/Context").Reference<<A, E, R>(effect: import("effect/Effect").Effect<A, E, R>, request: {
|
|
@@ -468,10 +418,60 @@ export declare function jobsPageWithRetry<const TQueues extends readonly JobsEnt
|
|
|
468
418
|
"~ClientError": never;
|
|
469
419
|
error: Schema.Union<readonly [typeof import("@shivaedev/contract/readPolicyErrors.ts").MissingReadPolicy, typeof import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied, typeof import("@shivaedev/contract/WebSocketRequired.ts").WebSocketRequired]>;
|
|
470
420
|
requiredForClient: false;
|
|
421
|
+
}), never> | import("effect/rpc/Rpc").Rpc<"admin.jobs.health", Schema.Void, Schema.Struct<{
|
|
422
|
+
readonly activeTotal: Schema.Number;
|
|
423
|
+
readonly deadLetteredTotal: Schema.Number;
|
|
424
|
+
readonly failedTotal: Schema.Number;
|
|
425
|
+
readonly jobs: Schema.$Array<Schema.Struct<{
|
|
426
|
+
readonly activeCount: Schema.Number;
|
|
427
|
+
readonly deadLetteredCount: Schema.Number;
|
|
428
|
+
readonly failedCount: Schema.Number;
|
|
429
|
+
readonly name: Schema.String;
|
|
430
|
+
readonly queuedCount: Schema.Number;
|
|
431
|
+
readonly readyCount: Schema.Number;
|
|
432
|
+
}>>;
|
|
433
|
+
readonly queuedTotal: Schema.Number;
|
|
434
|
+
readonly readyTotal: Schema.Number;
|
|
435
|
+
}>, Schema.Union<readonly [Schema.Union<readonly (typeof import("@shivaedev/errors/taxonomy.ts").BadRequest | typeof import("#jobs/schemas.ts").JobsUnavailable | typeof import("#jobs/schemas.ts").JobsPayloadInvalid | typeof import("#jobs/schemas.ts").JobsQueueUnregistered)[]>, typeof import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied]>, typeof JobsPermission | (import("effect/Context").Reference<<A, E, R>(effect: import("effect/Effect").Effect<A, E, R>, request: {
|
|
436
|
+
readonly rpc: import("effect/rpc/Rpc").Any;
|
|
437
|
+
readonly payload: unknown;
|
|
438
|
+
}) => import("effect/Effect").Effect<A, E | import("@shivaedev/contract/readPolicyErrors.ts").MissingReadPolicy | import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied | import("@shivaedev/contract/WebSocketRequired.ts").WebSocketRequired | import("effect/Types").unhandled, R>> & {
|
|
439
|
+
"~effect/rpc/RpcMiddleware": "~effect/rpc/RpcMiddleware";
|
|
440
|
+
"~ClientError": never;
|
|
441
|
+
error: Schema.Union<readonly [typeof import("@shivaedev/contract/readPolicyErrors.ts").MissingReadPolicy, typeof import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied, typeof import("@shivaedev/contract/WebSocketRequired.ts").WebSocketRequired]>;
|
|
442
|
+
requiredForClient: false;
|
|
443
|
+
}), never> | import("effect/rpc/Rpc").Rpc<"admin.jobs.job", Schema.Struct<{
|
|
444
|
+
id: Schema.String;
|
|
445
|
+
queue: Schema.String;
|
|
446
|
+
}>, Schema.OptionFromNullOr<Schema.Union<Schema.Struct<{
|
|
447
|
+
readonly attempt: Schema.Number;
|
|
448
|
+
readonly completedOn: Schema.OptionFromNullOr<Schema.DateTimeUtcFromString>;
|
|
449
|
+
readonly createdOn: Schema.DateTimeUtcFromString;
|
|
450
|
+
readonly id: Schema.String;
|
|
451
|
+
readonly output: Schema.NullOr<Schema.Struct<{
|
|
452
|
+
readonly _tag: Schema.withDecodingDefaultKey<Schema.String, never>;
|
|
453
|
+
readonly message: Schema.decodeTo<Schema.String, Schema.String, never, never>;
|
|
454
|
+
}>>;
|
|
455
|
+
readonly retryCount: Schema.Number;
|
|
456
|
+
readonly retryLimit: Schema.Number;
|
|
457
|
+
readonly startedOn: Schema.OptionFromNullOr<Schema.DateTimeUtcFromString>;
|
|
458
|
+
readonly state: Schema.Literals<readonly ["created", "retry", "active", "completed", "cancelled", "failed"]>;
|
|
459
|
+
readonly data: Schema.Unknown;
|
|
460
|
+
readonly queue: Schema.Literal<string>;
|
|
461
|
+
}>[]>>, Schema.Union<readonly [Schema.Union<readonly (typeof import("@shivaedev/errors/taxonomy.ts").BadRequest | typeof import("#jobs/schemas.ts").JobsUnavailable | typeof import("#jobs/schemas.ts").JobsPayloadInvalid | typeof import("#jobs/schemas.ts").JobsQueueUnregistered)[]>, typeof import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied]>, typeof JobsPermission | (import("effect/Context").Reference<<A, E, R>(effect: import("effect/Effect").Effect<A, E, R>, request: {
|
|
462
|
+
readonly rpc: import("effect/rpc/Rpc").Any;
|
|
463
|
+
readonly payload: unknown;
|
|
464
|
+
}) => import("effect/Effect").Effect<A, E | import("@shivaedev/contract/readPolicyErrors.ts").MissingReadPolicy | import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied | import("@shivaedev/contract/WebSocketRequired.ts").WebSocketRequired | import("effect/Types").unhandled, R>> & {
|
|
465
|
+
"~effect/rpc/RpcMiddleware": "~effect/rpc/RpcMiddleware";
|
|
466
|
+
"~ClientError": never;
|
|
467
|
+
error: Schema.Union<readonly [typeof import("@shivaedev/contract/readPolicyErrors.ts").MissingReadPolicy, typeof import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied, typeof import("@shivaedev/contract/WebSocketRequired.ts").WebSocketRequired]>;
|
|
468
|
+
requiredForClient: false;
|
|
471
469
|
}), never> | import("effect/rpc/Rpc").Rpc<"admin.jobs.retry", Schema.Struct<{
|
|
472
470
|
id: Schema.String;
|
|
473
471
|
queue: Schema.String;
|
|
474
|
-
}>, Schema.Void, Schema.Union<readonly (typeof Forbidden | typeof import("@shivaedev/errors/taxonomy.ts").BadRequest | typeof import("#jobs/schemas.ts").JobsUnavailable | typeof import("#jobs/schemas.ts").JobsPayloadInvalid | typeof import("#jobs/schemas.ts").JobsQueueUnregistered | typeof JobsNotFailed)[]>, typeof JobsPermission, never
|
|
472
|
+
}>, Schema.Void, Schema.Union<readonly (typeof Forbidden | typeof import("@shivaedev/errors/taxonomy.ts").BadRequest | typeof import("#jobs/schemas.ts").JobsUnavailable | typeof import("#jobs/schemas.ts").JobsPayloadInvalid | typeof import("#jobs/schemas.ts").JobsQueueUnregistered | typeof JobsNotFailed)[]>, typeof JobsPermission, never> | import("effect/rpc/Rpc").Rpc<"admin.jobs.runScheduleNow", Schema.Struct<{
|
|
473
|
+
queue: Schema.String;
|
|
474
|
+
}>, Schema.OptionFromNullOr<Schema.String>, Schema.Union<readonly (typeof Forbidden | typeof import("@shivaedev/errors/taxonomy.ts").BadRequest | typeof import("#jobs/schemas.ts").JobsUnavailable | typeof import("#jobs/schemas.ts").JobsPayloadInvalid | typeof import("#jobs/schemas.ts").JobsQueueUnregistered)[]>, typeof JobsPermission, never>, readonly [], undefined>;
|
|
475
475
|
} & {
|
|
476
476
|
queues: TQueues;
|
|
477
477
|
schedules: JobsEntry[];
|
package/dist/registry.d.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { Effect } from "effect";
|
|
1
2
|
import { RpcGroup } from "effect/rpc";
|
|
2
3
|
import type { AdminPage } from "#page.ts";
|
|
3
4
|
export interface AdminRegistry<TPages extends readonly AdminPage[]> {
|
|
@@ -18,4 +19,5 @@ export type RegistryPages<TRegistries extends readonly AnyAdminRegistry[]> = TRe
|
|
|
18
19
|
] ? readonly [...TFirst["pages"], ...RegistryPages<TRest>] : number extends TRegistries["length"] ? readonly TRegistries[number]["pages"][number][] : readonly [];
|
|
19
20
|
export declare function mergeAdminRegistries<const TRegistries extends readonly AnyAdminRegistry[]>(...registries: TRegistries & UniquePageIds<RegistryPages<TRegistries>>): AdminRegistry<RegistryPages<TRegistries>>;
|
|
20
21
|
export declare function adminRegistry<const TPages extends readonly AdminPage[]>(...pages: TPages & UniquePageIds<TPages>): AdminRegistry<TPages>;
|
|
22
|
+
export declare const validateAdminRegistry: (pages: readonly AdminPage[]) => Effect.Effect<void, never, never>;
|
|
21
23
|
//# sourceMappingURL=registry.d.ts.map
|
package/dist/registry.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../src/registry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEtC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAE1C,MAAM,WAAW,aAAa,CAAC,MAAM,SAAS,SAAS,SAAS,EAAE;IACjE,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;IAC7E,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,gBAAgB;IAChC,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,CAAC;IAC7B,QAAQ,CAAC,KAAK,EAAE,SAAS,SAAS,EAAE,CAAC;CACrC;AAED,MAAM,MAAM,aAAa,CAAC,MAAM,SAAS,SAAS,SAAS,EAAE,EAAE,KAAK,SAAS,MAAM,GAAG,KAAK,IAAI,MAAM,SAAS,SAAS;IACtH,MAAM,KAAK,SAAS,SAAS;IAC7B,GAAG,MAAM,KAAK,SAAS,SAAS,SAAS,EAAE;CAC3C,GACE,KAAK,CAAC,IAAI,CAAC,SAAS,KAAK,GACxB,KAAK,GACL,aAAa,CAAC,KAAK,EAAE,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,GAC1C,OAAO,CAAC;AAEX,MAAM,MAAM,aAAa,CAAC,WAAW,SAAS,SAAS,gBAAgB,EAAE,IAAI,WAAW,SAAS,SAAS;IACzG,MAAM,MAAM,SAAS,gBAAgB;IACrC,GAAG,MAAM,KAAK,SAAS,SAAS,gBAAgB,EAAE;CAClD,GACE,SAAS,CAAC,GAAG,MAAM,CAAC,OAAO,CAAC,EAAE,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC,GACtD,MAAM,SAAS,WAAW,CAAC,QAAQ,CAAC,GACnC,SAAS,WAAW,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,EAAE,GAC/C,SAAS,EAAE,CAAC;AAEhB,wBAAgB,oBAAoB,CAAC,KAAK,CAAC,WAAW,SAAS,SAAS,gBAAgB,EAAE,EACzF,GAAG,UAAU,EAAE,WAAW,GAAG,aAAa,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC,GACpE,aAAa,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC,CAAC;AAK7C,wBAAgB,aAAa,CAAC,KAAK,CAAC,MAAM,SAAS,SAAS,SAAS,EAAE,EAAE,GAAG,KAAK,EAAE,MAAM,GAAG,aAAa,CAAC,MAAM,CAAC,GAAG,aAAa,CAAC,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../src/registry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEtC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAE1C,MAAM,WAAW,aAAa,CAAC,MAAM,SAAS,SAAS,SAAS,EAAE;IACjE,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;IAC7E,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,gBAAgB;IAChC,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,CAAC;IAC7B,QAAQ,CAAC,KAAK,EAAE,SAAS,SAAS,EAAE,CAAC;CACrC;AAED,MAAM,MAAM,aAAa,CAAC,MAAM,SAAS,SAAS,SAAS,EAAE,EAAE,KAAK,SAAS,MAAM,GAAG,KAAK,IAAI,MAAM,SAAS,SAAS;IACtH,MAAM,KAAK,SAAS,SAAS;IAC7B,GAAG,MAAM,KAAK,SAAS,SAAS,SAAS,EAAE;CAC3C,GACE,KAAK,CAAC,IAAI,CAAC,SAAS,KAAK,GACxB,KAAK,GACL,aAAa,CAAC,KAAK,EAAE,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,GAC1C,OAAO,CAAC;AAEX,MAAM,MAAM,aAAa,CAAC,WAAW,SAAS,SAAS,gBAAgB,EAAE,IAAI,WAAW,SAAS,SAAS;IACzG,MAAM,MAAM,SAAS,gBAAgB;IACrC,GAAG,MAAM,KAAK,SAAS,SAAS,gBAAgB,EAAE;CAClD,GACE,SAAS,CAAC,GAAG,MAAM,CAAC,OAAO,CAAC,EAAE,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC,GACtD,MAAM,SAAS,WAAW,CAAC,QAAQ,CAAC,GACnC,SAAS,WAAW,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,EAAE,GAC/C,SAAS,EAAE,CAAC;AAEhB,wBAAgB,oBAAoB,CAAC,KAAK,CAAC,WAAW,SAAS,SAAS,gBAAgB,EAAE,EACzF,GAAG,UAAU,EAAE,WAAW,GAAG,aAAa,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC,GACpE,aAAa,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC,CAAC;AAK7C,wBAAgB,aAAa,CAAC,KAAK,CAAC,MAAM,SAAS,SAAS,SAAS,EAAE,EAAE,GAAG,KAAK,EAAE,MAAM,GAAG,aAAa,CAAC,MAAM,CAAC,GAAG,aAAa,CAAC,MAAM,CAAC,CAExI;AAED,eAAO,MAAM,qBAAqB,oEAgBhC,CAAC"}
|
package/dist/registry.js
CHANGED
|
@@ -1,24 +1,27 @@
|
|
|
1
|
+
import { Effect } from "effect";
|
|
1
2
|
import { RpcGroup } from "effect/rpc";
|
|
2
3
|
import { validateAdminRoutes } from "#adapters/validateAdminRoutes.ts";
|
|
3
4
|
export function mergeAdminRegistries(...registries) {
|
|
4
5
|
return adminRegistry(...registries.flatMap((registry) => registry.pages));
|
|
5
6
|
}
|
|
6
7
|
export function adminRegistry(...pages) {
|
|
8
|
+
return { group: RpcGroup.make().merge(...pages.map((page) => page.contract)), pages };
|
|
9
|
+
}
|
|
10
|
+
export const validateAdminRegistry = Effect.fnUntraced(function* (pages) {
|
|
7
11
|
const ids = new Set();
|
|
8
12
|
const tags = new Set();
|
|
9
|
-
function unique(seen, value, kind) {
|
|
10
|
-
if (seen.has(value)) {
|
|
11
|
-
throw new Error(`Duplicate admin ${kind}: ${value}`);
|
|
12
|
-
}
|
|
13
|
-
seen.add(value);
|
|
14
|
-
}
|
|
15
13
|
for (const page of pages) {
|
|
16
|
-
|
|
14
|
+
if (ids.has(page.id)) {
|
|
15
|
+
yield* Effect.die(new Error(`Duplicate admin page id: ${page.id}`));
|
|
16
|
+
}
|
|
17
|
+
ids.add(page.id);
|
|
17
18
|
for (const tag of page.contract.requests.keys()) {
|
|
18
|
-
|
|
19
|
+
if (tags.has(tag)) {
|
|
20
|
+
yield* Effect.die(new Error(`Duplicate admin RPC tag: ${tag}`));
|
|
21
|
+
}
|
|
22
|
+
tags.add(tag);
|
|
19
23
|
}
|
|
20
24
|
}
|
|
21
|
-
validateAdminRoutes(pages.map((page) => page.route));
|
|
22
|
-
|
|
23
|
-
}
|
|
25
|
+
yield* validateAdminRoutes(pages.map((page) => page.route));
|
|
26
|
+
});
|
|
24
27
|
//# sourceMappingURL=registry.js.map
|
package/dist/registry.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"registry.js","sourceRoot":"","sources":["../src/registry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AAkCvE,MAAM,UAAU,oBAAoB,CAAC,GAAG,UAAuC;IAC9E,OAAO,aAAa,CAAC,GAAG,UAAU,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC;AAC3E,CAAC;AAED,MAAM,UAAU,aAAa,CAA4C,GAAG,KAAqC;IAChH,
|
|
1
|
+
{"version":3,"file":"registry.js","sourceRoot":"","sources":["../src/registry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AAkCvE,MAAM,UAAU,oBAAoB,CAAC,GAAG,UAAuC;IAC9E,OAAO,aAAa,CAAC,GAAG,UAAU,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC;AAC3E,CAAC;AAED,MAAM,UAAU,aAAa,CAA4C,GAAG,KAAqC;IAChH,OAAO,EAAE,KAAK,EAAE,QAAQ,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC;AACvF,CAAC;AAED,MAAM,CAAC,MAAM,qBAAqB,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,KAA2B;IAC5F,MAAM,GAAG,GAAG,IAAI,GAAG,EAAU,CAAC;IAC9B,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;IAC/B,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QAC1B,IAAI,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC;YACtB,KAAK,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC,4BAA4B,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;QACrE,CAAC;QACD,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACjB,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,CAAC;YACjD,IAAI,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;gBACnB,KAAK,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC,4BAA4B,GAAG,EAAE,CAAC,CAAC,CAAC;YACjE,CAAC;YACD,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACf,CAAC;IACF,CAAC;IACD,KAAK,CAAC,CAAC,mBAAmB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;AAC7D,CAAC,CAAC,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { type Context, DateTime, Effect, Option, type Schema } from "effect";
|
|
1
|
+
import { type Context, DateTime, Effect, Layer, Option, type Schema } from "effect";
|
|
2
2
|
import { BadRequest } from "@shivaedev/errors/taxonomy.ts";
|
|
3
3
|
import type { PgBossError, PgBossPayloadError } from "@shivaedev/jobs/server/error.ts";
|
|
4
4
|
import type { PgBossService } from "@shivaedev/jobs/server/service.ts";
|
|
@@ -6,23 +6,23 @@ import { type JobsEntry, type JobsPayload } from "#jobs/entry.ts";
|
|
|
6
6
|
import type { jobsPage } from "#jobs/page.ts";
|
|
7
7
|
import { JobsPayloadInvalid, JobsQueueUnregistered, JobsUnavailable } from "#jobs/schemas.ts";
|
|
8
8
|
export declare function jobsFailures<A, R>(effect: Effect.Effect<A, PgBossError | PgBossPayloadError | Schema.SchemaError, R>): Effect.Effect<A, BadRequest | JobsPayloadInvalid | JobsUnavailable, R>;
|
|
9
|
-
export declare function jobsReadHandlers<const TQueues extends readonly JobsEntry[]
|
|
9
|
+
export declare function jobsReadHandlers<const TQueues extends readonly JobsEntry[]>(page: {
|
|
10
10
|
readonly queues: TQueues;
|
|
11
|
-
}
|
|
11
|
+
}): {
|
|
12
12
|
"admin.jobs.counts": ({ queue }: {
|
|
13
13
|
readonly queue: string;
|
|
14
|
-
}) => Effect.Effect<import("@shivaedev/jobs/server/health.ts").QueueCounts, BadRequest | JobsPayloadInvalid | JobsQueueUnregistered | JobsUnavailable,
|
|
14
|
+
}) => Effect.Effect<import("@shivaedev/jobs/server/health.ts").QueueCounts, BadRequest | JobsPayloadInvalid | JobsQueueUnregistered | JobsUnavailable, "@shivaedev/jobs/PgBossInspection">;
|
|
15
15
|
"admin.jobs.deadLettered": ({ queue, ...options }: {
|
|
16
16
|
readonly queue: string;
|
|
17
17
|
readonly limit: number;
|
|
18
18
|
readonly cursor?: string;
|
|
19
|
-
}) => Effect.Effect<import("@shivaedev/jobs/server/health.ts").JobPage<import("@shivaedev/jobs/server/health.ts").DeadLetteredJob<unknown>>, BadRequest | JobsPayloadInvalid | JobsQueueUnregistered | JobsUnavailable,
|
|
19
|
+
}) => Effect.Effect<import("@shivaedev/jobs/server/health.ts").JobPage<import("@shivaedev/jobs/server/health.ts").DeadLetteredJob<unknown>>, BadRequest | JobsPayloadInvalid | JobsQueueUnregistered | JobsUnavailable, "@shivaedev/jobs/PgBossInspection" | JobsPayload<TQueues[number]>["DecodingServices"]>;
|
|
20
20
|
"admin.jobs.failed": ({ queue, ...options }: {
|
|
21
21
|
readonly queue: string;
|
|
22
22
|
readonly limit: number;
|
|
23
23
|
readonly cursor?: string;
|
|
24
|
-
}) => Effect.Effect<import("@shivaedev/jobs/server/health.ts").JobPage<import("@shivaedev/jobs/server/health.ts").ListedJob<unknown>>, BadRequest | JobsPayloadInvalid | JobsQueueUnregistered | JobsUnavailable,
|
|
25
|
-
"admin.jobs.health": () => Effect.Effect<import("@shivaedev/jobs/server/health.ts").JobsHealth, BadRequest | JobsPayloadInvalid | JobsUnavailable,
|
|
24
|
+
}) => Effect.Effect<import("@shivaedev/jobs/server/health.ts").JobPage<import("@shivaedev/jobs/server/health.ts").ListedJob<unknown>>, BadRequest | JobsPayloadInvalid | JobsQueueUnregistered | JobsUnavailable, "@shivaedev/jobs/PgBossInspection" | JobsPayload<TQueues[number]>["DecodingServices"]>;
|
|
25
|
+
"admin.jobs.health": () => Effect.Effect<import("@shivaedev/jobs/server/health.ts").JobsHealth, BadRequest | JobsPayloadInvalid | JobsUnavailable, "@shivaedev/jobs/PgBossInspection">;
|
|
26
26
|
"admin.jobs.job": ({ id, queue }: {
|
|
27
27
|
readonly id: string;
|
|
28
28
|
readonly queue: string;
|
|
@@ -56,7 +56,7 @@ export declare function jobsReadHandlers<const TQueues extends readonly JobsEntr
|
|
|
56
56
|
retryLimit: number;
|
|
57
57
|
startedOn: Option.Option<DateTime.Utc>;
|
|
58
58
|
state: import("@shivaedev/jobs/server/job.ts").JobState;
|
|
59
|
-
}>, BadRequest | JobsPayloadInvalid | JobsQueueUnregistered | JobsUnavailable,
|
|
59
|
+
}>, BadRequest | JobsPayloadInvalid | JobsQueueUnregistered | JobsUnavailable, "@shivaedev/jobs/PgBossInspection" | JobsPayload<TQueues[number]>["DecodingServices"]>;
|
|
60
60
|
};
|
|
61
|
-
export declare function jobsHandlers<const TQueues extends readonly JobsEntry[], TService>(page: ReturnType<typeof jobsPage<TQueues>>, service: Context.Service<TService, PgBossService>):
|
|
61
|
+
export declare function jobsHandlers<const TQueues extends readonly JobsEntry[], TService>(page: ReturnType<typeof jobsPage<TQueues>>, service: Context.Service<TService, PgBossService>): Layer.Layer<import("effect/rpc/Rpc").Handler<"admin.jobs.counts"> | import("effect/rpc/Rpc").Handler<"admin.jobs.deadLettered"> | import("effect/rpc/Rpc").Handler<"admin.jobs.failed"> | import("effect/rpc/Rpc").Handler<"admin.jobs.health"> | import("effect/rpc/Rpc").Handler<"admin.jobs.job">, never, Exclude<TService, import("effect/Scope").Scope> | Exclude<Exclude<Exclude<JobsPayload<TQueues[number]>["DecodingServices"], import("@shivaedev/identity/identity.ts").Identity | import("@shivaedev/identity/identity.ts").SessionUser>, import("effect/Scope").Scope>, "@shivaedev/jobs/PgBossInspection">>;
|
|
62
62
|
//# sourceMappingURL=jobsHandlers.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jobsHandlers.d.ts","sourceRoot":"","sources":["../../src/server/jobsHandlers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,MAAM,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"jobsHandlers.d.ts","sourceRoot":"","sources":["../../src/server/jobsHandlers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,MAAM,EAAE,MAAM,QAAQ,CAAC;AACpF,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,KAAK,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AAGvF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AACvE,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,WAAW,EAAa,MAAM,gBAAgB,CAAC;AAC7E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,EAAE,kBAAkB,EAAE,qBAAqB,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAE9F,wBAAgB,YAAY,CAAC,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,WAAW,GAAG,kBAAkB,GAAG,MAAM,CAAC,WAAW,EAAE,CAAC,CAAC,0EAapH;AAED,wBAAgB,gBAAgB,CAAC,KAAK,CAAC,OAAO,SAAS,SAAS,SAAS,EAAE,EAAE,IAAI,EAAE;IAAE,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAA;CAAE;IAO7G,mBAAmB,cAAc;QAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;KAAE;IAM3D,yBAAyB,0BAA0B;QAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE;IAM/H,mBAAmB,0BAA0B;QAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE;IAMzH,mBAAmB;IAKnB,gBAAgB,kBAAkB;QAAE,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;KAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAyBlF;AAED,wBAAgB,YAAY,CAAC,KAAK,CAAC,OAAO,SAAS,SAAS,SAAS,EAAE,EAAE,QAAQ,EAChF,IAAI,EAAE,UAAU,CAAC,OAAO,QAAQ,CAAC,OAAO,CAAC,CAAC,EAC1C,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,QAAQ,EAAE,aAAa,CAAC,6lBAUjD"}
|