@shivaedev/admin 0.2.0 → 0.4.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 +43 -3
- package/dist/client/UsersTable.d.ts +11 -0
- package/dist/client/UsersTable.d.ts.map +1 -0
- package/dist/client/UsersTable.js +25 -0
- package/dist/client/UsersTable.js.map +1 -0
- package/dist/client/UsersView.d.ts +13 -0
- package/dist/client/UsersView.d.ts.map +1 -0
- package/dist/client/UsersView.js +35 -0
- package/dist/client/UsersView.js.map +1 -0
- 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/dist/server/usersHandlers.d.ts +2 -0
- package/dist/server/usersHandlers.d.ts.map +1 -0
- package/dist/server/usersHandlers.js +13 -0
- package/dist/server/usersHandlers.js.map +1 -0
- package/dist/users/page.d.ts +80 -0
- package/dist/users/page.d.ts.map +1 -0
- package/dist/users/page.js +31 -0
- package/dist/users/page.js.map +1 -0
- package/package.json +17 -6
- package/src/client/UsersTable.tsx +102 -0
- package/src/client/UsersView.ts +71 -0
- 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/src/server/usersHandlers.ts +14 -0
- package/src/users/page.ts +32 -0
package/README.md
CHANGED
|
@@ -17,7 +17,7 @@ The page exposes `admin.jobs.failed` and the generated `admin.jobs.$changes` sub
|
|
|
17
17
|
|
|
18
18
|
## Use native contracts and Layers
|
|
19
19
|
|
|
20
|
-
Install `@shivaedev/admin` with `effect`. Declare each page's queries, commands and streams with `@shivaedev/effect-contract`, then pass its native contract to `adminPage`. The stable id identifies the page at server registration; route metadata belongs to the application's view. Author RPC namespaces in the contract name, such as `admin.jobs`.
|
|
20
|
+
Install `@shivaedev/admin` with `effect`, `react` and `@effect/atom-react`. Declare each page's queries, commands and streams with `@shivaedev/effect-contract`, then pass its native contract to `adminPage`. The stable id identifies the page at server registration; route metadata belongs to the application's view. Author RPC namespaces in the contract name, such as `admin.jobs`.
|
|
21
21
|
|
|
22
22
|
```ts
|
|
23
23
|
import { Schema } from "effect";
|
|
@@ -59,7 +59,7 @@ const handlers = registration.handlers.pipe(
|
|
|
59
59
|
|
|
60
60
|
Pass `registration.group` and `handlers` to the existing application's RPC host on `/rpc`, merging them with its other groups and Layers as needed. The Platform host supplies generated change handlers; registration requires the page's application handlers. Handler Layer errors and service requirements remain inferred. Missing or extra page ids fail at registration; TypeScript also checks each Layer provides the handlers for its page.
|
|
61
61
|
|
|
62
|
-
Page declarations and the registry are browser-safe. Server registration lives under `/server`;
|
|
62
|
+
Page declarations and the registry are browser-safe. Server registration lives under `/server`; applications own route composition and styling. The built-in Users view uses React; server declarations add no transport. The package's stories prove role enforcement through native in-process RPC, with an already resolved session as a precondition.
|
|
63
63
|
|
|
64
64
|
## Built-in Jobs page
|
|
65
65
|
|
|
@@ -90,4 +90,44 @@ 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.
|
|
113
|
+
|
|
114
|
+
## Built-in Users page
|
|
115
|
+
|
|
116
|
+
`UsersPage` from `@shivaedev/admin/users/page.ts` declares `/admin/users`. Add it to the same registry as Jobs and register `users: usersHandlers` from `@shivaedev/admin/server/usersHandlers.ts`. The handlers use the application's existing Effect SQL client against Better Auth's default PostgreSQL `user` table, with the admin plugin's `role` column. They do not create another user store. Custom Better Auth table or column names are not supported by these handlers.
|
|
117
|
+
|
|
118
|
+
Bind `UsersPage.contract` to the registry's native AtomRpc client, then mount the package view in the application's admin shell. The view uses semantic HTML and Tailwind utility classes; Tailwind applications include `@source "../../node_modules/@shivaedev/admin/src/client";` in `src/client/entry.css`, as the starter does:
|
|
119
|
+
|
|
120
|
+
```tsx
|
|
121
|
+
import { UsersView } from "@shivaedev/admin/client/UsersView.ts";
|
|
122
|
+
|
|
123
|
+
const users = bind(UsersPage.contract, Client);
|
|
124
|
+
const changeRole = Client.runtime.fn(users.changeRole.run);
|
|
125
|
+
|
|
126
|
+
<UsersView list={users.list.query} changeRole={changeRole} />;
|
|
127
|
+
```
|
|
128
|
+
|
|
129
|
+
`admin.users.list` takes `{ limit, cursor? }` (1–100 users), returns `{ users, next, canChangeRoles }`, and orders pages by user id. Each user has id, name, email, roles and a UTC sign-up time. All reads and subscriptions require `admin`. Only callers who also have `owner` see role controls. `admin.users.changeRole` takes `{ userId, role, grant }` for Platform's `user`, `admin` and `owner` roles. It returns typed `Forbidden` for a non-owner, `LastOwner` when revoking the final owner, and `NotFound` for a missing user. Role changes preserve other roles, invalidate the list after commit, and emit an Effect log with actor id, target id, role, action and timestamp. There is no durable audit-history store.
|
|
130
|
+
|
|
131
|
+
Keep Better Auth cookie caching disabled so requests see current roles. Applications must route role writes through this operation to retain its owner and last-owner policy. The starter disables Better Auth's `/admin/set-role`, `/admin/update-user` and `/admin/create-user` browser endpoints; its server-side bootstrap API remains available.
|
|
132
|
+
|
|
133
|
+
The starter mounts Users beside Jobs and bootstraps new administrators with both `admin` and `owner`. Existing generated apps receive this wiring through `pnpm dlx @shivaedev/create-app@latest update` after release; review conflicts and install dependencies. For an existing database with no owner, bootstrap a new administrator with `pnpm admin:create`.
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import { type ChangeRoleInput } from "@shivaedev/platform/rpc/userRoles.ts";
|
|
2
|
+
import type { UsersList } from "#users/page.ts";
|
|
3
|
+
interface RoleControls {
|
|
4
|
+
readonly dispatch: (input: typeof ChangeRoleInput.Type) => void;
|
|
5
|
+
readonly pending: boolean;
|
|
6
|
+
}
|
|
7
|
+
export declare function UsersTable({ data, ...controls }: RoleControls & {
|
|
8
|
+
readonly data: typeof UsersList.Type;
|
|
9
|
+
}): import("react").JSX.Element;
|
|
10
|
+
export {};
|
|
11
|
+
//# sourceMappingURL=UsersTable.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"UsersTable.d.ts","sourceRoot":"","sources":["../../src/client/UsersTable.tsx"],"names":[],"mappings":"AACA,OAAO,EAAgB,KAAK,eAAe,EAAY,MAAM,sCAAsC,CAAC;AACpG,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAEhD,UAAU,YAAY;IACrB,QAAQ,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,OAAO,eAAe,CAAC,IAAI,KAAK,IAAI,CAAC;IAChE,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;CAC1B;AAuFD,wBAAgB,UAAU,CAAC,EAAE,IAAI,EAAE,GAAG,QAAQ,EAAE,EAAE,YAAY,GAAG;IAAE,QAAQ,CAAC,IAAI,EAAE,OAAO,SAAS,CAAC,IAAI,CAAA;CAAE,+BAOxG"}
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
import { createElement as _createElement } from "react";
|
|
2
|
+
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
3
|
+
import { DateTime } from "effect";
|
|
4
|
+
import { UserRole } from "@shivaedev/platform/rpc/userRoles.ts";
|
|
5
|
+
function UserHeaders() {
|
|
6
|
+
return (_jsx("tr", { children: ["Name", "Email", "Roles", "Signed up"].map((label) => (_jsx("th", { className: "whitespace-nowrap p-3", scope: "col", children: label }, label))) }));
|
|
7
|
+
}
|
|
8
|
+
function RoleCheckbox({ user, role, pending, dispatch }) {
|
|
9
|
+
return (_jsxs("label", { className: "mr-3 inline-flex gap-1", children: [_jsx("input", { "aria-label": `${role} for ${user.email}`, checked: user.roles.includes(role), disabled: pending, onChange: (event) => dispatch({ grant: event.target.checked, role, userId: user.id }), type: "checkbox" }), role] }));
|
|
10
|
+
}
|
|
11
|
+
function UserRoles({ user, canChangeRoles, dispatch, pending, }) {
|
|
12
|
+
return (_jsxs("div", { children: [_jsx("p", { children: user.roles.join(", ") || "No roles" }), canChangeRoles
|
|
13
|
+
? UserRole.literals.map((role) => _jsx(RoleCheckbox, { dispatch: dispatch, pending: pending, role: role, user: user }, role))
|
|
14
|
+
: null] }));
|
|
15
|
+
}
|
|
16
|
+
function UserRow({ user, ...controls }) {
|
|
17
|
+
return (_jsxs("tr", { className: "border-b", children: [_jsx("td", { className: "p-3", children: user.name }), _jsx("td", { className: "p-3", children: user.email }), _jsx("td", { className: "p-3", children: _jsx(UserRoles, { ...controls, user: user }) }), _jsx("td", { className: "whitespace-nowrap p-3", children: _jsx("time", { dateTime: DateTime.formatIso(user.createdAt), children: DateTime.formatIso(user.createdAt) }) })] }));
|
|
18
|
+
}
|
|
19
|
+
function UserRows({ data, ...controls }) {
|
|
20
|
+
return (_jsx("div", { className: "overflow-x-auto rounded-md border", children: _jsxs("table", { className: "w-full text-left text-sm", children: [_jsx("caption", { className: "sr-only", children: "App users and roles" }), _jsx("thead", { className: "bg-muted", children: _jsx(UserHeaders, {}) }), _jsx("tbody", { children: data.users.map((user) => (_createElement(UserRow, { ...controls, canChangeRoles: data.canChangeRoles, key: user.id, user: user }))) })] }) }));
|
|
21
|
+
}
|
|
22
|
+
export function UsersTable({ data, ...controls }) {
|
|
23
|
+
return (_jsxs("div", { className: "space-y-4", children: [data.canChangeRoles ? null : _jsx("p", { children: "Only owners can change roles." }), data.users.length === 0 ? _jsx("p", { children: "No users." }) : _jsx(UserRows, { ...controls, data: data })] }));
|
|
24
|
+
}
|
|
25
|
+
//# sourceMappingURL=UsersTable.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"UsersTable.js","sourceRoot":"","sources":["../../src/client/UsersTable.tsx"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
import type * as AsyncResult from "effect/reactivity/AsyncResult";
|
|
2
|
+
import type * as Atom from "effect/reactivity/Atom";
|
|
3
|
+
import type { ChangeRoleInput, UserListInput } from "@shivaedev/platform/rpc/userRoles.ts";
|
|
4
|
+
import type { UsersList } from "#users/page.ts";
|
|
5
|
+
export interface UsersViewProps {
|
|
6
|
+
readonly changeRole: Atom.AtomResultFn<typeof ChangeRoleInput.Type, void, unknown>;
|
|
7
|
+
readonly list: (input: typeof UserListInput.Type) => Atom.Atom<AsyncResult.AsyncResult<typeof UsersList.Type, unknown>>;
|
|
8
|
+
}
|
|
9
|
+
export declare function UsersView({ list, changeRole }: UsersViewProps): import("react").DetailedReactHTMLElement<{
|
|
10
|
+
"aria-label": string;
|
|
11
|
+
className: string;
|
|
12
|
+
}, HTMLElement>;
|
|
13
|
+
//# sourceMappingURL=UsersView.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"UsersView.d.ts","sourceRoot":"","sources":["../../src/client/UsersView.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,WAAW,MAAM,+BAA+B,CAAC;AAClE,OAAO,KAAK,KAAK,IAAI,MAAM,wBAAwB,CAAC;AAGpD,OAAO,KAAK,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,sCAAsC,CAAC;AAC3F,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAGhD,MAAM,WAAW,cAAc;IAC9B,QAAQ,CAAC,UAAU,EAAE,IAAI,CAAC,YAAY,CAAC,OAAO,eAAe,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;IACnF,QAAQ,CAAC,IAAI,EAAE,CAAC,KAAK,EAAE,OAAO,aAAa,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,OAAO,SAAS,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC;CACxH;AAaD,wBAAgB,SAAS,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,EAAE,cAAc;;;gBA6C7D"}
|
|
@@ -0,0 +1,35 @@
|
|
|
1
|
+
import { Cause, Option, Predicate } from "effect";
|
|
2
|
+
import { createElement, useState } from "react";
|
|
3
|
+
import { useAction, useQuery } from "@shivaedev/effect-react/client/resultState.ts";
|
|
4
|
+
import { UsersTable } from "./UsersTable.js";
|
|
5
|
+
function failure(cause) {
|
|
6
|
+
const error = Option.getOrUndefined(Cause.findErrorOption(cause));
|
|
7
|
+
if (Predicate.isTagged(error, "LastOwner")) {
|
|
8
|
+
return "The last owner cannot be demoted. Grant owner to another user first.";
|
|
9
|
+
}
|
|
10
|
+
if (Predicate.isTagged(error, "Forbidden")) {
|
|
11
|
+
return "Owner role required to change roles.";
|
|
12
|
+
}
|
|
13
|
+
return "Could not change the role. Try again.";
|
|
14
|
+
}
|
|
15
|
+
export function UsersView({ list, changeRole }) {
|
|
16
|
+
const [cursors, setCursors] = useState([]);
|
|
17
|
+
const cursor = cursors.at(-1);
|
|
18
|
+
const state = useQuery(list({ ...(cursor === undefined ? {} : { cursor }), limit: 20 }));
|
|
19
|
+
const action = useAction(changeRole);
|
|
20
|
+
const data = Option.getOrUndefined(state.data);
|
|
21
|
+
return createElement("section", { "aria-label": "App users", className: "space-y-4" }, createElement("button", { className: "rounded-md border px-3 py-2 disabled:opacity-50", disabled: state.pending, onClick: state.refresh, type: "button" }, "Refresh users"), state.pending ? createElement("p", { role: "status" }, "Loading users…") : null, Option.isSome(state.cause) ? createElement("p", { role: "alert" }, "Could not load users. Try refreshing.") : null, Option.isSome(action.cause) ? createElement("p", { role: "alert" }, failure(action.cause.value)) : null, data === undefined ? null : createElement(UsersTable, { data, dispatch: action.dispatch, pending: action.pending }), data === undefined
|
|
22
|
+
? null
|
|
23
|
+
: createElement("nav", { "aria-label": "User pages", className: "flex gap-4" }, createElement("button", {
|
|
24
|
+
className: "rounded-md border px-3 py-2 disabled:opacity-50",
|
|
25
|
+
disabled: cursors.length === 0 || state.pending,
|
|
26
|
+
onClick: () => setCursors(cursors.slice(0, -1)),
|
|
27
|
+
type: "button",
|
|
28
|
+
}, "Previous users"), createElement("button", {
|
|
29
|
+
className: "rounded-md border px-3 py-2 disabled:opacity-50",
|
|
30
|
+
disabled: Option.isNone(data.next) || state.pending,
|
|
31
|
+
onClick: () => Option.map(data.next, (next) => setCursors([...cursors, next])),
|
|
32
|
+
type: "button",
|
|
33
|
+
}, "Next users")));
|
|
34
|
+
}
|
|
35
|
+
//# sourceMappingURL=UsersView.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"UsersView.js","sourceRoot":"","sources":["../../src/client/UsersView.ts"],"names":[],"mappings":"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"}
|
|
@@ -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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"}
|