@cloud-cli/on 1.2.3 → 1.2.4
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/on.js +11 -11
- package/dist/queue.d.ts +0 -3
- package/package.json +1 -1
package/dist/on.js
CHANGED
|
@@ -8410,7 +8410,7 @@ var Vo = class {
|
|
|
8410
8410
|
await this.createTables(), await this.clearStaleJobs();
|
|
8411
8411
|
}
|
|
8412
8412
|
async enqueue(e, t, n) {
|
|
8413
|
-
return n && await zo.run("
|
|
8413
|
+
return n && await zo.run("UPDATE jobs SET status = 'cancelling' WHERE concurrency_key = ? AND status IN ('pending', 'running');", [n]), await zo.run("INSERT INTO jobs (workflow_id, concurrency_key, payload) VALUES (?, ?, ?);", [
|
|
8414
8414
|
e,
|
|
8415
8415
|
n || "",
|
|
8416
8416
|
JSON.stringify(t)
|
|
@@ -8420,16 +8420,16 @@ var Vo = class {
|
|
|
8420
8420
|
return await zo.get("\n UPDATE jobs\n SET\n status = 'running',\n worker_id = ?,\n started_at = CURRENT_TIMESTAMP\n WHERE id = (\n SELECT id FROM jobs\n WHERE status = 'pending'\n ORDER BY created_at ASC\n LIMIT 1\n )\n RETURNING *;\n ", [this.workerId]) || null;
|
|
8421
8421
|
}
|
|
8422
8422
|
async finishJob(e, t) {
|
|
8423
|
-
await zo.run("
|
|
8423
|
+
await zo.run("UPDATE jobs SET status = ?, finished_at = CURRENT_TIMESTAMP WHERE id = ?;", [t, e]);
|
|
8424
8424
|
}
|
|
8425
8425
|
async isCancelled(e) {
|
|
8426
8426
|
return (await zo.get("SELECT status FROM jobs WHERE id = ?;", [e]))?.status === "cancelling";
|
|
8427
8427
|
}
|
|
8428
8428
|
async clearStaleJobs() {
|
|
8429
|
-
return await zo.run("UPDATE jobs
|
|
8429
|
+
return await zo.run("UPDATE jobs SET status = 'pending', worker_id = NULL WHERE status = 'running' AND started_at < datetime('now', '-1 hour');");
|
|
8430
8430
|
}
|
|
8431
8431
|
async createTables() {
|
|
8432
|
-
return zo.run("\n CREATE TABLE IF NOT EXISTS jobs (\n id INTEGER PRIMARY KEY AUTOINCREMENT,\n workflow_id TEXT NOT NULL,\n payload TEXT NOT NULL,\n status TEXT NOT NULL DEFAULT 'pending',\n concurrency_key TEXT,\n worker_id TEXT,\n report TEXT
|
|
8432
|
+
return zo.run("\n CREATE TABLE IF NOT EXISTS jobs (\n id INTEGER PRIMARY KEY AUTOINCREMENT,\n workflow_id TEXT NOT NULL,\n payload TEXT NOT NULL,\n status TEXT NOT NULL DEFAULT 'pending',\n concurrency_key TEXT,\n worker_id TEXT,\n report TEXT,\n created_at DATETIME DEFAULT CURRENT_TIMESTAMP,\n started_at DATETIME DEFAULT CURRENT_TIMESTAMP,\n finished_at DATETIME DEFAULT CURRENT_TIMESTAMP,\n updated_at DATETIME DEFAULT CURRENT_TIMESTAMP\n );");
|
|
8433
8433
|
}
|
|
8434
8434
|
async saveReport(e, t) {
|
|
8435
8435
|
await zo.run("UPDATE jobs SET report = ?, updated_at = CURRENT_TIMESTAMP WHERE id = ?", [JSON.stringify(t), e]);
|
|
@@ -8438,7 +8438,7 @@ var Vo = class {
|
|
|
8438
8438
|
return zo.get("SELECT * FROM jobs WHERE id = ?", [e]);
|
|
8439
8439
|
}
|
|
8440
8440
|
async listJobs(e = 50) {
|
|
8441
|
-
return zo.all("SELECT
|
|
8441
|
+
return zo.all("SELECT * FROM jobs ORDER BY id DESC LIMIT ?;", [e]);
|
|
8442
8442
|
}
|
|
8443
8443
|
}, Ho = /* @__PURE__ */ ne(((e, t) => {
|
|
8444
8444
|
t.exports = {};
|
|
@@ -8693,7 +8693,7 @@ var Vo = class {
|
|
|
8693
8693
|
`--unit=${a}`,
|
|
8694
8694
|
"--wait",
|
|
8695
8695
|
"--pipe",
|
|
8696
|
-
`--working-directory=${t.workspacePath}`
|
|
8696
|
+
`--working-directory=${t.workspacePath}/wd`
|
|
8697
8697
|
];
|
|
8698
8698
|
if (t.env) for (let [e, n] of Object.entries(t.env)) s.push(`--setenv=${e}=${n}`);
|
|
8699
8699
|
if (t.timeoutMs) {
|
|
@@ -8708,7 +8708,7 @@ var Vo = class {
|
|
|
8708
8708
|
"--init",
|
|
8709
8709
|
`--name=${a}`,
|
|
8710
8710
|
"-v",
|
|
8711
|
-
`${t.workspacePath}:/workspace`,
|
|
8711
|
+
`${t.workspacePath}/wd:/workspace`,
|
|
8712
8712
|
"-w",
|
|
8713
8713
|
"/workspace",
|
|
8714
8714
|
t.image,
|
|
@@ -8716,7 +8716,7 @@ var Vo = class {
|
|
|
8716
8716
|
"-c",
|
|
8717
8717
|
t.command
|
|
8718
8718
|
] : [
|
|
8719
|
-
"sh",
|
|
8719
|
+
process.env.SHELL || "sh",
|
|
8720
8720
|
"-c",
|
|
8721
8721
|
t.command
|
|
8722
8722
|
];
|
|
@@ -8809,7 +8809,7 @@ var Vo = class {
|
|
|
8809
8809
|
"--rm",
|
|
8810
8810
|
"--init",
|
|
8811
8811
|
"-v",
|
|
8812
|
-
`${t.workspacePath}:/workspace`,
|
|
8812
|
+
`${t.workspacePath}/wd:/workspace`,
|
|
8813
8813
|
"-w",
|
|
8814
8814
|
"/workspace",
|
|
8815
8815
|
"--entrypoint",
|
|
@@ -8817,11 +8817,11 @@ var Vo = class {
|
|
|
8817
8817
|
t.image,
|
|
8818
8818
|
"-c",
|
|
8819
8819
|
t.command
|
|
8820
|
-
]) : (a = "sh", s = ["-c", t.command]);
|
|
8820
|
+
]) : (a = process.env.SHELL || "sh", s = ["-c", t.command]);
|
|
8821
8821
|
let c;
|
|
8822
8822
|
try {
|
|
8823
8823
|
c = v(a, s, {
|
|
8824
|
-
cwd: t.workspacePath,
|
|
8824
|
+
cwd: t.workspacePath + "/wd",
|
|
8825
8825
|
env: {
|
|
8826
8826
|
...process.env,
|
|
8827
8827
|
...t.env
|
package/dist/queue.d.ts
CHANGED
|
@@ -2,9 +2,6 @@ import { WorkflowExecutionReport, JobPayload, JobRecord, JobStatus } from './typ
|
|
|
2
2
|
export declare class QueueManager {
|
|
3
3
|
private workerId;
|
|
4
4
|
constructor(workerId: string);
|
|
5
|
-
/**
|
|
6
|
-
* Initializes the database schema.
|
|
7
|
-
*/
|
|
8
5
|
init(): Promise<void>;
|
|
9
6
|
/**
|
|
10
7
|
* Enqueues a new job into the database.
|