lonnymq 0.0.6 → 0.0.8

package/README.md

@@ -1,20 +1,20 @@
 # LonnyMQ
 
-A high performance, multi-tenant Postgres message queue implementation for NodeJS/Typescript.
+A high-performance, multi-tenant Postgres message queue implementation for Node.js/TypeScript.
 
 ## Features
 
-  - High throughput.
-  - Multi-tenant concurrency and capacity constraints.
-  - Durable message processing.
-  - Flexible message processing retries/deferrals.
-  - Message de-duplication.
-  - Queue actions as part of *existing* database transactions.
-  - Database client agnostic.
-  - Instant reactivity via `LISTEN/NOTIFY`.
-  - Zero dependencies.
+- High throughput
+- Multi-tenant concurrency and capacity constraints
+- Durable message processing
+- Flexible message processing retries/deferrals
+- Message de-duplication
+- Queue actions as part of *existing* database transactions
+- Database client agnostic
+- Instant reactivity via `LISTEN/NOTIFY`
+- Zero dependencies
 
-N.B. unlike other queue implementations, LonnyMQ provides direct access to queue methods vs. providing batteries-included Worker/Processor daemons. 
+N.B. Unlike other queue implementations, LonnyMQ provides direct access to queue methods rather than providing batteries-included Worker/Processor daemons.
 
 ## Quick Look
 
@@ -27,59 +27,84 @@ databaseClient satisfies DatabaseClient
 
 const queue = new Queue({ schema: "lonny" })
 
-for(let ix = 0; ix < 500; ix += 1) {
-    queue
+// Run migrations first
+for (const migration of queue.migrations()) {
+    for (const sql of migration.sql) {
+        await databaseClient.query(sql, [])
+    }
+}
+
+// Create messages
+for (let ix = 0; ix < 500; ix += 1) {
+    await queue
         .channel("myChannel")
         .message
         .create({ 
-            content: "Hello", 
+            content: Buffer.from("Hello"),
             databaseClient,
         })
 }
 
-while(true) {
+// Process messages
+while (true) {
     const dequeueResult = await queue.dequeue({ databaseClient })
-    if(dequeueResult.resultType === "MESSAGE_NOT_AVAILABLE") {
-        await sleep(Math.min(1_000, dequeueResult.retryMs))
+    if (dequeueResult.resultType === "MESSAGE_NOT_AVAILABLE") {
+        const sleepMs = Math.min(1000, dequeueResult.retryMs ?? 5000)
+        await new Promise(resolve => setTimeout(resolve, sleepMs))
         continue
     }
 
-    console.log(dequeueResult.message.content)
+    console.log(dequeueResult.message.content.toString())
     await dequeueResult.message.delete({ databaseClient })
 }
 ```
 
 ## Setup & Installation
 
-LonnyMQ can be installed from npm via:
+LonnyMQ can be installed from npm:
 
 ```bash
 npm install lonnymq
 ```
 
-Once the package is installed, we need to install the requisite DB machinery. LonnyMQ is agnostic to DB client/migration process and thus simply provides users an ordered list of "Migrations" - each containing a unique name and some SQL fragments to be executed.
+Once the package is installed, you need to install the requisite database machinery. LonnyMQ is agnostic to database client and migration process, providing users with an ordered list of "Migrations" - each containing a unique name and SQL fragments to be executed.
 
 ```typescript
 const queue = new Queue({ schema: "lonny" })
 const migrations = queue.migrations()
+
+// Execute migrations (in a transaction for safety)
+await databaseClient.query("BEGIN")
+try {
+    for (const migration of migrations) {
+        for (const sql of migration.sql) {
+            await databaseClient.query(sql, [])
+        }
+    }
+    await databaseClient.query("COMMIT")
+} catch (error) {
+    await databaseClient.query("ROLLBACK")
+    throw error
+}
 ```
 
-N.B. Migration SQL is not idempotent and thus these migrations should be executed in the context of a transaction that can be rolled back.
+**Note:** Migration SQL is not idempotent and should be executed within a transaction that can be rolled back if needed.
 
 ## Channels
 
-Channels are the mechanism by which LonnyMQ provides multi-tenancy support. They can be considered lightweight sub-queues that are read from in a round-robin fashion. There is no performance penalty associated with using large numbers of channels and thus can be assigned on a highly granular (i.e. per-user) basis to ensure work is scheduled fairly.
+Channels provide LonnyMQ's multi-tenancy support. They can be considered lightweight sub-queues that are read from in a round-robin fashion. There is no performance penalty associated with using large numbers of channels, so they can be assigned on a highly granular basis (e.g., per-user) to ensure work is scheduled fairly.
 
-Channels can be configured with concurrency and capacity limits by setting their "channel policy".
+Channels can be configured with concurrency, capacity, and rate limits by setting their "channel policy":
 
 ```typescript
 await queue
     .channel("my-channel")
     .policy
     .set({ 
-        maxConcurrency: 1, 
-        maxSize: null, 
-        databaseClient 
+        databaseClient,
+        maxConcurrency: 1,
+        maxSize: 100,
+        releaseIntervalMs: 1000
     })
 
 // Remove all constraints:
@@ -91,7 +116,7 @@ await queue
 
 ## Message creation
 
-We can add a message to the queue (and assign it to a particular channel) with the `create` function:
+You can add a message to the queue (and assign it to a particular channel) using the `create` function:
 
 ```typescript
 await queue
@@ -99,82 +124,132 @@ await queue
     .message
     .create({
         databaseClient,
-        content: "Hello, world"
+        content: Buffer.from("Hello, world"),
+        name: "optional-dedup-key",
+        lockMs: 30000,  // 30 seconds
+        delayMs: 5000   // 5 second delay
     })
 ```
 
-A `name` argument can be provided for de-duplication purposes: if a message that has _never_ been dequeued exists with the same name, and within the same channel, no new message will be created.
+The `name` argument can be provided for de-duplication purposes: if a message that has *never* been dequeued exists with the same name within the same channel, no new message will be created.
+
+## Message Processing
 
-## Message processing
+Messages can be fetched for processing by calling `dequeue` on the `Queue` - this locks the message. Once processing has completed, messages must be "finalized" via **deletion** or **deferral** (for further processing in the future).
 
-A message can be fetched for processing by calling `dequeue` on the `Queue` - locking the message. Once processing has completed, messages can then be "finalized" via **deletion** or **deferral** (for further processing in the future).
+```typescript
+const dequeueResult = await queue.dequeue({ databaseClient })
+
+if (dequeueResult.resultType === "MESSAGE_DEQUEUED") {
+    const { message } = dequeueResult
+    console.log(`Processing message: ${message.id}`)
+    console.log(`Content: ${message.content.toString()}`)
+    console.log(`Attempts: ${message.numAttempts}`)
+    
+    try {
+        // Process the message...
+        await processMessage(message.content)
+        
+        // Delete on success
+        await message.delete({ databaseClient })
+    } catch (error) {
+        // Defer for retry with updated state
+        await message.defer({ 
+            databaseClient,
+            delays: 30000, // Retry in 30 seconds
+            state: Buffer.from(JSON.stringify({ error: error.message }))
+        })
+    }
+}
+```
 
-When deferring a message, we can optionally specify `deferMs` and `state` arguments. `deferMs` tells the queue how long to wait before allowing the message to be re-processed, and `state` allows us to "save our working" and implement durable and/or repeating/scheduled tasks.
+When deferring a message, you can optionally specify `delayMs` and `state` arguments. The `delayMs` parameter tells the queue how long to wait before allowing the message to be re-processed, and `state` allows you to "save your work" and implement durable and/or repeating/scheduled tasks.
 
-### Graceful shutdowns and message sweeping
+### Graceful Shutdowns and Message Sweeping
 
-If your program ends unexpectedly, messages that are in the middle of being processed may well be "orphaned" in a locked state - causing channel blockages and reducing throughput. To mitigate this problem, it is imperative that we gracefully shutdown by catching unhandled exceptions and signals (i.e. `SIGINT`/`SIGTERM`) - finalizing all outstanding messages prior to exiting.
+If your program ends unexpectedly, messages that are currently being processed may become "orphaned" in a locked state - causing channel blockages and reducing throughput. To mitigate this problem, it's imperative that you gracefully shutdown by catching unhandled exceptions and signals (i.e., `SIGINT`/`SIGTERM`) and finalizing all outstanding messages prior to exiting.
 
-That said, despite our best efforts, should we run out of memory, suffer a loss of power, or receieve a `SIGKILL`, we will be unable to finalize messages that are currently locked. To mitigate this, we set a `lockMs` during message creation (by default this is 1 hour) which limits the maximum amount of time a message can be locked before being available again for dequeue. This facilities ensures that no matter the nature of the shutdown, the queue will always un-clog itself.
+That said, despite our best efforts, if we run out of memory, suffer a loss of power, or receive a `SIGKILL`, we will be unable to finalize messages that are currently locked. To mitigate this, we set a `lockMs` during message creation (by default this is 1 hour) which limits the maximum amount of time a message can be locked before being available again for dequeue. This facility ensures that no matter the nature of the shutdown, the queue will always recover automatically.
 
-## Improvements on polling
+## Improvements on Polling
 
-The simplest approach for processing messages is to call `dequeue` in a loop, and backing off with a sleep when no messages are available. The downside with this approach is that we lose reactivity as we increase the polling timeout interval.
+The simplest approach for processing messages is to call `dequeue` in a loop, backing off with a sleep when no messages are available. The downside with this approach is that we lose reactivity as we increase the polling timeout interval.
 
-To improve reactivity, we can use the `retryMs` returned when we fail to dequeue a message. This will either be `null` or tell us how long until the next message is available for processing (a message might be deferred for a period time). Thus, we can tune our sleep to use the minimum of our `retryMs` and a default poll timeout.
+To improve reactivity, you can use the `retryMs` returned when failing to dequeue a message. This will either be `null` or tell you how long until the next message is available for processing (a message might be deferred for a period of time). Thus, you can tune your sleep to use the minimum of your `retryMs` and a default poll timeout.
 
-Unfortunately, this doesn't help us in situations where a message is created/deferred while a worker is sleeping. However, if we deploy LonnyMQ, with the `useWake` parameter enabled, message creations and deferrals will trigger a payload to the `queue.wakeChannel()` Postgres channel with the amount of milliseconds until said message becomes available for processing encoded as a string payload.
+Unfortunately, this doesn't help in situations where a message is created/deferred while a worker is sleeping. However, if you deploy LonnyMQ with the `useWake` parameter enabled, message creations and deferrals will trigger a payload to the `queue.wakeChannel()` Postgres channel with the number of milliseconds until said message becomes available for processing encoded as a string payload.
 
 ```typescript
 const queue = new Queue({ schema: "lonny" })
 const migrations = queue.migrations({ useWake: true })
 
+// Run migrations with wake enabled...
+
 // LISTEN/NOTIFY only works with a single connection - not on a connection pool.
-const client = await pool.connect()
-await client.query(`LISTEN "${dep.wakeChannel()}"`)
+const client = await databaseClient.connect()
+await client.query(`LISTEN "${queue.wakeChannel()}"`)
 client.on("notification", (msg) => {
     if (msg.channel === queue.wakeChannel()) {
         const deferMs = parseInt(msg.payload as string, 10)
         console.log(`Should wake in ${deferMs} ms`)
+        // Wake up your worker loop here
     }
 })
 ```
 
 ## Deadlocks
 
-If all queue actions are isolated to their own transaction, there is 0 risk of deadlocks occurring. That being said, it is _possible_ to safely bulk perform the following actions within a single transaction if we ensure they are performed in a consistent lexicographical ordering with respect to channel name and message name (if provided):
+If all queue actions are isolated to their own transaction, there is zero risk of deadlocks occurring. That being said, it is *possible* to safely bulk-perform the following actions within a single transaction if we ensure they are performed in a consistent lexicographical ordering with respect to channel name and message name (if provided):
 
-  - Message create
-  - Channel policy set
-  - Channel policy clear
+- Message create
+- Channel policy set  
+- Channel policy clear
 
 Beyond the actions specified above, it is manifestly **unsafe** to bulk-perform any of the remaining actions within a single transaction. Each of these actions should be isolated within their **own** transaction:
 
- - Message dequeue
- - Message defer
- - Message delete
+- Message dequeue
+- Message defer
+- Message delete
+
+## Batching Operations
 
-To help with ensuring commands are ordered consistently, we can create a "Batch" object by calling:
+When you need to perform multiple safe operations (message creation and channel policy changes) within a single transaction, LonnyMQ provides a batching mechanism that automatically handles proper ordering to prevent deadlocks.
+
+The batch interface mirrors the main queue interface - you call `queue.batch()` to create a batch, then use the same `.channel(name).message.create()` and `.channel(name).policy.set/clear()` methods you're already familiar with. The key difference is that batch operations are queued up and don't execute immediately.
+
+The batch system ensures that all operations are executed in a consistent lexicographical order based on channel name and message name, eliminating the possibility of deadlocks when multiple workers are performing bulk operations simultaneously.
 
 ```typescript
 const batch = queue.batch()
-```
 
-This batch object provides a familiar API for message creation and channel policy mutations, but doesn't execute the underlying commands until the underlying batch is explicitly "executed". 
+batch.channel("user-123").message.create({ 
+    content: Buffer.from("Welcome email") 
+})
 
-```typescript
-const results = [
-    batch.channel("foo").message({ content: "hi" }),
-    batch.channel("bar").policy.clear(),
-    batch.channel("bar").message({ content: "hi", name: "foo" }),
-    batch.channel("bar").message({ content: "hi" }),
-]
-```
-Prior to execution, the batch object will perform a sort to ensure actions are ordered consistently
+batch.channel("user-123").policy.set({
+    maxConcurrency: 5,
+    maxSize: 1000,
+    releaseIntervalMs: 100
+})
+
+batch.channel("notifications").message.create({ 
+    content: Buffer.from("Daily digest"),
+    name: "daily-digest-2025-08-29"
+})
+
+batch.channel("analytics").policy.clear()
 
-```typescript
 await batch.execute({ databaseClient })
+```
 
-// Get the 3rd command that was submitted to the batch
-console.log(await results[2].get())
+## Database Clients
+
+LonnyMQ is designed to be database client agnostic, requiring only a minimal interface that most PostgreSQL clients already implement. Your database client must provide a single `query` method with this signature:
+
+```typescript
+interface DatabaseClient {
+    query(sql: string, params: Array<unknown>): Promise<{
+        rows: Array<Record<string, unknown>>
+    }>
+}
 ```

package/dist/index.cjs

@@ -1,15 +1,15 @@
-var{defineProperty:d,getOwnPropertyNames:V,getOwnPropertyDescriptor:X}=Object,K=Object.prototype.hasOwnProperty;var x=new WeakMap,J=(e)=>{var n=x.get(e),a;if(n)return n;if(n=d({},"__esModule",{value:!0}),e&&typeof e==="object"||typeof e==="function")V(e).map((_)=>!K.call(n,_)&&d(n,_,{get:()=>e[_],enumerable:!(a=X(e,_))||a.enumerable}));return x.set(e,n),n};var j=(e,n)=>{for(var a in n)d(e,a,{get:n[a],enumerable:!0,configurable:!0,set:(_)=>n[a]=()=>_})};var re={};j(re,{Queue:()=>y,MessageDequeueCommand:()=>i,MessageDeleteCommand:()=>l,MessageDeferCommand:()=>h,MessageCreateCommand:()=>o,ChannelPolicySetCommand:()=>m,ChannelPolicyClearCommand:()=>r});module.exports=J(re);var E=(e)=>({nodeType:"VALUE",value:e}),t=(e)=>({nodeType:"REF",value:e}),Z=(e)=>({nodeType:"RAW",value:e}),ee=(e)=>{return`'${e.replace(/'/g,"''")}'`},ne=(e)=>{if(e===null)return"NULL";else if(typeof e==="string")return ee(e);else if(typeof e==="number")return e.toString();else if(typeof e==="boolean")return e?"TRUE":"FALSE";else if(e instanceof Date)return`'${e.toISOString()}'`;else if(typeof e==="bigint")return e.toString();else throw new Error(`Unsupported value type: ${typeof e}`)},te=(e)=>{return`"${e.replace(/"/g,'""')}"`},ae=(e)=>{if(e.nodeType==="VALUE")return ne(e.value);else if(e.nodeType==="REF")return te(e.value);else if(e.nodeType==="RAW")return e.value;else throw new Error("Unsupported SQL node type")};var s=(e,...n)=>{let a=[];for(let _=0;_<e.length;_+=1)if(a.push(e[_]),_<n.length)a.push(ae(n[_]));return Z(a.join(""))};class r{schema;channelName;createdAt;constructor(e){this.schema=e.schema,this.channelName=e.channelName,this.createdAt=new Date}sortKeyGet(){return JSON.stringify([this.channelName,null,this.createdAt.toISOString()])}async execute(e){await e.query(s`
+var{defineProperty:d,getOwnPropertyNames:V,getOwnPropertyDescriptor:X}=Object,K=Object.prototype.hasOwnProperty;var y=new WeakMap,J=(e)=>{var n=y.get(e),s;if(n)return n;if(n=d({},"__esModule",{value:!0}),e&&typeof e==="object"||typeof e==="function")V(e).map((_)=>!K.call(n,_)&&d(n,_,{get:()=>e[_],enumerable:!(s=X(e,_))||s.enumerable}));return y.set(e,n),n};var j=(e,n)=>{for(var s in n)d(e,s,{get:n[s],enumerable:!0,configurable:!0,set:(_)=>n[s]=()=>_})};var re={};j(re,{Queue:()=>x,MessageDequeueCommand:()=>i,MessageDeleteCommand:()=>l,MessageDeferCommand:()=>h,MessageCreateCommand:()=>o,ChannelPolicySetCommand:()=>m,ChannelPolicyClearCommand:()=>r});module.exports=J(re);var E=(e)=>({nodeType:"VALUE",value:e}),t=(e)=>({nodeType:"REF",value:e}),Z=(e)=>({nodeType:"RAW",value:e}),ee=(e)=>{return`'${e.replace(/'/g,"''")}'`},ne=(e)=>{if(e===null)return"NULL";else if(typeof e==="string")return ee(e);else if(typeof e==="number")return e.toString();else if(typeof e==="boolean")return e?"TRUE":"FALSE";else if(e instanceof Date)return`'${e.toISOString()}'`;else if(typeof e==="bigint")return e.toString();else throw new Error(`Unsupported value type: ${typeof e}`)},te=(e)=>{return`"${e.replace(/"/g,'""')}"`},se=(e)=>{if(e.nodeType==="VALUE")return ne(e.value);else if(e.nodeType==="REF")return te(e.value);else if(e.nodeType==="RAW")return e.value;else throw new Error("Unsupported SQL node type")};var a=(e,...n)=>{let s=[];for(let _=0;_<e.length;_+=1)if(s.push(e[_]),_<n.length)s.push(se(n[_]));return Z(s.join(""))};class r{schema;channelName;createdAt;constructor(e){this.schema=e.schema,this.channelName=e.channelName,this.createdAt=new Date}sortKeyGet(){return JSON.stringify([this.channelName,null,this.createdAt.toISOString()])}async execute(e){await e.query(a`
             SELECT 1 FROM ${t(this.schema)}."channel_policy_clear"(
                 $1
             )
-        `.value,[this.channelName])}}class m{schema;channelName;maxSize;maxConcurrency;releaseIntervalMs;createdAt;constructor(e){this.schema=e.schema,this.channelName=e.channelName;let n=e.maxConcurrency??null;this.maxConcurrency=n!==null?Math.max(0,n):null;let a=e.maxSize??null;this.maxSize=a!==null?Math.max(0,a):null;let _=e.releaseIntervalMs??null;this.releaseIntervalMs=_!==null?Math.max(0,_):null,this.createdAt=new Date}sortKeyGet(){return JSON.stringify([this.channelName,null,this.createdAt.toISOString()])}async execute(e){await e.query(s`
+        `.value,[this.channelName])}}class m{schema;channelName;maxSize;maxConcurrency;releaseIntervalMs;createdAt;constructor(e){this.schema=e.schema,this.channelName=e.channelName;let n=e.maxConcurrency??null;this.maxConcurrency=n!==null?Math.max(0,n):null;let s=e.maxSize??null;this.maxSize=s!==null?Math.max(0,s):null;let _=e.releaseIntervalMs??null;this.releaseIntervalMs=_!==null?Math.max(0,_):null,this.createdAt=new Date}sortKeyGet(){return JSON.stringify([this.channelName,null,this.createdAt.toISOString()])}async execute(e){await e.query(a`
             SELECT 1 FROM ${t(this.schema)}."channel_policy_set"(
                 $1,
                 $2::INTEGER,
                 $3::INTEGER,
                 $4::INTEGER
             )
-        `.value,[this.channelName,this.maxSize,this.maxConcurrency,this.releaseIntervalMs])}}var R=(e)=>{return e*1000},se=(e)=>{return R(e*60)},f=(e)=>{return se(e*60)};var C=require("node:crypto");class p{value;constructor(e){this.value=e}toString(e){return C.createHash("sha256").update(e).update(this.value).digest("base64").replace(/=/g,"")}}var u=new p("WAKE"),$=!1,N=R(0),q=f(1);var g=require("path"),__filename="/home/runner/work/lonnymq/lonnymq/src/core/path.ts",_e=g.dirname(g.dirname(__filename)),ce=new RegExp(`^${_e}/`),c=(e)=>{return e.replace(ce,"")};var __filename="/home/runner/work/lonnymq/lonnymq/src/migration/04-function-message-create.ts";var F={name:c(__filename),sql:(e)=>{return[s`
+        `.value,[this.channelName,this.maxSize,this.maxConcurrency,this.releaseIntervalMs])}}var R=(e)=>{return e*1000},ae=(e)=>{return R(e*60)},f=(e)=>{return ae(e*60)};var C=require("node:crypto");class p{value;constructor(e){this.value=e}toString(e){return C.createHash("sha256").update(e).update(this.value).digest("base64").replace(/=/g,"")}}var u=new p("WAKE"),q=!1,N=R(0),$=f(1);var g=require("path"),__filename="/home/runner/work/lonnymq/lonnymq/src/core/path.ts",_e=g.dirname(g.dirname(__filename)),ce=new RegExp(`^${_e}/`),c=(e)=>{return e.replace(ce,"")};var __filename="/home/runner/work/lonnymq/lonnymq/src/migration/04-function-message-create.ts";var F={name:c(__filename),sql:(e)=>{return[a`
                 CREATE FUNCTION ${t(e.schema)}."message_create" (
                     p_id UUID,
                     p_channel_name TEXT,
@@ -65,7 +65,8 @@ var{defineProperty:d,getOwnPropertyNames:V,getOwnPropertyDescriptor:X}=Object,K=
                         "max_size",
                         "max_concurrency",
                         "message_next_id",
-                        "message_next_dequeue_after"
+                        "message_next_dequeue_after",
+                        "message_next_seq_no"
                     INTO v_channel_state;
 
                     IF v_channel_state."current_size" >= v_channel_policy."max_size" THEN
@@ -95,6 +96,7 @@ var{defineProperty:d,getOwnPropertyNames:V,getOwnPropertyDescriptor:X}=Object,K=
                         "name" = EXCLUDED."name"
                     RETURNING
                         "id", 
+                        "seq_no",
                         "dequeue_after"
                     INTO v_message;
 
@@ -106,12 +108,14 @@ var{defineProperty:d,getOwnPropertyNames:V,getOwnPropertyDescriptor:X}=Object,K=
 
                     IF 
                         v_channel_state."message_next_id" IS NULL OR
-                        v_channel_state."message_next_dequeue_after" > v_message."dequeue_after"
+                        v_channel_state."message_next_dequeue_after" > v_message."dequeue_after" OR
+                        (v_channel_state."message_next_dequeue_after" = v_message."dequeue_after" AND v_channel_state."message_next_seq_no" > v_message."seq_no")
                     THEN
                         UPDATE ${t(e.schema)}."channel_state" SET
                             "current_size" = v_channel_state."current_size" + 1,
                             "message_next_id" = v_message."id",
-                            "message_next_dequeue_after" = GREATEST(v_now, v_message."dequeue_after")
+                            "message_next_dequeue_after" = GREATEST(v_now, v_message."dequeue_after"),
+                            "message_next_seq_no" = v_message."seq_no"
                         WHERE "id" = v_channel_state."id";
                     ELSE
                         UPDATE ${t(e.schema)}."channel_state" SET
@@ -126,7 +130,7 @@ var{defineProperty:d,getOwnPropertyNames:V,getOwnPropertyDescriptor:X}=Object,K=
                     RETURN;
                 END;
                 $$ LANGUAGE plpgsql;
-            `]}};var M=require("node:crypto");class o{schema;channelName;name;content;lockMs;id;delayMs;createdAt;constructor(e){let n=e.name??null,a=e.lockMs===void 0?q:Math.max(0,e.lockMs),_=e.delayMs===void 0?N:e.delayMs;this.id=M.randomUUID(),this.schema=e.schema,this.channelName=e.channelName,this.content=e.content,this.name=n,this.lockMs=a,this.delayMs=_,this.createdAt=new Date}async execute(e){let n=await e.query(s`
+            `]}};var M=require("node:crypto");class o{schema;channelName;name;content;lockMs;id;delayMs;createdAt;constructor(e){let n=e.name??null,s=e.lockMs===void 0?$:Math.max(0,e.lockMs),_=e.delayMs===void 0?N:e.delayMs;this.id=M.randomUUID(),this.schema=e.schema,this.channelName=e.channelName,this.content=e.content,this.name=n,this.lockMs=s,this.delayMs=_,this.createdAt=new Date}async execute(e){let n=await e.query(a`
             SELECT * FROM ${t(this.schema)}."message_create"(
                 $1, 
                 $2, 
@@ -135,7 +139,7 @@ var{defineProperty:d,getOwnPropertyNames:V,getOwnPropertyDescriptor:X}=Object,K=
                 $5::INTEGER, 
                 $6::INTEGER
             )
-        `.value,[this.id,this.channelName,this.name,this.content,this.lockMs,this.delayMs]).then((a)=>a.rows[0]);if(n.result_code===1)return{resultType:"MESSAGE_DROPPED"};else if(n.result_code===2)return{resultType:"MESSAGE_DEDUPLICATED"};else if(n.result_code===0)return{resultType:"MESSAGE_CREATED"};else throw new Error("Unexpected result")}}var __filename="/home/runner/work/lonnymq/lonnymq/src/migration/05-function-message-dequeue.ts";var G={name:c(__filename),sql:(e)=>{return[s`
+        `.value,[this.id,this.channelName,this.name,this.content,this.lockMs,this.delayMs]).then((s)=>s.rows[0]);if(n.result_code===1)return{resultType:"MESSAGE_DROPPED"};else if(n.result_code===2)return{resultType:"MESSAGE_DEDUPLICATED"};else if(n.result_code===0)return{resultType:"MESSAGE_CREATED"};else throw new Error("Unexpected result")}}var __filename="/home/runner/work/lonnymq/lonnymq/src/migration/05-function-message-dequeue.ts";var G={name:c(__filename),sql:(e)=>{return[a`
                 CREATE FUNCTION ${t(e.schema)}."message_dequeue" ()
                 RETURNS TABLE (
                     result_code INTEGER,
@@ -181,14 +185,12 @@ var{defineProperty:d,getOwnPropertyNames:V,getOwnPropertyDescriptor:X}=Object,K=
 
                         RETURN QUERY SELECT 
                             ${E(1)},
-                            NULL::BYTEA,
-                            NULL::BYTEA,
+                            v_message_locked.content,
+                            v_message_locked.state,
                             JSON_BUILD_OBJECT(
                                 'id', v_message_locked.id,
                                 'channel_name', v_message_locked.channel_name,
-                                'state', v_message_locked.state,
-                                'name', v_message_locked.name
-                                'content', v_message_locked.content,
+                                'name', v_message_locked.name,
                                 'num_attempts', v_message_locked.num_attempts
                             );
                         RETURN;
@@ -248,11 +250,12 @@ var{defineProperty:d,getOwnPropertyNames:V,getOwnPropertyDescriptor:X}=Object,K=
 
                     SELECT
                         "message"."id",
-                        "message"."dequeue_after"
+                        "message"."dequeue_after",
+                        "message"."seq_no"
                     FROM ${t(e.schema)}."message"
                     WHERE NOT "is_locked"
                     AND "channel_name" = v_message_dequeue."channel_name"
-                    ORDER BY "dequeue_after" ASC, "id" ASC
+                    ORDER BY "dequeue_after" ASC, "seq_no" ASC
                     LIMIT 1
                     INTO v_message_next_dequeue;
 
@@ -265,7 +268,8 @@ var{defineProperty:d,getOwnPropertyNames:V,getOwnPropertyDescriptor:X}=Object,K=
                         UPDATE ${t(e.schema)}."channel_state" SET
                             "current_concurrency" = v_channel_state."current_concurrency" + 1,
                             "message_next_id" = v_message_next_dequeue."id",
-                            "message_next_dequeue_after" = v_message_next_dequeue_after
+                            "message_next_dequeue_after" = v_message_next_dequeue_after,
+                            "message_next_seq_no" = v_message_next_dequeue."seq_no"
                         WHERE "id" = v_channel_state."id";
                     ELSE
                         UPDATE ${t(e.schema)}."channel_state" SET
@@ -288,14 +292,14 @@ var{defineProperty:d,getOwnPropertyNames:V,getOwnPropertyDescriptor:X}=Object,K=
                     RETURN;
                 END;
                 $$ LANGUAGE plpgsql;
-            `]}};class i{schema;constructor(e){this.schema=e.schema}async execute(e){let n=await e.query(s`
+            `]}};class i{schema;constructor(e){this.schema=e.schema}async execute(e){let n=await e.query(a`
             SELECT
                 result_code,
                 metadata,
                 content,
                 state
             FROM ${t(this.schema)}."message_dequeue"()
-        `.value,[]).then((a)=>a.rows[0]);if(n.result_code===0)return{resultType:"MESSAGE_NOT_AVAILABLE",retryMs:n.metadata.retry_ms};else if(n.result_code===1)return{resultType:"MESSAGE_DEQUEUED",message:{id:n.metadata.id,channelName:n.metadata.channel_name,name:n.metadata.name,content:n.content,state:n.state,numAttempts:n.metadata.num_attempts}};else throw new Error("Unexpected dequeue result")}}var __filename="/home/runner/work/lonnymq/lonnymq/src/migration/06-function-message-delete.ts";var B={name:c(__filename),sql:(e)=>{return[s`
+        `.value,[]).then((s)=>s.rows[0]);if(n.result_code===0)return{resultType:"MESSAGE_NOT_AVAILABLE",retryMs:n.metadata.retry_ms};else if(n.result_code===1)return{resultType:"MESSAGE_DEQUEUED",message:{id:n.metadata.id,channelName:n.metadata.channel_name,name:n.metadata.name,content:n.content,state:n.state,numAttempts:n.metadata.num_attempts}};else throw new Error("Unexpected dequeue result")}}var __filename="/home/runner/work/lonnymq/lonnymq/src/migration/06-function-message-delete.ts";var B={name:c(__filename),sql:(e)=>{return[a`
                 CREATE FUNCTION ${t(e.schema)}."message_delete" (
                     p_id UUID
                 )
@@ -360,11 +364,11 @@ var{defineProperty:d,getOwnPropertyNames:V,getOwnPropertyDescriptor:X}=Object,K=
                         RETURN;
                 END;
                 $$ LANGUAGE plpgsql;
-            `]}};class l{schema;id;constructor(e){this.schema=e.schema,this.id=e.id}async execute(e){let n=await e.query(s`
+            `]}};class l{schema;id;constructor(e){this.schema=e.schema,this.id=e.id}async execute(e){let n=await e.query(a`
             SELECT * FROM ${t(this.schema)}."message_delete"(
                 $1
             )
-        `.value,[this.id]).then((a)=>a.rows[0]);if(n.result_code===0)return{resultType:"MESSAGE_NOT_FOUND"};else if(n.result_code===1)return{resultType:"STATE_INVALID"};else if(n.result_code===2)return{resultType:"MESSAGE_DELETED"};else throw new Error("Unexpected result")}}var __filename="/home/runner/work/lonnymq/lonnymq/src/migration/07-function-message-defer.ts";var P={name:c(__filename),sql:(e)=>{return[s`
+        `.value,[this.id]).then((s)=>s.rows[0]);if(n.result_code===0)return{resultType:"MESSAGE_NOT_FOUND"};else if(n.result_code===1)return{resultType:"STATE_INVALID"};else if(n.result_code===2)return{resultType:"MESSAGE_DELETED"};else throw new Error("Unexpected result")}}var __filename="/home/runner/work/lonnymq/lonnymq/src/migration/07-function-message-defer.ts";var P={name:c(__filename),sql:(e)=>{return[a`
                 CREATE FUNCTION ${t(e.schema)}."message_defer" (
                     p_id UUID,
                     p_delay_ms INTEGER,
@@ -381,7 +385,8 @@ var{defineProperty:d,getOwnPropertyNames:V,getOwnPropertyDescriptor:X}=Object,K=
                     SELECT
                         "message"."id",
                         "message"."channel_name",
-                        "message"."is_locked"
+                        "message"."is_locked",
+                        "message"."seq_no"
                     FROM ${t(e.schema)}."message"
                     WHERE "id" = p_id
                     FOR UPDATE
@@ -400,7 +405,8 @@ var{defineProperty:d,getOwnPropertyNames:V,getOwnPropertyDescriptor:X}=Object,K=
                     SELECT
                         "channel_state"."current_concurrency",
                         "channel_state"."message_next_id",
-                        "channel_state"."message_next_dequeue_after"
+                        "channel_state"."message_next_dequeue_after",
+                        "channel_state"."message_next_seq_no"
                     FROM ${t(e.schema)}."channel_state"
                     WHERE "name" = v_message."channel_name"
                     FOR UPDATE
@@ -410,12 +416,14 @@ var{defineProperty:d,getOwnPropertyNames:V,getOwnPropertyDescriptor:X}=Object,K=
 
                     IF 
                         v_channel_state."message_next_id" IS NULL OR 
-                        v_channel_state."message_next_dequeue_after" > v_dequeue_after
+                        v_channel_state."message_next_dequeue_after" > v_dequeue_after OR
+                        (v_channel_state."message_next_dequeue_after" = v_dequeue_after AND v_channel_state."message_next_seq_no" > v_message."seq_no")
                     THEN
                         UPDATE ${t(e.schema)}."channel_state" SET
                             "current_concurrency" = v_channel_state."current_concurrency" - 1,
                             "message_next_id" = v_message."id",
-                            "message_next_dequeue_after" = v_dequeue_after
+                            "message_next_dequeue_after" = v_dequeue_after,
+                            "message_next_seq_no" = v_message."seq_no"
                         WHERE "name" = v_message."channel_name";
                     ELSE
                         UPDATE ${t(e.schema)}."channel_state" SET
@@ -436,15 +444,15 @@ var{defineProperty:d,getOwnPropertyNames:V,getOwnPropertyDescriptor:X}=Object,K=
                         RETURN;
                 END;
                 $$ LANGUAGE plpgsql;
-            `]}};class h{schema;id;delayMs;state;constructor(e){let n=e.delayMs===void 0?N:e.delayMs;this.schema=e.schema,this.id=e.id,this.delayMs=n,this.state=e.state??null}async execute(e){let n=await e.query(s`
+            `]}};class h{schema;id;delayMs;state;constructor(e){let n=e.delayMs===void 0?N:e.delayMs;this.schema=e.schema,this.id=e.id,this.delayMs=n,this.state=e.state??null}async execute(e){let n=await e.query(a`
             SELECT * FROM ${t(this.schema)}."message_defer"(
                 $1,
                 $2,
                 $3
             )
-        `.value,[this.id,this.delayMs,this.state]).then((a)=>a.rows[0]);if(n.result_code===0)return{resultType:"MESSAGE_NOT_FOUND"};else if(n.result_code===1)return{resultType:"STATE_INVALID"};else if(n.result_code===2)return{resultType:"MESSAGE_DEFERRED"};else throw new Error("Unexpected result")}}var H=(e)=>{let n=e.split(`
-`),a=Number.MAX_SAFE_INTEGER;for(let _ of n){if(_.trim().length===0)continue;let T=_.search(/\S/);a=Math.min(a,T)}return n.map((_)=>_.slice(a)).join(`
-`).trim()};var __filename="/home/runner/work/lonnymq/lonnymq/src/migration/00-table-channel-policy.ts",k={name:c(__filename),sql:(e)=>{return[s`
+        `.value,[this.id,this.delayMs,this.state]).then((s)=>s.rows[0]);if(n.result_code===0)return{resultType:"MESSAGE_NOT_FOUND"};else if(n.result_code===1)return{resultType:"STATE_INVALID"};else if(n.result_code===2)return{resultType:"MESSAGE_DEFERRED"};else throw new Error("Unexpected result")}}var H=(e)=>{let n=e.split(`
+`),s=Number.MAX_SAFE_INTEGER;for(let _ of n){if(_.trim().length===0)continue;let T=_.search(/\S/);s=Math.min(s,T)}return n.map((_)=>_.slice(s)).join(`
+`).trim()};var __filename="/home/runner/work/lonnymq/lonnymq/src/migration/00-table-channel-policy.ts",k={name:c(__filename),sql:(e)=>{return[a`
                 CREATE TABLE ${t(e.schema)}."channel_policy" (
                     "id" UUID NOT NULL DEFAULT GEN_RANDOM_UUID(),
                     "name" TEXT NOT NULL,
@@ -453,10 +461,10 @@ var{defineProperty:d,getOwnPropertyNames:V,getOwnPropertyDescriptor:X}=Object,K=
                     "release_interval_ms" INTEGER,
                     PRIMARY KEY ("id")
                 );
-            `,s`
+            `,a`
                 CREATE UNIQUE INDEX "channel_policy_name_ux"
                 ON ${t(e.schema)}."channel_policy" ("name");
-            `]}};var __filename="/home/runner/work/lonnymq/lonnymq/src/migration/01-table-channel-state.ts",b={name:c(__filename),sql:(e)=>{return[s`
+            `]}};var __filename="/home/runner/work/lonnymq/lonnymq/src/migration/01-table-channel-state.ts",b={name:c(__filename),sql:(e)=>{return[a`
                 CREATE TABLE ${t(e.schema)}."channel_state" (
                     "id" UUID NOT NULL DEFAULT GEN_RANDOM_UUID(),
                     "name" TEXT NOT NULL,
@@ -467,21 +475,23 @@ var{defineProperty:d,getOwnPropertyNames:V,getOwnPropertyDescriptor:X}=Object,K=
                     "current_concurrency" INTEGER NOT NULL,
                     "message_next_id" UUID,
                     "message_next_dequeue_after" TIMESTAMP,
+                    "message_next_seq_no" BIGINT,
                     PRIMARY KEY ("id")
                 );
-            `,s`
+            `,a`
                 CREATE UNIQUE INDEX "channel_state_name_ux"
                 ON ${t(e.schema)}."channel_state" ("name");
-            `,s`
+            `,a`
                 CREATE INDEX "channel_state_dequeue_ix"
                 ON ${t(e.schema)}."channel_state" (
                     "message_next_dequeue_after" ASC
                 ) WHERE "message_next_id" IS NOT NULL
                 AND ("max_concurrency" IS NULL OR "current_concurrency" < "max_concurrency");
-            `]}};var __filename="/home/runner/work/lonnymq/lonnymq/src/migration/02-table-message.ts",z={name:c(__filename),sql:(e)=>{return[s`
+            `]}};var __filename="/home/runner/work/lonnymq/lonnymq/src/migration/02-table-message.ts",z={name:c(__filename),sql:(e)=>{return[a`
                 CREATE TABLE ${t(e.schema)}."message" (
                     "id" UUID NOT NULL,
                     "channel_name" TEXT NOT NULL,
+                    "seq_no" BIGSERIAL NOT NULL,
                     "name" TEXT,
                     "content" BYTEA NOT NULL,
                     "state" BYTEA,
@@ -491,25 +501,25 @@ var{defineProperty:d,getOwnPropertyNames:V,getOwnPropertyDescriptor:X}=Object,K=
                     "dequeue_after" TIMESTAMP NOT NULL,
                     PRIMARY KEY ("id")
                 );
-            `,s`
+            `,a`
                 CREATE UNIQUE INDEX "message_name_ux"
                 ON ${t(e.schema)}."message" (
                     "channel_name", 
                     "name"
                 ) WHERE "num_attempts" = 0
-            `,s`
+            `,a`
                 CREATE INDEX "message_dequeue_ix"
                 ON ${t(e.schema)}."message" (
                     "channel_name",
                     "dequeue_after" ASC,
-                    "id" ASC
+                    "seq_no" ASC
                 ) WHERE NOT "is_locked";
-            `,s`
+            `,a`
                 CREATE INDEX "message_locked_dequeue_ix"
                 ON ${t(e.schema)}."message" (
                     "dequeue_after" ASC
                 ) WHERE "is_locked";
-            `]}};var __filename="/home/runner/work/lonnymq/lonnymq/src/migration/03-function-wake.ts",w={name:c(__filename),sql:(e)=>{let n=u.toString(e.schema);return[s`
+            `]}};var __filename="/home/runner/work/lonnymq/lonnymq/src/migration/03-function-wake.ts",w={name:c(__filename),sql:(e)=>{let n=u.toString(e.schema);return[a`
                 CREATE FUNCTION ${t(e.schema)}."wake" (
                     p_delay_ms INTEGER
                 ) RETURNS VOID AS $$
@@ -519,7 +529,7 @@ var{defineProperty:d,getOwnPropertyNames:V,getOwnPropertyDescriptor:X}=Object,K=
                     END IF;
                 END;
                 $$ LANGUAGE plpgsql;
-            `]}};var __filename="/home/runner/work/lonnymq/lonnymq/src/migration/08-function-channel-policy-set.ts",W={name:c(__filename),sql:(e)=>{return[s`
+            `]}};var __filename="/home/runner/work/lonnymq/lonnymq/src/migration/08-function-channel-policy-set.ts",W={name:c(__filename),sql:(e)=>{return[a`
                 CREATE FUNCTION ${t(e.schema)}."channel_policy_set" (
                     p_name TEXT,
                     p_max_size INTEGER,
@@ -551,7 +561,7 @@ var{defineProperty:d,getOwnPropertyNames:V,getOwnPropertyDescriptor:X}=Object,K=
                     PERFORM ${t(e.schema)}."wake"(0);
                 END;
                 $$ LANGUAGE plpgsql;
-            `]}};var __filename="/home/runner/work/lonnymq/lonnymq/src/migration/09-function-channel-policy-clear.ts",Y={name:c(__filename),sql:(e)=>{return[s`
+            `]}};var __filename="/home/runner/work/lonnymq/lonnymq/src/migration/09-function-channel-policy-clear.ts",Y={name:c(__filename),sql:(e)=>{return[a`
                 CREATE FUNCTION ${t(e.schema)}."channel_policy_clear" (
                     p_name TEXT
                 ) RETURNS VOID AS $$
@@ -583,4 +593,4 @@ var{defineProperty:d,getOwnPropertyNames:V,getOwnPropertyDescriptor:X}=Object,K=
                     PERFORM ${t(e.schema)}."wake"(0);
                 END;
                 $$ LANGUAGE plpgsql;
-            `]}};class S{schema;channelName;registerFn;constructor(e){this.schema=e.schema,this.channelName=e.channelName,this.registerFn=e.registerFn}create(e){let n=new o({schema:this.schema,channelName:this.channelName,name:e.name,content:e.content,lockMs:e.lockMs,delayMs:e.delayMs}),a=new Promise((_)=>{this.registerFn({sortKey:JSON.stringify([n.channelName,n.name,n.createdAt.toISOString()]),execute:(T)=>n.execute(T).then((Q)=>_(Q))})});return{messageId:n.id,promise:a}}}class A{schema;channelName;registerFn;constructor(e){this.schema=e.schema,this.channelName=e.channelName,this.registerFn=e.registerFn}set(e){let n=new m({schema:this.schema,channelName:this.channelName,maxConcurrency:e.maxConcurrency,maxSize:e.maxSize,releaseIntervalMs:e.releaseIntervalMs});this.registerFn({sortKey:JSON.stringify([n.channelName,null,n.createdAt.toISOString()]),execute:async(a)=>{await n.execute(a)}})}clear(){let e=new r({schema:this.schema,channelName:this.channelName});this.registerFn({sortKey:JSON.stringify([e.channelName,null,e.createdAt.toISOString()]),execute:async(n)=>{await e.execute(n)}})}}class L{policy;message;constructor(e){this.message=new S(e),this.policy=new A(e)}}var Ee=(e,n)=>{return e.sortKey.localeCompare(n.sortKey)};class I{commands;schema;constructor(e){this.commands=[],this.schema=e.schema}channel(e){return new L({schema:this.schema,channelName:e,registerFn:(n)=>{this.commands.push(n)}})}async execute(e){for(let n of this.commands.sort(Ee))await n.execute(e.databaseClient)}}class U{schema;channelName;constructor(e){this.schema=e.schema,this.channelName=e.channelName}async create(e){return new o({schema:this.schema,channelName:this.channelName,name:e.name,content:e.content,lockMs:e.lockMs,delayMs:e.delayMs}).execute(e.databaseClient)}}class D{schema;channelName;constructor(e){this.schema=e.schema,this.channelName=e.channelName}set(e){return new m({schema:this.schema,channelName:this.channelName,maxConcurrency:e.maxConcurrency,maxSize:e.maxSize,releaseIntervalMs:e.releaseIntervalMs}).execute(e.databaseClient)}clear(e){return new r({schema:this.schema,channelName:this.channelName}).execute(e.databaseClient)}}class O{policy;message;constructor(e){this.message=new U({schema:e.schema,channelName:e.channelName}),this.policy=new D({schema:e.schema,channelName:e.channelName})}}class v{schema;id;channelName;name;content;state;numAttempts;constructor(e){this.schema=e.schema,this.id=e.id,this.channelName=e.channelName,this.name=e.name,this.content=e.content,this.state=e.state,this.numAttempts=e.numAttempts}async defer(e){return new h({schema:this.schema,id:this.id,delayMs:e.delayMs,state:e.state}).execute(e.databaseClient)}async delete(e){return new l({schema:this.schema,id:this.id}).execute(e.databaseClient)}}class y{schema;constructor(e){this.schema=e}async dequeue(e){let a=await new i({schema:this.schema}).execute(e.databaseClient);if(a.resultType==="MESSAGE_DEQUEUED")return{resultType:"MESSAGE_DEQUEUED",message:new v({schema:this.schema,id:a.message.id,channelName:a.message.channelName,name:a.message.name,content:a.message.content,state:a.message.state,numAttempts:a.message.numAttempts})};else return a}channel(e){return new O({schema:this.schema,channelName:e})}batch(){return new I({schema:this.schema})}migrations(e){return[k,b,z,w,F,G,B,P,W,Y].map((n)=>({name:n.name,sql:n.sql({schema:this.schema,useWake:e.useWake??$}).map((a)=>H(a.value))})).sort((n,a)=>n.name.localeCompare(a.name))}wakeChannel(){return u.toString(this.schema)}}
+            `]}};class S{schema;channelName;registerFn;constructor(e){this.schema=e.schema,this.channelName=e.channelName,this.registerFn=e.registerFn}create(e){let n=new o({schema:this.schema,channelName:this.channelName,name:e.name,content:e.content,lockMs:e.lockMs,delayMs:e.delayMs}),s=new Promise((_)=>{this.registerFn({sortKey:JSON.stringify([n.channelName,n.name,n.createdAt.toISOString()]),execute:(T)=>n.execute(T).then((Q)=>_(Q))})});return{messageId:n.id,promise:s}}}class A{schema;channelName;registerFn;constructor(e){this.schema=e.schema,this.channelName=e.channelName,this.registerFn=e.registerFn}set(e){let n=new m({schema:this.schema,channelName:this.channelName,maxConcurrency:e.maxConcurrency,maxSize:e.maxSize,releaseIntervalMs:e.releaseIntervalMs});this.registerFn({sortKey:JSON.stringify([n.channelName,null,n.createdAt.toISOString()]),execute:async(s)=>{await n.execute(s)}})}clear(){let e=new r({schema:this.schema,channelName:this.channelName});this.registerFn({sortKey:JSON.stringify([e.channelName,null,e.createdAt.toISOString()]),execute:async(n)=>{await e.execute(n)}})}}class I{policy;message;constructor(e){this.message=new S(e),this.policy=new A(e)}}var Ee=(e,n)=>{return e.sortKey.localeCompare(n.sortKey)};class L{commands;schema;constructor(e){this.commands=[],this.schema=e.schema}channel(e){return new I({schema:this.schema,channelName:e,registerFn:(n)=>{this.commands.push(n)}})}async execute(e){for(let n of this.commands.sort(Ee))await n.execute(e.databaseClient)}}class v{schema;channelName;constructor(e){this.schema=e.schema,this.channelName=e.channelName}async create(e){return new o({schema:this.schema,channelName:this.channelName,name:e.name,content:e.content,lockMs:e.lockMs,delayMs:e.delayMs}).execute(e.databaseClient)}}class U{schema;channelName;constructor(e){this.schema=e.schema,this.channelName=e.channelName}set(e){return new m({schema:this.schema,channelName:this.channelName,maxConcurrency:e.maxConcurrency,maxSize:e.maxSize,releaseIntervalMs:e.releaseIntervalMs}).execute(e.databaseClient)}clear(e){return new r({schema:this.schema,channelName:this.channelName}).execute(e.databaseClient)}}class O{policy;message;constructor(e){this.message=new v({schema:e.schema,channelName:e.channelName}),this.policy=new U({schema:e.schema,channelName:e.channelName})}}class D{schema;id;channelName;name;content;state;numAttempts;constructor(e){this.schema=e.schema,this.id=e.id,this.channelName=e.channelName,this.name=e.name,this.content=e.content,this.state=e.state,this.numAttempts=e.numAttempts}async defer(e){return new h({schema:this.schema,id:this.id,delayMs:e.delayMs,state:e.state}).execute(e.databaseClient)}async delete(e){return new l({schema:this.schema,id:this.id}).execute(e.databaseClient)}}class x{schema;constructor(e){this.schema=e.schema}async dequeue(e){let s=await new i({schema:this.schema}).execute(e.databaseClient);if(s.resultType==="MESSAGE_DEQUEUED")return{resultType:"MESSAGE_DEQUEUED",message:new D({schema:this.schema,id:s.message.id,channelName:s.message.channelName,name:s.message.name,content:s.message.content,state:s.message.state,numAttempts:s.message.numAttempts})};else return s}channel(e){return new O({schema:this.schema,channelName:e})}batch(){return new L({schema:this.schema})}migrations(e){return[k,b,z,w,F,G,B,P,W,Y].map((n)=>({name:n.name,sql:n.sql({schema:this.schema,useWake:e.useWake??q}).map((s)=>H(s.value))})).sort((n,s)=>n.name.localeCompare(s.name))}wakeChannel(){return u.toString(this.schema)}}

package/dist/index.d.ts

@@ -268,7 +268,9 @@ export type MessageDequeueResult = {
 };
 export declare class Queue {
 	private readonly schema;
-	constructor(schema: string);
+	constructor(params: {
+		schema: string;
+	});
 	dequeue(params: {
 		databaseClient: DatabaseClient;
 	}): Promise<MessageDequeueResult>;

package/dist/index.js

@@ -1,15 +1,15 @@
-var c=(e)=>({nodeType:"VALUE",value:e}),n=(e)=>({nodeType:"REF",value:e}),w=(e)=>({nodeType:"RAW",value:e}),W=(e)=>{return`'${e.replace(/'/g,"''")}'`},Y=(e)=>{if(e===null)return"NULL";else if(typeof e==="string")return W(e);else if(typeof e==="number")return e.toString();else if(typeof e==="boolean")return e?"TRUE":"FALSE";else if(e instanceof Date)return`'${e.toISOString()}'`;else if(typeof e==="bigint")return e.toString();else throw new Error(`Unsupported value type: ${typeof e}`)},Q=(e)=>{return`"${e.replace(/"/g,'""')}"`},V=(e)=>{if(e.nodeType==="VALUE")return Y(e.value);else if(e.nodeType==="REF")return Q(e.value);else if(e.nodeType==="RAW")return e.value;else throw new Error("Unsupported SQL node type")};var a=(e,...t)=>{let s=[];for(let E=0;E<e.length;E+=1)if(s.push(e[E]),E<t.length)s.push(V(t[E]));return w(s.join(""))};class r{schema;channelName;createdAt;constructor(e){this.schema=e.schema,this.channelName=e.channelName,this.createdAt=new Date}sortKeyGet(){return JSON.stringify([this.channelName,null,this.createdAt.toISOString()])}async execute(e){await e.query(a`
+var c=(e)=>({nodeType:"VALUE",value:e}),n=(e)=>({nodeType:"REF",value:e}),w=(e)=>({nodeType:"RAW",value:e}),W=(e)=>{return`'${e.replace(/'/g,"''")}'`},Y=(e)=>{if(e===null)return"NULL";else if(typeof e==="string")return W(e);else if(typeof e==="number")return e.toString();else if(typeof e==="boolean")return e?"TRUE":"FALSE";else if(e instanceof Date)return`'${e.toISOString()}'`;else if(typeof e==="bigint")return e.toString();else throw new Error(`Unsupported value type: ${typeof e}`)},Q=(e)=>{return`"${e.replace(/"/g,'""')}"`},V=(e)=>{if(e.nodeType==="VALUE")return Y(e.value);else if(e.nodeType==="REF")return Q(e.value);else if(e.nodeType==="RAW")return e.value;else throw new Error("Unsupported SQL node type")};var s=(e,...t)=>{let a=[];for(let E=0;E<e.length;E+=1)if(a.push(e[E]),E<t.length)a.push(V(t[E]));return w(a.join(""))};class r{schema;channelName;createdAt;constructor(e){this.schema=e.schema,this.channelName=e.channelName,this.createdAt=new Date}sortKeyGet(){return JSON.stringify([this.channelName,null,this.createdAt.toISOString()])}async execute(e){await e.query(s`
             SELECT 1 FROM ${n(this.schema)}."channel_policy_clear"(
                 $1
             )
-        `.value,[this.channelName])}}class m{schema;channelName;maxSize;maxConcurrency;releaseIntervalMs;createdAt;constructor(e){this.schema=e.schema,this.channelName=e.channelName;let t=e.maxConcurrency??null;this.maxConcurrency=t!==null?Math.max(0,t):null;let s=e.maxSize??null;this.maxSize=s!==null?Math.max(0,s):null;let E=e.releaseIntervalMs??null;this.releaseIntervalMs=E!==null?Math.max(0,E):null,this.createdAt=new Date}sortKeyGet(){return JSON.stringify([this.channelName,null,this.createdAt.toISOString()])}async execute(e){await e.query(a`
+        `.value,[this.channelName])}}class m{schema;channelName;maxSize;maxConcurrency;releaseIntervalMs;createdAt;constructor(e){this.schema=e.schema,this.channelName=e.channelName;let t=e.maxConcurrency??null;this.maxConcurrency=t!==null?Math.max(0,t):null;let a=e.maxSize??null;this.maxSize=a!==null?Math.max(0,a):null;let E=e.releaseIntervalMs??null;this.releaseIntervalMs=E!==null?Math.max(0,E):null,this.createdAt=new Date}sortKeyGet(){return JSON.stringify([this.channelName,null,this.createdAt.toISOString()])}async execute(e){await e.query(s`
             SELECT 1 FROM ${n(this.schema)}."channel_policy_set"(
                 $1,
                 $2::INTEGER,
                 $3::INTEGER,
                 $4::INTEGER
             )
-        `.value,[this.channelName,this.maxSize,this.maxConcurrency,this.releaseIntervalMs])}}var d=(e)=>{return e*1000},X=(e)=>{return d(e*60)},O=(e)=>{return X(e*60)};import{createHash as K}from"node:crypto";class v{value;constructor(e){this.value=e}toString(e){return K("sha256").update(e).update(this.value).digest("base64").replace(/=/g,"")}}var i=new v("WAKE"),y=!1,l=d(0),x=O(1);import{dirname as f}from"path";var __filename="/home/runner/work/lonnymq/lonnymq/src/core/path.ts",J=f(f(__filename)),j=new RegExp(`^${J}/`),_=(e)=>{return e.replace(j,"")};var __filename="/home/runner/work/lonnymq/lonnymq/src/migration/04-function-message-create.ts";var C={name:_(__filename),sql:(e)=>{return[a`
+        `.value,[this.channelName,this.maxSize,this.maxConcurrency,this.releaseIntervalMs])}}var d=(e)=>{return e*1000},X=(e)=>{return d(e*60)},O=(e)=>{return X(e*60)};import{createHash as K}from"node:crypto";class D{value;constructor(e){this.value=e}toString(e){return K("sha256").update(e).update(this.value).digest("base64").replace(/=/g,"")}}var i=new D("WAKE"),x=!1,l=d(0),y=O(1);import{dirname as f}from"path";var __filename="/home/runner/work/lonnymq/lonnymq/src/core/path.ts",J=f(f(__filename)),j=new RegExp(`^${J}/`),_=(e)=>{return e.replace(j,"")};var __filename="/home/runner/work/lonnymq/lonnymq/src/migration/04-function-message-create.ts";var C={name:_(__filename),sql:(e)=>{return[s`
                 CREATE FUNCTION ${n(e.schema)}."message_create" (
                     p_id UUID,
                     p_channel_name TEXT,
@@ -65,7 +65,8 @@ var c=(e)=>({nodeType:"VALUE",value:e}),n=(e)=>({nodeType:"REF",value:e}),w=(e)=
                         "max_size",
                         "max_concurrency",
                         "message_next_id",
-                        "message_next_dequeue_after"
+                        "message_next_dequeue_after",
+                        "message_next_seq_no"
                     INTO v_channel_state;
 
                     IF v_channel_state."current_size" >= v_channel_policy."max_size" THEN
@@ -95,6 +96,7 @@ var c=(e)=>({nodeType:"VALUE",value:e}),n=(e)=>({nodeType:"REF",value:e}),w=(e)=
                         "name" = EXCLUDED."name"
                     RETURNING
                         "id", 
+                        "seq_no",
                         "dequeue_after"
                     INTO v_message;
 
@@ -106,12 +108,14 @@ var c=(e)=>({nodeType:"VALUE",value:e}),n=(e)=>({nodeType:"REF",value:e}),w=(e)=
 
                     IF 
                         v_channel_state."message_next_id" IS NULL OR
-                        v_channel_state."message_next_dequeue_after" > v_message."dequeue_after"
+                        v_channel_state."message_next_dequeue_after" > v_message."dequeue_after" OR
+                        (v_channel_state."message_next_dequeue_after" = v_message."dequeue_after" AND v_channel_state."message_next_seq_no" > v_message."seq_no")
                     THEN
                         UPDATE ${n(e.schema)}."channel_state" SET
                             "current_size" = v_channel_state."current_size" + 1,
                             "message_next_id" = v_message."id",
-                            "message_next_dequeue_after" = GREATEST(v_now, v_message."dequeue_after")
+                            "message_next_dequeue_after" = GREATEST(v_now, v_message."dequeue_after"),
+                            "message_next_seq_no" = v_message."seq_no"
                         WHERE "id" = v_channel_state."id";
                     ELSE
                         UPDATE ${n(e.schema)}."channel_state" SET
@@ -126,7 +130,7 @@ var c=(e)=>({nodeType:"VALUE",value:e}),n=(e)=>({nodeType:"REF",value:e}),w=(e)=
                     RETURN;
                 END;
                 $$ LANGUAGE plpgsql;
-            `]}};import{randomUUID as Z}from"node:crypto";class o{schema;channelName;name;content;lockMs;id;delayMs;createdAt;constructor(e){let t=e.name??null,s=e.lockMs===void 0?x:Math.max(0,e.lockMs),E=e.delayMs===void 0?l:e.delayMs;this.id=Z(),this.schema=e.schema,this.channelName=e.channelName,this.content=e.content,this.name=t,this.lockMs=s,this.delayMs=E,this.createdAt=new Date}async execute(e){let t=await e.query(a`
+            `]}};import{randomUUID as Z}from"node:crypto";class o{schema;channelName;name;content;lockMs;id;delayMs;createdAt;constructor(e){let t=e.name??null,a=e.lockMs===void 0?y:Math.max(0,e.lockMs),E=e.delayMs===void 0?l:e.delayMs;this.id=Z(),this.schema=e.schema,this.channelName=e.channelName,this.content=e.content,this.name=t,this.lockMs=a,this.delayMs=E,this.createdAt=new Date}async execute(e){let t=await e.query(s`
             SELECT * FROM ${n(this.schema)}."message_create"(
                 $1, 
                 $2, 
@@ -135,7 +139,7 @@ var c=(e)=>({nodeType:"VALUE",value:e}),n=(e)=>({nodeType:"REF",value:e}),w=(e)=
                 $5::INTEGER, 
                 $6::INTEGER
             )
-        `.value,[this.id,this.channelName,this.name,this.content,this.lockMs,this.delayMs]).then((s)=>s.rows[0]);if(t.result_code===1)return{resultType:"MESSAGE_DROPPED"};else if(t.result_code===2)return{resultType:"MESSAGE_DEDUPLICATED"};else if(t.result_code===0)return{resultType:"MESSAGE_CREATED"};else throw new Error("Unexpected result")}}var __filename="/home/runner/work/lonnymq/lonnymq/src/migration/05-function-message-dequeue.ts";var p={name:_(__filename),sql:(e)=>{return[a`
+        `.value,[this.id,this.channelName,this.name,this.content,this.lockMs,this.delayMs]).then((a)=>a.rows[0]);if(t.result_code===1)return{resultType:"MESSAGE_DROPPED"};else if(t.result_code===2)return{resultType:"MESSAGE_DEDUPLICATED"};else if(t.result_code===0)return{resultType:"MESSAGE_CREATED"};else throw new Error("Unexpected result")}}var __filename="/home/runner/work/lonnymq/lonnymq/src/migration/05-function-message-dequeue.ts";var p={name:_(__filename),sql:(e)=>{return[s`
                 CREATE FUNCTION ${n(e.schema)}."message_dequeue" ()
                 RETURNS TABLE (
                     result_code INTEGER,
@@ -181,14 +185,12 @@ var c=(e)=>({nodeType:"VALUE",value:e}),n=(e)=>({nodeType:"REF",value:e}),w=(e)=
 
                         RETURN QUERY SELECT 
                             ${c(1)},
-                            NULL::BYTEA,
-                            NULL::BYTEA,
+                            v_message_locked.content,
+                            v_message_locked.state,
                             JSON_BUILD_OBJECT(
                                 'id', v_message_locked.id,
                                 'channel_name', v_message_locked.channel_name,
-                                'state', v_message_locked.state,
-                                'name', v_message_locked.name
-                                'content', v_message_locked.content,
+                                'name', v_message_locked.name,
                                 'num_attempts', v_message_locked.num_attempts
                             );
                         RETURN;
@@ -248,11 +250,12 @@ var c=(e)=>({nodeType:"VALUE",value:e}),n=(e)=>({nodeType:"REF",value:e}),w=(e)=
 
                     SELECT
                         "message"."id",
-                        "message"."dequeue_after"
+                        "message"."dequeue_after",
+                        "message"."seq_no"
                     FROM ${n(e.schema)}."message"
                     WHERE NOT "is_locked"
                     AND "channel_name" = v_message_dequeue."channel_name"
-                    ORDER BY "dequeue_after" ASC, "id" ASC
+                    ORDER BY "dequeue_after" ASC, "seq_no" ASC
                     LIMIT 1
                     INTO v_message_next_dequeue;
 
@@ -265,7 +268,8 @@ var c=(e)=>({nodeType:"VALUE",value:e}),n=(e)=>({nodeType:"REF",value:e}),w=(e)=
                         UPDATE ${n(e.schema)}."channel_state" SET
                             "current_concurrency" = v_channel_state."current_concurrency" + 1,
                             "message_next_id" = v_message_next_dequeue."id",
-                            "message_next_dequeue_after" = v_message_next_dequeue_after
+                            "message_next_dequeue_after" = v_message_next_dequeue_after,
+                            "message_next_seq_no" = v_message_next_dequeue."seq_no"
                         WHERE "id" = v_channel_state."id";
                     ELSE
                         UPDATE ${n(e.schema)}."channel_state" SET
@@ -288,14 +292,14 @@ var c=(e)=>({nodeType:"VALUE",value:e}),n=(e)=>({nodeType:"REF",value:e}),w=(e)=
                     RETURN;
                 END;
                 $$ LANGUAGE plpgsql;
-            `]}};class h{schema;constructor(e){this.schema=e.schema}async execute(e){let t=await e.query(a`
+            `]}};class h{schema;constructor(e){this.schema=e.schema}async execute(e){let t=await e.query(s`
             SELECT
                 result_code,
                 metadata,
                 content,
                 state
             FROM ${n(this.schema)}."message_dequeue"()
-        `.value,[]).then((s)=>s.rows[0]);if(t.result_code===0)return{resultType:"MESSAGE_NOT_AVAILABLE",retryMs:t.metadata.retry_ms};else if(t.result_code===1)return{resultType:"MESSAGE_DEQUEUED",message:{id:t.metadata.id,channelName:t.metadata.channel_name,name:t.metadata.name,content:t.content,state:t.state,numAttempts:t.metadata.num_attempts}};else throw new Error("Unexpected dequeue result")}}var __filename="/home/runner/work/lonnymq/lonnymq/src/migration/06-function-message-delete.ts";var $={name:_(__filename),sql:(e)=>{return[a`
+        `.value,[]).then((a)=>a.rows[0]);if(t.result_code===0)return{resultType:"MESSAGE_NOT_AVAILABLE",retryMs:t.metadata.retry_ms};else if(t.result_code===1)return{resultType:"MESSAGE_DEQUEUED",message:{id:t.metadata.id,channelName:t.metadata.channel_name,name:t.metadata.name,content:t.content,state:t.state,numAttempts:t.metadata.num_attempts}};else throw new Error("Unexpected dequeue result")}}var __filename="/home/runner/work/lonnymq/lonnymq/src/migration/06-function-message-delete.ts";var q={name:_(__filename),sql:(e)=>{return[s`
                 CREATE FUNCTION ${n(e.schema)}."message_delete" (
                     p_id UUID
                 )
@@ -360,11 +364,11 @@ var c=(e)=>({nodeType:"VALUE",value:e}),n=(e)=>({nodeType:"REF",value:e}),w=(e)=
                         RETURN;
                 END;
                 $$ LANGUAGE plpgsql;
-            `]}};class u{schema;id;constructor(e){this.schema=e.schema,this.id=e.id}async execute(e){let t=await e.query(a`
+            `]}};class u{schema;id;constructor(e){this.schema=e.schema,this.id=e.id}async execute(e){let t=await e.query(s`
             SELECT * FROM ${n(this.schema)}."message_delete"(
                 $1
             )
-        `.value,[this.id]).then((s)=>s.rows[0]);if(t.result_code===0)return{resultType:"MESSAGE_NOT_FOUND"};else if(t.result_code===1)return{resultType:"STATE_INVALID"};else if(t.result_code===2)return{resultType:"MESSAGE_DELETED"};else throw new Error("Unexpected result")}}var __filename="/home/runner/work/lonnymq/lonnymq/src/migration/07-function-message-defer.ts";var q={name:_(__filename),sql:(e)=>{return[a`
+        `.value,[this.id]).then((a)=>a.rows[0]);if(t.result_code===0)return{resultType:"MESSAGE_NOT_FOUND"};else if(t.result_code===1)return{resultType:"STATE_INVALID"};else if(t.result_code===2)return{resultType:"MESSAGE_DELETED"};else throw new Error("Unexpected result")}}var __filename="/home/runner/work/lonnymq/lonnymq/src/migration/07-function-message-defer.ts";var $={name:_(__filename),sql:(e)=>{return[s`
                 CREATE FUNCTION ${n(e.schema)}."message_defer" (
                     p_id UUID,
                     p_delay_ms INTEGER,
@@ -381,7 +385,8 @@ var c=(e)=>({nodeType:"VALUE",value:e}),n=(e)=>({nodeType:"REF",value:e}),w=(e)=
                     SELECT
                         "message"."id",
                         "message"."channel_name",
-                        "message"."is_locked"
+                        "message"."is_locked",
+                        "message"."seq_no"
                     FROM ${n(e.schema)}."message"
                     WHERE "id" = p_id
                     FOR UPDATE
@@ -400,7 +405,8 @@ var c=(e)=>({nodeType:"VALUE",value:e}),n=(e)=>({nodeType:"REF",value:e}),w=(e)=
                     SELECT
                         "channel_state"."current_concurrency",
                         "channel_state"."message_next_id",
-                        "channel_state"."message_next_dequeue_after"
+                        "channel_state"."message_next_dequeue_after",
+                        "channel_state"."message_next_seq_no"
                     FROM ${n(e.schema)}."channel_state"
                     WHERE "name" = v_message."channel_name"
                     FOR UPDATE
@@ -410,12 +416,14 @@ var c=(e)=>({nodeType:"VALUE",value:e}),n=(e)=>({nodeType:"REF",value:e}),w=(e)=
 
                     IF 
                         v_channel_state."message_next_id" IS NULL OR 
-                        v_channel_state."message_next_dequeue_after" > v_dequeue_after
+                        v_channel_state."message_next_dequeue_after" > v_dequeue_after OR
+                        (v_channel_state."message_next_dequeue_after" = v_dequeue_after AND v_channel_state."message_next_seq_no" > v_message."seq_no")
                     THEN
                         UPDATE ${n(e.schema)}."channel_state" SET
                             "current_concurrency" = v_channel_state."current_concurrency" - 1,
                             "message_next_id" = v_message."id",
-                            "message_next_dequeue_after" = v_dequeue_after
+                            "message_next_dequeue_after" = v_dequeue_after,
+                            "message_next_seq_no" = v_message."seq_no"
                         WHERE "name" = v_message."channel_name";
                     ELSE
                         UPDATE ${n(e.schema)}."channel_state" SET
@@ -436,15 +444,15 @@ var c=(e)=>({nodeType:"VALUE",value:e}),n=(e)=>({nodeType:"REF",value:e}),w=(e)=
                         RETURN;
                 END;
                 $$ LANGUAGE plpgsql;
-            `]}};class N{schema;id;delayMs;state;constructor(e){let t=e.delayMs===void 0?l:e.delayMs;this.schema=e.schema,this.id=e.id,this.delayMs=t,this.state=e.state??null}async execute(e){let t=await e.query(a`
+            `]}};class N{schema;id;delayMs;state;constructor(e){let t=e.delayMs===void 0?l:e.delayMs;this.schema=e.schema,this.id=e.id,this.delayMs=t,this.state=e.state??null}async execute(e){let t=await e.query(s`
             SELECT * FROM ${n(this.schema)}."message_defer"(
                 $1,
                 $2,
                 $3
             )
-        `.value,[this.id,this.delayMs,this.state]).then((s)=>s.rows[0]);if(t.result_code===0)return{resultType:"MESSAGE_NOT_FOUND"};else if(t.result_code===1)return{resultType:"STATE_INVALID"};else if(t.result_code===2)return{resultType:"MESSAGE_DEFERRED"};else throw new Error("Unexpected result")}}var F=(e)=>{let t=e.split(`
-`),s=Number.MAX_SAFE_INTEGER;for(let E of t){if(E.trim().length===0)continue;let T=E.search(/\S/);s=Math.min(s,T)}return t.map((E)=>E.slice(s)).join(`
-`).trim()};var __filename="/home/runner/work/lonnymq/lonnymq/src/migration/00-table-channel-policy.ts",M={name:_(__filename),sql:(e)=>{return[a`
+        `.value,[this.id,this.delayMs,this.state]).then((a)=>a.rows[0]);if(t.result_code===0)return{resultType:"MESSAGE_NOT_FOUND"};else if(t.result_code===1)return{resultType:"STATE_INVALID"};else if(t.result_code===2)return{resultType:"MESSAGE_DEFERRED"};else throw new Error("Unexpected result")}}var F=(e)=>{let t=e.split(`
+`),a=Number.MAX_SAFE_INTEGER;for(let E of t){if(E.trim().length===0)continue;let T=E.search(/\S/);a=Math.min(a,T)}return t.map((E)=>E.slice(a)).join(`
+`).trim()};var __filename="/home/runner/work/lonnymq/lonnymq/src/migration/00-table-channel-policy.ts",M={name:_(__filename),sql:(e)=>{return[s`
                 CREATE TABLE ${n(e.schema)}."channel_policy" (
                     "id" UUID NOT NULL DEFAULT GEN_RANDOM_UUID(),
                     "name" TEXT NOT NULL,
@@ -453,10 +461,10 @@ var c=(e)=>({nodeType:"VALUE",value:e}),n=(e)=>({nodeType:"REF",value:e}),w=(e)=
                     "release_interval_ms" INTEGER,
                     PRIMARY KEY ("id")
                 );
-            `,a`
+            `,s`
                 CREATE UNIQUE INDEX "channel_policy_name_ux"
                 ON ${n(e.schema)}."channel_policy" ("name");
-            `]}};var __filename="/home/runner/work/lonnymq/lonnymq/src/migration/01-table-channel-state.ts",G={name:_(__filename),sql:(e)=>{return[a`
+            `]}};var __filename="/home/runner/work/lonnymq/lonnymq/src/migration/01-table-channel-state.ts",G={name:_(__filename),sql:(e)=>{return[s`
                 CREATE TABLE ${n(e.schema)}."channel_state" (
                     "id" UUID NOT NULL DEFAULT GEN_RANDOM_UUID(),
                     "name" TEXT NOT NULL,
@@ -467,21 +475,23 @@ var c=(e)=>({nodeType:"VALUE",value:e}),n=(e)=>({nodeType:"REF",value:e}),w=(e)=
                     "current_concurrency" INTEGER NOT NULL,
                     "message_next_id" UUID,
                     "message_next_dequeue_after" TIMESTAMP,
+                    "message_next_seq_no" BIGINT,
                     PRIMARY KEY ("id")
                 );
-            `,a`
+            `,s`
                 CREATE UNIQUE INDEX "channel_state_name_ux"
                 ON ${n(e.schema)}."channel_state" ("name");
-            `,a`
+            `,s`
                 CREATE INDEX "channel_state_dequeue_ix"
                 ON ${n(e.schema)}."channel_state" (
                     "message_next_dequeue_after" ASC
                 ) WHERE "message_next_id" IS NOT NULL
                 AND ("max_concurrency" IS NULL OR "current_concurrency" < "max_concurrency");
-            `]}};var __filename="/home/runner/work/lonnymq/lonnymq/src/migration/02-table-message.ts",B={name:_(__filename),sql:(e)=>{return[a`
+            `]}};var __filename="/home/runner/work/lonnymq/lonnymq/src/migration/02-table-message.ts",B={name:_(__filename),sql:(e)=>{return[s`
                 CREATE TABLE ${n(e.schema)}."message" (
                     "id" UUID NOT NULL,
                     "channel_name" TEXT NOT NULL,
+                    "seq_no" BIGSERIAL NOT NULL,
                     "name" TEXT,
                     "content" BYTEA NOT NULL,
                     "state" BYTEA,
@@ -491,25 +501,25 @@ var c=(e)=>({nodeType:"VALUE",value:e}),n=(e)=>({nodeType:"REF",value:e}),w=(e)=
                     "dequeue_after" TIMESTAMP NOT NULL,
                     PRIMARY KEY ("id")
                 );
-            `,a`
+            `,s`
                 CREATE UNIQUE INDEX "message_name_ux"
                 ON ${n(e.schema)}."message" (
                     "channel_name", 
                     "name"
                 ) WHERE "num_attempts" = 0
-            `,a`
+            `,s`
                 CREATE INDEX "message_dequeue_ix"
                 ON ${n(e.schema)}."message" (
                     "channel_name",
                     "dequeue_after" ASC,
-                    "id" ASC
+                    "seq_no" ASC
                 ) WHERE NOT "is_locked";
-            `,a`
+            `,s`
                 CREATE INDEX "message_locked_dequeue_ix"
                 ON ${n(e.schema)}."message" (
                     "dequeue_after" ASC
                 ) WHERE "is_locked";
-            `]}};var __filename="/home/runner/work/lonnymq/lonnymq/src/migration/03-function-wake.ts",P={name:_(__filename),sql:(e)=>{let t=i.toString(e.schema);return[a`
+            `]}};var __filename="/home/runner/work/lonnymq/lonnymq/src/migration/03-function-wake.ts",P={name:_(__filename),sql:(e)=>{let t=i.toString(e.schema);return[s`
                 CREATE FUNCTION ${n(e.schema)}."wake" (
                     p_delay_ms INTEGER
                 ) RETURNS VOID AS $$
@@ -519,7 +529,7 @@ var c=(e)=>({nodeType:"VALUE",value:e}),n=(e)=>({nodeType:"REF",value:e}),w=(e)=
                     END IF;
                 END;
                 $$ LANGUAGE plpgsql;
-            `]}};var __filename="/home/runner/work/lonnymq/lonnymq/src/migration/08-function-channel-policy-set.ts",H={name:_(__filename),sql:(e)=>{return[a`
+            `]}};var __filename="/home/runner/work/lonnymq/lonnymq/src/migration/08-function-channel-policy-set.ts",H={name:_(__filename),sql:(e)=>{return[s`
                 CREATE FUNCTION ${n(e.schema)}."channel_policy_set" (
                     p_name TEXT,
                     p_max_size INTEGER,
@@ -551,7 +561,7 @@ var c=(e)=>({nodeType:"VALUE",value:e}),n=(e)=>({nodeType:"REF",value:e}),w=(e)=
                     PERFORM ${n(e.schema)}."wake"(0);
                 END;
                 $$ LANGUAGE plpgsql;
-            `]}};var __filename="/home/runner/work/lonnymq/lonnymq/src/migration/09-function-channel-policy-clear.ts",k={name:_(__filename),sql:(e)=>{return[a`
+            `]}};var __filename="/home/runner/work/lonnymq/lonnymq/src/migration/09-function-channel-policy-clear.ts",k={name:_(__filename),sql:(e)=>{return[s`
                 CREATE FUNCTION ${n(e.schema)}."channel_policy_clear" (
                     p_name TEXT
                 ) RETURNS VOID AS $$
@@ -583,4 +593,4 @@ var c=(e)=>({nodeType:"VALUE",value:e}),n=(e)=>({nodeType:"REF",value:e}),w=(e)=
                     PERFORM ${n(e.schema)}."wake"(0);
                 END;
                 $$ LANGUAGE plpgsql;
-            `]}};class R{schema;channelName;registerFn;constructor(e){this.schema=e.schema,this.channelName=e.channelName,this.registerFn=e.registerFn}create(e){let t=new o({schema:this.schema,channelName:this.channelName,name:e.name,content:e.content,lockMs:e.lockMs,delayMs:e.delayMs}),s=new Promise((E)=>{this.registerFn({sortKey:JSON.stringify([t.channelName,t.name,t.createdAt.toISOString()]),execute:(T)=>t.execute(T).then((z)=>E(z))})});return{messageId:t.id,promise:s}}}class g{schema;channelName;registerFn;constructor(e){this.schema=e.schema,this.channelName=e.channelName,this.registerFn=e.registerFn}set(e){let t=new m({schema:this.schema,channelName:this.channelName,maxConcurrency:e.maxConcurrency,maxSize:e.maxSize,releaseIntervalMs:e.releaseIntervalMs});this.registerFn({sortKey:JSON.stringify([t.channelName,null,t.createdAt.toISOString()]),execute:async(s)=>{await t.execute(s)}})}clear(){let e=new r({schema:this.schema,channelName:this.channelName});this.registerFn({sortKey:JSON.stringify([e.channelName,null,e.createdAt.toISOString()]),execute:async(t)=>{await e.execute(t)}})}}class S{policy;message;constructor(e){this.message=new R(e),this.policy=new g(e)}}var ee=(e,t)=>{return e.sortKey.localeCompare(t.sortKey)};class A{commands;schema;constructor(e){this.commands=[],this.schema=e.schema}channel(e){return new S({schema:this.schema,channelName:e,registerFn:(t)=>{this.commands.push(t)}})}async execute(e){for(let t of this.commands.sort(ee))await t.execute(e.databaseClient)}}class L{schema;channelName;constructor(e){this.schema=e.schema,this.channelName=e.channelName}async create(e){return new o({schema:this.schema,channelName:this.channelName,name:e.name,content:e.content,lockMs:e.lockMs,delayMs:e.delayMs}).execute(e.databaseClient)}}class I{schema;channelName;constructor(e){this.schema=e.schema,this.channelName=e.channelName}set(e){return new m({schema:this.schema,channelName:this.channelName,maxConcurrency:e.maxConcurrency,maxSize:e.maxSize,releaseIntervalMs:e.releaseIntervalMs}).execute(e.databaseClient)}clear(e){return new r({schema:this.schema,channelName:this.channelName}).execute(e.databaseClient)}}class U{policy;message;constructor(e){this.message=new L({schema:e.schema,channelName:e.channelName}),this.policy=new I({schema:e.schema,channelName:e.channelName})}}class D{schema;id;channelName;name;content;state;numAttempts;constructor(e){this.schema=e.schema,this.id=e.id,this.channelName=e.channelName,this.name=e.name,this.content=e.content,this.state=e.state,this.numAttempts=e.numAttempts}async defer(e){return new N({schema:this.schema,id:this.id,delayMs:e.delayMs,state:e.state}).execute(e.databaseClient)}async delete(e){return new u({schema:this.schema,id:this.id}).execute(e.databaseClient)}}class b{schema;constructor(e){this.schema=e}async dequeue(e){let s=await new h({schema:this.schema}).execute(e.databaseClient);if(s.resultType==="MESSAGE_DEQUEUED")return{resultType:"MESSAGE_DEQUEUED",message:new D({schema:this.schema,id:s.message.id,channelName:s.message.channelName,name:s.message.name,content:s.message.content,state:s.message.state,numAttempts:s.message.numAttempts})};else return s}channel(e){return new U({schema:this.schema,channelName:e})}batch(){return new A({schema:this.schema})}migrations(e){return[M,G,B,P,C,p,$,q,H,k].map((t)=>({name:t.name,sql:t.sql({schema:this.schema,useWake:e.useWake??y}).map((s)=>F(s.value))})).sort((t,s)=>t.name.localeCompare(s.name))}wakeChannel(){return i.toString(this.schema)}}export{b as Queue,h as MessageDequeueCommand,u as MessageDeleteCommand,N as MessageDeferCommand,o as MessageCreateCommand,m as ChannelPolicySetCommand,r as ChannelPolicyClearCommand};
+            `]}};class R{schema;channelName;registerFn;constructor(e){this.schema=e.schema,this.channelName=e.channelName,this.registerFn=e.registerFn}create(e){let t=new o({schema:this.schema,channelName:this.channelName,name:e.name,content:e.content,lockMs:e.lockMs,delayMs:e.delayMs}),a=new Promise((E)=>{this.registerFn({sortKey:JSON.stringify([t.channelName,t.name,t.createdAt.toISOString()]),execute:(T)=>t.execute(T).then((z)=>E(z))})});return{messageId:t.id,promise:a}}}class g{schema;channelName;registerFn;constructor(e){this.schema=e.schema,this.channelName=e.channelName,this.registerFn=e.registerFn}set(e){let t=new m({schema:this.schema,channelName:this.channelName,maxConcurrency:e.maxConcurrency,maxSize:e.maxSize,releaseIntervalMs:e.releaseIntervalMs});this.registerFn({sortKey:JSON.stringify([t.channelName,null,t.createdAt.toISOString()]),execute:async(a)=>{await t.execute(a)}})}clear(){let e=new r({schema:this.schema,channelName:this.channelName});this.registerFn({sortKey:JSON.stringify([e.channelName,null,e.createdAt.toISOString()]),execute:async(t)=>{await e.execute(t)}})}}class S{policy;message;constructor(e){this.message=new R(e),this.policy=new g(e)}}var ee=(e,t)=>{return e.sortKey.localeCompare(t.sortKey)};class A{commands;schema;constructor(e){this.commands=[],this.schema=e.schema}channel(e){return new S({schema:this.schema,channelName:e,registerFn:(t)=>{this.commands.push(t)}})}async execute(e){for(let t of this.commands.sort(ee))await t.execute(e.databaseClient)}}class I{schema;channelName;constructor(e){this.schema=e.schema,this.channelName=e.channelName}async create(e){return new o({schema:this.schema,channelName:this.channelName,name:e.name,content:e.content,lockMs:e.lockMs,delayMs:e.delayMs}).execute(e.databaseClient)}}class L{schema;channelName;constructor(e){this.schema=e.schema,this.channelName=e.channelName}set(e){return new m({schema:this.schema,channelName:this.channelName,maxConcurrency:e.maxConcurrency,maxSize:e.maxSize,releaseIntervalMs:e.releaseIntervalMs}).execute(e.databaseClient)}clear(e){return new r({schema:this.schema,channelName:this.channelName}).execute(e.databaseClient)}}class v{policy;message;constructor(e){this.message=new I({schema:e.schema,channelName:e.channelName}),this.policy=new L({schema:e.schema,channelName:e.channelName})}}class U{schema;id;channelName;name;content;state;numAttempts;constructor(e){this.schema=e.schema,this.id=e.id,this.channelName=e.channelName,this.name=e.name,this.content=e.content,this.state=e.state,this.numAttempts=e.numAttempts}async defer(e){return new N({schema:this.schema,id:this.id,delayMs:e.delayMs,state:e.state}).execute(e.databaseClient)}async delete(e){return new u({schema:this.schema,id:this.id}).execute(e.databaseClient)}}class b{schema;constructor(e){this.schema=e.schema}async dequeue(e){let a=await new h({schema:this.schema}).execute(e.databaseClient);if(a.resultType==="MESSAGE_DEQUEUED")return{resultType:"MESSAGE_DEQUEUED",message:new U({schema:this.schema,id:a.message.id,channelName:a.message.channelName,name:a.message.name,content:a.message.content,state:a.message.state,numAttempts:a.message.numAttempts})};else return a}channel(e){return new v({schema:this.schema,channelName:e})}batch(){return new A({schema:this.schema})}migrations(e){return[M,G,B,P,C,p,q,$,H,k].map((t)=>({name:t.name,sql:t.sql({schema:this.schema,useWake:e.useWake??x}).map((a)=>F(a.value))})).sort((t,a)=>t.name.localeCompare(a.name))}wakeChannel(){return i.toString(this.schema)}}export{b as Queue,h as MessageDequeueCommand,u as MessageDeleteCommand,N as MessageDeferCommand,o as MessageCreateCommand,m as ChannelPolicySetCommand,r as ChannelPolicyClearCommand};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lonnymq",
-  "version": "0.0.6",
+  "version": "0.0.8",
   "type": "module",
   "exports": {
     ".": {