Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: add support for remote devices with re-frisk server #21805

Merged
merged 5 commits into from
Jan 18, 2025
Merged

chore: add support for remote devices with re-frisk server #21805

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3dadd1e
chore: support overriding and defaulting re-frisk remote port in make…
seanstrom Dec 10, 2024
1695096
chore: add definitions for re-frisk environment variables in status c…
seanstrom Dec 10, 2024
617809e
chore: add re-frisk remote dev preload with host and port overrides
seanstrom Dec 10, 2024
bea3ef4
chore: replace re-frisk dev preload with local preload
seanstrom Dec 10, 2024
01e0976
chore: use make variable for android port forwarding
seanstrom Dec 12, 2024
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
6 changes: 4 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,9 +267,11 @@ run-metro: export TARGET := clojure
run-metro: ##@run Start Metro to build React Native changes
@scripts/run-metro.sh

export RE_FRISK_PORT ?= 4567
seanstrom marked this conversation as resolved.
Show resolved Hide resolved

run-re-frisk: export TARGET := clojure
run-re-frisk: ##@run Start re-frisk server
yarn shadow-cljs run re-frisk-remote.core/start
yarn shadow-cljs run re-frisk-remote.core/start ${RE_FRISK_PORT}

# TODO: Migrate this to a Nix recipe, much the same way as nix/mobile/android/targets/release-android.nix
run-android: export TARGET := android
Expand Down Expand Up @@ -443,7 +445,7 @@ android-ports: export RCT_METRO_PORT ?= 8081
android-ports: ##@other Add proxies to Android Device/Simulator
adb reverse tcp:$(RCT_METRO_PORT) tcp:$(RCT_METRO_PORT) && \
adb reverse tcp:3449 tcp:3449 && \
adb reverse tcp:4567 tcp:4567 && \
adb reverse tcp:$(RE_FRISK_PORT) tcp:$(RE_FRISK_PORT) && \
adb reverse tcp:$(FLOWSTORM_PORT) tcp:$(FLOWSTORM_PORT) && \
adb forward tcp:5561 tcp:5561

Expand Down
2 changes: 1 addition & 1 deletion shadow-cljs.edn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
:preloads [;; The official recommendation is to
;; load the debugger preload first.
flow-storm.api
re-frisk-remote.preload
dev.re-frisk-preload
status-im.setup.schema-preload
;; In order to use component test helpers in the REPL we need to
;; preload namespaces that are not normally required by
Expand Down
5 changes: 5 additions & 0 deletions src/dev/re_frisk_preload.cljs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
(ns dev.re-frisk-preload
(:require [re-frisk-remote.core :as re-frisk-remote]
[status-im.config]))

(re-frisk-remote/enable {:host (str status-im.config/re-frisk-host ":" status-im.config/re-frisk-port)})
3 changes: 3 additions & 0 deletions src/status_im/config.cljs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,3 +124,6 @@
(goog-define STATUS_BACKEND_SERVER_ROOT_DATA_DIR "")
;; if you're using android simulator, I suggest set the env variable to "http://10.0.2.2:"
(goog-define STATUS_BACKEND_SERVER_IMAGE_SERVER_URI_PREFIX "https://localhost:")

(def re-frisk-host (get-config :RE_FRISK_HOST "http://localhost"))
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the default, but what I like to do is change this to my computer's local hostname. For example, when the mobile device and my laptop are on the same network, my phone can access my computer by its local hostname like dev.local.

This is nice because using the local hostname avoids needing to update the RE_FRISK_HOST variable whenever the IP address changes.

(def re-frisk-port (get-config :RE_FRISK_PORT "4567"))