Merge branch '3007.x'

Author: dwoz

.github/actions/build-onedir-salt/action.yml

@@ -29,21 +29,13 @@ runs:
 
   steps:
 
-    - name: Download Cached Deps Onedir Package Directory
-      id: onedir-bare-cache
-      uses: ./.github/actions/cache
+    - name: Install Salt Packaging Dependencies into Relenv Onedir
+      uses: ./.github/actions/build-onedir-deps
       with:
-        path: artifacts/${{ inputs.package-name }}
-        key: >
-          ${{ inputs.cache-prefix }}|${{ inputs.python-version }}|deps|${{ inputs.platform }}|${{ inputs.arch }}|${{ inputs.package-name }}|${{
-            hashFiles(
-              format('{0}/.relenv/**/*.xz', github.workspace),
-              'requirements/static/pkg/*/*.txt',
-              '.github/actions/build-onedir-deps/action.yml',
-              '.github/workflows/build-deps-onedir-*.yml',
-              'cicd/shared-gh-workflows-context.yml'
-            )
-          }}
+        platform: ${{ inputs.platform }}
+        arch: ${{ inputs.arch }}
+        python-version: "${{ inputs.python-version }}"
+        cache-prefix: ${{ inputs.cache-seed }}|relenv|${{ inputs.salt-version }}
 
     - name: Download Source Tarball
       uses: actions/download-artifact@v4

.github/actions/ssh-tunnel/README.md

@@ -92,3 +92,9 @@ OkZFOjhCOjI3OjFDOjFBOkJEOjUxOjQ2OjE4OjBBOjhFOjVBOjI1OjQzOjQzOjZGOkRBXHJcbmE9c2V0
 dXA6YWN0aXZlXHJcbiIsICJ0eXBlIjogImFuc3dlciJ9
 -- Message received --
 ```
+
+SSH to your local port.
+
+```
+ssh -o StrictHostKeychecking=no -o TCPKeepAlive=no -o StrictHostKeyChecking=no -vv -p 5222 runner@localhost
+```

.github/actions/ssh-tunnel/rtcforward.py

@@ -6,6 +6,7 @@
 import json
 import logging
 import os
+import signal
 import sys
 import textwrap
 import time
@@ -77,6 +78,42 @@ def print_pastable(data, message="offer"):
     sys.stdout.flush()
 
 
+async def read_from_stdin():
+    loop = asyncio.get_event_loop()
+    line = await loop.run_in_executor(
+        None, input, "-- Please enter a message from remote party --\n"
+    )
+    data = line
+    while line:
+        try:
+            line = await loop.run_in_executor(None, input)
+        except EOFError:
+            break
+        data += line
+    print("-- Message received --")
+    return data
+
+
+class Channels:
+    def __init__(self, channels=None):
+        if channels is None:
+            channels = []
+        self.channels = channels
+
+    def add(self, channel):
+        self.channels.append(channel)
+
+    def close(self):
+        for channel in self.channels:
+            channel.close()
+
+
+class ProxyConnection:
+    def __init__(self, pc, channel):
+        self.pc = pc
+        self.channel = channel
+
+
 class ProxyClient:
 
     def __init__(self, args, channel):
@@ -219,29 +256,7 @@ def on_message(message):
             log.exception("WTF")
 
 
-class ProxyConnection:
-    def __init__(self, pc, channel):
-        self.pc = pc
-        self.channel = channel
-
-
-async def read_from_stdin():
-    loop = asyncio.get_event_loop()
-    line = await loop.run_in_executor(
-        None, input, "-- Please enter a message from remote party --\n"
-    )
-    data = line
-    while line:
-        try:
-            line = await loop.run_in_executor(None, input)
-        except EOFError:
-            break
-        data += line
-    print("-- Message received --")
-    return data
-
-
-async def run_answer(pc, args):
+async def run_answer(stop, pc, args):
     """
     Top level offer answer server.
     """
@@ -270,11 +285,11 @@ def on_datachannel(channel):
     elif obj is BYE:
         print("Exiting")
 
-    while True:
+    while not stop.is_set():
         await asyncio.sleep(0.3)
 
 
-async def run_offer(pc, args):
+async def run_offer(stop, pc, args):
     """
     Top level offer server this will estabilsh a data channel and start a tcp
     server on the port provided. New connections to the server will start the
@@ -324,10 +339,14 @@ def on_open():
     elif obj is BYE:
         print("Exiting")
 
-    while True:
+    while not stop.is_set():
         await asyncio.sleep(0.3)
 
 
+async def signal_handler(stop, pc):
+    stop.set()
+
+
 if __name__ == "__main__":
     if sys.platform == "win32":
         asyncio.set_event_loop_policy(asyncio.WindowsSelectorEventLoopPolicy())
@@ -343,16 +362,22 @@ def on_open():
         logging.basicConfig(level=logging.DEBUG)
     else:
         logging.basicConfig(level=logging.INFO)
-
+    stop = asyncio.Event()
     pc = RTCPeerConnection()
     if args.role == "offer":
-        coro = run_offer(pc, args)
+        coro = run_offer(stop, pc, args)
     else:
-        coro = run_answer(pc, args)
+        coro = run_answer(stop, pc, args)
 
     # run event loop
     loop = asyncio.new_event_loop()
     asyncio.set_event_loop(loop)
+    for signame in ("SIGINT", "SIGTERM"):
+        loop.add_signal_handler(
+            getattr(signal, signame),
+            lambda: asyncio.create_task(signal_handler(stop, pc)),
+        )
+
     try:
         loop.run_until_complete(coro)
     except KeyboardInterrupt: