@shivaedev/jobs 0.25.0 → 0.27.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +44 -0
- package/README.md +58 -19
- package/dist/server/adapters/clientErrorReporter.d.ts +3 -0
- package/dist/server/adapters/clientErrorReporter.d.ts.map +1 -0
- package/dist/server/adapters/clientErrorReporter.js +8 -0
- package/dist/server/adapters/clientErrorReporter.js.map +1 -0
- package/dist/server/adapters/installSchema.d.ts +5 -0
- package/dist/server/adapters/installSchema.d.ts.map +1 -0
- package/dist/server/adapters/installSchema.js +57 -0
- package/dist/server/adapters/installSchema.js.map +1 -0
- package/dist/server/adapters/registerWorker.d.ts +5 -0
- package/dist/server/adapters/registerWorker.d.ts.map +1 -0
- package/dist/server/{internal → adapters}/registerWorker.js +3 -2
- package/dist/server/adapters/registerWorker.js.map +1 -0
- package/dist/server/adapters/retireJobs.d.ts +5 -0
- package/dist/server/adapters/retireJobs.d.ts.map +1 -0
- package/dist/server/adapters/retireJobs.js +28 -0
- package/dist/server/adapters/retireJobs.js.map +1 -0
- package/dist/server/{internal → adapters}/runSchemaPlan.d.ts.map +1 -1
- package/dist/server/{internal → adapters}/runSchemaPlan.js.map +1 -1
- package/dist/server/{internal → adapters}/schemaIndexBuilds.d.ts.map +1 -1
- package/dist/server/{internal → adapters}/schemaIndexBuilds.js.map +1 -1
- package/dist/server/{internal → adapters}/testingExpirations.d.ts.map +1 -1
- package/dist/server/{internal → adapters}/testingExpirations.js.map +1 -1
- package/dist/server/{internal → adapters}/transactionDb.d.ts.map +1 -1
- package/dist/server/{internal → adapters}/transactionDb.js.map +1 -1
- package/dist/server/adapters/workerDiagnostics.d.ts +3 -0
- package/dist/server/adapters/workerDiagnostics.d.ts.map +1 -0
- package/dist/server/adapters/workerDiagnostics.js +24 -0
- package/dist/server/adapters/workerDiagnostics.js.map +1 -0
- package/dist/server/client.d.ts +2 -1
- package/dist/server/client.d.ts.map +1 -1
- package/dist/server/client.js +1 -2
- package/dist/server/client.js.map +1 -1
- package/dist/server/defaultClientFactory.d.ts +3 -0
- package/dist/server/defaultClientFactory.d.ts.map +1 -0
- package/dist/server/{internal/nativeClient.js → defaultClientFactory.js} +2 -2
- package/dist/server/defaultClientFactory.js.map +1 -0
- package/dist/server/defineSchedule.d.ts +3 -0
- package/dist/server/defineSchedule.d.ts.map +1 -0
- package/dist/server/{internal/scheduleDefinition.js → defineSchedule.js} +2 -2
- package/dist/server/defineSchedule.js.map +1 -0
- package/dist/server/definition.d.ts +0 -1
- package/dist/server/definition.d.ts.map +1 -1
- package/dist/server/definition.js +0 -4
- package/dist/server/definition.js.map +1 -1
- package/dist/server/error.d.ts +11 -1
- package/dist/server/error.d.ts.map +1 -1
- package/dist/server/error.js +6 -1
- package/dist/server/error.js.map +1 -1
- package/dist/server/health.d.ts +1 -0
- package/dist/server/health.d.ts.map +1 -1
- package/dist/server/internal/adapters/testingFetches.d.ts +7 -0
- package/dist/server/internal/adapters/testingFetches.d.ts.map +1 -0
- package/dist/server/internal/adapters/testingFetches.js +30 -0
- package/dist/server/internal/adapters/testingFetches.js.map +1 -0
- package/dist/server/internal/batchHandler.d.ts +1 -2
- package/dist/server/internal/batchHandler.d.ts.map +1 -1
- package/dist/server/internal/batchHandler.js +9 -1
- package/dist/server/internal/batchHandler.js.map +1 -1
- package/dist/server/internal/deadLetterResolutionPlan.d.ts +2 -0
- package/dist/server/internal/deadLetterResolutionPlan.d.ts.map +1 -0
- package/dist/server/internal/deadLetterResolutionPlan.js +28 -0
- package/dist/server/internal/deadLetterResolutionPlan.js.map +1 -0
- package/dist/server/internal/enqueueFor.d.ts.map +1 -1
- package/dist/server/internal/enqueueFor.js +2 -2
- package/dist/server/internal/enqueueFor.js.map +1 -1
- package/dist/server/internal/jobControl.d.ts.map +1 -1
- package/dist/server/internal/jobControl.js +2 -1
- package/dist/server/internal/jobControl.js.map +1 -1
- package/dist/server/internal/jobStorePlans.d.ts +2 -0
- package/dist/server/internal/jobStorePlans.d.ts.map +1 -0
- package/dist/server/internal/jobStorePlans.js +6 -0
- package/dist/server/internal/jobStorePlans.js.map +1 -0
- package/dist/server/internal/lifecycle.d.ts +1 -1
- package/dist/server/internal/lifecycle.d.ts.map +1 -1
- package/dist/server/internal/lifecycle.js +5 -3
- package/dist/server/internal/lifecycle.js.map +1 -1
- package/dist/server/internal/listJobs.d.ts.map +1 -1
- package/dist/server/internal/listJobs.js +3 -2
- package/dist/server/internal/listJobs.js.map +1 -1
- package/dist/server/internal/makeService.js +1 -1
- package/dist/server/internal/makeService.js.map +1 -1
- package/dist/server/internal/register.d.ts +1 -2
- package/dist/server/internal/register.d.ts.map +1 -1
- package/dist/server/internal/register.js +8 -8
- package/dist/server/internal/register.js.map +1 -1
- package/dist/server/internal/registerReleasedJobs.d.ts +1 -2
- package/dist/server/internal/registerReleasedJobs.d.ts.map +1 -1
- package/dist/server/internal/registerReleasedJobs.js +5 -4
- package/dist/server/internal/registerReleasedJobs.js.map +1 -1
- package/dist/server/internal/runQueueWorker.d.ts.map +1 -1
- package/dist/server/internal/runQueueWorker.js +3 -2
- package/dist/server/internal/runQueueWorker.js.map +1 -1
- package/dist/server/internal/storedRows.js +1 -1
- package/dist/server/internal/storedRows.js.map +1 -1
- package/dist/server/internal/testingClient.d.ts.map +1 -1
- package/dist/server/internal/testingClient.js +1 -1
- package/dist/server/internal/testingClient.js.map +1 -1
- package/dist/server/internal/testingWaits.d.ts +16 -0
- package/dist/server/internal/testingWaits.d.ts.map +1 -0
- package/dist/server/internal/testingWaits.js +56 -0
- package/dist/server/internal/testingWaits.js.map +1 -0
- package/dist/server/schema.d.ts.map +1 -1
- package/dist/server/schema.js +11 -53
- package/dist/server/schema.js.map +1 -1
- package/dist/server/service.d.ts +5 -4
- package/dist/server/service.d.ts.map +1 -1
- package/dist/server/service.js +6 -10
- package/dist/server/service.js.map +1 -1
- package/dist/server/testing.d.ts +5 -0
- package/dist/server/testing.d.ts.map +1 -1
- package/dist/server/testing.js +7 -2
- package/dist/server/testing.js.map +1 -1
- package/package.json +4 -4
- package/src/server/adapters/clientErrorReporter.ts +8 -0
- package/src/server/adapters/installSchema.ts +68 -0
- package/src/server/{internal → adapters}/registerWorker.ts +6 -7
- package/src/server/adapters/retireJobs.ts +30 -0
- package/src/server/adapters/workerDiagnostics.ts +28 -0
- package/src/server/client.ts +2 -3
- package/src/server/{internal/nativeClient.ts → defaultClientFactory.ts} +1 -1
- package/src/server/{internal/scheduleDefinition.ts → defineSchedule.ts} +1 -1
- package/src/server/definition.ts +0 -5
- package/src/server/error.ts +11 -1
- package/src/server/health.ts +1 -0
- package/src/server/internal/adapters/testingFetches.ts +36 -0
- package/src/server/internal/batchHandler.ts +11 -8
- package/src/server/internal/deadLetterResolutionPlan.ts +28 -0
- package/src/server/internal/enqueueFor.ts +2 -2
- package/src/server/internal/jobControl.ts +2 -1
- package/src/server/internal/jobStorePlans.ts +6 -0
- package/src/server/internal/lifecycle.ts +6 -3
- package/src/server/internal/listJobs.ts +11 -3
- package/src/server/internal/makeService.ts +1 -1
- package/src/server/internal/register.ts +6 -21
- package/src/server/internal/registerReleasedJobs.ts +6 -5
- package/src/server/internal/runQueueWorker.ts +3 -1
- package/src/server/internal/storedRows.ts +1 -1
- package/src/server/internal/testingClient.ts +1 -1
- package/src/server/internal/testingWaits.ts +98 -0
- package/src/server/schema.ts +14 -65
- package/src/server/service.ts +11 -14
- package/src/server/testing.ts +11 -2
- package/dist/server/internal/nativeClient.d.ts +0 -3
- package/dist/server/internal/nativeClient.d.ts.map +0 -1
- package/dist/server/internal/nativeClient.js.map +0 -1
- package/dist/server/internal/registerWorker.d.ts +0 -6
- package/dist/server/internal/registerWorker.d.ts.map +0 -1
- package/dist/server/internal/registerWorker.js.map +0 -1
- package/dist/server/internal/scheduleDefinition.d.ts +0 -3
- package/dist/server/internal/scheduleDefinition.d.ts.map +0 -1
- package/dist/server/internal/scheduleDefinition.js.map +0 -1
- /package/dist/server/{internal → adapters}/runSchemaPlan.d.ts +0 -0
- /package/dist/server/{internal → adapters}/runSchemaPlan.js +0 -0
- /package/dist/server/{internal → adapters}/schemaIndexBuilds.d.ts +0 -0
- /package/dist/server/{internal → adapters}/schemaIndexBuilds.js +0 -0
- /package/dist/server/{internal → adapters}/testingExpirations.d.ts +0 -0
- /package/dist/server/{internal → adapters}/testingExpirations.js +0 -0
- /package/dist/server/{internal → adapters}/transactionDb.d.ts +0 -0
- /package/dist/server/{internal → adapters}/transactionDb.js +0 -0
- /package/src/server/{internal → adapters}/runSchemaPlan.ts +0 -0
- /package/src/server/{internal → adapters}/schemaIndexBuilds.ts +0 -0
- /package/src/server/{internal → adapters}/testingExpirations.ts +0 -0
- /package/src/server/{internal → adapters}/transactionDb.ts +0 -0
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { Effect } from "effect";
|
|
2
|
+
import { registerWorker } from "#adapters/registerWorker.ts";
|
|
2
3
|
import { PgBossQueueOptionsError, toPgBossError } from "#error.ts";
|
|
3
4
|
import { ensureQueue } from "#internal/ensureQueue.ts";
|
|
4
|
-
import { registerWorker } from "#internal/registerWorker.ts";
|
|
5
5
|
import { runQueueWorker } from "#internal/runQueueWorker.ts";
|
|
6
6
|
function isQueueWorker(registration) {
|
|
7
7
|
return registration._tag === "QueueWorker";
|
|
@@ -41,17 +41,17 @@ const prepareQueues = Effect.fnUntraced(function* (client, registrations, replac
|
|
|
41
41
|
function workerContext(context) {
|
|
42
42
|
return context;
|
|
43
43
|
}
|
|
44
|
-
const registerQueue = Effect.fnUntraced(function* (client, registration, context, scope, schema,
|
|
44
|
+
const registerQueue = Effect.fnUntraced(function* (client, registration, context, scope, schema, graceful) {
|
|
45
45
|
const queue = registration._tag === "QueueWorker" ? registration.queue : registration;
|
|
46
46
|
const name = queue.name;
|
|
47
47
|
if (registration._tag === "QueueDefinition") {
|
|
48
48
|
return;
|
|
49
49
|
}
|
|
50
|
-
yield* registerWorker(client, name, queue.workerOptions, (job, deadline) => runQueueWorker(registration, job, deadline), scope, schema, queue.maxDeferrals,
|
|
50
|
+
yield* registerWorker(client, name, queue.workerOptions, (job, deadline) => runQueueWorker(registration, job, deadline), scope, schema, queue.maxDeferrals, graceful).pipe(Effect.provide(context));
|
|
51
51
|
});
|
|
52
|
-
const registerSchedule = Effect.fnUntraced(function* (client, worker, context, scope, schema,
|
|
52
|
+
const registerSchedule = Effect.fnUntraced(function* (client, worker, context, scope, schema, graceful) {
|
|
53
53
|
const { schedule } = worker;
|
|
54
|
-
yield* registerWorker(client, schedule.name, schedule.workerOptions, () => worker.effect, scope, schema, schedule.maxDeferrals,
|
|
54
|
+
yield* registerWorker(client, schedule.name, schedule.workerOptions, () => worker.effect, scope, schema, schedule.maxDeferrals, graceful).pipe(Effect.provide(context));
|
|
55
55
|
yield* Effect.tryPromise({
|
|
56
56
|
catch: (error) => toPgBossError("register", error, schedule.name),
|
|
57
57
|
try: () => client.schedule(schedule.name, schedule.cron, null, schedule.scheduleOptions),
|
|
@@ -64,7 +64,7 @@ export function registrationNames(registrations) {
|
|
|
64
64
|
}
|
|
65
65
|
return names;
|
|
66
66
|
}
|
|
67
|
-
export const registerJobs = Effect.fnUntraced(function* (client, registrations, context, replaceWorkers,
|
|
67
|
+
export const registerJobs = Effect.fnUntraced(function* (client, registrations, context, replaceWorkers, schema = "pgboss", startWorkers = true, graceful = true) {
|
|
68
68
|
const scope = yield* Effect.scope;
|
|
69
69
|
yield* Effect.try({ catch: (error) => toPgBossError("register", error), try: () => registrationNames(registrations) });
|
|
70
70
|
yield* prepareQueues(client, registrations, replaceWorkers);
|
|
@@ -74,10 +74,10 @@ export const registerJobs = Effect.fnUntraced(function* (client, registrations,
|
|
|
74
74
|
const provided = workerContext(context);
|
|
75
75
|
for (const registration of registrations) {
|
|
76
76
|
if (isQueueWorker(registration) || isQueueDefinition(registration)) {
|
|
77
|
-
yield* registerQueue(client, registration, provided, scope, schema,
|
|
77
|
+
yield* registerQueue(client, registration, provided, scope, schema, graceful);
|
|
78
78
|
}
|
|
79
79
|
else if (isScheduledWorker(registration)) {
|
|
80
|
-
yield* registerSchedule(client, registration, provided, scope, schema,
|
|
80
|
+
yield* registerSchedule(client, registration, provided, scope, schema, graceful);
|
|
81
81
|
}
|
|
82
82
|
}
|
|
83
83
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"register.js","sourceRoot":"","sources":["../../../src/server/internal/register.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,MAAM,EAAc,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"register.js","sourceRoot":"","sources":["../../../src/server/internal/register.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { type Context, Effect, Scope } from "effect";
|
|
2
2
|
import type { PgBossClient } from "#client.ts";
|
|
3
3
|
import type { JobRegistration } from "#definition.ts";
|
|
4
|
-
|
|
5
|
-
export declare const registerReleasedJobs: <R>(client: PgBossClient, jobs: readonly JobRegistration[], context: Context.Context<R>, replaceWorkers: boolean, execute: PgBossRunner, schema: string | undefined, graceful: boolean) => Effect.Effect<void, import("#error.ts").PgBossError | import("#error.ts").PgBossQueueOptionsError, Scope.Scope>;
|
|
4
|
+
export declare const registerReleasedJobs: <R>(client: PgBossClient, jobs: readonly JobRegistration[], context: Context.Context<R>, replaceWorkers: boolean, schema: string | undefined, graceful: boolean, retired?: readonly string[] | undefined) => Effect.Effect<void, import("#error.ts").PgBossError | import("#error.ts").PgBossQueueOptionsError, Scope.Scope>;
|
|
6
5
|
//# sourceMappingURL=registerReleasedJobs.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"registerReleasedJobs.d.ts","sourceRoot":"","sources":["../../../src/server/internal/registerReleasedJobs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,EAAU,KAAK,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"registerReleasedJobs.d.ts","sourceRoot":"","sources":["../../../src/server/internal/registerReleasedJobs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,EAAU,KAAK,EAAE,MAAM,QAAQ,CAAC;AAG7D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAC/C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAItD,eAAO,MAAM,oBAAoB,GAAgC,CAAC,0TAyChE,CAAC"}
|
|
@@ -1,16 +1,17 @@
|
|
|
1
1
|
import { Effect, Option, Scope } from "effect";
|
|
2
2
|
import { WorkerRelease } from "@shivaedev/sql/WorkerRelease.ts";
|
|
3
|
+
import { retireJobs } from "#adapters/retireJobs.ts";
|
|
3
4
|
import { toPgBossError } from "#error.ts";
|
|
4
5
|
import { registerJobs, registrationName } from "./register.js";
|
|
5
|
-
export const registerReleasedJobs = Effect.fnUntraced(function* (client, jobs, context, replaceWorkers,
|
|
6
|
+
export const registerReleasedJobs = Effect.fnUntraced(function* (client, jobs, context, replaceWorkers, schema, graceful, retired = []) {
|
|
6
7
|
const signal = yield* Effect.serviceOption(WorkerRelease);
|
|
7
8
|
const workers = jobs.filter((job) => job._tag !== "QueueDefinition");
|
|
8
9
|
const scope = yield* Effect.scope;
|
|
9
|
-
const register = registerJobs(client, jobs, context, replaceWorkers,
|
|
10
|
-
if (Option.isNone(signal) || workers.length === 0) {
|
|
10
|
+
const register = retireJobs(client, jobs, retired).pipe(Effect.andThen(registerJobs(client, jobs, context, replaceWorkers, schema, true, graceful)), Effect.provideService(Scope.Scope, scope));
|
|
11
|
+
if (Option.isNone(signal) || (workers.length === 0 && retired.length === 0)) {
|
|
11
12
|
return yield* register;
|
|
12
13
|
}
|
|
13
|
-
yield* registerJobs(client, jobs, context, replaceWorkers,
|
|
14
|
+
yield* registerJobs(client, jobs, context, replaceWorkers, schema, false, graceful);
|
|
14
15
|
let working = replaceWorkers;
|
|
15
16
|
let paused = false;
|
|
16
17
|
yield* signal.value.register((active) => Effect.gen(function* () {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"registerReleasedJobs.js","sourceRoot":"","sources":["../../../src/server/internal/registerReleasedJobs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AAC7D,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;
|
|
1
|
+
{"version":3,"file":"registerReleasedJobs.js","sourceRoot":"","sources":["../../../src/server/internal/registerReleasedJobs.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runQueueWorker.d.ts","sourceRoot":"","sources":["../../../src/server/internal/runQueueWorker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAoB,MAAM,QAAQ,CAAC;AAClD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"runQueueWorker.d.ts","sourceRoot":"","sources":["../../../src/server/internal/runQueueWorker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAoB,MAAM,QAAQ,CAAC;AAClD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,SAAS,CAAC;AAEnC,OAAO,EAAc,KAAK,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAI9D,wBAAgB,cAAc,CAAC,MAAM,EAAE,WAAW,EAAE,GAAG,EAAE,GAAG,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,MAAM,4CAatF"}
|
|
@@ -1,12 +1,13 @@
|
|
|
1
1
|
import { Effect, Redacted, Schema } from "effect";
|
|
2
|
+
import { workerDiagnostics } from "#adapters/workerDiagnostics.ts";
|
|
2
3
|
import { jobContext } from "#definition.ts";
|
|
3
4
|
import { PgBossPayloadError } from "#error.ts";
|
|
4
5
|
import { payloadOf } from "#internal/tracing.ts";
|
|
5
6
|
export function runQueueWorker(worker, job, deadline) {
|
|
6
|
-
return Schema.decodeUnknownEffect(worker.queue.schema)(payloadOf(job.data)).pipe(Effect.mapError((error) => new PgBossPayloadError({
|
|
7
|
+
return Schema.decodeUnknownEffect(Schema.toCodecJson(worker.queue.schema))(payloadOf(job.data)).pipe(Effect.mapError((error) => new PgBossPayloadError({
|
|
7
8
|
direction: "decode",
|
|
8
9
|
original: Redacted.make(error),
|
|
9
10
|
queue: worker.queue.name,
|
|
10
|
-
})), Effect.flatMap((payload) => worker.handler(payload, jobContext(job, deadline))));
|
|
11
|
+
})), Effect.flatMap((payload) => worker.handler(payload, jobContext(job, deadline))), workerDiagnostics);
|
|
11
12
|
}
|
|
12
13
|
//# sourceMappingURL=runQueueWorker.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runQueueWorker.js","sourceRoot":"","sources":["../../../src/server/internal/runQueueWorker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAElD,OAAO,EAAE,UAAU,EAAoB,MAAM,gBAAgB,CAAC;AAC9D,OAAO,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAC;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAEjD,MAAM,UAAU,cAAc,CAAC,MAAmB,EAAE,GAAiB,EAAE,QAAgB;IACtF,OAAO,MAAM,CAAC,mBAAmB,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,
|
|
1
|
+
{"version":3,"file":"runQueueWorker.js","sourceRoot":"","sources":["../../../src/server/internal/runQueueWorker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAElD,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AACnE,OAAO,EAAE,UAAU,EAAoB,MAAM,gBAAgB,CAAC;AAC9D,OAAO,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAC;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAEjD,MAAM,UAAU,cAAc,CAAC,MAAmB,EAAE,GAAiB,EAAE,QAAgB;IACtF,OAAO,MAAM,CAAC,mBAAmB,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CACnG,MAAM,CAAC,QAAQ,CACd,CAAC,KAAK,EAAE,EAAE,CACT,IAAI,kBAAkB,CAAC;QACtB,SAAS,EAAE,QAAQ;QACnB,QAAQ,EAAE,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC;QAC9B,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,IAAI;KACxB,CAAC,CACH,EACD,MAAM,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC,CAAC,EAC/E,iBAAiB,CACjB,CAAC;AACH,CAAC"}
|
|
@@ -5,6 +5,6 @@ export function quotedSchema(schema) {
|
|
|
5
5
|
return `"${schema.replaceAll('"', '""')}"`;
|
|
6
6
|
}
|
|
7
7
|
export function decodeStoredData(queue, data) {
|
|
8
|
-
return Schema.decodeUnknownEffect(queue.schema)(payloadOf(data)).pipe(Effect.mapError((error) => new PgBossPayloadError({ direction: "decode", original: Redacted.make(error), queue: queue.name })));
|
|
8
|
+
return Schema.decodeUnknownEffect(Schema.toCodecJson(queue.schema))(payloadOf(data)).pipe(Effect.mapError((error) => new PgBossPayloadError({ direction: "decode", original: Redacted.make(error), queue: queue.name })));
|
|
9
9
|
}
|
|
10
10
|
//# sourceMappingURL=storedRows.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"storedRows.js","sourceRoot":"","sources":["../../../src/server/internal/storedRows.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAElD,OAAO,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAC;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAEjD,MAAM,UAAU,YAAY,CAAC,MAAc;IAC1C,OAAO,IAAI,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC;AAC5C,CAAC;AAED,MAAM,UAAU,gBAAgB,CAC/B,KAA0D,EAC1D,IAAa;IAEb,OAAO,MAAM,CAAC,mBAAmB,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,
|
|
1
|
+
{"version":3,"file":"storedRows.js","sourceRoot":"","sources":["../../../src/server/internal/storedRows.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAElD,OAAO,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAC;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAEjD,MAAM,UAAU,YAAY,CAAC,MAAc;IAC1C,OAAO,IAAI,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC;AAC5C,CAAC;AAED,MAAM,UAAU,gBAAgB,CAC/B,KAA0D,EAC1D,IAAa;IAEb,OAAO,MAAM,CAAC,mBAAmB,CAAC,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CACxF,MAAM,CAAC,QAAQ,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,kBAAkB,CAAC,EAAE,SAAS,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAC9H,CAAC;AACH,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"testingClient.d.ts","sourceRoot":"","sources":["../../../src/server/internal/testingClient.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAO,MAAM,EAAE,WAAW,EAAgD,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"testingClient.d.ts","sourceRoot":"","sources":["../../../src/server/internal/testingClient.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAO,MAAM,EAAE,WAAW,EAAgD,MAAM,SAAS,CAAC;AAEtG,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAI/C,OAAO,KAAK,EAAgB,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAE1E,MAAM,WAAW,eAAe;IAC/B,QAAQ,CAAC,OAAO,EAAE,MAAM,IAAI,CAAC;IAC7B,QAAQ,CAAC,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC1C,QAAQ,CAAC,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC5C,QAAQ,CAAC,QAAQ,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC/B,QAAQ,CAAC,WAAW,EAAE,IAAI,CAAC,WAAW,EAAE,cAAc,GAAG,YAAY,CAAC,CAAC;IACvE,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC;CAC3B;AAED,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,eAAe,GAAG,YAAY,CAoHrG"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
+
import { testingExpirations } from "#adapters/testingExpirations.ts";
|
|
1
2
|
import { deferralObservers } from "#internal/deferral.ts";
|
|
2
3
|
import { expireAttempt } from "#internal/expireAttempt.ts";
|
|
3
4
|
import { observeTestingSettlements } from "#internal/observeTestingSettlements.ts";
|
|
4
|
-
import { testingExpirations } from "#internal/testingExpirations.ts";
|
|
5
5
|
export function testingClient(client, schema, controls) {
|
|
6
6
|
const settlements = observeTestingSettlements(client, (name) => {
|
|
7
7
|
for (const batch of controls.work.batches) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"testingClient.js","sourceRoot":"","sources":["../../../src/server/internal/testingClient.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"testingClient.js","sourceRoot":"","sources":["../../../src/server/internal/testingClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
import { Effect } from "effect";
|
|
2
|
+
import type { JobWithMetadata, PgBoss } from "pg-boss";
|
|
3
|
+
import type { JobPayloadSchema, QueueDefinition } from "#definition.ts";
|
|
4
|
+
import { type PgBossPayloadError, PgBossTestingError, PgBossWaitError } from "#error.ts";
|
|
5
|
+
import type { TestingFetches } from "#internal/adapters/testingFetches.ts";
|
|
6
|
+
import type { PgBossTestingWaitOptions } from "#testing.ts";
|
|
7
|
+
interface Signal {
|
|
8
|
+
readonly revision: Effect.Effect<number>;
|
|
9
|
+
readonly waitForChange: (after: number) => Effect.Effect<number>;
|
|
10
|
+
}
|
|
11
|
+
export declare function testingWaits(client: () => PgBoss, fetches: () => TestingFetches | undefined, signal: Signal): {
|
|
12
|
+
fetchesPass: (queue: Pick<QueueDefinition, "name">, count: number, options?: PgBossTestingWaitOptions) => Effect.Effect<unknown, PgBossTestingError | PgBossWaitError, never>;
|
|
13
|
+
untilJob: <TName extends string, TPayload extends JobPayloadSchema>(queue: Pick<QueueDefinition<TName, TPayload>, "name" | "schema">, id: string, state: JobWithMetadata["state"], options?: PgBossTestingWaitOptions) => Effect.Effect<JobWithMetadata<TPayload["Type"]>, PgBossPayloadError | PgBossTestingError | PgBossWaitError, Exclude<TPayload["DecodingServices"], never>>;
|
|
14
|
+
};
|
|
15
|
+
export {};
|
|
16
|
+
//# sourceMappingURL=testingWaits.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"testingWaits.d.ts","sourceRoot":"","sources":["../../../src/server/internal/testingWaits.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmB,MAAM,EAAoB,MAAM,QAAQ,CAAC;AACnE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACvD,OAAO,KAAK,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACxE,OAAO,EAAE,KAAK,kBAAkB,EAAE,kBAAkB,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AACzF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sCAAsC,CAAC;AAG3E,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,aAAa,CAAC;AAO5D,UAAU,MAAM;IACf,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IACzC,QAAQ,CAAC,aAAa,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;CACjE;AAkCD,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,MAAM,EAAE,OAAO,EAAE,MAAM,cAAc,GAAG,SAAS,EAAE,MAAM,EAAE,MAAM;IAE1G,WAAW,UAAU,IAAI,CAAC,eAAe,EAAE,MAAM,CAAC,SAAS,MAAM,YAAY,wBAAwB;IAqBrG,QAAQ,GAAG,KAAK,SAAS,MAAM,EAAE,QAAQ,SAAS,gBAAgB,SAC1D,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,QAAQ,CAAC,MAC5D,MAAM,SACH,eAAe,CAAC,OAAO,CAAC,YACrB,wBAAwB;EAmBpC"}
|
|
@@ -0,0 +1,56 @@
|
|
|
1
|
+
import { Clock, Duration, Effect, Option, Redacted } from "effect";
|
|
2
|
+
import { PgBossTestingError, PgBossWaitError } from "#error.ts";
|
|
3
|
+
import { decodeStoredData } from "#internal/storedRows.ts";
|
|
4
|
+
import { testingOperation } from "#internal/testingReadout.ts";
|
|
5
|
+
function waitUntil(signal, waitingFor, read, options) {
|
|
6
|
+
const within = Duration.fromInputUnsafe(options?.within ?? "20 seconds");
|
|
7
|
+
return Effect.suspend(() => {
|
|
8
|
+
let lastSeen = "nothing yet";
|
|
9
|
+
const wait = Effect.gen(function* () {
|
|
10
|
+
while (true) {
|
|
11
|
+
const revision = yield* signal.revision;
|
|
12
|
+
const { arrived, seen } = yield* read;
|
|
13
|
+
lastSeen = seen;
|
|
14
|
+
if (Option.isSome(arrived)) {
|
|
15
|
+
return arrived.value;
|
|
16
|
+
}
|
|
17
|
+
yield* signal.waitForChange(revision);
|
|
18
|
+
}
|
|
19
|
+
});
|
|
20
|
+
return wait.pipe(Effect.timeoutOrElse({ duration: within, orElse: () => Effect.fail(new PgBossWaitError({ lastSeen, waitingFor, within })) }),
|
|
21
|
+
// The budget is wall time, so a story's TestClock neither ends the wait early nor holds it open.
|
|
22
|
+
Effect.provideService(Clock.Clock, Clock.Clock.defaultValue()));
|
|
23
|
+
});
|
|
24
|
+
}
|
|
25
|
+
function fetchesRefused(queue, original) {
|
|
26
|
+
return new PgBossTestingError({ operation: "fetchesPass", original: Redacted.make(original), queue: queue.name });
|
|
27
|
+
}
|
|
28
|
+
export function testingWaits(client, fetches, signal) {
|
|
29
|
+
return {
|
|
30
|
+
fetchesPass: (queue, count, options) => Effect.gen(function* () {
|
|
31
|
+
if (!Number.isSafeInteger(count) || count < 1) {
|
|
32
|
+
return yield* fetchesRefused(queue, new RangeError("Fetch count must be a positive integer"));
|
|
33
|
+
}
|
|
34
|
+
const observed = fetches();
|
|
35
|
+
if (observed === undefined) {
|
|
36
|
+
return yield* fetchesRefused(queue, new Error("Provide the testing clientFactory to a jobs Layer first"));
|
|
37
|
+
}
|
|
38
|
+
const begun = observed.begun(queue.name);
|
|
39
|
+
const fetchesHave = count === 1 ? "fetch that began after the wait has" : "fetches that began after the wait have";
|
|
40
|
+
return yield* waitUntil(signal, `${count} ${queue.name} ${fetchesHave} finished`, Effect.sync(() => {
|
|
41
|
+
const passed = observed.passedSince(queue.name, begun);
|
|
42
|
+
return { arrived: passed >= count ? Option.some(undefined) : Option.none(), seen: `${passed} finished` };
|
|
43
|
+
}), options);
|
|
44
|
+
}),
|
|
45
|
+
untilJob: (queue, id, state, options) => waitUntil(signal, `job ${id} in ${queue.name} is ${state}`, testingOperation("untilJob", () => client().getJobById(queue.name, id), queue.name).pipe(Effect.flatMap((job) => {
|
|
46
|
+
if (job === null) {
|
|
47
|
+
return Effect.succeed({ arrived: Option.none(), seen: "no such job" });
|
|
48
|
+
}
|
|
49
|
+
if (job.state !== state) {
|
|
50
|
+
return Effect.succeed({ arrived: Option.none(), seen: job.state });
|
|
51
|
+
}
|
|
52
|
+
return Effect.map(decodeStoredData(queue, job.data), (data) => ({ arrived: Option.some({ ...job, data }), seen: job.state }));
|
|
53
|
+
})), options),
|
|
54
|
+
};
|
|
55
|
+
}
|
|
56
|
+
//# sourceMappingURL=testingWaits.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"testingWaits.js","sourceRoot":"","sources":["../../../src/server/internal/testingWaits.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAGnE,OAAO,EAA2B,kBAAkB,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAEzF,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAa/D,SAAS,SAAS,CACjB,MAAc,EACd,UAAkB,EAClB,IAAqC,EACrC,OAA6C;IAE7C,MAAM,MAAM,GAAG,QAAQ,CAAC,eAAe,CAAC,OAAO,EAAE,MAAM,IAAI,YAAY,CAAC,CAAC;IACzE,OAAO,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE;QAC1B,IAAI,QAAQ,GAAG,aAAa,CAAC;QAC7B,MAAM,IAAI,GAAG,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;YAChC,OAAO,IAAI,EAAE,CAAC;gBACb,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC;gBACxC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,KAAK,CAAC,CAAC,IAAI,CAAC;gBACtC,QAAQ,GAAG,IAAI,CAAC;gBAChB,IAAI,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC;oBAC5B,OAAO,OAAO,CAAC,KAAK,CAAC;gBACtB,CAAC;gBACD,KAAK,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;YACvC,CAAC;QACF,CAAC,CAAC,CAAC;QACH,OAAO,IAAI,CAAC,IAAI,CACf,MAAM,CAAC,aAAa,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,eAAe,CAAC,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC;QAC5H,iGAAiG;QACjG,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,YAAY,EAAE,CAAC,CAC9D,CAAC;IACH,CAAC,CAAC,CAAC;AACJ,CAAC;AAED,SAAS,cAAc,CAAC,KAAoC,EAAE,QAAe;IAC5E,OAAO,IAAI,kBAAkB,CAAC,EAAE,SAAS,EAAE,aAAa,EAAE,QAAQ,EAAE,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC;AACnH,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,MAAoB,EAAE,OAAyC,EAAE,MAAc;IAC3G,OAAO;QACN,WAAW,EAAE,CAAC,KAAoC,EAAE,KAAa,EAAE,OAAkC,EAAE,EAAE,CACxG,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;YACnB,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,KAAK,CAAC,IAAI,KAAK,GAAG,CAAC,EAAE,CAAC;gBAC/C,OAAO,KAAK,CAAC,CAAC,cAAc,CAAC,KAAK,EAAE,IAAI,UAAU,CAAC,wCAAwC,CAAC,CAAC,CAAC;YAC/F,CAAC;YACD,MAAM,QAAQ,GAAG,OAAO,EAAE,CAAC;YAC3B,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;gBAC5B,OAAO,KAAK,CAAC,CAAC,cAAc,CAAC,KAAK,EAAE,IAAI,KAAK,CAAC,yDAAyD,CAAC,CAAC,CAAC;YAC3G,CAAC;YACD,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YACzC,MAAM,WAAW,GAAG,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,qCAAqC,CAAC,CAAC,CAAC,wCAAwC,CAAC;YACnH,OAAO,KAAK,CAAC,CAAC,SAAS,CACtB,MAAM,EACN,GAAG,KAAK,IAAI,KAAK,CAAC,IAAI,IAAI,WAAW,WAAW,EAChD,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE;gBAChB,MAAM,MAAM,GAAG,QAAQ,CAAC,WAAW,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;gBACvD,OAAO,EAAE,OAAO,EAAE,MAAM,IAAI,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,GAAG,MAAM,WAAW,EAAE,CAAC;YAC1G,CAAC,CAAC,EACF,OAAO,CACP,CAAC;QACH,CAAC,CAAC;QACH,QAAQ,EAAE,CACT,KAAgE,EAChE,EAAU,EACV,KAA+B,EAC/B,OAAkC,EACjC,EAAE,CACH,SAAS,CACR,MAAM,EACN,OAAO,EAAE,OAAO,KAAK,CAAC,IAAI,OAAO,KAAK,EAAE,EACxC,gBAAgB,CAAC,UAAU,EAAE,GAAG,EAAE,CAAC,MAAM,EAAE,CAAC,UAAU,CAAU,KAAK,CAAC,IAAI,EAAE,EAAE,CAAC,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,CAChG,MAAM,CAAC,OAAO,CAAC,CAAC,GAAG,EAA+G,EAAE;YACnI,IAAI,GAAG,KAAK,IAAI,EAAE,CAAC;gBAClB,OAAO,MAAM,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC,CAAC;YACxE,CAAC;YACD,IAAI,GAAG,CAAC,KAAK,KAAK,KAAK,EAAE,CAAC;gBACzB,OAAO,MAAM,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,GAAG,CAAC,KAAK,EAAE,CAAC,CAAC;YACpE,CAAC;YACD,OAAO,MAAM,CAAC,GAAG,CAAC,gBAAgB,CAAC,KAAK,EAAE,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC,EAAE,GAAG,GAAG,EAAE,IAAI,EAAE,CAAC,EAAE,IAAI,EAAE,GAAG,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;QAC/H,CAAC,CAAC,CACF,EACD,OAAO,CACP;KACF,CAAC;AACH,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../src/server/schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAU,MAAM,QAAQ,CAAC;AACxC,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../src/server/schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAU,MAAM,QAAQ,CAAC;AACxC,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AAEzE,OAAO,EAAE,KAAK,WAAW,EAAiB,MAAM,WAAW,CAAC;AAM5D,MAAM,WAAW,mBAAmB;IACnC,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,wBAAgB,mBAAmB,CAAC,OAAO,GAAE,mBAAwB,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,WAAW,EAAE,SAAS,CAAC,SAAS,CAAC,CAK5H;AAED,wBAAgB,YAAY,CAAC,OAAO,GAAE,mBAAwB,GAAG,eAAe,CA0B/E"}
|
package/dist/server/schema.js
CHANGED
|
@@ -1,60 +1,13 @@
|
|
|
1
1
|
import { Effect, Schema } from "effect";
|
|
2
2
|
import { SqlClient } from "effect/sql";
|
|
3
|
-
import { getConstructionPlans, getMigrationPlans, PgBoss } from "pg-boss";
|
|
4
3
|
import pgBossPackage from "pg-boss/package.json" with { type: "json" };
|
|
4
|
+
import { installSchema } from "#adapters/installSchema.ts";
|
|
5
5
|
import { toPgBossError } from "#error.ts";
|
|
6
|
-
import { deferralStorePlan } from "#internal/deferralStorePlan.ts";
|
|
7
|
-
import { runSchemaPlan } from "#internal/runSchemaPlan.ts";
|
|
8
|
-
import { resumeSchemaIndexes } from "#internal/schemaIndexBuilds.ts";
|
|
9
|
-
const Partitions = Schema.Array(Schema.Struct({
|
|
10
|
-
policy: Schema.String,
|
|
11
|
-
tableName: Schema.String,
|
|
12
|
-
}));
|
|
13
6
|
const InstalledSchema = Schema.Array(Schema.Struct({ name: Schema.NullOr(Schema.String) }));
|
|
14
7
|
const InstalledVersion = Schema.Array(Schema.Struct({ version: Schema.Number }));
|
|
15
|
-
|
|
16
|
-
const schema = options.schema ?? "pgboss";
|
|
17
|
-
const construction = getConstructionPlans(schema);
|
|
18
|
-
const client = new PgBoss({
|
|
19
|
-
db: { executeSql: async (text, values = []) => ({ rows: Array.from(await run(connection.executeUnprepared(text, values, undefined))) }) },
|
|
20
|
-
schema,
|
|
21
|
-
});
|
|
22
|
-
if (!(await client.isInstalled())) {
|
|
23
|
-
await runSchemaPlan(connection, construction, run);
|
|
24
|
-
return;
|
|
25
|
-
}
|
|
26
|
-
const version = await client.schemaVersion();
|
|
27
|
-
if (version === null) {
|
|
28
|
-
throw new Error("The pg-boss version table is empty");
|
|
29
|
-
}
|
|
30
|
-
if (version > pgBossPackage.pgboss.schema) {
|
|
31
|
-
return;
|
|
32
|
-
}
|
|
33
|
-
if (version >= 27) {
|
|
34
|
-
await resumeSchemaIndexes(client, schema);
|
|
35
|
-
}
|
|
36
|
-
if (version < pgBossPackage.pgboss.schema) {
|
|
37
|
-
const partitionTables = Schema.decodeUnknownSync(Partitions)(await run(connection.executeUnprepared(`SELECT table_name AS "tableName", policy FROM ${schema}.queue WHERE partition = true`, [], undefined)));
|
|
38
|
-
await runSchemaPlan(connection, getMigrationPlans(schema, version, { partitionTables: Array.from(partitionTables) }), run, {
|
|
39
|
-
schema,
|
|
40
|
-
version: pgBossPackage.pgboss.schema,
|
|
41
|
-
});
|
|
42
|
-
await resumeSchemaIndexes(client, schema);
|
|
43
|
-
}
|
|
44
|
-
}
|
|
8
|
+
const InstalledResolution = Schema.Array(Schema.Struct({ installed: Schema.Boolean }));
|
|
45
9
|
export function installPgBossSchema(options = {}) {
|
|
46
|
-
return Effect.scoped(Effect.
|
|
47
|
-
const sql = yield* SqlClient.SqlClient;
|
|
48
|
-
const connection = yield* sql.reserve;
|
|
49
|
-
const run = Effect.runPromiseWith(yield* Effect.context());
|
|
50
|
-
yield* Effect.tryPromise({
|
|
51
|
-
catch: (error) => error,
|
|
52
|
-
try: async () => {
|
|
53
|
-
await installSchema(connection, options, run);
|
|
54
|
-
await run(connection.executeRaw(deferralStorePlan(options.schema ?? "pgboss"), []));
|
|
55
|
-
},
|
|
56
|
-
});
|
|
57
|
-
}).pipe(Effect.mapError((error) => toPgBossError("install", error)))).pipe(Effect.uninterruptible);
|
|
10
|
+
return Effect.scoped(installSchema(options)).pipe(Effect.mapError((error) => toPgBossError("install", error)), Effect.uninterruptible);
|
|
58
11
|
}
|
|
59
12
|
export function pgBossSchema(options = {}) {
|
|
60
13
|
const schema = options.schema ?? "pgboss";
|
|
@@ -69,9 +22,14 @@ export function pgBossSchema(options = {}) {
|
|
|
69
22
|
? []
|
|
70
23
|
: yield* sql `select version from ${table}`.withoutTransform.pipe(Effect.flatMap(Schema.decodeUnknownEffect(InstalledVersion)));
|
|
71
24
|
const required = pgBossPackage.pgboss.schema;
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
25
|
+
if (row === undefined || row.version < required) {
|
|
26
|
+
return `schema ${schema}, installed version ${row?.version ?? "missing"}, required version ${required}`;
|
|
27
|
+
}
|
|
28
|
+
const job = sql `${sql(schema)}.${sql("job")}`;
|
|
29
|
+
const [resolution] = yield* sql `SELECT EXISTS (
|
|
30
|
+
SELECT 1 FROM pg_trigger WHERE tgrelid = to_regclass(${job.compile()[0]}) AND tgname = 'effect_dead_letter_resolution'
|
|
31
|
+
) AS installed`.withoutTransform.pipe(Effect.flatMap(Schema.decodeUnknownEffect(InstalledResolution)));
|
|
32
|
+
return resolution?.installed ? undefined : `schema ${schema}, missing dead-letter resolution trigger`;
|
|
75
33
|
}),
|
|
76
34
|
};
|
|
77
35
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../src/server/schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../src/server/schema.ts"],"names":[],"mappings":"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"}
|
package/dist/server/service.d.ts
CHANGED
|
@@ -10,19 +10,19 @@ export interface PgBossService {
|
|
|
10
10
|
readonly deadLetteredJobs: <const TName extends string, const TPayload extends JobPayloadSchema | typeof Schema.Null>(queue: {
|
|
11
11
|
readonly name: TName;
|
|
12
12
|
readonly schema: TPayload;
|
|
13
|
-
}, options: JobPageOptions) => Effect.Effect<JobPage<DeadLetteredJob<
|
|
13
|
+
}, options: JobPageOptions) => Effect.Effect<JobPage<DeadLetteredJob<unknown>>, PgBossError | PgBossPayloadError | Schema.SchemaError, TPayload["DecodingServices"]>;
|
|
14
14
|
readonly enqueue: <const TName extends string, const TPayload extends JobPayloadSchema, const TQueue extends QueueDefinition<TName, TPayload>>(queue: QueueDefinition<TName, TPayload> & TQueue, payload: NoInfer<Schema.Schema.Type<TPayload>>, options?: NoInfer<TQueue["key"] extends undefined ? SendOptions : Omit<SendOptions, "singletonKey"> & {
|
|
15
15
|
readonly singletonKey?: never;
|
|
16
16
|
}>) => Effect.Effect<Option.Option<string>, PgBossError | PgBossPayloadError, TPayload["EncodingServices"]>;
|
|
17
17
|
readonly failedJobs: <const TName extends string, const TPayload extends JobPayloadSchema | typeof Schema.Null>(queue: {
|
|
18
18
|
readonly name: TName;
|
|
19
19
|
readonly schema: TPayload;
|
|
20
|
-
}, options: JobPageOptions) => Effect.Effect<JobPage<ListedJob<
|
|
20
|
+
}, options: JobPageOptions) => Effect.Effect<JobPage<ListedJob<unknown>>, PgBossError | PgBossPayloadError | Schema.SchemaError, TPayload["DecodingServices"]>;
|
|
21
21
|
readonly getJob: <const TName extends string, const TPayload extends JobPayloadSchema | typeof Schema.Null>(queue: {
|
|
22
22
|
readonly name: TName;
|
|
23
23
|
readonly schema: TPayload;
|
|
24
|
-
}, id: string) => Effect.Effect<Option.Option<JobWithMetadata<
|
|
25
|
-
readonly health: () => Effect.Effect<JobsHealth, PgBossError>;
|
|
24
|
+
}, id: string) => Effect.Effect<Option.Option<JobWithMetadata<unknown>>, PgBossError | PgBossPayloadError, TPayload["DecodingServices"]>;
|
|
25
|
+
readonly health: (queues?: readonly Pick<QueueDefinition, "name">[]) => Effect.Effect<JobsHealth, PgBossError>;
|
|
26
26
|
readonly retry: (queue: Pick<QueueDefinition, "name">, id: string) => Effect.Effect<void, PgBossError>;
|
|
27
27
|
}
|
|
28
28
|
export type PgBossOptions = Omit<ConstructorOptions, "connectionString"> & {
|
|
@@ -35,6 +35,7 @@ export declare function pgBossLayer(options: PgBossOptions): Layer.Layer<PgBoss,
|
|
|
35
35
|
export interface PgBossLayerOptions<TRegistrations extends readonly JobRegistration[], TErrorRequirements> {
|
|
36
36
|
readonly jobs: TRegistrations;
|
|
37
37
|
readonly onError?: (error: Error) => Effect.Effect<unknown, never, TErrorRequirements>;
|
|
38
|
+
readonly retired?: readonly string[];
|
|
38
39
|
}
|
|
39
40
|
export interface PgBossDefinition<TIdentifier extends string = string> extends Context.Service<TIdentifier, PgBossService> {
|
|
40
41
|
readonly layer: <const TRegistrations extends readonly JobRegistration[], TErrorRequirements = never>(options: PgBossLayerOptions<TRegistrations, TErrorRequirements>) => Layer.Layer<TIdentifier, PgBossError | PgBossQueueNamesError | PgBossQueueOptionsError, PgBoss | Exclude<RegistrationRequirements<TRegistrations>, TIdentifier> | TErrorRequirements>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../src/server/service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAQ,KAAK,EAAE,KAAK,MAAM,EAAE,QAAQ,EAAE,KAAK,MAAM,EAAS,MAAM,QAAQ,CAAC;AACjG,OAAO,KAAK,EAAE,kBAAkB,EAAE,eAAe,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../src/server/service.ts"],"names":[],"mappings":"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"}
|
package/dist/server/service.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { Context, Effect, Exit, Layer, Redacted, Scope } from "effect";
|
|
2
2
|
import { defineService } from "@shivaedev/service/defineService.ts";
|
|
3
3
|
import { genericMethod } from "@shivaedev/service/genericMethod.ts";
|
|
4
|
+
import { clientErrorReporter } from "#adapters/clientErrorReporter.ts";
|
|
4
5
|
import { logClientError, subscribeClientErrors } from "#internal/clientErrors.ts";
|
|
5
6
|
import { acquireClient, releaseClient } from "#internal/lifecycle.ts";
|
|
6
7
|
import { makeService } from "#internal/makeService.ts";
|
|
@@ -11,8 +12,7 @@ import { PgBoss } from "#PgBoss.ts";
|
|
|
11
12
|
export function pgBossLayer(options) {
|
|
12
13
|
const { connectionString, clientFactory, clientCacheKey, stop, ...settings } = options;
|
|
13
14
|
return Layer.effect(PgBoss, Effect.gen(function* () {
|
|
14
|
-
const
|
|
15
|
-
const execute = Effect.runPromiseWith(dependencies);
|
|
15
|
+
const report = yield* clientErrorReporter(logClientError);
|
|
16
16
|
const acquired = yield* Effect.acquireRelease(acquireClient({
|
|
17
17
|
clientCacheKey,
|
|
18
18
|
clientFactory,
|
|
@@ -20,9 +20,7 @@ export function pgBossLayer(options) {
|
|
|
20
20
|
...settings,
|
|
21
21
|
...(connectionString === undefined ? {} : { connectionString: Redacted.value(connectionString) }),
|
|
22
22
|
},
|
|
23
|
-
}, (
|
|
24
|
-
void execute(logClientError(error));
|
|
25
|
-
}), (client) => releaseClient(client, stop));
|
|
23
|
+
}, report), (client) => releaseClient(client, stop));
|
|
26
24
|
return { ...acquired, schema: settings.schema, stop };
|
|
27
25
|
}));
|
|
28
26
|
}
|
|
@@ -33,16 +31,14 @@ export function makePgBoss(identifier, queueNames) {
|
|
|
33
31
|
initialize: Effect.gen(function* () {
|
|
34
32
|
yield* validateQueueNames(options.jobs, queueNames);
|
|
35
33
|
const acquired = yield* PgBoss;
|
|
36
|
-
const execute = Effect.runPromiseWith(dependencies);
|
|
37
34
|
const workerScope = yield* Scope.make();
|
|
38
35
|
const service = makeService(acquired.client, options.jobs.map(registrationName), acquired.schema);
|
|
39
36
|
const context = Context.add(dependencies, Service, service);
|
|
40
37
|
const reportError = options.onError ?? logClientError;
|
|
41
|
-
const
|
|
42
|
-
|
|
43
|
-
});
|
|
38
|
+
const report = yield* clientErrorReporter(reportError).pipe(Effect.provide(context));
|
|
39
|
+
const unsubscribe = subscribeClientErrors(acquired.client, report);
|
|
44
40
|
yield* Effect.addFinalizer(() => Scope.close(workerScope, Exit.void).pipe(Effect.ensuring(Effect.sync(unsubscribe))));
|
|
45
|
-
yield* registerReleasedJobs(acquired.client, options.jobs, context, acquired.reused,
|
|
41
|
+
yield* registerReleasedJobs(acquired.client, options.jobs, context, acquired.reused, acquired.schema, acquired.stop?.graceful !== false, options.retired).pipe(Effect.provideService(Scope.Scope, workerScope), Effect.provide(dependencies));
|
|
46
42
|
return service;
|
|
47
43
|
}),
|
|
48
44
|
methods: (service) => ({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"service.js","sourceRoot":"","sources":["../../src/server/service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAe,QAAQ,EAAe,KAAK,EAAE,MAAM,QAAQ,CAAC;AAEjG,OAAO,EAAE,aAAa,EAAE,MAAM,qCAAqC,CAAC;AACpE,OAAO,EAAE,aAAa,EAAE,MAAM,qCAAqC,CAAC;
|
|
1
|
+
{"version":3,"file":"service.js","sourceRoot":"","sources":["../../src/server/service.ts"],"names":[],"mappings":"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"}
|
package/dist/server/testing.d.ts
CHANGED
|
@@ -10,6 +10,9 @@ export interface UnfinishedJob<TQueue extends SnapshotQueue> {
|
|
|
10
10
|
readonly startAfter: DateTime.Utc;
|
|
11
11
|
readonly state: "active" | "created" | "failed" | "retry";
|
|
12
12
|
}
|
|
13
|
+
export interface PgBossTestingWaitOptions {
|
|
14
|
+
readonly within?: Duration.Input;
|
|
15
|
+
}
|
|
13
16
|
export declare const testRetryPolicy: Readonly<{
|
|
14
17
|
retryBackoff: false;
|
|
15
18
|
retryDelay: 0;
|
|
@@ -29,6 +32,8 @@ export declare function makePgBossTesting(options?: PgBossTestingOptions): {
|
|
|
29
32
|
timezone: string;
|
|
30
33
|
}[], PgBossTestingError, never>;
|
|
31
34
|
trigger: (schedule: Pick<import("#definition.ts").ScheduleDefinition, "name" | "scheduleOptions">) => Effect.Effect<void, PgBossTestingError, never>;
|
|
35
|
+
fetchesPass: (queue: Pick<QueueDefinition, "name">, count: number, options?: PgBossTestingWaitOptions) => Effect.Effect<unknown, PgBossTestingError | import("#error.ts").PgBossWaitError, never>;
|
|
36
|
+
untilJob: <TName extends string, TPayload extends JobPayloadSchema>(queue: Pick<QueueDefinition<TName, TPayload>, "name" | "schema">, id: string, state: import("pg-boss").JobWithMetadata["state"], options?: PgBossTestingWaitOptions) => Effect.Effect<import("pg-boss").JobWithMetadata<TPayload["Type"]>, import("#error.ts").PgBossPayloadError | PgBossTestingError | import("#error.ts").PgBossWaitError, Exclude<TPayload["DecodingServices"], never>>;
|
|
32
37
|
checkBatchWindow: (queue: Pick<QueueDefinition, "name" | "workerOptions">, millisecondsPerJob: number) => Effect.Effect<void, PgBossTestingError, never>;
|
|
33
38
|
checkSchemaVersion: (expected: number) => Effect.Effect<void, PgBossTestingError, never>;
|
|
34
39
|
clientFactory: PgBossClientFactory;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"testing.d.ts","sourceRoot":"","sources":["../../src/server/testing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAY,MAAM,QAAQ,CAAC;AAEnE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"testing.d.ts","sourceRoot":"","sources":["../../src/server/testing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAY,MAAM,QAAQ,CAAC;AAEnE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAEtD,OAAO,KAAK,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACxE,OAAO,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAC;AAW/C,MAAM,MAAM,aAAa,GAAG,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,gBAAgB,CAAC,EAAE,MAAM,GAAG,QAAQ,CAAC,CAAC;AAE/F,MAAM,WAAW,aAAa,CAAC,MAAM,SAAS,aAAa;IAC1D,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC;IACxC,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;IAC/B,QAAQ,CAAC,UAAU,EAAE,QAAQ,CAAC,GAAG,CAAC;IAClC,QAAQ,CAAC,KAAK,EAAE,QAAQ,GAAG,SAAS,GAAG,QAAQ,GAAG,OAAO,CAAC;CAC1D;AAED,MAAM,WAAW,wBAAwB;IACxC,QAAQ,CAAC,MAAM,CAAC,EAAE,QAAQ,CAAC,KAAK,CAAC;CACjC;AAED,eAAO,MAAM,eAAe;;;EAAwD,CAAC;AAErF,MAAM,WAAW,oBAAoB;IACpC,QAAQ,CAAC,WAAW,CAAC,EAAE,OAAO,eAAe,CAAC;CAC9C;AAED,wBAAgB,iBAAiB,CAAC,OAAO,GAAE,oBAAyB;;;;;;;;;;;;;;8BAiCxC,IAAI,CAAC,eAAe,EAAE,MAAM,GAAG,eAAe,CAAC,sBAAsB,MAAM;mCAqBtE,MAAM;;yBAOhB,IAAI,CAAC,eAAe,EAAE,MAAM,CAAC,YAAY,MAAM;sBAUlD,IAAI,CAAC,eAAe,EAAE,MAAM,CAAC,YAAY,QAAQ,CAAC,KAAK;0BAWnD,IAAI,CAAC,eAAe,EAAE,MAAM,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAQpD;AAED,MAAM,MAAM,aAAa,GAAG,UAAU,CAAC,OAAO,iBAAiB,CAAC,CAAC"}
|