Compare commits
19
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
faf971a771 | ||
|
|
9f8a5e7cba | ||
|
|
c69c0c0cc8 | ||
|
|
9f67a380fd | ||
|
|
153a1dbd04 | ||
|
|
e6f92f0e9c | ||
|
|
bbd9f11bb9 | ||
|
|
fc71b5c331 | ||
|
|
563f703dde | ||
|
|
e6c443b935 | ||
|
|
7d51b7ffb3 | ||
|
|
63a151aef9 | ||
|
|
94f16186e7 | ||
|
|
4a32d56c17 | ||
|
|
50c4bf766c | ||
|
|
ec6544f157 | ||
|
|
9058c3c775 | ||
|
|
d80854f857 | ||
|
|
782ba35a59 |
Executable
+15
@@ -0,0 +1,15 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
set -e -o pipefail
|
||||||
|
|
||||||
|
mkdir -p release
|
||||||
|
cd release
|
||||||
|
git init
|
||||||
|
git config --local user.email "github-action@users.noreply.github.com"
|
||||||
|
git config --local user.name "GitHub Action"
|
||||||
|
git remote add origin https://github-action:$GITHUB_TOKEN@github.com/SagerNet/sing-geosite.git
|
||||||
|
git branch -M release
|
||||||
|
cp ../*.db ../*.sha256sum .
|
||||||
|
git add .
|
||||||
|
git commit -m "Update release"
|
||||||
|
git push -f origin release
|
||||||
Executable
+20
@@ -0,0 +1,20 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
set -e -o pipefail
|
||||||
|
|
||||||
|
function releaseRuleSet() {
|
||||||
|
dirName=$1
|
||||||
|
pushd $dirName
|
||||||
|
git init
|
||||||
|
git config --local user.email "github-action@users.noreply.github.com"
|
||||||
|
git config --local user.name "GitHub Action"
|
||||||
|
git remote add origin https://github-action:$GITHUB_TOKEN@github.com/SagerNet/sing-geosite.git
|
||||||
|
git branch -M $dirName
|
||||||
|
git add .
|
||||||
|
git commit -m "Update rule-set"
|
||||||
|
git push -f origin $dirName
|
||||||
|
popd
|
||||||
|
}
|
||||||
|
|
||||||
|
releaseRuleSet rule-set
|
||||||
|
releaseRuleSet rule-set-unstable
|
||||||
@@ -0,0 +1,22 @@
|
|||||||
|
{
|
||||||
|
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
|
||||||
|
"commitMessagePrefix": "[dependencies]",
|
||||||
|
"extends": [
|
||||||
|
"config:base",
|
||||||
|
":disableRateLimiting"
|
||||||
|
],
|
||||||
|
"baseBranches": [
|
||||||
|
"main"
|
||||||
|
],
|
||||||
|
"golang": {
|
||||||
|
"enabled": false
|
||||||
|
},
|
||||||
|
"packageRules": [
|
||||||
|
{
|
||||||
|
"matchManagers": [
|
||||||
|
"github-actions"
|
||||||
|
],
|
||||||
|
"groupName": "github-actions"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
Executable
+6
@@ -0,0 +1,6 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
|
PROJECTS=$(dirname "$0")/../..
|
||||||
|
|
||||||
|
go get -x github.com/sagernet/sing-box@$(git -C $PROJECTS/sing-box rev-parse HEAD)
|
||||||
|
go mod tidy
|
||||||
@@ -0,0 +1,29 @@
|
|||||||
|
name: Build
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches:
|
||||||
|
- main
|
||||||
|
jobs:
|
||||||
|
build:
|
||||||
|
name: Build
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- name: Checkout
|
||||||
|
uses: actions/checkout@v3
|
||||||
|
with:
|
||||||
|
fetch-depth: 0
|
||||||
|
- name: Setup Go
|
||||||
|
uses: actions/setup-go@v5
|
||||||
|
with:
|
||||||
|
go-version: ^1.22
|
||||||
|
- name: Build geosite
|
||||||
|
id: build
|
||||||
|
env:
|
||||||
|
NO_SKIP: true
|
||||||
|
run: |
|
||||||
|
go run -v .
|
||||||
|
- name: Upload artifacts
|
||||||
|
uses: actions/upload-artifact@v2
|
||||||
|
with:
|
||||||
|
name: geosite.db
|
||||||
|
path: geosite.db
|
||||||
@@ -0,0 +1,53 @@
|
|||||||
|
name: Release
|
||||||
|
on:
|
||||||
|
workflow_dispatch:
|
||||||
|
schedule:
|
||||||
|
- cron: "0 0 * * *"
|
||||||
|
jobs:
|
||||||
|
build:
|
||||||
|
name: Build
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- name: Checkout
|
||||||
|
uses: actions/checkout@v3
|
||||||
|
with:
|
||||||
|
fetch-depth: 0
|
||||||
|
- name: Setup Go
|
||||||
|
uses: actions/setup-go@v5
|
||||||
|
with:
|
||||||
|
go-version: ^1.22
|
||||||
|
- name: Build geosite
|
||||||
|
id: build
|
||||||
|
run: |
|
||||||
|
go run -v .
|
||||||
|
- name: Release rule sets
|
||||||
|
if: steps.build.outputs.skip != 'true'
|
||||||
|
run: .github/release-rule-set.sh
|
||||||
|
env:
|
||||||
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
- name: Generate sha256 hash
|
||||||
|
if: steps.build.outputs.skip != 'true'
|
||||||
|
run: |
|
||||||
|
sha256sum geosite.db > geosite.db.sha256sum
|
||||||
|
sha256sum geosite-cn.db > geosite-cn.db.sha256sum
|
||||||
|
- name: Release release branch
|
||||||
|
if: steps.build.outputs.skip != 'true'
|
||||||
|
run: .github/release-branch.sh
|
||||||
|
env:
|
||||||
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
- uses: dev-drprasad/delete-older-releases@v0.3.2
|
||||||
|
if: steps.build.outputs.skip != 'true'
|
||||||
|
with:
|
||||||
|
keep_latest: 10
|
||||||
|
env:
|
||||||
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
- name: Release geosite
|
||||||
|
if: steps.build.outputs.skip != 'true'
|
||||||
|
uses: softprops/action-gh-release@v1
|
||||||
|
with:
|
||||||
|
tag_name: ${{ steps.build.outputs.tag }}
|
||||||
|
files: |
|
||||||
|
geosite.db
|
||||||
|
geosite.db.sha256sum
|
||||||
|
geosite-cn.db
|
||||||
|
geosite-cn.db.sha256sum
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
/.idea/
|
||||||
|
/vendor/
|
||||||
|
**.db
|
||||||
|
/rule-set/
|
||||||
|
/rule-set-unstable/
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
linters:
|
||||||
|
disable-all: true
|
||||||
|
enable:
|
||||||
|
- gofumpt
|
||||||
|
- govet
|
||||||
|
- gci
|
||||||
|
- staticcheck
|
||||||
|
|
||||||
|
linters-settings:
|
||||||
|
gci:
|
||||||
|
custom-order: true
|
||||||
|
sections:
|
||||||
|
- standard
|
||||||
|
- prefix(github.com/sagernet/)
|
||||||
|
- default
|
||||||
|
staticcheck:
|
||||||
|
go: '1.20'
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
Copyright (C) 2022 by nekohasekai <contact-sagernet@sekai.icu>
|
||||||
|
|
||||||
|
This program is free software: you can redistribute it and/or modify
|
||||||
|
it under the terms of the GNU General Public License as published by
|
||||||
|
the Free Software Foundation, either version 3 of the License, or
|
||||||
|
(at your option) any later version.
|
||||||
|
|
||||||
|
This program is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
GNU General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU General Public License
|
||||||
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
fmt:
|
||||||
|
@gofumpt -l -w .
|
||||||
|
@gofmt -s -w .
|
||||||
|
@gci write --custom-order -s standard -s "prefix(github.com/sagernet/)" -s "default" .
|
||||||
|
|
||||||
|
fmt_install:
|
||||||
|
go install -v mvdan.cc/gofumpt@latest
|
||||||
|
go install -v github.com/daixiang0/gci@latest
|
||||||
|
|
||||||
|
lint:
|
||||||
|
golangci-lint run ./...
|
||||||
|
|
||||||
|
lint_install:
|
||||||
|
go install github.com/golangci/golangci-lint/cmd/golangci-lint@latest
|
||||||
|
|
||||||
|
test:
|
||||||
|
go test -v ./...
|
||||||
Binary file not shown.
@@ -1 +0,0 @@
|
|||||||
4a5028c9bbab52ae9869380ad8aa11fa40f1318e5f5d69ca268e7f6e89ad7548 geosite-cn.db
|
|
||||||
BIN
Binary file not shown.
@@ -1 +0,0 @@
|
|||||||
dd47e49ad9731940b2153c8981a51cc13216a50cec317a906fbfb3a5e16e5557 geosite.db
|
|
||||||
@@ -0,0 +1,29 @@
|
|||||||
|
module github.com/sagernet/sing-geosite
|
||||||
|
|
||||||
|
go 1.21
|
||||||
|
|
||||||
|
toolchain go1.22.3
|
||||||
|
|
||||||
|
require (
|
||||||
|
github.com/google/go-github/v45 v45.2.0
|
||||||
|
github.com/sagernet/sing v0.5.0-alpha.13
|
||||||
|
github.com/sagernet/sing-box v1.10.0-alpha.24
|
||||||
|
github.com/v2fly/v2ray-core/v5 v5.16.1
|
||||||
|
google.golang.org/protobuf v1.34.2
|
||||||
|
)
|
||||||
|
|
||||||
|
require (
|
||||||
|
github.com/adrg/xdg v0.4.0 // indirect
|
||||||
|
github.com/golang/protobuf v1.5.4 // indirect
|
||||||
|
github.com/google/go-querystring v1.1.0 // indirect
|
||||||
|
github.com/logrusorgru/aurora v2.0.3+incompatible // indirect
|
||||||
|
github.com/miekg/dns v1.1.61 // indirect
|
||||||
|
github.com/sagernet/sing-dns v0.3.0-beta.12 // indirect
|
||||||
|
go4.org/netipx v0.0.0-20231129151722-fdeea329fbba // indirect
|
||||||
|
golang.org/x/crypto v0.25.0 // indirect
|
||||||
|
golang.org/x/mod v0.19.0 // indirect
|
||||||
|
golang.org/x/net v0.27.0 // indirect
|
||||||
|
golang.org/x/sync v0.7.0 // indirect
|
||||||
|
golang.org/x/sys v0.22.0 // indirect
|
||||||
|
golang.org/x/tools v0.23.0 // indirect
|
||||||
|
)
|
||||||
@@ -0,0 +1,70 @@
|
|||||||
|
github.com/adrg/xdg v0.4.0 h1:RzRqFcjH4nE5C6oTAxhBtoE2IRyjBSa62SCbyPidvls=
|
||||||
|
github.com/adrg/xdg v0.4.0/go.mod h1:N6ag73EX4wyxeaoeHctc1mas01KZgsj5tYiAIwqJE/E=
|
||||||
|
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||||
|
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
|
||||||
|
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||||
|
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI=
|
||||||
|
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls=
|
||||||
|
github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
|
||||||
|
github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
|
||||||
|
github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
|
||||||
|
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
|
||||||
|
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
|
||||||
|
github.com/google/go-github/v45 v45.2.0 h1:5oRLszbrkvxDDqBCNj2hjDZMKmvexaZ1xw/FCD+K3FI=
|
||||||
|
github.com/google/go-github/v45 v45.2.0/go.mod h1:FObaZJEDSTa/WGCzZ2Z3eoCDXWJKMenWWTrd8jrta28=
|
||||||
|
github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=
|
||||||
|
github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU=
|
||||||
|
github.com/google/pprof v0.0.0-20231101202521-4ca4178f5c7a h1:fEBsGL/sjAuJrgah5XqmmYsTLzJp/TO9Lhy39gkverk=
|
||||||
|
github.com/google/pprof v0.0.0-20231101202521-4ca4178f5c7a/go.mod h1:czg5+yv1E0ZGTi6S6vVK1mke0fV+FaUhNGcd6VRS9Ik=
|
||||||
|
github.com/logrusorgru/aurora v2.0.3+incompatible h1:tOpm7WcpBTn4fjmVfgpQq0EfczGlG91VSDkswnjF5A8=
|
||||||
|
github.com/logrusorgru/aurora v2.0.3+incompatible/go.mod h1:7rIyQOR62GCctdiQpZ/zOJlFyk6y+94wXzv6RNZgaR4=
|
||||||
|
github.com/miekg/dns v1.1.61 h1:nLxbwF3XxhwVSm8g9Dghm9MHPaUZuqhPiGL+675ZmEs=
|
||||||
|
github.com/miekg/dns v1.1.61/go.mod h1:mnAarhS3nWaW+NVP2wTkYVIZyHNJ098SJZUki3eykwQ=
|
||||||
|
github.com/onsi/ginkgo/v2 v2.10.0 h1:sfUl4qgLdvkChZrWCYndY2EAu9BRIw1YphNAzy1VNWs=
|
||||||
|
github.com/onsi/ginkgo/v2 v2.10.0/go.mod h1:UDQOh5wbQUlMnkLfVaIUMtQ1Vus92oM+P2JX1aulgcE=
|
||||||
|
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
|
||||||
|
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
||||||
|
github.com/quic-go/qpack v0.4.0 h1:Cr9BXA1sQS2SmDUWjSofMPNKmvF6IiIfDRmgU0w1ZCo=
|
||||||
|
github.com/quic-go/qpack v0.4.0/go.mod h1:UZVnYIfi5GRk+zI9UMaCPsmZ2xKJP7XBUvVyT1Knj9A=
|
||||||
|
github.com/quic-go/qtls-go1-20 v0.4.1 h1:D33340mCNDAIKBqXuAvexTNMUByrYmFYVfKfDN5nfFs=
|
||||||
|
github.com/quic-go/qtls-go1-20 v0.4.1/go.mod h1:X9Nh97ZL80Z+bX/gUXMbipO6OxdiDi58b/fMC9mAL+k=
|
||||||
|
github.com/sagernet/quic-go v0.45.1-beta.2 h1:zkEeCbhdFFkrxKcuIRBtXNKci/1t2J/39QSG/sPvlmc=
|
||||||
|
github.com/sagernet/quic-go v0.45.1-beta.2/go.mod h1:+N3FqM9DAzOWfe64uxXuBejVJwX7DeW7BslzLO6N/xI=
|
||||||
|
github.com/sagernet/sing v0.5.0-alpha.13 h1:fpR4TFZfu/9V3LbHSAnnnwcaXGMF8ijmAAPoY2WHSKw=
|
||||||
|
github.com/sagernet/sing v0.5.0-alpha.13/go.mod h1:ARkL0gM13/Iv5VCZmci/NuoOlePoIsW0m7BWfln/Hak=
|
||||||
|
github.com/sagernet/sing-box v1.10.0-alpha.24 h1:+SVCGK65J4L9B/Edhkm54diGKtHBDDohdppPIklrQQY=
|
||||||
|
github.com/sagernet/sing-box v1.10.0-alpha.24/go.mod h1:Btidr16yUmnI8R1p96Z9BRqdufNkgCXKPbLjeO/DmlE=
|
||||||
|
github.com/sagernet/sing-dns v0.3.0-beta.12 h1:mdTsaVU+0jopEKUDLwLmo8AbiSGZOly97oSPBDX3O8I=
|
||||||
|
github.com/sagernet/sing-dns v0.3.0-beta.12/go.mod h1:rscgSr5ixOPk8XM9ZMLuMXCyldEQ1nLvdl0nfv+lp00=
|
||||||
|
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
|
||||||
|
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
|
||||||
|
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
|
||||||
|
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
|
||||||
|
github.com/v2fly/v2ray-core/v5 v5.16.1 h1:hIuRzCJhmRYqCA76hGiNLkAHopgbNt91L871wlJ/yUU=
|
||||||
|
github.com/v2fly/v2ray-core/v5 v5.16.1/go.mod h1:3pWIBTmNagMKpzd9/QicXq/7JZCQt716GsGZdBNmYkU=
|
||||||
|
go4.org/netipx v0.0.0-20231129151722-fdeea329fbba h1:0b9z3AuHCjxk0x/opv64kcgZLBseWJUpBw5I82+2U4M=
|
||||||
|
go4.org/netipx v0.0.0-20231129151722-fdeea329fbba/go.mod h1:PLyyIXexvUFg3Owu6p/WfdlivPbZJsZdgWZlrGope/Y=
|
||||||
|
golang.org/x/crypto v0.25.0 h1:ypSNr+bnYL2YhwoMt2zPxHFmbAN1KZs/njMG3hxUp30=
|
||||||
|
golang.org/x/crypto v0.25.0/go.mod h1:T+wALwcMOSE0kXgUAnPAHqTLW+XHgcELELW8VaDgm/M=
|
||||||
|
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 h1:2dVuKD2vS7b0QIHQbpyTISPd0LeHDbnYEryqj5Q1ug8=
|
||||||
|
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY=
|
||||||
|
golang.org/x/mod v0.19.0 h1:fEdghXQSo20giMthA7cd28ZC+jts4amQ3YMXiP5oMQ8=
|
||||||
|
golang.org/x/mod v0.19.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
|
||||||
|
golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys=
|
||||||
|
golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE=
|
||||||
|
golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
|
||||||
|
golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
|
||||||
|
golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
|
golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI=
|
||||||
|
golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
||||||
|
golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4=
|
||||||
|
golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
|
||||||
|
golang.org/x/tools v0.23.0 h1:SGsXPZ+2l4JsgaCKkx+FQ9YZ5XEtA1GZYuoDjenLjvg=
|
||||||
|
golang.org/x/tools v0.23.0/go.mod h1:pnu6ufv6vQkll6szChhK3C3L/ruaIv5eBeztNG8wtsI=
|
||||||
|
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||||
|
google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
|
||||||
|
google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
|
||||||
|
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||||
|
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||||
|
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
|
||||||
|
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||||
@@ -0,0 +1,423 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bufio"
|
||||||
|
"context"
|
||||||
|
"crypto/sha256"
|
||||||
|
"encoding/hex"
|
||||||
|
"fmt"
|
||||||
|
"io"
|
||||||
|
"net/http"
|
||||||
|
"os"
|
||||||
|
"path/filepath"
|
||||||
|
"sort"
|
||||||
|
"strings"
|
||||||
|
|
||||||
|
"github.com/sagernet/sing-box/common/geosite"
|
||||||
|
"github.com/sagernet/sing-box/common/srs"
|
||||||
|
C "github.com/sagernet/sing-box/constant"
|
||||||
|
"github.com/sagernet/sing-box/log"
|
||||||
|
"github.com/sagernet/sing-box/option"
|
||||||
|
"github.com/sagernet/sing/common"
|
||||||
|
E "github.com/sagernet/sing/common/exceptions"
|
||||||
|
|
||||||
|
"github.com/google/go-github/v45/github"
|
||||||
|
"github.com/v2fly/v2ray-core/v5/app/router/routercommon"
|
||||||
|
"google.golang.org/protobuf/proto"
|
||||||
|
)
|
||||||
|
|
||||||
|
var githubClient *github.Client
|
||||||
|
|
||||||
|
func init() {
|
||||||
|
accessToken, loaded := os.LookupEnv("ACCESS_TOKEN")
|
||||||
|
if !loaded {
|
||||||
|
githubClient = github.NewClient(nil)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
transport := &github.BasicAuthTransport{
|
||||||
|
Username: accessToken,
|
||||||
|
}
|
||||||
|
githubClient = github.NewClient(transport.Client())
|
||||||
|
}
|
||||||
|
|
||||||
|
func fetch(from string) (*github.RepositoryRelease, error) {
|
||||||
|
names := strings.SplitN(from, "/", 2)
|
||||||
|
latestRelease, _, err := githubClient.Repositories.GetLatestRelease(context.Background(), names[0], names[1])
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return latestRelease, err
|
||||||
|
}
|
||||||
|
|
||||||
|
func get(downloadURL *string) ([]byte, error) {
|
||||||
|
log.Info("download ", *downloadURL)
|
||||||
|
response, err := http.Get(*downloadURL)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
defer response.Body.Close()
|
||||||
|
return io.ReadAll(response.Body)
|
||||||
|
}
|
||||||
|
|
||||||
|
func download(release *github.RepositoryRelease) ([]byte, error) {
|
||||||
|
geositeAsset := common.Find(release.Assets, func(it *github.ReleaseAsset) bool {
|
||||||
|
return *it.Name == "dlc.dat"
|
||||||
|
})
|
||||||
|
geositeChecksumAsset := common.Find(release.Assets, func(it *github.ReleaseAsset) bool {
|
||||||
|
return *it.Name == "dlc.dat.sha256sum"
|
||||||
|
})
|
||||||
|
if geositeAsset == nil {
|
||||||
|
return nil, E.New("geosite asset not found in upstream release ", release.Name)
|
||||||
|
}
|
||||||
|
if geositeChecksumAsset == nil {
|
||||||
|
return nil, E.New("geosite asset not found in upstream release ", release.Name)
|
||||||
|
}
|
||||||
|
data, err := get(geositeAsset.BrowserDownloadURL)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
remoteChecksum, err := get(geositeChecksumAsset.BrowserDownloadURL)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
checksum := sha256.Sum256(data)
|
||||||
|
if hex.EncodeToString(checksum[:]) != string(remoteChecksum[:64]) {
|
||||||
|
return nil, E.New("checksum mismatch")
|
||||||
|
}
|
||||||
|
return data, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func parse(vGeositeData []byte) (map[string][]geosite.Item, error) {
|
||||||
|
vGeositeList := routercommon.GeoSiteList{}
|
||||||
|
err := proto.Unmarshal(vGeositeData, &vGeositeList)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
domainMap := make(map[string][]geosite.Item)
|
||||||
|
for _, vGeositeEntry := range vGeositeList.Entry {
|
||||||
|
code := strings.ToLower(vGeositeEntry.CountryCode)
|
||||||
|
domains := make([]geosite.Item, 0, len(vGeositeEntry.Domain)*2)
|
||||||
|
attributes := make(map[string][]*routercommon.Domain)
|
||||||
|
for _, domain := range vGeositeEntry.Domain {
|
||||||
|
if len(domain.Attribute) > 0 {
|
||||||
|
for _, attribute := range domain.Attribute {
|
||||||
|
attributes[attribute.Key] = append(attributes[attribute.Key], domain)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
switch domain.Type {
|
||||||
|
case routercommon.Domain_Plain:
|
||||||
|
domains = append(domains, geosite.Item{
|
||||||
|
Type: geosite.RuleTypeDomainKeyword,
|
||||||
|
Value: domain.Value,
|
||||||
|
})
|
||||||
|
case routercommon.Domain_Regex:
|
||||||
|
domains = append(domains, geosite.Item{
|
||||||
|
Type: geosite.RuleTypeDomainRegex,
|
||||||
|
Value: domain.Value,
|
||||||
|
})
|
||||||
|
case routercommon.Domain_RootDomain:
|
||||||
|
if strings.Contains(domain.Value, ".") {
|
||||||
|
domains = append(domains, geosite.Item{
|
||||||
|
Type: geosite.RuleTypeDomain,
|
||||||
|
Value: domain.Value,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
domains = append(domains, geosite.Item{
|
||||||
|
Type: geosite.RuleTypeDomainSuffix,
|
||||||
|
Value: "." + domain.Value,
|
||||||
|
})
|
||||||
|
case routercommon.Domain_Full:
|
||||||
|
domains = append(domains, geosite.Item{
|
||||||
|
Type: geosite.RuleTypeDomain,
|
||||||
|
Value: domain.Value,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
domainMap[code] = common.Uniq(domains)
|
||||||
|
for attribute, attributeEntries := range attributes {
|
||||||
|
attributeDomains := make([]geosite.Item, 0, len(attributeEntries)*2)
|
||||||
|
for _, domain := range attributeEntries {
|
||||||
|
switch domain.Type {
|
||||||
|
case routercommon.Domain_Plain:
|
||||||
|
attributeDomains = append(attributeDomains, geosite.Item{
|
||||||
|
Type: geosite.RuleTypeDomainKeyword,
|
||||||
|
Value: domain.Value,
|
||||||
|
})
|
||||||
|
case routercommon.Domain_Regex:
|
||||||
|
attributeDomains = append(attributeDomains, geosite.Item{
|
||||||
|
Type: geosite.RuleTypeDomainRegex,
|
||||||
|
Value: domain.Value,
|
||||||
|
})
|
||||||
|
case routercommon.Domain_RootDomain:
|
||||||
|
if strings.Contains(domain.Value, ".") {
|
||||||
|
attributeDomains = append(attributeDomains, geosite.Item{
|
||||||
|
Type: geosite.RuleTypeDomain,
|
||||||
|
Value: domain.Value,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
attributeDomains = append(attributeDomains, geosite.Item{
|
||||||
|
Type: geosite.RuleTypeDomainSuffix,
|
||||||
|
Value: "." + domain.Value,
|
||||||
|
})
|
||||||
|
case routercommon.Domain_Full:
|
||||||
|
attributeDomains = append(attributeDomains, geosite.Item{
|
||||||
|
Type: geosite.RuleTypeDomain,
|
||||||
|
Value: domain.Value,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
domainMap[code+"@"+attribute] = common.Uniq(attributeDomains)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return domainMap, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
type filteredCodePair struct {
|
||||||
|
code string
|
||||||
|
badCode string
|
||||||
|
}
|
||||||
|
|
||||||
|
func filterTags(data map[string][]geosite.Item) {
|
||||||
|
var codeList []string
|
||||||
|
for code := range data {
|
||||||
|
codeList = append(codeList, code)
|
||||||
|
}
|
||||||
|
var badCodeList []filteredCodePair
|
||||||
|
var filteredCodeMap []string
|
||||||
|
var mergedCodeMap []string
|
||||||
|
for _, code := range codeList {
|
||||||
|
codeParts := strings.Split(code, "@")
|
||||||
|
if len(codeParts) != 2 {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
leftParts := strings.Split(codeParts[0], "-")
|
||||||
|
var lastName string
|
||||||
|
if len(leftParts) > 1 {
|
||||||
|
lastName = leftParts[len(leftParts)-1]
|
||||||
|
}
|
||||||
|
if lastName == "" {
|
||||||
|
lastName = codeParts[0]
|
||||||
|
}
|
||||||
|
if lastName == codeParts[1] {
|
||||||
|
delete(data, code)
|
||||||
|
filteredCodeMap = append(filteredCodeMap, code)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if "!"+lastName == codeParts[1] {
|
||||||
|
badCodeList = append(badCodeList, filteredCodePair{
|
||||||
|
code: codeParts[0],
|
||||||
|
badCode: code,
|
||||||
|
})
|
||||||
|
} else if lastName == "!"+codeParts[1] {
|
||||||
|
badCodeList = append(badCodeList, filteredCodePair{
|
||||||
|
code: codeParts[0],
|
||||||
|
badCode: code,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for _, it := range badCodeList {
|
||||||
|
badList := data[it.badCode]
|
||||||
|
if it.badCode == "geolocation-!cn@cn" {
|
||||||
|
fmt.Println(badList)
|
||||||
|
}
|
||||||
|
if badList == nil {
|
||||||
|
panic("bad list not found: " + it.badCode)
|
||||||
|
}
|
||||||
|
delete(data, it.badCode)
|
||||||
|
newMap := make(map[geosite.Item]bool)
|
||||||
|
for _, item := range data[it.code] {
|
||||||
|
newMap[item] = true
|
||||||
|
}
|
||||||
|
for _, item := range badList {
|
||||||
|
delete(newMap, item)
|
||||||
|
}
|
||||||
|
newList := make([]geosite.Item, 0, len(newMap))
|
||||||
|
for item := range newMap {
|
||||||
|
newList = append(newList, item)
|
||||||
|
}
|
||||||
|
data[it.code] = newList
|
||||||
|
mergedCodeMap = append(mergedCodeMap, it.badCode)
|
||||||
|
}
|
||||||
|
sort.Strings(filteredCodeMap)
|
||||||
|
sort.Strings(mergedCodeMap)
|
||||||
|
os.Stderr.WriteString("filtered " + strings.Join(filteredCodeMap, ",") + "\n")
|
||||||
|
os.Stderr.WriteString("merged " + strings.Join(mergedCodeMap, ",") + "\n")
|
||||||
|
}
|
||||||
|
|
||||||
|
func mergeTags(data map[string][]geosite.Item) {
|
||||||
|
var codeList []string
|
||||||
|
for code := range data {
|
||||||
|
codeList = append(codeList, code)
|
||||||
|
}
|
||||||
|
var cnCodeList []string
|
||||||
|
for _, code := range codeList {
|
||||||
|
codeParts := strings.Split(code, "@")
|
||||||
|
if len(codeParts) != 2 {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if codeParts[1] != "cn" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if !strings.HasPrefix(codeParts[0], "category-") {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if strings.HasSuffix(codeParts[0], "-cn") || strings.HasSuffix(codeParts[0], "-!cn") {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
cnCodeList = append(cnCodeList, code)
|
||||||
|
}
|
||||||
|
newMap := make(map[geosite.Item]bool)
|
||||||
|
for _, item := range data["geolocation-cn"] {
|
||||||
|
newMap[item] = true
|
||||||
|
}
|
||||||
|
for _, code := range cnCodeList {
|
||||||
|
for _, item := range data[code] {
|
||||||
|
newMap[item] = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
newList := make([]geosite.Item, 0, len(newMap))
|
||||||
|
for item := range newMap {
|
||||||
|
newList = append(newList, item)
|
||||||
|
}
|
||||||
|
data["geolocation-cn"] = newList
|
||||||
|
println("merged cn categories: " + strings.Join(cnCodeList, ","))
|
||||||
|
}
|
||||||
|
|
||||||
|
func generate(release *github.RepositoryRelease, output string, cnOutput string, ruleSetOutput string, ruleSetUnstableOutput string) error {
|
||||||
|
vData, err := download(release)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
domainMap, err := parse(vData)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
filterTags(domainMap)
|
||||||
|
mergeTags(domainMap)
|
||||||
|
outputPath, _ := filepath.Abs(output)
|
||||||
|
os.Stderr.WriteString("write " + outputPath + "\n")
|
||||||
|
outputFile, err := os.Create(output)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
defer outputFile.Close()
|
||||||
|
writer := bufio.NewWriter(outputFile)
|
||||||
|
err = geosite.Write(writer, domainMap)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
err = writer.Flush()
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
cnCodes := []string{
|
||||||
|
"geolocation-cn",
|
||||||
|
}
|
||||||
|
cnDomainMap := make(map[string][]geosite.Item)
|
||||||
|
for _, cnCode := range cnCodes {
|
||||||
|
cnDomainMap[cnCode] = domainMap[cnCode]
|
||||||
|
}
|
||||||
|
cnOutputFile, err := os.Create(cnOutput)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
defer cnOutputFile.Close()
|
||||||
|
writer.Reset(cnOutputFile)
|
||||||
|
err = geosite.Write(writer, cnDomainMap)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
err = writer.Flush()
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
os.RemoveAll(ruleSetOutput)
|
||||||
|
os.RemoveAll(ruleSetUnstableOutput)
|
||||||
|
err = os.MkdirAll(ruleSetOutput, 0o755)
|
||||||
|
err = os.MkdirAll(ruleSetUnstableOutput, 0o755)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
for code, domains := range domainMap {
|
||||||
|
var headlessRule option.DefaultHeadlessRule
|
||||||
|
defaultRule := geosite.Compile(domains)
|
||||||
|
headlessRule.Domain = defaultRule.Domain
|
||||||
|
headlessRule.DomainSuffix = defaultRule.DomainSuffix
|
||||||
|
headlessRule.DomainKeyword = defaultRule.DomainKeyword
|
||||||
|
headlessRule.DomainRegex = defaultRule.DomainRegex
|
||||||
|
var plainRuleSet option.PlainRuleSet
|
||||||
|
plainRuleSet.Rules = []option.HeadlessRule{
|
||||||
|
{
|
||||||
|
Type: C.RuleTypeDefault,
|
||||||
|
DefaultOptions: headlessRule,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
srsPath, _ := filepath.Abs(filepath.Join(ruleSetOutput, "geosite-"+code+".srs"))
|
||||||
|
unstableSRSPath, _ := filepath.Abs(filepath.Join(ruleSetUnstableOutput, "geosite-"+code+".srs"))
|
||||||
|
// os.Stderr.WriteString("write " + srsPath + "\n")
|
||||||
|
var (
|
||||||
|
outputRuleSet *os.File
|
||||||
|
outputRuleSetUnstable *os.File
|
||||||
|
)
|
||||||
|
outputRuleSet, err = os.Create(srsPath)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
err = srs.Write(outputRuleSet, plainRuleSet, false)
|
||||||
|
outputRuleSet.Close()
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
outputRuleSetUnstable, err = os.Create(unstableSRSPath)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
err = srs.Write(outputRuleSetUnstable, plainRuleSet, true)
|
||||||
|
outputRuleSetUnstable.Close()
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func setActionOutput(name string, content string) {
|
||||||
|
os.Stdout.WriteString("::set-output name=" + name + "::" + content + "\n")
|
||||||
|
}
|
||||||
|
|
||||||
|
func release(source string, destination string, output string, cnOutput string, ruleSetOutput string, ruleSetOutputUnstable string) error {
|
||||||
|
sourceRelease, err := fetch(source)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
destinationRelease, err := fetch(destination)
|
||||||
|
if err != nil {
|
||||||
|
log.Warn("missing destination latest release")
|
||||||
|
} else {
|
||||||
|
if os.Getenv("NO_SKIP") != "true" && strings.Contains(*destinationRelease.Name, *sourceRelease.Name) {
|
||||||
|
log.Info("already latest")
|
||||||
|
setActionOutput("skip", "true")
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
err = generate(sourceRelease, output, cnOutput, ruleSetOutput, ruleSetOutputUnstable)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
setActionOutput("tag", *sourceRelease.Name)
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func main() {
|
||||||
|
err := release(
|
||||||
|
"v2fly/domain-list-community",
|
||||||
|
"sagernet/sing-geosite",
|
||||||
|
"geosite.db",
|
||||||
|
"geosite-cn.db",
|
||||||
|
"rule-set",
|
||||||
|
"rule-set-unstable",
|
||||||
|
)
|
||||||
|
if err != nil {
|
||||||
|
log.Fatal(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user