@wagq/wa-cli 0.6.4 → 0.6.6

package/lib/daml/asyncByApp.js

@@ -3,216 +3,251 @@ const Prompt = require("inquirer");
 const log = require("../../utils/log");
 const string2Data = require("../../utils/string2Data");
 
-const catalogue = 'pages'
+const catalogue = "pages";
 
 const initQuestions = () => [
-    {
-        type: 'list',
-        name: "ignore",
-        message: "git是否忽略当前目录",
-        choices: [true, false],
-        default: true
-    }
-]
+  {
+    type: "list",
+    name: "ignore",
+    message: "git是否忽略当前目录",
+    choices: [true, false],
+    default: true,
+  },
+];
 
 const handleIgnore = async (ignore, catalogue) => {
-    try {
-        if(ignore){
-            const ignoreExist = await fs.existsSync(`${process.cwd()}/.gitignore`);
-            if(!ignoreExist){
-                await fs.writeFileSync(`.gitignore`, `${catalogue}`, {
-                    cwd: process.cwd(),
-                })
-            }
-            else {
-                const hasCatalogue = await fs.readFileSync(`${process.cwd()}/.gitignore`).toString().includes(catalogue);
-                if(!hasCatalogue) {
-                    await fs.appendFileSync(`${process.cwd()}/.gitignore`, `\n${catalogue}`)
-                }
-            }
+  try {
+    if (ignore) {
+      const ignoreExist = await fs.existsSync(`${process.cwd()}/.gitignore`);
+      if (!ignoreExist) {
+        await fs.writeFileSync(`.gitignore`, `${catalogue}`, {
+          cwd: process.cwd(),
+        });
+      } else {
+        const hasCatalogue = await fs
+          .readFileSync(`${process.cwd()}/.gitignore`)
+          .toString()
+          .includes(catalogue);
+        if (!hasCatalogue) {
+          await fs.appendFileSync(
+            `${process.cwd()}/.gitignore`,
+            `\n${catalogue}`
+          );
         }
-        
-        return Promise.resolve();
+      }
     }
-    finally {
-        return Promise.resolve();
-    }
-}
-
-const getList = async(origin, appId, branchid, token) => {
-    try {
-        const request = () => fetch(`${origin}/api/assembler/page/list`, {
-            headers: {
-              accept: "application/json, text/plain, */*",
-              "accept-language":
-                "zh,ja;q=0.9,zh-CN;q=0.8,en;q=0.7,ko;q=0.6,vi;q=0.5,zh-TW;q=0.4",
-              "access-token": token,
-              appid: appId,
-              branchid: branchid,
-              "cache-control": "no-cache",
-              "content-type": "application/json",
-              pragma: "no-cache",
-              "sec-ch-ua":
-                '"Chromium";v="134", "Not:A-Brand";v="24", "Google Chrome";v="134"',
-              "sec-ch-ua-mobile": "?0",
-              "sec-ch-ua-platform": '"Windows"',
-              "sec-fetch-dest": "empty",
-              "sec-fetch-mode": "cors",
-              "sec-fetch-site": "same-origin",
-            },
-            body: `{"current":1,"size":1000,"name":"","path":"","type":"","appId":${appId}}`,
-            method: "POST",
-        });
-        log.loading('请求页面列表,条数为1000,这个数量应该是够了的')
-        const res = await request().then(res => res.json());
-        log.info(`请求页面列表成功,条数为${res.data.total}`)
-        
-        const lists = res.data.records.map((i) => {
-            return {
-              id: i.id,
-              name: `${i.name}(${i.path.replace(/\//g, '_')})`,
-            };
+
+    return Promise.resolve();
+  } finally {
+    return Promise.resolve();
+  }
+};
+
+const getList = async (origin, appId, branchid, token) => {
+  try {
+    const request = () =>
+      fetch(`${origin}/api/assembler/page/list`, {
+        headers: {
+          accept: "application/json, text/plain, */*",
+          "accept-language":
+            "zh,ja;q=0.9,zh-CN;q=0.8,en;q=0.7,ko;q=0.6,vi;q=0.5,zh-TW;q=0.4",
+          "access-token": token,
+          appid: appId,
+          branchid: branchid,
+          "cache-control": "no-cache",
+          "content-type": "application/json",
+          pragma: "no-cache",
+          "sec-ch-ua":
+            '"Chromium";v="134", "Not:A-Brand";v="24", "Google Chrome";v="134"',
+          "sec-ch-ua-mobile": "?0",
+          "sec-ch-ua-platform": '"Windows"',
+          "sec-fetch-dest": "empty",
+          "sec-fetch-mode": "cors",
+          "sec-fetch-site": "same-origin",
+        },
+        body: `{"current":1,"size":1000,"name":"","path":"","type":"","appId":${appId}}`,
+        method: "POST",
+      });
+    const res = await request().then((res) => res.json());
+
+    const lists = res.data.records.map((i) => {
+      return {
+        id: i.id,
+        name: `${i.name}(${i.path.replace(/\//g, "_")})`,
+      };
+    });
+
+    return lists || [];
+  } catch (err) {
+    log.error(
+      `请求页面列表失败,请检查参数是否正确, origin:${origin}, appId: ${appId}, branchid: ${branchid}, token: ${token}`
+    );
+  }
+};
+
+const getDaml = async (lists, origin, appId, branchid, token, dirName) => {
+  try {
+    lists.forEach(async ({ name, id }) => {
+      const request = () =>
+        fetch(`${origin}/api/assembler/page/getPageDaml`, {
+          headers: {
+            accept: "application/json, text/plain, */*",
+            "accept-language":
+              "zh,ja;q=0.9,zh-CN;q=0.8,en;q=0.7,ko;q=0.6,vi;q=0.5,zh-TW;q=0.4",
+            "access-token": token,
+            appid: appId,
+            branchid: branchid,
+            "cache-control": "no-cache",
+            "content-type": "application/json",
+            pragma: "no-cache",
+            "sec-ch-ua":
+              '"Chromium";v="134", "Not:A-Brand";v="24", "Google Chrome";v="134"',
+            "sec-ch-ua-mobile": "?0",
+            "sec-ch-ua-platform": '"Windows"',
+            "sec-fetch-dest": "empty",
+            "sec-fetch-mode": "cors",
+            "sec-fetch-site": "same-origin",
+            cookie: "_tea_utm_cache_1229=undefined",
+            "Referrer-Policy": "strict-origin-when-cross-origin",
+          },
+          body: `{\"pageId\":\"${id}\",\"appId\":\"${appId}\"}`,
+          method: "POST",
         });
 
-        return lists || []
-    }
-    catch(err) {
-        log.error(`请求页面列表失败,请检查参数是否正确, origin:${origin}, appId: ${appId}, branchid: ${branchid}, token: ${token}`)
-    }
-}
-
-const getDaml = async(lists, origin, appId, branchid, token, dirName) => {
-    try {
-        lists.forEach(async ({ name, id }) => {
-            const request = () =>
-            fetch(`${origin}/api/assembler/page/getPageDaml`, {
-                headers: {
-                accept: "application/json, text/plain, */*",
-                "accept-language":
-                    "zh,ja;q=0.9,zh-CN;q=0.8,en;q=0.7,ko;q=0.6,vi;q=0.5,zh-TW;q=0.4",
-                "access-token": token,
-                appid: appId,
-                branchid: branchid,
-                "cache-control": "no-cache",
-                "content-type": "application/json",
-                pragma: "no-cache",
-                "sec-ch-ua":
-                    '"Chromium";v="134", "Not:A-Brand";v="24", "Google Chrome";v="134"',
-                "sec-ch-ua-mobile": "?0",
-                "sec-ch-ua-platform": '"Windows"',
-                "sec-fetch-dest": "empty",
-                "sec-fetch-mode": "cors",
-                "sec-fetch-site": "same-origin",
-                cookie: "_tea_utm_cache_1229=undefined",
-                "Referrer-Policy": "strict-origin-when-cross-origin",
-                },
-                body: `{\"pageId\":\"${id}\",\"appId\":\"${appId}\"}`,
-                method: "POST",
-            });
-
-            log.loading(`正在同步${name}的逻辑器与变量值`)
-            request()
-            .then((res) => res.json())
-            .then(async(res) => {
-                const daml = JSON.parse(res.data.daml);
-                await generateLogic(dirName, daml, name);
-                await generateVariable(dirName, daml, name);
-            });
+      log.loading(`正在同步${name}的逻辑器与变量值`);
+      request()
+        .then((res) => res.json())
+        .then(async (res) => {
+          const daml = JSON.parse(res.data.daml);
+          await generateLogic(dirName, daml, name);
+          await generateVariable(dirName, daml, name);
         });
-    }
-    catch(err) {
-        log.error(err)
-    }
-}
-
-const generateLogic = async(dirName, daml, name) => {
-    try {
-        log.loading(`正在同步${name}的逻辑器`)
-        const logicDir = `${dirName}/${name}/logic`
-        // 创建逻辑器文件夹 
-        await fs.mkdirSync(
-            `${logicDir}`,
-            { recursive: true },
-            {
-                cwd: process.cwd(),
-            }
-        );
-        const pages = daml.app.subapps[0]?.actions?.actionList || [];
-        pages.forEach(({ content, name: fileName }) => {
-    
-        // 添加标识
-        content = `/** @file ${name}(逻辑名称:${fileName}) */
+    });
+  } catch (err) {
+    log.error(err);
+  }
+};
+
+const generateLogic = async (dirName, daml, name) => {
+  try {
+    log.loading(`正在同步${name}的逻辑器`);
+    const logicDir = `${dirName}/${name}/logic`;
+    // 创建逻辑器文件夹
+    await fs.mkdirSync(
+      `${logicDir}`,
+      { recursive: true },
+      {
+        cwd: process.cwd(),
+      }
+    );
+    const pages = daml.app.subapps[0]?.actions?.actionList || [];
+    pages.forEach(({ content, name: fileName }) => {
+      // 添加标识
+      content = `/** @file ${name}(逻辑名称:${fileName}) */
         
         ${content}`;
-    
-        fs.writeFileSync(`${logicDir}/${fileName}.js`, content, {
-            cwd: process.cwd(),
-        });
-        });
-        log.info(`同步${name}的逻辑器成功`);
-    }
-    catch(err) {
-        log.loading(`同步${name}的逻辑器失败:${err}`)
-    }
-}
-
-const generateVariable = async(dirName, daml, name) => {
-    try {
-        log.loading(`正在同步${name}的变量值`)
-        const variableDir = `${dirName}/${name}/variable`
-        // 创建变量文件夹
-        await fs.mkdirSync(
-            `${variableDir}`,
-            { recursive: true },
+
+      fs.writeFileSync(`${logicDir}/${fileName}.js`, content, {
+        cwd: process.cwd(),
+      });
+    });
+    log.info(`同步${name}的逻辑器成功`);
+  } catch (err) {
+    log.loading(`同步${name}的逻辑器失败:${err}`);
+  }
+};
+
+const generateVariable = async (dirName, daml, name) => {
+  try {
+    log.loading(`正在同步${name}的变量值`);
+    const variableDir = `${dirName}/${name}/variable`;
+    // 创建变量文件夹
+    await fs.mkdirSync(
+      `${variableDir}`,
+      { recursive: true },
+      {
+        cwd: process.cwd(),
+      }
+    );
+
+    const variables = daml.app.subapps[0].dataSource.dataList || [];
+
+    variables.forEach(({ key, value: variableValue }) => {
+      fs.writeFileSync(
+        `${variableDir}/${key}.json`,
+        JSON.stringify(
+          variableValue,
+          (key, value) => {
+            if (typeof value === "string") {
+              return string2Data(value);
+            }
+            return value;
+          },
+          2
+        ),
+        {
+          cwd: process.cwd(),
+        }
+      );
+    });
+    log.info(`同步${name}的变量值成功`);
+  } catch (err) {
+    log.loading(`同步${name}的变量失败:${err}`);
+  }
+};
+
+const checkDamlrc = async () => {
+  const exist = await fs.existsSync(`${process.cwd()}/.damlrc.json`);
+  if (!exist) {
+    log.loading(`
+      检测到.damlrc文件不存在, 
+      正在为你创建所需文件,
+    `);
+    await fs.writeFileSync(
+      `${process.cwd()}/.damlrc.json`,
+      `
+        [
             {
-                cwd: process.cwd(),
+                "appName": "应用名称",
+                "origin": "低代码域名",
+                "appId": "应用id",
+                "branchid": "应用分支id",
+                "token": "你的token"
             }
-        );
-        
-        const variables = daml.app.subapps[0].dataSource.dataList || [];
-        
-        variables.forEach(({ key, value: variableValue }) => {
-            fs.writeFileSync(`${variableDir}/${key}.json`, JSON.stringify(variableValue, (key, value) => {
-              if (typeof value === "string") {
-                return string2Data(value);
-              }
-              return value;
-            }, 2) , {
-              cwd: process.cwd(),
-            });
+        ]
+        `
+    );
+    log.error("文件创建成功,请打开.damlrc.json补充你的信息后再次执行命令");
+  }
+  return;
+};
+
+const main = async () => {
+  await checkDamlrc();
+  const settings = require(`${process.cwd()}/.damlrc.json`) || [];
+  const { ignore } = await Prompt.default.prompt(initQuestions());
+  settings.forEach(async ({ appName, origin, token, appId, branchid }) => {
+    const basePath = `${appName}/${catalogue}`;
+    const exist = await fs.existsSync(basePath);
+
+    if (!exist) {
+      log.info(`当前目录${basePath}不存在,开始创建${basePath}文件夹`);
+      const hasTopDir = await fs.existsSync(appName);
+      if (!hasTopDir) {
+        await fs.mkdirSync(String(appName), undefined, {
+          cwd: process.cwd(),
         });
-        log.info(`同步${name}的变量值成功`);
+      }
+      await fs.mkdirSync(String(basePath), undefined, {
+        cwd: process.cwd(),
+      });
     }
-    catch(err) {
-        log.loading(`同步${name}的变量失败:${err}`)
-    }
-}
-
-const main = async() => {
-    const settings = require(`${process.cwd()}/.damlrc`) || [];
-    const { origin, token, appId, branchid } = settings;
-    settings.forEach(async({appName, origin, token, appId, branchid}) => {
-        const { ignore } = await Prompt.default.prompt(initQuestions());
-        const basePath = `${appName}/${catalogue}`
-        const exist = await fs.existsSync(basePath);
-    
-        if (!exist) {
-            log.info(`当前目录${basePath}不存在,开始创建${basePath}文件夹`);
-            const hasTopDir = await fs.existsSync(appName);
-            if(!hasTopDir) {
-                await fs.mkdirSync(String(appName), undefined, {
-                    cwd: process.cwd(),
-                });
-            }
-            await fs.mkdirSync(String(basePath), undefined, {
-                cwd: process.cwd(),
-            });
-        }
-    
-        await handleIgnore(ignore, basePath);
-        const lists = await getList(origin, appId, branchid, token);
-        await getDaml(lists, origin, appId, branchid, token, basePath);
-    })
-} 
-
-module.exports = main
+
+    await handleIgnore(ignore, basePath);
+    const lists = await getList(origin, appId, branchid, token);
+    log.info(`请求${appName}页面列表成功,条数为${lists.length}`);
+    await getDaml(lists, origin, appId, branchid, token, basePath);
+  });
+};
+
+module.exports = main;

package/lib/server/index.js

@@ -1,13 +1,31 @@
 const { spawn } = require('node:child_process'); // 使用 node: 前缀明确使用核心模块
+const Prompt = require("inquirer");
 
-const server = (filePath, argv) => {
+// 可以在https://www.toolhelper.cn/SSL/SSLGenerate生成
+const sslQuestions = () => [
+  {
+    type: "input",
+    name: "cert",
+    default: "cert.pem",
+    message: `证书地址(完整的绝对路径)`,
+  },
+  {
+    type: "input",
+    name: "private",
+    default: "private.key",
+    message: `私钥地址(完整的绝对路径)`,
+  },
+];
+
+const server = async(filePath, argv) => {
   const https = argv.https ?? false;
   const port = argv.port ?? 3000;
 
   try {
     const args = [filePath, '-p', port.toString()];
     if (https) {
-      args.push('-S', '-C', 'cert.pem', '-K', 'key.pem');
+      const { cert, private } = await Prompt.default.prompt(sslQuestions());
+      args.push('-S', '-C', `${cert}`, '-K', `${private}`);
     }
     
     const child = spawn('npx', ['http-server', ...args], {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wagq/wa-cli",
-  "version": "0.6.4",
+  "version": "0.6.6",
   "description": "wa的脚手架",
   "main": "index.js",
   "scripts": {
@@ -37,7 +37,6 @@
     "ora": "^4.0.3",
     "xlsx": "^0.18.5"
   },
-  "devDependencies": {},
   "directories": {
     "lib": "lib"
   }