@shivaedev/admin 0.2.0 → 0.3.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/README.md +20 -1
- package/dist/jobs/keys.d.ts +8 -0
- package/dist/jobs/keys.d.ts.map +1 -0
- package/dist/jobs/keys.js +10 -0
- package/dist/jobs/keys.js.map +1 -0
- package/dist/jobs/page.d.ts +35 -35
- package/dist/jobs/page.d.ts.map +1 -1
- package/dist/jobs/page.js +11 -5
- package/dist/jobs/page.js.map +1 -1
- package/dist/jobs/retryPage.d.ts +241 -0
- package/dist/jobs/retryPage.d.ts.map +1 -0
- package/dist/jobs/retryPage.js +36 -0
- package/dist/jobs/retryPage.js.map +1 -0
- package/dist/server/jobsHandlers.d.ts +45 -2
- package/dist/server/jobsHandlers.d.ts.map +1 -1
- package/dist/server/jobsHandlers.js +12 -9
- package/dist/server/jobsHandlers.js.map +1 -1
- package/dist/server/jobsHandlersWithRetry.d.ts +6 -0
- package/dist/server/jobsHandlersWithRetry.d.ts.map +1 -0
- package/dist/server/jobsHandlersWithRetry.js +22 -0
- package/dist/server/jobsHandlersWithRetry.js.map +1 -0
- package/package.json +1 -1
- package/src/jobs/keys.ts +10 -0
- package/src/jobs/page.ts +11 -5
- package/src/jobs/retryPage.ts +39 -0
- package/src/server/jobsHandlers.ts +21 -14
- package/src/server/jobsHandlersWithRetry.ts +27 -0
package/README.md
CHANGED
|
@@ -90,4 +90,23 @@ The queries are `admin.jobs.health`, `admin.jobs.counts`, `admin.jobs.failed`, `
|
|
|
90
90
|
|
|
91
91
|
Health filters the runtime's monitor snapshot to the page's queues and recomputes totals from those queues. It has the same refresh timing as effect-pg-boss health. Unregistered names, including dead-letter queue names passed directly, fail with `JobsQueueUnregistered`. Stored payload decoding failures become `JobsPayloadInvalid`; jobs operation failures become `JobsUnavailable`, carrying the operation name. These declared failures do not expose the original database error.
|
|
92
92
|
|
|
93
|
-
The
|
|
93
|
+
The default `jobsPage` declares no commands, and its bound client has no retry operation. Handler registration performs no jobs read, and a failed jobs request leaves other pages available. PostgreSQL stories exercise these queries through serialized `/rpc` requests, including pagination, transformed payloads, missing jobs, queue restrictions and role enforcement. The application supplies the Jobs view and mounts the registration on its existing RPC host.
|
|
94
|
+
|
|
95
|
+
### Declare retry explicitly
|
|
96
|
+
|
|
97
|
+
Use `jobsPageWithRetry` and `jobsHandlersWithRetry` when administrators should be able to retry failed original jobs:
|
|
98
|
+
|
|
99
|
+
```ts
|
|
100
|
+
import { jobsPageWithRetry } from "@shivaedev/admin/jobs/retryPage.ts";
|
|
101
|
+
import { jobsHandlersWithRetry } from "@shivaedev/admin/server/jobsHandlersWithRetry.ts";
|
|
102
|
+
|
|
103
|
+
const JobsPage = jobsPageWithRetry({ name: "mail", schema: MailPayload });
|
|
104
|
+
const Admin = adminRegistry(JobsPage);
|
|
105
|
+
const registration = registerAdmin(Admin, {
|
|
106
|
+
jobs: jobsHandlersWithRetry(JobsPage, JobsService),
|
|
107
|
+
});
|
|
108
|
+
```
|
|
109
|
+
|
|
110
|
+
This variant adds only `admin.jobs.retry`, taking `{ queue, id }` and returning void. It requires the `admin` role, including when the caller has the `owner` role. The handler uses effect-pg-boss'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.
|
|
111
|
+
|
|
112
|
+
A successful bound retry invalidates health, the affected queue's counts and both listings, and the original job's detail. PostgreSQL stories mount these query atoms, retry through authenticated serialized RPC, and observe refetching and a second worker execution. Health retains the runtime monitor's refresh timing.
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
export declare const jobsKeys: {
|
|
2
|
+
counts: import("@shivaedev/effect-contract/keys.ts").Collection<"admin.jobs.counts", string>;
|
|
3
|
+
deadLettered: import("@shivaedev/effect-contract/keys.ts").Collection<"admin.jobs.deadLettered", string>;
|
|
4
|
+
failed: import("@shivaedev/effect-contract/keys.ts").Collection<"admin.jobs.failed", string>;
|
|
5
|
+
health: import("@shivaedev/effect-contract/keys.ts").Collection<"admin.jobs.health", string>;
|
|
6
|
+
job: (queue: string) => import("@shivaedev/effect-contract/keys.ts").Collection<`admin.jobs.job.${string}`, string>;
|
|
7
|
+
};
|
|
8
|
+
//# sourceMappingURL=keys.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"keys.d.ts","sourceRoot":"","sources":["../../src/jobs/keys.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,QAAQ;IACpB,MAAM;IACN,YAAY;IACZ,MAAM;IACN,MAAM;IACN,GAAG,UAAU,MAAM;CACnB,CAAC"}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import { Schema } from "effect";
|
|
2
|
+
import { collection } from "@shivaedev/effect-contract/keys.ts";
|
|
3
|
+
export const jobsKeys = {
|
|
4
|
+
counts: collection("admin.jobs.counts", Schema.String),
|
|
5
|
+
deadLettered: collection("admin.jobs.deadLettered", Schema.String),
|
|
6
|
+
failed: collection("admin.jobs.failed", Schema.String),
|
|
7
|
+
health: collection("admin.jobs.health", Schema.String),
|
|
8
|
+
job: (queue) => collection(`admin.jobs.job.${queue}`, Schema.String),
|
|
9
|
+
};
|
|
10
|
+
//# sourceMappingURL=keys.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"keys.js","sourceRoot":"","sources":["../../src/jobs/keys.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,UAAU,EAAE,MAAM,oCAAoC,CAAC;AAEhE,MAAM,CAAC,MAAM,QAAQ,GAAG;IACvB,MAAM,EAAE,UAAU,CAAC,mBAAmB,EAAE,MAAM,CAAC,MAAM,CAAC;IACtD,YAAY,EAAE,UAAU,CAAC,yBAAyB,EAAE,MAAM,CAAC,MAAM,CAAC;IAClE,MAAM,EAAE,UAAU,CAAC,mBAAmB,EAAE,MAAM,CAAC,MAAM,CAAC;IACtD,MAAM,EAAE,UAAU,CAAC,mBAAmB,EAAE,MAAM,CAAC,MAAM,CAAC;IACtD,GAAG,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,UAAU,CAAC,kBAAkB,KAAK,EAAE,EAAE,MAAM,CAAC,MAAM,CAAC;CAC5E,CAAC"}
|
package/dist/jobs/page.d.ts
CHANGED
|
@@ -98,22 +98,7 @@ export declare function jobsPage<const TQueues extends readonly JobsQueue[]>(...
|
|
|
98
98
|
JobsPayloadInvalid: typeof import("./schemas.ts").JobsPayloadInvalid;
|
|
99
99
|
JobsQueueUnregistered: typeof import("./schemas.ts").JobsQueueUnregistered;
|
|
100
100
|
JobsUnavailable: typeof import("./schemas.ts").JobsUnavailable;
|
|
101
|
-
}>>], readonly [], import("effect/rpc/Rpc").Rpc<"admin.jobs
|
|
102
|
-
id: Schema.String;
|
|
103
|
-
queue: Schema.String;
|
|
104
|
-
}>, Schema.OptionFromNullOr<Schema.Union<Schema.Struct<{
|
|
105
|
-
readonly attempt: Schema.Number;
|
|
106
|
-
readonly completedOn: Schema.OptionFromNullOr<Schema.DateTimeUtcFromString>;
|
|
107
|
-
readonly createdOn: Schema.DateTimeUtcFromString;
|
|
108
|
-
readonly id: Schema.String;
|
|
109
|
-
readonly output: Schema.Unknown;
|
|
110
|
-
readonly retryCount: Schema.Number;
|
|
111
|
-
readonly retryLimit: Schema.Number;
|
|
112
|
-
readonly startedOn: Schema.OptionFromNullOr<Schema.DateTimeUtcFromString>;
|
|
113
|
-
readonly state: Schema.Literals<readonly ["created", "retry", "active", "completed", "cancelled", "failed"]>;
|
|
114
|
-
readonly data: TQueues[number]["schema"];
|
|
115
|
-
readonly queue: Schema.Literal<string>;
|
|
116
|
-
}>[]>>, Schema.Union<readonly (typeof import("./schemas.ts").JobsUnavailable | typeof import("./schemas.ts").JobsPayloadInvalid | typeof import("./schemas.ts").JobsQueueUnregistered)[]>, typeof import("@shivaedev/platform/rpc/middleware.ts").AuthenticatedAdmin, never> | import("effect/rpc/Rpc").Rpc<"admin.jobs.$changes", Schema.Struct<{
|
|
101
|
+
}>>], readonly [], import("effect/rpc/Rpc").Rpc<"admin.jobs.$changes", Schema.Struct<{
|
|
117
102
|
queries: Schema.$Array<Schema.Union<readonly (Schema.Struct<{
|
|
118
103
|
query: Schema.Literal<"counts">;
|
|
119
104
|
payload: Schema.Struct<{
|
|
@@ -162,21 +147,7 @@ export declare function jobsPage<const TQueues extends readonly JobsQueue[]>(...
|
|
|
162
147
|
readonly failedCount: Schema.Number;
|
|
163
148
|
readonly queuedCount: Schema.Number;
|
|
164
149
|
readonly totalCount: Schema.Number;
|
|
165
|
-
}>, Schema.Union<readonly (typeof import("./schemas.ts").JobsUnavailable | typeof import("./schemas.ts").JobsPayloadInvalid | typeof import("./schemas.ts").JobsQueueUnregistered)[]>, typeof import("@shivaedev/platform/rpc/middleware.ts").AuthenticatedAdmin, never> | import("effect/rpc/Rpc").Rpc<"admin.jobs.
|
|
166
|
-
readonly activeTotal: Schema.Number;
|
|
167
|
-
readonly deadLetteredTotal: Schema.Number;
|
|
168
|
-
readonly failedTotal: Schema.Number;
|
|
169
|
-
readonly jobs: Schema.$Array<Schema.Struct<{
|
|
170
|
-
readonly activeCount: Schema.Number;
|
|
171
|
-
readonly deadLetteredCount: Schema.Number;
|
|
172
|
-
readonly failedCount: Schema.Number;
|
|
173
|
-
readonly name: Schema.String;
|
|
174
|
-
readonly queuedCount: Schema.Number;
|
|
175
|
-
readonly readyCount: Schema.Number;
|
|
176
|
-
}>>;
|
|
177
|
-
readonly queuedTotal: Schema.Number;
|
|
178
|
-
readonly readyTotal: Schema.Number;
|
|
179
|
-
}>, Schema.Union<readonly (typeof import("./schemas.ts").JobsUnavailable | typeof import("./schemas.ts").JobsPayloadInvalid | typeof import("./schemas.ts").JobsQueueUnregistered)[]>, typeof import("@shivaedev/platform/rpc/middleware.ts").AuthenticatedAdmin, never> | import("effect/rpc/Rpc").Rpc<"admin.jobs.failed", Schema.Struct<{
|
|
150
|
+
}>, Schema.Union<readonly (typeof import("./schemas.ts").JobsUnavailable | typeof import("./schemas.ts").JobsPayloadInvalid | typeof import("./schemas.ts").JobsQueueUnregistered)[]>, typeof import("@shivaedev/platform/rpc/middleware.ts").AuthenticatedAdmin, never> | import("effect/rpc/Rpc").Rpc<"admin.jobs.deadLettered", Schema.Struct<{
|
|
180
151
|
cursor: Schema.optionalKey<Schema.String>;
|
|
181
152
|
limit: Schema.Number;
|
|
182
153
|
queue: Schema.String;
|
|
@@ -193,9 +164,11 @@ export declare function jobsPage<const TQueues extends readonly JobsQueue[]>(...
|
|
|
193
164
|
readonly state: Schema.Literals<readonly ["created", "retry", "active", "completed", "cancelled", "failed"]>;
|
|
194
165
|
readonly data: TQueues[number]["schema"];
|
|
195
166
|
readonly queue: Schema.Literal<string>;
|
|
167
|
+
readonly sourceId: Schema.OptionFromNullOr<Schema.String>;
|
|
168
|
+
readonly sourceOutput: Schema.Unknown;
|
|
196
169
|
}>[]>>;
|
|
197
170
|
readonly next: Schema.OptionFromNullOr<Schema.String>;
|
|
198
|
-
}>, Schema.Union<readonly (typeof import("./schemas.ts").JobsUnavailable | typeof import("./schemas.ts").JobsPayloadInvalid | typeof import("./schemas.ts").JobsQueueUnregistered)[]>, typeof import("@shivaedev/platform/rpc/middleware.ts").AuthenticatedAdmin, never> | import("effect/rpc/Rpc").Rpc<"admin.jobs.
|
|
171
|
+
}>, Schema.Union<readonly (typeof import("./schemas.ts").JobsUnavailable | typeof import("./schemas.ts").JobsPayloadInvalid | typeof import("./schemas.ts").JobsQueueUnregistered)[]>, typeof import("@shivaedev/platform/rpc/middleware.ts").AuthenticatedAdmin, never> | import("effect/rpc/Rpc").Rpc<"admin.jobs.failed", Schema.Struct<{
|
|
199
172
|
cursor: Schema.optionalKey<Schema.String>;
|
|
200
173
|
limit: Schema.Number;
|
|
201
174
|
queue: Schema.String;
|
|
@@ -212,11 +185,38 @@ export declare function jobsPage<const TQueues extends readonly JobsQueue[]>(...
|
|
|
212
185
|
readonly state: Schema.Literals<readonly ["created", "retry", "active", "completed", "cancelled", "failed"]>;
|
|
213
186
|
readonly data: TQueues[number]["schema"];
|
|
214
187
|
readonly queue: Schema.Literal<string>;
|
|
215
|
-
readonly sourceId: Schema.OptionFromNullOr<Schema.String>;
|
|
216
|
-
readonly sourceOutput: Schema.Unknown;
|
|
217
188
|
}>[]>>;
|
|
218
189
|
readonly next: Schema.OptionFromNullOr<Schema.String>;
|
|
219
|
-
}>, Schema.Union<readonly (typeof import("./schemas.ts").JobsUnavailable | typeof import("./schemas.ts").JobsPayloadInvalid | typeof import("./schemas.ts").JobsQueueUnregistered)[]>, typeof import("@shivaedev/platform/rpc/middleware.ts").AuthenticatedAdmin, never
|
|
190
|
+
}>, Schema.Union<readonly (typeof import("./schemas.ts").JobsUnavailable | typeof import("./schemas.ts").JobsPayloadInvalid | typeof import("./schemas.ts").JobsQueueUnregistered)[]>, typeof import("@shivaedev/platform/rpc/middleware.ts").AuthenticatedAdmin, never> | import("effect/rpc/Rpc").Rpc<"admin.jobs.health", Schema.Void, Schema.Struct<{
|
|
191
|
+
readonly activeTotal: Schema.Number;
|
|
192
|
+
readonly deadLetteredTotal: Schema.Number;
|
|
193
|
+
readonly failedTotal: Schema.Number;
|
|
194
|
+
readonly jobs: Schema.$Array<Schema.Struct<{
|
|
195
|
+
readonly activeCount: Schema.Number;
|
|
196
|
+
readonly deadLetteredCount: Schema.Number;
|
|
197
|
+
readonly failedCount: Schema.Number;
|
|
198
|
+
readonly name: Schema.String;
|
|
199
|
+
readonly queuedCount: Schema.Number;
|
|
200
|
+
readonly readyCount: Schema.Number;
|
|
201
|
+
}>>;
|
|
202
|
+
readonly queuedTotal: Schema.Number;
|
|
203
|
+
readonly readyTotal: Schema.Number;
|
|
204
|
+
}>, Schema.Union<readonly (typeof import("./schemas.ts").JobsUnavailable | typeof import("./schemas.ts").JobsPayloadInvalid | typeof import("./schemas.ts").JobsQueueUnregistered)[]>, typeof import("@shivaedev/platform/rpc/middleware.ts").AuthenticatedAdmin, never> | import("effect/rpc/Rpc").Rpc<"admin.jobs.job", Schema.Struct<{
|
|
205
|
+
id: Schema.String;
|
|
206
|
+
queue: Schema.String;
|
|
207
|
+
}>, Schema.OptionFromNullOr<Schema.Union<Schema.Struct<{
|
|
208
|
+
readonly attempt: Schema.Number;
|
|
209
|
+
readonly completedOn: Schema.OptionFromNullOr<Schema.DateTimeUtcFromString>;
|
|
210
|
+
readonly createdOn: Schema.DateTimeUtcFromString;
|
|
211
|
+
readonly id: Schema.String;
|
|
212
|
+
readonly output: Schema.Unknown;
|
|
213
|
+
readonly retryCount: Schema.Number;
|
|
214
|
+
readonly retryLimit: Schema.Number;
|
|
215
|
+
readonly startedOn: Schema.OptionFromNullOr<Schema.DateTimeUtcFromString>;
|
|
216
|
+
readonly state: Schema.Literals<readonly ["created", "retry", "active", "completed", "cancelled", "failed"]>;
|
|
217
|
+
readonly data: TQueues[number]["schema"];
|
|
218
|
+
readonly queue: Schema.Literal<string>;
|
|
219
|
+
}>[]>>, Schema.Union<readonly (typeof import("./schemas.ts").JobsUnavailable | typeof import("./schemas.ts").JobsPayloadInvalid | typeof import("./schemas.ts").JobsQueueUnregistered)[]>, typeof import("@shivaedev/platform/rpc/middleware.ts").AuthenticatedAdmin, never>, readonly [], undefined>;
|
|
220
220
|
} & {
|
|
221
221
|
queues: TQueues;
|
|
222
222
|
};
|
package/dist/jobs/page.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"page.d.ts","sourceRoot":"","sources":["../../src/jobs/page.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"page.d.ts","sourceRoot":"","sources":["../../src/jobs/page.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAKhC,OAAO,EAAgD,KAAK,SAAS,EAA+C,MAAM,cAAc,CAAC;AAEzI,wBAAgB,QAAQ,CAAC,KAAK,CAAC,OAAO,SAAS,SAAS,SAAS,EAAE,EAAE,GAAG,MAAM,EAAE,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAqCtF"}
|
package/dist/jobs/page.js
CHANGED
|
@@ -2,6 +2,7 @@ import { Schema } from "effect";
|
|
|
2
2
|
import { contract } from "@shivaedev/effect-contract/contract.ts";
|
|
3
3
|
import { query } from "@shivaedev/effect-contract/operation.ts";
|
|
4
4
|
import { adminPage } from "#page.ts";
|
|
5
|
+
import { jobsKeys } from "./keys.js";
|
|
5
6
|
import { deadLetteredSchema, JobsFailures, JobsHealth, jobPage, jobSchema, PageFields, QueueCounts } from "./schemas.js";
|
|
6
7
|
export function jobsPage(...queues) {
|
|
7
8
|
const Job = Schema.Union(queues.map((queue) => jobSchema(queue)));
|
|
@@ -9,23 +10,28 @@ export function jobsPage(...queues) {
|
|
|
9
10
|
const page = adminPage({
|
|
10
11
|
contract: contract("admin.jobs", {
|
|
11
12
|
queries: [
|
|
12
|
-
query("health", { reads: () => [], rejections: JobsFailures, success: JobsHealth }),
|
|
13
|
-
query("counts", {
|
|
13
|
+
query("health", { reads: () => [jobsKeys.health.list], rejections: JobsFailures, success: JobsHealth }),
|
|
14
|
+
query("counts", {
|
|
15
|
+
payload: { queue: Schema.String },
|
|
16
|
+
reads: ({ queue }) => [jobsKeys.counts.item(queue)],
|
|
17
|
+
rejections: JobsFailures,
|
|
18
|
+
success: QueueCounts,
|
|
19
|
+
}),
|
|
14
20
|
query("failed", {
|
|
15
21
|
payload: { ...PageFields, queue: Schema.String },
|
|
16
|
-
reads: () => [],
|
|
22
|
+
reads: ({ queue }) => [jobsKeys.failed.item(queue)],
|
|
17
23
|
rejections: JobsFailures,
|
|
18
24
|
success: jobPage(Job),
|
|
19
25
|
}),
|
|
20
26
|
query("deadLettered", {
|
|
21
27
|
payload: { ...PageFields, queue: Schema.String },
|
|
22
|
-
reads: () => [],
|
|
28
|
+
reads: ({ queue }) => [jobsKeys.deadLettered.item(queue)],
|
|
23
29
|
rejections: JobsFailures,
|
|
24
30
|
success: jobPage(DeadLettered),
|
|
25
31
|
}),
|
|
26
32
|
query("job", {
|
|
27
33
|
payload: { id: Schema.String, queue: Schema.String },
|
|
28
|
-
reads: () => [],
|
|
34
|
+
reads: ({ queue, id }) => [jobsKeys.job(queue).item(id)],
|
|
29
35
|
rejections: JobsFailures,
|
|
30
36
|
success: Schema.OptionFromNullOr(Job),
|
|
31
37
|
}),
|
package/dist/jobs/page.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"page.js","sourceRoot":"","sources":["../../src/jobs/page.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,QAAQ,EAAE,MAAM,wCAAwC,CAAC;AAClE,OAAO,EAAE,KAAK,EAAE,MAAM,yCAAyC,CAAC;AAChE,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AACrC,OAAO,EAAE,kBAAkB,EAAE,YAAY,EAAE,UAAU,EAAkB,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAEzI,MAAM,UAAU,QAAQ,CAA6C,GAAG,MAAe;IACtF,MAAM,GAAG,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAsB,EAAE,EAAE,CAAC,SAAS,CAA4B,KAAK,CAAC,CAAC,CAAC,CAAC;IAC9G,MAAM,YAAY,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAsB,EAAE,EAAE,CAAC,kBAAkB,CAA4B,KAAK,CAAC,CAAC,CAAC,CAAC;IAChI,MAAM,IAAI,GAAG,SAAS,CAAC;QACtB,QAAQ,EAAE,QAAQ,CAAC,YAAY,EAAE;YAChC,OAAO,EAAE;gBACR,KAAK,CAAC,QAAQ,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"page.js","sourceRoot":"","sources":["../../src/jobs/page.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,241 @@
|
|
|
1
|
+
import { Schema } from "effect";
|
|
2
|
+
import { type JobsQueue } from "./schemas.ts";
|
|
3
|
+
declare const JobsNotFailed_base: Schema.Class<JobsNotFailed, Schema.TaggedStruct<"JobsNotFailed", {
|
|
4
|
+
readonly id: Schema.String;
|
|
5
|
+
readonly queue: Schema.String;
|
|
6
|
+
}>, import("effect/Cause").YieldableError>;
|
|
7
|
+
export declare class JobsNotFailed extends JobsNotFailed_base {
|
|
8
|
+
}
|
|
9
|
+
export declare function jobsPageWithRetry<const TQueues extends readonly JobsQueue[]>(...queues: TQueues): import("#page.ts").AdminPage & {
|
|
10
|
+
readonly id: "jobs";
|
|
11
|
+
readonly contract: import("@shivaedev/effect-contract/contract.ts").Contract<"admin.jobs", readonly [NoInfer<import("@shivaedev/effect-contract/operation.ts").Query<"health", Schema.Void, Schema.Struct<{
|
|
12
|
+
readonly activeTotal: Schema.Number;
|
|
13
|
+
readonly deadLetteredTotal: Schema.Number;
|
|
14
|
+
readonly failedTotal: Schema.Number;
|
|
15
|
+
readonly jobs: Schema.$Array<Schema.Struct<{
|
|
16
|
+
readonly activeCount: Schema.Number;
|
|
17
|
+
readonly deadLetteredCount: Schema.Number;
|
|
18
|
+
readonly failedCount: Schema.Number;
|
|
19
|
+
readonly name: Schema.String;
|
|
20
|
+
readonly queuedCount: Schema.Number;
|
|
21
|
+
readonly readyCount: Schema.Number;
|
|
22
|
+
}>>;
|
|
23
|
+
readonly queuedTotal: Schema.Number;
|
|
24
|
+
readonly readyTotal: Schema.Number;
|
|
25
|
+
}>, {
|
|
26
|
+
JobsPayloadInvalid: typeof import("./schemas.ts").JobsPayloadInvalid;
|
|
27
|
+
JobsQueueUnregistered: typeof import("./schemas.ts").JobsQueueUnregistered;
|
|
28
|
+
JobsUnavailable: typeof import("./schemas.ts").JobsUnavailable;
|
|
29
|
+
}>>, NoInfer<import("@shivaedev/effect-contract/operation.ts").Query<"counts", Schema.Struct<{
|
|
30
|
+
queue: Schema.String;
|
|
31
|
+
}>, Schema.Struct<{
|
|
32
|
+
readonly activeCount: Schema.Number;
|
|
33
|
+
readonly failedCount: Schema.Number;
|
|
34
|
+
readonly queuedCount: Schema.Number;
|
|
35
|
+
readonly totalCount: Schema.Number;
|
|
36
|
+
}>, {
|
|
37
|
+
JobsPayloadInvalid: typeof import("./schemas.ts").JobsPayloadInvalid;
|
|
38
|
+
JobsQueueUnregistered: typeof import("./schemas.ts").JobsQueueUnregistered;
|
|
39
|
+
JobsUnavailable: typeof import("./schemas.ts").JobsUnavailable;
|
|
40
|
+
}>>, NoInfer<import("@shivaedev/effect-contract/operation.ts").Query<"failed", Schema.Struct<{
|
|
41
|
+
cursor: Schema.optionalKey<Schema.String>;
|
|
42
|
+
limit: Schema.Number;
|
|
43
|
+
queue: Schema.String;
|
|
44
|
+
}>, Schema.Struct<{
|
|
45
|
+
readonly jobs: Schema.$Array<Schema.Union<Schema.Struct<{
|
|
46
|
+
readonly attempt: Schema.Number;
|
|
47
|
+
readonly completedOn: Schema.OptionFromNullOr<Schema.DateTimeUtcFromString>;
|
|
48
|
+
readonly createdOn: Schema.DateTimeUtcFromString;
|
|
49
|
+
readonly id: Schema.String;
|
|
50
|
+
readonly output: Schema.Unknown;
|
|
51
|
+
readonly retryCount: Schema.Number;
|
|
52
|
+
readonly retryLimit: Schema.Number;
|
|
53
|
+
readonly startedOn: Schema.OptionFromNullOr<Schema.DateTimeUtcFromString>;
|
|
54
|
+
readonly state: Schema.Literals<readonly ["created", "retry", "active", "completed", "cancelled", "failed"]>;
|
|
55
|
+
readonly data: [...TQueues][number]["schema"];
|
|
56
|
+
readonly queue: Schema.Literal<string>;
|
|
57
|
+
}>[]>>;
|
|
58
|
+
readonly next: Schema.OptionFromNullOr<Schema.String>;
|
|
59
|
+
}>, {
|
|
60
|
+
JobsPayloadInvalid: typeof import("./schemas.ts").JobsPayloadInvalid;
|
|
61
|
+
JobsQueueUnregistered: typeof import("./schemas.ts").JobsQueueUnregistered;
|
|
62
|
+
JobsUnavailable: typeof import("./schemas.ts").JobsUnavailable;
|
|
63
|
+
}>>, NoInfer<import("@shivaedev/effect-contract/operation.ts").Query<"deadLettered", Schema.Struct<{
|
|
64
|
+
cursor: Schema.optionalKey<Schema.String>;
|
|
65
|
+
limit: Schema.Number;
|
|
66
|
+
queue: Schema.String;
|
|
67
|
+
}>, Schema.Struct<{
|
|
68
|
+
readonly jobs: Schema.$Array<Schema.Union<Schema.Struct<{
|
|
69
|
+
readonly attempt: Schema.Number;
|
|
70
|
+
readonly completedOn: Schema.OptionFromNullOr<Schema.DateTimeUtcFromString>;
|
|
71
|
+
readonly createdOn: Schema.DateTimeUtcFromString;
|
|
72
|
+
readonly id: Schema.String;
|
|
73
|
+
readonly output: Schema.Unknown;
|
|
74
|
+
readonly retryCount: Schema.Number;
|
|
75
|
+
readonly retryLimit: Schema.Number;
|
|
76
|
+
readonly startedOn: Schema.OptionFromNullOr<Schema.DateTimeUtcFromString>;
|
|
77
|
+
readonly state: Schema.Literals<readonly ["created", "retry", "active", "completed", "cancelled", "failed"]>;
|
|
78
|
+
readonly data: [...TQueues][number]["schema"];
|
|
79
|
+
readonly queue: Schema.Literal<string>;
|
|
80
|
+
readonly sourceId: Schema.OptionFromNullOr<Schema.String>;
|
|
81
|
+
readonly sourceOutput: Schema.Unknown;
|
|
82
|
+
}>[]>>;
|
|
83
|
+
readonly next: Schema.OptionFromNullOr<Schema.String>;
|
|
84
|
+
}>, {
|
|
85
|
+
JobsPayloadInvalid: typeof import("./schemas.ts").JobsPayloadInvalid;
|
|
86
|
+
JobsQueueUnregistered: typeof import("./schemas.ts").JobsQueueUnregistered;
|
|
87
|
+
JobsUnavailable: typeof import("./schemas.ts").JobsUnavailable;
|
|
88
|
+
}>>, NoInfer<import("@shivaedev/effect-contract/operation.ts").Query<"job", Schema.Struct<{
|
|
89
|
+
id: Schema.String;
|
|
90
|
+
queue: Schema.String;
|
|
91
|
+
}>, Schema.OptionFromNullOr<Schema.Union<Schema.Struct<{
|
|
92
|
+
readonly attempt: Schema.Number;
|
|
93
|
+
readonly completedOn: Schema.OptionFromNullOr<Schema.DateTimeUtcFromString>;
|
|
94
|
+
readonly createdOn: Schema.DateTimeUtcFromString;
|
|
95
|
+
readonly id: Schema.String;
|
|
96
|
+
readonly output: Schema.Unknown;
|
|
97
|
+
readonly retryCount: Schema.Number;
|
|
98
|
+
readonly retryLimit: Schema.Number;
|
|
99
|
+
readonly startedOn: Schema.OptionFromNullOr<Schema.DateTimeUtcFromString>;
|
|
100
|
+
readonly state: Schema.Literals<readonly ["created", "retry", "active", "completed", "cancelled", "failed"]>;
|
|
101
|
+
readonly data: [...TQueues][number]["schema"];
|
|
102
|
+
readonly queue: Schema.Literal<string>;
|
|
103
|
+
}>[]>>, {
|
|
104
|
+
JobsPayloadInvalid: typeof import("./schemas.ts").JobsPayloadInvalid;
|
|
105
|
+
JobsQueueUnregistered: typeof import("./schemas.ts").JobsQueueUnregistered;
|
|
106
|
+
JobsUnavailable: typeof import("./schemas.ts").JobsUnavailable;
|
|
107
|
+
}>>], readonly [NoInfer<import("@shivaedev/effect-contract/operation.ts").Command<"retry", Schema.Struct<{
|
|
108
|
+
id: Schema.String;
|
|
109
|
+
queue: Schema.String;
|
|
110
|
+
}>, Schema.Void, {
|
|
111
|
+
readonly JobsPayloadInvalid: typeof import("./schemas.ts").JobsPayloadInvalid;
|
|
112
|
+
readonly JobsQueueUnregistered: typeof import("./schemas.ts").JobsQueueUnregistered;
|
|
113
|
+
readonly JobsUnavailable: typeof import("./schemas.ts").JobsUnavailable;
|
|
114
|
+
readonly JobsNotFailed: typeof JobsNotFailed;
|
|
115
|
+
}>>], import("effect/rpc/Rpc").Rpc<"admin.jobs.$changes", Schema.Struct<{
|
|
116
|
+
queries: Schema.$Array<Schema.Union<readonly (Schema.Struct<{
|
|
117
|
+
query: Schema.Literal<"counts">;
|
|
118
|
+
payload: Schema.Struct<{
|
|
119
|
+
queue: Schema.String;
|
|
120
|
+
}>;
|
|
121
|
+
}> | Schema.Struct<{
|
|
122
|
+
query: Schema.Literal<"deadLettered">;
|
|
123
|
+
payload: Schema.Struct<{
|
|
124
|
+
cursor: Schema.optionalKey<Schema.String>;
|
|
125
|
+
limit: Schema.Number;
|
|
126
|
+
queue: Schema.String;
|
|
127
|
+
}>;
|
|
128
|
+
}> | Schema.Struct<{
|
|
129
|
+
query: Schema.Literal<"failed">;
|
|
130
|
+
payload: Schema.Struct<{
|
|
131
|
+
cursor: Schema.optionalKey<Schema.String>;
|
|
132
|
+
limit: Schema.Number;
|
|
133
|
+
queue: Schema.String;
|
|
134
|
+
}>;
|
|
135
|
+
}> | Schema.Struct<{
|
|
136
|
+
query: Schema.Literal<"health">;
|
|
137
|
+
payload: Schema.Void;
|
|
138
|
+
}> | Schema.Struct<{
|
|
139
|
+
query: Schema.Literal<"job">;
|
|
140
|
+
payload: Schema.Struct<{
|
|
141
|
+
id: Schema.String;
|
|
142
|
+
queue: Schema.String;
|
|
143
|
+
}>;
|
|
144
|
+
}>)[]>>;
|
|
145
|
+
}>, import("effect/rpc/RpcSchema").Stream<Schema.Union<readonly [Schema.Struct<{
|
|
146
|
+
readonly _tag: Schema.Literal<"Changed">;
|
|
147
|
+
readonly keys: Schema.$Array<Schema.Union<readonly [Schema.Struct<{
|
|
148
|
+
readonly _tag: Schema.Literal<"List">;
|
|
149
|
+
readonly collection: Schema.String;
|
|
150
|
+
}>, Schema.Struct<{
|
|
151
|
+
readonly _tag: Schema.Literal<"Item">;
|
|
152
|
+
readonly collection: Schema.String;
|
|
153
|
+
readonly id: Schema.Union<readonly [Schema.String, Schema.Number]>;
|
|
154
|
+
}>]>>;
|
|
155
|
+
}>, Schema.Struct<{
|
|
156
|
+
readonly _tag: Schema.Literal<"Resync">;
|
|
157
|
+
}>]>, Schema.Never>, Schema.Never, typeof import("@shivaedev/platform/rpc/middleware.ts").AuthenticatedAdmin, never> | import("effect/rpc/Rpc").Rpc<"admin.jobs.counts", Schema.Struct<{
|
|
158
|
+
queue: Schema.String;
|
|
159
|
+
}>, Schema.Struct<{
|
|
160
|
+
readonly activeCount: Schema.Number;
|
|
161
|
+
readonly failedCount: Schema.Number;
|
|
162
|
+
readonly queuedCount: Schema.Number;
|
|
163
|
+
readonly totalCount: Schema.Number;
|
|
164
|
+
}>, Schema.Union<readonly (typeof import("./schemas.ts").JobsUnavailable | typeof import("./schemas.ts").JobsPayloadInvalid | typeof import("./schemas.ts").JobsQueueUnregistered)[]>, typeof import("@shivaedev/platform/rpc/middleware.ts").AuthenticatedAdmin, never> | import("effect/rpc/Rpc").Rpc<"admin.jobs.failed", Schema.Struct<{
|
|
165
|
+
cursor: Schema.optionalKey<Schema.String>;
|
|
166
|
+
limit: Schema.Number;
|
|
167
|
+
queue: Schema.String;
|
|
168
|
+
}>, Schema.Struct<{
|
|
169
|
+
readonly jobs: Schema.$Array<Schema.Union<Schema.Struct<{
|
|
170
|
+
readonly attempt: Schema.Number;
|
|
171
|
+
readonly completedOn: Schema.OptionFromNullOr<Schema.DateTimeUtcFromString>;
|
|
172
|
+
readonly createdOn: Schema.DateTimeUtcFromString;
|
|
173
|
+
readonly id: Schema.String;
|
|
174
|
+
readonly output: Schema.Unknown;
|
|
175
|
+
readonly retryCount: Schema.Number;
|
|
176
|
+
readonly retryLimit: Schema.Number;
|
|
177
|
+
readonly startedOn: Schema.OptionFromNullOr<Schema.DateTimeUtcFromString>;
|
|
178
|
+
readonly state: Schema.Literals<readonly ["created", "retry", "active", "completed", "cancelled", "failed"]>;
|
|
179
|
+
readonly data: [...TQueues][number]["schema"];
|
|
180
|
+
readonly queue: Schema.Literal<string>;
|
|
181
|
+
}>[]>>;
|
|
182
|
+
readonly next: Schema.OptionFromNullOr<Schema.String>;
|
|
183
|
+
}>, Schema.Union<readonly (typeof import("./schemas.ts").JobsUnavailable | typeof import("./schemas.ts").JobsPayloadInvalid | typeof import("./schemas.ts").JobsQueueUnregistered)[]>, typeof import("@shivaedev/platform/rpc/middleware.ts").AuthenticatedAdmin, never> | import("effect/rpc/Rpc").Rpc<"admin.jobs.deadLettered", Schema.Struct<{
|
|
184
|
+
cursor: Schema.optionalKey<Schema.String>;
|
|
185
|
+
limit: Schema.Number;
|
|
186
|
+
queue: Schema.String;
|
|
187
|
+
}>, Schema.Struct<{
|
|
188
|
+
readonly jobs: Schema.$Array<Schema.Union<Schema.Struct<{
|
|
189
|
+
readonly attempt: Schema.Number;
|
|
190
|
+
readonly completedOn: Schema.OptionFromNullOr<Schema.DateTimeUtcFromString>;
|
|
191
|
+
readonly createdOn: Schema.DateTimeUtcFromString;
|
|
192
|
+
readonly id: Schema.String;
|
|
193
|
+
readonly output: Schema.Unknown;
|
|
194
|
+
readonly retryCount: Schema.Number;
|
|
195
|
+
readonly retryLimit: Schema.Number;
|
|
196
|
+
readonly startedOn: Schema.OptionFromNullOr<Schema.DateTimeUtcFromString>;
|
|
197
|
+
readonly state: Schema.Literals<readonly ["created", "retry", "active", "completed", "cancelled", "failed"]>;
|
|
198
|
+
readonly data: [...TQueues][number]["schema"];
|
|
199
|
+
readonly queue: Schema.Literal<string>;
|
|
200
|
+
readonly sourceId: Schema.OptionFromNullOr<Schema.String>;
|
|
201
|
+
readonly sourceOutput: Schema.Unknown;
|
|
202
|
+
}>[]>>;
|
|
203
|
+
readonly next: Schema.OptionFromNullOr<Schema.String>;
|
|
204
|
+
}>, Schema.Union<readonly (typeof import("./schemas.ts").JobsUnavailable | typeof import("./schemas.ts").JobsPayloadInvalid | typeof import("./schemas.ts").JobsQueueUnregistered)[]>, typeof import("@shivaedev/platform/rpc/middleware.ts").AuthenticatedAdmin, never> | import("effect/rpc/Rpc").Rpc<"admin.jobs.job", Schema.Struct<{
|
|
205
|
+
id: Schema.String;
|
|
206
|
+
queue: Schema.String;
|
|
207
|
+
}>, Schema.OptionFromNullOr<Schema.Union<Schema.Struct<{
|
|
208
|
+
readonly attempt: Schema.Number;
|
|
209
|
+
readonly completedOn: Schema.OptionFromNullOr<Schema.DateTimeUtcFromString>;
|
|
210
|
+
readonly createdOn: Schema.DateTimeUtcFromString;
|
|
211
|
+
readonly id: Schema.String;
|
|
212
|
+
readonly output: Schema.Unknown;
|
|
213
|
+
readonly retryCount: Schema.Number;
|
|
214
|
+
readonly retryLimit: Schema.Number;
|
|
215
|
+
readonly startedOn: Schema.OptionFromNullOr<Schema.DateTimeUtcFromString>;
|
|
216
|
+
readonly state: Schema.Literals<readonly ["created", "retry", "active", "completed", "cancelled", "failed"]>;
|
|
217
|
+
readonly data: [...TQueues][number]["schema"];
|
|
218
|
+
readonly queue: Schema.Literal<string>;
|
|
219
|
+
}>[]>>, Schema.Union<readonly (typeof import("./schemas.ts").JobsUnavailable | typeof import("./schemas.ts").JobsPayloadInvalid | typeof import("./schemas.ts").JobsQueueUnregistered)[]>, typeof import("@shivaedev/platform/rpc/middleware.ts").AuthenticatedAdmin, never> | import("effect/rpc/Rpc").Rpc<"admin.jobs.retry", Schema.Struct<{
|
|
220
|
+
id: Schema.String;
|
|
221
|
+
queue: Schema.String;
|
|
222
|
+
}>, Schema.Void, Schema.Union<readonly (typeof import("./schemas.ts").JobsUnavailable | typeof import("./schemas.ts").JobsPayloadInvalid | typeof import("./schemas.ts").JobsQueueUnregistered | typeof JobsNotFailed)[]>, typeof import("@shivaedev/platform/rpc/middleware.ts").AuthenticatedAdmin, never> | import("effect/rpc/Rpc").Rpc<"admin.jobs.health", Schema.Void, Schema.Struct<{
|
|
223
|
+
readonly activeTotal: Schema.Number;
|
|
224
|
+
readonly deadLetteredTotal: Schema.Number;
|
|
225
|
+
readonly failedTotal: Schema.Number;
|
|
226
|
+
readonly jobs: Schema.$Array<Schema.Struct<{
|
|
227
|
+
readonly activeCount: Schema.Number;
|
|
228
|
+
readonly deadLetteredCount: Schema.Number;
|
|
229
|
+
readonly failedCount: Schema.Number;
|
|
230
|
+
readonly name: Schema.String;
|
|
231
|
+
readonly queuedCount: Schema.Number;
|
|
232
|
+
readonly readyCount: Schema.Number;
|
|
233
|
+
}>>;
|
|
234
|
+
readonly queuedTotal: Schema.Number;
|
|
235
|
+
readonly readyTotal: Schema.Number;
|
|
236
|
+
}>, Schema.Union<readonly (typeof import("./schemas.ts").JobsUnavailable | typeof import("./schemas.ts").JobsPayloadInvalid | typeof import("./schemas.ts").JobsQueueUnregistered)[]>, typeof import("@shivaedev/platform/rpc/middleware.ts").AuthenticatedAdmin, never>, readonly [], undefined>;
|
|
237
|
+
} & {
|
|
238
|
+
queues: TQueues;
|
|
239
|
+
};
|
|
240
|
+
export {};
|
|
241
|
+
//# sourceMappingURL=retryPage.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"retryPage.d.ts","sourceRoot":"","sources":["../../src/jobs/retryPage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAMhC,OAAO,EAAgB,KAAK,SAAS,EAAE,MAAM,cAAc,CAAC;;;;;AAE5D,qBAAa,aAAc,SAAQ,kBAGjC;CAAG;AAEL,wBAAgB,iBAAiB,CAAC,KAAK,CAAC,OAAO,SAAS,SAAS,SAAS,EAAE,EAAE,GAAG,MAAM,EAAE,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAyB/F"}
|
|
@@ -0,0 +1,36 @@
|
|
|
1
|
+
import { Schema } from "effect";
|
|
2
|
+
import { contract } from "@shivaedev/effect-contract/contract.ts";
|
|
3
|
+
import { command } from "@shivaedev/effect-contract/operation.ts";
|
|
4
|
+
import { adminPage } from "#page.ts";
|
|
5
|
+
import { jobsKeys } from "./keys.js";
|
|
6
|
+
import { jobsPage } from "./page.js";
|
|
7
|
+
import { JobsFailures } from "./schemas.js";
|
|
8
|
+
export class JobsNotFailed extends Schema.TaggedError()("JobsNotFailed", {
|
|
9
|
+
id: Schema.String,
|
|
10
|
+
queue: Schema.String,
|
|
11
|
+
}) {
|
|
12
|
+
}
|
|
13
|
+
export function jobsPageWithRetry(...queues) {
|
|
14
|
+
const page = jobsPage(...queues);
|
|
15
|
+
return Object.assign(adminPage({
|
|
16
|
+
contract: contract("admin.jobs", {
|
|
17
|
+
commands: [
|
|
18
|
+
command("retry", {
|
|
19
|
+
invalidates: ({ queue, id }) => [
|
|
20
|
+
jobsKeys.health.list,
|
|
21
|
+
jobsKeys.counts.item(queue),
|
|
22
|
+
jobsKeys.failed.item(queue),
|
|
23
|
+
jobsKeys.deadLettered.item(queue),
|
|
24
|
+
jobsKeys.job(queue).item(id),
|
|
25
|
+
],
|
|
26
|
+
payload: { id: Schema.String, queue: Schema.String },
|
|
27
|
+
rejections: { ...JobsFailures, JobsNotFailed },
|
|
28
|
+
}),
|
|
29
|
+
],
|
|
30
|
+
queries: page.contract.declaration.queries,
|
|
31
|
+
}),
|
|
32
|
+
id: page.id,
|
|
33
|
+
route: page.route,
|
|
34
|
+
}), { queues });
|
|
35
|
+
}
|
|
36
|
+
//# sourceMappingURL=retryPage.js.map
|
|
@@ -0,0 +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,wCAAwC,CAAC;AAClE,OAAO,EAAE,OAAO,EAAE,MAAM,yCAAyC,CAAC;AAClE,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AACrC,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AACrC,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AACrC,OAAO,EAAE,YAAY,EAAkB,MAAM,cAAc,CAAC;AAE5D,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,aAAa,EAAE;iBAC9C,CAAC;aACF;YACD,OAAO,EAAE,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,OAAO;SAC1C,CAAC;QACF,EAAE,EAAE,IAAI,CAAC,EAAE;QACX,KAAK,EAAE,IAAI,CAAC,KAAK;KACjB,CAAC,EACF,EAAE,MAAM,EAAE,CACV,CAAC;AACH,CAAC"}
|
|
@@ -1,6 +1,49 @@
|
|
|
1
|
-
import { type Context } from "effect";
|
|
1
|
+
import { type Context, DateTime, Effect, Option } from "effect";
|
|
2
|
+
import type { PgBossError, PgBossPayloadError } from "@shivaedev/effect-pg-boss/server/error.ts";
|
|
2
3
|
import type { PgBossService } from "@shivaedev/effect-pg-boss/server/service.ts";
|
|
3
4
|
import type { jobsPage } from "#jobs/page.ts";
|
|
4
|
-
import { type JobsQueue } from "#jobs/schemas.ts";
|
|
5
|
+
import { JobsPayloadInvalid, type JobsQueue, JobsQueueUnregistered, JobsUnavailable } from "#jobs/schemas.ts";
|
|
6
|
+
export declare function jobsFailures<A, R>(effect: Effect.Effect<A, PgBossError | PgBossPayloadError, R>): Effect.Effect<A, JobsPayloadInvalid | JobsUnavailable, R>;
|
|
7
|
+
export declare function jobsReadHandlers<const TQueues extends readonly JobsQueue[], TService>(page: {
|
|
8
|
+
readonly queues: TQueues;
|
|
9
|
+
}, service: Context.Service<TService, PgBossService>): {
|
|
10
|
+
"admin.jobs.counts": ({ queue }: {
|
|
11
|
+
readonly queue: string;
|
|
12
|
+
}) => Effect.Effect<import("@shivaedev/effect-pg-boss/server/health.ts").QueueCounts, JobsPayloadInvalid | JobsQueueUnregistered | JobsUnavailable, TService>;
|
|
13
|
+
"admin.jobs.deadLettered": ({ queue, ...options }: {
|
|
14
|
+
readonly queue: string;
|
|
15
|
+
readonly limit: number;
|
|
16
|
+
readonly cursor?: string;
|
|
17
|
+
}) => Effect.Effect<import("@shivaedev/effect-pg-boss/server/health.ts").JobPage<import("@shivaedev/effect-pg-boss/server/health.ts").DeadLetteredJob<TQueues[number]["schema"]["Type"]>>, JobsPayloadInvalid | JobsQueueUnregistered | JobsUnavailable, TService | TQueues[number]["schema"]["DecodingServices"]>;
|
|
18
|
+
"admin.jobs.failed": ({ queue, ...options }: {
|
|
19
|
+
readonly queue: string;
|
|
20
|
+
readonly limit: number;
|
|
21
|
+
readonly cursor?: string;
|
|
22
|
+
}) => Effect.Effect<import("@shivaedev/effect-pg-boss/server/health.ts").JobPage<import("@shivaedev/effect-pg-boss/server/health.ts").ListedJob<TQueues[number]["schema"]["Type"]>>, JobsPayloadInvalid | JobsQueueUnregistered | JobsUnavailable, TService | TQueues[number]["schema"]["DecodingServices"]>;
|
|
23
|
+
"admin.jobs.health": () => Effect.Effect<{
|
|
24
|
+
activeTotal: number;
|
|
25
|
+
deadLetteredTotal: number;
|
|
26
|
+
failedTotal: number;
|
|
27
|
+
jobs: import("@shivaedev/effect-pg-boss/server/health.ts").QueueHealth[];
|
|
28
|
+
queuedTotal: number;
|
|
29
|
+
readyTotal: number;
|
|
30
|
+
}, JobsPayloadInvalid | JobsUnavailable, TService>;
|
|
31
|
+
"admin.jobs.job": ({ id, queue }: {
|
|
32
|
+
readonly id: string;
|
|
33
|
+
readonly queue: string;
|
|
34
|
+
}) => Effect.Effect<Option.Option<{
|
|
35
|
+
attempt: number;
|
|
36
|
+
completedOn: Option.Option<DateTime.Utc>;
|
|
37
|
+
createdOn: DateTime.Utc;
|
|
38
|
+
data: TQueues[number]["schema"]["Type"];
|
|
39
|
+
id: string;
|
|
40
|
+
output: object;
|
|
41
|
+
queue: string;
|
|
42
|
+
retryCount: number;
|
|
43
|
+
retryLimit: number;
|
|
44
|
+
startedOn: Option.Option<DateTime.Utc>;
|
|
45
|
+
state: "active" | "cancelled" | "completed" | "created" | "failed" | "retry";
|
|
46
|
+
}>, JobsPayloadInvalid | JobsQueueUnregistered | JobsUnavailable, TService | TQueues[number]["schema"]["DecodingServices"]>;
|
|
47
|
+
};
|
|
5
48
|
export declare function jobsHandlers<const TQueues extends readonly JobsQueue[], TService>(page: ReturnType<typeof jobsPage<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">, never, Exclude<Exclude<TService, import("@shivaedev/platform/rpc/identity.ts").Identity | import("@shivaedev/platform/rpc/identity.ts").SessionUser>, import("effect/Scope").Scope> | Exclude<Exclude<TService, import("@shivaedev/platform/rpc/identity.ts").Identity | import("@shivaedev/platform/rpc/identity.ts").SessionUser>, import("effect/Scope").Scope> | Exclude<Exclude<TQueues[number]["schema"]["DecodingServices"], import("@shivaedev/platform/rpc/identity.ts").Identity | import("@shivaedev/platform/rpc/identity.ts").SessionUser>, import("effect/Scope").Scope>>;
|
|
6
49
|
//# sourceMappingURL=jobsHandlers.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jobsHandlers.d.ts","sourceRoot":"","sources":["../../src/server/jobsHandlers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,OAAO,
|
|
1
|
+
{"version":3,"file":"jobsHandlers.d.ts","sourceRoot":"","sources":["../../src/server/jobsHandlers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChE,OAAO,KAAK,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,2CAA2C,CAAC;AACjG,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6CAA6C,CAAC;AACjF,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,EAAE,kBAAkB,EAAE,KAAK,SAAS,EAAE,qBAAqB,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAE9G,wBAAgB,YAAY,CAAC,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,WAAW,GAAG,kBAAkB,EAAE,CAAC,CAAC,6DAM/F;AAED,wBAAgB,gBAAgB,CAAC,KAAK,CAAC,OAAO,SAAS,SAAS,SAAS,EAAE,EAAE,QAAQ,EACpF,IAAI,EAAE;IAAE,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAA;CAAE,EAClC,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,QAAQ,EAAE,aAAa,CAAC;IAQhD,mBAAmB,cAAc;QAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;KAAE;IAM3D,yBAAyB,0BAA0B;QAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE;IAM/H,mBAAmB,0BAA0B;QAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE;IAMzH,mBAAmB;;;;;;;;IAcnB,gBAAgB,kBAAkB;QAAE,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;KAAE;;;;;;;;;;;;;EAmBlF;AAED,wBAAgB,YAAY,CAAC,KAAK,CAAC,OAAO,SAAS,SAAS,SAAS,EAAE,EAAE,QAAQ,EAChF,IAAI,EAAE,UAAU,CAAC,OAAO,QAAQ,CAAC,OAAO,CAAC,CAAC,EAC1C,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,QAAQ,EAAE,aAAa,CAAC,k3BAGjD"}
|
|
@@ -1,33 +1,33 @@
|
|
|
1
1
|
import { DateTime, Effect, Option } from "effect";
|
|
2
2
|
import { JobsPayloadInvalid, JobsQueueUnregistered, JobsUnavailable } from "#jobs/schemas.ts";
|
|
3
|
-
function
|
|
3
|
+
export function jobsFailures(effect) {
|
|
4
4
|
return effect.pipe(Effect.mapError((error) => error._tag === "PgBossPayloadError" ? new JobsPayloadInvalid({ queue: error.queue }) : new JobsUnavailable({ operation: error.operation })));
|
|
5
5
|
}
|
|
6
|
-
export function
|
|
6
|
+
export function jobsReadHandlers(page, service) {
|
|
7
7
|
function registered(name) {
|
|
8
8
|
const queues = page.queues;
|
|
9
9
|
const queue = queues.find((candidate) => candidate.name === name);
|
|
10
10
|
return queue === undefined ? Effect.fail(new JobsQueueUnregistered({ queue: name })) : Effect.succeed(queue);
|
|
11
11
|
}
|
|
12
|
-
return
|
|
12
|
+
return {
|
|
13
13
|
"admin.jobs.counts": ({ queue }) => Effect.gen(function* () {
|
|
14
14
|
const definition = yield* registered(queue);
|
|
15
15
|
const jobs = yield* service;
|
|
16
|
-
return yield*
|
|
16
|
+
return yield* jobsFailures(jobs.counts(definition));
|
|
17
17
|
}),
|
|
18
18
|
"admin.jobs.deadLettered": ({ queue, ...options }) => Effect.gen(function* () {
|
|
19
19
|
const definition = yield* registered(queue);
|
|
20
20
|
const jobs = yield* service;
|
|
21
|
-
return yield*
|
|
21
|
+
return yield* jobsFailures(jobs.deadLetteredJobs(definition, options));
|
|
22
22
|
}),
|
|
23
23
|
"admin.jobs.failed": ({ queue, ...options }) => Effect.gen(function* () {
|
|
24
24
|
const definition = yield* registered(queue);
|
|
25
25
|
const jobs = yield* service;
|
|
26
|
-
return yield*
|
|
26
|
+
return yield* jobsFailures(jobs.failedJobs(definition, options));
|
|
27
27
|
}),
|
|
28
28
|
"admin.jobs.health": () => Effect.gen(function* () {
|
|
29
29
|
const jobs = yield* service;
|
|
30
|
-
const health = yield*
|
|
30
|
+
const health = yield* jobsFailures(jobs.health);
|
|
31
31
|
const visible = health.jobs.filter((queue) => page.queues.some((candidate) => candidate.name === queue.name));
|
|
32
32
|
return {
|
|
33
33
|
activeTotal: visible.reduce((sum, queue) => sum + queue.activeCount, 0),
|
|
@@ -41,7 +41,7 @@ export function jobsHandlers(page, service) {
|
|
|
41
41
|
"admin.jobs.job": ({ id, queue }) => Effect.gen(function* () {
|
|
42
42
|
const definition = yield* registered(queue);
|
|
43
43
|
const jobs = yield* service;
|
|
44
|
-
return Option.map(yield*
|
|
44
|
+
return Option.map(yield* jobsFailures(jobs.getJob(definition, id)), (job) => ({
|
|
45
45
|
attempt: job.startedOn === null ? 0 : job.retryCount + 1,
|
|
46
46
|
completedOn: Option.map(Option.fromNullishOr(job.completedOn), DateTime.makeUnsafe),
|
|
47
47
|
createdOn: DateTime.makeUnsafe(job.createdOn),
|
|
@@ -55,6 +55,9 @@ export function jobsHandlers(page, service) {
|
|
|
55
55
|
state: job.state,
|
|
56
56
|
}));
|
|
57
57
|
}),
|
|
58
|
-
}
|
|
58
|
+
};
|
|
59
|
+
}
|
|
60
|
+
export function jobsHandlers(page, service) {
|
|
61
|
+
return page.contract.application.toLayer(jobsReadHandlers(page, service));
|
|
59
62
|
}
|
|
60
63
|
//# sourceMappingURL=jobsHandlers.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jobsHandlers.js","sourceRoot":"","sources":["../../src/server/jobsHandlers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAIhE,OAAO,EAAE,kBAAkB,EAAkB,qBAAqB,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAE9G,
|
|
1
|
+
{"version":3,"file":"jobsHandlers.js","sourceRoot":"","sources":["../../src/server/jobsHandlers.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
import { type Context } from "effect";
|
|
2
|
+
import type { PgBossService } from "@shivaedev/effect-pg-boss/server/service.ts";
|
|
3
|
+
import { type jobsPageWithRetry } from "#jobs/retryPage.ts";
|
|
4
|
+
import { type JobsQueue } from "#jobs/schemas.ts";
|
|
5
|
+
export declare function jobsHandlersWithRetry<const TQueues extends readonly JobsQueue[], 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/platform/rpc/identity.ts").Identity | import("@shivaedev/platform/rpc/identity.ts").SessionUser>, import("effect/Scope").Scope> | Exclude<Exclude<TService, import("@shivaedev/platform/rpc/identity.ts").Identity | import("@shivaedev/platform/rpc/identity.ts").SessionUser>, import("effect/Scope").Scope> | Exclude<Exclude<TQueues[number]["schema"]["DecodingServices"], import("@shivaedev/platform/rpc/identity.ts").Identity | import("@shivaedev/platform/rpc/identity.ts").SessionUser>, import("effect/Scope").Scope>>;
|
|
6
|
+
//# sourceMappingURL=jobsHandlersWithRetry.d.ts.map
|
|
@@ -0,0 +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;AACtD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6CAA6C,CAAC;AACjF,OAAO,EAAiB,KAAK,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAC3E,OAAO,EAAE,KAAK,SAAS,EAAyB,MAAM,kBAAkB,CAAC;AAGzE,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,y6BAkBjD"}
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
import { Effect, Option } from "effect";
|
|
2
|
+
import { JobsNotFailed } from "#jobs/retryPage.ts";
|
|
3
|
+
import { JobsQueueUnregistered } from "#jobs/schemas.ts";
|
|
4
|
+
import { jobsFailures, jobsReadHandlers } from "./jobsHandlers.js";
|
|
5
|
+
export function jobsHandlersWithRetry(page, service) {
|
|
6
|
+
return page.contract.application.toLayer({
|
|
7
|
+
...jobsReadHandlers(page, service),
|
|
8
|
+
"admin.jobs.retry": ({ queue, id }) => Effect.gen(function* () {
|
|
9
|
+
const definition = page.queues.find((candidate) => candidate.name === queue);
|
|
10
|
+
if (definition === undefined) {
|
|
11
|
+
return yield* Effect.fail(new JobsQueueUnregistered({ queue }));
|
|
12
|
+
}
|
|
13
|
+
const jobs = yield* service;
|
|
14
|
+
const job = yield* jobsFailures(jobs.getJob(definition, id));
|
|
15
|
+
if (Option.isNone(job) || job.value.state !== "failed") {
|
|
16
|
+
return yield* Effect.fail(new JobsNotFailed({ id, queue }));
|
|
17
|
+
}
|
|
18
|
+
yield* jobsFailures(jobs.retry(definition, id));
|
|
19
|
+
}),
|
|
20
|
+
});
|
|
21
|
+
}
|
|
22
|
+
//# sourceMappingURL=jobsHandlersWithRetry.js.map
|
|
@@ -0,0 +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;AAEtD,OAAO,EAAE,aAAa,EAA0B,MAAM,oBAAoB,CAAC;AAC3E,OAAO,EAAkB,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AACzE,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,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,IAAI,KAAK,KAAK,CAAC,CAAC;YAC7E,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;gBAC9B,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,qBAAqB,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;YACjE,CAAC;YACD,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,OAAO,CAAC;YAC5B,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM,CAAoC,UAAU,EAAE,EAAE,CAAC,CAAC,CAAC;YAChG,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,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC,CAAC;QACjD,CAAC,CAAC;KACH,CAAC,CAAC;AACJ,CAAC"}
|
package/package.json
CHANGED
package/src/jobs/keys.ts
ADDED
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import { Schema } from "effect";
|
|
2
|
+
import { collection } from "@shivaedev/effect-contract/keys.ts";
|
|
3
|
+
|
|
4
|
+
export const jobsKeys = {
|
|
5
|
+
counts: collection("admin.jobs.counts", Schema.String),
|
|
6
|
+
deadLettered: collection("admin.jobs.deadLettered", Schema.String),
|
|
7
|
+
failed: collection("admin.jobs.failed", Schema.String),
|
|
8
|
+
health: collection("admin.jobs.health", Schema.String),
|
|
9
|
+
job: (queue: string) => collection(`admin.jobs.job.${queue}`, Schema.String),
|
|
10
|
+
};
|
package/src/jobs/page.ts
CHANGED
|
@@ -2,6 +2,7 @@ import { Schema } from "effect";
|
|
|
2
2
|
import { contract } from "@shivaedev/effect-contract/contract.ts";
|
|
3
3
|
import { query } from "@shivaedev/effect-contract/operation.ts";
|
|
4
4
|
import { adminPage } from "#page.ts";
|
|
5
|
+
import { jobsKeys } from "./keys.ts";
|
|
5
6
|
import { deadLetteredSchema, JobsFailures, JobsHealth, type JobsQueue, jobPage, jobSchema, PageFields, QueueCounts } from "./schemas.ts";
|
|
6
7
|
|
|
7
8
|
export function jobsPage<const TQueues extends readonly JobsQueue[]>(...queues: TQueues) {
|
|
@@ -10,23 +11,28 @@ export function jobsPage<const TQueues extends readonly JobsQueue[]>(...queues:
|
|
|
10
11
|
const page = adminPage({
|
|
11
12
|
contract: contract("admin.jobs", {
|
|
12
13
|
queries: [
|
|
13
|
-
query("health", { reads: () => [], rejections: JobsFailures, success: JobsHealth }),
|
|
14
|
-
query("counts", {
|
|
14
|
+
query("health", { reads: () => [jobsKeys.health.list], rejections: JobsFailures, success: JobsHealth }),
|
|
15
|
+
query("counts", {
|
|
16
|
+
payload: { queue: Schema.String },
|
|
17
|
+
reads: ({ queue }) => [jobsKeys.counts.item(queue)],
|
|
18
|
+
rejections: JobsFailures,
|
|
19
|
+
success: QueueCounts,
|
|
20
|
+
}),
|
|
15
21
|
query("failed", {
|
|
16
22
|
payload: { ...PageFields, queue: Schema.String },
|
|
17
|
-
reads: () => [],
|
|
23
|
+
reads: ({ queue }) => [jobsKeys.failed.item(queue)],
|
|
18
24
|
rejections: JobsFailures,
|
|
19
25
|
success: jobPage(Job),
|
|
20
26
|
}),
|
|
21
27
|
query("deadLettered", {
|
|
22
28
|
payload: { ...PageFields, queue: Schema.String },
|
|
23
|
-
reads: () => [],
|
|
29
|
+
reads: ({ queue }) => [jobsKeys.deadLettered.item(queue)],
|
|
24
30
|
rejections: JobsFailures,
|
|
25
31
|
success: jobPage(DeadLettered),
|
|
26
32
|
}),
|
|
27
33
|
query("job", {
|
|
28
34
|
payload: { id: Schema.String, queue: Schema.String },
|
|
29
|
-
reads: () => [],
|
|
35
|
+
reads: ({ queue, id }) => [jobsKeys.job(queue).item(id)],
|
|
30
36
|
rejections: JobsFailures,
|
|
31
37
|
success: Schema.OptionFromNullOr(Job),
|
|
32
38
|
}),
|
|
@@ -0,0 +1,39 @@
|
|
|
1
|
+
import { Schema } from "effect";
|
|
2
|
+
import { contract } from "@shivaedev/effect-contract/contract.ts";
|
|
3
|
+
import { command } from "@shivaedev/effect-contract/operation.ts";
|
|
4
|
+
import { adminPage } from "#page.ts";
|
|
5
|
+
import { jobsKeys } from "./keys.ts";
|
|
6
|
+
import { jobsPage } from "./page.ts";
|
|
7
|
+
import { JobsFailures, type JobsQueue } from "./schemas.ts";
|
|
8
|
+
|
|
9
|
+
export class JobsNotFailed extends Schema.TaggedError<JobsNotFailed>()("JobsNotFailed", {
|
|
10
|
+
id: Schema.String,
|
|
11
|
+
queue: Schema.String,
|
|
12
|
+
}) {}
|
|
13
|
+
|
|
14
|
+
export function jobsPageWithRetry<const TQueues extends readonly JobsQueue[]>(...queues: TQueues) {
|
|
15
|
+
const page = jobsPage(...queues);
|
|
16
|
+
return Object.assign(
|
|
17
|
+
adminPage({
|
|
18
|
+
contract: contract("admin.jobs", {
|
|
19
|
+
commands: [
|
|
20
|
+
command("retry", {
|
|
21
|
+
invalidates: ({ queue, id }) => [
|
|
22
|
+
jobsKeys.health.list,
|
|
23
|
+
jobsKeys.counts.item(queue),
|
|
24
|
+
jobsKeys.failed.item(queue),
|
|
25
|
+
jobsKeys.deadLettered.item(queue),
|
|
26
|
+
jobsKeys.job(queue).item(id),
|
|
27
|
+
],
|
|
28
|
+
payload: { id: Schema.String, queue: Schema.String },
|
|
29
|
+
rejections: { ...JobsFailures, JobsNotFailed },
|
|
30
|
+
}),
|
|
31
|
+
],
|
|
32
|
+
queries: page.contract.declaration.queries,
|
|
33
|
+
}),
|
|
34
|
+
id: page.id,
|
|
35
|
+
route: page.route,
|
|
36
|
+
}),
|
|
37
|
+
{ queues },
|
|
38
|
+
);
|
|
39
|
+
}
|
|
@@ -4,7 +4,7 @@ import type { PgBossService } from "@shivaedev/effect-pg-boss/server/service.ts"
|
|
|
4
4
|
import type { jobsPage } from "#jobs/page.ts";
|
|
5
5
|
import { JobsPayloadInvalid, type JobsQueue, JobsQueueUnregistered, JobsUnavailable } from "#jobs/schemas.ts";
|
|
6
6
|
|
|
7
|
-
function
|
|
7
|
+
export function jobsFailures<A, R>(effect: Effect.Effect<A, PgBossError | PgBossPayloadError, R>) {
|
|
8
8
|
return effect.pipe(
|
|
9
9
|
Effect.mapError((error) =>
|
|
10
10
|
error._tag === "PgBossPayloadError" ? new JobsPayloadInvalid({ queue: error.queue }) : new JobsUnavailable({ operation: error.operation }),
|
|
@@ -12,8 +12,8 @@ function failures<A, R>(effect: Effect.Effect<A, PgBossError | PgBossPayloadErro
|
|
|
12
12
|
);
|
|
13
13
|
}
|
|
14
14
|
|
|
15
|
-
export function
|
|
16
|
-
page:
|
|
15
|
+
export function jobsReadHandlers<const TQueues extends readonly JobsQueue[], TService>(
|
|
16
|
+
page: { readonly queues: TQueues },
|
|
17
17
|
service: Context.Service<TService, PgBossService>,
|
|
18
18
|
) {
|
|
19
19
|
function registered(name: string) {
|
|
@@ -21,29 +21,29 @@ export function jobsHandlers<const TQueues extends readonly JobsQueue[], TServic
|
|
|
21
21
|
const queue = queues.find((candidate) => candidate.name === name);
|
|
22
22
|
return queue === undefined ? Effect.fail(new JobsQueueUnregistered({ queue: name })) : Effect.succeed(queue);
|
|
23
23
|
}
|
|
24
|
-
return
|
|
25
|
-
"admin.jobs.counts": ({ queue }) =>
|
|
24
|
+
return {
|
|
25
|
+
"admin.jobs.counts": ({ queue }: { readonly queue: string }) =>
|
|
26
26
|
Effect.gen(function* () {
|
|
27
27
|
const definition = yield* registered(queue);
|
|
28
28
|
const jobs = yield* service;
|
|
29
|
-
return yield*
|
|
29
|
+
return yield* jobsFailures(jobs.counts(definition));
|
|
30
30
|
}),
|
|
31
|
-
"admin.jobs.deadLettered": ({ queue, ...options }) =>
|
|
31
|
+
"admin.jobs.deadLettered": ({ queue, ...options }: { readonly queue: string; readonly limit: number; readonly cursor?: string }) =>
|
|
32
32
|
Effect.gen(function* () {
|
|
33
33
|
const definition = yield* registered(queue);
|
|
34
34
|
const jobs = yield* service;
|
|
35
|
-
return yield*
|
|
35
|
+
return yield* jobsFailures(jobs.deadLetteredJobs<string, TQueues[number]["schema"]>(definition, options));
|
|
36
36
|
}),
|
|
37
|
-
"admin.jobs.failed": ({ queue, ...options }) =>
|
|
37
|
+
"admin.jobs.failed": ({ queue, ...options }: { readonly queue: string; readonly limit: number; readonly cursor?: string }) =>
|
|
38
38
|
Effect.gen(function* () {
|
|
39
39
|
const definition = yield* registered(queue);
|
|
40
40
|
const jobs = yield* service;
|
|
41
|
-
return yield*
|
|
41
|
+
return yield* jobsFailures(jobs.failedJobs<string, TQueues[number]["schema"]>(definition, options));
|
|
42
42
|
}),
|
|
43
43
|
"admin.jobs.health": () =>
|
|
44
44
|
Effect.gen(function* () {
|
|
45
45
|
const jobs = yield* service;
|
|
46
|
-
const health = yield*
|
|
46
|
+
const health = yield* jobsFailures(jobs.health);
|
|
47
47
|
const visible = health.jobs.filter((queue) => page.queues.some((candidate) => candidate.name === queue.name));
|
|
48
48
|
return {
|
|
49
49
|
activeTotal: visible.reduce((sum, queue) => sum + queue.activeCount, 0),
|
|
@@ -54,11 +54,11 @@ export function jobsHandlers<const TQueues extends readonly JobsQueue[], TServic
|
|
|
54
54
|
readyTotal: visible.reduce((sum, queue) => sum + queue.readyCount, 0),
|
|
55
55
|
};
|
|
56
56
|
}),
|
|
57
|
-
"admin.jobs.job": ({ id, queue }) =>
|
|
57
|
+
"admin.jobs.job": ({ id, queue }: { readonly id: string; readonly queue: string }) =>
|
|
58
58
|
Effect.gen(function* () {
|
|
59
59
|
const definition = yield* registered(queue);
|
|
60
60
|
const jobs = yield* service;
|
|
61
|
-
return Option.map(yield*
|
|
61
|
+
return Option.map(yield* jobsFailures(jobs.getJob<string, TQueues[number]["schema"]>(definition, id)), (job) => ({
|
|
62
62
|
attempt: job.startedOn === null ? 0 : job.retryCount + 1,
|
|
63
63
|
completedOn: Option.map(Option.fromNullishOr(job.completedOn), DateTime.makeUnsafe),
|
|
64
64
|
createdOn: DateTime.makeUnsafe(job.createdOn),
|
|
@@ -72,5 +72,12 @@ export function jobsHandlers<const TQueues extends readonly JobsQueue[], TServic
|
|
|
72
72
|
state: job.state,
|
|
73
73
|
}));
|
|
74
74
|
}),
|
|
75
|
-
}
|
|
75
|
+
};
|
|
76
|
+
}
|
|
77
|
+
|
|
78
|
+
export function jobsHandlers<const TQueues extends readonly JobsQueue[], TService>(
|
|
79
|
+
page: ReturnType<typeof jobsPage<TQueues>>,
|
|
80
|
+
service: Context.Service<TService, PgBossService>,
|
|
81
|
+
) {
|
|
82
|
+
return page.contract.application.toLayer(jobsReadHandlers(page, service));
|
|
76
83
|
}
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
import { type Context, Effect, Option } from "effect";
|
|
2
|
+
import type { PgBossService } from "@shivaedev/effect-pg-boss/server/service.ts";
|
|
3
|
+
import { JobsNotFailed, type jobsPageWithRetry } from "#jobs/retryPage.ts";
|
|
4
|
+
import { type JobsQueue, JobsQueueUnregistered } from "#jobs/schemas.ts";
|
|
5
|
+
import { jobsFailures, jobsReadHandlers } from "./jobsHandlers.ts";
|
|
6
|
+
|
|
7
|
+
export function jobsHandlersWithRetry<const TQueues extends readonly JobsQueue[], TService>(
|
|
8
|
+
page: ReturnType<typeof jobsPageWithRetry<TQueues>>,
|
|
9
|
+
service: Context.Service<TService, PgBossService>,
|
|
10
|
+
) {
|
|
11
|
+
return page.contract.application.toLayer({
|
|
12
|
+
...jobsReadHandlers(page, service),
|
|
13
|
+
"admin.jobs.retry": ({ queue, id }) =>
|
|
14
|
+
Effect.gen(function* () {
|
|
15
|
+
const definition = page.queues.find((candidate) => candidate.name === queue);
|
|
16
|
+
if (definition === undefined) {
|
|
17
|
+
return yield* Effect.fail(new JobsQueueUnregistered({ queue }));
|
|
18
|
+
}
|
|
19
|
+
const jobs = yield* service;
|
|
20
|
+
const job = yield* jobsFailures(jobs.getJob<string, TQueues[number]["schema"]>(definition, id));
|
|
21
|
+
if (Option.isNone(job) || job.value.state !== "failed") {
|
|
22
|
+
return yield* Effect.fail(new JobsNotFailed({ id, queue }));
|
|
23
|
+
}
|
|
24
|
+
yield* jobsFailures(jobs.retry(definition, id));
|
|
25
|
+
}),
|
|
26
|
+
});
|
|
27
|
+
}
|