react-native-update-cli 2.1.2 → 2.2.0

package/lib/api.js

@@ -54,6 +54,7 @@ const _tcpping = /*#__PURE__*/ _interop_require_default(require("tcp-ping"));
 const _packagejson = /*#__PURE__*/ _interop_require_default(require("../package.json"));
 const _constants = require("./utils/constants");
 const _i18n = require("./utils/i18n");
+const _httphelper = require("./utils/http-helper");
 function _interop_require_default(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
@@ -62,7 +63,6 @@ function _interop_require_default(obj) {
 const tcpPing = _util.default.promisify(_tcpping.default.ping);
 let session;
 let savedSession;
-const host = process.env.PUSHY_REGISTRY || process.env.RNU_API || _constants.defaultEndpoint;
 const userAgent = `react-native-update-cli/${_packagejson.default.version}`;
 const getSession = ()=>session;
 const replaceSession = (newSession)=>{
@@ -96,7 +96,9 @@ const closeSession = ()=>{
     session = undefined;
 };
 async function query(url, options) {
-    const resp = await (0, _nodefetch.default)(url, options);
+    const baseUrl = await _httphelper.getBaseUrl;
+    const fullUrl = `${baseUrl}${url}`;
+    const resp = await (0, _nodefetch.default)(fullUrl, options);
     const text = await resp.text();
     let json;
     try {
@@ -112,7 +114,7 @@ async function query(url, options) {
     return json;
 }
 function queryWithoutBody(method) {
-    return (api)=>query(host + api, {
+    return (api)=>query(api, {
             method,
             headers: {
                 'User-Agent': userAgent,
@@ -121,7 +123,7 @@ function queryWithoutBody(method) {
         });
 }
 function queryWithBody(method) {
-    return (api, body)=>query(host + api, {
+    return (api, body)=>query(api, {
             method,
             headers: {
                 'User-Agent': userAgent,
@@ -141,6 +143,7 @@ async function uploadFile(fn, key) {
     });
     let realUrl = url;
     if (backupUrl) {
+        // @ts-ignore
         if (global.USE_ACC_OSS) {
             realUrl = backupUrl;
         } else {

package/lib/bundle.js

@@ -544,6 +544,7 @@ async function diffFromPPK(origin, next, output) {
         throw new Error('Bundle file not found! Please use default bundle file name and path.');
     }
     const copies = {};
+    const copiesv2 = {};
     const zipfile = new _yazl.ZipFile();
     const writePromise = new Promise((resolve, reject)=>{
         zipfile.outputStream.on('error', (err)=>{
@@ -601,6 +602,7 @@ async function diffFromPPK(origin, next, output) {
                     addEntry(base);
                 }
                 copies[entry.fileName] = originMap[entry.crc32];
+                copiesv2[entry.crc32] = entry.fileName;
                 return;
             }
             // New file.
@@ -631,6 +633,7 @@ async function diffFromPPK(origin, next, output) {
     //console.log({copies, deletes});
     zipfile.addBuffer(Buffer.from(JSON.stringify({
         copies,
+        copiesv2,
         deletes
     })), '__diff.json');
     zipfile.end();
@@ -661,6 +664,7 @@ async function diffFromPackage(origin, next, output, originBundleName, transform
         throw new Error('Bundle file not found! Please use default bundle file name and path.');
     }
     const copies = {};
+    const copiesv2 = {};
     const zipfile = new _yazl.ZipFile();
     const writePromise = new Promise((resolve, reject)=>{
         zipfile.outputStream.on('error', (err)=>{
@@ -697,6 +701,7 @@ async function diffFromPackage(origin, next, output, originBundleName, transform
             // If moved from other place
             if (originMap[entry.crc32]) {
                 copies[entry.fileName] = originMap[entry.crc32];
+                copiesv2[entry.crc32] = entry.fileName;
                 return;
             }
             return new Promise((resolve, reject)=>{
@@ -714,7 +719,8 @@ async function diffFromPackage(origin, next, output, originBundleName, transform
         }
     });
     zipfile.addBuffer(Buffer.from(JSON.stringify({
-        copies
+        copies,
+        copiesv2
     })), '__diff.json');
     zipfile.end();
     await writePromise;

package/lib/utils/constants.js

@@ -15,8 +15,8 @@ _export(exports, {
     credentialFile: function() {
         return credentialFile;
     },
-    defaultEndpoint: function() {
-        return defaultEndpoint;
+    defaultEndpoints: function() {
+        return defaultEndpoints;
     },
     pricingPageUrl: function() {
         return pricingPageUrl;
@@ -40,4 +40,10 @@ const credentialFile = IS_CRESC ? '.cresc.token' : '.update';
 const updateJson = IS_CRESC ? 'cresc.config.json' : 'update.json';
 const tempDir = IS_CRESC ? '.cresc.temp' : '.pushy';
 const pricingPageUrl = IS_CRESC ? 'https://cresc.dev/pricing' : 'https://pushy.reactnative.cn/pricing.html';
-const defaultEndpoint = IS_CRESC ? 'https://api.cresc.dev' : 'https://update.reactnative.cn/api';
+const defaultEndpoints = IS_CRESC ? [
+    'https://api.cresc.dev',
+    'https://api.cresc.app'
+] : [
+    'https://update.reactnative.cn/api',
+    'https://update.react-native.cn/api'
+];

package/lib/utils/http-helper.js

@@ -0,0 +1,90 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+function _export(target, all) {
+    for(var name in all)Object.defineProperty(target, name, {
+        enumerable: true,
+        get: all[name]
+    });
+}
+_export(exports, {
+    getBaseUrl: function() {
+        return getBaseUrl;
+    },
+    ping: function() {
+        return ping;
+    },
+    promiseAny: function() {
+        return promiseAny;
+    },
+    testUrls: function() {
+        return testUrls;
+    }
+});
+const _constants = require("./constants");
+function promiseAny(promises) {
+    return new Promise((resolve, reject)=>{
+        let count = 0;
+        for (const promise of promises){
+            Promise.resolve(promise).then(resolve).catch(()=>{
+                count++;
+                if (count === promises.length) {
+                    reject(new Error('All promises were rejected'));
+                }
+            });
+        }
+    });
+}
+const ping = async (url)=>{
+    let pingFinished = false;
+    return Promise.race([
+        fetch(url, {
+            method: 'HEAD'
+        }).then(({ status, statusText })=>{
+            pingFinished = true;
+            if (status === 200) {
+                // console.log('ping success', url);
+                return url;
+            }
+            // console.log('ping failed', url, status, statusText);
+            throw new Error('ping failed');
+        }).catch((e)=>{
+            pingFinished = true;
+            // console.log('ping error', url, e);
+            throw new Error('ping error');
+        }),
+        new Promise((_, reject)=>setTimeout(()=>{
+                reject(new Error('ping timeout'));
+                if (!pingFinished) {
+                // console.log('ping timeout', url);
+                }
+            }, 2000))
+    ]);
+};
+const testUrls = async (urls)=>{
+    if (!(urls == null ? void 0 : urls.length)) {
+        return null;
+    }
+    const ret = await promiseAny(urls.map(ping));
+    if (ret) {
+        return ret;
+    }
+    // console.log('all ping failed, use first url:', urls[0]);
+    return urls[0];
+};
+const getBaseUrl = (async ()=>{
+    const testEndpoint = process.env.PUSHY_REGISTRY || process.env.RNU_API;
+    if (testEndpoint) {
+        return testEndpoint;
+    }
+    return testUrls(_constants.defaultEndpoints.map((url)=>`${url}/status`)).then((ret)=>{
+        let baseUrl = _constants.defaultEndpoints[0];
+        if (ret) {
+            // remove /status
+            baseUrl = ret.replace('/status', '');
+        }
+        // console.log('baseUrl', baseUrl);
+        return baseUrl;
+    });
+})();

package/lib/utils/index.js

@@ -40,7 +40,7 @@ const _chalk = /*#__PURE__*/ _interop_require_default(require("chalk"));
 const _compareversions = require("compare-versions");
 const _fsextra = /*#__PURE__*/ _interop_require_default(require("fs-extra"));
 const _packagejson = /*#__PURE__*/ _interop_require_default(require("../../package.json"));
-const _latestversion = /*#__PURE__*/ _interop_require_default(require("../utils/latest-version"));
+const _latestversion = /*#__PURE__*/ _interop_require_default(require("./latest-version"));
 const _appinfoparser = /*#__PURE__*/ _interop_require_default(require("./app-info-parser"));
 const _checkplugin = require("./check-plugin");
 const _read = require("read");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-update-cli",
-  "version": "2.1.2",
+  "version": "2.2.0",
   "description": "command line tool for react-native-update (remote updates for react native)",
   "main": "index.js",
   "bin": {

package/src/api.ts

@@ -10,18 +10,16 @@ import packageJson from '../package.json';
 import type { Package, Session } from './types';
 import {
   credentialFile,
-  defaultEndpoint,
   pricingPageUrl,
 } from './utils/constants';
 import { t } from './utils/i18n';
+import { getBaseUrl } from 'utils/http-helper';
 
 const tcpPing = util.promisify(tcpp.ping);
 
 let session: Session | undefined;
 let savedSession: Session | undefined;
 
-const host =
-  process.env.PUSHY_REGISTRY || process.env.RNU_API || defaultEndpoint;
 
 const userAgent = `react-native-update-cli/${packageJson.version}`;
 
@@ -64,7 +62,9 @@ export const closeSession = () => {
 };
 
 async function query(url: string, options: fetch.RequestInit) {
-  const resp = await fetch(url, options);
+  const baseUrl = await getBaseUrl;
+  const fullUrl = `${baseUrl}${url}`;
+  const resp = await fetch(fullUrl, options);
   const text = await resp.text();
   let json: any;
   try {
@@ -83,7 +83,7 @@ async function query(url: string, options: fetch.RequestInit) {
 
 function queryWithoutBody(method: string) {
   return (api: string) =>
-    query(host + api, {
+    query(api, {
       method,
       headers: {
         'User-Agent': userAgent,
@@ -94,7 +94,7 @@ function queryWithoutBody(method: string) {
 
 function queryWithBody(method: string) {
   return (api: string, body?: Record<string, any>) =>
-    query(host + api, {
+    query(api, {
       method,
       headers: {
         'User-Agent': userAgent,
@@ -116,6 +116,7 @@ export async function uploadFile(fn: string, key?: string) {
   });
   let realUrl = url;
   if (backupUrl) {
+    // @ts-ignore
     if (global.USE_ACC_OSS) {
       realUrl = backupUrl;
     } else {

package/src/bundle.ts

@@ -597,6 +597,7 @@ async function diffFromPPK(origin: string, next: string, output: string) {
   }
 
   const copies = {};
+  const copiesv2 = {};
 
   const zipfile = new YazlZipFile();
 
@@ -668,6 +669,7 @@ async function diffFromPPK(origin: string, next: string, output: string) {
           addEntry(base);
         }
         copies[entry.fileName] = originMap[entry.crc32];
+        copiesv2[entry.crc32] = entry.fileName;
         return;
       }
 
@@ -700,7 +702,7 @@ async function diffFromPPK(origin: string, next: string, output: string) {
 
   //console.log({copies, deletes});
   zipfile.addBuffer(
-    Buffer.from(JSON.stringify({ copies, deletes })),
+    Buffer.from(JSON.stringify({ copies, copiesv2, deletes })),
     '__diff.json',
   );
   zipfile.end();
@@ -747,6 +749,7 @@ async function diffFromPackage(
   }
 
   const copies = {};
+  const copiesv2 = {};
 
   const zipfile = new YazlZipFile();
 
@@ -792,6 +795,7 @@ async function diffFromPackage(
       // If moved from other place
       if (originMap[entry.crc32]) {
         copies[entry.fileName] = originMap[entry.crc32];
+        copiesv2[entry.crc32] = entry.fileName;
         return;
       }
 
@@ -810,7 +814,7 @@ async function diffFromPackage(
     }
   });
 
-  zipfile.addBuffer(Buffer.from(JSON.stringify({ copies })), '__diff.json');
+  zipfile.addBuffer(Buffer.from(JSON.stringify({ copies, copiesv2 })), '__diff.json');
   zipfile.end();
   await writePromise;
 }

package/src/utils/constants.ts

@@ -10,6 +10,6 @@ export const pricingPageUrl = IS_CRESC
   ? 'https://cresc.dev/pricing'
   : 'https://pushy.reactnative.cn/pricing.html';
 
-export const defaultEndpoint = IS_CRESC
-  ? 'https://api.cresc.dev'
-  : 'https://update.reactnative.cn/api';
+export const defaultEndpoints = IS_CRESC
+  ? ['https://api.cresc.dev', 'https://api.cresc.app']
+  : ['https://update.reactnative.cn/api', 'https://update.react-native.cn/api'];

package/src/utils/http-helper.ts

@@ -0,0 +1,83 @@
+import { defaultEndpoints } from './constants';
+
+// const baseUrl = `http://localhost:9000`;
+// let baseUrl = SERVER.main[0];
+// const baseUrl = `https://p.reactnative.cn/api`;
+
+export function promiseAny<T>(promises: Promise<T>[]) {
+  return new Promise<T>((resolve, reject) => {
+    let count = 0;
+
+    for (const promise of promises) {
+      Promise.resolve(promise)
+        .then(resolve)
+        .catch(() => {
+          count++;
+          if (count === promises.length) {
+            reject(new Error('All promises were rejected'));
+          }
+        });
+    }
+  });
+}
+
+export const ping = async (url: string) => {
+  let pingFinished = false;
+  return Promise.race([
+    fetch(url, {
+      method: 'HEAD',
+    })
+      .then(({ status, statusText }) => {
+        pingFinished = true;
+        if (status === 200) {
+          // console.log('ping success', url);
+          return url;
+        }
+        // console.log('ping failed', url, status, statusText);
+        throw new Error('ping failed');
+      })
+      .catch((e) => {
+        pingFinished = true;
+        // console.log('ping error', url, e);
+        throw new Error('ping error');
+      }),
+    new Promise((_, reject) =>
+      setTimeout(() => {
+        reject(new Error('ping timeout'));
+        if (!pingFinished) {
+          // console.log('ping timeout', url);
+        }
+      }, 2000),
+    ),
+  ]) as Promise<string | null>;
+};
+
+export const testUrls = async (urls?: string[]) => {
+  if (!urls?.length) {
+    return null;
+  }
+  const ret = await promiseAny(urls.map(ping));
+  if (ret) {
+    return ret;
+  }
+  // console.log('all ping failed, use first url:', urls[0]);
+  return urls[0];
+};
+
+export const getBaseUrl = (async () => {
+  const testEndpoint = process.env.PUSHY_REGISTRY || process.env.RNU_API;
+  if (testEndpoint) {
+    return testEndpoint;
+  }
+  return testUrls(defaultEndpoints.map((url) => `${url}/status`)).then(
+    (ret) => {
+      let baseUrl = defaultEndpoints[0];
+      if (ret) {
+        // remove /status
+        baseUrl = ret.replace('/status', '');
+      }
+      // console.log('baseUrl', baseUrl);
+      return baseUrl;
+    },
+  );
+})();