Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apple/Package.resolved

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion apple/Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ let package = Package(
.library(name: "LogseqModel", type: .dynamic, targets: ["LogseqModel"]),
],
dependencies: [
.package(url: "ssh://git@github.com/logseq/lui.git", revision: "f13b6f909ba63c888d189eede21bc0960e7de0d0"),
.package(url: "ssh://git@github.com/logseq/lui.git", revision: "87fcf6af90728bca313b9de991e5bf30564bbc05"),
.package(url: "https://github.com/getsentry/sentry-cocoa.git", exact: "9.27.0")
],
targets: [
Expand Down
2 changes: 1 addition & 1 deletion logseq.opam
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ pin-depends: [
["melange-transit-core.0.1.2" "git+https://github.com/logseq/melange-transit.git#main"]
["melange-transit-native.0.1.2" "git+https://github.com/logseq/melange-transit.git#main"]
["melange-transit-melange.0.1.2" "git+https://github.com/logseq/melange-transit.git#main"]
["lui.0.1.0" "git+ssh://git@github.com/logseq/lui.git#f13b6f909ba63c888d189eede21bc0960e7de0d0"]
["lui.0.1.0" "git+ssh://git@github.com/logseq/lui.git#87fcf6af90728bca313b9de991e5bf30564bbc05"]
["sdl3.0.0.1--alpha" "git+https://github.com/logseq/ocaml-sdl3.git#a9919c19bb4a0ba4857142f007ad93dd2563e799"]
["drive.dev" "git+https://github.com/logseq/drive.git#dd735a65ed525d1c36db38ac8e8114aa81d314a1"]
["ocaml-signal.0.1.0" "git+https://github.com/logseq/ocaml-signal.git#02e18cdc5e0ad672aa223f638eaa3ba52fc9421e"]
Expand Down
149 changes: 149 additions & 0 deletions scripts/cloud-agent-install.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,149 @@
#!/usr/bin/env bash
# Cloud Agent install for logseq/mobile (Linux OCaml core).
# Idempotent: safe to re-run. Does not start servers or run tests.
set -euo pipefail

[ ! -d '/agent/repos/mobile' ] || cd '/agent/repos/mobile' || exit $?
cd "$(git rev-parse --show-toplevel 2>/dev/null || pwd)"

export DEBIAN_FRONTEND=noninteractive
export GIT_TERMINAL_PROMPT=0
export GIT_CONFIG_COUNT=3
export GIT_CONFIG_KEY_0="url.https://github.com/.insteadOf"
export GIT_CONFIG_VALUE_0="git@github.com:"
export GIT_CONFIG_KEY_1="url.https://github.com/.insteadOf"
export GIT_CONFIG_VALUE_1="ssh://git@github.com/"
export GIT_CONFIG_KEY_2="url.https://github.com/.insteadOf"
export GIT_CONFIG_VALUE_2="git+ssh://git@github.com/"

SDL3_PREFIX="${LOGSEQ_SDL3_PREFIX:-/opt/sdl3}"
export PKG_CONFIG_PATH="${SDL3_PREFIX}/lib/pkgconfig${PKG_CONFIG_PATH:+:$PKG_CONFIG_PATH}"
export LD_LIBRARY_PATH="${SDL3_PREFIX}/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
export LIBRARY_PATH="${SDL3_PREFIX}/lib${LIBRARY_PATH:+:$LIBRARY_PATH}"
export C_INCLUDE_PATH="${SDL3_PREFIX}/include${C_INCLUDE_PATH:+:$C_INCLUDE_PATH}"

sudo apt-get update -qq
sudo apt-get install -y -qq \
build-essential cmake ninja-build pkg-config \
opam bubblewrap m4 \
libsqlite3-dev libffi-dev \
libsdl2-dev libsdl2-ttf-dev \
libpango1.0-dev libcairo2-dev \
libx11-dev libxext-dev libxrandr-dev libxcursor-dev libxfixes-dev \
libxi-dev libxss-dev libxtst-dev libwayland-dev libxkbcommon-dev \
libdbus-1-dev libibus-1.0-dev libudev-dev \
libasound2-dev libpulse-dev libdrm-dev libgbm-dev \
libegl1-mesa-dev libgles2-mesa-dev

# Persist toolchain env for subsequent login shells / agent commands.
PROFILE_SNIPPET="$HOME/.profile"
MARKER='# logseq-mobile-cloud-agent'
if ! grep -qF "$MARKER" "$PROFILE_SNIPPET" 2>/dev/null; then
cat >> "$PROFILE_SNIPPET" <<EOF

$MARKER
export PKG_CONFIG_PATH="${SDL3_PREFIX}/lib/pkgconfig\${PKG_CONFIG_PATH:+:\$PKG_CONFIG_PATH}"
export LD_LIBRARY_PATH="${SDL3_PREFIX}/lib\${LD_LIBRARY_PATH:+:\$LD_LIBRARY_PATH}"
export LIBRARY_PATH="${SDL3_PREFIX}/lib\${LIBRARY_PATH:+:\$LIBRARY_PATH}"
export C_INCLUDE_PATH="${SDL3_PREFIX}/include\${C_INCLUDE_PATH:+:\$C_INCLUDE_PATH}"
if command -v opam >/dev/null 2>&1; then
eval "\$(opam env --switch=5.5.0 --set-switch 2>/dev/null)" || true
fi
EOF
fi

# SDL3 is not packaged on Ubuntu 24.04; build the pinned runtime once.
if ! PKG_CONFIG_PATH="${SDL3_PREFIX}/lib/pkgconfig${PKG_CONFIG_PATH:+:$PKG_CONFIG_PATH}" \
pkg-config --exists sdl3; then
sudo mkdir -p "$SDL3_PREFIX"
sudo chown "$(whoami)" "$SDL3_PREFIX"
TMP_SDL=$(mktemp -d)
trap 'rm -rf "$TMP_SDL"' EXIT
curl -fsSL \
https://raw.githubusercontent.com/logseq/ocaml-sdl3/a9919c19bb4a0ba4857142f007ad93dd2563e799/tooling/install_sdl3.py \
-o "$TMP_SDL/install_sdl3.py"
python3 "$TMP_SDL/install_sdl3.py" "$SDL3_PREFIX"
trap - EXIT
rm -rf "$TMP_SDL"
fi
sudo ldconfig || true

# Opam switch (global ~/.opam — survives across checkouts).
if [ ! -d "${OPAMROOT:-$HOME/.opam}" ]; then
opam init --disable-sandboxing -a --bare
fi
if ! opam switch list --short 2>/dev/null | grep -qx '5.5.0'; then
opam switch create 5.5.0
fi
eval "$(opam env --switch=5.5.0 --set-switch)"

git config --global url."https://github.com/".insteadOf "git@github.com:" || true
git config --global url."https://github.com/".insteadOf "ssh://git@github.com/" || true
git config --global url."https://github.com/".insteadOf "git+ssh://git@github.com/" || true

opam pin add -n -y melange-edn-core git+https://github.com/logseq/melange-edn.git#main
opam pin add -n -y melange-edn-native git+https://github.com/logseq/melange-edn.git#main
opam pin add -n -y melange-transit-core git+https://github.com/logseq/melange-transit.git#main
opam pin add -n -y melange-transit-native git+https://github.com/logseq/melange-transit.git#main

# Fresh switch: install deps then drop lockfile-vendored packages (duniverse owns them).
# Re-runs skip the heavy deps pass when melange + opam-monorepo are already present.
if ! opam list --installed --short | grep -qx 'opam-monorepo'; then
opam install . --deps-only --yes --with-test --assume-depexts
if [ -f logseq.opam.locked ]; then
comm -12 \
<(grep -oE '"[a-zA-Z0-9_.-]+" \{= "[^"]*" & \?vendor\}' logseq.opam.locked | cut -d'"' -f2 | sort) \
<(opam list --installed --short | sort) \
| xargs -r opam remove -y || true
fi
opam install -y melange.7.0.1-55
opam install -y opam-monorepo.0.3.6
else
opam install -y melange.7.0.1-55 opam-monorepo.0.3.6
fi

if [ ! -d duniverse ] || [ ! -d duniverse/lui ]; then
for attempt in 1 2 3; do
if opam exec -- opam-monorepo pull; then
break
fi
[ "$attempt" -lt 3 ] || exit 1
sleep 10
done
fi

# Pin-depends that opam-monorepo does not vendor (logseq git pins).
if [ -f logseq.opam ]; then
for pin in $(grep -oE 'logseq/[A-Za-z0-9_-]+\.git#[A-Za-z0-9._/-]+' logseq.opam | sort -u); do
url="${pin%%#*}"
sha="${pin##*#}"
name="$(basename "$url" .git)"
if [ -d "duniverse/$name" ]; then
# Keep pin SHA current when logseq.opam changes.
if [ -d "duniverse/$name/.git" ]; then
current="$(git -C "duniverse/$name" rev-parse HEAD 2>/dev/null || true)"
if [ "$current" != "$sha" ] && [ "${#sha}" -ge 7 ]; then
git -C "duniverse/$name" fetch --quiet "https://github.com/$url" "$sha" || true
git -C "duniverse/$name" checkout --quiet "$sha" 2>/dev/null \
|| git -C "duniverse/$name" checkout --quiet FETCH_HEAD || true
fi
fi
continue
fi
git clone --quiet "https://github.com/$url" "duniverse/$name"
if ! git -C "duniverse/$name" checkout --quiet "$sha"; then
git -C "duniverse/$name" fetch --quiet "https://github.com/$url" "$sha"
git -C "duniverse/$name" checkout --quiet FETCH_HEAD
fi
done
fi

mkdir -p "$HOME/.config/dune"
printf '(lang dune 3.0)\n(cache enabled)\n' > "$HOME/.config/dune/config"

# Smoke: toolchain present (full runtest is for agents, not install).
ocaml -version
dune --version
test -d duniverse/lui
pkg-config --exists sdl3
echo "cloud-agent-install: ok"
42 changes: 22 additions & 20 deletions shared/src/logseq/view_authentication.ml
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ let send_action send action = Model.AuthenticationForm action |> send |> ignore
let action send value = fun _ -> send_action send value
let tr source value = View_base.tr (Signal.sample source) value

let mobile_input kind control : t = fun context parent ->
let mobile_input kind control : t = custom (fun context parent ->
let scope = Lui_ui.extension context "native-auth-input" in
Lui_ui.extension_property context scope "kind" (StringValue kind);
ignore (control context (Some scope));
ignore (mount context ~parent:scope control);
attach context parent scope;
scope
scope)

let field source send key label kind =
let value (current : Model.logseq_model) =
Expand All @@ -22,7 +22,7 @@ let field source send key label kind =
| key -> Option.value ~default:"" (List.assoc_opt
(String.sub key 10 (String.length key - 10)) t.attributes) in
let input = if kind = "password" || kind = "new-password" then secure_field else text_field in
fun context parent ->
custom (fun context parent ->
let android = Lui_ui.host context = KotlinHost in
let field_style value = if android then None else Some value in
let control =
Expand All @@ -36,11 +36,12 @@ let field source send key label kind =
~on_submit:(action send Auth_flow.Submit) [] in
(* Compose's outlined control fills its parent in a form and supplies its own border. *)
let control = if android then column ~style_class:"form" [control] else control in
column ~key:("auth." ^ key) ~gap:6 ~cross:`stretch [
text ~padding_horizontal:(if android then 0 else 14)
~value:(tr source label) ~foreground:"muted-foreground" ~style_class:"subheadline" [];
mobile_input kind control;
] context parent
mount context ?parent
(column ~key:("auth." ^ key) ~gap:6 ~cross:`stretch [
text ~padding_horizontal:(if android then 0 else 14)
~value:(tr source label) ~foreground:"muted-foreground" ~style_class:"subheadline" [];
mobile_input kind control;
]))

let fields source send stage attributes choices =
let email = field source send "email" "Email" "email" in
Expand Down Expand Up @@ -81,7 +82,7 @@ let sheet source send : t =
let link id label event = button ~variant:`ghost ~text:(tr source label) ~min_height:44
~text_alignment:`center ~accessibility_identifier:id ~disabled_signal:busy ~on_press:(action send event) [] in
let can_submit = Signal.map (fun current -> Auth_flow.can_submit (form current)) source in
fun context parent ->
custom (fun context parent ->
let android = Lui_ui.host context = KotlinHost in
let title = Signal.map (fun current -> tr source (Auth_flow.title (form current))) source in
(* SwiftUI renders the sheet outside the node tree. Scope these tokens to its content. *)
Expand Down Expand Up @@ -139,13 +140,14 @@ let sheet source send : t =
~on_press:(action send Auth_flow.Cancel) [];
] in
let sheet_title = if android then Signal.constant context.ui_scheduler "" else title in
View_base.sheet ~model_source:source ~title:(reactive sheet_title)
~height:680 ~style_class:"navigation-content navigation-inline-title"
~detents_signal:(Signal.map (fun current -> match (form current).stage with
| Auth_flow.Register | NewPassword -> "0.82,large"
| ForgotPassword -> "0.48,large"
| Login -> "0.54,large"
| _ -> "0.62,large") source)
~accessibility_identifier:"sheet.authentication"
~on_dismiss:(action send Auth_flow.Dismiss)
(if android then [header; content] else [content; navigation_toolbar]) context parent
mount context ?parent
(View_base.sheet ~model_source:source ~title:(reactive sheet_title)
~height:680 ~style_class:"navigation-content navigation-inline-title"
~detents_signal:(Signal.map (fun current -> match (form current).stage with
| Auth_flow.Register | NewPassword -> "0.82,large"
| ForgotPassword -> "0.48,large"
| Login -> "0.54,large"
| _ -> "0.62,large") source)
~accessibility_identifier:"sheet.authentication"
~on_dismiss:(action send Auth_flow.Dismiss)
(if android then [header; content] else [content; navigation_toolbar])))
Loading
Loading