From 7c75b37d09bbd1c810a87f4a690f84b3ae48c622 Mon Sep 17 00:00:00 2001
From: Aoran Zeng <ccmywish@qq.com>
Date: Fri, 22 Nov 2024 11:02:03 +0800
Subject: [PATCH] Fix 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  | 28 ++++++++++++++++------------
 src/recipe/lang/Node.js/npm.c     |  2 --
 src/recipe/lang/Node.js/pnpm.c    |  2 --
 5 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/src/recipe/lang/Node.js/Node.js.c b/src/recipe/lang/Node.js/Node.js.c
index d503aa3..73b0c9b 100644
--- a/src/recipe/lang/Node.js/Node.js.c
+++ b/src/recipe/lang/Node.js/Node.js.c
@@ -71,8 +71,6 @@ 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 2fdd680..3216070 100644
--- a/src/recipe/lang/Node.js/Yarn.c
+++ b/src/recipe/lang/Node.js/Yarn.c
@@ -40,8 +40,6 @@ 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 c8c811f..7d7c1ca 100644
--- a/src/recipe/lang/Node.js/common.h
+++ b/src/recipe/lang/Node.js/common.h
@@ -8,15 +8,19 @@
  * Last Modified  : <2024-11-22>
  * ------------------------------------------------------------*/
 
-static MirrorSite_t
-NpmMirror = {
+static SourceProvider_t UpstreamNpm =
+{
+  "upstream", "npmjs.org", "上游默认源 npmjs.org", "https://www.npmjs.com/",
+  {NotSkip, NA, NA, "https://registry.npmjs.org/@tensorflow/tfjs/-/tfjs-4.22.0.tgz"}
+};
+
+static MirrorSite_t NpmMirror =
+{
   "npmmirror", "npmmirror", "npmmirror (阿里云赞助)", "https://npmmirror.com/",
   // 注意，下面这个是跳转后的地址，不确定未来会不会改变
   {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
  * @sync https://github.com/RubyMetric/chsrc/wiki/Node.js-MirrorSite
@@ -27,12 +31,12 @@ 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/"},
+static Source_t pl_nodejs_sources[] =
+{
+  {&UpstreamNpm,  "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);
 
@@ -44,8 +48,8 @@ def_sources_n(pl_nodejs);
  * @sync https://github.com/RubyMetric/chsrc/discussions/85
  *
  */
-static Source_t
-pl_nodejs_binary_release_sources[] = {
+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/"},
diff --git a/src/recipe/lang/Node.js/npm.c b/src/recipe/lang/Node.js/npm.c
index 8ad6e34..d0dc5d0 100644
--- a/src/recipe/lang/Node.js/npm.c
+++ b/src/recipe/lang/Node.js/npm.c
@@ -26,8 +26,6 @@ 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 5536214..90b0341 100644
--- a/src/recipe/lang/Node.js/pnpm.c
+++ b/src/recipe/lang/Node.js/pnpm.c
@@ -27,8 +27,6 @@ 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)