From 5419a139361b7b2ab55019bb8b070d9b0085eba0 Mon Sep 17 00:00:00 2001 From: Aoran Zeng Date: Fri, 22 Nov 2024 10:34:14 +0800 Subject: [PATCH] Measure upstream for `Node.js` [GitHub #126] --- src/recipe/lang/Node.js/Node.js.c | 2 ++ src/recipe/lang/Node.js/Yarn.c | 2 ++ src/recipe/lang/Node.js/common.h | 27 ++++++++++++++------------- src/recipe/lang/Node.js/npm.c | 2 ++ src/recipe/lang/Node.js/pnpm.c | 2 ++ 5 files changed, 22 insertions(+), 13 deletions(-) diff --git a/src/recipe/lang/Node.js/Node.js.c b/src/recipe/lang/Node.js/Node.js.c index 73b0c9b..d503aa3 100644 --- a/src/recipe/lang/Node.js/Node.js.c +++ b/src/recipe/lang/Node.js/Node.js.c @@ -71,6 +71,8 @@ pl_nodejs_setsrc (char *option) chsrc_note2 (msg); } + chsrc_set_measure_upstream (PL_NodeJS_NPM_Upstream_Measure_URL); + bool npm_exist, yarn_exist, pnpm_exist; pl_nodejs_check_cmd (&npm_exist, &yarn_exist, &pnpm_exist); diff --git a/src/recipe/lang/Node.js/Yarn.c b/src/recipe/lang/Node.js/Yarn.c index 3216070..2fdd680 100644 --- a/src/recipe/lang/Node.js/Yarn.c +++ b/src/recipe/lang/Node.js/Yarn.c @@ -40,6 +40,8 @@ pl_nodejs_yarn_getsrc (char *option) void pl_nodejs_yarn_setsrc (char *option) { + chsrc_set_measure_upstream (PL_NodeJS_NPM_Upstream_Measure_URL); + Source_t source; chsrc_yield_for_the_source (pl_nodejs); if (ProgMode_Target_Group!=true) diff --git a/src/recipe/lang/Node.js/common.h b/src/recipe/lang/Node.js/common.h index 799d397..c8c811f 100644 --- a/src/recipe/lang/Node.js/common.h +++ b/src/recipe/lang/Node.js/common.h @@ -5,16 +5,17 @@ * Contributors : Nul None * Created On : <2023-09-09> * Major Revision : 1 - * Last Modified : <2024-09-23> + * Last Modified : <2024-11-22> * ------------------------------------------------------------*/ static MirrorSite_t NpmMirror = { "npmmirror", "npmmirror", "npmmirror (阿里云赞助)", "https://npmmirror.com/", // 注意,下面这个是跳转后的地址,不确定未来会不会改变 - {NotSkip, NA, NA, "https://cdn.npmmirror.com/packages/%40tensorflow/tfjs/4.10.0/tfjs-4.10.0.tgz"} // 29MB + {NotSkip, NA, NA, "https://cdn.npmmirror.com/packages/%40tensorflow/tfjs/4.22.0/tfjs-4.22.0.tgz"} // 29MB }; +#define PL_NodeJS_NPM_Upstream_Measure_URL "https://registry.npmjs.org/@tensorflow/tfjs/-/tfjs-4.22.0.tgz" /** * @update 2024-09-23 @@ -28,10 +29,10 @@ NpmMirror = { */ static Source_t pl_nodejs_sources[] = { - {&UpstreamProvider, "https://registry.npmjs.org/"}, // @note 根据 pnpm 官网,有最后的斜线 - {&NpmMirror, "https://registry.npmmirror.com"}, - {&Huawei, "https://mirrors.huaweicloud.com/repository/npm/"}, - {&Tencent, "https://mirrors.cloud.tencent.com/npm/"}, + {&UpstreamProvider, "https://registry.npmjs.org/"}, /* @note 根据 pnpm 官网,有最后的斜线 */ + {&NpmMirror, "https://registry.npmmirror.com"}, + {&Huawei, "https://mirrors.huaweicloud.com/repository/npm/"}, + {&Tencent, "https://mirrors.cloud.tencent.com/npm/"}, }; def_sources_n(pl_nodejs); @@ -45,13 +46,13 @@ def_sources_n(pl_nodejs); */ static Source_t pl_nodejs_binary_release_sources[] = { - {&UpstreamProvider, "https://nodejs.org/dist/"}, - {&NpmMirror, "https://npmmirror.com/mirrors"}, - {&Tuna, "https://mirrors.tuna.tsinghua.edu.cn/nodejs-release/"}, - {&Bfsu, "https://mirrors.bfsu.edu.cn/nodejs-release/"}, - {&Ustc, "https://mirrors.ustc.edu.cn/node/"}, + {&UpstreamProvider, "https://nodejs.org/dist/"}, + {&NpmMirror, "https://npmmirror.com/mirrors"}, + {&Tuna, "https://mirrors.tuna.tsinghua.edu.cn/nodejs-release/"}, + {&Bfsu, "https://mirrors.bfsu.edu.cn/nodejs-release/"}, + {&Ustc, "https://mirrors.ustc.edu.cn/node/"}, - {&Huawei, "https://mirrors.huaweicloud.com/nodejs/"}, - {&Tencent, "https://mirrors.cloud.tencent.com/nodejs-release/"}, + {&Huawei, "https://mirrors.huaweicloud.com/nodejs/"}, + {&Tencent, "https://mirrors.cloud.tencent.com/nodejs-release/"}, }; def_sources_n(pl_nodejs_binary_release); diff --git a/src/recipe/lang/Node.js/npm.c b/src/recipe/lang/Node.js/npm.c index d0dc5d0..8ad6e34 100644 --- a/src/recipe/lang/Node.js/npm.c +++ b/src/recipe/lang/Node.js/npm.c @@ -26,6 +26,8 @@ pl_nodejs_npm_getsrc (char *option) void pl_nodejs_npm_setsrc (char *option) { + chsrc_set_measure_upstream (PL_NodeJS_NPM_Upstream_Measure_URL); + Source_t source; chsrc_yield_for_the_source (pl_nodejs); if (ProgMode_Target_Group!=true) diff --git a/src/recipe/lang/Node.js/pnpm.c b/src/recipe/lang/Node.js/pnpm.c index 90b0341..5536214 100644 --- a/src/recipe/lang/Node.js/pnpm.c +++ b/src/recipe/lang/Node.js/pnpm.c @@ -27,6 +27,8 @@ pl_nodejs_pnpm_getsrc (char *option) void pl_nodejs_pnpm_setsrc (char *option) { + chsrc_set_measure_upstream (PL_NodeJS_NPM_Upstream_Measure_URL); + Source_t source; chsrc_yield_for_the_source (pl_nodejs); if (ProgMode_Target_Group!=true)