@ao_zorin/zocket 1.1.0 → 1.3.0

package/scripts/install-zocket.sh

@@ -4,34 +4,34 @@ set -euo pipefail
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 REPO_ROOT="$(cd "${SCRIPT_DIR}/.." && pwd)"
 
-SOURCE_MODE="${SOURCE_MODE:-auto}"         # auto|local|git|pypi
-REPO_URL="${REPO_URL:-https://github.com/your-org/zocket.git}"
+SOURCE_MODE="${SOURCE_MODE:-auto}"         # auto|local|git|npm
+REPO_URL="${REPO_URL:-https://github.com/aozorin/zocket.git}"
 REPO_REF="${REPO_REF:-main}"
-INSTALL_ROOT="${INSTALL_ROOT:-$HOME/.local/share/zocket}"
 ZOCKET_HOME_DIR="${ZOCKET_HOME_DIR:-$HOME/.zocket}"
-LANGUAGE="${LANGUAGE:-en}"                 # en|ru
+LANGUAGE="${LANGUAGE:-en}"                 # en|ru (used by UI; config set via web)
 WEB_PORT="${WEB_PORT:-18001}"
 MCP_PORT="${MCP_PORT:-18002}"
 MCP_STREAM_PORT="${MCP_STREAM_PORT:-18003}"
-MCP_MODE="${MCP_MODE:-metadata}"           # metadata|admin
+MCP_MODE="${MCP_MODE:-admin}"              # metadata|admin
 AUTOSTART="${AUTOSTART:-user}"             # user|system|none
 SERVICE_USER="${SERVICE_USER:-zocketd}"
+WEB_ENABLED="${WEB_ENABLED:-true}"
 
 usage() {
   cat <<EOF
 Usage: $(basename "$0") [options]
 
 Options:
-  --source <auto|local|git|pypi>
+  --source <auto|local|git|npm>
   --repo-url <git-url>
   --repo-ref <branch-or-tag>
-  --install-root <path>
   --zocket-home <path>
   --lang <en|ru>
   --web-port <port>
   --mcp-port <port>
   --mcp-stream-port <port>
   --mcp-mode <metadata|admin>
+  --no-web
   --autostart <user|system|none>
   --service-user <name>
   -h, --help
@@ -45,13 +45,13 @@ while [[ $# -gt 0 ]]; do
     --source) SOURCE_MODE="$2"; shift 2 ;;
     --repo-url) REPO_URL="$2"; shift 2 ;;
     --repo-ref) REPO_REF="$2"; shift 2 ;;
-    --install-root) INSTALL_ROOT="$2"; shift 2 ;;
     --zocket-home) ZOCKET_HOME_DIR="$2"; shift 2 ;;
     --lang) LANGUAGE="$2"; shift 2 ;;
     --web-port) WEB_PORT="$2"; shift 2 ;;
     --mcp-port) MCP_PORT="$2"; shift 2 ;;
     --mcp-stream-port) MCP_STREAM_PORT="$2"; shift 2 ;;
     --mcp-mode) MCP_MODE="$2"; shift 2 ;;
+    --no-web) WEB_ENABLED="false"; shift 1 ;;
     --autostart) AUTOSTART="$2"; shift 2 ;;
     --service-user) SERVICE_USER="$2"; shift 2 ;;
     -h|--help) usage; exit 0 ;;
@@ -71,54 +71,100 @@ run_sudo() {
   fi
 }
 
-install_python_linux() {
+install_node_linux() {
   if have_cmd apt-get; then
     run_sudo apt-get update
-    run_sudo apt-get install -y python3 python3-venv python3-pip git curl
+    run_sudo apt-get install -y nodejs npm git curl
     return
   fi
   if have_cmd dnf; then
-    run_sudo dnf install -y python3 python3-pip python3-virtualenv git curl
+    run_sudo dnf install -y nodejs npm git curl
     return
   fi
   if have_cmd yum; then
-    run_sudo yum install -y python3 python3-pip git curl
+    run_sudo yum install -y nodejs npm git curl
     return
   fi
   if have_cmd pacman; then
-    run_sudo pacman -Sy --noconfirm python python-pip git curl
+    run_sudo pacman -Sy --noconfirm nodejs npm git curl
     return
   fi
   if have_cmd zypper; then
-    run_sudo zypper install -y python3 python3-pip python3-virtualenv git curl
+    run_sudo zypper install -y nodejs npm git curl
     return
   fi
   if have_cmd apk; then
-    run_sudo apk add --no-cache python3 py3-pip py3-virtualenv git curl
+    run_sudo apk add --no-cache nodejs npm git curl
     return
   fi
-  echo "Unsupported Linux package manager. Install Python 3.10+, pip, and venv manually." >&2
+  echo "Unsupported Linux package manager. Install Node.js 18+ and npm manually." >&2
   exit 1
 }
 
-install_python_macos() {
+install_node_macos() {
   if ! have_cmd brew; then
     echo "Homebrew not found. Install Homebrew first: https://brew.sh" >&2
     exit 1
   fi
-  brew install python git curl
+  brew install node git curl
 }
 
+OS="$(uname -s | tr '[:upper:]' '[:lower:]')"
+if ! have_cmd node || ! have_cmd npm; then
+  echo "node/npm not found, installing dependencies..."
+  case "$OS" in
+    linux*) install_node_linux ;;
+    darwin*) install_node_macos ;;
+    *)
+      echo "Unsupported OS for this installer: $OS" >&2
+      exit 1
+      ;;
+  esac
+fi
+
+if [[ "$SOURCE_MODE" == "auto" ]]; then
+  if [[ -f "${REPO_ROOT}/package.json" ]]; then
+    SOURCE_MODE="local"
+  else
+    SOURCE_MODE="npm"
+  fi
+fi
+
+case "$SOURCE_MODE" in
+  local)
+    npm i -g "${REPO_ROOT}"
+    ;;
+  git)
+    npm i -g "git+${REPO_URL}#${REPO_REF}"
+    ;;
+  npm)
+    npm i -g @ao_zorin/zocket
+    ;;
+  *)
+    echo "Invalid source mode: $SOURCE_MODE" >&2
+    exit 2
+    ;;
+ esac
+
+ZOCKET_BIN="$(command -v zocket || true)"
+if [[ -z "${ZOCKET_BIN}" ]]; then
+  echo "zocket binary not found after install" >&2
+  exit 1
+fi
+
+export ZOCKET_HOME="${ZOCKET_HOME_DIR}"
+mkdir -p "${ZOCKET_HOME_DIR}"
+"${ZOCKET_BIN}" init >/dev/null
+
 write_systemd_unit() {
   local unit_path="$1"
   local exec_start="$2"
   local svc_user="$3"
   local svc_group="$4"
   local zocket_home="$5"
-  local extra_rw="${6:-}"
   run_sudo tee "${unit_path}" >/dev/null <<EOF
 [Unit]
-Description=Zocket $(basename "${unit_path%.service}")
+Description=Zocket service
 After=network-online.target
 Wants=network-online.target
 
@@ -138,7 +184,7 @@ ProtectKernelTunables=true
 ProtectControlGroups=true
 LockPersonality=true
 MemoryDenyWriteExecute=true
-ReadWritePaths=${zocket_home} ${extra_rw}
+ReadWritePaths=${zocket_home}
 
 [Install]
 WantedBy=multi-user.target
@@ -152,7 +198,7 @@ write_systemd_user_unit() {
   mkdir -p "$(dirname "${unit_path}")"
   cat > "${unit_path}" <<EOF
 [Unit]
-Description=Zocket $(basename "${unit_path%.service}")
+Description=Zocket service
 After=default.target
 
 [Service]
@@ -198,149 +244,42 @@ EOF
 EOF
 }
 
-OS="$(uname -s | tr '[:upper:]' '[:lower:]')"
-if ! have_cmd python3; then
-  echo "python3 not found, installing dependencies..."
-  case "$OS" in
-    linux*) install_python_linux ;;
-    darwin*) install_python_macos ;;
-    *)
-      echo "Unsupported OS for this installer: $OS" >&2
-      exit 1
-      ;;
-  esac
+EXEC_START="${ZOCKET_BIN} start --host 127.0.0.1 --web-port ${WEB_PORT} --mcp-port ${MCP_PORT} --mcp-stream-port ${MCP_STREAM_PORT} --mode ${MCP_MODE}"
+if [[ "$WEB_ENABLED" == "false" ]]; then
+  EXEC_START="${EXEC_START} --no-web"
 fi
 
-if ! have_cmd git; then
-  echo "git not found, installing..."
-  case "$OS" in
-    linux*) install_python_linux ;;
-    darwin*) install_python_macos ;;
-    *) echo "Install git manually and rerun." >&2; exit 1 ;;
-  esac
-fi
-
-if [[ "$SOURCE_MODE" == "auto" ]]; then
-  if [[ -f "${REPO_ROOT}/pyproject.toml" ]]; then
-    SOURCE_MODE="local"
-  else
-    SOURCE_MODE="git"
-  fi
-fi
-
-PKG_SOURCE=""
-SRC_DIR="${INSTALL_ROOT}/src"
-
-mkdir -p "${INSTALL_ROOT}"
-
-if [[ "$SOURCE_MODE" == "local" ]]; then
-  PKG_SOURCE="${REPO_ROOT}"
-elif [[ "$SOURCE_MODE" == "git" ]]; then
-  if [[ -d "${SRC_DIR}/.git" ]]; then
-    git -C "${SRC_DIR}" fetch --all --tags
-    git -C "${SRC_DIR}" checkout "${REPO_REF}"
-    git -C "${SRC_DIR}" pull --ff-only
-  else
-    rm -rf "${SRC_DIR}"
-    git clone --depth 1 --branch "${REPO_REF}" "${REPO_URL}" "${SRC_DIR}"
-  fi
-  PKG_SOURCE="${SRC_DIR}"
-elif [[ "$SOURCE_MODE" == "pypi" ]]; then
-  PKG_SOURCE="zocket"
-else
-  echo "Invalid source mode: $SOURCE_MODE" >&2
-  exit 2
-fi
-
-VENV_DIR="${INSTALL_ROOT}/venv"
-PY_BIN="${VENV_DIR}/bin/python3"
-ZOCKET_BIN="${VENV_DIR}/bin/zocket"
-
-python3 -m venv "${VENV_DIR}"
-"${PY_BIN}" -m pip install --upgrade pip setuptools wheel
-
-if [[ "$SOURCE_MODE" == "pypi" ]]; then
-  "${PY_BIN}" -m pip install --upgrade "${PKG_SOURCE}"
-else
-  "${PY_BIN}" -m pip install --upgrade "${PKG_SOURCE}"
-fi
-
-mkdir -p "$HOME/.local/bin"
-ln -sf "${ZOCKET_BIN}" "$HOME/.local/bin/zocket"
-
-export ZOCKET_HOME="${ZOCKET_HOME_DIR}"
-mkdir -p "${ZOCKET_HOME_DIR}"
-
-if [[ ! -f "${ZOCKET_HOME_DIR}/vault.enc" ]]; then
-  "${ZOCKET_BIN}" init
-fi
-
-"${ZOCKET_BIN}" config set-language "${LANGUAGE}" >/dev/null
-
 if [[ "$AUTOSTART" == "user" && "$OS" == linux* ]]; then
   USER_UNIT_DIR="$HOME/.config/systemd/user"
-  write_systemd_user_unit "${USER_UNIT_DIR}/zocket-web.service" \
-    "${PY_BIN} -m zocket web --host 127.0.0.1 --port ${WEB_PORT}" \
-    "${ZOCKET_HOME_DIR}"
-  write_systemd_user_unit "${USER_UNIT_DIR}/zocket-mcp-sse.service" \
-    "${PY_BIN} -m zocket mcp --transport sse --mode ${MCP_MODE} --host 127.0.0.1 --port ${MCP_PORT}" \
-    "${ZOCKET_HOME_DIR}"
-  write_systemd_user_unit "${USER_UNIT_DIR}/zocket-mcp-http.service" \
-    "${PY_BIN} -m zocket mcp --transport streamable-http --mode ${MCP_MODE} --host 127.0.0.1 --port ${MCP_STREAM_PORT}" \
-    "${ZOCKET_HOME_DIR}"
+  write_systemd_user_unit "${USER_UNIT_DIR}/zocket.service" "${EXEC_START}" "${ZOCKET_HOME_DIR}"
   systemctl --user daemon-reload
-  systemctl --user enable --now zocket-web.service zocket-mcp-sse.service zocket-mcp-http.service >/dev/null
+  systemctl --user enable --now zocket.service >/dev/null
 fi
 
 if [[ "$AUTOSTART" == "system" && "$OS" == linux* ]]; then
-  write_systemd_unit "/etc/systemd/system/zocket-web.service" \
-    "${PY_BIN} -m zocket web --host 127.0.0.1 --port ${WEB_PORT}" \
-    "${SERVICE_USER}" "${SERVICE_USER}" "${ZOCKET_HOME_DIR}" "/tmp"
-  write_systemd_unit "/etc/systemd/system/zocket-mcp-sse.service" \
-    "${PY_BIN} -m zocket mcp --transport sse --mode ${MCP_MODE} --host 127.0.0.1 --port ${MCP_PORT}" \
-    "${SERVICE_USER}" "${SERVICE_USER}" "${ZOCKET_HOME_DIR}"
-  write_systemd_unit "/etc/systemd/system/zocket-mcp-http.service" \
-    "${PY_BIN} -m zocket mcp --transport streamable-http --mode ${MCP_MODE} --host 127.0.0.1 --port ${MCP_STREAM_PORT}" \
-    "${SERVICE_USER}" "${SERVICE_USER}" "${ZOCKET_HOME_DIR}"
+  write_systemd_unit "/etc/systemd/system/zocket.service" "${EXEC_START}" "${SERVICE_USER}" "${SERVICE_USER}" "${ZOCKET_HOME_DIR}"
   run_sudo systemctl daemon-reload
-  run_sudo systemctl enable --now zocket-web.service zocket-mcp-sse.service zocket-mcp-http.service >/dev/null
+  run_sudo systemctl enable --now zocket.service >/dev/null
 fi
 
 if [[ "$AUTOSTART" != "none" && "$OS" == darwin* ]]; then
   PLIST_DIR="$HOME/Library/LaunchAgents"
-  install_launchd "dev.zocket.web" \
-    "${PY_BIN} -m zocket web --host 127.0.0.1 --port ${WEB_PORT}" \
-    "${ZOCKET_HOME_DIR}" "${PLIST_DIR}"
-  install_launchd "dev.zocket.mcp-sse" \
-    "${PY_BIN} -m zocket mcp --transport sse --mode ${MCP_MODE} --host 127.0.0.1 --port ${MCP_PORT}" \
-    "${ZOCKET_HOME_DIR}" "${PLIST_DIR}"
-  install_launchd "dev.zocket.mcp-streamable" \
-    "${PY_BIN} -m zocket mcp --transport streamable-http --mode ${MCP_MODE} --host 127.0.0.1 --port ${MCP_STREAM_PORT}" \
-    "${ZOCKET_HOME_DIR}" "${PLIST_DIR}"
-  launchctl unload "${PLIST_DIR}/dev.zocket.web.plist" >/dev/null 2>&1 || true
-  launchctl unload "${PLIST_DIR}/dev.zocket.mcp-sse.plist" >/dev/null 2>&1 || true
-  launchctl unload "${PLIST_DIR}/dev.zocket.mcp-streamable.plist" >/dev/null 2>&1 || true
-  launchctl load "${PLIST_DIR}/dev.zocket.web.plist"
-  launchctl load "${PLIST_DIR}/dev.zocket.mcp-sse.plist"
-  launchctl load "${PLIST_DIR}/dev.zocket.mcp-streamable.plist"
+  install_launchd "dev.zocket" "${EXEC_START}" "${ZOCKET_HOME_DIR}" "${PLIST_DIR}"
+  launchctl unload "${PLIST_DIR}/dev.zocket.plist" >/dev/null 2>&1 || true
+  launchctl load "${PLIST_DIR}/dev.zocket.plist"
 fi
 
 cat <<EOF
 zocket installed successfully.
 
-Runtime:
-  venv:      ${VENV_DIR}
-  zocket:    ${ZOCKET_BIN}
-  ZOCKET_HOME=${ZOCKET_HOME_DIR}
+zocket:    ${ZOCKET_BIN}
+ZOCKET_HOME=${ZOCKET_HOME_DIR}
 
 Default ports:
-  web panel: http://127.0.0.1:${WEB_PORT}
+  web panel: http://127.0.0.1:${WEB_PORT}$( [[ "$WEB_ENABLED" == "false" ]] && printf ' (disabled)' )
   MCP SSE:   http://127.0.0.1:${MCP_PORT}/sse
   MCP HTTP:  http://127.0.0.1:${MCP_STREAM_PORT}/mcp
 
 Next steps:
-  1) Open web: ${ZOCKET_BIN} web --host 127.0.0.1 --port ${WEB_PORT}
-  2) MCP SSE (Claude Code): ${ZOCKET_BIN} mcp --transport sse --mode ${MCP_MODE} --host 127.0.0.1 --port ${MCP_PORT}
-  3) MCP Streamable (Codex): ${ZOCKET_BIN} mcp --transport streamable-http --mode ${MCP_MODE} --host 127.0.0.1 --port ${MCP_STREAM_PORT}
-  4) MCP stdio: ${ZOCKET_BIN} mcp --transport stdio --mode ${MCP_MODE}
+  1) Start now: ${EXEC_START}
 EOF