@lazycatcloud/lzc-cli 1.1.7 → 1.1.9

package/scripts/cli.js

@@ -7,13 +7,14 @@ 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 { contextDirname } 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";
 const pkgInfo = JSON.parse(
   fs.readFileSync(path.join(contextDirname(import.meta.url), "../package.json"))
 );
+import env from "../lib/env.js";
 
 // logger level middleware
 const logLevelOriginalFactory = logger.methodFactory;
@@ -38,8 +39,9 @@ logger.methodFactory = function (methodName, logLevel, loggerName) {
         color = chalk.bold.red;
         break;
     }
+    const prefix = loggerName ?? methodName;
     rawMethod(
-      `[${methodName}] ` +
+      `[${prefix}] ` +
         args
           .map((a) => {
             let res = a;
@@ -73,150 +75,26 @@ const program = yargs(hideBin(process.argv))
   })
   .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: false,
-  aliases: ["c"],
-  handler: async ({ name }) => {
-    let create = await importDefault("../cmds/create.js");
-    await create({ name });
-  },
-});
-
-program.command({
-  command: "init",
-  desc: false,
-  handler: async () => {
-    const { Init } = await import("../cmds/init.js");
-    new Init({ cwd: process.cwd() }).create();
-  },
-});
-
-program.command({
-  command: "uninstall",
-  desc: false,
-  handler: async () => {
-    const { uninstall } = await importDefault("../cmds/app.js");
-    await uninstall();
-  },
-});
-
-program.command({
-  command: "publish",
-  desc: false,
-  handler: async () => {
-    // 第一步 打包镜像
-    const Publisher = await importDefault("../cmds/publish.js");
-    const publisher = new Publisher();
-    await publisher.run();
-    // const b = builder();
-    // const contextDir = process.cwd()
-    // const dockerfile = Env.get("BUILD_CONTEXT")
-    // b.dockerRemoteBuildV2()
-    // 第二步
-  },
-});
-
-program.command({
-  command: "deploy",
-  desc: false,
-  handler: async () => {
-    const { deploy } = await importDefault("../cmds/app.js");
-    await deploy();
-  },
-});
-
-program.command({
-  command: "build [context]",
-  desc: false,
-  builder: (args) => {
-    args.option("f", {
-      alias: "file",
-      describe: "Dockerfile",
-      default: "Dockerfile",
-    });
-  },
-  handler: async ({ context, file }) => {
-    const Builder = await importDefault("../lib/builder.js");
-    Env.load(process.cwd());
-    const b = new Builder({ env: Env.all });
-    b.dockerRemoteBuildV2(context, file);
-  },
-});
-
-let devSubCommands = [
-  {
-    command: "forward [addr]",
-    desc: "本地端口转发",
-    handler: async ({ addr }) => {
-      const { dev } = await importDefault("../cmds/dev.js");
-      await dev(addr);
-    },
-  },
-  {
-    command: "shell",
-    desc: "远程连接盒子",
-    builder: (args) => {
-      args.option("b", {
-        alias: "build",
-        desc: "重新部署应用",
-        type: "boolean",
-      });
-    },
-    handler: async (args) => {
-      const { devShell } = await importDefault("../cmds/dev.js");
-      await devShell(args);
-    },
-  },
-];
-program.command({
-  command: "dev",
-  desc: false,
-  builder: (args) => {
-    args.command(devSubCommands);
-  },
-});
-
-program.command({
-  command: "log [project]",
-  desc: false,
-  builder: (args) => {
-    args.option("u", {
-      alias: "user",
-      describe: "多实例对应的用户",
-      demandOption: false,
-      type: "string",
-    });
-  },
-  handler: async (args) => {
-    const { monitor } = await importDefault("../cmds/log.js");
-    await monitor(args.project, args);
-  },
-});
-
 program.command({
   command: "config [key] [value]",
   desc: false,
   builder: (args) => {
     args.implies("key", "value");
-    args.option("g", {
-      alias: "global",
-      describe: "global config",
-      type: "boolean",
-      default: false,
-    });
   },
-  handler: async (args) => {
-    const { config } = await importDefault("../cmds/config.js");
-    await config([args.key, args.value, args]);
+  handler: async ({ key, value }) => {
+    if (!key && !value) {
+      console.log(env.stringify());
+      return;
+    }
+    const pair = Object.fromEntries([[key, value]]);
+    env.set(pair, true);
   },
 });
 
 boxCommand(program);
 lpkAppCommand(program);
 lpkProjectCommand(program);
+appstoreCommand(program);
 
 const parser = program
   .strict()
@@ -232,6 +110,7 @@ const parser = program
       case "box":
       case "app":
       case "project":
+      case "appstore":
         program.showHelp();
         return;
     }

package/template/_lpk/README.md

@@ -0,0 +1,31 @@
+
+# 懒猫云应用
+
+## 构建
+```
+lzc-cli project build -o you-awesome.lpk
+```
+将会在当前的目录下构建出一个 lpk 包。
+
+## 安装
+```
+lzc-cli app install you-awesome.lpk
+```
+
+## 开发
+```
+lzc-cli project devshell -b
+```
+
+## 成为懒猫云应用开发者
+在 https://developer.lazycat.cloud/ 注册一个开发者帐号，注册开发者帐号后，你可以申请自己的应用，并发布到[商店](https://appstore.lazycat.cloud/)中。
+
+## 使用 lzc-cli 发布应用
+在你申请应用成功后，后面的应用升级可以直接通过 `lzc-cli` 进行发布
+`lzc-cli appstore publish <lpk包地址>`
+
+# 查看发布的应用
+发布成功后，你可以在 https://appstore.lazycat.cloud/#/shop 中查看你的应用。
+
+## 交流和帮助
+你可以在 https://bbs.lazycat.cloud/ 畅所欲言。

package/template/_lpk/exec.sh

@@ -0,0 +1,19 @@
+#!/bin/sh
+
+# 执行 setupscript 脚本
+SETUPSCRIPT=/lzcapp/pkg/content/devshell/setupscript
+if [ -f $SETUPSCRIPT ];then
+    . $SETUPSCRIPT
+fi
+
+set -e
+
+# 切换目录
+cd /lzcapp/cache/devshell
+if command -v $SHELL &> /dev/null
+then
+    exec $SHELL
+else
+    echo "$SHELL 不存在，执行默认的 /bin/sh"
+    exec /bin/sh
+fi

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

@@ -0,0 +1,16 @@
+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

@@ -0,0 +1,19 @@
+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://www.linakesi.com
+  handlers:
+    error_page_templates:
+      502: /lzcapp/pkg/content/502.html.tpl

package/template/_lpk/local_devshell/Dockerfile

@@ -0,0 +1,16 @@
+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 openssh openssl inotify-tools curl tzdata \
+  && echo "root:root" | chpasswd
+
+COPY sshd_config /etc/ssh/sshd_config
+COPY entrypoint.sh /entrypoint.sh
+
+RUN cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \
+    echo "Asia/Shanghai" > /etc/timezone && \
+    date && \
+    chmod +x /entrypoint.sh
+
+CMD ["./entrypoint.sh"]

package/template/_lpk/local_devshell/build.sh

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

package/template/_lpk/local_devshell/entrypoint.sh

@@ -0,0 +1,87 @@
+#!/bin/sh
+set -e
+
+ssh-keygen -A
+
+free_port(){
+    # $1 最小端口
+    local port="$1"
+    port="${port:-8192}"
+    local ports
+    ports="$(cut -c 16-19 /proc/net/tcp)"
+    while echo "$ports" | grep -q "$(printf '%.4X' "$port")"; do
+        port=$((port+1))
+    done
+    echo $port
+}
+local_ssh_port="$(free_port 22812)"
+
+# do not detach (-D), log to stderr (-e), passthrough other arguments
+/usr/sbin/sshd -e -p $local_ssh_port
+
+OPTIONS="-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o ConnectionAttempts=3 -o ConnectTimeout=30 -o ServerAliveInterval=5"
+
+# 生成key
+cat >/tmp/prepare.sh <<EOF
+#!/bin/sh
+mkdir -p /tmp/$PKGID/.ssh
+
+if [ ! -f /tmp/$PKGID/.ssh/id_ed25519 ]; then
+   ssh-keygen -t ed25519 -f /tmp/$PKGID/.ssh/id_ed25519 -P ""
+fi
+EOF
+ssh $OPTIONS -p $SDK_PORT -i /sdk/privateKey $SDK_HOST "$(cat /tmp/prepare.sh)"
+
+# 复制生成的 key 到本地的 devshell 容器中
+scp -O -i /sdk/privateKey -P $SDK_PORT $OPTIONS $SDK_HOST:/tmp/$PKGID/.ssh/id_ed25519.pub /tmp/id_ed25519.pub
+# 输出到本地 devshell 容器中的 authorized_keys 中
+mkdir -p /root/.ssh
+cat /tmp/id_ed25519.pub >> /root/.ssh/authorized_keys
+
+
+# 生成 ssh port
+cat >/tmp/sdk_port.sh <<\EOF
+#!/bin/sh
+free_port(){
+    # $1 最小端口
+    local port="$1"
+    port="${port:-8192}"
+    local ports
+    ports="$(cut -c 16-19 /proc/net/tcp)"
+    while echo "$ports" | grep -q "$(printf '%.4X' "$port")"; do
+        port=$((port+1))
+    done
+    echo $port
+}
+echo "ssh_port:$(free_port 12282)"
+EOF
+ssh_port=$(ssh $OPTIONS -p $SDK_PORT -i /sdk/privateKey $SDK_HOST "$(cat /tmp/sdk_port.sh)" 2>&1 |\
+               grep ssh_port | awk -F: '{ print $2 }')
+echo "ssh port: $ssh_port"
+
+# inotify script
+cat >/tmp/inotify.sh <<EOF
+#!/bin/sh
+cd /project
+while [ -d /project/$PKGID ]
+do
+  cd /project/$PKGID
+  inotifywait -q -m -r -e "modify,move,create,delete" --timefmt "%Y-%m-%d %X" --format "%T,%:e,%w%f,$PKGID" .
+done
+EOF
+chmod +x /tmp/inotify.sh
+
+# 反代本地的 $local_ssh_port 端口到 sdk 容器中的端口 ssh_port
+cat >/tmp/sshfs.sh <<EOF
+#!/bin/sh
+set -ex
+
+mkdir -p /var/lib/box-server/lzcapps/$PKGID/lzcapp/cache/devshell
+
+sshfs -v root@localhost:/project/$PKGID /var/lib/box-server/lzcapps/$PKGID/lzcapp/cache/devshell -o allow_other,default_permissions -o direct_io -o dir_cache=no -o IdentityFile=/tmp/$PKGID/.ssh/id_ed25519 -o auto_unmount $OPTIONS -p $ssh_port -o uid=$HOSTUID -o gid=$HOSTGID
+
+echo "sshfs running"
+ssh root@localhost $OPTIONS -p $ssh_port -i /tmp/$PKGID/.ssh/id_ed25519 sh -c '/tmp/inotify.sh' | /lzc-cli-backend -inotify
+EOF
+
+exec ssh -R 127.0.0.1:$ssh_port:127.0.0.1:$local_ssh_port -p $SDK_PORT $OPTIONS -i /sdk/privateKey $SDK_HOST "$(cat /tmp/sshfs.sh)"

package/template/{_lazycat/debug/shell → _lpk/local_devshell}/sshd_config

@@ -10,9 +10,9 @@
 # possible, but leave them commented.  Uncommented options override the
 # default value.
 
-#Port 22
+# Port 22456
 #AddressFamily any
-#ListenAddress 0.0.0.0
+ListenAddress 127.0.0.1
 #ListenAddress ::
 
 #HostKey /etc/ssh/ssh_host_rsa_key
@@ -49,9 +49,9 @@ AuthorizedKeysFile      .ssh/authorized_keys
 #HostbasedAuthentication no
 # Change to yes if you don't trust ~/.ssh/known_hosts for
 # HostbasedAuthentication
-#IgnoreUserKnownHosts no
+IgnoreUserKnownHosts yes
 # Don't read the user's ~/.rhosts and ~/.shosts files
-#IgnoreRhosts yes
+IgnoreRhosts yes
 
 # To disable tunneled clear text passwords, change to no here!
 PasswordAuthentication no
@@ -79,9 +79,9 @@ PermitEmptyPasswords no
 # 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
+# UsePAM no
 
-#AllowAgentForwarding yes
+AllowAgentForwarding yes
 # Feel free to re-enable these if your use case requires them.
 AllowTcpForwarding yes
 GatewayPorts yes
@@ -94,8 +94,8 @@ X11Forwarding no
 #TCPKeepAlive yes
 #PermitUserEnvironment no
 #Compression delayed
-ClientAliveInterval 3
-ClientAliveCountMax 0
+ClientAliveInterval 5
+ClientAliveCountMax 3
 #UseDNS no
 #PidFile /run/sshd.pid
 #MaxStartups 10:30:100

package/template/_lpk/manifest.yml.in

@@ -4,7 +4,6 @@ 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时候提交反馈的地方

package/template/{vue/lzc-build.yml → _lpk/vue.lzc-build.yml.in}

@@ -6,7 +6,7 @@
 buildscript: npm run build
 
 # manifest: 指定 lpk 包的 manifest.yml 文件路径
-manifest: ./manifest.yml
+# manifest: ./lzc-manifest.yml
 
 # contentdir: 指定打包的内容，将会打包到 lpk 中
 contentdir: ./dist
@@ -51,3 +51,11 @@ devshell:
     - nodejs
     - vim
     - npm
+  # setupscript 每次进入到app container后都会执行的配置脚本
+  # - 可以为脚本的路径地址
+  # - 如果构建命令简单，也可以直接写 sh 的命令
+  # setupscript: export GOPROXY=https://goproxy.cn
+  # setupscript: ./setupscript.sh
+  setupscript: |
+    export GOPROXY=https://goproxy.cn
+    export npm_config_registry=https://registry.npmmirror.com

package/template/golang/README.md

@@ -4,8 +4,6 @@ Rego is an online Go regular expression tester
 
 Inspired by [rubular](http://rubular.com/).
 
-It's currently deployed on Heroku at [http://regoio.herokuapp.com/](http://regoio.herokuapp.com/)
-
 ## TODO
 
 - Sharing (permalink)

package/template/golang/_gitignore

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

package/template/golang/build.sh

@@ -1,6 +1,12 @@
 #!/usr/bin/sh
 
+set -e
+
 go mod tidy
 
+go test -v
+
 mkdir -p build
 CGO_ENABLED=0 go build -o build/rego
+
+cp index.html build/

package/template/golang/lzc-build.yml

@@ -6,7 +6,7 @@
 buildscript: ./build.sh
 
 # manifest: 指定 lpk 包的 manifest.yml 文件路径
-manifest: ./manifest.yml
+# manifest: ./lzc-manifest.yml
 
 # contentdir: 指定打包的内容，将会打包到 lpk 中
 contentdir: ./build
@@ -50,3 +50,11 @@ devshell:
   dependencies:
     - go
     - vim
+  # setupscript 每次进入到app container后都会执行的配置脚本
+  # - 可以为脚本的路径地址
+  # - 如果构建命令简单，也可以直接写 sh 的命令
+  # setupscript: export GOPROXY=https://goproxy.cn
+  # setupscript: ./setupscript.sh
+  setupscript: |
+    export GOPROXY=https://goproxy.cn
+    export npm_config_registry=https://registry.npmmirror.com

package/template/golang/rego.go

@@ -2,11 +2,11 @@ package main
 
 import (
 	"encoding/json"
+	"flag"
 	"fmt"
 	"html/template"
 	"log"
 	"net/http"
-	"os"
 	"regexp"
 	"strconv"
 )
@@ -16,11 +16,6 @@ type MatchResultResponse struct {
 	GroupsName []string   `json:"groupsName"`
 }
 
-func handler(rw http.ResponseWriter, req *http.Request) {
-	t, _ := template.ParseFiles("index.html")
-	t.Execute(rw, nil)
-}
-
 func regExpHandler(rw http.ResponseWriter, req *http.Request) {
 	var matches [][]string
 
@@ -34,7 +29,6 @@ func regExpHandler(rw http.ResponseWriter, req *http.Request) {
 	log.Printf("Find all : %t", findAllSubmatch)
 
 	m := &MatchResultResponse{}
-
 	r, err := regexp.Compile(regexpString)
 	if err != nil {
 		log.Printf("Invalid RegExp : %s \n", regexpString)
@@ -61,23 +55,28 @@ func regExpHandler(rw http.ResponseWriter, req *http.Request) {
 }
 
 func main() {
+	indexHtml := flag.String("html", "index.html", "The html template file.")
+	port := flag.String("port", "3000", "The http port.")
+	flag.Parse()
+
 	// Main handler (index.html)
-	http.HandleFunc("/", handler)
+	http.HandleFunc("/", func(rw http.ResponseWriter, req *http.Request) {
+		t, err := template.ParseFiles(*indexHtml)
+		if err != nil {
+			log.Fatal(err)
+		}
+		t.Execute(rw, nil)
+	})
+
 	// Regex testing service
 	http.HandleFunc("/test_regexp/", regExpHandler)
 	// Static file serving
 	http.Handle("/assets/", http.StripPrefix("/assets/", http.FileServer(http.Dir("assets"))))
 
-	port := os.Getenv("PORT")
-	if port == "" {
-		port = "3000"
-	}
-
 	// Launch server
-        log.Printf("server listen to %s \n", ":"+port)
-	err := http.ListenAndServe(":"+port, nil)
+	log.Printf("server listen to %s \n", ":"+*port)
+	err := http.ListenAndServe(":"+*port, nil)
 	if err != nil {
 		log.Fatal(err)
 	}
-
 }

package/template/golang/rego_test.go

@@ -0,0 +1,13 @@
+package main
+
+import (
+	"html/template"
+	"testing"
+)
+
+func TestParse(t *testing.T) {
+	_, err := template.ParseFiles("index.html")
+	if err != nil {
+		panic(err)
+	}
+}

package/template/ionic_vue3/lzc-build.yml

@@ -6,7 +6,7 @@
 buildscript: npm run build
 
 # manifest: 指定 lpk 包的 manifest.yml 文件路径
-manifest: ./manifest.yml
+# manifest: ./lzc-manifest.yml
 
 # contentdir: 指定打包的内容，将会打包到 lpk 中
 contentdir: ./dist
@@ -51,3 +51,11 @@ devshell:
     - nodejs
     - vim
     - npm
+  # setupscript 每次进入到app container后都会执行的配置脚本
+  # - 可以为脚本的路径地址
+  # - 如果构建命令简单，也可以直接写 sh 的命令
+  # setupscript: export GOPROXY=https://goproxy.cn
+  # setupscript: ./setupscript.sh
+  setupscript: |
+    export GOPROXY=https://goproxy.cn
+    export npm_config_registry=https://registry.npmmirror.com

package/template/lite/error_pages/502.html.tpl

@@ -0,0 +1,13 @@
+<html>
+  <body>
+    <h1>
+你的程序无法访问了~~~~~~~~
+    </h1>
+    <p>
+原因: {{ .ErrorDetail}}
+    </p>
+    <p>
+      请稍后再试吧
+    </p>
+  </body>
+</html>