Skip to content

Commit

Permalink
Stability improvements (#40)
Browse files Browse the repository at this point in the history
* Kill old server processes when we try to open a new space

* update engine submodule

* update the git commit sha for the engine

* Fix format using ./mirror-godot-app/scripts/file_format.sh

* Port static checks for mirror-godot-app to the repository
  • Loading branch information
RevoluPowered authored Mar 24, 2024
1 parent 10417e2 commit f563576
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 17 deletions.
13 changes: 13 additions & 0 deletions .github/workflows/static_checks.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
name: 📊 Static Checks
on: push

jobs:
format:
name: File formatting (mirror-godot-app/.workflows/scripts/file_format.sh)
runs-on: "ubuntu-latest"
steps:
- uses: actions/checkout@v3
- name: File formatting checks (file_format.sh)
run: |
cd ./mirror-godot-app/
bash .github/scripts/file_format.sh
2 changes: 1 addition & 1 deletion godot-engine
12 changes: 0 additions & 12 deletions mirror-godot-app/.github/workflows/static_checks.yml

This file was deleted.

2 changes: 1 addition & 1 deletion mirror-godot-app/project.godot
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ global_script_class_icons={
config/name="The Mirror"
config/version="Beta V1"
run/main_scene="res://scenes/boot_scene.tscn"
config/features=PackedStringArray("4.3", "8f207f96", "mirror")
config/features=PackedStringArray("4.3", "4309e8e8", "mirror")
boot_splash/bg_color=Color(0.0745098, 0.0862745, 0.184314, 1)
boot_splash/image="res://art/white_logo_slate_bg_with_text.png"
boot_splash/fullsize=false
Expand Down
5 changes: 3 additions & 2 deletions mirror-godot-app/scripts/autoload/zone/client.gd
Original file line number Diff line number Diff line change
Expand Up @@ -539,7 +539,9 @@ func _join_new_server_locally(space_id: String) -> bool:
# When we can ask mirror-web-server for an already existing server to connect to, first
# Then we will replace that flag, with that request being done and responded.
var should_create_a_new_server_locally = ProjectSettings.get_setting("feature_flags/always_spin_up_local_server", false)
if should_create_a_new_server_locally and pid == null:
if should_create_a_new_server_locally:
if pid != null:
OS.kill(pid)
var firebase_auth = str(Firebase.Auth.auth.refreshtoken)
print(firebase_auth)
var arguments = ["--server", "--space", space_id, "--mode", "edit", "--uuid", "localhost", "--server_login", firebase_auth, "--headless", "--remote-debug", "tcp://127.0.0.1:6008"]
Expand All @@ -552,7 +554,6 @@ func _join_new_server_locally(space_id: String) -> bool:
func _find_zone_by_space(space_id: String) -> void:
if _join_new_server_locally(space_id):
return

# Normal join process with dedicated servers
var promise = Net.zone_finder.join_build_server(space_id)
var build_server = await promise.wait_till_fulfilled()
Expand Down
2 changes: 1 addition & 1 deletion mirror-godot-app/ui/main_menu/pages/view_space.gd
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ func populate(space: Dictionary) -> void:
_updated_at_label.text = Util.datetime_dict_to_mmm_dd_yyyy(updated)
_url_label.text = _construct_space_url(_space.get("_id", "unknown"))
var creator_promise: Promise = Net.user_client.get_user_profile(_space.creator)
creator_promise.connect_func_to_fulfill(func():
creator_promise.connect_func_to_fulfill(func():
if creator_promise.is_error():
push_error("Failed to get creator")
var data = creator_promise.get_result()
Expand Down

0 comments on commit f563576

Please sign in to comment.