fix: only fallback to old search when new search endpoint is unavailable

openupm · Jul 26, 2020 · d71e61a · d71e61a
1 parent 93b0577
commit d71e61a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/bin/openupm b/bin/openupm
diff --git a/lib/cmd-search.js b/lib/cmd-search.js
@@ -99,7 +99,7 @@ const searchOld = async function(keyword) {
       log.debug(`status ${err.response.status}`);
     if (isConnectionError(err))
       log.error(`can not reach to registry ${env.registry}`);
-    else log.error(err.message);
+    else if (!is404Error(err)) log.error(err.message);
   }
 };
 
@@ -119,14 +119,16 @@ module.exports = async function(keyword, options) {
   // search endpoint
   let results = await searchEndpoint(keyword);
   // search old search
-  if (!results) results = (await searchOld(keyword)) || [];
+  if (results === undefined) {
+    results = (await searchOld(keyword)) || [];
+  }
   // search upstream
   // if (env.upstream) {
   //   const upstreamResults =
   //     (await searchEndpoint(keyword, env.upstreamRegistry)) || [];
   //   results.push(...upstreamResults);
   // }
-  if (results.length) {
+  if (results && results.length) {
     results.forEach(x => table.push(x.slice(0, -1)));
     log.info(table.toString());
   } else log.info(`No matches found for "${keyword}"`);