moving CloudSubsystem to plus since it requires plus anyway

.efrocachemap

@@ -4060,50 +4060,50 @@
   "build/assets/windows/Win32/ucrtbased.dll": "2def5335207d41b21b9823f6805997f1",
   "build/assets/windows/Win32/vc_redist.x86.exe": "b08a55e2e77623fe657bea24f223a3ae",
   "build/assets/windows/Win32/vcruntime140d.dll": "865b2af4d1e26a1a8073c89acb06e599",
-  "build/prefab/full/linux_arm64_gui/debug/ballisticakit": "c1f5b6a9fe5aee5baab40248a00eb606",
+  "build/prefab/full/linux_arm64_gui/debug/ballisticakit": "17021648748aac4145a79a9ad2874806",
-  "build/prefab/full/linux_arm64_gui/release/ballisticakit": "88888a9139b8a047d1dde25ae0aa9ea6",
+  "build/prefab/full/linux_arm64_gui/release/ballisticakit": "3b9736b07e5a81e09d32d29b9f054b7c",
-  "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "e51014b672283258ba29f546f3a8833e",
+  "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "24629b411382ddfdc80e6b634af8f3f6",
-  "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "811973441c2d7998445182b2ab4bcc24",
+  "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "6bd8e6f4545bf224c6141326fc68c80b",
-  "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "01e0fe6152b79211acec7e88a99c6579",
+  "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "e70899ffcd793fcae1342d41670d18ba",
-  "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "9e2b7acbcd3892af6be5f85bfe328c2c",
+  "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "9be993909a0dd46ac9b50d88f59de5f6",
-  "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "2f54025a53bb947c89eee520131eae52",
+  "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "028ab436f8631ec3e82b07f51ab845f0",
-  "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "b9df392dca06e52b958ea3c9b676ae6a",
+  "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "54603d34c3cccdd331c3288caf7c3b8d",
-  "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "f2ed10e0b5956ce8ef5b87c3e0c75eea",
+  "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "b0768168b9573ff8b671395ceca879da",
-  "build/prefab/full/mac_arm64_gui/release/ballisticakit": "e1c27e7ecb5272f92e6cfdb91b0750d3",
+  "build/prefab/full/mac_arm64_gui/release/ballisticakit": "1f5d24c9b683da8b6157df85355710ea",
-  "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "67827bd210a484f7d93974b581b95a85",
+  "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "497748396d5d71a475d95bfa6130bf1f",
-  "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "c03d44f4096cbffe0d1b3391a7b09555",
+  "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "39cc184e4dd9117d9d6ff6d5767ca05b",
-  "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "a78c8b08a19dc23d1881eee37fdbcfdd",
+  "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "e3d0c4e375306a0a4e62059d096c7d95",
-  "build/prefab/full/mac_x86_64_gui/release/ballisticakit": "ca2caba96a855ac6fa7459855bfa49bb",
+  "build/prefab/full/mac_x86_64_gui/release/ballisticakit": "ded06d43470afd7f2638ccc797de0912",
-  "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "9521bca3d6dc02e896fa01ab0ccdfd0c",
+  "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "50193a899f076eef856ad256c58419c7",
-  "build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "31762c816772ba2c0516c26589428c08",
+  "build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "1ec4be2102a46ac1a4412d8797288d56",
-  "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "ab72b100f5c1eaaac6264b8f662fabb7",
+  "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "04d51a7df2a3976afacf49d56159544f",
-  "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "edf145cc7855aced80f60766a9420df5",
+  "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "d408589fd7d143f06ade596bf3c6c7c8",
-  "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "4d4e6e57f179666e8f5a50352b9cda9b",
+  "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "ddbbfc7325cc0bf3e8439df2072ccc22",
-  "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "20babca2eb9cc062f583ecea557a945e",
+  "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "86623c711eee712df279e49302acb10e",
-  "build/prefab/lib/linux_arm64_gui/debug/libballisticaplus.a": "8ccecbffbaa9886636741cca293d2893",
+  "build/prefab/lib/linux_arm64_gui/debug/libballisticaplus.a": "7637fa3020d4da5ee313cb8c22e0399b",
-  "build/prefab/lib/linux_arm64_gui/release/libballisticaplus.a": "42679aef4dd8b35b39a2c968ff20ed45",
+  "build/prefab/lib/linux_arm64_gui/release/libballisticaplus.a": "c2c95b1ca36504784c20abdb42fae8db",
-  "build/prefab/lib/linux_arm64_server/debug/libballisticaplus.a": "8ccecbffbaa9886636741cca293d2893",
+  "build/prefab/lib/linux_arm64_server/debug/libballisticaplus.a": "7637fa3020d4da5ee313cb8c22e0399b",
-  "build/prefab/lib/linux_arm64_server/release/libballisticaplus.a": "42679aef4dd8b35b39a2c968ff20ed45",
+  "build/prefab/lib/linux_arm64_server/release/libballisticaplus.a": "c2c95b1ca36504784c20abdb42fae8db",
-  "build/prefab/lib/linux_x86_64_gui/debug/libballisticaplus.a": "b2c2c33149201227ba96459dbeeba012",
+  "build/prefab/lib/linux_x86_64_gui/debug/libballisticaplus.a": "68a8a98018e4c460744ff9bc2fb0b73c",
-  "build/prefab/lib/linux_x86_64_gui/release/libballisticaplus.a": "2b27b84fe8305b7f3829aa28ab5e5705",
+  "build/prefab/lib/linux_x86_64_gui/release/libballisticaplus.a": "ef801cfa392f59c790200380227b072c",
-  "build/prefab/lib/linux_x86_64_server/debug/libballisticaplus.a": "b2c2c33149201227ba96459dbeeba012",
+  "build/prefab/lib/linux_x86_64_server/debug/libballisticaplus.a": "68a8a98018e4c460744ff9bc2fb0b73c",
-  "build/prefab/lib/linux_x86_64_server/release/libballisticaplus.a": "2b27b84fe8305b7f3829aa28ab5e5705",
+  "build/prefab/lib/linux_x86_64_server/release/libballisticaplus.a": "ef801cfa392f59c790200380227b072c",
-  "build/prefab/lib/mac_arm64_gui/debug/libballisticaplus.a": "f6b49cee7baf1ee49598b803566d9914",
+  "build/prefab/lib/mac_arm64_gui/debug/libballisticaplus.a": "c6d59b3595cea948fda12f9346d5e753",
-  "build/prefab/lib/mac_arm64_gui/release/libballisticaplus.a": "a15dc59a2de8a8d32b32f07fe25d41b1",
+  "build/prefab/lib/mac_arm64_gui/release/libballisticaplus.a": "2a0b3096b5036abc7c5bcd33bf37ce9f",
-  "build/prefab/lib/mac_arm64_server/debug/libballisticaplus.a": "f6b49cee7baf1ee49598b803566d9914",
+  "build/prefab/lib/mac_arm64_server/debug/libballisticaplus.a": "c6d59b3595cea948fda12f9346d5e753",
-  "build/prefab/lib/mac_arm64_server/release/libballisticaplus.a": "a15dc59a2de8a8d32b32f07fe25d41b1",
+  "build/prefab/lib/mac_arm64_server/release/libballisticaplus.a": "2a0b3096b5036abc7c5bcd33bf37ce9f",
-  "build/prefab/lib/mac_x86_64_gui/debug/libballisticaplus.a": "80fd9070d92797ff6e26c0a5493dcb42",
+  "build/prefab/lib/mac_x86_64_gui/debug/libballisticaplus.a": "223989b257f0f4896d5b735cef7d35f6",
-  "build/prefab/lib/mac_x86_64_gui/release/libballisticaplus.a": "07c2b1098c1c08d2e28934a6f0e1fcf2",
+  "build/prefab/lib/mac_x86_64_gui/release/libballisticaplus.a": "97db7ec9f3232827279df483227293e5",
-  "build/prefab/lib/mac_x86_64_server/debug/libballisticaplus.a": "724d8dcd34fb6c2c0109906d44a4fb12",
+  "build/prefab/lib/mac_x86_64_server/debug/libballisticaplus.a": "61a149df0a13696ebdcd7e95a6106604",
-  "build/prefab/lib/mac_x86_64_server/release/libballisticaplus.a": "07c2b1098c1c08d2e28934a6f0e1fcf2",
+  "build/prefab/lib/mac_x86_64_server/release/libballisticaplus.a": "97db7ec9f3232827279df483227293e5",
-  "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "698b55a6c11f38e5c28587a7039e6175",
+  "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "9a2ee7823e832e274ed891779b723a9e",
-  "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "753db5761ce823966fcef472b73e06d1",
+  "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "a23bf4fd8abd100afae92ceaacddb222",
-  "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "b1e41720089a0d7724337071442238c9",
+  "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "070f7105134f16fdf507d243c5b149b3",
-  "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "37d3e9fa31a003dd9609f476d4165d12",
+  "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "e87d4ad432185815cfe9b5e0e3d14192",
-  "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "105f4dc0399235e4a9c25c3977febec8",
+  "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "0fb5ebecdf7d3f43948967a7141a576f",
-  "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "820c04dd9965698a86e4f5efffdb729d",
+  "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "3a7717589e3c989d744f9a1414c4ad73",
-  "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "070727ad10a727b22beef6ee736c7a5f",
+  "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "89717c9d08ac5ed3d7572184278ef60e",
-  "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "6d2969401a8a022e28f4680b01004a50",
+  "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "7562cde17f374b229668f8ddd0cd982e",
   "src/assets/ba_data/python/babase/_mgen/__init__.py": "f885fed7f2ed98ff2ba271f9dbe3391c",
   "src/assets/ba_data/python/babase/_mgen/enums.py": "b611c090513a21e2fe90e56582724e9d",
   "src/ballistica/base/mgen/pyembed/binding_base.inc": "72bfed2cce8ff19741989dec28302f3f",

src/assets/.asset_manifest_public.json

@@ -13,7 +13,6 @@
  "ba_data/python/babase/__pycache__/_apputils.cpython-311.opt-1.pyc",
  "ba_data/python/babase/__pycache__/_assetmanager.cpython-311.opt-1.pyc",
  "ba_data/python/babase/__pycache__/_asyncio.cpython-311.opt-1.pyc",
- "ba_data/python/babase/__pycache__/_cloud.cpython-311.opt-1.pyc",
  "ba_data/python/babase/__pycache__/_devconsole.cpython-311.opt-1.pyc",
  "ba_data/python/babase/__pycache__/_emptyappmode.cpython-311.opt-1.pyc",
  "ba_data/python/babase/__pycache__/_env.cpython-311.opt-1.pyc",
@@ -42,7 +41,6 @@
  "ba_data/python/babase/_apputils.py",
  "ba_data/python/babase/_assetmanager.py",
  "ba_data/python/babase/_asyncio.py",
- "ba_data/python/babase/_cloud.py",
  "ba_data/python/babase/_devconsole.py",
  "ba_data/python/babase/_emptyappmode.py",
  "ba_data/python/babase/_env.py",
@@ -121,8 +119,10 @@
  "ba_data/python/baenv.py",
  "ba_data/python/baplus/__init__.py",
  "ba_data/python/baplus/__pycache__/__init__.cpython-311.opt-1.pyc",
+ "ba_data/python/baplus/__pycache__/_cloud.cpython-311.opt-1.pyc",
  "ba_data/python/baplus/__pycache__/_hooks.cpython-311.opt-1.pyc",
  "ba_data/python/baplus/__pycache__/_subsystem.cpython-311.opt-1.pyc",
+ "ba_data/python/baplus/_cloud.py",
  "ba_data/python/baplus/_hooks.py",
  "ba_data/python/baplus/_subsystem.py",
  "ba_data/python/bascenev1/__init__.py",

src/assets/Makefile

@@ -171,7 +171,6 @@ SCRIPT_TARGETS_PY_PUBLIC = \
   $(BUILD_DIR)/ba_data/python/babase/_apputils.py \
   $(BUILD_DIR)/ba_data/python/babase/_assetmanager.py \
   $(BUILD_DIR)/ba_data/python/babase/_asyncio.py \
-  $(BUILD_DIR)/ba_data/python/babase/_cloud.py \
   $(BUILD_DIR)/ba_data/python/babase/_devconsole.py \
   $(BUILD_DIR)/ba_data/python/babase/_emptyappmode.py \
   $(BUILD_DIR)/ba_data/python/babase/_env.py \
@@ -210,6 +209,7 @@ SCRIPT_TARGETS_PY_PUBLIC = \
   $(BUILD_DIR)/ba_data/python/baclassic/osmusic.py \
   $(BUILD_DIR)/ba_data/python/baenv.py \
   $(BUILD_DIR)/ba_data/python/baplus/__init__.py \
+  $(BUILD_DIR)/ba_data/python/baplus/_cloud.py \
   $(BUILD_DIR)/ba_data/python/baplus/_hooks.py \
   $(BUILD_DIR)/ba_data/python/baplus/_subsystem.py \
   $(BUILD_DIR)/ba_data/python/bascenev1/__init__.py \
@@ -446,7 +446,6 @@ SCRIPT_TARGETS_PYC_PUBLIC = \
   $(BUILD_DIR)/ba_data/python/babase/__pycache__/_apputils.cpython-311.opt-1.pyc \
   $(BUILD_DIR)/ba_data/python/babase/__pycache__/_assetmanager.cpython-311.opt-1.pyc \
   $(BUILD_DIR)/ba_data/python/babase/__pycache__/_asyncio.cpython-311.opt-1.pyc \
-  $(BUILD_DIR)/ba_data/python/babase/__pycache__/_cloud.cpython-311.opt-1.pyc \
   $(BUILD_DIR)/ba_data/python/babase/__pycache__/_devconsole.cpython-311.opt-1.pyc \
   $(BUILD_DIR)/ba_data/python/babase/__pycache__/_emptyappmode.cpython-311.opt-1.pyc \
   $(BUILD_DIR)/ba_data/python/babase/__pycache__/_env.cpython-311.opt-1.pyc \
@@ -485,6 +484,7 @@ SCRIPT_TARGETS_PYC_PUBLIC = \
   $(BUILD_DIR)/ba_data/python/baclassic/__pycache__/osmusic.cpython-311.opt-1.pyc \
   $(BUILD_DIR)/ba_data/python/__pycache__/baenv.cpython-311.opt-1.pyc \
   $(BUILD_DIR)/ba_data/python/baplus/__pycache__/__init__.cpython-311.opt-1.pyc \
+  $(BUILD_DIR)/ba_data/python/baplus/__pycache__/_cloud.cpython-311.opt-1.pyc \
   $(BUILD_DIR)/ba_data/python/baplus/__pycache__/_hooks.cpython-311.opt-1.pyc \
   $(BUILD_DIR)/ba_data/python/baplus/__pycache__/_subsystem.cpython-311.opt-1.pyc \
   $(BUILD_DIR)/ba_data/python/bascenev1/__pycache__/__init__.cpython-311.opt-1.pyc \

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

@@ -118,7 +118,6 @@ from babase._apputils import (
     get_remote_app_name,
     AppHealthMonitor,
 )
-from babase._cloud import CloudSubsystem
 from babase._devconsole import (
     DevConsoleTab,
     DevConsoleTabEntry,
@@ -213,7 +212,6 @@ __all__ = [
     'clipboard_has_text',
     'clipboard_is_supported',
     'clipboard_set_text',
-    'CloudSubsystem',
     'commit_app_config',
     'ContextCall',
     'ContextError',

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

@@ -16,9 +16,11 @@ from __future__ import annotations
 
 import logging
 
+from baplus._cloud import CloudSubsystem
 from baplus._subsystem import PlusSubsystem
 
 __all__ = [
+    'CloudSubsystem',
     'PlusSubsystem',
 ]
 

src/assets/ba_data/python/baplus/_cloud.py

@@ -7,8 +7,7 @@ from __future__ import annotations
 import logging
 from typing import TYPE_CHECKING, overload
 
-import _babase
+import babase
-from babase._appsubsystem import AppSubsystem
 
 if TYPE_CHECKING:
     from typing import Callable, Any
@@ -23,7 +22,7 @@ DEBUG_LOG = False
 # internal protocols.
 
 
-class CloudSubsystem(AppSubsystem):
+class CloudSubsystem(babase.AppSubsystem):
     """Manages communication with cloud components."""
 
     @property
@@ -44,7 +43,7 @@ class CloudSubsystem(AppSubsystem):
         if DEBUG_LOG:
             logging.debug('CloudSubsystem: Connectivity is now %s.', connected)
 
-        plus = _babase.app.plus
+        plus = babase.app.plus
         assert plus is not None
 
         # Inform things that use this.
@@ -117,12 +116,11 @@ class CloudSubsystem(AppSubsystem):
         The provided on_response call will be run in the logic thread
         and passed either the response or the error that occurred.
         """
-        from babase._general import Call
 
         del msg  # Unused.
 
-        _babase.pushcall(
+        babase.pushcall(
-            Call(
+            babase.Call(
                 on_response,
                 RuntimeError('Cloud functionality is not available.'),
             )
@@ -188,7 +186,7 @@ def cloud_console_exec(code: str) -> None:
     except Exception:
         import traceback
 
-        apptime = _babase.apptime()
+        apptime = babase.apptime()
         print(f'Exec error at time {apptime:.2f}.', file=sys.stderr)
         traceback.print_exc()
 

src/assets/ba_data/python/baplus/_subsystem.py

@@ -11,7 +11,8 @@ from babase import AppSubsystem
 if TYPE_CHECKING:
     from typing import Callable, Any
 
-    from babase import CloudSubsystem, AccountV2Subsystem
+    from baplus._cloud import CloudSubsystem
+    from babase import AccountV2Subsystem
 
 
 class PlusSubsystem(AppSubsystem):

src/assets/ba_data/python/bauiv1lib/promocode.py

@@ -191,6 +191,10 @@ async def _run_code(code: str) -> None:
     plus = bui.app.plus
     assert plus is not None
 
+    # If we're signed in with a V2 account, ship this to V2 server.
+    # if plus.accounts.primary is not None:
+    #     plus.cloud.send_message
+
     plus.add_v1_account_transaction(
         {
             'type': 'PROMO_CODE',