Skip to content

Commit

Permalink
🚚 update: post ownership transfer change (#50)
Browse files Browse the repository at this point in the history
* 🚚 update: ownership to refraction-networking

Signed-off-by: Gaukas Wang <[email protected]>

* update: FOSSA url

Signed-off-by: Gaukas Wang <[email protected]>

---------

Signed-off-by: Gaukas Wang <[email protected]>
  • Loading branch information
gaukas authored Feb 17, 2024
1 parent 98cf39f commit 3f736e9
Show file tree
Hide file tree
Showing 32 changed files with 72 additions and 83 deletions.
13 changes: 0 additions & 13 deletions .deepsource.toml

This file was deleted.

40 changes: 21 additions & 19 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# W.A.T.E.R.: WebAssembly Transport Executables Runtime
[![License](https://img.shields.io/github/license/gaukas/water)](https://github.com/gaukas/water/blob/master/LICENSE)
[![FOSSA](https://app.fossa.com/api/projects/git%2Bgithub.com%2Fgaukas%2Fwater.svg?type=shield&issueType=license)](https://app.fossa.com/projects/git%2Bgithub.com%2Fgaukas%2Fwater?ref=badge_shield&issueType=license)
[![CI](https://github.com/gaukas/water/actions/workflows/go.yml/badge.svg?branch=master)](https://github.com/gaukas/water/actions/workflows/go.yml)
[![Go Doc](https://pkg.go.dev/badge/github.com/gaukas/water.svg)](https://pkg.go.dev/github.com/gaukas/water)
[![License](https://img.shields.io/github/license/gaukas/water)](https://github.com/refraction-networking/water/blob/master/LICENSE)
[![FOSSA](https://app.fossa.com/api/projects/git%2Bgithub.com%2Frefraction-networking%2Fwater.svg?type=shield&issueType=license)](https://app.fossa.com/projects/git%2Bgithub.com%2Frefraction-networking%2Fwater?ref=badge_shield&issueType=license)
[![CI](https://github.com/refraction-networking/water/actions/workflows/go.yml/badge.svg?branch=master)](https://github.com/refraction-networking/water/actions/workflows/go.yml)
[![Go Doc](https://pkg.go.dev/badge/github.com/refraction-networking/water.svg)](https://pkg.go.dev/github.com/refraction-networking/water)

<div style="width: 100%; height = 160px">
<div style="width: 75%; height: 150px; float: left;">
Expand All @@ -21,32 +21,34 @@

To build a WATM in Go, please refer to [watm](https://github.com/gaukas/watm) for examples and helper libraries interfacing Pluggable Transports-like interfaces. Official Go compiler is currently not supported ([watm#4](https://github.com/gaukas/watm/issues/4)).

You can contact one of developers personally via [email protected], or simply [opening an issue](https://github.com/gaukas/water/issues/new).
You can contact one of developers personally via [email protected], or simply [opening an issue](https://github.com/refraction-networking/water/issues/new).

The Rust implementation of the runtime library and information about writing, building, and using WebAssembly Transport Modules(WATM) from Rust can be found in [water-rs](https://github.com/erikziyunchi/water-rs).
The Rust implementation of the runtime library and information about writing, building, and using WebAssembly Transport Modules(WATM) from Rust can be found in [water-rs](https://github.com/refraction-networking/water-rs).

### Cite our work

If you quoted or used our work in your own project/paper/research, please cite our paper [Just add WATER: WebAssembly-based Circumvention Transports](https://arxiv.org/pdf/2312.00163.pdf).
If you quoted or used our work in your own project/paper/research, please cite our paper [Just add WATER: WebAssembly-based Circumvention Transports](https://www.petsymposium.org/foci/2024/foci-2024-0003.pdf), which is published in the proceedings of Free and Open Communications on the Internet (FOCI) in 2024 issue 1, pages 22-28.

<details>
<summary>BibTeX</summary>

```bibtex
@inproceedings{water-foci24,
author = {Chi, Erik and Wang, Gaukas and Halderman, J. Alex and Wustrow, Eric and Wampler, Jack},
year = {2024},
month = {02},
title = {Just add {WATER}: {WebAssembly}-based Circumvention Transports},
address = {Virtual Event},
series = {FOCI '24},
booktitle = {Free and Open Communications on the Internet},
}
@inproceedings{water-foci24,
author = {Chi, Erik and Wang, Gaukas and Halderman, J. Alex and Wustrow, Eric and Wampler, Jack},
year = {2024},
month = {02},
number = {1},
pages = {22-28},
title = {Just add {WATER}: {WebAssembly}-based Circumvention Transports},
howpublished = "\url{https://www.petsymposium.org/foci/2024/foci-2024-0003.php}",
publisher = {PoPETs},
address = {Virtual Event},
series = {FOCI '24},
booktitle = {Free and Open Communications on the Internet},
}
```
</details>

**Update**: our paper has been accepted by FOCI and will appear at [FOCI 2024](https://foci.community/foci24.html) on Feb 19, 2024!

## Be Water

> Empty your mind, be formless, shapeless, like water. If you put water into a cup, it becomes the cup. You put water into a bottle and it becomes the bottle. You put it in a teapot, it becomes the teapot. Now, water can flow or it can crash. Be water, my friend.
Expand All @@ -70,7 +72,7 @@ W.A.T.E.R. is designed to be future-proof with the automated multi-version WebAs
import (
// ...

_ "github.com/gaukas/water/transport/v0"
_ "github.com/refraction-networking/water/transport/v0"

// ...
)
Expand Down
4 changes: 2 additions & 2 deletions config.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"net"
"os"

"github.com/gaukas/water/configbuilder"
"github.com/gaukas/water/internal/log"
"github.com/refraction-networking/water/configbuilder"
"github.com/refraction-networking/water/internal/log"
"google.golang.org/protobuf/proto"
)

Expand Down
4 changes: 2 additions & 2 deletions config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (
"reflect"
"testing"

"github.com/gaukas/water/internal/log"
"github.com/refraction-networking/water/internal/log"

"github.com/gaukas/water"
"github.com/refraction-networking/water"
)

func TestConfig_Clone(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion configbuilder/config.pb.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package configbuilder

import "github.com/gaukas/water/configbuilder/pb"
import "github.com/refraction-networking/water/configbuilder/pb"

// ConfigProtoBuf defines the Protobuf format of the Config.
//
Expand Down
2 changes: 1 addition & 1 deletion configbuilder/pb/config.proto
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ syntax = "proto3";

package water;

option go_package = "github.com/gaukas/water/configbuilder/pb";
option go_package = "github.com/refraction-networking/water/configbuilder/pb";

message Config {
TransportModule transport_module = 1;
Expand Down
2 changes: 1 addition & 1 deletion core.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"runtime"
"sync"

"github.com/gaukas/water/internal/log"
"github.com/refraction-networking/water/internal/log"
"github.com/tetratelabs/wazero"
"github.com/tetratelabs/wazero/api"
"github.com/tetratelabs/wazero/imports/wasi_snapshot_preview1"
Expand Down
4 changes: 2 additions & 2 deletions dialer_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"fmt"
"net"

"github.com/gaukas/water"
_ "github.com/gaukas/water/transport/v0"
"github.com/refraction-networking/water"
_ "github.com/refraction-networking/water/transport/v0"
)

// ExampleDialer demonstrates how to use water.Dialer.
Expand Down
2 changes: 1 addition & 1 deletion examples/v0/dialer/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ This is an example of using `water.Dialer` with any v0 WATM.
### Install

```bash
go get github.com/gaukas/water/examples/v0/dialer
go get github.com/refraction-networking/water/examples/v0/dialer
```

### Run
Expand Down
6 changes: 3 additions & 3 deletions examples/v0/dialer/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import (
"os"
"time"

"github.com/gaukas/water"
"github.com/gaukas/water/internal/log"
_ "github.com/gaukas/water/transport/v0"
"github.com/refraction-networking/water"
"github.com/refraction-networking/water/internal/log"
_ "github.com/refraction-networking/water/transport/v0"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion examples/v0/listener/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ This is an example of using `water.Listener` with any v0 WATM.
### Install

```bash
go get github.com/gaukas/water/examples/v0/listener
go get github.com/refraction-networking/water/examples/v0/listener
```

### Run
Expand Down
6 changes: 3 additions & 3 deletions examples/v0/listener/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import (
"os"
"time"

"github.com/gaukas/water"
"github.com/gaukas/water/internal/log"
_ "github.com/gaukas/water/transport/v0"
"github.com/refraction-networking/water"
"github.com/refraction-networking/water/internal/log"
_ "github.com/refraction-networking/water/transport/v0"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion examples/v0/relay/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ This is an example of using `water.Relay` with any v0 WATM.
### Install

```bash
go get github.com/gaukas/water/examples/v0/relay
go get github.com/refraction-networking/water/examples/v0/relay
```

### Run
Expand Down
4 changes: 2 additions & 2 deletions examples/v0/relay/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"net"
"os"

"github.com/gaukas/water"
_ "github.com/gaukas/water/transport/v0"
"github.com/refraction-networking/water"
_ "github.com/refraction-networking/water/transport/v0"
)

var (
Expand Down
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
module github.com/gaukas/water
module github.com/refraction-networking/water

go 1.20

replace github.com/tetratelabs/wazero v1.6.0 => github.com/gaukas/wazero v1.6.5-w
replace github.com/tetratelabs/wazero v1.6.0 => github.com/refraction-networking/wazero v1.6.6-w

require (
github.com/tetratelabs/wazero v1.6.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
github.com/gaukas/wazero v1.6.5-w h1:tSQbdHJjYcH9GmQ/5aObsTdbsw44pRT2eqw8HXIuWKg=
github.com/gaukas/wazero v1.6.5-w/go.mod h1:0U0G41+ochRKoPKCJlh0jMg1CHkyfK8kDqiirMmKY8A=
github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg=
github.com/refraction-networking/wazero v1.6.6-w h1:GopGAQ5/Rah0vzGImewwOrOaXFR+FmgWlgGKs1JpVlw=
github.com/refraction-networking/wazero v1.6.6-w/go.mod h1:ytl6Zuh20R/eROuyDaGPkp82O9C/DJfXAwJfQ3X6/7Y=
golang.org/x/exp v0.0.0-20240119083558-1b970713d09a h1:Q8/wZp0KX97QFTc2ywcOE0YRjZPVIx+MXInMzdvQqcA=
golang.org/x/exp v0.0.0-20240119083558-1b970713d09a/go.mod h1:idGWGoKP1toJGkd5/ig9ZLuPcZBC3ewk7SzmH0uou08=
google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I=
Expand Down
2 changes: 1 addition & 1 deletion internal/socket/tcpconn.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"os"
"sync"

"github.com/gaukas/water/internal/log"
"github.com/refraction-networking/water/internal/log"
)

// TCPConnPair returns a pair of connected net.TCPConn.
Expand Down
2 changes: 1 addition & 1 deletion internal/socket/tcpconn_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"testing"
"time"

"github.com/gaukas/water/internal/socket"
"github.com/refraction-networking/water/internal/socket"
)

func TestTCPConnPair(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion internal/socket/unixconn.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"os"
"sync"

"github.com/gaukas/water/internal/log"
"github.com/refraction-networking/water/internal/log"
)

// UnixConnPair returns a pair of connected net.UnixConn.
Expand Down
2 changes: 1 addition & 1 deletion internal/socket/unixconn_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"testing"
"time"

"github.com/gaukas/water/internal/socket"
"github.com/refraction-networking/water/internal/socket"
)

func TestUnixConnPair(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions listener_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"fmt"
"net"

"github.com/gaukas/water"
_ "github.com/gaukas/water/transport/v0"
"github.com/refraction-networking/water"
_ "github.com/refraction-networking/water/transport/v0"
)

// ExampleListener demonstrates how to use water.Listener.
Expand Down
2 changes: 1 addition & 1 deletion log.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package water

import (
"github.com/gaukas/water/internal/log"
"github.com/refraction-networking/water/internal/log"
)

// SetDefaultLogger sets the logger to be used by the package
Expand Down
4 changes: 2 additions & 2 deletions relay_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"net"
"time"

"github.com/gaukas/water"
_ "github.com/gaukas/water/transport/v0"
"github.com/refraction-networking/water"
_ "github.com/refraction-networking/water/transport/v0"
)

// ExampleRelay demonstrates how to use water.Relay.
Expand Down
6 changes: 3 additions & 3 deletions transport/v0/conn.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import (
"sync/atomic"
"time"

"github.com/gaukas/water"
"github.com/gaukas/water/internal/log"
"github.com/gaukas/water/internal/socket"
"github.com/refraction-networking/water"
"github.com/refraction-networking/water/internal/log"
"github.com/refraction-networking/water/internal/socket"
)

// Conn is the first experimental version of Conn implementation.
Expand Down
2 changes: 1 addition & 1 deletion transport/v0/dialer.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"
"fmt"

"github.com/gaukas/water"
"github.com/refraction-networking/water"
)

func init() {
Expand Down
4 changes: 2 additions & 2 deletions transport/v0/dialer_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"testing"
"time"

"github.com/gaukas/water"
v0 "github.com/gaukas/water/transport/v0"
"github.com/refraction-networking/water"
v0 "github.com/refraction-networking/water/transport/v0"
)

// ExampleDialer demonstrates how to use v0.Dialer as a water.Dialer.
Expand Down
4 changes: 2 additions & 2 deletions transport/v0/gc_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"sync/atomic"
"testing"

"github.com/gaukas/water"
v0 "github.com/gaukas/water/transport/v0"
"github.com/refraction-networking/water"
v0 "github.com/refraction-networking/water/transport/v0"
)

// This file is specifically designed to test to make sure everything will eventually be
Expand Down
2 changes: 1 addition & 1 deletion transport/v0/listener.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"net"
"sync/atomic"

"github.com/gaukas/water"
"github.com/refraction-networking/water"
)

func init() {
Expand Down
4 changes: 2 additions & 2 deletions transport/v0/listener_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"testing"
"time"

"github.com/gaukas/water"
v0 "github.com/gaukas/water/transport/v0"
"github.com/refraction-networking/water"
v0 "github.com/refraction-networking/water/transport/v0"
)

// ExampleListener demonstrates how to use v0.Listener as a water.Listener.
Expand Down
2 changes: 1 addition & 1 deletion transport/v0/relay.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"net"
"sync/atomic"

"github.com/gaukas/water"
"github.com/refraction-networking/water"
)

func init() {
Expand Down
4 changes: 2 additions & 2 deletions transport/v0/relay_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"testing"
"time"

"github.com/gaukas/water"
v0 "github.com/gaukas/water/transport/v0"
"github.com/refraction-networking/water"
v0 "github.com/refraction-networking/water/transport/v0"
)

// ExampleRelay demonstrates how to use v0.Relay as a water.Relay.
Expand Down
8 changes: 4 additions & 4 deletions transport/v0/transport_module.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ import (
"sync"
"syscall"

"github.com/gaukas/water"
"github.com/gaukas/water/internal/log"
"github.com/gaukas/water/internal/socket"
"github.com/gaukas/water/internal/wasip1"
"github.com/refraction-networking/water"
"github.com/refraction-networking/water/internal/log"
"github.com/refraction-networking/water/internal/socket"
"github.com/refraction-networking/water/internal/wasip1"
"github.com/tetratelabs/wazero/api"
)

Expand Down

0 comments on commit 3f736e9

Please sign in to comment.