Compare commits

...
20 Commits
Author SHA1 Message Date
Codex 01f2c66f48 Refine terminal input controls
Gitea Smoke / smoke (push) Successful in 0s
Gitea Android APK / build (push) Failing after 8m32s
2026-07-10 15:11:12 +00:00
Codex 8fda3fa2da Align primary UI with v0 design
Gitea Smoke / smoke (push) Successful in 0s
Gitea Android APK / build (push) Failing after 8m54s
2026-07-10 14:23:25 +00:00
Codex 69f40e7d36 Apply v0 tmux management UI
Gitea Android APK / build (push) Failing after 0s
Gitea Smoke / smoke (push) Successful in 0s
2026-07-10 10:47:27 +00:00
Codex bc918e7664 Use full terminal text width
Gitea Smoke / smoke (push) Successful in 0s
Gitea Android APK / build (push) Failing after 8m19s
2026-07-10 09:11:03 +00:00
Codex aba3930417 Fix TLS socket wrapper compilation
Gitea Android APK / build (push) Failing after 0s
Gitea Smoke / smoke (push) Successful in 0s
2026-07-10 03:57:57 +00:00
Codex 4476f41aa6 Reconnect terminal websockets automatically
Gitea Smoke / smoke (push) Successful in 0s
Gitea Android APK / build (push) Has been cancelled
2026-07-10 03:51:42 +00:00
Codex 5122683761 Compact terminal composer controls
Gitea Android APK / build (push) Failing after 0s
Gitea Smoke / smoke (push) Successful in 0s
2026-07-10 02:43:11 +00:00
Codex 924835dd55 Fix terminal enter and ungrouped sessions
Gitea Smoke / smoke (push) Successful in 1s
Gitea Android APK / build (push) Successful in 11m55s
2026-07-09 16:36:52 +00:00
Codex 9fd7b02522 Ignore local Android tool cache
Gitea Smoke / smoke (push) Successful in 0s
Gitea Android APK / build (push) Successful in 11m55s
2026-07-09 10:02:29 +00:00
Codex 8e871a3ce6 Add preview APK update channel 2026-07-09 10:01:14 +00:00
Codex df29546ff9 Move terminal key pager into composer
Gitea Smoke / smoke (push) Successful in 0s
Gitea Android APK / build (push) Successful in 11m57s
2026-07-09 00:19:35 +00:00
Codex bbd6fe3f5f Refresh native UI styling
Gitea Smoke / smoke (push) Successful in 0s
Gitea Android APK / build (push) Failing after 8m17s
2026-07-08 23:50:48 +00:00
Codex 7e87adfc8d Add terminal group switcher
Gitea Smoke / smoke (push) Successful in 0s
Gitea Android APK / build (push) Failing after 8m52s
2026-07-08 23:39:17 +00:00
Codex 87729df01f Refine terminal keys and send input
Gitea Smoke / smoke (push) Successful in 0s
Gitea Android APK / build (push) Failing after 8m37s
2026-07-08 23:19:48 +00:00
Codex 18ad29b501 Add Gitea release mirror script
Gitea Smoke / smoke (push) Successful in 0s
Gitea Android APK / build (push) Has been cancelled
2026-07-08 23:11:58 +00:00
Codex 61e28645f1 Fix server flow and keyboard insets
Gitea Smoke / smoke (push) Successful in 0s
Gitea Android APK / build (push) Successful in 12m16s
2026-07-08 15:30:13 +00:00
Codex a3bc92ddb5 Prefer Gitea for Android builds
Gitea Android APK / build (push) Failing after 0s
Gitea Smoke / smoke (push) Successful in 0s
2026-07-08 01:30:40 +00:00
Codex 1874d23716 Make terminal accessory bar paged
Gitea Smoke / smoke (push) Successful in 0s
Gitea Android Compile Check / build (push) Successful in 12m27s
2026-07-08 01:14:25 +00:00
Codex c4ec2fd2ef Refine terminal input panel
Gitea Android Compile Check / build (push) Failing after 0s
Gitea Smoke / smoke (push) Successful in 1s
2026-07-08 00:38:31 +00:00
Codex ced6523c00 Improve terminal composer controls
Gitea Smoke / smoke (push) Successful in 0s
Gitea Android Compile Check / build (push) Successful in 12m2s
2026-07-08 00:12:16 +00:00
16 changed files with 2269 additions and 303 deletions
+108 -12
View File
@@ -1,4 +1,4 @@
name: Gitea Android Compile Check name: Gitea Android APK
on: [push] on: [push]
@@ -6,9 +6,13 @@ jobs:
build: build:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Compile Android APK - name: Build Android APK
env: env:
CLONE_TOKEN: ${{ secrets.TMUX_GITEA_TOKEN }} CLONE_TOKEN: ${{ secrets.TMUX_GITEA_TOKEN }}
ANDROID_KEYSTORE_BASE64: ${{ secrets.ANDROID_KEYSTORE_BASE64 }}
ANDROID_KEYSTORE_PASSWORD: ${{ secrets.ANDROID_KEYSTORE_PASSWORD }}
ANDROID_KEY_ALIAS: ${{ secrets.ANDROID_KEY_ALIAS }}
ANDROID_KEY_PASSWORD: ${{ secrets.ANDROID_KEY_PASSWORD }}
run: | run: |
set -eu set -eu
@@ -26,8 +30,12 @@ jobs:
rm -rf "${WORKDIR}" rm -rf "${WORKDIR}"
SERVER_URL="${GITHUB_SERVER_URL:-https://gitea.neatcn.com}" SERVER_URL="${GITHUB_SERVER_URL:-https://gitea.neatcn.com}"
REPOSITORY="${GITHUB_REPOSITORY:-tmux/tmux-browser-android}" REPOSITORY="${GITHUB_REPOSITORY:-tmux/tmux-browser-android}"
AUTH_SERVER_URL="$(printf '%s' "${SERVER_URL}" | sed "s#https://#https://gouki:${CLONE_TOKEN}@#")" if [ -n "${CLONE_TOKEN:-}" ]; then
git clone "${AUTH_SERVER_URL}/${REPOSITORY}.git" "${WORKDIR}" AUTH_SERVER_URL="$(printf '%s' "${SERVER_URL}" | sed "s#https://#https://gouki:${CLONE_TOKEN}@#")"
git clone "${AUTH_SERVER_URL}/${REPOSITORY}.git" "${WORKDIR}"
else
git clone "${SERVER_URL}/${REPOSITORY}.git" "${WORKDIR}"
fi
cd "${WORKDIR}" cd "${WORKDIR}"
git checkout "${GITHUB_SHA:-main}" git checkout "${GITHUB_SHA:-main}"
@@ -53,17 +61,105 @@ jobs:
yes | sdkmanager --licenses >/dev/null || true yes | sdkmanager --licenses >/dev/null || true
sdkmanager "platforms;android-35" "build-tools;35.0.0" "platform-tools" sdkmanager "platforms;android-35" "build-tools;35.0.0" "platform-tools"
VERSION_NAME="0.1.${GITHUB_RUN_NUMBER:-0}" REF="${GITHUB_REF:-}"
VERSION_CODE=$((2000 + ${GITHUB_RUN_NUMBER:-0})) REF_NAME="${GITHUB_REF_NAME:-}"
gradle :app:assembleDebug \ if [ -z "${REF_NAME}" ]; then
REF_NAME="${REF##*/}"
fi
PUBLISH_RELEASE=0
if [ "${REF#refs/tags/v}" != "${REF}" ]; then
PUBLISH_RELEASE=1
VERSION_NAME="${REF_NAME#v}"
MAJOR="$(printf '%s' "${VERSION_NAME}" | cut -d. -f1)"
MINOR="$(printf '%s' "${VERSION_NAME}" | cut -d. -f2)"
PATCH="$(printf '%s' "${VERSION_NAME}" | cut -d. -f3)"
VERSION_CODE=$((MAJOR * 1000000 + MINOR * 1000 + PATCH))
else
VERSION_NAME="0.1.${GITHUB_RUN_NUMBER:-0}"
VERSION_CODE=$((3000 + ${GITHUB_RUN_NUMBER:-0}))
fi
SIGNED=false
if [ -n "${ANDROID_KEYSTORE_BASE64:-}" ]; then
echo "${ANDROID_KEYSTORE_BASE64}" | base64 -d > release.jks
{
echo "storeFile=release.jks"
echo "storePassword=${ANDROID_KEYSTORE_PASSWORD}"
echo "keyAlias=${ANDROID_KEY_ALIAS}"
echo "keyPassword=${ANDROID_KEY_PASSWORD}"
} > signing.properties
SIGNED=true
fi
if [ "${PUBLISH_RELEASE}" = "1" ] && [ "${SIGNED}" != "true" ]; then
echo "Gitea release publishing requires ANDROID_KEYSTORE_BASE64 and signing secrets." >&2
exit 1
fi
if [ "${PUBLISH_RELEASE}" = "1" ] && [ -z "${CLONE_TOKEN:-}" ]; then
echo "Gitea release publishing requires TMUX_GITEA_TOKEN." >&2
exit 1
fi
if [ "${SIGNED}" = "true" ]; then
BUILD_TASK=":app:assembleRelease"
else
BUILD_TASK=":app:assembleDebug"
fi
gradle "${BUILD_TASK}" \
-PversionCode="${VERSION_CODE}" \ -PversionCode="${VERSION_CODE}" \
-PversionName="${VERSION_NAME}" \ -PversionName="${VERSION_NAME}" \
-PrepoSlug="neatstudio/tmux-browser-android" -PrepoSlug="neatstudio/tmux-browser-android"
mkdir -p release mkdir -p release
APK_PATH="$(find app/build/outputs/apk -name '*.apk' | sort | tail -n 1)" APK_PATH="$(find app/build/outputs/apk -name '*.apk' | sort | tail -n 1)"
cp "${APK_PATH}" release/tmux-android-gitea-compile-check.apk cp "${APK_PATH}" release/tmux-android.apk
ls -lh release/tmux-android-gitea-compile-check.apk cp "${APK_PATH}" "release/tmux-android-${VERSION_NAME}.apk"
sha256sum release/tmux-android-gitea-compile-check.apk SHA256="$(sha256sum release/tmux-android.apk | awk '{print $1}')"
echo "Gitea-built APK is a compile check only." TAG="v${VERSION_NAME}"
echo "Do not publish it as a release asset; release APKs are GitHub-built and mirrored byte-for-byte to Gitea." APK_URL="https://gitea.neatcn.com/tmux/tmux-browser-android/releases/download/${TAG}/tmux-android.apk"
RELEASE_PAGE_URL="https://gitea.neatcn.com/tmux/tmux-browser-android/releases/tag/${TAG}"
cat > release/latest.json << JSON
{
"versionCode": ${VERSION_CODE},
"versionName": "${VERSION_NAME}",
"apkUrl": "${APK_URL}",
"sha256": "${SHA256}",
"releasePageUrl": "${RELEASE_PAGE_URL}",
"minSdk": 26
}
JSON
ls -lh release/tmux-android.apk release/latest.json
sha256sum release/tmux-android.apk
if [ "${PUBLISH_RELEASE}" != "1" ]; then
echo "Gitea main build completed as compile check."
exit 0
fi
API_ROOT="https://gitea.neatcn.com/api/v1/repos/tmux/tmux-browser-android"
RELEASE_BODY='{"tag_name":"'"${TAG}"'","target_commitish":"main","name":"tmux Android '"${VERSION_NAME}"'","body":"Android APK for tmux-ui remote testing.","draft":false,"prerelease":false}'
if ! curl -fsSL -X POST \
-H "Authorization: token ${CLONE_TOKEN}" \
-H "Content-Type: application/json" \
-d "${RELEASE_BODY}" \
"${API_ROOT}/releases" \
-o /tmp/gitea-release.json; then
curl -fsSL -H "Authorization: token ${CLONE_TOKEN}" \
"${API_ROOT}/releases/tags/${TAG}" \
-o /tmp/gitea-release.json
fi
RELEASE_ID="$(sed -n 's/.*"id":\([0-9][0-9]*\).*/\1/p' /tmp/gitea-release.json | head -1)"
if [ -z "${RELEASE_ID}" ]; then
echo "Cannot resolve Gitea release id." >&2
cat /tmp/gitea-release.json >&2
exit 1
fi
curl -fsSL -X POST -H "Authorization: token ${CLONE_TOKEN}" \
-F "attachment=@release/tmux-android.apk;type=application/vnd.android.package-archive" \
"${API_ROOT}/releases/${RELEASE_ID}/assets?name=tmux-android.apk" \
-o /tmp/gitea-apk-asset.json
curl -fsSL -X POST -H "Authorization: token ${CLONE_TOKEN}" \
-F "attachment=@release/latest.json;type=application/json" \
"${API_ROOT}/releases/${RELEASE_ID}/assets?name=latest.json" \
-o /tmp/gitea-latest-asset.json
echo "Published Gitea release ${TAG}."
+3 -3
View File
@@ -2,8 +2,6 @@ name: Android APK
on: on:
push: push:
branches:
- main
tags: tags:
- "v*" - "v*"
pull_request: pull_request:
@@ -27,10 +25,12 @@ jobs:
run: | run: |
if [[ "${GITHUB_REF}" == refs/tags/v* ]]; then if [[ "${GITHUB_REF}" == refs/tags/v* ]]; then
VERSION_NAME="${GITHUB_REF_NAME#v}" VERSION_NAME="${GITHUB_REF_NAME#v}"
IFS='.' read -r MAJOR MINOR PATCH <<< "${VERSION_NAME}"
VERSION_CODE=$((MAJOR * 1000000 + MINOR * 1000 + PATCH))
else else
VERSION_NAME="0.1.${GITHUB_RUN_NUMBER}" VERSION_NAME="0.1.${GITHUB_RUN_NUMBER}"
VERSION_CODE=$((1000 + GITHUB_RUN_NUMBER))
fi fi
VERSION_CODE=$((1000 + GITHUB_RUN_NUMBER))
echo "VERSION_NAME=${VERSION_NAME}" >> "${GITHUB_ENV}" echo "VERSION_NAME=${VERSION_NAME}" >> "${GITHUB_ENV}"
echo "VERSION_CODE=${VERSION_CODE}" >> "${GITHUB_ENV}" echo "VERSION_CODE=${VERSION_CODE}" >> "${GITHUB_ENV}"
+1 -1
View File
@@ -1,4 +1,5 @@
.gradle/ .gradle/
.ci/
build/ build/
app/build/ app/build/
local.properties local.properties
@@ -6,4 +7,3 @@ signing.properties
*.jks *.jks
*.keystore *.keystore
release/ release/
+27 -28
View File
@@ -88,31 +88,32 @@ base64 -w 0 tmux-android-release.jks
Branch builds and manual workflow runs create Actions artifacts only. Use them Branch builds and manual workflow runs create Actions artifacts only. Use them
to verify grouped changes before publishing. to verify grouped changes before publishing.
Publish a release build by pushing a `v*` tag. A tag should be reserved for a Gitea is the primary build and update channel. Normal `main` pushes run the
coherent feature/test batch, not every small UI or text change. Tag publishing Gitea Android workflow for compile checks, while GitHub no longer builds every
creates a GitHub Release with: main push. Publish a release build by pushing a `v*` tag after a coherent
feature/test batch, not every small UI or text change.
Tag publishing can create GitHub Release assets with:
```text ```text
https://github.com/neatstudio/tmux-browser-android/releases/latest/download/tmux-android.apk https://github.com/neatstudio/tmux-browser-android/releases/latest/download/tmux-android.apk
https://github.com/neatstudio/tmux-browser-android/releases/latest/download/latest.json https://github.com/neatstudio/tmux-browser-android/releases/latest/download/latest.json
``` ```
Gitea is the app's default install/update channel because phones may not be able Gitea is also the app's default install/update channel because phones may not be
to reach GitHub reliably. GitHub remains an optional public source. This Gitea able to reach GitHub reliably. GitHub remains an optional public source. This
instance does not support the GitHub-style `/releases/latest/download/...` URL, Gitea instance does not support the GitHub-style
so the app uses the Gitea Release API as the stable Gitea update entrypoint. `/releases/latest/download/...` URL, so the app uses the Gitea Release API as
the stable Gitea update entrypoint.
Release APKs must be identical on GitHub and Gitea. The canonical APK is the Release APKs on GitHub and Gitea should either be the exact same file or be
GitHub Release asset built by `.github/workflows/android.yml`; publish to Gitea built from the same tag with the same signing keystore, `versionCode`, and
by mirroring that same `tmux-android.apk` byte-for-byte and uploading a `versionName`. The Gitea workflow publishes release assets only when signing
Gitea-specific `latest.json` whose `apkUrl` points at the Gitea asset but whose secrets are present. Unsigned Gitea builds remain compile checks and must not be
`versionCode`, `versionName`, and `sha256` match the GitHub manifest. Do not use used for automatic in-place updates.
a separately built Gitea APK as a release asset unless it is proven to have the
same SHA-256 as the GitHub APK. This keeps Android signatures and update
compatibility identical no matter which platform the phone can reach.
Plain branch builds only create Actions artifacts; they are useful for CI Plain branch builds are useful for CI verification, but releases are the stable
verification, but releases are the stable download/update channel. download/update channel.
Unsigned/debug workflow artifacts are useful only for smoke testing install and Unsigned/debug workflow artifacts are useful only for smoke testing install and
launch. Automatic in-place updates require release APKs signed with the same launch. Automatic in-place updates require release APKs signed with the same
@@ -123,18 +124,16 @@ incompatible package.
The terminal screen connects to `/ws/terminal` and sends the upstream protocol The terminal screen connects to `/ws/terminal` and sends the upstream protocol
messages unchanged: `attach`, `input`, `resize`, `scroll`, and `clear-history`. messages unchanged: `attach`, `input`, `resize`, `scroll`, and `clear-history`.
The first Android UI renders terminal output as monospace text with basic ANSI The Android UI renders terminal output through a lightweight screen buffer with
SGR color support. The terminal view stays bottom-aligned when output is short, cursor movement, line clearing, screen clearing, basic ANSI SGR color support,
auto-scrolls as data arrives, and adjusts its bottom inset when the soft keyboard and throttled redraws. It is enough for shell-oriented remote testing, but it is
opens. Rendering is throttled and the local terminal buffer is capped so opening not yet a complete xterm-compatible renderer for full-screen TUIs such as `vim`
busy sessions does not block the UI thread. Input typed before the terminal or `top`.
attach message is sent is queued and flushed after the WebSocket client is ready.
It is enough for shell-oriented remote testing, but it is not yet a complete
xterm-compatible renderer for full-screen TUIs such as `vim` or `top`.
The terminal toolbar and shortcut row include tmux prefix helpers. The app sends The terminal input area is a native multi-line composer with a paged accessory
the same control bytes a keyboard would send, for example `Ctrl+B`, `Ctrl+B d`, bar for editing keys, control keys, tmux prefix helpers, navigation keys, and
`Ctrl+B c`, `Ctrl+B n`, and `Ctrl+B p`. common shell symbols. The app sends the same control bytes a keyboard would
send, for example `Ctrl+B`, `Ctrl+B d`, `Ctrl+B c`, `Ctrl+B n`, and `Ctrl+B p`.
All app features are native Android controls. Complex server objects such as All app features are native Android controls. Complex server objects such as
preferences, timeline events, group messages, and image metadata currently use preferences, timeline events, group messages, and image metadata currently use
+3
View File
@@ -14,6 +14,8 @@ val defaultGithubUpdateUrl = providers.gradleProperty("defaultGithubUpdateUrl")
.orElse("https://github.com/${repoSlug.get()}/releases/latest/download/latest.json") .orElse("https://github.com/${repoSlug.get()}/releases/latest/download/latest.json")
val defaultGiteaUpdateUrl = providers.gradleProperty("defaultGiteaUpdateUrl") val defaultGiteaUpdateUrl = providers.gradleProperty("defaultGiteaUpdateUrl")
.orElse("https://gitea.neatcn.com/api/v1/repos/tmux/tmux-browser-android/releases/latest") .orElse("https://gitea.neatcn.com/api/v1/repos/tmux/tmux-browser-android/releases/latest")
val defaultPreviewUpdateUrl = providers.gradleProperty("defaultPreviewUpdateUrl")
.orElse("https://gitea.neatcn.com/tmux/tmux-browser-android/releases/download/preview/latest.json")
val defaultApkUrl = providers.gradleProperty("defaultApkUrl") val defaultApkUrl = providers.gradleProperty("defaultApkUrl")
.orElse("https://github.com/${repoSlug.get()}/releases/latest/download/tmux-android.apk") .orElse("https://github.com/${repoSlug.get()}/releases/latest/download/tmux-android.apk")
val defaultReleasePageUrl = providers.gradleProperty("defaultReleasePageUrl") val defaultReleasePageUrl = providers.gradleProperty("defaultReleasePageUrl")
@@ -40,6 +42,7 @@ android {
buildConfigField("String", "DEFAULT_UPDATE_URL", "\"${defaultUpdateUrl.get()}\"") buildConfigField("String", "DEFAULT_UPDATE_URL", "\"${defaultUpdateUrl.get()}\"")
buildConfigField("String", "DEFAULT_GITHUB_UPDATE_URL", "\"${defaultGithubUpdateUrl.get()}\"") buildConfigField("String", "DEFAULT_GITHUB_UPDATE_URL", "\"${defaultGithubUpdateUrl.get()}\"")
buildConfigField("String", "DEFAULT_GITEA_UPDATE_URL", "\"${defaultGiteaUpdateUrl.get()}\"") buildConfigField("String", "DEFAULT_GITEA_UPDATE_URL", "\"${defaultGiteaUpdateUrl.get()}\"")
buildConfigField("String", "DEFAULT_PREVIEW_UPDATE_URL", "\"${defaultPreviewUpdateUrl.get()}\"")
buildConfigField("String", "DEFAULT_APK_URL", "\"${defaultApkUrl.get()}\"") buildConfigField("String", "DEFAULT_APK_URL", "\"${defaultApkUrl.get()}\"")
buildConfigField("String", "DEFAULT_RELEASE_PAGE_URL", "\"${defaultReleasePageUrl.get()}\"") buildConfigField("String", "DEFAULT_RELEASE_PAGE_URL", "\"${defaultReleasePageUrl.get()}\"")
} }
@@ -4,6 +4,7 @@ import android.util.Base64;
import java.io.BufferedInputStream; import java.io.BufferedInputStream;
import java.io.BufferedOutputStream; import java.io.BufferedOutputStream;
import java.net.InetSocketAddress;
import java.net.Socket; import java.net.Socket;
import java.net.URI; import java.net.URI;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
@@ -14,16 +15,22 @@ import java.util.Arrays;
import javax.net.ssl.SSLSocketFactory; import javax.net.ssl.SSLSocketFactory;
final class AppEventSocketClient { final class AppEventSocketClient {
private static final long HEARTBEAT_INTERVAL_MS = 15000L;
private static final int SOCKET_CONNECT_TIMEOUT_MS = 10000;
private static final int SOCKET_READ_TIMEOUT_MS = 45000;
interface Listener { interface Listener {
void onMessage(String text); void onMessage(String text);
void onClosed(); void onClosed();
} }
private final Listener listener; private final Listener listener;
private final Object writeLock = new Object();
private Socket socket; private Socket socket;
private BufferedInputStream input; private BufferedInputStream input;
private BufferedOutputStream output; private BufferedOutputStream output;
private volatile boolean closed; private volatile boolean closed;
private Thread heartbeatThread;
AppEventSocketClient(Listener listener) { AppEventSocketClient(Listener listener) {
this.listener = listener; this.listener = listener;
@@ -40,12 +47,11 @@ final class AppEventSocketClient {
sendFrame(8, new byte[0]); sendFrame(8, new byte[0]);
} catch (Exception ignored) { } catch (Exception ignored) {
} }
try { closeSocketQuietly();
if (socket != null) { }
socket.close();
} boolean isClosed() {
} catch (Exception ignored) { return closed;
}
} }
private void run(String baseUrl) { private void run(String baseUrl) {
@@ -55,6 +61,7 @@ final class AppEventSocketClient {
input = new BufferedInputStream(socket.getInputStream()); input = new BufferedInputStream(socket.getInputStream());
output = new BufferedOutputStream(socket.getOutputStream()); output = new BufferedOutputStream(socket.getOutputStream());
handshake(uri); handshake(uri);
startHeartbeat();
while (!closed) { while (!closed) {
Frame frame = readFrame(); Frame frame = readFrame();
if (frame.opcode == 1) { if (frame.opcode == 1) {
@@ -69,12 +76,7 @@ final class AppEventSocketClient {
} finally { } finally {
closed = true; closed = true;
listener.onClosed(); listener.onClosed();
try { closeSocketQuietly();
if (socket != null) {
socket.close();
}
} catch (Exception ignored) {
}
} }
} }
@@ -91,10 +93,39 @@ final class AppEventSocketClient {
if (port == -1) { if (port == -1) {
port = "wss".equalsIgnoreCase(uri.getScheme()) ? 443 : 80; port = "wss".equalsIgnoreCase(uri.getScheme()) ? 443 : 80;
} }
Socket raw = new Socket();
raw.connect(new InetSocketAddress(uri.getHost(), port), SOCKET_CONNECT_TIMEOUT_MS);
Socket connected;
if ("wss".equalsIgnoreCase(uri.getScheme())) { if ("wss".equalsIgnoreCase(uri.getScheme())) {
return SSLSocketFactory.getDefault().createSocket(uri.getHost(), port); connected = ((SSLSocketFactory) SSLSocketFactory.getDefault())
.createSocket(raw, uri.getHost(), port, true);
} else {
connected = raw;
} }
return new Socket(uri.getHost(), port); connected.setKeepAlive(true);
connected.setTcpNoDelay(true);
connected.setSoTimeout(SOCKET_READ_TIMEOUT_MS);
return connected;
}
private void startHeartbeat() {
heartbeatThread = new Thread(() -> {
while (!closed) {
try {
Thread.sleep(HEARTBEAT_INTERVAL_MS);
if (!closed) {
sendFrame(9, new byte[0]);
}
} catch (InterruptedException ignored) {
Thread.currentThread().interrupt();
return;
} catch (Exception error) {
closeSocketQuietly();
return;
}
}
}, "app-events-ws-heartbeat");
heartbeatThread.start();
} }
private void handshake(URI uri) throws Exception { private void handshake(URI uri) throws Exception {
@@ -181,32 +212,47 @@ final class AppEventSocketClient {
} }
private void sendFrame(int opcode, byte[] payload) throws Exception { private void sendFrame(int opcode, byte[] payload) throws Exception {
if (output == null) { synchronized (writeLock) {
return; if (output == null) {
} return;
output.write(0x80 | opcode);
byte[] mask = new byte[4];
new SecureRandom().nextBytes(mask);
int length = payload.length;
if (length < 126) {
output.write(0x80 | length);
} else if (length <= 0xffff) {
output.write(0x80 | 126);
output.write((length >>> 8) & 0xff);
output.write(length & 0xff);
} else {
output.write(0x80 | 127);
for (int i = 7; i >= 0; i--) {
output.write((length >>> (8 * i)) & 0xff);
} }
output.write(0x80 | opcode);
byte[] mask = new byte[4];
new SecureRandom().nextBytes(mask);
int length = payload.length;
if (length < 126) {
output.write(0x80 | length);
} else if (length <= 0xffff) {
output.write(0x80 | 126);
output.write((length >>> 8) & 0xff);
output.write(length & 0xff);
} else {
output.write(0x80 | 127);
for (int i = 7; i >= 0; i--) {
output.write((length >>> (8 * i)) & 0xff);
}
}
output.write(mask);
byte[] masked = Arrays.copyOf(payload, payload.length);
for (int i = 0; i < masked.length; i++) {
masked[i] = (byte) (masked[i] ^ mask[i % 4]);
}
output.write(masked);
output.flush();
} }
output.write(mask); }
byte[] masked = Arrays.copyOf(payload, payload.length);
for (int i = 0; i < masked.length; i++) { private void closeSocketQuietly() {
masked[i] = (byte) (masked[i] ^ mask[i % 4]); if (heartbeatThread != null) {
heartbeatThread.interrupt();
heartbeatThread = null;
}
try {
if (socket != null) {
socket.close();
}
} catch (Exception ignored) {
} }
output.write(masked);
output.flush();
} }
private static final class Frame { private static final class Frame {
File diff suppressed because it is too large Load Diff
@@ -109,6 +109,8 @@ final class TerminalScreenBuffer {
putChar(' '); putChar(' ');
} }
index++; index++;
} else if (isNakedDeviceAttributesTail(text, index)) {
index = skipNakedDeviceAttributesTail(text, index);
} else if (item >= 0x20 && item != 0x7f) { } else if (item >= 0x20 && item != 0x7f) {
putChar(item); putChar(item);
index++; index++;
@@ -495,6 +497,36 @@ final class TerminalScreenBuffer {
return -1; return -1;
} }
private boolean isNakedDeviceAttributesTail(String text, int index) {
int cursor = index;
boolean hasSemicolon = false;
if (cursor < text.length() && (text.charAt(cursor) == '?' || text.charAt(cursor) == '>')) {
cursor++;
}
while (cursor < text.length()) {
char item = text.charAt(cursor);
if (item >= '0' && item <= '9') {
cursor++;
continue;
}
if (item == ';') {
hasSemicolon = true;
cursor++;
continue;
}
return item == 'c' && hasSemicolon && cursor > index && cursor - index <= 16;
}
return false;
}
private int skipNakedDeviceAttributesTail(String text, int index) {
int cursor = index;
while (cursor < text.length() && text.charAt(cursor) != 'c') {
cursor++;
}
return Math.min(cursor + 1, text.length());
}
private int findAnsiEnd(String text, int start) { private int findAnsiEnd(String text, int start) {
for (int index = start; index < text.length(); index++) { for (int index = start; index < text.length(); index++) {
char item = text.charAt(index); char item = text.charAt(index);
@@ -6,6 +6,7 @@ import org.json.JSONObject;
import java.io.BufferedInputStream; import java.io.BufferedInputStream;
import java.io.BufferedOutputStream; import java.io.BufferedOutputStream;
import java.net.InetSocketAddress;
import java.net.Socket; import java.net.Socket;
import java.net.URI; import java.net.URI;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
@@ -19,6 +20,10 @@ import java.util.concurrent.RejectedExecutionException;
import javax.net.ssl.SSLSocketFactory; import javax.net.ssl.SSLSocketFactory;
final class TerminalSocketClient { final class TerminalSocketClient {
private static final long HEARTBEAT_INTERVAL_MS = 15000L;
private static final int SOCKET_CONNECT_TIMEOUT_MS = 10000;
private static final int SOCKET_READ_TIMEOUT_MS = 45000;
interface Listener { interface Listener {
void onConnected(); void onConnected();
void onOutput(String data); void onOutput(String data);
@@ -35,6 +40,7 @@ final class TerminalSocketClient {
private BufferedOutputStream output; private BufferedOutputStream output;
private volatile boolean closed; private volatile boolean closed;
private Thread thread; private Thread thread;
private Thread heartbeatThread;
TerminalSocketClient(Listener listener) { TerminalSocketClient(Listener listener) {
this.listener = listener; this.listener = listener;
@@ -97,6 +103,7 @@ final class TerminalSocketClient {
"rows", rows "rows", rows
); );
listener.onConnected(); listener.onConnected();
startHeartbeat();
readLoop(); readLoop();
} catch (Exception error) { } catch (Exception error) {
if (!closed) { if (!closed) {
@@ -123,10 +130,39 @@ final class TerminalSocketClient {
if (port == -1) { if (port == -1) {
port = "wss".equalsIgnoreCase(uri.getScheme()) ? 443 : 80; port = "wss".equalsIgnoreCase(uri.getScheme()) ? 443 : 80;
} }
Socket raw = new Socket();
raw.connect(new InetSocketAddress(uri.getHost(), port), SOCKET_CONNECT_TIMEOUT_MS);
Socket connected;
if ("wss".equalsIgnoreCase(uri.getScheme())) { if ("wss".equalsIgnoreCase(uri.getScheme())) {
return SSLSocketFactory.getDefault().createSocket(uri.getHost(), port); connected = ((SSLSocketFactory) SSLSocketFactory.getDefault())
.createSocket(raw, uri.getHost(), port, true);
} else {
connected = raw;
} }
return new Socket(uri.getHost(), port); connected.setKeepAlive(true);
connected.setTcpNoDelay(true);
connected.setSoTimeout(SOCKET_READ_TIMEOUT_MS);
return connected;
}
private void startHeartbeat() {
heartbeatThread = new Thread(() -> {
while (!closed) {
try {
Thread.sleep(HEARTBEAT_INTERVAL_MS);
if (!closed) {
sendFrame(9, new byte[0]);
}
} catch (InterruptedException ignored) {
Thread.currentThread().interrupt();
return;
} catch (Exception error) {
closeSocketQuietly();
return;
}
}
}, "terminal-ws-heartbeat");
heartbeatThread.start();
} }
private void handshake(URI uri) throws Exception { private void handshake(URI uri) throws Exception {
@@ -279,6 +315,10 @@ final class TerminalSocketClient {
} }
private void closeSocketQuietly() { private void closeSocketQuietly() {
if (heartbeatThread != null) {
heartbeatThread.interrupt();
heartbeatThread = null;
}
try { try {
if (socket != null) { if (socket != null) {
socket.close(); socket.close();
@@ -80,6 +80,14 @@ final class UpdateManager {
); );
} }
void checkPreview(boolean userInitiated) {
startUpdateCheck(
userInitiated,
"Preview",
new String[]{BuildConfig.DEFAULT_PREVIEW_UPDATE_URL}
);
}
void checkWithFallback(boolean userInitiated) { void checkWithFallback(boolean userInitiated) {
startUpdateCheck( startUpdateCheck(
userInitiated, userInitiated,
+5 -4
View File
@@ -1,11 +1,12 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<style name="AppTheme" parent="android:style/Theme.Material.Light.NoActionBar"> <style name="AppTheme" parent="android:style/Theme.Material.NoActionBar">
<item name="android:fontFamily">sans</item> <item name="android:fontFamily">sans</item>
<item name="android:windowLightStatusBar">false</item> <item name="android:windowLightStatusBar">false</item>
<item name="android:statusBarColor">#111418</item> <item name="android:windowLightNavigationBar">false</item>
<item name="android:navigationBarColor">#111418</item> <item name="android:statusBarColor">#090B0D</item>
<item name="android:navigationBarColor">#090B0D</item>
<item name="android:windowBackground">#090B0D</item>
<item name="android:windowActionModeOverlay">true</item> <item name="android:windowActionModeOverlay">true</item>
</style> </style>
</resources> </resources>
+41
View File
@@ -0,0 +1,41 @@
# Preview APK workflow
Use this path for fast UI testing before a formal tag/release.
The preview build is a debug APK with package id `com.neatstudio.tmuxandroid.debug`.
It can be installed next to the formal release app, so preview version codes do not
block future formal releases.
## Build locally
```bash
scripts/setup-android-local.sh
scripts/build-preview-apk.sh
```
Output:
- `release/preview/tmux-android-preview.apk`
- `release/preview/latest.json`
## Upload to Gitea preview release
```bash
scripts/upload-gitea-preview.sh
```
The script reads `TMUX_GITEA_TOKEN` or prompts for a hidden token.
Before uploading, it deletes existing assets with the same names, so the preview
release keeps only one current APK and one current manifest.
Fixed preview URLs:
- Manifest: `https://gitea.neatcn.com/tmux/tmux-browser-android/releases/download/preview/latest.json`
- APK: `https://gitea.neatcn.com/tmux/tmux-browser-android/releases/download/preview/tmux-android-preview.apk`
## Notes
- Preview APKs are not formal releases and should not be tagged as `v*`.
- Preview uses debug signing unless a separate debug signing setup is added.
- The installed preview app is separate from the release app because Gradle applies
`applicationIdSuffix = ".debug"` for debug builds.
+46
View File
@@ -0,0 +1,46 @@
#!/usr/bin/env bash
set -euo pipefail
ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
CI_DIR="${ROOT_DIR}/.ci"
GRADLE_VERSION="${GRADLE_VERSION:-8.10.2}"
GRADLE_HOME="${CI_DIR}/gradle-${GRADLE_VERSION}"
ANDROID_HOME="${ANDROID_HOME:-${CI_DIR}/android-sdk}"
CMDLINE_TOOLS="${ANDROID_HOME}/cmdline-tools/latest"
BUILD_NUMBER="${BUILD_NUMBER:-$(date -u +%m%d%H%M)}"
VERSION_CODE="${VERSION_CODE:-$((900000000 + 10#${BUILD_NUMBER}))}"
VERSION_NAME="${VERSION_NAME:-preview-${BUILD_NUMBER}}"
if [ ! -x "${GRADLE_HOME}/bin/gradle" ] || [ ! -x "${CMDLINE_TOOLS}/bin/sdkmanager" ]; then
"${ROOT_DIR}/scripts/setup-android-local.sh"
fi
export ANDROID_HOME
export ANDROID_SDK_ROOT="${ANDROID_HOME}"
export PATH="${GRADLE_HOME}/bin:${CMDLINE_TOOLS}/bin:${ANDROID_HOME}/platform-tools:${PATH}"
cd "${ROOT_DIR}"
gradle :app:assembleDebug \
-PversionCode="${VERSION_CODE}" \
-PversionName="${VERSION_NAME}" \
-PrepoSlug="neatstudio/tmux-browser-android"
OUT_DIR="${ROOT_DIR}/release/preview"
mkdir -p "${OUT_DIR}"
APK_PATH="$(find app/build/outputs/apk/debug -name '*.apk' | sort | tail -n 1)"
cp "${APK_PATH}" "${OUT_DIR}/tmux-android-preview.apk"
SHA256="$(sha256sum "${OUT_DIR}/tmux-android-preview.apk" | cut -d " " -f 1)"
cat > "${OUT_DIR}/latest.json" <<JSON
{
"versionCode": ${VERSION_CODE},
"versionName": "${VERSION_NAME}",
"apkUrl": "https://gitea.neatcn.com/tmux/tmux-browser-android/releases/download/preview/tmux-android-preview.apk",
"sha256": "${SHA256}",
"releasePageUrl": "https://gitea.neatcn.com/tmux/tmux-browser-android/releases/tag/preview",
"minSdk": 26
}
JSON
ls -lh "${OUT_DIR}/tmux-android-preview.apk" "${OUT_DIR}/latest.json"
sha256sum "${OUT_DIR}/tmux-android-preview.apk"
+115
View File
@@ -0,0 +1,115 @@
#!/usr/bin/env bash
set -euo pipefail
usage() {
cat >&2 <<'EOF'
Usage: scripts/mirror-gitea-release.sh TAG APK_PATH [VERSION_CODE] [VERSION_NAME]
Mirrors an already-built APK to the Gitea release for TAG and uploads a
Gitea-specific latest.json.
Token source:
TMUX_GITEA_TOKEN environment variable, or hidden stdin prompt.
EOF
}
if [ "${1:-}" = "-h" ] || [ "${1:-}" = "--help" ]; then
usage
exit 0
fi
if [ "$#" -lt 2 ] || [ "$#" -gt 4 ]; then
usage
exit 2
fi
TAG="$1"
APK_PATH="$2"
VERSION_NAME="${4:-${TAG#v}}"
if [ ! -f "$APK_PATH" ]; then
echo "APK not found: $APK_PATH" >&2
exit 1
fi
if [ -n "${3:-}" ]; then
VERSION_CODE="$3"
else
IFS=. read -r MAJOR MINOR PATCH <<EOF
$VERSION_NAME
EOF
VERSION_CODE=$((MAJOR * 1000000 + MINOR * 1000 + PATCH))
fi
TOKEN="${TMUX_GITEA_TOKEN:-}"
if [ -z "$TOKEN" ]; then
printf "Gitea token: " >&2
IFS= read -rs TOKEN
printf "\n" >&2
fi
if [ -z "$TOKEN" ]; then
echo "Missing Gitea token." >&2
exit 1
fi
API_ROOT="https://gitea.neatcn.com/api/v1/repos/tmux/tmux-browser-android"
RELEASE_PAGE_URL="https://gitea.neatcn.com/tmux/tmux-browser-android/releases/tag/${TAG}"
APK_URL="https://gitea.neatcn.com/tmux/tmux-browser-android/releases/download/${TAG}/tmux-android.apk"
SHA256="$(sha256sum "$APK_PATH" | cut -d " " -f 1)"
WORK_DIR="$(mktemp -d)"
trap 'rm -rf "$WORK_DIR"' EXIT
LATEST_JSON="${WORK_DIR}/latest.json"
cat > "$LATEST_JSON" <<JSON
{
"versionCode": ${VERSION_CODE},
"versionName": "${VERSION_NAME}",
"apkUrl": "${APK_URL}",
"sha256": "${SHA256}",
"releasePageUrl": "${RELEASE_PAGE_URL}",
"minSdk": 26
}
JSON
RELEASE_JSON="${WORK_DIR}/release.json"
BODY='{"tag_name":"'"${TAG}"'","target_commitish":"main","name":"tmux Android '"${VERSION_NAME}"'","body":"Android APK for tmux-ui remote testing.","draft":false,"prerelease":false}'
if ! curl -fsSL \
-X POST \
-H "Authorization: token ${TOKEN}" \
-H "Content-Type: application/json" \
-d "$BODY" \
"${API_ROOT}/releases" \
-o "$RELEASE_JSON"; then
curl -fsSL \
-H "Authorization: token ${TOKEN}" \
"${API_ROOT}/releases/tags/${TAG}" \
-o "$RELEASE_JSON"
fi
RELEASE_ID="$(sed -n 's/^{"id":\([0-9][0-9]*\),.*/\1/p' "$RELEASE_JSON" | head -1)"
if [ -z "$RELEASE_ID" ]; then
echo "Cannot resolve Gitea release id for ${TAG}." >&2
exit 1
fi
upload_asset() {
local file="$1"
local name="$2"
local type="$3"
curl -fsSL \
-X POST \
-H "Authorization: token ${TOKEN}" \
-F "attachment=@${file};type=${type}" \
"${API_ROOT}/releases/${RELEASE_ID}/assets?name=${name}" \
-o "${WORK_DIR}/${name}.asset.json"
}
upload_asset "$APK_PATH" "tmux-android.apk" "application/vnd.android.package-archive"
upload_asset "$LATEST_JSON" "latest.json" "application/json"
echo "Mirrored ${TAG} to Gitea release ${RELEASE_ID}"
echo "versionCode=${VERSION_CODE}"
echo "versionName=${VERSION_NAME}"
echo "sha256=${SHA256}"
+39
View File
@@ -0,0 +1,39 @@
#!/usr/bin/env bash
set -euo pipefail
ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
CI_DIR="${ROOT_DIR}/.ci"
GRADLE_VERSION="${GRADLE_VERSION:-8.10.2}"
ANDROID_TOOLS_ZIP="${ANDROID_TOOLS_ZIP:-commandlinetools-linux-11076708_latest.zip}"
GRADLE_HOME="${CI_DIR}/gradle-${GRADLE_VERSION}"
ANDROID_HOME="${ANDROID_HOME:-${CI_DIR}/android-sdk}"
CMDLINE_TOOLS="${ANDROID_HOME}/cmdline-tools/latest"
mkdir -p "${CI_DIR}"
if [ ! -x "${GRADLE_HOME}/bin/gradle" ]; then
curl -fSL --connect-timeout 20 --retry 3 --retry-delay 2 --max-time 600 \
-o "${CI_DIR}/gradle.zip" \
"https://services.gradle.org/distributions/gradle-${GRADLE_VERSION}-bin.zip"
unzip -q "${CI_DIR}/gradle.zip" -d "${CI_DIR}"
fi
if [ ! -x "${CMDLINE_TOOLS}/bin/sdkmanager" ]; then
mkdir -p "${ANDROID_HOME}/cmdline-tools"
curl -fSL --connect-timeout 20 --retry 3 --retry-delay 2 --max-time 600 \
-o "${CI_DIR}/android-tools.zip" \
"https://dl.google.com/android/repository/${ANDROID_TOOLS_ZIP}"
unzip -q "${CI_DIR}/android-tools.zip" -d "${ANDROID_HOME}/cmdline-tools"
rm -rf "${CMDLINE_TOOLS}"
mv "${ANDROID_HOME}/cmdline-tools/cmdline-tools" "${CMDLINE_TOOLS}"
fi
export ANDROID_HOME
export ANDROID_SDK_ROOT="${ANDROID_HOME}"
export PATH="${GRADLE_HOME}/bin:${CMDLINE_TOOLS}/bin:${ANDROID_HOME}/platform-tools:${PATH}"
yes | sdkmanager --licenses >/dev/null || true
sdkmanager "platforms;android-35" "build-tools;35.0.0" "platform-tools"
echo "ANDROID_HOME=${ANDROID_HOME}"
echo "GRADLE_HOME=${GRADLE_HOME}"
+93
View File
@@ -0,0 +1,93 @@
#!/usr/bin/env bash
set -euo pipefail
ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
APK_PATH="${1:-${ROOT_DIR}/release/preview/tmux-android-preview.apk}"
LATEST_JSON="${2:-${ROOT_DIR}/release/preview/latest.json}"
TAG="preview"
API_ROOT="https://gitea.neatcn.com/api/v1/repos/tmux/tmux-browser-android"
if [ ! -f "${APK_PATH}" ]; then
echo "APK not found: ${APK_PATH}" >&2
exit 1
fi
if [ ! -f "${LATEST_JSON}" ]; then
echo "latest.json not found: ${LATEST_JSON}" >&2
exit 1
fi
TOKEN="${TMUX_GITEA_TOKEN:-}"
if [ -z "${TOKEN}" ]; then
printf "Gitea token: " >&2
IFS= read -rs TOKEN
printf "\n" >&2
fi
if [ -z "${TOKEN}" ]; then
echo "Missing Gitea token." >&2
exit 1
fi
WORK_DIR="$(mktemp -d)"
trap 'rm -rf "${WORK_DIR}"' EXIT
RELEASE_JSON="${WORK_DIR}/release.json"
BODY='{"tag_name":"preview","target_commitish":"main","name":"tmux Android Preview","body":"Mutable preview APK for fast UI testing. This is not a formal release.","draft":false,"prerelease":true}'
if ! curl -fsSL \
-X POST \
-H "Authorization: token ${TOKEN}" \
-H "Content-Type: application/json" \
-d "${BODY}" \
"${API_ROOT}/releases" \
-o "${RELEASE_JSON}"; then
curl -fsSL \
-H "Authorization: token ${TOKEN}" \
"${API_ROOT}/releases/tags/${TAG}" \
-o "${RELEASE_JSON}"
fi
RELEASE_ID="$(sed -n 's/^{"id":\([0-9][0-9]*\),.*/\1/p' "${RELEASE_JSON}" | head -1)"
if [ -z "${RELEASE_ID}" ]; then
echo "Cannot resolve Gitea release id for preview." >&2
exit 1
fi
upload_asset() {
local file="$1"
local name="$2"
local type="$3"
local assets_json old_ids old_id
assets_json="${WORK_DIR}/assets-${name}.json"
curl -fsSL -H "Authorization: token ${TOKEN}" \
"${API_ROOT}/releases/${RELEASE_ID}/assets" \
-o "${assets_json}"
old_ids="$(python3 - "${assets_json}" "${name}" <<'PY'
import json
import sys
with open(sys.argv[1], "r", encoding="utf-8") as handle:
assets = json.load(handle)
for asset in assets:
if asset.get("name") == sys.argv[2]:
print(asset.get("id"))
PY
)"
for old_id in ${old_ids}; do
curl -fsSL -X DELETE -H "Authorization: token ${TOKEN}" \
"${API_ROOT}/releases/${RELEASE_ID}/assets/${old_id}" \
-o /dev/null
done
curl -fsSL \
-X POST \
-H "Authorization: token ${TOKEN}" \
-F "attachment=@${file};type=${type}" \
"${API_ROOT}/releases/${RELEASE_ID}/assets?name=${name}" \
-o "${WORK_DIR}/${name}.asset.json"
}
upload_asset "${APK_PATH}" "tmux-android-preview.apk" "application/vnd.android.package-archive"
upload_asset "${LATEST_JSON}" "latest.json" "application/json"
echo "Uploaded preview release ${RELEASE_ID}"
echo "Manifest: https://gitea.neatcn.com/tmux/tmux-browser-android/releases/download/preview/latest.json"
echo "APK: https://gitea.neatcn.com/tmux/tmux-browser-android/releases/download/preview/tmux-android-preview.apk"