@shivaedev/admin 0.22.1 → 0.23.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 +6 -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/retryPage.d.ts +16 -5
- 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 +4 -4
- package/dist/users/page.d.ts +5 -5
- package/package.json +12 -12
- 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
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/retryPage.d.ts
CHANGED
|
@@ -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">;
|
|
@@ -344,7 +352,12 @@ export declare function jobsPageWithRetry<const TQueues extends readonly JobsEnt
|
|
|
344
352
|
"~ClientError": never;
|
|
345
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]>;
|
|
346
354
|
requiredForClient: false;
|
|
347
|
-
}), never> | import("effect/rpc/Rpc").Rpc<"admin.jobs.
|
|
355
|
+
}), never> | import("effect/rpc/Rpc").Rpc<"admin.jobs.retry", Schema.Struct<{
|
|
356
|
+
id: Schema.String;
|
|
357
|
+
queue: Schema.String;
|
|
358
|
+
}>, 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<{
|
|
359
|
+
queue: Schema.String;
|
|
360
|
+
}>, 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> | import("effect/rpc/Rpc").Rpc<"admin.jobs.counts", Schema.Struct<{
|
|
348
361
|
queue: Schema.String;
|
|
349
362
|
}>, Schema.Struct<{
|
|
350
363
|
readonly activeCount: Schema.Number;
|
|
@@ -473,12 +486,10 @@ export declare function jobsPageWithRetry<const TQueues extends readonly JobsEnt
|
|
|
473
486
|
"~ClientError": never;
|
|
474
487
|
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]>;
|
|
475
488
|
requiredForClient: false;
|
|
476
|
-
}), never
|
|
477
|
-
id: Schema.String;
|
|
478
|
-
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>, readonly [], undefined>;
|
|
489
|
+
}), never>, readonly [], undefined>;
|
|
480
490
|
} & {
|
|
481
491
|
queues: TQueues;
|
|
492
|
+
schedules: JobsEntry[];
|
|
482
493
|
};
|
|
483
494
|
export {};
|
|
484
495
|
//# 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":"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"}
|
package/dist/sessions/Page.d.ts
CHANGED
|
@@ -105,7 +105,9 @@ export declare const SessionsPage: import("#page.ts").AdminPage & {
|
|
|
105
105
|
"~ClientError": never;
|
|
106
106
|
error: 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]>;
|
|
107
107
|
requiredForClient: false;
|
|
108
|
-
}), never> | import("effect/rpc/Rpc").Rpc<"identity.sessions.
|
|
108
|
+
}), never> | import("effect/rpc/Rpc").Rpc<"identity.sessions.revoke", import("effect/Schema").Struct<{
|
|
109
|
+
id: import("effect/Schema").String;
|
|
110
|
+
}>, import("effect/Schema").Void, import("effect/Schema").Union<readonly (typeof import("@shivaedev/errors/taxonomy.ts").NotFound | typeof import("@shivaedev/errors/taxonomy.ts").Forbidden | typeof import("@shivaedev/errors/taxonomy.ts").AuthUnavailable)[]>, typeof SessionsPermission, never> | import("effect/rpc/Rpc").Rpc<"identity.sessions.list", import("effect/Schema").Struct<{
|
|
109
111
|
readonly cursor: import("effect/Schema").optionalKey<import("effect/Schema").Struct<{
|
|
110
112
|
readonly id: import("effect/Schema").String;
|
|
111
113
|
readonly lastActivityAt: import("effect/Schema").DateTimeUtcFromString;
|
|
@@ -135,8 +137,6 @@ export declare const SessionsPage: import("#page.ts").AdminPage & {
|
|
|
135
137
|
"~ClientError": never;
|
|
136
138
|
error: 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]>;
|
|
137
139
|
requiredForClient: false;
|
|
138
|
-
}), never
|
|
139
|
-
id: import("effect/Schema").String;
|
|
140
|
-
}>, import("effect/Schema").Void, import("effect/Schema").Union<readonly (typeof import("@shivaedev/errors/taxonomy.ts").NotFound | typeof import("@shivaedev/errors/taxonomy.ts").Forbidden | typeof import("@shivaedev/errors/taxonomy.ts").AuthUnavailable)[]>, typeof SessionsPermission, never>, readonly [], undefined>;
|
|
140
|
+
}), never>, readonly [], undefined>;
|
|
141
141
|
};
|
|
142
142
|
//# sourceMappingURL=Page.d.ts.map
|
package/dist/users/page.d.ts
CHANGED
|
@@ -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<{
|
|
@@ -104,7 +101,10 @@ export declare function usersPage<const TRole extends string>(access: Pick<Acces
|
|
|
104
101
|
"~ClientError": never;
|
|
105
102
|
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
103
|
requiredForClient: false;
|
|
107
|
-
}), never> | import("effect/rpc/Rpc").Rpc<"admin.users.
|
|
104
|
+
}), never> | import("effect/rpc/Rpc").Rpc<"admin.users.changeRole", Schema.Struct<{
|
|
105
|
+
role: Schema.Literals<TRole[]>;
|
|
106
|
+
userId: Schema.String;
|
|
107
|
+
}>, 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
108
|
readonly cursor: Schema.optionalKey<Schema.String>;
|
|
109
109
|
readonly limit: Schema.Number;
|
|
110
110
|
}>, Schema.Struct<{
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@shivaedev/admin",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.23.0",
|
|
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": {
|
|
@@ -46,19 +46,19 @@
|
|
|
46
46
|
"@shivaedev/changes": "0.11.0",
|
|
47
47
|
"@shivaedev/contract": "0.42.0",
|
|
48
48
|
"@shivaedev/errors": "0.10.0",
|
|
49
|
-
"@shivaedev/identity": "0.29.
|
|
50
|
-
"@shivaedev/jobs": "0.
|
|
49
|
+
"@shivaedev/identity": "0.29.2",
|
|
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.45.
|
|
57
|
-
"@shivaedev/server": "0.
|
|
58
|
-
"@shivaedev/sql": "0.
|
|
59
|
-
"@shivaedev/test-kits": "0.9.
|
|
60
|
-
"@shivaedev/test-sql": "0.24.
|
|
61
|
-
"@shivaedev/test-story": "0.44.
|
|
54
|
+
"@shivaedev/quality": "0.69.1",
|
|
55
|
+
"@shivaedev/rate-limit": "0.6.3",
|
|
56
|
+
"@shivaedev/react": "0.45.1",
|
|
57
|
+
"@shivaedev/server": "0.30.0",
|
|
58
|
+
"@shivaedev/sql": "0.45.0",
|
|
59
|
+
"@shivaedev/test-kits": "0.9.3",
|
|
60
|
+
"@shivaedev/test-sql": "0.24.3",
|
|
61
|
+
"@shivaedev/test-story": "0.44.2",
|
|
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.45.
|
|
74
|
+
"@shivaedev/react": "0.45.1",
|
|
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
|
}
|