@rubytech/create-maxy-code 0.1.468 → 0.1.469

package/payload/server/{chunk-FOYHK255.js → chunk-56WJMBQQ.js}

@@ -151,8 +151,8 @@ function objectUrl(accountId, bucket, key) {
   return `https://api.cloudflare.com/client/v4/accounts/${accountId}/r2/buckets/${encodeURIComponent(bucket)}/objects/${encodeObjectKey(key)}`;
 }
 var defaultFetch = (url, init) => fetch(url, init);
-var defaultRun2 = (cmd, args, env) => new Promise((resolve, reject) => {
-  execFile2(cmd, args, { env }, (err, stdout, stderr) => {
+var defaultRun2 = (cmd, args, env, opts) => new Promise((resolve, reject) => {
+  execFile2(cmd, args, { env, cwd: opts?.cwd }, (err, stdout, stderr) => {
     if (err) {
       reject(new Error(`${cmd} ${args.join(" ")} failed: ${err.message}
 ${stderr}`));
@@ -343,7 +343,7 @@ function makeCfExec(cred, run = defaultRun2, fetchFn = defaultFetch) {
     async pagesDeploy(dir, project, branch) {
       const args = ["wrangler", "pages", "deploy", dir, "--project-name", project];
       if (branch !== void 0) args.push("--branch", branch);
-      const { stdout } = await run("npx", args, env);
+      const { stdout } = await run("npx", args, env, { cwd: dir });
       const plain = stdout.replace(/\[[0-9;]*m/g, "");
       const urls = plain.match(/https:\/\/[A-Za-z0-9._-]+\.pages\.dev/g);
       const url = urls?.[urls.length - 1];

package/payload/server/server.js

@@ -126,7 +126,7 @@ import {
   registerResource,
   resolveOwner,
   tooLargeMessage
-} from "./chunk-FOYHK255.js";
+} from "./chunk-56WJMBQQ.js";
 import {
   __commonJS,
   __toESM
@@ -5316,9 +5316,6 @@ function getStatus() {
     terminalReason: conn.terminalReason
   }));
 }
-function getSocket(accountId) {
-  return connections.get(accountId)?.sock ?? null;
-}
 function findConnectionByKey(conns, accountId) {
   return conns.find((c) => c.accountId === accountId) ?? conns.find((c) => c.platformAccountId === accountId);
 }
@@ -7085,6 +7082,21 @@ function createScheduleInjectRoutes(deps) {
 // server/index.ts
 var import_dist9 = __toESM(require_dist(), 1);
 
+// app/lib/whatsapp/socket-resolution-error.ts
+function formatPresentKeys(presentKeys) {
+  return presentKeys.join(",") || "none";
+}
+function formatSocketResolutionReason(res) {
+  return res.reason === "key-miss" ? `key-miss presentKeys=${formatPresentKeys(res.presentKeys)}` : "disconnected";
+}
+function formatSocketResolutionMessage(res, accountId, opts = {}) {
+  if (res.reason === "key-miss") {
+    return `WhatsApp socket key miss: no socket is registered for accountId=${accountId} (present keys: ${formatPresentKeys(res.presentKeys)}). This is an account-keying fault, not a dropped link \u2014 do not advise re-pairing.`;
+  }
+  const clause = opts.disconnectedClause ? `; ${opts.disconnectedClause}` : "";
+  return `WhatsApp account "${accountId}" is registered but its transport is down${clause}.`;
+}
+
 // app/lib/telegram/outbound/send-text.ts
 async function sendTelegramText(botToken, chatId, text) {
   try {
@@ -7907,16 +7919,9 @@ async function sendWhatsAppDocument(input) {
   const jid = normalizeJid2(to);
   const res = resolveSocket(accountId);
   if (!res.ok) {
-    const reason = res.reason === "key-miss" ? `key-miss presentKeys=${res.presentKeys.join(",") || "none"}` : "disconnected";
+    const reason = formatSocketResolutionReason(res);
     console.error(`${TAG20} sent document to=${jid} file=${filename} bytes=${fileStat.size} ok=false reason=${reason}`);
-    if (res.reason === "key-miss") {
-      return {
-        ok: false,
-        status: 503,
-        error: `WhatsApp socket key miss: no socket is registered for accountId=${accountId} (present keys: ${res.presentKeys.join(",") || "none"}). This is an account-keying fault, not a dropped link \u2014 do not advise re-pairing.`
-      };
-    }
-    return { ok: false, status: 503, error: `WhatsApp account "${accountId}" is registered but its transport is down.` };
+    return { ok: false, status: 503, error: formatSocketResolutionMessage(res, accountId) };
   }
   const sock = res.sock;
   const buffer = Buffer.from(await readFile(resolvedPath));
@@ -8448,11 +8453,12 @@ app2.post("/config", async (c) => {
       }
       case "list-groups": {
         const groupAccountId = accountId ?? "default";
-        const sock = getSocket(groupAccountId);
-        if (!sock) {
-          console.error(`${TAG22} config action=list-groups error="not connected" accountId=${groupAccountId}`);
-          return c.json({ ok: false, error: `WhatsApp account "${groupAccountId}" is not connected. Connect first, then retry.` });
+        const groupRes = resolveSocket(groupAccountId);
+        if (!groupRes.ok) {
+          console.error(`${TAG22} config action=list-groups error="${formatSocketResolutionReason(groupRes)}" accountId=${groupAccountId}`);
+          return c.json({ ok: false, error: formatSocketResolutionMessage(groupRes, groupAccountId) });
         }
+        const sock = groupRes.sock;
         try {
           const participating = await sock.groupFetchAllParticipating();
           const groups = Object.values(participating).map((g) => ({
@@ -8761,11 +8767,12 @@ app2.get("/group-info", async (c) => {
       console.error(`${TAG22} group-info error="not a group JID" jid=${jid} account=${accountId}`);
       return c.json({ error: `"${jid}" is not a group JID. Group JIDs end with @g.us.` }, 400);
     }
-    const sock = getSocket(accountId);
-    if (!sock) {
-      console.error(`${TAG22} group-info error="not connected" account=${accountId}`);
-      return c.json({ error: `WhatsApp account "${accountId}" is not connected. Connect first, then retry.` }, 400);
+    const res = resolveSocket(accountId);
+    if (!res.ok) {
+      console.error(`${TAG22} group-info error="${formatSocketResolutionReason(res)}" account=${accountId}`);
+      return c.json({ error: formatSocketResolutionMessage(res, accountId) }, 400);
     }
+    const sock = res.sock;
     const meta = await sock.groupMetadata(jid);
     const result = {
       jid: meta.id,
@@ -9301,7 +9308,7 @@ app3.post("/r2/object/delete", envelopeBodyLimit("write"), async (c) => {
 });
 var storage_broker_default = app3;
 async function runStorageAudit(root) {
-  const { reconcileStorage } = await import("./src-52M7SECF.js");
+  const { reconcileStorage } = await import("./src-JYPKMWJR.js");
   const session = getSession();
   try {
     const cf = await makeHouseCfExec(root);
@@ -9334,7 +9341,7 @@ async function runStorageAudit(root) {
   }
 }
 async function runPagesAudit(root) {
-  const { reconcilePages } = await import("./src-52M7SECF.js");
+  const { reconcilePages } = await import("./src-JYPKMWJR.js");
   const session = getSession();
   try {
     const cf = await makeHousePagesExec(root);
@@ -25590,20 +25597,29 @@ function startNativeFileFollower(input) {
   };
   const sid = input.senderId.slice(0, 8);
   let lastComposingAt = Number.NEGATIVE_INFINITY;
+  const presenceSock = (state) => {
+    const res = resolveSocket(input.accountId);
+    if (!res.ok) {
+      console.error(
+        `[whatsapp-adaptor] op=presence state=${state} sender=${sid} ok=false reason=${formatSocketResolutionReason(res)}`
+      );
+      return null;
+    }
+    console.error(`[whatsapp-adaptor] op=presence state=${state} sender=${sid}`);
+    return res.sock;
+  };
   const onActivity = () => {
     const now = Date.now();
     if (now - lastComposingAt < COMPOSING_REFRESH_MS) return;
     lastComposingAt = now;
-    const sock = getSocket(input.accountId);
+    const sock = presenceSock("composing");
     if (!sock) return;
-    console.error(`[whatsapp-adaptor] op=presence state=composing sender=${sid}`);
     void sendComposing(sock, input.senderId);
   };
   const onTurnComplete = () => {
     lastComposingAt = Number.NEGATIVE_INFINITY;
-    const sock = getSocket(input.accountId);
+    const sock = presenceSock("paused");
     if (!sock) return;
-    console.error(`[whatsapp-adaptor] op=presence state=paused sender=${sid}`);
     void sendPaused(sock, input.senderId);
   };
   return startFollower({
@@ -27000,10 +27016,11 @@ var scheduleInjectRoutes = createScheduleInjectRoutes({
     const res = resolveSocket(accountId);
     if (!res.ok) {
       if (res.reason === "key-miss") {
-        console.error(`[whatsapp-native] op=socket-key-miss accountId=${accountId} presentKeys=${res.presentKeys.join(",") || "none"}`);
-        throw new Error(`WhatsApp socket key miss: no socket is registered for accountId=${accountId} (present keys: ${res.presentKeys.join(",") || "none"}). This is an account-keying fault, not a dropped link \u2014 do not advise re-pairing.`);
+        console.error(`[whatsapp-native] op=socket-key-miss accountId=${accountId} presentKeys=${formatPresentKeys(res.presentKeys)}`);
       }
-      throw new Error(`WhatsApp disconnected: the socket for accountId=${accountId} is registered but its transport is down; cannot deliver scheduled reply.`);
+      throw new Error(
+        formatSocketResolutionMessage(res, accountId, { disconnectedClause: "cannot deliver scheduled reply" })
+      );
     }
     await sendTextMessage(res.sock, toWhatsappJid(destination), text, { accountId: res.accountId });
   },

package/payload/server/{src-52M7SECF.js → src-JYPKMWJR.js}

@@ -22,7 +22,7 @@ import {
   stripAccountWideTokens,
   tooLargeMessage,
   validateMapping
-} from "./chunk-FOYHK255.js";
+} from "./chunk-56WJMBQQ.js";
 import "./chunk-PFF6I7KP.js";
 export {
   D1_MAX_SQL_STATEMENT_BYTES,