@shivaedev/admin 0.23.7 → 0.24.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.
Files changed (38) hide show
  1. package/CHANGELOG.md +7 -0
  2. package/README.md +9 -0
  3. package/dist/adapters/validateAdminRoutes.d.ts +2 -1
  4. package/dist/adapters/validateAdminRoutes.d.ts.map +1 -1
  5. package/dist/adapters/validateAdminRoutes.js +18 -18
  6. package/dist/adapters/validateAdminRoutes.js.map +1 -1
  7. package/dist/client/adapters/JobDetail.d.ts.map +1 -1
  8. package/dist/client/adapters/JobDetail.js +13 -3
  9. package/dist/client/adapters/JobDetail.js.map +1 -1
  10. package/dist/client/adapters/JobList.d.ts.map +1 -1
  11. package/dist/client/adapters/JobList.js +16 -2
  12. package/dist/client/adapters/JobList.js.map +1 -1
  13. package/dist/jobs/page.d.ts +57 -57
  14. package/dist/jobs/retryPage.d.ts +60 -60
  15. package/dist/registry.d.ts +2 -0
  16. package/dist/registry.d.ts.map +1 -1
  17. package/dist/registry.js +14 -11
  18. package/dist/registry.js.map +1 -1
  19. package/dist/server/jobsHandlers.d.ts +9 -9
  20. package/dist/server/jobsHandlers.d.ts.map +1 -1
  21. package/dist/server/jobsHandlers.js +9 -13
  22. package/dist/server/jobsHandlers.js.map +1 -1
  23. package/dist/server/jobsHandlersWithRetry.d.ts +2 -2
  24. package/dist/server/jobsHandlersWithRetry.d.ts.map +1 -1
  25. package/dist/server/jobsHandlersWithRetry.js +7 -4
  26. package/dist/server/jobsHandlersWithRetry.js.map +1 -1
  27. package/dist/server/registerAdmin.d.ts +1 -1
  28. package/dist/server/registerAdmin.d.ts.map +1 -1
  29. package/dist/server/registerAdmin.js +3 -2
  30. package/dist/server/registerAdmin.js.map +1 -1
  31. package/package.json +13 -13
  32. package/src/adapters/validateAdminRoutes.ts +18 -19
  33. package/src/client/adapters/JobDetail.tsx +23 -13
  34. package/src/client/adapters/JobList.tsx +28 -24
  35. package/src/registry.ts +15 -11
  36. package/src/server/jobsHandlers.ts +16 -16
  37. package/src/server/jobsHandlersWithRetry.ts +45 -35
  38. package/src/server/registerAdmin.ts +21 -15
@@ -1 +1 @@
1
- {"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../src/registry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEtC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAE1C,MAAM,WAAW,aAAa,CAAC,MAAM,SAAS,SAAS,SAAS,EAAE;IACjE,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;IAC7E,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,gBAAgB;IAChC,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,CAAC;IAC7B,QAAQ,CAAC,KAAK,EAAE,SAAS,SAAS,EAAE,CAAC;CACrC;AAED,MAAM,MAAM,aAAa,CAAC,MAAM,SAAS,SAAS,SAAS,EAAE,EAAE,KAAK,SAAS,MAAM,GAAG,KAAK,IAAI,MAAM,SAAS,SAAS;IACtH,MAAM,KAAK,SAAS,SAAS;IAC7B,GAAG,MAAM,KAAK,SAAS,SAAS,SAAS,EAAE;CAC3C,GACE,KAAK,CAAC,IAAI,CAAC,SAAS,KAAK,GACxB,KAAK,GACL,aAAa,CAAC,KAAK,EAAE,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,GAC1C,OAAO,CAAC;AAEX,MAAM,MAAM,aAAa,CAAC,WAAW,SAAS,SAAS,gBAAgB,EAAE,IAAI,WAAW,SAAS,SAAS;IACzG,MAAM,MAAM,SAAS,gBAAgB;IACrC,GAAG,MAAM,KAAK,SAAS,SAAS,gBAAgB,EAAE;CAClD,GACE,SAAS,CAAC,GAAG,MAAM,CAAC,OAAO,CAAC,EAAE,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC,GACtD,MAAM,SAAS,WAAW,CAAC,QAAQ,CAAC,GACnC,SAAS,WAAW,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,EAAE,GAC/C,SAAS,EAAE,CAAC;AAEhB,wBAAgB,oBAAoB,CAAC,KAAK,CAAC,WAAW,SAAS,SAAS,gBAAgB,EAAE,EACzF,GAAG,UAAU,EAAE,WAAW,GAAG,aAAa,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC,GACpE,aAAa,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC,CAAC;AAK7C,wBAAgB,aAAa,CAAC,KAAK,CAAC,MAAM,SAAS,SAAS,SAAS,EAAE,EAAE,GAAG,KAAK,EAAE,MAAM,GAAG,aAAa,CAAC,MAAM,CAAC,GAAG,aAAa,CAAC,MAAM,CAAC,CAiBxI"}
1
+ {"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../src/registry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEtC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAE1C,MAAM,WAAW,aAAa,CAAC,MAAM,SAAS,SAAS,SAAS,EAAE;IACjE,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;IAC7E,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,gBAAgB;IAChC,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,CAAC;IAC7B,QAAQ,CAAC,KAAK,EAAE,SAAS,SAAS,EAAE,CAAC;CACrC;AAED,MAAM,MAAM,aAAa,CAAC,MAAM,SAAS,SAAS,SAAS,EAAE,EAAE,KAAK,SAAS,MAAM,GAAG,KAAK,IAAI,MAAM,SAAS,SAAS;IACtH,MAAM,KAAK,SAAS,SAAS;IAC7B,GAAG,MAAM,KAAK,SAAS,SAAS,SAAS,EAAE;CAC3C,GACE,KAAK,CAAC,IAAI,CAAC,SAAS,KAAK,GACxB,KAAK,GACL,aAAa,CAAC,KAAK,EAAE,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,GAC1C,OAAO,CAAC;AAEX,MAAM,MAAM,aAAa,CAAC,WAAW,SAAS,SAAS,gBAAgB,EAAE,IAAI,WAAW,SAAS,SAAS;IACzG,MAAM,MAAM,SAAS,gBAAgB;IACrC,GAAG,MAAM,KAAK,SAAS,SAAS,gBAAgB,EAAE;CAClD,GACE,SAAS,CAAC,GAAG,MAAM,CAAC,OAAO,CAAC,EAAE,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC,GACtD,MAAM,SAAS,WAAW,CAAC,QAAQ,CAAC,GACnC,SAAS,WAAW,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,EAAE,GAC/C,SAAS,EAAE,CAAC;AAEhB,wBAAgB,oBAAoB,CAAC,KAAK,CAAC,WAAW,SAAS,SAAS,gBAAgB,EAAE,EACzF,GAAG,UAAU,EAAE,WAAW,GAAG,aAAa,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC,GACpE,aAAa,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC,CAAC;AAK7C,wBAAgB,aAAa,CAAC,KAAK,CAAC,MAAM,SAAS,SAAS,SAAS,EAAE,EAAE,GAAG,KAAK,EAAE,MAAM,GAAG,aAAa,CAAC,MAAM,CAAC,GAAG,aAAa,CAAC,MAAM,CAAC,CAExI;AAED,eAAO,MAAM,qBAAqB,oEAgBhC,CAAC"}
package/dist/registry.js CHANGED
@@ -1,24 +1,27 @@
1
+ import { Effect } from "effect";
1
2
  import { RpcGroup } from "effect/rpc";
2
3
  import { validateAdminRoutes } from "#adapters/validateAdminRoutes.ts";
3
4
  export function mergeAdminRegistries(...registries) {
4
5
  return adminRegistry(...registries.flatMap((registry) => registry.pages));
5
6
  }
6
7
  export function adminRegistry(...pages) {
8
+ return { group: RpcGroup.make().merge(...pages.map((page) => page.contract)), pages };
9
+ }
10
+ export const validateAdminRegistry = Effect.fnUntraced(function* (pages) {
7
11
  const ids = new Set();
8
12
  const tags = new Set();
9
- function unique(seen, value, kind) {
10
- if (seen.has(value)) {
11
- throw new Error(`Duplicate admin ${kind}: ${value}`);
12
- }
13
- seen.add(value);
14
- }
15
13
  for (const page of pages) {
16
- unique(ids, page.id, "page id");
14
+ if (ids.has(page.id)) {
15
+ yield* Effect.die(new Error(`Duplicate admin page id: ${page.id}`));
16
+ }
17
+ ids.add(page.id);
17
18
  for (const tag of page.contract.requests.keys()) {
18
- unique(tags, tag, "RPC tag");
19
+ if (tags.has(tag)) {
20
+ yield* Effect.die(new Error(`Duplicate admin RPC tag: ${tag}`));
21
+ }
22
+ tags.add(tag);
19
23
  }
20
24
  }
21
- validateAdminRoutes(pages.map((page) => page.route));
22
- return { group: RpcGroup.make().merge(...pages.map((page) => page.contract)), pages };
23
- }
25
+ yield* validateAdminRoutes(pages.map((page) => page.route));
26
+ });
24
27
  //# sourceMappingURL=registry.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"registry.js","sourceRoot":"","sources":["../src/registry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AAkCvE,MAAM,UAAU,oBAAoB,CAAC,GAAG,UAAuC;IAC9E,OAAO,aAAa,CAAC,GAAG,UAAU,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC;AAC3E,CAAC;AAED,MAAM,UAAU,aAAa,CAA4C,GAAG,KAAqC;IAChH,MAAM,GAAG,GAAG,IAAI,GAAG,EAAU,CAAC;IAC9B,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;IAC/B,SAAS,MAAM,CAAC,IAAiB,EAAE,KAAa,EAAE,IAAY;QAC7D,IAAI,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;YACrB,MAAM,IAAI,KAAK,CAAC,mBAAmB,IAAI,KAAK,KAAK,EAAE,CAAC,CAAC;QACtD,CAAC;QACD,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IACjB,CAAC;IACD,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QAC1B,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,EAAE,SAAS,CAAC,CAAC;QAChC,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,CAAC;YACjD,MAAM,CAAC,IAAI,EAAE,GAAG,EAAE,SAAS,CAAC,CAAC;QAC9B,CAAC;IACF,CAAC;IACD,mBAAmB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;IACrD,OAAO,EAAE,KAAK,EAAE,QAAQ,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC;AACvF,CAAC"}
1
+ {"version":3,"file":"registry.js","sourceRoot":"","sources":["../src/registry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AAkCvE,MAAM,UAAU,oBAAoB,CAAC,GAAG,UAAuC;IAC9E,OAAO,aAAa,CAAC,GAAG,UAAU,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC;AAC3E,CAAC;AAED,MAAM,UAAU,aAAa,CAA4C,GAAG,KAAqC;IAChH,OAAO,EAAE,KAAK,EAAE,QAAQ,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC;AACvF,CAAC;AAED,MAAM,CAAC,MAAM,qBAAqB,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,KAA2B;IAC5F,MAAM,GAAG,GAAG,IAAI,GAAG,EAAU,CAAC;IAC9B,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;IAC/B,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QAC1B,IAAI,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC;YACtB,KAAK,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC,4BAA4B,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;QACrE,CAAC;QACD,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACjB,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,CAAC;YACjD,IAAI,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;gBACnB,KAAK,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC,4BAA4B,GAAG,EAAE,CAAC,CAAC,CAAC;YACjE,CAAC;YACD,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACf,CAAC;IACF,CAAC;IACD,KAAK,CAAC,CAAC,mBAAmB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;AAC7D,CAAC,CAAC,CAAC"}
@@ -1,4 +1,4 @@
1
- import { type Context, DateTime, Effect, Option, type Schema } from "effect";
1
+ import { type Context, DateTime, Effect, Layer, Option, type Schema } from "effect";
2
2
  import { BadRequest } from "@shivaedev/errors/taxonomy.ts";
3
3
  import type { PgBossError, PgBossPayloadError } from "@shivaedev/jobs/server/error.ts";
4
4
  import type { PgBossService } from "@shivaedev/jobs/server/service.ts";
@@ -6,23 +6,23 @@ import { type JobsEntry, type JobsPayload } from "#jobs/entry.ts";
6
6
  import type { jobsPage } from "#jobs/page.ts";
7
7
  import { JobsPayloadInvalid, JobsQueueUnregistered, JobsUnavailable } from "#jobs/schemas.ts";
8
8
  export declare function jobsFailures<A, R>(effect: Effect.Effect<A, PgBossError | PgBossPayloadError | Schema.SchemaError, R>): Effect.Effect<A, BadRequest | JobsPayloadInvalid | JobsUnavailable, R>;
9
- export declare function jobsReadHandlers<const TQueues extends readonly JobsEntry[], TService>(page: {
9
+ export declare function jobsReadHandlers<const TQueues extends readonly JobsEntry[]>(page: {
10
10
  readonly queues: TQueues;
11
- }, service: Context.Service<TService, PgBossService>): {
11
+ }): {
12
12
  "admin.jobs.counts": ({ queue }: {
13
13
  readonly queue: string;
14
- }) => Effect.Effect<import("@shivaedev/jobs/server/health.ts").QueueCounts, BadRequest | JobsPayloadInvalid | JobsQueueUnregistered | JobsUnavailable, TService>;
14
+ }) => Effect.Effect<import("@shivaedev/jobs/server/health.ts").QueueCounts, BadRequest | JobsPayloadInvalid | JobsQueueUnregistered | JobsUnavailable, "@shivaedev/jobs/PgBossInspection">;
15
15
  "admin.jobs.deadLettered": ({ queue, ...options }: {
16
16
  readonly queue: string;
17
17
  readonly limit: number;
18
18
  readonly cursor?: string;
19
- }) => Effect.Effect<import("@shivaedev/jobs/server/health.ts").JobPage<import("@shivaedev/jobs/server/health.ts").DeadLetteredJob<unknown>>, BadRequest | JobsPayloadInvalid | JobsQueueUnregistered | JobsUnavailable, TService | JobsPayload<TQueues[number]>["DecodingServices"]>;
19
+ }) => Effect.Effect<import("@shivaedev/jobs/server/health.ts").JobPage<import("@shivaedev/jobs/server/health.ts").DeadLetteredJob<unknown>>, BadRequest | JobsPayloadInvalid | JobsQueueUnregistered | JobsUnavailable, "@shivaedev/jobs/PgBossInspection" | JobsPayload<TQueues[number]>["DecodingServices"]>;
20
20
  "admin.jobs.failed": ({ queue, ...options }: {
21
21
  readonly queue: string;
22
22
  readonly limit: number;
23
23
  readonly cursor?: string;
24
- }) => Effect.Effect<import("@shivaedev/jobs/server/health.ts").JobPage<import("@shivaedev/jobs/server/health.ts").ListedJob<unknown>>, BadRequest | JobsPayloadInvalid | JobsQueueUnregistered | JobsUnavailable, TService | JobsPayload<TQueues[number]>["DecodingServices"]>;
25
- "admin.jobs.health": () => Effect.Effect<import("@shivaedev/jobs/server/health.ts").JobsHealth, BadRequest | JobsPayloadInvalid | JobsUnavailable, TService>;
24
+ }) => Effect.Effect<import("@shivaedev/jobs/server/health.ts").JobPage<import("@shivaedev/jobs/server/health.ts").ListedJob<unknown>>, BadRequest | JobsPayloadInvalid | JobsQueueUnregistered | JobsUnavailable, "@shivaedev/jobs/PgBossInspection" | JobsPayload<TQueues[number]>["DecodingServices"]>;
25
+ "admin.jobs.health": () => Effect.Effect<import("@shivaedev/jobs/server/health.ts").JobsHealth, BadRequest | JobsPayloadInvalid | JobsUnavailable, "@shivaedev/jobs/PgBossInspection">;
26
26
  "admin.jobs.job": ({ id, queue }: {
27
27
  readonly id: string;
28
28
  readonly queue: string;
@@ -56,7 +56,7 @@ export declare function jobsReadHandlers<const TQueues extends readonly JobsEntr
56
56
  retryLimit: number;
57
57
  startedOn: Option.Option<DateTime.Utc>;
58
58
  state: import("@shivaedev/jobs/server/job.ts").JobState;
59
- }>, BadRequest | JobsPayloadInvalid | JobsQueueUnregistered | JobsUnavailable, TService | JobsPayload<TQueues[number]>["DecodingServices"]>;
59
+ }>, BadRequest | JobsPayloadInvalid | JobsQueueUnregistered | JobsUnavailable, "@shivaedev/jobs/PgBossInspection" | JobsPayload<TQueues[number]>["DecodingServices"]>;
60
60
  };
61
- 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>>;
61
+ export declare function jobsHandlers<const TQueues extends readonly JobsEntry[], TService>(page: ReturnType<typeof jobsPage<TQueues>>, service: Context.Service<TService, PgBossService>): 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<TService, import("effect/Scope").Scope> | Exclude<Exclude<Exclude<JobsPayload<TQueues[number]>["DecodingServices"], import("@shivaedev/identity/identity.ts").Identity | import("@shivaedev/identity/identity.ts").SessionUser>, import("effect/Scope").Scope>, "@shivaedev/jobs/PgBossInspection">>;
62
62
  //# 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,KAAK,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC7E,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,KAAK,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AAEvF,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,GAAG,MAAM,CAAC,WAAW,EAAE,CAAC,CAAC,0EAapH;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;IAO3D,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;IAO/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;IAOzH,mBAAmB;IAMnB,gBAAgB,kBAAkB;QAAE,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;KAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA0BlF;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
+ {"version":3,"file":"jobsHandlers.d.ts","sourceRoot":"","sources":["../../src/server/jobsHandlers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,MAAM,EAAE,MAAM,QAAQ,CAAC;AACpF,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,KAAK,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AAGvF,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,GAAG,MAAM,CAAC,WAAW,EAAE,CAAC,CAAC,0EAapH;AAED,wBAAgB,gBAAgB,CAAC,KAAK,CAAC,OAAO,SAAS,SAAS,SAAS,EAAE,EAAE,IAAI,EAAE;IAAE,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAA;CAAE;IAO7G,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;IAKnB,gBAAgB,kBAAkB;QAAE,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;KAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAyBlF;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,6lBAUjD"}
@@ -1,5 +1,6 @@
1
- import { DateTime, Effect, Option } from "effect";
1
+ import { DateTime, Effect, Layer, Option } from "effect";
2
2
  import { BadRequest } from "@shivaedev/errors/taxonomy.ts";
3
+ import { PgBossInspection } from "@shivaedev/jobs/server/inspection.ts";
3
4
  import { readJobFailure } from "@shivaedev/jobs/server/readJobFailure.ts";
4
5
  import { jobsQueue } from "#jobs/entry.ts";
5
6
  import { JobsPayloadInvalid, JobsQueueUnregistered, JobsUnavailable } from "#jobs/schemas.ts";
@@ -15,7 +16,7 @@ export function jobsFailures(effect) {
15
16
  }
16
17
  }));
17
18
  }
18
- export function jobsReadHandlers(page, service) {
19
+ export function jobsReadHandlers(page) {
19
20
  function registered(name) {
20
21
  const queues = page.queues;
21
22
  const queue = queues.find((candidate) => candidate.name === name);
@@ -24,31 +25,26 @@ export function jobsReadHandlers(page, service) {
24
25
  return {
25
26
  "admin.jobs.counts": ({ queue }) => Effect.gen(function* () {
26
27
  const definition = yield* registered(queue);
27
- const runtime = yield* service;
28
- const jobs = yield* runtime.inspection();
28
+ const jobs = yield* PgBossInspection;
29
29
  return yield* jobsFailures(jobs.counts(definition));
30
30
  }),
31
31
  "admin.jobs.deadLettered": ({ queue, ...options }) => Effect.gen(function* () {
32
32
  const definition = yield* registered(queue);
33
- const runtime = yield* service;
34
- const jobs = yield* runtime.inspection();
33
+ const jobs = yield* PgBossInspection;
35
34
  return yield* jobsFailures(jobs.deadLetteredJobs(definition, options));
36
35
  }),
37
36
  "admin.jobs.failed": ({ queue, ...options }) => Effect.gen(function* () {
38
37
  const definition = yield* registered(queue);
39
- const runtime = yield* service;
40
- const jobs = yield* runtime.inspection();
38
+ const jobs = yield* PgBossInspection;
41
39
  return yield* jobsFailures(jobs.failedJobs(definition, options));
42
40
  }),
43
41
  "admin.jobs.health": () => Effect.gen(function* () {
44
- const runtime = yield* service;
45
- const jobs = yield* runtime.inspection();
42
+ const jobs = yield* PgBossInspection;
46
43
  return yield* jobsFailures(jobs.health(page.queues));
47
44
  }),
48
45
  "admin.jobs.job": ({ id, queue }) => Effect.gen(function* () {
49
46
  const definition = yield* registered(queue);
50
- const runtime = yield* service;
51
- const jobs = yield* runtime.inspection();
47
+ const jobs = yield* PgBossInspection;
52
48
  const result = yield* jobsFailures(jobs.getJob(definition, id));
53
49
  if (Option.isNone(result)) {
54
50
  return Option.none();
@@ -72,6 +68,6 @@ export function jobsReadHandlers(page, service) {
72
68
  };
73
69
  }
74
70
  export function jobsHandlers(page, service) {
75
- return page.contract.application.toLayer(jobsReadHandlers(page, service));
71
+ return page.contract.application.toLayer(jobsReadHandlers(page)).pipe(Layer.provide(Layer.effect(PgBossInspection, Effect.flatMap(service, (jobs) => jobs.inspection()))));
76
72
  }
77
73
  //# sourceMappingURL=jobsHandlers.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"jobsHandlers.js","sourceRoot":"","sources":["../../src/server/jobsHandlers.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"jobsHandlers.js","sourceRoot":"","sources":["../../src/server/jobsHandlers.ts"],"names":[],"mappings":"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"}
@@ -1,7 +1,7 @@
1
- import { type Context } from "effect";
1
+ import { type Context, Layer } from "effect";
2
2
  import { SessionUser } from "@shivaedev/identity/identity.ts";
3
3
  import type { PgBossService } from "@shivaedev/jobs/server/service.ts";
4
4
  import { type JobsEntry, type JobsPayload } from "#jobs/entry.ts";
5
5
  import { type jobsPageWithRetry } from "#jobs/retryPage.ts";
6
- 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"> | import("effect/rpc/Rpc").Handler<"admin.jobs.runScheduleNow">, never, Exclude<Exclude<TService, import("@shivaedev/identity/identity.ts").Identity | SessionUser>, import("effect/Scope").Scope> | Exclude<Exclude<TService, import("@shivaedev/identity/identity.ts").Identity | SessionUser>, import("effect/Scope").Scope> | Exclude<Exclude<TService, import("@shivaedev/identity/identity.ts").Identity | SessionUser>, import("effect/Scope").Scope> | Exclude<Exclude<TService, import("@shivaedev/identity/identity.ts").Identity | SessionUser>, import("effect/Scope").Scope> | Exclude<Exclude<JobsPayload<TQueues[number]>["DecodingServices"], import("@shivaedev/identity/identity.ts").Identity | SessionUser>, import("effect/Scope").Scope> | Exclude<Exclude<JobsPayload<TQueues[number]>["DecodingServices"], import("@shivaedev/identity/identity.ts").Identity | SessionUser>, import("effect/Scope").Scope>>;
6
+ export declare function jobsHandlersWithRetry<const TQueues extends readonly JobsEntry[], TService>(page: ReturnType<typeof jobsPageWithRetry<TQueues>>, service: Context.Service<TService, PgBossService>): 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"> | import("effect/rpc/Rpc").Handler<"admin.jobs.runScheduleNow">, never, Exclude<TService, import("effect/Scope").Scope> | Exclude<Exclude<Exclude<TService, import("@shivaedev/identity/identity.ts").Identity | SessionUser>, import("effect/Scope").Scope>, "@shivaedev/jobs/PgBossInspection"> | Exclude<Exclude<Exclude<TService, import("@shivaedev/identity/identity.ts").Identity | SessionUser>, import("effect/Scope").Scope>, "@shivaedev/jobs/PgBossInspection"> | Exclude<Exclude<Exclude<JobsPayload<TQueues[number]>["DecodingServices"], import("@shivaedev/identity/identity.ts").Identity | SessionUser>, import("effect/Scope").Scope>, "@shivaedev/jobs/PgBossInspection"> | Exclude<Exclude<Exclude<JobsPayload<TQueues[number]>["DecodingServices"], import("@shivaedev/identity/identity.ts").Identity | SessionUser>, import("effect/Scope").Scope>, "@shivaedev/jobs/PgBossInspection">>;
7
7
  //# 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;AAEtD,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAC9D,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;AAK3E,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,qvCAoCjD"}
1
+ {"version":3,"file":"jobsHandlersWithRetry.d.ts","sourceRoot":"","sources":["../../src/server/jobsHandlersWithRetry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,OAAO,EAAU,KAAK,EAAU,MAAM,QAAQ,CAAC;AAE7D,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAE9D,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;AAK3E,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,gtCA6CjD"}
@@ -1,14 +1,16 @@
1
- import { Effect, Option } from "effect";
1
+ import { Effect, Layer, Option } from "effect";
2
2
  import { requirePermission } from "@shivaedev/access/requirePermission.ts";
3
3
  import { SessionUser } from "@shivaedev/identity/identity.ts";
4
+ import { PgBossInspection } from "@shivaedev/jobs/server/inspection.ts";
4
5
  import { jobsQueue } from "#jobs/entry.ts";
5
6
  import { JobsNotFailed } from "#jobs/retryPage.ts";
6
7
  import { JobsQueueUnregistered } from "#jobs/schemas.ts";
7
8
  import { RetryJobs } from "#permissions.ts";
8
9
  import { jobsFailures, jobsReadHandlers } from "#server/jobsHandlers.ts";
9
10
  export function jobsHandlersWithRetry(page, service) {
10
- return page.contract.application.toLayer({
11
- ...jobsReadHandlers(page, service),
11
+ return page.contract.application
12
+ .toLayer({
13
+ ...jobsReadHandlers(page),
12
14
  "admin.jobs.retry": ({ queue, id }) => Effect.gen(function* () {
13
15
  yield* requirePermission(yield* SessionUser, RetryJobs);
14
16
  const entries = page.queues;
@@ -35,6 +37,7 @@ export function jobsHandlersWithRetry(page, service) {
35
37
  const runtime = yield* service;
36
38
  return yield* runtime.runScheduleNow({ name: entry.name, scheduleOptions: entry.scheduleOptions ?? {} }).pipe(Effect.catchTag("PgBossNotFoundError", () => Effect.fail(new JobsQueueUnregistered({ queue }))), Effect.catchTag("PgBossError", (error) => jobsFailures(Effect.fail(error))));
37
39
  }),
38
- });
40
+ })
41
+ .pipe(Layer.provide(Layer.effect(PgBossInspection, Effect.flatMap(service, (jobs) => jobs.inspection()))));
39
42
  }
40
43
  //# sourceMappingURL=jobsHandlersWithRetry.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"jobsHandlersWithRetry.js","sourceRoot":"","sources":["../../src/server/jobsHandlersWithRetry.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"jobsHandlersWithRetry.js","sourceRoot":"","sources":["../../src/server/jobsHandlersWithRetry.ts"],"names":[],"mappings":"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"}
@@ -2,7 +2,7 @@ import { Layer } from "effect";
2
2
  import type { Rpc, RpcGroup } from "effect/rpc";
3
3
  import type { SessionPolicy } from "@shivaedev/identity/server/SessionPolicy.ts";
4
4
  import type { AdminPage } from "#page.ts";
5
- import type { AdminRegistry } from "#registry.ts";
5
+ import { type AdminRegistry } from "#registry.ts";
6
6
  type HandlerLayers<TPages extends readonly AdminPage[]> = {
7
7
  readonly [TPage in TPages[number] as TPage["id"]]: Layer.Layer<Rpc.ToHandler<RpcGroup.Rpcs<TPage["contract"]["application"]>>, unknown, unknown>;
8
8
  };
@@ -1 +1 @@
1
- {"version":3,"file":"registerAdmin.d.ts","sourceRoot":"","sources":["../../src/server/registerAdmin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,KAAK,EAAE,MAAM,QAAQ,CAAC;AACvC,OAAO,KAAK,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAChD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6CAA6C,CAAC;AACjF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAC1C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAGlD,KAAK,aAAa,CAAC,MAAM,SAAS,SAAS,SAAS,EAAE,IAAI;IACzD,QAAQ,EAAE,KAAK,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC;CAChJ,CAAC;AAEF,KAAK,gBAAgB,CAAC,SAAS,IAAI,OAAO,CAAC,SAAS,CAAC,MAAM,SAAS,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;AAElF,wBAAgB,aAAa,CAAC,KAAK,CAAC,MAAM,SAAS,SAAS,SAAS,EAAE,EAAE,SAAS,SAAS,aAAa,CAAC,MAAM,CAAC,EAC/G,QAAQ,EAAE,aAAa,CAAC,MAAM,CAAC,EAC/B,QAAQ,EAAE,SAAS,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,SAAS,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,KAAK,CAAC,GACjF;IACF,QAAQ,CAAC,KAAK,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC;IAC/C,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,QAAQ,EAAE,KAAK,CAAC,KAAK,CAC3B,KAAK,CAAC,OAAO,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC,GAC1C,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE;QAAE,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,eAAe,CAAC,CAAA;KAAE,CAAC,EACvH,KAAK,CAAC,KAAK,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC,EACxC,KAAK,CAAC,QAAQ,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC,GAAG,aAAa,CAC3D,CAAC;CACF,CAAC"}
1
+ {"version":3,"file":"registerAdmin.d.ts","sourceRoot":"","sources":["../../src/server/registerAdmin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,KAAK,EAAE,MAAM,QAAQ,CAAC;AACvC,OAAO,KAAK,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAChD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6CAA6C,CAAC;AACjF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAC1C,OAAO,EAAE,KAAK,aAAa,EAAyB,MAAM,cAAc,CAAC;AAGzE,KAAK,aAAa,CAAC,MAAM,SAAS,SAAS,SAAS,EAAE,IAAI;IACzD,QAAQ,EAAE,KAAK,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC;CAChJ,CAAC;AAEF,KAAK,gBAAgB,CAAC,SAAS,IAAI,OAAO,CAAC,SAAS,CAAC,MAAM,SAAS,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;AAElF,wBAAgB,aAAa,CAAC,KAAK,CAAC,MAAM,SAAS,SAAS,SAAS,EAAE,EAAE,SAAS,SAAS,aAAa,CAAC,MAAM,CAAC,EAC/G,QAAQ,EAAE,aAAa,CAAC,MAAM,CAAC,EAC/B,QAAQ,EAAE,SAAS,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,SAAS,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,KAAK,CAAC,GACjF;IACF,QAAQ,CAAC,KAAK,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC;IAC/C,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,QAAQ,EAAE,KAAK,CAAC,KAAK,CAC3B,KAAK,CAAC,OAAO,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC,GAC1C,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE;QAAE,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,eAAe,CAAC,CAAA;KAAE,CAAC,EACvH,KAAK,CAAC,KAAK,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC,EACxC,KAAK,CAAC,QAAQ,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC,GAAG,aAAa,CAC3D,CAAC;CACF,CAAC"}
@@ -1,7 +1,8 @@
1
1
  import { Effect, Layer } from "effect";
2
+ import { validateAdminRegistry } from "#registry.ts";
2
3
  import { pagePermissions } from "#server/pagePermissions.ts";
3
4
  export function registerAdmin(registry, handlers) {
4
- const registered = Layer.suspend(() => {
5
+ const registered = Layer.unwrap(validateAdminRegistry(registry.pages).pipe(Effect.as(Layer.suspend(() => {
5
6
  const ids = new Set(registry.pages.map((page) => page.id));
6
7
  for (const id of ids) {
7
8
  if (!Object.hasOwn(handlers, id)) {
@@ -14,7 +15,7 @@ export function registerAdmin(registry, handlers) {
14
15
  }
15
16
  }
16
17
  return Layer.mergeAll(Layer.empty, ...Object.values(handlers)).pipe(Layer.provideMerge(pagePermissions(registry)));
17
- });
18
+ }))));
18
19
  return { group: registry.group, handlers: registered, pages: registry.pages };
19
20
  }
20
21
  //# sourceMappingURL=registerAdmin.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"registerAdmin.js","sourceRoot":"","sources":["../../src/server/registerAdmin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AAKvC,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAqB7D,MAAM,UAAU,aAAa,CAC5B,QAA6C,EAC7C,QAAwE;IAExE,MAAM,UAAU,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE;QACrC,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;QAC3D,KAAK,MAAM,EAAE,IAAI,GAAG,EAAE,CAAC;YACtB,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,CAAC,EAAE,CAAC;gBAClC,OAAO,KAAK,CAAC,aAAa,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC,2BAA2B,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;YACpF,CAAC;QACF,CAAC;QACD,KAAK,MAAM,EAAE,IAAI,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;YACxC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC;gBAClB,OAAO,KAAK,CAAC,aAAa,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC,gCAAgC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;YACzF,CAAC;QACF,CAAC;QACD,OAAO,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,EAAE,GAAG,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;IACpH,CAAC,CAAC,CAAC;IACH,OAAO,EAAE,KAAK,EAAE,QAAQ,CAAC,KAAK,EAAE,QAAQ,EAAE,UAAU,EAAE,KAAK,EAAE,QAAQ,CAAC,KAAK,EAAE,CAAC;AAC/E,CAAC"}
1
+ {"version":3,"file":"registerAdmin.js","sourceRoot":"","sources":["../../src/server/registerAdmin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AAIvC,OAAO,EAAsB,qBAAqB,EAAE,MAAM,cAAc,CAAC;AACzE,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAqB7D,MAAM,UAAU,aAAa,CAC5B,QAA6C,EAC7C,QAAwE;IAExE,MAAM,UAAU,GAAG,KAAK,CAAC,MAAM,CAC9B,qBAAqB,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,IAAI,CACzC,MAAM,CAAC,EAAE,CACR,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE;QAClB,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;QAC3D,KAAK,MAAM,EAAE,IAAI,GAAG,EAAE,CAAC;YACtB,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,CAAC,EAAE,CAAC;gBAClC,OAAO,KAAK,CAAC,aAAa,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC,2BAA2B,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;YACpF,CAAC;QACF,CAAC;QACD,KAAK,MAAM,EAAE,IAAI,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;YACxC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC;gBAClB,OAAO,KAAK,CAAC,aAAa,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC,gCAAgC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;YACzF,CAAC;QACF,CAAC;QACD,OAAO,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,EAAE,GAAG,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;IACpH,CAAC,CAAC,CACF,CACD,CACD,CAAC;IACF,OAAO,EAAE,KAAK,EAAE,QAAQ,CAAC,KAAK,EAAE,QAAQ,EAAE,UAAU,EAAE,KAAK,EAAE,QAAQ,CAAC,KAAK,EAAE,CAAC;AAC/E,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@shivaedev/admin",
3
- "version": "0.23.7",
3
+ "version": "0.24.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": {
@@ -49,21 +49,21 @@
49
49
  "dependencies": {
50
50
  "@shivaedev/access": "0.6.1",
51
51
  "@shivaedev/changes": "0.11.1",
52
- "@shivaedev/contract": "0.43.3",
52
+ "@shivaedev/contract": "0.43.4",
53
53
  "@shivaedev/errors": "0.10.1",
54
- "@shivaedev/identity": "0.30.5",
55
- "@shivaedev/jobs": "0.41.4"
54
+ "@shivaedev/identity": "0.30.6",
55
+ "@shivaedev/jobs": "0.42.0"
56
56
  },
57
57
  "devDependencies": {
58
58
  "@effect/atom-react": "4.1.1",
59
- "@shivaedev/quality": "0.74.0",
60
- "@shivaedev/rate-limit": "0.6.7",
61
- "@shivaedev/react": "0.46.6",
62
- "@shivaedev/server": "0.33.1",
63
- "@shivaedev/sql": "0.46.3",
64
- "@shivaedev/test-kits": "0.10.6",
65
- "@shivaedev/test-sql": "0.24.7",
66
- "@shivaedev/test-story": "0.45.5",
59
+ "@shivaedev/quality": "0.74.3",
60
+ "@shivaedev/rate-limit": "0.6.8",
61
+ "@shivaedev/react": "0.46.7",
62
+ "@shivaedev/server": "0.33.2",
63
+ "@shivaedev/sql": "0.46.4",
64
+ "@shivaedev/test-kits": "0.10.7",
65
+ "@shivaedev/test-sql": "0.24.8",
66
+ "@shivaedev/test-story": "0.45.6",
67
67
  "@types/node": "24.19.2",
68
68
  "@types/react": "19.3.0",
69
69
  "@types/react-dom": "19.3.0",
@@ -76,7 +76,7 @@
76
76
  },
77
77
  "peerDependencies": {
78
78
  "@effect/atom-react": "4.1.1",
79
- "@shivaedev/react": "0.46.6",
79
+ "@shivaedev/react": "0.46.7",
80
80
  "effect": "4.1.1",
81
81
  "react": "19.3.1"
82
82
  },
@@ -1,3 +1,4 @@
1
+ import { Effect } from "effect";
1
2
  import type { AdminRoute } from "#page.ts";
2
3
 
3
4
  function overlaps(left: string, right: string): boolean {
@@ -11,26 +12,24 @@ function overlaps(left: string, right: string): boolean {
11
12
  );
12
13
  }
13
14
 
14
- function pathsOf(route: AdminRoute): readonly string[] {
15
- const page = route.path.replace(/\/$/u, "");
16
- const detail = route.detail?.replace(/\/$/u, "");
17
- if (detail !== undefined && !detail.startsWith(`${page}/`)) {
18
- throw new Error(`Admin detail path ${route.detail} must be under page path ${route.path}`);
19
- }
20
- return detail === undefined ? [page] : [page, detail];
21
- }
22
-
23
- export function validateAdminRoutes(routes: readonly AdminRoute[]): void {
15
+ export const validateAdminRoutes = Effect.fnUntraced(function* (routes: readonly AdminRoute[]) {
24
16
  const paths: string[] = [];
25
- for (const path of routes.flatMap(pathsOf)) {
26
- const normalized = path.replace(/\$[^/]+/gu, "$");
27
- if (paths.includes(normalized)) {
28
- throw new Error(`Duplicate admin path: ${normalized}`);
17
+ for (const route of routes) {
18
+ const page = route.path.replace(/\/$/u, "");
19
+ const detail = route.detail?.replace(/\/$/u, "");
20
+ if (detail !== undefined && !detail.startsWith(`${page}/`)) {
21
+ yield* Effect.die(new Error(`Admin detail path ${route.detail} must be under page path ${route.path}`));
29
22
  }
30
- const existing = paths.find((candidate) => overlaps(candidate, normalized));
31
- if (existing !== undefined) {
32
- throw new Error(`Overlapping admin paths: ${existing} and ${normalized}`);
23
+ for (const path of detail === undefined ? [page] : [page, detail]) {
24
+ const normalized = path.replace(/\$[^/]+/gu, "$");
25
+ if (paths.includes(normalized)) {
26
+ yield* Effect.die(new Error(`Duplicate admin path: ${normalized}`));
27
+ }
28
+ const existing = paths.find((candidate) => overlaps(candidate, normalized));
29
+ if (existing !== undefined) {
30
+ yield* Effect.die(new Error(`Overlapping admin paths: ${existing} and ${normalized}`));
31
+ }
32
+ paths.push(normalized);
33
33
  }
34
- paths.push(normalized);
35
34
  }
36
- }
35
+ });
@@ -19,15 +19,29 @@ export function JobDetail({
19
19
  return (
20
20
  <section aria-label="Job detail">
21
21
  <h2 className="mb-4 text-xl font-semibold">Job detail</h2>
22
- <JobsQueryPanel state={state}>
23
- {(job) => (Option.isSome(job) ? <JobRecord job={job.value} retry={retry} /> : <p>Job not found.</p>)}
24
- </JobsQueryPanel>
22
+ <JobsQueryPanel state={state}>{(job) => <JobResult job={job} retry={retry} />}</JobsQueryPanel>
25
23
  </section>
26
24
  );
27
25
  }
28
26
 
27
+ function JobResult({ job, retry }: { readonly job: Option.Option<AdminJob>; readonly retry: RetryJob | undefined }) {
28
+ if (Option.isNone(job)) {
29
+ return <p>Job not found.</p>;
30
+ }
31
+ return <JobRecord job={job.value} retry={retry} />;
32
+ }
33
+
29
34
  export function JobRecord({ job, retry }: { readonly job: AdminJob; readonly retry?: RetryJob | undefined }) {
30
35
  const failure = ("sourceOutput" in job ? job.sourceOutput : job.output)?.message ?? "No failure recorded.";
36
+ const deadLetterDetails =
37
+ "sourceId" in job ? (
38
+ <>
39
+ <h3 className="font-medium">Dead-letter source</h3>
40
+ <p className="text-sm break-all">{Option.getOrElse(job.sourceId, () => "Unknown original")}</p>
41
+ <pre className="bg-muted max-w-full overflow-auto rounded-md p-3 text-xs">{JSON.stringify(job.sourceOutput, null, 2)}</pre>
42
+ </>
43
+ ) : null;
44
+ const retryControl = retry !== undefined && job.state === "failed" && !("sourceId" in job) ? <RetryControl job={job} retry={retry} /> : null;
31
45
  return (
32
46
  <div className="min-w-0 rounded-md border p-4">
33
47
  <div className="min-w-0 space-y-4">
@@ -54,14 +68,8 @@ export function JobRecord({ job, retry }: { readonly job: AdminJob; readonly ret
54
68
  <p className="wrap-anywhere">{failure}</p>
55
69
  <h3 className="font-medium">Output</h3>
56
70
  <pre className="bg-muted max-w-full overflow-auto rounded-md p-3 text-xs">{JSON.stringify(job.output, null, 2)}</pre>
57
- {"sourceId" in job && (
58
- <>
59
- <h3 className="font-medium">Dead-letter source</h3>
60
- <p className="text-sm break-all">{Option.getOrElse(job.sourceId, () => "Unknown original")}</p>
61
- <pre className="bg-muted max-w-full overflow-auto rounded-md p-3 text-xs">{JSON.stringify(job.sourceOutput, null, 2)}</pre>
62
- </>
63
- )}
64
- {retry !== undefined && job.state === "failed" && !("sourceId" in job) && <RetryControl job={job} retry={retry} />}
71
+ {deadLetterDetails}
72
+ {retryControl}
65
73
  </div>
66
74
  </div>
67
75
  );
@@ -69,13 +77,15 @@ export function JobRecord({ job, retry }: { readonly job: AdminJob; readonly ret
69
77
 
70
78
  function RetryControl({ job, retry }: { readonly job: AdminJob; readonly retry: RetryJob }) {
71
79
  const action = useAction(retry);
80
+ const failureMessage = Option.isSome(action.cause) ? <p role="alert">Could not retry this job. Refresh and try again.</p> : null;
81
+ const resultMessage = Option.isSome(action.data) ? <p role="status">Retry requested.</p> : null;
72
82
  return (
73
83
  <div className="space-y-2">
74
84
  <JobButton disabled={action.pending} onClick={() => action.dispatch({ id: job.id, queue: job.queue })}>
75
85
  {action.pending ? "Retrying…" : "Retry job"}
76
86
  </JobButton>
77
- {Option.isSome(action.cause) && <p role="alert">Could not retry this job. Refresh and try again.</p>}
78
- {Option.isSome(action.data) && <p role="status">Retry requested.</p>}
87
+ {failureMessage}
88
+ {resultMessage}
79
89
  </div>
80
90
  );
81
91
  }
@@ -1,5 +1,5 @@
1
1
  import { Option } from "effect";
2
- import { useState } from "react";
2
+ import { type ReactNode, useState } from "react";
3
3
  import type { QueueDisplay } from "@shivaedev/jobs/display.ts";
4
4
  import { useQuery } from "@shivaedev/react/client/resultState.ts";
5
5
  import { JobDetail, JobRecord } from "#client/adapters/JobDetail.tsx";
@@ -26,6 +26,19 @@ export function JobList({
26
26
  const cursor = cursors.at(-1);
27
27
  const state = useQuery(api[kind].query({ ...(cursor === undefined ? {} : { cursor }), limit: 10, queue }));
28
28
  const selected = Option.flatMap(state.data, (page) => Option.fromUndefinedOr(page.jobs.find((job) => job.id === selectedId)));
29
+ let selectedDetail: ReactNode = null;
30
+ if (selectedId !== undefined) {
31
+ if (kind === "failed") {
32
+ selectedDetail = <JobDetail api={api} id={selectedId} key={selectedId} queue={queue} retry={retry} />;
33
+ } else if (Option.isSome(selected)) {
34
+ selectedDetail = (
35
+ <section aria-label="Dead-letter detail">
36
+ <h2 className="mb-4 text-xl font-semibold">Dead-letter detail</h2>
37
+ <JobRecord job={selected.value} />
38
+ </section>
39
+ );
40
+ }
41
+ }
29
42
  function selectJob(job: AdminJob) {
30
43
  select(job.id);
31
44
  }
@@ -33,31 +46,22 @@ export function JobList({
33
46
  setCursors(next);
34
47
  select(undefined);
35
48
  }
49
+ function renderPage(page: { readonly jobs: readonly AdminJob[]; readonly next: Option.Option<string> }) {
50
+ const kindLabel = kind === "failed" ? "failed" : "dead-lettered";
51
+ const emptyMessage = page.jobs.length === 0 ? <p>No {kindLabel} jobs.</p> : null;
52
+ const table = page.jobs.length === 0 ? null : <JobTable jobs={page.jobs} select={selectJob} subject={subject} />;
53
+ return (
54
+ <>
55
+ {emptyMessage}
56
+ {table}
57
+ <JobPagination change={changePage} cursors={cursors} next={page.next} pending={state.pending} />
58
+ </>
59
+ );
60
+ }
36
61
  return (
37
62
  <div className="space-y-6">
38
- <JobsQueryPanel state={state}>
39
- {(page) => (
40
- <>
41
- {page.jobs.length === 0 ? (
42
- <p>No {kind === "failed" ? "failed" : "dead-lettered"} jobs.</p>
43
- ) : (
44
- <JobTable jobs={page.jobs} select={selectJob} subject={subject} />
45
- )}
46
- <JobPagination change={changePage} cursors={cursors} next={page.next} pending={state.pending} />
47
- </>
48
- )}
49
- </JobsQueryPanel>
50
- {selectedId !== undefined
51
- && (kind === "failed" ? (
52
- <JobDetail api={api} id={selectedId} key={selectedId} queue={queue} retry={retry} />
53
- ) : (
54
- Option.isSome(selected) && (
55
- <section aria-label="Dead-letter detail">
56
- <h2 className="mb-4 text-xl font-semibold">Dead-letter detail</h2>
57
- <JobRecord job={selected.value} />
58
- </section>
59
- )
60
- ))}
63
+ <JobsQueryPanel state={state}>{renderPage}</JobsQueryPanel>
64
+ {selectedDetail}
61
65
  </div>
62
66
  );
63
67
  }
package/src/registry.ts CHANGED
@@ -1,3 +1,4 @@
1
+ import { Effect } from "effect";
1
2
  import { RpcGroup } from "effect/rpc";
2
3
  import { validateAdminRoutes } from "#adapters/validateAdminRoutes.ts";
3
4
  import type { AdminPage } from "#page.ts";
@@ -38,20 +39,23 @@ export function mergeAdminRegistries(...registries: readonly AnyAdminRegistry[])
38
39
  }
39
40
 
40
41
  export function adminRegistry<const TPages extends readonly AdminPage[]>(...pages: TPages & UniquePageIds<TPages>): AdminRegistry<TPages> {
42
+ return { group: RpcGroup.make().merge(...pages.map((page) => page.contract)), pages };
43
+ }
44
+
45
+ export const validateAdminRegistry = Effect.fnUntraced(function* (pages: readonly AdminPage[]) {
41
46
  const ids = new Set<string>();
42
47
  const tags = new Set<string>();
43
- function unique(seen: Set<string>, value: string, kind: string) {
44
- if (seen.has(value)) {
45
- throw new Error(`Duplicate admin ${kind}: ${value}`);
46
- }
47
- seen.add(value);
48
- }
49
48
  for (const page of pages) {
50
- unique(ids, page.id, "page id");
49
+ if (ids.has(page.id)) {
50
+ yield* Effect.die(new Error(`Duplicate admin page id: ${page.id}`));
51
+ }
52
+ ids.add(page.id);
51
53
  for (const tag of page.contract.requests.keys()) {
52
- unique(tags, tag, "RPC tag");
54
+ if (tags.has(tag)) {
55
+ yield* Effect.die(new Error(`Duplicate admin RPC tag: ${tag}`));
56
+ }
57
+ tags.add(tag);
53
58
  }
54
59
  }
55
- validateAdminRoutes(pages.map((page) => page.route));
56
- return { group: RpcGroup.make().merge(...pages.map((page) => page.contract)), pages };
57
- }
60
+ yield* validateAdminRoutes(pages.map((page) => page.route));
61
+ });