@lazycatcloud/lzc-cli 1.1.3 → 1.1.6

package/template/ionic_vue3/vite.config.ts

@@ -23,6 +23,6 @@ export default defineConfig({
     },
   },
   server: {
-    port: 8080,
+    port: 3000,
   },
 })

package/template/release/golang/build.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 set -ex
-SHELLDIR="$(dirname "$(python -c "import os; print(os.path.abspath('.'))")")"
 
+SHELLDIR="$(dirname "$(readlink -f "$0")")"
 cd "$SHELLDIR"
 
 mkdir build

package/template/release/ionic_vue3/Dockerfile

@@ -7,4 +7,4 @@ COPY dist .
 EXPOSE $HTTP_SERVICE_PORT
 
 ENV HTTP_SERVICE_PORT ${HTTP_SERVICE_PORT}
-CMD /usr/bin/lzcapp --listen :$HTTP_SERVICE_PORT --www .
+CMD /usr/bin/lzcinit --listen :$HTTP_SERVICE_PORT --www .

package/template/release/ionic_vue3/build.sh

@@ -1,9 +1,7 @@
 #!/bin/sh
 set -ex
 
-
-SHELLDIR="$(dirname "$(python -c "import os; print(os.path.abspath('.'))")")"
-
+SHELLDIR="$(dirname "$(readlink -f "$0")")"
 cd "$SHELLDIR"
 
 npm run build

package/template/release/ionic_vue3/docker-compose.yml.in

@@ -1,8 +1,3 @@
 services:
   ${APP_ID}:
     image: ${APP_IMAGE_NAME}
-    volumes:
-      - lzcapis-lzcapp:/lzcapp
-
-volumes:
-  lzcapis-lzcapp:

package/template/release/vue/Dockerfile

@@ -7,4 +7,4 @@ COPY dist .
 EXPOSE $HTTP_SERVICE_PORT
 
 ENV HTTP_SERVICE_PORT ${HTTP_SERVICE_PORT}
-CMD /usr/bin/lzcapp --listen :$HTTP_SERVICE_PORT --www .
+CMD /usr/bin/lzcinit -listen :$HTTP_SERVICE_PORT -up /="file://./"

package/template/release/vue/build.sh

@@ -2,9 +2,8 @@
 set -ex
 
 
-SHELLDIR="$(dirname "$(python -c "import os; print(os.path.abspath('.'))")")"
-
-# cd "$SHELLDIR"
+SHELLDIR="$(dirname "$(readlink -f "$0")")"
+cd "$SHELLDIR"
 
 ## 该文件运行时路径为 .lazycat 对应的目录
 

package/template/release/vue/docker-compose.yml.in

@@ -1,8 +1,3 @@
 services:
   ${APP_ID}:
     image: ${APP_IMAGE_NAME}
-    volumes:
-      - lzcapis-lzcapp:/lzcapp
-
-volumes:
-  lzcapis-lzcapp:

package/template/vue/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

package/template/vue/src/main.js

@@ -3,17 +3,6 @@ import App from "./App.vue";
 
 Vue.config.productionTip = false;
 
-import LZC from "./lzc.js";
-const lzc = new LZC();
-Vue.use(lzc, { webdav: true });
-
-lzc
-  .autoLogin()
-  .then(() => {
-    new Vue({
-      render: (h) => h(App),
-    }).$mount("#app");
-  })
-  .catch((e) => {
-    console.error(e);
-  });
+new Vue({
+  render: (h) => h(App),
+}).$mount("#app");

package/template/vue/vue.config.js

@@ -1,3 +1,19 @@
+const nodeVersions = process.versions.node.split(".");
+if (
+  nodeVersions[0] >= 17 &&
+    process.env["NODE_OPTIONS"] &&
+    process.env["NODE_OPTIONS"].search(/--openssl-legacy-provider/) == -1
+) {
+  console.warn(`
+当前 nodejs 版本为 ${process.version}
+
+nodejs 17.0.0 后的版本由于使用的 openssl 3.0 的原因。需要使用设置
+    export NODE_OPTIONS=--openssl-legacy-provider
+
+推荐使用 vue3 进行开发。
+`);
+}
+
 module.exports = {
   devServer: {
     historyApiFallback: true,

package/scripts/auto-completion.sh

@@ -1,46 +0,0 @@
-# Forked from https://github.com/isaacs/npm/blob/v1.3.17/lib/utils/completion.sh
-# Forked from https://github.com/twolfson/foundry/blob/4.3.3/bin/completion/foundry
-#!/bin/bash
-###-begin-lzc-cli-completion-###
-#
-# foundry command completion script
-#
-# Installation: lzc-cli completion >> ~/.bashrc  (or ~/.zshrc)
-# Or, maybe: lzc-cli completion > /usr/local/etc/bash_completion.d/lzc-cli
-#
-
-COMP_WORDBREAKS=${COMP_WORDBREAKS/=/}
-COMP_WORDBREAKS=${COMP_WORDBREAKS/@/}
-export COMP_WORDBREAKS
-
-if type complete &>/dev/null; then
-  _lzc_cli_completion () {
-    local si="$IFS"
-    IFS=$'\n' COMPREPLY=($(COMP_CWORD="$COMP_CWORD" \
-                           COMP_LINE="$COMP_LINE" \
-                           COMP_POINT="$COMP_POINT" \
-                           lzc-cli completion -- "${COMP_WORDS[@]}" \
-                           2>/dev/null)) || return $?
-    IFS="$si"
-  }
-  complete -F _lzc_cli_completion lzc-cli
-# DEV: We removed `compdef` due to issues with `zsh` (zsh 5.0.0 (x86_64-unknown-linux-gnu))
-elif type compctl &>/dev/null; then
-  _lzc_cli_completion () {
-    local cword line point words si
-    read -Ac words
-    read -cn cword
-    let cword-=1
-    read -l line
-    read -ln point
-    si="$IFS"
-    IFS=$'\n' reply=($(COMP_CWORD="$cword" \
-                       COMP_LINE="$line" \
-                       COMP_POINT="$point" \
-                       lzc-cli completion -- "${words[@]}" \
-                       2>/dev/null)) || return $?
-    IFS="$si"
-  }
-  compctl -K _lzc_cli_completion lzc-cli
-fi
-###-end-lzc-cli-completion-###

package/template/_lazycat/debug/shell/nginx.conf.template

@@ -1,64 +0,0 @@
-# need to use root permission to connect unix socket
-user  root;
-worker_processes  1;
-
-error_log  /var/log/nginx/error.log info;
-pid        /var/run/nginx.pid;
-
-events {
-    worker_connections  1024;
-}
-
-stream {
-    upstream tunnel {
-      server ${APP_DEBUG_SHELL}:22;
-    }
-    server {
-        listen [::]:22 ipv6only=on;
-        proxy_pass tunnel;
-    }
-}
-
-
-http {
-    log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
-                      '$status $body_bytes_sent "$http_referer" '
-                      '"$http_user_agent" "$http_x_forwarded_for"';
-
-    access_log  /var/log/nginx/access.log  main;
-
-    sendfile        on;
-    #tcp_nopush     on;
-
-    keepalive_timeout  65;
-
-    map $http_upgrade $connection_upgrade {
-        default upgrade;
-        '' close;
-    }
-
-    #gzip  on;
-
-    server {
-        listen *:${APP_DEBUG_PORT};
-
-        error_page 502 503 504 /50x.html;
-
-        large_client_header_buffers 4 32k;
-
-        location = /50x.html {
-            root /etc/nginx;
-            internal;
-        }
-
-        location / {
-            proxy_pass  http://${APP_DEBUG_SHELL}:${APP_DEBUG_PORT}/;
-            proxy_set_header    Host               localhost;
-            proxy_set_header    X-Real-IP          $remote_addr;
-            proxy_set_header    X-Forwarded-For    $proxy_add_x_forwarded_for;
-            proxy_set_header    Upgrade            $http_upgrade;
-            proxy_set_header    Connection         $connection_upgrade;
-            proxy_next_upstream error timeout invalid_header http_502 http_503 http_504;
-        }
-    }
-}

package/template/vue/src/lzc.js

@@ -1,110 +0,0 @@
-// lzcapis 提供以下api
-// - lzcapis/profile
-// - lzcapis/fs
-// - lzcapis/login
-
-import { createClient } from "webdav";
-
-function statusText(res) {
-  return `Status Code: ${res.status}, Error: ${res.statusText}`;
-}
-
-function getCookie(cname) {
-  let name = cname + "=";
-  let decodedCookie = decodeURIComponent(document.cookie);
-  let ca = decodedCookie.split(";");
-  for (let i = 0; i < ca.length; i++) {
-    let c = ca[i];
-    while (c.charAt(0) == " ") {
-      c = c.substring(1);
-    }
-    if (c.indexOf(name) == 0) {
-      return c.substring(name.length, c.length);
-    }
-  }
-  return "";
-}
-
-class LZC {
-  constructor() {
-    this.api = window.location.origin + "/lzcapis";
-    this.user = undefined;
-    this.fs = undefined;
-  }
-
-  // vue plugin interface
-  install(vue, { webdav } = {}) {
-    if (webdav) {
-      this.fs = createClient(this.fsAPI(), {});
-    }
-
-    vue.prototype.$lzc = this;
-  }
-
-  fsAPI() {
-    return this.api + "/fs";
-  }
-
-  profileAPI() {
-    return this.api + "/profile";
-  }
-
-  async getProfile() {
-    let res = await fetch(this.profileAPI());
-    if (res.status === 200) {
-      let userInfo = await res.json();
-
-      this.user = userInfo;
-      return userInfo;
-    } else {
-      throw statusText(res);
-    }
-  }
-
-  loginAPI(redirect) {
-    if (!redirect) {
-      redirect = window.location.origin;
-    }
-    return this.api + "/login" + "?redirect=" + redirect;
-  }
-
-  // if lzcapis-session already exist, will auto login
-  // else will redirect to the lzcapis auth page.
-  async autoLogin() {
-    try {
-      let cs = getCookie("lzcapis-session");
-      if (cs) {
-        let profile = await this.getProfile();
-        return profile;
-      }
-    } catch (e) {
-      console.error(e);
-    }
-  }
-
-  login(redirect) {
-    window.location.replace(this.loginAPI(redirect));
-  }
-
-  logoutAPI(redirect) {
-    if (!redirect) {
-      redirect = window.location.href;
-    }
-    return this.api + "/logout" + "?redirect_uri=" + redirect;
-  }
-
-  async logout() {
-    let res = await fetch(this.logoutAPI(), { mode: "no-cors" });
-    if (res.status === 200) {
-      return Promise.resolve();
-    } else {
-      throw statusText(res);
-    }
-  }
-
-  isLogged() {
-    return !!this.user;
-  }
-}
-
-export default LZC;