@lazycatcloud/lzc-cli 1.1.3 → 1.1.6

package/scripts/cli.js

@@ -2,25 +2,82 @@
 import process from "process";
 import path from "path";
 import fs from "fs";
-import { contextDirname, importDefault } from "../lib/utils.js";
+import logger from "loglevel";
 import yargs from "yargs";
 import { hideBin } from "yargs/helpers";
+import chalk from "chalk";
 
+import { contextDirname, importDefault } from "../lib/utils.js";
 import Env from "../lib/env.js";
 import { boxCommand } from "../lib/box/index.js";
+import { lpkAppCommand, lpkProjectCommand } from "../lib/app/index.js";
 const pkgInfo = JSON.parse(
   fs.readFileSync(path.join(contextDirname(import.meta.url), "../package.json"))
 );
 
+// logger level middleware
+const logLevelOriginalFactory = logger.methodFactory;
+logger.methodFactory = function (methodName, logLevel, loggerName) {
+  let rawMethod = logLevelOriginalFactory(methodName, logLevel, loggerName);
+  return function (...args) {
+    let color = (msg) => chalk.gray;
+    switch (methodName) {
+      case "trace":
+        color = chalk.dim.cyan;
+        break;
+      case "debug":
+        color = chalk.blue;
+        break;
+      case "info":
+        color = chalk.green;
+        break;
+      case "warn":
+        color = chalk.magenta;
+        break;
+      case "error":
+        color = chalk.bold.red;
+        break;
+    }
+    rawMethod(
+      `[${methodName}] ` +
+        args
+          .map((a) => {
+            let res = a;
+            if (typeof a == "object") {
+              res = JSON.stringify(a, undefined, 4);
+            }
+            return color(res);
+          })
+          .join(" ")
+    );
+  };
+};
+logger.setDefaultLevel("info");
+function setLoggerLevel({ log }) {
+  logger.setLevel(log, false);
+}
+
 const program = yargs(hideBin(process.argv))
   .scriptName("lzc-cli")
   .usage("<command> [options]")
   .version(`lzc-cli ${pkgInfo.version}`)
-  .completion("completion", "生成bash/zsh补全脚本");
+  .option("log", {
+    type: "string",
+    default: "info",
+    describe: "log level 'trace', 'debug', 'info', 'warn', 'error'",
+  })
+  .option("help", {
+    alias: "h",
+    type: "boolean",
+    default: false,
+  })
+  .completion("completion", false);
 
+// Set desc to false to create a hidden command. Hidden commands don’t show up
+// in the help output and aren’t available for completion.
 program.command({
   command: "create <name>",
-  desc: "创建懒猫云应用",
+  desc: false,
   aliases: ["c"],
   handler: async ({ name }) => {
     let create = await importDefault("../cmds/create.js");
@@ -30,7 +87,7 @@ program.command({
 
 program.command({
   command: "init",
-  desc: "初始化懒猫云应用配置",
+  desc: false,
   handler: async () => {
     const { Init } = await import("../cmds/init.js");
     new Init({ cwd: process.cwd() }).create();
@@ -39,7 +96,7 @@ program.command({
 
 program.command({
   command: "uninstall",
-  desc: "卸载应用",
+  desc: false,
   handler: async () => {
     const { uninstall } = await importDefault("../cmds/app.js");
     await uninstall();
@@ -48,7 +105,7 @@ program.command({
 
 program.command({
   command: "publish",
-  desc: "发布应用",
+  desc: false,
   handler: async () => {
     // 第一步 打包镜像
     const Publisher = await importDefault("../cmds/publish.js");
@@ -64,7 +121,7 @@ program.command({
 
 program.command({
   command: "deploy",
-  desc: "部署应用至设备",
+  desc: false,
   handler: async () => {
     const { deploy } = await importDefault("../cmds/app.js");
     await deploy();
@@ -73,7 +130,7 @@ program.command({
 
 program.command({
   command: "build [context]",
-  desc: "构建",
+  desc: false,
   builder: (args) => {
     args.option("f", {
       alias: "file",
@@ -116,7 +173,7 @@ let devSubCommands = [
 ];
 program.command({
   command: "dev",
-  desc: "dev [forward [addr] | shell]",
+  desc: false,
   builder: (args) => {
     args.command(devSubCommands);
   },
@@ -124,12 +181,12 @@ program.command({
 
 program.command({
   command: "log [project]",
-  desc: "查看应用日志",
+  desc: false,
   builder: (args) => {
     args.option("u", {
       alias: "user",
       describe: "多实例对应的用户",
-      demandOption: true,
+      demandOption: false,
       type: "string",
     });
   },
@@ -141,7 +198,7 @@ program.command({
 
 program.command({
   command: "config [key] [value]",
-  desc: "应用配置项",
+  desc: false,
   builder: (args) => {
     args.implies("key", "value");
     args.option("g", {
@@ -158,5 +215,27 @@ program.command({
 });
 
 boxCommand(program);
+lpkAppCommand(program);
+lpkProjectCommand(program);
+
+const parser = program
+  .strict()
+  .showHelpOnFail(false, "使用 lzc-cli help 查看更多帮助")
+  .middleware([setLoggerLevel])
+  .parse();
 
-program.parse();
+// 当没有参数的时候，默认显示帮助。
+(async () => {
+  const argv = await parser;
+  if (argv._.length == 1) {
+    switch (argv._[0]) {
+      case "box":
+      case "app":
+      case "project":
+        program.showHelp();
+        return;
+    }
+  } else if (argv._.length == 0) {
+    program.showHelp();
+  }
+})();

package/template/_lazycat/debug/shell/Dockerfile

@@ -1,8 +1,10 @@
-FROM node:16-alpine3.12
+FROM registry.lazycat.cloud/lzc/lzcapp:0.1
 
 RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.ustc.edu.cn/g' /etc/apk/repositories
 
-RUN apk add --no-cache openssh rsync \
+COPY --from=golang:1.18-alpine /usr/local/go/ /usr/local/go/
+
+RUN apk add --no-cache openssh rsync musl-dev curl openssl curl nodejs npm \
   && echo "root:root" | chpasswd
 
 EXPOSE 22
@@ -13,4 +15,4 @@ COPY entrypoint.sh /entrypoint.sh
 
 RUN chmod +x /entrypoint.sh
 
-ENTRYPOINT ["/entrypoint.sh"]
+ENTRYPOINT ./entrypoint.sh

package/template/_lazycat/debug/shell/docker-compose.override.yml.in

@@ -1,20 +1,10 @@
 services:
   ${APP_ID}:
-    image: nginx:1.21.4-alpine
-    volumes:
-      - ./nginx.conf.template:/etc/nginx/templates/nginx.conf.template
-      - ./50x.html:/etc/nginx/50x.html
-    environment:
-      - NGINX_ENVSUBST_OUTPUT_DIR=/etc/nginx
-      - APP_DEBUG_PORT=${HTTP_SERVICE_PORT}
-      - APP_DEBUG_SHELL=debug-shell.${APP_ID}.lzcapp
-    command: [nginx, '-g', 'daemon off;']
-    depends_on:
-      - debug-shell
-  debug-shell:
     image: ${APP_IMAGE_NAME}
     pull_policy: build
     build: .
+    environment:
+      - HTTP_SERVICE_PORT=${HTTP_SERVICE_PORT}
     volumes:
       - ./debug/ssh:/root/.ssh
       - project-data:/root/

package/template/_lazycat/debug/shell/entrypoint.sh

@@ -7,4 +7,6 @@ ssh-keygen -A
 rsync --daemon
 
 # do not detach (-D), log to stderr (-e), passthrough other arguments
-exec /usr/sbin/sshd -D -e "$@"
+/usr/sbin/sshd -e "$@"
+
+exec /usr/bin/lzcinit -listen :$HTTP_SERVICE_PORT -up /="http://127.0.0.1:3000"

package/template/_lpk/Dockerfile.in

@@ -0,0 +1,8 @@
+FROM alpine:3.16
+
+RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.ustc.edu.cn/g' /etc/apk/repositories
+
+RUN apk add --no-cache bash ${dependencies} \
+  && echo "root:root" | chpasswd
+
+CMD ["sleep", "infinity"]

package/template/_lpk/devshell/Dockerfile

@@ -0,0 +1,18 @@
+FROM alpine
+
+RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.ustc.edu.cn/g' /etc/apk/repositories
+
+COPY --from=golang:1.18-alpine /usr/local/go/ /usr/local/go/
+
+RUN apk add --no-cache openssh musl-dev curl openssl curl nodejs npm sshfs rsync \
+  && echo "root:root" | chpasswd
+
+EXPOSE 22
+
+COPY sshd_config /etc/ssh/sshd_config
+
+COPY entrypoint.sh /entrypoint.sh
+
+RUN chmod +x /entrypoint.sh
+
+CMD ["./entrypoint.sh"]

package/template/_lpk/devshell/build.sh

@@ -0,0 +1,5 @@
+#!/usr/bin/sh
+
+VERSION=0.0.4
+docker build -f Dockerfile . -t registry.lazycat.cloud/lzc-cli/devshell:$VERSION
+docker push registry.lazycat.cloud/lzc-cli/devshell:$VERSION

package/template/_lpk/devshell/entrypoint.sh

@@ -0,0 +1,8 @@
+#!/bin/sh
+set -ex
+
+# generate host keys if not present
+ssh-keygen -A
+
+# do not detach (-D), log to stderr (-e), passthrough other arguments
+exec /usr/sbin/sshd -D -e "$@"

package/template/_lpk/devshell/sshd_config

@@ -0,0 +1,117 @@
+#       $OpenBSD: sshd_config,v 1.104 2021/07/02 05:11:21 dtucker Exp $
+
+# This is the sshd server system-wide configuration file.  See
+# sshd_config(5) for more information.
+
+# This sshd was compiled with PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
+
+# The strategy used for options in the default sshd_config shipped with
+# OpenSSH is to specify options with their default value where
+# possible, but leave them commented.  Uncommented options override the
+# default value.
+
+# Port 22
+#AddressFamily any
+#ListenAddress 0.0.0.0
+#ListenAddress ::
+
+#HostKey /etc/ssh/ssh_host_rsa_key
+#HostKey /etc/ssh/ssh_host_ecdsa_key
+#HostKey /etc/ssh/ssh_host_ed25519_key
+
+# Ciphers and keying
+#RekeyLimit default none
+
+# Logging
+#SyslogFacility AUTH
+#LogLevel INFO
+
+# Authentication:
+
+#LoginGraceTime 2m
+PermitRootLogin yes
+#StrictModes yes
+#MaxAuthTries 6
+#MaxSessions 10
+
+PubkeyAuthentication yes
+
+# The default is to check both .ssh/authorized_keys and .ssh/authorized_keys2
+# but this is overridden so installations will only check .ssh/authorized_keys
+AuthorizedKeysFile      /lzcapp/pkg/content/devshell/authorized_keys
+
+#AuthorizedPrincipalsFile none
+
+#AuthorizedKeysCommand none
+#AuthorizedKeysCommandUser nobody
+
+# For this to work you will also need host keys in /etc/ssh/ssh_known_hosts
+#HostbasedAuthentication no
+# Change to yes if you don't trust ~/.ssh/known_hosts for
+# HostbasedAuthentication
+#IgnoreUserKnownHosts no
+# Don't read the user's ~/.rhosts and ~/.shosts files
+#IgnoreRhosts yes
+
+# To disable tunneled clear text passwords, change to no here!
+PasswordAuthentication no
+PermitEmptyPasswords no
+
+# Change to no to disable s/key passwords
+#KbdInteractiveAuthentication yes
+
+# Kerberos options
+#KerberosAuthentication no
+#KerberosOrLocalPasswd yes
+#KerberosTicketCleanup yes
+#KerberosGetAFSToken no
+
+# GSSAPI options
+#GSSAPIAuthentication no
+#GSSAPICleanupCredentials yes
+
+# Set this to 'yes' to enable PAM authentication, account processing,
+# and session processing. If this is enabled, PAM authentication will
+# be allowed through the KbdInteractiveAuthentication and
+# PasswordAuthentication.  Depending on your PAM configuration,
+# PAM authentication via KbdInteractiveAuthentication may bypass
+# the setting of "PermitRootLogin without-password".
+# If you just want the PAM account and session checks to run without
+# PAM authentication, then enable this but set PasswordAuthentication
+# and KbdInteractiveAuthentication to 'no'.
+#UsePAM no
+
+#AllowAgentForwarding yes
+# Feel free to re-enable these if your use case requires them.
+AllowTcpForwarding yes
+GatewayPorts yes
+X11Forwarding no
+#X11DisplayOffset 10
+#X11UseLocalhost yes
+#PermitTTY yes
+#PrintMotd yes
+#PrintLastLog yes
+#TCPKeepAlive yes
+#PermitUserEnvironment no
+#Compression delayed
+ClientAliveInterval 3
+ClientAliveCountMax 0
+#UseDNS no
+#PidFile /run/sshd.pid
+#MaxStartups 10:30:100
+#PermitTunnel no
+#ChrootDirectory none
+#VersionAddendum none
+
+# no default banner path
+#Banner none
+
+# override default of no subsystems
+Subsystem       sftp    /usr/lib/ssh/sftp-server
+
+# Example of overriding settings on a per-user basis
+#Match User anoncvs
+#       X11Forwarding no
+#       AllowTcpForwarding no
+#       PermitTTY no
+#       ForceCommand cvs server

package/template/_lpk/manifest.yml.in

@@ -0,0 +1,17 @@
+lzc-sdk-version: 0.1
+
+package: ${package}              # app的唯一标识符
+version: ${version}         # app的版本
+name: ${name}               # app名称
+description: ${description} # app描述
+icon: ./icon.svg                #必须是当前pkg内路径，会提供给启动器等地方使用
+
+license: https://choosealicense.com/licenses/mit/
+homepage: ${homepage}       # 出现bug时候提交反馈的地方
+author: ${author}           # app author
+
+#application作为一个特殊的container运行，对应的service名称为固定的`app`，其他service可以通过此名称与app进行通讯
+application:
+  subdomain: ${subdomain}  #期望的app域名
+  routes:
+    - /=file:///lzcapp/pkg/content/

package/template/_lpk/sync/Dockerfile

@@ -0,0 +1,16 @@
+FROM alpine
+
+RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.ustc.edu.cn/g' /etc/apk/repositories
+
+RUN apk add --no-cache openssh openssl sshfs rsync \
+  && echo "root:root" | chpasswd
+
+EXPOSE 22
+
+COPY sshd_config /etc/ssh/sshd_config
+
+COPY entrypoint.sh /entrypoint.sh
+
+RUN chmod +x /entrypoint.sh
+
+CMD ["./entrypoint.sh"]

package/template/_lpk/sync/build.sh

@@ -0,0 +1,5 @@
+#!/usr/bin/sh
+
+VERSION=0.0.1
+docker build -f Dockerfile . -t registry.lazycat.cloud/lzc-cli/sync:$VERSION
+docker push registry.lazycat.cloud/lzc-cli/sync:$VERSION

package/template/_lpk/sync/entrypoint.sh

@@ -0,0 +1,8 @@
+#!/bin/sh
+set -ex
+
+# generate host keys if not present
+ssh-keygen -A
+
+# do not detach (-D), log to stderr (-e), passthrough other arguments
+exec /usr/sbin/sshd -D -e "$@"

package/template/_lpk/sync/sshd_config

@@ -0,0 +1,117 @@
+#       $OpenBSD: sshd_config,v 1.104 2021/07/02 05:11:21 dtucker Exp $
+
+# This is the sshd server system-wide configuration file.  See
+# sshd_config(5) for more information.
+
+# This sshd was compiled with PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
+
+# The strategy used for options in the default sshd_config shipped with
+# OpenSSH is to specify options with their default value where
+# possible, but leave them commented.  Uncommented options override the
+# default value.
+
+# Port 22
+#AddressFamily any
+#ListenAddress 0.0.0.0
+#ListenAddress ::
+
+#HostKey /etc/ssh/ssh_host_rsa_key
+#HostKey /etc/ssh/ssh_host_ecdsa_key
+#HostKey /etc/ssh/ssh_host_ed25519_key
+
+# Ciphers and keying
+#RekeyLimit default none
+
+# Logging
+#SyslogFacility AUTH
+#LogLevel INFO
+
+# Authentication:
+
+#LoginGraceTime 2m
+PermitRootLogin yes
+#StrictModes yes
+#MaxAuthTries 6
+#MaxSessions 10
+
+PubkeyAuthentication yes
+
+# The default is to check both .ssh/authorized_keys and .ssh/authorized_keys2
+# but this is overridden so installations will only check .ssh/authorized_keys
+AuthorizedKeysFile      /lzcapp/pkg/content/devshell/authorized_keys
+
+#AuthorizedPrincipalsFile none
+
+#AuthorizedKeysCommand none
+#AuthorizedKeysCommandUser nobody
+
+# For this to work you will also need host keys in /etc/ssh/ssh_known_hosts
+#HostbasedAuthentication no
+# Change to yes if you don't trust ~/.ssh/known_hosts for
+# HostbasedAuthentication
+#IgnoreUserKnownHosts no
+# Don't read the user's ~/.rhosts and ~/.shosts files
+#IgnoreRhosts yes
+
+# To disable tunneled clear text passwords, change to no here!
+PasswordAuthentication no
+PermitEmptyPasswords no
+
+# Change to no to disable s/key passwords
+#KbdInteractiveAuthentication yes
+
+# Kerberos options
+#KerberosAuthentication no
+#KerberosOrLocalPasswd yes
+#KerberosTicketCleanup yes
+#KerberosGetAFSToken no
+
+# GSSAPI options
+#GSSAPIAuthentication no
+#GSSAPICleanupCredentials yes
+
+# Set this to 'yes' to enable PAM authentication, account processing,
+# and session processing. If this is enabled, PAM authentication will
+# be allowed through the KbdInteractiveAuthentication and
+# PasswordAuthentication.  Depending on your PAM configuration,
+# PAM authentication via KbdInteractiveAuthentication may bypass
+# the setting of "PermitRootLogin without-password".
+# If you just want the PAM account and session checks to run without
+# PAM authentication, then enable this but set PasswordAuthentication
+# and KbdInteractiveAuthentication to 'no'.
+#UsePAM no
+
+#AllowAgentForwarding yes
+# Feel free to re-enable these if your use case requires them.
+AllowTcpForwarding yes
+GatewayPorts yes
+X11Forwarding no
+#X11DisplayOffset 10
+#X11UseLocalhost yes
+#PermitTTY yes
+#PrintMotd yes
+#PrintLastLog yes
+#TCPKeepAlive yes
+#PermitUserEnvironment no
+#Compression delayed
+ClientAliveInterval 3
+ClientAliveCountMax 0
+#UseDNS no
+#PidFile /run/sshd.pid
+#MaxStartups 10:30:100
+#PermitTunnel no
+#ChrootDirectory none
+#VersionAddendum none
+
+# no default banner path
+#Banner none
+
+# override default of no subsystems
+Subsystem       sftp    /usr/lib/ssh/sftp-server
+
+# Example of overriding settings on a per-user basis
+#Match User anoncvs
+#       X11Forwarding no
+#       AllowTcpForwarding no
+#       PermitTTY no
+#       ForceCommand cvs server

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

@@ -0,0 +1,3 @@
+services:
+  sync:
+    image: registry.lazycat.cloud/lzc-cli/sync:0.0.1

package/template/golang/build.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/sh
+
+go mod tidy
+
+mkdir -p build
+CGO_ENABLED=0 go build -o build/rego

package/template/golang/lzc-build.yml

@@ -0,0 +1,52 @@
+# 整个文件中，可以通过 ${var} 的方式，使用 manifest.yml 文件中定义的值
+
+# buildscript
+# - 可以为构建脚本的路径地址
+# - 如果构建命令简单，也可以直接写 sh 的命令
+buildscript: ./build.sh
+
+# manifest: 指定 lpk 包的 manifest.yml 文件路径
+manifest: ./manifest.yml
+
+# contentdir: 指定打包的内容，将会打包到 lpk 中
+contentdir: ./build
+
+# pkgout: lpk 包的输出路径
+pkgout: ./
+
+# icon 指定 lpk 包 icon 的路径路径，如果不指定将会警告
+# icon 仅仅允许 png 后缀的文件
+icon: ./lazycat.png
+
+# devshell 自定义应用的开发容器环境
+# - routers 指定应用容器的访问路由
+
+# devshell 没有指定 image 的情况，将会默认使用 registry.lazycat.cloud/lzc-cli/devshell:latest
+# 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:0.0.4
+
+# devshell 指定构建Dockerfile
+# image 字段如果没有定义，将默认使用 ${package}-devshell:${version}
+# devshell:
+#   routes:
+#     - /=http://127.0.0.1:3000
+#   image: ${package}-devshell:${version}
+#   pull_policy: build
+#   build: .
+
+# dvshell 指定开发依赖的情况
+# 这种情况下，选用 apline:3.16 作为基础镜像，在 dependencies 中添加所需要的开发依赖即可
+# 如果 dependencies 和 build 同时存在，将会优先使用 dependencies
+devshell:
+  routes:
+    - /=http://127.0.0.1:3000
+  dependencies:
+    - go
+    - vim

package/template/ionic_vue3/lzc-build.yml

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