Skip to content

Commit

Permalink
chore: rename module
Browse files Browse the repository at this point in the history
  • Loading branch information
whatwewant committed Nov 4, 2023
1 parent 77f3285 commit aa72849
Show file tree
Hide file tree
Showing 179 changed files with 503 additions and 503 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/feature_request_en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ body:
options:
- label: "I understand that this is the official open-source version of the Clash core, **only providing support for the open-source version or Premium version**"
required: true
- label: "I have looked for my idea in [the issue tracker](https://github.com/Dreamacro/clash/issues?q=is%3Aissue+label%3Aenhancement), **and found none of which being related**"
- label: "I have looked for my idea in [the issue tracker](https://github.com/doreamon-design/clash/issues?q=is%3Aissue+label%3Aenhancement), **and found none of which being related**"
required: true
- label: "I have read the [official Wiki](https://dreamacro.github.io/clash/)"
required: true
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/feature_request_zh.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ body:
options:
- label: "我了解这里是 Clash 官方仓库,并非 Clash.Meta / OpenClash / ClashX / Clash For Windows 或其他任何衍生版本"
required: true
- label: "我已经在[这里](https://github.com/Dreamacro/clash/issues?q=is%3Aissue+label%3Aenhancement)找过我要提出的建议,**并且没有找到相关问题**"
- label: "我已经在[这里](https://github.com/doreamon-design/clash/issues?q=is%3Aissue+label%3Aenhancement)找过我要提出的建议,**并且没有找到相关问题**"
required: true
- label: "我已经仔细阅读 [官方 Wiki](https://dreamacro.github.io/clash/) "
required: true
Expand Down
2 changes: 1 addition & 1 deletion .golangci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ linters-settings:
custom-order: true
sections:
- standard
- prefix(github.com/Dreamacro/clash)
- prefix(github.com/doreamon-design/clash)
- default
staticcheck:
go: '1.21'
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ RUN --mount=target=. \
mv /clash* /clash

FROM alpine:latest
LABEL org.opencontainers.image.source="https://github.com/Dreamacro/clash"
LABEL org.opencontainers.image.source="https://github.com/doreamon-design/clash"

COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
COPY --from=builder /Country.mmdb /root/.config/clash/
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ NAME=clash
BINDIR=bin
VERSION=$(shell git describe --tags || echo "unknown version")
BUILDTIME=$(shell date -u)
GOBUILD=CGO_ENABLED=0 go build -trimpath -ldflags '-X "github.com/Dreamacro/clash/constant.Version=$(VERSION)" \
-X "github.com/Dreamacro/clash/constant.BuildTime=$(BUILDTIME)" \
GOBUILD=CGO_ENABLED=0 go build -trimpath -ldflags '-X "github.com/doreamon-design/clash/constant.Version=$(VERSION)" \
-X "github.com/doreamon-design/clash/constant.BuildTime=$(BUILDTIME)" \
-w -s -buildid='

PLATFORM_LIST = \
Expand Down
18 changes: 9 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
<h1 align="center">
<img src="https://github.com/Dreamacro/clash/raw/master/docs/logo.png" alt="Clash" width="200">
<img src="https://github.com/doreamon-design/clash/raw/master/docs/logo.png" alt="Clash" width="200">
<br>Clash<br>
</h1>

<h4 align="center">A rule-based tunnel in Go.</h4>

<p align="center">
<a href="https://github.com/Dreamacro/clash/actions">
<img src="https://img.shields.io/github/actions/workflow/status/Dreamacro/clash/release.yml?branch=master&style=flat-square" alt="Github Actions">
<a href="https://github.com/doreamon-design/clash/actions">
<img src="https://img.shields.io/github/actions/workflow/status/doreamon-design/clash/release.yml?branch=master&style=flat-square" alt="Github Actions">
</a>
<a href="https://goreportcard.com/report/github.com/Dreamacro/clash">
<img src="https://goreportcard.com/badge/github.com/Dreamacro/clash?style=flat-square">
<a href="https://goreportcard.com/report/github.com/doreamon-design/clash">
<img src="https://goreportcard.com/badge/github.com/doreamon-design/clash?style=flat-square">
</a>
<img src="https://img.shields.io/github/go-mod/go-version/Dreamacro/clash?style=flat-square">
<a href="https://github.com/Dreamacro/clash/releases">
<img src="https://img.shields.io/github/release/Dreamacro/clash/all.svg?style=flat-square">
<img src="https://img.shields.io/github/go-mod/go-version/doreamon-design/clash?style=flat-square">
<a href="https://github.com/doreamon-design/clash/releases">
<img src="https://img.shields.io/github/release/doreamon-design/clash/all.svg?style=flat-square">
</a>
<a href="https://github.com/Dreamacro/clash/releases/tag/premium">
<a href="https://github.com/doreamon-design/clash/releases/tag/premium">
<img src="https://img.shields.io/badge/release-Premium-00b4f0?style=flat-square">
</a>
</p>
Expand Down
6 changes: 3 additions & 3 deletions adapter/adapter.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import (
"strconv"
"time"

"github.com/Dreamacro/clash/common/queue"
"github.com/Dreamacro/clash/component/dialer"
C "github.com/Dreamacro/clash/constant"
"github.com/doreamon-design/clash/common/queue"
"github.com/doreamon-design/clash/component/dialer"
C "github.com/doreamon-design/clash/constant"

"go.uber.org/atomic"
)
Expand Down
6 changes: 3 additions & 3 deletions adapter/inbound/http.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"net"
"net/netip"

C "github.com/Dreamacro/clash/constant"
"github.com/Dreamacro/clash/context"
"github.com/Dreamacro/clash/transport/socks5"
C "github.com/doreamon-design/clash/constant"
"github.com/doreamon-design/clash/context"
"github.com/doreamon-design/clash/transport/socks5"
)

// NewHTTP receive normal http request and return HTTPContext
Expand Down
4 changes: 2 additions & 2 deletions adapter/inbound/https.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"net/http"
"net/netip"

C "github.com/Dreamacro/clash/constant"
"github.com/Dreamacro/clash/context"
C "github.com/doreamon-design/clash/constant"
"github.com/doreamon-design/clash/context"
)

// NewHTTPS receive CONNECT request and return ConnContext
Expand Down
4 changes: 2 additions & 2 deletions adapter/inbound/packet.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"net"
"net/netip"

C "github.com/Dreamacro/clash/constant"
"github.com/Dreamacro/clash/transport/socks5"
C "github.com/doreamon-design/clash/constant"
"github.com/doreamon-design/clash/transport/socks5"
)

// PacketAdapter is a UDP Packet adapter for socks/redir/tun
Expand Down
6 changes: 3 additions & 3 deletions adapter/inbound/socket.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"net"
"net/netip"

C "github.com/Dreamacro/clash/constant"
"github.com/Dreamacro/clash/context"
"github.com/Dreamacro/clash/transport/socks5"
C "github.com/doreamon-design/clash/constant"
"github.com/doreamon-design/clash/context"
"github.com/doreamon-design/clash/transport/socks5"
)

// NewSocket receive TCP inbound and return ConnContext
Expand Down
6 changes: 3 additions & 3 deletions adapter/inbound/util.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import (
"strconv"
"strings"

"github.com/Dreamacro/clash/common/util"
C "github.com/Dreamacro/clash/constant"
"github.com/Dreamacro/clash/transport/socks5"
"github.com/doreamon-design/clash/common/util"
C "github.com/doreamon-design/clash/constant"
"github.com/doreamon-design/clash/transport/socks5"
)

func parseSocksAddr(target socks5.Addr) *C.Metadata {
Expand Down
4 changes: 2 additions & 2 deletions adapter/outbound/base.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"errors"
"net"

"github.com/Dreamacro/clash/component/dialer"
C "github.com/Dreamacro/clash/constant"
"github.com/doreamon-design/clash/component/dialer"
C "github.com/doreamon-design/clash/constant"
)

type Base struct {
Expand Down
4 changes: 2 additions & 2 deletions adapter/outbound/direct.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"context"
"net"

"github.com/Dreamacro/clash/component/dialer"
C "github.com/Dreamacro/clash/constant"
"github.com/doreamon-design/clash/component/dialer"
C "github.com/doreamon-design/clash/constant"
)

type Direct struct {
Expand Down
4 changes: 2 additions & 2 deletions adapter/outbound/http.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import (
"net/url"
"strconv"

"github.com/Dreamacro/clash/component/dialer"
C "github.com/Dreamacro/clash/constant"
"github.com/doreamon-design/clash/component/dialer"
C "github.com/doreamon-design/clash/constant"
)

type Http struct {
Expand Down
4 changes: 2 additions & 2 deletions adapter/outbound/reject.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"net"
"time"

"github.com/Dreamacro/clash/component/dialer"
C "github.com/Dreamacro/clash/constant"
"github.com/doreamon-design/clash/component/dialer"
C "github.com/doreamon-design/clash/constant"
)

type Reject struct {
Expand Down
14 changes: 7 additions & 7 deletions adapter/outbound/shadowsocks.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ import (
"net"
"strconv"

"github.com/Dreamacro/clash/common/structure"
"github.com/Dreamacro/clash/component/dialer"
C "github.com/Dreamacro/clash/constant"
"github.com/Dreamacro/clash/transport/shadowsocks/core"
obfs "github.com/Dreamacro/clash/transport/simple-obfs"
"github.com/Dreamacro/clash/transport/socks5"
v2rayObfs "github.com/Dreamacro/clash/transport/v2ray-plugin"
"github.com/doreamon-design/clash/common/structure"
"github.com/doreamon-design/clash/component/dialer"
C "github.com/doreamon-design/clash/constant"
"github.com/doreamon-design/clash/transport/shadowsocks/core"
obfs "github.com/doreamon-design/clash/transport/simple-obfs"
"github.com/doreamon-design/clash/transport/socks5"
v2rayObfs "github.com/doreamon-design/clash/transport/v2ray-plugin"
)

type ShadowSocks struct {
Expand Down
16 changes: 8 additions & 8 deletions adapter/outbound/shadowsocksr.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ import (
"net"
"strconv"

"github.com/Dreamacro/clash/component/dialer"
C "github.com/Dreamacro/clash/constant"
"github.com/Dreamacro/clash/transport/shadowsocks/core"
"github.com/Dreamacro/clash/transport/shadowsocks/shadowaead"
"github.com/Dreamacro/clash/transport/shadowsocks/shadowstream"
"github.com/Dreamacro/clash/transport/ssr/obfs"
"github.com/Dreamacro/clash/transport/ssr/protocol"
"github.com/doreamon-design/clash/component/dialer"
C "github.com/doreamon-design/clash/constant"
"github.com/doreamon-design/clash/transport/shadowsocks/core"
"github.com/doreamon-design/clash/transport/shadowsocks/shadowaead"
"github.com/doreamon-design/clash/transport/shadowsocks/shadowstream"
"github.com/doreamon-design/clash/transport/ssr/obfs"
"github.com/doreamon-design/clash/transport/ssr/protocol"
)

type ShadowSocksR struct {
Expand Down Expand Up @@ -94,7 +94,7 @@ func (ssr *ShadowSocksR) ListenPacketContext(ctx context.Context, metadata *C.Me

func NewShadowSocksR(option ShadowSocksROption) (*ShadowSocksR, error) {
// SSR protocol compatibility
// https://github.com/Dreamacro/clash/pull/2056
// https://github.com/doreamon-design/clash/pull/2056
if option.Cipher == "none" {
option.Cipher = "dummy"
}
Expand Down
10 changes: 5 additions & 5 deletions adapter/outbound/snell.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ import (
"net"
"strconv"

"github.com/Dreamacro/clash/common/structure"
"github.com/Dreamacro/clash/component/dialer"
C "github.com/Dreamacro/clash/constant"
obfs "github.com/Dreamacro/clash/transport/simple-obfs"
"github.com/Dreamacro/clash/transport/snell"
"github.com/doreamon-design/clash/common/structure"
"github.com/doreamon-design/clash/component/dialer"
C "github.com/doreamon-design/clash/constant"
obfs "github.com/doreamon-design/clash/transport/simple-obfs"
"github.com/doreamon-design/clash/transport/snell"
)

type Snell struct {
Expand Down
6 changes: 3 additions & 3 deletions adapter/outbound/socks5.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import (
"net/netip"
"strconv"

"github.com/Dreamacro/clash/component/dialer"
C "github.com/Dreamacro/clash/constant"
"github.com/Dreamacro/clash/transport/socks5"
"github.com/doreamon-design/clash/component/dialer"
C "github.com/doreamon-design/clash/constant"
"github.com/doreamon-design/clash/transport/socks5"
)

type Socks5 struct {
Expand Down
8 changes: 4 additions & 4 deletions adapter/outbound/trojan.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ import (
"net/http"
"strconv"

"github.com/Dreamacro/clash/component/dialer"
C "github.com/Dreamacro/clash/constant"
"github.com/Dreamacro/clash/transport/gun"
"github.com/Dreamacro/clash/transport/trojan"
"github.com/doreamon-design/clash/component/dialer"
C "github.com/doreamon-design/clash/constant"
"github.com/doreamon-design/clash/transport/gun"
"github.com/doreamon-design/clash/transport/trojan"

"golang.org/x/net/http2"
)
Expand Down
6 changes: 3 additions & 3 deletions adapter/outbound/util.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"net"
"time"

"github.com/Dreamacro/clash/component/resolver"
C "github.com/Dreamacro/clash/constant"
"github.com/Dreamacro/clash/transport/socks5"
"github.com/doreamon-design/clash/component/resolver"
C "github.com/doreamon-design/clash/constant"
"github.com/doreamon-design/clash/transport/socks5"

"github.com/Dreamacro/protobytes"
)
Expand Down
12 changes: 6 additions & 6 deletions adapter/outbound/vmess.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ import (
"strconv"
"strings"

"github.com/Dreamacro/clash/component/dialer"
"github.com/Dreamacro/clash/component/resolver"
C "github.com/Dreamacro/clash/constant"
"github.com/Dreamacro/clash/transport/gun"
"github.com/Dreamacro/clash/transport/socks5"
"github.com/Dreamacro/clash/transport/vmess"
"github.com/doreamon-design/clash/component/dialer"
"github.com/doreamon-design/clash/component/resolver"
C "github.com/doreamon-design/clash/constant"
"github.com/doreamon-design/clash/transport/gun"
"github.com/doreamon-design/clash/transport/socks5"
"github.com/doreamon-design/clash/transport/vmess"

"golang.org/x/net/http2"
)
Expand Down
4 changes: 2 additions & 2 deletions adapter/outboundgroup/common.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package outboundgroup
import (
"time"

C "github.com/Dreamacro/clash/constant"
"github.com/Dreamacro/clash/constant/provider"
C "github.com/doreamon-design/clash/constant"
"github.com/doreamon-design/clash/constant/provider"
)

const (
Expand Down
10 changes: 5 additions & 5 deletions adapter/outboundgroup/fallback.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ import (
"context"
"encoding/json"

"github.com/Dreamacro/clash/adapter/outbound"
"github.com/Dreamacro/clash/common/singledo"
"github.com/Dreamacro/clash/component/dialer"
C "github.com/Dreamacro/clash/constant"
"github.com/Dreamacro/clash/constant/provider"
"github.com/doreamon-design/clash/adapter/outbound"
"github.com/doreamon-design/clash/common/singledo"
"github.com/doreamon-design/clash/component/dialer"
C "github.com/doreamon-design/clash/constant"
"github.com/doreamon-design/clash/constant/provider"
)

type Fallback struct {
Expand Down
12 changes: 6 additions & 6 deletions adapter/outboundgroup/loadbalance.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ import (
"fmt"
"net"

"github.com/Dreamacro/clash/adapter/outbound"
"github.com/Dreamacro/clash/common/murmur3"
"github.com/Dreamacro/clash/common/singledo"
"github.com/Dreamacro/clash/component/dialer"
C "github.com/Dreamacro/clash/constant"
"github.com/Dreamacro/clash/constant/provider"
"github.com/doreamon-design/clash/adapter/outbound"
"github.com/doreamon-design/clash/common/murmur3"
"github.com/doreamon-design/clash/common/singledo"
"github.com/doreamon-design/clash/component/dialer"
C "github.com/doreamon-design/clash/constant"
"github.com/doreamon-design/clash/constant/provider"

"golang.org/x/net/publicsuffix"
)
Expand Down
10 changes: 5 additions & 5 deletions adapter/outboundgroup/parser.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ import (
"errors"
"fmt"

"github.com/Dreamacro/clash/adapter/outbound"
"github.com/Dreamacro/clash/adapter/provider"
"github.com/Dreamacro/clash/common/structure"
C "github.com/Dreamacro/clash/constant"
types "github.com/Dreamacro/clash/constant/provider"
"github.com/doreamon-design/clash/adapter/outbound"
"github.com/doreamon-design/clash/adapter/provider"
"github.com/doreamon-design/clash/common/structure"
C "github.com/doreamon-design/clash/constant"
types "github.com/doreamon-design/clash/constant/provider"

regexp "github.com/dlclark/regexp2"
)
Expand Down
Loading

0 comments on commit aa72849

Please sign in to comment.