bcmd 0.6.12__tar.gz → 0.6.14__tar.gz

{bcmd-0.6.12 → bcmd-0.6.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bcmd
-Version: 0.6.12
+Version: 0.6.14
 Summary: Commands for Beni
 Author-email: Beni Mang <benimang@126.com>
 Maintainer-email: Beni Mang <benimang@126.com>

bcmd-0.6.14/bcmd/common/secret.py

@@ -0,0 +1,69 @@
+import tkinter as tk
+from tkinter import messagebox
+from typing import Any, TypedDict
+
+from async_lru import alru_cache
+from beni import bcrypto, btask
+from beni.bform import BForm
+
+
+class PypiSecret(TypedDict):
+    username: str
+    password: str
+
+
+@alru_cache
+async def getPypi(value: str = '') -> PypiSecret:
+    return _getData(
+        '请输入 PYPI 密钥信息',
+        value or 'QbuF2mV/lqovtF5dskZGD7qHknYbNuF2QseWRtWxLZTPrC/jL1tcxV8JEKaRjLsu46PxJZ7zepJwggnUTIWnEAoV5VtgP2/hbuzxxHha8817kR5c65H9fXm8eOal7DYXsUoGPQMnm59UWNXUKjmIaP4sn9nySFlRYqa8sEZSbYQ4N0NL35Dpj1e3wyQxJ+7h2jwKAz50Hh8G4yAM3/js9+NUe4ymts+UXcwsP3ADIBMkzjnFc0lEYg2d+fw0A74XWCvoZPoGqHZR/THUOVNAYxoGgDzP4SPIk1XsmtpxvfO/DpJd/Cg/0fB3MYagGKI1+m6Bxqhvd1I/lf0YbM5y4E4=',
+    )
+
+
+class QiniuSecret(TypedDict):
+    bucket: str
+    baseUrl: str
+    ak: str
+    sk: str
+
+
+@alru_cache
+async def getQiniu(value: str = '') -> QiniuSecret:
+    return _getData(
+        '请输入 七牛云 密钥信息',
+        value or 'vNroFKeKklrdcJ89suFm+iyuJsq/cyUB5+QWoeeiMc/J0oSLF9cg5rqbK1IRxF0cCQ8KmkQQhdVa+PI6kuTBhoSH6IviVTylzAOrJywEccz9jWkJkW28Y9Vo4ePZmfWf/j7wdxNB144z234KD8IxJn4lR2A0L9JN5kk1o1/hpcydXL74FNtt03lYL/E3WVcvpUfw37mri2HMYOfUw81dRwW35/hMuQjtq1BBrKrIsSKTHH44tROMcgyvt+Qy292AtDBcsYiZxBKhQtBFPMq/vUs=',
+    )
+
+
+def _getData(title: str, content: str) -> Any:
+
+    class PasswordForm(BForm):
+        result: dict[str, Any] = {}
+
+        def __init__(self):
+            super().__init__(title=title)
+            self.passwordVar = tk.StringVar(value='')
+            ary = content.split(' ')
+            if len(ary) > 1:
+                self.addLabel('提示', ary[0])
+            self.addEntry('密码', self.passwordVar, width=30, password=True, focus=True, command=self.onBtn)
+            self.addBtn('确定', self.onBtn)
+
+        def onBtn(self):
+            try:
+                self.result.update(
+                    bcrypto.decryptJson(content, self.passwordVar.get())
+                )
+                self.destroy()
+            except:
+                messagebox.showerror('密码错误', '密码错误，请重新输入')
+
+        def getResult(self):
+            return self.result
+
+    result = PasswordForm().run()
+
+    if result is None:
+        btask.abort('用户取消操作')
+    else:
+        return result

{bcmd-0.6.12 → bcmd-0.6.14}/bcmd/tasks/__init__.py

@@ -2,7 +2,6 @@
 from . import bin
 from . import code
 from . import crypto
-from . import debian
 from . import docs
 from . import download
 from . import image
@@ -15,3 +14,4 @@ from . import proxy
 from . import time
 from . import upgrade
 from . import wasabi
+from . import wslProxy

{bcmd-0.6.12 → bcmd-0.6.14}/bcmd/tasks/docs.py

@@ -98,7 +98,10 @@ async def userInput():
         def getResult(self):
             return self.varIsUpload.get(), self.varPassword.get()
 
-    isUpload, password = BuildForm().run()
+    result = BuildForm().run()
+    if not result:
+        btask.abort('用户取消操作')
+    isUpload, password = result
 
     # 配置里面每个字段都尝试解密（实际效率较低但不影响使用）
     for k, v in conf.items():

{bcmd-0.6.12 → bcmd-0.6.14}/bcmd/tasks/proxy.py

@@ -1,5 +1,4 @@
-from __future__ import annotations
-
+import platform
 from typing import Final
 
 import psutil
@@ -25,10 +24,14 @@ async def proxy(
     template = ''
 
     # 针对不同的终端使用不同的模板
-    if 'cmd.exe' in processNameAry:
-        template = cmdTemplate
-    elif set(['powershell.exe', 'pwsh.exe']) & set(processNameAry):
-        template = powerShellTemplate
+    match platform.system():
+        case 'Windows':
+            if 'cmd.exe' in processNameAry:
+                template = cmdTemplate
+            elif set(['powershell.exe', 'pwsh.exe']) & set(processNameAry):
+                template = powerShellTemplate
+        case 'Linux':
+            template = linuxShellTemplate
 
     btask.assertTrue(template, f'不支持当前终端（{processNameAry}）')
     lineAry = textToAry(template.format(port))
@@ -54,3 +57,9 @@ powerShellTemplate = '''
     $env:https_proxy="http://localhost:{0}"
     $env:all_proxy="http://localhost:{0}"
 '''
+
+linuxShellTemplate = '''
+    export http_proxy="http://localhost:{0}"
+    export https_proxy="http://localhost:{0}"
+    export all_proxy="http://localhost:{0}"
+'''

bcmd-0.6.14/bcmd/tasks/wslProxy.py

@@ -0,0 +1,59 @@
+from typing import Final
+
+import pyperclip
+import typer
+from beni import bcolor, btask
+from beni.bfunc import syncCall, textToAry
+
+app: Final = btask.newSubApp('WSL2 代理服务')
+
+
+@app.command()
+@syncCall
+async def linux(
+    port: int = typer.Argument(15236, help="代理服务器端口"),
+):
+    '生成终端设置代理服务器的命令'
+    ip = "$(ip route | grep default | awk '{print $3}')"
+    lineAry = textToAry(f'''
+        export HTTP_PROXY=http://{ip}):{port}
+        export HTTPS_PROXY=http://{ip}):{port}
+        export ALL_PROXY=http://{ip}):{port}
+        curl https://google.com.hk
+    ''')
+    msg = '\r\n' + '\n'.join(lineAry) + '\n'
+    pyperclip.copy(msg.strip() + '\n')
+    bcolor.printMagenta(msg)
+    bcolor.printYellow('已复制，可直接粘贴使用')
+
+
+@app.command()
+@syncCall
+async def windows(
+    port: int = typer.Argument(15236, help="代理服务器端口"),
+    off: bool = typer.Option(False, '--off', help='关闭代理'),
+):
+    '设置防火墙以及端口转发'
+
+    firewallName = 'Allow Veee from WSL'
+
+    if not off:
+        template = f'''
+        New-NetFirewallRule -DisplayName "{firewallName}" -Direction Inbound -Action Allow -Protocol TCP -LocalPort {port} -RemoteAddress 172.0.0.0/8 -Profile Any
+        netsh interface portproxy add v4tov4 listenaddress=0.0.0.0 listenport={port} connectaddress=127.0.0.1 connectport={port}
+        netstat -ano | findstr :{port} | findstr 0.0.0.0
+        '''
+    else:
+        template = f'''
+        netsh interface portproxy delete v4tov4 listenaddress=0.0.0.0 listenport={port}
+        Remove-NetFirewallRule -DisplayName "{firewallName}"
+        '''
+    lineAry = textToAry(template)
+    msg = '\r\n' + '\n'.join(lineAry) + '\n'
+    pyperclip.copy(msg.strip() + '\n')
+    bcolor.printMagenta(msg)
+    if not off:
+        bcolor.printYellow('开启防火墙以及端口转发')
+    else:
+        bcolor.printYellow('关闭防火墙以及端口转发')
+    bcolor.printYellow('已复制，可直接粘贴使用')

{bcmd-0.6.12 → bcmd-0.6.14}/bcmd.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bcmd
-Version: 0.6.12
+Version: 0.6.14
 Summary: Commands for Beni
 Author-email: Beni Mang <benimang@126.com>
 Maintainer-email: Beni Mang <benimang@126.com>

{bcmd-0.6.12 → bcmd-0.6.14}/bcmd.egg-info/SOURCES.txt

@@ -10,7 +10,6 @@ pyproject.toml
 ./bcmd/tasks/bin.py
 ./bcmd/tasks/code.py
 ./bcmd/tasks/crypto.py
-./bcmd/tasks/debian.py
 ./bcmd/tasks/docs.py
 ./bcmd/tasks/download.py
 ./bcmd/tasks/image.py
@@ -23,6 +22,7 @@ pyproject.toml
 ./bcmd/tasks/time.py
 ./bcmd/tasks/upgrade.py
 ./bcmd/tasks/wasabi.py
+./bcmd/tasks/wslProxy.py
 ./bcmd/utils/__init__.py
 ./bcmd/utils/utils.py
 ./test/__init__.py
@@ -45,7 +45,6 @@ bcmd/tasks/__init__.py
 bcmd/tasks/bin.py
 bcmd/tasks/code.py
 bcmd/tasks/crypto.py
-bcmd/tasks/debian.py
 bcmd/tasks/docs.py
 bcmd/tasks/download.py
 bcmd/tasks/image.py
@@ -58,5 +57,6 @@ bcmd/tasks/proxy.py
 bcmd/tasks/time.py
 bcmd/tasks/upgrade.py
 bcmd/tasks/wasabi.py
+bcmd/tasks/wslProxy.py
 bcmd/utils/__init__.py
 bcmd/utils/utils.py

{bcmd-0.6.12 → bcmd-0.6.14}/pyproject.toml

@@ -3,7 +3,7 @@
 
 [project]
 name = 'bcmd'
-version = '0.6.12'
+version = '0.6.14'
 description = 'Commands for Beni'
 requires-python = '>=3.10'
 keywords = ['benimang', 'beni', 'bcmd']

bcmd-0.6.12/bcmd/common/secret.py

@@ -1,51 +0,0 @@
-import getpass
-from typing import Any, TypedDict, cast
-
-from async_lru import alru_cache
-from beni import bcrypto, btask
-from beni.bcolor import printRed
-
-
-class PypiSecret(TypedDict):
-    username: str
-    password: str
-
-
-@alru_cache
-async def getPypi(value: str = '') -> PypiSecret:
-    return cast(
-        Any,
-        _getData(value or 'QbuF2mV/lqovtF5dskZGD7qHknYbNuF2QseWRtWxLZTPrC/jL1tcxV8JEKaRjLsu46PxJZ7zepJwggnUTIWnEAoV5VtgP2/hbuzxxHha8817kR5c65H9fXm8eOal7DYXsUoGPQMnm59UWNXUKjmIaP4sn9nySFlRYqa8sEZSbYQ4N0NL35Dpj1e3wyQxJ+7h2jwKAz50Hh8G4yAM3/js9+NUe4ymts+UXcwsP3ADIBMkzjnFc0lEYg2d+fw0A74XWCvoZPoGqHZR/THUOVNAYxoGgDzP4SPIk1XsmtpxvfO/DpJd/Cg/0fB3MYagGKI1+m6Bxqhvd1I/lf0YbM5y4E4='),
-    )
-
-
-class QiniuSecret(TypedDict):
-    bucket: str
-    baseUrl: str
-    ak: str
-    sk: str
-
-
-@alru_cache
-async def getQiniu(value: str = '') -> QiniuSecret:
-    return cast(
-        Any,
-        _getData(value or 'vNroFKeKklrdcJ89suFm+iyuJsq/cyUB5+QWoeeiMc/J0oSLF9cg5rqbK1IRxF0cCQ8KmkQQhdVa+PI6kuTBhoSH6IviVTylzAOrJywEccz9jWkJkW28Y9Vo4ePZmfWf/j7wdxNB144z234KD8IxJn4lR2A0L9JN5kk1o1/hpcydXL74FNtt03lYL/E3WVcvpUfw37mri2HMYOfUw81dRwW35/hMuQjtq1BBrKrIsSKTHH44tROMcgyvt+Qy292AtDBcsYiZxBKhQtBFPMq/vUs='),
-    )
-
-
-def _getData(content: str) -> dict[str, Any]:
-    index = content.find(' ')
-    if index > -1:
-        tips = f'请输入密码（{content[:index]}）：'
-    else:
-        tips = '请输入密码：'
-    while True:
-        try:
-            pwd = getpass.getpass(tips)
-            return bcrypto.decryptJson(content, pwd)
-        except KeyboardInterrupt:
-            print('')
-            btask.abort('用户操作取消')
-        except BaseException:
-            printRed('密码错误')

bcmd-0.6.12/bcmd/tasks/debian.py

@@ -1,78 +0,0 @@
-import os
-from typing import Final
-
-from beni import bcolor, bfile, bpath, btask, binput
-from beni.bfunc import syncCall
-
-app: Final = btask.newSubApp('Debian 系统管理')
-
-
-@app.command()
-@syncCall
-async def install_python():
-    '安装python脚本'
-    pythonZipFile = ''
-    pythonName = ''
-    pythonVersion = ''
-    bcolor.printYellow(f'官网地址：https://www.python.org/downloads/source/')
-    bcolor.printYellow(f'先从官网上下载 python 源码压缩包（.tar.xz）')
-    while True:
-        pythonZipFile = input('输入python压缩文件名（如：Python-3.12.1.tar.xz）：').strip()
-        if pythonZipFile.endswith('.tar.xz'):
-            pythonName = pythonZipFile.replace('.tar.xz', '')
-            pythonVersion = '.'.join(pythonName.split('-')[-1].split('.')[:-1])
-            break
-        else:
-            print('输入有误，请重新输入')
-    cmdList: list[str] = [
-        f'apt update',
-        f'apt install build-essential zlib1g-dev libncurses5-dev libgdbm-dev libnss3-dev libssl-dev libsqlite3-dev libreadline-dev libffi-dev libbz2-dev -y',
-        f'tar -xf {pythonZipFile}',
-        f'cd {pythonName}',
-        f'./configure --enable-optimizations',  # 配置编译选项
-        f'make -j `nproc`',                     # 编译源代码，`nproc` 会利用所有可用的 CPU 核心加快编译速度
-        f'make altinstall',                     # 安装 Python，altinstall 避免替换默认的 python 命令
-        f'cd ..',
-        f'rm -rf {pythonName}',
-        f'rm -rf /usr/local/bin/python',
-        f'ln -s /usr/local/bin/python{pythonVersion} /usr/local/bin/python',
-        f'rm -rf /usr/local/bin/pip',
-        f'ln -s /usr/local/bin/pip{pythonVersion} /usr/local/bin/pip',
-        f'python --version',
-        f'pip --version',
-        f'pip install pipx',
-        f'pipx install bcmd',
-    ]
-    shFile = bpath.desktop(f'install-python-{pythonName}.sh')
-    await bfile.writeText(shFile, '\n'.join(cmdList))
-    bcolor.printGreen(f'将以下两个文件拷贝到服务器上，然后执行 sh {shFile.name} 即可安装 python')
-    print(pythonZipFile)
-    print(shFile)
-
-
-@app.command()
-@syncCall
-async def install_software():
-    '安装常用软件'
-    await binput.confirm('即将安装这些软件（7z nginx mariadb），是否确认？')
-    cmdList: list[str] = [
-        f'echo 更新软件包列表',
-        f'apt update',
-        f'echo 安装 7z',
-        f'apt install p7zip-full -y',
-        f'echo 安装 nginx',
-        f'apt install nginx -y',
-        f'systemctl start nginx',
-        f'systemctl enable nginx',
-        f'systemctl status nginx',
-        f'echo 安装 MariaDB',
-        f'apt install mariadb-server -y',
-        f'systemctl start mariadb',
-        f'systemctl enable mariadb',
-        f"sed -i 's/bind-address/# bind-address/' /etc/mysql/mariadb.conf.d/50-server.cnf"
-        f'systemctl restart mariadb',
-        f'systemctl status mariadb',
-
-    ]
-    for cmd in cmdList:
-        os.system(cmd)