@lazycatcloud/lzc-cli 1.2.14 → 1.2.16

package/lib/app/lpk_create.js

@@ -71,16 +71,22 @@ export class LpkManifest {
 
   async askLpkInfo() {
     const noEmpty = (value) => value != "";
+    const smartAppId = `cloud.lazycat.app.${this.defaultAppID}`;
+    const getAppName = (answers) => {
+      const fields = answers["package"].split(".");
+      return fields[fields.length - 1];
+    };
     return await inquirer.prompt([
       {
         type: "input",
         name: "package",
-        message: "请输入应用ID, 如 cloud.lazycat.app.video",
+        message: `请输入应用ID, 如 ${smartAppId}`,
+        default: smartAppId,
         validate: (input) => {
           if (isValidPackageName(input)) {
             return true;
           } else {
-            return "应用ID错误，请输入正确的格式, 如 cloud.lazycat.app.video";
+            return `应用ID错误，请输入正确的格式, 如 ${smartAppId}`;
           }
         },
       },
@@ -95,9 +101,7 @@ export class LpkManifest {
         type: "input",
         name: "subdomain",
         message: "请输入应用子域名",
-        default: (answers) => {
-          return answers["package"].trim();
-        },
+        default: getAppName,
         validate: (input) => {
           if (!/^([a-z]|[0-9]|[\-])+$/.test(input)) {
             return "应用名称只能包含(减号，小写字母，数字)，请重新输入";
@@ -109,10 +113,7 @@ export class LpkManifest {
         type: "input",
         name: "name",
         message: "请输入应用名称",
-        default: (answers) => {
-          const p = answers["package"];
-          return `${p}-懒猫云`;
-        },
+        default: getAppName,
         validate: noEmpty,
       },
       {

package/lib/app/lpk_devshell.js

@@ -353,7 +353,7 @@ export class AppDevShell {
       logger.debug("use default lzc-cli/devshell image");
       manifest["application"][
         "image"
-      ] = `registry.lazycat.cloud/lzc-cli/devshell:latest`;
+      ] = `registry.lazycat.cloud/lzc-cli/devshell:v0.0.5`;
       return manifest;
     });
 
@@ -420,7 +420,7 @@ class DevShell {
     // 检查rsync工具是否存在:提示用户
     const rsyncExisted = commandExists.sync("rsync");
     if (!rsyncExisted) {
-      console.log(chalk.red("请检查 rsync 是否安装，路径是否正确!"));
+      logger.error("请检查 rsync 是否安装，路径是否正确!");
       process.exit(1);
     }
 

package/lib/appstore/login.js

@@ -83,6 +83,17 @@ async function askUserInfo() {
   ]);
 }
 
+async function interactiveLogin() {
+  try {
+    let info = await askUserInfo();
+    await login(info.username, info.password);
+  } catch (e) {
+    logger.debug("login error: ", e);
+    logger.info("帐号或者密码错误，请重新输入!");
+    return interactiveLogin();
+  }
+}
+
 export async function reLogin() {
   let token = await isLogin();
   if (token) {
@@ -100,9 +111,7 @@ export async function reLogin() {
       return;
     }
   }
-
-  let info = await askUserInfo();
-  await login(info.username, info.password);
+  await interactiveLogin();
 }
 
 export async function autoLogin() {
@@ -113,8 +122,7 @@ export async function autoLogin() {
   }
 
   logger.debug("token错误，尝试自动登录");
-  let info = await askUserInfo();
-  await login(info.username, info.password);
+  await interactiveLogin();
 }
 
 export async function request(url, options = {}) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lazycatcloud/lzc-cli",
-  "version": "1.2.14",
+  "version": "1.2.16",
   "description": "lazycat cloud developer kit",
   "files": [
     "template",

package/template/_lpk/devshell/Dockerfile

@@ -2,17 +2,5 @@ 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 \
+RUN apk add --no-cache openssh musl-dev openssl curl 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

@@ -1,5 +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
+VERSION=0.0.5
+docker build -f Dockerfile . -t registry.lazycat.cloud/lzc-cli/devshell:v$VERSION
+docker push registry.lazycat.cloud/lzc-cli/devshell:v$VERSION

package/template/_lpk/vue.lzc-build.yml.in

@@ -21,7 +21,7 @@ icon: ./lazycat.png
 # devshell 自定义应用的开发容器环境
 # - routers 指定应用容器的访问路由
 
-# devshell 没有指定 image 的情况，将会默认使用 registry.lazycat.cloud/lzc-cli/devshell:latest
+# devshell 没有指定 image 的情况，将会默认使用 registry.lazycat.cloud/lzc-cli/devshell:v0.0.5
 # devshell:
 #   routers:
 #     - /=http://127.0.0.1:8080

package/template/golang/lzc-build.yml

@@ -21,7 +21,7 @@ icon: ./lazycat.png
 # devshell 自定义应用的开发容器环境
 # - routers 指定应用容器的访问路由
 
-# devshell 没有指定 image 的情况，将会默认使用 registry.lazycat.cloud/lzc-cli/devshell:latest
+# devshell 没有指定 image 的情况，将会默认使用 registry.lazycat.cloud/lzc-cli/devshell:v0.0.5
 # devshell:
 #   routers:
 #     - /=http://127.0.0.1:8080

package/template/ionic_vue3/lzc-build.yml

@@ -21,7 +21,7 @@ icon: ./lazycat.png
 # devshell 自定义应用的开发容器环境
 # - routers 指定应用容器的访问路由
 
-# devshell 没有指定 image 的情况，将会默认使用 registry.lazycat.cloud/lzc-cli/devshell:latest
+# devshell 没有指定 image 的情况，将会默认使用 registry.lazycat.cloud/lzc-cli/devshell:v0.0.5
 # devshell:
 #   routers:
 #     - /=http://127.0.0.1:8080

package/template/lite/lzc-build.yml

@@ -17,11 +17,10 @@ pkgout: ./
 # icon 指定 lpk 包 icon 的路径路径，如果不指定将会警告
 # icon 仅仅允许 png 后缀的文件
 icon: ./lazycat.png
-
 # devshell 自定义应用的开发容器环境
 # - routers 指定应用容器的访问路由
 
-# devshell 没有指定 image 的情况，将会默认使用 registry.lazycat.cloud/lzc-cli/devshell:latest
+# devshell 没有指定 image 的情况，将会默认使用 registry.lazycat.cloud/lzc-cli/devshell:v0.0.5
 # devshell:
 #   routers:
 #     - /=http://127.0.0.1:8080

package/template/_lpk/devshell/entrypoint.sh

@@ -1,8 +0,0 @@
-#!/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

@@ -1,117 +0,0 @@
-#       $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