lightshortcuts 1.1.3 → 1.1.5

package/bin/lsc.js

@@ -10,6 +10,10 @@ const { merge, getZipFileList, pwdMd5, fmtTime } = require("../lib/utils");
 const fileExists = require("../lib/helpers/file-exists");
 const { createZip } = require("../lib/helpers/zip");
 
+// 读取 package.json 获取版本号
+const packageJson = require("../package.json");
+const version = packageJson.version;
+
 const log = (message, ...args) => {
   console.log(`[${fmtTime()}] ${message}`, ...args);
 };
@@ -50,7 +54,7 @@ const {
   sendWechatWebhook,
 } = require("../lib/core/api");
 
-program.version("1.1.3");
+program.version(version);
 
 // 登录并保存token
 let lightBaseURL = "";

package/lib/LSC.js

@@ -35,7 +35,7 @@ var token,
   need_wechat_push = false, //是否需要企业微信推送
   webhookUrl,
   //以下是H5web相关配置
-  publish_h5web_arr,
+  publish_h5web_arr = [],
   h5web_name = {};
 
 //引入API
@@ -188,7 +188,7 @@ const publishH5web = async (pkg_id_arr, app_name = "") => {
     log(`*************发布H5web应用*************`);
     log("发布H5web离线包", pkg_id_arr, app_name);
     const __filePath = path.join(process.cwd(), `${pkg_dir}${pkg_zip_name}`);
-    let file_size = await statSync(__filePath).size;
+    let pkg_size = await statSync(__filePath).size;
     log("上传H5应用离线包");
     let pkg_id = await fileUpload(__filePath, "h5_src");
     log("上传H5应用离线包成功", pkg_id);
@@ -196,7 +196,7 @@ const publishH5web = async (pkg_id_arr, app_name = "") => {
     let comp_pkg_id = await addH5webPkg({
       pkg_name: `${pkg_zip_name}(${new Date().getTime()})`,
       pkg_id,
-      file_size,
+      pkg_size,
       pkg_desc: release_desc || "此版本为自动化方式进行快捷发布",
     });
     log("创建H5应用包成功", comp_pkg_id);
@@ -204,7 +204,7 @@ const publishH5web = async (pkg_id_arr, app_name = "") => {
 
     for (let i = 0; i < pkg_id_arr.length; i++) {
       const result = await releaseMuchVersion(pkg_id_arr[i], comp_pkg_id);
-      log(`🔥发布${h5web_name[pkg_id_arr[i]]}H5应用包成功！`);
+      log(`🔥发布“${h5web_name[pkg_id_arr[i]]}”H5应用包成功！`);
       const msg = `发布 ${h5web_name[pkg_id_arr[i]]} H5应用包成功！`;
       if (need_wechat_push && webhookUrl) {
         const message = msg;
@@ -214,7 +214,7 @@ const publishH5web = async (pkg_id_arr, app_name = "") => {
         } catch (error) {
           await sendWechatWebhook(
             webhookUrl,
-            `发布 ${h5web_name[pkg_id_arr[i]]} H5应用包失败❌！原因：${error}`,
+            `发布“${h5web_name[pkg_id_arr[i]]}”H5应用包失败❌！原因：${error}`,
           );
           error("消息发送失败:", error);
         }
@@ -223,7 +223,7 @@ const publishH5web = async (pkg_id_arr, app_name = "") => {
   } catch (error) {
     await sendWechatWebhook(
       webhookUrl,
-      `发布${h5web_name[pkg_id_arr[i]]}H5应用包失败❌！原因：${error}`,
+      `发布“${h5web_name[pkg_id_arr[i]]}”H5应用包失败❌！原因：${error}`,
     );
     log("发布H5web离线包失败：", error);
   }
@@ -247,18 +247,30 @@ async function MainH5web(publish_h5web_arr) {
 
 //检查H5web应用ID是否存在
 const checkH5webAppIds = function (appList, checkIds) {
+  //appList里面的id是数字类型，checkIds是字符串类型
   try {
-    // 提取应用列表中的所有ID并存储在Set中，提高查找效率
-    const existingIdsSet = new Set(appList.map((app) => app.id.toString()));
+    // 空值和类型检查
+    if (!Array.isArray(appList) || !Array.isArray(checkIds)) {
+      log("appList或checkIds不是数组");
+      return [];
+    }
 
-    // 使用reduce过滤出存在的ID
-    const foundIds = checkIds.reduce((acc, id) => {
-      if (existingIdsSet.has(id)) {
-        h5web_name[id] = appList.find((app) => app.id.toString() === id).name;
-        acc.push(id);
-      }
-      return acc;
-    }, []);
+    // 过滤无效的应用对象并构建Map，避免重复查找
+    const validApps = appList.filter(app => app && app.id !== undefined);
+    const appMap = new Map(validApps.map(app => [app.id.toString(), app]));
+
+    // 过滤无效的ID并查找存在的应用
+    const foundIds = checkIds
+      .filter(id => id !== undefined && id !== null && id !== '')
+      .map(id => String(id))
+      .filter(idStr => {
+        const app = appMap.get(idStr);
+        if (app && app.show_name) {
+          h5web_name[idStr] = app.show_name;
+          return true;
+        }
+        return false;
+      });
 
     return foundIds;
   } catch (error) {
@@ -296,7 +308,7 @@ async function LSC(config = {}) {
 
   token = publishInfo.token;
   pkgid = publishInfo.pkgid;
-  publish_app_arr = publishInfo.publish_app_arr;
+  publish_app_arr = publishInfo.publish_app_arr || [];
 
   set_pkg_version = publishInfo.set_pkg_version;
   task_status = publishInfo.task_status;
@@ -309,8 +321,8 @@ async function LSC(config = {}) {
   apps_name = publishInfo.apps_name;
   need_wechat_push = publishInfo.need_wechat_push; //是否需要企业微信推送
   webhookUrl = wecomWebhook;
-  publish_h5web_arr = publishInfo.publish_h5web_arr;
-  h5web_name = publishInfo.h5web_name;
+  publish_h5web_arr = publishInfo.publish_h5web_arr || [];
+  h5web_name = publishInfo.h5web_name || {};
 
   //全局配置
   axios.defaults.baseURL = lightBaseURL;

package/lib/core/api.js

@@ -727,14 +727,31 @@ const updateOfflineTask = async function (uotArgs = {}) {
 //查询执行发布任务状态成功与否接口，返回true或false
 const queryOfflineVersionDetail = async function ({ id, app_id }) {
   try {
-    const res = await retryWrapper(
+    const result = await retryWrapper(
       async () => {
-        return await axios.get(
+        const res = await axios.get(
           `${ApiList.queryOfflineVersionDetail}?id=${id}&app_id=${app_id}`,
           {
             ...getAxiosConfig(),
           },
         );
+
+        // 处理响应数据
+        const { err_no, data } = res.data;
+
+        if (err_no == 0) {
+          const { status } = data;
+          if (status == 1) {
+            // 状态1 表示任务执行成功
+            return true;
+          } else {
+            // 其他状态都认为是失败，则继续重试查询，直到状态为1或重试次数耗尽
+            log(`查询执行发布任务状态详情是:${status}`);
+            throw new Error(`查询执行发布任务状态详情是:${status}`);
+          }
+        } else {
+          return false;
+        }
       },
       {
         maxRetries: 5,
@@ -743,22 +760,7 @@ const queryOfflineVersionDetail = async function ({ id, app_id }) {
       },
     );
 
-    // 处理响应数据
-    const { err_no, data } = res.data;
-
-    if (err_no == 0) {
-      const { status } = data;
-      if (status == 4) {
-        // 状态4 表示任务执行成功
-        return true;
-      } else {
-        // 其他状态都认为是失败，则继续重试查询，直到状态为4或重试次数耗尽
-        log(`查询执行发布任务状态详情是:${status}`);
-        throw new Error(`查询执行发布任务状态详情是:${status}`);
-      }
-    } else {
-      return false;
-    }
+    return result;
   } catch (error) {
     log(`查询执行发布任务状态报错:${error}`);
     throw error;

package/package.json

@@ -10,7 +10,7 @@
         "inquirer": "^8.2.0",
         "qs": "^6.10.3"
     },
-    "version": "1.1.3",
+    "version": "1.1.5",
     "description": "Light离线包自动发布工具",
     "main": "index.js",
     "scripts": {