@manablox/jobs 0.3.0 → 0.4.0

package/dist/index.d.ts

@@ -1,6 +1,6 @@
+import { Manablox } from "@manablox/core";
 import { Database, Repositories } from "@manablox/db";
 import { JobsOptions } from "bullmq";
-import { Manablox } from "@manablox/core";
 //#region src/index.d.ts
 export interface JobPayloads {
   'webhook:deliver': {

package/dist/index.js

@@ -1,3 +1,4 @@
+import { runAsActor, systemActor } from "@manablox/core";
 import { schema } from "@manablox/db";
 import { Queue, Worker } from "bullmq";
 import { sql } from "drizzle-orm";
@@ -9,14 +10,14 @@ function createJobRunner(manablox, db, repos, handlers = {}) {
 	if (!redisUrl) return {
 		inline: true,
 		async enqueue(name, payload) {
-			await runJob(name, payload, db, repos, handlers, manablox);
+			await runAsActor(systemActor(`job:${name}`), () => runJob(name, payload, db, repos, handlers, manablox));
 		},
 		async close() {}
 	};
 	const connection = new Redis(redisUrl, { maxRetriesPerRequest: null });
 	const queue = new Queue("manablox", { connection });
 	const worker = new Worker("manablox", async (job) => {
-		await runJob(job.name, job.data, db, repos, handlers, manablox);
+		await runAsActor(systemActor(`job:${job.name}`), () => runJob(job.name, job.data, db, repos, handlers, manablox));
 	}, {
 		connection,
 		concurrency: 8,
@@ -75,7 +76,18 @@ async function runJob(name, payload, db, repos, handlers, manablox) {
 			await handlers.workflowRun?.(data.runId);
 			break;
 		}
-		case "maintenance:pruneApiKeys": await db.delete(schema.apikeys).where(sql`${schema.apikeys.expiresAt} is not null and ${schema.apikeys.expiresAt} < now()`);
+		case "maintenance:pruneApiKeys": {
+			const deleted = await db.delete(schema.apikeys).where(sql`${schema.apikeys.expiresAt} is not null and ${schema.apikeys.expiresAt} < now()`).returning({
+				id: schema.apikeys.id,
+				name: schema.apikeys.name
+			});
+			if (deleted.length) await repos.audit.record({
+				action: "apiKey.prune",
+				targetKind: "apiKey",
+				meta: { removed: deleted }
+			});
+			break;
+		}
 	}
 }
 //#endregion

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@manablox/jobs",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "type": "module",
   "exports": {
     ".": {
@@ -11,8 +11,8 @@
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "dependencies": {
-    "@manablox/core": "0.3.0",
-    "@manablox/db": "0.3.0",
+    "@manablox/core": "0.4.0",
+    "@manablox/db": "0.4.0",
     "bullmq": "^6.3.4",
     "ioredis": "^6.0.0",
     "drizzle-orm": "^0.45.2"