v1.0.8

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-update-cli",
-  "version": "1.0.3",
+  "version": "1.0.8",
   "description": "Command tools for javaScript updater with `pushy` service for react native apps.",
   "main": "index.js",
   "bin": {
@@ -40,7 +40,8 @@
     "progress": "^2.0.3",
     "read": "^1.0.7",
     "request": "^2.88.2",
-    "tty-table": "^3.2.0",
+    "tcp-ping": "^0.1.1",
+    "tty-table": "2.8",
     "update-notifier": "^4.1.0",
     "yauzl": "^2.10.0",
     "yazl": "2.5.1"
@@ -52,5 +53,8 @@
     "babel-plugin-transform-es2015-modules-commonjs": "^6.26.2",
     "babel-plugin-transform-es2015-spread": "^6.22.0",
     "babel-plugin-transform-object-rest-spread": "^6.26.0"
+  },
+  "engines": {
+    "node": ">= 8"
   }
 }

src/api.js

@@ -8,6 +8,10 @@ const fs = require('fs-extra');
 import request from 'request';
 import ProgressBar from 'progress';
 const packageJson = require('../package.json');
+const tcpp = require('tcp-ping');
+const util = require('util');
+
+const tcpPing = util.promisify(tcpp.ping);
 
 let session = undefined;
 let savedSession = undefined;
@@ -98,11 +102,20 @@ exports.put = queryWithBody('PUT');
 exports.doDelete = queryWithBody('DELETE');
 
 async function uploadFile(fn) {
-  const { url, formData } = await exports.post('/upload', {});
+  const { url, backupUrl, formData } = await exports.post('/upload', {});
   let realUrl = url;
 
-  if (!/^https?\:\/\//.test(url)) {
-    realUrl = host + url;
+  if (backupUrl) {
+    const pingResult = await tcpPing({
+      address: url.replace('https://', ''),
+      attempts: 4,
+      timeout: 1000,
+    });
+    // console.log({pingResult});
+    if (pingResult.avg > 150) {
+      realUrl = backupUrl;
+    }
+    // console.log({realUrl});
   }
 
   const fileSize = fs.statSync(fn).size;

src/utils/index.js

@@ -66,7 +66,7 @@ export async function getApkInfo(fn) {
     }
   }
   if (buildTime == 0) {
-    throw new Error('Can not get build time for this app.');
+    throw new Error('无法获取此包的编译时间戳。请更新react-native-update到最新版本后重新打包上传。');
   }
   return { versionName, buildTime };
 }
@@ -86,7 +86,7 @@ export async function getIpaInfo(fn) {
     );
   }
   if (!buildTimeTxtBuffer) {
-    throw new Error('Can not get build time for this app.');
+    throw new Error('无法获取此包的编译时间戳。请更新react-native-update到最新版本后重新打包上传。');
   }
   const buildTime = buildTimeTxtBuffer.toString().replace('\n', '');
   return { versionName, buildTime };

yarn.lock

@@ -116,11 +116,6 @@ ajv@^6.5.5:
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
-amdefine@~1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
-  integrity sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=
-
 ansi-align@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-3.0.0.tgz#b536b371cf687caaef236c18d3e21fe3797467cb"
@@ -777,26 +772,11 @@ commander@^2.11.0:
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
   integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
 
-commander@~2.8.1:
-  version "2.8.1"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.8.1.tgz#06be367febfda0c330aa1e2a072d3dc9762425d4"
-  integrity sha1-Br42f+v9oMMwqh4qBy09yXYkJdQ=
-  dependencies:
-    graceful-readlink ">= 1.0.0"
-
 component-emitter@^1.2.1:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0"
   integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==
 
-compressjs@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/compressjs/-/compressjs-1.0.3.tgz#95db74dd5b9038cf80bca321ab0ede271b4959b6"
-  integrity sha1-ldt03VuQOM+AvKMhqw7eJxtJWbY=
-  dependencies:
-    amdefine "~1.0.0"
-    commander "~2.8.1"
-
 concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
@@ -1310,11 +1290,6 @@ graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.4, graceful-fs@^4.1.6,
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz#4a12ff1b60376ef09862c2093edd908328be8423"
   integrity sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==
 
-"graceful-readlink@>= 1.0.0":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725"
-  integrity sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=
-
 gradle-to-js@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/gradle-to-js/-/gradle-to-js-2.0.0.tgz#b790a97376d3d713105a086590e569610f7e6bc4"
@@ -1950,7 +1925,7 @@ mute-stream@~0.0.4:
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d"
   integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==
 
-nan@^2.12.1, nan@^2.14.0:
+nan@^2.12.1:
   version "2.14.0"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz#7818f722027b2459a86f0295d434d1fc2336c52c"
   integrity sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==
@@ -1972,13 +1947,6 @@ nanomatch@^1.2.9:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
-"node-bsdiff@https://github.com/tdzl2003/node-bsdiff":
-  version "0.1.5"
-  resolved "https://github.com/tdzl2003/node-bsdiff#75fe1403451887ec6047cd7d18401b9a2255ad73"
-  dependencies:
-    compressjs "^1.0.3"
-    nan "^2.14.0"
-
 node-fetch@^2.6.0:
   version "2.6.0"
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.0.tgz#e633456386d4aa55863f676a7ab0daa8fdecb0fd"
@@ -2434,10 +2402,10 @@ slash@^1.0.0:
   resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
   integrity sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=
 
-smartwrap@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/smartwrap/-/smartwrap-2.0.0.tgz#f74dedd9ebf41db63aac84a8a469a9e93b7f7e12"
-  integrity sha512-POeNwjVZLe5l7ZSwZ/+BIbneogBGTB5wOjSstkcdoZklrNwCthuh4t/fvRBmecXHFdFTEKcZ9+kSUHeZuaHlBA==
+smartwrap@^1.2.3:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/smartwrap/-/smartwrap-1.2.5.tgz#45ee3e09ac234e5f7f17c16e916f511834f3cd23"
+  integrity sha512-bzWRwHwu0RnWjwU7dFy7tF68pDAx/zMSu3g7xr9Nx5J0iSImYInglwEVExyHLxXljy6PWMjkSAbwF7t2mPnRmg==
   dependencies:
     breakword "^1.0.5"
     grapheme-splitter "^1.0.4"
@@ -2627,6 +2595,11 @@ supports-color@^7.1.0:
   dependencies:
     has-flag "^4.0.0"
 
+tcp-ping@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/tcp-ping/-/tcp-ping-0.1.1.tgz#02dd7f42b5bf7d7cb78d5b7aacefa155fd8f7c0c"
+  integrity sha1-At1/QrW/fXy3jVt6rO+hVf2PfAw=
+
 term-size@^2.1.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/term-size/-/term-size-2.2.0.tgz#1f16adedfe9bdc18800e1776821734086fcc6753"
@@ -2685,14 +2658,14 @@ trim-right@^1.0.1:
   resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"
   integrity sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=
 
-tty-table@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/tty-table/-/tty-table-3.2.0.tgz#885af230caca397b5d956c7c2ca58202f7bfcc58"
-  integrity sha512-wdCoXi8FKKAkC2V9bFUr9eMAXsfV+508XfJhWyUgD9G63lJv3iEUIIQAvv339qmgMYzE3WKvwni3dPMjIQISbQ==
+tty-table@2.8:
+  version "2.8.13"
+  resolved "https://registry.yarnpkg.com/tty-table/-/tty-table-2.8.13.tgz#d484a416381973eaebbdf19c79136b390e5c6d70"
+  integrity sha512-eVV/+kB6fIIdx+iUImhXrO22gl7f6VmmYh0Zbu6C196fe1elcHXd7U6LcLXu0YoVPc2kNesWiukYcdK8ZmJ6aQ==
   dependencies:
     chalk "^3.0.0"
     csv "^5.3.1"
-    smartwrap "^2.0.0"
+    smartwrap "^1.2.3"
     strip-ansi "^6.0.0"
     wcwidth "^1.0.1"
     yargs "^15.1.0"