@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,32 @@
|
|
|
1
|
+
// Generated by @shivaedev/build from src/Users.ts. Do not edit or commit this file; run `pnpm generate` to write it again.
|
|
2
|
+
import type { Users as UsersModule } from "#Users.ts";
|
|
3
|
+
import { UsersPermission } from "#permissions.ts";
|
|
4
|
+
import { clientContract } from "@shivaedev/contract/clientContract.ts";
|
|
5
|
+
import type { ClientMatchesModule } from "@shivaedev/contract/clientMatchesModule.ts";
|
|
6
|
+
import { AuthUnavailable, Forbidden, NotFound } from "@shivaedev/errors/taxonomy.ts";
|
|
7
|
+
import { LastRoleAssigner } from "@shivaedev/identity/roles.ts";
|
|
8
|
+
import { UserListInput, userKeys } from "@shivaedev/identity/users.ts";
|
|
9
|
+
import { Schema } from "effect";
|
|
10
|
+
|
|
11
|
+
export const adminUsersWire = {
|
|
12
|
+
changeRole: { rejections: { AuthUnavailable, Forbidden, LastRoleAssigner, NotFound }, success: Schema.Void },
|
|
13
|
+
list: { rejections: { AuthUnavailable, Forbidden }, success: Schema.Struct({ next: Schema.Option(Schema.String), users: Schema.Array(Schema.Struct({ createdAt: Schema.DateTimeUtc, email: Schema.String, id: Schema.String, name: Schema.String, role: Schema.String })), canChangeRoles: Schema.Boolean }) },
|
|
14
|
+
} as const;
|
|
15
|
+
|
|
16
|
+
export const Users = clientContract({
|
|
17
|
+
commands: {
|
|
18
|
+
changeRole: { invalidates: () => [userKeys.list] },
|
|
19
|
+
},
|
|
20
|
+
middleware: UsersPermission,
|
|
21
|
+
name: "admin.users",
|
|
22
|
+
payloads: {
|
|
23
|
+
changeRole: { role: Schema.String, userId: Schema.String },
|
|
24
|
+
list: UserListInput.fields,
|
|
25
|
+
},
|
|
26
|
+
queries: {
|
|
27
|
+
list: { reads: () => [userKeys.list] },
|
|
28
|
+
},
|
|
29
|
+
wire: adminUsersWire,
|
|
30
|
+
});
|
|
31
|
+
|
|
32
|
+
export const adminUsersMatchModule: ClientMatchesModule<typeof Users, typeof UsersModule> = true;
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import { Schema } from "effect";
|
|
2
|
+
import { JobFailure } from "@shivaedev/jobs/JobFailure.ts";
|
|
3
|
+
import { JobFields } from "#jobs/schemas.ts";
|
|
4
|
+
|
|
5
|
+
export class JobsDeadLetter extends Schema.Class<JobsDeadLetter>("JobsDeadLetter")({
|
|
6
|
+
...JobFields,
|
|
7
|
+
sourceId: Schema.OptionFromNullOr(Schema.String),
|
|
8
|
+
sourceOutput: Schema.NullOr(JobFailure).annotate({ sensitive: true }),
|
|
9
|
+
sourceQueue: Schema.String,
|
|
10
|
+
}) {}
|
package/src/jobs/Page.ts
ADDED
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import { Jobs } from "#generated/Jobs.ts";
|
|
2
|
+
import { adminPage } from "#page.ts";
|
|
3
|
+
import { JobsPermission } from "#permissions.ts";
|
|
4
|
+
|
|
5
|
+
export const JobsPage = adminPage({
|
|
6
|
+
contract: Jobs,
|
|
7
|
+
id: "jobs",
|
|
8
|
+
permission: JobsPermission,
|
|
9
|
+
route: { path: "/admin/jobs", title: "Jobs" },
|
|
10
|
+
});
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import { JobsWithRetry } from "#generated/JobsWithRetry.ts";
|
|
2
|
+
import { adminPage } from "#page.ts";
|
|
3
|
+
import { JobsPermission } from "#permissions.ts";
|
|
4
|
+
|
|
5
|
+
export const JobsPageWithRetry = adminPage({
|
|
6
|
+
contract: JobsWithRetry,
|
|
7
|
+
id: "jobs",
|
|
8
|
+
permission: JobsPermission,
|
|
9
|
+
route: { path: "/admin/jobs", title: "Jobs" },
|
|
10
|
+
});
|
package/src/jobs/Row.ts
ADDED
package/src/jobs/schemas.ts
CHANGED
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import { Schema } from "effect";
|
|
2
|
-
import { BadRequest } from "@shivaedev/errors/taxonomy.ts";
|
|
3
2
|
import { JobFailure } from "@shivaedev/jobs/JobFailure.ts";
|
|
4
3
|
|
|
5
4
|
export interface JobsQueue {
|
|
@@ -19,8 +18,6 @@ export class JobsQueueUnregistered extends Schema.TaggedError<JobsQueueUnregiste
|
|
|
19
18
|
queue: Schema.String,
|
|
20
19
|
}) {}
|
|
21
20
|
|
|
22
|
-
export const JobsFailures = { BadRequest, JobsPayloadInvalid, JobsQueueUnregistered, JobsUnavailable };
|
|
23
|
-
|
|
24
21
|
export const QueueCounts = Schema.Struct({
|
|
25
22
|
activeCount: Schema.Number,
|
|
26
23
|
failedCount: Schema.Number,
|
|
@@ -50,8 +47,10 @@ export const JobFields = {
|
|
|
50
47
|
attempt: Schema.Number,
|
|
51
48
|
completedOn: Schema.OptionFromNullOr(Schema.DateTimeUtcFromString),
|
|
52
49
|
createdOn: Schema.DateTimeUtcFromString,
|
|
50
|
+
data: Schema.Unknown.annotate({ sensitive: true }),
|
|
53
51
|
id: Schema.String,
|
|
54
52
|
output: Schema.NullOr(JobFailure).annotate({ sensitive: true }),
|
|
53
|
+
queue: Schema.String,
|
|
55
54
|
retryCount: Schema.Number,
|
|
56
55
|
retryLimit: Schema.Number,
|
|
57
56
|
startedOn: Schema.OptionFromNullOr(Schema.DateTimeUtcFromString),
|
|
@@ -59,23 +58,3 @@ export const JobFields = {
|
|
|
59
58
|
};
|
|
60
59
|
|
|
61
60
|
export const PageFields = { cursor: Schema.optionalKey(Schema.String), limit: Schema.Number };
|
|
62
|
-
|
|
63
|
-
export function jobSchema<TPayload extends Schema.Top>(queue: { readonly name: string; readonly schema: TPayload }) {
|
|
64
|
-
return Schema.Struct({ ...JobFields, data: Schema.Unknown.annotate({ sensitive: true }), queue: Schema.Literal(queue.name) });
|
|
65
|
-
}
|
|
66
|
-
|
|
67
|
-
export function deadLetteredSchema<TPayload extends Schema.Top>(queue: { readonly name: string; readonly schema: TPayload }) {
|
|
68
|
-
const name: string = `${queue.name}-dlq`;
|
|
69
|
-
return Schema.Struct({
|
|
70
|
-
...JobFields,
|
|
71
|
-
data: Schema.Unknown.annotate({ sensitive: true }),
|
|
72
|
-
queue: Schema.Literal(name),
|
|
73
|
-
sourceId: Schema.OptionFromNullOr(Schema.String),
|
|
74
|
-
sourceOutput: Schema.NullOr(JobFailure).annotate({ sensitive: true }),
|
|
75
|
-
sourceQueue: Schema.Literal(queue.name),
|
|
76
|
-
});
|
|
77
|
-
}
|
|
78
|
-
|
|
79
|
-
export function jobPage<TJob extends Schema.Top>(job: TJob) {
|
|
80
|
-
return Schema.Struct({ jobs: Schema.Array(job), next: Schema.OptionFromNullOr(Schema.String) });
|
|
81
|
-
}
|
package/src/page.ts
CHANGED
|
@@ -38,15 +38,14 @@ interface PageGroup extends RpcGroup.Any {
|
|
|
38
38
|
readonly requests: ReadonlyMap<string, Rpc.Any>;
|
|
39
39
|
}
|
|
40
40
|
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
};
|
|
41
|
+
// Distributes over a generated contract's queries, which arrive as one array of their union rather than a tuple.
|
|
42
|
+
type PageQuery<TQuery> = TQuery extends QueryShape
|
|
43
|
+
? Omit<TQuery, "readPolicy"> & {
|
|
44
|
+
readonly readPolicy: QueryReadPolicy<TQuery["payload"]["Type"], TQuery["error"]["Type"], QueryServices<TQuery> | SessionUser>;
|
|
45
|
+
}
|
|
46
|
+
: never;
|
|
47
|
+
|
|
48
|
+
type PageQueries<TQueries extends readonly QueryShape[]> = { readonly [TIndex in keyof TQueries]: PageQuery<TQueries[TIndex]> };
|
|
50
49
|
|
|
51
50
|
type PageRpcs<TRpc> =
|
|
52
51
|
TRpc extends Rpc.Rpc<infer TTag, infer TPayload, infer TSuccess, infer TError, infer TMiddleware, infer R>
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
import { Context, type Effect, type Option } from "effect";
|
|
2
|
+
import type { BadRequest } from "@shivaedev/errors/taxonomy.ts";
|
|
3
|
+
import type { DeadLetteredJob, JobPage, JobPageOptions, JobsHealth, ListedJob, QueueCounts } from "@shivaedev/jobs/server/health.ts";
|
|
4
|
+
import type { Job } from "@shivaedev/jobs/server/job.ts";
|
|
5
|
+
import type { JobsNotFailed } from "#jobs/NotFailed.ts";
|
|
6
|
+
import type { JobsPayloadInvalid, JobsQueueUnregistered, JobsUnavailable } from "#jobs/schemas.ts";
|
|
7
|
+
|
|
8
|
+
type Read = JobsUnavailable | JobsQueueUnregistered;
|
|
9
|
+
type Listing = Read | JobsPayloadInvalid | BadRequest;
|
|
10
|
+
|
|
11
|
+
export class RegisteredQueues extends Context.Service<
|
|
12
|
+
RegisteredQueues,
|
|
13
|
+
{
|
|
14
|
+
readonly counts: (queue: string) => Effect.Effect<QueueCounts, Read>;
|
|
15
|
+
readonly deadLetteredJobs: (queue: string, options: JobPageOptions) => Effect.Effect<JobPage<DeadLetteredJob<unknown>>, Listing>;
|
|
16
|
+
readonly failedJobs: (queue: string, options: JobPageOptions) => Effect.Effect<JobPage<ListedJob<unknown>>, Listing>;
|
|
17
|
+
readonly getJob: (queue: string, id: string) => Effect.Effect<Option.Option<Job<unknown>>, Read | JobsPayloadInvalid>;
|
|
18
|
+
readonly health: () => Effect.Effect<JobsHealth, JobsUnavailable>;
|
|
19
|
+
readonly retry: (queue: string, id: string) => Effect.Effect<void, Read | JobsPayloadInvalid | JobsNotFailed>;
|
|
20
|
+
readonly runScheduleNow: (schedule: string) => Effect.Effect<Option.Option<string>, Read>;
|
|
21
|
+
}
|
|
22
|
+
>()("@shivaedev/admin/RegisteredQueues") {}
|
|
@@ -0,0 +1,94 @@
|
|
|
1
|
+
import { type Context, Effect, Layer, Option, type Schema } from "effect";
|
|
2
|
+
import { BadRequest } from "@shivaedev/errors/taxonomy.ts";
|
|
3
|
+
import type { PgBossError, PgBossPayloadError } from "@shivaedev/jobs/server/error.ts";
|
|
4
|
+
import type { PgBossService } from "@shivaedev/jobs/server/service.ts";
|
|
5
|
+
import { type JobsEntry, type JobsPayload, jobsQueue } from "#jobs/entry.ts";
|
|
6
|
+
import { JobsNotFailed } from "#jobs/NotFailed.ts";
|
|
7
|
+
import { JobsPayloadInvalid, JobsQueueUnregistered, JobsUnavailable } from "#jobs/schemas.ts";
|
|
8
|
+
import { RegisteredQueues } from "#server/RegisteredQueues.ts";
|
|
9
|
+
|
|
10
|
+
type Declared<E> = E extends Schema.SchemaError
|
|
11
|
+
? BadRequest
|
|
12
|
+
: E extends PgBossPayloadError
|
|
13
|
+
? JobsPayloadInvalid
|
|
14
|
+
: E extends PgBossError
|
|
15
|
+
? JobsUnavailable
|
|
16
|
+
: never;
|
|
17
|
+
|
|
18
|
+
function jobsFailures<A, E extends PgBossError | PgBossPayloadError | Schema.SchemaError, R>(
|
|
19
|
+
effect: Effect.Effect<A, E, R>,
|
|
20
|
+
): Effect.Effect<A, Declared<E>, R>;
|
|
21
|
+
function jobsFailures<A, R>(
|
|
22
|
+
effect: Effect.Effect<A, PgBossError | PgBossPayloadError | Schema.SchemaError, R>,
|
|
23
|
+
): Effect.Effect<A, BadRequest | JobsPayloadInvalid | JobsUnavailable, R> {
|
|
24
|
+
return effect.pipe(
|
|
25
|
+
Effect.mapError((error) => {
|
|
26
|
+
switch (error._tag) {
|
|
27
|
+
case "SchemaError":
|
|
28
|
+
return new BadRequest({ message: "Invalid job page options" });
|
|
29
|
+
case "PgBossPayloadError":
|
|
30
|
+
return new JobsPayloadInvalid({ queue: error.queue });
|
|
31
|
+
case "PgBossError":
|
|
32
|
+
return new JobsUnavailable({ operation: error.operation });
|
|
33
|
+
}
|
|
34
|
+
}),
|
|
35
|
+
);
|
|
36
|
+
}
|
|
37
|
+
|
|
38
|
+
// The Layer keeps the queue schemas' decoding services, so the page's operations require only RegisteredQueues.
|
|
39
|
+
export function pgBossQueues<const TQueues extends readonly JobsEntry[], TService>(
|
|
40
|
+
service: Context.Service<TService, PgBossService>,
|
|
41
|
+
...queues: TQueues
|
|
42
|
+
) {
|
|
43
|
+
return Layer.effect(
|
|
44
|
+
RegisteredQueues,
|
|
45
|
+
Effect.gen(function* () {
|
|
46
|
+
const runtime = yield* service;
|
|
47
|
+
const inspection = yield* runtime.inspection();
|
|
48
|
+
const decoding = yield* Effect.context<JobsPayload<TQueues[number]>["DecodingServices"]>();
|
|
49
|
+
const entries: readonly TQueues[number][] = queues;
|
|
50
|
+
function registered(name: string) {
|
|
51
|
+
const entry = entries.find((candidate) => candidate.name === name);
|
|
52
|
+
return entry === undefined ? Effect.fail(new JobsQueueUnregistered({ queue: name })) : Effect.succeed(jobsQueue(entry));
|
|
53
|
+
}
|
|
54
|
+
function decoded<A, E>(effect: Effect.Effect<A, E, JobsPayload<TQueues[number]>["DecodingServices"]>) {
|
|
55
|
+
return Effect.provideContext(effect, decoding);
|
|
56
|
+
}
|
|
57
|
+
return RegisteredQueues.of({
|
|
58
|
+
counts: (queue) => Effect.flatMap(registered(queue), (definition) => jobsFailures(inspection.counts(definition))),
|
|
59
|
+
deadLetteredJobs: (queue, options) =>
|
|
60
|
+
Effect.flatMap(registered(queue), (definition) =>
|
|
61
|
+
decoded(jobsFailures(inspection.deadLetteredJobs<string, JobsPayload<TQueues[number]>>(definition, options))),
|
|
62
|
+
),
|
|
63
|
+
failedJobs: (queue, options) =>
|
|
64
|
+
Effect.flatMap(registered(queue), (definition) =>
|
|
65
|
+
decoded(jobsFailures(inspection.failedJobs<string, JobsPayload<TQueues[number]>>(definition, options))),
|
|
66
|
+
),
|
|
67
|
+
getJob: (queue, id) =>
|
|
68
|
+
Effect.flatMap(registered(queue), (definition) =>
|
|
69
|
+
decoded(jobsFailures(inspection.getJob<string, JobsPayload<TQueues[number]>>(definition, id))),
|
|
70
|
+
),
|
|
71
|
+
health: () => jobsFailures(inspection.health(queues)),
|
|
72
|
+
retry: (queue, id) =>
|
|
73
|
+
Effect.gen(function* () {
|
|
74
|
+
const definition = yield* registered(queue);
|
|
75
|
+
const job = yield* decoded(jobsFailures(inspection.getJob<string, JobsPayload<TQueues[number]>>(definition, id)));
|
|
76
|
+
if (Option.isNone(job) || job.value.state !== "failed") {
|
|
77
|
+
return yield* new JobsNotFailed({ id, queue });
|
|
78
|
+
}
|
|
79
|
+
yield* jobsFailures(runtime.retry(definition, id));
|
|
80
|
+
}),
|
|
81
|
+
runScheduleNow: (name) => {
|
|
82
|
+
const schedule = entries.find((candidate) => candidate.name === name && !("schema" in candidate));
|
|
83
|
+
if (schedule === undefined || "schema" in schedule) {
|
|
84
|
+
return Effect.fail(new JobsQueueUnregistered({ queue: name }));
|
|
85
|
+
}
|
|
86
|
+
return runtime.runScheduleNow({ name: schedule.name, scheduleOptions: schedule.scheduleOptions ?? {} }).pipe(
|
|
87
|
+
Effect.catchTag("PgBossNotFoundError", () => Effect.fail(new JobsQueueUnregistered({ queue: name }))),
|
|
88
|
+
Effect.catchTag("PgBossError", (error) => Effect.fail(new JobsUnavailable({ operation: error.operation }))),
|
|
89
|
+
);
|
|
90
|
+
},
|
|
91
|
+
});
|
|
92
|
+
}),
|
|
93
|
+
);
|
|
94
|
+
}
|
|
@@ -0,0 +1,72 @@
|
|
|
1
|
+
import { DateTime, Effect, Option, Schema } from "effect";
|
|
2
|
+
import { query } from "@shivaedev/contract/operation.ts";
|
|
3
|
+
import type { JobPage } from "@shivaedev/jobs/server/health.ts";
|
|
4
|
+
import { readJobFailure } from "@shivaedev/jobs/server/readJobFailure.ts";
|
|
5
|
+
import { JobsDeadLetter } from "#jobs/DeadLetter.ts";
|
|
6
|
+
import { jobsKeys } from "#jobs/keys.ts";
|
|
7
|
+
import { JobsRow } from "#jobs/Row.ts";
|
|
8
|
+
import { JobsPayloadInvalid, PageFields } from "#jobs/schemas.ts";
|
|
9
|
+
import { RegisteredQueues } from "#server/RegisteredQueues.ts";
|
|
10
|
+
|
|
11
|
+
export const Health = query("health", {
|
|
12
|
+
reads: () => [jobsKeys.health.list],
|
|
13
|
+
*run() {
|
|
14
|
+
return yield* (yield* RegisteredQueues).health();
|
|
15
|
+
},
|
|
16
|
+
});
|
|
17
|
+
|
|
18
|
+
export const Counts = query("counts", {
|
|
19
|
+
payload: { queue: Schema.String },
|
|
20
|
+
reads: ({ queue }) => [jobsKeys.counts.item(queue)],
|
|
21
|
+
*run({ queue }) {
|
|
22
|
+
return yield* (yield* RegisteredQueues).counts(queue);
|
|
23
|
+
},
|
|
24
|
+
});
|
|
25
|
+
|
|
26
|
+
export const Failed = query("failed", {
|
|
27
|
+
payload: { ...PageFields, queue: Schema.String },
|
|
28
|
+
reads: ({ queue }) => [jobsKeys.failed.item(queue)],
|
|
29
|
+
*run({ queue, ...options }) {
|
|
30
|
+
const page = yield* (yield* RegisteredQueues).failedJobs(queue, options);
|
|
31
|
+
const rows: JobPage<JobsRow> = { jobs: page.jobs.map((job) => new JobsRow(job)), next: page.next };
|
|
32
|
+
return rows;
|
|
33
|
+
},
|
|
34
|
+
});
|
|
35
|
+
|
|
36
|
+
export const DeadLettered = query("deadLettered", {
|
|
37
|
+
payload: { ...PageFields, queue: Schema.String },
|
|
38
|
+
reads: ({ queue }) => [jobsKeys.deadLettered.item(queue)],
|
|
39
|
+
*run({ queue, ...options }) {
|
|
40
|
+
const page = yield* (yield* RegisteredQueues).deadLetteredJobs(queue, options);
|
|
41
|
+
const copies: JobPage<JobsDeadLetter> = { jobs: page.jobs.map((job) => new JobsDeadLetter(job)), next: page.next };
|
|
42
|
+
return copies;
|
|
43
|
+
},
|
|
44
|
+
});
|
|
45
|
+
|
|
46
|
+
export const Detail = query("job", {
|
|
47
|
+
payload: { id: Schema.String, queue: Schema.String },
|
|
48
|
+
reads: ({ queue, id }) => [jobsKeys.job(queue).item(id)],
|
|
49
|
+
*run({ id, queue }) {
|
|
50
|
+
const found = yield* (yield* RegisteredQueues).getJob(queue, id);
|
|
51
|
+
if (Option.isNone(found)) {
|
|
52
|
+
return Option.none<JobsRow>();
|
|
53
|
+
}
|
|
54
|
+
const job = found.value;
|
|
55
|
+
const output = yield* readJobFailure(queue, job.output).pipe(Effect.mapError(() => new JobsPayloadInvalid({ queue })));
|
|
56
|
+
return Option.some(
|
|
57
|
+
new JobsRow({
|
|
58
|
+
attempt: job.startedOn === null ? 0 : job.retryCount + 1,
|
|
59
|
+
completedOn: Option.map(Option.fromNullishOr(job.completedOn), DateTime.makeUnsafe),
|
|
60
|
+
createdOn: DateTime.makeUnsafe(job.createdOn),
|
|
61
|
+
data: job.data,
|
|
62
|
+
id: job.id,
|
|
63
|
+
output,
|
|
64
|
+
queue: job.name,
|
|
65
|
+
retryCount: job.retryCount,
|
|
66
|
+
retryLimit: job.retryLimit,
|
|
67
|
+
startedOn: Option.map(Option.fromNullishOr(job.startedOn), DateTime.makeUnsafe),
|
|
68
|
+
state: job.state,
|
|
69
|
+
}),
|
|
70
|
+
);
|
|
71
|
+
},
|
|
72
|
+
});
|
package/src/sessions/Page.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
+
import { Sessions } from "@shivaedev/identity/generated/Sessions.ts";
|
|
1
2
|
import { SessionsPermission } from "@shivaedev/identity/sessionPermissions.ts";
|
|
2
|
-
import { Sessions } from "@shivaedev/identity/sessions.ts";
|
|
3
3
|
import { adminPage } from "#page.ts";
|
|
4
4
|
|
|
5
5
|
export const SessionsPage = adminPage({
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import { Users } from "#generated/Users.ts";
|
|
2
|
+
import { adminPage } from "#page.ts";
|
|
3
|
+
import { UsersPermission } from "#permissions.ts";
|
|
4
|
+
|
|
5
|
+
export const UsersPage = adminPage({
|
|
6
|
+
contract: Users,
|
|
7
|
+
id: "users",
|
|
8
|
+
permission: UsersPermission,
|
|
9
|
+
route: { path: "/admin/users", title: "Users" },
|
|
10
|
+
});
|