7dd25a55bb
* Bundle mosh-client via CI build pipeline Add a GitHub Actions workflow that builds a static, distro-portable mosh-client for linux-x64, linux-arm64, darwin-universal (arm64+x86_64) from upstream mobile-shell/mosh source, plus a pinned win32-x64 binary sourced from FluentTerminal (GPL-3.0). Releases attach SHA256SUMS so scripts/fetch-mosh-binaries.cjs can verify and pull the right binary into resources/mosh/<platform-arch>/ during npm run pack. electron-builder.config.cjs gains a moshExtraResources() helper that adds the binary to extraResources only when present on disk, keeping local dev packages working without bundled mosh. terminalBridge.cjs now exports bundledMoshClient() and prefers the bundled static client over whatever the system mosh wrapper would resolve via PATH (via the MOSH_CLIENT env var). The Windows branch throws a clear error pointing at Settings instead of silently falling back to a literal "mosh.exe" string when no wrapper is installed. This is Phase 1 — Phase 2 (follow-up) replaces the FluentTerminal Windows binary with an in-CI Cygwin static build and adds a Node-side mosh-server bootstrap so Mosh works out-of-the-box on Windows. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * Phase 2: Node-side Mosh handshake (no Perl wrapper required) Reimplement what the upstream Mosh Perl wrapper does in pure Node: spawn `ssh [user@]host -- mosh-server new`, sniff the byte stream for `MOSH CONNECT <port> <key>`, then spawn `mosh-client` locally with MOSH_KEY in the environment. The new electron/bridges/moshHandshake.cjs module exposes the parser, sniffer, and command builders as pure functions so they can be unit tested without spawning real ssh. terminalBridge.startMoshSession now prefers this path whenever a bare mosh-client (bundled, explicit, or system) and ssh (in-box OpenSSH on Win10 1809+, system everywhere else) are both detectable. The legacy path through the system mosh Perl wrapper is preserved as a fallback so users with custom mosh setups don't regress. Auth is delegated to system ssh, so keys, agent, ssh_config, and known_hosts all keep working. Password / 2FA need a controlling TTY which the bootstrap doesn't provide; affected users keep the legacy wrapper path until interactive UI lands. Tests: - moshHandshake.test.cjs (20 tests) — parser corner cases, command builders, sniffer split-chunk handling, ring-buffer trim, exec resolver - terminalBridge.bareMoshClient.test.cjs (4 tests) — explicit-path basename gating 317 → 341 passing tests; lint clean. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * Phase 3: in-CI Cygwin Windows build + visible PTY handshake Phase 3a — in-CI Cygwin Windows build - scripts/build-mosh/build-windows.sh builds mosh-client.exe from upstream mobile-shell/mosh source inside Cygwin, then walks the cygcheck import graph to bundle every required Cygwin DLL (cygwin1.dll, cygcrypto, cygprotobuf, cygncursesw, etc) into a tar.gz alongside the exe. - The `build-mosh-binaries` workflow swaps the FluentTerminal-pinned fetch job for a real Cygwin build (windows-latest + cygwin-install- action). fetch-windows.sh is preserved as an emergency fallback but no longer wired into the matrix. - fetch-mosh-binaries.cjs unpacks the tar.gz into resources/mosh/ win32-x64/ so mosh-client.exe sits next to its DLLs. - mosh-extra-resources.cjs ships the entire win32-x64/ dir (exe + DLL bundle) into Resources/mosh/, so the packaged installer runs on a stock Windows host with no Cygwin install. Phase 3b — visible PTY handshake (password / 2FA prompts) - terminalBridge.startMoshSession now spawns ssh inside node-pty so the user sees and can answer password / 2FA / known-hosts prompts in their terminal. When `MOSH CONNECT` is sniffed from the byte stream, session.proc is atomically swapped from the ssh PTY to a freshly-spawned mosh-client PTY. The MOSH CONNECT line itself is redacted from the visible output. - writeToSession / resizeSession read session.proc lazily, so input arriving after the swap goes to mosh-client without extra wiring. - The ZMODEM sentry is recreated for the new proc since its writeToRemote closure captured the previous handle. - Removes the earlier non-PTY child_process.spawn handshake — the PTY-based one supersedes it. Phase 3c — win32-arm64 deferred - Cygwin's arm64 port has no stable cygwin1.dll release yet, so we do not attempt an arm64 Windows build. arm64 Windows installs fall through to the legacy `mosh` wrapper path that the bridge already handles. Documented in the workflow. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * Allow branch/PR pushes to test the mosh-binaries workflow Mirrors the build-packages workflow change in #868: any push or PR that touches the mosh build pipeline triggers the matrix (artifacts only, no release), while only `mosh-bin-*` tag pushes (or an explicit workflow_dispatch with release_tag) publish a release. `paths` filter keeps unrelated commits from running this expensive workflow (~30min for the Cygwin leg). Concurrency group cancels superseded branch/PR builds; tag builds use a unique group so a follow-up commit can't kill an in-progress release. Release job's `if:` enforces the same rule independently — even if the trigger gets re-broadened, branches/PRs can't leak a release. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * Fix mosh binary workflow runners * Fix Windows mosh workflow invocation * Keep shell scripts LF in workflow checkouts * Trigger mosh workflow on attributes changes * Fix mosh build tool dependencies * Fix Linux mosh static build * Fix macOS mosh build tool lookup * Skip macOS ncurses terminfo install * Fix mosh PR review findings * Allow Linux system mosh dependencies * Fix Windows mosh DLL bundling * Limit bundled Windows mosh DLLs * Honor configured PATH for mosh handshake --------- Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
115 lines
4.1 KiB
Bash
Executable File
115 lines
4.1 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
# Build a portable mosh-client binary inside manylinux2014.
|
|
#
|
|
# Inputs (env):
|
|
# MOSH_REF — git ref of mobile-shell/mosh to build (e.g. mosh-1.4.0)
|
|
# ARCH — x64 | arm64 (for output naming only; container is already that arch)
|
|
# OUT_DIR — directory to write mosh-client-linux-<arch> + sha256
|
|
#
|
|
# Output:
|
|
# $OUT_DIR/mosh-client-linux-<arch>
|
|
# $OUT_DIR/mosh-client-linux-<arch>.sha256
|
|
#
|
|
# Strategy: build OpenSSL, protobuf, ncurses as static archives in a
|
|
# scratch prefix, then build mosh against those and link libstdc++/libgcc
|
|
# statically. The resulting binary still depends on standard Linux system
|
|
# libraries such as glibc/libz/libutil from the manylinux2014 baseline
|
|
# (compatible with virtually every distro released since 2014, including
|
|
# Debian 9+, Ubuntu 18.04+, CentOS 7+).
|
|
set -euo pipefail
|
|
|
|
: "${MOSH_REF:?missing MOSH_REF}"
|
|
: "${ARCH:?missing ARCH}"
|
|
: "${OUT_DIR:?missing OUT_DIR}"
|
|
|
|
validate_mosh_ref() {
|
|
if [[ ! "$MOSH_REF" =~ ^[A-Za-z0-9][A-Za-z0-9._/-]*$ ]] \
|
|
|| [[ "$MOSH_REF" == *..* ]] \
|
|
|| [[ "$MOSH_REF" == *@\{* ]] \
|
|
|| [[ "$MOSH_REF" == */ ]] \
|
|
|| [[ "$MOSH_REF" == *.lock ]]; then
|
|
echo "ERROR: invalid MOSH_REF: $MOSH_REF" >&2
|
|
exit 1
|
|
fi
|
|
}
|
|
validate_mosh_ref
|
|
|
|
OPENSSL_VER=3.0.13
|
|
PROTOBUF_VER=21.12
|
|
NCURSES_VER=6.4
|
|
|
|
WORK=$(mktemp -d)
|
|
trap 'rm -rf "$WORK"' EXIT
|
|
PREFIX="$WORK/prefix"
|
|
mkdir -p "$PREFIX/lib" "$PREFIX/include" "$OUT_DIR"
|
|
|
|
yum install -y -q autoconf automake libtool perl perl-IPC-Cmd make gcc gcc-c++ pkgconfig zlib-devel
|
|
|
|
cd "$WORK"
|
|
|
|
# OpenSSL static
|
|
curl -fsSL "https://www.openssl.org/source/openssl-$OPENSSL_VER.tar.gz" | tar xz
|
|
( cd "openssl-$OPENSSL_VER"
|
|
./config no-shared no-tests --prefix="$PREFIX" --openssldir="$PREFIX/ssl"
|
|
make -j"$(nproc)"
|
|
make install_sw )
|
|
|
|
# protobuf static (3.x stays compatible with mosh's generated proto code)
|
|
curl -fsSL "https://github.com/protocolbuffers/protobuf/releases/download/v$PROTOBUF_VER/protobuf-cpp-3.$PROTOBUF_VER.tar.gz" | tar xz
|
|
( cd "protobuf-3.$PROTOBUF_VER"
|
|
./configure --prefix="$PREFIX" --enable-static --disable-shared --with-pic
|
|
make -j"$(nproc)"
|
|
make install )
|
|
|
|
# ncurses static
|
|
curl -fsSL "https://invisible-island.net/archives/ncurses/ncurses-$NCURSES_VER.tar.gz" | tar xz
|
|
( cd "ncurses-$NCURSES_VER"
|
|
CFLAGS="-fPIC -O2" CXXFLAGS="-fPIC -O2" \
|
|
./configure --prefix="$PREFIX" --without-shared --without-debug --without-cxx-shared --without-tests --disable-pc-files --enable-widec
|
|
make -j"$(nproc)"
|
|
make install )
|
|
|
|
# Mosh. Fetch the requested ref explicitly so branch names, tags, and commit
|
|
# SHAs all work from workflow_dispatch.
|
|
git init mosh
|
|
git -C mosh remote add origin https://github.com/mobile-shell/mosh.git
|
|
git -C mosh fetch --depth 1 origin "$MOSH_REF"
|
|
git -C mosh checkout --detach FETCH_HEAD
|
|
( cd mosh
|
|
export PATH="$PREFIX/bin:$PATH"
|
|
./autogen.sh
|
|
PKG_CONFIG_PATH="$PREFIX/lib/pkgconfig:$PREFIX/lib64/pkgconfig" \
|
|
./configure --enable-completion=no --disable-server \
|
|
CPPFLAGS="-I$PREFIX/include -I$PREFIX/include/ncursesw" \
|
|
CXXFLAGS="-I$PREFIX/include -I$PREFIX/include/ncursesw -O2" \
|
|
CFLAGS="-I$PREFIX/include -I$PREFIX/include/ncursesw -O2" \
|
|
LDFLAGS="-L$PREFIX/lib -L$PREFIX/lib64 -static-libstdc++ -static-libgcc" \
|
|
LIBS="-ldl -lpthread"
|
|
make -j"$(nproc)" )
|
|
|
|
OUT_BIN="$OUT_DIR/mosh-client-linux-$ARCH"
|
|
cp mosh/src/frontend/mosh-client "$OUT_BIN"
|
|
strip "$OUT_BIN"
|
|
|
|
echo "--- file ---"
|
|
file "$OUT_BIN"
|
|
echo "--- ldd ---"
|
|
ldd "$OUT_BIN" || true
|
|
echo "--- size ---"
|
|
ls -lh "$OUT_BIN"
|
|
|
|
# Sanity check: must not link any non-system shared libraries. Allow only
|
|
# the glibc runtime family and the ELF loader.
|
|
ldd "$OUT_BIN" > "$WORK/ldd.txt" || true
|
|
awk '
|
|
/=>/ { print $1; next }
|
|
/^[[:space:]]*\/.*ld-linux/ { print $1; next }
|
|
' "$WORK/ldd.txt" > "$WORK/deps.txt"
|
|
if grep -Ev '^(linux-vdso\.so\.1|lib(c|m|pthread|rt|dl|resolv|util|z)\.so\.[0-9]+|/lib.*/ld-linux.*\.so\.[0-9]+|ld-linux.*\.so\.[0-9]+)$' "$WORK/deps.txt"; then
|
|
echo "ERROR: mosh-client links a non-system shared library; static linking failed." >&2
|
|
exit 1
|
|
fi
|
|
|
|
( cd "$OUT_DIR" && sha256sum "mosh-client-linux-$ARCH" > "mosh-client-linux-$ARCH.sha256" )
|
|
cat "$OUT_DIR/mosh-client-linux-$ARCH.sha256"
|