Compare commits
24 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 86379818a2 | |||
| 8a07d2df7e | |||
| 7d63da8be3 | |||
| 06ee9cfce2 | |||
| 13d475da20 | |||
| fbf46a72b0 | |||
| 5bb15ff2c9 | |||
| 5812d6a827 | |||
| 083f19324f | |||
| dd07abf501 | |||
| 0202a3e055 | |||
| 66ca82c635 | |||
| 85d42ee91c | |||
| bdc25bb3d6 | |||
| e6689ae2dc | |||
| 688e0c3e23 | |||
| d996e7171b | |||
| 76e91aa9b8 | |||
| af5bd9f75d | |||
| 0fd36e4e6d | |||
| 0f29e2ad31 | |||
| 4ce3647670 | |||
| 90976cded1 | |||
| f5714eccee |
@@ -23,7 +23,7 @@ jobs:
|
|||||||
npm install
|
npm install
|
||||||
npm run build
|
npm run build
|
||||||
- name: Upload frontend build artifact
|
- name: Upload frontend build artifact
|
||||||
uses: actions/upload-artifact@v6
|
uses: actions/upload-artifact@v7
|
||||||
with:
|
with:
|
||||||
name: frontend-dist
|
name: frontend-dist
|
||||||
path: frontend/dist/
|
path: frontend/dist/
|
||||||
@@ -35,7 +35,7 @@ jobs:
|
|||||||
- name: Checkout repository
|
- name: Checkout repository
|
||||||
uses: actions/checkout@v6.0.2
|
uses: actions/checkout@v6.0.2
|
||||||
- name: Download frontend build artifact
|
- name: Download frontend build artifact
|
||||||
uses: actions/download-artifact@v7
|
uses: actions/download-artifact@v8
|
||||||
with:
|
with:
|
||||||
name: frontend-dist
|
name: frontend-dist
|
||||||
path: frontend_dist
|
path: frontend_dist
|
||||||
|
|||||||
@@ -102,7 +102,7 @@ jobs:
|
|||||||
run: tar -zcvf s-ui-linux-${{ matrix.platform }}.tar.gz s-ui
|
run: tar -zcvf s-ui-linux-${{ matrix.platform }}.tar.gz s-ui
|
||||||
|
|
||||||
- name: Upload files to Artifacts
|
- name: Upload files to Artifacts
|
||||||
uses: actions/upload-artifact@v6
|
uses: actions/upload-artifact@v7
|
||||||
with:
|
with:
|
||||||
name: s-ui-linux-${{ matrix.platform }}
|
name: s-ui-linux-${{ matrix.platform }}
|
||||||
path: ./s-ui-linux-${{ matrix.platform }}.tar.gz
|
path: ./s-ui-linux-${{ matrix.platform }}.tar.gz
|
||||||
@@ -110,7 +110,9 @@ jobs:
|
|||||||
|
|
||||||
- name: Upload to Release
|
- name: Upload to Release
|
||||||
uses: svenstaro/upload-release-action@v2
|
uses: svenstaro/upload-release-action@v2
|
||||||
if: github.event_name == 'release' && github.event.action == 'published'
|
if: |
|
||||||
|
(github.event_name == 'release' && github.event.action == 'published') ||
|
||||||
|
(github.event_name == 'push' && startsWith(github.ref, 'refs/tags/'))
|
||||||
with:
|
with:
|
||||||
repo_token: ${{ secrets.GITHUB_TOKEN }}
|
repo_token: ${{ secrets.GITHUB_TOKEN }}
|
||||||
tag: ${{ github.ref }}
|
tag: ${{ github.ref }}
|
||||||
|
|||||||
@@ -85,7 +85,7 @@ jobs:
|
|||||||
zip -r "s-ui-windows-amd64.zip" s-ui-windows
|
zip -r "s-ui-windows-amd64.zip" s-ui-windows
|
||||||
|
|
||||||
- name: Upload files to Artifacts
|
- name: Upload files to Artifacts
|
||||||
uses: actions/upload-artifact@v6
|
uses: actions/upload-artifact@v7
|
||||||
with:
|
with:
|
||||||
name: s-ui-windows-amd64
|
name: s-ui-windows-amd64
|
||||||
path: ./s-ui-windows-amd64.zip
|
path: ./s-ui-windows-amd64.zip
|
||||||
@@ -93,7 +93,9 @@ jobs:
|
|||||||
|
|
||||||
- name: Upload to Release
|
- name: Upload to Release
|
||||||
uses: svenstaro/upload-release-action@v2
|
uses: svenstaro/upload-release-action@v2
|
||||||
if: github.event_name == 'release' && github.event.action == 'published'
|
if: |
|
||||||
|
(github.event_name == 'release' && github.event.action == 'published') ||
|
||||||
|
(github.event_name == 'push' && startsWith(github.ref, 'refs/tags/'))
|
||||||
with:
|
with:
|
||||||
repo_token: ${{ secrets.GITHUB_TOKEN }}
|
repo_token: ${{ secrets.GITHUB_TOKEN }}
|
||||||
tag: ${{ github.ref }}
|
tag: ${{ github.ref }}
|
||||||
@@ -155,7 +157,7 @@ jobs:
|
|||||||
zip -r "s-ui-windows-arm64.zip" s-ui-windows
|
zip -r "s-ui-windows-arm64.zip" s-ui-windows
|
||||||
|
|
||||||
- name: Upload ARM64 files to Artifacts
|
- name: Upload ARM64 files to Artifacts
|
||||||
uses: actions/upload-artifact@v6
|
uses: actions/upload-artifact@v7
|
||||||
with:
|
with:
|
||||||
name: s-ui-windows-arm64
|
name: s-ui-windows-arm64
|
||||||
path: ./s-ui-windows-arm64.zip
|
path: ./s-ui-windows-arm64.zip
|
||||||
@@ -163,7 +165,9 @@ jobs:
|
|||||||
|
|
||||||
- name: Upload ARM64 to Release
|
- name: Upload ARM64 to Release
|
||||||
uses: svenstaro/upload-release-action@v2
|
uses: svenstaro/upload-release-action@v2
|
||||||
if: github.event_name == 'release' && github.event.action == 'published'
|
if: |
|
||||||
|
(github.event_name == 'release' && github.event.action == 'published') ||
|
||||||
|
(github.event_name == 'push' && startsWith(github.ref, 'refs/tags/'))
|
||||||
with:
|
with:
|
||||||
repo_token: ${{ secrets.GITHUB_TOKEN }}
|
repo_token: ${{ secrets.GITHUB_TOKEN }}
|
||||||
tag: ${{ github.ref }}
|
tag: ${{ github.ref }}
|
||||||
|
|||||||
+276
@@ -0,0 +1,276 @@
|
|||||||
|
# Contributing to S-UI
|
||||||
|
|
||||||
|
Thank you for your interest in contributing to S-UI. This document explains how to set up a development environment, follow project conventions, and submit changes. Your contributions help make the **multi-inbound-per-user** approach and the rest of the project better for everyone.
|
||||||
|
|
||||||
|
## Table of Contents
|
||||||
|
|
||||||
|
- [Code of Conduct](#code-of-conduct)
|
||||||
|
- [Development Environment Setup](#development-environment-setup)
|
||||||
|
- [Coding Conventions and Style Guide](#coding-conventions-and-style-guide)
|
||||||
|
- [Testing](#testing)
|
||||||
|
- [Features That Need Help](#features-that-need-help)
|
||||||
|
- [Pull Request Process](#pull-request-process)
|
||||||
|
- [Adding This Guide in Your Repository](#adding-this-guide-in-your-repository)
|
||||||
|
- [Reporting Bugs and Requesting Features](#reporting-bugs-and-requesting-features)
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Code of Conduct
|
||||||
|
|
||||||
|
Please be respectful and constructive when interacting with maintainers and other contributors. This project is for personal learning and communication; use it responsibly and legally.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Development Environment Setup
|
||||||
|
|
||||||
|
### Prerequisites
|
||||||
|
|
||||||
|
- **Go**: 1.25 or later (see `go.mod` for the exact version).
|
||||||
|
- **Git**: For cloning and submodules.
|
||||||
|
- **C compiler**: Required for CGO (e.g. `gcc`, `musl-dev` on Alpine).
|
||||||
|
- **Node.js** (optional): Only if you plan to work on or rebuild the frontend. The repo can be run with pre-built frontend assets.
|
||||||
|
|
||||||
|
### Clone and Submodules
|
||||||
|
|
||||||
|
```bash
|
||||||
|
git clone https://github.com/alireza0/s-ui
|
||||||
|
cd s-ui
|
||||||
|
git submodule update --init --recursive
|
||||||
|
```
|
||||||
|
|
||||||
|
The **frontend** lives in a submodule. If you only work on the backend, you can use the existing `web/html` contents or build the frontend once (see below).
|
||||||
|
|
||||||
|
### Backend-Only Development (quickest)
|
||||||
|
|
||||||
|
1. Build and run with the provided script (builds backend and runs with debug + local DB):
|
||||||
|
|
||||||
|
```bash
|
||||||
|
./runSUI.sh
|
||||||
|
```
|
||||||
|
|
||||||
|
This runs `./build.sh` then `SUI_DB_FOLDER="db" SUI_DEBUG=true ./sui`.
|
||||||
|
|
||||||
|
2. Or build manually:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
./build.sh
|
||||||
|
SUI_DB_FOLDER=db SUI_DEBUG=true ./sui
|
||||||
|
```
|
||||||
|
|
||||||
|
Default panel: **http://localhost:2095/app/** (user: `admin`, password: `admin` — change in production).
|
||||||
|
|
||||||
|
### Full Stack (Backend + Frontend)
|
||||||
|
|
||||||
|
1. **Frontend** (separate repo in submodule):
|
||||||
|
|
||||||
|
```bash
|
||||||
|
cd frontend
|
||||||
|
npm install
|
||||||
|
npm run build
|
||||||
|
cd ..
|
||||||
|
```
|
||||||
|
|
||||||
|
2. **Replace web assets and build backend**:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
mkdir -p web/html
|
||||||
|
rm -rf web/html/*
|
||||||
|
cp -R frontend/dist/* web/html/
|
||||||
|
go build -ldflags "-w -s" -tags "with_quic,with_grpc,with_utls,with_acme,with_gvisor" -o sui main.go
|
||||||
|
```
|
||||||
|
|
||||||
|
3. Run:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
SUI_DB_FOLDER=db SUI_DEBUG=true ./sui
|
||||||
|
```
|
||||||
|
|
||||||
|
### Build Tags
|
||||||
|
|
||||||
|
The backend is built with these tags for full functionality:
|
||||||
|
|
||||||
|
- `with_quic`, `with_grpc`, `with_utls`, `with_acme`, `with_gvisor`
|
||||||
|
|
||||||
|
Use the same tags when building locally if you need feature parity with releases.
|
||||||
|
|
||||||
|
### Environment Variables (development)
|
||||||
|
|
||||||
|
| Variable | Description | Example |
|
||||||
|
|----------------|--------------------------------|-----------|
|
||||||
|
| `SUI_DB_FOLDER`| Directory for SQLite DB files | `db` |
|
||||||
|
| `SUI_DEBUG` | Enable debug mode | `true` |
|
||||||
|
| `SUI_LOG_LEVEL`| Log level | `debug` |
|
||||||
|
| `SUI_BIN_FOLDER` | Directory for binaries | `bin` |
|
||||||
|
|
||||||
|
### Docker (optional)
|
||||||
|
|
||||||
|
```bash
|
||||||
|
git clone https://github.com/alireza0/s-ui
|
||||||
|
cd s-ui
|
||||||
|
git submodule update --init --recursive
|
||||||
|
docker build -t s-ui .
|
||||||
|
# or: docker compose up -d
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Coding Conventions and Style Guide
|
||||||
|
|
||||||
|
### General
|
||||||
|
|
||||||
|
- Write clear, maintainable code. Prefer small, focused functions and packages.
|
||||||
|
- Comment non-obvious logic and public APIs.
|
||||||
|
- Handle errors explicitly; avoid ignoring `err` unless intentional.
|
||||||
|
|
||||||
|
### Go Style
|
||||||
|
|
||||||
|
- Follow **standard Go style** and **[Effective Go](https://go.dev/doc/effective_go)**.
|
||||||
|
- Run **gofmt** (or **goimports**) before committing:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
gofmt -w .
|
||||||
|
# or: goimports -w .
|
||||||
|
```
|
||||||
|
|
||||||
|
- Use **camelCase** for unexported names and **PascalCase** for exported names.
|
||||||
|
- Keep package names short and lowercase (e.g. `api`, `service`, `util`).
|
||||||
|
- Group imports: standard library, then third-party, then project imports (as in existing files).
|
||||||
|
|
||||||
|
### Project Structure Conventions
|
||||||
|
|
||||||
|
- **`api/`**: HTTP handlers and API routing (e.g. `apiHandler.go`, `apiV2Handler.go`).
|
||||||
|
- **`service/`**: Business logic and panel/core operations.
|
||||||
|
- **`database/model/`**: GORM models and DB entities.
|
||||||
|
- **`util/`**: Shared utilities (e.g. link/sub conversion, JSON).
|
||||||
|
- **`core/`**: sing-box integration and core runtime.
|
||||||
|
- **`sub/`**: Subscription (link/json) handling.
|
||||||
|
|
||||||
|
When adding new features, place code in the appropriate layer (handler → service → model/util) and avoid circular dependencies.
|
||||||
|
|
||||||
|
### Naming and Patterns
|
||||||
|
|
||||||
|
- Handlers: suffix `Handler` (e.g. `APIHandler`, `APIv2Handler`).
|
||||||
|
- Services: suffix `Service` or use package name (e.g. `ApiService`, `LinkService`).
|
||||||
|
- Models: clear struct names with JSON/gorm tags (see `database/model/`).
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Testing
|
||||||
|
|
||||||
|
### Current State
|
||||||
|
|
||||||
|
- The project does not yet have a formal test suite (no `*_test.go` files in the repo).
|
||||||
|
- CI currently focuses on **builds** (e.g. `release.yml`) rather than automated tests.
|
||||||
|
|
||||||
|
### What You Can Do Now
|
||||||
|
|
||||||
|
1. **Build verification**: Before submitting a PR, ensure the project builds:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
go build -ldflags "-w -s" -tags "with_quic,with_grpc,with_utls,with_acme,with_gvisor" -o sui main.go
|
||||||
|
```
|
||||||
|
|
||||||
|
2. **Manual testing**: Run with `./runSUI.sh`, test the changed area (panel, API, subscription, etc.).
|
||||||
|
|
||||||
|
3. **Future tests**: Contributions that add **unit tests** (e.g. for `util/`, `service/`, or API handlers) or **integration tests** are very welcome. Prefer the standard library `testing` package and table-driven tests where appropriate.
|
||||||
|
|
||||||
|
### Running the Linter (optional)
|
||||||
|
|
||||||
|
```bash
|
||||||
|
go vet ./...
|
||||||
|
# Optional: staticcheck, golangci-lint, etc.
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Features That Need Help
|
||||||
|
|
||||||
|
Community help is especially valuable in these areas. Check the [Issues](https://github.com/alireza0/s-ui/issues) for current tasks and ideas.
|
||||||
|
|
||||||
|
### High-Value Areas
|
||||||
|
|
||||||
|
- **Multi-inbound per user**: Core differentiator of S-UI; improvements to UX, docs, and robustness are welcome.
|
||||||
|
- **API (v1 and v2)**: Completeness, consistency, and documentation (see [API Documentation](https://github.com/alireza0/s-ui/wiki/API-Documentation)).
|
||||||
|
- **Subscription service**: Link conversion, JSON subscription, and info endpoints (`sub/`, `util/`).
|
||||||
|
- **Testing**: Adding unit and integration tests for critical paths.
|
||||||
|
- **Documentation**: User docs, API examples, and contribution docs (like this file).
|
||||||
|
- **Platform support**: macOS is experimental; Windows and Linux improvements are welcome (see `windows/` and `.github/workflows/`).
|
||||||
|
|
||||||
|
### How to Find Tasks
|
||||||
|
|
||||||
|
- **Good first issue**: Look for issues labeled `good first issue` or `help wanted`.
|
||||||
|
- **Feature requests**: [Feature request template](.github/ISSUE_TEMPLATE/feature_request.md).
|
||||||
|
- **Bugs**: [Bug report template](.github/ISSUE_TEMPLATE/bug_report.md).
|
||||||
|
|
||||||
|
If you want to work on a larger feature, open an issue first to discuss approach and avoid duplicate work.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Pull Request Process
|
||||||
|
|
||||||
|
1. **Fork and branch**
|
||||||
|
|
||||||
|
- Fork the repository on GitHub.
|
||||||
|
- Create a branch from `main`: e.g. `git checkout -b fix/issue-123` or `feature/sub-improvements`.
|
||||||
|
|
||||||
|
2. **Make your changes**
|
||||||
|
|
||||||
|
- Follow the [Coding Conventions](#coding-conventions-and-style-guide).
|
||||||
|
- Run `gofmt` and ensure the project builds (see [Testing](#testing)).
|
||||||
|
- Keep commits focused and messages clear (e.g. "Fix link conversion for VMess", "Add tests for outJson").
|
||||||
|
|
||||||
|
3. **Push and open a PR**
|
||||||
|
|
||||||
|
- Push your branch and open a Pull Request against `main`.
|
||||||
|
- Use the PR description to explain:
|
||||||
|
- What problem or feature the PR addresses.
|
||||||
|
- What you changed and how to verify it.
|
||||||
|
- Reference any related issue (e.g. "Fixes #123").
|
||||||
|
|
||||||
|
4. **Review and CI**
|
||||||
|
|
||||||
|
- Maintainers will review your code. CI (e.g. build workflows) must pass.
|
||||||
|
- Address feedback by pushing new commits to the same branch.
|
||||||
|
|
||||||
|
5. **Merge**
|
||||||
|
|
||||||
|
- Once approved and CI is green, a maintainer will merge your PR. Thank you for contributing!
|
||||||
|
|
||||||
|
### PR Guidelines
|
||||||
|
|
||||||
|
- Prefer **small, reviewable PRs**. Split large features into logical steps.
|
||||||
|
- Avoid unrelated changes (e.g. formatting-only or refactors in a feature PR).
|
||||||
|
- Ensure your branch is up to date with `main` before submitting (rebase or merge as the project prefers).
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Adding This Guide in Your Repository
|
||||||
|
|
||||||
|
If you maintain a fork or your own repository and want the contribution guide to be visible and linked properly:
|
||||||
|
|
||||||
|
1. **Keep `CONTRIBUTING.md` in the repository root**
|
||||||
|
GitHub automatically discovers a file named `CONTRIBUTING.md` (or `CONTRIBUTING`) in the root. When someone opens a new issue or pull request, GitHub can show a link to it. The community profile also uses it for the “Contributing” section.
|
||||||
|
|
||||||
|
2. **Link from README**
|
||||||
|
Add a short line in your main `README.md` so new contributors see it when they land on the repo, for example:
|
||||||
|
```markdown
|
||||||
|
**Want to contribute?** See [CONTRIBUTING.md](CONTRIBUTING.md) for development setup, coding conventions, and the pull request process.
|
||||||
|
```
|
||||||
|
|
||||||
|
3. **Optional: GitHub “Contributing” link**
|
||||||
|
In the repository **Settings → General → Features**, ensure “Issues” (and optionally “Discussions”) are enabled. The link to `CONTRIBUTING.md` appears when users create a new issue or PR; no extra config is needed as long as the file is in the root.
|
||||||
|
|
||||||
|
4. **When forking**
|
||||||
|
If you fork S-UI, `CONTRIBUTING.md` is already in the repo. Update the clone URLs and repo names in this file if you want your fork’s contribution instructions to point to your own repository.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Reporting Bugs and Requesting Features
|
||||||
|
|
||||||
|
- **Bugs**: Use the [bug report template](.github/ISSUE_TEMPLATE/bug_report.md). Include version, OS, steps to reproduce, and expected vs actual behavior.
|
||||||
|
- **Features**: Use the [feature request template](.github/ISSUE_TEMPLATE/feature_request.md). Describe the use case and, if possible, a proposed approach.
|
||||||
|
- **Questions**: Use the [question template](.github/ISSUE_TEMPLATE/question-template.md) or discussions if enabled.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
Thank you for helping S-UI grow. Your contributions make it possible for more users to adopt S-UI in production and benefit from its multi-inbound-per-user design.
|
||||||
@@ -11,6 +11,8 @@
|
|||||||
|
|
||||||
**If you think this project is helpful to you, you may wish to give a**:star2:
|
**If you think this project is helpful to you, you may wish to give a**:star2:
|
||||||
|
|
||||||
|
**Want to contribute?** See [CONTRIBUTING.md](CONTRIBUTING.md) for development setup, coding conventions, testing, and the pull request process.
|
||||||
|
|
||||||
[](https://www.buymeacoffee.com/alireza7)
|
[](https://www.buymeacoffee.com/alireza7)
|
||||||
|
|
||||||
<a href="https://nowpayments.io/donation/alireza7" target="_blank" rel="noreferrer noopener">
|
<a href="https://nowpayments.io/donation/alireza7" target="_blank" rel="noreferrer noopener">
|
||||||
@@ -25,7 +27,7 @@
|
|||||||
| Multi-Client/Inbound | :heavy_check_mark: |
|
| Multi-Client/Inbound | :heavy_check_mark: |
|
||||||
| Advanced Traffic Routing Interface | :heavy_check_mark: |
|
| Advanced Traffic Routing Interface | :heavy_check_mark: |
|
||||||
| Client & Traffic & System Status | :heavy_check_mark: |
|
| Client & Traffic & System Status | :heavy_check_mark: |
|
||||||
| Subscription Service (link/json + info)| :heavy_check_mark: |
|
| Subscription Link (link/json/clash + info)| :heavy_check_mark: |
|
||||||
| Dark/Light Theme | :heavy_check_mark: |
|
| Dark/Light Theme | :heavy_check_mark: |
|
||||||
| API Interface | :heavy_check_mark: |
|
| API Interface | :heavy_check_mark: |
|
||||||
|
|
||||||
|
|||||||
@@ -48,6 +48,8 @@ func (a *APIHandler) postHandler(c *gin.Context) {
|
|||||||
a.ApiService.RestartSb(c)
|
a.ApiService.RestartSb(c)
|
||||||
case "linkConvert":
|
case "linkConvert":
|
||||||
a.ApiService.LinkConvert(c)
|
a.ApiService.LinkConvert(c)
|
||||||
|
case "subConvert":
|
||||||
|
a.ApiService.SubConvert(c)
|
||||||
case "importdb":
|
case "importdb":
|
||||||
a.ApiService.ImportDb(c)
|
a.ApiService.ImportDb(c)
|
||||||
case "addToken":
|
case "addToken":
|
||||||
@@ -97,6 +99,8 @@ func (a *APIHandler) getHandler(c *gin.Context) {
|
|||||||
a.ApiService.GetTokens(c)
|
a.ApiService.GetTokens(c)
|
||||||
case "singbox-config":
|
case "singbox-config":
|
||||||
a.ApiService.GetSingboxConfig(c)
|
a.ApiService.GetSingboxConfig(c)
|
||||||
|
case "checkOutbound":
|
||||||
|
a.ApiService.GetCheckOutbound(c)
|
||||||
default:
|
default:
|
||||||
jsonMsg(c, "failed", common.NewError("unknown action: ", action))
|
jsonMsg(c, "failed", common.NewError("unknown action: ", action))
|
||||||
}
|
}
|
||||||
|
|||||||
+15
-8
@@ -330,6 +330,12 @@ func (a *ApiService) LinkConvert(c *gin.Context) {
|
|||||||
jsonObj(c, result, err)
|
jsonObj(c, result, err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (a *ApiService) SubConvert(c *gin.Context) {
|
||||||
|
link := c.Request.FormValue("link")
|
||||||
|
result, err := util.GetExternalSub(link)
|
||||||
|
jsonObj(c, result, err)
|
||||||
|
}
|
||||||
|
|
||||||
func (a *ApiService) ImportDb(c *gin.Context) {
|
func (a *ApiService) ImportDb(c *gin.Context) {
|
||||||
file, _, err := c.Request.FormFile("db")
|
file, _, err := c.Request.FormFile("db")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -380,13 +386,7 @@ func (a *ApiService) DeleteToken(c *gin.Context) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (a *ApiService) GetSingboxConfig(c *gin.Context) {
|
func (a *ApiService) GetSingboxConfig(c *gin.Context) {
|
||||||
config, err := a.ConfigService.GetConfig("")
|
rawConfig, err := a.ConfigService.GetConfig("")
|
||||||
if err != nil {
|
|
||||||
c.Status(400)
|
|
||||||
c.Writer.WriteString(err.Error())
|
|
||||||
return
|
|
||||||
}
|
|
||||||
rawConfig, err := json.MarshalIndent(config, "", " ")
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
c.Status(400)
|
c.Status(400)
|
||||||
c.Writer.WriteString(err.Error())
|
c.Writer.WriteString(err.Error())
|
||||||
@@ -394,5 +394,12 @@ func (a *ApiService) GetSingboxConfig(c *gin.Context) {
|
|||||||
}
|
}
|
||||||
c.Header("Content-Type", "application/json")
|
c.Header("Content-Type", "application/json")
|
||||||
c.Header("Content-Disposition", "attachment; filename=config_"+time.Now().Format("20060102-150405")+".json")
|
c.Header("Content-Disposition", "attachment; filename=config_"+time.Now().Format("20060102-150405")+".json")
|
||||||
c.Writer.Write(rawConfig)
|
c.Writer.Write(*rawConfig)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a *ApiService) GetCheckOutbound(c *gin.Context) {
|
||||||
|
tag := c.Query("tag")
|
||||||
|
link := c.Query("link")
|
||||||
|
result := a.ConfigService.CheckOutbound(tag, link)
|
||||||
|
jsonObj(c, result, nil)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -49,6 +49,8 @@ func (a *APIv2Handler) postHandler(c *gin.Context) {
|
|||||||
a.ApiService.RestartSb(c)
|
a.ApiService.RestartSb(c)
|
||||||
case "linkConvert":
|
case "linkConvert":
|
||||||
a.ApiService.LinkConvert(c)
|
a.ApiService.LinkConvert(c)
|
||||||
|
case "subConvert":
|
||||||
|
a.ApiService.SubConvert(c)
|
||||||
case "importdb":
|
case "importdb":
|
||||||
a.ApiService.ImportDb(c)
|
a.ApiService.ImportDb(c)
|
||||||
default:
|
default:
|
||||||
@@ -86,6 +88,8 @@ func (a *APIv2Handler) getHandler(c *gin.Context) {
|
|||||||
a.ApiService.GetKeypairs(c)
|
a.ApiService.GetKeypairs(c)
|
||||||
case "getdb":
|
case "getdb":
|
||||||
a.ApiService.GetDb(c)
|
a.ApiService.GetDb(c)
|
||||||
|
case "checkOutbound":
|
||||||
|
a.ApiService.GetCheckOutbound(c)
|
||||||
default:
|
default:
|
||||||
jsonMsg(c, "failed", common.NewError("unknown action: ", action))
|
jsonMsg(c, "failed", common.NewError("unknown action: ", action))
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -79,7 +79,7 @@ func (a *APP) Start() error {
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
err = a.configService.StartCore("")
|
err = a.configService.StartCore()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logger.Error(err)
|
logger.Error(err)
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -1 +1 @@
|
|||||||
1.3.8
|
1.3.11
|
||||||
+3
-3
@@ -82,11 +82,11 @@ func (c *Core) Start(sbConfig []byte) error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (c *Core) Stop() error {
|
func (c *Core) Stop() error {
|
||||||
if c.isRunning {
|
|
||||||
c.isRunning = false
|
c.isRunning = false
|
||||||
return c.instance.Close()
|
if c.instance != nil {
|
||||||
}
|
|
||||||
return nil
|
return nil
|
||||||
|
}
|
||||||
|
return c.instance.Close()
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c *Core) IsRunning() bool {
|
func (c *Core) IsRunning() bool {
|
||||||
|
|||||||
@@ -0,0 +1,40 @@
|
|||||||
|
package core
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
urltest "github.com/sagernet/sing-box/common/urltest"
|
||||||
|
)
|
||||||
|
|
||||||
|
const checkTimeout = 15 * time.Second
|
||||||
|
|
||||||
|
type CheckOutboundResult struct {
|
||||||
|
OK bool
|
||||||
|
Delay uint16
|
||||||
|
Error string
|
||||||
|
}
|
||||||
|
|
||||||
|
func CheckOutbound(ctx context.Context, tag string, link string) (result CheckOutboundResult) {
|
||||||
|
if outbound_manager == nil {
|
||||||
|
result.Error = "core not running"
|
||||||
|
return result
|
||||||
|
}
|
||||||
|
ob, ok := outbound_manager.Outbound(tag)
|
||||||
|
if !ok {
|
||||||
|
result.Error = "outbound not found"
|
||||||
|
return result
|
||||||
|
}
|
||||||
|
|
||||||
|
ctx, cancel := context.WithTimeout(ctx, checkTimeout)
|
||||||
|
defer cancel()
|
||||||
|
|
||||||
|
delay, err := urltest.URLTest(ctx, link, ob)
|
||||||
|
if err != nil {
|
||||||
|
result.Error = err.Error()
|
||||||
|
return result
|
||||||
|
}
|
||||||
|
result.OK = true
|
||||||
|
result.Delay = delay
|
||||||
|
return result
|
||||||
|
}
|
||||||
@@ -13,5 +13,5 @@ func NewCheckCoreJob() *CheckCoreJob {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (s *CheckCoreJob) Run() {
|
func (s *CheckCoreJob) Run() {
|
||||||
s.ConfigService.StartCore("")
|
s.ConfigService.StartCore()
|
||||||
}
|
}
|
||||||
|
|||||||
+7
-1
@@ -4,6 +4,7 @@ import (
|
|||||||
"encoding/json"
|
"encoding/json"
|
||||||
"os"
|
"os"
|
||||||
"path"
|
"path"
|
||||||
|
"strings"
|
||||||
|
|
||||||
"github.com/alireza0/s-ui/config"
|
"github.com/alireza0/s-ui/config"
|
||||||
"github.com/alireza0/s-ui/database/model"
|
"github.com/alireza0/s-ui/database/model"
|
||||||
@@ -49,7 +50,12 @@ func OpenDB(dbPath string) error {
|
|||||||
c := &gorm.Config{
|
c := &gorm.Config{
|
||||||
Logger: gormLogger,
|
Logger: gormLogger,
|
||||||
}
|
}
|
||||||
db, err = gorm.Open(sqlite.Open(dbPath), c)
|
sep := "?"
|
||||||
|
if strings.Contains(dbPath, "?") {
|
||||||
|
sep = "&"
|
||||||
|
}
|
||||||
|
dsn := dbPath + sep + "_busy_timeout=10000"
|
||||||
|
db, err = gorm.Open(sqlite.Open(dsn), c)
|
||||||
|
|
||||||
if config.IsDebug() {
|
if config.IsDebug() {
|
||||||
db = db.Debug()
|
db = db.Debug()
|
||||||
|
|||||||
+6
-2
@@ -1,4 +1,8 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
./sui migrate
|
DB_PATH="${SUI_DB_FOLDER:-/app/db}/s-ui.db"
|
||||||
./sui
|
if [ -f "$DB_PATH" ]; then
|
||||||
|
./sui migrate
|
||||||
|
fi
|
||||||
|
|
||||||
|
exec ./sui
|
||||||
+1
-1
Submodule frontend updated: 32054ae938...031d0e166f
@@ -1,6 +1,6 @@
|
|||||||
module github.com/alireza0/s-ui
|
module github.com/alireza0/s-ui
|
||||||
|
|
||||||
go 1.25.6
|
go 1.25.7
|
||||||
|
|
||||||
require (
|
require (
|
||||||
github.com/gin-contrib/gzip v1.2.5
|
github.com/gin-contrib/gzip v1.2.5
|
||||||
@@ -10,7 +10,7 @@ require (
|
|||||||
github.com/op/go-logging v0.0.0-20160315200505-970db520ece7
|
github.com/op/go-logging v0.0.0-20160315200505-970db520ece7
|
||||||
github.com/robfig/cron/v3 v3.0.1
|
github.com/robfig/cron/v3 v3.0.1
|
||||||
github.com/sagernet/sing v0.7.18
|
github.com/sagernet/sing v0.7.18
|
||||||
github.com/sagernet/sing-box v1.12.20
|
github.com/sagernet/sing-box v1.12.23
|
||||||
github.com/sagernet/sing-dns v0.4.6
|
github.com/sagernet/sing-dns v0.4.6
|
||||||
github.com/shirou/gopsutil/v4 v4.26.1
|
github.com/shirou/gopsutil/v4 v4.26.1
|
||||||
golang.zx2c4.com/wireguard/wgctrl v0.0.0-20241231184526-a9ab2273dd10
|
golang.zx2c4.com/wireguard/wgctrl v0.0.0-20241231184526-a9ab2273dd10
|
||||||
@@ -20,7 +20,7 @@ require (
|
|||||||
)
|
)
|
||||||
|
|
||||||
require (
|
require (
|
||||||
filippo.io/edwards25519 v1.1.0 // indirect
|
filippo.io/edwards25519 v1.2.0 // indirect
|
||||||
github.com/ajg/form v1.5.1 // indirect
|
github.com/ajg/form v1.5.1 // indirect
|
||||||
github.com/akutz/memconn v0.1.0 // indirect
|
github.com/akutz/memconn v0.1.0 // indirect
|
||||||
github.com/alexbrainman/sspi v0.0.0-20231016080023-1a75b4708caa // indirect
|
github.com/alexbrainman/sspi v0.0.0-20231016080023-1a75b4708caa // indirect
|
||||||
@@ -110,7 +110,7 @@ require (
|
|||||||
github.com/sagernet/nftables v0.3.0-beta.4 // indirect
|
github.com/sagernet/nftables v0.3.0-beta.4 // indirect
|
||||||
github.com/sagernet/quic-go v0.52.0-sing-box-mod.3 // indirect
|
github.com/sagernet/quic-go v0.52.0-sing-box-mod.3 // indirect
|
||||||
github.com/sagernet/sing-mux v0.3.4 // indirect
|
github.com/sagernet/sing-mux v0.3.4 // indirect
|
||||||
github.com/sagernet/sing-quic v0.5.2 // indirect
|
github.com/sagernet/sing-quic v0.5.3 // indirect
|
||||||
github.com/sagernet/sing-shadowsocks v0.2.8 // indirect
|
github.com/sagernet/sing-shadowsocks v0.2.8 // indirect
|
||||||
github.com/sagernet/sing-shadowsocks2 v0.2.1 // indirect
|
github.com/sagernet/sing-shadowsocks2 v0.2.1 // indirect
|
||||||
github.com/sagernet/sing-shadowtls v0.2.1-0.20250503051639-fcd445d33c11 // indirect
|
github.com/sagernet/sing-shadowtls v0.2.1-0.20250503051639-fcd445d33c11 // indirect
|
||||||
|
|||||||
@@ -1,5 +1,9 @@
|
|||||||
filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=
|
filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=
|
||||||
filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
|
filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
|
||||||
|
filippo.io/edwards25519 v1.1.1 h1:YpjwWWlNmGIDyXOn8zLzqiD+9TyIlPhGFG96P39uBpw=
|
||||||
|
filippo.io/edwards25519 v1.1.1/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
|
||||||
|
filippo.io/edwards25519 v1.2.0 h1:crnVqOiS4jqYleHd9vaKZ+HKtHfllngJIiOpNpoJsjo=
|
||||||
|
filippo.io/edwards25519 v1.2.0/go.mod h1:xzAOLCNug/yB62zG1bQ8uziwrIqIuxhctzJT18Q77mc=
|
||||||
github.com/ajg/form v1.5.1 h1:t9c7v8JUKu/XxOGBU0yjNpaMloxGEJhUkqFRq0ibGeU=
|
github.com/ajg/form v1.5.1 h1:t9c7v8JUKu/XxOGBU0yjNpaMloxGEJhUkqFRq0ibGeU=
|
||||||
github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY=
|
github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY=
|
||||||
github.com/akutz/memconn v0.1.0 h1:NawI0TORU4hcOMsMr11g7vwlCdkYeLKXBcxWu2W/P8A=
|
github.com/akutz/memconn v0.1.0 h1:NawI0TORU4hcOMsMr11g7vwlCdkYeLKXBcxWu2W/P8A=
|
||||||
@@ -217,14 +221,14 @@ github.com/sagernet/quic-go v0.52.0-sing-box-mod.3 h1:ySqffGm82rPqI1TUPqmtHIYd12
|
|||||||
github.com/sagernet/quic-go v0.52.0-sing-box-mod.3/go.mod h1:OV+V5kEBb8kJS7k29MzDu6oj9GyMc7HA07sE1tedxz4=
|
github.com/sagernet/quic-go v0.52.0-sing-box-mod.3/go.mod h1:OV+V5kEBb8kJS7k29MzDu6oj9GyMc7HA07sE1tedxz4=
|
||||||
github.com/sagernet/sing v0.7.18 h1:iZHkaru1/MoHugx3G+9S3WG4owMewKO/KvieE2Pzk4E=
|
github.com/sagernet/sing v0.7.18 h1:iZHkaru1/MoHugx3G+9S3WG4owMewKO/KvieE2Pzk4E=
|
||||||
github.com/sagernet/sing v0.7.18/go.mod h1:ARkL0gM13/Iv5VCZmci/NuoOlePoIsW0m7BWfln/Hak=
|
github.com/sagernet/sing v0.7.18/go.mod h1:ARkL0gM13/Iv5VCZmci/NuoOlePoIsW0m7BWfln/Hak=
|
||||||
github.com/sagernet/sing-box v1.12.20 h1:5KarG2Q8/8k8VKXN6sywTc0Gs06HKZ4++zu2y4bw9KA=
|
github.com/sagernet/sing-box v1.12.23 h1:egmRGPpzMZVmc4iCl0T1wBBAZea3NTxDmi//b3sXSsQ=
|
||||||
github.com/sagernet/sing-box v1.12.20/go.mod h1:ePKI4HpMVy+wtAumZx6pJxwq2ddiwmU+0ZoVteNdTsY=
|
github.com/sagernet/sing-box v1.12.23/go.mod h1:jjM3DQWWJSMW3U0uv3AxYRjyLnHu/SXN3A6Svex83/w=
|
||||||
github.com/sagernet/sing-dns v0.4.6 h1:mjZC0o6d5sQ1sraoOBbK3G3apCbuL8wWYwu2RNu5rbM=
|
github.com/sagernet/sing-dns v0.4.6 h1:mjZC0o6d5sQ1sraoOBbK3G3apCbuL8wWYwu2RNu5rbM=
|
||||||
github.com/sagernet/sing-dns v0.4.6/go.mod h1:dweQs54ng2YGzoJfz+F9dGuDNdP5pJ3PLeggnK5VWc8=
|
github.com/sagernet/sing-dns v0.4.6/go.mod h1:dweQs54ng2YGzoJfz+F9dGuDNdP5pJ3PLeggnK5VWc8=
|
||||||
github.com/sagernet/sing-mux v0.3.4 h1:ZQplKl8MNXutjzbMVtWvWG31fohhgOfCuUZR4dVQ8+s=
|
github.com/sagernet/sing-mux v0.3.4 h1:ZQplKl8MNXutjzbMVtWvWG31fohhgOfCuUZR4dVQ8+s=
|
||||||
github.com/sagernet/sing-mux v0.3.4/go.mod h1:QvlKMyNBNrQoyX4x+gq028uPbLM2XeRpWtDsWBJbFSk=
|
github.com/sagernet/sing-mux v0.3.4/go.mod h1:QvlKMyNBNrQoyX4x+gq028uPbLM2XeRpWtDsWBJbFSk=
|
||||||
github.com/sagernet/sing-quic v0.5.2 h1:I3vlfRImhr0uLwRS3b3ib70RMG9FcXtOKKUDz3eKRWc=
|
github.com/sagernet/sing-quic v0.5.3 h1:K937DKJN98xqyztijRkLJqbBfyV4rEZcYxFyP3EBikU=
|
||||||
github.com/sagernet/sing-quic v0.5.2/go.mod h1:evP1e++ZG8TJHVV5HudXV4vWeYzGfCdF4HwSJZcdqkI=
|
github.com/sagernet/sing-quic v0.5.3/go.mod h1:evP1e++ZG8TJHVV5HudXV4vWeYzGfCdF4HwSJZcdqkI=
|
||||||
github.com/sagernet/sing-shadowsocks v0.2.8 h1:PURj5PRoAkqeHh2ZW205RWzN9E9RtKCVCzByXruQWfE=
|
github.com/sagernet/sing-shadowsocks v0.2.8 h1:PURj5PRoAkqeHh2ZW205RWzN9E9RtKCVCzByXruQWfE=
|
||||||
github.com/sagernet/sing-shadowsocks v0.2.8/go.mod h1:lo7TWEMDcN5/h5B8S0ew+r78ZODn6SwVaFhvB6H+PTI=
|
github.com/sagernet/sing-shadowsocks v0.2.8/go.mod h1:lo7TWEMDcN5/h5B8S0ew+r78ZODn6SwVaFhvB6H+PTI=
|
||||||
github.com/sagernet/sing-shadowsocks2 v0.2.1 h1:dWV9OXCeFPuYGHb6IRqlSptVnSzOelnqqs2gQ2/Qioo=
|
github.com/sagernet/sing-shadowsocks2 v0.2.1 h1:dWV9OXCeFPuYGHb6IRqlSptVnSzOelnqqs2gQ2/Qioo=
|
||||||
|
|||||||
@@ -23,6 +23,16 @@ func InitLogger(level logging.Level) {
|
|||||||
var backend logging.Backend
|
var backend logging.Backend
|
||||||
var format logging.Formatter
|
var format logging.Formatter
|
||||||
|
|
||||||
|
_, inContainer := os.LookupEnv("container")
|
||||||
|
if !inContainer {
|
||||||
|
if _, statErr := os.Stat("/.dockerenv"); statErr == nil {
|
||||||
|
inContainer = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if inContainer {
|
||||||
|
backend = logging.NewLogBackend(os.Stderr, "", 0)
|
||||||
|
format = logging.MustStringFormatter(`%{time:2006/01/02 15:04:05} %{level} - %{message}`)
|
||||||
|
} else {
|
||||||
backend, err = logging.NewSyslogBackend("")
|
backend, err = logging.NewSyslogBackend("")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
fmt.Println("Unable to use syslog: " + err.Error())
|
fmt.Println("Unable to use syslog: " + err.Error())
|
||||||
@@ -33,6 +43,7 @@ func InitLogger(level logging.Level) {
|
|||||||
} else {
|
} else {
|
||||||
format = logging.MustStringFormatter(`%{level} - %{message}`)
|
format = logging.MustStringFormatter(`%{level} - %{message}`)
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
backendFormatter := logging.NewBackendFormatter(backend, format)
|
backendFormatter := logging.NewBackendFormatter(backend, format)
|
||||||
backendLeveled := logging.AddModuleLevel(backendFormatter)
|
backendLeveled := logging.AddModuleLevel(backendFormatter)
|
||||||
|
|||||||
+18
-6
@@ -222,10 +222,16 @@ func (s *ClientService) UpdateClientsOnInboundAdd(tx *gorm.DB, initIds string, i
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (s *ClientService) UpdateClientsOnInboundDelete(tx *gorm.DB, id uint, tag string) error {
|
func (s *ClientService) UpdateClientsOnInboundDelete(tx *gorm.DB, id uint, tag string) error {
|
||||||
|
var clientIds []uint
|
||||||
|
err := tx.Raw("SELECT clients.id FROM clients, json_each(clients.inbounds) AS je WHERE je.value = ?", id).Scan(&clientIds).Error
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if len(clientIds) == 0 {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
var clients []model.Client
|
var clients []model.Client
|
||||||
err := tx.Table("clients").
|
err = tx.Model(model.Client{}).Where("id IN ?", clientIds).Find(&clients).Error
|
||||||
Where("EXISTS (SELECT 1 FROM json_each(clients.inbounds) WHERE json_each.value = ?)", id).
|
|
||||||
Find(&clients).Error
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
@@ -265,10 +271,16 @@ func (s *ClientService) UpdateClientsOnInboundDelete(tx *gorm.DB, id uint, tag s
|
|||||||
func (s *ClientService) UpdateLinksByInboundChange(tx *gorm.DB, inbounds *[]model.Inbound, hostname string, oldTag string) error {
|
func (s *ClientService) UpdateLinksByInboundChange(tx *gorm.DB, inbounds *[]model.Inbound, hostname string, oldTag string) error {
|
||||||
var err error
|
var err error
|
||||||
for _, inbound := range *inbounds {
|
for _, inbound := range *inbounds {
|
||||||
|
var clientIds []uint
|
||||||
|
err = tx.Raw("SELECT clients.id FROM clients, json_each(clients.inbounds) AS je WHERE je.value = ?", inbound.Id).Scan(&clientIds).Error
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if len(clientIds) == 0 {
|
||||||
|
continue
|
||||||
|
}
|
||||||
var clients []model.Client
|
var clients []model.Client
|
||||||
err = tx.Table("clients").
|
err = tx.Model(model.Client{}).Where("id IN ?", clientIds).Find(&clients).Error
|
||||||
Where("EXISTS (SELECT 1 FROM json_each(clients.inbounds) WHERE json_each.value = ?)", inbound.Id).
|
|
||||||
Find(&clients).Error
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|||||||
+45
-14
@@ -44,7 +44,7 @@ func NewConfigService(core *core.Core) *ConfigService {
|
|||||||
return &ConfigService{}
|
return &ConfigService{}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *ConfigService) GetConfig(data string) (*SingBoxConfig, error) {
|
func (s *ConfigService) GetConfig(data string) (*[]byte, error) {
|
||||||
var err error
|
var err error
|
||||||
if len(data) == 0 {
|
if len(data) == 0 {
|
||||||
data, err = s.SettingService.GetConfig()
|
data, err = s.SettingService.GetConfig()
|
||||||
@@ -74,22 +74,22 @@ func (s *ConfigService) GetConfig(data string) (*SingBoxConfig, error) {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
return &singboxConfig, nil
|
rawConfig, err := json.MarshalIndent(singboxConfig, "", " ")
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return &rawConfig, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *ConfigService) StartCore(defaultConfig string) error {
|
func (s *ConfigService) StartCore() error {
|
||||||
if corePtr.IsRunning() {
|
if corePtr.IsRunning() {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
singboxConfig, err := s.GetConfig(defaultConfig)
|
rawConfig, err := s.GetConfig("")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
rawConfig, err := json.MarshalIndent(singboxConfig, "", " ")
|
err = corePtr.Start(*rawConfig)
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
err = corePtr.Start(rawConfig)
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logger.Error("start sing-box err:", err.Error())
|
logger.Error("start sing-box err:", err.Error())
|
||||||
return err
|
return err
|
||||||
@@ -103,15 +103,34 @@ func (s *ConfigService) RestartCore() error {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
return s.StartCore("")
|
return s.StartCore()
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *ConfigService) restartCoreWithConfig(config json.RawMessage) error {
|
func (s *ConfigService) restartCoreWithConfig(config json.RawMessage) error {
|
||||||
err := s.StopCore()
|
var err error
|
||||||
|
defer func() {
|
||||||
|
if err != nil {
|
||||||
|
corePtr.Stop()
|
||||||
|
logger.Error("restart sing-box err:", err.Error())
|
||||||
|
} else {
|
||||||
|
logger.Info("sing-box restarted with new config")
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
if corePtr.IsRunning() {
|
||||||
|
err = corePtr.GetInstance().Close()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
return s.StartCore(string(config))
|
}
|
||||||
|
rawConfig, err := s.GetConfig(string(config))
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
err = corePtr.Start(*rawConfig)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *ConfigService) StopCore() error {
|
func (s *ConfigService) StopCore() error {
|
||||||
@@ -123,6 +142,16 @@ func (s *ConfigService) StopCore() error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (s *ConfigService) CheckOutbound(tag string, link string) core.CheckOutboundResult {
|
||||||
|
if tag == "" {
|
||||||
|
return core.CheckOutboundResult{Error: "missing query parameter: tag"}
|
||||||
|
}
|
||||||
|
if corePtr == nil || !corePtr.IsRunning() {
|
||||||
|
return core.CheckOutboundResult{Error: "core not running"}
|
||||||
|
}
|
||||||
|
return core.CheckOutbound(corePtr.GetCtx(), tag, link)
|
||||||
|
}
|
||||||
|
|
||||||
func (s *ConfigService) Save(obj string, act string, data json.RawMessage, initUsers string, loginUser string, hostname string) ([]string, error) {
|
func (s *ConfigService) Save(obj string, act string, data json.RawMessage, initUsers string, loginUser string, hostname string) ([]string, error) {
|
||||||
var err error
|
var err error
|
||||||
var objs []string = []string{obj}
|
var objs []string = []string{obj}
|
||||||
@@ -134,7 +163,7 @@ func (s *ConfigService) Save(obj string, act string, data json.RawMessage, initU
|
|||||||
tx.Commit()
|
tx.Commit()
|
||||||
// Try to start core if it is not running
|
// Try to start core if it is not running
|
||||||
if !corePtr.IsRunning() {
|
if !corePtr.IsRunning() {
|
||||||
s.StartCore("")
|
s.StartCore()
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
tx.Rollback()
|
tx.Rollback()
|
||||||
@@ -169,7 +198,9 @@ func (s *ConfigService) Save(obj string, act string, data json.RawMessage, initU
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
err = s.restartCoreWithConfig(data)
|
configData := make(json.RawMessage, len(data))
|
||||||
|
copy(configData, data)
|
||||||
|
go func() { _ = s.restartCoreWithConfig(configData) }()
|
||||||
case "settings":
|
case "settings":
|
||||||
err = s.SettingService.Save(tx, data)
|
err = s.SettingService.Save(tx, data)
|
||||||
default:
|
default:
|
||||||
|
|||||||
+33
-11
@@ -9,6 +9,8 @@ import (
|
|||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/alireza0/s-ui/config"
|
"github.com/alireza0/s-ui/config"
|
||||||
|
"github.com/alireza0/s-ui/database"
|
||||||
|
"github.com/alireza0/s-ui/database/model"
|
||||||
"github.com/alireza0/s-ui/logger"
|
"github.com/alireza0/s-ui/logger"
|
||||||
|
|
||||||
"github.com/sagernet/sing-box/common/tls"
|
"github.com/sagernet/sing-box/common/tls"
|
||||||
@@ -40,10 +42,11 @@ func (s *ServerService) GetStatus(request string) *map[string]interface{} {
|
|||||||
case "net":
|
case "net":
|
||||||
status["net"] = s.GetNetInfo()
|
status["net"] = s.GetNetInfo()
|
||||||
case "sys":
|
case "sys":
|
||||||
status["uptime"] = s.GetUptime()
|
|
||||||
status["sys"] = s.GetSystemInfo()
|
status["sys"] = s.GetSystemInfo()
|
||||||
case "sbd":
|
case "sbd":
|
||||||
status["sbd"] = s.GetSingboxInfo()
|
status["sbd"] = s.GetSingboxInfo()
|
||||||
|
case "db":
|
||||||
|
status["db"] = s.GetDatabaseInfo()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return &status
|
return &status
|
||||||
@@ -59,16 +62,6 @@ func (s *ServerService) GetCpuPercent() float64 {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *ServerService) GetUptime() uint64 {
|
|
||||||
upTime, err := host.Uptime()
|
|
||||||
if err != nil {
|
|
||||||
logger.Warning("get uptime failed:", err)
|
|
||||||
return 0
|
|
||||||
} else {
|
|
||||||
return upTime
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *ServerService) GetMemInfo() map[string]interface{} {
|
func (s *ServerService) GetMemInfo() map[string]interface{} {
|
||||||
info := make(map[string]interface{}, 0)
|
info := make(map[string]interface{}, 0)
|
||||||
memInfo, err := mem.VirtualMemory()
|
memInfo, err := mem.VirtualMemory()
|
||||||
@@ -192,6 +185,7 @@ func (s *ServerService) GetSystemInfo() map[string]interface{} {
|
|||||||
}
|
}
|
||||||
info["ipv4"] = ipv4
|
info["ipv4"] = ipv4
|
||||||
info["ipv6"] = ipv6
|
info["ipv6"] = ipv6
|
||||||
|
info["bootTime"], _ = host.BootTime()
|
||||||
|
|
||||||
return info
|
return info
|
||||||
}
|
}
|
||||||
@@ -259,3 +253,31 @@ func (s *ServerService) generateWireGuardKey(pk string) []string {
|
|||||||
}
|
}
|
||||||
return []string{"PrivateKey: " + wgKeys.String(), "PublicKey: " + wgKeys.PublicKey().String()}
|
return []string{"PrivateKey: " + wgKeys.String(), "PublicKey: " + wgKeys.PublicKey().String()}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (s *ServerService) GetDatabaseInfo() map[string]int64 {
|
||||||
|
info := make(map[string]int64, 0)
|
||||||
|
db := database.GetDB()
|
||||||
|
if db == nil {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
var clientsCount, inboundsCount, outboundsCount, servicesCount, endpointsCount, clientUp, clientDown int64
|
||||||
|
|
||||||
|
db.Model(&model.Client{}).Count(&clientsCount)
|
||||||
|
db.Model(&model.Inbound{}).Count(&inboundsCount)
|
||||||
|
db.Model(&model.Outbound{}).Count(&outboundsCount)
|
||||||
|
db.Model(&model.Service{}).Count(&servicesCount)
|
||||||
|
db.Model(&model.Endpoint{}).Count(&endpointsCount)
|
||||||
|
db.Model(&model.Client{}).Select("COALESCE(SUM(up),0)").Scan(&clientUp)
|
||||||
|
db.Model(&model.Client{}).Select("COALESCE(SUM(down),0)").Scan(&clientDown)
|
||||||
|
|
||||||
|
info["clients"] = clientsCount
|
||||||
|
info["inbounds"] = inboundsCount
|
||||||
|
info["outbounds"] = outboundsCount
|
||||||
|
info["services"] = servicesCount
|
||||||
|
info["endpoints"] = endpointsCount
|
||||||
|
info["clientUp"] = clientUp
|
||||||
|
info["clientDown"] = clientDown
|
||||||
|
|
||||||
|
return info
|
||||||
|
}
|
||||||
|
|||||||
+7
-1
@@ -125,7 +125,13 @@ func (s *ClashService) ConvertToClashMeta(outbounds *[]map[string]interface{}) (
|
|||||||
proxy := make(map[string]interface{})
|
proxy := make(map[string]interface{})
|
||||||
proxy["name"] = obMap["tag"]
|
proxy["name"] = obMap["tag"]
|
||||||
proxy["type"] = t
|
proxy["type"] = t
|
||||||
proxy["server"] = obMap["server"]
|
|
||||||
|
server, _ := obMap["server"].(string)
|
||||||
|
if len(server) > 0 && strings.Contains(server, ":") && !strings.Contains(server, ".") && !(strings.HasPrefix(server, "[") && strings.HasSuffix(server, "]")) {
|
||||||
|
server = "'[" + server + "]'"
|
||||||
|
}
|
||||||
|
proxy["server"] = server
|
||||||
|
|
||||||
proxy["port"] = obMap["server_port"]
|
proxy["port"] = obMap["server_port"]
|
||||||
|
|
||||||
switch t {
|
switch t {
|
||||||
|
|||||||
+2
-32
@@ -1,10 +1,7 @@
|
|||||||
package sub
|
package sub
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"crypto/tls"
|
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"io"
|
|
||||||
"net/http"
|
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/alireza0/s-ui/logger"
|
"github.com/alireza0/s-ui/logger"
|
||||||
@@ -32,7 +29,8 @@ func (s *LinkService) GetLinks(linkJson *json.RawMessage, types string, clientIn
|
|||||||
case "external":
|
case "external":
|
||||||
result = append(result, link.Uri)
|
result = append(result, link.Uri)
|
||||||
case "sub":
|
case "sub":
|
||||||
result = append(result, s.getExternalSub(link.Uri)...)
|
subLinks := util.GetExternalLink(link.Uri)
|
||||||
|
result = append(result, strings.Split(subLinks, "\n")...)
|
||||||
case "local":
|
case "local":
|
||||||
if types == "all" {
|
if types == "all" {
|
||||||
result = append(result, s.addClientInfo(link.Uri, clientInfo))
|
result = append(result, s.addClientInfo(link.Uri, clientInfo))
|
||||||
@@ -74,31 +72,3 @@ func (s *LinkService) addClientInfo(uri string, clientInfo string) string {
|
|||||||
return uri + clientInfo
|
return uri + clientInfo
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *LinkService) getExternalSub(url string) []string {
|
|
||||||
tr := &http.Transport{
|
|
||||||
TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
|
|
||||||
}
|
|
||||||
|
|
||||||
client := &http.Client{Transport: tr}
|
|
||||||
|
|
||||||
// Make the HTTP request
|
|
||||||
response, err := client.Get(url)
|
|
||||||
if err != nil {
|
|
||||||
logger.Warning("sub: Error making HTTP request:", err)
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
defer response.Body.Close()
|
|
||||||
|
|
||||||
// Read the response body
|
|
||||||
body, err := io.ReadAll(response.Body)
|
|
||||||
if err != nil {
|
|
||||||
logger.Warning("sub: Error reading response body:", err)
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// Convert if the content is Base64 encoded
|
|
||||||
links := util.StrOrBase64Encoded(string(body))
|
|
||||||
return strings.Split(links, "\n")
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|||||||
+31
-54
@@ -200,17 +200,9 @@ func hy(u *url.URL, i int) (*map[string]interface{}, string, error) {
|
|||||||
port, _ = strconv.Atoi(portStr)
|
port, _ = strconv.Atoi(portStr)
|
||||||
}
|
}
|
||||||
|
|
||||||
tls := map[string]interface{}{
|
security := query.Get("security")
|
||||||
"enabled": true,
|
if len(security) == 0 {
|
||||||
"server_name": query.Get("peer"),
|
security = "tls"
|
||||||
}
|
|
||||||
alpn := query.Get("alpn")
|
|
||||||
insecure := query.Get("insecure")
|
|
||||||
if len(alpn) > 0 {
|
|
||||||
tls["alpn"] = strings.Split(alpn, ",")
|
|
||||||
}
|
|
||||||
if insecure == "1" || insecure == "true" {
|
|
||||||
tls["insecure"] = true
|
|
||||||
}
|
}
|
||||||
|
|
||||||
tag := u.Fragment
|
tag := u.Fragment
|
||||||
@@ -224,7 +216,7 @@ func hy(u *url.URL, i int) (*map[string]interface{}, string, error) {
|
|||||||
"server_port": port,
|
"server_port": port,
|
||||||
"obfs": query.Get("obfsParam"),
|
"obfs": query.Get("obfsParam"),
|
||||||
"auth_str": query.Get("auth"),
|
"auth_str": query.Get("auth"),
|
||||||
"tls": tls,
|
"tls": getTls(security, &query),
|
||||||
}
|
}
|
||||||
down, _ := strconv.Atoi(query.Get("downmbps"))
|
down, _ := strconv.Atoi(query.Get("downmbps"))
|
||||||
up, _ := strconv.Atoi(query.Get("upmbps"))
|
up, _ := strconv.Atoi(query.Get("upmbps"))
|
||||||
@@ -253,17 +245,9 @@ func hy2(u *url.URL, i int) (*map[string]interface{}, string, error) {
|
|||||||
port, _ = strconv.Atoi(portStr)
|
port, _ = strconv.Atoi(portStr)
|
||||||
}
|
}
|
||||||
|
|
||||||
tls := map[string]interface{}{
|
security := query.Get("security")
|
||||||
"enabled": true,
|
if len(security) == 0 {
|
||||||
"server_name": query.Get("sni"),
|
security = "tls"
|
||||||
}
|
|
||||||
alpn := query.Get("alpn")
|
|
||||||
insecure := query.Get("insecure")
|
|
||||||
if len(alpn) > 0 {
|
|
||||||
tls["alpn"] = strings.Split(alpn, ",")
|
|
||||||
}
|
|
||||||
if insecure == "1" || insecure == "true" {
|
|
||||||
tls["insecure"] = true
|
|
||||||
}
|
}
|
||||||
|
|
||||||
tag := u.Fragment
|
tag := u.Fragment
|
||||||
@@ -276,11 +260,13 @@ func hy2(u *url.URL, i int) (*map[string]interface{}, string, error) {
|
|||||||
"server": host,
|
"server": host,
|
||||||
"server_port": port,
|
"server_port": port,
|
||||||
"password": u.User.Username(),
|
"password": u.User.Username(),
|
||||||
"tls": tls,
|
"tls": getTls(security, &query),
|
||||||
}
|
}
|
||||||
down, _ := strconv.Atoi(query.Get("downmbps"))
|
down, _ := strconv.Atoi(query.Get("downmbps"))
|
||||||
up, _ := strconv.Atoi(query.Get("upmbps"))
|
up, _ := strconv.Atoi(query.Get("upmbps"))
|
||||||
obfs := query.Get("obfs")
|
obfs := query.Get("obfs")
|
||||||
|
mport := query.Get("mport")
|
||||||
|
fastopen := query.Get("fastopen")
|
||||||
if down > 0 {
|
if down > 0 {
|
||||||
hy2["down_mbps"] = down
|
hy2["down_mbps"] = down
|
||||||
}
|
}
|
||||||
@@ -293,6 +279,12 @@ func hy2(u *url.URL, i int) (*map[string]interface{}, string, error) {
|
|||||||
"password": query.Get("obfs-password"),
|
"password": query.Get("obfs-password"),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if len(mport) > 0 {
|
||||||
|
hy2["server_ports"] = strings.Split(mport, ",")
|
||||||
|
}
|
||||||
|
if fastopen == "1" || fastopen == "true" {
|
||||||
|
hy2["fastopen"] = true
|
||||||
|
}
|
||||||
return &hy2, tag, nil
|
return &hy2, tag, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -304,17 +296,9 @@ func anytls(u *url.URL, i int) (*map[string]interface{}, string, error) {
|
|||||||
port, _ = strconv.Atoi(portStr)
|
port, _ = strconv.Atoi(portStr)
|
||||||
}
|
}
|
||||||
|
|
||||||
tls := map[string]interface{}{
|
security := query.Get("security")
|
||||||
"enabled": true,
|
if len(security) == 0 {
|
||||||
"server_name": query.Get("sni"),
|
security = "tls"
|
||||||
}
|
|
||||||
alpn := query.Get("alpn")
|
|
||||||
insecure := query.Get("insecure")
|
|
||||||
if len(alpn) > 0 {
|
|
||||||
tls["alpn"] = strings.Split(alpn, ",")
|
|
||||||
}
|
|
||||||
if insecure == "1" || insecure == "true" {
|
|
||||||
tls["insecure"] = true
|
|
||||||
}
|
}
|
||||||
|
|
||||||
tag := u.Fragment
|
tag := u.Fragment
|
||||||
@@ -327,7 +311,7 @@ func anytls(u *url.URL, i int) (*map[string]interface{}, string, error) {
|
|||||||
"server": host,
|
"server": host,
|
||||||
"server_port": port,
|
"server_port": port,
|
||||||
"password": u.User.Username(),
|
"password": u.User.Username(),
|
||||||
"tls": tls,
|
"tls": getTls(security, &query),
|
||||||
}
|
}
|
||||||
return &anytls, tag, nil
|
return &anytls, tag, nil
|
||||||
}
|
}
|
||||||
@@ -340,21 +324,9 @@ func tuic(u *url.URL, i int) (*map[string]interface{}, string, error) {
|
|||||||
port, _ = strconv.Atoi(portStr)
|
port, _ = strconv.Atoi(portStr)
|
||||||
}
|
}
|
||||||
|
|
||||||
tls := map[string]interface{}{
|
security := query.Get("security")
|
||||||
"enabled": true,
|
if len(security) == 0 {
|
||||||
"server_name": query.Get("sni"),
|
security = "tls"
|
||||||
}
|
|
||||||
alpn := query.Get("alpn")
|
|
||||||
insecure := query.Get("allow_insecure")
|
|
||||||
disable_sni := query.Get("disable_sni")
|
|
||||||
if len(alpn) > 0 {
|
|
||||||
tls["alpn"] = strings.Split(alpn, ",")
|
|
||||||
}
|
|
||||||
if insecure == "1" || insecure == "true" {
|
|
||||||
tls["insecure"] = true
|
|
||||||
}
|
|
||||||
if disable_sni == "1" || disable_sni == "true" {
|
|
||||||
tls["disable_sni"] = true
|
|
||||||
}
|
}
|
||||||
|
|
||||||
tag := u.Fragment
|
tag := u.Fragment
|
||||||
@@ -371,7 +343,7 @@ func tuic(u *url.URL, i int) (*map[string]interface{}, string, error) {
|
|||||||
"password": password,
|
"password": password,
|
||||||
"congestion_control": query.Get("congestion_control"),
|
"congestion_control": query.Get("congestion_control"),
|
||||||
"udp_relay_mode": query.Get("udp_relay_mode"),
|
"udp_relay_mode": query.Get("udp_relay_mode"),
|
||||||
"tls": tls,
|
"tls": getTls(security, &query),
|
||||||
}
|
}
|
||||||
return &tuic, tag, nil
|
return &tuic, tag, nil
|
||||||
}
|
}
|
||||||
@@ -480,9 +452,11 @@ func getTls(security string, q *url.Values) map[string]interface{} {
|
|||||||
tls := map[string]interface{}{}
|
tls := map[string]interface{}{}
|
||||||
tls_fp := q.Get("fp")
|
tls_fp := q.Get("fp")
|
||||||
tls_sni := q.Get("sni")
|
tls_sni := q.Get("sni")
|
||||||
tls_insecure := q.Get("allowInsecure")
|
tls_allow_insecure := q.Get("allowInsecure")
|
||||||
|
tls_insecure := q.Get("insecure")
|
||||||
tls_alpn := q.Get("alpn")
|
tls_alpn := q.Get("alpn")
|
||||||
tls_ech := q.Get("ech")
|
tls_ech := q.Get("ech")
|
||||||
|
disable_sni := q.Get("disable_sni")
|
||||||
switch security {
|
switch security {
|
||||||
case "tls":
|
case "tls":
|
||||||
tls["enabled"] = true
|
tls["enabled"] = true
|
||||||
@@ -500,7 +474,7 @@ func getTls(security string, q *url.Values) map[string]interface{} {
|
|||||||
if len(tls_alpn) > 0 {
|
if len(tls_alpn) > 0 {
|
||||||
tls["alpn"] = strings.Split(tls_alpn, ",")
|
tls["alpn"] = strings.Split(tls_alpn, ",")
|
||||||
}
|
}
|
||||||
if tls_insecure == "1" || tls_insecure == "true" {
|
if tls_insecure == "1" || tls_insecure == "true" || tls_allow_insecure == "1" || tls_allow_insecure == "true" {
|
||||||
tls["insecure"] = true
|
tls["insecure"] = true
|
||||||
}
|
}
|
||||||
if len(tls_fp) > 0 {
|
if len(tls_fp) > 0 {
|
||||||
@@ -517,5 +491,8 @@ func getTls(security string, q *url.Values) map[string]interface{} {
|
|||||||
},
|
},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if disable_sni == "1" || disable_sni == "true" {
|
||||||
|
tls["disable_sni"] = true
|
||||||
|
}
|
||||||
return tls
|
return tls
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,97 @@
|
|||||||
|
package util
|
||||||
|
|
||||||
|
import (
|
||||||
|
"crypto/tls"
|
||||||
|
"encoding/json"
|
||||||
|
"io"
|
||||||
|
"net/http"
|
||||||
|
"strings"
|
||||||
|
|
||||||
|
"github.com/alireza0/s-ui/logger"
|
||||||
|
"github.com/alireza0/s-ui/util/common"
|
||||||
|
)
|
||||||
|
|
||||||
|
func GetExternalLink(url string) string {
|
||||||
|
tr := &http.Transport{
|
||||||
|
TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
|
||||||
|
}
|
||||||
|
|
||||||
|
client := &http.Client{Transport: tr}
|
||||||
|
|
||||||
|
response, err := client.Get(url)
|
||||||
|
if err != nil {
|
||||||
|
logger.Warning("sub: Error making HTTP request:", err)
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
defer response.Body.Close()
|
||||||
|
|
||||||
|
body, err := io.ReadAll(response.Body)
|
||||||
|
if err != nil {
|
||||||
|
logger.Warning("sub: Error reading response body:", err)
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
|
||||||
|
data := StrOrBase64Encoded(string(body))
|
||||||
|
return data
|
||||||
|
}
|
||||||
|
|
||||||
|
func GetExternalSub(url string) ([]map[string]interface{}, error) {
|
||||||
|
var err error
|
||||||
|
var result []map[string]interface{}
|
||||||
|
|
||||||
|
if len(url) == 0 {
|
||||||
|
return nil, common.NewError("no url")
|
||||||
|
}
|
||||||
|
|
||||||
|
data := GetExternalLink(url)
|
||||||
|
if len(data) == 0 {
|
||||||
|
return nil, common.NewError("no result")
|
||||||
|
}
|
||||||
|
|
||||||
|
// if the data is a JSON object
|
||||||
|
if strings.HasPrefix(data, "{") && strings.HasSuffix(data, "}") {
|
||||||
|
var jsonData map[string]interface{}
|
||||||
|
err = json.Unmarshal([]byte(data), &jsonData)
|
||||||
|
if err != nil {
|
||||||
|
logger.Warning("sub: Error unmarshalling JSON:", err)
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
outbounds, ok := jsonData["outbounds"].([]any)
|
||||||
|
if !ok {
|
||||||
|
logger.Warning("sub: Error getting outbounds:", err)
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
for _, outbound := range outbounds {
|
||||||
|
outboundMap, ok := outbound.(map[string]interface{})
|
||||||
|
if ok && len(outboundMap) > 0 {
|
||||||
|
oType, _ := outboundMap["type"].(string)
|
||||||
|
switch oType {
|
||||||
|
case "urltest":
|
||||||
|
case "direct":
|
||||||
|
case "selector":
|
||||||
|
case "block":
|
||||||
|
continue
|
||||||
|
default:
|
||||||
|
result = append(result, outboundMap)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if len(result) == 0 {
|
||||||
|
return nil, common.NewError("no result")
|
||||||
|
}
|
||||||
|
return result, nil
|
||||||
|
} else {
|
||||||
|
// if data is a text
|
||||||
|
links := strings.Split(data, "\n")
|
||||||
|
for _, link := range links {
|
||||||
|
linkToJson, _, err := GetOutbound(link, 0)
|
||||||
|
if err == nil {
|
||||||
|
result = append(result, *linkToJson)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if len(result) == 0 {
|
||||||
|
return nil, common.NewError("no result")
|
||||||
|
}
|
||||||
|
return result, nil
|
||||||
|
}
|
||||||
@@ -3,6 +3,8 @@ setlocal enabledelayedexpansion
|
|||||||
|
|
||||||
echo Building S-UI for Windows...
|
echo Building S-UI for Windows...
|
||||||
|
|
||||||
|
cd /d "%~dp0"
|
||||||
|
|
||||||
REM Check if Go is installed
|
REM Check if Go is installed
|
||||||
go version >nul 2>&1
|
go version >nul 2>&1
|
||||||
if errorlevel 1 (
|
if errorlevel 1 (
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ if %errorLevel% neq 0 (
|
|||||||
exit /b 1
|
exit /b 1
|
||||||
)
|
)
|
||||||
|
|
||||||
|
cd /d "%~dp0"
|
||||||
REM Set installation directory
|
REM Set installation directory
|
||||||
set "INSTALL_DIR=C:\Program Files\s-ui"
|
set "INSTALL_DIR=C:\Program Files\s-ui"
|
||||||
set "SERVICE_NAME=s-ui"
|
set "SERVICE_NAME=s-ui"
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ setlocal enabledelayedexpansion
|
|||||||
REM S-UI Windows Control Script
|
REM S-UI Windows Control Script
|
||||||
REM This script provides a menu-driven interface for managing S-UI on Windows
|
REM This script provides a menu-driven interface for managing S-UI on Windows
|
||||||
|
|
||||||
|
cd /d "%~dp0"
|
||||||
set "SERVICE_NAME=s-ui"
|
set "SERVICE_NAME=s-ui"
|
||||||
set "INSTALL_DIR=%SUI_HOME%"
|
set "INSTALL_DIR=%SUI_HOME%"
|
||||||
if "%INSTALL_DIR%"=="" set "INSTALL_DIR=C:\Program Files\s-ui"
|
if "%INSTALL_DIR%"=="" set "INSTALL_DIR=C:\Program Files\s-ui"
|
||||||
|
|||||||
Reference in New Issue
Block a user