@shivaedev/admin 0.7.0 → 0.8.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 +2 -0
- package/dist/jobs/entry.d.ts +12 -0
- package/dist/jobs/entry.d.ts.map +1 -0
- package/dist/jobs/entry.js +5 -0
- package/dist/jobs/entry.js.map +1 -0
- package/dist/jobs/keys.d.ts +5 -5
- package/dist/jobs/keys.js +1 -1
- package/dist/jobs/keys.js.map +1 -1
- package/dist/jobs/page.d.ts +47 -41
- package/dist/jobs/page.d.ts.map +1 -1
- package/dist/jobs/page.js +17 -4
- package/dist/jobs/page.js.map +1 -1
- package/dist/jobs/retryPage.d.ts +20 -14
- package/dist/jobs/retryPage.d.ts.map +1 -1
- package/dist/jobs/retryPage.js.map +1 -1
- package/dist/jobs/schemas.d.ts +2 -2
- package/dist/jobs/schemas.d.ts.map +1 -1
- package/dist/jobs/schemas.js.map +1 -1
- package/dist/permissions.d.ts +2 -2
- package/dist/server/jobsHandlers.d.ts +8 -7
- package/dist/server/jobsHandlers.d.ts.map +1 -1
- package/dist/server/jobsHandlers.js +2 -1
- package/dist/server/jobsHandlers.js.map +1 -1
- package/dist/server/jobsHandlersWithRetry.d.ts +2 -2
- package/dist/server/jobsHandlersWithRetry.d.ts.map +1 -1
- package/dist/server/jobsHandlersWithRetry.js +5 -2
- package/dist/server/jobsHandlersWithRetry.js.map +1 -1
- package/dist/users/page.d.ts +8 -2
- package/dist/users/page.d.ts.map +1 -1
- package/dist/users/page.js +5 -2
- package/dist/users/page.js.map +1 -1
- package/package.json +12 -11
- package/src/jobs/entry.ts +15 -0
- package/src/jobs/keys.ts +1 -1
- package/src/jobs/page.ts +19 -6
- package/src/jobs/retryPage.ts +3 -2
- package/src/jobs/schemas.ts +2 -2
- package/src/server/jobsHandlers.ts +8 -7
- package/src/server/jobsHandlersWithRetry.ts +8 -5
- package/src/users/page.ts +5 -2
package/README.md
CHANGED
|
@@ -94,6 +94,8 @@ const registration = registerAdmin(Admin, {
|
|
|
94
94
|
|
|
95
95
|
The queries are `admin.jobs.health`, `admin.jobs.counts`, `admin.jobs.failed`, `admin.jobs.deadLettered` and `admin.jobs.job`. Counts take `{ queue }`; listings take `{ queue, limit, cursor? }` and return `{ jobs, next }`, where `next` is an `Option<string>`. Job lookup takes `{ queue, id }` and returns `Option<Job>`. Each job carries its queue, decoded payload, state, attempt and retry counts, output and timestamps. Dead-letter listings also carry `sourceId` and `sourceOutput`. Timestamps use UTC `DateTime` values; the RPC encodes timestamps as strings and Options as nullable values. The queue's original codec encodes and decodes its payload across RPC, preserving its service requirements.
|
|
96
96
|
|
|
97
|
+
Schedule definitions from `defineSchedule` can be passed beside queues. A browser declaration can share just `{ _tag: "ScheduleDefinition", name }`; scheduled runs use a null payload schema for failed and dead-letter listings and job lookup. Calling `jobsPage()` with no arguments registers the same read-only page and serves health with no jobs and zero totals.
|
|
98
|
+
|
|
97
99
|
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 jobs 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.
|
|
98
100
|
|
|
99
101
|
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 permission enforcement. The application supplies the Jobs view and mounts the registration on its existing RPC host.
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
import { Schema } from "effect";
|
|
2
|
+
import type { JobsQueue } from "./schemas.ts";
|
|
3
|
+
export type JobsEntry = JobsQueue | {
|
|
4
|
+
readonly _tag: "ScheduleDefinition";
|
|
5
|
+
readonly name: string;
|
|
6
|
+
};
|
|
7
|
+
export type JobsPayload<TEntry extends JobsEntry> = [TEntry] extends [never] ? typeof Schema.Never : TEntry extends JobsQueue ? TEntry["schema"] : typeof Schema.Null;
|
|
8
|
+
export declare function jobsQueue<TEntry extends JobsEntry>(entry: TEntry): {
|
|
9
|
+
readonly name: string;
|
|
10
|
+
readonly schema: JobsPayload<TEntry>;
|
|
11
|
+
};
|
|
12
|
+
//# sourceMappingURL=entry.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"entry.d.ts","sourceRoot":"","sources":["../../src/jobs/entry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAE9C,MAAM,MAAM,SAAS,GAAG,SAAS,GAAG;IAAE,QAAQ,CAAC,IAAI,EAAE,oBAAoB,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC;AAEnG,MAAM,MAAM,WAAW,CAAC,MAAM,SAAS,SAAS,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,GACzE,OAAO,MAAM,CAAC,KAAK,GACnB,MAAM,SAAS,SAAS,GACvB,MAAM,CAAC,QAAQ,CAAC,GAChB,OAAO,MAAM,CAAC,IAAI,CAAC;AAEvB,wBAAgB,SAAS,CAAC,MAAM,SAAS,SAAS,EAAE,KAAK,EAAE,MAAM,GAAG;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC,MAAM,CAAC,CAAA;CAAE,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"entry.js","sourceRoot":"","sources":["../../src/jobs/entry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAYhC,MAAM,UAAU,SAAS,CAAC,KAAgB;IACzC,OAAO,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;AACrF,CAAC"}
|
package/dist/jobs/keys.d.ts
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
export declare const jobsKeys: {
|
|
2
|
-
counts: import("@shivaedev/
|
|
3
|
-
deadLettered: import("@shivaedev/
|
|
4
|
-
failed: import("@shivaedev/
|
|
5
|
-
health: import("@shivaedev/
|
|
6
|
-
job: (queue: string) => import("@shivaedev/
|
|
2
|
+
counts: import("@shivaedev/changes/keys.ts").Collection<"admin.jobs.counts", string, Record<never, never>>;
|
|
3
|
+
deadLettered: import("@shivaedev/changes/keys.ts").Collection<"admin.jobs.deadLettered", string, Record<never, never>>;
|
|
4
|
+
failed: import("@shivaedev/changes/keys.ts").Collection<"admin.jobs.failed", string, Record<never, never>>;
|
|
5
|
+
health: import("@shivaedev/changes/keys.ts").Collection<"admin.jobs.health", string, Record<never, never>>;
|
|
6
|
+
job: (queue: string) => import("@shivaedev/changes/keys.ts").Collection<`admin.jobs.job.${string}`, string, Record<never, never>>;
|
|
7
7
|
};
|
|
8
8
|
//# sourceMappingURL=keys.d.ts.map
|
package/dist/jobs/keys.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Schema } from "effect";
|
|
2
|
-
import { collection } from "@shivaedev/
|
|
2
|
+
import { collection } from "@shivaedev/changes/keys.ts";
|
|
3
3
|
export const jobsKeys = {
|
|
4
4
|
counts: collection("admin.jobs.counts", Schema.String),
|
|
5
5
|
deadLettered: collection("admin.jobs.deadLettered", Schema.String),
|
package/dist/jobs/keys.js.map
CHANGED
|
@@ -1 +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,
|
|
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,4BAA4B,CAAC;AAExD,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
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { Schema } from "effect";
|
|
2
2
|
import { JobsPermission } from "#permissions.ts";
|
|
3
|
-
import { type
|
|
4
|
-
export declare function jobsPage<const TQueues extends readonly
|
|
3
|
+
import { type JobsEntry, type JobsPayload } from "./entry.ts";
|
|
4
|
+
export declare function jobsPage<const TQueues extends readonly JobsEntry[]>(...queues: TQueues): import("#page.ts").AdminPage & {
|
|
5
5
|
readonly id: "jobs";
|
|
6
6
|
readonly contract: import("@shivaedev/contract/contract.ts").Contract<"admin.jobs", readonly [NoInfer<import("@shivaedev/contract/operation.ts").Query<"health", Schema.Void, Schema.Struct<{
|
|
7
7
|
readonly activeTotal: Schema.Number;
|
|
@@ -47,7 +47,7 @@ export declare function jobsPage<const TQueues extends readonly JobsQueue[]>(...
|
|
|
47
47
|
readonly retryLimit: Schema.Number;
|
|
48
48
|
readonly startedOn: Schema.OptionFromNullOr<Schema.DateTimeUtcFromString>;
|
|
49
49
|
readonly state: Schema.Literals<readonly ["created", "retry", "active", "completed", "cancelled", "failed"]>;
|
|
50
|
-
readonly data: TQueues[number]
|
|
50
|
+
readonly data: JobsPayload<TQueues[number]>;
|
|
51
51
|
readonly queue: Schema.Literal<string>;
|
|
52
52
|
}>[]>>;
|
|
53
53
|
readonly next: Schema.OptionFromNullOr<Schema.String>;
|
|
@@ -70,7 +70,7 @@ export declare function jobsPage<const TQueues extends readonly JobsQueue[]>(...
|
|
|
70
70
|
readonly retryLimit: Schema.Number;
|
|
71
71
|
readonly startedOn: Schema.OptionFromNullOr<Schema.DateTimeUtcFromString>;
|
|
72
72
|
readonly state: Schema.Literals<readonly ["created", "retry", "active", "completed", "cancelled", "failed"]>;
|
|
73
|
-
readonly data: TQueues[number]
|
|
73
|
+
readonly data: JobsPayload<TQueues[number]>;
|
|
74
74
|
readonly queue: Schema.Literal<string>;
|
|
75
75
|
readonly sourceId: Schema.OptionFromNullOr<Schema.String>;
|
|
76
76
|
readonly sourceOutput: Schema.Unknown;
|
|
@@ -93,28 +93,13 @@ export declare function jobsPage<const TQueues extends readonly JobsQueue[]>(...
|
|
|
93
93
|
readonly retryLimit: Schema.Number;
|
|
94
94
|
readonly startedOn: Schema.OptionFromNullOr<Schema.DateTimeUtcFromString>;
|
|
95
95
|
readonly state: Schema.Literals<readonly ["created", "retry", "active", "completed", "cancelled", "failed"]>;
|
|
96
|
-
readonly data: TQueues[number]
|
|
96
|
+
readonly data: JobsPayload<TQueues[number]>;
|
|
97
97
|
readonly queue: Schema.Literal<string>;
|
|
98
98
|
}>[]>>, {
|
|
99
99
|
JobsPayloadInvalid: typeof import("./schemas.ts").JobsPayloadInvalid;
|
|
100
100
|
JobsQueueUnregistered: typeof import("./schemas.ts").JobsQueueUnregistered;
|
|
101
101
|
JobsUnavailable: typeof import("./schemas.ts").JobsUnavailable;
|
|
102
|
-
}>>], readonly [], import("effect/rpc/Rpc").Rpc<"admin.jobs
|
|
103
|
-
id: Schema.String;
|
|
104
|
-
queue: Schema.String;
|
|
105
|
-
}>, Schema.OptionFromNullOr<Schema.Union<Schema.Struct<{
|
|
106
|
-
readonly attempt: Schema.Number;
|
|
107
|
-
readonly completedOn: Schema.OptionFromNullOr<Schema.DateTimeUtcFromString>;
|
|
108
|
-
readonly createdOn: Schema.DateTimeUtcFromString;
|
|
109
|
-
readonly id: Schema.String;
|
|
110
|
-
readonly output: Schema.Unknown;
|
|
111
|
-
readonly retryCount: Schema.Number;
|
|
112
|
-
readonly retryLimit: Schema.Number;
|
|
113
|
-
readonly startedOn: Schema.OptionFromNullOr<Schema.DateTimeUtcFromString>;
|
|
114
|
-
readonly state: Schema.Literals<readonly ["created", "retry", "active", "completed", "cancelled", "failed"]>;
|
|
115
|
-
readonly data: TQueues[number]["schema"];
|
|
116
|
-
readonly queue: Schema.Literal<string>;
|
|
117
|
-
}>[]>>, Schema.Union<readonly (typeof import("./schemas.ts").JobsUnavailable | typeof import("./schemas.ts").JobsPayloadInvalid | typeof import("./schemas.ts").JobsQueueUnregistered)[]>, typeof JobsPermission, never> | import("effect/rpc/Rpc").Rpc<"admin.jobs.$changes", Schema.Struct<{
|
|
102
|
+
}>>], readonly [], import("effect/rpc/Rpc").Rpc<"admin.jobs.$changes", Schema.Struct<{
|
|
118
103
|
queries: Schema.$Array<Schema.Union<readonly (Schema.Struct<{
|
|
119
104
|
query: Schema.Literal<"counts">;
|
|
120
105
|
payload: Schema.Struct<{
|
|
@@ -147,6 +132,11 @@ export declare function jobsPage<const TQueues extends readonly JobsQueue[]>(...
|
|
|
147
132
|
}>, import("effect/rpc/RpcSchema").Stream<Schema.Union<readonly [Schema.Struct<{
|
|
148
133
|
readonly _tag: Schema.Literal<"Changed">;
|
|
149
134
|
readonly keys: Schema.$Array<Schema.Union<readonly [Schema.Struct<{
|
|
135
|
+
readonly _tag: Schema.Literal<"Bucket">;
|
|
136
|
+
readonly collection: Schema.String;
|
|
137
|
+
readonly field: Schema.String;
|
|
138
|
+
readonly value: Schema.Union<readonly [Schema.String, Schema.Number]>;
|
|
139
|
+
}>, Schema.Struct<{
|
|
150
140
|
readonly _tag: Schema.Literal<"List">;
|
|
151
141
|
readonly collection: Schema.String;
|
|
152
142
|
}>, Schema.Struct<{
|
|
@@ -154,30 +144,17 @@ export declare function jobsPage<const TQueues extends readonly JobsQueue[]>(...
|
|
|
154
144
|
readonly collection: Schema.String;
|
|
155
145
|
readonly id: Schema.Union<readonly [Schema.String, Schema.Number]>;
|
|
156
146
|
}>]>>;
|
|
147
|
+
readonly queryIndexes: Schema.optional<Schema.$Array<Schema.Number>>;
|
|
157
148
|
}>, Schema.Struct<{
|
|
158
149
|
readonly _tag: Schema.Literal<"Resync">;
|
|
159
|
-
}>]>, Schema.
|
|
150
|
+
}>]>, Schema.Union<readonly [typeof import("@shivaedev/contract/readPolicyErrors.ts").MissingReadPolicy, typeof import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied]>>, Schema.Never, typeof JobsPermission, never> | import("effect/rpc/Rpc").Rpc<"admin.jobs.counts", Schema.Struct<{
|
|
160
151
|
queue: Schema.String;
|
|
161
152
|
}>, Schema.Struct<{
|
|
162
153
|
readonly activeCount: Schema.Number;
|
|
163
154
|
readonly failedCount: Schema.Number;
|
|
164
155
|
readonly queuedCount: Schema.Number;
|
|
165
156
|
readonly totalCount: Schema.Number;
|
|
166
|
-
}>, Schema.Union<readonly (typeof import("./schemas.ts").JobsUnavailable | typeof import("./schemas.ts").JobsPayloadInvalid | typeof import("./schemas.ts").JobsQueueUnregistered)[]>, typeof JobsPermission, never> | import("effect/rpc/Rpc").Rpc<"admin.jobs.
|
|
167
|
-
readonly activeTotal: Schema.Number;
|
|
168
|
-
readonly deadLetteredTotal: Schema.Number;
|
|
169
|
-
readonly failedTotal: Schema.Number;
|
|
170
|
-
readonly jobs: Schema.$Array<Schema.Struct<{
|
|
171
|
-
readonly activeCount: Schema.Number;
|
|
172
|
-
readonly deadLetteredCount: Schema.Number;
|
|
173
|
-
readonly failedCount: Schema.Number;
|
|
174
|
-
readonly name: Schema.String;
|
|
175
|
-
readonly queuedCount: Schema.Number;
|
|
176
|
-
readonly readyCount: Schema.Number;
|
|
177
|
-
}>>;
|
|
178
|
-
readonly queuedTotal: Schema.Number;
|
|
179
|
-
readonly readyTotal: Schema.Number;
|
|
180
|
-
}>, Schema.Union<readonly (typeof import("./schemas.ts").JobsUnavailable | typeof import("./schemas.ts").JobsPayloadInvalid | typeof import("./schemas.ts").JobsQueueUnregistered)[]>, typeof JobsPermission, never> | import("effect/rpc/Rpc").Rpc<"admin.jobs.failed", Schema.Struct<{
|
|
157
|
+
}>, Schema.Union<readonly [Schema.Union<readonly (typeof import("./schemas.ts").JobsUnavailable | typeof import("./schemas.ts").JobsPayloadInvalid | typeof import("./schemas.ts").JobsQueueUnregistered)[]>, typeof import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied]>, typeof JobsPermission, never> | import("effect/rpc/Rpc").Rpc<"admin.jobs.failed", Schema.Struct<{
|
|
181
158
|
cursor: Schema.optionalKey<Schema.String>;
|
|
182
159
|
limit: Schema.Number;
|
|
183
160
|
queue: Schema.String;
|
|
@@ -192,11 +169,11 @@ export declare function jobsPage<const TQueues extends readonly JobsQueue[]>(...
|
|
|
192
169
|
readonly retryLimit: Schema.Number;
|
|
193
170
|
readonly startedOn: Schema.OptionFromNullOr<Schema.DateTimeUtcFromString>;
|
|
194
171
|
readonly state: Schema.Literals<readonly ["created", "retry", "active", "completed", "cancelled", "failed"]>;
|
|
195
|
-
readonly data: TQueues[number]
|
|
172
|
+
readonly data: JobsPayload<TQueues[number]>;
|
|
196
173
|
readonly queue: Schema.Literal<string>;
|
|
197
174
|
}>[]>>;
|
|
198
175
|
readonly next: Schema.OptionFromNullOr<Schema.String>;
|
|
199
|
-
}>, Schema.Union<readonly (typeof import("./schemas.ts").JobsUnavailable | typeof import("./schemas.ts").JobsPayloadInvalid | typeof import("./schemas.ts").JobsQueueUnregistered)[]>, typeof JobsPermission, never> | import("effect/rpc/Rpc").Rpc<"admin.jobs.deadLettered", Schema.Struct<{
|
|
176
|
+
}>, Schema.Union<readonly [Schema.Union<readonly (typeof import("./schemas.ts").JobsUnavailable | typeof import("./schemas.ts").JobsPayloadInvalid | typeof import("./schemas.ts").JobsQueueUnregistered)[]>, typeof import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied]>, typeof JobsPermission, never> | import("effect/rpc/Rpc").Rpc<"admin.jobs.deadLettered", Schema.Struct<{
|
|
200
177
|
cursor: Schema.optionalKey<Schema.String>;
|
|
201
178
|
limit: Schema.Number;
|
|
202
179
|
queue: Schema.String;
|
|
@@ -211,13 +188,42 @@ export declare function jobsPage<const TQueues extends readonly JobsQueue[]>(...
|
|
|
211
188
|
readonly retryLimit: Schema.Number;
|
|
212
189
|
readonly startedOn: Schema.OptionFromNullOr<Schema.DateTimeUtcFromString>;
|
|
213
190
|
readonly state: Schema.Literals<readonly ["created", "retry", "active", "completed", "cancelled", "failed"]>;
|
|
214
|
-
readonly data: TQueues[number]
|
|
191
|
+
readonly data: JobsPayload<TQueues[number]>;
|
|
215
192
|
readonly queue: Schema.Literal<string>;
|
|
216
193
|
readonly sourceId: Schema.OptionFromNullOr<Schema.String>;
|
|
217
194
|
readonly sourceOutput: Schema.Unknown;
|
|
218
195
|
}>[]>>;
|
|
219
196
|
readonly next: Schema.OptionFromNullOr<Schema.String>;
|
|
220
|
-
}>, Schema.Union<readonly (typeof import("./schemas.ts").JobsUnavailable | typeof import("./schemas.ts").JobsPayloadInvalid | typeof import("./schemas.ts").JobsQueueUnregistered)[]>, typeof JobsPermission, never
|
|
197
|
+
}>, Schema.Union<readonly [Schema.Union<readonly (typeof import("./schemas.ts").JobsUnavailable | typeof import("./schemas.ts").JobsPayloadInvalid | typeof import("./schemas.ts").JobsQueueUnregistered)[]>, typeof import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied]>, typeof JobsPermission, never> | import("effect/rpc/Rpc").Rpc<"admin.jobs.job", Schema.Struct<{
|
|
198
|
+
id: Schema.String;
|
|
199
|
+
queue: Schema.String;
|
|
200
|
+
}>, Schema.OptionFromNullOr<Schema.Union<Schema.Struct<{
|
|
201
|
+
readonly attempt: Schema.Number;
|
|
202
|
+
readonly completedOn: Schema.OptionFromNullOr<Schema.DateTimeUtcFromString>;
|
|
203
|
+
readonly createdOn: Schema.DateTimeUtcFromString;
|
|
204
|
+
readonly id: Schema.String;
|
|
205
|
+
readonly output: Schema.Unknown;
|
|
206
|
+
readonly retryCount: Schema.Number;
|
|
207
|
+
readonly retryLimit: Schema.Number;
|
|
208
|
+
readonly startedOn: Schema.OptionFromNullOr<Schema.DateTimeUtcFromString>;
|
|
209
|
+
readonly state: Schema.Literals<readonly ["created", "retry", "active", "completed", "cancelled", "failed"]>;
|
|
210
|
+
readonly data: JobsPayload<TQueues[number]>;
|
|
211
|
+
readonly queue: Schema.Literal<string>;
|
|
212
|
+
}>[]>>, Schema.Union<readonly [Schema.Union<readonly (typeof import("./schemas.ts").JobsUnavailable | typeof import("./schemas.ts").JobsPayloadInvalid | typeof import("./schemas.ts").JobsQueueUnregistered)[]>, typeof import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied]>, typeof JobsPermission, never> | import("effect/rpc/Rpc").Rpc<"admin.jobs.health", Schema.Void, Schema.Struct<{
|
|
213
|
+
readonly activeTotal: Schema.Number;
|
|
214
|
+
readonly deadLetteredTotal: Schema.Number;
|
|
215
|
+
readonly failedTotal: Schema.Number;
|
|
216
|
+
readonly jobs: Schema.$Array<Schema.Struct<{
|
|
217
|
+
readonly activeCount: Schema.Number;
|
|
218
|
+
readonly deadLetteredCount: Schema.Number;
|
|
219
|
+
readonly failedCount: Schema.Number;
|
|
220
|
+
readonly name: Schema.String;
|
|
221
|
+
readonly queuedCount: Schema.Number;
|
|
222
|
+
readonly readyCount: Schema.Number;
|
|
223
|
+
}>>;
|
|
224
|
+
readonly queuedTotal: Schema.Number;
|
|
225
|
+
readonly readyTotal: Schema.Number;
|
|
226
|
+
}>, Schema.Union<readonly [Schema.Union<readonly (typeof import("./schemas.ts").JobsUnavailable | typeof import("./schemas.ts").JobsPayloadInvalid | typeof import("./schemas.ts").JobsQueueUnregistered)[]>, typeof import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied]>, typeof JobsPermission, never>, readonly [], undefined>;
|
|
221
227
|
} & {
|
|
222
228
|
queues: TQueues;
|
|
223
229
|
};
|
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,
|
|
1
|
+
{"version":3,"file":"page.d.ts","sourceRoot":"","sources":["../../src/jobs/page.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,MAAM,EAAE,MAAM,QAAQ,CAAC;AAMxC,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,WAAW,EAAa,MAAM,YAAY,CAAC;AAIzE,wBAAgB,QAAQ,CAAC,KAAK,CAAC,OAAO,SAAS,SAAS,SAAS,EAAE,EAAE,GAAG,MAAM,EAAE,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAgDtF"}
|
package/dist/jobs/page.js
CHANGED
|
@@ -1,37 +1,50 @@
|
|
|
1
|
-
import { Schema } from "effect";
|
|
1
|
+
import { Effect, Schema } from "effect";
|
|
2
2
|
import { contract } from "@shivaedev/contract/contract.ts";
|
|
3
3
|
import { query } from "@shivaedev/contract/operation.ts";
|
|
4
|
+
import { SessionUser } from "@shivaedev/identity/identity.ts";
|
|
5
|
+
import { hasPermission } from "@shivaedev/identity/permission.ts";
|
|
4
6
|
import { adminPage } from "#page.ts";
|
|
5
7
|
import { JobsPermission } from "#permissions.ts";
|
|
8
|
+
import { jobsQueue } from "./entry.js";
|
|
6
9
|
import { jobsKeys } from "./keys.js";
|
|
7
10
|
import { deadLetteredSchema, JobsFailures, JobsHealth, jobPage, jobSchema, PageFields, QueueCounts } from "./schemas.js";
|
|
8
11
|
export function jobsPage(...queues) {
|
|
9
|
-
const
|
|
10
|
-
const
|
|
12
|
+
const definitions = queues.map((queue) => jobsQueue(queue));
|
|
13
|
+
const Job = Schema.Union(definitions.map((queue) => jobSchema(queue)));
|
|
14
|
+
const DeadLettered = Schema.Union(definitions.map((queue) => deadLetteredSchema(queue)));
|
|
11
15
|
const page = adminPage({
|
|
12
16
|
contract: contract("admin.jobs", {
|
|
13
17
|
queries: [
|
|
14
|
-
query("health", {
|
|
18
|
+
query("health", {
|
|
19
|
+
readPolicy: () => Effect.map(SessionUser, (user) => hasPermission(user, JobsPermission.permission)),
|
|
20
|
+
reads: () => [jobsKeys.health.list],
|
|
21
|
+
rejections: JobsFailures,
|
|
22
|
+
success: JobsHealth,
|
|
23
|
+
}),
|
|
15
24
|
query("counts", {
|
|
16
25
|
payload: { queue: Schema.String },
|
|
26
|
+
readPolicy: () => Effect.map(SessionUser, (user) => hasPermission(user, JobsPermission.permission)),
|
|
17
27
|
reads: ({ queue }) => [jobsKeys.counts.item(queue)],
|
|
18
28
|
rejections: JobsFailures,
|
|
19
29
|
success: QueueCounts,
|
|
20
30
|
}),
|
|
21
31
|
query("failed", {
|
|
22
32
|
payload: { ...PageFields, queue: Schema.String },
|
|
33
|
+
readPolicy: () => Effect.map(SessionUser, (user) => hasPermission(user, JobsPermission.permission)),
|
|
23
34
|
reads: ({ queue }) => [jobsKeys.failed.item(queue)],
|
|
24
35
|
rejections: JobsFailures,
|
|
25
36
|
success: jobPage(Job),
|
|
26
37
|
}),
|
|
27
38
|
query("deadLettered", {
|
|
28
39
|
payload: { ...PageFields, queue: Schema.String },
|
|
40
|
+
readPolicy: () => Effect.map(SessionUser, (user) => hasPermission(user, JobsPermission.permission)),
|
|
29
41
|
reads: ({ queue }) => [jobsKeys.deadLettered.item(queue)],
|
|
30
42
|
rejections: JobsFailures,
|
|
31
43
|
success: jobPage(DeadLettered),
|
|
32
44
|
}),
|
|
33
45
|
query("job", {
|
|
34
46
|
payload: { id: Schema.String, queue: Schema.String },
|
|
47
|
+
readPolicy: () => Effect.map(SessionUser, (user) => hasPermission(user, JobsPermission.permission)),
|
|
35
48
|
reads: ({ queue, id }) => [jobsKeys.job(queue).item(id)],
|
|
36
49
|
rejections: JobsFailures,
|
|
37
50
|
success: Schema.OptionFromNullOr(Job),
|
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;
|
|
1
|
+
{"version":3,"file":"page.js","sourceRoot":"","sources":["../../src/jobs/page.ts"],"names":[],"mappings":"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"}
|
package/dist/jobs/retryPage.d.ts
CHANGED
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
import { Schema } from "effect";
|
|
2
2
|
import { JobsPermission } from "#permissions.ts";
|
|
3
|
-
import {
|
|
3
|
+
import type { JobsEntry } from "./entry.ts";
|
|
4
4
|
declare const JobsNotFailed_base: Schema.Class<JobsNotFailed, Schema.TaggedStruct<"JobsNotFailed", {
|
|
5
5
|
readonly id: Schema.String;
|
|
6
6
|
readonly queue: Schema.String;
|
|
7
7
|
}>, import("effect/Cause").YieldableError>;
|
|
8
8
|
export declare class JobsNotFailed extends JobsNotFailed_base {
|
|
9
9
|
}
|
|
10
|
-
export declare function jobsPageWithRetry<const TQueues extends readonly
|
|
10
|
+
export declare function jobsPageWithRetry<const TQueues extends readonly JobsEntry[]>(...queues: TQueues): import("#page.ts").AdminPage & {
|
|
11
11
|
readonly id: "jobs";
|
|
12
12
|
readonly contract: import("@shivaedev/contract/contract.ts").Contract<"admin.jobs", readonly [NoInfer<import("@shivaedev/contract/operation.ts").Query<"health", Schema.Void, Schema.Struct<{
|
|
13
13
|
readonly activeTotal: Schema.Number;
|
|
@@ -53,7 +53,7 @@ export declare function jobsPageWithRetry<const TQueues extends readonly JobsQue
|
|
|
53
53
|
readonly retryLimit: Schema.Number;
|
|
54
54
|
readonly startedOn: Schema.OptionFromNullOr<Schema.DateTimeUtcFromString>;
|
|
55
55
|
readonly state: Schema.Literals<readonly ["created", "retry", "active", "completed", "cancelled", "failed"]>;
|
|
56
|
-
readonly data: [...TQueues][number]
|
|
56
|
+
readonly data: import("./entry.ts").JobsPayload<[...TQueues][number]>;
|
|
57
57
|
readonly queue: Schema.Literal<string>;
|
|
58
58
|
}>[]>>;
|
|
59
59
|
readonly next: Schema.OptionFromNullOr<Schema.String>;
|
|
@@ -76,7 +76,7 @@ export declare function jobsPageWithRetry<const TQueues extends readonly JobsQue
|
|
|
76
76
|
readonly retryLimit: Schema.Number;
|
|
77
77
|
readonly startedOn: Schema.OptionFromNullOr<Schema.DateTimeUtcFromString>;
|
|
78
78
|
readonly state: Schema.Literals<readonly ["created", "retry", "active", "completed", "cancelled", "failed"]>;
|
|
79
|
-
readonly data: [...TQueues][number]
|
|
79
|
+
readonly data: import("./entry.ts").JobsPayload<[...TQueues][number]>;
|
|
80
80
|
readonly queue: Schema.Literal<string>;
|
|
81
81
|
readonly sourceId: Schema.OptionFromNullOr<Schema.String>;
|
|
82
82
|
readonly sourceOutput: Schema.Unknown;
|
|
@@ -99,7 +99,7 @@ export declare function jobsPageWithRetry<const TQueues extends readonly JobsQue
|
|
|
99
99
|
readonly retryLimit: Schema.Number;
|
|
100
100
|
readonly startedOn: Schema.OptionFromNullOr<Schema.DateTimeUtcFromString>;
|
|
101
101
|
readonly state: Schema.Literals<readonly ["created", "retry", "active", "completed", "cancelled", "failed"]>;
|
|
102
|
-
readonly data: [...TQueues][number]
|
|
102
|
+
readonly data: import("./entry.ts").JobsPayload<[...TQueues][number]>;
|
|
103
103
|
readonly queue: Schema.Literal<string>;
|
|
104
104
|
}>[]>>, {
|
|
105
105
|
JobsPayloadInvalid: typeof import("./schemas.ts").JobsPayloadInvalid;
|
|
@@ -146,6 +146,11 @@ export declare function jobsPageWithRetry<const TQueues extends readonly JobsQue
|
|
|
146
146
|
}>, import("effect/rpc/RpcSchema").Stream<Schema.Union<readonly [Schema.Struct<{
|
|
147
147
|
readonly _tag: Schema.Literal<"Changed">;
|
|
148
148
|
readonly keys: Schema.$Array<Schema.Union<readonly [Schema.Struct<{
|
|
149
|
+
readonly _tag: Schema.Literal<"Bucket">;
|
|
150
|
+
readonly collection: Schema.String;
|
|
151
|
+
readonly field: Schema.String;
|
|
152
|
+
readonly value: Schema.Union<readonly [Schema.String, Schema.Number]>;
|
|
153
|
+
}>, Schema.Struct<{
|
|
149
154
|
readonly _tag: Schema.Literal<"List">;
|
|
150
155
|
readonly collection: Schema.String;
|
|
151
156
|
}>, Schema.Struct<{
|
|
@@ -153,16 +158,17 @@ export declare function jobsPageWithRetry<const TQueues extends readonly JobsQue
|
|
|
153
158
|
readonly collection: Schema.String;
|
|
154
159
|
readonly id: Schema.Union<readonly [Schema.String, Schema.Number]>;
|
|
155
160
|
}>]>>;
|
|
161
|
+
readonly queryIndexes: Schema.optional<Schema.$Array<Schema.Number>>;
|
|
156
162
|
}>, Schema.Struct<{
|
|
157
163
|
readonly _tag: Schema.Literal<"Resync">;
|
|
158
|
-
}>]>, Schema.
|
|
164
|
+
}>]>, Schema.Union<readonly [typeof import("@shivaedev/contract/readPolicyErrors.ts").MissingReadPolicy, typeof import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied]>>, Schema.Never, typeof JobsPermission, never> | import("effect/rpc/Rpc").Rpc<"admin.jobs.counts", Schema.Struct<{
|
|
159
165
|
queue: Schema.String;
|
|
160
166
|
}>, Schema.Struct<{
|
|
161
167
|
readonly activeCount: Schema.Number;
|
|
162
168
|
readonly failedCount: Schema.Number;
|
|
163
169
|
readonly queuedCount: Schema.Number;
|
|
164
170
|
readonly totalCount: Schema.Number;
|
|
165
|
-
}>, Schema.Union<readonly (typeof import("./schemas.ts").JobsUnavailable | typeof import("./schemas.ts").JobsPayloadInvalid | typeof import("./schemas.ts").JobsQueueUnregistered)[]>, typeof JobsPermission, never> | import("effect/rpc/Rpc").Rpc<"admin.jobs.deadLettered", Schema.Struct<{
|
|
171
|
+
}>, Schema.Union<readonly [Schema.Union<readonly (typeof import("./schemas.ts").JobsUnavailable | typeof import("./schemas.ts").JobsPayloadInvalid | typeof import("./schemas.ts").JobsQueueUnregistered)[]>, typeof import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied]>, typeof JobsPermission, never> | import("effect/rpc/Rpc").Rpc<"admin.jobs.deadLettered", Schema.Struct<{
|
|
166
172
|
cursor: Schema.optionalKey<Schema.String>;
|
|
167
173
|
limit: Schema.Number;
|
|
168
174
|
queue: Schema.String;
|
|
@@ -177,13 +183,13 @@ export declare function jobsPageWithRetry<const TQueues extends readonly JobsQue
|
|
|
177
183
|
readonly retryLimit: Schema.Number;
|
|
178
184
|
readonly startedOn: Schema.OptionFromNullOr<Schema.DateTimeUtcFromString>;
|
|
179
185
|
readonly state: Schema.Literals<readonly ["created", "retry", "active", "completed", "cancelled", "failed"]>;
|
|
180
|
-
readonly data: [...TQueues][number]
|
|
186
|
+
readonly data: import("./entry.ts").JobsPayload<[...TQueues][number]>;
|
|
181
187
|
readonly queue: Schema.Literal<string>;
|
|
182
188
|
readonly sourceId: Schema.OptionFromNullOr<Schema.String>;
|
|
183
189
|
readonly sourceOutput: Schema.Unknown;
|
|
184
190
|
}>[]>>;
|
|
185
191
|
readonly next: Schema.OptionFromNullOr<Schema.String>;
|
|
186
|
-
}>, Schema.Union<readonly (typeof import("./schemas.ts").JobsUnavailable | typeof import("./schemas.ts").JobsPayloadInvalid | typeof import("./schemas.ts").JobsQueueUnregistered)[]>, typeof JobsPermission, never> | import("effect/rpc/Rpc").Rpc<"admin.jobs.failed", Schema.Struct<{
|
|
192
|
+
}>, Schema.Union<readonly [Schema.Union<readonly (typeof import("./schemas.ts").JobsUnavailable | typeof import("./schemas.ts").JobsPayloadInvalid | typeof import("./schemas.ts").JobsQueueUnregistered)[]>, typeof import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied]>, typeof JobsPermission, never> | import("effect/rpc/Rpc").Rpc<"admin.jobs.failed", Schema.Struct<{
|
|
187
193
|
cursor: Schema.optionalKey<Schema.String>;
|
|
188
194
|
limit: Schema.Number;
|
|
189
195
|
queue: Schema.String;
|
|
@@ -198,11 +204,11 @@ export declare function jobsPageWithRetry<const TQueues extends readonly JobsQue
|
|
|
198
204
|
readonly retryLimit: Schema.Number;
|
|
199
205
|
readonly startedOn: Schema.OptionFromNullOr<Schema.DateTimeUtcFromString>;
|
|
200
206
|
readonly state: Schema.Literals<readonly ["created", "retry", "active", "completed", "cancelled", "failed"]>;
|
|
201
|
-
readonly data: [...TQueues][number]
|
|
207
|
+
readonly data: import("./entry.ts").JobsPayload<[...TQueues][number]>;
|
|
202
208
|
readonly queue: Schema.Literal<string>;
|
|
203
209
|
}>[]>>;
|
|
204
210
|
readonly next: Schema.OptionFromNullOr<Schema.String>;
|
|
205
|
-
}>, Schema.Union<readonly (typeof import("./schemas.ts").JobsUnavailable | typeof import("./schemas.ts").JobsPayloadInvalid | typeof import("./schemas.ts").JobsQueueUnregistered)[]>, typeof JobsPermission, never> | import("effect/rpc/Rpc").Rpc<"admin.jobs.health", Schema.Void, Schema.Struct<{
|
|
211
|
+
}>, Schema.Union<readonly [Schema.Union<readonly (typeof import("./schemas.ts").JobsUnavailable | typeof import("./schemas.ts").JobsPayloadInvalid | typeof import("./schemas.ts").JobsQueueUnregistered)[]>, typeof import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied]>, typeof JobsPermission, never> | import("effect/rpc/Rpc").Rpc<"admin.jobs.health", Schema.Void, Schema.Struct<{
|
|
206
212
|
readonly activeTotal: Schema.Number;
|
|
207
213
|
readonly deadLetteredTotal: Schema.Number;
|
|
208
214
|
readonly failedTotal: Schema.Number;
|
|
@@ -216,7 +222,7 @@ export declare function jobsPageWithRetry<const TQueues extends readonly JobsQue
|
|
|
216
222
|
}>>;
|
|
217
223
|
readonly queuedTotal: Schema.Number;
|
|
218
224
|
readonly readyTotal: Schema.Number;
|
|
219
|
-
}>, Schema.Union<readonly (typeof import("./schemas.ts").JobsUnavailable | typeof import("./schemas.ts").JobsPayloadInvalid | typeof import("./schemas.ts").JobsQueueUnregistered)[]>, typeof JobsPermission, never> | import("effect/rpc/Rpc").Rpc<"admin.jobs.job", Schema.Struct<{
|
|
225
|
+
}>, Schema.Union<readonly [Schema.Union<readonly (typeof import("./schemas.ts").JobsUnavailable | typeof import("./schemas.ts").JobsPayloadInvalid | typeof import("./schemas.ts").JobsQueueUnregistered)[]>, typeof import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied]>, typeof JobsPermission, never> | import("effect/rpc/Rpc").Rpc<"admin.jobs.job", Schema.Struct<{
|
|
220
226
|
id: Schema.String;
|
|
221
227
|
queue: Schema.String;
|
|
222
228
|
}>, Schema.OptionFromNullOr<Schema.Union<Schema.Struct<{
|
|
@@ -229,9 +235,9 @@ export declare function jobsPageWithRetry<const TQueues extends readonly JobsQue
|
|
|
229
235
|
readonly retryLimit: Schema.Number;
|
|
230
236
|
readonly startedOn: Schema.OptionFromNullOr<Schema.DateTimeUtcFromString>;
|
|
231
237
|
readonly state: Schema.Literals<readonly ["created", "retry", "active", "completed", "cancelled", "failed"]>;
|
|
232
|
-
readonly data: [...TQueues][number]
|
|
238
|
+
readonly data: import("./entry.ts").JobsPayload<[...TQueues][number]>;
|
|
233
239
|
readonly queue: Schema.Literal<string>;
|
|
234
|
-
}>[]>>, Schema.Union<readonly (typeof import("./schemas.ts").JobsUnavailable | typeof import("./schemas.ts").JobsPayloadInvalid | typeof import("./schemas.ts").JobsQueueUnregistered)[]>, typeof JobsPermission, never> | import("effect/rpc/Rpc").Rpc<"admin.jobs.retry", Schema.Struct<{
|
|
240
|
+
}>[]>>, Schema.Union<readonly [Schema.Union<readonly (typeof import("./schemas.ts").JobsUnavailable | typeof import("./schemas.ts").JobsPayloadInvalid | typeof import("./schemas.ts").JobsQueueUnregistered)[]>, typeof import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied]>, typeof JobsPermission, never> | import("effect/rpc/Rpc").Rpc<"admin.jobs.retry", Schema.Struct<{
|
|
235
241
|
id: Schema.String;
|
|
236
242
|
queue: Schema.String;
|
|
237
243
|
}>, Schema.Void, Schema.Union<readonly (typeof import("./schemas.ts").JobsUnavailable | typeof import("./schemas.ts").JobsPayloadInvalid | typeof import("./schemas.ts").JobsQueueUnregistered | typeof JobsNotFailed)[]>, typeof JobsPermission, never>, readonly [], undefined>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"retryPage.d.ts","sourceRoot":"","sources":["../../src/jobs/retryPage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAIhC,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"retryPage.d.ts","sourceRoot":"","sources":["../../src/jobs/retryPage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAIhC,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;;;;;AAK5C,qBAAa,aAAc,SAAQ,kBAGjC;CAAG;AAEL,wBAAgB,iBAAiB,CAAC,KAAK,CAAC,OAAO,SAAS,SAAS,SAAS,EAAE,EAAE,GAAG,MAAM,EAAE,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA0B/F"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"retryPage.js","sourceRoot":"","sources":["../../src/jobs/retryPage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,QAAQ,EAAE,MAAM,iCAAiC,CAAC;AAC3D,OAAO,EAAE,OAAO,EAAE,MAAM,kCAAkC,CAAC;AAC3D,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AACrC,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"retryPage.js","sourceRoot":"","sources":["../../src/jobs/retryPage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,QAAQ,EAAE,MAAM,iCAAiC,CAAC;AAC3D,OAAO,EAAE,OAAO,EAAE,MAAM,kCAAkC,CAAC;AAC3D,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AACrC,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEjD,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AACrC,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AACrC,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAE5C,MAAM,OAAO,aAAc,SAAQ,MAAM,CAAC,WAAW,EAAiB,CAAC,eAAe,EAAE;IACvF,EAAE,EAAE,MAAM,CAAC,MAAM;IACjB,KAAK,EAAE,MAAM,CAAC,MAAM;CACpB,CAAC;CAAG;AAEL,MAAM,UAAU,iBAAiB,CAA6C,GAAG,MAAe;IAC/F,MAAM,IAAI,GAAG,QAAQ,CAAC,GAAG,MAAM,CAAC,CAAC;IACjC,OAAO,MAAM,CAAC,MAAM,CACnB,SAAS,CAAC;QACT,QAAQ,EAAE,QAAQ,CAAC,YAAY,EAAE;YAChC,QAAQ,EAAE;gBACT,OAAO,CAAC,OAAO,EAAE;oBAChB,WAAW,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC;wBAC/B,QAAQ,CAAC,MAAM,CAAC,IAAI;wBACpB,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC;wBAC3B,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC;wBAC3B,QAAQ,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC;wBACjC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC;qBAC5B;oBACD,OAAO,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE;oBACpD,UAAU,EAAE,EAAE,GAAG,YAAY,EAAE,aAAa,EAAE;iBAC9C,CAAC;aACF;YACD,OAAO,EAAE,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,OAAO;SAC1C,CAAC;QACF,EAAE,EAAE,IAAI,CAAC,EAAE;QACX,UAAU,EAAE,cAAc;QAC1B,KAAK,EAAE,IAAI,CAAC,KAAK;KACjB,CAAC,EACF,EAAE,MAAM,EAAE,CACV,CAAC;AACH,CAAC"}
|
package/dist/jobs/schemas.d.ts
CHANGED
|
@@ -70,7 +70,7 @@ export declare const PageFields: {
|
|
|
70
70
|
cursor: Schema.optionalKey<Schema.String>;
|
|
71
71
|
limit: Schema.Number;
|
|
72
72
|
};
|
|
73
|
-
export declare function jobSchema<TPayload extends
|
|
73
|
+
export declare function jobSchema<TPayload extends Schema.Top>(queue: {
|
|
74
74
|
readonly name: string;
|
|
75
75
|
readonly schema: TPayload;
|
|
76
76
|
}): Schema.Struct<{
|
|
@@ -86,7 +86,7 @@ export declare function jobSchema<TPayload extends JobsQueue["schema"]>(queue: {
|
|
|
86
86
|
readonly data: TPayload;
|
|
87
87
|
readonly queue: Schema.Literal<string>;
|
|
88
88
|
}>;
|
|
89
|
-
export declare function deadLetteredSchema<TPayload extends
|
|
89
|
+
export declare function deadLetteredSchema<TPayload extends Schema.Top>(queue: {
|
|
90
90
|
readonly name: string;
|
|
91
91
|
readonly schema: TPayload;
|
|
92
92
|
}): Schema.Struct<{
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schemas.d.ts","sourceRoot":"","sources":["../../src/jobs/schemas.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,MAAM,WAAW,SAAS;IACzB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,GAAG;QAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;CAClF;;;;AAED,qBAAa,eAAgB,SAAQ,oBAEnC;CAAG;;;;AAEL,qBAAa,kBAAmB,SAAQ,uBAEtC;CAAG;;;;AAEL,qBAAa,qBAAsB,SAAQ,0BAEzC;CAAG;AAEL,eAAO,MAAM,YAAY;;;;CAAiE,CAAC;AAE3F,eAAO,MAAM,WAAW;;;;;EAKtB,CAAC;AAEH,eAAO,MAAM,WAAW;;;;;;;EAOtB,CAAC;AAEH,eAAO,MAAM,UAAU;;;;;;;;;;;;;;EAOrB,CAAC;AAEH,eAAO,MAAM,SAAS;IACrB,OAAO;IACP,WAAW;IACX,SAAS;IACT,EAAE;IACF,MAAM;IACN,UAAU;IACV,UAAU;IACV,SAAS;IACT,KAAK;CACL,CAAC;AAEF,eAAO,MAAM,UAAU;IAAK,MAAM;IAAqC,KAAK;CAAiB,CAAC;AAE9F,wBAAgB,SAAS,CAAC,QAAQ,SAAS,
|
|
1
|
+
{"version":3,"file":"schemas.d.ts","sourceRoot":"","sources":["../../src/jobs/schemas.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,MAAM,WAAW,SAAS;IACzB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,GAAG;QAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;CAClF;;;;AAED,qBAAa,eAAgB,SAAQ,oBAEnC;CAAG;;;;AAEL,qBAAa,kBAAmB,SAAQ,uBAEtC;CAAG;;;;AAEL,qBAAa,qBAAsB,SAAQ,0BAEzC;CAAG;AAEL,eAAO,MAAM,YAAY;;;;CAAiE,CAAC;AAE3F,eAAO,MAAM,WAAW;;;;;EAKtB,CAAC;AAEH,eAAO,MAAM,WAAW;;;;;;;EAOtB,CAAC;AAEH,eAAO,MAAM,UAAU;;;;;;;;;;;;;;EAOrB,CAAC;AAEH,eAAO,MAAM,SAAS;IACrB,OAAO;IACP,WAAW;IACX,SAAS;IACT,EAAE;IACF,MAAM;IACN,UAAU;IACV,UAAU;IACV,SAAS;IACT,KAAK;CACL,CAAC;AAEF,eAAO,MAAM,UAAU;IAAK,MAAM;IAAqC,KAAK;CAAiB,CAAC;AAE9F,wBAAgB,SAAS,CAAC,QAAQ,SAAS,MAAM,CAAC,GAAG,EAAE,KAAK,EAAE;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAA;CAAE;;;;;;;;;;;;GAEjH;AAED,wBAAgB,kBAAkB,CAAC,QAAQ,SAAS,MAAM,CAAC,GAAG,EAAE,KAAK,EAAE;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAA;CAAE;;;;;;;;;;;;;;GAS1H;AAED,wBAAgB,OAAO,CAAC,IAAI,SAAS,MAAM,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI;;;GAEzD"}
|
package/dist/jobs/schemas.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schemas.js","sourceRoot":"","sources":["../../src/jobs/schemas.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAOhC,MAAM,OAAO,eAAgB,SAAQ,MAAM,CAAC,WAAW,EAAmB,CAAC,iBAAiB,EAAE;IAC7F,SAAS,EAAE,MAAM,CAAC,MAAM;CACxB,CAAC;CAAG;AAEL,MAAM,OAAO,kBAAmB,SAAQ,MAAM,CAAC,WAAW,EAAsB,CAAC,oBAAoB,EAAE;IACtG,KAAK,EAAE,MAAM,CAAC,MAAM;CACpB,CAAC;CAAG;AAEL,MAAM,OAAO,qBAAsB,SAAQ,MAAM,CAAC,WAAW,EAAyB,CAAC,uBAAuB,EAAE;IAC/G,KAAK,EAAE,MAAM,CAAC,MAAM;CACpB,CAAC;CAAG;AAEL,MAAM,CAAC,MAAM,YAAY,GAAG,EAAE,kBAAkB,EAAE,qBAAqB,EAAE,eAAe,EAAE,CAAC;AAE3F,MAAM,CAAC,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC;IACxC,WAAW,EAAE,MAAM,CAAC,MAAM;IAC1B,WAAW,EAAE,MAAM,CAAC,MAAM;IAC1B,WAAW,EAAE,MAAM,CAAC,MAAM;IAC1B,UAAU,EAAE,MAAM,CAAC,MAAM;CACzB,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC;IACxC,WAAW,EAAE,MAAM,CAAC,MAAM;IAC1B,iBAAiB,EAAE,MAAM,CAAC,MAAM;IAChC,WAAW,EAAE,MAAM,CAAC,MAAM;IAC1B,IAAI,EAAE,MAAM,CAAC,MAAM;IACnB,WAAW,EAAE,MAAM,CAAC,MAAM;IAC1B,UAAU,EAAE,MAAM,CAAC,MAAM;CACzB,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC;IACvC,WAAW,EAAE,MAAM,CAAC,MAAM;IAC1B,iBAAiB,EAAE,MAAM,CAAC,MAAM;IAChC,WAAW,EAAE,MAAM,CAAC,MAAM;IAC1B,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC;IAC/B,WAAW,EAAE,MAAM,CAAC,MAAM;IAC1B,UAAU,EAAE,MAAM,CAAC,MAAM;CACzB,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,SAAS,GAAG;IACxB,OAAO,EAAE,MAAM,CAAC,MAAM;IACtB,WAAW,EAAE,MAAM,CAAC,gBAAgB,CAAC,MAAM,CAAC,qBAAqB,CAAC;IAClE,SAAS,EAAE,MAAM,CAAC,qBAAqB;IACvC,EAAE,EAAE,MAAM,CAAC,MAAM;IACjB,MAAM,EAAE,MAAM,CAAC,OAAO;IACtB,UAAU,EAAE,MAAM,CAAC,MAAM;IACzB,UAAU,EAAE,MAAM,CAAC,MAAM;IACzB,SAAS,EAAE,MAAM,CAAC,gBAAgB,CAAC,MAAM,CAAC,qBAAqB,CAAC;IAChE,KAAK,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,WAAW,EAAE,QAAQ,CAAC,CAAC;CAC1F,CAAC;AAEF,MAAM,CAAC,MAAM,UAAU,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC;AAE9F,MAAM,UAAU,SAAS,
|
|
1
|
+
{"version":3,"file":"schemas.js","sourceRoot":"","sources":["../../src/jobs/schemas.ts"],"names":[],"mappings":"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"}
|
package/dist/permissions.d.ts
CHANGED
|
@@ -22,12 +22,12 @@ export declare const ReadJobs: {
|
|
|
22
22
|
readonly name: "jobs.read";
|
|
23
23
|
readonly strength: "own";
|
|
24
24
|
};
|
|
25
|
-
declare const UsersPermission_base: import("effect/rpc/RpcMiddleware").ServiceClass<UsersPermission, "@shivaedev/admin/UsersPermission", import("@shivaedev/identity/identity.ts").Identity | import("@shivaedev/identity/identity.ts").SessionUser, import("effect/Schema").Union<readonly [typeof import("@shivaedev/errors/taxonomy.ts").Unauthorized, typeof import("@shivaedev/errors/taxonomy.ts").AuthUnavailable, typeof import("@shivaedev/errors/taxonomy.ts").Forbidden]>, never, never, false> & {
|
|
25
|
+
declare const UsersPermission_base: import("effect/rpc/RpcMiddleware").ServiceClass<UsersPermission, "@shivaedev/admin/UsersPermission", import("@shivaedev/identity/identity.ts").Identity | import("@shivaedev/identity/identity.ts").SessionUser, import("effect/Schema").Union<readonly [typeof import("@shivaedev/errors/taxonomy.ts").Unauthorized, typeof import("@shivaedev/errors/taxonomy.ts").AuthUnavailable, typeof import("@shivaedev/errors/taxonomy.ts").Forbidden, typeof import("@shivaedev/contract/readPolicyErrors.ts").MissingReadPolicy, typeof import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied]>, never, never, false> & {
|
|
26
26
|
permission: import("@shivaedev/access/permission.ts").Permission;
|
|
27
27
|
};
|
|
28
28
|
export declare class UsersPermission extends UsersPermission_base {
|
|
29
29
|
}
|
|
30
|
-
declare const JobsPermission_base: import("effect/rpc/RpcMiddleware").ServiceClass<JobsPermission, "@shivaedev/admin/JobsPermission", import("@shivaedev/identity/identity.ts").Identity | import("@shivaedev/identity/identity.ts").SessionUser, import("effect/Schema").Union<readonly [typeof import("@shivaedev/errors/taxonomy.ts").Unauthorized, typeof import("@shivaedev/errors/taxonomy.ts").AuthUnavailable, typeof import("@shivaedev/errors/taxonomy.ts").Forbidden]>, never, never, false> & {
|
|
30
|
+
declare const JobsPermission_base: import("effect/rpc/RpcMiddleware").ServiceClass<JobsPermission, "@shivaedev/admin/JobsPermission", import("@shivaedev/identity/identity.ts").Identity | import("@shivaedev/identity/identity.ts").SessionUser, import("effect/Schema").Union<readonly [typeof import("@shivaedev/errors/taxonomy.ts").Unauthorized, typeof import("@shivaedev/errors/taxonomy.ts").AuthUnavailable, typeof import("@shivaedev/errors/taxonomy.ts").Forbidden, typeof import("@shivaedev/contract/readPolicyErrors.ts").MissingReadPolicy, typeof import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied]>, never, never, false> & {
|
|
31
31
|
permission: import("@shivaedev/access/permission.ts").Permission;
|
|
32
32
|
};
|
|
33
33
|
export declare class JobsPermission extends JobsPermission_base {
|
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
import { type Context, DateTime, Effect, Option } from "effect";
|
|
2
2
|
import type { PgBossError, PgBossPayloadError } from "@shivaedev/jobs/server/error.ts";
|
|
3
3
|
import type { PgBossService } from "@shivaedev/jobs/server/service.ts";
|
|
4
|
+
import { type JobsEntry, type JobsPayload } from "#jobs/entry.ts";
|
|
4
5
|
import type { jobsPage } from "#jobs/page.ts";
|
|
5
|
-
import { JobsPayloadInvalid,
|
|
6
|
+
import { JobsPayloadInvalid, JobsQueueUnregistered, JobsUnavailable } from "#jobs/schemas.ts";
|
|
6
7
|
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
|
|
8
|
+
export declare function jobsReadHandlers<const TQueues extends readonly JobsEntry[], TService>(page: {
|
|
8
9
|
readonly queues: TQueues;
|
|
9
10
|
}, service: Context.Service<TService, PgBossService>): {
|
|
10
11
|
"admin.jobs.counts": ({ queue }: {
|
|
@@ -14,12 +15,12 @@ export declare function jobsReadHandlers<const TQueues extends readonly JobsQueu
|
|
|
14
15
|
readonly queue: string;
|
|
15
16
|
readonly limit: number;
|
|
16
17
|
readonly cursor?: string;
|
|
17
|
-
}) => Effect.Effect<import("@shivaedev/jobs/server/health.ts").JobPage<import("@shivaedev/jobs/server/health.ts").DeadLetteredJob<TQueues[number]["
|
|
18
|
+
}) => Effect.Effect<import("@shivaedev/jobs/server/health.ts").JobPage<import("@shivaedev/jobs/server/health.ts").DeadLetteredJob<JobsPayload<TQueues[number]>["Type"]>>, JobsPayloadInvalid | JobsQueueUnregistered | JobsUnavailable, TService | JobsPayload<TQueues[number]>["DecodingServices"]>;
|
|
18
19
|
"admin.jobs.failed": ({ queue, ...options }: {
|
|
19
20
|
readonly queue: string;
|
|
20
21
|
readonly limit: number;
|
|
21
22
|
readonly cursor?: string;
|
|
22
|
-
}) => Effect.Effect<import("@shivaedev/jobs/server/health.ts").JobPage<import("@shivaedev/jobs/server/health.ts").ListedJob<TQueues[number]["
|
|
23
|
+
}) => Effect.Effect<import("@shivaedev/jobs/server/health.ts").JobPage<import("@shivaedev/jobs/server/health.ts").ListedJob<JobsPayload<TQueues[number]>["Type"]>>, JobsPayloadInvalid | JobsQueueUnregistered | JobsUnavailable, TService | JobsPayload<TQueues[number]>["DecodingServices"]>;
|
|
23
24
|
"admin.jobs.health": () => Effect.Effect<{
|
|
24
25
|
activeTotal: number;
|
|
25
26
|
deadLetteredTotal: number;
|
|
@@ -35,7 +36,7 @@ export declare function jobsReadHandlers<const TQueues extends readonly JobsQueu
|
|
|
35
36
|
attempt: number;
|
|
36
37
|
completedOn: Option.Option<DateTime.Utc>;
|
|
37
38
|
createdOn: DateTime.Utc;
|
|
38
|
-
data: TQueues[number]["
|
|
39
|
+
data: JobsPayload<TQueues[number]>["Type"];
|
|
39
40
|
id: string;
|
|
40
41
|
output: object;
|
|
41
42
|
queue: string;
|
|
@@ -43,7 +44,7 @@ export declare function jobsReadHandlers<const TQueues extends readonly JobsQueu
|
|
|
43
44
|
retryLimit: number;
|
|
44
45
|
startedOn: Option.Option<DateTime.Utc>;
|
|
45
46
|
state: "active" | "cancelled" | "completed" | "created" | "failed" | "retry";
|
|
46
|
-
}>, JobsPayloadInvalid | JobsQueueUnregistered | JobsUnavailable, TService | TQueues[number]["
|
|
47
|
+
}>, JobsPayloadInvalid | JobsQueueUnregistered | JobsUnavailable, TService | JobsPayload<TQueues[number]>["DecodingServices"]>;
|
|
47
48
|
};
|
|
48
|
-
export declare function jobsHandlers<const TQueues extends readonly
|
|
49
|
+
export declare function jobsHandlers<const TQueues extends readonly JobsEntry[], 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/identity/identity.ts").Identity | import("@shivaedev/identity/identity.ts").SessionUser>, import("effect/Scope").Scope> | Exclude<Exclude<TService, import("@shivaedev/identity/identity.ts").Identity | import("@shivaedev/identity/identity.ts").SessionUser>, import("effect/Scope").Scope> | Exclude<Exclude<JobsPayload<TQueues[number]>["DecodingServices"], import("@shivaedev/identity/identity.ts").Identity | import("@shivaedev/identity/identity.ts").SessionUser>, import("effect/Scope").Scope>>;
|
|
49
50
|
//# 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,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChE,OAAO,KAAK,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AACvF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AACvE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,EAAE,kBAAkB,EAAE,
|
|
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,iCAAiC,CAAC;AACvF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AACvE,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,WAAW,EAAa,MAAM,gBAAgB,CAAC;AAC7E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,EAAE,kBAAkB,EAAE,qBAAqB,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAE9F,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,61BAGjD"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { DateTime, Effect, Option } from "effect";
|
|
2
|
+
import { jobsQueue } from "#jobs/entry.ts";
|
|
2
3
|
import { JobsPayloadInvalid, JobsQueueUnregistered, JobsUnavailable } from "#jobs/schemas.ts";
|
|
3
4
|
export function jobsFailures(effect) {
|
|
4
5
|
return effect.pipe(Effect.mapError((error) => error._tag === "PgBossPayloadError" ? new JobsPayloadInvalid({ queue: error.queue }) : new JobsUnavailable({ operation: error.operation })));
|
|
@@ -7,7 +8,7 @@ export function jobsReadHandlers(page, service) {
|
|
|
7
8
|
function registered(name) {
|
|
8
9
|
const queues = page.queues;
|
|
9
10
|
const queue = queues.find((candidate) => candidate.name === name);
|
|
10
|
-
return queue === undefined ? Effect.fail(new JobsQueueUnregistered({ queue: name })) : Effect.succeed(queue);
|
|
11
|
+
return queue === undefined ? Effect.fail(new JobsQueueUnregistered({ queue: name })) : Effect.succeed(jobsQueue(queue));
|
|
11
12
|
}
|
|
12
13
|
return {
|
|
13
14
|
"admin.jobs.counts": ({ queue }) => Effect.gen(function* () {
|
|
@@ -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;
|
|
1
|
+
{"version":3,"file":"jobsHandlers.js","sourceRoot":"","sources":["../../src/server/jobsHandlers.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { type Context } from "effect";
|
|
2
2
|
import type { PgBossService } from "@shivaedev/jobs/server/service.ts";
|
|
3
|
+
import { type JobsEntry, type JobsPayload } from "#jobs/entry.ts";
|
|
3
4
|
import { type jobsPageWithRetry } from "#jobs/retryPage.ts";
|
|
4
|
-
import
|
|
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/identity/identity.ts").Identity | import("@shivaedev/identity/identity.ts").SessionUser>, import("effect/Scope").Scope> | Exclude<Exclude<TService, import("@shivaedev/identity/identity.ts").Identity | import("@shivaedev/identity/identity.ts").SessionUser>, import("effect/Scope").Scope> | Exclude<Exclude<TQueues[number]["schema"]["DecodingServices"], import("@shivaedev/identity/identity.ts").Identity | import("@shivaedev/identity/identity.ts").SessionUser>, import("effect/Scope").Scope>>;
|
|
5
|
+
export declare function jobsHandlersWithRetry<const TQueues extends readonly JobsEntry[], TService>(page: ReturnType<typeof jobsPageWithRetry<TQueues>>, service: Context.Service<TService, PgBossService>): import("effect/Layer").Layer<import("effect/rpc/Rpc").Handler<"admin.jobs.counts"> | import("effect/rpc/Rpc").Handler<"admin.jobs.deadLettered"> | import("effect/rpc/Rpc").Handler<"admin.jobs.failed"> | import("effect/rpc/Rpc").Handler<"admin.jobs.health"> | import("effect/rpc/Rpc").Handler<"admin.jobs.job"> | import("effect/rpc/Rpc").Handler<"admin.jobs.retry">, never, Exclude<Exclude<TService, import("@shivaedev/identity/identity.ts").Identity | import("@shivaedev/identity/identity.ts").SessionUser>, import("effect/Scope").Scope> | Exclude<Exclude<TService, import("@shivaedev/identity/identity.ts").Identity | import("@shivaedev/identity/identity.ts").SessionUser>, import("effect/Scope").Scope> | Exclude<Exclude<JobsPayload<TQueues[number]>["DecodingServices"], import("@shivaedev/identity/identity.ts").Identity | import("@shivaedev/identity/identity.ts").SessionUser>, import("effect/Scope").Scope>>;
|
|
6
6
|
//# sourceMappingURL=jobsHandlersWithRetry.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jobsHandlersWithRetry.d.ts","sourceRoot":"","sources":["../../src/server/jobsHandlersWithRetry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,OAAO,EAAkB,MAAM,QAAQ,CAAC;AACtD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AACvE,OAAO,
|
|
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,mCAAmC,CAAC;AACvE,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,WAAW,EAAa,MAAM,gBAAgB,CAAC;AAC7E,OAAO,EAAiB,KAAK,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAI3E,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,o5BAoBjD"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { Effect, Option } from "effect";
|
|
2
|
+
import { jobsQueue } from "#jobs/entry.ts";
|
|
2
3
|
import { JobsNotFailed } from "#jobs/retryPage.ts";
|
|
3
4
|
import { JobsQueueUnregistered } from "#jobs/schemas.ts";
|
|
4
5
|
import { jobsFailures, jobsReadHandlers } from "./jobsHandlers.js";
|
|
@@ -6,10 +7,12 @@ export function jobsHandlersWithRetry(page, service) {
|
|
|
6
7
|
return page.contract.application.toLayer({
|
|
7
8
|
...jobsReadHandlers(page, service),
|
|
8
9
|
"admin.jobs.retry": ({ queue, id }) => Effect.gen(function* () {
|
|
9
|
-
const
|
|
10
|
-
|
|
10
|
+
const entries = page.queues;
|
|
11
|
+
const entry = entries.find((candidate) => candidate.name === queue);
|
|
12
|
+
if (entry === undefined) {
|
|
11
13
|
return yield* Effect.fail(new JobsQueueUnregistered({ queue }));
|
|
12
14
|
}
|
|
15
|
+
const definition = jobsQueue(entry);
|
|
13
16
|
const jobs = yield* service;
|
|
14
17
|
const job = yield* jobsFailures(jobs.getJob(definition, id));
|
|
15
18
|
if (Option.isNone(job) || job.value.state !== "failed") {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jobsHandlersWithRetry.js","sourceRoot":"","sources":["../../src/server/jobsHandlersWithRetry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEtD,OAAO,EAAE,aAAa,EAA0B,MAAM,oBAAoB,CAAC;AAC3E,OAAO,
|
|
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,EAAoC,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC7E,OAAO,EAAE,aAAa,EAA0B,MAAM,oBAAoB,CAAC;AAC3E,OAAO,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AACzD,OAAO,EAAE,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,OAAO,GAA+B,IAAI,CAAC,MAAM,CAAC;YACxD,MAAM,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,IAAI,KAAK,KAAK,CAAC,CAAC;YACpE,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;gBACzB,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,qBAAqB,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;YACjE,CAAC;YACD,MAAM,UAAU,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC;YACpC,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,OAAO,CAAC;YAC5B,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM,CAAuC,UAAU,EAAE,EAAE,CAAC,CAAC,CAAC;YACnG,IAAI,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,KAAK,CAAC,KAAK,KAAK,QAAQ,EAAE,CAAC;gBACxD,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,aAAa,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;YAC7D,CAAC;YACD,KAAK,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC,CAAC;QACjD,CAAC,CAAC;KACH,CAAC,CAAC;AACJ,CAAC"}
|
package/dist/users/page.d.ts
CHANGED
|
@@ -51,6 +51,11 @@ export declare function usersPage<const TRole extends string>(access: Pick<Retur
|
|
|
51
51
|
}>, import("effect/rpc/RpcSchema").Stream<Schema.Union<readonly [Schema.Struct<{
|
|
52
52
|
readonly _tag: Schema.Literal<"Changed">;
|
|
53
53
|
readonly keys: Schema.$Array<Schema.Union<readonly [Schema.Struct<{
|
|
54
|
+
readonly _tag: Schema.Literal<"Bucket">;
|
|
55
|
+
readonly collection: Schema.String;
|
|
56
|
+
readonly field: Schema.String;
|
|
57
|
+
readonly value: Schema.Union<readonly [Schema.String, Schema.Number]>;
|
|
58
|
+
}>, Schema.Struct<{
|
|
54
59
|
readonly _tag: Schema.Literal<"List">;
|
|
55
60
|
readonly collection: Schema.String;
|
|
56
61
|
}>, Schema.Struct<{
|
|
@@ -58,9 +63,10 @@ export declare function usersPage<const TRole extends string>(access: Pick<Retur
|
|
|
58
63
|
readonly collection: Schema.String;
|
|
59
64
|
readonly id: Schema.Union<readonly [Schema.String, Schema.Number]>;
|
|
60
65
|
}>]>>;
|
|
66
|
+
readonly queryIndexes: Schema.optional<Schema.$Array<Schema.Number>>;
|
|
61
67
|
}>, Schema.Struct<{
|
|
62
68
|
readonly _tag: Schema.Literal<"Resync">;
|
|
63
|
-
}>]>, Schema.
|
|
69
|
+
}>]>, Schema.Union<readonly [typeof import("@shivaedev/contract/readPolicyErrors.ts").MissingReadPolicy, typeof import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied]>>, Schema.Never, typeof UsersPermission, never> | import("effect/rpc/Rpc").Rpc<"admin.users.changeRole", Schema.Struct<{
|
|
64
70
|
role: Schema.Literals<TRole[]>;
|
|
65
71
|
userId: Schema.String;
|
|
66
72
|
}>, Schema.Void, Schema.Union<readonly (typeof NotFound | typeof Forbidden | typeof AuthUnavailable | typeof LastRoleAssigner)[]>, typeof UsersPermission, never> | import("effect/rpc/Rpc").Rpc<"admin.users.list", Schema.Struct<{
|
|
@@ -76,6 +82,6 @@ export declare function usersPage<const TRole extends string>(access: Pick<Retur
|
|
|
76
82
|
readonly role: Schema.String;
|
|
77
83
|
}>>;
|
|
78
84
|
readonly canChangeRoles: Schema.Boolean;
|
|
79
|
-
}>, Schema.Union<readonly (typeof Forbidden | typeof AuthUnavailable)[]>, typeof UsersPermission, never>, readonly [], undefined>;
|
|
85
|
+
}>, Schema.Union<readonly [Schema.Union<readonly (typeof Forbidden | typeof AuthUnavailable)[]>, typeof import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied]>, typeof UsersPermission, never>, readonly [], undefined>;
|
|
80
86
|
};
|
|
81
87
|
//# sourceMappingURL=page.d.ts.map
|
package/dist/users/page.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"page.d.ts","sourceRoot":"","sources":["../../src/users/page.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"page.d.ts","sourceRoot":"","sources":["../../src/users/page.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,MAAM,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;AAI5D,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AAIrF,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAA2B,MAAM,iBAAiB,CAAC;AAI5E,eAAO,MAAM,SAAS;;;;;;;;;;EAAwE,CAAC;AAC/F,wBAAgB,SAAS,CAAC,KAAK,CAAC,KAAK,SAAS,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,UAAU,CAAC,OAAO,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,MAAM,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAwB5G"}
|
package/dist/users/page.js
CHANGED
|
@@ -1,8 +1,10 @@
|
|
|
1
|
-
import { Schema } from "effect";
|
|
1
|
+
import { Effect, Schema } from "effect";
|
|
2
|
+
import { collection } from "@shivaedev/changes/keys.ts";
|
|
2
3
|
import { contract } from "@shivaedev/contract/contract.ts";
|
|
3
|
-
import { collection } from "@shivaedev/contract/keys.ts";
|
|
4
4
|
import { command, query } from "@shivaedev/contract/operation.ts";
|
|
5
5
|
import { AuthUnavailable, Forbidden, NotFound } from "@shivaedev/errors/taxonomy.ts";
|
|
6
|
+
import { SessionUser } from "@shivaedev/identity/identity.ts";
|
|
7
|
+
import { hasPermission } from "@shivaedev/identity/permission.ts";
|
|
6
8
|
import { adminPage } from "#page.ts";
|
|
7
9
|
import { UsersPermission } from "#permissions.ts";
|
|
8
10
|
import { LastRoleAssigner, UserList, UserListInput } from "#users/roles.ts";
|
|
@@ -21,6 +23,7 @@ export function usersPage(access) {
|
|
|
21
23
|
queries: [
|
|
22
24
|
query("list", {
|
|
23
25
|
payload: UserListInput.fields,
|
|
26
|
+
readPolicy: () => Effect.map(SessionUser, (user) => hasPermission(user, UsersPermission.permission)),
|
|
24
27
|
reads: () => [users.list],
|
|
25
28
|
rejections: { AuthUnavailable, Forbidden },
|
|
26
29
|
success: UsersList,
|
package/dist/users/page.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"page.js","sourceRoot":"","sources":["../../src/users/page.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"page.js","sourceRoot":"","sources":["../../src/users/page.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAExC,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AACxD,OAAO,EAAE,QAAQ,EAAE,MAAM,iCAAiC,CAAC;AAC3D,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,kCAAkC,CAAC;AAClE,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AACrF,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAC9D,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAClE,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AACrC,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAE5E,MAAM,KAAK,GAAG,UAAU,CAAC,aAAa,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;AAEvD,MAAM,CAAC,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,GAAG,QAAQ,CAAC,MAAM,EAAE,cAAc,EAAE,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC;AAC/F,MAAM,UAAU,SAAS,CAA6B,MAAuD;IAC5G,OAAO,SAAS,CAAC;QAChB,QAAQ,EAAE,QAAQ,CAAC,aAAa,EAAE;YACjC,QAAQ,EAAE;gBACT,OAAO,CAAC,YAAY,EAAE;oBACrB,WAAW,EAAE,GAAG,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC;oBAC/B,OAAO,EAAE,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE;oBACrD,UAAU,EAAE,EAAE,eAAe,EAAE,SAAS,EAAE,gBAAgB,EAAE,QAAQ,EAAE;iBACtE,CAAC;aACF;YACD,OAAO,EAAE;gBACR,KAAK,CAAC,MAAM,EAAE;oBACb,OAAO,EAAE,aAAa,CAAC,MAAM;oBAC7B,UAAU,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,aAAa,CAAC,IAAI,EAAE,eAAe,CAAC,UAAU,CAAC,CAAC;oBACpG,KAAK,EAAE,GAAG,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC;oBACzB,UAAU,EAAE,EAAE,eAAe,EAAE,SAAS,EAAE;oBAC1C,OAAO,EAAE,SAAS;iBAClB,CAAC;aACF;SACD,CAAC;QACF,EAAE,EAAE,OAAO;QACX,UAAU,EAAE,eAAe;QAC3B,KAAK,EAAE,EAAE,IAAI,EAAE,cAAc,EAAE,KAAK,EAAE,OAAO,EAAE;KAC/C,CAAC,CAAC;AACJ,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@shivaedev/admin",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.8.0",
|
|
4
4
|
"description": "Explicit admin page contracts and a protected native Effect RPC registry",
|
|
5
5
|
"homepage": "https://github.com/ShivaeDev/platform/tree/main/packages/admin#readme",
|
|
6
6
|
"bugs": {
|
|
@@ -42,24 +42,25 @@
|
|
|
42
42
|
],
|
|
43
43
|
"dependencies": {
|
|
44
44
|
"@shivaedev/access": "0.1.1",
|
|
45
|
-
"@shivaedev/
|
|
45
|
+
"@shivaedev/changes": "0.5.0",
|
|
46
|
+
"@shivaedev/contract": "0.19.0",
|
|
46
47
|
"@shivaedev/errors": "0.1.0",
|
|
47
|
-
"@shivaedev/identity": "0.
|
|
48
|
-
"@shivaedev/jobs": "0.
|
|
49
|
-
"@shivaedev/react": "0.
|
|
50
|
-
"@shivaedev/sql": "0.
|
|
48
|
+
"@shivaedev/identity": "0.3.0",
|
|
49
|
+
"@shivaedev/jobs": "0.22.0",
|
|
50
|
+
"@shivaedev/react": "0.21.0",
|
|
51
|
+
"@shivaedev/sql": "0.24.0"
|
|
51
52
|
},
|
|
52
53
|
"devDependencies": {
|
|
53
54
|
"@effect/atom-react": "4.0.5",
|
|
54
|
-
"@shivaedev/quality": "0.
|
|
55
|
-
"@shivaedev/server": "0.
|
|
56
|
-
"@shivaedev/test-sql": "0.10.
|
|
57
|
-
"@shivaedev/test-story": "0.
|
|
55
|
+
"@shivaedev/quality": "0.43.0",
|
|
56
|
+
"@shivaedev/server": "0.3.0",
|
|
57
|
+
"@shivaedev/test-sql": "0.10.2",
|
|
58
|
+
"@shivaedev/test-story": "0.22.0",
|
|
58
59
|
"@types/node": "24.19.2",
|
|
59
60
|
"@types/react": "19.3.0",
|
|
60
61
|
"@types/react-dom": "19.3.0",
|
|
61
62
|
"effect": "4.0.5",
|
|
62
|
-
"happy-dom": "21.0.
|
|
63
|
+
"happy-dom": "21.0.4",
|
|
63
64
|
"react": "19.3.1",
|
|
64
65
|
"react-dom": "19.3.1",
|
|
65
66
|
"typescript": "7.0.2",
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import { Schema } from "effect";
|
|
2
|
+
import type { JobsQueue } from "./schemas.ts";
|
|
3
|
+
|
|
4
|
+
export type JobsEntry = JobsQueue | { readonly _tag: "ScheduleDefinition"; readonly name: string };
|
|
5
|
+
|
|
6
|
+
export type JobsPayload<TEntry extends JobsEntry> = [TEntry] extends [never]
|
|
7
|
+
? typeof Schema.Never
|
|
8
|
+
: TEntry extends JobsQueue
|
|
9
|
+
? TEntry["schema"]
|
|
10
|
+
: typeof Schema.Null;
|
|
11
|
+
|
|
12
|
+
export function jobsQueue<TEntry extends JobsEntry>(entry: TEntry): { readonly name: string; readonly schema: JobsPayload<TEntry> };
|
|
13
|
+
export function jobsQueue(entry: JobsEntry) {
|
|
14
|
+
return { name: entry.name, schema: "schema" in entry ? entry.schema : Schema.Null };
|
|
15
|
+
}
|
package/src/jobs/keys.ts
CHANGED
package/src/jobs/page.ts
CHANGED
|
@@ -1,38 +1,51 @@
|
|
|
1
|
-
import { Schema } from "effect";
|
|
1
|
+
import { Effect, Schema } from "effect";
|
|
2
2
|
import { contract } from "@shivaedev/contract/contract.ts";
|
|
3
3
|
import { query } from "@shivaedev/contract/operation.ts";
|
|
4
|
+
import { SessionUser } from "@shivaedev/identity/identity.ts";
|
|
5
|
+
import { hasPermission } from "@shivaedev/identity/permission.ts";
|
|
4
6
|
import { adminPage } from "#page.ts";
|
|
5
7
|
import { JobsPermission } from "#permissions.ts";
|
|
8
|
+
import { type JobsEntry, type JobsPayload, jobsQueue } from "./entry.ts";
|
|
6
9
|
import { jobsKeys } from "./keys.ts";
|
|
7
|
-
import { deadLetteredSchema, JobsFailures, JobsHealth,
|
|
10
|
+
import { deadLetteredSchema, JobsFailures, JobsHealth, jobPage, jobSchema, PageFields, QueueCounts } from "./schemas.ts";
|
|
8
11
|
|
|
9
|
-
export function jobsPage<const TQueues extends readonly
|
|
10
|
-
const
|
|
11
|
-
const
|
|
12
|
+
export function jobsPage<const TQueues extends readonly JobsEntry[]>(...queues: TQueues) {
|
|
13
|
+
const definitions = queues.map((queue: TQueues[number]) => jobsQueue(queue));
|
|
14
|
+
const Job = Schema.Union(definitions.map((queue) => jobSchema<JobsPayload<TQueues[number]>>(queue)));
|
|
15
|
+
const DeadLettered = Schema.Union(definitions.map((queue) => deadLetteredSchema<JobsPayload<TQueues[number]>>(queue)));
|
|
12
16
|
const page = adminPage({
|
|
13
17
|
contract: contract("admin.jobs", {
|
|
14
18
|
queries: [
|
|
15
|
-
query("health", {
|
|
19
|
+
query("health", {
|
|
20
|
+
readPolicy: () => Effect.map(SessionUser, (user) => hasPermission(user, JobsPermission.permission)),
|
|
21
|
+
reads: () => [jobsKeys.health.list],
|
|
22
|
+
rejections: JobsFailures,
|
|
23
|
+
success: JobsHealth,
|
|
24
|
+
}),
|
|
16
25
|
query("counts", {
|
|
17
26
|
payload: { queue: Schema.String },
|
|
27
|
+
readPolicy: () => Effect.map(SessionUser, (user) => hasPermission(user, JobsPermission.permission)),
|
|
18
28
|
reads: ({ queue }) => [jobsKeys.counts.item(queue)],
|
|
19
29
|
rejections: JobsFailures,
|
|
20
30
|
success: QueueCounts,
|
|
21
31
|
}),
|
|
22
32
|
query("failed", {
|
|
23
33
|
payload: { ...PageFields, queue: Schema.String },
|
|
34
|
+
readPolicy: () => Effect.map(SessionUser, (user) => hasPermission(user, JobsPermission.permission)),
|
|
24
35
|
reads: ({ queue }) => [jobsKeys.failed.item(queue)],
|
|
25
36
|
rejections: JobsFailures,
|
|
26
37
|
success: jobPage(Job),
|
|
27
38
|
}),
|
|
28
39
|
query("deadLettered", {
|
|
29
40
|
payload: { ...PageFields, queue: Schema.String },
|
|
41
|
+
readPolicy: () => Effect.map(SessionUser, (user) => hasPermission(user, JobsPermission.permission)),
|
|
30
42
|
reads: ({ queue }) => [jobsKeys.deadLettered.item(queue)],
|
|
31
43
|
rejections: JobsFailures,
|
|
32
44
|
success: jobPage(DeadLettered),
|
|
33
45
|
}),
|
|
34
46
|
query("job", {
|
|
35
47
|
payload: { id: Schema.String, queue: Schema.String },
|
|
48
|
+
readPolicy: () => Effect.map(SessionUser, (user) => hasPermission(user, JobsPermission.permission)),
|
|
36
49
|
reads: ({ queue, id }) => [jobsKeys.job(queue).item(id)],
|
|
37
50
|
rejections: JobsFailures,
|
|
38
51
|
success: Schema.OptionFromNullOr(Job),
|
package/src/jobs/retryPage.ts
CHANGED
|
@@ -3,16 +3,17 @@ import { contract } from "@shivaedev/contract/contract.ts";
|
|
|
3
3
|
import { command } from "@shivaedev/contract/operation.ts";
|
|
4
4
|
import { adminPage } from "#page.ts";
|
|
5
5
|
import { JobsPermission } from "#permissions.ts";
|
|
6
|
+
import type { JobsEntry } from "./entry.ts";
|
|
6
7
|
import { jobsKeys } from "./keys.ts";
|
|
7
8
|
import { jobsPage } from "./page.ts";
|
|
8
|
-
import { JobsFailures
|
|
9
|
+
import { JobsFailures } from "./schemas.ts";
|
|
9
10
|
|
|
10
11
|
export class JobsNotFailed extends Schema.TaggedError<JobsNotFailed>()("JobsNotFailed", {
|
|
11
12
|
id: Schema.String,
|
|
12
13
|
queue: Schema.String,
|
|
13
14
|
}) {}
|
|
14
15
|
|
|
15
|
-
export function jobsPageWithRetry<const TQueues extends readonly
|
|
16
|
+
export function jobsPageWithRetry<const TQueues extends readonly JobsEntry[]>(...queues: TQueues) {
|
|
16
17
|
const page = jobsPage(...queues);
|
|
17
18
|
return Object.assign(
|
|
18
19
|
adminPage({
|
package/src/jobs/schemas.ts
CHANGED
|
@@ -58,11 +58,11 @@ export const JobFields = {
|
|
|
58
58
|
|
|
59
59
|
export const PageFields = { cursor: Schema.optionalKey(Schema.String), limit: Schema.Number };
|
|
60
60
|
|
|
61
|
-
export function jobSchema<TPayload extends
|
|
61
|
+
export function jobSchema<TPayload extends Schema.Top>(queue: { readonly name: string; readonly schema: TPayload }) {
|
|
62
62
|
return Schema.Struct({ ...JobFields, data: queue.schema, queue: Schema.Literal(queue.name) });
|
|
63
63
|
}
|
|
64
64
|
|
|
65
|
-
export function deadLetteredSchema<TPayload extends
|
|
65
|
+
export function deadLetteredSchema<TPayload extends Schema.Top>(queue: { readonly name: string; readonly schema: TPayload }) {
|
|
66
66
|
const name: string = `${queue.name}-dlq`;
|
|
67
67
|
return Schema.Struct({
|
|
68
68
|
...JobFields,
|
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
import { type Context, DateTime, Effect, Option } from "effect";
|
|
2
2
|
import type { PgBossError, PgBossPayloadError } from "@shivaedev/jobs/server/error.ts";
|
|
3
3
|
import type { PgBossService } from "@shivaedev/jobs/server/service.ts";
|
|
4
|
+
import { type JobsEntry, type JobsPayload, jobsQueue } from "#jobs/entry.ts";
|
|
4
5
|
import type { jobsPage } from "#jobs/page.ts";
|
|
5
|
-
import { JobsPayloadInvalid,
|
|
6
|
+
import { JobsPayloadInvalid, JobsQueueUnregistered, JobsUnavailable } from "#jobs/schemas.ts";
|
|
6
7
|
|
|
7
8
|
export function jobsFailures<A, R>(effect: Effect.Effect<A, PgBossError | PgBossPayloadError, R>) {
|
|
8
9
|
return effect.pipe(
|
|
@@ -12,14 +13,14 @@ export function jobsFailures<A, R>(effect: Effect.Effect<A, PgBossError | PgBoss
|
|
|
12
13
|
);
|
|
13
14
|
}
|
|
14
15
|
|
|
15
|
-
export function jobsReadHandlers<const TQueues extends readonly
|
|
16
|
+
export function jobsReadHandlers<const TQueues extends readonly JobsEntry[], TService>(
|
|
16
17
|
page: { readonly queues: TQueues },
|
|
17
18
|
service: Context.Service<TService, PgBossService>,
|
|
18
19
|
) {
|
|
19
20
|
function registered(name: string) {
|
|
20
21
|
const queues: readonly TQueues[number][] = page.queues;
|
|
21
22
|
const queue = queues.find((candidate) => candidate.name === name);
|
|
22
|
-
return queue === undefined ? Effect.fail(new JobsQueueUnregistered({ queue: name })) : Effect.succeed(queue);
|
|
23
|
+
return queue === undefined ? Effect.fail(new JobsQueueUnregistered({ queue: name })) : Effect.succeed(jobsQueue(queue));
|
|
23
24
|
}
|
|
24
25
|
return {
|
|
25
26
|
"admin.jobs.counts": ({ queue }: { readonly queue: string }) =>
|
|
@@ -32,13 +33,13 @@ export function jobsReadHandlers<const TQueues extends readonly JobsQueue[], TSe
|
|
|
32
33
|
Effect.gen(function* () {
|
|
33
34
|
const definition = yield* registered(queue);
|
|
34
35
|
const jobs = yield* service;
|
|
35
|
-
return yield* jobsFailures(jobs.deadLetteredJobs<string, TQueues[number]
|
|
36
|
+
return yield* jobsFailures(jobs.deadLetteredJobs<string, JobsPayload<TQueues[number]>>(definition, options));
|
|
36
37
|
}),
|
|
37
38
|
"admin.jobs.failed": ({ queue, ...options }: { readonly queue: string; readonly limit: number; readonly cursor?: string }) =>
|
|
38
39
|
Effect.gen(function* () {
|
|
39
40
|
const definition = yield* registered(queue);
|
|
40
41
|
const jobs = yield* service;
|
|
41
|
-
return yield* jobsFailures(jobs.failedJobs<string, TQueues[number]
|
|
42
|
+
return yield* jobsFailures(jobs.failedJobs<string, JobsPayload<TQueues[number]>>(definition, options));
|
|
42
43
|
}),
|
|
43
44
|
"admin.jobs.health": () =>
|
|
44
45
|
Effect.gen(function* () {
|
|
@@ -58,7 +59,7 @@ export function jobsReadHandlers<const TQueues extends readonly JobsQueue[], TSe
|
|
|
58
59
|
Effect.gen(function* () {
|
|
59
60
|
const definition = yield* registered(queue);
|
|
60
61
|
const jobs = yield* service;
|
|
61
|
-
return Option.map(yield* jobsFailures(jobs.getJob<string, TQueues[number]
|
|
62
|
+
return Option.map(yield* jobsFailures(jobs.getJob<string, JobsPayload<TQueues[number]>>(definition, id)), (job) => ({
|
|
62
63
|
attempt: job.startedOn === null ? 0 : job.retryCount + 1,
|
|
63
64
|
completedOn: Option.map(Option.fromNullishOr(job.completedOn), DateTime.makeUnsafe),
|
|
64
65
|
createdOn: DateTime.makeUnsafe(job.createdOn),
|
|
@@ -75,7 +76,7 @@ export function jobsReadHandlers<const TQueues extends readonly JobsQueue[], TSe
|
|
|
75
76
|
};
|
|
76
77
|
}
|
|
77
78
|
|
|
78
|
-
export function jobsHandlers<const TQueues extends readonly
|
|
79
|
+
export function jobsHandlers<const TQueues extends readonly JobsEntry[], TService>(
|
|
79
80
|
page: ReturnType<typeof jobsPage<TQueues>>,
|
|
80
81
|
service: Context.Service<TService, PgBossService>,
|
|
81
82
|
) {
|
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
import { type Context, Effect, Option } from "effect";
|
|
2
2
|
import type { PgBossService } from "@shivaedev/jobs/server/service.ts";
|
|
3
|
+
import { type JobsEntry, type JobsPayload, jobsQueue } from "#jobs/entry.ts";
|
|
3
4
|
import { JobsNotFailed, type jobsPageWithRetry } from "#jobs/retryPage.ts";
|
|
4
|
-
import {
|
|
5
|
+
import { JobsQueueUnregistered } from "#jobs/schemas.ts";
|
|
5
6
|
import { jobsFailures, jobsReadHandlers } from "./jobsHandlers.ts";
|
|
6
7
|
|
|
7
|
-
export function jobsHandlersWithRetry<const TQueues extends readonly
|
|
8
|
+
export function jobsHandlersWithRetry<const TQueues extends readonly JobsEntry[], TService>(
|
|
8
9
|
page: ReturnType<typeof jobsPageWithRetry<TQueues>>,
|
|
9
10
|
service: Context.Service<TService, PgBossService>,
|
|
10
11
|
) {
|
|
@@ -12,12 +13,14 @@ export function jobsHandlersWithRetry<const TQueues extends readonly JobsQueue[]
|
|
|
12
13
|
...jobsReadHandlers(page, service),
|
|
13
14
|
"admin.jobs.retry": ({ queue, id }) =>
|
|
14
15
|
Effect.gen(function* () {
|
|
15
|
-
const
|
|
16
|
-
|
|
16
|
+
const entries: readonly TQueues[number][] = page.queues;
|
|
17
|
+
const entry = entries.find((candidate) => candidate.name === queue);
|
|
18
|
+
if (entry === undefined) {
|
|
17
19
|
return yield* Effect.fail(new JobsQueueUnregistered({ queue }));
|
|
18
20
|
}
|
|
21
|
+
const definition = jobsQueue(entry);
|
|
19
22
|
const jobs = yield* service;
|
|
20
|
-
const job = yield* jobsFailures(jobs.getJob<string, TQueues[number]
|
|
23
|
+
const job = yield* jobsFailures(jobs.getJob<string, JobsPayload<TQueues[number]>>(definition, id));
|
|
21
24
|
if (Option.isNone(job) || job.value.state !== "failed") {
|
|
22
25
|
return yield* Effect.fail(new JobsNotFailed({ id, queue }));
|
|
23
26
|
}
|
package/src/users/page.ts
CHANGED
|
@@ -1,9 +1,11 @@
|
|
|
1
|
-
import { Schema } from "effect";
|
|
1
|
+
import { Effect, Schema } from "effect";
|
|
2
2
|
import type { roleSet } from "@shivaedev/access/roleSet.ts";
|
|
3
|
+
import { collection } from "@shivaedev/changes/keys.ts";
|
|
3
4
|
import { contract } from "@shivaedev/contract/contract.ts";
|
|
4
|
-
import { collection } from "@shivaedev/contract/keys.ts";
|
|
5
5
|
import { command, query } from "@shivaedev/contract/operation.ts";
|
|
6
6
|
import { AuthUnavailable, Forbidden, NotFound } from "@shivaedev/errors/taxonomy.ts";
|
|
7
|
+
import { SessionUser } from "@shivaedev/identity/identity.ts";
|
|
8
|
+
import { hasPermission } from "@shivaedev/identity/permission.ts";
|
|
7
9
|
import { adminPage } from "#page.ts";
|
|
8
10
|
import { UsersPermission } from "#permissions.ts";
|
|
9
11
|
import { LastRoleAssigner, UserList, UserListInput } from "#users/roles.ts";
|
|
@@ -24,6 +26,7 @@ export function usersPage<const TRole extends string>(access: Pick<ReturnType<ty
|
|
|
24
26
|
queries: [
|
|
25
27
|
query("list", {
|
|
26
28
|
payload: UserListInput.fields,
|
|
29
|
+
readPolicy: () => Effect.map(SessionUser, (user) => hasPermission(user, UsersPermission.permission)),
|
|
27
30
|
reads: () => [users.list],
|
|
28
31
|
rejections: { AuthUnavailable, Forbidden },
|
|
29
32
|
success: UsersList,
|