groupmq-plus 1.1.1 → 1.1.2

package/dist/lua/change-delay.lua

@@ -4,6 +4,11 @@ local jobId = ARGV[1]
 local newDelayUntil = tonumber(ARGV[2])
 local now = tonumber(ARGV[3])
 
+-- Validate required parameters
+if not newDelayUntil or not now then
+  return 0
+end
+
 local jobKey = ns .. ":job:" .. jobId
 local delayedKey = ns .. ":delayed"
 local readyKey = ns .. ":ready"
@@ -21,6 +26,12 @@ end
 
 local gZ = ns .. ":g:" .. groupId
 
+-- Check if job is still in group (not deleted)
+local jobInGroup = redis.call("ZSCORE", gZ, jobId)
+if not jobInGroup then
+  return 0
+end
+
 -- Update job's delayUntil field
 redis.call("HSET", jobKey, "delayUntil", tostring(newDelayUntil))
 
@@ -30,13 +41,9 @@ local inDelayed = redis.call("ZSCORE", delayedKey, jobId)
 if newDelayUntil > 0 and newDelayUntil > now then
   -- Job should be delayed
   redis.call("HSET", jobKey, "status", "delayed")
-  if inDelayed then
-    -- Update existing delay
-    redis.call("ZADD", delayedKey, newDelayUntil, jobId)
-  else
-    -- Move to delayed
-    redis.call("ZADD", delayedKey, newDelayUntil, jobId)
-    -- If this is the head job, remove group from ready
+  redis.call("ZADD", delayedKey, newDelayUntil, jobId)
+  -- If this is the head job and wasn't already delayed, remove group from ready
+  if not inDelayed then
     local head = redis.call("ZRANGE", gZ, 0, 0)
     if head and #head > 0 and head[1] == jobId then
       redis.call("ZREM", readyKey, groupId)
@@ -48,12 +55,12 @@ else
   if inDelayed then
     -- Remove from delayed
     redis.call("ZREM", delayedKey, jobId)
-    -- If this is the head job, ensure group is in ready
-    local head = redis.call("ZRANGE", gZ, 0, 0, "WITHSCORES")
-    if head and #head >= 2 and head[1] == jobId then
-      local headScore = tonumber(head[2])
-      redis.call("ZADD", readyKey, headScore, groupId)
-    end
+  end
+  -- If this is the head job, ensure group is in ready
+  local head = redis.call("ZRANGE", gZ, 0, 0, "WITHSCORES")
+  if head and #head >= 2 and head[1] == jobId then
+    local headScore = tonumber(head[2])
+    redis.call("ZADD", readyKey, headScore, groupId)
   end
 end
 

package/dist/lua/clean-status.lua

@@ -30,6 +30,7 @@ for i = 1, #ids do
   -- Remove from group and update ready queue for ALL statuses
   -- This prevents poisoned groups when completed/failed jobs are cleaned
   local groupId = redis.call('HGET', jobKey, 'groupId')
+  local parentId = redis.call('HGET', jobKey, 'parentId')
   if groupId then
     local gZ = ns .. ':g:' .. groupId
     local readyKey = ns .. ':ready'
@@ -51,10 +52,18 @@ for i = 1, #ids do
     end
   end
 
-  -- Delete job hash, idempotence key and flow results
-  redis.call('DEL', jobKey)
-  redis.call('DEL', ns .. ':unique:' .. id)
-  redis.call('DEL', ns .. ':flow:results:' .. id)
+  -- Delete job hash, idempotence key, flow results and children tracking (variadic DEL optimization)
+  redis.call('DEL', 
+    jobKey,
+    ns .. ':unique:' .. id,
+    ns .. ':flow:results:' .. id,
+    ns .. ':flow:children:' .. id
+  )
+
+  -- 2. If this job is a child, remove it from parent's children set
+  if parentId then
+    redis.call('SREM', ns .. ':flow:children:' .. parentId, id)
+  end
 
   removed = removed + 1
 end

package/dist/lua/enqueue-flow.lua

@@ -83,6 +83,10 @@ for i = 0, childrenCount - 1 do
   
   redis.call("SET", ns .. ":unique:" .. childId, childId)
   
+  -- Record child relationship for introspection
+  -- Key: {ns}:flow:children:{parentId}
+  redis.call("SADD", ns .. ":flow:children:" .. parentId, childId)
+  
   -- Handle delay or immediate waiting
   if childDelay > 0 then
     local delayUntil = now + childDelay

package/dist/lua/remove.lua

@@ -13,6 +13,7 @@ if redis.call("EXISTS", jobKey) == 0 then
 end
 
 local groupId = redis.call("HGET", jobKey, "groupId")
+local parentId = redis.call("HGET", jobKey, "parentId")
 
 -- Remove from delayed and processing structures
 redis.call("ZREM", delayedKey, jobId)
@@ -46,9 +47,18 @@ if groupId then
   end
 end
 
--- Finally, delete the job hash and flow results
-redis.call("DEL", jobKey)
-redis.call("DEL", ns .. ":flow:results:" .. jobId)
+-- Finally, delete the job hash, flow results and children tracking (variadic DEL optimization)
+redis.call("DEL", 
+  jobKey,
+  ns .. ":flow:results:" .. jobId,
+  ns .. ":flow:children:" .. jobId
+)
+
+-- Clean up flow relationships
+-- If this job is a child, remove it from parent's children set
+if parentId then
+  redis.call("SREM", ns .. ":flow:children:" .. parentId, jobId)
+end
 
 return 1
 

package/dist/lua/reserve.lua

@@ -87,8 +87,8 @@ for i = 1, #groups, 2 do
     -- Group has capacity, try to get head job
     local head = redis.call("ZRANGE", gZ, 0, 0, "WITHSCORES")
     if head and #head >= 2 then
-      local headJobId = head[1]
-      local headJobKey = ns .. ":job:" .. headJobId
+      local candidateJobId = head[1]
+      local headJobKey = ns .. ":job:" .. candidateJobId
       
       -- Skip if head job is delayed (will be promoted later)
       local jobStatus = redis.call("HGET", headJobKey, "status")

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "groupmq-plus",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "Per-group FIFO queue on Redis with visibility timeouts and retries.",
   "license": "MIT",
   "private": false,