@lazycatcloud/lzc-cli 1.2.28 → 1.2.30

package/lib/app/apkshell.js

@@ -1,6 +1,6 @@
 import fs from "node:fs"
-import fetch from "node-fetch"
 import logger from "loglevel"
+import { api } from "../utils.js"
 
 export async function triggerApk(id, name, iconPath) {
   if (!id) {
@@ -15,16 +15,11 @@ export async function triggerApk(id, name, iconPath) {
     if (iconPath) {
       form.append("app_icon", new Blob([fs.readFileSync(iconPath)]))
     }
-    const resp = await fetch(
+    const resp = await api.post(
       "https://appstore.lazycat.cloud/api/trigger_latest_for_app",
-      {
-        method: "POST",
-        body: form
-      }
+      form
     )
     if (resp.status == 304) {
-      // 没有修改
-      logger.info(`APK构建任务已创建成功,如需使用安卓端,请耐心等待1分钟左右`)
     } else if (resp.status == 201) {
       logger.info(`APK构建任务已创建成功,如需使用安卓端,请耐心等待1分钟左右`)
     } else if (resp.status >= 400) {

package/lib/app/index.js

@@ -2,7 +2,7 @@ import path from "node:path"
 import lpkCreate from "./lpk_create.js"
 import { LpkBuild } from "./lpk_build.js"
 import { AppDevShell } from "./lpk_devshell.js"
-import { LpkInstaller } from "./lpk_installer.js"
+import { LpkInstaller, installConfig } from "./lpk_installer.js"
 import logger from "loglevel"
 import { sleep } from "../utils.js"
 import { DebugBridge } from "./lpk_debug_bridge.js"
@@ -14,8 +14,6 @@ export function lpkProjectCommand(program) {
       command: "create <name>",
       desc: "创建懒猫云应用",
       handler: async ({ name }) => {
-        await shellApi.init()
-
         await lpkCreate(name)
       }
     },
@@ -68,10 +66,15 @@ export function lpkProjectCommand(program) {
           describe: "同时打包 lzc-build.yml 中指定的 contentdir 目录",
           type: "boolean"
         })
+        args.option("apk", {
+          describe: "是否生成APK(y/n)",
+          type: "string",
+          default: "y"
+        })
       },
-      handler: async ({ context, force, config, contentdir }) => {
+      handler: async ({ context, force, config, contentdir, apk }) => {
         await shellApi.init()
-
+        installConfig.apk = apk == "y"
         const cwd = context ? path.resolve(context) : process.cwd()
         const lpkBuild = await new LpkBuild(cwd, config).init()
         lpkBuild.onBeforeBuildPackage(async (options) => {
@@ -107,8 +110,16 @@ export function lpkAppCommand(program) {
     {
       command: "install [pkgPath]",
       desc: "部署应用至设备, pkgPath 可以为路径，或者https://,http://请求地址, 如果不填写，将默认为当前目录下的lpk",
-      handler: async ({ pkgPath }) => {
+      builder: (args) => {
+        args.option("apk", {
+          describe: "是否生成APK(y/n)",
+          type: "string",
+          default: "y"
+        })
+      },
+      handler: async ({ pkgPath, apk }) => {
         await shellApi.init()
+        installConfig.apk = apk == "y"
 
         pkgPath = pkgPath ?? process.cwd()
         const installer = new LpkInstaller()

package/lib/app/lpk_create_generator.js

@@ -144,6 +144,8 @@ export const TemplateConfig = {
 ⚙️  进入应用容器后执行下面命令:
    npm install
    npm run dev
+🚀 启动应用:
+   进入微服客户端启动器页面点击应用图标来测试应用
    `.trim()
         )
       )

package/lib/app/lpk_debug_bridge.js

@@ -2,7 +2,8 @@ import { spawn, spawnSync } from "child_process"
 import fs from "node:fs"
 import shellApi from "../shellapi.js"
 import inquirer from "inquirer"
-import { isDebugMode, resolveDomain } from "../utils.js"
+import { isDebugMode, resolveDomain, sleep } from "../utils.js"
+import logger from "loglevel"
 
 export class DebugBridge {
   constructor() {
@@ -18,7 +19,7 @@ export class DebugBridge {
     const ssh = spawnSync(sshCmd, args, {
       shell: true,
       encoding: "utf-8",
-      stdio: ["pipe", "pipe", "inherit"]
+      stdio: ["pipe", "pipe", "pipe"]
     })
     return new Promise((resolve, reject) => {
       ssh.status == 0
@@ -31,6 +32,7 @@ export class DebugBridge {
 
   async install(lpkPath, pkgId) {
     if (!(await this.canPublicKey())) {
+      // 如果不能 ssh public key 登录则直接调用 ssh-copy-id 复制，否则后面可能会出现 rsync 询问密码的问题
       await this.sshCopyId()
     }
 
@@ -53,29 +55,13 @@ export class DebugBridge {
   }
 
   async canPublicKey() {
-    try {
-      await this.common(this.sshCmd, [`-o PasswordAuthentication=no`])
-      return true
-    } catch {
-      return false
-    }
+    // FIXME: 目前没有找到在允许空密码的情况下，检测是否只能通过 publickey 登录的方法。
+    return false
   }
 
   async sshCopyId() {
-    const questions = [
-      {
-        name: "upload",
-        type: "input",
-        default: "y",
-        message:
-          "检测到你目前使用的密码帐号登录，是否使用 ssh-copy-id 上传密钥 (y/n): "
-      }
-    ]
-    const answers = await inquirer.prompt(questions)
-    if (answers.upload.toLowerCase() == "y") {
-      const resolvedIp = await resolveDomain(this.domain)
-      return this.common(`ssh-copy-id`, [`-f -p 22222 box@${resolvedIp}`])
-    }
+    const resolvedIp = await resolveDomain(this.domain)
+    return this.common(`ssh-copy-id`, [`-f -p 22222 box@${resolvedIp}`])
   }
 
   async status(appId) {
@@ -100,6 +86,16 @@ export class DebugBridge {
 
   async devshell(appId, isUserApp, onconnect = null) {
     const resolvedIp = await resolveDomain(this.domain)
+    let waiting = true
+    while (waiting) {
+      if (await this.isDevshell(appId)) {
+        waiting = false
+        break
+      }
+      logger.debug("wait app container to running...")
+      await sleep(100)
+    }
+
     const stream = spawn(
       `ssh -p 22222 box@${resolvedIp}`,
       [
@@ -119,9 +115,9 @@ export class DebugBridge {
       stream.on("close", (code) => {
         code == 0 ? resolve() : reject()
       })
-      if (onconnect) {
-        stream.on("spawn", onconnect)
-      }
+      // spawn 事件只是进程启动成功的事件，并不是ssh成功连接上的事件。所以这里使
+      // 用前面的一个 isDevshell 判断是否已经启动这个容器，再使用 spawn
+      stream.on("spawn", onconnect)
     })
   }
 

package/lib/app/lpk_devshell.js

@@ -18,7 +18,8 @@ import {
   isUserApp,
   createTemplateFileCommon,
   isDebugMode,
-  resolveDomain
+  resolveDomain,
+  sleep
 } from "../utils.js"
 import os from "node:os"
 import commandExists from "command-exists"

package/lib/app/lpk_installer.js

@@ -7,6 +7,7 @@ import { DebugBridge } from "./lpk_debug_bridge.js"
 import shellapi from "../shellapi.js"
 import { triggerApk } from "./apkshell.js"
 
+export const installConfig = { apk: true }
 // 从一个目录中找出修改时间最新的包
 function findOnceLpkByDir(dir = process.cwd()) {
   const pkg = fs
@@ -95,11 +96,14 @@ export class LpkInstaller {
     try {
       spawnSync("unzip", ["-d", tempDir, pkgPath])
       manifest = loadFromYaml(path.join(tempDir, "manifest.yml"))
-      await triggerApk(
-        manifest["package"],
-        manifest["name"],
-        path.resolve(path.join(tempDir, "icon.png"))
-      )
+      logger.debug("是否生成APK:", installConfig.apk)
+      if (installConfig.apk) {
+        await triggerApk(
+          manifest["package"],
+          manifest["name"],
+          path.resolve(path.join(tempDir, "icon.png"))
+        )
+      }
       logger.debug("lpk manifest", manifest)
     } finally {
       fs.rmSync(tempDir, { recursive: true })
@@ -113,5 +117,6 @@ export class LpkInstaller {
     logger.info(
       `👉 请在浏览器中访问 https://${manifest["application"]["subdomain"]}.${shellapi.boxname}.heiyu.space`
     )
+    logger.info(`👉 并使用微服的用户名和密码登录`)
   }
 }

package/lib/appstore/login.js

@@ -3,7 +3,6 @@ import path from "path"
 import logger from "loglevel"
 import env from "../env.js"
 import inquirer from "inquirer"
-import FormData from "form-data"
 
 const accountServerUrl = "https://account.lazycat.cloud"
 
@@ -12,17 +11,13 @@ function join(...params) {
   return x
 }
 
-function login(username, password) {
-  const form = new FormData()
-  form.append("username", username)
-  form.append("password", password)
-
+async function login(username, password) {
   return fetch(join(accountServerUrl, "/api/login/signin"), {
     method: "POST",
-    headers: {
-      "content-type": `multipart/form-data; boundary=${form.getBoundary()}`
-    },
-    body: form
+    body: new URLSearchParams({
+      username: username,
+      password: password
+    })
   })
     .then(async (res) => {
       let bodyText = await res.text()

package/lib/shellapi.js

@@ -32,6 +32,11 @@ class ShellApi {
     const { addr, cred } = this.readShellApiInfo()
     this.client = new pbShell.ShellCore(addr, grpc.credentials.createInsecure())
 
+    // 检查当前 shell 环境上下文是否配置 HTTP_PROXY
+    if (this.checkEnvProxy()) {
+        logger.warn(`WARN:: 当前终端环境已配置 HTTP_PROXY 代理，可能会导致访问懒猫微服失败，如果未影响功能可以忽略该警告`)
+    }
+
     const md = new grpc.Metadata()
     md.add("lzc-shellapi-cred", cred)
     this.metadata = md
@@ -115,6 +120,19 @@ class ShellApi {
       })
   }
 
+  checkEnvProxy() {
+    if(process.env.HTTPS_PROXY ||
+        process.env.HTTP_PROXY ||
+        process.env.ALL_PROXY ||
+        process.env.https_proxy ||
+        process.env.http_proxy ||
+        process.env.all_proxy
+    ){
+        return true
+    }
+    return false
+  }
+
   async setDefaultBox(boxname) {
     const boxes = await this.boxList()
     const box = boxes.find((b) => b.box_name === boxname)

package/lib/utils.js

@@ -16,6 +16,21 @@ import { spawnSync } from "node:child_process"
 import logger from "loglevel"
 import * as tar from "tar"
 import dns from "node:dns/promises"
+import axios from "axios"
+
+// 创建 Axios 实例
+export const api = axios.create()
+
+// 添加响应拦截器
+api.interceptors.response.use(
+  (response) => response, // 直接返回响应
+  (error) => {
+    if (error.response && error.response.status === 304) {
+      return Promise.resolve(error.response) // 返回响应以便后续处理
+    }
+    return Promise.reject(error) // 其他错误继续抛出
+  }
+)
 
 export const envsubstr = async (templateContents, args) => {
   const parse = await importDefault("envsub/js/envsub-parser.js")

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lazycatcloud/lzc-cli",
-  "version": "1.2.28",
+  "version": "1.2.30",
   "description": "lazycat cloud developer kit",
   "files": [
     "template",
@@ -21,6 +21,7 @@
     "@grpc/grpc-js": "^1.11.1",
     "@grpc/proto-loader": "^0.7.13",
     "archiver": "^7.0.1",
+    "axios": "^1.7.7",
     "chalk": "^5.3.0",
     "chokidar": "^3.6.0",
     "command-exists": "^1.2.9",