lightshortcuts 1.0.5 → 1.0.8

package/README.md

@@ -23,9 +23,25 @@
    **发布前需要先登录系统**，需要输入API地址和token：
 
    ```
-   lsc login
+   Usage: lsc login [options]
+   
+   登录会话
+   
+   Options:
+     -e, --env <type>  选择管控台的环境，e为dev、prod
+   
+   示例1：
+   lsc login -e dev #切换到测试环境
+   示例2：
+   lsc login --env prod #切换到生产环境
    ```
 
+3. 切换不同会话环境，name：dev、prod
+
+   ```
+   lsc use <name> 
+   ```
+   
 3. 初始化发布配置
 
    方式一：交互模式进行创建（推荐方式）：
@@ -36,7 +52,7 @@
 
    之后将在当前路径下创建发布配置文件lsc.config.json，请打开文件，根据需要做相应修改：
 
-   ```json
+   ```
    {
      "pkgid": "XXXXX", //离线包唯一ID
      "set_pkg_version": "1.0.1", //指定发布版本
@@ -78,7 +94,53 @@
 
 在配置好发布文件的前提下，可以缩写成以下命令：
 
-```bash
+```
 lsc login && lsc publish
 ```
+6. 会话注销
+
+   ```
+   Usage: lsc logout [options]
+   
+   注销会话
+   
+   Options:
+     -e, --env <type>     选择管控台的环境
+     -l, --link <link>    注销指定管控台链接
+     -t, --token <token>  注销指定token
+   ```
+
+7. 帮助
+
+   ```
+   ➜  ~ lsc --help
+   Usage: lsc [options] [command]
+   
+   Options:
+     -V, --version     output the version number
+     -h, --help        display help for command
+   
+   Commands:
+     login [options]   登录会话
+     logout [options]  注销会话
+     use <name>        设置当前发布版本
+     config            交互式配置离线包发布参数
+     init              快速初始化配置模板
+     publish|p         发布离线包
+     batch|b           发布离线包
+     help [command]    display help for command
+   ```
+
+   
+
+附：
+
+1、在Windows系统运行命令时，如果提示“此系统上禁止运行脚本”，则按如下方法解决：
+
+```
+方法：
+1、以管理员身份运行 Windows PowerShell(管理员)
+2、输入 set-ExecutionPolicy RemoteSigned ，然后输入A 回车
+3、还可以通过 get-ExecutionPolicy 查看当前的状态
+```
 

package/bin/lsc.js

@@ -10,22 +10,35 @@ const { merge, getZipFileList } = require("../lib/utils");
 const fileExists = require("../lib/helpers/file-exists");
 
 // 读取发布配置文件
-const lscrcPath = path.join(process.env.HOME||process.env.USERPROFILE, ".lscrc.json");
+const lscrcPath = path.join(
+    process.env.HOME || process.env.USERPROFILE,
+    ".lscrc.json"
+);
+
 const defaultConfig = require("../lib/defaults");
-const { checkSession, initAxiosConfig } = require("../lib/core/API");
+const { checkSession, initAxiosConfig, logout } = require("../lib/core/API");
 // 主目录下登录配置文件
 let confPath = path.join(process.cwd(), "./lsc.config.json");
 
-program.version("0.0.4");
+program.version("0.0.7");
 
 // 登录并保存token
 let lightBaseURL = "";
 let loginQuestions = [
+    {
+        type: "list",
+        message: "现在配置的环境是？",
+        name: "env",
+        choices: [
+            { key: 0, value: "dev", name: "测试环境", checked: true },
+            { key: 1, value: "prod", name: "生产环境" },
+        ],
+    },
     {
         type: "input",
         message: "请输入API前缀地址：",
         name: "lightBaseURL",
-        default: lightBaseURL || defaultConfig.lightBaseURL,
+        default: () => lightBaseURL || defaultConfig.lightBaseURL,
         validate: async (url) => {
             lightBaseURL = url;
             return true;
@@ -42,7 +55,7 @@ let loginQuestions = [
     },
 ];
 //校验是否已经登录
-const loginAction = async function () {
+const loginAction = async function (env) {
     fileExists(lscrcPath)
         .then(async (res) => {
             // 是否需要交互处理
@@ -50,15 +63,29 @@ const loginAction = async function () {
             if (res) {
                 // 存在文件
                 let lscRc = require(lscrcPath);
-                lightBaseURL = lscRc.lightBaseURL;
-                let res = await validSession(lscRc.lightBaseURL, lscRc.token);
-                if (!res) {
-                    // 已有API链接
-                    // loginQuestions.shift();
+                if (
+                    lscRc[`${env}`] &&
+                    lscRc[`${env}`].lightBaseURL &&
+                    lscRc[`${env}`].token
+                ) {
+                    lightBaseURL = lscRc[`${env}`].lightBaseURL;
+                    // console.log(lightBaseURL);
+                    let res = await validSession(
+                        lscRc[`${env}`].lightBaseURL,
+                        lscRc[`${env}`].token
+                    );
+                    if (!res) {
+                        // 已有API链接
+                        // loginQuestions.shift();
+                        console.log(lscRc[`${env}`]);
+                        console.log("\n");
+                    } else {
+                        // token仍有效
+                        console.log(`已登录，当前通道：${env}`);
+                        needLoginProcessF = false;
+                    }
                 } else {
-                    // token仍有效
-                    console.log("已登录");
-                    needLoginProcessF = false;
+                    needLoginProcessF = true;
                 }
             } else {
                 // 不存在文件
@@ -66,8 +93,22 @@ const loginAction = async function () {
             }
             if (needLoginProcessF) {
                 inquirer.prompt(loginQuestions).then(async (answers) => {
-                    await writeConfig(answers, lscrcPath);
-                    console.log(JSON.stringify(answers));
+                    // let lscRc = require(lscrcPath);
+                    // lscRc.currentEnv = env;
+                    let { lightBaseURL, token, env } = answers;
+                    // await writeConfig(answers, lscrcPath);
+
+                    let lscRc = {};
+                    let fef = await fileExists(lscrcPath);
+
+                    if (fef) {
+                        lscRc = require(lscrcPath);
+                    }
+                    lscRc.currentEnv = env;
+                    lscRc[`${env}`] = { lightBaseURL, token };
+
+                    await writeConfig(lscRc, lscrcPath);
+                    // console.log(JSON.stringify(lscRc));
                     return true;
                 });
             }
@@ -79,12 +120,87 @@ const loginAction = async function () {
 };
 program
     .command("login")
-    .description("输入登录token")
-    .action(async () => {
-        await loginAction();
+    .description("登录会话")
+    .option("-e, --env <type>", "选择管控台的环境")
+    .action(async (opts) => {
+        let { env } = opts;
+        if (env == undefined) {
+            // 没传环境变量参数
+            let fef = await fileExists(lscrcPath);
+            if (fef) {
+                let { currentEnv } = require(lscrcPath);
+                if (currentEnv) {
+                    env = currentEnv;
+                } else {
+                    env = "dev";
+                }
+            } else {
+                env = "dev";
+            }
+        }
+        await loginAction(env);
     });
 
-program.command("config").action(function () {
+// 注销会话
+program
+    .command("logout")
+    .description("注销会话")
+    .option("-e, --env <type>", "选择管控台的环境")
+    .option("-l, --link <link>", "注销指定管控台链接")
+    .option("-t, --token <token>", "注销指定token")
+    .action(async (opts) => {
+        let { env, link, token } = opts;
+        let baseUrl, authToken;
+        if (env == undefined) {
+            // 没传env环境变量参数
+            let fef = await fileExists(lscrcPath);
+            if (fef) {
+                // 有本地会话配置，读取本地会话
+                let r = require(lscrcPath);
+                if (r.currentEnv) {
+                    // 有本地会话
+                    env = r.currentEnv;
+                    //如果传入url,token则用传入的，否则用本地的；
+                    baseUrl = link ? link : r[`${env}`].lightBaseURL;
+                    authToken = token ? token : r[`${env}`].token;
+                } else {
+                    console.log("不存在本地会话，请传入url,token");
+                }
+            } else {
+                // 不存在本地会话时
+                console.log("不存在本地会话，请传入url,token");
+            }
+        }
+        if (baseUrl && authToken) {
+            await initAxiosConfig(baseUrl, authToken);
+            let f = await logout(token);
+            console.log(`注销${f ? "成功" : "失败"}`);
+        }else{
+            console.log("不存在本地会话，请传入url,token");
+        }
+
+    });
+
+// 设置当前发布版本
+program
+    .command("use <name>")
+    .description("设置当前发布版本")
+    .action(async (opts) => {
+        let fef = await fileExists(lscrcPath);
+        if (fef) {
+            let lscRc = require(lscrcPath);
+            lscRc.currentEnv = opts;
+            if (lscRc[`${opts}`]) {
+                await writeConfig(lscRc, lscrcPath);
+            } else {
+                console.log("不存在的离线包环境，请先进行登录：lsc login");
+            }
+        } else {
+            console.log("登录文件不存在，请先进行登录：lsc login");
+        }
+    });
+
+program.command("config").description("交互式配置离线包发布参数").action(function () {
     let initConfig = {},
         initAnswers = {};
     inquirer
@@ -155,7 +271,7 @@ program.command("config").action(function () {
                 default: "dist.zip",
             },
             {
-                type: "rawlist",
+                type: "list",
                 message: "是否处理上一版本离线包？",
                 name: "task_status",
                 choices: [
@@ -251,7 +367,7 @@ const initConfAction = function () {
         }
     });
 };
-program.command("init").action(function () {
+program.command("init").description("快速初始化配置模板").action(function () {
     initConfAction();
 });
 
@@ -265,7 +381,9 @@ program
             feConF = await fileExists(confPath);
         //是否存在配置文件
         if (feLscF && feConF) {
-            const { lightBaseURL, token } = require(lscrcPath);
+            const lscRC = require(lscrcPath),
+                { currentEnv } = lscRC,
+                { lightBaseURL, token } = lscRC[`${currentEnv}`];
             const publishConfArgs = require(confPath);
 
             if (publishConfArgs.publishInfo) {
@@ -305,9 +423,12 @@ program
 // 批量离线包发布.已经包名作为pkgid
 program
     .command("batch")
+    .description("发布离线包")
     .alias("b")
     .action(async function () {
-        const { lightBaseURL, token } = require(lscrcPath);
+        const lscRC = require(lscrcPath),
+            { currentEnv } = lscRC,
+            { lightBaseURL, token } = lscRC[`${currentEnv}`];
         const publishConfArgs = require(confPath);
 
         let currPath = path.join(process.cwd(), publishConfArgs.pkg_dir);
@@ -334,7 +455,7 @@ async function writeConfig(configArgs, path = "./lsc.config.json") {
         if (err) {
             throw err;
         }
-        console.log("创建配置模板成功，可根据需要进行相应修改");
+        console.log("已更新");
     });
 }
 
@@ -343,7 +464,7 @@ async function validSession(lightBaseURL, token) {
     await initAxiosConfig(lightBaseURL, token);
     let f = await checkSession(token);
     if (!f) {
-        await console.log("\n会话已过期或者无效，请重新确认：", f);
+        await console.log("\n会话已过期或者无效，请重新确认：", f, "\n");
     }
     return f;
 }

package/lib/LSC.js

@@ -82,7 +82,7 @@ async function publish(h5pkgid, app_id) {
                     }),
                     e = qotRes.filter((val) => val.status == 0),
                     f = e[0];
-                // 处理上一版本的问题
+                // 处理上一版本的问题：保持、暂停、下架
                 if (task_status != 0) {
                     let sm = { 0: "发布", 1: "暂停", 2: "下架" };
                     const uotRes = await updateOfflineTask({

package/lib/core/API.js

@@ -50,6 +50,26 @@ const checkSession = async function (token) {
     });
 };
 
+// 注销会话
+const logout = async function (token){
+    return new Promise((resolve, reject) => {
+        axios
+            .get(ApiList.logout)
+            .then((res) => {
+                let { data } = res;
+                if (data.err_no === 0) {
+                    resolve(true);
+                } else {
+                    resolve(false);
+                }
+            })
+            .catch((err) => {
+                console.warn(`注销会话报错！${err.response.data.data[0].error_info}`);
+                resolve(false);
+            });
+    });
+}
+
 // 上传文件,__filePath:绝对路径
 const fileUpload = async function (__filePath) {
     return new Promise((resolve, reject) => {
@@ -160,7 +180,7 @@ const queryOfflineVersionlist = async function (app_id, h5app_id) {
         { id } = t;
     //pkg_id
     let qovRes = await axios.get(
-        `${ApiList.queryOfflineVersionlist}?app_id=${app_id}&pkg_id=${id}&page_no=1&page_size=10`
+        `${ApiList.queryOfflineVersionlist}?app_id=${app_id}&pkg_id=${id}&page_no=1&page_size=30`
     );
     return qovRes.data;
 };
@@ -306,6 +326,7 @@ const updateOfflineTask = async function (uotArgs = {}) {
 
 module.exports = {
     allOfflinePkgLists,
+    logout,
     checkSession,
     fileUpload,
     queryOfflinePkgList,

package/lib/core/apiUrl.js

@@ -5,6 +5,7 @@ const offlineURlPrefix = `/light/light-platform-client/v/appdiy/offline/`;
 const ApiList = {
     fileUpload: "/ltcommon/file/v/upload?bizType=h5_offline_src",
     checkSession: "/light/light-platform-client/v/auth/check_session",
+    logout:"/light/light-platform-client/v/auth/logout",
     queryOfflinePkgList: offlineURlPrefix + "query_offline_pkglist1",
     queryOfflineVersionlist: offlineURlPrefix + "query_offline_versionlist",
     addOfflineH5pkg: offlineURlPrefix + "add_offline_h5pkg",

package/package.json

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