Request unused port for the webserver instead of hardcoding a default and iterating until an unused port is found

Author: cibere

CHANGELOG.txt

@@ -1,10 +1,3 @@
-v0.2.0
+v0.2.1
 
-- redo offline docs instructions
-- Add the ability to have "live" lookups (disable the usage of a cache for a library)
-- rewrite the settings code to store your libraries in a `libraries.pickle` file, away from the standard flow plugin setting.
-    - on startup, check for libraries stored the pre-0.2.0 way, and if found, move them to the pickle file.
-- make the file not found error to be more human readable
-- Allow local docs without the need to use file protocol urls
-    - Convert file protocol urls to normal paths for backward compatibility
-- If the default port (2907) is taken, increment until an available one is found
+- Request unused port for the webserver instead of hardcoding a default and iterating until an unused port is found

SettingsTemplate.yaml

@@ -1,4 +1,4 @@
 body:
   - type: textBlock
     attributes:
-      description: Thank you for using rtfm. Due to limits with flow and the way this plugin was written, I am unable to put the plugin settings in this settings menu. By default, your plugin settings can be accessed by going to the following website "http://localhost:2907/". Additionally, the default settings keyword is "rtfm", which will give you quick access to the website and a button to reload the cache.
+      description: Thank you for using rtfm. Due to limits with flow and the way this plugin was written, I am unable to put the plugin settings in this settings menu. By default, the settings keyword is "rtfm". Using this keyword, you can open up the settings menu.

plugin.json

@@ -4,7 +4,7 @@
     "Name": "rtfm",
     "Description": "a rtfm lookup plugin",
     "Author": "cibere",
-    "Version": "0.2.0",
+    "Version": "0.2.1",
     "Language": "python_v2",
     "Website": "https://github.com/cibere/Flow.Launcher.Plugin.rtfm",
     "IcoPath": "assets/app.png",

plugin/server/core.py

@@ -13,8 +13,6 @@
     from ..plugin import RtfmPlugin
 
 log = logging.getLogger("webserver")
-DEFAULT_PORT = 2908
-
 
 def build_app(
     write_settings: Callable[[list[dict[str, str]]], None],
@@ -74,27 +72,15 @@ async def get_local_doc_path(request: web.Request):
     return app
 
 
-async def start_runner(app: web.Application, host: str, port: int) -> int:
+async def start_runner(app: web.Application, host: str, port: int):
     runner = web.AppRunner(app)
     await runner.setup()
 
     site = web.TCPSite(runner, host, port)
-    try:
-        await site.start()
-    except OSError as e:
-        # port already used
-        if e.errno == 10048:
-            new_port = port + 1
-            log.exception(
-                f"Could not start on port {port!r}, incremending port and trying again on {new_port!r}",
-                exc_info=e,
-            )
-            return await start_runner(app, host, new_port)
-        raise
-    else:
-        log.info(f"Started on port {port!r}")
-        return port
+    await site.start()
 
+    socket_info: tuple[str, int] = site._server.sockets[0].getsockname() # type: ignore
+    return socket_info[1]
 
 async def run_app(
     write_settings: Callable[[list[dict[str, str]]], None],
@@ -103,7 +89,7 @@ async def run_app(
     run_forever: bool = True,
 ):
     app = build_app(write_settings, plugin)
-    port = await start_runner(app, "localhost", DEFAULT_PORT)
+    port = await start_runner(app, "localhost", 0)
 
     plugin.webserver_port = port