lightshortcuts 1.0.8 → 1.0.9

package/README.md

@@ -128,10 +128,13 @@ lsc login && lsc publish
      init              快速初始化配置模板
      publish|p         发布离线包
      batch|b           发布离线包
-     help [command]    display help for command
+     deal <version>    处理离线包兼容版本相互重叠的情况，谨慎使用！
+     clean <all>       批量处理离线包兼容版本相互重叠的情况，谨慎使用！
    ```
-
    
+8. 清理指定离线包兼容版本范围：`lsc deal version`
+
+9. 批量清理指定离线包兼容版本范围(需管理员权限)：`lsc clean all`
 
 附：
 

package/bin/lsc.js

@@ -16,11 +16,17 @@ const lscrcPath = path.join(
 );
 
 const defaultConfig = require("../lib/defaults");
-const { checkSession, initAxiosConfig, logout } = require("../lib/core/API");
+const {
+    checkSession,
+    initAxiosConfig,
+    logout,
+    dealVersionList,
+    batchDealVersionList
+} = require("../lib/core/API");
 // 主目录下登录配置文件
 let confPath = path.join(process.cwd(), "./lsc.config.json");
 
-program.version("0.0.7");
+program.version("0.0.8");
 
 // 登录并保存token
 let lightBaseURL = "";
@@ -175,10 +181,9 @@ program
             await initAxiosConfig(baseUrl, authToken);
             let f = await logout(token);
             console.log(`注销${f ? "成功" : "失败"}`);
-        }else{
+        } else {
             console.log("不存在本地会话，请传入url,token");
         }
-
     });
 
 // 设置当前发布版本
@@ -200,141 +205,144 @@ program
         }
     });
 
-program.command("config").description("交互式配置离线包发布参数").action(function () {
-    let initConfig = {},
-        initAnswers = {};
-    inquirer
-        .prompt([
-            // {
-            //     type: "input",
-            //     message: "请输入token：",
-            //     name: "token",
-            // },
-            {
-                type: "input",
-                message: "请输入离线包id：",
-                name: "pkgid",
-            },
-            {
-                type: "input",
-                message: "请指定离线包发布版本号：",
-                name: "set_pkg_version",
-                default: "1.0.1",
-            },
-            {
-                type: "input",
-                message: "APP版本iOS版本范围：",
-                name: "ios_version_scope",
-                default: "7.0.6",
-            },
-            {
-                type: "input",
-                message: "APP版本Android版本范围：",
-                name: "android_version_scope",
-                default: "7.0.6.0",
-            },
-            {
-                type: "checkbox",
-                message: "请选择发布的APP：",
-                name: "publish_app_arr",
-                choices: [
-                    {
-                        key: "3577",
-                        value: "3592",
-                        name: "开发版_iOS",
-                        checked: true,
+program
+    .command("config")
+    .description("交互式配置离线包发布参数")
+    .action(function () {
+        let initConfig = {},
+            initAnswers = {};
+        inquirer
+            .prompt([
+                // {
+                //     type: "input",
+                //     message: "请输入token：",
+                //     name: "token",
+                // },
+                {
+                    type: "input",
+                    message: "请输入离线包id：",
+                    name: "pkgid",
+                },
+                {
+                    type: "input",
+                    message: "请指定离线包发布版本号：",
+                    name: "set_pkg_version",
+                    default: "1.0.1",
+                },
+                {
+                    type: "input",
+                    message: "APP版本iOS版本范围：",
+                    name: "ios_version_scope",
+                    default: "7.0.6",
+                },
+                {
+                    type: "input",
+                    message: "APP版本Android版本范围：",
+                    name: "android_version_scope",
+                    default: "7.0.6.0",
+                },
+                {
+                    type: "checkbox",
+                    message: "请选择发布的APP：",
+                    name: "publish_app_arr",
+                    choices: [
+                        {
+                            key: "3577",
+                            value: "3592",
+                            name: "开发版_iOS",
+                            checked: true,
+                        },
+                        {
+                            key: "3577",
+                            value: "3577",
+                            name: "开发版_安卓",
+                            checked: true,
+                        },
+                    ],
+                    validate(answer) {
+                        if (answer.length < 1) {
+                            return "请至少选择一项";
+                        }
+                        return true;
                     },
-                    {
-                        key: "3577",
-                        value: "3577",
-                        name: "开发版_安卓",
-                        checked: true,
+                },
+                {
+                    type: "input",
+                    message: "离线包压缩包存放相对位置：",
+                    name: "pkg_dir",
+                    default: "./dist/",
+                },
+                {
+                    type: "input",
+                    message: "离线包名称：",
+                    name: "pkg_zip_name",
+                    default: "dist.zip",
+                },
+                {
+                    type: "list",
+                    message: "是否处理上一版本离线包？",
+                    name: "task_status",
+                    choices: [
+                        { key: 0, value: 0, name: "保留", checked: true },
+                        { key: 1, value: 1, name: "暂停" },
+                        { key: 2, value: 2, name: "结束" },
+                    ],
+                },
+                {
+                    type: "input",
+                    message: "发布日志：",
+                    name: "release_desc",
+                    default: "功能更新",
+                    when: (answers) => {
+                        initAnswers = Object.assign({}, answers);
+                        // console.log("initAnswers",initAnswers);
+                        return true;
                     },
-                ],
-                validate(answer) {
-                    if (answer.length < 1) {
-                        return "请至少选择一项";
-                    }
-                    return true;
                 },
-            },
-            {
-                type: "input",
-                message: "离线包压缩包存放相对位置：",
-                name: "pkg_dir",
-                default: "./dist/",
-            },
-            {
-                type: "input",
-                message: "离线包名称：",
-                name: "pkg_zip_name",
-                default: "dist.zip",
-            },
-            {
-                type: "list",
-                message: "是否处理上一版本离线包？",
-                name: "task_status",
-                choices: [
-                    { key: 0, value: 0, name: "保留", checked: true },
-                    { key: 1, value: 1, name: "暂停" },
-                    { key: 2, value: 2, name: "结束" },
-                ],
-            },
-            {
-                type: "input",
-                message: "发布日志：",
-                name: "release_desc",
-                default: "功能更新",
-                when: (answers) => {
-                    initAnswers = Object.assign({}, answers);
-                    // console.log("initAnswers",initAnswers);
-                    return true;
+                // {
+                //     type: "input",
+                //     message: "请输入API前缀地址：",
+                //     name: "lightBaseURL",
+                //     default: "https://xxx.xxx.xxx/lightadmin/pas-api",
+                //     when: (answers) => {
+                //         initAnswers = Object.assign({}, answers);
+                //         // console.log("initAnswers",initAnswers);
+                //         return true;
+                //     },
+                // },
+                {
+                    type: "confirm",
+                    message: "是否使用以上配置？",
+                    name: "useConfig",
+                    default: true,
                 },
-            },
-            // {
-            //     type: "input",
-            //     message: "请输入API前缀地址：",
-            //     name: "lightBaseURL",
-            //     default: "https://xxx.xxx.xxx/lightadmin/pas-api",
-            //     when: (answers) => {
-            //         initAnswers = Object.assign({}, answers);
-            //         // console.log("initAnswers",initAnswers);
-            //         return true;
-            //     },
-            // },
-            {
-                type: "confirm",
-                message: "是否使用以上配置？",
-                name: "useConfig",
-                default: true,
-            },
-            {
-                type: "confirm",
-                message: "是否保存配置？",
-                name: "saveConfig",
-                default: true,
-                when: function (answers) {
-                    return answers.useConfig;
+                {
+                    type: "confirm",
+                    message: "是否保存配置？",
+                    name: "saveConfig",
+                    default: true,
+                    when: function (answers) {
+                        return answers.useConfig;
+                    },
                 },
-            },
-        ])
-        .then((asw) => {
-            let { useConfig, saveConfig } = asw;
-            if (useConfig) {
-                let totalConfig = {
-                    ...initAnswers,
-                    apps_name: defaultConfig.publishInfo.apps_name,
-                };
-                if (saveConfig) {
-                    // 保存配置
-                    writeConfig(totalConfig);
+            ])
+            .then((asw) => {
+                let { useConfig, saveConfig } = asw;
+                if (useConfig) {
+                    let totalConfig = {
+                        ...initAnswers,
+                        apps_name: defaultConfig.publishInfo.apps_name,
+                    };
+                    if (saveConfig) {
+                        // 保存配置
+                        writeConfig(totalConfig);
+                    }
+                    console.log(totalConfig);
+                } else {
+                    console.log("已结束！");
                 }
-                console.log(totalConfig);
-            } else {
-                console.log("已结束！");
-            }
-        });
-});
+            });
+    });
 
 // 初始化配置模板
 const initConfAction = function () {
@@ -367,9 +375,12 @@ const initConfAction = function () {
         }
     });
 };
-program.command("init").description("快速初始化配置模板").action(function () {
-    initConfAction();
-});
+program
+    .command("init")
+    .description("快速初始化配置模板")
+    .action(function () {
+        initConfAction();
+    });
 
 // 单项目发布
 program
@@ -449,6 +460,71 @@ program
         }
     });
 
+// 处理离线包兼容版本相互重叠的情况
+program
+    .command("deal version")
+    .description("处理离线包兼容版本相互重叠的情况，谨慎使用！")
+    .action(async function () {
+        let dv = [
+            {
+                type: "input",
+                message: "请输入app_id：",
+                name: "app_id",
+                default:3592
+            },
+            {
+                type: "input",
+                message: "请输入pkg_id：",
+                name: "pkg_id",
+                default:2307
+            },
+        ];
+        inquirer.prompt(dv).then(async function (aws) {
+            const {app_id, pkg_id} = aws;
+            let f = await fileExists(lscrcPath);
+            if (f) {
+                let lscRc = require(lscrcPath),
+                    { currentEnv } = lscRc;
+                const { lightBaseURL, token } = lscRc[`${currentEnv}`];
+                await initAxiosConfig(lightBaseURL, token);
+                await dealVersionList({app_id, pkg_id});
+            } else {
+                console.log("登录文件不存在，请先进行登录：lsc login");
+            }
+        });
+    });
+
+// 处理离线包兼容版本相互重叠的情况
+program
+    .command("clean all")
+    .description("批量处理离线包兼容版本相互重叠的情况，谨慎使用！")
+    .action(async function () {
+        console.log("批量处理离线包兼容版本相互重叠的情况，谨慎使用！")
+        let dv = [
+            {
+                type: "input",
+                message: "请输入app_id列表，以逗号分隔：",
+                name: "app_id",
+                default:"3592,3577,3580,3562"
+            }
+        ];
+        inquirer.prompt(dv).then(async function (aws) {
+            const {app_id} = aws;
+            console.log((app_id+'').split(','));
+            let ids = (app_id+'').split(',');
+            let f = await fileExists(lscrcPath);
+            if (f) {
+                let lscRc = require(lscrcPath),
+                    { currentEnv } = lscRc;
+                const { lightBaseURL, token } = lscRc[`${currentEnv}`];
+                await initAxiosConfig(lightBaseURL, token);
+                await batchDealVersionList(ids);
+            } else {
+                console.log("登录文件不存在，请先进行登录：lsc login");
+            }
+        });
+    });
+
 async function writeConfig(configArgs, path = "./lsc.config.json") {
     // 写入文件内容（如果文件不存在会创建一个文件）
     writeFile(path, JSON.stringify(configArgs), { flag: "w" }, function (err) {

package/lib/LSC.js

@@ -29,6 +29,7 @@ const {
     queryOfflinePkgList,
     queryOfflineVersionlist,
     syncPkgList,
+    dealVersionList
 } = require("./core/API");
 
 //在APP上发布指定离线包主逻辑
@@ -85,16 +86,7 @@ async function publish(h5pkgid, app_id) {
                 // 处理上一版本的问题：保持、暂停、下架
                 if (task_status != 0) {
                     let sm = { 0: "发布", 1: "暂停", 2: "下架" };
-                    const uotRes = await updateOfflineTask({
-                        id: f.id,
-                        status: task_status, //0发布，1暂停，2下架
-                        app_id,
-                    });
-                    console.log(
-                        `版本${prevVerInfo.version}${sm[task_status]}${
-                            uotRes ? "成功" : "失败"
-                        }`
-                    );
+                    await dealVersionList({ app_id, pkg_id, status: task_status });
                 }
             }
         }

package/lib/core/API.js

@@ -9,16 +9,31 @@ const { ApiList } = require("./apiUrl");
 // 存储APP的离线包
 let allOfflinePkgLists = {};
 
-const initAxiosConfig = async function(lightBaseURL,token){
+const initAxiosConfig = async function (lightBaseURL, token) {
     //全局配置
     axios.defaults.baseURL = lightBaseURL;
     axios.defaults.headers["cookie"] = `token=${token}`;
+    axios.defaults.headers["User-Agent"] = "LightShortcuts Pro";
 };
 
+// 添加请求拦截器
+axios.interceptors.request.use(
+    function (config) {
+        // 在发送请求之前做些什么
+        // console.log(config)
+        return config;
+    },
+    function (error) {
+        // 对请求错误做些什么
+        return Promise.reject(error);
+    }
+);
+
 // 添加响应拦截器
 axios.interceptors.response.use(
     function (response) {
         // 2xx 范围内的状态码都会触发该函数。
+        // console.log(response.data);
         return response;
     },
     function (error) {
@@ -29,8 +44,7 @@ axios.interceptors.response.use(
 
 //校验会话有效性
 const checkSession = async function (token) {
-    if(token){
-
+    if (token) {
     }
     return new Promise((resolve, reject) => {
         axios
@@ -51,7 +65,7 @@ const checkSession = async function (token) {
 };
 
 // 注销会话
-const logout = async function (token){
+const logout = async function (token) {
     return new Promise((resolve, reject) => {
         axios
             .get(ApiList.logout)
@@ -64,11 +78,13 @@ const logout = async function (token){
                 }
             })
             .catch((err) => {
-                console.warn(`注销会话报错！${err.response.data.data[0].error_info}`);
+                console.warn(
+                    `注销会话报错，原因是：${err.response.data.data[0].error_info}`
+                );
                 resolve(false);
             });
     });
-}
+};
 
 // 上传文件,__filePath:绝对路径
 const fileUpload = async function (__filePath) {
@@ -193,7 +209,9 @@ const addOfflineH5pkg = async function (app_id, h5app_id, name) {
         ),
         copFlag = copRes.data.data;
     let conRes = await axios.get(
-            `${ApiList.checkOfflinePkgname}?app_id=${app_id}&name=${encodeURI(name)}`
+            `${ApiList.checkOfflinePkgname}?app_id=${app_id}&name=${encodeURI(
+                name
+            )}`
         ),
         conFlag = conRes.data.data;
     if (copFlag || conFlag) {
@@ -284,7 +302,6 @@ const queryOfflineTask = async function (args) {
                 )}&page_no=1&page_size=5`
             )
             .then(function (res) {
-                // console.log("获取指定版本下的发布任务列表:", JSON.stringify(res.data));
                 const { err_no, data } = res.data;
                 if (err_no == 0) {
                     resolve(data.list);
@@ -309,7 +326,6 @@ const updateOfflineTask = async function (uotArgs = {}) {
             data: qs.stringify(uotArgs),
         })
             .then(function (res) {
-                console.log("更新发布任务状态:", res.data);
                 const { err_no } = res.data;
                 if (err_no == 0) {
                     resolve(true);
@@ -324,6 +340,99 @@ const updateOfflineTask = async function (uotArgs = {}) {
     });
 };
 
+// 处理版本范围相互覆盖的离线包
+const dealVersionList = async function ({ app_id, pkg_id, status = 2, name }) {
+    if (pkg_id == null) {
+        return false;
+    }
+    let qovRes = await axios.get(
+        `${ApiList.queryOfflineVersionlist}?app_id=${app_id}&pkg_id=${pkg_id}&page_no=1&page_size=30`
+    );
+    let { list } = qovRes.data.data;
+    let versionList = [];
+    // 获取要下架的版本号ID；
+    let toDoId = list.reduce((acc, cur) => {
+        let {
+            id,
+            ios_version_scope,
+            android_version_scope,
+            status,
+            version,
+            release_type,
+        } = cur;
+        // if (ios_version_scope == "") {
+        //     console.warn(`ios_version_scope == ""`, cur);
+        // }
+        if (status == 1 && release_type == 0) {
+            if (versionList.includes(ios_version_scope)) {
+                let o = acc[`${ios_version_scope}`];
+                acc[`${ios_version_scope}`] = [...o, { id, version }];
+            } else {
+                acc[`${ios_version_scope}`] = [];
+                versionList.push(ios_version_scope);
+            }
+        }
+
+        return acc;
+    }, {});
+
+    for (const key in toDoId) {
+        if (Object.hasOwnProperty.call(toDoId, key)) {
+            const vl = toDoId[key];
+            if (vl.length > 0) {
+                for (let index = 0; index < vl.length; index++) {
+                    const val = vl[index];
+                    try {
+                        let t = await todoVersion(app_id, val.id);
+                        let sm = { 0: "发布", 1: "暂停", 2: "下架" },tips=sm[`${status}`];
+                        console.log(
+                            `${app_id}${name ? name : ""}版本范围：${key}，版本号：${
+                                val.version
+                            },版本ID：${val.id},处理情况：${tips}${t ? "成功" : "失败"}`
+                        );
+                    } catch (error) {}
+                }
+            }
+        }
+    }
+
+    async function todoVersion(app_id, version_id) {
+        const qot = await queryOfflineTask({ app_id, version_id });
+        // console.log("qot",qot)
+        // return;
+        let tmp = qot.reduce((acc, cur) => {
+            if (cur.status == 0) {
+                acc = [...acc, cur.id];
+            }
+            return acc;
+        }, []);
+        let taskId = tmp[0];
+        // 下架
+        return await updateOfflineTask({
+            id: taskId,
+            status: 2,
+            app_id,
+        });
+    }
+};
+
+// 批处理版本范围相互覆盖的离线包
+const batchDealVersionList = async function (ids, h5app_id, status = 2) {
+    const pkgLists = await queryOfflinePkgList(ids);
+    for (const key in pkgLists) {
+        if (Object.hasOwnProperty.call(pkgLists, key)) {
+            const ele = pkgLists[key];
+            for (let index = 0; index < ele.length; index++) {
+                const f = ele[index];
+                let { app_id, pkg_id, name } = f;
+                if (pkg_id != null) {
+                    await dealVersionList({ app_id, pkg_id, status: 2, name });
+                }
+            }
+        }
+    }
+};
+
 module.exports = {
     allOfflinePkgLists,
     logout,
@@ -338,5 +447,7 @@ module.exports = {
     queryOfflineTask,
     updateOfflineTask,
     syncPkgList,
-    initAxiosConfig
+    initAxiosConfig,
+    dealVersionList,
+    batchDealVersionList,
 };

package/package.json

@@ -9,7 +9,7 @@
         "inquirer": "^8.2.0",
         "qs": "^6.10.3"
     },
-    "version": "1.0.8",
+    "version": "1.0.9",
     "description": "Light离线包自动发布工具",
     "main": "index.js",
     "devDependencies": {},