tsarr 2.7.3 → 2.7.5

package/dist/cli/commands/service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/service.ts"],"names":[],"mappings":"AAOA,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,IAAI,CAAC,EAAE,QAAQ,GAAG,QAAQ,GAAG,SAAS,CAAC;IACvC,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;CACnB;AAED,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,CAAC,EAAE,SAAS,EAAE,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,GAAG,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;CAC/D;AAED,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,SAAS,EAAE,CAAC;CACtB;AAED,eAAO,MAAM,sBAAsB,UAA0D,CAAC;AAE9F,wBAAgB,YAAY,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,EAAE,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,CAAC,EAAE,CAM5E;AAED,wBAAgB,mBAAmB,CACjC,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,EACnB,aAAa,EAAE,CAAC,MAAM,EAAE,GAAG,KAAK,GAAG,EACnC,SAAS,EAAE,WAAW,EAAE,uDA+MzB"}
+{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/service.ts"],"names":[],"mappings":"AAOA,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,IAAI,CAAC,EAAE,QAAQ,GAAG,QAAQ,GAAG,SAAS,CAAC;IACvC,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;CACnB;AAED,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,CAAC,EAAE,SAAS,EAAE,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,GAAG,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;CAC/D;AAED,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,SAAS,EAAE,CAAC;CACtB;AAED,eAAO,MAAM,sBAAsB,UAA0D,CAAC;AAE9F,wBAAgB,YAAY,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,EAAE,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,CAAC,EAAE,CAM5E;AAED,wBAAgB,mBAAmB,CACjC,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,EACnB,aAAa,EAAE,CAAC,MAAM,EAAE,GAAG,KAAK,GAAG,EACnC,SAAS,EAAE,WAAW,EAAE,uDAsMzB"}

package/dist/cli/index.js

@@ -5409,6 +5409,12 @@ function buildServiceCommand(serviceName, description, clientFactory, resources)
             const raw = await action.run(client2, resolvedArgs);
             if (raw?.error !== undefined) {
               const err = raw.error;
+              const networkMsg = classifyNetworkError(err, serviceName);
+              if (networkMsg) {
+                consola.error(`${networkMsg}
+Run \`tsarr doctor\` to diagnose.`);
+                process.exit(1);
+              }
               const status = err?.status ?? raw?.response?.status;
               if (status === 401) {
                 const authHint = serviceName === "qbittorrent" ? "Check your username and password." : `Check your API key.
@@ -5416,18 +5422,6 @@ Run \`tsarr config init\` or set TSARR_${serviceName.toUpperCase()}_API_KEY`;
                 consola.error(`Unauthorized. ${authHint}`);
               } else if (status === 404) {
                 consola.error("Not found.");
-              } else if (!status && err?.code) {
-                const code = err.code;
-                if (code === "ConnectionRefused" || code === "ECONNREFUSED") {
-                  consola.error(`Connection refused. Is ${serviceName} running?
-Run \`tsarr doctor\` to diagnose.`);
-                } else if (code === "ConnectionReset" || code === "ECONNRESET") {
-                  consola.error(`Connection reset. ${serviceName} may have crashed.
-Run \`tsarr doctor\` to diagnose.`);
-                } else {
-                  consola.error(`${err?.message ?? `Network error (${code})`}
-Run \`tsarr doctor\` to diagnose.`);
-                }
               } else {
                 consola.error(err?.title ?? err?.message ?? `API error (${status ?? "unknown"})`);
               }
@@ -5525,12 +5519,42 @@ Run \`tsarr doctor\` to diagnose.`);
   } else if (error instanceof TsarrError) {
     consola.error(`Error: ${error.message}`);
   } else if (error instanceof Error) {
-    consola.error(error.message);
+    const networkMsg = classifyNetworkError(error, serviceName);
+    if (networkMsg) {
+      consola.error(`${networkMsg}
+Run \`tsarr doctor\` to diagnose.`);
+    } else {
+      consola.error(error.message);
+    }
   } else {
     consola.error("An unexpected error occurred.");
   }
   process.exit(1);
 }
+function classifyNetworkError(error, serviceName) {
+  if (!error || typeof error !== "object")
+    return null;
+  const err = error;
+  const cause = err.cause;
+  const code = cause?.code ?? err.code;
+  const msg = err.message ?? "";
+  if (code === "ECONNREFUSED" || code === "ConnectionRefused") {
+    return `Connection refused. Is ${serviceName} running?`;
+  }
+  if (code === "ENOTFOUND") {
+    return `Host not found for ${serviceName}. Check the URL.`;
+  }
+  if (code === "ECONNRESET" || code === "ConnectionReset") {
+    return `Connection reset. ${serviceName} may have crashed.`;
+  }
+  if (code === "ETIMEDOUT") {
+    return `Connection timed out for ${serviceName}.`;
+  }
+  if (msg === "fetch failed" || msg.includes("fetch failed")) {
+    return `Unable to reach ${serviceName}${cause?.message ? `: ${cause.message}` : ""}`;
+  }
+  return null;
+}
 var COMMAND_OUTPUT_COLUMNS;
 var init_service = __esm(() => {
   init_dist();
@@ -21319,8 +21343,10 @@ var init_doctor = __esm(() => {
           const status = await client9.getSystemStatus();
           if (status?.error !== undefined) {
             const err = status.error;
-            const cause = err?.code ? { code: err.code } : undefined;
-            throw Object.assign(new Error(err?.message ?? err?.code ?? "Unknown API error"), cause ? { cause } : {});
+            const code = err?.cause?.code ?? err?.code;
+            const cause = code ? { code } : undefined;
+            const message = err?.cause?.message ?? err?.message ?? err?.code ?? "Unknown API error";
+            throw Object.assign(new Error(message), cause ? { cause } : {});
           }
           const version = extractVersion(service, status) ?? "?";
           if (version === "?") {
@@ -21764,7 +21790,7 @@ init_dist();
 // package.json
 var package_default = {
   name: "tsarr",
-  version: "2.7.3",
+  version: "2.7.5",
   author: "Robbe Verhelst",
   repository: {
     type: "git",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tsarr",
-  "version": "2.7.3",
+  "version": "2.7.5",
   "author": "Robbe Verhelst",
   "repository": {
     "type": "git",