more client-server work

CHANGELOG.md

@@ -1,4 +1,4 @@
-### 1.7.37 (build 22105, api 9, 2024-11-19)
+### 1.7.37 (build 22106, api 9, 2024-11-22)
 - Bumping api version to 9. As you'll see below, there's some UI changes that
   will require a bit of work for any UI mods to adapt to. If your mods don't
   touch UI stuff at all you can simply bump your api version and call it a day.

src/assets/.asset_manifest_public.json

@@ -22,6 +22,7 @@
  "ba_data/python/babase/__pycache__/_general.cpython-312.opt-1.pyc",
  "ba_data/python/babase/__pycache__/_hooks.cpython-312.opt-1.pyc",
  "ba_data/python/babase/__pycache__/_language.cpython-312.opt-1.pyc",
+ "ba_data/python/babase/__pycache__/_logging.cpython-312.opt-1.pyc",
  "ba_data/python/babase/__pycache__/_login.cpython-312.opt-1.pyc",
  "ba_data/python/babase/__pycache__/_math.cpython-312.opt-1.pyc",
  "ba_data/python/babase/__pycache__/_meta.cpython-312.opt-1.pyc",
@@ -52,6 +53,7 @@
  "ba_data/python/babase/_general.py",
  "ba_data/python/babase/_hooks.py",
  "ba_data/python/babase/_language.py",
+ "ba_data/python/babase/_logging.py",
  "ba_data/python/babase/_login.py",
  "ba_data/python/babase/_math.py",
  "ba_data/python/babase/_meta.py",

src/assets/Makefile

@@ -185,6 +185,7 @@ SCRIPT_TARGETS_PY_PUBLIC = \
   $(BUILD_DIR)/ba_data/python/babase/_general.py \
   $(BUILD_DIR)/ba_data/python/babase/_hooks.py \
   $(BUILD_DIR)/ba_data/python/babase/_language.py \
+  $(BUILD_DIR)/ba_data/python/babase/_logging.py \
   $(BUILD_DIR)/ba_data/python/babase/_login.py \
   $(BUILD_DIR)/ba_data/python/babase/_math.py \
   $(BUILD_DIR)/ba_data/python/babase/_meta.py \
@@ -464,6 +465,7 @@ SCRIPT_TARGETS_PYC_PUBLIC = \
   $(BUILD_DIR)/ba_data/python/babase/__pycache__/_general.cpython-312.opt-1.pyc \
   $(BUILD_DIR)/ba_data/python/babase/__pycache__/_hooks.cpython-312.opt-1.pyc \
   $(BUILD_DIR)/ba_data/python/babase/__pycache__/_language.cpython-312.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/babase/__pycache__/_logging.cpython-312.opt-1.pyc \
   $(BUILD_DIR)/ba_data/python/babase/__pycache__/_login.cpython-312.opt-1.pyc \
   $(BUILD_DIR)/ba_data/python/babase/__pycache__/_math.cpython-312.opt-1.pyc \
   $(BUILD_DIR)/ba_data/python/babase/__pycache__/_meta.cpython-312.opt-1.pyc \

src/assets/ba_data/python/babase/__init__.py

@@ -17,15 +17,14 @@
 # dependency loops. The exception is TYPE_CHECKING blocks and
 # annotations since those aren't evaluated at runtime.
 
-import logging
 from efro.util import set_canonical_module_names
 
-
 import _babase
 from _babase import (
     add_clean_frame_callback,
     allows_ticket_sales,
     android_get_external_files_dir,
+    app_instance_uuid,
     appname,
     appnameupper,
     apptime,
@@ -114,6 +113,7 @@
     unlock_all_input,
     update_internal_logger_levels,
     user_agent_string,
+    user_ran_commands,
     Vec3,
     workspaces_in_use,
 )
@@ -172,10 +172,9 @@
     get_type_name,
 )
 from babase._language import Lstr, LanguageSubsystem
+from babase._logging import balog, lifecyclelog
 from babase._login import LoginAdapter, LoginInfo
 
-# noinspection PyProtectedMember
-# (PyCharm inspection bug?)
 from babase._mgen.enums import (
     Permission,
     SpecialChar,
@@ -190,8 +189,6 @@
 from babase._stringedit import StringEditAdapter, StringEditSubsystem
 from babase._text import timestring
 
-# Our standard set of loggers.
-balog = logging.getLogger('ba')
 
 _babase.app = app = App()
 app.postinit()
@@ -213,6 +210,7 @@
     'AppIntentDefault',
     'AppIntentExec',
     'AppMode',
+    'app_instance_uuid',
     'appname',
     'appnameupper',
     'AppModeSelector',
@@ -287,6 +285,7 @@
     'is_point_in_box',
     'is_xcode_build',
     'LanguageSubsystem',
+    'lifecyclelog',
     'lock_all_input',
     'LoginAdapter',
     'LoginInfo',
@@ -356,6 +355,7 @@
     'unlock_all_input',
     'update_internal_logger_levels',
     'user_agent_string',
+    'user_ran_commands',
     'utf8_all',
     'Vec3',
     'vec3validate',

src/assets/ba_data/python/babase/_app.py

@@ -24,6 +24,7 @@
 from babase._stringedit import StringEditSubsystem
 from babase._devconsole import DevConsoleSubsystem
 from babase._appconfig import AppConfig
+from babase._logging import lifecyclelog
 
 if TYPE_CHECKING:
     import asyncio
@@ -871,7 +872,7 @@ def _on_running(self) -> None:
     def _apply_app_config(self) -> None:
         assert _babase.in_logic_thread()
 
-        _babase.lifecyclelog('apply-app-config')
+        lifecyclelog.info('apply-app-config')
 
         # If multiple apply calls have been made, only actually apply
         # once.
@@ -903,7 +904,7 @@ def _update_state(self) -> None:
         if self._native_shutdown_complete_called:
             if self.state is not self.State.SHUTDOWN_COMPLETE:
                 self.state = self.State.SHUTDOWN_COMPLETE
-                _babase.lifecyclelog(f'app-state is now {self.state.name}')
+                lifecyclelog.info('app-state is now %s', self.state.name)
                 self._on_shutdown_complete()
 
         # Shutdown trumps all. Though we can't start shutting down until
@@ -913,7 +914,7 @@ def _update_state(self) -> None:
             # Entering shutdown state:
             if self.state is not self.State.SHUTTING_DOWN:
                 self.state = self.State.SHUTTING_DOWN
-                _babase.lifecyclelog(f'app-state is now {self.state.name}')
+                lifecyclelog.info('app-state is now %s', self.state.name)
                 self._on_shutting_down()
 
         elif self._native_suspended:
@@ -930,7 +931,7 @@ def _update_state(self) -> None:
             if self._initial_sign_in_completed and self._meta_scan_completed:
                 if self.state != self.State.RUNNING:
                     self.state = self.State.RUNNING
-                    _babase.lifecyclelog(f'app-state is now {self.state.name}')
+                    lifecyclelog.info('app-state is now %s', self.state.name)
                     if not self._called_on_running:
                         self._called_on_running = True
                         self._on_running()
@@ -939,7 +940,7 @@ def _update_state(self) -> None:
             elif self._init_completed:
                 if self.state is not self.State.LOADING:
                     self.state = self.State.LOADING
-                    _babase.lifecyclelog(f'app-state is now {self.state.name}')
+                    lifecyclelog.info('app-state is now %s', self.state.name)
                     if not self._called_on_loading:
                         self._called_on_loading = True
                         self._on_loading()
@@ -948,7 +949,7 @@ def _update_state(self) -> None:
             elif self._native_bootstrapping_completed:
                 if self.state is not self.State.INITING:
                     self.state = self.State.INITING
-                    _babase.lifecyclelog(f'app-state is now {self.state.name}')
+                    lifecyclelog.info('app-state is now %s', self.state.name)
                     if not self._called_on_initing:
                         self._called_on_initing = True
                         self._on_initing()
@@ -957,7 +958,7 @@ def _update_state(self) -> None:
             elif self._native_start_called:
                 if self.state is not self.State.NATIVE_BOOTSTRAPPING:
                     self.state = self.State.NATIVE_BOOTSTRAPPING
-                    _babase.lifecyclelog(f'app-state is now {self.state.name}')
+                    lifecyclelog.info('app-state is now %s', self.state.name)
             else:
                 # Only logical possibility left is NOT_STARTED, in which
                 # case we should not be getting called.
@@ -1068,10 +1069,10 @@ async def _wait_for_shutdown_suppressions(self) -> None:
 
         # Spin and wait for anything blocking shutdown to complete.
         starttime = _babase.apptime()
-        _babase.lifecyclelog('shutdown-suppress-wait begin')
+        lifecyclelog.info('shutdown-suppress-wait begin')
         while _babase.shutdown_suppress_count() > 0:
             await asyncio.sleep(0.001)
-        _babase.lifecyclelog('shutdown-suppress-wait end')
+        lifecyclelog.info('shutdown-suppress-wait end')
         duration = _babase.apptime() - starttime
         if duration > 1.0:
             logging.warning(
@@ -1084,7 +1085,7 @@ async def _fade_and_shutdown_graphics(self) -> None:
         import asyncio
 
         # Kick off a short fade and give it time to complete.
-        _babase.lifecyclelog('fade-and-shutdown-graphics begin')
+        lifecyclelog.info('fade-and-shutdown-graphics begin')
         _babase.fade_screen(False, time=0.15)
         await asyncio.sleep(0.15)
 
@@ -1093,19 +1094,19 @@ async def _fade_and_shutdown_graphics(self) -> None:
         _babase.graphics_shutdown_begin()
         while not _babase.graphics_shutdown_is_complete():
             await asyncio.sleep(0.01)
-        _babase.lifecyclelog('fade-and-shutdown-graphics end')
+        lifecyclelog.info('fade-and-shutdown-graphics end')
 
     async def _fade_and_shutdown_audio(self) -> None:
         import asyncio
 
         # Tell the audio system to go down and give it a bit of
         # time to do so gracefully.
-        _babase.lifecyclelog('fade-and-shutdown-audio begin')
+        lifecyclelog.info('fade-and-shutdown-audio begin')
         _babase.audio_shutdown_begin()
         await asyncio.sleep(0.15)
         while not _babase.audio_shutdown_is_complete():
             await asyncio.sleep(0.01)
-        _babase.lifecyclelog('fade-and-shutdown-audio end')
+        lifecyclelog.info('fade-and-shutdown-audio end')
 
     def _threadpool_no_wait_done(self, fut: Future) -> None:
         try:

src/assets/ba_data/python/babase/_logging.py

@@ -0,0 +1,11 @@
+# Released under the MIT License. See LICENSE for details.
+#
+"""Logging functionality."""
+
+from __future__ import annotations
+
+import logging
+
+# Our standard set of loggers.
+balog = logging.getLogger('ba')
+lifecyclelog = logging.getLogger('ba.lifecycle')

src/assets/ba_data/python/baclassic/_appmode.py

@@ -3,6 +3,7 @@
 """Contains ClassicAppMode."""
 from __future__ import annotations
 
+import os
 import logging
 from functools import partial
 from typing import TYPE_CHECKING, override
@@ -157,8 +158,8 @@ def update_for_primary_account(
         """Update subscriptions/etc. for a new primary account state."""
         assert in_logic_thread()
 
-        # Test subscription.
-        if bool(False):
+        # For testing subscription functionality.
+        if os.environ.get('BA_SUBSCRIPTION_TEST') == '1':
             assert app.plus is not None
             if account is None:
                 self._test_sub = None