From 0ff5baaa42bf2c2dec21eb6ebcff7cf4d166b669 Mon Sep 17 00:00:00 2001 From: Shirasawa <764798966@qq.com> Date: Sat, 25 Apr 2020 01:03:40 +0800 Subject: [PATCH] Add TSS Mirrorp --- .github/actions/upload/index.js | 4 +- LICENSE | 8 +- README.md | 2 +- package-lock.json | 743 +++++++++++++------------------- package.json | 29 +- src/constants.ts | 3 + src/plugin/DownloadProviders.ts | 73 +++- src/protocol/check-update.ts | 10 +- src/utils/hacks.ts | 7 +- 9 files changed, 394 insertions(+), 485 deletions(-) diff --git a/.github/actions/upload/index.js b/.github/actions/upload/index.js index 0b392fe..dc36236 100644 --- a/.github/actions/upload/index.js +++ b/.github/actions/upload/index.js @@ -1,7 +1,7 @@ const github = require('@actions/github') const core = require('@actions/core') const COS = require('cos-nodejs-sdk-v5') -const Refresher = require('tencent-cdn-refresh/src/refresh') +const Refresher = require('tencent-cdn-refresh') const { extname, basename } = require('path') const { promises: fs } = require('fs') const { createHash } = require('crypto') @@ -86,7 +86,7 @@ const { promisify } = require('util') Body: hashesData }) try { - core.info(await new Refresher(options).flashDirs('https://dl.pl.apisium.cn/')) + core.info(await new Refresher(options).purgeDirsCache('https://dl.pl.apisium.cn/')) } catch (e) { core.warning(e) } diff --git a/LICENSE b/LICENSE index 7e3168a..785e692 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2019 Shirasawa & CI010 +Copyright (c) 2020 Apisium Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -19,3 +19,9 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Copyright (c) 2020 Apisium + +Without permission by Apisium, do not use our logo and name outside this +project, modify the copyright, name, logo and author information is not +allowed too. diff --git a/README.md b/README.md index 4817e84..a2133c0 100644 --- a/README.md +++ b/README.md @@ -51,7 +51,7 @@ Use taobao registry: set REGISTRY=https://registry.npm.taobao.org/ set dist-url=http://npm.taobao.org/mirrors/atom-shell set ELECTRON_MIRROR=http://npm.taobao.org/mirrors/electron/ -set ELECTRON_CUSTOM_DIR=8.2.2 +set ELECTRON_CUSTOM_DIR=8.2.3 ``` ### Development diff --git a/package-lock.json b/package-lock.json index cfa6219..1ec02c4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -270,11 +270,11 @@ } }, "@babel/helper-create-class-features-plugin": { - "version": "7.8.6", - "resolved": "https://registry.npm.taobao.org/@babel/helper-create-class-features-plugin/download/@babel/helper-create-class-features-plugin-7.8.6.tgz?cache=0&sync_timestamp=1582806192465&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40babel%2Fhelper-create-class-features-plugin%2Fdownload%2F%40babel%2Fhelper-create-class-features-plugin-7.8.6.tgz", - "integrity": "sha1-JDpbRuL48PZ03BOHYx62souFHeA=", + "version": "7.9.5", + "resolved": "https://registry.npm.taobao.org/@babel/helper-create-class-features-plugin/download/@babel/helper-create-class-features-plugin-7.9.5.tgz", + "integrity": "sha1-eXU9RAF4BrSBAX8ksC/UETxxBuo=", "requires": { - "@babel/helper-function-name": "^7.8.3", + "@babel/helper-function-name": "^7.9.5", "@babel/helper-member-expression-to-functions": "^7.8.3", "@babel/helper-optimise-call-expression": "^7.8.3", "@babel/helper-plugin-utils": "^7.8.3", @@ -284,25 +284,25 @@ "dependencies": { "@babel/code-frame": { "version": "7.8.3", - "resolved": "https://registry.npm.taobao.org/@babel/code-frame/download/@babel/code-frame-7.8.3.tgz", + "resolved": "https://registry.npm.taobao.org/@babel/code-frame/download/@babel/code-frame-7.8.3.tgz?cache=0&sync_timestamp=1578953126105&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40babel%2Fcode-frame%2Fdownload%2F%40babel%2Fcode-frame-7.8.3.tgz", "integrity": "sha1-M+JZA9dIEYFTThLsCiXxa2/PQZ4=", "requires": { "@babel/highlight": "^7.8.3" } }, "@babel/helper-function-name": { - "version": "7.8.3", - "resolved": "https://registry.npm.taobao.org/@babel/helper-function-name/download/@babel/helper-function-name-7.8.3.tgz", - "integrity": "sha1-7utmWgGx8RBo6fuGrVahyxqCTMo=", + "version": "7.9.5", + "resolved": "https://registry.npm.taobao.org/@babel/helper-function-name/download/@babel/helper-function-name-7.9.5.tgz", + "integrity": "sha1-K1OCDTUnUSDhh0qC5aq+E3aSClw=", "requires": { "@babel/helper-get-function-arity": "^7.8.3", "@babel/template": "^7.8.3", - "@babel/types": "^7.8.3" + "@babel/types": "^7.9.5" } }, "@babel/helper-get-function-arity": { "version": "7.8.3", - "resolved": "https://registry.npm.taobao.org/@babel/helper-get-function-arity/download/@babel/helper-get-function-arity-7.8.3.tgz", + "resolved": "https://registry.npm.taobao.org/@babel/helper-get-function-arity/download/@babel/helper-get-function-arity-7.8.3.tgz?cache=0&sync_timestamp=1578951938166&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40babel%2Fhelper-get-function-arity%2Fdownload%2F%40babel%2Fhelper-get-function-arity-7.8.3.tgz", "integrity": "sha1-uJS5R70AQ4HOY+odufCFR+kgq9U=", "requires": { "@babel/types": "^7.8.3" @@ -310,7 +310,7 @@ }, "@babel/helper-member-expression-to-functions": { "version": "7.8.3", - "resolved": "https://registry.npm.taobao.org/@babel/helper-member-expression-to-functions/download/@babel/helper-member-expression-to-functions-7.8.3.tgz", + "resolved": "https://registry.npm.taobao.org/@babel/helper-member-expression-to-functions/download/@babel/helper-member-expression-to-functions-7.8.3.tgz?cache=0&sync_timestamp=1578951939517&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40babel%2Fhelper-member-expression-to-functions%2Fdownload%2F%40babel%2Fhelper-member-expression-to-functions-7.8.3.tgz", "integrity": "sha1-ZZtxBJjqbB2ZB+DHPyBu7n2twkw=", "requires": { "@babel/types": "^7.8.3" @@ -318,7 +318,7 @@ }, "@babel/helper-optimise-call-expression": { "version": "7.8.3", - "resolved": "https://registry.npm.taobao.org/@babel/helper-optimise-call-expression/download/@babel/helper-optimise-call-expression-7.8.3.tgz", + "resolved": "https://registry.npm.taobao.org/@babel/helper-optimise-call-expression/download/@babel/helper-optimise-call-expression-7.8.3.tgz?cache=0&sync_timestamp=1578951937431&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40babel%2Fhelper-optimise-call-expression%2Fdownload%2F%40babel%2Fhelper-optimise-call-expression-7.8.3.tgz", "integrity": "sha1-ftBxgT0Jx1KY708giVYAa2ER7Lk=", "requires": { "@babel/types": "^7.8.3" @@ -326,7 +326,7 @@ }, "@babel/helper-plugin-utils": { "version": "7.8.3", - "resolved": "https://registry.npm.taobao.org/@babel/helper-plugin-utils/download/@babel/helper-plugin-utils-7.8.3.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40babel%2Fhelper-plugin-utils%2Fdownload%2F%40babel%2Fhelper-plugin-utils-7.8.3.tgz", + "resolved": "https://registry.npm.taobao.org/@babel/helper-plugin-utils/download/@babel/helper-plugin-utils-7.8.3.tgz", "integrity": "sha1-nqKTvhm6vA9S/4yoizTDYRsghnA=" }, "@babel/helper-replace-supers": { @@ -775,7 +775,7 @@ "dependencies": { "@babel/helper-plugin-utils": { "version": "7.8.3", - "resolved": "https://registry.npm.taobao.org/@babel/helper-plugin-utils/download/@babel/helper-plugin-utils-7.8.3.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40babel%2Fhelper-plugin-utils%2Fdownload%2F%40babel%2Fhelper-plugin-utils-7.8.3.tgz", + "resolved": "https://registry.npm.taobao.org/@babel/helper-plugin-utils/download/@babel/helper-plugin-utils-7.8.3.tgz", "integrity": "sha1-nqKTvhm6vA9S/4yoizTDYRsghnA=" } } @@ -1078,7 +1078,7 @@ "dependencies": { "@babel/helper-plugin-utils": { "version": "7.8.3", - "resolved": "https://registry.npm.taobao.org/@babel/helper-plugin-utils/download/@babel/helper-plugin-utils-7.8.3.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40babel%2Fhelper-plugin-utils%2Fdownload%2F%40babel%2Fhelper-plugin-utils-7.8.3.tgz", + "resolved": "https://registry.npm.taobao.org/@babel/helper-plugin-utils/download/@babel/helper-plugin-utils-7.8.3.tgz", "integrity": "sha1-nqKTvhm6vA9S/4yoizTDYRsghnA=" } } @@ -1168,7 +1168,7 @@ "dependencies": { "@babel/helper-plugin-utils": { "version": "7.8.3", - "resolved": "https://registry.npm.taobao.org/@babel/helper-plugin-utils/download/@babel/helper-plugin-utils-7.8.3.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40babel%2Fhelper-plugin-utils%2Fdownload%2F%40babel%2Fhelper-plugin-utils-7.8.3.tgz", + "resolved": "https://registry.npm.taobao.org/@babel/helper-plugin-utils/download/@babel/helper-plugin-utils-7.8.3.tgz", "integrity": "sha1-nqKTvhm6vA9S/4yoizTDYRsghnA=" } } @@ -1348,68 +1348,6 @@ "sumchecker": "^3.0.1" }, "dependencies": { - "@sindresorhus/is": { - "version": "0.14.0", - "resolved": "https://registry.npm.taobao.org/@sindresorhus/is/download/@sindresorhus/is-0.14.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40sindresorhus%2Fis%2Fdownload%2F%40sindresorhus%2Fis-0.14.0.tgz", - "integrity": "sha1-n7OjzzEyMoFR81PeRjLgHlIQK+o=", - "dev": true - }, - "@szmarczak/http-timer": { - "version": "1.1.2", - "resolved": "https://registry.npm.taobao.org/@szmarczak/http-timer/download/@szmarczak/http-timer-1.1.2.tgz", - "integrity": "sha1-sWZeLEYaLNkvTBu/UNVFTeDUtCE=", - "dev": true, - "requires": { - "defer-to-connect": "^1.0.1" - } - }, - "cacheable-request": { - "version": "6.1.0", - "resolved": "https://registry.npm.taobao.org/cacheable-request/download/cacheable-request-6.1.0.tgz", - "integrity": "sha1-IP+4vRYrpL4R6VZ9gj22UQUsqRI=", - "dev": true, - "requires": { - "clone-response": "^1.0.2", - "get-stream": "^5.1.0", - "http-cache-semantics": "^4.0.0", - "keyv": "^3.0.0", - "lowercase-keys": "^2.0.0", - "normalize-url": "^4.1.0", - "responselike": "^1.0.2" - }, - "dependencies": { - "get-stream": { - "version": "5.1.0", - "resolved": "https://registry.npm.taobao.org/get-stream/download/get-stream-5.1.0.tgz", - "integrity": "sha1-ASA83JJZf5uQkGfD5lbMH008Tck=", - "dev": true, - "requires": { - "pump": "^3.0.0" - } - }, - "lowercase-keys": { - "version": "2.0.0", - "resolved": "https://registry.npm.taobao.org/lowercase-keys/download/lowercase-keys-2.0.0.tgz", - "integrity": "sha1-JgPni3tLAAbLyi+8yKMgJVislHk=", - "dev": true - } - } - }, - "decompress-response": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz", - "integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=", - "dev": true, - "requires": { - "mimic-response": "^1.0.0" - } - }, - "defer-to-connect": { - "version": "1.1.3", - "resolved": "https://registry.npm.taobao.org/defer-to-connect/download/defer-to-connect-1.1.3.tgz", - "integrity": "sha1-MxrgUMCNz3ifjIOnuB8O2U9KxZE=", - "dev": true - }, "fs-extra": { "version": "8.1.0", "resolved": "https://registry.npm.taobao.org/fs-extra/download/fs-extra-8.1.0.tgz", @@ -1421,31 +1359,6 @@ "universalify": "^0.1.0" } }, - "got": { - "version": "9.6.0", - "resolved": "https://registry.npm.taobao.org/got/download/got-9.6.0.tgz?cache=0&sync_timestamp=1585075191797&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fgot%2Fdownload%2Fgot-9.6.0.tgz", - "integrity": "sha1-7fRefWf5lUVwXeH3u+7rEhdl7YU=", - "dev": true, - "requires": { - "@sindresorhus/is": "^0.14.0", - "@szmarczak/http-timer": "^1.1.2", - "cacheable-request": "^6.0.0", - "decompress-response": "^3.3.0", - "duplexer3": "^0.1.4", - "get-stream": "^4.1.0", - "lowercase-keys": "^1.0.1", - "mimic-response": "^1.0.1", - "p-cancelable": "^1.0.0", - "to-readable-stream": "^1.0.0", - "url-parse-lax": "^3.0.0" - } - }, - "json-buffer": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz", - "integrity": "sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg=", - "dev": true - }, "jsonfile": { "version": "4.0.0", "resolved": "https://registry.npm.taobao.org/jsonfile/download/jsonfile-4.0.0.tgz", @@ -1455,54 +1368,6 @@ "graceful-fs": "^4.1.6" } }, - "keyv": { - "version": "3.1.0", - "resolved": "https://registry.npm.taobao.org/keyv/download/keyv-3.1.0.tgz", - "integrity": "sha1-7MIoSG9pmR5J6UdkhaW+Ho/FxNk=", - "dev": true, - "requires": { - "json-buffer": "3.0.0" - } - }, - "lowercase-keys": { - "version": "1.0.1", - "resolved": "https://registry.npm.taobao.org/lowercase-keys/download/lowercase-keys-1.0.1.tgz", - "integrity": "sha1-b54wtHCE2XGnyCD/FabFFnt0wm8=", - "dev": true - }, - "mimic-response": { - "version": "1.0.1", - "resolved": "https://registry.npm.taobao.org/mimic-response/download/mimic-response-1.0.1.tgz?cache=0&sync_timestamp=1581922218546&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmimic-response%2Fdownload%2Fmimic-response-1.0.1.tgz", - "integrity": "sha1-SSNTiHju9CBjy4o+OweYeBSHqxs=", - "dev": true - }, - "normalize-url": { - "version": "4.5.0", - "resolved": "https://registry.npm.taobao.org/normalize-url/download/normalize-url-4.5.0.tgz", - "integrity": "sha1-RTNUCH5sqWlXvY9br3U/WYIUISk=", - "dev": true - }, - "p-cancelable": { - "version": "1.1.0", - "resolved": "https://registry.npm.taobao.org/p-cancelable/download/p-cancelable-1.1.0.tgz", - "integrity": "sha1-0HjRWjr0CSIMiG8dmgyi5EGrJsw=", - "dev": true - }, - "responselike": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz", - "integrity": "sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=", - "dev": true, - "requires": { - "lowercase-keys": "^1.0.0" - } - }, - "to-readable-stream": { - "version": "1.0.0", - "resolved": "https://registry.npm.taobao.org/to-readable-stream/download/to-readable-stream-1.0.0.tgz", - "integrity": "sha1-zgqgwvPfat+FLvtASng+d8BHV3E=", - "dev": true - }, "universalify": { "version": "0.1.2", "resolved": "https://registry.npm.taobao.org/universalify/download/universalify-0.1.2.tgz?cache=0&sync_timestamp=1583530825899&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Funiversalify%2Fdownload%2Funiversalify-0.1.2.tgz", @@ -1950,30 +1815,18 @@ } }, "@sindresorhus/is": { - "version": "2.1.0", - "resolved": "https://registry.npm.taobao.org/@sindresorhus/is/download/@sindresorhus/is-2.1.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40sindresorhus%2Fis%2Fdownload%2F%40sindresorhus%2Fis-2.1.0.tgz", - "integrity": "sha1-atTKYQ9pYJjpKVSrQx/4O+oM4T8=", + "version": "0.14.0", + "resolved": "https://registry.npm.taobao.org/@sindresorhus/is/download/@sindresorhus/is-0.14.0.tgz", + "integrity": "sha1-n7OjzzEyMoFR81PeRjLgHlIQK+o=", "dev": true }, "@szmarczak/http-timer": { - "version": "4.0.5", - "resolved": "https://registry.npm.taobao.org/@szmarczak/http-timer/download/@szmarczak/http-timer-4.0.5.tgz", - "integrity": "sha1-v71QIR6d+lG6B9pYoUzf0zMgUVI=", - "dev": true, - "requires": { - "defer-to-connect": "^2.0.0" - } - }, - "@types/cacheable-request": { - "version": "6.0.1", - "resolved": "https://registry.npm.taobao.org/@types/cacheable-request/download/@types/cacheable-request-6.0.1.tgz", - "integrity": "sha1-XSLz3e0f06hMC761A5p0GcLJGXY=", + "version": "1.1.2", + "resolved": "https://registry.npm.taobao.org/@szmarczak/http-timer/download/@szmarczak/http-timer-1.1.2.tgz", + "integrity": "sha1-sWZeLEYaLNkvTBu/UNVFTeDUtCE=", "dev": true, "requires": { - "@types/http-cache-semantics": "*", - "@types/keyv": "*", - "@types/node": "*", - "@types/responselike": "*" + "defer-to-connect": "^1.0.1" } }, "@types/color-name": { @@ -1995,7 +1848,7 @@ }, "@types/estree": { "version": "0.0.44", - "resolved": "https://registry.npm.taobao.org/@types/estree/download/@types/estree-0.0.44.tgz?cache=0&sync_timestamp=1584727775273&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40types%2Festree%2Fdownload%2F%40types%2Festree-0.0.44.tgz", + "resolved": "https://registry.npm.taobao.org/@types/estree/download/@types/estree-0.0.44.tgz?cache=0&sync_timestamp=1584728607897&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40types%2Festree%2Fdownload%2F%40types%2Festree-0.0.44.tgz", "integrity": "sha1-mAzFopo+876m/x99AhBH1+pXXiE=" }, "@types/events": { @@ -2028,31 +1881,16 @@ "integrity": "sha1-Un0g72hXGkrwLtdDUBZOemdUSGA=", "dev": true }, - "@types/http-cache-semantics": { - "version": "4.0.0", - "resolved": "https://registry.npm.taobao.org/@types/http-cache-semantics/download/@types/http-cache-semantics-4.0.0.tgz", - "integrity": "sha1-kUB3lzaqJlVjXudW4kZ9eHz+iio=", - "dev": true - }, "@types/json-schema": { "version": "7.0.4", "resolved": "https://registry.npm.taobao.org/@types/json-schema/download/@types/json-schema-7.0.4.tgz", "integrity": "sha1-OP1z3f2bVaux4bLtV4y1W9e30zk=", "dev": true }, - "@types/keyv": { - "version": "3.1.1", - "resolved": "https://registry.npm.taobao.org/@types/keyv/download/@types/keyv-3.1.1.tgz", - "integrity": "sha1-5FpFMk/KnatxarEjDuJJyftSz6c=", - "dev": true, - "requires": { - "@types/node": "*" - } - }, "@types/lodash": { - "version": "4.14.149", - "resolved": "https://registry.npm.taobao.org/@types/lodash/download/@types/lodash-4.14.149.tgz?cache=0&sync_timestamp=1574120085454&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40types%2Flodash%2Fdownload%2F%40types%2Flodash-4.14.149.tgz", - "integrity": "sha1-E0LWPZSMYGKDj7+WEBL3TU5jhEA=", + "version": "4.14.150", + "resolved": "https://registry.npm.taobao.org/@types/lodash/download/@types/lodash-4.14.150.tgz?cache=0&sync_timestamp=1587165294618&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40types%2Flodash%2Fdownload%2F%40types%2Flodash-4.14.150.tgz", + "integrity": "sha1-ZJ/kRoTD8fy2Fk2UPFphl36M8L0=", "dev": true }, "@types/minimatch": { @@ -2067,9 +1905,9 @@ "dev": true }, "@types/node": { - "version": "13.11.1", - "resolved": "https://registry.npm.taobao.org/@types/node/download/@types/node-13.11.1.tgz", - "integrity": "sha1-SaKoPfnSbarOrTDQzMh2KxKNU8c=" + "version": "13.13.2", + "resolved": "https://registry.npm.taobao.org/@types/node/download/@types/node-13.13.2.tgz", + "integrity": "sha1-Fg2CYjYQ21kKZOjKgXhOERF+WlQ=" }, "@types/parse-json": { "version": "4.0.0", @@ -2136,15 +1974,6 @@ "@types/node": "*" } }, - "@types/responselike": { - "version": "1.0.0", - "resolved": "https://registry.npm.taobao.org/@types/responselike/download/@types/responselike-1.0.0.tgz", - "integrity": "sha1-JR9P59FU0rrRJavhtCmyOv0mLik=", - "dev": true, - "requires": { - "@types/node": "*" - } - }, "@types/semver": { "version": "7.1.0", "resolved": "https://registry.npm.taobao.org/@types/semver/download/@types/semver-7.1.0.tgz", @@ -2194,25 +2023,25 @@ } }, "@typescript-eslint/eslint-plugin": { - "version": "2.28.0", - "resolved": "https://registry.npm.taobao.org/@typescript-eslint/eslint-plugin/download/@typescript-eslint/eslint-plugin-2.28.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40typescript-eslint%2Feslint-plugin%2Fdownload%2F%40typescript-eslint%2Feslint-plugin-2.28.0.tgz", - "integrity": "sha1-RDG8bTr0GQPlJVdwcD1OVaDMvew=", + "version": "2.29.0", + "resolved": "https://registry.npm.taobao.org/@typescript-eslint/eslint-plugin/download/@typescript-eslint/eslint-plugin-2.29.0.tgz", + "integrity": "sha1-ye+rdiTj3W0USg5Fd6VB0b1Cwqw=", "dev": true, "requires": { - "@typescript-eslint/experimental-utils": "2.28.0", + "@typescript-eslint/experimental-utils": "2.29.0", "functional-red-black-tree": "^1.0.1", "regexpp": "^3.0.0", "tsutils": "^3.17.1" } }, "@typescript-eslint/experimental-utils": { - "version": "2.28.0", - "resolved": "https://registry.npm.taobao.org/@typescript-eslint/experimental-utils/download/@typescript-eslint/experimental-utils-2.28.0.tgz", - "integrity": "sha1-H9CWHNjvZSJoe0xWJkfabnH4gz0=", + "version": "2.29.0", + "resolved": "https://registry.npm.taobao.org/@typescript-eslint/experimental-utils/download/@typescript-eslint/experimental-utils-2.29.0.tgz?cache=0&sync_timestamp=1587403463614&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40typescript-eslint%2Fexperimental-utils%2Fdownload%2F%40typescript-eslint%2Fexperimental-utils-2.29.0.tgz", + "integrity": "sha1-PLgGDekmW6ExYlqWu/7DG6bUoP4=", "dev": true, "requires": { "@types/json-schema": "^7.0.3", - "@typescript-eslint/typescript-estree": "2.28.0", + "@typescript-eslint/typescript-estree": "2.29.0", "eslint-scope": "^5.0.0", "eslint-utils": "^2.0.0" }, @@ -2229,21 +2058,21 @@ } }, "@typescript-eslint/parser": { - "version": "2.28.0", - "resolved": "https://registry.npm.taobao.org/@typescript-eslint/parser/download/@typescript-eslint/parser-2.28.0.tgz", - "integrity": "sha1-u3YShu/SsHFHYcq50O5YR88IA4U=", + "version": "2.29.0", + "resolved": "https://registry.npm.taobao.org/@typescript-eslint/parser/download/@typescript-eslint/parser-2.29.0.tgz", + "integrity": "sha1-bjxOIe1jk9wFudi0fwt+cx7yHJw=", "dev": true, "requires": { "@types/eslint-visitor-keys": "^1.0.0", - "@typescript-eslint/experimental-utils": "2.28.0", - "@typescript-eslint/typescript-estree": "2.28.0", + "@typescript-eslint/experimental-utils": "2.29.0", + "@typescript-eslint/typescript-estree": "2.29.0", "eslint-visitor-keys": "^1.1.0" } }, "@typescript-eslint/typescript-estree": { - "version": "2.28.0", - "resolved": "https://registry.npm.taobao.org/@typescript-eslint/typescript-estree/download/@typescript-eslint/typescript-estree-2.28.0.tgz", - "integrity": "sha1-00lJCZ/4EJLDbcJ1tqHqWAcpugA=", + "version": "2.29.0", + "resolved": "https://registry.npm.taobao.org/@typescript-eslint/typescript-estree/download/@typescript-eslint/typescript-estree-2.29.0.tgz", + "integrity": "sha1-G+ZhK7Avw3rJ9GZSHBRZpHROjTo=", "dev": true, "requires": { "debug": "^4.1.1", @@ -2297,9 +2126,9 @@ } }, "@xmcl/core": { - "version": "2.1.3", - "resolved": "https://registry.npm.taobao.org/@xmcl/core/download/@xmcl/core-2.1.3.tgz", - "integrity": "sha1-TIuhYNHl09dFYI85wQeHiozkBeY=", + "version": "2.2.0", + "resolved": "https://registry.npm.taobao.org/@xmcl/core/download/@xmcl/core-2.2.0.tgz", + "integrity": "sha1-fD7PXpnU2nxzdpJAoXIFrBE9mCU=", "dev": true, "requires": { "@xmcl/unzip": "^1.2.0" @@ -2315,16 +2144,14 @@ } }, "@xmcl/installer": { - "version": "2.6.8", - "resolved": "https://registry.npm.taobao.org/@xmcl/installer/download/@xmcl/installer-2.6.8.tgz", - "integrity": "sha1-lrpP/O4IRVwNmx77LBk9JbcC5NA=", + "version": "2.7.3", + "resolved": "https://registry.npm.taobao.org/@xmcl/installer/download/@xmcl/installer-2.7.3.tgz", + "integrity": "sha1-87CfUJLyMxqsRBRlf47/I5iymq0=", "dev": true, "requires": { - "@xmcl/core": "^2.1.3", + "@xmcl/core": "^2.2.0", "@xmcl/forge-site-parser": "^2.0.4", "@xmcl/task": "^2.1.6", - "agentkeepalive": "^4.1.0", - "got": "^10.7.0", "java-asm": "^0.0.6" } }, @@ -2397,7 +2224,7 @@ }, "acorn-dynamic-import": { "version": "4.0.0", - "resolved": "http://registry.npm.taobao.org/acorn-dynamic-import/download/acorn-dynamic-import-4.0.0.tgz", + "resolved": "https://registry.npm.taobao.org/acorn-dynamic-import/download/acorn-dynamic-import-4.0.0.tgz", "integrity": "sha1-SCIQFAWCo2uDw+NC4c/ryqkkCUg=" }, "acorn-globals": { @@ -2435,17 +2262,6 @@ "object-assign": "4.x" } }, - "agentkeepalive": { - "version": "4.1.0", - "resolved": "https://registry.npm.taobao.org/agentkeepalive/download/agentkeepalive-4.1.0.tgz", - "integrity": "sha1-pI4EDtFnRd0pzpI2dfYMnJDznuA=", - "dev": true, - "requires": { - "debug": "^4.1.0", - "depd": "^1.1.2", - "humanize-ms": "^1.2.1" - } - }, "aggregate-error": { "version": "3.0.1", "resolved": "https://registry.npm.taobao.org/aggregate-error/download/aggregate-error-3.0.1.tgz?cache=0&sync_timestamp=1570167911603&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Faggregate-error%2Fdownload%2Faggregate-error-3.0.1.tgz", @@ -2586,7 +2402,7 @@ }, "apollojs": { "version": "1.3.0", - "resolved": "https://registry.npmjs.org/apollojs/-/apollojs-1.3.0.tgz", + "resolved": "https://registry.npm.taobao.org/apollojs/download/apollojs-1.3.0.tgz", "integrity": "sha1-X3sAME2XQOKnvltSx8CAfVH5JV4=", "dev": true }, @@ -3340,9 +3156,9 @@ "integrity": "sha1-ZfCvOC9Xi83HQr2cKB6cstd2gyg=" }, "bili": { - "version": "4.9.0", - "resolved": "https://registry.npm.taobao.org/bili/download/bili-4.9.0.tgz", - "integrity": "sha1-JFkLM+p270EVL3eWqszue77GqtI=", + "version": "4.9.1", + "resolved": "https://registry.npm.taobao.org/bili/download/bili-4.9.1.tgz", + "integrity": "sha1-fDaIDhdeT09nBPMbYlfREWo1AVY=", "requires": { "@babel/core": "^7.2.2", "@babel/plugin-proposal-object-rest-spread": "^7.3.1", @@ -3362,7 +3178,7 @@ "rollup-plugin-node-resolve": "^4.2.3", "rollup-plugin-postcss": "^2.0.3", "rollup-plugin-replace": "^2.1.0", - "rollup-plugin-terser": "^4.0.2" + "rollup-plugin-terser": "^5.3.0" }, "dependencies": { "ansi-regex": { @@ -3372,7 +3188,7 @@ }, "chalk": { "version": "2.4.2", - "resolved": "https://registry.npm.taobao.org/chalk/download/chalk-2.4.2.tgz?cache=0&sync_timestamp=1573282949696&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fchalk%2Fdownload%2Fchalk-2.4.2.tgz", + "resolved": "https://registry.npm.taobao.org/chalk/download/chalk-2.4.2.tgz", "integrity": "sha1-zUJUFnelQzPPVBpJEIwUMrRMlCQ=", "requires": { "ansi-styles": "^3.2.1", @@ -3381,13 +3197,13 @@ } }, "cli-spinners": { - "version": "2.2.0", - "resolved": "https://registry.npm.taobao.org/cli-spinners/download/cli-spinners-2.2.0.tgz", - "integrity": "sha1-6LmI2SBsaSMC2O6DTnqFwBRNj3c=" + "version": "2.3.0", + "resolved": "https://registry.npm.taobao.org/cli-spinners/download/cli-spinners-2.3.0.tgz?cache=0&sync_timestamp=1586157510340&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcli-spinners%2Fdownload%2Fcli-spinners-2.3.0.tgz", + "integrity": "sha1-BjIjmktapMlYYQFCw0u3plH8jfU=" }, "ora": { "version": "3.4.0", - "resolved": "https://registry.npm.taobao.org/ora/download/ora-3.4.0.tgz", + "resolved": "https://registry.npm.taobao.org/ora/download/ora-3.4.0.tgz?cache=0&sync_timestamp=1587481470351&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fora%2Fdownload%2Fora-3.4.0.tgz", "integrity": "sha1-vwdSSRBZo+8+1MhQl1Md6f280xg=", "requires": { "chalk": "^2.4.2", @@ -3689,12 +3505,12 @@ "dependencies": { "acorn": { "version": "6.4.1", - "resolved": "https://registry.npm.taobao.org/acorn/download/acorn-6.4.1.tgz?cache=0&sync_timestamp=1583796606796&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Facorn%2Fdownload%2Facorn-6.4.1.tgz", + "resolved": "https://registry.npm.taobao.org/acorn/download/acorn-6.4.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Facorn%2Fdownload%2Facorn-6.4.1.tgz", "integrity": "sha1-Ux5Yuj9RudrLmmZGyk3r9bFMpHQ=" }, "chalk": { "version": "2.4.2", - "resolved": "https://registry.npm.taobao.org/chalk/download/chalk-2.4.2.tgz?cache=0&sync_timestamp=1573282949696&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fchalk%2Fdownload%2Fchalk-2.4.2.tgz", + "resolved": "https://registry.npm.taobao.org/chalk/download/chalk-2.4.2.tgz", "integrity": "sha1-zUJUFnelQzPPVBpJEIwUMrRMlCQ=", "requires": { "ansi-styles": "^3.2.1", @@ -3897,29 +3713,19 @@ "unset-value": "^1.0.0" } }, - "cacheable-lookup": { - "version": "2.0.1", - "resolved": "https://registry.npm.taobao.org/cacheable-lookup/download/cacheable-lookup-2.0.1.tgz", - "integrity": "sha1-h75koYuSUjSHXhCpux68pK3Oazg=", - "dev": true, - "requires": { - "@types/keyv": "^3.1.1", - "keyv": "^4.0.0" - } - }, "cacheable-request": { - "version": "7.0.1", - "resolved": "https://registry.npm.taobao.org/cacheable-request/download/cacheable-request-7.0.1.tgz", - "integrity": "sha1-BiAxwoViMngu1pSiV/o12pOUKlg=", + "version": "6.1.0", + "resolved": "https://registry.npm.taobao.org/cacheable-request/download/cacheable-request-6.1.0.tgz", + "integrity": "sha1-IP+4vRYrpL4R6VZ9gj22UQUsqRI=", "dev": true, "requires": { "clone-response": "^1.0.2", "get-stream": "^5.1.0", "http-cache-semantics": "^4.0.0", - "keyv": "^4.0.0", + "keyv": "^3.0.0", "lowercase-keys": "^2.0.0", "normalize-url": "^4.1.0", - "responselike": "^2.0.0" + "responselike": "^1.0.2" }, "dependencies": { "get-stream": { @@ -3931,6 +3737,12 @@ "pump": "^3.0.0" } }, + "lowercase-keys": { + "version": "2.0.0", + "resolved": "https://registry.npm.taobao.org/lowercase-keys/download/lowercase-keys-2.0.0.tgz", + "integrity": "sha1-JgPni3tLAAbLyi+8yKMgJVislHk=", + "dev": true + }, "normalize-url": { "version": "4.5.0", "resolved": "https://registry.npm.taobao.org/normalize-url/download/normalize-url-4.5.0.tgz", @@ -4977,12 +4789,12 @@ "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=" }, "decompress-response": { - "version": "5.0.0", - "resolved": "https://registry.npm.taobao.org/decompress-response/download/decompress-response-5.0.0.tgz?cache=0&sync_timestamp=1572616719270&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdecompress-response%2Fdownload%2Fdecompress-response-5.0.0.tgz", - "integrity": "sha1-eEk5boDj0euoyy9170kw92Rhyw8=", + "version": "3.3.0", + "resolved": "https://registry.npm.taobao.org/decompress-response/download/decompress-response-3.3.0.tgz?cache=0&sync_timestamp=1572616719270&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdecompress-response%2Fdownload%2Fdecompress-response-3.3.0.tgz", + "integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=", "dev": true, "requires": { - "mimic-response": "^2.0.0" + "mimic-response": "^1.0.0" } }, "deep-extend": { @@ -5012,9 +4824,9 @@ } }, "defer-to-connect": { - "version": "2.0.0", - "resolved": "https://registry.npm.taobao.org/defer-to-connect/download/defer-to-connect-2.0.0.tgz", - "integrity": "sha1-g9axmdsEFZOshNeBtSIjCMz0wsE=", + "version": "1.1.3", + "resolved": "https://registry.npm.taobao.org/defer-to-connect/download/defer-to-connect-1.1.3.tgz", + "integrity": "sha1-MxrgUMCNz3ifjIOnuB8O2U9KxZE=", "dev": true }, "define-properties": { @@ -5630,9 +5442,9 @@ "dev": true }, "electron": { - "version": "8.2.2", - "resolved": "https://registry.npm.taobao.org/electron/download/electron-8.2.2.tgz?cache=0&sync_timestamp=1586882206750&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Felectron%2Fdownload%2Felectron-8.2.2.tgz", - "integrity": "sha1-bdsnwfFf2l9uiR4a0TwKDRWw8TM=", + "version": "8.2.3", + "resolved": "https://registry.npm.taobao.org/electron/download/electron-8.2.3.tgz", + "integrity": "sha1-t9akO9nzokKMZg3NBVogA0Ug4eo=", "dev": true, "requires": { "@electron/get": "^1.0.1", @@ -5641,9 +5453,9 @@ }, "dependencies": { "@types/node": { - "version": "12.12.35", - "resolved": "https://registry.npm.taobao.org/@types/node/download/@types/node-12.12.35.tgz", - "integrity": "sha1-HmGyJsFDgPQ4T3DP5JplwsVTrSs=", + "version": "12.12.36", + "resolved": "https://registry.npm.taobao.org/@types/node/download/@types/node-12.12.36.tgz?cache=0&sync_timestamp=1587400295926&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40types%2Fnode%2Fdownload%2F%40types%2Fnode-12.12.36.tgz", + "integrity": "sha1-FiyMKi5lnaSABJ3w4ZrhKK06FSc=", "dev": true } } @@ -6703,6 +6515,11 @@ "resolved": "https://registry.npm.taobao.org/etag/download/etag-1.8.1.tgz", "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=" }, + "eventemitter3": { + "version": "4.0.0", + "resolved": "https://registry.npm.taobao.org/eventemitter3/download/eventemitter3-4.0.0.tgz", + "integrity": "sha1-1lF2FjiH7lnzhtZMgmELaWpKdOs=" + }, "events": { "version": "3.0.0", "resolved": "https://registry.npm.taobao.org/events/download/events-3.0.0.tgz", @@ -6952,7 +6769,7 @@ }, "fast-html-parser": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/fast-html-parser/-/fast-html-parser-1.0.1.tgz", + "resolved": "https://registry.npm.taobao.org/fast-html-parser/download/fast-html-parser-1.0.1.tgz", "integrity": "sha1-TsyWg7i7ea/hGlCAe3hT55JWzqI=", "dev": true, "requires": { @@ -7957,43 +7774,22 @@ "dev": true }, "got": { - "version": "10.7.0", - "resolved": "https://registry.npm.taobao.org/got/download/got-10.7.0.tgz?cache=0&sync_timestamp=1585075191797&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fgot%2Fdownload%2Fgot-10.7.0.tgz", - "integrity": "sha1-YoidvNbMoyzWoVTMLQxolRIdCR8=", + "version": "9.6.0", + "resolved": "https://registry.npm.taobao.org/got/download/got-9.6.0.tgz", + "integrity": "sha1-7fRefWf5lUVwXeH3u+7rEhdl7YU=", "dev": true, "requires": { - "@sindresorhus/is": "^2.0.0", - "@szmarczak/http-timer": "^4.0.0", - "@types/cacheable-request": "^6.0.1", - "cacheable-lookup": "^2.0.0", - "cacheable-request": "^7.0.1", - "decompress-response": "^5.0.0", + "@sindresorhus/is": "^0.14.0", + "@szmarczak/http-timer": "^1.1.2", + "cacheable-request": "^6.0.0", + "decompress-response": "^3.3.0", "duplexer3": "^0.1.4", - "get-stream": "^5.0.0", - "lowercase-keys": "^2.0.0", - "mimic-response": "^2.1.0", - "p-cancelable": "^2.0.0", - "p-event": "^4.0.0", - "responselike": "^2.0.0", - "to-readable-stream": "^2.0.0", - "type-fest": "^0.10.0" - }, - "dependencies": { - "get-stream": { - "version": "5.1.0", - "resolved": "https://registry.npm.taobao.org/get-stream/download/get-stream-5.1.0.tgz", - "integrity": "sha1-ASA83JJZf5uQkGfD5lbMH008Tck=", - "dev": true, - "requires": { - "pump": "^3.0.0" - } - }, - "type-fest": { - "version": "0.10.0", - "resolved": "https://registry.npm.taobao.org/type-fest/download/type-fest-0.10.0.tgz", - "integrity": "sha1-fwayufv8WBBo0TQf+r0DSc6vxkI=", - "dev": true - } + "get-stream": "^4.1.0", + "lowercase-keys": "^1.0.1", + "mimic-response": "^1.0.1", + "p-cancelable": "^1.0.0", + "to-readable-stream": "^1.0.0", + "url-parse-lax": "^3.0.0" } }, "graceful-fs": { @@ -8345,15 +8141,6 @@ "resolved": "https://registry.npm.taobao.org/https-browserify/download/https-browserify-1.0.0.tgz", "integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=" }, - "humanize-ms": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/humanize-ms/-/humanize-ms-1.2.1.tgz", - "integrity": "sha1-xG4xWaKT9riW2ikxbYtv6Lt5u+0=", - "dev": true, - "requires": { - "ms": "^2.0.0" - } - }, "husky": { "version": "4.2.5", "resolved": "https://registry.npm.taobao.org/husky/download/husky-4.2.5.tgz?cache=0&sync_timestamp=1586469908461&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fhusky%2Fdownload%2Fhusky-4.2.5.tgz", @@ -8502,11 +8289,11 @@ "dev": true }, "import-cwd": { - "version": "2.1.0", - "resolved": "https://registry.npm.taobao.org/import-cwd/download/import-cwd-2.1.0.tgz", - "integrity": "sha1-qmzzbnInYShcs3HsZRn1PiQ1sKk=", + "version": "3.0.0", + "resolved": "https://registry.npm.taobao.org/import-cwd/download/import-cwd-3.0.0.tgz", + "integrity": "sha1-IIRVR3GAFRJuqbNna3WS+4vUz5I=", "requires": { - "import-from": "^2.1.0" + "import-from": "^3.0.0" } }, "import-fresh": { @@ -8519,11 +8306,18 @@ } }, "import-from": { - "version": "2.1.0", - "resolved": "https://registry.npm.taobao.org/import-from/download/import-from-2.1.0.tgz", - "integrity": "sha1-M1238qev/VOqpHHUuAId7ja387E=", + "version": "3.0.0", + "resolved": "https://registry.npm.taobao.org/import-from/download/import-from-3.0.0.tgz", + "integrity": "sha1-BVz+w4zVon2AV8pRN219O/CJGWY=", "requires": { - "resolve-from": "^3.0.0" + "resolve-from": "^5.0.0" + }, + "dependencies": { + "resolve-from": { + "version": "5.0.0", + "resolved": "https://registry.npm.taobao.org/resolve-from/download/resolve-from-5.0.0.tgz", + "integrity": "sha1-w1IlhD3493bfIcV1V7wIfp39/Gk=" + } } }, "import-lazy": { @@ -9075,7 +8869,7 @@ }, "jest-worker": { "version": "24.9.0", - "resolved": "https://registry.npm.taobao.org/jest-worker/download/jest-worker-24.9.0.tgz?cache=0&sync_timestamp=1566444249955&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fjest-worker%2Fdownload%2Fjest-worker-24.9.0.tgz", + "resolved": "https://registry.npm.taobao.org/jest-worker/download/jest-worker-24.9.0.tgz?cache=0&sync_timestamp=1587334054636&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fjest-worker%2Fdownload%2Fjest-worker-24.9.0.tgz", "integrity": "sha1-Xb/bWy0yLphWeJgjipaXvM5ns+U=", "requires": { "merge-stream": "^2.0.0", @@ -9084,7 +8878,7 @@ "dependencies": { "supports-color": { "version": "6.1.0", - "resolved": "https://registry.npm.taobao.org/supports-color/download/supports-color-6.1.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsupports-color%2Fdownload%2Fsupports-color-6.1.0.tgz", + "resolved": "https://registry.npm.taobao.org/supports-color/download/supports-color-6.1.0.tgz", "integrity": "sha1-B2Srxpxj1ayELdSGfo0CXogN+PM=", "requires": { "has-flag": "^3.0.0" @@ -9201,9 +8995,9 @@ "integrity": "sha1-gFZNLkg9rPbo7yCWUKZ98/DCg6Q=" }, "json-buffer": { - "version": "3.0.1", - "resolved": "https://registry.npm.taobao.org/json-buffer/download/json-buffer-3.0.1.tgz", - "integrity": "sha1-kziAKjDTtmBfvgYT4JQAjKjAWhM=", + "version": "3.0.0", + "resolved": "https://registry.npm.taobao.org/json-buffer/download/json-buffer-3.0.0.tgz", + "integrity": "sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg=", "dev": true }, "json-parse-better-errors": { @@ -9300,12 +9094,12 @@ } }, "keyv": { - "version": "4.0.0", - "resolved": "https://registry.npm.taobao.org/keyv/download/keyv-4.0.0.tgz", - "integrity": "sha1-LR2raUkmstQn5MdIBKEIUL5EwS8=", + "version": "3.1.0", + "resolved": "https://registry.npm.taobao.org/keyv/download/keyv-3.1.0.tgz", + "integrity": "sha1-7MIoSG9pmR5J6UdkhaW+Ho/FxNk=", "dev": true, "requires": { - "json-buffer": "3.0.1" + "json-buffer": "3.0.0" } }, "kind-of": { @@ -9566,9 +9360,9 @@ } }, "lowercase-keys": { - "version": "2.0.0", - "resolved": "https://registry.npm.taobao.org/lowercase-keys/download/lowercase-keys-2.0.0.tgz", - "integrity": "sha1-JgPni3tLAAbLyi+8yKMgJVislHk=", + "version": "1.0.1", + "resolved": "https://registry.npm.taobao.org/lowercase-keys/download/lowercase-keys-1.0.1.tgz", + "integrity": "sha1-b54wtHCE2XGnyCD/FabFFnt0wm8=", "dev": true }, "lru-cache": { @@ -9770,9 +9564,9 @@ "integrity": "sha1-ggyGo5M0ZA6ZUWkovQP8qIBX0CI=" }, "mimic-response": { - "version": "2.1.0", - "resolved": "https://registry.npm.taobao.org/mimic-response/download/mimic-response-2.1.0.tgz?cache=0&sync_timestamp=1581922218546&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmimic-response%2Fdownload%2Fmimic-response-2.1.0.tgz", - "integrity": "sha1-0Tdj019hPQnsN+uzC6wEacDuj0M=", + "version": "1.0.1", + "resolved": "https://registry.npm.taobao.org/mimic-response/download/mimic-response-1.0.1.tgz?cache=0&sync_timestamp=1581922218546&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmimic-response%2Fdownload%2Fmimic-response-1.0.1.tgz", + "integrity": "sha1-SSNTiHju9CBjy4o+OweYeBSHqxs=", "dev": true }, "mini-create-react-context": { @@ -10417,7 +10211,7 @@ }, "os-homedir": { "version": "2.0.0", - "resolved": "http://registry.npm.taobao.org/os-homedir/download/os-homedir-2.0.0.tgz", + "resolved": "https://registry.npm.taobao.org/os-homedir/download/os-homedir-2.0.0.tgz", "integrity": "sha1-oMdrsAGoOSpQPL1G5+ZQs0I6kjw=" }, "os-locale": { @@ -10457,9 +10251,9 @@ } }, "p-cancelable": { - "version": "2.0.0", - "resolved": "https://registry.npm.taobao.org/p-cancelable/download/p-cancelable-2.0.0.tgz", - "integrity": "sha1-SjdA9b2vXtXXw+NIgsb7XWsmam4=", + "version": "1.1.0", + "resolved": "https://registry.npm.taobao.org/p-cancelable/download/p-cancelable-1.1.0.tgz", + "integrity": "sha1-0HjRWjr0CSIMiG8dmgyi5EGrJsw=", "dev": true }, "p-defer": { @@ -10468,20 +10262,10 @@ "integrity": "sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=", "dev": true }, - "p-event": { - "version": "4.1.0", - "resolved": "https://registry.npm.taobao.org/p-event/download/p-event-4.1.0.tgz", - "integrity": "sha1-6Su4Ztfo5bcyKTscgmnTjpmCv44=", - "dev": true, - "requires": { - "p-timeout": "^2.0.1" - } - }, "p-finally": { "version": "1.0.0", "resolved": "https://registry.npm.taobao.org/p-finally/download/p-finally-1.0.0.tgz?cache=0&sync_timestamp=1560955759606&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fp-finally%2Fdownload%2Fp-finally-1.0.0.tgz", - "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=", - "dev": true + "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=" }, "p-is-promise": { "version": "2.1.0", @@ -10515,15 +10299,18 @@ } }, "p-queue": { - "version": "2.4.2", - "resolved": "https://registry.npm.taobao.org/p-queue/download/p-queue-2.4.2.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fp-queue%2Fdownload%2Fp-queue-2.4.2.tgz", - "integrity": "sha1-A2CYJmgrdDvpoi26JQUb1Gck/DQ=" + "version": "6.3.0", + "resolved": "https://registry.npm.taobao.org/p-queue/download/p-queue-6.3.0.tgz", + "integrity": "sha1-Gb+kSF235qDBNQSf9nFjdYgNnDo=", + "requires": { + "eventemitter3": "^4.0.0", + "p-timeout": "^3.1.0" + } }, "p-timeout": { - "version": "2.0.1", - "resolved": "https://registry.npm.taobao.org/p-timeout/download/p-timeout-2.0.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fp-timeout%2Fdownload%2Fp-timeout-2.0.1.tgz", - "integrity": "sha1-2N0ZeVldLcATnh/ka4tkbLPN8Dg=", - "dev": true, + "version": "3.2.0", + "resolved": "https://registry.npm.taobao.org/p-timeout/download/p-timeout-3.2.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fp-timeout%2Fdownload%2Fp-timeout-3.2.0.tgz", + "integrity": "sha1-x+F6vJcdKnli74NiazXWNazyPf4=", "requires": { "p-finally": "^1.0.0" } @@ -11000,7 +10787,8 @@ "pify": { "version": "3.0.0", "resolved": "http://registry.npm.taobao.org/pify/download/pify-3.0.0.tgz", - "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=" + "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", + "dev": true }, "pkg-dir": { "version": "2.0.0", @@ -11209,6 +10997,24 @@ "requires": { "cosmiconfig": "^5.0.0", "import-cwd": "^2.0.0" + }, + "dependencies": { + "import-cwd": { + "version": "2.1.0", + "resolved": "https://registry.npm.taobao.org/import-cwd/download/import-cwd-2.1.0.tgz", + "integrity": "sha1-qmzzbnInYShcs3HsZRn1PiQ1sKk=", + "requires": { + "import-from": "^2.1.0" + } + }, + "import-from": { + "version": "2.1.0", + "resolved": "https://registry.npm.taobao.org/import-from/download/import-from-2.1.0.tgz", + "integrity": "sha1-M1238qev/VOqpHHUuAId7ja387E=", + "requires": { + "resolve-from": "^3.0.0" + } + } } }, "postcss-merge-longhand": { @@ -11304,9 +11110,9 @@ } }, "postcss-modules": { - "version": "1.5.0", - "resolved": "https://registry.npm.taobao.org/postcss-modules/download/postcss-modules-1.5.0.tgz?cache=0&sync_timestamp=1578507863405&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpostcss-modules%2Fdownload%2Fpostcss-modules-1.5.0.tgz", - "integrity": "sha1-CNps5D/PrbxoWgIf5u0w75KfC8w=", + "version": "2.0.0", + "resolved": "https://registry.npm.taobao.org/postcss-modules/download/postcss-modules-2.0.0.tgz?cache=0&sync_timestamp=1586850009591&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpostcss-modules%2Fdownload%2Fpostcss-modules-2.0.0.tgz", + "integrity": "sha1-Rz0NcyZlHYQIWFwqFUEV1cs2zOA=", "requires": { "css-modules-loader-core": "^1.1.0", "generic-names": "^2.0.1", @@ -12674,13 +12480,10 @@ "dev": true }, "reqwq": { - "version": "0.2.4", - "resolved": "https://registry.npmjs.org/reqwq/-/reqwq-0.2.4.tgz", - "integrity": "sha512-7g75tbuuQBvS1Bre2IJzxbS8Ih3GhXIxJhogfEZLD8mhDBguPOQ5tpbsFNNMK/xwGOOw4CdgPFV3XyhwIZO/rA==", - "dev": true, - "requires": { - "@types/react": "^16.9.11" - } + "version": "0.3.0", + "resolved": "https://registry.npm.taobao.org/reqwq/download/reqwq-0.3.0.tgz", + "integrity": "sha1-T5MNSI7Zt6H5VmQBN3PV4BnHnQA=", + "dev": true }, "reselect": { "version": "4.0.0", @@ -12755,12 +12558,12 @@ "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=" }, "responselike": { - "version": "2.0.0", - "resolved": "https://registry.npm.taobao.org/responselike/download/responselike-2.0.0.tgz", - "integrity": "sha1-JjkbzDF091D5p56sxAoSpcQtdyM=", + "version": "1.0.2", + "resolved": "https://registry.npm.taobao.org/responselike/download/responselike-1.0.2.tgz", + "integrity": "sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=", "dev": true, "requires": { - "lowercase-keys": "^2.0.0" + "lowercase-keys": "^1.0.0" } }, "restore-cursor": { @@ -12835,7 +12638,7 @@ }, "rollup": { "version": "1.32.1", - "resolved": "https://registry.npm.taobao.org/rollup/download/rollup-1.32.1.tgz", + "resolved": "https://registry.npm.taobao.org/rollup/download/rollup-1.32.1.tgz?cache=0&sync_timestamp=1587582716518&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Frollup%2Fdownload%2Frollup-1.32.1.tgz", "integrity": "sha1-RIDlLZ2eKuS0a6DZ3erzFjlA+cQ=", "requires": { "@types/estree": "*", @@ -12863,7 +12666,7 @@ }, "rollup-plugin-commonjs": { "version": "9.3.4", - "resolved": "https://registry.npm.taobao.org/rollup-plugin-commonjs/download/rollup-plugin-commonjs-9.3.4.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Frollup-plugin-commonjs%2Fdownload%2Frollup-plugin-commonjs-9.3.4.tgz", + "resolved": "https://registry.npm.taobao.org/rollup-plugin-commonjs/download/rollup-plugin-commonjs-9.3.4.tgz", "integrity": "sha1-Kz3du73tg9RcNv8QHN0p6ST9I7w=", "requires": { "estree-walker": "^0.6.0", @@ -12910,34 +12713,77 @@ } }, "rollup-plugin-postcss": { - "version": "2.5.0", - "resolved": "https://registry.npm.taobao.org/rollup-plugin-postcss/download/rollup-plugin-postcss-2.5.0.tgz?cache=0&sync_timestamp=1584465007108&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Frollup-plugin-postcss%2Fdownload%2Frollup-plugin-postcss-2.5.0.tgz", - "integrity": "sha1-VO8kh82kmNi8ppqso7VbMN7gEGs=", + "version": "2.9.0", + "resolved": "https://registry.npm.taobao.org/rollup-plugin-postcss/download/rollup-plugin-postcss-2.9.0.tgz", + "integrity": "sha1-5uoKG4/cSkn8A4XaWIBOMydQwoI=", "requires": { - "chalk": "^2.4.2", - "concat-with-sourcemaps": "^1.0.5", - "cssnano": "^4.1.8", - "import-cwd": "^2.1.0", - "p-queue": "^2.4.2", - "pify": "^3.0.0", - "postcss": "^7.0.14", - "postcss-load-config": "^2.0.0", - "postcss-modules": "^1.4.1", + "chalk": "^4.0.0", + "concat-with-sourcemaps": "^1.1.0", + "cssnano": "^4.1.10", + "import-cwd": "^3.0.0", + "p-queue": "^6.3.0", + "pify": "^5.0.0", + "postcss": "^7.0.27", + "postcss-load-config": "^2.1.0", + "postcss-modules": "^2.0.0", "promise.series": "^0.2.0", - "resolve": "^1.5.0", - "rollup-pluginutils": "^2.0.1", - "safe-identifier": "^0.3.1", + "resolve": "^1.16.0", + "rollup-pluginutils": "^2.8.2", + "safe-identifier": "^0.4.1", "style-inject": "^0.3.0" }, "dependencies": { - "chalk": { - "version": "2.4.2", - "resolved": "https://registry.npm.taobao.org/chalk/download/chalk-2.4.2.tgz?cache=0&sync_timestamp=1573282949696&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fchalk%2Fdownload%2Fchalk-2.4.2.tgz", - "integrity": "sha1-zUJUFnelQzPPVBpJEIwUMrRMlCQ=", + "pify": { + "version": "5.0.0", + "resolved": "https://registry.npm.taobao.org/pify/download/pify-5.0.0.tgz", + "integrity": "sha1-H17KP16H6+wozG1UoOSq8ArMEn8=" + }, + "postcss": { + "version": "7.0.27", + "resolved": "https://registry.npm.taobao.org/postcss/download/postcss-7.0.27.tgz?cache=0&sync_timestamp=1581994853208&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpostcss%2Fdownload%2Fpostcss-7.0.27.tgz", + "integrity": "sha1-zGfNxrDao3UQW3xCSoVWc0X8VNk=", "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" + "chalk": "^2.4.2", + "source-map": "^0.6.1", + "supports-color": "^6.1.0" + }, + "dependencies": { + "chalk": { + "version": "2.4.2", + "resolved": "https://registry.npm.taobao.org/chalk/download/chalk-2.4.2.tgz", + "integrity": "sha1-zUJUFnelQzPPVBpJEIwUMrRMlCQ=", + "requires": { + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" + }, + "dependencies": { + "supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npm.taobao.org/supports-color/download/supports-color-5.5.0.tgz", + "integrity": "sha1-4uaaRKyHcveKHsCzW2id9lMO/I8=", + "requires": { + "has-flag": "^3.0.0" + } + } + } + } + } + }, + "resolve": { + "version": "1.17.0", + "resolved": "https://registry.npm.taobao.org/resolve/download/resolve-1.17.0.tgz", + "integrity": "sha1-sllBtUloIxzC0bt2p5y38sC/hEQ=", + "requires": { + "path-parse": "^1.0.6" + } + }, + "supports-color": { + "version": "6.1.0", + "resolved": "https://registry.npm.taobao.org/supports-color/download/supports-color-6.1.0.tgz", + "integrity": "sha1-B2Srxpxj1ayELdSGfo0CXogN+PM=", + "requires": { + "has-flag": "^3.0.0" } } } @@ -12962,31 +12808,60 @@ } }, "rollup-plugin-terser": { - "version": "4.0.4", - "resolved": "https://registry.npm.taobao.org/rollup-plugin-terser/download/rollup-plugin-terser-4.0.4.tgz?cache=0&sync_timestamp=1576059692647&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Frollup-plugin-terser%2Fdownload%2Frollup-plugin-terser-4.0.4.tgz", - "integrity": "sha1-b2Ye8oT6fCeWPSQmAWkdw9I/mU4=", + "version": "5.3.0", + "resolved": "https://registry.npm.taobao.org/rollup-plugin-terser/download/rollup-plugin-terser-5.3.0.tgz", + "integrity": "sha1-nA3TPVdx35YwzQJ9aiVZGH9liF4=", "requires": { - "@babel/code-frame": "^7.0.0", - "jest-worker": "^24.0.0", - "serialize-javascript": "^1.6.1", - "terser": "^3.14.1" + "@babel/code-frame": "^7.5.5", + "jest-worker": "^24.9.0", + "rollup-pluginutils": "^2.8.2", + "serialize-javascript": "^2.1.2", + "terser": "^4.6.2" }, "dependencies": { + "@babel/code-frame": { + "version": "7.8.3", + "resolved": "https://registry.npm.taobao.org/@babel/code-frame/download/@babel/code-frame-7.8.3.tgz?cache=0&sync_timestamp=1578953126105&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40babel%2Fcode-frame%2Fdownload%2F%40babel%2Fcode-frame-7.8.3.tgz", + "integrity": "sha1-M+JZA9dIEYFTThLsCiXxa2/PQZ4=", + "requires": { + "@babel/highlight": "^7.8.3" + } + }, + "@babel/highlight": { + "version": "7.9.0", + "resolved": "https://registry.npm.taobao.org/@babel/highlight/download/@babel/highlight-7.9.0.tgz", + "integrity": "sha1-TptFzLgreWBycbKXmtgse2gWMHk=", + "requires": { + "@babel/helper-validator-identifier": "^7.9.0", + "chalk": "^2.0.0", + "js-tokens": "^4.0.0" + } + }, + "chalk": { + "version": "2.4.2", + "resolved": "https://registry.npm.taobao.org/chalk/download/chalk-2.4.2.tgz", + "integrity": "sha1-zUJUFnelQzPPVBpJEIwUMrRMlCQ=", + "requires": { + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" + } + }, "terser": { - "version": "3.17.0", - "resolved": "https://registry.npm.taobao.org/terser/download/terser-3.17.0.tgz", - "integrity": "sha1-+I/77aDetWN/nSSw2mb04VqxDLI=", + "version": "4.6.11", + "resolved": "https://registry.npm.taobao.org/terser/download/terser-4.6.11.tgz", + "integrity": "sha1-Ev+Z/dYqJt4qgvUIUVQH62zNip8=", "requires": { - "commander": "^2.19.0", + "commander": "^2.20.0", "source-map": "~0.6.1", - "source-map-support": "~0.5.10" + "source-map-support": "~0.5.12" } } } }, "rollup-pluginutils": { "version": "2.8.2", - "resolved": "https://registry.npm.taobao.org/rollup-pluginutils/download/rollup-pluginutils-2.8.2.tgz?cache=0&sync_timestamp=1568405888956&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Frollup-pluginutils%2Fdownload%2Frollup-pluginutils-2.8.2.tgz", + "resolved": "https://registry.npm.taobao.org/rollup-pluginutils/download/rollup-pluginutils-2.8.2.tgz", "integrity": "sha1-cvKvB0i1kjZNvTOJ5gDlqURKNR4=", "requires": { "estree-walker": "^0.6.1" @@ -13021,9 +12896,9 @@ "integrity": "sha1-mR7GnSluAxN0fVm9/St0XDX4go0=" }, "safe-identifier": { - "version": "0.3.1", - "resolved": "https://registry.npm.taobao.org/safe-identifier/download/safe-identifier-0.3.1.tgz", - "integrity": "sha1-RmuVbvhVixC74VuH/t9HCrKDzTk=" + "version": "0.4.1", + "resolved": "https://registry.npm.taobao.org/safe-identifier/download/safe-identifier-0.4.1.tgz", + "integrity": "sha1-tlFr9yWU8DFCtfkU9MAYQsyxtng=" }, "safe-regex": { "version": "1.1.0", @@ -13158,9 +13033,9 @@ } }, "serialize-javascript": { - "version": "1.9.1", - "resolved": "https://registry.npm.taobao.org/serialize-javascript/download/serialize-javascript-1.9.1.tgz?cache=0&sync_timestamp=1581860621656&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fserialize-javascript%2Fdownload%2Fserialize-javascript-1.9.1.tgz", - "integrity": "sha1-z8IArvd7YAxH2pu4FJyUPnmML9s=" + "version": "2.1.2", + "resolved": "https://registry.npm.taobao.org/serialize-javascript/download/serialize-javascript-2.1.2.tgz?cache=0&sync_timestamp=1581860621656&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fserialize-javascript%2Fdownload%2Fserialize-javascript-2.1.2.tgz", + "integrity": "sha1-7OxTsOAxe9yV73arcHS3OEeF+mE=" }, "serialize-to-js": { "version": "3.0.2", @@ -13556,7 +13431,7 @@ }, "sourcemap-codec": { "version": "1.4.8", - "resolved": "https://registry.npm.taobao.org/sourcemap-codec/download/sourcemap-codec-1.4.8.tgz", + "resolved": "https://registry.npm.taobao.org/sourcemap-codec/download/sourcemap-codec-1.4.8.tgz?cache=0&sync_timestamp=1579203623896&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsourcemap-codec%2Fdownload%2Fsourcemap-codec-1.4.8.tgz", "integrity": "sha1-6oBL2UhXQC5pktBaOO8a41qatMQ=" }, "spdx-correct": { @@ -14285,9 +14160,13 @@ } }, "tencent-cdn-refresh": { - "version": "git+https://github.com/godruoyi/tencent-cdn-refresh.git#c6d1d233a02e080b6bd28d85059548a6f5f2e1f3", - "from": "git+https://github.com/godruoyi/tencent-cdn-refresh.git", - "dev": true + "version": "2.0.0", + "resolved": "https://registry.npm.taobao.org/tencent-cdn-refresh/download/tencent-cdn-refresh-2.0.0.tgz", + "integrity": "sha1-OES3uzKBsG0MXF6oypHzS5GEcgo=", + "dev": true, + "requires": { + "node-fetch": "^2.6.0" + } }, "term-size": { "version": "2.2.0", @@ -14401,9 +14280,9 @@ } }, "to-readable-stream": { - "version": "2.1.0", - "resolved": "https://registry.npm.taobao.org/to-readable-stream/download/to-readable-stream-2.1.0.tgz", - "integrity": "sha1-gogDFhIb6mYs3CJq2zCt21DLBug=", + "version": "1.0.0", + "resolved": "https://registry.npm.taobao.org/to-readable-stream/download/to-readable-stream-1.0.0.tgz", + "integrity": "sha1-zgqgwvPfat+FLvtASng+d8BHV3E=", "dev": true }, "to-regex": { diff --git a/package.json b/package.json index 388810d..4087e6b 100644 --- a/package.json +++ b/package.json @@ -56,9 +56,9 @@ "@emotion/core": "^10.0.28", "@emotion/styled": "^10.0.27", "@types/fs-extra": "^8.1.0", - "@types/lodash": "^4.14.149", + "@types/lodash": "^4.14.150", "@types/minimist": "^1.2.0", - "@types/node": "^13.11.1", + "@types/node": "^13.13.2", "@types/react": "^16.9.34", "@types/react-dom": "^16.9.6", "@types/react-router-dom": "^5.1.4", @@ -66,10 +66,10 @@ "@types/url-join": "^4.0.0", "@types/yauzl": "^2.9.1", "@types/yazl": "^2.4.2", - "@typescript-eslint/eslint-plugin": "^2.28.0", - "@typescript-eslint/parser": "^2.28.0", - "@xmcl/core": "^2.1.3", - "@xmcl/installer": "^2.6.8", + "@typescript-eslint/eslint-plugin": "^2.29.0", + "@typescript-eslint/parser": "^2.29.0", + "@xmcl/core": "^2.2.0", + "@xmcl/installer": "^2.7.3", "@xmcl/nbt": "^2.0.3", "@xmcl/resourcepack": "^1.0.12", "@xmcl/task": "^2.1.6", @@ -80,7 +80,7 @@ "babel-plugin-module-resolver": "^4.0.0", "cos-nodejs-sdk-v5": "^2.5.20", "del-cli": "^3.0.0", - "electron": "^8.2.2", + "electron": "^8.2.3", "electron-builder": "^22.4.1", "eslint": "^6.8.0", "eslint-config-standard": "^14.1.1", @@ -115,14 +115,14 @@ "react-router-cache-route": "^1.8.4", "react-router-dom": "^5.1.2", "react-slick": "^0.25.2", - "reqwq": "^0.2.4", + "reqwq": "^0.3.0", "resolve-path": "^1.4.0", "semver": "^7.3.2", "shallowequal": "^1.1.0", "skinview-utils": "^0.2.1", "skinview3d": "^2.0.0-alpha.1", "slick-carousel": "^1.8.1", - "tencent-cdn-refresh": "git+https://github.com/godruoyi/tencent-cdn-refresh.git", + "tencent-cdn-refresh": "^2.0.0", "typescript": "^3.8.3", "url-join": "^4.0.1", "uuid-by-string": "^3.0.2", @@ -145,7 +145,7 @@ "dependencies": { "@xmcl/client": "^2.0.5", "asar": "^3.0.3", - "bili": "^4.9.0", + "bili": "^4.9.1", "chalk": "^4.0.0", "fs-extra": "^9.0.0", "globby": "^11.0.0", @@ -169,12 +169,6 @@ "output": "release" }, "extraFiles": "unpacked", - "publish": [ - { - "provider": "generic", - "url": "https://xmcl.azurewebsites.net/api/pl/latest" - } - ], "files": [ "dist/**/*", "!dist/report.html", @@ -227,7 +221,8 @@ "oneClick": false, "perMachine": true, "allowToChangeInstallationDirectory": true, - "include": "build/installer.nsh" + "include": "build/installer.nsh", + "appPackageUrl": "https://nsis.pl.apisium.cn/release/pl-nsis-redirect" }, "linux": { "maintainer": "Shirasawa <764798966@qq.com>", diff --git a/src/constants.ts b/src/constants.ts index 38ff6d4..fe3f4f2 100644 --- a/src/constants.ts +++ b/src/constants.ts @@ -44,5 +44,8 @@ export const ALLOW_PLUGIN_EXTENSIONS = ['.js', '.mjs', '.asar'] export const DEFAULT_LOCATE = (navigator.languages[0] || 'zh-cn').toLowerCase() export const LAUNCHING_IMAGE = join(APP_PATH, 'launching.webp') +export const DOWNLOAD_EXE_URL = 'https://dl.pl.apisium.cn/PureLauncher.exe' +export const DOWNLOAD_ASAR_URL = 'https://dl.pl.apisium.cn/app.asar' +export const LATEST_URL = 'https://dl.pl.apisium.cn/latest.json' export const LAUNCHER_MANIFEST_URL = 'https://r.pl.apisium.cn/manifest.json' export const NEWS_URL = 'https://s.pl.apisium.cn/news.json' diff --git a/src/plugin/DownloadProviders.ts b/src/plugin/DownloadProviders.ts index 8de84b3..f36f7c8 100644 --- a/src/plugin/DownloadProviders.ts +++ b/src/plugin/DownloadProviders.ts @@ -1,37 +1,43 @@ import urlJoin from 'url-join' -import { DefaultDownloader, DownloadOption, Installer } from '@xmcl/installer/index' +import { HttpDownloader, DownloadOption, Installer } from '@xmcl/installer/index' import { NOT_PROXY } from 'reqwq' +interface Version { id: string, url: string } export interface DownloadProvider { name (): string locales?: string[] launchermeta: string launcher: string - resources: string - libraries: string + resources: string | string[] + libraries: string | string[] forge: string preference?: boolean - client?: (version: { id: string, url: string }) => string + json?: (version: Version) => string + client?: (version: Version) => string optifine?: (mcVersion: string, type: string, version: string) => Promise | string } export const optifine = (mcVersion: string, type: string, version: string) => `https://bmclapi2.bangbang93.com/optifine/${mcVersion}/${type}/${version}` + +const MCBBSAPI: DownloadProvider & { [NOT_PROXY]: true } = { + [NOT_PROXY]: true, + preference: true, + name: () => 'MCBBSAPI', + locales: ['zh'], + launchermeta: 'https://download.mcbbs.net', + launcher: 'https://download.mcbbs.net', + resources: 'https://download.mcbbs.net/assets', + libraries: 'https://download.mcbbs.net/maven', + forge: 'https://download.mcbbs.net/maven', + json: ({ id }) => `https://download.mcbbs.net/version/${id}/json`, + client: ({ id }) => `https://download.mcbbs.net/version/${id}/client`, + optifine: (mcVersion: string, type: string, version: string) => + `https://download.mcbbs.net/optifine/${mcVersion}/${type}/${version}` +} + const DownloadProviders = { - MCBBSAPI: { - [NOT_PROXY]: true, - preference: true, - name: () => 'MCBBSAPI', - locales: ['zh'], - launchermeta: 'https://download.mcbbs.net', - launcher: 'https://download.mcbbs.net', - resources: 'https://download.mcbbs.net/assets', - libraries: 'https://download.mcbbs.net/maven', - forge: 'https://download.mcbbs.net/maven', - client: ({ id }) => `https://download.mcbbs.net/version/${id}/client`, - optifine: (mcVersion: string, type: string, version: string) => - `https://download.mcbbs.net/optifine/${mcVersion}/${type}/${version}` - }, + MCBBSAPI, BMCLAPI: { [NOT_PROXY]: true, name: () => 'BMCLAPI', @@ -41,9 +47,23 @@ const DownloadProviders = { resources: 'https://bmclapi2.bangbang93.com/assets', libraries: 'https://bmclapi2.bangbang93.com/maven', forge: 'https://bmclapi2.bangbang93.com/maven', + json: ({ id }) => `https://bmclapi2.bangbang93.com/version/${id}/json`, client: ({ id }) => `https://bmclapi2.bangbang93.com/version/${id}/client`, optifine }, + TSS_MIRROR: { + ...MCBBSAPI, + preference: false, + name: () => 'TSS Mirror', + client: (c: any) => { + try { return 'https://mc.mirrors.tmysam.top' + new URL(c.url).pathname } catch (e) { + console.error(e) + return MCBBSAPI.client(c) + } + }, + resources: 'https://mcres.mirrors.tmysam.top', + libraries: 'https://mclib.mirrors.tmysam.top' + }, OFFICIAL: { [NOT_PROXY]: true, name: () => $('OFFICIAL'), @@ -66,8 +86,15 @@ const DownloadProviders = { } } -export class ProgressDownloader extends DefaultDownloader { +export class ProgressDownloader extends HttpDownloader { public bytes = 0 + public syncSockets = () => { + this.agents.http.maxSockets = this.agents.https.maxSockets = profilesStore.extraJson.downloadThreads + } + constructor () { + super() + pluginMaster.once('loaded', this.syncSockets) + } public downloadFile (option: DownloadOption) { const fn = option.progress option.progress = (c, w, t, u) => { @@ -88,11 +115,15 @@ export const getDownloaders = (client?: any): Installer.Option => { if (!provider) isOffcical = true return { downloader, + jsonUrl: client && provider.json ? provider.json(client) : undefined, client: client && provider.client ? provider.client(client) : undefined, assetsDownloadConcurrency: profilesStore.extraJson.downloadThreads || 16, maxConcurrency: profilesStore.extraJson.downloadThreads || 16, - assetsHost: isOffcical ? undefined : [provider.resources], - libraryHost: isOffcical && provider?.libraries ? undefined : lib => urlJoin(provider.libraries, lib.download.path) + assetsHost: isOffcical ? undefined : typeof provider.resources === 'string' + ? [provider.resources] : provider.resources, + libraryHost: isOffcical && provider?.libraries ? undefined : lib => typeof provider.libraries === 'string' + ? urlJoin(provider.libraries, lib.download.path) + : provider.libraries.map(it => urlJoin(it, lib.download.path)) } } diff --git a/src/protocol/check-update.ts b/src/protocol/check-update.ts index aee3a7f..33759a6 100644 --- a/src/protocol/check-update.ts +++ b/src/protocol/check-update.ts @@ -15,7 +15,7 @@ import { remote, ipcRenderer, shell } from 'electron' import { getJson, download, genId } from '../utils/index' import { RESOURCES_VERSIONS_INDEX_PATH, RESOURCES_MODS_INDEX_FILE_NAME, ENTRY_POINT_PATH, RESOURCES_VERSIONS_PATH, ASAR_PATH, RESOURCES_RESOURCE_PACKS_INDEX_PATH, RESOURCES_PLUGINS_INDEX, - LAUNCHER_MANIFEST_URL, TEMP_PATH, DEFAULT_LOCATE } from '../constants' + LATEST_URL, TEMP_PATH, DOWNLOAD_ASAR_URL, DOWNLOAD_EXE_URL } from '../constants' export default async (version: string) => { const json: T.ResourceVersion = (await fs.readJson(RESOURCES_VERSIONS_INDEX_PATH, { throws: false }) || { })[version] @@ -43,15 +43,13 @@ export const updatePlugins = async () => { let downloaded = '' export const updateLauncher = async () => { - const data = await getJson(LAUNCHER_MANIFEST_URL) - const url: string = data.downloads[+(DEFAULT_LOCATE !== 'zh-cn')] - const json = await getJson(joinUrl(url, 'latest.json')) + const json = await getJson(joinUrl(LATEST_URL)) if (!gt(json.version, version)) return if (major(json.version) === major(version)) { const destination = join(TEMP_PATH, genId()) await download({ destination, - url: joinUrl(url, 'app.asar'), + url: DOWNLOAD_ASAR_URL, checksum: { algorithm: 'sha1', hash: json.asar } }, $('Update Package'), `PureLauncher-${json.version}.asar`) await fs.ensureDir(ASAR_PATH) @@ -66,7 +64,7 @@ export const updateLauncher = async () => { downloaded = join(TEMP_PATH, `PureLauncher-${json.version}-${genId()}.exe`) await download({ destination: downloaded, - url: joinUrl(url, 'PureLauncher.exe'), + url: DOWNLOAD_EXE_URL, checksum: { algorithm: 'sha1', hash: json.exe } }, $('Update Package'), `PureLauncher-${json.version}.exe`) localStorage.removeItem('updateCheckTime') diff --git a/src/utils/hacks.ts b/src/utils/hacks.ts index e7e461a..6a7da18 100644 --- a/src/utils/hacks.ts +++ b/src/utils/hacks.ts @@ -1,10 +1,7 @@ import { downloader } from '../plugin/DownloadProviders' -const { normailzeDownloader } = require('@xmcl/installer/util') -require('@xmcl/installer/util').normailzeDownloader = (a: any) => { - if (!a.downloader) a.downloader = downloader - normailzeDownloader(a) -} +require('@xmcl/installer/util').resolveDownloader = (opts: any, closure: any) => + closure(opts.downloader ? opts : { ...opts, downloader }) const fs = require('fs-extra') const installer = require('@xmcl/installer/index')