@lazycatcloud/lzc-cli 1.2.29 → 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,12 +15,9 @@ 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) {
     } else if (resp.status == 201) {

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() {
@@ -85,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}`,
       [
@@ -104,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

@@ -513,7 +513,6 @@ class DevShell {
       await this.watchFile(this.appId)
       await this.connectShell(async () => {
         // 在连接成功的时候，同步一次文件
-        await sleep(300)
         await this.syncProject(this.appId)
       })
     } catch (e) {

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.29",
+  "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",