@shivaedev/jobs 0.32.0 → 0.35.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 +22 -0
- package/README.md +19 -5
- package/dist/server/adapters/clientErrorSubscription.d.ts +4 -0
- package/dist/server/adapters/clientErrorSubscription.d.ts.map +1 -0
- package/dist/server/adapters/clientErrorSubscription.js +6 -0
- package/dist/server/adapters/clientErrorSubscription.js.map +1 -0
- package/dist/server/adapters/settleDeferral.d.ts.map +1 -1
- package/dist/server/adapters/settleDeferral.js +8 -2
- package/dist/server/adapters/settleDeferral.js.map +1 -1
- package/dist/server/adapters/testingClient.d.ts.map +1 -1
- package/dist/server/adapters/testingClient.js +2 -0
- package/dist/server/adapters/testingClient.js.map +1 -1
- package/dist/server/adapters/testingController.d.ts +2 -1
- package/dist/server/adapters/testingController.d.ts.map +1 -1
- package/dist/server/adapters/testingController.js +14 -2
- package/dist/server/adapters/testingController.js.map +1 -1
- package/dist/server/adapters/testingTime.d.ts +10 -0
- package/dist/server/adapters/testingTime.d.ts.map +1 -0
- package/dist/server/adapters/testingTime.js +18 -0
- package/dist/server/adapters/testingTime.js.map +1 -0
- package/dist/server/inspection.d.ts +17 -17
- package/dist/server/inspection.d.ts.map +1 -1
- package/dist/server/inspection.js +30 -20
- package/dist/server/inspection.js.map +1 -1
- package/dist/server/internal/PgBossInitialization.d.ts +9 -0
- package/dist/server/internal/PgBossInitialization.d.ts.map +1 -0
- package/dist/server/internal/PgBossInitialization.js +4 -0
- package/dist/server/internal/PgBossInitialization.js.map +1 -0
- package/dist/server/internal/PgBossOperations.d.ts +27 -0
- package/dist/server/internal/PgBossOperations.d.ts.map +1 -0
- package/dist/server/internal/PgBossOperations.js +35 -0
- package/dist/server/internal/PgBossOperations.js.map +1 -0
- package/dist/server/internal/adapters/deferralChanges.d.ts +3 -0
- package/dist/server/internal/adapters/deferralChanges.d.ts.map +1 -0
- package/dist/server/internal/adapters/deferralChanges.js +2 -0
- package/dist/server/internal/adapters/deferralChanges.js.map +1 -0
- package/dist/server/internal/initializeInspection.d.ts +4 -0
- package/dist/server/internal/initializeInspection.d.ts.map +1 -0
- package/dist/server/internal/initializeInspection.js +8 -0
- package/dist/server/internal/initializeInspection.js.map +1 -0
- package/dist/server/internal/initializeJobs.d.ts +4 -0
- package/dist/server/internal/initializeJobs.d.ts.map +1 -0
- package/dist/server/internal/initializeJobs.js +4 -0
- package/dist/server/internal/initializeJobs.js.map +1 -0
- package/dist/server/internal/operations/busy.d.ts +3 -0
- package/dist/server/internal/operations/busy.d.ts.map +1 -0
- package/dist/server/internal/operations/busy.js +4 -0
- package/dist/server/internal/operations/busy.js.map +1 -0
- package/dist/server/internal/operations/changes.d.ts +5 -0
- package/dist/server/internal/operations/changes.d.ts.map +1 -0
- package/dist/server/internal/operations/changes.js +4 -0
- package/dist/server/internal/operations/changes.js.map +1 -0
- package/dist/server/internal/operations/counts.d.ts +3 -0
- package/dist/server/internal/operations/counts.d.ts.map +1 -0
- package/dist/server/internal/operations/counts.js +4 -0
- package/dist/server/internal/operations/counts.js.map +1 -0
- package/dist/server/internal/operations/deadLetteredJobs.d.ts +6 -0
- package/dist/server/internal/operations/deadLetteredJobs.d.ts.map +1 -0
- package/dist/server/internal/operations/deadLetteredJobs.js +4 -0
- package/dist/server/internal/operations/deadLetteredJobs.js.map +1 -0
- package/dist/server/internal/operations/deferred.d.ts +6 -0
- package/dist/server/internal/operations/deferred.d.ts.map +1 -0
- package/dist/server/internal/operations/deferred.js +4 -0
- package/dist/server/internal/operations/deferred.js.map +1 -0
- package/dist/server/internal/operations/deleteQueue.d.ts +3 -0
- package/dist/server/internal/operations/deleteQueue.d.ts.map +1 -0
- package/dist/server/internal/operations/deleteQueue.js +4 -0
- package/dist/server/internal/operations/deleteQueue.js.map +1 -0
- package/dist/server/internal/operations/enqueue.d.ts +3 -0
- package/dist/server/internal/operations/enqueue.d.ts.map +1 -0
- package/dist/server/internal/operations/enqueue.js +4 -0
- package/dist/server/internal/operations/enqueue.js.map +1 -0
- package/dist/server/internal/operations/failedJobs.d.ts +6 -0
- package/dist/server/internal/operations/failedJobs.d.ts.map +1 -0
- package/dist/server/internal/operations/failedJobs.js +4 -0
- package/dist/server/internal/operations/failedJobs.js.map +1 -0
- package/dist/server/internal/operations/getJob.d.ts +6 -0
- package/dist/server/internal/operations/getJob.d.ts.map +1 -0
- package/dist/server/internal/operations/getJob.js +4 -0
- package/dist/server/internal/operations/getJob.js.map +1 -0
- package/dist/server/internal/operations/health.d.ts +3 -0
- package/dist/server/internal/operations/health.d.ts.map +1 -0
- package/dist/server/internal/operations/health.js +4 -0
- package/dist/server/internal/operations/health.js.map +1 -0
- package/dist/server/internal/operations/inspection.d.ts +3 -0
- package/dist/server/internal/operations/inspection.d.ts.map +1 -0
- package/dist/server/internal/operations/inspection.js +4 -0
- package/dist/server/internal/operations/inspection.js.map +1 -0
- package/dist/server/internal/operations/inspectionHealth.d.ts +5 -0
- package/dist/server/internal/operations/inspectionHealth.d.ts.map +1 -0
- package/dist/server/internal/operations/inspectionHealth.js +4 -0
- package/dist/server/internal/operations/inspectionHealth.js.map +1 -0
- package/dist/server/internal/operations/jobs.d.ts +43 -0
- package/dist/server/internal/operations/jobs.d.ts.map +1 -0
- package/dist/server/internal/operations/jobs.js +4 -0
- package/dist/server/internal/operations/jobs.js.map +1 -0
- package/dist/server/internal/operations/queue.d.ts +3 -0
- package/dist/server/internal/operations/queue.d.ts.map +1 -0
- package/dist/server/internal/operations/queue.js +4 -0
- package/dist/server/internal/operations/queue.js.map +1 -0
- package/dist/server/internal/operations/refreshQueueStats.d.ts +3 -0
- package/dist/server/internal/operations/refreshQueueStats.d.ts.map +1 -0
- package/dist/server/internal/operations/refreshQueueStats.js +4 -0
- package/dist/server/internal/operations/refreshQueueStats.js.map +1 -0
- package/dist/server/internal/operations/retry.d.ts +3 -0
- package/dist/server/internal/operations/retry.d.ts.map +1 -0
- package/dist/server/internal/operations/retry.js +4 -0
- package/dist/server/internal/operations/retry.js.map +1 -0
- package/dist/server/internal/operations/schedules.d.ts +3 -0
- package/dist/server/internal/operations/schedules.d.ts.map +1 -0
- package/dist/server/internal/operations/schedules.js +4 -0
- package/dist/server/internal/operations/schedules.js.map +1 -0
- package/dist/server/internal/operations/schemaVersion.d.ts +3 -0
- package/dist/server/internal/operations/schemaVersion.d.ts.map +1 -0
- package/dist/server/internal/operations/schemaVersion.js +4 -0
- package/dist/server/internal/operations/schemaVersion.js.map +1 -0
- package/dist/server/internal/operations/snapshot.d.ts +3 -0
- package/dist/server/internal/operations/snapshot.d.ts.map +1 -0
- package/dist/server/internal/operations/snapshot.js +4 -0
- package/dist/server/internal/operations/snapshot.js.map +1 -0
- package/dist/server/internal/operations/storedJobs.d.ts +5 -0
- package/dist/server/internal/operations/storedJobs.d.ts.map +1 -0
- package/dist/server/internal/operations/storedJobs.js +4 -0
- package/dist/server/internal/operations/storedJobs.js.map +1 -0
- package/dist/server/internal/operations/unschedule.d.ts +3 -0
- package/dist/server/internal/operations/unschedule.d.ts.map +1 -0
- package/dist/server/internal/operations/unschedule.js +4 -0
- package/dist/server/internal/operations/unschedule.js.map +1 -0
- package/dist/server/internal/pgBossDefinitionLayer.d.ts +7 -0
- package/dist/server/internal/pgBossDefinitionLayer.d.ts.map +1 -0
- package/dist/server/internal/pgBossDefinitionLayer.js +32 -0
- package/dist/server/internal/pgBossDefinitionLayer.js.map +1 -0
- package/dist/server/internal/testingIdle.d.ts +1 -1
- package/dist/server/internal/testingIdle.d.ts.map +1 -1
- package/dist/server/internal/testingIdle.js +4 -3
- package/dist/server/internal/testingIdle.js.map +1 -1
- package/dist/server/internal/testingWaits.d.ts +1 -1
- package/dist/server/internal/testingWaits.d.ts.map +1 -1
- package/dist/server/internal/testingWaits.js +2 -4
- package/dist/server/internal/testingWaits.js.map +1 -1
- package/dist/server/service.d.ts +2 -2
- package/dist/server/service.d.ts.map +1 -1
- package/dist/server/service.js +4 -47
- package/dist/server/service.js.map +1 -1
- package/dist/server/testing.d.ts +4 -1
- package/dist/server/testing.d.ts.map +1 -1
- package/dist/server/testing.js.map +1 -1
- package/package.json +11 -11
- package/src/server/adapters/clientErrorSubscription.ts +7 -0
- package/src/server/adapters/settleDeferral.ts +8 -2
- package/src/server/adapters/testingClient.ts +2 -0
- package/src/server/adapters/testingController.ts +14 -2
- package/src/server/adapters/testingTime.ts +25 -0
- package/src/server/inspection.ts +31 -20
- package/src/server/internal/PgBossInitialization.ts +9 -0
- package/src/server/internal/PgBossOperations.ts +35 -0
- package/src/server/internal/adapters/deferralChanges.ts +3 -0
- package/src/server/internal/initializeInspection.ts +8 -0
- package/src/server/internal/initializeJobs.ts +4 -0
- package/src/server/internal/operations/busy.ts +5 -0
- package/src/server/internal/operations/changes.ts +5 -0
- package/src/server/internal/operations/counts.ts +5 -0
- package/src/server/internal/operations/deadLetteredJobs.ts +5 -0
- package/src/server/internal/operations/deferred.ts +5 -0
- package/src/server/internal/operations/deleteQueue.ts +5 -0
- package/src/server/internal/operations/enqueue.ts +5 -0
- package/src/server/internal/operations/failedJobs.ts +5 -0
- package/src/server/internal/operations/getJob.ts +5 -0
- package/src/server/internal/operations/health.ts +5 -0
- package/src/server/internal/operations/inspection.ts +5 -0
- package/src/server/internal/operations/inspectionHealth.ts +5 -0
- package/src/server/internal/operations/jobs.ts +5 -0
- package/src/server/internal/operations/queue.ts +5 -0
- package/src/server/internal/operations/refreshQueueStats.ts +5 -0
- package/src/server/internal/operations/retry.ts +5 -0
- package/src/server/internal/operations/schedules.ts +5 -0
- package/src/server/internal/operations/schemaVersion.ts +5 -0
- package/src/server/internal/operations/snapshot.ts +5 -0
- package/src/server/internal/operations/storedJobs.ts +5 -0
- package/src/server/internal/operations/unschedule.ts +5 -0
- package/src/server/internal/pgBossDefinitionLayer.ts +65 -0
- package/src/server/internal/testingIdle.ts +4 -2
- package/src/server/internal/testingWaits.ts +2 -6
- package/src/server/service.ts +9 -66
- package/src/server/testing.ts +2 -0
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"pgBossDefinitionLayer.d.ts","sourceRoot":"","sources":["../../../src/server/internal/pgBossDefinitionLayer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,OAAO,EAAgB,KAAK,EAAS,MAAM,QAAQ,CAAC;AAIlE,OAAO,KAAK,EAAE,eAAe,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;AACvF,OAAO,KAAK,EAAE,WAAW,EAAE,qBAAqB,EAAE,uBAAuB,EAAE,MAAM,kBAAkB,CAAC;AACpG,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAC3C,OAAO,KAAK,EAAE,kBAAkB,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAU5E,wBAAgB,qBAAqB,CAAC,WAAW,SAAS,MAAM,EAAE,KAAK,CAAC,cAAc,SAAS,SAAS,eAAe,EAAE,EAAE,CAAC,EAC3H,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,WAAW,EAAE,aAAa,CAAC,EACpD,OAAO,EAAE,kBAAkB,CAAC,cAAc,EAAE,CAAC,CAAC,EAC9C,UAAU,CAAC,EAAE,SAAS,MAAM,EAAE,GAC5B,KAAK,CAAC,KAAK,CACb,WAAW,EACX,WAAW,GAAG,qBAAqB,GAAG,uBAAuB,EAC7D,MAAM,GAAG,OAAO,CAAC,wBAAwB,CAAC,cAAc,CAAC,EAAE,WAAW,CAAC,GAAG,CAAC,CAC3E,CAAC"}
|
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
import { Effect, Exit, Layer, Scope } from "effect";
|
|
2
|
+
import { clientErrorReporter } from "#server/adapters/clientErrorReporter.ts";
|
|
3
|
+
import { clientErrorSubscription } from "#server/adapters/clientErrorSubscription.ts";
|
|
4
|
+
import { jobEngine } from "#server/adapters/jobEngine.ts";
|
|
5
|
+
import { PgBoss } from "#server/PgBoss.ts";
|
|
6
|
+
import { logClientError } from "./clientErrors.js";
|
|
7
|
+
import { JobEngine } from "./engine.js";
|
|
8
|
+
import { makeService } from "./makeService.js";
|
|
9
|
+
import { PgBossInitialization } from "./PgBossInitialization.js";
|
|
10
|
+
import { PgBossOperations } from "./PgBossOperations.js";
|
|
11
|
+
import { registrationName } from "./register.js";
|
|
12
|
+
import { registerReleasedJobs } from "./registerReleasedJobs.js";
|
|
13
|
+
import { validateQueueNames } from "./validateQueueNames.js";
|
|
14
|
+
export function pgBossDefinitionLayer(Service, options, queueNames) {
|
|
15
|
+
return Layer.unwrap(Effect.map(Effect.context(), (dependencies) => Layer.effect(Service, PgBossOperations).pipe(Layer.provide(Layer.fresh(PgBossOperations.layer)), Layer.provide(Layer.succeed(PgBossInitialization, initializePgBoss(Service, options, dependencies, queueNames))))));
|
|
16
|
+
}
|
|
17
|
+
const initializePgBoss = Effect.fnUntraced(function* (Service, options, dependencies, queueNames) {
|
|
18
|
+
yield* validateQueueNames(options.jobs, queueNames);
|
|
19
|
+
const acquired = yield* PgBoss;
|
|
20
|
+
const workerScope = yield* Scope.make();
|
|
21
|
+
const service = yield* makeService(acquired.client, options.jobs.map(registrationName), acquired.schema).pipe(Effect.provideService(JobEngine, jobEngine(acquired.client, acquired.schema)));
|
|
22
|
+
yield* Effect.gen(function* () {
|
|
23
|
+
const context = yield* Effect.context();
|
|
24
|
+
const reportError = options.onError ?? logClientError;
|
|
25
|
+
const report = yield* clientErrorReporter(reportError).pipe(Effect.provide(context));
|
|
26
|
+
const unsubscribe = yield* clientErrorSubscription(acquired.client, report);
|
|
27
|
+
yield* Effect.addFinalizer(() => Scope.close(workerScope, Exit.void).pipe(Effect.ensuring(Effect.sync(unsubscribe))));
|
|
28
|
+
yield* registerReleasedJobs(acquired.client, options.jobs, context, acquired.reused, acquired.schema, acquired.stop, options.retired).pipe(Effect.provideService(Scope.Scope, workerScope));
|
|
29
|
+
}).pipe(Effect.provideService(Service, service), Effect.provide(dependencies));
|
|
30
|
+
return service;
|
|
31
|
+
});
|
|
32
|
+
//# sourceMappingURL=pgBossDefinitionLayer.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"pgBossDefinitionLayer.js","sourceRoot":"","sources":["../../../src/server/internal/pgBossDefinitionLayer.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,5 +13,5 @@ export interface TestingWork {
|
|
|
13
13
|
export declare function testingIdle(inspection: () => PgBossInspectionService, work: TestingWork, signal: {
|
|
14
14
|
readonly revision: Effect.Effect<number>;
|
|
15
15
|
readonly waitForChange: (after: number) => Effect.Effect<number>;
|
|
16
|
-
}): Effect.Effect<void, PgBossTestingError>;
|
|
16
|
+
}, wake?: Effect.Effect<void>): Effect.Effect<void, PgBossTestingError>;
|
|
17
17
|
//# sourceMappingURL=testingIdle.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"testingIdle.d.ts","sourceRoot":"","sources":["../../../src/server/internal/testingIdle.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"testingIdle.d.ts","sourceRoot":"","sources":["../../../src/server/internal/testingIdle.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAC3D,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AAGrE,MAAM,WAAW,YAAY;IAC5B,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC3C,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,OAAO,EAAE,OAAO,CAAC;CACjB;AAED,MAAM,WAAW,WAAW;IAC3B,QAAQ,CAAC,OAAO,EAAE,GAAG,CAAC,YAAY,CAAC,CAAC;IACpC,QAAQ,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;CAC7B;AAED,wBAAgB,WAAW,CAC1B,UAAU,EAAE,MAAM,uBAAuB,EACzC,IAAI,EAAE,WAAW,EACjB,MAAM,EAAE;IAAE,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAAC,QAAQ,CAAC,aAAa,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;CAAE,EACtH,IAAI,GAAE,MAAM,CAAC,MAAM,CAAC,IAAI,CAAe,GACrC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,kBAAkB,CAAC,CAczC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { Effect } from "effect";
|
|
2
2
|
import { testingInspection } from "#server/internal/testingOperation.ts";
|
|
3
|
-
export function testingIdle(inspection, work, signal) {
|
|
3
|
+
export function testingIdle(inspection, work, signal, wake = Effect.void) {
|
|
4
4
|
const busy = Effect.suspend(() => testingInspection("waitForIdle", inspection().busy([...work.queues].map((name) => ({ name })))));
|
|
5
5
|
return Effect.gen(function* () {
|
|
6
6
|
while (true) {
|
|
@@ -10,8 +10,9 @@ export function testingIdle(inspection, work, signal) {
|
|
|
10
10
|
if (work.queues.size === 0 || !(unsettled || (yield* busy))) {
|
|
11
11
|
return;
|
|
12
12
|
}
|
|
13
|
+
yield* wake;
|
|
13
14
|
yield* signal.waitForChange(revision);
|
|
14
15
|
}
|
|
15
|
-
})
|
|
16
|
+
});
|
|
16
17
|
}
|
|
17
18
|
//# sourceMappingURL=testingIdle.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"testingIdle.js","sourceRoot":"","sources":["../../../src/server/internal/testingIdle.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"testingIdle.js","sourceRoot":"","sources":["../../../src/server/internal/testingIdle.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAGhC,OAAO,EAAE,iBAAiB,EAAE,MAAM,sCAAsC,CAAC;AAazE,MAAM,UAAU,WAAW,CAC1B,UAAyC,EACzC,IAAiB,EACjB,MAAsH,EACtH,IAAI,GAAwB,MAAM,CAAC,IAAI;IAEvC,MAAM,IAAI,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,iBAAiB,CAAC,aAAa,EAAE,UAAU,EAAE,CAAC,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACnI,OAAO,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QAC1B,OAAO,IAAI,EAAE,CAAC;YACb,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC;YACxC,oGAAoG;YACpG,MAAM,SAAS,GAAG,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YACpE,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC,SAAS,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC;gBAC7D,OAAO;YACR,CAAC;YACD,KAAK,CAAC,CAAC,IAAI,CAAC;YACZ,KAAK,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;QACvC,CAAC;IACF,CAAC,CAAC,CAAC;AACJ,CAAC"}
|
|
@@ -14,7 +14,7 @@ export declare function testingWaits(inspection: () => PgBossInspectionService,
|
|
|
14
14
|
untilJob: <TName extends string, TPayload extends JobPayloadSchema | typeof Schema.Null>(queue: {
|
|
15
15
|
readonly name: TName;
|
|
16
16
|
readonly schema: TPayload;
|
|
17
|
-
}, id: string, state: JobState, options?: PgBossTestingWaitOptions) => Effect.Effect<Job<TPayload["Type"]>, PgBossPayloadError | PgBossTestingError | PgBossWaitError,
|
|
17
|
+
}, id: string, state: JobState, options?: PgBossTestingWaitOptions) => Effect.Effect<Job<TPayload["Type"]>, PgBossPayloadError | PgBossTestingError | PgBossWaitError, TPayload["DecodingServices"]>;
|
|
18
18
|
};
|
|
19
19
|
export {};
|
|
20
20
|
//# sourceMappingURL=testingWaits.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"testingWaits.d.ts","sourceRoot":"","sources":["../../../src/server/internal/testingWaits.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"testingWaits.d.ts","sourceRoot":"","sources":["../../../src/server/internal/testingWaits.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,MAAM,EAAoB,KAAK,MAAM,EAAE,MAAM,QAAQ,CAAC;AACzE,OAAO,KAAK,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAC/E,OAAO,EAAE,KAAK,kBAAkB,EAAE,kBAAkB,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAChG,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AACrE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,6CAA6C,CAAC;AAElF,OAAO,KAAK,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AACpD,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,oBAAoB,CAAC;AAOnE,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;AA8BD,wBAAgB,YAAY,CAAC,UAAU,EAAE,MAAM,uBAAuB,EAAE,OAAO,EAAE,MAAM,cAAc,GAAG,SAAS,EAAE,MAAM,EAAE,MAAM;IAE/H,WAAW,UAAU,IAAI,CAAC,eAAe,EAAE,MAAM,CAAC,SAAS,MAAM,YAAY,wBAAwB;IAqBrG,QAAQ,GAAG,KAAK,SAAS,MAAM,EAAE,QAAQ,SAAS,gBAAgB,GAAG,OAAO,MAAM,CAAC,IAAI,SAC/E;QAAE,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC;QAAC,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAA;KAAE,MACtD,MAAM,SACH,QAAQ,YACL,wBAAwB;EAmBpC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { Duration, Effect, Option, Redacted } from "effect";
|
|
2
2
|
import { PgBossTestingError, PgBossWaitError } from "#server/error.ts";
|
|
3
3
|
import { testingInspection } from "#server/internal/testingOperation.ts";
|
|
4
4
|
function waitUntil(signal, waitingFor, read, options) {
|
|
@@ -16,9 +16,7 @@ function waitUntil(signal, waitingFor, read, options) {
|
|
|
16
16
|
yield* signal.waitForChange(revision);
|
|
17
17
|
}
|
|
18
18
|
});
|
|
19
|
-
return wait.pipe(Effect.timeoutOrElse({ duration: within, orElse: () => Effect.fail(new PgBossWaitError({ lastSeen, waitingFor, within })) })
|
|
20
|
-
// The budget is wall time, so a story's TestClock neither ends the wait early nor holds it open.
|
|
21
|
-
Effect.provideService(Clock.Clock, Clock.Clock.defaultValue()));
|
|
19
|
+
return wait.pipe(Effect.timeoutOrElse({ duration: within, orElse: () => Effect.fail(new PgBossWaitError({ lastSeen, waitingFor, within })) }));
|
|
22
20
|
});
|
|
23
21
|
}
|
|
24
22
|
function fetchesRefused(queue, original) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"testingWaits.js","sourceRoot":"","sources":["../../../src/server/internal/testingWaits.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"testingWaits.js","sourceRoot":"","sources":["../../../src/server/internal/testingWaits.ts"],"names":[],"mappings":"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"}
|
package/dist/server/service.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Context, Effect, Layer, type Option, type Redacted, type Schema } from "effect";
|
|
1
|
+
import { Context, type Effect, Layer, type Option, type Redacted, type Schema } from "effect";
|
|
2
2
|
import type { PgBossClientFactory } from "#server/client.ts";
|
|
3
3
|
import type { ClientOptions, StopOptions } from "#server/clientOptions.ts";
|
|
4
4
|
import type { JobPayloadSchema, JobRegistration, QueueDefinition, RegistrationRequirements, ScheduleDefinition } from "#server/definition.ts";
|
|
@@ -38,7 +38,6 @@ export type PgBossOptions = Omit<ClientOptions, "connectionString"> & {
|
|
|
38
38
|
readonly clientCacheKey?: string | symbol | undefined;
|
|
39
39
|
readonly stop?: StopOptions;
|
|
40
40
|
};
|
|
41
|
-
export declare function pgBossLayer(options: PgBossOptions): Layer.Layer<PgBoss, PgBossError | PgBossClientOptionsError>;
|
|
42
41
|
export interface PgBossLayerOptions<TRegistrations extends readonly JobRegistration[], TErrorRequirements> {
|
|
43
42
|
readonly jobs: TRegistrations;
|
|
44
43
|
readonly onError?: (error: Error) => Effect.Effect<unknown, never, TErrorRequirements>;
|
|
@@ -47,5 +46,6 @@ export interface PgBossLayerOptions<TRegistrations extends readonly JobRegistrat
|
|
|
47
46
|
export interface PgBossDefinition<TIdentifier extends string = string> extends Context.Service<TIdentifier, PgBossService> {
|
|
48
47
|
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>;
|
|
49
48
|
}
|
|
49
|
+
export declare function pgBossLayer(options: PgBossOptions): Layer.Layer<PgBoss, PgBossError | PgBossClientOptionsError>;
|
|
50
50
|
export declare function makePgBoss<const TIdentifier extends string>(identifier: TIdentifier, queueNames?: readonly string[]): PgBossDefinition<TIdentifier>;
|
|
51
51
|
//# sourceMappingURL=service.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../src/server/service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,
|
|
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,59 +1,16 @@
|
|
|
1
|
-
import { Context,
|
|
2
|
-
import { defineService } from "@shivaedev/service/defineService.ts";
|
|
3
|
-
import { genericMethod } from "@shivaedev/service/genericMethod.ts";
|
|
4
|
-
import { clientErrorReporter } from "#server/adapters/clientErrorReporter.ts";
|
|
5
|
-
import { jobEngine } from "#server/adapters/jobEngine.ts";
|
|
1
|
+
import { Context, Layer } from "effect";
|
|
6
2
|
import { clientEngine } from "#server/adapters/lifecycle.ts";
|
|
7
3
|
import { acquireClient } from "#server/internal/acquireClient.ts";
|
|
8
|
-
import { logClientError, subscribeClientErrors } from "#server/internal/clientErrors.ts";
|
|
9
|
-
import { JobEngine } from "#server/internal/engine.ts";
|
|
10
4
|
import { ClientEngine } from "#server/internal/lifecycle.ts";
|
|
11
|
-
import {
|
|
12
|
-
import { registrationName } from "#server/internal/register.ts";
|
|
13
|
-
import { registerReleasedJobs } from "#server/internal/registerReleasedJobs.ts";
|
|
14
|
-
import { validateQueueNames } from "#server/internal/validateQueueNames.ts";
|
|
5
|
+
import { pgBossDefinitionLayer } from "#server/internal/pgBossDefinitionLayer.ts";
|
|
15
6
|
import { PgBoss } from "#server/PgBoss.ts";
|
|
16
7
|
export function pgBossLayer(options) {
|
|
17
8
|
return Layer.effect(PgBoss, acquireClient(options)).pipe(Layer.provide(Layer.succeed(ClientEngine, clientEngine)));
|
|
18
9
|
}
|
|
19
10
|
export function makePgBoss(identifier, queueNames) {
|
|
20
|
-
|
|
21
|
-
return defineService({
|
|
22
|
-
id: identifier,
|
|
23
|
-
initialize: Effect.gen(function* () {
|
|
24
|
-
yield* validateQueueNames(options.jobs, queueNames);
|
|
25
|
-
const acquired = yield* PgBoss;
|
|
26
|
-
const workerScope = yield* Scope.make();
|
|
27
|
-
const service = yield* makeService(acquired.client, options.jobs.map(registrationName), acquired.schema).pipe(Effect.provideService(JobEngine, jobEngine(acquired.client, acquired.schema)));
|
|
28
|
-
yield* Effect.gen(function* () {
|
|
29
|
-
const context = yield* Effect.context();
|
|
30
|
-
const reportError = options.onError ?? logClientError;
|
|
31
|
-
const report = yield* clientErrorReporter(reportError).pipe(Effect.provide(context));
|
|
32
|
-
const unsubscribe = subscribeClientErrors(acquired.client, report);
|
|
33
|
-
yield* Effect.addFinalizer(() => Scope.close(workerScope, Exit.void).pipe(Effect.ensuring(Effect.sync(unsubscribe))));
|
|
34
|
-
yield* registerReleasedJobs(acquired.client, options.jobs, context, acquired.reused, acquired.schema, acquired.stop, options.retired).pipe(Effect.provideService(Scope.Scope, workerScope));
|
|
35
|
-
}).pipe(Effect.provideService(Service, service), Effect.provide(dependencies));
|
|
36
|
-
return service;
|
|
37
|
-
}),
|
|
38
|
-
methods: (service) => ({
|
|
39
|
-
counts: service.counts,
|
|
40
|
-
deadLetteredJobs: genericMethod(service.deadLetteredJobs),
|
|
41
|
-
deleteQueue: service.deleteQueue,
|
|
42
|
-
enqueue: genericMethod(service.enqueue),
|
|
43
|
-
failedJobs: genericMethod(service.failedJobs),
|
|
44
|
-
getJob: genericMethod(service.getJob),
|
|
45
|
-
health: service.health,
|
|
46
|
-
inspection: service.inspection,
|
|
47
|
-
refreshQueueStats: service.refreshQueueStats,
|
|
48
|
-
retry: service.retry,
|
|
49
|
-
unschedule: service.unschedule,
|
|
50
|
-
}),
|
|
51
|
-
requires: [PgBoss],
|
|
52
|
-
});
|
|
53
|
-
}
|
|
54
|
-
const Service = definition({ jobs: [] }, Context.empty());
|
|
11
|
+
const Service = Context.Service(identifier);
|
|
55
12
|
function layer(options) {
|
|
56
|
-
return
|
|
13
|
+
return pgBossDefinitionLayer(Service, options, queueNames);
|
|
57
14
|
}
|
|
58
15
|
return Object.assign(Service, { layer });
|
|
59
16
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"service.js","sourceRoot":"","sources":["../../src/server/service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,
|
|
1
|
+
{"version":3,"file":"service.js","sourceRoot":"","sources":["../../src/server/service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAe,KAAK,EAA2C,MAAM,QAAQ,CAAC;AAC9F,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAe7D,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAC7D,OAAO,EAAE,qBAAqB,EAAE,MAAM,2CAA2C,CAAC;AAElF,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAsD3C,MAAM,UAAU,WAAW,CAAC,OAAsB;IACjD,OAAO,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,YAAY,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC;AACpH,CAAC;AAED,MAAM,UAAU,UAAU,CAAmC,UAAuB,EAAE,UAA8B;IACnH,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAA6B,UAAU,CAAC,CAAC;IACxE,SAAS,KAAK,CAAqE,OAA8C;QAChI,OAAO,qBAAqB,CAAC,OAAO,EAAE,OAAO,EAAE,UAAU,CAAC,CAAC;IAC5D,CAAC;IACD,OAAO,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;AAC1C,CAAC"}
|
package/dist/server/testing.d.ts
CHANGED
|
@@ -1,7 +1,9 @@
|
|
|
1
1
|
import { type Duration, Effect, type Tracer } from "effect";
|
|
2
|
+
import type { TestClock } from "effect/testing";
|
|
2
3
|
export declare function makePgBossTesting(options?: PgBossTestingOptions): {
|
|
3
4
|
runDeferredNow: (queue: Pick<import("./definition.ts").QueueDefinition, "name">) => Effect.Effect<void, import("./error.ts").PgBossTestingError, never>;
|
|
4
5
|
runDueNow: (queue: Pick<import("./definition.ts").QueueDefinition, "name">) => Effect.Effect<void, import("./error.ts").PgBossTestingError, never>;
|
|
6
|
+
timePasses: (duration: Duration.Input) => Effect.Effect<undefined, import("./error.ts").PgBossTestingError, never>;
|
|
5
7
|
schedules: () => Effect.Effect<{
|
|
6
8
|
cron: string;
|
|
7
9
|
name: string;
|
|
@@ -12,7 +14,7 @@ export declare function makePgBossTesting(options?: PgBossTestingOptions): {
|
|
|
12
14
|
untilJob: <TName extends string, TPayload extends import("./definition.ts").JobPayloadSchema | typeof import("effect/Schema").Null>(queue: {
|
|
13
15
|
readonly name: TName;
|
|
14
16
|
readonly schema: TPayload;
|
|
15
|
-
}, id: string, state: import("./job.ts").JobState, options?: PgBossTestingWaitOptions) => Effect.Effect<import("./job.ts").Job<TPayload["Type"]>, import("./error.ts").PgBossPayloadError | import("./error.ts").PgBossTestingError | import("./error.ts").PgBossWaitError,
|
|
17
|
+
}, id: string, state: import("./job.ts").JobState, options?: PgBossTestingWaitOptions) => Effect.Effect<import("./job.ts").Job<TPayload["Type"]>, import("./error.ts").PgBossPayloadError | import("./error.ts").PgBossTestingError | import("./error.ts").PgBossWaitError, TPayload["DecodingServices"]>;
|
|
16
18
|
deferred: (queue: Pick<import("./definition.ts").QueueDefinition, "name">) => Effect.Effect<{
|
|
17
19
|
at: import("effect/DateTime").Utc;
|
|
18
20
|
reason: string;
|
|
@@ -79,6 +81,7 @@ export declare const testRetryPolicy: Readonly<{
|
|
|
79
81
|
retryDelay: 0;
|
|
80
82
|
}>;
|
|
81
83
|
export interface PgBossTestingOptions {
|
|
84
|
+
readonly clock?: TestClock.TestClock;
|
|
82
85
|
readonly retryPolicy?: typeof testRetryPolicy;
|
|
83
86
|
}
|
|
84
87
|
export declare function linkedWorkerSpans(sender: Pick<Tracer.AnySpan, "spanId" | "traceId">, spans: readonly Tracer.Span[]): Effect.Effect<Tracer.Span[], never, never>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"testing.d.ts","sourceRoot":"","sources":["../../src/server/testing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,EAAE,KAAK,MAAM,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"testing.d.ts","sourceRoot":"","sources":["../../src/server/testing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,EAAE,KAAK,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC5D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAGhD,wBAAgB,iBAAiB,CAAC,OAAO,GAAE,oBAAyB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAEnE;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,KAAK,CAAC,EAAE,SAAS,CAAC,SAAS,CAAC;IACrC,QAAQ,CAAC,WAAW,CAAC,EAAE,OAAO,eAAe,CAAC;CAC9C;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,QAAQ,GAAG,SAAS,CAAC,EAAE,KAAK,EAAE,SAAS,MAAM,CAAC,IAAI,EAAE,8CASlH;AAED,MAAM,MAAM,aAAa,GAAG,UAAU,CAAC,OAAO,iBAAiB,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"testing.js","sourceRoot":"","sources":["../../src/server/testing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,MAAM,EAAe,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"testing.js","sourceRoot":"","sources":["../../src/server/testing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,MAAM,EAAe,MAAM,QAAQ,CAAC;AAE5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AAE1E,MAAM,UAAU,iBAAiB,CAAC,OAAO,GAAyB,EAAE;IACnE,OAAO,iBAAiB,CAAC,OAAO,CAAC,CAAC;AACnC,CAAC;AAMD,MAAM,CAAC,MAAM,eAAe,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,YAAY,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,EAAE,CAAC,CAAC;AAOrF,MAAM,UAAU,iBAAiB,CAAC,MAAkD,EAAE,KAA6B;IAClH,OAAO,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CACvB,KAAK,CAAC,MAAM,CACX,CAAC,IAAI,EAAE,EAAE,CACR,IAAI,CAAC,IAAI,KAAK,UAAU;WACrB,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,kBAAkB,CAAC,KAAK,SAAS;WACrD,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,KAAK,MAAM,CAAC,MAAM,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,KAAK,MAAM,CAAC,OAAO,CAAC,CACzG,CACD,CAAC;AACH,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@shivaedev/jobs",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.35.0",
|
|
4
4
|
"description": "Effect-native jobs and lifecycle management for pg-boss",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"effect"
|
|
@@ -20,14 +20,14 @@
|
|
|
20
20
|
"imports": {
|
|
21
21
|
"#test/*": "./src/test-support/*",
|
|
22
22
|
"#*.ts": {
|
|
23
|
-
"source": "./src/*.ts",
|
|
23
|
+
"@shivaedev/source": "./src/*.ts",
|
|
24
24
|
"types": "./dist/*.d.ts",
|
|
25
25
|
"default": "./dist/*.js"
|
|
26
26
|
}
|
|
27
27
|
},
|
|
28
28
|
"exports": {
|
|
29
29
|
"./*.ts": {
|
|
30
|
-
"source": "./src/*.ts",
|
|
30
|
+
"@shivaedev/source": "./src/*.ts",
|
|
31
31
|
"types": "./dist/*.d.ts",
|
|
32
32
|
"default": "./dist/*.js"
|
|
33
33
|
},
|
|
@@ -43,16 +43,16 @@
|
|
|
43
43
|
"README.md"
|
|
44
44
|
],
|
|
45
45
|
"dependencies": {
|
|
46
|
-
"@shivaedev/errors": "0.
|
|
47
|
-
"@shivaedev/service": "0.
|
|
48
|
-
"@shivaedev/sql": "0.
|
|
46
|
+
"@shivaedev/errors": "0.9.0",
|
|
47
|
+
"@shivaedev/service": "0.7.0",
|
|
48
|
+
"@shivaedev/sql": "0.37.0"
|
|
49
49
|
},
|
|
50
50
|
"devDependencies": {
|
|
51
|
-
"@shivaedev/http": "0.
|
|
52
|
-
"@shivaedev/quality": "0.
|
|
53
|
-
"@shivaedev/test": "0.
|
|
54
|
-
"@shivaedev/test-sql": "0.
|
|
55
|
-
"@shivaedev/test-story": "0.
|
|
51
|
+
"@shivaedev/http": "0.6.0",
|
|
52
|
+
"@shivaedev/quality": "0.60.0",
|
|
53
|
+
"@shivaedev/test": "0.15.0",
|
|
54
|
+
"@shivaedev/test-sql": "0.20.0",
|
|
55
|
+
"@shivaedev/test-story": "0.38.0",
|
|
56
56
|
"@types/node": "24.19.2",
|
|
57
57
|
"effect": "4.0.6",
|
|
58
58
|
"pg-boss": "12.38.0",
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
import { Effect } from "effect";
|
|
2
|
+
import type { PgBossClient } from "#server/client.ts";
|
|
3
|
+
import { subscribeClientErrors } from "#server/internal/clientErrors.ts";
|
|
4
|
+
|
|
5
|
+
export function clientErrorSubscription(client: PgBossClient, report: (error: Error) => void) {
|
|
6
|
+
return Effect.sync(() => subscribeClientErrors(client, report));
|
|
7
|
+
}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { Schema } from "effect";
|
|
2
2
|
import type { PgBossClient } from "#server/client.ts";
|
|
3
|
+
import { deferralChanges } from "#server/internal/adapters/deferralChanges.ts";
|
|
3
4
|
import { STATELY_DEFERRAL_POLICY } from "#server/internal/deferral.ts";
|
|
4
5
|
import type { JobAttempt } from "#server/internal/engine.ts";
|
|
5
6
|
import { quotedSchema } from "#server/internal/storedRows.ts";
|
|
@@ -11,8 +12,9 @@ export async function settleDeferral(client: PgBossClient, schema: string, job:
|
|
|
11
12
|
throw new TypeError("This pg-boss client does not support getDb for RetryAt");
|
|
12
13
|
}
|
|
13
14
|
const quoted = quotedSchema(schema);
|
|
15
|
+
const db = client.getDb();
|
|
14
16
|
// Native failure settlement deletes and reinserts jobs, so a cascading job foreign key would erase the counter.
|
|
15
|
-
const { rows } = await
|
|
17
|
+
const { rows } = await db.executeSql(
|
|
16
18
|
`WITH claimed AS MATERIALIZED (
|
|
17
19
|
SELECT name, id, created_on,
|
|
18
20
|
GREATEST(keep_until, $4::timestamptz + (keep_until - start_after)) AS keep_until
|
|
@@ -50,5 +52,9 @@ export async function settleDeferral(client: PgBossClient, schema: string, job:
|
|
|
50
52
|
SELECT EXISTS (SELECT 1 FROM claimed) AS claimed, EXISTS (SELECT 1 FROM deferred) AS deferred`,
|
|
51
53
|
[job.name, job.id, job.retryCount, at, reason, Reflect.get(job, "startedOn"), maxDeferrals],
|
|
52
54
|
);
|
|
53
|
-
|
|
55
|
+
const settled = Schema.decodeUnknownSync(Settlement)(rows[0]);
|
|
56
|
+
if (settled.deferred) {
|
|
57
|
+
deferralChanges.get(db)?.();
|
|
58
|
+
}
|
|
59
|
+
return settled;
|
|
54
60
|
}
|
|
@@ -4,6 +4,7 @@ import { testingExpirations } from "#server/adapters/testingExpirations.ts";
|
|
|
4
4
|
import type { ClientUpdateOptions, ClientUpdateRequest, ClientUpdateResult, PgBossClient } from "#server/client.ts";
|
|
5
5
|
import type { EngineClient } from "#server/engineClient.ts";
|
|
6
6
|
import type { EnqueueOptions } from "#server/enqueueOptions.ts";
|
|
7
|
+
import { deferralChanges } from "#server/internal/adapters/deferralChanges.ts";
|
|
7
8
|
import type { TestingBatch, TestingWork } from "#server/internal/testingIdle.ts";
|
|
8
9
|
import type { WorkerJob } from "#server/job.ts";
|
|
9
10
|
|
|
@@ -18,6 +19,7 @@ export interface TestingControls {
|
|
|
18
19
|
|
|
19
20
|
export function testingClient(client: EngineClient, schema: string, controls: TestingControls): EngineClient {
|
|
20
21
|
const engine = testingEngine(client, schema);
|
|
22
|
+
deferralChanges.set(client.getDb(), controls.changed);
|
|
21
23
|
|
|
22
24
|
const expirations = testingExpirations(client);
|
|
23
25
|
function update(request: ClientUpdateRequest): Promise<ClientUpdateResult>;
|
|
@@ -1,7 +1,9 @@
|
|
|
1
1
|
import { Duration, Effect, Redacted, type Schema } from "effect";
|
|
2
|
+
import { TestClock as PgBossTestClock } from "pg-boss";
|
|
2
3
|
import { defaultClientFactory } from "#server/adapters/defaultClientFactory.ts";
|
|
3
4
|
import { testingClient } from "#server/adapters/testingClient.ts";
|
|
4
5
|
import { testingDueNow } from "#server/adapters/testingDueNow.ts";
|
|
6
|
+
import { testingTime } from "#server/adapters/testingTime.ts";
|
|
5
7
|
import type { JobReadOptions, PgBossClientFactory } from "#server/client.ts";
|
|
6
8
|
import type { JobPayloadSchema, QueueDefinition } from "#server/definition.ts";
|
|
7
9
|
import type { EngineClient } from "#server/engineClient.ts";
|
|
@@ -16,6 +18,7 @@ import type { PgBossTestingOptions } from "#server/testing.ts";
|
|
|
16
18
|
import { queueSignal } from "./queueSignal.ts";
|
|
17
19
|
import { testingInspectionClient } from "./testingInspectionClient.ts";
|
|
18
20
|
export function testingController(settings: PgBossTestingOptions = {}) {
|
|
21
|
+
const clock = settings.clock === undefined ? undefined : new PgBossTestClock(settings.clock.currentTimeMillisUnsafe());
|
|
19
22
|
let current: EngineClient | undefined;
|
|
20
23
|
let fetches: TestingFetches | undefined;
|
|
21
24
|
let schema = "pgboss";
|
|
@@ -47,13 +50,21 @@ export function testingController(settings: PgBossTestingOptions = {}) {
|
|
|
47
50
|
throw new Error("A testing controller owns one jobs client; create a controller per runtime");
|
|
48
51
|
}
|
|
49
52
|
schema = clientOptions.schema ?? "pgboss";
|
|
50
|
-
current = defaultClientFactory(clientOptions);
|
|
53
|
+
current = defaultClientFactory({ ...clientOptions, ...(clock === undefined ? {} : { clock }) });
|
|
51
54
|
fetches = testingFetches(current.getDb(), signal.changed);
|
|
52
55
|
current = testingClient(current, schema, controls);
|
|
53
56
|
return testingInspectionClient(current, schema, work, signal.changed, (reads) => {
|
|
54
57
|
observed = reads;
|
|
55
58
|
});
|
|
56
59
|
};
|
|
60
|
+
const wake = Effect.sync(() => {
|
|
61
|
+
if (clock !== undefined) {
|
|
62
|
+
for (const worker of client().getWipData()) {
|
|
63
|
+
client().notifyWorker(worker.id);
|
|
64
|
+
}
|
|
65
|
+
}
|
|
66
|
+
});
|
|
67
|
+
const idle = testingIdle(inspection, work, signal, wake);
|
|
57
68
|
return {
|
|
58
69
|
deferred: (queue: Pick<QueueDefinition, "name">) => Effect.suspend(() => testingInspection("deferred", inspection().deferred(queue), queue.name)),
|
|
59
70
|
...testingDueNow(client, () => schema, signal.changed),
|
|
@@ -120,6 +131,7 @@ export function testingController(settings: PgBossTestingOptions = {}) {
|
|
|
120
131
|
snapshot: <const TQueues extends readonly SnapshotQueue[]>(queues: TQueues) =>
|
|
121
132
|
Effect.suspend(() => testingInspection("snapshot", inspection().snapshot(queues))),
|
|
122
133
|
waitForChange: signal.waitForChange,
|
|
123
|
-
waitForIdle:
|
|
134
|
+
waitForIdle: idle,
|
|
135
|
+
...testingTime(settings.clock, clock, idle),
|
|
124
136
|
};
|
|
125
137
|
}
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
import { Duration, Effect } from "effect";
|
|
2
|
+
import type { TestClock } from "effect/testing";
|
|
3
|
+
import type { PgBossTestingError } from "#server/error.ts";
|
|
4
|
+
import { testingOperation } from "#server/internal/testingOperation.ts";
|
|
5
|
+
|
|
6
|
+
export function testingTime(
|
|
7
|
+
clock: TestClock.TestClock | undefined,
|
|
8
|
+
jobs: { readonly setTime: (time: number) => Promise<void>; readonly tick: (milliseconds: number) => Promise<void> } | undefined,
|
|
9
|
+
idle: Effect.Effect<void, PgBossTestingError>,
|
|
10
|
+
) {
|
|
11
|
+
return {
|
|
12
|
+
timePasses: (duration: Duration.Input) =>
|
|
13
|
+
Effect.gen(function* () {
|
|
14
|
+
if (clock === undefined || jobs === undefined) {
|
|
15
|
+
return yield* Effect.die(new Error("Provide the story's TestClock to makePgBossTesting before passing time"));
|
|
16
|
+
}
|
|
17
|
+
yield* idle;
|
|
18
|
+
const next = clock.currentTimeMillisUnsafe() + Duration.toMillis(Duration.fromInputUnsafe(duration));
|
|
19
|
+
yield* testingOperation("timePasses", () => jobs.setTime(next));
|
|
20
|
+
yield* clock.adjust(duration);
|
|
21
|
+
yield* testingOperation("timePasses", () => jobs.tick(0));
|
|
22
|
+
yield* idle;
|
|
23
|
+
}),
|
|
24
|
+
};
|
|
25
|
+
}
|
package/src/server/inspection.ts
CHANGED
|
@@ -1,10 +1,24 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import type { DateTime } from "effect";
|
|
2
2
|
import { defineService } from "@shivaedev/service/defineService.ts";
|
|
3
3
|
import { genericMethod } from "@shivaedev/service/genericMethod.ts";
|
|
4
|
-
import { inspection } from "#server/adapters/inspection.ts";
|
|
5
4
|
import type { inspectionChanges } from "#server/adapters/inspectionChanges.ts";
|
|
6
5
|
import type { inspectionReads } from "#server/adapters/inspectionReads.ts";
|
|
7
6
|
import type { JobPayloadSchema, QueueDefinition } from "#server/definition.ts";
|
|
7
|
+
import { initializeInspection } from "#server/internal/initializeInspection.ts";
|
|
8
|
+
import { busy } from "#server/internal/operations/busy.ts";
|
|
9
|
+
import { changes } from "#server/internal/operations/changes.ts";
|
|
10
|
+
import { counts } from "#server/internal/operations/counts.ts";
|
|
11
|
+
import { deadLetteredJobs } from "#server/internal/operations/deadLetteredJobs.ts";
|
|
12
|
+
import { deferred } from "#server/internal/operations/deferred.ts";
|
|
13
|
+
import { failedJobs } from "#server/internal/operations/failedJobs.ts";
|
|
14
|
+
import { getJob } from "#server/internal/operations/getJob.ts";
|
|
15
|
+
import { inspectionHealth } from "#server/internal/operations/inspectionHealth.ts";
|
|
16
|
+
import { jobs } from "#server/internal/operations/jobs.ts";
|
|
17
|
+
import { queue } from "#server/internal/operations/queue.ts";
|
|
18
|
+
import { schedules } from "#server/internal/operations/schedules.ts";
|
|
19
|
+
import { schemaVersion } from "#server/internal/operations/schemaVersion.ts";
|
|
20
|
+
import { snapshot } from "#server/internal/operations/snapshot.ts";
|
|
21
|
+
import { storedJobs } from "#server/internal/operations/storedJobs.ts";
|
|
8
22
|
import { PgBoss } from "#server/PgBoss.ts";
|
|
9
23
|
import type { PgBossService } from "#server/service.ts";
|
|
10
24
|
|
|
@@ -20,25 +34,22 @@ export interface UnfinishedJob<TQueue extends SnapshotQueue> {
|
|
|
20
34
|
|
|
21
35
|
export const PgBossInspection = defineService({
|
|
22
36
|
id: "@shivaedev/jobs/PgBossInspection",
|
|
23
|
-
initialize:
|
|
24
|
-
const acquired = yield* PgBoss;
|
|
25
|
-
return yield* inspection(acquired.client, acquired.schema);
|
|
26
|
-
}),
|
|
37
|
+
initialize: initializeInspection,
|
|
27
38
|
methods: (service) => ({
|
|
28
|
-
busy: service
|
|
29
|
-
changes: service
|
|
30
|
-
counts: service
|
|
31
|
-
deadLetteredJobs: genericMethod(service
|
|
32
|
-
deferred: service
|
|
33
|
-
failedJobs: genericMethod(service
|
|
34
|
-
getJob: genericMethod(service
|
|
35
|
-
health: service
|
|
36
|
-
jobs: genericMethod(service
|
|
37
|
-
queue: service
|
|
38
|
-
schedules: service
|
|
39
|
-
schemaVersion: service
|
|
40
|
-
snapshot: genericMethod(service
|
|
41
|
-
storedJobs: service
|
|
39
|
+
busy: busy(service),
|
|
40
|
+
changes: changes(service),
|
|
41
|
+
counts: counts(service),
|
|
42
|
+
deadLetteredJobs: genericMethod(deadLetteredJobs(service)),
|
|
43
|
+
deferred: deferred(service),
|
|
44
|
+
failedJobs: genericMethod(failedJobs(service)),
|
|
45
|
+
getJob: genericMethod(getJob(service)),
|
|
46
|
+
health: inspectionHealth(service),
|
|
47
|
+
jobs: genericMethod(jobs(service)),
|
|
48
|
+
queue: queue(service),
|
|
49
|
+
schedules: schedules(service),
|
|
50
|
+
schemaVersion: schemaVersion(service),
|
|
51
|
+
snapshot: genericMethod(snapshot(service)),
|
|
52
|
+
storedJobs: storedJobs(service),
|
|
42
53
|
}),
|
|
43
54
|
requires: [PgBoss] as const,
|
|
44
55
|
});
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import { Context, type Effect, type Scope } from "effect";
|
|
2
|
+
import type { PgBossError, PgBossQueueNamesError, PgBossQueueOptionsError } from "#server/error.ts";
|
|
3
|
+
import type { PgBoss } from "#server/PgBoss.ts";
|
|
4
|
+
import type { PgBossService } from "#server/service.ts";
|
|
5
|
+
|
|
6
|
+
export class PgBossInitialization extends Context.Service<
|
|
7
|
+
PgBossInitialization,
|
|
8
|
+
Effect.Effect<PgBossService, PgBossError | PgBossQueueNamesError | PgBossQueueOptionsError, PgBoss | Scope.Scope>
|
|
9
|
+
>()("@shivaedev/jobs/PgBossInitialization") {}
|
|
@@ -0,0 +1,35 @@
|
|
|
1
|
+
import { defineService } from "@shivaedev/service/defineService.ts";
|
|
2
|
+
import { genericMethod } from "@shivaedev/service/genericMethod.ts";
|
|
3
|
+
import { counts } from "#server/internal/operations/counts.ts";
|
|
4
|
+
import { deadLetteredJobs } from "#server/internal/operations/deadLetteredJobs.ts";
|
|
5
|
+
import { deleteQueue } from "#server/internal/operations/deleteQueue.ts";
|
|
6
|
+
import { enqueue } from "#server/internal/operations/enqueue.ts";
|
|
7
|
+
import { failedJobs } from "#server/internal/operations/failedJobs.ts";
|
|
8
|
+
import { getJob } from "#server/internal/operations/getJob.ts";
|
|
9
|
+
import { health } from "#server/internal/operations/health.ts";
|
|
10
|
+
import { inspection } from "#server/internal/operations/inspection.ts";
|
|
11
|
+
import { refreshQueueStats } from "#server/internal/operations/refreshQueueStats.ts";
|
|
12
|
+
import { retry } from "#server/internal/operations/retry.ts";
|
|
13
|
+
import { unschedule } from "#server/internal/operations/unschedule.ts";
|
|
14
|
+
import { PgBoss } from "#server/PgBoss.ts";
|
|
15
|
+
import { initializeJobs } from "./initializeJobs.ts";
|
|
16
|
+
import { PgBossInitialization } from "./PgBossInitialization.ts";
|
|
17
|
+
|
|
18
|
+
export const PgBossOperations = defineService({
|
|
19
|
+
id: "@shivaedev/jobs/PgBossOperations",
|
|
20
|
+
initialize: initializeJobs,
|
|
21
|
+
methods: (state) => ({
|
|
22
|
+
counts: counts(state),
|
|
23
|
+
deadLetteredJobs: genericMethod(deadLetteredJobs(state)),
|
|
24
|
+
deleteQueue: deleteQueue(state),
|
|
25
|
+
enqueue: genericMethod(enqueue(state)),
|
|
26
|
+
failedJobs: genericMethod(failedJobs(state)),
|
|
27
|
+
getJob: genericMethod(getJob(state)),
|
|
28
|
+
health: health(state),
|
|
29
|
+
inspection: inspection(state),
|
|
30
|
+
refreshQueueStats: refreshQueueStats(state),
|
|
31
|
+
retry: retry(state),
|
|
32
|
+
unschedule: unschedule(state),
|
|
33
|
+
}),
|
|
34
|
+
requires: [PgBoss, PgBossInitialization],
|
|
35
|
+
});
|