@portqueue/core 1.2.1 → 1.2.2
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/dist/conformance/index.cjs +82 -2
- package/dist/conformance/index.cjs.map +1 -1
- package/dist/conformance/index.mjs +83 -3
- package/dist/conformance/index.mjs.map +1 -1
- package/dist/consumer/completion-batcher.d.ts +29 -0
- package/dist/consumer/completion.service.d.ts +5 -3
- package/dist/consumer/execution.service.d.ts +7 -2
- package/dist/consumer/worker.d.ts +16 -0
- package/dist/drivers/driver.interface.d.ts +26 -2
- package/dist/drivers/mysql/index.cjs +50 -3
- package/dist/drivers/mysql/index.cjs.map +1 -1
- package/dist/drivers/mysql/index.mjs +50 -3
- package/dist/drivers/mysql/index.mjs.map +1 -1
- package/dist/drivers/mysql/mysql-driver.d.ts +16 -3
- package/dist/drivers/oracle/index.cjs +50 -3
- package/dist/drivers/oracle/index.cjs.map +1 -1
- package/dist/drivers/oracle/index.mjs +50 -3
- package/dist/drivers/oracle/index.mjs.map +1 -1
- package/dist/drivers/oracle/oracle-driver.d.ts +14 -3
- package/dist/drivers/pglite/index.cjs +6 -3
- package/dist/drivers/pglite/index.cjs.map +1 -1
- package/dist/drivers/pglite/index.mjs +6 -3
- package/dist/drivers/pglite/index.mjs.map +1 -1
- package/dist/drivers/pglite/migrations.d.ts +2 -3
- package/dist/drivers/postgresql/index.cjs +1 -1
- package/dist/drivers/postgresql/index.mjs +1 -1
- package/dist/drivers/postgresql/migrations.d.ts +21 -0
- package/dist/drivers/postgresql/postgresql-driver.d.ts +28 -3
- package/dist/drivers/shared/base-driver.d.ts +28 -2
- package/dist/drivers/sqlite/index.cjs +36 -4
- package/dist/drivers/sqlite/index.cjs.map +1 -1
- package/dist/drivers/sqlite/index.mjs +36 -4
- package/dist/drivers/sqlite/index.mjs.map +1 -1
- package/dist/drivers/sqlite/sqlite-driver.d.ts +14 -3
- package/dist/index.cjs +107 -10
- package/dist/index.cjs.map +1 -1
- package/dist/index.d.ts +2 -2
- package/dist/index.mjs +108 -11
- package/dist/index.mjs.map +1 -1
- package/dist/jobs/job-record.d.ts +8 -0
- package/dist/{migration-Dx8eUthW.cjs → migration-CX7j4wVB.cjs} +59 -1
- package/dist/migration-CX7j4wVB.cjs.map +1 -0
- package/dist/{migration-D0IRP2oq.js → migration-VkNQT3a_.js} +60 -2
- package/dist/migration-VkNQT3a_.js.map +1 -0
- package/dist/{postgresql-driver-CPHv5SUT.js → postgresql-driver-DQRzg2NA.js} +179 -57
- package/dist/postgresql-driver-DQRzg2NA.js.map +1 -0
- package/dist/{postgresql-driver-DRT68TKb.cjs → postgresql-driver-xfqy9mi8.cjs} +179 -57
- package/dist/postgresql-driver-xfqy9mi8.cjs.map +1 -0
- package/package.json +1 -1
- package/dist/migration-D0IRP2oq.js.map +0 -1
- package/dist/migration-Dx8eUthW.cjs.map +0 -1
- package/dist/postgresql-driver-CPHv5SUT.js.map +0 -1
- package/dist/postgresql-driver-DRT68TKb.cjs.map +0 -1
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { createHash } from "node:crypto";
|
|
2
2
|
import { a as DatabaseEngine, c as capabilities, D as DriverCapability, b as DeduplicationReason, A as ACTIVE_STATUSES, J as JobStatus, F as FINISHED_STATUSES } from "../../storage.constants-DYEQUmc8.js";
|
|
3
|
-
import { T as TableName, B as BaseDriver, t as toMigrationSteps, M as MissingPeerDependencyError, D as DriverConnectionError, a as MigrationColumn, b as DriverQueryError, J as JOB_COLUMNS, Q as QueueColumn, c as JobColumn, S as ScheduleColumn, d as SCHEDULE_INSERT_COLUMNS, I as InstanceColumn, r as retentionStatusBit, e as MS_PER_SECOND, U as UnsupportedCapabilityError } from "../../migration-
|
|
3
|
+
import { T as TableName, B as BaseDriver, t as toMigrationSteps, M as MissingPeerDependencyError, D as DriverConnectionError, a as MigrationColumn, b as DriverQueryError, J as JOB_COLUMNS, Q as QueueColumn, c as JobColumn, S as ScheduleColumn, d as SCHEDULE_INSERT_COLUMNS, C as CLAIM_COLUMNS, I as InstanceColumn, r as retentionStatusBit, e as MS_PER_SECOND, U as UnsupportedCapabilityError } from "../../migration-VkNQT3a_.js";
|
|
4
4
|
function v1(names) {
|
|
5
5
|
const t = names.name;
|
|
6
6
|
const idx = names.derived;
|
|
@@ -572,11 +572,11 @@ class MysqlDriver extends BaseDriver {
|
|
|
572
572
|
session
|
|
573
573
|
);
|
|
574
574
|
const res = await this.execute(
|
|
575
|
-
`SELECT ${
|
|
575
|
+
`SELECT ${CLAIM_COLUMNS.join(", ")} FROM ${this.t(TableName.JOB)} WHERE ${JobColumn.ID} IN (${this.phList(ids.length)}) AND ${JobColumn.LOCK_TOKEN} = ${this.ph(ids.length)}`,
|
|
576
576
|
[...ids, lockToken],
|
|
577
577
|
session
|
|
578
578
|
);
|
|
579
|
-
return this.sortClaimed(res.rows.map((r) => this.
|
|
579
|
+
return this.sortClaimed(res.rows.map((r) => this.mapClaimedJob(r, { queueName, lockToken })));
|
|
580
580
|
});
|
|
581
581
|
}
|
|
582
582
|
/**
|
|
@@ -624,6 +624,53 @@ class MysqlDriver extends BaseDriver {
|
|
|
624
624
|
);
|
|
625
625
|
return res.rowCount > 0;
|
|
626
626
|
}
|
|
627
|
+
/**
|
|
628
|
+
* Settle a batch per claim token (and per id chunk). Without `RETURNING`, the rows that still pass
|
|
629
|
+
* the fence (`ACTIVE` and the group's token, exactly like {@link completeJob}) are locked first
|
|
630
|
+
* with `SELECT … FOR UPDATE`, then exactly those are updated — both inside one transaction, so the
|
|
631
|
+
* ids returned are the ids settled. Parameters are pushed in placeholder order.
|
|
632
|
+
*/
|
|
633
|
+
async completeJobs(options) {
|
|
634
|
+
const settled = [];
|
|
635
|
+
for (const group of this.groupByLockToken(options.jobs)) {
|
|
636
|
+
const ids = await this.overIdChunks(
|
|
637
|
+
group.items,
|
|
638
|
+
async (chunk) => this.inTx(options.tx, async (run) => {
|
|
639
|
+
const selParams = chunk.map((job) => job.jobId);
|
|
640
|
+
const sel = await run(
|
|
641
|
+
`SELECT ${JobColumn.ID} FROM ${this.t(TableName.JOB)} WHERE ${JobColumn.ID} IN (${this.phList(chunk.length)})${this.claimFence(selParams, group.lockToken)} FOR UPDATE`,
|
|
642
|
+
selParams
|
|
643
|
+
);
|
|
644
|
+
const held = new Set(sel.rows.map((row) => String(row[JobColumn.ID])));
|
|
645
|
+
const owned = chunk.filter((job) => held.has(job.jobId));
|
|
646
|
+
if (!owned.length) return [];
|
|
647
|
+
const params = [JobStatus.COMPLETED];
|
|
648
|
+
const returnValue = this.returnValueExpression(owned, params);
|
|
649
|
+
const nowAt = params.length;
|
|
650
|
+
params.push(options.now, options.now);
|
|
651
|
+
const idsAt = params.length;
|
|
652
|
+
params.push(...owned.map((job) => job.jobId));
|
|
653
|
+
await run(
|
|
654
|
+
`UPDATE ${this.t(TableName.JOB)} SET ${JobColumn.STATUS} = ${this.ph(0)}, ${JobColumn.RETURN_VALUE} = ${returnValue}, ${JobColumn.COMPLETED_AT} = ${this.ph(nowAt)}, ${JobColumn.UPDATED_AT} = ${this.ph(nowAt + 1)}, ${JobColumn.LOCKED_UNTIL} = NULL, ${JobColumn.LOCK_TOKEN} = NULL WHERE ${JobColumn.ID} IN (${this.phList(owned.length, idsAt)})`,
|
|
655
|
+
params
|
|
656
|
+
);
|
|
657
|
+
return owned.map((job) => job.jobId);
|
|
658
|
+
})
|
|
659
|
+
);
|
|
660
|
+
settled.push(...ids);
|
|
661
|
+
}
|
|
662
|
+
return settled;
|
|
663
|
+
}
|
|
664
|
+
/** `NULL` when no job in the chunk returned anything, otherwise a `CASE` on the id. */
|
|
665
|
+
returnValueExpression(chunk, params) {
|
|
666
|
+
const values = chunk.map((job) => this.toJson(job.returnValue));
|
|
667
|
+
if (values.every((value) => value === null)) return "NULL";
|
|
668
|
+
const arms = chunk.map((job, i) => {
|
|
669
|
+
params.push(job.jobId, values[i]);
|
|
670
|
+
return `WHEN ${this.ph(params.length - 2)} THEN ${this.ph(params.length - 1)}`;
|
|
671
|
+
});
|
|
672
|
+
return `CASE ${JobColumn.ID} ${arms.join(" ")} ELSE NULL END`;
|
|
673
|
+
}
|
|
627
674
|
async retryJob(options) {
|
|
628
675
|
const params = [
|
|
629
676
|
JobStatus.RETRY,
|