Merge pull request #75 from Euro-Office/feat/support-android-dev-ips

Feat/support android dev ips

Author: moodyjmz

develop/Makefile

@@ -1,8 +1,49 @@
 PRODUCT_VERSION ?= $(shell cat ../VERSION)
 export PRODUCT_VERSION
 
+# Detect host LAN IP for phones/emulators/LAN devices. Used by `make mobile`
+# and `make refresh-urls`.
+ifeq ($(shell uname -s),Darwin)
+	DETECTED_HOST_LAN_IP := $(shell ipconfig getifaddr en0 2>/dev/null || ipconfig getifaddr en1 2>/dev/null)
+else
+	# 1.1.1.1 is a dummy public target — `ip route get` just asks the kernel
+	# which local source IP it would use, without actually sending packets.
+	DETECTED_HOST_LAN_IP := $(shell ip route get 1.1.1.1 2>/dev/null | awk '{print $$7; exit}')
+endif
+
+# Empty by default: `make local` runs on localhost (desktop browser + iOS sim).
+# `make mobile` sets this so Android emulators and LAN-connected devices can reach the editor.
+HOST_LAN_IP ?=
+export HOST_LAN_IP
+
 local:
-	docker compose up -d && docker compose exec eo bash
+	@echo ""
+	@echo "   ███████╗ ██████╗"
+	@echo "   ██╔════╝██╔═══██╗"
+	@echo "   █████╗  ██║   ██║"
+	@echo "   ██╔══╝  ██║   ██║"
+	@echo "   ███████╗╚██████╔╝"
+	@echo "   ╚══════╝ ╚═════╝"
+	@echo ""
+	@echo "   Euro-Office Development Environment"
+	@echo ""
+ifeq ($(HOST_LAN_IP),)
+	@echo "   Mode: localhost (desktop browser + iOS sim)"
+	@echo "   For Android / physical device testing: make mobile"
+else
+	@echo "   Mode: mobile / LAN"
+	@echo "   Host LAN IP:   $(HOST_LAN_IP)"
+	@echo "   On IP change:  make refresh-urls"
+endif
+	@echo ""
+	docker compose up -d
+	@$(MAKE) --no-print-directory refresh-urls
+	docker compose exec eo bash
+
+# Like `make local`, but injects the detected HOST_LAN_IP so that Nextcloud
+# returns a DocumentServerUrl mobile/LAN clients can actually reach.
+mobile:
+	@HOST_LAN_IP="$(DETECTED_HOST_LAN_IP)" $(MAKE) local
 
 pull:
 	docker compose pull && docker compose up -d && docker compose exec eo bash
@@ -11,3 +52,29 @@ build:
 	(cd ../build && docker buildx bake develop) && \
 	(docker compose up -d) && \
 	(docker compose exec eo bash)
+
+# Align OnlyOffice URLs and trusted_domains with the current mode.
+# - If HOST_LAN_IP is set: mobile/LAN mode (DocumentServerUrl = http://<ip>:8080/, trusted_domains[2] = <ip>).
+# - If HOST_LAN_IP is empty: localhost mode (DocumentServerUrl = http://localhost:8080/, trusted_domains[2] cleared).
+# Waits for Nextcloud + OnlyOffice to finish installing on first boot, then applies idempotently.
+refresh-urls:
+	@start=$$(date +%s); \
+	  while ! docker compose exec -T eo curl -sf http://localhost/healthcheck >/dev/null 2>&1; do \
+	    printf "\rWaiting for document server (%ds)   " $$(($$(date +%s) - start)); \
+	    sleep 2; \
+	  done; \
+	  printf "\rDocument server ready (%ds).          \n" $$(($$(date +%s) - start))
+	@start=$$(date +%s); \
+	  while ! docker compose exec -T -u www-data nextcloud ./occ config:app:get onlyoffice DocumentServerUrl 2>/dev/null | grep -q "http"; do \
+	    printf "\rWaiting for Nextcloud setup (%ds)   " $$(($$(date +%s) - start)); \
+	    sleep 2; \
+	  done; \
+	  printf "\rNextcloud setup ready (%ds).          \n" $$(($$(date +%s) - start))
+	@target="$${HOST_LAN_IP:-localhost}"; \
+	  echo "Setting DocumentServerUrl to http://$$target:8080/"; \
+	  docker compose exec -T -u www-data nextcloud ./occ config:app:set onlyoffice DocumentServerUrl --value="http://$$target:8080/" >/dev/null; \
+	  if [ "$$target" = "localhost" ]; then \
+	    docker compose exec -T -u www-data nextcloud ./occ config:system:delete trusted_domains 2 >/dev/null 2>&1 || true; \
+	  else \
+	    docker compose exec -T -u www-data nextcloud ./occ config:system:set trusted_domains 2 --value=$$target >/dev/null; \
+	  fi

develop/README.md

@@ -8,6 +8,7 @@ The docker compose environment in this directory allows to run document server b
   - `make` to use the image that is currently available locally
   - `make pull` to use the latest image from github
   - `make build` to build the image locally from scratch
+  - `make mobile` for Android emulator / physical LAN device testing (see below)
 
   You may need to generate a PAT first, as described in https://github.com/Euro-Office/DocumentServer/pkgs/container/documentserver
 - In docker-compose.yml, for the eo service, ensure that `target` is set to `develop`
@@ -24,6 +25,31 @@ The docker compose environment in this directory allows to run document server b
         - Secret key: `secret`
     - Navigate to Files `http://localhost:8081/apps/files/`, create a document, and try to open it
 
+#### Testing from mobile devices and emulators
+
+`make local` runs on `localhost` — enough for the desktop browser and iOS simulator. For Android emulators and physical devices on the LAN, use `make mobile` instead — it detects the host's LAN IP and injects it so the editor is reachable from off-desktop clients.
+
+| Client | Target | Nextcloud URL |
+|---|---|---|
+| Desktop browser | `make local` or `make mobile` | `http://localhost:8081/` |
+| iOS simulator | `make local` or `make mobile` | `http://localhost:8081/` |
+| Android emulator | `make mobile` | `http://10.0.2.2:8081/` |
+| Physical LAN device | `make mobile` | `http://<HOST_LAN_IP>:8081/` |
+
+IP detection uses `ipconfig` on macOS and `ip route` on Linux. On native Windows — or any machine where detection fails — pass it explicitly:
+
+```sh
+make mobile HOST_LAN_IP=192.168.1.50
+```
+
+When your LAN IP changes (new wifi, tethering, etc.), update the running stack without a full rebuild:
+
+```sh
+make refresh-urls
+```
+
+Switching between `make local` and `make mobile` on an already-started stack is supported — both targets re-apply the correct URLs and trusted domains on each run.
+
 #### Building changes:
 
 - Enter the container with `docker compose exec eo bash`

develop/docker-compose.yml

@@ -31,7 +31,10 @@ services:
       - /var/www/html
       - ./setup/enable-office.sh:/docker-entrypoint-hooks.d/post-installation/enable-office.sh:ro
     environment:
-      NEXTCLOUD_TRUSTED_DOMAINS: 172.18.0.1 
+      # 10.0.2.2 = Android emulator's alias for host. Mobile/LAN IPs are
+      # applied post-boot by `make refresh-urls` so the container env stays
+      # stable across mode switches (no recreation, no data loss).
+      NEXTCLOUD_TRUSTED_DOMAINS: 10.0.2.2
       SQLITE_DATABASE: nextcloud
       NEXTCLOUD_ADMIN_USER: admin
       NEXTCLOUD_ADMIN_PASSWORD: admin

develop/setup/enable-office.sh

@@ -1,6 +1,11 @@
 #!/bin/bash
 
-php /var/www/html/occ config:system:set trusted_domains 1 --value=nextcloud
+php /var/www/html/occ config:system:set trusted_domains 10 --value=nextcloud
+
+# Disable throttling for dev — mobile login retries trip the default
+# brute-force protection and rate limiter, blocking further requests.
+php /var/www/html/occ config:system:set auth.bruteforce.protection.enabled --value=false --type=boolean
+php /var/www/html/occ config:system:set ratelimit.protection.enabled --value=false --type=boolean
 
 echo "Waiting for Euro-Office document server to be ready..."
 until curl -sf http://eo/healthcheck > /dev/null 2>&1; do
@@ -9,6 +14,7 @@ until curl -sf http://eo/healthcheck > /dev/null 2>&1; do
 done
 echo "Document server is ready!"
 
+# Baseline URL; `make local` / `make mobile` rewrite this via `refresh-urls`.
 php /var/www/html/occ app:enable onlyoffice
 php /var/www/html/occ config:app:set onlyoffice DocumentServerUrl --value="http://localhost:8080/"
 php /var/www/html/occ config:app:set onlyoffice StorageUrl --value="http://nextcloud/"