Revamp is_hosted() -> in_shiny_server()

Author: schloerke

shiny/bookmark/_restore_state.py

@@ -9,8 +9,8 @@
 from urllib.parse import parse_qs, parse_qsl
 
 from ._bookmark_state import local_restore_dir
-from ._utils import from_json_str, is_hosted
 from ._types import BookmarkRestoreDirFn
+from ._utils import from_json_str, in_shiny_server
 
 if TYPE_CHECKING:
     from .._app import App
@@ -191,7 +191,7 @@ async def _load_state_qs(self, query_string: str, *, app: App) -> None:
         load_bookmark_fn: BookmarkRestoreDirFn | None = app._bookmark_restore_dir_fn
 
         if load_bookmark_fn is None:
-            if is_hosted():
+            if in_shiny_server():
                 raise NotImplementedError(
                     "The hosting environment does not support server-side bookmarking."
                 )

shiny/bookmark/_save_state.py

@@ -8,8 +8,8 @@
 from .._utils import private_random_id
 from ..reactive import isolate
 from ._bookmark_state import local_save_dir
-from ._utils import is_hosted, to_json_str
 from ._types import BookmarkSaveDirFn
+from ._utils import in_shiny_server, to_json_str
 
 if TYPE_CHECKING:
     from shiny._app import App
@@ -75,7 +75,7 @@ async def _save_state(self, *, app: App) -> str:
         save_bookmark_fn: BookmarkSaveDirFn | None = app._bookmark_save_dir_fn
 
         if save_bookmark_fn is None:
-            if is_hosted():
+            if in_shiny_server():
                 # TODO: Barret; Implement `bookmark_save_dir` for Connect
                 raise NotImplementedError(
                     "The hosting environment does not support server-side bookmarking."

shiny/bookmark/_utils.py

@@ -6,17 +6,13 @@
 import orjson
 
 
-def is_hosted() -> bool:
-    # Can't look at SHINY_PORT, as we already set it in shiny/_main.py's `run_app()`
+# https://github.com/rstudio/shiny/blob/f55c26af4a0493b082d2967aca6d36b90795adf1/R/server.R#L510-L514
+def in_shiny_server() -> bool:
+    shiny_port = os.environ.get("SHINY_PORT")
+    if shiny_port is None or shiny_port == "":
+        return False
 
-    # TODO: Barret: Q: How to support shinyapps.io? Or use `SHINY_PORT` how R-shiny did
-
-    # Instead, looking for the presence of the environment variable that Connect sets
-    # (*_Connect) or Shiny Server sets (SHINY_APP)
-    for env_var in ("POSIT_CONNECT", "RSTUDIO_CONNECT", "SHINY_APP"):
-        if env_var in os.environ:
-            return True
-    return False
+    return True
 
 
 def to_json_str(x: Any) -> str: