v1.11.0 release

1. Provide HTTP / HTTPS proxy (issue #47).
2. Add "mieru check update" and "mita check update" commands.

Makefile

@@ -29,10 +29,10 @@ PROJECT_NAME=$(shell basename "${ROOT}")
 # - build/package/mita/arm64/rpm/mita.spec
 # - docs/server-install.md
 # - docs/server-install.zh_CN.md
-# - pkg/appctl/version.go
+# - pkg/version/current.go
 #
 # Use `tools/bump_version.sh` script to change all those files at one shot.
-VERSION="1.10.0"
+VERSION="1.11.0"
 
 # Build binaries and installation packages.
 .PHONY: build

README.md

@@ -27,8 +27,9 @@ For an explanation of the mieru protocol, see [mieru Proxy Protocol](https://git
 5. When the server can not decrypt the data sent by the client, no content is returned. it is difficult for GFW to discover the mieru service through active probing.
 6. mieru supports multiple users sharing a single proxy server.
 7. mieru supports IPv4 and IPv6.
-8. The client software supports Windows, Mac OS, Linux and Android systems. Android users should use SagerNet client version 0.8.1-rc02 or above, and install mieru plugin version 1.6.1 or above.
-9. If you need advanced features like global proxy or customized routing rules, you can use mieru as the backend of a proxy platform such as clash.
+8. mieru provides socks5, HTTP and HTTPS proxy.
+9. The client software supports Windows, Mac OS, Linux and Android systems. Android users should use SagerNet client version 0.8.1-rc02 or above, and install mieru plugin version 1.6.1 or above.
+10. If you need advanced features like global proxy or customized routing rules, you can use mieru as the backend of a proxy platform such as clash.
 
 ## User Guide
 

README.zh_CN.md

@@ -24,9 +24,10 @@ mieru 的翻墙原理与 shadowsocks / v2ray 等软件类似，在客户端和
 4. 在使用 UDP 传输协议时，mieru 不需要客户端和服务器进行握手，即可直接发送数据。
 5. 当服务器无法解密客户端发送的数据时，不会返回任何内容。GFW 很难通过主动探测发现 mieru 服务。
 6. mieru 支持多个用户共享代理服务器。
-7. 支持 IPv4 和 IPv6。
-8. 客户端软件支持 Windows, Mac OS, Linux 和 Android 系统。Android 用户请使用 0.8.1-rc02 版本或以上 SagerNet 客户端并安装 1.6.1 版本或以上 mieru 插件。
-9. 如果需要全局代理或自定义路由规则等高级功能，可以将 mieru 作为 clash 等代理平台的后端。
+7. mieru 支持 IPv4 和 IPv6。
+8. mieru 提供 socks5, HTTP 和 HTTPS 代理。
+9. 客户端软件支持 Windows, Mac OS, Linux 和 Android 系统。Android 用户请使用 0.8.1-rc02 版本或以上 SagerNet 客户端并安装 1.6.1 版本或以上 mieru 插件。
+10. 如果需要全局代理或自定义路由规则等高级功能，可以将 mieru 作为 clash 等代理平台的后端。
 
 ## 使用教程
 

build/package/mieru/amd64/debian/DEBIAN/control

@@ -1,5 +1,5 @@
 Package: mieru
-Version: 1.10.0
+Version: 1.11.0
 Section: net
 Priority: optional
 Architecture: amd64

build/package/mieru/amd64/rpm/mieru.spec

@@ -1,5 +1,5 @@
 Name: mieru
-Version: 1.10.0
+Version: 1.11.0
 Release: 1%{?dist}
 Summary: Mieru proxy client
 License: GPLv3+

build/package/mieru/arm64/debian/DEBIAN/control

@@ -1,5 +1,5 @@
 Package: mieru
-Version: 1.10.0
+Version: 1.11.0
 Section: net
 Priority: optional
 Architecture: arm64

build/package/mieru/arm64/rpm/mieru.spec

@@ -1,5 +1,5 @@
 Name: mieru
-Version: 1.10.0
+Version: 1.11.0
 Release: 1%{?dist}
 Summary: Mieru proxy client
 License: GPLv3+

build/package/mita/amd64/debian/DEBIAN/control

@@ -1,5 +1,5 @@
 Package: mita
-Version: 1.10.0
+Version: 1.11.0
 Section: net
 Priority: optional
 Architecture: amd64

build/package/mita/amd64/rpm/mita.spec

@@ -1,5 +1,5 @@
 Name: mita
-Version: 1.10.0
+Version: 1.11.0
 Release: 1%{?dist}
 Summary: Mieru proxy server
 License: GPLv3+

build/package/mita/arm64/debian/DEBIAN/control

@@ -1,5 +1,5 @@
 Package: mita
-Version: 1.10.0
+Version: 1.11.0
 Section: net
 Priority: optional
 Architecture: arm64

build/package/mita/arm64/rpm/mita.spec

@@ -1,5 +1,5 @@
 Name: mita
-Version: 1.10.0
+Version: 1.11.0
 Release: 1%{?dist}
 Summary: Mieru proxy server
 License: GPLv3+

configs/examples/client_config.json

@@ -25,5 +25,7 @@
     "rpcPort": 8964,
     "socks5Port": 1080,
     "loggingLevel": "INFO",
-    "socks5ListenLAN": false
+    "socks5ListenLAN": false,
+    "httpProxyPort": 8080,
+    "httpProxyListenLAN": false
 }

configs/templates/client_config.json

@@ -25,5 +25,7 @@
     "rpcPort": -1,
     "socks5Port": -1,
     "loggingLevel": "INFO",
-    "socks5ListenLAN": false
+    "socks5ListenLAN": false,
+    "httpProxyPort": -1,
+    "httpProxyListenLAN": false
 }

docs/client-install.md

@@ -44,7 +44,9 @@ to modify the proxy client settings. Here `<FILE>` is a JSON formatted file. We
     "rpcPort": -1,
     "socks5Port": -1,
     "loggingLevel": "INFO",
-    "socks5ListenLAN": false
+    "socks5ListenLAN": false,
+    "httpProxyPort": -1,
+    "httpProxyListenLAN": false
 }
 ```
 
@@ -56,9 +58,10 @@ Please download or copy this template and use a text editor to modify the follow
 4. If you have registered a domain name for the proxy server, please fill in the domain name in `profiles` -> `servers` -> `domainName`. Otherwise, do not modify this property.
 5. Fill in `profiles` -> `servers` -> `portBindings` -> `port` with the TCP or UDP port number that mita is listening on. The port number must be the same as the one set in the proxy server.
 6. Specify a value between 1280 and 1500 for the `profiles` -> `mtu` property. The default value is 1400. This value can be different from the setting in the proxy server.
-7. Please specify a value from 1025 to 65535 for the `rpcPort` property. **Please make sure that the firewall allows communication using this port.**
-8. Please specify a value between 1025 and 65535 for the `socks5Port` property. This port cannot be the same as `rpcPort`. **Make sure that the firewall allows communication on this port.**
+7. Please specify a value between 1025 and 65535 for the `rpcPort` property.
+8. Please specify a value between 1025 and 65535 for the `socks5Port` property. This port cannot be the same as `rpcPort`.
 9. If the client needs to provide proxy services to other devices on the LAN, set the `socks5ListenLAN` property to `true`.
+10. If you want to enable HTTP / HTTPS proxy, Please specify a value between 1025 and 65535 for the `httpProxyPort` property. This port cannot be the same as `rpcPort` or `socks5Port`. If the client needs to provide HTTP / HTTPS proxy services to other devices on the LAN, set the `httpProxyListenLAN` property to `true`. If you want to disable HTTP / HTTPS proxy, please delete `httpProxyPort` and `httpProxyListenLAN` property.
 
 If you have multiple proxy servers installed, or one server listening on multiple ports, you can add them all to the client settings. Each time a new connection is created, mieru will randomly select one of the servers and one of the ports. **If you are using multiple servers, make sure that each server has the mita proxy service started.**
 
@@ -92,7 +95,9 @@ An example of the above setting is as follows.
     "rpcPort": 8964,
     "socks5Port": 1080,
     "loggingLevel": "INFO",
-    "socks5ListenLAN": false
+    "socks5ListenLAN": false,
+    "httpProxyPort": 8080,
+    "httpProxyListenLAN": false
 }
 ```
 

docs/client-install.zh_CN.md

@@ -44,7 +44,9 @@ mieru apply config <FILE>
     "rpcPort": -1,
     "socks5Port": -1,
     "loggingLevel": "INFO",
-    "socks5ListenLAN": false
+    "socks5ListenLAN": false,
+    "httpProxyPort": -1,
+    "httpProxyListenLAN": false
 }
 ```
 
@@ -56,9 +58,10 @@ mieru apply config <FILE>
 4. 如果你为代理服务器注册了域名，请在 `profiles` -> `servers` -> `domainName` 中填写域名。否则，请勿修改这个属性。
 5. 在 `profiles` -> `servers` -> `portBindings` -> `port` 中填写 mita 监听的 TCP 或 UDP 端口号。这个端口号必须与代理服务器中的设置相同。
 6. 请为 `profiles` -> `mtu` 属性中指定一个从 1280 到 1500 之间的值。默认值为 1400。这个值可以与代理服务器中的设置不同。
-7. 请为 `rpcPort` 属性指定一个从 1025 到 65535 之间的数值。**请确保防火墙允许使用该端口进行通信。**
-8. 请为 `socks5Port` 属性指定一个从 1025 到 65535 之间的数值。该端口不能与 `rpcPort` 相同。**请确保防火墙允许使用该端口进行通信。**
+7. 请为 `rpcPort` 属性指定一个从 1025 到 65535 之间的数值。
+8. 请为 `socks5Port` 属性指定一个从 1025 到 65535 之间的数值。该端口不能与 `rpcPort` 相同。
 9. 如果客户端需要为局域网中的其他设备提供代理服务，请将 `socks5ListenLAN` 属性设置为 `true`。
+10. 如果要启动 HTTP / HTTPS 代理，请为 `httpProxyPort` 属性指定一个从 1025 到 65535 之间的数值。该端口不能与 `rpcPort` 和 `socks5Port` 相同。如果需要为局域网中的其他设备提供 HTTP / HTTPS 代理，请将 `httpProxyListenLAN` 属性设置为 `true`。如果不需要 HTTP / HTTPS 代理，请删除 `httpProxyPort` 和 `httpProxyListenLAN` 属性。
 
 如果你安装了多台代理服务器，或者一台服务器监听多个端口，可以把它们都添加到客户端设置中。每次发起新的连接时，mieru 会随机选取其中的一台服务器和一个端口。**如果使用了多台服务器，请确保每一台服务器都启动了 mita 代理服务。**
 
@@ -92,7 +95,9 @@ mieru apply config <FILE>
     "rpcPort": 8964,
     "socks5Port": 1080,
     "loggingLevel": "INFO",
-    "socks5ListenLAN": false
+    "socks5ListenLAN": false,
+    "httpProxyPort": 8080,
+    "httpProxyListenLAN": false
 }
 ```
 

docs/server-install.md

@@ -10,10 +10,10 @@ Before installation and configuration, connect to the server via SSH and then ex
 
 ```sh
 # Debian / Ubuntu
-curl -LSO https://github.com/enfein/mieru/releases/download/v1.10.0/mita_1.10.0_amd64.deb
+curl -LSO https://github.com/enfein/mieru/releases/download/v1.11.0/mita_1.11.0_amd64.deb
 
 # Fedora / CentOS / Red Hat Enterprise Linux
-curl -LSO https://github.com/enfein/mieru/releases/download/v1.10.0/mita-1.10.0-1.x86_64.rpm
+curl -LSO https://github.com/enfein/mieru/releases/download/v1.11.0/mita-1.11.0-1.x86_64.rpm
 ```
 
 To download the installer for the ARM architecture, replace `amd64` with `arm64`, and `x86_64` with `aarch64` in the link. If the above link is blocked, please use your browser to download and install from the GitHub Releases page.
@@ -22,10 +22,10 @@ To download the installer for the ARM architecture, replace `amd64` with `arm64`
 
 ```sh
 # Debian / Ubuntu
-sudo dpkg -i mita_1.10.0_amd64.deb
+sudo dpkg -i mita_1.11.0_amd64.deb
 
 # Fedora / CentOS / Red Hat Enterprise Linux
-sudo rpm -Uvh --force mita-1.10.0-1.x86_64.rpm
+sudo rpm -Uvh --force mita-1.11.0-1.x86_64.rpm
 ```
 
 ## Grant permissions

docs/server-install.zh_CN.md

@@ -10,10 +10,10 @@
 
 ```sh
 # Debian / Ubuntu
-curl -LSO https://github.com/enfein/mieru/releases/download/v1.10.0/mita_1.10.0_amd64.deb
+curl -LSO https://github.com/enfein/mieru/releases/download/v1.11.0/mita_1.11.0_amd64.deb
 
 # Fedora / CentOS / Red Hat Enterprise Linux
-curl -LSO https://github.com/enfein/mieru/releases/download/v1.10.0/mita-1.10.0-1.x86_64.rpm
+curl -LSO https://github.com/enfein/mieru/releases/download/v1.11.0/mita-1.11.0-1.x86_64.rpm
 ```
 
 下载 ARM 架构的安装包，将链接中的 `amd64` 替换成 `arm64`，`x86_64` 替换成 `aarch64` 即可。如果上述链接被墙，请翻墙后使用浏览器从 GitHub Releases 页面下载安装。
@@ -22,10 +22,10 @@ curl -LSO https://github.com/enfein/mieru/releases/download/v1.10.0/mita-1.10.0-
 
 ```sh
 # Debian / Ubuntu
-sudo dpkg -i mita_1.10.0_amd64.deb
+sudo dpkg -i mita_1.11.0_amd64.deb
 
 # Fedora / CentOS / Red Hat Enterprise Linux
-sudo rpm -Uvh --force mita-1.10.0-1.x86_64.rpm
+sudo rpm -Uvh --force mita-1.11.0-1.x86_64.rpm
 ```
 
 ## 赋予当前用户操作 mita 的权限，需要重启服务器使此设置生效