react-native-update-cli 2.9.2 → 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/bundle-runner.d.ts

@@ -15,6 +15,13 @@ export interface RunBundleCommandOptions {
     cli: BundleCliOptions;
     isSentry: boolean;
 }
+type ResolvedExpoCli = {
+    cliPath: string;
+    usingExpo: boolean;
+};
+export declare function hasProjectDependency(dependencyName: string, projectRoot?: string): boolean;
+export declare function resolveExpoCli(projectRoot?: string): ResolvedExpoCli;
 export declare function runReactNativeBundleCommand({ bundleName, dev, entryFile, outputFolder, platform, sourcemapOutput, config, forceHermes, cli, isSentry, }: RunBundleCommandOptions): Promise<void>;
 export declare function copyDebugidForSentry(bundleName: string, outputFolder: string, sourcemapOutput: string): Promise<void>;
 export declare function uploadSourcemapForSentry(bundleName: string, outputFolder: string, sourcemapOutput: string, version: string): Promise<void>;
+export {};

package/lib/bundle-runner.js

@@ -12,6 +12,12 @@ _export(exports, {
     copyDebugidForSentry: function() {
         return copyDebugidForSentry;
     },
+    hasProjectDependency: function() {
+        return hasProjectDependency;
+    },
+    resolveExpoCli: function() {
+        return resolveExpoCli;
+    },
     runReactNativeBundleCommand: function() {
         return runReactNativeBundleCommand;
     },
@@ -73,6 +79,70 @@ function _interop_require_wildcard(obj, nodeInterop) {
 }
 const g2js = require('gradle-to-js/lib/parser');
 const properties = require('properties');
+const dependencyFields = [
+    'dependencies',
+    'devDependencies',
+    'peerDependencies',
+    'optionalDependencies'
+];
+function hasProjectDependency(dependencyName, projectRoot = process.cwd()) {
+    try {
+        const packageJson = JSON.parse(_fsextra.readFileSync(_path.default.join(projectRoot, 'package.json'), 'utf8'));
+        return dependencyFields.some((field)=>{
+            const dependencies = packageJson[field];
+            if (typeof dependencies !== 'object' || dependencies === null) {
+                return false;
+            }
+            return dependencyName in dependencies;
+        });
+    } catch (e) {
+        return false;
+    }
+}
+function resolveExpoCli(projectRoot = process.cwd()) {
+    if (!hasProjectDependency('expo', projectRoot)) {
+        return {
+            cliPath: '',
+            usingExpo: false
+        };
+    }
+    try {
+        const searchPaths = [
+            projectRoot
+        ];
+        try {
+            const expoPackageJsonPath = require.resolve('expo/package.json', {
+                paths: [
+                    projectRoot
+                ]
+            });
+            searchPaths.push(_path.default.dirname(expoPackageJsonPath));
+        } catch (e) {
+        // expo 包不存在，忽略
+        }
+        const cliPath = require.resolve('@expo/cli', {
+            paths: searchPaths
+        });
+        const expoCliVersion = JSON.parse(_fsextra.readFileSync(require.resolve('@expo/cli/package.json', {
+            paths: searchPaths
+        }), 'utf8')).version;
+        if (!(0, _compareversions.satisfies)(expoCliVersion, '>= 0.10.17')) {
+            return {
+                cliPath: '',
+                usingExpo: false
+            };
+        }
+        return {
+            cliPath,
+            usingExpo: true
+        };
+    } catch (e) {
+        return {
+            cliPath: '',
+            usingExpo: false
+        };
+    }
+}
 async function runReactNativeBundleCommand({ bundleName, dev, entryFile, outputFolder, platform, sourcemapOutput, config, forceHermes, cli, isSentry }) {
     let gradleConfig = {};
     if (platform === 'android') {
@@ -90,35 +160,9 @@ async function runReactNativeBundleCommand({ bundleName, dev, entryFile, outputF
     let cliPath = '';
     let usingExpo = false;
     const getExpoCli = ()=>{
-        try {
-            const searchPaths = [
-                process.cwd()
-            ];
-            try {
-                const expoPath = require.resolve('expo/package.json', {
-                    paths: [
-                        process.cwd()
-                    ]
-                });
-                const expoDir = expoPath.replace(/\/package\.json$/, '');
-                searchPaths.push(expoDir);
-            } catch (e) {
-            // expo 包不存在，忽略
-            }
-            cliPath = require.resolve('@expo/cli', {
-                paths: searchPaths
-            });
-            const expoCliVersion = JSON.parse(_fsextra.readFileSync(require.resolve('@expo/cli/package.json', {
-                paths: searchPaths
-            })).toString()).version;
-            if ((0, _compareversions.satisfies)(expoCliVersion, '>= 0.10.17')) {
-                usingExpo = true;
-            } else {
-                cliPath = '';
-            }
-        } catch (e) {
-        // fallback 到 RN CLI
-        }
+        const resolvedExpoCli = resolveExpoCli();
+        cliPath = resolvedExpoCli.cliPath;
+        usingExpo = resolvedExpoCli.usingExpo;
     };
     const getRnCli = ()=>{
         try {

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.2",
+  "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/bundle-runner.ts

@@ -32,6 +32,90 @@ interface GradleConfig {
   enableHermes?: boolean;
 }
 
+const dependencyFields = [
+  'dependencies',
+  'devDependencies',
+  'peerDependencies',
+  'optionalDependencies',
+] as const;
+
+type ResolvedExpoCli = {
+  cliPath: string;
+  usingExpo: boolean;
+};
+
+export function hasProjectDependency(
+  dependencyName: string,
+  projectRoot = process.cwd(),
+): boolean {
+  try {
+    const packageJson = JSON.parse(
+      fs.readFileSync(path.join(projectRoot, 'package.json'), 'utf8'),
+    ) as Record<string, unknown>;
+
+    return dependencyFields.some((field) => {
+      const dependencies = packageJson[field];
+      if (typeof dependencies !== 'object' || dependencies === null) {
+        return false;
+      }
+      return dependencyName in dependencies;
+    });
+  } catch {
+    return false;
+  }
+}
+
+export function resolveExpoCli(projectRoot = process.cwd()): ResolvedExpoCli {
+  if (!hasProjectDependency('expo', projectRoot)) {
+    return {
+      cliPath: '',
+      usingExpo: false,
+    };
+  }
+
+  try {
+    const searchPaths = [projectRoot];
+
+    try {
+      const expoPackageJsonPath = require.resolve('expo/package.json', {
+        paths: [projectRoot],
+      });
+      searchPaths.push(path.dirname(expoPackageJsonPath));
+    } catch {
+      // expo 包不存在，忽略
+    }
+
+    const cliPath = require.resolve('@expo/cli', {
+      paths: searchPaths,
+    });
+    const expoCliVersion = JSON.parse(
+      fs.readFileSync(
+        require.resolve('@expo/cli/package.json', {
+          paths: searchPaths,
+        }),
+        'utf8',
+      ),
+    ).version;
+
+    if (!satisfies(expoCliVersion, '>= 0.10.17')) {
+      return {
+        cliPath: '',
+        usingExpo: false,
+      };
+    }
+
+    return {
+      cliPath,
+      usingExpo: true,
+    };
+  } catch {
+    return {
+      cliPath: '',
+      usingExpo: false,
+    };
+  }
+}
+
 export async function runReactNativeBundleCommand({
   bundleName,
   dev,
@@ -65,40 +149,9 @@ export async function runReactNativeBundleCommand({
   let usingExpo = false;
 
   const getExpoCli = () => {
-    try {
-      const searchPaths = [process.cwd()];
-
-      try {
-        const expoPath = require.resolve('expo/package.json', {
-          paths: [process.cwd()],
-        });
-        const expoDir = expoPath.replace(/\/package\.json$/, '');
-        searchPaths.push(expoDir);
-      } catch {
-        // expo 包不存在，忽略
-      }
-
-      cliPath = require.resolve('@expo/cli', {
-        paths: searchPaths,
-      });
-
-      const expoCliVersion = JSON.parse(
-        fs
-          .readFileSync(
-            require.resolve('@expo/cli/package.json', {
-              paths: searchPaths,
-            }),
-          )
-          .toString(),
-      ).version;
-      if (satisfies(expoCliVersion, '>= 0.10.17')) {
-        usingExpo = true;
-      } else {
-        cliPath = '';
-      }
-    } catch {
-      // fallback 到 RN CLI
-    }
+    const resolvedExpoCli = resolveExpoCli();
+    cliPath = resolvedExpoCli.cliPath;
+    usingExpo = resolvedExpoCli.usingExpo;
   };
 
   const getRnCli = () => {

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>;
 };