Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 GitHub Action
|
532d2a3554 |
@@ -1,15 +0,0 @@
|
||||
#!/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
|
||||
@@ -1,13 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
set -e -o pipefail
|
||||
|
||||
cd rule-set
|
||||
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 rule-set
|
||||
git add .
|
||||
git commit -m "Update rule-set"
|
||||
git push -f origin rule-set
|
||||
@@ -1,22 +0,0 @@
|
||||
{
|
||||
"$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"
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -1,6 +0,0 @@
|
||||
#!/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
|
||||
@@ -1,29 +0,0 @@
|
||||
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
|
||||
@@ -1,53 +0,0 @@
|
||||
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
|
||||
@@ -1,4 +0,0 @@
|
||||
/.idea/
|
||||
/vendor/
|
||||
/geosite.db
|
||||
/rule-set/
|
||||
@@ -1,17 +0,0 @@
|
||||
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'
|
||||
@@ -1,14 +0,0 @@
|
||||
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/>.
|
||||
@@ -1,17 +0,0 @@
|
||||
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.
@@ -0,0 +1 @@
|
||||
4a5028c9bbab52ae9869380ad8aa11fa40f1318e5f5d69ca268e7f6e89ad7548 geosite-cn.db
|
||||
BIN
Binary file not shown.
@@ -0,0 +1 @@
|
||||
dd47e49ad9731940b2153c8981a51cc13216a50cec317a906fbfb3a5e16e5557 geosite.db
|
||||
@@ -1,29 +0,0 @@
|
||||
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.3.8
|
||||
github.com/sagernet/sing-box v1.8.13
|
||||
github.com/v2fly/v2ray-core/v5 v5.16.1
|
||||
google.golang.org/protobuf v1.34.0
|
||||
)
|
||||
|
||||
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.59 // indirect
|
||||
github.com/sagernet/sing-dns v0.1.14 // indirect
|
||||
go4.org/netipx v0.0.0-20231129151722-fdeea329fbba // indirect
|
||||
golang.org/x/crypto v0.22.0 // indirect
|
||||
golang.org/x/mod v0.17.0 // indirect
|
||||
golang.org/x/net v0.24.0 // indirect
|
||||
golang.org/x/sync v0.7.0 // indirect
|
||||
golang.org/x/sys v0.19.0 // indirect
|
||||
golang.org/x/tools v0.20.0 // indirect
|
||||
)
|
||||
@@ -1,54 +0,0 @@
|
||||
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/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/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.59 h1:C9EXc/UToRwKLhK5wKU/I4QVsBUc8kE6MkHBkeypWZs=
|
||||
github.com/miekg/dns v1.1.59/go.mod h1:nZpewl5p6IvctfgrckopVx2OlSEHPRO/U4SYkRklrEk=
|
||||
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/sagernet/sing v0.3.8 h1:gm4JKalPhydMYX2zFOTnnd4TXtM/16WFRqSjMepYQQk=
|
||||
github.com/sagernet/sing v0.3.8/go.mod h1:+60H3Cm91RnL9dpVGWDPHt0zTQImO9Vfqt9a4rSambI=
|
||||
github.com/sagernet/sing-box v1.8.13 h1:M8mLo7AWDKV9d+Bq41fOz7B5CvS4+xhBR1tmwzrr7PY=
|
||||
github.com/sagernet/sing-box v1.8.13/go.mod h1:Cb0FBO7r5UnQJQ7Ql0jgdJ8SmzCyFvCQ7eeXq2clTOI=
|
||||
github.com/sagernet/sing-dns v0.1.14 h1:kxE/Ik3jMXmD3sXsdt9MgrNzLFWt64mghV+MQqzyf40=
|
||||
github.com/sagernet/sing-dns v0.1.14/go.mod h1:AA+vZMNovuPN5i/sPnfF6756Nq94nzb5nXodMWbta5w=
|
||||
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.22.0 h1:g1v0xeRhjcugydODzvb3mEM9SQ0HGp9s/nh3COQ/C30=
|
||||
golang.org/x/crypto v0.22.0/go.mod h1:vr6Su+7cTlO45qkww3VDJlzDn0ctJvRgYbC2NvXHt+M=
|
||||
golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA=
|
||||
golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
|
||||
golang.org/x/net v0.24.0 h1:1PcaxkF854Fu3+lvBIx5SYn9wRlBzzcnHZSiaFFAb0w=
|
||||
golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8=
|
||||
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.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o=
|
||||
golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
||||
golang.org/x/tools v0.20.0 h1:hz/CVckiOxybQvFw6h7b/q80NTr9IUQb4s1IIzW7KNY=
|
||||
golang.org/x/tools v0.20.0/go.mod h1:WvitBU7JJf6A4jOdg4S1tviW9bhUxkgeCui/0JHctQg=
|
||||
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||
google.golang.org/protobuf v1.34.0 h1:Qo/qEd2RZPCf2nKuorzksSknv0d3ERwp1vFG38gSmH4=
|
||||
google.golang.org/protobuf v1.34.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
|
||||
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=
|
||||
@@ -1,396 +0,0 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"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) 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()
|
||||
err = geosite.Write(outputFile, domainMap)
|
||||
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()
|
||||
err = geosite.Write(cnOutputFile, cnDomainMap)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
os.RemoveAll(ruleSetOutput)
|
||||
err = os.MkdirAll(ruleSetOutput, 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"))
|
||||
//os.Stderr.WriteString("write " + srsPath + "\n")
|
||||
outputRuleSet, err := os.Create(srsPath)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
err = srs.Write(outputRuleSet, plainRuleSet)
|
||||
if err != nil {
|
||||
outputRuleSet.Close()
|
||||
return err
|
||||
}
|
||||
outputRuleSet.Close()
|
||||
}
|
||||
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) 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)
|
||||
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",
|
||||
)
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user