Ariang rpcHost regex pattern fixed

Author: biplobsd

OneClickRun.ipynb

@@ -1019,18 +1019,22 @@
         "import urllib.request, requests\n",
         "from IPython.display import HTML, clear_output\n",
         "from urllib.parse import urlparse\n",
+        "import subprocess\n",
+        "import psutil\n",
         "\n",
         "#####################################\n",
+        "\n",
         "USE_FREE_TOKEN = True  # @param {type:\"boolean\"}\n",
         "REGION = \"JP\" #@param [\"US\", \"EU\", \"AP\", \"AU\", \"SA\", \"JP\", \"IN\"]\n",
+        "\n",
         "# Aria2 Service\n",
         "Aria2_rpc = True  # @param {type:\"boolean\"}\n",
         "Ariang_WEBUI = True  # @param {type:\"boolean\"}\n",
         "TOKEN = \"\"  # @param {type:\"string\"}\n",
         "PORT_FORWARD = \"localhost\" #@param [\"ngrok\", \"localhost\", \"argotunnel\"]\n",
-        "# OUTPUT_DIR = \"\"  # @param {type:\"string\"}\n",
         "PORT = 8221\n",
         "HOME = os.path.expanduser(\"~\")\n",
+        "BASE_PATH = 'tools/ariang'\n",
         "\n",
         "if not os.path.exists(f\"{HOME}/.ipython/ocr.py\"):\n",
         "    hCode = \"https://raw.githubusercontent.com/biplobsd/\" \\\n",
@@ -1049,8 +1053,6 @@
         "\n",
         "loadingAn()\n",
         "\n",
-        "BASE_PATH = 'tools/ariang'\n",
-        "\n",
         "# Ariang SETUP\n",
         "runSh('apt install -y aria2')\n",
         "os.makedirs(BASE_PATH, exist_ok=True)\n",
@@ -1063,12 +1065,25 @@
         "  htmlF = urlopen(link+\"/releases/latest\").read().decode('UTF-8')\n",
         "  return re.findall(r'.+\\/tag\\/([.0-9A-Za-z]+)\".+/', htmlF)[0]\n",
         "\n",
+        "def run_process(command, shell=False, cwd=None, env=None):\n",
+        "  for proc in psutil.process_iter():\n",
+        "    try:\n",
+        "      # Get process info as a named tuple containing the process name and command-line arguments\n",
+        "      process_info = proc.as_dict(attrs=['pid', 'name', 'cmdline'])\n",
+        "      process_cmdline = process_info['cmdline']\n",
+        "\n",
+        "      # Check if the command matches the process command-line arguments\n",
+        "      if process_cmdline == command.split():\n",
+        "        print(\"Killing process with PID\", process_info['pid'])\n",
+        "        proc.kill()\n",
+        "    except (psutil.NoSuchProcess, psutil.AccessDenied, psutil.ZombieProcess):\n",
+        "      pass\n",
+        "\n",
+        "  print(\"Starting process with command\", command)\n",
+        "  subprocess.Popen(command, shell=shell, cwd=cwd, env=env)\n",
+        "\n",
         "# Downloading latest version of ariang\n",
         "if not os.path.exists(f\"{BASE_PATH}/index.html\"):\n",
-        "  # BASE_URL = r\"https://github.com/mayswind/AriaNg\"\n",
-        "  # LATEST_TAG = latestTag(BASE_URL)\n",
-        "  # urlF = f'{BASE_URL}/releases/download/{LATEST_TAG}/' \\\n",
-        "  #             f'AriaNg-{LATEST_TAG}-AllInOne.zip'\n",
         "  urllib.request.urlretrieve(\n",
         "      findPackageR('mayswind/AriaNg', 'AllInOne.zip'),\n",
         "      f'{BASE_PATH}/new.zip')\n",
@@ -1080,15 +1095,7 @@
         "    pass\n",
         "\n",
         "# START_ARIANG_WEBUI_AND_ARIA2_RPC\n",
-        "try:\n",
-        "  if not OUTPUT_DIR:\n",
-        "    OUTPUT_DIR = f\"downloads/\"\n",
-        "  elif not os.path.exists(OUTPUT_DIR):\n",
-        "    clear_output()\n",
-        "    print(\"Error: Your set path not found! Create path!\")\n",
-        "    exx()\n",
-        "except:\n",
-        "  OUTPUT_DIR = f\"{CWD}/downloads/\"\n",
+        "OUTPUT_DIR = f\"{CWD}/downloads/\"\n",
         "if Aria2_rpc:\n",
         "  if not findProcess(\"aria2c\", \"--enable-rpc\"):\n",
         "    try:\n",
@@ -1137,15 +1144,12 @@
         "      read_data = f.read()\n",
         "      f.seek(0)\n",
         "      f.truncate(0)\n",
-        "      read_data = re.sub(r'(rpcHost:\"\\w+.\")|rpcHost:\"\"', \n",
-        "                        f'rpcHost:\"{Host}\"', read_data)\n",
+        "      read_data = re.sub(r'(rpcHost:\"[^\"]+.)|rpcHost:\"\"', f'rpcHost:\"{Host}\"', read_data)\n",
         "      read_data = re.sub(r'protocol:\"\\w+.\"', r'protocol:\"ws\"', read_data)\n",
         "      read_data = re.sub(r'rpcPort:\"\\d+.\"', f'rpcPort:\"{port}\"', read_data)\n",
         "      f.write(read_data)\n",
-        "  try:\n",
-        "    urllib.request.urlopen(f\"http://localhost:{PORT}\")\n",
-        "  except:\n",
-        "    runSh(f\"python3 -m http.server {PORT} &\", shell=True, cd=BASE_PATH)\n",
+        "  \n",
+        "  run_process(f\"python3 -m http.server {PORT} &\", shell=True, cwd=BASE_PATH)\n",
         "  \n",
         "  Server = PortForward_wrapper(\n",
         "    PORT_FORWARD, TOKEN, USE_FREE_TOKEN, [['Ariang', PORT, 'http']], REGION.lower(), \n",