@lazycatcloud/lzc-cli 1.2.52 → 1.2.53

package/changelog.md

@@ -1,3 +1,8 @@
+# 1.2.53
+
+1. 修复 devshell 模型下，环境变量中有空格导致export错误
+2. 优化生成 apk shell 错误提示
+
 # 1.2.52
 
 1. appstore api 变更

package/lib/app/lpk_installer.js

@@ -101,11 +101,16 @@ export class LpkInstaller {
 
       logger.debug("是否生成APK:", installConfig.apk)
       if (installConfig.apk) {
-        await triggerApk(
+        triggerApk(
           manifest["package"],
           manifest["name"],
           path.resolve(path.join(tempDir, "icon.png"))
-        )
+        ).catch((err) => {
+          logger.debug("生成 APK 失败: ", err)
+          logger.debug(
+            "生成 APK 失败，使用 lzc-cli project devshell --apk n 忽略该错误"
+          )
+        })
       }
       logger.debug("lpk manifest", manifest)
     } finally {

package/lib/appstore/login.js

@@ -1,7 +1,7 @@
 import fetch from "node-fetch"
 import path from "path"
 import logger from "loglevel"
-import env from "../env.js"
+import env from "../config/env.js"
 import inquirer from "inquirer"
 
 const accountServerUrl = "https://account.lazycat.cloud"

package/lib/appstore/prePublish.js

@@ -5,7 +5,7 @@ import fs from "node:fs"
 import inquirer from "inquirer"
 import path from "node:path"
 import { isFileExist, isPngWithFile, unzipSync } from "../utils.js"
-import env from "../env.js"
+import env from "../config/env.js"
 import { Publish } from "./publish.js"
 
 async function askChangeLog() {

package/lib/config/env.js

@@ -0,0 +1,60 @@
+import path from "path"
+import fs from "fs"
+import { ensureDir } from "../utils.js"
+import logger from "loglevel"
+import os from "node:os"
+
+export const GLOBAL_CONFIG_DIR = path.join(
+  os.homedir(),
+  "/.config/lazycat/box-config.json"
+)
+
+class Env {
+  constructor() {
+    this.allEnv = {}
+    this.globalEnvPath = GLOBAL_CONFIG_DIR
+    ensureDir(this.globalEnvPath)
+
+    this._loadGlobalEnv()
+  }
+
+  has(key) {
+    return Object.keys(this.allEnv).indexOf(key) > -1
+  }
+
+  get(key) {
+    return this.allEnv[key]
+  }
+
+  all() {
+    return this.allEnv
+  }
+
+  del(key) {
+    delete this.allEnv[key]
+    this.save()
+  }
+
+  save() {
+    fs.writeFileSync(
+      this.globalEnvPath,
+      JSON.stringify(this.allEnv, null, "  ")
+    )
+  }
+
+  set(pairs) {
+    Object.assign(this.allEnv, pairs)
+    this.save()
+  }
+
+  _loadGlobalEnv() {
+    try {
+      this.allEnv = JSON.parse(fs.readFileSync(this.globalEnvPath))
+    } catch (e) {
+      logger.debug("global env fail to fetch ", e.message)
+      this.allEnv = {}
+    }
+  }
+}
+
+export default new Env()

package/lib/config/index.js

@@ -0,0 +1,57 @@
+import env from "./env.js"
+import logger from "loglevel"
+
+export function configCommand(program) {
+  const subCommands = [
+    {
+      command: "set [key] [value]",
+      desc: "设置配置",
+      handler: async ({ key, value }) => {
+        if (!key && !value) {
+          throw `key 和 value 不能为空`
+        }
+        const pair = Object.fromEntries([[key, value]])
+        env.set(pair)
+        logger.info(`${key} 配置成功!`)
+      }
+    },
+    {
+      command: "del [key]",
+      desc: "删除配置",
+      handler: async ({ key, value }) => {
+        if (key) {
+          env.del(key)
+          logger.info(`删除 ${key} 成功!`)
+          return
+        }
+      }
+    },
+    {
+      command: "get [key]",
+      desc: "获取配置",
+      handler: async ({ key }) => {
+        if (key) {
+          const v = env.get(key)
+          logger.info(`${key} ${v}`)
+        } else {
+          const all = env.all()
+          Object.keys(all).forEach((k) => {
+            logger.info(`${k} ${all[k]}`)
+          })
+        }
+        return
+      }
+    }
+  ]
+  program.command({
+    command: "config",
+    desc: "配置管理",
+    builder: (args) => {
+      args.command(subCommands)
+      args
+        .example("$0 config get", "列出所有配置")
+        .example("$0 config get foo", "获取key为foo的配置")
+        .example("$0 config set noCheckVersion false", "禁用lzc-cli的版本检测")
+    }
+  })
+}

package/lib/env.js

@@ -26,14 +26,27 @@ class Env {
     return this.allEnv[key]
   }
 
-  set(pairs) {
-    Object.assign(this.allEnv, pairs)
+  all() {
+    return this.allEnv
+  }
+
+  del(key) {
+    delete this.allEnv[key]
+    this.save()
+  }
+
+  save() {
     fs.writeFileSync(
       this.globalEnvPath,
       JSON.stringify(this.allEnv, null, "  ")
     )
   }
 
+  set(pairs) {
+    Object.assign(this.allEnv, pairs)
+    this.save()
+  }
+
   _loadGlobalEnv() {
     try {
       this.allEnv = JSON.parse(fs.readFileSync(this.globalEnvPath))

package/lib/shellapi.js

@@ -77,7 +77,7 @@ NOTE：在指定环境变量的模式下，有些接口依旧不能访问，为
       this.metadata = md
       this.info = await this.initBoxInfo()
     }
-    this.checkDevTools()
+    await this.checkDevTools()
   }
 
   get boxname() {
@@ -142,18 +142,29 @@ NOTE：在指定环境变量的模式下，有些接口依旧不能访问，为
 
   async checkDevTools() {
     const url = `https://dev.${this.info.boxname}.heiyu.space/bannerfile`
-    fetch(url, { redirect: "error" })
-      .then(async (res) => {
-        const content = await res.text()
-        if (res.status != 200 || content != bannerfileContent) {
+    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 查看应用状态
+`
           )
-        }
-      })
-      .catch(() => {
-        logger.debug(`你的懒猫微服开发者工具版本较低，请从商店中更新`)
-      })
+          reject()
+        })
+        .catch(() => {
+          logger.error(
+            `检测懒猫开发者工具失败，请检测您当前的网络或者懒猫微服客户端是否正常启动。`
+          )
+          reject()
+        })
+    })
   }
 
   checkEnvProxy() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lazycatcloud/lzc-cli",
-  "version": "1.2.52",
+  "version": "1.2.53",
   "description": "lazycat cloud developer kit",
   "scripts": {
     "prepublishOnly": "node check-changelog.js"
@@ -12,7 +12,7 @@
     "changelog.md"
   ],
   "bin": {
-    "lzc-cli": "./scripts/cli.js"
+    "lzc-cli": "scripts/cli.js"
   },
   "type": "module",
   "keywords": [

package/scripts/cli.js

@@ -11,7 +11,7 @@ import { contextDirname, pkgInfo } from "../lib/utils.js"
 import { boxCommand } from "../lib/box/index.js"
 import { appstoreCommand } from "../lib/appstore/index.js"
 import { lpkAppCommand, lpkProjectCommand } from "../lib/app/index.js"
-import env from "../lib/env.js"
+import { configCommand } from "../lib/config/index.js"
 
 // logger level middleware
 const logLevelOriginalFactory = logger.methodFactory
@@ -73,22 +73,7 @@ const program = yargs(hideBin(process.argv))
   })
   .completion("completion", false)
 
-program.command({
-  command: "config [key] [value]",
-  desc: false,
-  builder: (args) => {
-    args.implies("key", "value")
-  },
-  handler: async ({ key, value }) => {
-    if (!key && !value) {
-      console.log(env.stringify())
-      return
-    }
-    const pair = Object.fromEntries([[key, value]])
-    env.set(pair, true)
-  }
-})
-
+configCommand(program)
 boxCommand(program)
 lpkAppCommand(program)
 lpkProjectCommand(program)
@@ -109,6 +94,7 @@ appstoreCommand(program)
       case "app":
       case "project":
       case "appstore":
+      case "config":
         program.showHelp()
         return
     }

package/template/_lpk/exec.sh

@@ -4,7 +4,7 @@
 # 从1号进程读取环境变量
 cat > /tmp/lzcapp_env.sh << EOF
 #!/bin/sh
-$(/usr/lib/debug.bridge/busybox tr '\0' '\n' < /proc/1/environ | /usr/lib/debug.bridge/busybox xargs -I{} echo export {})
+$(/usr/lib/debug.bridge/busybox tr '\0' '\n' < /proc/1/environ | /usr/lib/debug.bridge/busybox xargs -I{} echo 'export "{}"')
 EOF
 . /tmp/lzcapp_env.sh