@shivaedev/admin 0.7.0 → 0.8.1

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 (42) hide show
  1. package/README.md +44 -30
  2. package/dist/client/UsersTable.js +3 -3
  3. package/dist/jobs/entry.d.ts +12 -0
  4. package/dist/jobs/entry.d.ts.map +1 -0
  5. package/dist/jobs/entry.js +5 -0
  6. package/dist/jobs/entry.js.map +1 -0
  7. package/dist/jobs/keys.d.ts +5 -5
  8. package/dist/jobs/keys.js +1 -1
  9. package/dist/jobs/keys.js.map +1 -1
  10. package/dist/jobs/page.d.ts +20 -14
  11. package/dist/jobs/page.d.ts.map +1 -1
  12. package/dist/jobs/page.js +17 -4
  13. package/dist/jobs/page.js.map +1 -1
  14. package/dist/jobs/retryPage.d.ts +23 -17
  15. package/dist/jobs/retryPage.d.ts.map +1 -1
  16. package/dist/jobs/retryPage.js.map +1 -1
  17. package/dist/jobs/schemas.d.ts +2 -2
  18. package/dist/jobs/schemas.d.ts.map +1 -1
  19. package/dist/jobs/schemas.js.map +1 -1
  20. package/dist/permissions.d.ts +2 -2
  21. package/dist/server/jobsHandlers.d.ts +8 -7
  22. package/dist/server/jobsHandlers.d.ts.map +1 -1
  23. package/dist/server/jobsHandlers.js +2 -1
  24. package/dist/server/jobsHandlers.js.map +1 -1
  25. package/dist/server/jobsHandlersWithRetry.d.ts +2 -2
  26. package/dist/server/jobsHandlersWithRetry.d.ts.map +1 -1
  27. package/dist/server/jobsHandlersWithRetry.js +5 -2
  28. package/dist/server/jobsHandlersWithRetry.js.map +1 -1
  29. package/dist/users/page.d.ts +8 -2
  30. package/dist/users/page.d.ts.map +1 -1
  31. package/dist/users/page.js +5 -2
  32. package/dist/users/page.js.map +1 -1
  33. package/package.json +12 -11
  34. package/src/client/UsersTable.tsx +3 -3
  35. package/src/jobs/entry.ts +15 -0
  36. package/src/jobs/keys.ts +1 -1
  37. package/src/jobs/page.ts +19 -6
  38. package/src/jobs/retryPage.ts +3 -2
  39. package/src/jobs/schemas.ts +2 -2
  40. package/src/server/jobsHandlers.ts +8 -7
  41. package/src/server/jobsHandlersWithRetry.ts +8 -5
  42. package/src/users/page.ts +5 -2
@@ -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 JobsQueue["schema"]>(queue: {
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 JobsQueue["schema"]>(queue: {
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,SAAS,CAAC,QAAQ,CAAC,EAAE,KAAK,EAAE;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAA;CAAE;;;;;;;;;;;;GAE1H;AAED,wBAAgB,kBAAkB,CAAC,QAAQ,SAAS,SAAS,CAAC,QAAQ,CAAC,EAAE,KAAK,EAAE;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAA;CAAE;;;;;;;;;;;;;;GASnI;AAED,wBAAgB,OAAO,CAAC,IAAI,SAAS,MAAM,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI;;;GAEzD"}
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"}
@@ -1 +1 @@
1
- {"version":3,"file":"schemas.js","sourceRoot":"","sources":["../../src/jobs/schemas.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"schemas.js","sourceRoot":"","sources":["../../src/jobs/schemas.ts"],"names":[],"mappings":"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"}
@@ -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, type JobsQueue, JobsQueueUnregistered, JobsUnavailable } from "#jobs/schemas.ts";
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 JobsQueue[], TService>(page: {
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]["schema"]["Type"]>>, JobsPayloadInvalid | JobsQueueUnregistered | JobsUnavailable, TService | TQueues[number]["schema"]["DecodingServices"]>;
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]["schema"]["Type"]>>, JobsPayloadInvalid | JobsQueueUnregistered | JobsUnavailable, TService | TQueues[number]["schema"]["DecodingServices"]>;
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]["schema"]["Type"];
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]["schema"]["DecodingServices"]>;
47
+ }>, JobsPayloadInvalid | JobsQueueUnregistered | JobsUnavailable, TService | JobsPayload<TQueues[number]>["DecodingServices"]>;
47
48
  };
48
- export declare function jobsHandlers<const TQueues extends readonly JobsQueue[], TService>(page: ReturnType<typeof jobsPage<TQueues>>, service: Context.Service<TService, PgBossService>): import("effect/Layer").Layer<import("effect/rpc/Rpc").Handler<"admin.jobs.counts"> | import("effect/rpc/Rpc").Handler<"admin.jobs.deadLettered"> | import("effect/rpc/Rpc").Handler<"admin.jobs.failed"> | import("effect/rpc/Rpc").Handler<"admin.jobs.health"> | import("effect/rpc/Rpc").Handler<"admin.jobs.job">, never, Exclude<Exclude<TService, import("@shivaedev/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>>;
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,KAAK,SAAS,EAAE,qBAAqB,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAE9G,wBAAgB,YAAY,CAAC,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,WAAW,GAAG,kBAAkB,EAAE,CAAC,CAAC,6DAM/F;AAED,wBAAgB,gBAAgB,CAAC,KAAK,CAAC,OAAO,SAAS,SAAS,SAAS,EAAE,EAAE,QAAQ,EACpF,IAAI,EAAE;IAAE,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAA;CAAE,EAClC,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,QAAQ,EAAE,aAAa,CAAC;IAQhD,mBAAmB,cAAc;QAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;KAAE;IAM3D,yBAAyB,0BAA0B;QAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE;IAM/H,mBAAmB,0BAA0B;QAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE;IAMzH,mBAAmB;;;;;;;;IAcnB,gBAAgB,kBAAkB;QAAE,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;KAAE;;;;;;;;;;;;;EAmBlF;AAED,wBAAgB,YAAY,CAAC,KAAK,CAAC,OAAO,SAAS,SAAS,SAAS,EAAE,EAAE,QAAQ,EAChF,IAAI,EAAE,UAAU,CAAC,OAAO,QAAQ,CAAC,OAAO,CAAC,CAAC,EAC1C,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,QAAQ,EAAE,aAAa,CAAC,01BAGjD"}
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":"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"}
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 { type JobsQueue } from "#jobs/schemas.ts";
5
- export declare function jobsHandlersWithRetry<const TQueues extends readonly JobsQueue[], TService>(page: ReturnType<typeof jobsPageWithRetry<TQueues>>, service: Context.Service<TService, PgBossService>): import("effect/Layer").Layer<import("effect/rpc/Rpc").Handler<"admin.jobs.counts"> | import("effect/rpc/Rpc").Handler<"admin.jobs.deadLettered"> | import("effect/rpc/Rpc").Handler<"admin.jobs.failed"> | import("effect/rpc/Rpc").Handler<"admin.jobs.health"> | import("effect/rpc/Rpc").Handler<"admin.jobs.job"> | import("effect/rpc/Rpc").Handler<"admin.jobs.retry">, never, Exclude<Exclude<TService, import("@shivaedev/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,EAAiB,KAAK,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAC3E,OAAO,EAAE,KAAK,SAAS,EAAyB,MAAM,kBAAkB,CAAC;AAGzE,wBAAgB,qBAAqB,CAAC,KAAK,CAAC,OAAO,SAAS,SAAS,SAAS,EAAE,EAAE,QAAQ,EACzF,IAAI,EAAE,UAAU,CAAC,OAAO,iBAAiB,CAAC,OAAO,CAAC,CAAC,EACnD,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,QAAQ,EAAE,aAAa,CAAC,i5BAkBjD"}
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 definition = page.queues.find((candidate) => candidate.name === queue);
10
- if (definition === undefined) {
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,EAAkB,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AACzE,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAEnE,MAAM,UAAU,qBAAqB,CACpC,IAAmD,EACnD,OAAiD;IAEjD,OAAO,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,OAAO,CAAC;QACxC,GAAG,gBAAgB,CAAC,IAAI,EAAE,OAAO,CAAC;QAClC,kBAAkB,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,CACrC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;YACnB,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,IAAI,KAAK,KAAK,CAAC,CAAC;YAC7E,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;gBAC9B,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,qBAAqB,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;YACjE,CAAC;YACD,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,OAAO,CAAC;YAC5B,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM,CAAoC,UAAU,EAAE,EAAE,CAAC,CAAC,CAAC;YAChG,IAAI,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,KAAK,CAAC,KAAK,KAAK,QAAQ,EAAE,CAAC;gBACxD,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,aAAa,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;YAC7D,CAAC;YACD,KAAK,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC,CAAC;QACjD,CAAC,CAAC;KACH,CAAC,CAAC;AACJ,CAAC"}
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"}
@@ -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.Never>, Schema.Never, typeof UsersPermission, never> | import("effect/rpc/Rpc").Rpc<"admin.users.changeRole", Schema.Struct<{
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
@@ -1 +1 @@
1
- {"version":3,"file":"page.d.ts","sourceRoot":"","sources":["../../src/users/page.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;AAI5D,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AAErF,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;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAuB5G"}
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"}
@@ -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,
@@ -1 +1 @@
1
- {"version":3,"file":"page.js","sourceRoot":"","sources":["../../src/users/page.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,OAAO,EAAE,QAAQ,EAAE,MAAM,iCAAiC,CAAC;AAC3D,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AACzD,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,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,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"}
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.7.0",
3
+ "version": "0.8.1",
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/contract": "0.18.0",
45
+ "@shivaedev/changes": "0.5.0",
46
+ "@shivaedev/contract": "0.19.1",
46
47
  "@shivaedev/errors": "0.1.0",
47
- "@shivaedev/identity": "0.2.0",
48
- "@shivaedev/jobs": "0.21.0",
49
- "@shivaedev/react": "0.20.0",
50
- "@shivaedev/sql": "0.23.0"
48
+ "@shivaedev/identity": "0.3.1",
49
+ "@shivaedev/jobs": "0.22.0",
50
+ "@shivaedev/react": "0.21.1",
51
+ "@shivaedev/sql": "0.24.0"
51
52
  },
52
53
  "devDependencies": {
53
54
  "@effect/atom-react": "4.0.5",
54
- "@shivaedev/quality": "0.42.0",
55
- "@shivaedev/server": "0.2.0",
56
- "@shivaedev/test-sql": "0.10.1",
57
- "@shivaedev/test-story": "0.21.1",
55
+ "@shivaedev/quality": "0.44.0",
56
+ "@shivaedev/server": "0.3.1",
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.3",
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",
@@ -21,7 +21,7 @@ function UserRole<TRole extends string>({
21
21
  return canChangeRoles ? (
22
22
  <select
23
23
  aria-label={`Role for ${user.email}`}
24
- className="rounded-md border bg-background p-2"
24
+ className="bg-background rounded-md border p-2"
25
25
  disabled={pending}
26
26
  onChange={(event) => {
27
27
  const role = roles.find((candidate) => candidate === event.target.value);
@@ -54,7 +54,7 @@ function UserRow<TRole extends string>({
54
54
  <td className="p-3">
55
55
  <UserRole {...controls} canChangeRoles={canChangeRoles} user={user} />
56
56
  </td>
57
- <td className="whitespace-nowrap p-3">
57
+ <td className="p-3 whitespace-nowrap">
58
58
  <time dateTime={DateTime.formatIso(user.createdAt)}>{DateTime.formatIso(user.createdAt)}</time>
59
59
  </td>
60
60
  </tr>
@@ -90,7 +90,7 @@ function UserHeaders() {
90
90
  return (
91
91
  <tr>
92
92
  {["Name", "Email", "Role", "Signed up"].map((label) => (
93
- <th className="whitespace-nowrap p-3" key={label} scope="col">
93
+ <th className="p-3 whitespace-nowrap" key={label} scope="col">
94
94
  {label}
95
95
  </th>
96
96
  ))}
@@ -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
@@ -1,5 +1,5 @@
1
1
  import { Schema } from "effect";
2
- import { collection } from "@shivaedev/contract/keys.ts";
2
+ import { collection } from "@shivaedev/changes/keys.ts";
3
3
 
4
4
  export const jobsKeys = {
5
5
  counts: collection("admin.jobs.counts", Schema.String),
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, type JobsQueue, jobPage, jobSchema, PageFields, QueueCounts } from "./schemas.ts";
10
+ import { deadLetteredSchema, JobsFailures, JobsHealth, jobPage, jobSchema, PageFields, QueueCounts } from "./schemas.ts";
8
11
 
9
- export function jobsPage<const TQueues extends readonly JobsQueue[]>(...queues: TQueues) {
10
- const Job = Schema.Union(queues.map((queue: TQueues[number]) => jobSchema<TQueues[number]["schema"]>(queue)));
11
- const DeadLettered = Schema.Union(queues.map((queue: TQueues[number]) => deadLetteredSchema<TQueues[number]["schema"]>(queue)));
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", { reads: () => [jobsKeys.health.list], rejections: JobsFailures, success: JobsHealth }),
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),
@@ -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, type JobsQueue } from "./schemas.ts";
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 JobsQueue[]>(...queues: TQueues) {
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({
@@ -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 JobsQueue["schema"]>(queue: { readonly name: string; readonly schema: TPayload }) {
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 JobsQueue["schema"]>(queue: { readonly name: string; readonly schema: TPayload }) {
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, type JobsQueue, JobsQueueUnregistered, JobsUnavailable } from "#jobs/schemas.ts";
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 JobsQueue[], TService>(
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]["schema"]>(definition, options));
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]["schema"]>(definition, options));
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]["schema"]>(definition, id)), (job) => ({
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 JobsQueue[], TService>(
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 { type JobsQueue, JobsQueueUnregistered } from "#jobs/schemas.ts";
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 JobsQueue[], TService>(
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 definition = page.queues.find((candidate) => candidate.name === queue);
16
- if (definition === undefined) {
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]["schema"]>(definition, id));
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,