@shipers-dev/multi 0.23.1 → 0.23.3

package/dist/index.js

@@ -15000,7 +15000,7 @@ import { parseArgs as parseArgs2 } from "util";
 // package.json
 var package_default = {
   name: "@shipers-dev/multi",
-  version: "0.23.1",
+  version: "0.23.3",
   type: "module",
   bin: {
     "multi-agent": "./dist/index.js"
@@ -32695,13 +32695,13 @@ async function cmdConnect(apiUrl, config2) {
       heartbeat().catch(() => {});
     }, 200);
   };
+  let alive = true;
   {
     const pending3 = await heartbeat();
     if (pending3 > 0)
-      drainOfflineDispatches(apiUrl, config2.deviceId, config2.token, db, () => schedule2());
+      drainOfflineDispatches(apiUrl, config2.deviceId, config2.token, db, () => schedule2(), () => alive);
   }
-  drainOfflineDispatches(apiUrl, config2.deviceId, config2.token, db, () => schedule2());
-  let alive = true;
+  drainOfflineDispatches(apiUrl, config2.deviceId, config2.token, db, () => schedule2(), () => alive);
   const shutdown = async (reason) => {
     if (!alive)
       return;
@@ -32749,7 +32749,7 @@ async function cmdConnect(apiUrl, config2) {
           try {
             const pending3 = await heartbeat();
             if (pending3 > 0)
-              drainOfflineDispatches(apiUrl, config2.deviceId, config2.token, db, () => schedule2());
+              drainOfflineDispatches(apiUrl, config2.deviceId, config2.token, db, () => schedule2(), () => alive);
           } catch (e) {
             log3(`heartbeat error after tunnel restart: ${String(e)}`);
           }
@@ -32780,9 +32780,9 @@ async function cmdConnect(apiUrl, config2) {
     })();
   let probeFailures = 0;
   let tick = 0;
-  const PROBE_EVERY = 6;
+  const PROBE_EVERY = 2;
   while (alive) {
-    await sleep5(20000);
+    await sleep5(60000);
     if (existsSync7(STOP_PATH2)) {
       await shutdown("stop flag");
       break;
@@ -32806,7 +32806,7 @@ async function cmdConnect(apiUrl, config2) {
     try {
       const pending3 = await heartbeat();
       if (pending3 > 0)
-        drainOfflineDispatches(apiUrl, config2.deviceId, config2.token, db, () => schedule2());
+        drainOfflineDispatches(apiUrl, config2.deviceId, config2.token, db, () => schedule2(), () => alive);
     } catch (e) {
       log3(`heartbeat error: ${String(e)}`);
     }
@@ -33848,7 +33848,9 @@ async function ackDispatch(apiUrl, dispatchId, secret) {
     log3(`ack dispatch ${dispatchId} failed: ${String(e)}`);
   }
 }
-async function drainOfflineDispatches(apiUrl, deviceId, secret, db, onEnqueued) {
+async function drainOfflineDispatches(apiUrl, deviceId, secret, db, onEnqueued, isAlive) {
+  if (!isAlive())
+    return;
   let list;
   try {
     list = await apiClient.get(`${apiUrl}/api/devices/${deviceId}/dispatches/pending`);
@@ -33861,6 +33863,10 @@ async function drainOfflineDispatches(apiUrl, deviceId, secret, db, onEnqueued)
     return;
   log3(`\uD83E\uDEA3 draining ${rows.length} offline dispatch(es)`);
   for (const r of rows) {
+    if (!isAlive()) {
+      log3("drain aborted: shutting down");
+      return;
+    }
     try {
       const res = await fetch(`${apiUrl}/api/issues/dispatches/${r.id}/claim`, {
         method: "POST",
@@ -34368,7 +34374,10 @@ function loadConfig() {
   try {
     if (!existsSync7(CONFIG_PATH2))
       return {};
-    return JSON.parse(readFileSync7(CONFIG_PATH2, "utf8"));
+    const raw = JSON.parse(readFileSync7(CONFIG_PATH2, "utf8"));
+    if (!raw.token && raw.authToken)
+      raw.token = raw.authToken;
+    return raw;
   } catch {
     return {};
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shipers-dev/multi",
-  "version": "0.23.1",
+  "version": "0.23.3",
   "type": "module",
   "bin": {
     "multi-agent": "./dist/index.js"