@shivaedev/admin 0.22.1 → 0.23.1
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 +14 -0
- package/README.md +12 -2
- package/dist/client/adapters/JobsView.d.ts +6 -2
- package/dist/client/adapters/JobsView.d.ts.map +1 -1
- package/dist/client/adapters/JobsView.js +5 -2
- package/dist/client/adapters/JobsView.js.map +1 -1
- package/dist/client/adapters/RunScheduleControl.d.ts +6 -0
- package/dist/client/adapters/RunScheduleControl.d.ts.map +1 -0
- package/dist/client/adapters/RunScheduleControl.js +11 -0
- package/dist/client/adapters/RunScheduleControl.js.map +1 -0
- package/dist/client/adapters/jobsTypes.d.ts +3 -0
- package/dist/client/adapters/jobsTypes.d.ts.map +1 -1
- package/dist/jobs/entry.d.ts +3 -0
- package/dist/jobs/entry.d.ts.map +1 -1
- package/dist/jobs/page.d.ts +66 -81
- package/dist/jobs/page.d.ts.map +1 -1
- package/dist/jobs/retryPage.d.ts +21 -25
- package/dist/jobs/retryPage.d.ts.map +1 -1
- package/dist/jobs/retryPage.js +12 -1
- package/dist/jobs/retryPage.js.map +1 -1
- package/dist/server/jobsHandlersWithRetry.d.ts +1 -1
- package/dist/server/jobsHandlersWithRetry.d.ts.map +1 -1
- package/dist/server/jobsHandlersWithRetry.js +10 -0
- package/dist/server/jobsHandlersWithRetry.js.map +1 -1
- package/dist/sessions/Page.d.ts +6 -21
- package/dist/sessions/Page.d.ts.map +1 -1
- package/dist/users/page.d.ts +11 -26
- package/dist/users/page.d.ts.map +1 -1
- package/package.json +13 -13
- package/src/client/adapters/JobsView.ts +8 -2
- package/src/client/adapters/RunScheduleControl.tsx +19 -0
- package/src/client/adapters/jobsTypes.ts +2 -0
- package/src/jobs/entry.ts +1 -1
- package/src/jobs/retryPage.ts +12 -1
- package/src/server/jobsHandlersWithRetry.ts +14 -0
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,19 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
## 0.23.1 - 2026-11-06
|
|
4
|
+
|
|
5
|
+
### Changed
|
|
6
|
+
|
|
7
|
+
- Update `@shivaedev/contract` from 0.42.0 to 0.43.0.
|
|
8
|
+
- Update `@shivaedev/identity` from 0.29.2 to 0.30.0.
|
|
9
|
+
- Update `@shivaedev/react` from 0.45.1 to 0.46.0.
|
|
10
|
+
|
|
11
|
+
## 0.23.0 - 2026-11-06
|
|
12
|
+
|
|
13
|
+
### Added
|
|
14
|
+
|
|
15
|
+
- Run schedules from the admin Jobs view on retry-enabled pages, guarded by the existing jobs management permission.
|
|
16
|
+
|
|
3
17
|
## 0.22.1 - 2026-11-06
|
|
4
18
|
|
|
5
19
|
### Changed
|
package/README.md
CHANGED
|
@@ -194,7 +194,7 @@ const jobs = bind(JobsPage.contract, Client);
|
|
|
194
194
|
<JobsView api={jobs} queues={JobsPage.queues} />;
|
|
195
195
|
```
|
|
196
196
|
|
|
197
|
-
For a retry-enabled page, pass `retry={Client.runtime.fn(jobs.retry.run)}`. The view offers retry on failed originals; the server also requires `jobs.retry`.
|
|
197
|
+
For a retry-enabled page, pass `retry={Client.runtime.fn(jobs.retry.run)}`. The view offers retry on failed originals; the server also requires `jobs.retry`. Omit both action props for a read-only view. Keep the view inside the application's admin shell and protect its route with `JobsPage.route.permission`.
|
|
198
198
|
|
|
199
199
|
Queue and schedule labels replace internal names in the queue picker and selected queue heading. A queue's `subject` columns select fields from its masked inspection payload; numbers display as decoded values, and missing fields display `—`. Native `Redacted` fields and sensitive keys remain masked. Failed and dead-lettered jobs use the same subject columns, with dead-letter copies under their source queue's tab rather than separate queue choices. String-only queue lists remain supported and show internal names without subject columns. `defineQueue` checks subject field names against its payload Schema; browser-safe declarations can use `SubjectColumn<typeof PayloadSchema>` from `@shivaedev/jobs/display.ts` to check columns before sharing them with the server.
|
|
200
200
|
|
|
@@ -213,10 +213,20 @@ const registration = registerAdmin(Admin, {
|
|
|
213
213
|
});
|
|
214
214
|
```
|
|
215
215
|
|
|
216
|
-
This variant adds
|
|
216
|
+
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.
|
|
217
217
|
|
|
218
218
|
A successful bound retry invalidates health, the affected queue's counts and both listings, and the original job's detail. Health retains the runtime monitor's refresh timing.
|
|
219
219
|
|
|
220
|
+
### Run a schedule now
|
|
221
|
+
|
|
222
|
+
The retry-enabled page also exposes `admin.jobs.runScheduleNow`, taking `{ queue }` and returning `Option<string>` with the enqueued run ID. Declare a schedule as `{ name, label?, scheduleOptions?: { key? } }` without a payload Schema, or pass its `defineSchedule` definition. The handler calls the jobs service's `runScheduleNow` and requires the same `ReadJobs` and `RetryJobs` permissions as retry. It rejects queues and schedules omitted from the page with `JobsQueueUnregistered`. The schedule's normal handler processes the run and its timetable stays unchanged.
|
|
223
|
+
|
|
224
|
+
Pass the page's schedule declarations and bound action to show **Run now** for a selected schedule:
|
|
225
|
+
|
|
226
|
+
```tsx
|
|
227
|
+
<JobsView api={jobs} queues={JobsPage.queues} schedules={JobsPage.schedules} runScheduleNow={Client.runtime.fn(jobs.runScheduleNow.run)} />;
|
|
228
|
+
```
|
|
229
|
+
|
|
220
230
|
### Built-in Users page
|
|
221
231
|
|
|
222
232
|
Call `usersPage(AppAccess)` from `@shivaedev/admin/users/page.ts` with the application's code-defined role set. Add the returned page to the same registry as Jobs and register `users: usersHandlers(UsersPage)` from `@shivaedev/admin/server/usersHandlers.ts`. The handlers require identity's `UserDirectory` service. Provide `betterAuthUserDirectory(AppAccess, authOptions)` from `@shivaedev/identity/server/better-auth/adapters/userDirectory.ts` with the same options used by `betterAuthMount`. Identity owns the PostgreSQL reads and role writes, including custom auth mappings. For example, `authOptions.user.modelName: "users"` makes the Users view open and page through `users`; mapped name, email, role and creation-time columns are used as well. The page reads identity's exported `userKeys.list` collection, so role changes refresh open user lists.
|
|
@@ -1,11 +1,15 @@
|
|
|
1
1
|
import type { QueueDisplay } from "@shivaedev/jobs/display.ts";
|
|
2
|
-
import type { JobsViewClient, RetryJob } from "./jobsTypes.ts";
|
|
2
|
+
import type { JobsViewClient, RetryJob, RunScheduleNow } from "./jobsTypes.ts";
|
|
3
3
|
export interface JobsViewProps {
|
|
4
4
|
readonly api: JobsViewClient;
|
|
5
5
|
readonly queues: readonly (string | QueueDisplay)[];
|
|
6
6
|
readonly retry?: RetryJob | undefined;
|
|
7
|
+
readonly runScheduleNow?: RunScheduleNow | undefined;
|
|
8
|
+
readonly schedules?: readonly {
|
|
9
|
+
readonly name: string;
|
|
10
|
+
}[];
|
|
7
11
|
}
|
|
8
|
-
export declare function JobsView({ api, queues, retry }: JobsViewProps): import("react").DetailedReactHTMLElement<{
|
|
12
|
+
export declare function JobsView({ api, queues, retry, schedules, runScheduleNow }: JobsViewProps): import("react").DetailedReactHTMLElement<{
|
|
9
13
|
role: "alert";
|
|
10
14
|
}, HTMLElement> | import("react").DetailedReactHTMLElement<{
|
|
11
15
|
className: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"JobsView.d.ts","sourceRoot":"","sources":["../../../src/client/adapters/JobsView.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAI/D,OAAO,KAAK,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"JobsView.d.ts","sourceRoot":"","sources":["../../../src/client/adapters/JobsView.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAI/D,OAAO,KAAK,EAAE,cAAc,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAG/E,MAAM,WAAW,aAAa;IAC7B,QAAQ,CAAC,GAAG,EAAE,cAAc,CAAC;IAC7B,QAAQ,CAAC,MAAM,EAAE,SAAS,CAAC,MAAM,GAAG,YAAY,CAAC,EAAE,CAAC;IACpD,QAAQ,CAAC,KAAK,CAAC,EAAE,QAAQ,GAAG,SAAS,CAAC;IACtC,QAAQ,CAAC,cAAc,CAAC,EAAE,cAAc,GAAG,SAAS,CAAC;IACrD,QAAQ,CAAC,SAAS,CAAC,EAAE,SAAS;QAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;CAC1D;AAED,wBAAgB,QAAQ,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,EAAE,aAAa;;;;gBAyBxF"}
|
|
@@ -3,7 +3,8 @@ import { createElement, useState } from "react";
|
|
|
3
3
|
import { useQuery } from "@shivaedev/react/client/resultState.ts";
|
|
4
4
|
import { JobsHealthMetrics } from "./JobsMetrics.js";
|
|
5
5
|
import { JobsQueuePicker, JobsQueueView } from "./JobsQueueView.js";
|
|
6
|
-
|
|
6
|
+
import { RunScheduleControl } from "./RunScheduleControl.js";
|
|
7
|
+
export function JobsView({ api, queues, retry, schedules, runScheduleNow }) {
|
|
7
8
|
const definitions = queues.map((definition) => (typeof definition === "string" ? { name: definition } : definition));
|
|
8
9
|
const [name, selectQueue] = useState(definitions[0]?.name ?? "");
|
|
9
10
|
const queue = definitions.find((candidate) => candidate.name === name);
|
|
@@ -14,6 +15,8 @@ export function JobsView({ api, queues, retry }) {
|
|
|
14
15
|
}
|
|
15
16
|
return createElement("div", { className: "min-w-0 space-y-8" }, createElement(JobsHealthMetrics, { state: health }), queue === undefined
|
|
16
17
|
? createElement("p", null, "No queues or schedules registered.")
|
|
17
|
-
: createElement("div", { className: "min-w-0 space-y-6" }, createElement(JobsQueuePicker, { queues: definitions, select: selectQueue, value: name }),
|
|
18
|
+
: createElement("div", { className: "min-w-0 space-y-6" }, createElement(JobsQueuePicker, { queues: definitions, select: selectQueue, value: name }), runScheduleNow !== undefined && schedules?.some((schedule) => schedule.name === name)
|
|
19
|
+
? createElement(RunScheduleControl, { key: `run-${name}`, queue: name, run: runScheduleNow })
|
|
20
|
+
: null, createElement(JobsQueueView, { api, key: name, label: queue.label, queue: name, retry, subject: queue.subject })));
|
|
18
21
|
}
|
|
19
22
|
//# sourceMappingURL=JobsView.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"JobsView.js","sourceRoot":"","sources":["../../../src/client/adapters/JobsView.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AAClD,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAEhD,OAAO,EAAE,QAAQ,EAAE,MAAM,wCAAwC,CAAC;AAClE,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAmB,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,oBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"JobsView.js","sourceRoot":"","sources":["../../../src/client/adapters/JobsView.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AAClD,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAEhD,OAAO,EAAE,QAAQ,EAAE,MAAM,wCAAwC,CAAC;AAClE,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAmB,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,oBAAqB,CAAC;AAErE,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAA0B,CAAC;AAU9D,MAAM,UAAU,QAAQ,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,cAAc,EAAiB;IACxF,MAAM,WAAW,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC,OAAO,UAAU,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC;IACrH,MAAM,CAAC,IAAI,EAAE,WAAW,CAAC,GAAG,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,IAAI,IAAI,EAAE,CAAC,CAAC;IACjE,MAAM,KAAK,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;IACvE,MAAM,MAAM,GAAG,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC;IACrD,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,eAAe,CAAC,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC,CAAC;IACrI,IAAI,MAAM,EAAE,CAAC;QACZ,OAAO,aAAa,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,mCAAmC,CAAC,CAAC;IACnF,CAAC;IACD,OAAO,aAAa,CACnB,KAAK,EACL,EAAE,SAAS,EAAE,mBAAmB,EAAE,EAClC,aAAa,CAAC,iBAAiB,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,EACnD,KAAK,KAAK,SAAS;QAClB,CAAC,CAAC,aAAa,CAAC,GAAG,EAAE,IAAI,EAAE,oCAAoC,CAAC;QAChE,CAAC,CAAC,aAAa,CACb,KAAK,EACL,EAAE,SAAS,EAAE,mBAAmB,EAAE,EAClC,aAAa,CAAC,eAAe,EAAE,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,EACzF,cAAc,KAAK,SAAS,IAAI,SAAS,EAAE,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,KAAK,IAAI,CAAC;YACpF,CAAC,CAAC,aAAa,CAAC,kBAAkB,EAAE,EAAE,GAAG,EAAE,OAAO,IAAI,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,cAAc,EAAE,CAAC;YAC7F,CAAC,CAAC,IAAI,EACP,aAAa,CAAC,aAAa,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC,CAChH,CACH,CAAC;AACH,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"RunScheduleControl.d.ts","sourceRoot":"","sources":["../../../src/client/adapters/RunScheduleControl.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAErD,wBAAgB,kBAAkB,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE;IAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,GAAG,EAAE,cAAc,CAAA;CAAE,+BAa1G"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
2
|
+
import { Option } from "effect";
|
|
3
|
+
import { useAction } from "@shivaedev/react/client/resultState.ts";
|
|
4
|
+
import { JobButton } from "./JobButton.js";
|
|
5
|
+
export function RunScheduleControl({ queue, run }) {
|
|
6
|
+
const action = useAction(run);
|
|
7
|
+
const failure = Option.isSome(action.cause) ? _jsx("p", { role: "alert", children: "Could not run this schedule." }) : null;
|
|
8
|
+
const status = Option.isSome(action.data) ? _jsx("p", { role: "status", children: Option.isSome(action.data.value) ? "Run requested." : "No run enqueued." }) : null;
|
|
9
|
+
return (_jsxs("div", { className: "space-y-2", children: [_jsx(JobButton, { disabled: action.pending, onClick: () => action.dispatch({ queue }), children: action.pending ? "Requesting…" : "Run now" }), failure, status] }));
|
|
10
|
+
}
|
|
11
|
+
//# sourceMappingURL=RunScheduleControl.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"RunScheduleControl.js","sourceRoot":"","sources":["../../../src/client/adapters/RunScheduleControl.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,SAAS,EAAE,MAAM,wCAAwC,CAAC;AACnE,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAiB,CAAC;AAG5C,MAAM,UAAU,kBAAkB,CAAC,EAAE,KAAK,EAAE,GAAG,EAA4D;IAC1G,MAAM,MAAM,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC;IAC9B,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,YAAG,IAAI,EAAC,OAAO,6CAAiC,CAAC,CAAC,CAAC,IAAI,CAAC;IACtG,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,YAAG,IAAI,EAAC,QAAQ,YAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,kBAAkB,GAAK,CAAC,CAAC,CAAC,IAAI,CAAC;IACnJ,OAAO,CACN,eAAK,SAAS,EAAC,WAAW,aACzB,KAAC,SAAS,IAAC,QAAQ,EAAE,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,KAAK,EAAE,CAAC,YAC5E,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,SAAS,GAChC,EACX,OAAO,EACP,MAAM,IACF,CACN,CAAC;AACH,CAAC"}
|
|
@@ -31,5 +31,8 @@ export interface JobsViewClient {
|
|
|
31
31
|
readonly job: Query<JobId, Option.Option<Job>>;
|
|
32
32
|
}
|
|
33
33
|
export type RetryJob = Atom.AtomResultFn<JobId, void, unknown>;
|
|
34
|
+
export type RunScheduleNow = Atom.AtomResultFn<{
|
|
35
|
+
readonly queue: string;
|
|
36
|
+
}, Option.Option<string>, unknown>;
|
|
34
37
|
export {};
|
|
35
38
|
//# sourceMappingURL=jobsTypes.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jobsTypes.d.ts","sourceRoot":"","sources":["../../../src/client/adapters/jobsTypes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC7C,OAAO,KAAK,KAAK,WAAW,MAAM,+BAA+B,CAAC;AAClE,OAAO,KAAK,KAAK,IAAI,MAAM,wBAAwB,CAAC;AACpD,OAAO,KAAK,EAAE,kBAAkB,EAAE,UAAU,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/F,KAAK,GAAG,GAAG,UAAU,CAAC,OAAO,SAAS,CAAC,OAAO,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;AACvE,KAAK,UAAU,GAAG,UAAU,CAAC,OAAO,kBAAkB,CAAC,OAAO,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;AACvF,MAAM,MAAM,QAAQ,GAAG,GAAG,GAAG,UAAU,CAAC;AACxC,UAAU,KAAK;IACd,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;CACvB;AACD,UAAU,SAAS;IAClB,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;CACvB;AACD,UAAU,IAAI,CAAC,CAAC;IACf,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC,EAAE,CAAC;IAC5B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;CACrC;AACD,UAAU,KAAK,CAAC,MAAM,EAAE,CAAC;IACxB,QAAQ,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC;CAClF;AACD,MAAM,WAAW,cAAc;IAC9B,QAAQ,CAAC,MAAM,EAAE,KAAK,CAAC;QAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;KAAE,EAAE,OAAO,WAAW,CAAC,IAAI,CAAC,CAAC;IAC5E,QAAQ,CAAC,YAAY,EAAE,KAAK,CAAC,SAAS,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC;IAC1D,QAAQ,CAAC,MAAM,EAAE,KAAK,CAAC,SAAS,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;IAC7C,QAAQ,CAAC,MAAM,EAAE,KAAK,CAAC,IAAI,EAAE,OAAO,UAAU,CAAC,IAAI,CAAC,CAAC;IACrD,QAAQ,CAAC,GAAG,EAAE,KAAK,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;CAC/C;AACD,MAAM,MAAM,QAAQ,GAAG,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"jobsTypes.d.ts","sourceRoot":"","sources":["../../../src/client/adapters/jobsTypes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC7C,OAAO,KAAK,KAAK,WAAW,MAAM,+BAA+B,CAAC;AAClE,OAAO,KAAK,KAAK,IAAI,MAAM,wBAAwB,CAAC;AACpD,OAAO,KAAK,EAAE,kBAAkB,EAAE,UAAU,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/F,KAAK,GAAG,GAAG,UAAU,CAAC,OAAO,SAAS,CAAC,OAAO,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;AACvE,KAAK,UAAU,GAAG,UAAU,CAAC,OAAO,kBAAkB,CAAC,OAAO,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;AACvF,MAAM,MAAM,QAAQ,GAAG,GAAG,GAAG,UAAU,CAAC;AACxC,UAAU,KAAK;IACd,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;CACvB;AACD,UAAU,SAAS;IAClB,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;CACvB;AACD,UAAU,IAAI,CAAC,CAAC;IACf,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC,EAAE,CAAC;IAC5B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;CACrC;AACD,UAAU,KAAK,CAAC,MAAM,EAAE,CAAC;IACxB,QAAQ,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC;CAClF;AACD,MAAM,WAAW,cAAc;IAC9B,QAAQ,CAAC,MAAM,EAAE,KAAK,CAAC;QAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;KAAE,EAAE,OAAO,WAAW,CAAC,IAAI,CAAC,CAAC;IAC5E,QAAQ,CAAC,YAAY,EAAE,KAAK,CAAC,SAAS,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC;IAC1D,QAAQ,CAAC,MAAM,EAAE,KAAK,CAAC,SAAS,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;IAC7C,QAAQ,CAAC,MAAM,EAAE,KAAK,CAAC,IAAI,EAAE,OAAO,UAAU,CAAC,IAAI,CAAC,CAAC;IACrD,QAAQ,CAAC,GAAG,EAAE,KAAK,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;CAC/C;AACD,MAAM,MAAM,QAAQ,GAAG,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;AAE/D,MAAM,MAAM,cAAc,GAAG,IAAI,CAAC,YAAY,CAAC;IAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;CAAE,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC"}
|
package/dist/jobs/entry.d.ts
CHANGED
|
@@ -3,6 +3,9 @@ import type { QueueDisplay } from "@shivaedev/jobs/display.ts";
|
|
|
3
3
|
import type { JobsQueue } from "./schemas.ts";
|
|
4
4
|
export type JobsEntry = (JobsQueue | {
|
|
5
5
|
readonly name: string;
|
|
6
|
+
readonly scheduleOptions?: {
|
|
7
|
+
readonly key?: string;
|
|
8
|
+
};
|
|
6
9
|
}) & QueueDisplay;
|
|
7
10
|
export type JobsPayload<TEntry extends JobsEntry> = [TEntry] extends [never] ? typeof Schema.Never : TEntry extends JobsQueue ? TEntry["schema"] : typeof Schema.Null;
|
|
8
11
|
export declare function jobsQueue<TEntry extends JobsEntry>(entry: TEntry): {
|
package/dist/jobs/entry.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"entry.d.ts","sourceRoot":"","sources":["../../src/jobs/entry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAE9C,MAAM,MAAM,SAAS,GAAG,CAAC,SAAS,GAAG;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC,GAAG,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"entry.d.ts","sourceRoot":"","sources":["../../src/jobs/entry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAE9C,MAAM,MAAM,SAAS,GAAG,CAAC,SAAS,GAAG;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,eAAe,CAAC,EAAE;QAAE,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAA;KAAE,CAAA;CAAE,CAAC,GAAG,YAAY,CAAC;AAErI,MAAM,MAAM,WAAW,CAAC,MAAM,SAAS,SAAS,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,GACzE,OAAO,MAAM,CAAC,KAAK,GACnB,MAAM,SAAS,SAAS,GACvB,MAAM,CAAC,QAAQ,CAAC,GAChB,OAAO,MAAM,CAAC,IAAI,CAAC;AAEvB,wBAAgB,SAAS,CAAC,MAAM,SAAS,SAAS,EAAE,KAAK,EAAE,MAAM,GAAG;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC,MAAM,CAAC,CAAA;CAAE,CAAC"}
|
package/dist/jobs/page.d.ts
CHANGED
|
@@ -29,7 +29,7 @@ export declare function jobsPage<const TQueues extends readonly JobsEntry[]>(...
|
|
|
29
29
|
JobsPayloadInvalid: typeof import("#jobs/schemas.ts").JobsPayloadInvalid;
|
|
30
30
|
JobsQueueUnregistered: typeof import("#jobs/schemas.ts").JobsQueueUnregistered;
|
|
31
31
|
JobsUnavailable: typeof import("#jobs/schemas.ts").JobsUnavailable;
|
|
32
|
-
}, never
|
|
32
|
+
}, never>>, "readPolicy"> & {
|
|
33
33
|
readonly readPolicy: import("@shivaedev/contract/readPolicy.ts").QueryReadPolicy<void, import("@shivaedev/errors/taxonomy.ts").BadRequest | import("#jobs/schemas.ts").JobsPayloadInvalid | import("#jobs/schemas.ts").JobsQueueUnregistered | import("#jobs/schemas.ts").JobsUnavailable, import("@shivaedev/identity/identity.ts").SessionUser>;
|
|
34
34
|
}, Omit<NoInfer<import("@shivaedev/contract/operation.ts").Query<"counts", Schema.Struct<{
|
|
35
35
|
queue: Schema.String;
|
|
@@ -43,7 +43,7 @@ export declare function jobsPage<const TQueues extends readonly JobsEntry[]>(...
|
|
|
43
43
|
JobsPayloadInvalid: typeof import("#jobs/schemas.ts").JobsPayloadInvalid;
|
|
44
44
|
JobsQueueUnregistered: typeof import("#jobs/schemas.ts").JobsQueueUnregistered;
|
|
45
45
|
JobsUnavailable: typeof import("#jobs/schemas.ts").JobsUnavailable;
|
|
46
|
-
}, never
|
|
46
|
+
}, never>>, "readPolicy"> & {
|
|
47
47
|
readonly readPolicy: import("@shivaedev/contract/readPolicy.ts").QueryReadPolicy<{
|
|
48
48
|
readonly queue: string;
|
|
49
49
|
}, import("@shivaedev/errors/taxonomy.ts").BadRequest | import("#jobs/schemas.ts").JobsPayloadInvalid | import("#jobs/schemas.ts").JobsQueueUnregistered | import("#jobs/schemas.ts").JobsUnavailable, import("@shivaedev/identity/identity.ts").SessionUser>;
|
|
@@ -74,7 +74,7 @@ export declare function jobsPage<const TQueues extends readonly JobsEntry[]>(...
|
|
|
74
74
|
JobsPayloadInvalid: typeof import("#jobs/schemas.ts").JobsPayloadInvalid;
|
|
75
75
|
JobsQueueUnregistered: typeof import("#jobs/schemas.ts").JobsQueueUnregistered;
|
|
76
76
|
JobsUnavailable: typeof import("#jobs/schemas.ts").JobsUnavailable;
|
|
77
|
-
}, never
|
|
77
|
+
}, never>>, "readPolicy"> & {
|
|
78
78
|
readonly readPolicy: import("@shivaedev/contract/readPolicy.ts").QueryReadPolicy<{
|
|
79
79
|
readonly cursor?: string;
|
|
80
80
|
readonly limit: number;
|
|
@@ -113,7 +113,7 @@ export declare function jobsPage<const TQueues extends readonly JobsEntry[]>(...
|
|
|
113
113
|
JobsPayloadInvalid: typeof import("#jobs/schemas.ts").JobsPayloadInvalid;
|
|
114
114
|
JobsQueueUnregistered: typeof import("#jobs/schemas.ts").JobsQueueUnregistered;
|
|
115
115
|
JobsUnavailable: typeof import("#jobs/schemas.ts").JobsUnavailable;
|
|
116
|
-
}, never
|
|
116
|
+
}, never>>, "readPolicy"> & {
|
|
117
117
|
readonly readPolicy: import("@shivaedev/contract/readPolicy.ts").QueryReadPolicy<{
|
|
118
118
|
readonly cursor?: string;
|
|
119
119
|
readonly limit: number;
|
|
@@ -142,12 +142,38 @@ export declare function jobsPage<const TQueues extends readonly JobsEntry[]>(...
|
|
|
142
142
|
JobsPayloadInvalid: typeof import("#jobs/schemas.ts").JobsPayloadInvalid;
|
|
143
143
|
JobsQueueUnregistered: typeof import("#jobs/schemas.ts").JobsQueueUnregistered;
|
|
144
144
|
JobsUnavailable: typeof import("#jobs/schemas.ts").JobsUnavailable;
|
|
145
|
-
}, never
|
|
145
|
+
}, never>>, "readPolicy"> & {
|
|
146
146
|
readonly readPolicy: import("@shivaedev/contract/readPolicy.ts").QueryReadPolicy<{
|
|
147
147
|
readonly id: string;
|
|
148
148
|
readonly queue: string;
|
|
149
149
|
}, import("@shivaedev/errors/taxonomy.ts").BadRequest | import("#jobs/schemas.ts").JobsPayloadInvalid | import("#jobs/schemas.ts").JobsQueueUnregistered | import("#jobs/schemas.ts").JobsUnavailable, import("@shivaedev/identity/identity.ts").SessionUser>;
|
|
150
|
-
}], readonly [], import("effect/rpc/Rpc").Rpc<"admin.jobs
|
|
150
|
+
}], readonly [], import("effect/rpc/Rpc").Rpc<"admin.jobs.job", Schema.Struct<{
|
|
151
|
+
id: Schema.String;
|
|
152
|
+
queue: Schema.String;
|
|
153
|
+
}>, Schema.OptionFromNullOr<Schema.Union<Schema.Struct<{
|
|
154
|
+
readonly attempt: Schema.Number;
|
|
155
|
+
readonly completedOn: Schema.OptionFromNullOr<Schema.DateTimeUtcFromString>;
|
|
156
|
+
readonly createdOn: Schema.DateTimeUtcFromString;
|
|
157
|
+
readonly id: Schema.String;
|
|
158
|
+
readonly output: Schema.NullOr<Schema.Struct<{
|
|
159
|
+
readonly _tag: Schema.withDecodingDefaultKey<Schema.String, never>;
|
|
160
|
+
readonly message: Schema.decodeTo<Schema.String, Schema.String, never, never>;
|
|
161
|
+
}>>;
|
|
162
|
+
readonly retryCount: Schema.Number;
|
|
163
|
+
readonly retryLimit: Schema.Number;
|
|
164
|
+
readonly startedOn: Schema.OptionFromNullOr<Schema.DateTimeUtcFromString>;
|
|
165
|
+
readonly state: Schema.Literals<readonly ["created", "retry", "active", "completed", "cancelled", "failed"]>;
|
|
166
|
+
readonly data: Schema.Unknown;
|
|
167
|
+
readonly queue: Schema.Literal<string>;
|
|
168
|
+
}>[]>>, 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: Effect.Effect<A, E, R>, request: {
|
|
169
|
+
readonly rpc: import("effect/rpc/Rpc").Any;
|
|
170
|
+
readonly payload: unknown;
|
|
171
|
+
}) => 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>> & {
|
|
172
|
+
"~effect/rpc/RpcMiddleware": "~effect/rpc/RpcMiddleware";
|
|
173
|
+
"~ClientError": never;
|
|
174
|
+
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]>;
|
|
175
|
+
requiredForClient: false;
|
|
176
|
+
}), never> | import("effect/rpc/Rpc").Rpc<"admin.jobs.$changes", Schema.Struct<{
|
|
151
177
|
queries: Schema.$Array<Schema.Union<readonly (Schema.Struct<{
|
|
152
178
|
query: Schema.Literal<"counts">;
|
|
153
179
|
payload: Schema.Struct<{
|
|
@@ -177,25 +203,10 @@ export declare function jobsPage<const TQueues extends readonly JobsEntry[]>(...
|
|
|
177
203
|
queue: Schema.String;
|
|
178
204
|
}>;
|
|
179
205
|
}>)[]>>;
|
|
180
|
-
}>, import("effect/rpc/RpcSchema").Stream<Schema.Union<readonly [
|
|
181
|
-
readonly _tag: Schema.Literal<"
|
|
182
|
-
readonly
|
|
183
|
-
|
|
184
|
-
readonly collection: Schema.String;
|
|
185
|
-
readonly field: Schema.String;
|
|
186
|
-
readonly value: Schema.Union<readonly [Schema.String, Schema.Number]>;
|
|
187
|
-
}>, Schema.Struct<{
|
|
188
|
-
readonly _tag: Schema.Literal<"List">;
|
|
189
|
-
readonly collection: Schema.String;
|
|
190
|
-
}>, Schema.Struct<{
|
|
191
|
-
readonly _tag: Schema.Literal<"Item">;
|
|
192
|
-
readonly collection: Schema.String;
|
|
193
|
-
readonly id: Schema.Union<readonly [Schema.String, Schema.Number]>;
|
|
194
|
-
}>]>>;
|
|
195
|
-
readonly queryIndexes: Schema.optional<Schema.$Array<Schema.Number>>;
|
|
196
|
-
}>, Schema.Struct<{
|
|
197
|
-
readonly _tag: Schema.Literal<"Resync">;
|
|
198
|
-
}>]>, typeof import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied, ...(Schema.Struct<{
|
|
206
|
+
}>, import("effect/rpc/RpcSchema").Stream<Schema.Union<readonly [typeof import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied, ...(Schema.Struct<{
|
|
207
|
+
readonly _tag: Schema.Literal<"Unchanged">;
|
|
208
|
+
readonly queryIndex: Schema.Number;
|
|
209
|
+
}> | Schema.Struct<{
|
|
199
210
|
_tag: Schema.Literal<"Result">;
|
|
200
211
|
query: Schema.Literal<"counts">;
|
|
201
212
|
queryIndex: Schema.Number;
|
|
@@ -319,7 +330,29 @@ export declare function jobsPage<const TQueues extends readonly JobsEntry[]>(...
|
|
|
319
330
|
"~ClientError": never;
|
|
320
331
|
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]>;
|
|
321
332
|
requiredForClient: false;
|
|
322
|
-
}), never> | import("effect/rpc/Rpc").Rpc<"admin.jobs.
|
|
333
|
+
}), never> | import("effect/rpc/Rpc").Rpc<"admin.jobs.health", Schema.Void, Schema.Struct<{
|
|
334
|
+
readonly activeTotal: Schema.Number;
|
|
335
|
+
readonly deadLetteredTotal: Schema.Number;
|
|
336
|
+
readonly failedTotal: Schema.Number;
|
|
337
|
+
readonly jobs: Schema.$Array<Schema.Struct<{
|
|
338
|
+
readonly activeCount: Schema.Number;
|
|
339
|
+
readonly deadLetteredCount: Schema.Number;
|
|
340
|
+
readonly failedCount: Schema.Number;
|
|
341
|
+
readonly name: Schema.String;
|
|
342
|
+
readonly queuedCount: Schema.Number;
|
|
343
|
+
readonly readyCount: Schema.Number;
|
|
344
|
+
}>>;
|
|
345
|
+
readonly queuedTotal: Schema.Number;
|
|
346
|
+
readonly readyTotal: Schema.Number;
|
|
347
|
+
}>, 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: Effect.Effect<A, E, R>, request: {
|
|
348
|
+
readonly rpc: import("effect/rpc/Rpc").Any;
|
|
349
|
+
readonly payload: unknown;
|
|
350
|
+
}) => 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>> & {
|
|
351
|
+
"~effect/rpc/RpcMiddleware": "~effect/rpc/RpcMiddleware";
|
|
352
|
+
"~ClientError": never;
|
|
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]>;
|
|
354
|
+
requiredForClient: false;
|
|
355
|
+
}), never> | import("effect/rpc/Rpc").Rpc<"admin.jobs.failed", Schema.Struct<{
|
|
323
356
|
cursor: Schema.optionalKey<Schema.String>;
|
|
324
357
|
limit: Schema.Number;
|
|
325
358
|
queue: Schema.String;
|
|
@@ -339,12 +372,6 @@ export declare function jobsPage<const TQueues extends readonly JobsEntry[]>(...
|
|
|
339
372
|
readonly state: Schema.Literals<readonly ["created", "retry", "active", "completed", "cancelled", "failed"]>;
|
|
340
373
|
readonly data: Schema.Unknown;
|
|
341
374
|
readonly queue: Schema.Literal<string>;
|
|
342
|
-
readonly sourceId: Schema.OptionFromNullOr<Schema.String>;
|
|
343
|
-
readonly sourceOutput: Schema.NullOr<Schema.Struct<{
|
|
344
|
-
readonly _tag: Schema.withDecodingDefaultKey<Schema.String, never>;
|
|
345
|
-
readonly message: Schema.decodeTo<Schema.String, Schema.String, never, never>;
|
|
346
|
-
}>>;
|
|
347
|
-
readonly sourceQueue: Schema.Literal<string>;
|
|
348
375
|
}>[]>>;
|
|
349
376
|
readonly next: Schema.OptionFromNullOr<Schema.String>;
|
|
350
377
|
}>, 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: Effect.Effect<A, E, R>, request: {
|
|
@@ -355,7 +382,7 @@ export declare function jobsPage<const TQueues extends readonly JobsEntry[]>(...
|
|
|
355
382
|
"~ClientError": never;
|
|
356
383
|
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]>;
|
|
357
384
|
requiredForClient: false;
|
|
358
|
-
}), never> | import("effect/rpc/Rpc").Rpc<"admin.jobs.
|
|
385
|
+
}), never> | import("effect/rpc/Rpc").Rpc<"admin.jobs.deadLettered", Schema.Struct<{
|
|
359
386
|
cursor: Schema.optionalKey<Schema.String>;
|
|
360
387
|
limit: Schema.Number;
|
|
361
388
|
queue: Schema.String;
|
|
@@ -375,6 +402,12 @@ export declare function jobsPage<const TQueues extends readonly JobsEntry[]>(...
|
|
|
375
402
|
readonly state: Schema.Literals<readonly ["created", "retry", "active", "completed", "cancelled", "failed"]>;
|
|
376
403
|
readonly data: Schema.Unknown;
|
|
377
404
|
readonly queue: Schema.Literal<string>;
|
|
405
|
+
readonly sourceId: Schema.OptionFromNullOr<Schema.String>;
|
|
406
|
+
readonly sourceOutput: Schema.NullOr<Schema.Struct<{
|
|
407
|
+
readonly _tag: Schema.withDecodingDefaultKey<Schema.String, never>;
|
|
408
|
+
readonly message: Schema.decodeTo<Schema.String, Schema.String, never, never>;
|
|
409
|
+
}>>;
|
|
410
|
+
readonly sourceQueue: Schema.Literal<string>;
|
|
378
411
|
}>[]>>;
|
|
379
412
|
readonly next: Schema.OptionFromNullOr<Schema.String>;
|
|
380
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: Effect.Effect<A, E, R>, request: {
|
|
@@ -385,54 +418,6 @@ export declare function jobsPage<const TQueues extends readonly JobsEntry[]>(...
|
|
|
385
418
|
"~ClientError": never;
|
|
386
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]>;
|
|
387
420
|
requiredForClient: false;
|
|
388
|
-
}), never> | import("effect/rpc/Rpc").Rpc<"admin.jobs.health", Schema.Void, Schema.Struct<{
|
|
389
|
-
readonly activeTotal: Schema.Number;
|
|
390
|
-
readonly deadLetteredTotal: Schema.Number;
|
|
391
|
-
readonly failedTotal: Schema.Number;
|
|
392
|
-
readonly jobs: Schema.$Array<Schema.Struct<{
|
|
393
|
-
readonly activeCount: Schema.Number;
|
|
394
|
-
readonly deadLetteredCount: Schema.Number;
|
|
395
|
-
readonly failedCount: Schema.Number;
|
|
396
|
-
readonly name: Schema.String;
|
|
397
|
-
readonly queuedCount: Schema.Number;
|
|
398
|
-
readonly readyCount: Schema.Number;
|
|
399
|
-
}>>;
|
|
400
|
-
readonly queuedTotal: Schema.Number;
|
|
401
|
-
readonly readyTotal: Schema.Number;
|
|
402
|
-
}>, 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: Effect.Effect<A, E, R>, request: {
|
|
403
|
-
readonly rpc: import("effect/rpc/Rpc").Any;
|
|
404
|
-
readonly payload: unknown;
|
|
405
|
-
}) => 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>> & {
|
|
406
|
-
"~effect/rpc/RpcMiddleware": "~effect/rpc/RpcMiddleware";
|
|
407
|
-
"~ClientError": never;
|
|
408
|
-
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]>;
|
|
409
|
-
requiredForClient: false;
|
|
410
|
-
}), never> | import("effect/rpc/Rpc").Rpc<"admin.jobs.job", Schema.Struct<{
|
|
411
|
-
id: Schema.String;
|
|
412
|
-
queue: Schema.String;
|
|
413
|
-
}>, Schema.OptionFromNullOr<Schema.Union<Schema.Struct<{
|
|
414
|
-
readonly attempt: Schema.Number;
|
|
415
|
-
readonly completedOn: Schema.OptionFromNullOr<Schema.DateTimeUtcFromString>;
|
|
416
|
-
readonly createdOn: Schema.DateTimeUtcFromString;
|
|
417
|
-
readonly id: Schema.String;
|
|
418
|
-
readonly output: Schema.NullOr<Schema.Struct<{
|
|
419
|
-
readonly _tag: Schema.withDecodingDefaultKey<Schema.String, never>;
|
|
420
|
-
readonly message: Schema.decodeTo<Schema.String, Schema.String, never, never>;
|
|
421
|
-
}>>;
|
|
422
|
-
readonly retryCount: Schema.Number;
|
|
423
|
-
readonly retryLimit: Schema.Number;
|
|
424
|
-
readonly startedOn: Schema.OptionFromNullOr<Schema.DateTimeUtcFromString>;
|
|
425
|
-
readonly state: Schema.Literals<readonly ["created", "retry", "active", "completed", "cancelled", "failed"]>;
|
|
426
|
-
readonly data: Schema.Unknown;
|
|
427
|
-
readonly queue: Schema.Literal<string>;
|
|
428
|
-
}>[]>>, 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: Effect.Effect<A, E, R>, request: {
|
|
429
|
-
readonly rpc: import("effect/rpc/Rpc").Any;
|
|
430
|
-
readonly payload: unknown;
|
|
431
|
-
}) => 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>> & {
|
|
432
|
-
"~effect/rpc/RpcMiddleware": "~effect/rpc/RpcMiddleware";
|
|
433
|
-
"~ClientError": never;
|
|
434
|
-
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]>;
|
|
435
|
-
requiredForClient: false;
|
|
436
421
|
}), never>, readonly [], undefined>;
|
|
437
422
|
} & {
|
|
438
423
|
queues: TQueues;
|
package/dist/jobs/page.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"page.d.ts","sourceRoot":"","sources":["../../src/jobs/page.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAGxC,OAAO,EAAE,KAAK,SAAS,EAA+B,MAAM,gBAAgB,CAAC;AAI7E,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEjD,wBAAgB,QAAQ,CAAC,KAAK,CAAC,OAAO,SAAS,SAAS,SAAS,EAAE,EAAE,GAAG,MAAM,EAAE,OAAO
|
|
1
|
+
{"version":3,"file":"page.d.ts","sourceRoot":"","sources":["../../src/jobs/page.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAGxC,OAAO,EAAE,KAAK,SAAS,EAA+B,MAAM,gBAAgB,CAAC;AAI7E,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEjD,wBAAgB,QAAQ,CAAC,KAAK,CAAC,OAAO,SAAS,SAAS,SAAS,EAAE,EAAE,GAAG,MAAM,EAAE,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAgDtF"}
|
package/dist/jobs/retryPage.d.ts
CHANGED
|
@@ -36,7 +36,7 @@ export declare function jobsPageWithRetry<const TQueues extends readonly JobsEnt
|
|
|
36
36
|
JobsPayloadInvalid: typeof import("./schemas.ts").JobsPayloadInvalid;
|
|
37
37
|
JobsQueueUnregistered: typeof import("./schemas.ts").JobsQueueUnregistered;
|
|
38
38
|
JobsUnavailable: typeof import("./schemas.ts").JobsUnavailable;
|
|
39
|
-
}, never
|
|
39
|
+
}, never>>, "readPolicy"> & {
|
|
40
40
|
readonly readPolicy: import("@shivaedev/contract/readPolicy.ts").QueryReadPolicy<void, import("@shivaedev/errors/taxonomy.ts").BadRequest | import("./schemas.ts").JobsPayloadInvalid | import("./schemas.ts").JobsQueueUnregistered | import("./schemas.ts").JobsUnavailable, import("@shivaedev/identity/identity.ts").SessionUser>;
|
|
41
41
|
}, "readPolicy"> & {
|
|
42
42
|
readonly readPolicy: import("@shivaedev/contract/readPolicy.ts").QueryReadPolicy<void, import("@shivaedev/errors/taxonomy.ts").BadRequest | import("./schemas.ts").JobsPayloadInvalid | import("./schemas.ts").JobsQueueUnregistered | import("./schemas.ts").JobsUnavailable, import("@shivaedev/identity/identity.ts").SessionUser>;
|
|
@@ -52,7 +52,7 @@ export declare function jobsPageWithRetry<const TQueues extends readonly JobsEnt
|
|
|
52
52
|
JobsPayloadInvalid: typeof import("./schemas.ts").JobsPayloadInvalid;
|
|
53
53
|
JobsQueueUnregistered: typeof import("./schemas.ts").JobsQueueUnregistered;
|
|
54
54
|
JobsUnavailable: typeof import("./schemas.ts").JobsUnavailable;
|
|
55
|
-
}, never
|
|
55
|
+
}, never>>, "readPolicy"> & {
|
|
56
56
|
readonly readPolicy: import("@shivaedev/contract/readPolicy.ts").QueryReadPolicy<{
|
|
57
57
|
readonly queue: string;
|
|
58
58
|
}, import("@shivaedev/errors/taxonomy.ts").BadRequest | import("./schemas.ts").JobsPayloadInvalid | import("./schemas.ts").JobsQueueUnregistered | import("./schemas.ts").JobsUnavailable, import("@shivaedev/identity/identity.ts").SessionUser>;
|
|
@@ -87,7 +87,7 @@ export declare function jobsPageWithRetry<const TQueues extends readonly JobsEnt
|
|
|
87
87
|
JobsPayloadInvalid: typeof import("./schemas.ts").JobsPayloadInvalid;
|
|
88
88
|
JobsQueueUnregistered: typeof import("./schemas.ts").JobsQueueUnregistered;
|
|
89
89
|
JobsUnavailable: typeof import("./schemas.ts").JobsUnavailable;
|
|
90
|
-
}, never
|
|
90
|
+
}, never>>, "readPolicy"> & {
|
|
91
91
|
readonly readPolicy: import("@shivaedev/contract/readPolicy.ts").QueryReadPolicy<{
|
|
92
92
|
readonly cursor?: string;
|
|
93
93
|
readonly limit: number;
|
|
@@ -132,7 +132,7 @@ export declare function jobsPageWithRetry<const TQueues extends readonly JobsEnt
|
|
|
132
132
|
JobsPayloadInvalid: typeof import("./schemas.ts").JobsPayloadInvalid;
|
|
133
133
|
JobsQueueUnregistered: typeof import("./schemas.ts").JobsQueueUnregistered;
|
|
134
134
|
JobsUnavailable: typeof import("./schemas.ts").JobsUnavailable;
|
|
135
|
-
}, never
|
|
135
|
+
}, never>>, "readPolicy"> & {
|
|
136
136
|
readonly readPolicy: import("@shivaedev/contract/readPolicy.ts").QueryReadPolicy<{
|
|
137
137
|
readonly cursor?: string;
|
|
138
138
|
readonly limit: number;
|
|
@@ -167,7 +167,7 @@ export declare function jobsPageWithRetry<const TQueues extends readonly JobsEnt
|
|
|
167
167
|
JobsPayloadInvalid: typeof import("./schemas.ts").JobsPayloadInvalid;
|
|
168
168
|
JobsQueueUnregistered: typeof import("./schemas.ts").JobsQueueUnregistered;
|
|
169
169
|
JobsUnavailable: typeof import("./schemas.ts").JobsUnavailable;
|
|
170
|
-
}, never
|
|
170
|
+
}, never>>, "readPolicy"> & {
|
|
171
171
|
readonly readPolicy: import("@shivaedev/contract/readPolicy.ts").QueryReadPolicy<{
|
|
172
172
|
readonly id: string;
|
|
173
173
|
readonly queue: string;
|
|
@@ -187,6 +187,14 @@ export declare function jobsPageWithRetry<const TQueues extends readonly JobsEnt
|
|
|
187
187
|
readonly JobsUnavailable: typeof import("./schemas.ts").JobsUnavailable;
|
|
188
188
|
readonly Forbidden: typeof Forbidden;
|
|
189
189
|
readonly JobsNotFailed: typeof JobsNotFailed;
|
|
190
|
+
}>>, NoInfer<import("@shivaedev/contract/operation.ts").Command<"runScheduleNow", Schema.Struct<{
|
|
191
|
+
queue: Schema.String;
|
|
192
|
+
}>, Schema.OptionFromNullOr<Schema.String>, {
|
|
193
|
+
readonly BadRequest: typeof import("@shivaedev/errors/taxonomy.ts").BadRequest;
|
|
194
|
+
readonly JobsPayloadInvalid: typeof import("./schemas.ts").JobsPayloadInvalid;
|
|
195
|
+
readonly JobsQueueUnregistered: typeof import("./schemas.ts").JobsQueueUnregistered;
|
|
196
|
+
readonly JobsUnavailable: typeof import("./schemas.ts").JobsUnavailable;
|
|
197
|
+
readonly Forbidden: typeof Forbidden;
|
|
190
198
|
}>>], import("effect/rpc/Rpc").Rpc<"admin.jobs.$changes", Schema.Struct<{
|
|
191
199
|
queries: Schema.$Array<Schema.Union<readonly (Schema.Struct<{
|
|
192
200
|
query: Schema.Literal<"counts">;
|
|
@@ -217,25 +225,10 @@ export declare function jobsPageWithRetry<const TQueues extends readonly JobsEnt
|
|
|
217
225
|
queue: Schema.String;
|
|
218
226
|
}>;
|
|
219
227
|
}>)[]>>;
|
|
220
|
-
}>, import("effect/rpc/RpcSchema").Stream<Schema.Union<readonly [
|
|
221
|
-
readonly _tag: Schema.Literal<"
|
|
222
|
-
readonly
|
|
223
|
-
|
|
224
|
-
readonly collection: Schema.String;
|
|
225
|
-
readonly field: Schema.String;
|
|
226
|
-
readonly value: Schema.Union<readonly [Schema.String, Schema.Number]>;
|
|
227
|
-
}>, Schema.Struct<{
|
|
228
|
-
readonly _tag: Schema.Literal<"List">;
|
|
229
|
-
readonly collection: Schema.String;
|
|
230
|
-
}>, Schema.Struct<{
|
|
231
|
-
readonly _tag: Schema.Literal<"Item">;
|
|
232
|
-
readonly collection: Schema.String;
|
|
233
|
-
readonly id: Schema.Union<readonly [Schema.String, Schema.Number]>;
|
|
234
|
-
}>]>>;
|
|
235
|
-
readonly queryIndexes: Schema.optional<Schema.$Array<Schema.Number>>;
|
|
236
|
-
}>, Schema.Struct<{
|
|
237
|
-
readonly _tag: Schema.Literal<"Resync">;
|
|
238
|
-
}>]>, typeof import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied, ...(Schema.Struct<{
|
|
228
|
+
}>, import("effect/rpc/RpcSchema").Stream<Schema.Union<readonly [typeof import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied, ...(Schema.Struct<{
|
|
229
|
+
readonly _tag: Schema.Literal<"Unchanged">;
|
|
230
|
+
readonly queryIndex: Schema.Number;
|
|
231
|
+
}> | Schema.Struct<{
|
|
239
232
|
_tag: Schema.Literal<"Result">;
|
|
240
233
|
query: Schema.Literal<"counts">;
|
|
241
234
|
queryIndex: Schema.Number;
|
|
@@ -476,9 +469,12 @@ export declare function jobsPageWithRetry<const TQueues extends readonly JobsEnt
|
|
|
476
469
|
}), never> | import("effect/rpc/Rpc").Rpc<"admin.jobs.retry", Schema.Struct<{
|
|
477
470
|
id: Schema.String;
|
|
478
471
|
queue: Schema.String;
|
|
479
|
-
}>, Schema.Void, Schema.Union<readonly (typeof Forbidden | typeof import("@shivaedev/errors/taxonomy.ts").BadRequest | typeof import("./schemas.ts").JobsUnavailable | typeof import("./schemas.ts").JobsPayloadInvalid | typeof import("./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("./schemas.ts").JobsUnavailable | typeof import("./schemas.ts").JobsPayloadInvalid | typeof import("./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("./schemas.ts").JobsUnavailable | typeof import("./schemas.ts").JobsPayloadInvalid | typeof import("./schemas.ts").JobsQueueUnregistered)[]>, typeof JobsPermission, never>, readonly [], undefined>;
|
|
480
475
|
} & {
|
|
481
476
|
queues: TQueues;
|
|
477
|
+
schedules: JobsEntry[];
|
|
482
478
|
};
|
|
483
479
|
export {};
|
|
484
480
|
//# sourceMappingURL=retryPage.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"retryPage.d.ts","sourceRoot":"","sources":["../../src/jobs/retryPage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAGhC,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAE1D,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;;;;;AAK5C,qBAAa,aAAc,SAAQ,kBAGjC;CAAG;AAEL,wBAAgB,iBAAiB,CAAC,KAAK,CAAC,OAAO,SAAS,SAAS,SAAS,EAAE,EAAE,GAAG,MAAM,EAAE,OAAO
|
|
1
|
+
{"version":3,"file":"retryPage.d.ts","sourceRoot":"","sources":["../../src/jobs/retryPage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAGhC,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAE1D,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;;;;;AAK5C,qBAAa,aAAc,SAAQ,kBAGjC;CAAG;AAEL,wBAAgB,iBAAiB,CAAC,KAAK,CAAC,OAAO,SAAS,SAAS,SAAS,EAAE,EAAE,GAAG,MAAM,EAAE,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAqC/F"}
|
package/dist/jobs/retryPage.js
CHANGED
|
@@ -28,12 +28,23 @@ export function jobsPageWithRetry(...queues) {
|
|
|
28
28
|
payload: { id: Schema.String, queue: Schema.String },
|
|
29
29
|
rejections: { ...JobsFailures, Forbidden, JobsNotFailed },
|
|
30
30
|
}),
|
|
31
|
+
command("runScheduleNow", {
|
|
32
|
+
invalidates: ({ queue }) => [
|
|
33
|
+
jobsKeys.health.list,
|
|
34
|
+
jobsKeys.counts.item(queue),
|
|
35
|
+
jobsKeys.failed.item(queue),
|
|
36
|
+
jobsKeys.deadLettered.item(queue),
|
|
37
|
+
],
|
|
38
|
+
payload: { queue: Schema.String },
|
|
39
|
+
rejections: { ...JobsFailures, Forbidden },
|
|
40
|
+
success: Schema.OptionFromNullOr(Schema.String),
|
|
41
|
+
}),
|
|
31
42
|
],
|
|
32
43
|
queries: page.contract.declaration.queries,
|
|
33
44
|
}),
|
|
34
45
|
id: page.id,
|
|
35
46
|
permission: JobsPermission,
|
|
36
47
|
route: page.route,
|
|
37
|
-
}), { queues });
|
|
48
|
+
}), { queues, schedules: queues.filter((entry) => !("schema" in entry)) });
|
|
38
49
|
}
|
|
39
50
|
//# sourceMappingURL=retryPage.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"retryPage.js","sourceRoot":"","sources":["../../src/jobs/retryPage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,QAAQ,EAAE,MAAM,iCAAiC,CAAC;AAC3D,OAAO,EAAE,OAAO,EAAE,MAAM,kCAAkC,CAAC;AAC3D,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAC1D,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AACrC,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEjD,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AACrC,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AACrC,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAE5C,MAAM,OAAO,aAAc,SAAQ,MAAM,CAAC,WAAW,EAAiB,CAAC,eAAe,EAAE;IACvF,EAAE,EAAE,MAAM,CAAC,MAAM;IACjB,KAAK,EAAE,MAAM,CAAC,MAAM;CACpB,CAAC;CAAG;AAEL,MAAM,UAAU,iBAAiB,CAA6C,GAAG,MAAe;IAC/F,MAAM,IAAI,GAAG,QAAQ,CAAC,GAAG,MAAM,CAAC,CAAC;IACjC,OAAO,MAAM,CAAC,MAAM,CACnB,SAAS,CAAC;QACT,QAAQ,EAAE,QAAQ,CAAC,YAAY,EAAE;YAChC,QAAQ,EAAE;gBACT,OAAO,CAAC,OAAO,EAAE;oBAChB,WAAW,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC;wBAC/B,QAAQ,CAAC,MAAM,CAAC,IAAI;wBACpB,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC;wBAC3B,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC;wBAC3B,QAAQ,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC;wBACjC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC;qBAC5B;oBACD,OAAO,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE;oBACpD,UAAU,EAAE,EAAE,GAAG,YAAY,EAAE,SAAS,EAAE,aAAa,EAAE;iBACzD,CAAC;aACF;YACD,OAAO,EAAE,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,OAAO;SAC1C,CAAC;QACF,EAAE,EAAE,IAAI,CAAC,EAAE;QACX,UAAU,EAAE,cAAc;QAC1B,KAAK,EAAE,IAAI,CAAC,KAAK;KACjB,CAAC,EACF,EAAE,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"retryPage.js","sourceRoot":"","sources":["../../src/jobs/retryPage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,QAAQ,EAAE,MAAM,iCAAiC,CAAC;AAC3D,OAAO,EAAE,OAAO,EAAE,MAAM,kCAAkC,CAAC;AAC3D,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAC1D,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AACrC,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEjD,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AACrC,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AACrC,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAE5C,MAAM,OAAO,aAAc,SAAQ,MAAM,CAAC,WAAW,EAAiB,CAAC,eAAe,EAAE;IACvF,EAAE,EAAE,MAAM,CAAC,MAAM;IACjB,KAAK,EAAE,MAAM,CAAC,MAAM;CACpB,CAAC;CAAG;AAEL,MAAM,UAAU,iBAAiB,CAA6C,GAAG,MAAe;IAC/F,MAAM,IAAI,GAAG,QAAQ,CAAC,GAAG,MAAM,CAAC,CAAC;IACjC,OAAO,MAAM,CAAC,MAAM,CACnB,SAAS,CAAC;QACT,QAAQ,EAAE,QAAQ,CAAC,YAAY,EAAE;YAChC,QAAQ,EAAE;gBACT,OAAO,CAAC,OAAO,EAAE;oBAChB,WAAW,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC;wBAC/B,QAAQ,CAAC,MAAM,CAAC,IAAI;wBACpB,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC;wBAC3B,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC;wBAC3B,QAAQ,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC;wBACjC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC;qBAC5B;oBACD,OAAO,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE;oBACpD,UAAU,EAAE,EAAE,GAAG,YAAY,EAAE,SAAS,EAAE,aAAa,EAAE;iBACzD,CAAC;gBACF,OAAO,CAAC,gBAAgB,EAAE;oBACzB,WAAW,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC;wBAC3B,QAAQ,CAAC,MAAM,CAAC,IAAI;wBACpB,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC;wBAC3B,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC;wBAC3B,QAAQ,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC;qBACjC;oBACD,OAAO,EAAE,EAAE,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE;oBACjC,UAAU,EAAE,EAAE,GAAG,YAAY,EAAE,SAAS,EAAE;oBAC1C,OAAO,EAAE,MAAM,CAAC,gBAAgB,CAAC,MAAM,CAAC,MAAM,CAAC;iBAC/C,CAAC;aACF;YACD,OAAO,EAAE,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,OAAO;SAC1C,CAAC;QACF,EAAE,EAAE,IAAI,CAAC,EAAE;QACX,UAAU,EAAE,cAAc;QAC1B,KAAK,EAAE,IAAI,CAAC,KAAK;KACjB,CAAC,EACF,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,IAAI,KAAK,CAAC,CAAC,EAAE,CACrE,CAAC;AACH,CAAC"}
|
|
@@ -3,5 +3,5 @@ import { SessionUser } from "@shivaedev/identity/identity.ts";
|
|
|
3
3
|
import type { PgBossService } from "@shivaedev/jobs/server/service.ts";
|
|
4
4
|
import { type JobsEntry, type JobsPayload } from "#jobs/entry.ts";
|
|
5
5
|
import { type jobsPageWithRetry } from "#jobs/retryPage.ts";
|
|
6
|
-
export declare function jobsHandlersWithRetry<const TQueues extends readonly JobsEntry[], TService>(page: ReturnType<typeof jobsPageWithRetry<TQueues>>, service: Context.Service<TService, PgBossService>): import("effect/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"> | import("effect/rpc/Rpc").Handler<"admin.jobs.retry">, never, Exclude<Exclude<TService, import("@shivaedev/identity/identity.ts").Identity | SessionUser>, import("effect/Scope").Scope> | Exclude<Exclude<TService, import("@shivaedev/identity/identity.ts").Identity | SessionUser>, import("effect/Scope").Scope> | Exclude<Exclude<TService, import("@shivaedev/identity/identity.ts").Identity | SessionUser>, import("effect/Scope").Scope> | Exclude<Exclude<JobsPayload<TQueues[number]>["DecodingServices"], import("@shivaedev/identity/identity.ts").Identity | SessionUser>, import("effect/Scope").Scope> | Exclude<Exclude<JobsPayload<TQueues[number]>["DecodingServices"], import("@shivaedev/identity/identity.ts").Identity | SessionUser>, import("effect/Scope").Scope>>;
|
|
6
|
+
export declare function jobsHandlersWithRetry<const TQueues extends readonly JobsEntry[], TService>(page: ReturnType<typeof jobsPageWithRetry<TQueues>>, service: Context.Service<TService, PgBossService>): import("effect/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"> | import("effect/rpc/Rpc").Handler<"admin.jobs.retry"> | import("effect/rpc/Rpc").Handler<"admin.jobs.runScheduleNow">, never, Exclude<Exclude<TService, import("@shivaedev/identity/identity.ts").Identity | SessionUser>, import("effect/Scope").Scope> | Exclude<Exclude<TService, import("@shivaedev/identity/identity.ts").Identity | SessionUser>, import("effect/Scope").Scope> | Exclude<Exclude<TService, import("@shivaedev/identity/identity.ts").Identity | SessionUser>, import("effect/Scope").Scope> | Exclude<Exclude<TService, import("@shivaedev/identity/identity.ts").Identity | SessionUser>, import("effect/Scope").Scope> | Exclude<Exclude<JobsPayload<TQueues[number]>["DecodingServices"], import("@shivaedev/identity/identity.ts").Identity | SessionUser>, import("effect/Scope").Scope> | Exclude<Exclude<JobsPayload<TQueues[number]>["DecodingServices"], import("@shivaedev/identity/identity.ts").Identity | SessionUser>, import("effect/Scope").Scope>>;
|
|
7
7
|
//# sourceMappingURL=jobsHandlersWithRetry.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jobsHandlersWithRetry.d.ts","sourceRoot":"","sources":["../../src/server/jobsHandlersWithRetry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,OAAO,EAAkB,MAAM,QAAQ,CAAC;AAEtD,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAC9D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AACvE,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,WAAW,EAAa,MAAM,gBAAgB,CAAC;AAC7E,OAAO,EAAiB,KAAK,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAK3E,wBAAgB,qBAAqB,CAAC,KAAK,CAAC,OAAO,SAAS,SAAS,SAAS,EAAE,EAAE,QAAQ,EACzF,IAAI,EAAE,UAAU,CAAC,OAAO,iBAAiB,CAAC,OAAO,CAAC,CAAC,EACnD,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,QAAQ,EAAE,aAAa,CAAC,
|
|
1
|
+
{"version":3,"file":"jobsHandlersWithRetry.d.ts","sourceRoot":"","sources":["../../src/server/jobsHandlersWithRetry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,OAAO,EAAkB,MAAM,QAAQ,CAAC;AAEtD,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAC9D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AACvE,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,WAAW,EAAa,MAAM,gBAAgB,CAAC;AAC7E,OAAO,EAAiB,KAAK,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAK3E,wBAAgB,qBAAqB,CAAC,KAAK,CAAC,OAAO,SAAS,SAAS,SAAS,EAAE,EAAE,QAAQ,EACzF,IAAI,EAAE,UAAU,CAAC,OAAO,iBAAiB,CAAC,OAAO,CAAC,CAAC,EACnD,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,QAAQ,EAAE,aAAa,CAAC,qvCAoCjD"}
|
|
@@ -25,6 +25,16 @@ export function jobsHandlersWithRetry(page, service) {
|
|
|
25
25
|
}
|
|
26
26
|
yield* jobsFailures(runtime.retry(definition, id));
|
|
27
27
|
}),
|
|
28
|
+
"admin.jobs.runScheduleNow": ({ queue }) => Effect.gen(function* () {
|
|
29
|
+
yield* requirePermission(yield* SessionUser, RetryJobs);
|
|
30
|
+
const entries = page.queues;
|
|
31
|
+
const entry = entries.find((candidate) => candidate.name === queue && !("schema" in candidate));
|
|
32
|
+
if (entry === undefined || "schema" in entry) {
|
|
33
|
+
return yield* Effect.fail(new JobsQueueUnregistered({ queue }));
|
|
34
|
+
}
|
|
35
|
+
const runtime = yield* service;
|
|
36
|
+
return yield* runtime.runScheduleNow({ name: entry.name, scheduleOptions: entry.scheduleOptions ?? {} }).pipe(Effect.catchTag("PgBossNotFoundError", () => Effect.fail(new JobsQueueUnregistered({ queue }))), Effect.catchTag("PgBossError", (error) => jobsFailures(Effect.fail(error))));
|
|
37
|
+
}),
|
|
28
38
|
});
|
|
29
39
|
}
|
|
30
40
|
//# sourceMappingURL=jobsHandlersWithRetry.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jobsHandlersWithRetry.js","sourceRoot":"","sources":["../../src/server/jobsHandlersWithRetry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACtD,OAAO,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAC3E,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAE9D,OAAO,EAAoC,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC7E,OAAO,EAAE,aAAa,EAA0B,MAAM,oBAAoB,CAAC;AAC3E,OAAO,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AACzD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAEnE,MAAM,UAAU,qBAAqB,CACpC,IAAmD,EACnD,OAAiD;IAEjD,OAAO,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,OAAO,CAAC;QACxC,GAAG,gBAAgB,CAAC,IAAI,EAAE,OAAO,CAAC;QAClC,kBAAkB,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,CACrC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;YACnB,KAAK,CAAC,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;YACxD,MAAM,OAAO,GAA+B,IAAI,CAAC,MAAM,CAAC;YACxD,MAAM,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,IAAI,KAAK,KAAK,CAAC,CAAC;YACpE,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;gBACzB,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,qBAAqB,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;YACjE,CAAC;YACD,MAAM,UAAU,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC;YACpC,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,OAAO,CAAC;YAC/B,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC;YACzC,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM,CAAuC,UAAU,EAAE,EAAE,CAAC,CAAC,CAAC;YACnG,IAAI,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,KAAK,CAAC,KAAK,KAAK,QAAQ,EAAE,CAAC;gBACxD,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,aAAa,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;YAC7D,CAAC;YACD,KAAK,CAAC,CAAC,YAAY,CAAC,OAAO,CAAC,KAAK,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC,CAAC;QACpD,CAAC,CAAC;KACH,CAAC,CAAC;AACJ,CAAC"}
|
|
1
|
+
{"version":3,"file":"jobsHandlersWithRetry.js","sourceRoot":"","sources":["../../src/server/jobsHandlersWithRetry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACtD,OAAO,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAC3E,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAE9D,OAAO,EAAoC,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC7E,OAAO,EAAE,aAAa,EAA0B,MAAM,oBAAoB,CAAC;AAC3E,OAAO,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AACzD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAEnE,MAAM,UAAU,qBAAqB,CACpC,IAAmD,EACnD,OAAiD;IAEjD,OAAO,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,OAAO,CAAC;QACxC,GAAG,gBAAgB,CAAC,IAAI,EAAE,OAAO,CAAC;QAClC,kBAAkB,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,CACrC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;YACnB,KAAK,CAAC,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;YACxD,MAAM,OAAO,GAA+B,IAAI,CAAC,MAAM,CAAC;YACxD,MAAM,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,IAAI,KAAK,KAAK,CAAC,CAAC;YACpE,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;gBACzB,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,qBAAqB,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;YACjE,CAAC;YACD,MAAM,UAAU,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC;YACpC,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,OAAO,CAAC;YAC/B,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC;YACzC,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM,CAAuC,UAAU,EAAE,EAAE,CAAC,CAAC,CAAC;YACnG,IAAI,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,KAAK,CAAC,KAAK,KAAK,QAAQ,EAAE,CAAC;gBACxD,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,aAAa,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;YAC7D,CAAC;YACD,KAAK,CAAC,CAAC,YAAY,CAAC,OAAO,CAAC,KAAK,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC,CAAC;QACpD,CAAC,CAAC;QACH,2BAA2B,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAC1C,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;YACnB,KAAK,CAAC,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;YACxD,MAAM,OAAO,GAAyB,IAAI,CAAC,MAAM,CAAC;YAClD,MAAM,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,IAAI,KAAK,KAAK,IAAI,CAAC,CAAC,QAAQ,IAAI,SAAS,CAAC,CAAC,CAAC;YAChG,IAAI,KAAK,KAAK,SAAS,IAAI,QAAQ,IAAI,KAAK,EAAE,CAAC;gBAC9C,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,qBAAqB,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;YACjE,CAAC;YACD,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,OAAO,CAAC;YAC/B,OAAO,KAAK,CAAC,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,eAAe,EAAE,KAAK,CAAC,eAAe,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAC5G,MAAM,CAAC,QAAQ,CAAC,qBAAqB,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,qBAAqB,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,EAC/F,MAAM,CAAC,QAAQ,CAAC,aAAa,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAC3E,CAAC;QACH,CAAC,CAAC;KACH,CAAC,CAAC;AACJ,CAAC"}
|
package/dist/sessions/Page.d.ts
CHANGED
|
@@ -33,7 +33,7 @@ export declare const SessionsPage: import("#page.ts").AdminPage & {
|
|
|
33
33
|
}>, {
|
|
34
34
|
readonly AuthUnavailable: typeof import("@shivaedev/errors/taxonomy.ts").AuthUnavailable;
|
|
35
35
|
readonly Forbidden: typeof import("@shivaedev/errors/taxonomy.ts").Forbidden;
|
|
36
|
-
}, never
|
|
36
|
+
}, never>>, "readPolicy"> & {
|
|
37
37
|
readonly readPolicy: import("@shivaedev/contract/readPolicy.ts").QueryReadPolicy<{
|
|
38
38
|
readonly cursor?: {
|
|
39
39
|
readonly id: string;
|
|
@@ -58,25 +58,10 @@ export declare const SessionsPage: import("#page.ts").AdminPage & {
|
|
|
58
58
|
readonly limit: import("effect/Schema").Number;
|
|
59
59
|
}>;
|
|
60
60
|
}>[]>>;
|
|
61
|
-
}>, import("effect/rpc/RpcSchema").Stream<import("effect/Schema").Union<readonly [import("
|
|
62
|
-
readonly _tag: import("effect/Schema").Literal<"
|
|
63
|
-
readonly
|
|
64
|
-
|
|
65
|
-
readonly collection: import("effect/Schema").String;
|
|
66
|
-
readonly field: import("effect/Schema").String;
|
|
67
|
-
readonly value: import("effect/Schema").Union<readonly [import("effect/Schema").String, import("effect/Schema").Number]>;
|
|
68
|
-
}>, import("effect/Schema").Struct<{
|
|
69
|
-
readonly _tag: import("effect/Schema").Literal<"List">;
|
|
70
|
-
readonly collection: import("effect/Schema").String;
|
|
71
|
-
}>, import("effect/Schema").Struct<{
|
|
72
|
-
readonly _tag: import("effect/Schema").Literal<"Item">;
|
|
73
|
-
readonly collection: import("effect/Schema").String;
|
|
74
|
-
readonly id: import("effect/Schema").Union<readonly [import("effect/Schema").String, import("effect/Schema").Number]>;
|
|
75
|
-
}>]>>;
|
|
76
|
-
readonly queryIndexes: import("effect/Schema").optional<import("effect/Schema").$Array<import("effect/Schema").Number>>;
|
|
77
|
-
}>, import("effect/Schema").Struct<{
|
|
78
|
-
readonly _tag: import("effect/Schema").Literal<"Resync">;
|
|
79
|
-
}>]>, typeof import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied, ...import("effect/Schema").Struct<{
|
|
61
|
+
}>, import("effect/rpc/RpcSchema").Stream<import("effect/Schema").Union<readonly [typeof import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied, ...(import("effect/Schema").Struct<{
|
|
62
|
+
readonly _tag: import("effect/Schema").Literal<"Unchanged">;
|
|
63
|
+
readonly queryIndex: import("effect/Schema").Number;
|
|
64
|
+
}> | import("effect/Schema").Struct<{
|
|
80
65
|
_tag: import("effect/Schema").Literal<"Result">;
|
|
81
66
|
query: import("effect/Schema").Literal<"list">;
|
|
82
67
|
queryIndex: import("effect/Schema").Number;
|
|
@@ -97,7 +82,7 @@ export declare const SessionsPage: import("#page.ts").AdminPage & {
|
|
|
97
82
|
}>;
|
|
98
83
|
}>>;
|
|
99
84
|
}>;
|
|
100
|
-
}>[]]>, import("effect/Schema").Union<readonly [typeof import("@shivaedev/contract/readPolicyErrors.ts").MissingReadPolicy, typeof import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied, typeof import("@shivaedev/contract/WebSocketRequired.ts").WebSocketRequired, ...import("effect/Schema").Union<readonly (typeof import("@shivaedev/errors/taxonomy.ts").Forbidden | typeof import("@shivaedev/errors/taxonomy.ts").AuthUnavailable)[]>[]]>>, import("effect/Schema").Never, typeof SessionsPermission | (import("effect/Context").Reference<<A, E, R>(effect: import("effect/Effect").Effect<A, E, R>, request: {
|
|
85
|
+
}>)[]]>, import("effect/Schema").Union<readonly [typeof import("@shivaedev/contract/readPolicyErrors.ts").MissingReadPolicy, typeof import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied, typeof import("@shivaedev/contract/WebSocketRequired.ts").WebSocketRequired, ...import("effect/Schema").Union<readonly (typeof import("@shivaedev/errors/taxonomy.ts").Forbidden | typeof import("@shivaedev/errors/taxonomy.ts").AuthUnavailable)[]>[]]>>, import("effect/Schema").Never, typeof SessionsPermission | (import("effect/Context").Reference<<A, E, R>(effect: import("effect/Effect").Effect<A, E, R>, request: {
|
|
101
86
|
readonly rpc: import("effect/rpc/Rpc").Any;
|
|
102
87
|
readonly payload: unknown;
|
|
103
88
|
}) => 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>> & {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Page.d.ts","sourceRoot":"","sources":["../../src/sessions/Page.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,2CAA2C,CAAC;AAI/E,eAAO,MAAM,YAAY
|
|
1
|
+
{"version":3,"file":"Page.d.ts","sourceRoot":"","sources":["../../src/sessions/Page.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,2CAA2C,CAAC;AAI/E,eAAO,MAAM,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAKvB,CAAC"}
|
package/dist/users/page.d.ts
CHANGED
|
@@ -39,7 +39,7 @@ export declare function usersPage<const TRole extends string>(access: Pick<Acces
|
|
|
39
39
|
}>, {
|
|
40
40
|
readonly AuthUnavailable: typeof AuthUnavailable;
|
|
41
41
|
readonly Forbidden: typeof Forbidden;
|
|
42
|
-
}, never
|
|
42
|
+
}, never>>, "readPolicy"> & {
|
|
43
43
|
readonly readPolicy: import("@shivaedev/contract/readPolicy.ts").QueryReadPolicy<{
|
|
44
44
|
readonly cursor?: string;
|
|
45
45
|
readonly limit: number;
|
|
@@ -52,10 +52,7 @@ export declare function usersPage<const TRole extends string>(access: Pick<Acces
|
|
|
52
52
|
readonly Forbidden: typeof Forbidden;
|
|
53
53
|
readonly LastRoleAssigner: typeof LastRoleAssigner;
|
|
54
54
|
readonly NotFound: typeof NotFound;
|
|
55
|
-
}>>], import("effect/rpc/Rpc").Rpc<"admin.users
|
|
56
|
-
role: Schema.Literals<TRole[]>;
|
|
57
|
-
userId: Schema.String;
|
|
58
|
-
}>, Schema.Void, Schema.Union<readonly (typeof NotFound | typeof Forbidden | typeof AuthUnavailable | typeof LastRoleAssigner)[]>, typeof UsersPermission, never> | import("effect/rpc/Rpc").Rpc<"admin.users.$changes", Schema.Struct<{
|
|
55
|
+
}>>], import("effect/rpc/Rpc").Rpc<"admin.users.$changes", Schema.Struct<{
|
|
59
56
|
queries: Schema.$Array<Schema.Union<readonly Schema.Struct<{
|
|
60
57
|
query: Schema.Literal<"list">;
|
|
61
58
|
payload: Schema.Struct<{
|
|
@@ -63,25 +60,10 @@ export declare function usersPage<const TRole extends string>(access: Pick<Acces
|
|
|
63
60
|
readonly limit: Schema.Number;
|
|
64
61
|
}>;
|
|
65
62
|
}>[]>>;
|
|
66
|
-
}>, import("effect/rpc/RpcSchema").Stream<Schema.Union<readonly [
|
|
67
|
-
readonly _tag: Schema.Literal<"
|
|
68
|
-
readonly
|
|
69
|
-
|
|
70
|
-
readonly collection: Schema.String;
|
|
71
|
-
readonly field: Schema.String;
|
|
72
|
-
readonly value: Schema.Union<readonly [Schema.String, Schema.Number]>;
|
|
73
|
-
}>, Schema.Struct<{
|
|
74
|
-
readonly _tag: Schema.Literal<"List">;
|
|
75
|
-
readonly collection: Schema.String;
|
|
76
|
-
}>, Schema.Struct<{
|
|
77
|
-
readonly _tag: Schema.Literal<"Item">;
|
|
78
|
-
readonly collection: Schema.String;
|
|
79
|
-
readonly id: Schema.Union<readonly [Schema.String, Schema.Number]>;
|
|
80
|
-
}>]>>;
|
|
81
|
-
readonly queryIndexes: Schema.optional<Schema.$Array<Schema.Number>>;
|
|
82
|
-
}>, Schema.Struct<{
|
|
83
|
-
readonly _tag: Schema.Literal<"Resync">;
|
|
84
|
-
}>]>, typeof import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied, ...Schema.Struct<{
|
|
63
|
+
}>, import("effect/rpc/RpcSchema").Stream<Schema.Union<readonly [typeof import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied, ...(Schema.Struct<{
|
|
64
|
+
readonly _tag: Schema.Literal<"Unchanged">;
|
|
65
|
+
readonly queryIndex: Schema.Number;
|
|
66
|
+
}> | Schema.Struct<{
|
|
85
67
|
_tag: Schema.Literal<"Result">;
|
|
86
68
|
query: Schema.Literal<"list">;
|
|
87
69
|
queryIndex: Schema.Number;
|
|
@@ -96,7 +78,7 @@ export declare function usersPage<const TRole extends string>(access: Pick<Acces
|
|
|
96
78
|
}>>;
|
|
97
79
|
readonly canChangeRoles: Schema.Boolean;
|
|
98
80
|
}>;
|
|
99
|
-
}>[]]>, Schema.Union<readonly [typeof import("@shivaedev/contract/readPolicyErrors.ts").MissingReadPolicy, typeof import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied, typeof import("@shivaedev/contract/WebSocketRequired.ts").WebSocketRequired, ...Schema.Union<readonly (typeof Forbidden | typeof AuthUnavailable)[]>[]]>>, Schema.Never, typeof UsersPermission | (import("effect/Context").Reference<<A, E, R>(effect: Effect.Effect<A, E, R>, request: {
|
|
81
|
+
}>)[]]>, Schema.Union<readonly [typeof import("@shivaedev/contract/readPolicyErrors.ts").MissingReadPolicy, typeof import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied, typeof import("@shivaedev/contract/WebSocketRequired.ts").WebSocketRequired, ...Schema.Union<readonly (typeof Forbidden | typeof AuthUnavailable)[]>[]]>>, Schema.Never, typeof UsersPermission | (import("effect/Context").Reference<<A, E, R>(effect: Effect.Effect<A, E, R>, request: {
|
|
100
82
|
readonly rpc: import("effect/rpc/Rpc").Any;
|
|
101
83
|
readonly payload: unknown;
|
|
102
84
|
}) => 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>> & {
|
|
@@ -104,7 +86,10 @@ export declare function usersPage<const TRole extends string>(access: Pick<Acces
|
|
|
104
86
|
"~ClientError": never;
|
|
105
87
|
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]>;
|
|
106
88
|
requiredForClient: false;
|
|
107
|
-
}), never> | import("effect/rpc/Rpc").Rpc<"admin.users.
|
|
89
|
+
}), never> | import("effect/rpc/Rpc").Rpc<"admin.users.changeRole", Schema.Struct<{
|
|
90
|
+
role: Schema.Literals<TRole[]>;
|
|
91
|
+
userId: Schema.String;
|
|
92
|
+
}>, Schema.Void, Schema.Union<readonly (typeof NotFound | typeof Forbidden | typeof AuthUnavailable | typeof LastRoleAssigner)[]>, typeof UsersPermission, never> | import("effect/rpc/Rpc").Rpc<"admin.users.list", Schema.Struct<{
|
|
108
93
|
readonly cursor: Schema.optionalKey<Schema.String>;
|
|
109
94
|
readonly limit: Schema.Number;
|
|
110
95
|
}>, Schema.Struct<{
|
package/dist/users/page.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"page.d.ts","sourceRoot":"","sources":["../../src/users/page.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAGjE,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AACrF,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAGhE,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAElD,eAAO,MAAM,SAAS;;;;;;;;;;EAAwE,CAAC;AAC/F,wBAAgB,SAAS,CAAC,KAAK,CAAC,KAAK,SAAS,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC
|
|
1
|
+
{"version":3,"file":"page.d.ts","sourceRoot":"","sources":["../../src/users/page.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAGjE,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AACrF,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAGhE,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAElD,eAAO,MAAM,SAAS;;;;;;;;;;EAAwE,CAAC;AAC/F,wBAAgB,SAAS,CAAC,KAAK,CAAC,KAAK,SAAS,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAwB9F"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@shivaedev/admin",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.23.1",
|
|
4
4
|
"description": "Explicit admin page contracts and a protected native Effect RPC registry",
|
|
5
5
|
"homepage": "https://github.com/ShivaeDev/platform/tree/main/packages/admin#readme",
|
|
6
6
|
"bugs": {
|
|
@@ -44,21 +44,21 @@
|
|
|
44
44
|
"dependencies": {
|
|
45
45
|
"@shivaedev/access": "0.6.0",
|
|
46
46
|
"@shivaedev/changes": "0.11.0",
|
|
47
|
-
"@shivaedev/contract": "0.
|
|
47
|
+
"@shivaedev/contract": "0.43.0",
|
|
48
48
|
"@shivaedev/errors": "0.10.0",
|
|
49
|
-
"@shivaedev/identity": "0.
|
|
50
|
-
"@shivaedev/jobs": "0.
|
|
49
|
+
"@shivaedev/identity": "0.30.0",
|
|
50
|
+
"@shivaedev/jobs": "0.41.0"
|
|
51
51
|
},
|
|
52
52
|
"devDependencies": {
|
|
53
53
|
"@effect/atom-react": "4.1.0",
|
|
54
|
-
"@shivaedev/quality": "0.
|
|
55
|
-
"@shivaedev/rate-limit": "0.6.
|
|
56
|
-
"@shivaedev/react": "0.
|
|
57
|
-
"@shivaedev/server": "0.
|
|
58
|
-
"@shivaedev/sql": "0.
|
|
59
|
-
"@shivaedev/test-kits": "0.
|
|
60
|
-
"@shivaedev/test-sql": "0.24.
|
|
61
|
-
"@shivaedev/test-story": "0.
|
|
54
|
+
"@shivaedev/quality": "0.69.3",
|
|
55
|
+
"@shivaedev/rate-limit": "0.6.3",
|
|
56
|
+
"@shivaedev/react": "0.46.0",
|
|
57
|
+
"@shivaedev/server": "0.31.0",
|
|
58
|
+
"@shivaedev/sql": "0.45.0",
|
|
59
|
+
"@shivaedev/test-kits": "0.10.0",
|
|
60
|
+
"@shivaedev/test-sql": "0.24.3",
|
|
61
|
+
"@shivaedev/test-story": "0.45.0",
|
|
62
62
|
"@types/node": "24.19.2",
|
|
63
63
|
"@types/react": "19.3.0",
|
|
64
64
|
"@types/react-dom": "19.3.0",
|
|
@@ -71,7 +71,7 @@
|
|
|
71
71
|
},
|
|
72
72
|
"peerDependencies": {
|
|
73
73
|
"@effect/atom-react": "4.1.0",
|
|
74
|
-
"@shivaedev/react": "0.
|
|
74
|
+
"@shivaedev/react": "0.46.0",
|
|
75
75
|
"effect": "4.1.0",
|
|
76
76
|
"react": "19.3.1"
|
|
77
77
|
},
|
|
@@ -4,15 +4,18 @@ import type { QueueDisplay } from "@shivaedev/jobs/display.ts";
|
|
|
4
4
|
import { useQuery } from "@shivaedev/react/client/resultState.ts";
|
|
5
5
|
import { JobsHealthMetrics } from "./JobsMetrics.tsx";
|
|
6
6
|
import { JobsQueuePicker, JobsQueueView } from "./JobsQueueView.tsx";
|
|
7
|
-
import type { JobsViewClient, RetryJob } from "./jobsTypes.ts";
|
|
7
|
+
import type { JobsViewClient, RetryJob, RunScheduleNow } from "./jobsTypes.ts";
|
|
8
|
+
import { RunScheduleControl } from "./RunScheduleControl.tsx";
|
|
8
9
|
|
|
9
10
|
export interface JobsViewProps {
|
|
10
11
|
readonly api: JobsViewClient;
|
|
11
12
|
readonly queues: readonly (string | QueueDisplay)[];
|
|
12
13
|
readonly retry?: RetryJob | undefined;
|
|
14
|
+
readonly runScheduleNow?: RunScheduleNow | undefined;
|
|
15
|
+
readonly schedules?: readonly { readonly name: string }[];
|
|
13
16
|
}
|
|
14
17
|
|
|
15
|
-
export function JobsView({ api, queues, retry }: JobsViewProps) {
|
|
18
|
+
export function JobsView({ api, queues, retry, schedules, runScheduleNow }: JobsViewProps) {
|
|
16
19
|
const definitions = queues.map((definition) => (typeof definition === "string" ? { name: definition } : definition));
|
|
17
20
|
const [name, selectQueue] = useState(definitions[0]?.name ?? "");
|
|
18
21
|
const queue = definitions.find((candidate) => candidate.name === name);
|
|
@@ -31,6 +34,9 @@ export function JobsView({ api, queues, retry }: JobsViewProps) {
|
|
|
31
34
|
"div",
|
|
32
35
|
{ className: "min-w-0 space-y-6" },
|
|
33
36
|
createElement(JobsQueuePicker, { queues: definitions, select: selectQueue, value: name }),
|
|
37
|
+
runScheduleNow !== undefined && schedules?.some((schedule) => schedule.name === name)
|
|
38
|
+
? createElement(RunScheduleControl, { key: `run-${name}`, queue: name, run: runScheduleNow })
|
|
39
|
+
: null,
|
|
34
40
|
createElement(JobsQueueView, { api, key: name, label: queue.label, queue: name, retry, subject: queue.subject }),
|
|
35
41
|
),
|
|
36
42
|
);
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
import { Option } from "effect";
|
|
2
|
+
import { useAction } from "@shivaedev/react/client/resultState.ts";
|
|
3
|
+
import { JobButton } from "./JobButton.tsx";
|
|
4
|
+
import type { RunScheduleNow } from "./jobsTypes.ts";
|
|
5
|
+
|
|
6
|
+
export function RunScheduleControl({ queue, run }: { readonly queue: string; readonly run: RunScheduleNow }) {
|
|
7
|
+
const action = useAction(run);
|
|
8
|
+
const failure = Option.isSome(action.cause) ? <p role="alert">Could not run this schedule.</p> : null;
|
|
9
|
+
const status = Option.isSome(action.data) ? <p role="status">{Option.isSome(action.data.value) ? "Run requested." : "No run enqueued."}</p> : null;
|
|
10
|
+
return (
|
|
11
|
+
<div className="space-y-2">
|
|
12
|
+
<JobButton disabled={action.pending} onClick={() => action.dispatch({ queue })}>
|
|
13
|
+
{action.pending ? "Requesting…" : "Run now"}
|
|
14
|
+
</JobButton>
|
|
15
|
+
{failure}
|
|
16
|
+
{status}
|
|
17
|
+
</div>
|
|
18
|
+
);
|
|
19
|
+
}
|
|
@@ -30,3 +30,5 @@ export interface JobsViewClient {
|
|
|
30
30
|
readonly job: Query<JobId, Option.Option<Job>>;
|
|
31
31
|
}
|
|
32
32
|
export type RetryJob = Atom.AtomResultFn<JobId, void, unknown>;
|
|
33
|
+
|
|
34
|
+
export type RunScheduleNow = Atom.AtomResultFn<{ readonly queue: string }, Option.Option<string>, unknown>;
|
package/src/jobs/entry.ts
CHANGED
|
@@ -2,7 +2,7 @@ import { Schema } from "effect";
|
|
|
2
2
|
import type { QueueDisplay } from "@shivaedev/jobs/display.ts";
|
|
3
3
|
import type { JobsQueue } from "./schemas.ts";
|
|
4
4
|
|
|
5
|
-
export type JobsEntry = (JobsQueue | { readonly name: string }) & QueueDisplay;
|
|
5
|
+
export type JobsEntry = (JobsQueue | { readonly name: string; readonly scheduleOptions?: { readonly key?: string } }) & QueueDisplay;
|
|
6
6
|
|
|
7
7
|
export type JobsPayload<TEntry extends JobsEntry> = [TEntry] extends [never]
|
|
8
8
|
? typeof Schema.Never
|
package/src/jobs/retryPage.ts
CHANGED
|
@@ -31,6 +31,17 @@ export function jobsPageWithRetry<const TQueues extends readonly JobsEntry[]>(..
|
|
|
31
31
|
payload: { id: Schema.String, queue: Schema.String },
|
|
32
32
|
rejections: { ...JobsFailures, Forbidden, JobsNotFailed },
|
|
33
33
|
}),
|
|
34
|
+
command("runScheduleNow", {
|
|
35
|
+
invalidates: ({ queue }) => [
|
|
36
|
+
jobsKeys.health.list,
|
|
37
|
+
jobsKeys.counts.item(queue),
|
|
38
|
+
jobsKeys.failed.item(queue),
|
|
39
|
+
jobsKeys.deadLettered.item(queue),
|
|
40
|
+
],
|
|
41
|
+
payload: { queue: Schema.String },
|
|
42
|
+
rejections: { ...JobsFailures, Forbidden },
|
|
43
|
+
success: Schema.OptionFromNullOr(Schema.String),
|
|
44
|
+
}),
|
|
34
45
|
],
|
|
35
46
|
queries: page.contract.declaration.queries,
|
|
36
47
|
}),
|
|
@@ -38,6 +49,6 @@ export function jobsPageWithRetry<const TQueues extends readonly JobsEntry[]>(..
|
|
|
38
49
|
permission: JobsPermission,
|
|
39
50
|
route: page.route,
|
|
40
51
|
}),
|
|
41
|
-
{ queues },
|
|
52
|
+
{ queues, schedules: queues.filter((entry) => !("schema" in entry)) },
|
|
42
53
|
);
|
|
43
54
|
}
|
|
@@ -31,5 +31,19 @@ export function jobsHandlersWithRetry<const TQueues extends readonly JobsEntry[]
|
|
|
31
31
|
}
|
|
32
32
|
yield* jobsFailures(runtime.retry(definition, id));
|
|
33
33
|
}),
|
|
34
|
+
"admin.jobs.runScheduleNow": ({ queue }) =>
|
|
35
|
+
Effect.gen(function* () {
|
|
36
|
+
yield* requirePermission(yield* SessionUser, RetryJobs);
|
|
37
|
+
const entries: readonly JobsEntry[] = page.queues;
|
|
38
|
+
const entry = entries.find((candidate) => candidate.name === queue && !("schema" in candidate));
|
|
39
|
+
if (entry === undefined || "schema" in entry) {
|
|
40
|
+
return yield* Effect.fail(new JobsQueueUnregistered({ queue }));
|
|
41
|
+
}
|
|
42
|
+
const runtime = yield* service;
|
|
43
|
+
return yield* runtime.runScheduleNow({ name: entry.name, scheduleOptions: entry.scheduleOptions ?? {} }).pipe(
|
|
44
|
+
Effect.catchTag("PgBossNotFoundError", () => Effect.fail(new JobsQueueUnregistered({ queue }))),
|
|
45
|
+
Effect.catchTag("PgBossError", (error) => jobsFailures(Effect.fail(error))),
|
|
46
|
+
);
|
|
47
|
+
}),
|
|
34
48
|
});
|
|
35
49
|
}
|