react-native-update-cli 2.9.3 → 2.9.4

package/lib/api.js

@@ -114,21 +114,30 @@ const closeSession = ()=>{
     }
     session = undefined;
 };
+function createRequestError(error, requestUrl) {
+    const message = typeof error === 'string' ? error : error instanceof Error ? error.message : String(error);
+    return new Error(`${message}\nURL: ${requestUrl}`);
+}
 async function query(url, options) {
     const baseUrl = await _httphelper.getBaseUrl;
     const fullUrl = `${baseUrl}${url}`;
-    const resp = await (0, _nodefetch.default)(fullUrl, options);
+    let resp;
+    try {
+        resp = await (0, _nodefetch.default)(fullUrl, options);
+    } catch (error) {
+        throw createRequestError(error, fullUrl);
+    }
     const text = await resp.text();
     let json;
     try {
         json = JSON.parse(text);
     } catch (e) {}
     if (resp.status !== 200) {
-        const message = (json == null ? void 0 : json.message) || resp.statusText;
+        const message = (json == null ? void 0 : json.message) || resp.statusText || `HTTP ${resp.status}`;
         if (resp.status === 401) {
-            throw new Error((0, _i18n.t)('loginExpired'));
+            throw createRequestError((0, _i18n.t)('loginExpired'), fullUrl);
         }
-        throw new Error(message);
+        throw createRequestError(message, fullUrl);
     }
     return json;
 }
@@ -221,12 +230,17 @@ async function uploadFile(fn, key) {
     // form.append('file', fileStream, {
     //   contentType: 'application/octet-stream',
     // });
-    const res = await (0, _nodefetch.default)(realUrl, {
-        method: 'POST',
-        body: form
-    });
+    let res;
+    try {
+        res = await (0, _nodefetch.default)(realUrl, {
+            method: 'POST',
+            body: form
+        });
+    } catch (error) {
+        throw createRequestError(error, realUrl);
+    }
     if (res.status > 299) {
-        throw new Error(`${res.status}: ${res.statusText}`);
+        throw createRequestError(`${res.status}: ${res.statusText || 'Upload failed'}`, realUrl);
     }
     // const body = await response.json();
     return {

package/lib/utils/http-helper.js

@@ -65,7 +65,7 @@ const ping = async (url)=>{
                 if (!pingFinished) {
                 // console.log('ping timeout', url);
                 }
-            }, 2000))
+            }, 5000))
     ]);
 };
 const testUrls = async (urls)=>{

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-update-cli",
-  "version": "2.9.3",
+  "version": "2.9.4",
   "description": "command line tool for react-native-update (remote updates for react native)",
   "main": "lib/exports.js",
   "types": "lib/exports.d.ts",

package/src/api.ts

@@ -75,10 +75,25 @@ export const closeSession = () => {
   session = undefined;
 };
 
+function createRequestError(error: unknown, requestUrl: string) {
+  const message =
+    typeof error === 'string'
+      ? error
+      : error instanceof Error
+        ? error.message
+        : String(error);
+  return new Error(`${message}\nURL: ${requestUrl}`);
+}
+
 async function query(url: string, options: fetch.RequestInit) {
   const baseUrl = await getBaseUrl;
   const fullUrl = `${baseUrl}${url}`;
-  const resp = await fetch(fullUrl, options);
+  let resp: fetch.Response;
+  try {
+    resp = await fetch(fullUrl, options);
+  } catch (error) {
+    throw createRequestError(error, fullUrl);
+  }
   const text = await resp.text();
   let json: any;
   try {
@@ -86,11 +101,11 @@ async function query(url: string, options: fetch.RequestInit) {
   } catch (e) {}
 
   if (resp.status !== 200) {
-    const message = json?.message || resp.statusText;
+    const message = json?.message || resp.statusText || `HTTP ${resp.status}`;
     if (resp.status === 401) {
-      throw new Error(t('loginExpired'));
+      throw createRequestError(t('loginExpired'), fullUrl);
     }
-    throw new Error(message);
+    throw createRequestError(message, fullUrl);
   }
   return json;
 }
@@ -195,13 +210,21 @@ export async function uploadFile(fn: string, key?: string) {
   //   contentType: 'application/octet-stream',
   // });
 
-  const res = await fetch(realUrl, {
-    method: 'POST',
-    body: form,
-  });
+  let res: fetch.Response;
+  try {
+    res = await fetch(realUrl, {
+      method: 'POST',
+      body: form,
+    });
+  } catch (error) {
+    throw createRequestError(error, realUrl);
+  }
 
   if (res.status > 299) {
-    throw new Error(`${res.status}: ${res.statusText}`);
+    throw createRequestError(
+      `${res.status}: ${res.statusText || 'Upload failed'}`,
+      realUrl,
+    );
   }
 
   // const body = await response.json();

package/src/utils/http-helper.ts

@@ -48,7 +48,7 @@ export const ping = async (url: string) => {
         if (!pingFinished) {
           // console.log('ping timeout', url);
         }
-      }, 2000),
+      }, 5000),
     ),
   ]) as Promise<string | null>;
 };