Fork honcho in dev

Author: davegaeddert

plain-dev/LICENSE

@@ -1,3 +1,5 @@
+## Plain is released under the BSD 3-Clause License
+
 BSD 3-Clause License
 
 Copyright (c) 2023, Dropseed, LLC
@@ -26,3 +28,26 @@ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
 CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
 OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+## This package contains code forked from github.com/nickstenning/honcho
+
+Copyright (c) 2012-2024 Nick Stenning, https://whiteink.com/
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

plain-dev/plain/dev/cli.py

@@ -8,13 +8,13 @@
 
 import click
 import tomllib
-from honcho.manager import Manager as HonchoManager
 
 from plain.runtime import APP_PATH, settings
 
 from .db import cli as db_cli
 from .mkcert import MkcertManager
 from .pid import Pid
+from .poncho.manager import Manager as PonchoManager
 from .services import Services
 from .utils import has_pyproject_toml, plainpackage_installed
 
@@ -48,7 +48,7 @@ def services():
 
 class Dev:
     def __init__(self, *, port):
-        self.manager = HonchoManager()
+        self.poncho = PonchoManager()
         self.port = port
         self.plain_env = {
             **os.environ,
@@ -76,9 +76,11 @@ def run(self):
                 storage_path=Path(settings.PLAIN_TEMP_PATH) / "dev" / "certs",
             )
             self.modify_hosts_file()
-            self.add_csrf_trusted_origins()
-            self.add_allowed_hosts()
+            self.set_csrf_trusted_origins()
+            self.set_allowed_hosts()
             self.run_preflight()
+
+            # Processes for poncho to run simultaneously
             self.add_gunicorn()
             self.add_tailwind()
             self.add_pyproject_run()
@@ -91,9 +93,9 @@ def run(self):
                 bold=True,
             )
 
-            self.manager.loop()
+            self.poncho.loop()
 
-            return self.manager.returncode
+            return self.poncho.returncode
         finally:
             pid.rm()
 
@@ -152,7 +154,7 @@ def modify_hosts_file(self):
                 )
                 sys.exit(1)
 
-    def add_csrf_trusted_origins(self):
+    def set_csrf_trusted_origins(self):
         csrf_trusted_origins = json.dumps(
             [
                 f"https://{self.domain}:{self.port}",
@@ -168,7 +170,7 @@ def add_csrf_trusted_origins(self):
         self.plain_env["PLAIN_CSRF_TRUSTED_ORIGINS"] = csrf_trusted_origins
         self.custom_process_env["PLAIN_CSRF_TRUSTED_ORIGINS"] = csrf_trusted_origins
 
-    def add_allowed_hosts(self):
+    def set_allowed_hosts(self):
         allowed_hosts = json.dumps([self.domain])
 
         click.secho(
@@ -226,13 +228,13 @@ def add_gunicorn(self):
             # Default to two workers to prevent lockups
             self.plain_env["WEB_CONCURRENCY"] = "2"
 
-        self.manager.add_process("plain", runserver_cmd, env=self.plain_env)
+        self.poncho.add_process("plain", runserver_cmd, env=self.plain_env)
 
     def add_tailwind(self):
         if not plainpackage_installed("tailwind"):
             return
 
-        self.manager.add_process("tailwind", "plain tailwind compile --watch")
+        self.poncho.add_process("tailwind", "plain tailwind compile --watch")
 
     def add_pyproject_run(self):
         if not has_pyproject_toml(APP_PATH.parent):
@@ -249,7 +251,7 @@ def add_pyproject_run(self):
                 **self.custom_process_env,
                 **data.get("env", {}),
             }
-            self.manager.add_process(name, data["cmd"], env=env)
+            self.poncho.add_process(name, data["cmd"], env=env)
 
     def add_services(self):
         services = Services.get_services(APP_PATH.parent)
@@ -259,7 +261,7 @@ def add_services(self):
                 "PYTHONUNBUFFERED": "true",
                 **data.get("env", {}),
             }
-            self.manager.add_process(name, data["cmd"], env=env)
+            self.poncho.add_process(name, data["cmd"], env=env)
 
 
 cli.add_command(db_cli)

plain-dev/plain/dev/poncho/__init__.py

@@ -0,0 +1,4 @@
+try:
+    from ._version import __version__
+except ImportError:
+    __version__ = "0.0.0+unknown"

plain-dev/plain/dev/poncho/color.py

@@ -0,0 +1,28 @@
+ANSI_COLOURS = ["grey", "red", "green", "yellow", "blue", "magenta", "cyan", "white"]
+
+for i, name in enumerate(ANSI_COLOURS):
+    globals()[name] = str(30 + i)
+    globals()["intense_" + name] = str(30 + i) + ";1"
+
+
+def get_colors():
+    cs = [
+        "cyan",
+        "yellow",
+        "green",
+        "magenta",
+        "red",
+        "blue",
+        "intense_cyan",
+        "intense_yellow",
+        "intense_green",
+        "intense_magenta",
+        "intense_red",
+        "intense_blue",
+    ]
+    cs = [globals()[c] for c in cs]
+
+    i = 0
+    while True:
+        yield cs[i % len(cs)]
+        i += 1

plain-dev/plain/dev/poncho/compat.py

@@ -0,0 +1,47 @@
+"""
+Compatibility layer and utilities, mostly for proper Windows and Python 3
+support.
+"""
+import errno
+import os
+import signal
+import sys
+
+# This works for both 32 and 64 bit Windows
+ON_WINDOWS = "win32" in str(sys.platform).lower()
+
+if ON_WINDOWS:
+    import ctypes
+
+
+class ProcessManager:
+    if ON_WINDOWS:
+
+        def terminate(self, pid):
+            # The first argument to OpenProcess represents the desired access
+            # to the process. 1 represents the PROCESS_TERMINATE access right.
+            handle = ctypes.windll.kernel32.OpenProcess(1, False, pid)
+            ctypes.windll.kernel32.TerminateProcess(handle, -1)
+            ctypes.windll.kernel32.CloseHandle(handle)
+    else:
+
+        def terminate(self, pid):
+            try:
+                os.killpg(pid, signal.SIGTERM)
+            except OSError as e:
+                if e.errno not in [errno.EPERM, errno.ESRCH]:
+                    raise
+
+    if ON_WINDOWS:
+
+        def kill(self, pid):
+            # There's no SIGKILL on Win32...
+            self.terminate(pid)
+    else:
+
+        def kill(self, pid):
+            try:
+                os.killpg(pid, signal.SIGKILL)
+            except OSError as e:
+                if e.errno not in [errno.EPERM, errno.ESRCH]:
+                    raise