@shivaedev/admin 0.24.3 → 0.26.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 +37 -0
- package/README.md +104 -76
- package/dist/Jobs.d.ts +71 -0
- package/dist/Jobs.d.ts.map +1 -0
- package/dist/Jobs.js +13 -0
- package/dist/Jobs.js.map +1 -0
- package/dist/JobsWithRetry.d.ts +92 -0
- package/dist/JobsWithRetry.d.ts.map +1 -0
- package/dist/JobsWithRetry.js +40 -0
- package/dist/JobsWithRetry.js.map +1 -0
- package/dist/Users.d.ts +35 -0
- package/dist/Users.d.ts.map +1 -0
- package/dist/Users.js +35 -0
- package/dist/Users.js.map +1 -0
- package/dist/client/adapters/JobDetail.d.ts +5 -2
- package/dist/client/adapters/JobDetail.d.ts.map +1 -1
- package/dist/client/adapters/JobDetail.js +13 -9
- package/dist/client/adapters/JobDetail.js.map +1 -1
- package/dist/client/adapters/JobList.d.ts +3 -1
- package/dist/client/adapters/JobList.d.ts.map +1 -1
- package/dist/client/adapters/JobList.js +3 -3
- package/dist/client/adapters/JobList.js.map +1 -1
- package/dist/client/adapters/JobsQueueView.d.ts +3 -1
- package/dist/client/adapters/JobsQueueView.d.ts.map +1 -1
- package/dist/client/adapters/JobsQueueView.js +2 -2
- package/dist/client/adapters/JobsQueueView.js.map +1 -1
- package/dist/client/adapters/JobsView.d.ts +3 -2
- package/dist/client/adapters/JobsView.d.ts.map +1 -1
- package/dist/client/adapters/JobsView.js +10 -2
- package/dist/client/adapters/JobsView.js.map +1 -1
- package/dist/client/adapters/SessionConfirmation.d.ts +1 -1
- package/dist/client/adapters/SessionConfirmation.d.ts.map +1 -1
- package/dist/client/adapters/SessionListView.d.ts +3 -1
- package/dist/client/adapters/SessionListView.d.ts.map +1 -1
- package/dist/client/adapters/SessionListView.js +5 -5
- package/dist/client/adapters/SessionListView.js.map +1 -1
- package/dist/client/adapters/SessionPagination.d.ts +2 -2
- package/dist/client/adapters/SessionPagination.d.ts.map +1 -1
- package/dist/client/adapters/SessionsView.d.ts +5 -4
- package/dist/client/adapters/SessionsView.d.ts.map +1 -1
- package/dist/client/adapters/SessionsView.js +10 -2
- package/dist/client/adapters/SessionsView.js.map +1 -1
- package/dist/client/adapters/Timestamp.d.ts +8 -0
- package/dist/client/adapters/Timestamp.d.ts.map +1 -0
- package/dist/client/adapters/Timestamp.js +7 -0
- package/dist/client/adapters/Timestamp.js.map +1 -0
- package/dist/client/adapters/UsersTable.d.ts +4 -2
- package/dist/client/adapters/UsersTable.d.ts.map +1 -1
- package/dist/client/adapters/UsersTable.js +3 -3
- package/dist/client/adapters/UsersTable.js.map +1 -1
- package/dist/client/adapters/UsersView.d.ts +5 -4
- package/dist/client/adapters/UsersView.d.ts.map +1 -1
- package/dist/client/adapters/UsersView.js +4 -2
- package/dist/client/adapters/UsersView.js.map +1 -1
- package/dist/client/adapters/jobsTypes.d.ts +8 -8
- package/dist/client/adapters/jobsTypes.d.ts.map +1 -1
- package/dist/client/adapters/timestampText.d.ts +7 -0
- package/dist/client/adapters/timestampText.d.ts.map +1 -0
- package/dist/client/adapters/timestampText.js +9 -0
- package/dist/client/adapters/timestampText.js.map +1 -0
- package/dist/generated/Jobs.d.ts +144 -0
- package/dist/generated/Jobs.d.ts.map +1 -0
- package/dist/generated/Jobs.js +35 -0
- package/dist/generated/Jobs.js.map +1 -0
- package/dist/generated/JobsWithRetry.d.ts +182 -0
- package/dist/generated/JobsWithRetry.d.ts.map +1 -0
- package/dist/generated/JobsWithRetry.js +50 -0
- package/dist/generated/JobsWithRetry.js.map +1 -0
- package/dist/generated/Users.d.ts +65 -0
- package/dist/generated/Users.d.ts.map +1 -0
- package/dist/generated/Users.js +27 -0
- package/dist/generated/Users.js.map +1 -0
- package/dist/jobs/DeadLetter.d.ts +27 -0
- package/dist/jobs/DeadLetter.d.ts.map +1 -0
- package/dist/jobs/DeadLetter.js +11 -0
- package/dist/jobs/DeadLetter.js.map +1 -0
- package/dist/jobs/NotFailed.d.ts +9 -0
- package/dist/jobs/NotFailed.d.ts.map +1 -0
- package/dist/jobs/NotFailed.js +7 -0
- package/dist/jobs/NotFailed.js.map +1 -0
- package/dist/jobs/Page.d.ts +272 -0
- package/dist/jobs/Page.d.ts.map +1 -0
- package/dist/jobs/Page.js +10 -0
- package/dist/jobs/Page.js.map +1 -0
- package/dist/jobs/PageWithRetry.d.ts +296 -0
- package/dist/jobs/PageWithRetry.d.ts.map +1 -0
- package/dist/jobs/PageWithRetry.js +10 -0
- package/dist/jobs/PageWithRetry.js.map +1 -0
- package/dist/jobs/Row.d.ts +21 -0
- package/dist/jobs/Row.d.ts.map +1 -0
- package/dist/jobs/Row.js +5 -0
- package/dist/jobs/Row.js.map +1 -0
- package/dist/jobs/schemas.d.ts +2 -55
- package/dist/jobs/schemas.d.ts.map +1 -1
- package/dist/jobs/schemas.js +2 -19
- package/dist/jobs/schemas.js.map +1 -1
- package/dist/page.d.ts +4 -3
- package/dist/page.d.ts.map +1 -1
- package/dist/page.js.map +1 -1
- package/dist/server/RegisteredQueues.d.ts +21 -0
- package/dist/server/RegisteredQueues.d.ts.map +1 -0
- package/dist/server/RegisteredQueues.js +4 -0
- package/dist/server/RegisteredQueues.js.map +1 -0
- package/dist/server/adapters/pgBossQueues.d.ts +6 -0
- package/dist/server/adapters/pgBossQueues.d.ts.map +1 -0
- package/dist/server/adapters/pgBossQueues.js +57 -0
- package/dist/server/adapters/pgBossQueues.js.map +1 -0
- package/dist/server/jobsReads.d.ts +40 -0
- package/dist/server/jobsReads.d.ts.map +1 -0
- package/dist/server/jobsReads.js +65 -0
- package/dist/server/jobsReads.js.map +1 -0
- package/dist/sessions/Page.d.ts +29 -25
- package/dist/sessions/Page.d.ts.map +1 -1
- package/dist/sessions/Page.js +1 -1
- package/dist/sessions/Page.js.map +1 -1
- package/dist/users/List.d.ts +5 -0
- package/dist/users/List.d.ts.map +1 -0
- package/dist/users/List.js +2 -0
- package/dist/users/List.js.map +1 -0
- package/dist/users/Page.d.ts +104 -0
- package/dist/users/Page.d.ts.map +1 -0
- package/dist/users/Page.js +10 -0
- package/dist/users/Page.js.map +1 -0
- package/package.json +17 -15
- package/src/Jobs.ts +13 -0
- package/src/JobsWithRetry.ts +42 -0
- package/src/Users.ts +38 -0
- package/src/client/adapters/JobDetail.tsx +23 -8
- package/src/client/adapters/JobList.tsx +5 -2
- package/src/client/adapters/JobsQueueView.tsx +4 -1
- package/src/client/adapters/JobsView.ts +12 -3
- package/src/client/adapters/SessionConfirmation.tsx +1 -1
- package/src/client/adapters/SessionListView.tsx +8 -6
- package/src/client/adapters/SessionPagination.tsx +2 -2
- package/src/client/adapters/SessionsView.ts +14 -5
- package/src/client/adapters/Timestamp.tsx +18 -0
- package/src/client/adapters/UsersTable.tsx +9 -8
- package/src/client/adapters/UsersView.ts +8 -5
- package/src/client/adapters/jobsTypes.ts +8 -8
- package/src/client/adapters/timestampText.ts +17 -0
- package/src/generated/Jobs.ts +40 -0
- package/src/generated/JobsWithRetry.ts +55 -0
- package/src/generated/README.md +1 -0
- package/src/generated/Users.ts +32 -0
- package/src/jobs/DeadLetter.ts +10 -0
- package/src/jobs/NotFailed.ts +6 -0
- package/src/jobs/Page.ts +10 -0
- package/src/jobs/PageWithRetry.ts +10 -0
- package/src/jobs/Row.ts +4 -0
- package/src/jobs/schemas.ts +2 -23
- package/src/page.ts +8 -9
- package/src/server/RegisteredQueues.ts +22 -0
- package/src/server/adapters/pgBossQueues.ts +94 -0
- package/src/server/jobsReads.ts +72 -0
- package/src/sessions/Page.ts +1 -1
- package/src/users/List.ts +3 -0
- package/src/users/Page.ts +10 -0
- package/dist/jobs/page.d.ts +0 -425
- package/dist/jobs/page.d.ts.map +0 -1
- package/dist/jobs/page.js +0 -58
- package/dist/jobs/page.js.map +0 -1
- package/dist/jobs/retryPage.d.ts +0 -480
- package/dist/jobs/retryPage.d.ts.map +0 -1
- package/dist/jobs/retryPage.js +0 -50
- package/dist/jobs/retryPage.js.map +0 -1
- package/dist/server/jobsHandlers.d.ts +0 -62
- package/dist/server/jobsHandlers.d.ts.map +0 -1
- package/dist/server/jobsHandlers.js +0 -73
- package/dist/server/jobsHandlers.js.map +0 -1
- package/dist/server/jobsHandlersWithRetry.d.ts +0 -7
- package/dist/server/jobsHandlersWithRetry.d.ts.map +0 -1
- package/dist/server/jobsHandlersWithRetry.js +0 -43
- package/dist/server/jobsHandlersWithRetry.js.map +0 -1
- package/dist/server/usersHandlers.d.ts +0 -3
- package/dist/server/usersHandlers.d.ts.map +0 -1
- package/dist/server/usersHandlers.js +0 -15
- package/dist/server/usersHandlers.js.map +0 -1
- package/dist/users/page.d.ts +0 -115
- package/dist/users/page.d.ts.map +0 -1
- package/dist/users/page.js +0 -35
- package/dist/users/page.js.map +0 -1
- package/src/jobs/page.ts +0 -58
- package/src/jobs/retryPage.ts +0 -54
- package/src/server/jobsHandlers.ts +0 -95
- package/src/server/jobsHandlersWithRetry.ts +0 -59
- package/src/server/usersHandlers.ts +0 -17
- package/src/users/page.ts +0 -36
|
@@ -0,0 +1,42 @@
|
|
|
1
|
+
import { Schema } from "effect";
|
|
2
|
+
import { requirePermission } from "@shivaedev/access/requirePermission.ts";
|
|
3
|
+
import { defineModule } from "@shivaedev/contract/defineModule.ts";
|
|
4
|
+
import { command } from "@shivaedev/contract/operation.ts";
|
|
5
|
+
import { SessionUser } from "@shivaedev/identity/identity.ts";
|
|
6
|
+
import { adminJobsWire } from "#generated/JobsWithRetry.ts";
|
|
7
|
+
import { jobsKeys } from "#jobs/keys.ts";
|
|
8
|
+
import { JobsPermission, RetryJobs } from "#permissions.ts";
|
|
9
|
+
import { Counts, DeadLettered, Detail, Failed, Health } from "#server/jobsReads.ts";
|
|
10
|
+
import { RegisteredQueues } from "#server/RegisteredQueues.ts";
|
|
11
|
+
|
|
12
|
+
const Retry = command("retry", {
|
|
13
|
+
invalidates: ({ queue, id }) => [
|
|
14
|
+
jobsKeys.health.list,
|
|
15
|
+
jobsKeys.counts.item(queue),
|
|
16
|
+
jobsKeys.failed.item(queue),
|
|
17
|
+
jobsKeys.deadLettered.item(queue),
|
|
18
|
+
jobsKeys.job(queue).item(id),
|
|
19
|
+
],
|
|
20
|
+
payload: { id: Schema.String, queue: Schema.String },
|
|
21
|
+
*run({ id, queue }) {
|
|
22
|
+
yield* requirePermission(yield* SessionUser, RetryJobs);
|
|
23
|
+
yield* (yield* RegisteredQueues).retry(queue, id);
|
|
24
|
+
},
|
|
25
|
+
});
|
|
26
|
+
|
|
27
|
+
const RunScheduleNow = command("runScheduleNow", {
|
|
28
|
+
invalidates: ({ queue }) => [jobsKeys.health.list, jobsKeys.counts.item(queue), jobsKeys.failed.item(queue), jobsKeys.deadLettered.item(queue)],
|
|
29
|
+
payload: { queue: Schema.String },
|
|
30
|
+
*run({ queue }) {
|
|
31
|
+
yield* requirePermission(yield* SessionUser, RetryJobs);
|
|
32
|
+
return yield* (yield* RegisteredQueues).runScheduleNow(queue);
|
|
33
|
+
},
|
|
34
|
+
});
|
|
35
|
+
|
|
36
|
+
export const JobsWithRetry = defineModule({
|
|
37
|
+
middleware: JobsPermission,
|
|
38
|
+
name: "admin.jobs",
|
|
39
|
+
operations: [Health, Counts, Failed, DeadLettered, Detail, Retry, RunScheduleNow],
|
|
40
|
+
requires: [RegisteredQueues],
|
|
41
|
+
wire: adminJobsWire,
|
|
42
|
+
});
|
package/src/Users.ts
ADDED
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
import { Schema } from "effect";
|
|
2
|
+
import { defineModule } from "@shivaedev/contract/defineModule.ts";
|
|
3
|
+
import { command, query } from "@shivaedev/contract/operation.ts";
|
|
4
|
+
import { SessionUser } from "@shivaedev/identity/identity.ts";
|
|
5
|
+
import { hasPermission } from "@shivaedev/identity/permission.ts";
|
|
6
|
+
import { AssignRoles } from "@shivaedev/identity/roles.ts";
|
|
7
|
+
import { UserDirectory } from "@shivaedev/identity/server/UserDirectory.ts";
|
|
8
|
+
import { UserListInput, userKeys } from "@shivaedev/identity/users.ts";
|
|
9
|
+
import { adminUsersWire } from "#generated/Users.ts";
|
|
10
|
+
import { UsersPermission } from "#permissions.ts";
|
|
11
|
+
import { changeUserRole, listUsers } from "#server/users.ts";
|
|
12
|
+
import type { UsersList } from "#users/List.ts";
|
|
13
|
+
|
|
14
|
+
const ListUsers = query("list", {
|
|
15
|
+
payload: UserListInput.fields,
|
|
16
|
+
reads: () => [userKeys.list],
|
|
17
|
+
*run(input) {
|
|
18
|
+
const user = yield* SessionUser;
|
|
19
|
+
const list: UsersList = { ...(yield* listUsers(input)), canChangeRoles: hasPermission(user, AssignRoles) };
|
|
20
|
+
return list;
|
|
21
|
+
},
|
|
22
|
+
});
|
|
23
|
+
|
|
24
|
+
const ChangeRole = command("changeRole", {
|
|
25
|
+
invalidates: () => [userKeys.list],
|
|
26
|
+
payload: { role: Schema.String, userId: Schema.String },
|
|
27
|
+
*run(input) {
|
|
28
|
+
yield* changeUserRole(input);
|
|
29
|
+
},
|
|
30
|
+
});
|
|
31
|
+
|
|
32
|
+
export const Users = defineModule({
|
|
33
|
+
middleware: UsersPermission,
|
|
34
|
+
name: "admin.users",
|
|
35
|
+
operations: [ListUsers, ChangeRole],
|
|
36
|
+
requires: [UserDirectory],
|
|
37
|
+
wire: adminUsersWire,
|
|
38
|
+
});
|
|
@@ -1,16 +1,20 @@
|
|
|
1
|
-
import { DateTime, Option } from "effect";
|
|
1
|
+
import { type DateTime, Option } from "effect";
|
|
2
2
|
import { useAction, useQuery } from "@shivaedev/react/client/resultState.ts";
|
|
3
3
|
import { JobButton } from "#client/adapters/JobButton.tsx";
|
|
4
4
|
import { JobsQueryPanel } from "#client/adapters/JobsQueryPanel.tsx";
|
|
5
5
|
import type { AdminJob, JobsViewClient, RetryJob } from "#client/adapters/jobsTypes.ts";
|
|
6
|
+
import { Timestamp } from "#client/adapters/Timestamp.tsx";
|
|
7
|
+
import type { DateDisplay } from "#client/adapters/timestampText.ts";
|
|
6
8
|
|
|
7
9
|
export function JobDetail({
|
|
8
10
|
api,
|
|
11
|
+
dates,
|
|
9
12
|
queue,
|
|
10
13
|
id,
|
|
11
14
|
retry,
|
|
12
15
|
}: {
|
|
13
16
|
readonly api: JobsViewClient;
|
|
17
|
+
readonly dates: DateDisplay;
|
|
14
18
|
readonly queue: string;
|
|
15
19
|
readonly id: string;
|
|
16
20
|
readonly retry: RetryJob | undefined;
|
|
@@ -19,19 +23,30 @@ export function JobDetail({
|
|
|
19
23
|
return (
|
|
20
24
|
<section aria-label="Job detail">
|
|
21
25
|
<h2 className="mb-4 text-xl font-semibold">Job detail</h2>
|
|
22
|
-
<JobsQueryPanel state={state}>{(job) => <JobResult job={job} retry={retry} />}</JobsQueryPanel>
|
|
26
|
+
<JobsQueryPanel state={state}>{(job) => <JobResult dates={dates} job={job} retry={retry} />}</JobsQueryPanel>
|
|
23
27
|
</section>
|
|
24
28
|
);
|
|
25
29
|
}
|
|
26
30
|
|
|
27
|
-
function JobResult({
|
|
31
|
+
function JobResult({
|
|
32
|
+
dates,
|
|
33
|
+
job,
|
|
34
|
+
retry,
|
|
35
|
+
}: {
|
|
36
|
+
readonly dates: DateDisplay;
|
|
37
|
+
readonly job: Option.Option<AdminJob>;
|
|
38
|
+
readonly retry: RetryJob | undefined;
|
|
39
|
+
}) {
|
|
28
40
|
if (Option.isNone(job)) {
|
|
29
41
|
return <p>Job not found.</p>;
|
|
30
42
|
}
|
|
31
|
-
return <JobRecord job={job.value} retry={retry} />;
|
|
43
|
+
return <JobRecord dates={dates} job={job.value} retry={retry} />;
|
|
32
44
|
}
|
|
33
45
|
|
|
34
|
-
export function JobRecord({ job, retry }: { readonly job: AdminJob; readonly retry?: RetryJob | undefined }) {
|
|
46
|
+
export function JobRecord({ dates, job, retry }: { readonly dates: DateDisplay; readonly job: AdminJob; readonly retry?: RetryJob | undefined }) {
|
|
47
|
+
function shown(time: DateTime.DateTime) {
|
|
48
|
+
return <Timestamp dates={dates} time={time} />;
|
|
49
|
+
}
|
|
35
50
|
const failure = ("sourceOutput" in job ? job.sourceOutput : job.output)?.message ?? "No failure recorded.";
|
|
36
51
|
const deadLetterDetails =
|
|
37
52
|
"sourceId" in job ? (
|
|
@@ -48,12 +63,12 @@ export function JobRecord({ job, retry }: { readonly job: AdminJob; readonly ret
|
|
|
48
63
|
<dl className="grid min-w-0 gap-3 text-sm wrap-anywhere sm:grid-cols-2">
|
|
49
64
|
{Object.entries({
|
|
50
65
|
Attempt: job.attempt,
|
|
51
|
-
Completed: Option.match(job.completedOn, { onNone: () => "—", onSome:
|
|
52
|
-
Created:
|
|
66
|
+
Completed: Option.match(job.completedOn, { onNone: () => "—", onSome: shown }),
|
|
67
|
+
Created: shown(job.createdOn),
|
|
53
68
|
"ID": job.id,
|
|
54
69
|
Queue: job.queue,
|
|
55
70
|
"Retry count / limit": `${job.retryCount} / ${job.retryLimit}`,
|
|
56
|
-
Started: Option.match(job.startedOn, { onNone: () => "—", onSome:
|
|
71
|
+
Started: Option.match(job.startedOn, { onNone: () => "—", onSome: shown }),
|
|
57
72
|
State: job.state,
|
|
58
73
|
}).map(([label, value]) => (
|
|
59
74
|
<div key={label}>
|
|
@@ -7,15 +7,18 @@ import { JobPagination } from "#client/adapters/JobPagination.tsx";
|
|
|
7
7
|
import { JobsQueryPanel } from "#client/adapters/JobsQueryPanel.tsx";
|
|
8
8
|
import { JobTable } from "#client/adapters/JobTable.tsx";
|
|
9
9
|
import type { AdminJob, JobsViewClient, RetryJob } from "#client/adapters/jobsTypes.ts";
|
|
10
|
+
import type { DateDisplay } from "#client/adapters/timestampText.ts";
|
|
10
11
|
|
|
11
12
|
export function JobList({
|
|
12
13
|
api,
|
|
14
|
+
dates,
|
|
13
15
|
queue,
|
|
14
16
|
kind,
|
|
15
17
|
retry,
|
|
16
18
|
subject,
|
|
17
19
|
}: {
|
|
18
20
|
readonly api: JobsViewClient;
|
|
21
|
+
readonly dates: DateDisplay;
|
|
19
22
|
readonly queue: string;
|
|
20
23
|
readonly kind: "failed" | "deadLettered";
|
|
21
24
|
readonly retry: RetryJob | undefined;
|
|
@@ -29,12 +32,12 @@ export function JobList({
|
|
|
29
32
|
let selectedDetail: ReactNode = null;
|
|
30
33
|
if (selectedId !== undefined) {
|
|
31
34
|
if (kind === "failed") {
|
|
32
|
-
selectedDetail = <JobDetail api={api} id={selectedId} key={selectedId} queue={queue} retry={retry} />;
|
|
35
|
+
selectedDetail = <JobDetail api={api} dates={dates} id={selectedId} key={selectedId} queue={queue} retry={retry} />;
|
|
33
36
|
} else if (Option.isSome(selected)) {
|
|
34
37
|
selectedDetail = (
|
|
35
38
|
<section aria-label="Dead-letter detail">
|
|
36
39
|
<h2 className="mb-4 text-xl font-semibold">Dead-letter detail</h2>
|
|
37
|
-
<JobRecord job={selected.value} />
|
|
40
|
+
<JobRecord dates={dates} job={selected.value} />
|
|
38
41
|
</section>
|
|
39
42
|
);
|
|
40
43
|
}
|
|
@@ -5,15 +5,18 @@ import { JobList } from "#client/adapters/JobList.tsx";
|
|
|
5
5
|
import { JobsMetrics } from "#client/adapters/JobsMetrics.tsx";
|
|
6
6
|
import { JobsQueryPanel } from "#client/adapters/JobsQueryPanel.tsx";
|
|
7
7
|
import type { JobsViewClient, RetryJob } from "#client/adapters/jobsTypes.ts";
|
|
8
|
+
import type { DateDisplay } from "#client/adapters/timestampText.ts";
|
|
8
9
|
|
|
9
10
|
export function JobsQueueView({
|
|
10
11
|
api,
|
|
12
|
+
dates,
|
|
11
13
|
label,
|
|
12
14
|
queue,
|
|
13
15
|
retry,
|
|
14
16
|
subject,
|
|
15
17
|
}: {
|
|
16
18
|
readonly api: JobsViewClient;
|
|
19
|
+
readonly dates: DateDisplay;
|
|
17
20
|
readonly label?: string | undefined;
|
|
18
21
|
readonly queue: string;
|
|
19
22
|
readonly retry: RetryJob | undefined;
|
|
@@ -53,7 +56,7 @@ export function JobsQueueView({
|
|
|
53
56
|
))}
|
|
54
57
|
</div>
|
|
55
58
|
<div aria-labelledby={`jobs-${kind}-tab`} id={`jobs-${kind}-panel`} role="tabpanel">
|
|
56
|
-
<JobList api={api} key={kind} kind={kind} queue={queue} retry={retry} subject={subject} />
|
|
59
|
+
<JobList api={api} dates={dates} key={kind} kind={kind} queue={queue} retry={retry} subject={subject} />
|
|
57
60
|
</div>
|
|
58
61
|
</>
|
|
59
62
|
);
|
|
@@ -6,8 +6,9 @@ import { JobsHealthMetrics } from "#client/adapters/JobsMetrics.tsx";
|
|
|
6
6
|
import { JobsQueuePicker, JobsQueueView } from "#client/adapters/JobsQueueView.tsx";
|
|
7
7
|
import type { JobsViewClient, RetryJob, RunScheduleNow } from "#client/adapters/jobsTypes.ts";
|
|
8
8
|
import { RunScheduleControl } from "#client/adapters/RunScheduleControl.tsx";
|
|
9
|
+
import type { DateDisplay } from "#client/adapters/timestampText.ts";
|
|
9
10
|
|
|
10
|
-
export interface JobsViewProps {
|
|
11
|
+
export interface JobsViewProps extends DateDisplay {
|
|
11
12
|
readonly api: JobsViewClient;
|
|
12
13
|
readonly queues: readonly (string | QueueDisplay)[];
|
|
13
14
|
readonly retry?: RetryJob | undefined;
|
|
@@ -15,7 +16,7 @@ export interface JobsViewProps {
|
|
|
15
16
|
readonly schedules?: readonly { readonly name: string }[];
|
|
16
17
|
}
|
|
17
18
|
|
|
18
|
-
export function JobsView({ api, queues, retry, schedules, runScheduleNow }: JobsViewProps) {
|
|
19
|
+
export function JobsView({ api, queues, retry, schedules, runScheduleNow, locale, timeZone }: JobsViewProps) {
|
|
19
20
|
const definitions = queues.map((definition) => (typeof definition === "string" ? { name: definition } : definition));
|
|
20
21
|
const [name, selectQueue] = useState(definitions[0]?.name ?? "");
|
|
21
22
|
const queue = definitions.find((candidate) => candidate.name === name);
|
|
@@ -37,7 +38,15 @@ export function JobsView({ api, queues, retry, schedules, runScheduleNow }: Jobs
|
|
|
37
38
|
runScheduleNow !== undefined && schedules?.some((schedule) => schedule.name === name)
|
|
38
39
|
? createElement(RunScheduleControl, { key: `run-${name}`, queue: name, run: runScheduleNow })
|
|
39
40
|
: null,
|
|
40
|
-
createElement(JobsQueueView, {
|
|
41
|
+
createElement(JobsQueueView, {
|
|
42
|
+
api,
|
|
43
|
+
dates: { locale, timeZone },
|
|
44
|
+
key: name,
|
|
45
|
+
label: queue.label,
|
|
46
|
+
queue: name,
|
|
47
|
+
retry,
|
|
48
|
+
subject: queue.subject,
|
|
49
|
+
}),
|
|
41
50
|
),
|
|
42
51
|
);
|
|
43
52
|
}
|
|
@@ -1,8 +1,10 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import
|
|
1
|
+
import type { SignedInSession } from "@shivaedev/identity/signedInSessions.ts";
|
|
2
|
+
import { Timestamp } from "#client/adapters/Timestamp.tsx";
|
|
3
|
+
import type { DateDisplay } from "#client/adapters/timestampText.ts";
|
|
3
4
|
|
|
4
5
|
interface SessionControls {
|
|
5
6
|
readonly currentSessionId: string | undefined;
|
|
7
|
+
readonly dates: DateDisplay;
|
|
6
8
|
readonly pending: boolean;
|
|
7
9
|
readonly select: (session: typeof SignedInSession.Type) => void;
|
|
8
10
|
}
|
|
@@ -20,7 +22,7 @@ export function SessionListView({ sessions, ...controls }: SessionControls & { r
|
|
|
20
22
|
);
|
|
21
23
|
}
|
|
22
24
|
|
|
23
|
-
function SessionRow({ session, currentSessionId, pending, select }: SessionControls & { readonly session: typeof SignedInSession.Type }) {
|
|
25
|
+
function SessionRow({ session, currentSessionId, dates, pending, select }: SessionControls & { readonly session: typeof SignedInSession.Type }) {
|
|
24
26
|
const current = session.id === currentSessionId && <p className="font-medium">Your current session</p>;
|
|
25
27
|
return (
|
|
26
28
|
<li className="min-w-0 space-y-3 rounded-md border p-4 wrap-anywhere">
|
|
@@ -40,12 +42,12 @@ function SessionRow({ session, currentSessionId, pending, select }: SessionContr
|
|
|
40
42
|
Revoke session
|
|
41
43
|
</button>
|
|
42
44
|
</div>
|
|
43
|
-
<SessionTimes session={session} />
|
|
45
|
+
<SessionTimes dates={dates} session={session} />
|
|
44
46
|
</li>
|
|
45
47
|
);
|
|
46
48
|
}
|
|
47
49
|
|
|
48
|
-
function SessionTimes({ session }: { readonly session: typeof SignedInSession.Type }) {
|
|
50
|
+
function SessionTimes({ dates, session }: { readonly dates: DateDisplay; readonly session: typeof SignedInSession.Type }) {
|
|
49
51
|
const times = [
|
|
50
52
|
["Started", session.startedAt],
|
|
51
53
|
["Last activity", session.lastActivityAt],
|
|
@@ -57,7 +59,7 @@ function SessionTimes({ session }: { readonly session: typeof SignedInSession.Ty
|
|
|
57
59
|
<div key={label}>
|
|
58
60
|
<dt className="text-muted-foreground">{label}</dt>
|
|
59
61
|
<dd>
|
|
60
|
-
<
|
|
62
|
+
<Timestamp dates={dates} time={time} />
|
|
61
63
|
</dd>
|
|
62
64
|
</div>
|
|
63
65
|
))}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Option } from "effect";
|
|
2
|
-
import type { SessionList, SessionListInput } from "@shivaedev/identity/
|
|
2
|
+
import type { SessionList, SessionListInput } from "@shivaedev/identity/signedInSessions.ts";
|
|
3
3
|
|
|
4
4
|
type Cursor = NonNullable<typeof SessionListInput.Type.cursor>;
|
|
5
5
|
|
|
@@ -9,7 +9,7 @@ export function SessionPagination({
|
|
|
9
9
|
pending,
|
|
10
10
|
go,
|
|
11
11
|
}: {
|
|
12
|
-
readonly data:
|
|
12
|
+
readonly data: SessionList | undefined;
|
|
13
13
|
readonly cursors: readonly Cursor[];
|
|
14
14
|
readonly pending: boolean;
|
|
15
15
|
readonly go: (cursors: readonly Cursor[]) => void;
|
|
@@ -2,16 +2,17 @@ import { Cause, type Effect, Option, Predicate } from "effect";
|
|
|
2
2
|
import type * as AsyncResult from "effect/reactivity/AsyncResult";
|
|
3
3
|
import type * as Atom from "effect/reactivity/Atom";
|
|
4
4
|
import { createElement, useState } from "react";
|
|
5
|
-
import type { SessionList, SessionListInput, SignedInSession } from "@shivaedev/identity/
|
|
5
|
+
import type { SessionList, SessionListInput, SignedInSession } from "@shivaedev/identity/signedInSessions.ts";
|
|
6
6
|
import type { AtomServices } from "@shivaedev/react/AtomServices.ts";
|
|
7
7
|
import { useAction, useQuery } from "@shivaedev/react/client/resultState.ts";
|
|
8
8
|
import { SessionConfirmation } from "#client/adapters/SessionConfirmation.tsx";
|
|
9
9
|
import { SessionListView } from "#client/adapters/SessionListView.tsx";
|
|
10
10
|
import { SessionPagination } from "#client/adapters/SessionPagination.tsx";
|
|
11
|
+
import type { DateDisplay } from "#client/adapters/timestampText.ts";
|
|
11
12
|
|
|
12
|
-
export interface SessionsViewProps<R, E> {
|
|
13
|
+
export interface SessionsViewProps<R, E> extends DateDisplay {
|
|
13
14
|
readonly currentSessionId: string | undefined;
|
|
14
|
-
readonly list: (input: typeof SessionListInput.Type) => Atom.Atom<AsyncResult.AsyncResult<
|
|
15
|
+
readonly list: (input: typeof SessionListInput.Type) => Atom.Atom<AsyncResult.AsyncResult<SessionList, unknown>>;
|
|
15
16
|
readonly onCurrentSessionRevoked: () => void;
|
|
16
17
|
readonly revoke: (input: { readonly id: string }) => Effect.Effect<void, unknown, AtomServices<R>>;
|
|
17
18
|
readonly runtime: Atom.AtomRuntime<R, E>;
|
|
@@ -21,7 +22,7 @@ function forbidden(cause: Option.Option<Cause.Cause<unknown>>) {
|
|
|
21
22
|
return Option.exists(Option.flatMap(cause, Cause.findErrorOption), (error) => Predicate.isTagged(error, "Forbidden"));
|
|
22
23
|
}
|
|
23
24
|
|
|
24
|
-
export function SessionsView<R, E>({ currentSessionId, list, onCurrentSessionRevoked, revoke, runtime }: SessionsViewProps<R, E>) {
|
|
25
|
+
export function SessionsView<R, E>({ currentSessionId, list, locale, onCurrentSessionRevoked, revoke, runtime, timeZone }: SessionsViewProps<R, E>) {
|
|
25
26
|
const [cursors, setCursors] = useState<readonly NonNullable<typeof SessionListInput.Type.cursor>[]>([]);
|
|
26
27
|
const [selected, select] = useState<typeof SignedInSession.Type>();
|
|
27
28
|
const cursor = cursors.at(-1);
|
|
@@ -61,7 +62,15 @@ export function SessionsView<R, E>({ currentSessionId, list, onCurrentSessionRev
|
|
|
61
62
|
pending: action.pending,
|
|
62
63
|
selected,
|
|
63
64
|
}),
|
|
64
|
-
data === undefined
|
|
65
|
+
data === undefined
|
|
66
|
+
? null
|
|
67
|
+
: createElement(SessionListView, {
|
|
68
|
+
currentSessionId,
|
|
69
|
+
dates: { locale, timeZone },
|
|
70
|
+
pending: action.pending,
|
|
71
|
+
select,
|
|
72
|
+
sessions: data.sessions,
|
|
73
|
+
}),
|
|
65
74
|
createElement(SessionPagination, {
|
|
66
75
|
cursors,
|
|
67
76
|
data,
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
import { DateTime } from "effect";
|
|
2
|
+
import { type DateDisplay, timestampText } from "#client/adapters/timestampText.ts";
|
|
3
|
+
|
|
4
|
+
export function Timestamp({
|
|
5
|
+
className,
|
|
6
|
+
dates,
|
|
7
|
+
time,
|
|
8
|
+
}: {
|
|
9
|
+
readonly className?: string;
|
|
10
|
+
readonly dates: DateDisplay;
|
|
11
|
+
readonly time: DateTime.DateTime;
|
|
12
|
+
}) {
|
|
13
|
+
return (
|
|
14
|
+
<time className={className} dateTime={DateTime.formatIso(time)}>
|
|
15
|
+
{timestampText(time, dates)}
|
|
16
|
+
</time>
|
|
17
|
+
);
|
|
18
|
+
}
|
|
@@ -1,10 +1,12 @@
|
|
|
1
|
-
import { DateTime } from "effect";
|
|
2
1
|
import type { ReactNode } from "react";
|
|
3
2
|
import type { DirectoryUser } from "@shivaedev/identity/users.ts";
|
|
3
|
+
import { Timestamp } from "#client/adapters/Timestamp.tsx";
|
|
4
|
+
import type { DateDisplay } from "#client/adapters/timestampText.ts";
|
|
4
5
|
import type { ChangeRoleInput } from "#users/ChangeRoleInput.ts";
|
|
5
|
-
import type { UsersList } from "#users/
|
|
6
|
+
import type { UsersList } from "#users/List.ts";
|
|
6
7
|
|
|
7
8
|
interface RoleControls<TRole extends string> {
|
|
9
|
+
readonly dates: DateDisplay;
|
|
8
10
|
readonly dispatch: (input: ChangeRoleInput<TRole>) => void;
|
|
9
11
|
readonly pending: boolean;
|
|
10
12
|
readonly roles: readonly TRole[];
|
|
@@ -16,7 +18,7 @@ function UserRole<TRole extends string>({
|
|
|
16
18
|
roles,
|
|
17
19
|
pending,
|
|
18
20
|
dispatch,
|
|
19
|
-
}: RoleControls<TRole> & {
|
|
21
|
+
}: Omit<RoleControls<TRole>, "dates"> & {
|
|
20
22
|
readonly user: typeof DirectoryUser.Type;
|
|
21
23
|
readonly canChangeRoles: boolean;
|
|
22
24
|
}) {
|
|
@@ -48,6 +50,7 @@ function UserRole<TRole extends string>({
|
|
|
48
50
|
function UserRow<TRole extends string>({
|
|
49
51
|
user,
|
|
50
52
|
canChangeRoles,
|
|
53
|
+
dates,
|
|
51
54
|
...controls
|
|
52
55
|
}: RoleControls<TRole> & { readonly user: typeof DirectoryUser.Type; readonly canChangeRoles: boolean }) {
|
|
53
56
|
return (
|
|
@@ -58,9 +61,7 @@ function UserRow<TRole extends string>({
|
|
|
58
61
|
<UserRole {...controls} canChangeRoles={canChangeRoles} user={user} />
|
|
59
62
|
</UserCell>
|
|
60
63
|
<UserCell label="Signed up">
|
|
61
|
-
<
|
|
62
|
-
{DateTime.formatIso(user.createdAt)}
|
|
63
|
-
</time>
|
|
64
|
+
<Timestamp className="sm:whitespace-nowrap" dates={dates} time={user.createdAt} />
|
|
64
65
|
</UserCell>
|
|
65
66
|
</tr>
|
|
66
67
|
);
|
|
@@ -74,7 +75,7 @@ function UserCell({ label, children }: { readonly label: string; readonly childr
|
|
|
74
75
|
);
|
|
75
76
|
}
|
|
76
77
|
|
|
77
|
-
function UserRows<TRole extends string>({ data, ...controls }: RoleControls<TRole> & { readonly data:
|
|
78
|
+
function UserRows<TRole extends string>({ data, ...controls }: RoleControls<TRole> & { readonly data: UsersList }) {
|
|
78
79
|
return (
|
|
79
80
|
<div className="sm:overflow-x-auto sm:rounded-md sm:border">
|
|
80
81
|
<table className="block w-full text-left text-sm sm:table">
|
|
@@ -91,7 +92,7 @@ function UserRows<TRole extends string>({ data, ...controls }: RoleControls<TRol
|
|
|
91
92
|
</div>
|
|
92
93
|
);
|
|
93
94
|
}
|
|
94
|
-
export function UsersTable<TRole extends string>({ data, ...controls }: RoleControls<TRole> & { readonly data:
|
|
95
|
+
export function UsersTable<TRole extends string>({ data, ...controls }: RoleControls<TRole> & { readonly data: UsersList }) {
|
|
95
96
|
const permission = !data.canChangeRoles && <p>Permission to assign roles is required to change roles.</p>;
|
|
96
97
|
const users = data.users.length === 0 ? <p>No users.</p> : <UserRows {...controls} data={data} />;
|
|
97
98
|
return (
|
|
@@ -4,13 +4,14 @@ import type * as Atom from "effect/reactivity/Atom";
|
|
|
4
4
|
import { createElement, useState } from "react";
|
|
5
5
|
import type { UserListInput } from "@shivaedev/identity/users.ts";
|
|
6
6
|
import { useAction, useQuery } from "@shivaedev/react/client/resultState.ts";
|
|
7
|
+
import type { DateDisplay } from "#client/adapters/timestampText.ts";
|
|
7
8
|
import { UsersTable } from "#client/adapters/UsersTable.tsx";
|
|
8
9
|
import type { ChangeRoleInput } from "#users/ChangeRoleInput.ts";
|
|
9
|
-
import type { UsersList } from "#users/
|
|
10
|
+
import type { UsersList } from "#users/List.ts";
|
|
10
11
|
|
|
11
|
-
export interface UsersViewProps<TRole extends string> {
|
|
12
|
+
export interface UsersViewProps<TRole extends string> extends DateDisplay {
|
|
12
13
|
readonly changeRole: Atom.AtomResultFn<ChangeRoleInput<TRole>, void, unknown>;
|
|
13
|
-
readonly list: (input: typeof UserListInput.Type) => Atom.Atom<AsyncResult.AsyncResult<
|
|
14
|
+
readonly list: (input: typeof UserListInput.Type) => Atom.Atom<AsyncResult.AsyncResult<UsersList, unknown>>;
|
|
14
15
|
readonly roles: readonly TRole[];
|
|
15
16
|
}
|
|
16
17
|
|
|
@@ -25,7 +26,7 @@ function failure(cause: Cause.Cause<unknown>): string {
|
|
|
25
26
|
return "Could not change the role. Try again.";
|
|
26
27
|
}
|
|
27
28
|
|
|
28
|
-
export function UsersView<TRole extends string>({ list, changeRole, roles }: UsersViewProps<TRole>) {
|
|
29
|
+
export function UsersView<TRole extends string>({ list, changeRole, roles, locale, timeZone }: UsersViewProps<TRole>) {
|
|
29
30
|
const [cursors, setCursors] = useState<readonly string[]>([]);
|
|
30
31
|
const cursor = cursors.at(-1);
|
|
31
32
|
const state = useQuery(list({ ...(cursor === undefined ? {} : { cursor }), limit: 20 }));
|
|
@@ -42,7 +43,9 @@ export function UsersView<TRole extends string>({ list, changeRole, roles }: Use
|
|
|
42
43
|
state.pending ? createElement("p", { role: "status" }, "Loading users…") : null,
|
|
43
44
|
Option.isSome(state.cause) ? createElement("p", { role: "alert" }, "Could not load users. Try refreshing.") : null,
|
|
44
45
|
Option.isSome(action.cause) ? createElement("p", { role: "alert" }, failure(action.cause.value)) : null,
|
|
45
|
-
data === undefined
|
|
46
|
+
data === undefined
|
|
47
|
+
? null
|
|
48
|
+
: createElement(UsersTable<TRole>, { data, dates: { locale, timeZone }, dispatch: action.dispatch, pending: action.pending, roles }),
|
|
46
49
|
data === undefined
|
|
47
50
|
? null
|
|
48
51
|
: createElement(
|
|
@@ -1,11 +1,11 @@
|
|
|
1
|
-
import type { Option
|
|
1
|
+
import type { Option } from "effect";
|
|
2
2
|
import type * as AsyncResult from "effect/reactivity/AsyncResult";
|
|
3
3
|
import type * as Atom from "effect/reactivity/Atom";
|
|
4
|
-
import type {
|
|
4
|
+
import type { JobsDeadLetter } from "#jobs/DeadLetter.ts";
|
|
5
|
+
import type { JobsRow } from "#jobs/Row.ts";
|
|
6
|
+
import type { JobsHealth, QueueCounts } from "#jobs/schemas.ts";
|
|
5
7
|
|
|
6
|
-
type
|
|
7
|
-
type DeadLetter = ReturnType<typeof deadLetteredSchema<typeof Schema.Unknown>>["Type"];
|
|
8
|
-
export type AdminJob = Job | DeadLetter;
|
|
8
|
+
export type AdminJob = JobsRow | JobsDeadLetter;
|
|
9
9
|
interface JobId {
|
|
10
10
|
readonly id: string;
|
|
11
11
|
readonly queue: string;
|
|
@@ -24,10 +24,10 @@ interface Query<TInput, A> {
|
|
|
24
24
|
}
|
|
25
25
|
export interface JobsViewClient {
|
|
26
26
|
readonly counts: Query<{ readonly queue: string }, typeof QueueCounts.Type>;
|
|
27
|
-
readonly deadLettered: Query<PageInput, Page<
|
|
28
|
-
readonly failed: Query<PageInput, Page<
|
|
27
|
+
readonly deadLettered: Query<PageInput, Page<JobsDeadLetter>>;
|
|
28
|
+
readonly failed: Query<PageInput, Page<JobsRow>>;
|
|
29
29
|
readonly health: Query<void, typeof JobsHealth.Type>;
|
|
30
|
-
readonly job: Query<JobId, Option.Option<
|
|
30
|
+
readonly job: Query<JobId, Option.Option<JobsRow>>;
|
|
31
31
|
}
|
|
32
32
|
export type RetryJob = Atom.AtomResultFn<JobId, void, unknown>;
|
|
33
33
|
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
import { DateTime, Option } from "effect";
|
|
2
|
+
|
|
3
|
+
export interface DateDisplay {
|
|
4
|
+
readonly locale?: string | undefined;
|
|
5
|
+
readonly timeZone?: string | undefined;
|
|
6
|
+
}
|
|
7
|
+
|
|
8
|
+
const STYLE = { dateStyle: "medium", timeStyle: "long" } as const;
|
|
9
|
+
|
|
10
|
+
export function timestampText(time: DateTime.DateTime, { locale, timeZone }: DateDisplay): string {
|
|
11
|
+
const options = locale === undefined ? STYLE : { ...STYLE, locale };
|
|
12
|
+
// Intl throws on a locale or time zone it cannot read, and a saved preference must not take the page down with it.
|
|
13
|
+
const preferred = Option.liftThrowable(() =>
|
|
14
|
+
timeZone === undefined ? DateTime.formatLocal(time, options) : DateTime.format(time, { ...options, timeZone }),
|
|
15
|
+
)();
|
|
16
|
+
return Option.getOrElse(preferred, () => DateTime.formatLocal(time, STYLE));
|
|
17
|
+
}
|
|
@@ -0,0 +1,40 @@
|
|
|
1
|
+
// Generated by @shivaedev/build from src/Jobs.ts. Do not edit or commit this file; run `pnpm generate` to write it again.
|
|
2
|
+
import type { Jobs as JobsModule } from "#Jobs.ts";
|
|
3
|
+
import { JobsDeadLetter } from "#jobs/DeadLetter.ts";
|
|
4
|
+
import { JobsRow } from "#jobs/Row.ts";
|
|
5
|
+
import { jobsKeys } from "#jobs/keys.ts";
|
|
6
|
+
import { JobsPayloadInvalid, JobsQueueUnregistered, JobsUnavailable, PageFields } from "#jobs/schemas.ts";
|
|
7
|
+
import { JobsPermission } from "#permissions.ts";
|
|
8
|
+
import { clientContract } from "@shivaedev/contract/clientContract.ts";
|
|
9
|
+
import type { ClientMatchesModule } from "@shivaedev/contract/clientMatchesModule.ts";
|
|
10
|
+
import { BadRequest } from "@shivaedev/errors/taxonomy.ts";
|
|
11
|
+
import { Schema } from "effect";
|
|
12
|
+
|
|
13
|
+
export const adminJobsWire = {
|
|
14
|
+
counts: { rejections: { JobsQueueUnregistered, JobsUnavailable }, success: Schema.Struct({ activeCount: Schema.Number, failedCount: Schema.Number, queuedCount: Schema.Number, totalCount: Schema.Number }) },
|
|
15
|
+
deadLettered: { rejections: { BadRequest, JobsPayloadInvalid, JobsQueueUnregistered, JobsUnavailable }, success: Schema.Struct({ jobs: Schema.Array(JobsDeadLetter), next: Schema.Option(Schema.String) }) },
|
|
16
|
+
failed: { rejections: { BadRequest, JobsPayloadInvalid, JobsQueueUnregistered, JobsUnavailable }, success: Schema.Struct({ jobs: Schema.Array(JobsRow), next: Schema.Option(Schema.String) }) },
|
|
17
|
+
health: { rejections: { JobsUnavailable }, success: Schema.Struct({ activeTotal: Schema.Number, deadLetteredTotal: Schema.Number, failedTotal: Schema.Number, jobs: Schema.Array(Schema.Struct({ activeCount: Schema.Number, deadLetteredCount: Schema.Number, failedCount: Schema.Number, name: Schema.String, queuedCount: Schema.Number, readyCount: Schema.Number })), queuedTotal: Schema.Number, readyTotal: Schema.Number }) },
|
|
18
|
+
job: { rejections: { JobsPayloadInvalid, JobsQueueUnregistered, JobsUnavailable }, success: Schema.Option(JobsRow) },
|
|
19
|
+
} as const;
|
|
20
|
+
|
|
21
|
+
export const Jobs = clientContract({
|
|
22
|
+
middleware: JobsPermission,
|
|
23
|
+
name: "admin.jobs",
|
|
24
|
+
payloads: {
|
|
25
|
+
counts: { queue: Schema.String },
|
|
26
|
+
deadLettered: { ...PageFields, queue: Schema.String },
|
|
27
|
+
failed: { ...PageFields, queue: Schema.String },
|
|
28
|
+
job: { id: Schema.String, queue: Schema.String },
|
|
29
|
+
},
|
|
30
|
+
queries: {
|
|
31
|
+
counts: { reads: ({ queue }) => [jobsKeys.counts.item(queue)] },
|
|
32
|
+
deadLettered: { reads: ({ queue }) => [jobsKeys.deadLettered.item(queue)] },
|
|
33
|
+
failed: { reads: ({ queue }) => [jobsKeys.failed.item(queue)] },
|
|
34
|
+
health: { reads: () => [jobsKeys.health.list] },
|
|
35
|
+
job: { reads: ({ queue, id }) => [jobsKeys.job(queue).item(id)] },
|
|
36
|
+
},
|
|
37
|
+
wire: adminJobsWire,
|
|
38
|
+
});
|
|
39
|
+
|
|
40
|
+
export const adminJobsMatchModule: ClientMatchesModule<typeof Jobs, typeof JobsModule> = true;
|
|
@@ -0,0 +1,55 @@
|
|
|
1
|
+
// Generated by @shivaedev/build from src/JobsWithRetry.ts. Do not edit or commit this file; run `pnpm generate` to write it again.
|
|
2
|
+
import type { JobsWithRetry as JobsWithRetryModule } from "#JobsWithRetry.ts";
|
|
3
|
+
import { JobsDeadLetter } from "#jobs/DeadLetter.ts";
|
|
4
|
+
import { JobsNotFailed } from "#jobs/NotFailed.ts";
|
|
5
|
+
import { JobsRow } from "#jobs/Row.ts";
|
|
6
|
+
import { jobsKeys } from "#jobs/keys.ts";
|
|
7
|
+
import { JobsPayloadInvalid, JobsQueueUnregistered, JobsUnavailable, PageFields } from "#jobs/schemas.ts";
|
|
8
|
+
import { JobsPermission } from "#permissions.ts";
|
|
9
|
+
import { clientContract } from "@shivaedev/contract/clientContract.ts";
|
|
10
|
+
import type { ClientMatchesModule } from "@shivaedev/contract/clientMatchesModule.ts";
|
|
11
|
+
import { BadRequest, Forbidden } from "@shivaedev/errors/taxonomy.ts";
|
|
12
|
+
import { Schema } from "effect";
|
|
13
|
+
|
|
14
|
+
export const adminJobsWire = {
|
|
15
|
+
counts: { rejections: { JobsQueueUnregistered, JobsUnavailable }, success: Schema.Struct({ activeCount: Schema.Number, failedCount: Schema.Number, queuedCount: Schema.Number, totalCount: Schema.Number }) },
|
|
16
|
+
deadLettered: { rejections: { BadRequest, JobsPayloadInvalid, JobsQueueUnregistered, JobsUnavailable }, success: Schema.Struct({ jobs: Schema.Array(JobsDeadLetter), next: Schema.Option(Schema.String) }) },
|
|
17
|
+
failed: { rejections: { BadRequest, JobsPayloadInvalid, JobsQueueUnregistered, JobsUnavailable }, success: Schema.Struct({ jobs: Schema.Array(JobsRow), next: Schema.Option(Schema.String) }) },
|
|
18
|
+
health: { rejections: { JobsUnavailable }, success: Schema.Struct({ activeTotal: Schema.Number, deadLetteredTotal: Schema.Number, failedTotal: Schema.Number, jobs: Schema.Array(Schema.Struct({ activeCount: Schema.Number, deadLetteredCount: Schema.Number, failedCount: Schema.Number, name: Schema.String, queuedCount: Schema.Number, readyCount: Schema.Number })), queuedTotal: Schema.Number, readyTotal: Schema.Number }) },
|
|
19
|
+
job: { rejections: { JobsPayloadInvalid, JobsQueueUnregistered, JobsUnavailable }, success: Schema.Option(JobsRow) },
|
|
20
|
+
retry: { rejections: { Forbidden, JobsNotFailed, JobsPayloadInvalid, JobsQueueUnregistered, JobsUnavailable }, success: Schema.Void },
|
|
21
|
+
runScheduleNow: { rejections: { Forbidden, JobsQueueUnregistered, JobsUnavailable }, success: Schema.Option(Schema.String) },
|
|
22
|
+
} as const;
|
|
23
|
+
|
|
24
|
+
export const JobsWithRetry = clientContract({
|
|
25
|
+
commands: {
|
|
26
|
+
retry: { invalidates: ({ queue, id }) => [
|
|
27
|
+
jobsKeys.health.list,
|
|
28
|
+
jobsKeys.counts.item(queue),
|
|
29
|
+
jobsKeys.failed.item(queue),
|
|
30
|
+
jobsKeys.deadLettered.item(queue),
|
|
31
|
+
jobsKeys.job(queue).item(id),
|
|
32
|
+
] },
|
|
33
|
+
runScheduleNow: { invalidates: ({ queue }) => [jobsKeys.health.list, jobsKeys.counts.item(queue), jobsKeys.failed.item(queue), jobsKeys.deadLettered.item(queue)] },
|
|
34
|
+
},
|
|
35
|
+
middleware: JobsPermission,
|
|
36
|
+
name: "admin.jobs",
|
|
37
|
+
payloads: {
|
|
38
|
+
counts: { queue: Schema.String },
|
|
39
|
+
deadLettered: { ...PageFields, queue: Schema.String },
|
|
40
|
+
failed: { ...PageFields, queue: Schema.String },
|
|
41
|
+
job: { id: Schema.String, queue: Schema.String },
|
|
42
|
+
retry: { id: Schema.String, queue: Schema.String },
|
|
43
|
+
runScheduleNow: { queue: Schema.String },
|
|
44
|
+
},
|
|
45
|
+
queries: {
|
|
46
|
+
counts: { reads: ({ queue }) => [jobsKeys.counts.item(queue)] },
|
|
47
|
+
deadLettered: { reads: ({ queue }) => [jobsKeys.deadLettered.item(queue)] },
|
|
48
|
+
failed: { reads: ({ queue }) => [jobsKeys.failed.item(queue)] },
|
|
49
|
+
health: { reads: () => [jobsKeys.health.list] },
|
|
50
|
+
job: { reads: ({ queue, id }) => [jobsKeys.job(queue).item(id)] },
|
|
51
|
+
},
|
|
52
|
+
wire: adminJobsWire,
|
|
53
|
+
});
|
|
54
|
+
|
|
55
|
+
export const adminJobsMatchModule: ClientMatchesModule<typeof JobsWithRetry, typeof JobsWithRetryModule> = true;
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
This folder is written by `pnpm generate`.
|