bullpane 0.5.2 → 0.6.1

package/README.md

@@ -4,6 +4,8 @@
 
 ```sh
 npx bullpane --redis redis://localhost:6379
+# or, for BullMQ 6's Postgres backend
+npx bullpane --postgres postgres://user:pass@localhost:5432/app
 ```
 
 Open <http://localhost:3000>. That is the whole install: no database to set up, no account, no login.
@@ -14,24 +16,26 @@ Open <http://localhost:3000>. That is the whole install: no database to set up,
 
 ## What you get
 
-- Every queue on a Redis, with counts, success rate and what needs attention.
+- Every queue on a Redis, or in BullMQ 6's Postgres backend, with counts, success rate and what needs attention.
 - Jobs by state, search inside job data, job detail with data, return value, stack trace and logs.
 - Retry, promote, remove and bulk actions through the official `bullmq` API. Pause, resume, clean, drain.
 - Job schedulers, flows (parent/child trees), stalled jobs, Redis health.
 - BullMQ Pro groups: per-group concurrency, rate limits and paused groups.
 - Safe on a busy production Redis: no `KEYS`, one round trip per read, payloads truncated inside Redis.
 
-Works with BullMQ 4, 5 and 6 on Redis, Redis Cluster and Valkey, and with BullMQ Pro.
+Works with BullMQ 4, 5 and 6 on Redis, Redis Cluster and Valkey, with BullMQ 6 on Postgres (behind PgBouncer too), and with BullMQ Pro.
 
 **Pro** (USD 39/month, one installation, unlimited users) adds login with roles, SSO, alerts to Slack or webhooks, folders, a flow graph, an audit log and an MCP server for Claude and other AI clients.
 
 ## Options
 
 ```
-npx bullpane [--redis <url>] [options]
+npx bullpane [--redis <url> | --postgres <url>] [options]
 
   --redis <url>          Redis your BullMQ workers use, added as a connection
   --prefix <prefix>      BullMQ prefix of that connection (default: bull)
+  --postgres <url>       Postgres of BullMQ 6's Postgres backend, added as a connection
+  --schema <schema>      Schema of that connection (default: bullmq)
   --port <port>          HTTP port (default: 3000)
   --host <host>          Interface to listen on (default: 127.0.0.1)
   --data-dir <dir>       Where the SQLite database lives (default: ~/.bullpane)

package/bin/bullpane.mjs

@@ -18,12 +18,15 @@ const { version } = JSON.parse(readFileSync(path.join(root, "package.json"), "ut
 const HELP = `Bullpane ${version} — self-hosted dashboard for BullMQ and BullMQ Pro
 
 Usage
-  npx bullpane [--redis <url>] [options]
+  npx bullpane [--redis <url> | --postgres <url>] [options]
 
 Options
   --redis <url>          Redis your BullMQ workers use, added as a connection
                          (e.g. redis://localhost:6379). More can be added in the UI.
   --prefix <prefix>      BullMQ prefix of that connection (default: bull)
+  --postgres <url>       Postgres of BullMQ 6's Postgres backend, added as a
+                         connection (e.g. postgres://user:pass@localhost:5432/app)
+  --schema <schema>      Schema BullMQ created its tables in (default: bullmq)
   --port <port>          HTTP port (default: 3000, or $PORT)
   --host <host>          Interface to listen on (default: 127.0.0.1). The free
                          edition has no login: only use 0.0.0.0 on a private network.
@@ -41,6 +44,8 @@ try {
     options: {
       redis: { type: "string" },
       prefix: { type: "string" },
+      postgres: { type: "string" },
+      schema: { type: "string" },
       port: { type: "string" },
       host: { type: "string" },
       "data-dir": { type: "string" },
@@ -82,6 +87,28 @@ set("WEB_DIST", undefined, path.join(root, "web"));
 set("PUBLIC_URL", undefined, `http://localhost:${env.PORT}`);
 set("NODE_ENV", undefined, "production");
 
+if (args.redis && args.postgres) {
+  console.error("--redis and --postgres are one connection each: pass one, add the other in the UI");
+  process.exit(2);
+}
+
+/** host:port, never the password */
+const nameFrom = (url) => {
+  const u = new URL(url);
+  return `${u.hostname}${u.port ? `:${u.port}` : ""}`;
+};
+
+if (args.postgres) {
+  let name;
+  try {
+    name = nameFrom(args.postgres);
+  } catch {
+    console.error(`--postgres must be a URL like postgres://user:pass@localhost:5432/app`);
+    process.exit(2);
+  }
+  env.BULLPANE_CONNECTIONS = JSON.stringify([{ name, kind: "postgres", url: args.postgres, prefix: args.schema ?? "bullmq" }]);
+}
+
 if (args.redis) {
   let name = "Redis";
   try {

package/dist/lua/searchJobs.lua

@@ -16,7 +16,10 @@
   ARGV[9]     byteBudget: stop the call once this many payload bytes were copied
               into Lua, even if `batch` hashes were not reached. The cursor comes
               back as usual and the UI keeps streaming.
-  ARGV[10..]  hash fields to HMGET (must include name, data, failedReason)
+  ARGV[10]    group id (BullMQ Pro), or "" for no group filter
+  ARGV[11]    the hash fields that may hold the group id, comma separated
+              (GROUP_ID_FIELDS in keys.ts); `opts.group.id` is the fallback
+  ARGV[12..]  hash fields to HMGET (must include name, data, failedReason)
 
   Returns { matches, nextCursor, scanned, total, skipped }
     matches     rows shaped exactly like getJobs.lua rows (…, dataTruncated, dataBytes)
@@ -30,6 +33,11 @@
   call independent of both queue size and payload size: at most `batch` hashes
   and at most `byteBudget` payload bytes. Before them a search over 1000 × 1 MB
   jobs kept Redis busy for 13 s; with them a call is a few milliseconds.
+
+  With a group id, a job outside the group costs one HMGET of its group fields
+  and opts (a few hundred bytes, counted in the byte budget) and its payload is
+  never read. Pro keeps a group's delayed, failed and completed jobs in the
+  queue-wide state keys, so this is the only way to list them per group.
 ]]
 local rcall = redis.call
 local key = KEYS[1]
@@ -42,9 +50,14 @@ local qprefix = ARGV[6]
 local previewBytes = tonumber(ARGV[7])
 local maxFieldBytes = tonumber(ARGV[8])
 local byteBudget = tonumber(ARGV[9])
+local group = ARGV[10]
+
+local groupFields = {}
+for f in string.gmatch(ARGV[11], "[^,]+") do groupFields[#groupFields + 1] = f end
+groupFields[#groupFields + 1] = "opts"
 
 local fields = {}
-for i = 10, #ARGV do fields[#fields + 1] = ARGV[i] end
+for i = 12, #ARGV do fields[#fields + 1] = ARGV[i] end
 local SKIP = "\0skip"
 
 local dataIdx, retIdx, nameIdx, reasonIdx = nil, nil, nil, nil
@@ -83,9 +96,25 @@ local function has(hay, needle)
   return hay and string.find(string.lower(hay), needle, 1, true) ~= nil
 end
 
+-- Exact group match: a group id field on the hash, else opts.group.id. opts is
+-- only decoded when it contains the id as plain text, so most misses cost a find.
+local function inGroup(hkey)
+  local vals = rcall("HMGET", hkey, unpack(groupFields))
+  local opts = vals[#vals]
+  if opts then bytes = bytes + #opts end
+  for i = 1, #vals - 1 do
+    if vals[i] then return vals[i] == group end
+  end
+  if not opts or not string.find(opts, group, 1, true) then return false end
+  local ok, decoded = pcall(cjson.decode, opts)
+  if not ok or type(decoded) ~= "table" or type(decoded.group) ~= "table" then return false end
+  local id = decoded.group.id
+  return id ~= nil and tostring(id) == group
+end
+
 for _, id in ipairs(ids) do
   scanned = scanned + 1
-  if string.sub(id, 1, 2) ~= "0:" then
+  if string.sub(id, 1, 2) ~= "0:" and (group == "" or inGroup(qprefix .. id)) then
     local hkey = qprefix .. id
     local dataBytes = dataIdx and rcall("HSTRLEN", hkey, "data") or 0
     local retBytes = retIdx and rcall("HSTRLEN", hkey, "returnvalue") or 0
@@ -129,12 +158,13 @@ for _, id in ipairs(ids) do
           break
         end
       end
-      if bytes >= byteBudget then
-        stoppedEarly = true
-        break
-      end
     end
   end
+  -- Also after a group miss: those read opts, which counts against the budget.
+  if bytes >= byteBudget then
+    stoppedEarly = true
+    break
+  end
 end
 
 local nextCursor = cursor + scanned