xshell 0.0.47 → 0.0.48

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "xshell",
-    "version": "0.0.47",
+    "version": "0.0.48",
     "main": "./index.js",
     "bin": {
         "xshell": "./xshell.js",
@@ -96,7 +96,7 @@
         "ora": "=5.4.1",
         "promise-retry": "^2.0.1",
         "qs": "^6.10.3",
-        "react": "^18.0.0",
+        "react": "^18.1.0",
         "react-i18next": "^11.16.7",
         "request": "^2.88.2",
         "request-promise-native": "^1.0.9",
@@ -105,7 +105,7 @@
         "stream-buffers": "^3.0.2",
         "strip-ansi": "=6.0.0",
         "tough-cookie": "^4.0.0",
-        "tslib": "^2.3.1",
+        "tslib": "^2.4.0",
         "typescript": "^4.6.3",
         "upath": "^2.0.1",
         "vinyl": "^2.2.1",
@@ -114,7 +114,7 @@
     },
     "devDependencies": {
         "@babel/types": "^7.17.0",
-        "@types/babel__traverse": "^7.17.0",
+        "@types/babel__traverse": "^7.17.1",
         "@types/byte-size": "^8.1.0",
         "@types/chardet": "^0.8.1",
         "@types/cheerio": "^0.22.31",
@@ -122,14 +122,14 @@
         "@types/express": "^4.17.13",
         "@types/fs-extra": "^9.0.13",
         "@types/gulp-sort": "2.0.0",
-        "@types/js-cookie": "^3.0.1",
+        "@types/js-cookie": "^3.0.2",
         "@types/koa": "^2.13.4",
         "@types/koa-compress": "^4.0.3",
         "@types/lodash": "^4.14.182",
-        "@types/node": "^17.0.25",
+        "@types/node": "^17.0.29",
         "@types/promise-retry": "^1.1.3",
         "@types/qs": "^6.9.7",
-        "@types/react": "^18.0.5",
+        "@types/react": "^18.0.8",
         "@types/request": "^2.48.8",
         "@types/request-promise-native": "^1.0.18",
         "@types/rimraf": "^3.0.2",
@@ -139,6 +139,6 @@
         "@types/vscode": "^1.66.0",
         "@types/ws": "^8.5.3",
         "source-map-loader": "^3.0.1",
-        "ts-loader": "^9.2.8"
+        "ts-loader": "^9.2.9"
     }
 }

package/utils.browser.d.ts

@@ -1,5 +1,7 @@
 export declare function delay(milliseconds: number): Promise<void>;
 /** 拼接 TypedArrays 生成一个完整的 Uint8Array */
 export declare function concat(arrays: ArrayBufferView[]): Uint8Array;
+/** 时间间隔 (milliseconds) 格式化 */
+export declare function delta2str(delta: number): string;
 /** 字符串字典序比较 */
 export declare function strcmp(l: string, r: string): 0 | 1 | -1;

package/utils.browser.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.strcmp = exports.concat = exports.delay = void 0;
+exports.strcmp = exports.delta2str = exports.concat = exports.delay = void 0;
 async function delay(milliseconds) {
     return new Promise(resolve => {
         setTimeout(() => {
@@ -24,6 +24,22 @@ function concat(arrays) {
     return buf;
 }
 exports.concat = concat;
+/** 时间间隔 (milliseconds) 格式化 */
+function delta2str(delta) {
+    // [0, 1000) ms
+    if (delta < 1000)
+        return `${delta} ms`;
+    // 1.123 s
+    if (1000 <= delta && delta < 1000 * 60)
+        return `${(delta / 1000).toFixed(1)} s`;
+    // 1 min 12 s [1 min 0s, 60 min)
+    const seconds = delta / 1000;
+    if (seconds < 60 * 60)
+        return `${Math.trunc(seconds / 60)} min ${seconds % 60} s`;
+    const hour = Math.trunc(seconds / 3600);
+    return `${hour} h ${Math.trunc((seconds - 3600 * hour) / 60)} min ${seconds % 60} s`;
+}
+exports.delta2str = delta2str;
 /** 字符串字典序比较 */
 function strcmp(l, r) {
     if (l === r)

package/utils.browser.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.browser.js","sourceRoot":"","sources":["utils.browser.ts"],"names":[],"mappings":";;;AAAO,KAAK,UAAU,KAAK,CAAE,YAAoB;IAC7C,OAAO,IAAI,OAAO,CAAQ,OAAO,CAAC,EAAE;QAChC,UAAU,CAAC,GAAG,EAAE;YACZ,OAAO,EAAE,CAAA;QACb,CAAC,EAAE,YAAY,CAAC,CAAA;IACpB,CAAC,CAAC,CAAA;AACN,CAAC;AAND,sBAMC;AAGD,wCAAwC;AACxC,SAAgB,MAAM,CAAE,MAAyB;IAC7C,IAAI,MAAM,GAAG,CAAC,CAAA;IACd,KAAK,MAAM,CAAC,IAAI,MAAM;QAClB,MAAM,IAAI,CAAC,CAAC,UAAU,CAAA;IAE1B,IAAI,GAAG,GAAG,IAAI,UAAU,CAAC,MAAM,CAAC,CAAA;IAChC,IAAI,MAAM,GAAG,CAAC,CAAA;IACd,KAAK,MAAM,CAAC,IAAI,MAAM,EAAE;QACpB,MAAM,SAAS,GAAG,IAAI,UAAU,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,UAAU,EAAE,CAAC,CAAC,UAAU,CAAC,CAAA;QACtE,GAAG,CAAC,GAAG,CAAC,SAAS,EAAE,MAAM,CAAC,CAAA;QAC1B,MAAM,IAAI,SAAS,CAAC,UAAU,CAAA;KACjC;IAED,OAAO,GAAG,CAAA;AACd,CAAC;AAdD,wBAcC;AAGD,eAAe;AACf,SAAgB,MAAM,CAAE,CAAS,EAAE,CAAS;IACxC,IAAI,CAAC,KAAK,CAAC;QAAE,OAAO,CAAC,CAAA;IACrB,IAAI,CAAC,GAAG,CAAC;QAAI,OAAO,CAAC,CAAC,CAAA;IACtB,OAAO,CAAC,CAAA;AACZ,CAAC;AAJD,wBAIC","sourcesContent":["export async function delay (milliseconds: number) {\n    return new Promise<void>( resolve => {\n        setTimeout(() => {\n            resolve()\n        }, milliseconds)\n    })\n}\n\n\n/** 拼接 TypedArrays 生成一个完整的 Uint8Array */\nexport function concat (arrays: ArrayBufferView[]) {\n    let length = 0\n    for (const a of arrays)\n        length += a.byteLength\n        \n    let buf = new Uint8Array(length)\n    let offset = 0\n    for (const a of arrays) {\n        const uint8view = new Uint8Array(a.buffer, a.byteOffset, a.byteLength)\n        buf.set(uint8view, offset)\n        offset += uint8view.byteLength\n    }\n    \n    return buf\n}\n\n\n/** 字符串字典序比较 */\nexport function strcmp (l: string, r: string) {\n    if (l === r) return 0\n    if (l < r)   return -1\n    return 1\n}\n"]}
+{"version":3,"file":"utils.browser.js","sourceRoot":"","sources":["utils.browser.ts"],"names":[],"mappings":";;;AAAO,KAAK,UAAU,KAAK,CAAE,YAAoB;IAC7C,OAAO,IAAI,OAAO,CAAQ,OAAO,CAAC,EAAE;QAChC,UAAU,CAAC,GAAG,EAAE;YACZ,OAAO,EAAE,CAAA;QACb,CAAC,EAAE,YAAY,CAAC,CAAA;IACpB,CAAC,CAAC,CAAA;AACN,CAAC;AAND,sBAMC;AAGD,wCAAwC;AACxC,SAAgB,MAAM,CAAE,MAAyB;IAC7C,IAAI,MAAM,GAAG,CAAC,CAAA;IACd,KAAK,MAAM,CAAC,IAAI,MAAM;QAClB,MAAM,IAAI,CAAC,CAAC,UAAU,CAAA;IAE1B,IAAI,GAAG,GAAG,IAAI,UAAU,CAAC,MAAM,CAAC,CAAA;IAChC,IAAI,MAAM,GAAG,CAAC,CAAA;IACd,KAAK,MAAM,CAAC,IAAI,MAAM,EAAE;QACpB,MAAM,SAAS,GAAG,IAAI,UAAU,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,UAAU,EAAE,CAAC,CAAC,UAAU,CAAC,CAAA;QACtE,GAAG,CAAC,GAAG,CAAC,SAAS,EAAE,MAAM,CAAC,CAAA;QAC1B,MAAM,IAAI,SAAS,CAAC,UAAU,CAAA;KACjC;IAED,OAAO,GAAG,CAAA;AACd,CAAC;AAdD,wBAcC;AAGD,8BAA8B;AAC9B,SAAgB,SAAS,CAAE,KAAa;IACpC,eAAe;IACf,IAAI,KAAK,GAAG,IAAI;QACZ,OAAO,GAAG,KAAK,KAAK,CAAA;IAExB,UAAU;IACV,IAAI,IAAI,IAAI,KAAK,IAAI,KAAK,GAAG,IAAI,GAAG,EAAE;QAClC,OAAO,GAAG,CAAC,KAAK,GAAG,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAA;IAE3C,gCAAgC;IAChC,MAAM,OAAO,GAAG,KAAK,GAAG,IAAI,CAAA;IAE5B,IAAI,OAAO,GAAG,EAAE,GAAG,EAAE;QACjB,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,GAAG,EAAE,CAAC,QAAQ,OAAO,GAAG,EAAE,IAAI,CAAA;IAE9D,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,GAAG,IAAI,CAAC,CAAA;IAEvC,OAAO,GAAG,IAAI,MAAM,IAAI,CAAC,KAAK,CAAC,CAAC,OAAO,GAAG,IAAI,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,QAAQ,OAAO,GAAG,EAAE,IAAI,CAAA;AACxF,CAAC;AAlBD,8BAkBC;AAGD,eAAe;AACf,SAAgB,MAAM,CAAE,CAAS,EAAE,CAAS;IACxC,IAAI,CAAC,KAAK,CAAC;QAAE,OAAO,CAAC,CAAA;IACrB,IAAI,CAAC,GAAG,CAAC;QAAI,OAAO,CAAC,CAAC,CAAA;IACtB,OAAO,CAAC,CAAA;AACZ,CAAC;AAJD,wBAIC","sourcesContent":["export async function delay (milliseconds: number) {\n    return new Promise<void>( resolve => {\n        setTimeout(() => {\n            resolve()\n        }, milliseconds)\n    })\n}\n\n\n/** 拼接 TypedArrays 生成一个完整的 Uint8Array */\nexport function concat (arrays: ArrayBufferView[]) {\n    let length = 0\n    for (const a of arrays)\n        length += a.byteLength\n    \n    let buf = new Uint8Array(length)\n    let offset = 0\n    for (const a of arrays) {\n        const uint8view = new Uint8Array(a.buffer, a.byteOffset, a.byteLength)\n        buf.set(uint8view, offset)\n        offset += uint8view.byteLength\n    }\n    \n    return buf\n}\n\n\n/** 时间间隔 (milliseconds) 格式化 */\nexport function delta2str (delta: number) {\n    // [0, 1000) ms\n    if (delta < 1000)\n        return `${delta} ms`\n    \n    // 1.123 s\n    if (1000 <= delta && delta < 1000 * 60)\n        return `${(delta / 1000).toFixed(1)} s`\n    \n    // 1 min 12 s [1 min 0s, 60 min)\n    const seconds = delta / 1000\n    \n    if (seconds < 60 * 60)\n        return `${Math.trunc(seconds / 60)} min ${seconds % 60} s`\n    \n    const hour = Math.trunc(seconds / 3600)\n    \n    return `${hour} h ${Math.trunc((seconds - 3600 * hour) / 60)} min ${seconds % 60} s`\n}\n\n\n/** 字符串字典序比较 */\nexport function strcmp (l: string, r: string) {\n    if (l === r) return 0\n    if (l < r)   return -1\n    return 1\n}\n\n"]}