pug-site-core 2.0.1 → 2.0.3

package/index.js

@@ -18,37 +18,44 @@ export const pugSiteCore = {
   translateLanguageData,
 };
 
-// let curCmd = process.env.npm_lifecycle_event;
+let curCmd = process.env.npm_lifecycle_event;
+const args = process.argv.slice(2);
 
-// try {
-//   switch (curCmd) {
-//     case "getFun":
-//       await generateGetDataFn();
-//       break;
-//     case "getData":
-//       await generateGetDataFn();
-//       const args = process.argv.slice(2);
-//       await fetchDataToJsonFile(args);
-//       break;
-//     case "dev":
-//       startDevServer();
-//       break;
-//     case "compileFn":
-//       await compilePagesPugToFn();
-//       break;
-//     case "buildFn":
-//       await buildFn();
-//       break;
-//     case "buildStatic":
-//       await buildStatic();
-//       break;
-//     case "lang":
-//       await translateLanguageData();
-//       break;
-//     default:
-//       console.log(`未知的命令: ${curCmd}`);
-//   }
-// } catch (error) {
-//   console.error(`执行命令 ${curCmd} 时发生错误:`, error);
-//   process.exit(1);
-// }
+// 检查是否包含 dev 参数
+if (args.includes("dev")) {
+  try {
+    switch (curCmd) {
+      case "getFun":
+        await generateGetDataFn();
+        break;
+      case "getData":
+        await generateGetDataFn();
+        // 移除 dev 参数后传递其他参数
+        const dataArgs = args.filter((arg) => arg !== "dev");
+        await fetchDataToJsonFile(dataArgs);
+        break;
+      case "dev":
+        startDevServer();
+        break;
+      case "compileFn":
+        await compilePagesPugToFn();
+        break;
+      case "buildFn":
+        await buildFn();
+        break;
+      case "buildStatic":
+        await buildStatic();
+        break;
+      case "lang":
+        await translateLanguageData();
+        break;
+      default:
+        console.log(`未知的命令: ${curCmd}`);
+    }
+  } catch (error) {
+    console.error(`执行命令 ${curCmd} 时发生错误:`, error);
+    process.exit(1);
+  }
+} else {
+  console.log(`请添加 dev 参数以执行命令，例如: npm run getData dev`);
+}

package/lib/devServer.js

@@ -171,7 +171,7 @@ async function matchRouter(url, language, device) {
   for (let index = 0; index < router.length; index++) {
     const obj = router[index];
     if (obj.matchFn.call(params)) {
-      let data = obj.getData.call(params);
+      let data = await obj.getData.call(params);
       let pugPath = obj.getPagesFnName.call(params);
       pugPath = pugPath.split("_").join(pathSymbol);
       return {

package/lib/generate.js

@@ -196,12 +196,22 @@ export async function fetchDataToJsonFile(args) {
     const getData = await import(paths.getData);
     const pugFilePathList = await getPagesPugFilePathArr();
 
-    const { languageList, customBuildData, fetchDataLangLimit } = config;
+    const { languageList, customBuildData, fetchDataConcurrencyLimit } = config;
 
-    await async.eachLimit(languageList, fetchDataLangLimit, async (language) => {
-      // 语言过滤检查
-      if (filterLang.length && !filterLang.includes(language)) return;
+    // 创建一个全局任务队列控制整体并发数
+    const queue = async.queue(async (task) => {
+      await task();
+    }, fetchDataConcurrencyLimit || 10);
 
+    // 收集所有需要执行的任务
+    const allTasks = [];
+
+    // 过滤出需要处理的语言
+    const languagesToProcess = filterLang.length
+      ? languageList.filter((lang) => filterLang.includes(lang))
+      : languageList;
+
+    for (const language of languagesToProcess) {
       // 清空指定语言的数据目录
       if (filterLang.includes(language) && !filterFun.length) {
         await fse.remove(paths.resolveRoot("jsonData", language));
@@ -210,67 +220,73 @@ export async function fetchDataToJsonFile(args) {
       // 处理公共数据
       const commonFuncName = "get_common_data";
       if (isFillFun(commonFuncName)) {
-        const commonData = await getData[commonFuncName](language);
-        console.log(language, commonFuncName, "开始写入json文件");
-        await fse.outputJSON(
-          paths.resolveRoot("jsonData", language, "_common.json"),
-          commonData
-        );
+        allTasks.push(async () => {
+          const commonData = await getData[commonFuncName](language);
+          console.log(language, commonFuncName, "开始写入json文件");
+          await fse.outputJSON(
+            paths.resolveRoot("jsonData", language, "_common.json"),
+            commonData
+          );
+        });
       }
 
       // 处理自定义数据
       if (customBuildData?.length) {
-        await async.each(customBuildData, async (obj) => {
+        for (const obj of customBuildData) {
           if (
             obj.includeLang &&
             obj.includeLang.length > 0 &&
             !obj.includeLang.includes(language)
           ) {
-            return;
+            continue;
           }
+
           let dataFn = getData[obj.getDataFn];
           if (!dataFn || typeof dataFn !== "function") {
             return Promise.reject(new Error(obj.getDataFn + "获取数据函数不存在"));
           }
 
-          if (filterFun.length && !filterFun.includes(funName)) {
-            return;
+          if (filterFun.length && !filterFun.includes(obj.getDataFn)) {
+            continue;
           }
 
-          let data = await dataFn(language);
-          await checkData(data, language, obj.getDataFn);
-          console.log(language, obj.getDataFn, "开始写入json文件");
-          let outPutPath = obj.outPutPath.split("/").join(pathSymbol);
-          if (Array.isArray(data)) {
-            let name = outPutPath.split(pathSymbol).pop().replace(/\..*$/, "");
-            const regex = /^\[.+\]$/;
-            if (regex.test(name)) {
-              let property = name.slice(1, -1);
-              for (let index = 0; index < data.length; index++) {
-                const dataItem = data[index];
-                let fileName = dataItem[property];
-                if (!fileName) {
-                  return Promise.reject(
-                    new Error(
-                      `${language} ${obj.getDataFn} 获取的数据中期望以${property}属性命名文件但是${index}下标中对象属性不存在或者为空字符串`
-                    )
+          allTasks.push(async () => {
+            let data = await dataFn(language);
+            await checkData(data, language, obj.getDataFn);
+            console.log(language, obj.getDataFn, "开始写入json文件");
+            let outPutPath = obj.outPutPath.split("/").join(pathSymbol);
+            if (Array.isArray(data)) {
+              let name = outPutPath.split(pathSymbol).pop().replace(/\..*$/, "");
+              const regex = /^\[.+\]$/;
+              if (regex.test(name)) {
+                let property = name.slice(1, -1);
+                for (let index = 0; index < data.length; index++) {
+                  const dataItem = data[index];
+                  let fileName = dataItem[property];
+                  if (!fileName) {
+                    return Promise.reject(
+                      new Error(
+                        `${language} ${obj.getDataFn} 获取的数据中期望以${property}属性命名文件但是${index}下标中对象属性不存在或者为空字符串`
+                      )
+                    );
+                  }
+                  await saveJsonData(
+                    paths.join(language, outPutPath.replace(name, fileName)),
+                    dataItem
                   );
                 }
-                await saveJsonData(
-                  paths.join(language, outPutPath.replace(name, fileName)),
-                  dataItem
-                );
+              } else {
+                await saveJsonData(paths.join(language, outPutPath), data);
               }
-            } else {
+            } else if (typeof data === "object") {
               await saveJsonData(paths.join(language, outPutPath), data);
             }
-          } else if (typeof data === "object") {
-            await saveJsonData(paths.join(language, outPutPath), data);
-          }
-        });
+          });
+        }
       }
 
-      await async.each(pugFilePathList, async (fileName) => {
+      // 处理模板页面数据
+      for (const fileName of pugFilePathList) {
         let funName =
           "get_" + fileName.split(pathSymbol).join("_").slice(0, -4) + "_data";
 
@@ -278,42 +294,64 @@ export async function fetchDataToJsonFile(args) {
         if (!getData[funName] || typeof getData[funName] !== "function") {
           return Promise.reject(new Error(`${funName} 获取数据函数不存在`));
         }
+
         if (filterFun.length && !filterFun.includes(funName)) {
-          return Promise;
+          continue;
         }
-        let data = await getData[funName](language);
-        await checkData(data, language, funName);
-        console.log(language, funName, "开始写入json文件");
-        if (Array.isArray(data)) {
-          await async.eachOfLimit(data, 64, async (item, index) => {
-            let lastJsonFilePath;
-            if (item.page_name) {
-              lastJsonFilePath = paths.join(
+
+        allTasks.push(async () => {
+          let data = await getData[funName](language);
+          await checkData(data, language, funName);
+          console.log(language, funName, "开始写入json文件");
+          if (Array.isArray(data)) {
+            for (let index = 0; index < data.length; index++) {
+              const item = data[index];
+              let lastJsonFilePath;
+              if (item.page_name) {
+                lastJsonFilePath = paths.join(
+                  language,
+                  ...jsonFilePath.slice(0, -1),
+                  item.page_name
+                );
+              } else {
+                console.warn("下标:", index, "无page_name属性,使用index作为文件名");
+                lastJsonFilePath =
+                  paths.join(language, ...jsonFilePath) +
+                  "_" +
+                  (index + 1) +
+                  ".json";
+              }
+              item._template = fileName;
+              await saveJsonData(lastJsonFilePath, item);
+            }
+          } else {
+            if (data.page_name) {
+              jsonFilePath = paths.join(
                 language,
                 ...jsonFilePath.slice(0, -1),
-                item.page_name
+                data.page_name
               );
             } else {
-              console.warn("下标:", index, "无page_name属性,使用index作为文件名");
-              lastJsonFilePath =
-                paths.join(language, ...jsonFilePath) + "_" + ++index + ".json";
+              jsonFilePath = paths.join(language, ...jsonFilePath) + ".json";
             }
-            item._template = fileName;
-            await saveJsonData(lastJsonFilePath, item);
-          });
-        } else {
-          if (data.page_name) {
-            jsonFilePath = paths.join(
-              language,
-              ...jsonFilePath.slice(0, -1),
-              data.page_name
-            );
-          } else {
-            jsonFilePath = paths.join(language, ...jsonFilePath) + ".json";
+            data._template = fileName;
+            await saveJsonData(jsonFilePath, data);
           }
-          data._template = fileName;
-          await saveJsonData(jsonFilePath, data);
-        }
+        });
+      }
+    }
+
+    // 将所有任务添加到队列
+    allTasks.forEach((task) => queue.push(task));
+
+    // 等待所有任务完成
+    return new Promise((resolve, reject) => {
+      queue.drain(() => {
+        resolve();
+      });
+
+      queue.error((err) => {
+        reject(err);
       });
     });
   } catch (error) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pug-site-core",
-  "version": "2.0.1",
+  "version": "2.0.3",
   "main": "index.js",
   "type": "module",
   "scripts": {
@@ -37,7 +37,7 @@
     "axios": "^1.7.7"
   },
   "license": "ISC",
-  "description": "注释测试的指令执行",
+  "description": "优化并发处理现在可以精细到一个数据请求",
   "files": [
     "lib/",
     "index.js"