@lazycatcloud/lzc-cli 1.2.29 → 1.2.31

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/index.js

@@ -7,13 +7,23 @@ import logger from "loglevel"
 import { sleep } from "../utils.js"
 import { DebugBridge } from "./lpk_debug_bridge.js"
 import shellApi from "../shellapi.js"
+import { generate } from "./lpk_create_generator.js"
 
 export function lpkProjectCommand(program) {
   let subCommands = [
+    {
+      command: "init",
+      desc: "初始化懒猫云应用(提供最基础的模板)",
+      handler: async () => {
+        generate("blank", "./")
+        logger.info("应用初始化完成")
+      }
+    },
     {
       command: "create <name>",
       desc: "创建懒猫云应用",
       handler: async ({ name }) => {
+        name = String(name)
         await lpkCreate(name)
       }
     },

package/lib/app/lpk_create.js

@@ -52,14 +52,13 @@ export class LpkManifest {
       {
         type: "input",
         name: "appId",
-        message: `请输入应用ID, 如(${this.defaultAppID})`,
+        message: `请输入应用ID，例如app-demo1`,
         default: this.defaultAppID,
         validate: (input) => {
           if (isValidAppId(input)) {
             return true
           } else {
-            // return `请输入 1-63 位的字母、数字或-，且不能以-开头或结尾。`
-            return `请输入 1-63 位的字母、数字。`
+            return `允许小写字母或数字或-的组合，但不以数字开头，且不能以 - 开头或结束，也不能有连续的短横线 --`
           }
         }
       }

package/lib/app/lpk_create_generator.js

@@ -50,7 +50,7 @@ function writeFileTree(target, files) {
   })
 }
 
-async function generate(type, to, opts = {}) {
+export async function generate(type, to, opts = {}) {
   const files = await loadFiles(type, opts.prefix)
   writeFileTree(to, files)
 }

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")
@@ -344,16 +359,15 @@ export class FileLocker {
 }
 
 export function isValidAppId(appId) {
-  // 暂时去掉 - 的支持
-  // const regex = new RegExp("^[a-zA-Z0-9][a-zA-Z0-9-]{0,61}[a-zA-Z0-9]$")
-  const regex = new RegExp("^[a-z][a-z0-9]{0,61}[a-zA-Z0-9]$")
+  const regex = new RegExp("^(?!-)(?!.*--)[a-z][a-z0-9]*([-][a-z0-9]+)*$")
   return regex.test(appId)
 }
 
 export function isValidPackageName(packageName) {
   // 暂时去掉 - 的支持
-  // const regex = new RegExp("^(?:[a-z][a-z0-9-]*\\.)+[a-z][a-z0-9-]*$")
-  const regex = new RegExp("^(?:[a-z][a-z0-9]*\\.)+[a-z][a-z0-9]*$")
+  const regex = new RegExp(
+    "^[a-z][a-z0-9]*([-][a-z0-9]+)*(?:.[a-z][a-z0-9]*([-][a-z0-9]+)*)*$"
+  )
   return regex.test(packageName)
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lazycatcloud/lzc-cli",
-  "version": "1.2.29",
+  "version": "1.2.31",
   "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",

package/template/blank/lzc-build.yml

@@ -0,0 +1,59 @@
+# 整个文件中，可以通过 ${var} 的方式，使用 manifest 字段指定的文件定义的值
+
+# buildscript
+# - 可以为构建脚本的路径地址
+# - 如果构建命令简单，也可以直接写 sh 的命令
+buildscript: npm run build
+
+# manifest: 指定 lpk 包的 manifest.yml 文件路径
+manifest: ./lzc-manifest.yml
+
+# contentdir: 指定打包的内容，将会打包到 lpk 中
+contentdir: ./dist
+
+# pkgout: lpk 包的输出路径
+pkgout: ./
+
+# icon 指定 lpk 包 icon 的路径路径，如果不指定将会警告
+# icon 仅仅允许 png 后缀的文件
+icon: ./lzc-icon.png
+
+# devshell 自定义应用的开发容器环境
+# - routers 指定应用容器的访问路由
+
+# devshell 没有指定 image 的情况，将会默认使用 registry.lazycat.cloud/lzc-cli/devshell:v0.0.5
+# devshell:
+#   routers:
+#     - /=http://127.0.0.1:8080
+
+# devshell 指定 image 的情况
+# devshell:
+#   routes:
+#     - /=http://127.0.0.1:3000
+#   image: registry.lazycat.cloud/lzc-cli/devshell:v0.0.5
+
+# devshell 指定构建Dockerfile
+# image 字段如果没有定义，将默认使用 ${package}-devshell:${version}
+# devshell:
+#   routes:
+#     - /=http://127.0.0.1:3000
+#   image: ${package}-devshell:${version}
+#   pull_policy: build
+#   build: .
+
+# dvshell 指定开发依赖的情况
+# 这种情况下，选用 alpine:latest 作为基础镜像，在 dependencies 中添加所需要的开发依赖即可
+# 如果 dependencies 和 build 同时存在，将会优先使用 dependencies
+devshell:
+  routes:
+    - /=http://127.0.0.1:3000
+  dependencies:
+    - nodejs
+    - npm
+  # setupscript 每次进入到app container后都会执行的配置脚本
+  # - 可以为脚本的路径地址
+  # - 如果构建命令简单，也可以直接写 sh 的命令
+  # setupscript: export GOPROXY=https://goproxy.cn
+  # setupscript: ./setupscript.sh
+  setupscript: |
+    export npm_config_registry=https://registry.npmmirror.com

package/template/blank/lzc-manifest.yml

@@ -0,0 +1,12 @@
+lzc-sdk-version: 0.1
+name: helloworld
+package: cloud.lazycat.app.helloworld
+version: 0.0.1
+description: 
+license: https://choosealicense.com/licenses/mit/
+homepage: 
+author: 
+application:
+  subdomain: helloworld
+  routes:
+    - /=file:///lzcapp/pkg/content/dist