lonnymq 0.0.4 → 0.0.6

package/dist/index.cjs

@@ -1,22 +1,25 @@
-var{defineProperty:R,getOwnPropertyNames:X,getOwnPropertyDescriptor:V}=Object,K=Object.prototype.hasOwnProperty;var f=new WeakMap,Q=(e)=>{var n=f.get(e),_;if(n)return n;if(n=R({},"__esModule",{value:!0}),e&&typeof e==="object"||typeof e==="function")X(e).map((c)=>!K.call(n,c)&&R(n,c,{get:()=>e[c],enumerable:!(_=V(e,c))||_.enumerable}));return f.set(e,n),n};var Y=(e,n)=>{for(var _ in n)R(e,_,{get:n[_],enumerable:!0,configurable:!0,set:(c)=>n[_]=()=>c})};var Ee={};Y(Ee,{Queue:()=>U,MessageDequeueCommand:()=>u,MessageDeleteCommand:()=>h,MessageDeferCommand:()=>N,MessageCreateCommand:()=>m,ChannelPolicySetCommand:()=>o,ChannelPolicyClearCommand:()=>r});module.exports=Q(Ee);var s=(e)=>({nodeType:"VALUE",value:e}),t=(e)=>({nodeType:"REF",value:e}),j=(e)=>({nodeType:"RAW",value:e}),Z=(e)=>{return`'${e.replace(/'/g,"''")}'`},ee=(e)=>{if(e===null)return"NULL";else if(typeof e==="string")return Z(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}`)},ne=(e)=>{return`"${e.replace(/"/g,'""')}"`},te=(e)=>{if(e.nodeType==="VALUE")return ee(e.value);else if(e.nodeType==="REF")return ne(e.value);else if(e.nodeType==="RAW")return e.value;else throw new Error("Unsupported SQL node type")};var a=(e,...n)=>{let _=[];for(let c=0;c<e.length;c+=1)if(_.push(e[c]),c<n.length)_.push(te(n[c]));return j(_.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{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`
             SELECT 1 FROM ${t(this.schema)}."channel_policy_clear"(
-                ${s(this.channelName)}
+                $1
             )
-        `.value)}}class o{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 _=e.maxSize??null;this.maxSize=_!==null?Math.max(0,_):null;let c=e.releaseIntervalMs??null;this.releaseIntervalMs=c!==null?Math.max(0,c):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 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`
             SELECT 1 FROM ${t(this.schema)}."channel_policy_set"(
-                ${s(this.channelName)},
-                ${s(this.maxSize)}::INTEGER,
-                ${s(this.maxConcurrency)}::INTEGER,
-                ${s(this.releaseIntervalMs)}::INTEGER
+                $1,
+                $2::INTEGER,
+                $3::INTEGER,
+                $4::INTEGER
             )
-        `.value)}}var S=(e)=>{return e*1000},_e=(e)=>{return S(e*60)},p=(e)=>{return _e(e*60)};var q=require("node:crypto");class C{value;constructor(e){this.value=e}toString(e){return q.createHash("sha256").update(e).update(this.value).digest("base64").replace(/=/g,"")}}var T=new C("WAKE"),$=!1,d=S(0),F=p(1);var g=require("path"),__filename="/home/runner/work/lonnymq/lonnymq/src/core/path.ts",se=g.dirname(g.dirname(__filename)),ae=new RegExp(`^${se}/`),E=(e)=>{return e.replace(ae,"")};var __filename="/home/runner/work/lonnymq/lonnymq/src/migration/04-function-message-create.ts";var M={name:E(__filename),sql:(e)=>{return[a`
+        `.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`
                 CREATE FUNCTION ${t(e.schema)}."message_create" (
+                    p_id UUID,
                     p_channel_name TEXT,
                     p_name TEXT,
-                    p_content TEXT,
+                    p_content BYTEA,
                     p_lock_ms INTEGER,
                     p_delay_ms INTEGER
-                ) RETURNS JSONB AS $$
+                ) RETURNS TABLE (
+                    result_code INTEGER
+                ) AS $$
                 DECLARE
                     v_now TIMESTAMP;
                     v_channel_policy RECORD;
@@ -27,9 +30,9 @@ var{defineProperty:R,getOwnPropertyNames:X,getOwnPropertyDescriptor:V}=Object,K=
                     v_now := NOW();
 
                     SELECT
-                        "max_size",
-                        "max_concurrency",
-                        "release_interval_ms"
+                        "channel_policy"."max_size",
+                        "channel_policy"."max_concurrency",
+                        "channel_policy"."release_interval_ms"
                     FROM ${t(e.schema)}."channel_policy"
                     WHERE "name" = p_channel_name
                     FOR SHARE
@@ -66,18 +69,20 @@ var{defineProperty:R,getOwnPropertyNames:X,getOwnPropertyDescriptor:V}=Object,K=
                     INTO v_channel_state;
 
                     IF v_channel_state."current_size" >= v_channel_policy."max_size" THEN
-                        RETURN JSONB_BUILD_OBJECT(
-                            'result_code', ${s(1)}
-                        );
+                        RETURN QUERY SELECT
+                            ${E(1)};
+                        RETURN;
                     END IF;
 
                     INSERT INTO ${t(e.schema)}."message" (
+                        "id",
                         "channel_name",
                         "name",
                         "content",
                         "lock_ms",
                         "dequeue_after"
                     ) VALUES (
+                        p_id,
                         p_channel_name,
                         p_name,
                         p_content,
@@ -90,15 +95,13 @@ var{defineProperty:R,getOwnPropertyNames:X,getOwnPropertyDescriptor:V}=Object,K=
                         "name" = EXCLUDED."name"
                     RETURNING
                         "id", 
-                        "xmax",
                         "dequeue_after"
                     INTO v_message;
 
-                    IF v_message."xmax" != 0 THEN
-                        RETURN JSONB_BUILD_OBJECT(
-                            'result_code', ${s(2)},
-                            'id', v_message."id"
-                        );
+                    IF v_message."id" != p_id THEN
+                        RETURN QUERY SELECT 
+                            ${E(2)};
+                        RETURN;
                     END IF;
 
                     IF 
@@ -118,26 +121,30 @@ var{defineProperty:R,getOwnPropertyNames:X,getOwnPropertyDescriptor:V}=Object,K=
 
                     PERFORM ${t(e.schema)}."wake"(GREATEST(0, p_delay_ms));
 
-                    RETURN JSONB_BUILD_OBJECT(
-                        'result_code', ${s(0)},
-                        'id', v_message."id"
-                    );
+                    RETURN QUERY SELECT
+                        ${E(0)};
+                    RETURN;
                 END;
                 $$ LANGUAGE plpgsql;
-            `]}};class m{schema;channelName;name;content;lockMs;delayMs;createdAt;constructor(e){let n=e.name??null,_=e.lockMs===void 0?F:Math.max(0,e.lockMs),c=e.delayMs===void 0?d:e.delayMs;this.schema=e.schema,this.channelName=e.channelName,this.content=e.content,this.name=n,this.lockMs=_,this.delayMs=c,this.createdAt=new Date}async execute(e){let n=await e.query(a`
-            SELECT ${t(this.schema)}."message_create"(
-                ${s(this.channelName)},
-                ${s(this.name)},
-                ${s(this.content)},
-                ${s(this.lockMs)}::INTEGER,
-                ${s(this.delayMs)}::INTEGER
-            ) AS "result"
-        `.value).then((_)=>_.rows[0].result);if(n.result_code===1)return{resultType:"MESSAGE_DROPPED"};else if(n.result_code===2)return{resultType:"MESSAGE_DEDUPLICATED",id:BigInt(n.id)};else if(n.result_code===0)return{resultType:"MESSAGE_CREATED",id:BigInt(n.id)};else throw new Error("Unexpected result")}}var __filename="/home/runner/work/lonnymq/lonnymq/src/migration/05-function-message-dequeue.ts";var G={name:E(__filename),sql:(e)=>{return[a`
+            `]}};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`
+            SELECT * FROM ${t(this.schema)}."message_create"(
+                $1, 
+                $2, 
+                $3, 
+                $4,
+                $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`
                 CREATE FUNCTION ${t(e.schema)}."message_dequeue" ()
-                RETURNS JSONB AS $$
+                RETURNS TABLE (
+                    result_code INTEGER,
+                    content BYTEA,
+                    state BYTEA,
+                    metadata JSON
+                ) AS $$
                 DECLARE
                     v_now TIMESTAMP;
-                    v_dequeue_nonce UUID;
                     v_channel_state RECORD;
                     v_message_locked RECORD;
                     v_retry_after TIMESTAMP;
@@ -146,17 +153,16 @@ var{defineProperty:R,getOwnPropertyNames:X,getOwnPropertyDescriptor:V}=Object,K=
                     v_message_next_dequeue_after TIMESTAMP;
                 BEGIN
                     v_now := NOW();
-                    v_dequeue_nonce := GEN_RANDOM_UUID();
 
                     SELECT
-                        "id",
-                        "name",
-                        "state",
-                        "content",
-                        "channel_name",
-                        "lock_ms",
-                        "dequeue_after",
-                        "num_attempts"
+                        "message"."id",
+                        "message"."name",
+                        "message"."state",
+                        "message"."content",
+                        "message"."channel_name",
+                        "message"."lock_ms",
+                        "message"."dequeue_after",
+                        "message"."num_attempts"
                     FROM ${t(e.schema)}."message"
                     WHERE "is_locked"
                     ORDER BY "dequeue_after" ASC
@@ -168,31 +174,33 @@ var{defineProperty:R,getOwnPropertyNames:X,getOwnPropertyDescriptor:V}=Object,K=
                     IF v_message_locked."dequeue_after" <= v_now THEN
                         UPDATE ${t(e.schema)}."message" SET
                             "num_attempts" = v_message_locked."num_attempts" + 1,
-                            "dequeue_after" = v_now + (v_message_locked."lock_ms" * INTERVAL '1 millisecond'),
-                            "dequeue_nonce" = v_dequeue_nonce
+                            "dequeue_after" = v_now + (v_message_locked."lock_ms" * INTERVAL '1 millisecond')
                         WHERE "id" = v_message_locked."id";
 
                         PERFORM ${t(e.schema)}."wake"(v_message_locked."lock_ms");
 
-                        RETURN JSONB_BUILD_OBJECT(
-                            'result_code', ${s(1)},
-                            'id', v_message_locked.id,
-                            'channel_name', v_message_locked.channel_name,
-                            'state', v_message_locked.state,
-                            'name', v_message_locked.name,
-                            'dequeue_nonce', v_dequeue_nonce,
-                            'content', v_message_locked.content,
-                            'num_attempts', v_message_locked.num_attempts
-                        );
+                        RETURN QUERY SELECT 
+                            ${E(1)},
+                            NULL::BYTEA,
+                            NULL::BYTEA,
+                            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,
+                                'num_attempts', v_message_locked.num_attempts
+                            );
+                        RETURN;
                     END IF;
 
                     SELECT
-                        "id",
-                        "name",
-                        "release_interval_ms",
-                        "message_next_id",
-                        "message_next_dequeue_after",
-                        "current_concurrency"
+                        "channel_state"."id",
+                        "channel_state"."name",
+                        "channel_state"."release_interval_ms",
+                        "channel_state"."message_next_id",
+                        "channel_state"."message_next_dequeue_after",
+                        "channel_state"."current_concurrency"
                     FROM ${t(e.schema)}."channel_state"
                     WHERE "message_next_id" IS NOT NULL
                     AND ("max_concurrency" IS NULL OR "current_concurrency" < "max_concurrency")
@@ -208,20 +216,24 @@ var{defineProperty:R,getOwnPropertyNames:X,getOwnPropertyDescriptor:V}=Object,K=
                             v_message_locked."dequeue_after"
                         );
 
-                        RETURN JSONB_BUILD_OBJECT(
-                            'result_code', ${s(0)},
-                            'retry_ms', CEIL(EXTRACT(MILLISECOND FROM v_retry_after - v_now))
-                        );
+                        RETURN QUERY SELECT
+                            ${E(0)},
+                            NULL::BYTEA,
+                            NULL::BYTEA,
+                            JSON_BUILD_OBJECT(
+                                'retry_ms', CEIL(EXTRACT(MILLISECOND FROM v_retry_after - v_now))
+                            );
+                        RETURN;
                     END IF;
 
                     SELECT
-                        "id",
-                        "name",
-                        "channel_name",
-                        "content",
-                        "num_attempts",
-                        "state",
-                        "lock_ms"
+                        "message"."id",
+                        "message"."name",
+                        "message"."channel_name",
+                        "message"."content",
+                        "message"."num_attempts",
+                        "message"."state",
+                        "message"."lock_ms"
                     FROM ${t(e.schema)}."message"
                     WHERE "id" = v_channel_state."message_next_id"
                     INTO v_message_dequeue;
@@ -229,15 +241,14 @@ var{defineProperty:R,getOwnPropertyNames:X,getOwnPropertyDescriptor:V}=Object,K=
                     UPDATE ${t(e.schema)}."message" SET
                         "is_locked" = TRUE,
                         "num_attempts" = v_message_dequeue."num_attempts" + 1,
-                        "dequeue_nonce" = v_dequeue_nonce,
                         "dequeue_after" = v_now + (v_message_dequeue."lock_ms" * INTERVAL '1 millisecond')
                     WHERE "id" = v_message_dequeue."id";
 
                     PERFORM ${t(e.schema)}."wake"(v_message_dequeue."lock_ms");
 
                     SELECT
-                        "id",
-                        "dequeue_after"
+                        "message"."id",
+                        "message"."dequeue_after"
                     FROM ${t(e.schema)}."message"
                     WHERE NOT "is_locked"
                     AND "channel_name" = v_message_dequeue."channel_name"
@@ -264,61 +275,68 @@ var{defineProperty:R,getOwnPropertyNames:X,getOwnPropertyDescriptor:V}=Object,K=
                     END IF;
 
 
-                    RETURN JSONB_BUILD_OBJECT(
-                        'result_code', ${s(1)},
-                        'id', v_message_dequeue.id,
-                        'channel_name', v_message_dequeue.channel_name,
-                        'state', v_message_dequeue.state,
-                        'dequeue_nonce', v_dequeue_nonce,
-                        'name', v_message_dequeue.name,
-                        'content', v_message_dequeue.content,
-                        'num_attempts', v_message_dequeue.num_attempts
-                    );
+                    RETURN QUERY SELECT
+                        ${E(1)},
+                        v_message_dequeue.content,
+                        v_message_dequeue.state,
+                        JSON_BUILD_OBJECT(
+                            'id', v_message_dequeue.id,
+                            'channel_name', v_message_dequeue.channel_name,
+                            'name', v_message_dequeue.name,
+                            'num_attempts', v_message_dequeue.num_attempts
+                        );
+                    RETURN;
                 END;
                 $$ LANGUAGE plpgsql;
-            `]}};class u{schema;constructor(e){this.schema=e.schema}async execute(e){let n=await e.query(a`
-            SELECT ${t(this.schema)}."message_dequeue"() AS "result"
-        `.value).then((_)=>_.rows[0].result);if(n.result_code===0)return{resultType:"MESSAGE_NOT_AVAILABLE",retryMs:n.retry_ms};else if(n.result_code===1)return{resultType:"MESSAGE_DEQUEUED",message:{id:BigInt(n.id),channelName:n.channel_name,name:n.name,content:n.content,dequeueNonce:n.dequeue_nonce,state:n.state,numAttempts:n.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:E(__filename),sql:(e)=>{return[a`
+            `]}};class i{schema;constructor(e){this.schema=e.schema}async execute(e){let n=await e.query(s`
+            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`
                 CREATE FUNCTION ${t(e.schema)}."message_delete" (
-                    p_id BIGINT,
-                    p_dequeue_nonce UUID
+                    p_id UUID
                 )
-                RETURNS JSONB AS $$
+                RETURNS TABLE (
+                    result_code INTEGER
+                ) AS $$
                 DECLARE
                     v_channel_policy RECORD;
                     v_channel_state RECORD;
                     v_message RECORD;
                 BEGIN
                     SELECT
-                        "id",
-                        "channel_name",
-                        "dequeue_nonce"
+                        "message"."id",
+                        "message"."channel_name",
+                        "message"."is_locked"
                     FROM ${t(e.schema)}."message"
                     WHERE "id" = p_id
                     FOR UPDATE
                     INTO v_message;
 
                     IF v_message."id" IS NULL THEN
-                        RETURN JSONB_BUILD_OBJECT(
-                            'result_code', ${s(0)}
-                        );
-                    ELSEIF v_message."dequeue_nonce" != p_dequeue_nonce THEN
-                        RETURN JSONB_BUILD_OBJECT(
-                            'result_code', ${s(1)}
-                        );
+                        RETURN QUERY SELECT
+                            ${E(0)};
+                        RETURN;
+                    ELSIF NOT v_message."is_locked" THEN
+                        RETURN QUERY SELECT
+                            ${E(1)};
+                        RETURN;
                     END IF;
 
                     SELECT
-                        "id"
+                        "channel_policy"."id"
                     FROM ${t(e.schema)}."channel_policy"
                     WHERE "name" = v_message."channel_name"
                     FOR SHARE
                     INTO v_channel_policy;
 
                     SELECT
-                        "id",
-                        "current_size",
-                        "current_concurrency"
+                        "channel_state"."id",
+                        "channel_state"."current_size",
+                        "channel_state"."current_concurrency"
                     FROM ${t(e.schema)}."channel_state"
                     WHERE "name" = v_message."channel_name"
                     FOR UPDATE
@@ -337,51 +355,52 @@ var{defineProperty:R,getOwnPropertyNames:X,getOwnPropertyDescriptor:V}=Object,K=
                     DELETE FROM ${t(e.schema)}."message"
                     WHERE "id" = p_id;
 
-                    RETURN JSONB_BUILD_OBJECT(
-                        'result_code', ${s(2)}
-                    );
+                        RETURN QUERY SELECT
+                            ${E(2)};
+                        RETURN;
                 END;
                 $$ LANGUAGE plpgsql;
-            `]}};class h{schema;id;dequeueNonce;constructor(e){this.schema=e.schema,this.id=e.id,this.dequeueNonce=e.dequeueNonce}async execute(e){let n=await e.query(a`
-            SELECT ${t(this.schema)}."message_delete"( ${s(this.id)},
-                ${s(this.dequeueNonce)}
-            ) AS "result"
-        `.value).then((_)=>_.rows[0].result);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:E(__filename),sql:(e)=>{return[a`
+            `]}};class l{schema;id;constructor(e){this.schema=e.schema,this.id=e.id}async execute(e){let n=await e.query(s`
+            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`
                 CREATE FUNCTION ${t(e.schema)}."message_defer" (
-                    p_id BIGINT,
-                    p_dequeue_nonce UUID,
+                    p_id UUID,
                     p_delay_ms INTEGER,
-                    p_state TEXT
+                    p_state BYTEA
                 )
-                RETURNS JSONB AS $$
+                RETURNS TABLE (
+                    result_code INTEGER
+                ) AS $$
                 DECLARE
                     v_channel_state RECORD;
                     v_dequeue_after TIMESTAMP;
                     v_message RECORD;
                 BEGIN
                     SELECT
-                        "id",
-                        "channel_name",
-                        "dequeue_nonce"
+                        "message"."id",
+                        "message"."channel_name",
+                        "message"."is_locked"
                     FROM ${t(e.schema)}."message"
                     WHERE "id" = p_id
                     FOR UPDATE
                     INTO v_message;
 
                     IF v_message."id" IS NULL THEN
-                        RETURN JSONB_BUILD_OBJECT(
-                            'result_code', ${s(0)}
-                        );
-                    ELSEIF v_message."dequeue_nonce" != p_dequeue_nonce THEN
-                        RETURN JSONB_BUILD_OBJECT(
-                            'result_code', ${s(1)}
-                        );
+                        RETURN QUERY SELECT
+                            ${E(0)};
+                        RETURN;
+                    ELSIF NOT v_message."is_locked" THEN
+                        RETURN QUERY SELECT
+                            ${E(1)};
+                        RETURN;
                     END IF;
 
                     SELECT
-                        "current_concurrency",
-                        "message_next_id",
-                        "message_next_dequeue_after"
+                        "channel_state"."current_concurrency",
+                        "channel_state"."message_next_id",
+                        "channel_state"."message_next_dequeue_after"
                     FROM ${t(e.schema)}."channel_state"
                     WHERE "name" = v_message."channel_name"
                     FOR UPDATE
@@ -412,97 +431,95 @@ var{defineProperty:R,getOwnPropertyNames:X,getOwnPropertyDescriptor:V}=Object,K=
 
                     PERFORM ${t(e.schema)}."wake"(GREATEST(0, p_delay_ms));
 
-                    RETURN JSONB_BUILD_OBJECT(
-                        'result_code', ${s(2)}
-                    );
+                        RETURN QUERY SELECT
+                            ${E(2)};
+                        RETURN;
                 END;
                 $$ LANGUAGE plpgsql;
-            `]}};class N{schema;id;dequeueNonce;delayMs;state;constructor(e){let n=e.delayMs===void 0?d:e.delayMs;this.schema=e.schema,this.id=e.id,this.dequeueNonce=e.dequeueNonce,this.delayMs=n,this.state=e.state??null}async execute(e){let n=await e.query(a`
-            SELECT ${t(this.schema)}."message_defer"(
-                ${s(this.id)},
-                ${s(this.dequeueNonce)},
-                ${s(this.delayMs)},
-                ${s(this.state)}
-            ) AS "result"
-        `.value).then((_)=>_.rows[0].result);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(`
-`),_=Number.MAX_SAFE_INTEGER;for(let c of n){if(c.trim().length===0)continue;let l=c.search(/\S/);_=Math.min(_,l)}return n.map((c)=>c.slice(_)).join(`
-`).trim()};var __filename="/home/runner/work/lonnymq/lonnymq/src/migration/00-table-channel-policy.ts",b={name:E(__filename),sql:(e)=>{return[a`
+            `]}};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`
+            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`
                 CREATE TABLE ${t(e.schema)}."channel_policy" (
-                    "id" BIGSERIAL NOT NULL,
+                    "id" UUID NOT NULL DEFAULT GEN_RANDOM_UUID(),
                     "name" TEXT NOT NULL,
                     "max_size" INTEGER,
                     "max_concurrency" INTEGER,
                     "release_interval_ms" INTEGER,
                     PRIMARY KEY ("id")
                 );
-            `,a`
+            `,s`
                 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",k={name:E(__filename),sql:(e)=>{return[a`
+            `]}};var __filename="/home/runner/work/lonnymq/lonnymq/src/migration/01-table-channel-state.ts",b={name:c(__filename),sql:(e)=>{return[s`
                 CREATE TABLE ${t(e.schema)}."channel_state" (
-                    "id" BIGSERIAL NOT NULL,
+                    "id" UUID NOT NULL DEFAULT GEN_RANDOM_UUID(),
                     "name" TEXT NOT NULL,
                     "max_size" INTEGER,
                     "max_concurrency" INTEGER,
                     "release_interval_ms" INTEGER,
                     "current_size" INTEGER NOT NULL,
                     "current_concurrency" INTEGER NOT NULL,
-                    "message_next_id" BIGINT,
+                    "message_next_id" UUID,
                     "message_next_dequeue_after" TIMESTAMP,
                     PRIMARY KEY ("id")
                 );
-            `,a`
+            `,s`
                 CREATE UNIQUE INDEX "channel_state_name_ux"
                 ON ${t(e.schema)}."channel_state" ("name");
-            `,a`
+            `,s`
                 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:E(__filename),sql:(e)=>{return[a`
+            `]}};var __filename="/home/runner/work/lonnymq/lonnymq/src/migration/02-table-message.ts",z={name:c(__filename),sql:(e)=>{return[s`
                 CREATE TABLE ${t(e.schema)}."message" (
-                    "id" BIGSERIAL NOT NULL,
+                    "id" UUID NOT NULL,
                     "channel_name" TEXT NOT NULL,
-                    "dequeue_nonce" UUID,
                     "name" TEXT,
-                    "content" TEXT NOT NULL,
-                    "state" TEXT,
+                    "content" BYTEA NOT NULL,
+                    "state" BYTEA,
                     "lock_ms" INTEGER NOT NULL,
                     "is_locked" BOOLEAN NOT NULL DEFAULT FALSE,
                     "num_attempts" INTEGER NOT NULL DEFAULT 0,
                     "dequeue_after" TIMESTAMP NOT NULL,
                     PRIMARY KEY ("id")
                 );
-            `,a`
+            `,s`
                 CREATE UNIQUE INDEX "message_name_ux"
                 ON ${t(e.schema)}."message" (
                     "channel_name", 
                     "name"
                 ) WHERE "num_attempts" = 0
-            `,a`
+            `,s`
                 CREATE INDEX "message_dequeue_ix"
                 ON ${t(e.schema)}."message" (
                     "channel_name",
                     "dequeue_after" ASC,
                     "id" ASC
                 ) WHERE NOT "is_locked";
-            `,a`
+            `,s`
                 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:E(__filename),sql:(e)=>{let n=T.toString(e.schema);return[a`
+            `]}};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`
                 CREATE FUNCTION ${t(e.schema)}."wake" (
                     p_delay_ms INTEGER
                 ) RETURNS VOID AS $$
                 BEGIN
-                    IF ${s(e.useWake)} THEN
-                        PERFORM PG_NOTIFY(${s(n)}, p_delay_ms::TEXT);
+                    IF ${E(e.useWake)} THEN
+                        PERFORM PG_NOTIFY(${E(n)}, p_delay_ms::TEXT);
                     END IF;
                 END;
                 $$ LANGUAGE plpgsql;
-            `]}};var __filename="/home/runner/work/lonnymq/lonnymq/src/migration/08-function-channel-policy-set.ts",W={name:E(__filename),sql:(e)=>{return[a`
+            `]}};var __filename="/home/runner/work/lonnymq/lonnymq/src/migration/08-function-channel-policy-set.ts",W={name:c(__filename),sql:(e)=>{return[s`
                 CREATE FUNCTION ${t(e.schema)}."channel_policy_set" (
                     p_name TEXT,
                     p_max_size INTEGER,
@@ -534,7 +551,7 @@ var{defineProperty:R,getOwnPropertyNames:X,getOwnPropertyDescriptor:V}=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",J={name:E(__filename),sql:(e)=>{return[a`
+            `]}};var __filename="/home/runner/work/lonnymq/lonnymq/src/migration/09-function-channel-policy-clear.ts",Y={name:c(__filename),sql:(e)=>{return[s`
                 CREATE FUNCTION ${t(e.schema)}."channel_policy_clear" (
                     p_name TEXT
                 ) RETURNS VOID AS $$
@@ -545,8 +562,8 @@ var{defineProperty:R,getOwnPropertyNames:X,getOwnPropertyDescriptor:V}=Object,K=
                     WHERE "name" = p_name;
 
                     SELECT
-                        "id",
-                        "current_size"
+                        "channel_state"."id",
+                        "channel_state"."current_size"
                     FROM ${t(e.schema)}."channel_state"
                     WHERE "name" = p_name
                     FOR UPDATE
@@ -566,4 +583,4 @@ var{defineProperty:R,getOwnPropertyNames:X,getOwnPropertyDescriptor:V}=Object,K=
                     PERFORM ${t(e.schema)}."wake"(0);
                 END;
                 $$ LANGUAGE plpgsql;
-            `]}};class i{value;isSet;constructor(){this.isSet=!1,this.value=null}get(){return this.isSet?{resultType:"RESULT_SET",value:this.value}:{resultType:"RESULT_NOT_SET"}}set(e){this.isSet=!0,this.value=e}}class I{schema;channelName;registerFn;constructor(e){this.schema=e.schema,this.channelName=e.channelName,this.registerFn=e.registerFn}create(e){let n=new m({schema:this.schema,channelName:this.channelName,name:e.name,content:e.content,lockMs:e.lockMs,delayMs:e.delayMs}),_=new i;return this.registerFn({sortKey:JSON.stringify([n.channelName,n.name,n.createdAt.toISOString()]),execute:(c)=>n.execute(c).then((l)=>_.set(l))}),_}}class O{schema;channelName;registerFn;constructor(e){this.schema=e.schema,this.channelName=e.channelName,this.registerFn=e.registerFn}set(e){let n=new o({schema:this.schema,channelName:this.channelName,maxConcurrency:e.maxConcurrency,maxSize:e.maxSize,releaseIntervalMs:e.releaseIntervalMs}),_=new i;return this.registerFn({sortKey:JSON.stringify([n.channelName,null,n.createdAt.toISOString()]),execute:(c)=>n.execute(c).then((l)=>_.set(l))}),_}clear(){let e=new r({schema:this.schema,channelName:this.channelName}),n=new i;return this.registerFn({sortKey:JSON.stringify([e.channelName,null,e.createdAt.toISOString()]),execute:(_)=>e.execute(_).then((c)=>n.set(c))}),n}}class A{policy;message;constructor(e){this.message=new I(e),this.policy=new O(e)}}var ce=(e,n)=>{return e.sortKey.localeCompare(n.sortKey)};class L{commands;schema;constructor(e){this.commands=[],this.schema=e.schema}channel(e){return new A({schema:this.schema,channelName:e,registerFn:(n)=>{this.commands.push(n)}})}async execute(e){for(let n of this.commands.sort(ce))await n.execute(e.databaseClient)}}class v{schema;channelName;constructor(e){this.schema=e.schema,this.channelName=e.channelName}async create(e){return new m({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 o({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 y{policy;message;constructor(e){this.message=new v({schema:e.schema,channelName:e.channelName}),this.policy=new D({schema:e.schema,channelName:e.channelName})}}class x{schema;id;channelName;name;content;dequeueNonce;state;numAttempts;constructor(e){this.schema=e.schema,this.id=e.id,this.channelName=e.channelName,this.dequeueNonce=e.dequeueNonce,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,dequeueNonce:this.dequeueNonce,delayMs:e.delayMs,state:e.state}).execute(e.databaseClient)}async delete(e){return new h({schema:this.schema,id:this.id,dequeueNonce:this.dequeueNonce}).execute(e.databaseClient)}}class U{schema;constructor(e){this.schema=e}async dequeue(e){let _=await new u({schema:this.schema}).execute(e.databaseClient);if(_.resultType==="MESSAGE_DEQUEUED")return{resultType:"MESSAGE_DEQUEUED",message:new x({schema:this.schema,id:_.message.id,dequeueNonce:_.message.dequeueNonce,channelName:_.message.channelName,name:_.message.name,content:_.message.content,state:_.message.state,numAttempts:_.message.numAttempts})};else return _}channel(e){return new y({schema:this.schema,channelName:e})}batch(){return new L({schema:this.schema})}migrations(e){return[b,k,z,w,M,G,B,P,W,J].map((n)=>({name:n.name,sql:n.sql({schema:this.schema,useWake:e.useWake??$}).map((_)=>H(_.value))})).sort((n,_)=>n.name.localeCompare(_.name))}wakeChannel(){return T.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}),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)}}