@lazycatcloud/lzc-cli 1.2.58 → 1.2.60

package/changelog.md

@@ -1,3 +1,14 @@
+# 1.2.60
+1. 添加用户登录友好提示
+2. 移除已弃用模版
+3. 支持 lzc-build 文件配置 `compose.override` 字段
+
+# 1.2.59
+
+1. 修复 copy-image 网关超时
+2. 当解析 manifest 失败的时候，继续安装
+3. 修复盒子 ingress 错误的时候，获取不到本地的默认盒子
+
 # 1.2.58
 
 1. 使用 127.0.0.1 替代 localhost 避免解析错误

package/lib/app/lpk_build.js

@@ -305,6 +305,11 @@ export class LpkBuild {
         dumpToYaml(manifest, path.join(tempDir, "manifest.yml"))
       }
 
+      // compose.override.yml
+      if (this.options['compose_override']) {
+        dumpToYaml(this.options['override'], path.join(tempDir, "compose.override.yml"))
+      }
+
       // 打包 lpk
       if (this.beforeDumpLpkFn.length > 0) {
         await this.beforeDumpLpkFn.reduce(async (prev, curr) => {

package/lib/app/lpk_create_generator.js

@@ -55,81 +55,6 @@ export async function generate(type, to, opts = {}) {
   writeFileTree(to, files)
 }
 
-function appendREADME(dir) {
-  const readme = path.resolve(dir, "README.md")
-  const readmeTemplate = path.resolve(
-    __dirname,
-    "..",
-    "..",
-    "template",
-    "_lpk",
-    "README.md"
-  )
-  if (!isFileExist(readme)) {
-    fs.copyFileSync(readmeTemplate, readme)
-  } else {
-    const contentStream = fs.readFileSync(readmeTemplate, {
-      encoding: "utf-8"
-    })
-    fs.writeFileSync(readme, contentStream, { flag: "a" })
-  }
-}
-
-function vueTemplate(type) {
-  const v = type == "vue3" ? "vue@3" : "vue@2"
-  return {
-    build: async (to, option) => {
-      spawn.sync("npm", ["init", v, path.basename(to)], { stdio: "inherit" })
-    },
-    after: async function (name, cwd) {
-      spawn.sync("npm", ["install"], {
-        cwd: path.resolve(cwd, name),
-        stdio: "inherit"
-      })
-
-      const lzcBuildTemplatePath = path.resolve(
-        __dirname,
-        "..",
-        "..",
-        "template",
-        "_lpk",
-        "vue.lzc-build.yml.in"
-      )
-      logger.debug("复制", lzcBuildTemplatePath)
-      fs.copyFileSync(lzcBuildTemplatePath, path.resolve(name, "lzc-build.yml"))
-
-      const iconPngPath = path.resolve(
-        __dirname,
-        "..",
-        "..",
-        "template",
-        "_lpk",
-        "lazycat.png"
-      )
-      fs.copyFileSync(iconPngPath, path.resolve(name, "lazycat.png"))
-
-      // 更改默认的端口
-      const packageJson = path.resolve(name, "package.json")
-      const pkgInfo = JSON.parse(fs.readFileSync(packageJson))
-      pkgInfo["scripts"]["dev"] = `vite --port 3000 --host`
-      fs.writeFileSync(packageJson, JSON.stringify(pkgInfo, null, "  "))
-
-      appendREADME(path.resolve(cwd, name))
-
-      console.log(
-        chalk.green(
-          `
-🚀 构建 lpk 包
-  ${chalk.yellow(`lzc-cli project build -o ${name}.lpk`)}
-⚙️ 将应用安装至设备中:
-  ${chalk.yellow(`lzc-cli app install ${name}.lpk`)}
-   `.trim()
-        )
-      )
-    }
-  }
-}
-
 function appCreateSuccessTip(name) {
   console.log(
     chalk.green(
@@ -162,82 +87,5 @@ export const TemplateConfig = {
         )
       )
     }
-  },
-  // vue3: vueTemplate("vue3"),
-  vue2: vueTemplate("vue2"),
-  lite: {
-    build: async (to, option) => {
-      await generate("lite", to, option)
-    },
-    after: async function (name, cwd) {
-      appendREADME(path.resolve(cwd, name))
-
-      console.log(
-        chalk.green(
-          `
-✨ 懒猫云应用 ${name} 已创建:
-  ${chalk.yellow(`cd ${name}`)}
-🚀 构建 lpk 包
-  ${chalk.yellow(`lzc-cli project build -o ${name}.lpk`)}
-⚙️ 将应用安装至设备中:
-  ${chalk.yellow(`lzc-cli app install ${name}.lpk`)}
-   `.trim()
-        )
-      )
-    }
-  },
-  ionic_vue3: {
-    build: async (to, option) => {
-      await generate("ionic_vue3", to, option)
-    },
-    after: async function (name, cwd) {
-      appendREADME(path.resolve(cwd, name))
-
-      console.log(chalk.green("开始安装依赖"))
-      spawn.sync("npm", ["install"], {
-        cwd: path.join(cwd, name),
-        stdio: "inherit"
-      })
-
-      console.log(
-        chalk.green(
-          `
-✨ 懒猫云应用 ${name} 已创建:
-  ${chalk.yellow(`cd ${name}`)}
-  ${chalk.yellow(`npm run dev`)}
-🚀 构建 lpk 包
-  ${chalk.yellow(`lzc-cli project build -o ${name}.lpk`)}
-⚙️ 将应用安装至设备中:
-  ${chalk.yellow(`lzc-cli app install ${name}.lpk`)}
-📄 生成android代码:
-  ${chalk.yellow(`npm run build_android`)}
-📄 生成ios代码:
-  ${chalk.yellow(`npm run build_ios`)}
-   `.trim()
-        )
-      )
-    }
-  },
-  golang: {
-    build: async (to, option) => {
-      await generate("golang", to, option)
-    },
-    after: function (name, cwd) {
-      appendREADME(path.resolve(cwd, name))
-
-      console.log(
-        chalk.green(
-          `
-✨ 懒猫云应用 ${name} 已创建:
-  ${chalk.yellow(`cd ${name}`)}
-  ${chalk.yellow(`go run .`)}
-🚀 构建 lpk 包
-  ${chalk.yellow(`lzc-cli project build -o ${name}.lpk`)}
-⚙️ 将应用安装至设备中:
-  ${chalk.yellow(`lzc-cli app install ${name}.lpk`)}
-`.trim()
-        )
-      )
-    }
   }
 }

package/lib/app/lpk_installer.js

@@ -113,6 +113,8 @@ export class LpkInstaller {
         })
       }
       logger.debug("lpk manifest", manifest)
+    } catch (err) {
+      logger.debug("parse manifest ", err)
     } finally {
       fs.rmSync(tempDir, { recursive: true })
     }
@@ -120,12 +122,14 @@ export class LpkInstaller {
     const bridge = new DebugBridge()
     await bridge.init()
     logger.info("开始安装应用")
-    await bridge.install(pkgPath, manifest["package"])
+    await bridge.install(pkgPath, manifest ? manifest["package"] : "")
     logger.info("\n")
     logger.info(`安装成功！`)
-    logger.info(
-      `👉 请在浏览器中访问 https://${manifest["application"]["subdomain"]}.${shellapi.boxname}.heiyu.space`
-    )
-    logger.info(`👉 并使用微服的用户名和密码登录`)
+    if (manifest) {
+      logger.info(
+        `👉 请在浏览器中访问 https://${manifest["application"]["subdomain"]}.${shellapi.boxname}.heiyu.space`
+      )
+      logger.info(`👉 并使用微服的用户名和密码登录`)
+    }
   }
 }

package/lib/appstore/index.js

@@ -3,6 +3,7 @@ import logger from "loglevel"
 import { PrePublish } from "./prePublish.js"
 import { reLogin, request } from "./login.js"
 import fs from "node:fs"
+import { sleep } from "../utils.js"
 
 export function appstoreCommand(program) {
   let subCommands = [
@@ -72,13 +73,21 @@ export function appstoreCommand(program) {
         logger.info(
           `Waiting ... ( copy ${imageName} to lazycat offical registry)`
         )
-
         try {
-          const resp = await request(`${baseUrl}/push-image?image=${imageName}`)
-          if (resp.ok) {
-            logger.info("lazycat-registry:", await resp.text())
-          } else {
-            logger.error("error: ", await resp.text())
+          for (; ;) {
+            const resp = await request(`${baseUrl}/push-image?image=${imageName}&v=2`)
+            if (resp.ok) {
+              const tag = await resp.text()
+              if (tag.length == 0) {
+                await sleep(2500)
+                continue
+              }
+              logger.info("lazycat-registry:", tag)
+            } else {
+              logger.error("error: ", await resp.text())
+            }
+
+            break;
           }
         } catch (err) {
           console.error(err)

package/lib/appstore/login.js

@@ -84,11 +84,19 @@ async function interactiveLogin() {
     await login(info.username, info.password)
   } catch (e) {
     logger.debug("login error: ", e)
-    logger.info("帐号或者密码错误，请重新输入!")
+    logger.error("帐号或者密码错误，请重新输入!")
     return interactiveLogin()
   }
 }
 
+function tipsFirstLogin() {
+    let token = env.get("token")
+    if (!token) {
+      // 还没登录过的用户提示用户前往 https://developer.lazycat.cloud/manage 注册开发者账号
+      logger.info("请登录懒猫微服社区账号，账号注册以及开发者权限申请地址: https://developer.lazycat.cloud/manage")
+    }
+}
+
 export async function reLogin() {
   let token = await isLogin()
   if (token) {
@@ -105,6 +113,8 @@ export async function reLogin() {
       logger.info(`token: ${token}`)
       return
     }
+  } else {
+    tipsFirstLogin()
   }
   await interactiveLogin()
 }
@@ -114,6 +124,8 @@ export async function autoLogin() {
   if (token) {
     logger.debug("appstore 已经登录")
     return
+  } else {
+    tipsFirstLogin()
   }
 
   logger.debug("token错误，尝试自动登录")

package/lib/debug_bridge.js

@@ -15,6 +15,9 @@ import {
 import logger from "loglevel"
 import commandExists from "command-exists"
 import path from "node:path"
+import fetch from "node-fetch"
+
+const bannerfileContent = `˄=ᆽ=ᐟ \\`
 
 export function sshBinary() {
   if (isWindows) {
@@ -42,12 +45,40 @@ export class DebugBridge {
   }
 
   async init() {
+    await this.checkDevTools()
     if (!(await this.canPublicKey())) {
       // 如果不能 ssh public key 登录则提示授权申请，否则后面可能会出现 rsync 询问密码的问题
       await this.sshApplyGrant()
     }
   }
 
+  async checkDevTools() {
+    const url = `https://dev.${this.boxname}.heiyu.space/bannerfile`
+    return new Promise((resolve, reject) => {
+      fetch(url, { redirect: "error" })
+        .then(async (res) => {
+          const content = await res.text()
+          if (res.status == 200 && content == bannerfileContent) {
+            resolve()
+            return
+          }
+          logger.warn(
+            `检测到你还没有安装 '懒猫开发者工具'，请先到商店中搜索安装
+点击直接跳转 https://appstore.${this.boxname}.heiyu.space/#/shop/detail/cloud.lazycat.developer.tools
+点击打开应用 https://dev.${this.boxname}.heiyu.space 查看应用状态
+`
+          )
+          reject()
+        })
+        .catch(() => {
+          logger.error(
+            `检测懒猫开发者工具失败，请检测您当前的网络或者懒猫微服客户端是否正常启动。`
+          )
+          reject()
+        })
+    })
+  }
+
   async common(cmd, args) {
     const resolvedIp = await resolveDomain(this.domain)
     args = args.map((arg) => arg.replace(this.domain, resolvedIp))
@@ -73,7 +104,8 @@ export class DebugBridge {
       sshBinary(),
       [
         ...sshCmdArgs(`box@${resolvedIp}`),
-        `install --uid ${this.uid} --pkgId ${pkgId}`
+        `install --uid ${this.uid}`,
+        pkgId ? `--pkgId ${pkgId}` : ""
       ],
       {
         shell: true,

package/lib/shellapi.js

@@ -11,9 +11,6 @@ import path from "node:path"
 import fs from "node:fs"
 import os from "node:os"
 import logger from "loglevel"
-import fetch from "node-fetch"
-
-const bannerfileContent = `˄=ᆽ=ᐟ \\`
 
 /**
  * @link {https://www.npmjs.com/package/appdirs}
@@ -77,7 +74,6 @@ NOTE：在指定环境变量的模式下，有些接口依旧不能访问，为
       this.metadata = md
       this.info = await this.initBoxInfo()
     }
-    await this.checkDevTools()
   }
 
   get boxname() {
@@ -140,33 +136,6 @@ NOTE：在指定环境变量的模式下，有些接口依旧不能访问，为
     throw "没有默认盒子信息, 请先使用 lzc-cli box switch 设置默认的盒子信息"
   }
 
-  async checkDevTools() {
-    const url = `https://dev.${this.info.boxname}.heiyu.space/bannerfile`
-    return new Promise((resolve, reject) => {
-      fetch(url, { redirect: "error" })
-        .then(async (res) => {
-          const content = await res.text()
-          if (res.status == 200 && content == bannerfileContent) {
-            resolve()
-            return
-          }
-          logger.warn(
-            `检测到你还没有安装 '懒猫开发者工具'，请先到商店中搜索安装
-点击直接跳转 https://appstore.${this.info.boxname}.heiyu.space/#/shop/detail/cloud.lazycat.developer.tools
-点击打开应用 https://dev.${this.info.boxname}.heiyu.space 查看应用状态
-`
-          )
-          reject()
-        })
-        .catch(() => {
-          logger.error(
-            `检测懒猫开发者工具失败，请检测您当前的网络或者懒猫微服客户端是否正常启动。`
-          )
-          reject()
-        })
-    })
-  }
-
   checkEnvProxy() {
     if (
       process.env.HTTPS_PROXY ||

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lazycatcloud/lzc-cli",
-  "version": "1.2.58",
+  "version": "1.2.60",
   "description": "lazycat cloud developer kit",
   "scripts": {
     "prepublishOnly": "node check-changelog.js"

package/template/blank/lzc-build.yml

@@ -3,13 +3,13 @@
 # buildscript
 # - 可以为构建脚本的路径地址
 # - 如果构建命令简单，也可以直接写 sh 的命令
-buildscript: npm run build
+# buildscript:
 
 # manifest: 指定 lpk 包的 manifest.yml 文件路径
 manifest: ./lzc-manifest.yml
 
 # contentdir: 指定打包的内容，将会打包到 lpk 中
-contentdir: ./dist
+# contentdir: ./
 
 # pkgout: lpk 包的输出路径
 pkgout: ./
@@ -17,7 +17,6 @@ pkgout: ./
 # icon 指定 lpk 包 icon 的路径路径，如果不指定将会警告
 # icon 仅仅允许 png 后缀的文件
 icon: ./lzc-icon.png
-
 # devshell 自定义应用的开发容器环境
 # - routers 指定应用容器的访问路由
 
@@ -44,16 +43,16 @@ icon: ./lzc-icon.png
 # 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
+# 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

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

package/template/_lpk/golang.manifest.yml.in

@@ -1,16 +0,0 @@
-lzc-sdk-version: 0.1
-
-package: ${package}              # app的唯一标识符
-version: ${version}         # app的版本
-name: ${name}               # app名称
-description: ${description} # app描述
-
-license: https://choosealicense.com/licenses/mit/
-homepage: ${homepage}       # 出现bug时候提交反馈的地方
-author: ${author}           # app author
-
-#application作为一个特殊的container运行，对应的service名称为固定的`app`，其他service可以通过此名称与app进行通讯
-application:
-  subdomain: ${subdomain}  #期望的app域名
-  routes:
-    - /=exec://3000,/lzcapp/pkg/content/rego -html /lzcapp/pkg/content/index.html

package/template/_lpk/lite.manifest.yml.in

@@ -1,19 +0,0 @@
-lzc-sdk-version: 0.1
-
-package: ${package}         # app的唯一标识符
-version: ${version}         # app的版本
-name: ${name}               # app名称
-description: ${description} # app描述
-
-license: https://choosealicense.com/licenses/mit/
-homepage: ${homepage}       # 出现bug时候提交反馈的地方
-author: ${author}           # app author
-
-#application作为一个特殊的container运行，对应的service名称为固定的`app`，其他service可以通过此名称与app进行通讯
-application:
-  subdomain: ${subdomain}  #期望的app域名
-  routes:
-    - /=https://lazycat.cloud
-  handlers:
-    error_page_templates:
-      502: /lzcapp/pkg/content/502.html.tpl

package/template/golang/.godir

@@ -1 +0,0 @@
-rego

package/template/golang/README.md

@@ -1,10 +0,0 @@
-# rego
-
-Rego is an online Go regular expression tester
-
-Inspired by [rubular](http://rubular.com/).
-
-## TODO
-
-- Sharing (permalink)
-- Add developer documentation

package/template/golang/_gitignore

@@ -1,2 +0,0 @@
-build/*
-*.lpk