mirror of
https://github.com/logos-storage/logos-storage-go-bindings.git
synced 2026-01-02 13:33:10 +00:00
Compare commits
No commits in common. "master" and "v0.0.22" have entirely different histories.
9
.github/workflows/ci.yml
vendored
9
.github/workflows/ci.yml
vendored
@ -2,14 +2,12 @@ name: Go Tests
|
||||
|
||||
on:
|
||||
push:
|
||||
branches: master
|
||||
pull_request:
|
||||
|
||||
jobs:
|
||||
test:
|
||||
runs-on: ${{ matrix.os }}
|
||||
strategy:
|
||||
matrix:
|
||||
os: [ubuntu-latest, macos-latest]
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
steps:
|
||||
- name: Checkout
|
||||
@ -46,8 +44,5 @@ jobs:
|
||||
- name: Build codex go
|
||||
run: make
|
||||
|
||||
- name: Install gotestsum
|
||||
run: go install gotest.tools/gotestsum@latest
|
||||
|
||||
- name: Go test
|
||||
run: make test
|
||||
|
||||
5
.gitignore
vendored
5
.gitignore
vendored
@ -19,7 +19,4 @@ nimcache
|
||||
|
||||
# Test files
|
||||
codex/testdata/hello.downloaded.txt
|
||||
codex/testdata/hello.downloaded.writer.txt
|
||||
|
||||
# Bin
|
||||
codex-go
|
||||
codex/testdata/hello.downloaded.writer.txt
|
||||
77
.vscode/launch.json
vendored
77
.vscode/launch.json
vendored
@ -1,77 +0,0 @@
|
||||
{
|
||||
// Use IntelliSense to learn about possible attributes.
|
||||
// Hover to view descriptions of existing attributes.
|
||||
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
|
||||
"version": "0.2.0",
|
||||
"configurations": [
|
||||
{
|
||||
"name": "Debug Current Test",
|
||||
"type": "go",
|
||||
"request": "launch",
|
||||
"mode": "test",
|
||||
"program": "${fileDirname}",
|
||||
"args": ["-test.v", "-test.run", "^${selectedText}$"],
|
||||
"env": {
|
||||
"CGO_ENABLED": "1"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "Debug Current Test Function",
|
||||
"type": "go",
|
||||
"request": "launch",
|
||||
"mode": "test",
|
||||
"program": "${fileDirname}",
|
||||
"env": {
|
||||
"CGO_ENABLED": "1"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "Debug All Tests in Current File",
|
||||
"type": "go",
|
||||
"request": "launch",
|
||||
"mode": "test",
|
||||
"program": "${fileDirname}",
|
||||
"args": ["-test.v"],
|
||||
"env": {
|
||||
"CGO_ENABLED": "1"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "Debug All Tests in Current Package",
|
||||
"type": "go",
|
||||
"request": "launch",
|
||||
"mode": "test",
|
||||
"program": "${fileDirname}",
|
||||
"args": ["-test.v", "-count=1"],
|
||||
"env": {
|
||||
"CGO_ENABLED": "1"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "Debug Codex Tests",
|
||||
"type": "go",
|
||||
"request": "launch",
|
||||
"mode": "test",
|
||||
"program": "${workspaceFolder}/codex",
|
||||
"args": ["-test.v"],
|
||||
"env": {
|
||||
"CGO_ENABLED": "1"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "Debug Specific Test (e.g., TestUpload)",
|
||||
"type": "go",
|
||||
"request": "launch",
|
||||
"mode": "test",
|
||||
"program": "${workspaceFolder}/codex",
|
||||
"args": [
|
||||
"-test.v",
|
||||
"-test.run",
|
||||
"TestUpload"
|
||||
],
|
||||
"env": {
|
||||
"CGO_ENABLED": "1"
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
6
.vscode/settings.json
vendored
6
.vscode/settings.json
vendored
@ -1,9 +1,7 @@
|
||||
{
|
||||
"go.toolsEnvVars": {
|
||||
"CGO_ENABLED": "1",
|
||||
"CGO_CFLAGS": "-I${workspaceFolder}/vendor/nim-codex/library",
|
||||
"CGO_LDFLAGS": "-L${workspaceFolder}/vendor/nim-codex/build -lcodex -Wl,-rpath,${workspaceFolder}/vendor/nim-codex/build",
|
||||
"CGO_LDFLAGS": "-L${workspaceFolder}/vendor/nim-codex/build -Wl,-rpath,${workspaceFolder}/vendor/nim-codex/build",
|
||||
"LD_LIBRARY_PATH": "${workspaceFolder}/vendor/nim-codex/build:${env:LD_LIBRARY_PATH}"
|
||||
},
|
||||
"go.testTimeout": "2m"
|
||||
}
|
||||
}
|
||||
38
CHANGELOG.md
38
CHANGELOG.md
@ -1,41 +1,3 @@
|
||||
## v0.0.28 (2025-11-14)
|
||||
### Notes
|
||||
|
||||
- fix: bump nim codex to prevent datastore lock when closing the Codex client
|
||||
- fix: configuration duration for block-ttl, block-mi and int for num-threads
|
||||
|
||||
## v0.0.27 (2025-11-11)
|
||||
### Notes
|
||||
|
||||
- Enhance release note in
|
||||
- Bump nim-codex to prototype release branch
|
||||
|
||||
## v0.0.26 (2025-11-03)
|
||||
### Notes
|
||||
|
||||
- Bump `nim-codex` to prototype release branch
|
||||
|
||||
## v0.0.25 (2025-11-03)
|
||||
### Notes
|
||||
|
||||
- Add `exists` to check the existence of a cid in the local store
|
||||
|
||||
## v0.0.24 (2025-10-30)
|
||||
### Notes
|
||||
|
||||
- Return the standard context.Canceled when a context is cancelled
|
||||
|
||||
## v0.0.23 (2025-10-30)
|
||||
### Notes
|
||||
|
||||
- Add context cancellation support
|
||||
- Prevent segmentation fault when trying to stop and node not started
|
||||
|
||||
## v0.0.22 (2025-10-20)
|
||||
### Notes
|
||||
|
||||
- Downgrade Go version requirement to 1.24.0
|
||||
|
||||
## v0.0.21 (2025-10-15)
|
||||
### Notes
|
||||
|
||||
|
||||
13
Makefile
13
Makefile
@ -23,24 +23,13 @@ libcodex:
|
||||
@echo "Building libcodex..."
|
||||
@$(MAKE) -C $(NIM_CODEX_DIR) libcodex
|
||||
|
||||
libcodex-with-debug-api:
|
||||
@echo "Building libcodex..."
|
||||
@$(MAKE) -C $(NIM_CODEX_DIR) libcodex CODEX_LIB_PARAMS="-d:codex_enable_api_debug_peers"
|
||||
|
||||
build:
|
||||
@echo "Building Codex Go Bindings..."
|
||||
CGO_ENABLED=1 CGO_CFLAGS="$(CGO_CFLAGS)" CGO_LDFLAGS="$(CGO_LDFLAGS)" go build -o codex-go ./codex
|
||||
|
||||
test:
|
||||
@echo "Running tests..."
|
||||
CGO_ENABLED=1 CGO_CFLAGS="$(CGO_CFLAGS)" CGO_LDFLAGS="$(CGO_LDFLAGS)" GOTESTFLAGS="-timeout=2m" gotestsum --packages="./..." -f testname -- $(if $(filter-out test,$(MAKECMDGOALS)),-run "$(filter-out test,$(MAKECMDGOALS))")
|
||||
|
||||
test-with-params:
|
||||
@echo "Running tests..."
|
||||
CGO_ENABLED=1 CGO_CFLAGS="$(CGO_CFLAGS)" CGO_LDFLAGS="$(CGO_LDFLAGS)" GOTESTFLAGS="-timeout=2m" gotestsum --packages="./..." -f testname -- $(ARGS)
|
||||
|
||||
%:
|
||||
@:
|
||||
CGO_ENABLED=1 CGO_CFLAGS="$(CGO_CFLAGS)" CGO_LDFLAGS="$(CGO_LDFLAGS)" go test ./...
|
||||
|
||||
clean:
|
||||
@echo "Cleaning up..."
|
||||
|
||||
72
README.md
72
README.md
@ -78,68 +78,27 @@ Follow these steps to install and set up the module:
|
||||
1. Make sure your system has the [prerequisites](https://github.com/codex-storage/nim-codex) to run a local Codex node.
|
||||
|
||||
2. Fetch the dependencies:
|
||||
```sh
|
||||
```
|
||||
make update
|
||||
```
|
||||
|
||||
3. Build the library:
|
||||
```sh
|
||||
```
|
||||
make libcodex
|
||||
```
|
||||
|
||||
You can pass flags to the Codex building step by using `CODEX_LIB_PARAMS`. For example,
|
||||
if you want to enable debug API for peers, you can build the library using:
|
||||
|
||||
```sh
|
||||
```
|
||||
CODEX_LIB_PARAMS="-d:codex_enable_api_debug_peers=true" make libcodex
|
||||
```
|
||||
|
||||
or you can use a convenience `libcodex-with-debug-api` make target:
|
||||
|
||||
```sh
|
||||
make libcodex-with-debug-api
|
||||
```
|
||||
|
||||
To run the test, you have to make sure you have `gotestsum` installed on your system, e.g.:
|
||||
|
||||
```sh
|
||||
go install gotest.tools/gotestsum@latest
|
||||
```
|
||||
|
||||
Then you can run the tests as follows.
|
||||
|
||||
To run all the tests:
|
||||
|
||||
```sh
|
||||
make test
|
||||
```
|
||||
|
||||
To run selected test only:
|
||||
|
||||
```sh
|
||||
make test "TestDownloadManifest$"
|
||||
```
|
||||
|
||||
> We use `$` to make sure we run only the `TestDownloadManifest` test.
|
||||
> Without `$` we would run all the tests starting with `TestDownloadManifest` and
|
||||
> so also `TestDownloadManifestWithNotExistingCid`
|
||||
>
|
||||
|
||||
If you need to pass more arguments to the underlying `go test` (`gotestsum` passes
|
||||
everything after `--` to `go test`), you can use: `test-with-params` make target, e.g.:
|
||||
|
||||
```sh
|
||||
make test-with-params ARGS='-run "TestDownloadManifest$$" -count=2'
|
||||
```
|
||||
|
||||
> Here, we use double escape `$$` instead of just `$`, otherwise make
|
||||
> will interpret `$` as a make variable inside `ARGS`.
|
||||
|
||||
Now the module is ready for use in your project.
|
||||
|
||||
The release process is defined [here](./RELEASE.md).
|
||||
|
||||
## API
|
||||
## Usage
|
||||
|
||||
### Init
|
||||
|
||||
@ -212,10 +171,11 @@ buf := bytes.NewBuffer([]byte("Hello World!"))
|
||||
onProgress := func(read, total int, percent float64, err error) {
|
||||
// Do something with the data
|
||||
}
|
||||
ctx := context.Background()
|
||||
cid, err := codex.UploadReader(ctx, UploadOptions{filepath: "hello.txt", onProgress: onProgress}, buf)
|
||||
cid, err := codex.UploadReader(UploadOptions{filepath: "hello.txt", onProgress: onProgress}, buf)
|
||||
```
|
||||
|
||||
Caveat: once started, the upload cannot be cancelled.
|
||||
|
||||
#### file
|
||||
|
||||
The `file` strategy allows you to upload a file on Codex using the path.
|
||||
@ -229,10 +189,11 @@ The `UploadFile` returns the cid of the content uploaded.
|
||||
onProgress := func(read, total int, percent float64, err error) {
|
||||
// Do something with the data
|
||||
}
|
||||
ctx := context.Background()
|
||||
cid, err := codex.UploadFile(ctx, UploadOptions{filepath: "./testdata/hello.txt", onProgress: onProgress})
|
||||
cid, err := codex.UploadFile(UploadOptions{filepath: "./testdata/hello.txt", onProgress: onProgress})
|
||||
```
|
||||
|
||||
Caveat: once started, the upload cannot be cancelled.
|
||||
|
||||
#### chunks
|
||||
|
||||
The `chunks` strategy allows you to manage the upload by yourself. It requires more code
|
||||
@ -285,10 +246,11 @@ opt := DownloadStreamOptions{
|
||||
// Handle progress
|
||||
},
|
||||
}
|
||||
ctx := context.Background()
|
||||
err := codex.DownloadStream(ctx, cid, opt)
|
||||
err := codex.DownloadStream(cid, opt)
|
||||
```
|
||||
|
||||
Caveat: once started, the download cannot be cancelled.
|
||||
|
||||
#### chunks
|
||||
|
||||
The `chunks` strategy allows to manage the download by yourself. It requires more code
|
||||
@ -348,10 +310,4 @@ peerId := "..."
|
||||
record, err := node.CodexPeerDebug(peerId)
|
||||
```
|
||||
|
||||
`CodexPeerDebug` is only available if you built with `-d:codex_enable_api_debug_peers=true` flag.
|
||||
|
||||
### Context and cancellation
|
||||
|
||||
Go contexts are exposed only on the long-running operations as `UploadReader`, `UploadFile`, and `DownloadFile`. If the
|
||||
context is cancelled, those methods cancel the active upload or download. Short lived API calls don’t take a context
|
||||
because they usually finish before a cancellation signal could matter.
|
||||
`CodexPeerDebug` is only available if you built with `-d:codex_enable_api_debug_peers=true` flag.
|
||||
67
RELEASE.md
67
RELEASE.md
@ -27,70 +27,3 @@ Once published, the artifacts can be downloaded using the `version`, example:
|
||||
|
||||
It is not recommended to use the `latest` URL because you may face cache issues.
|
||||
|
||||
## Integration
|
||||
|
||||
Once released, you can integrate it into your Go project using:
|
||||
|
||||
```bash
|
||||
go get github.com/codex-storage/codex-go-bindings@v0.0.26
|
||||
```
|
||||
|
||||
Then you can use the following `Makefile` command to fetch the artifact:
|
||||
|
||||
```bash
|
||||
LIBS_DIR := $(abspath ./libs)
|
||||
CODEX_OS := linux
|
||||
CODEX_ARCH := amd64
|
||||
CODEX_VERSION := $(shell go list -m -f '{{.Version}}' github.com/codex-storage/codex-go-bindings 2>/dev/null)
|
||||
CODEX_DOWNLOAD_URL := "https://github.com/codex-storage/codex-go-bindings/releases/download/$(CODEX_VERSION)/codex-${CODEX_OS}-${CODEX_ARCH}.zip"
|
||||
|
||||
fetch-libcodex:
|
||||
mkdir -p $(LIBS_DIR); \
|
||||
curl -fSL --create-dirs -o $(LIBS_DIR)/codex-${CODEX_OS}-${CODEX_ARCH}.zip ${CODEX_DOWNLOAD_URL}; \
|
||||
unzip -o -qq $(LIBS_DIR)/codex-${CODEX_OS}-${CODEX_ARCH}.zip -d $(LIBS_DIR); \
|
||||
rm -f $(LIBS_DIR)/codex*.zip;
|
||||
```
|
||||
|
||||
`CODEX_VERSION` uses the same version as the Codex Go dependency declared in your project.
|
||||
|
||||
### Nix
|
||||
|
||||
If you use Nix in a sandboxed environment, you cannot use curl to download the artifacts, so you have to prefetch them using the artifacts `SHA-256` hash. To generate the hash, you can use the following command:
|
||||
|
||||
```bash
|
||||
nix store prefetch-file --json --unpack https://github.com/codex-storage/codex-go-bindings/releases/download/v0.0.26/codex-macos-arm64.zip | jq -r .hash
|
||||
|
||||
# [10.4 MiB DL] sha256-3CHIWoSjo0plsYqzXQWm1EtY1STcljV4yfXTPon90uE=
|
||||
```
|
||||
|
||||
Then include this hash in your Nix configuration. For example:
|
||||
|
||||
```nix
|
||||
let
|
||||
optionalString = pkgs.lib.optionalString;
|
||||
codexVersion = "v0.0.26";
|
||||
arch =
|
||||
if stdenv.hostPlatform.isx86_64 then "amd64"
|
||||
else if stdenv.hostPlatform.isAarch64 then "arm64"
|
||||
else stdenv.hostPlatform.arch;
|
||||
os = if stdenv.isDarwin then "macos" else "Linux";
|
||||
hash =
|
||||
if stdenv.hostPlatform.isDarwin
|
||||
# nix store prefetch-file --json --unpack https://github.com/codex-storage/codex-go-bindings/releases/download/v0.0.26/codex-macos-arm64.zip | jq -r .hash
|
||||
then "sha256-3CHIWoSjo0plsYqzXQWm1EtY1STcljV4yfXTPon90uE="
|
||||
# nix store prefetch-file --json --unpack https://github.com/codex-storage/codex-go-bindings/releases/download/v0.0.26/codex-Linux-amd64.zip | jq -r .hash
|
||||
else "sha256-YxW2vFZlcLrOx1PYgWW4MIstH/oFBRF0ooS0sl3v6ig=";
|
||||
|
||||
# Pre-fetch libcodex to avoid network during build
|
||||
codexLib = pkgs.fetchzip {
|
||||
url = "https://github.com/codex-storage/codex-go-bindings/releases/download/${codexVersion}/codex-${os}-${arch}.zip";
|
||||
hash = hash;
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
preBuild = ''
|
||||
export LIBS_DIR="${codexLib}"
|
||||
# Build something cool with Codex
|
||||
'';
|
||||
```
|
||||
|
||||
|
||||
@ -92,7 +92,7 @@ const (
|
||||
|
||||
type Config struct {
|
||||
// Default: INFO
|
||||
LogLevel string `json:"log-level,omitempty"`
|
||||
LogLevel LogLevel `json:"log-level,omitempty"`
|
||||
|
||||
// Specifies what kind of logs should be written to stdout
|
||||
// Default: auto
|
||||
@ -159,12 +159,12 @@ type Config struct {
|
||||
|
||||
// Default block timeout in seconds - 0 disables the ttl
|
||||
// Default: 30 days
|
||||
BlockTtl string `json:"block-ttl,omitempty"`
|
||||
BlockTtl int `json:"block-ttl,omitempty"`
|
||||
|
||||
// Time interval in seconds - determines frequency of block
|
||||
// maintenance cycle: how often blocks are checked for expiration and cleanup
|
||||
// Default: 10 minutes
|
||||
BlockMaintenanceInterval string `json:"block-mi,omitempty"`
|
||||
BlockMaintenanceInterval int `json:"block-mi,omitempty"`
|
||||
|
||||
// Number of blocks to check every maintenance cycle
|
||||
// Default: 1000
|
||||
@ -280,12 +280,8 @@ func (node CodexNode) Destroy() error {
|
||||
return bridge.callError("cGoCodexDestroy")
|
||||
}
|
||||
|
||||
// We don't wait for the bridge here.
|
||||
// The destroy function does not call the worker thread,
|
||||
// it destroys the context directly and return the return
|
||||
// value synchronously.
|
||||
|
||||
return nil
|
||||
_, err = bridge.wait()
|
||||
return err
|
||||
}
|
||||
|
||||
// Version returns the version of the Codex node.
|
||||
|
||||
@ -1,15 +1,9 @@
|
||||
package codex
|
||||
|
||||
import (
|
||||
"testing"
|
||||
)
|
||||
import "testing"
|
||||
|
||||
func TestCodexVersion(t *testing.T) {
|
||||
config := defaultConfigHelper(t)
|
||||
node, err := New(config)
|
||||
if err != nil {
|
||||
t.Fatalf("Failed to create Codex node: %v", err)
|
||||
}
|
||||
node := newCodexNode(t, withNoStart())
|
||||
|
||||
version, err := node.Version()
|
||||
if err != nil {
|
||||
@ -23,11 +17,7 @@ func TestCodexVersion(t *testing.T) {
|
||||
}
|
||||
|
||||
func TestCodexRevision(t *testing.T) {
|
||||
config := defaultConfigHelper(t)
|
||||
node, err := New(config)
|
||||
if err != nil {
|
||||
t.Fatalf("Failed to create Codex node: %v", err)
|
||||
}
|
||||
node := newCodexNode(t, withNoStart())
|
||||
|
||||
revision, err := node.Revision()
|
||||
if err != nil {
|
||||
@ -81,74 +71,3 @@ func TestPeerId(t *testing.T) {
|
||||
|
||||
t.Logf("Codex PeerId: %s", peerId)
|
||||
}
|
||||
|
||||
func TestStorageQuota(t *testing.T) {
|
||||
node := newCodexNode(t, Config{
|
||||
StorageQuota: 1024 * 1024 * 1024, // 1GB
|
||||
})
|
||||
|
||||
if node == nil {
|
||||
t.Fatal("expected codex node to be created")
|
||||
}
|
||||
}
|
||||
|
||||
func TestCreateAndDestroyMultipleInstancesWithSameDatadir(t *testing.T) {
|
||||
datadir := t.TempDir()
|
||||
|
||||
config := Config{
|
||||
DataDir: datadir,
|
||||
LogFormat: LogFormatNoColors,
|
||||
MetricsEnabled: false,
|
||||
BlockRetries: 5,
|
||||
Nat: "none",
|
||||
}
|
||||
|
||||
for range 2 {
|
||||
node, err := New(config)
|
||||
if err != nil {
|
||||
t.Fatalf("Failed to create Codex node: %v", err)
|
||||
}
|
||||
|
||||
if err := node.Start(); err != nil {
|
||||
t.Fatalf("Failed to start Codex node: %v", err)
|
||||
}
|
||||
|
||||
if err := node.Stop(); err != nil {
|
||||
t.Fatalf("Failed to stop Codex node: %v", err)
|
||||
}
|
||||
|
||||
if err := node.Destroy(); err != nil {
|
||||
t.Fatalf("Failed to stop Codex node after restart: %v", err)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestNumThreads(t *testing.T) {
|
||||
node := newCodexNode(t, Config{
|
||||
NumThreads: 1,
|
||||
})
|
||||
|
||||
if node == nil {
|
||||
t.Fatal("expected codex node to be created")
|
||||
}
|
||||
}
|
||||
|
||||
func TestBlockTtl(t *testing.T) {
|
||||
node := newCodexNode(t, Config{
|
||||
BlockTtl: "10H",
|
||||
})
|
||||
|
||||
if node == nil {
|
||||
t.Fatal("expected codex node to be created")
|
||||
}
|
||||
}
|
||||
|
||||
func TestBlockMaintenanceInterval(t *testing.T) {
|
||||
node := newCodexNode(t, Config{
|
||||
BlockMaintenanceInterval: "10H",
|
||||
})
|
||||
|
||||
if node == nil {
|
||||
t.Fatal("expected codex node to be created")
|
||||
}
|
||||
}
|
||||
|
||||
@ -32,19 +32,38 @@ func TestUpdateLogLevel(t *testing.T) {
|
||||
}
|
||||
defer os.Remove(tmpFile.Name())
|
||||
|
||||
node := newCodexNode(t, Config{
|
||||
LogLevel: "INFO",
|
||||
LogFile: tmpFile.Name(),
|
||||
LogFormat: LogFormatNoColors,
|
||||
node, err := New(Config{
|
||||
LogFile: tmpFile.Name(),
|
||||
MetricsEnabled: false,
|
||||
})
|
||||
if err != nil {
|
||||
t.Fatalf("Failed to create Codex node: %v", err)
|
||||
}
|
||||
|
||||
t.Cleanup(func() {
|
||||
if err := node.Stop(); err != nil {
|
||||
t.Logf("cleanup codex: %v", err)
|
||||
}
|
||||
|
||||
if err := node.Destroy(); err != nil {
|
||||
t.Logf("cleanup codex: %v", err)
|
||||
}
|
||||
})
|
||||
|
||||
content, err := os.ReadFile(tmpFile.Name())
|
||||
if err := node.Start(); err != nil {
|
||||
t.Fatalf("Failed to start Codex node: %v", err)
|
||||
}
|
||||
|
||||
content, err := os.ReadFile(tmpFile.Name())
|
||||
if err != nil {
|
||||
t.Fatalf("Failed to read log file: %v", err)
|
||||
}
|
||||
if !strings.Contains(string(content), "INF") {
|
||||
t.Errorf("Log file does not contain INFO statement %s", string(content))
|
||||
if !strings.Contains(string(content), "Started codex node") {
|
||||
t.Errorf("Log file does not contain 'Started codex node' %s", string(content))
|
||||
}
|
||||
|
||||
if err := node.Stop(); err != nil {
|
||||
t.Fatalf("Failed to stop Codex node: %v", err)
|
||||
}
|
||||
|
||||
err = node.UpdateLogLevel("ERROR")
|
||||
@ -52,11 +71,6 @@ func TestUpdateLogLevel(t *testing.T) {
|
||||
t.Fatalf("UpdateLogLevel call failed: %v", err)
|
||||
}
|
||||
|
||||
if err := node.Stop(); err != nil {
|
||||
t.Fatalf("Failed to stop Codex node: %v", err)
|
||||
}
|
||||
|
||||
// Clear the file
|
||||
if err := os.WriteFile(tmpFile.Name(), []byte{}, 0644); err != nil {
|
||||
t.Fatalf("Failed to clear log file: %v", err)
|
||||
}
|
||||
@ -71,8 +85,8 @@ func TestUpdateLogLevel(t *testing.T) {
|
||||
t.Fatalf("Failed to read log file: %v", err)
|
||||
}
|
||||
|
||||
if strings.Contains(string(content), "INF") {
|
||||
t.Errorf("Log file contains INFO statement after log level update: %s", string(content))
|
||||
if strings.Contains(string(content), "Starting discovery node") {
|
||||
t.Errorf("Log file contains 'Starting discovery node'")
|
||||
}
|
||||
}
|
||||
|
||||
@ -80,10 +94,50 @@ func TestCodexPeerDebug(t *testing.T) {
|
||||
var bootstrap, node1, node2 *CodexNode
|
||||
var err error
|
||||
|
||||
bootstrap = newCodexNode(t, Config{
|
||||
DiscoveryPort: 8092,
|
||||
t.Cleanup(func() {
|
||||
if bootstrap != nil {
|
||||
if err := bootstrap.Stop(); err != nil {
|
||||
t.Logf("cleanup bootstrap: %v", err)
|
||||
}
|
||||
|
||||
if err := bootstrap.Destroy(); err != nil {
|
||||
t.Logf("cleanup bootstrap: %v", err)
|
||||
}
|
||||
}
|
||||
if node1 != nil {
|
||||
if err := node1.Stop(); err != nil {
|
||||
t.Logf("cleanup node1: %v", err)
|
||||
}
|
||||
|
||||
if err := node1.Destroy(); err != nil {
|
||||
t.Logf("cleanup node1: %v", err)
|
||||
}
|
||||
}
|
||||
if node2 != nil {
|
||||
if err := node2.Stop(); err != nil {
|
||||
t.Logf("cleanup node2: %v", err)
|
||||
}
|
||||
|
||||
if err := node2.Destroy(); err != nil {
|
||||
t.Logf("cleanup node2: %v", err)
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
bootstrap, err = New(Config{
|
||||
DataDir: t.TempDir(),
|
||||
LogFormat: LogFormatNoColors,
|
||||
MetricsEnabled: false,
|
||||
DiscoveryPort: 8092,
|
||||
})
|
||||
if err != nil {
|
||||
t.Fatalf("Failed to create bootstrap: %v", err)
|
||||
}
|
||||
|
||||
if err := bootstrap.Start(); err != nil {
|
||||
t.Fatalf("Failed to start bootstrap: %v", err)
|
||||
}
|
||||
|
||||
spr, err := bootstrap.Spr()
|
||||
if err != nil {
|
||||
t.Fatalf("Failed to get bootstrap spr: %v", err)
|
||||
@ -91,15 +145,35 @@ func TestCodexPeerDebug(t *testing.T) {
|
||||
|
||||
bootstrapNodes := []string{spr}
|
||||
|
||||
node1 = newCodexNode(t, Config{
|
||||
node1, err = New(Config{
|
||||
DataDir: t.TempDir(),
|
||||
LogFormat: LogFormatNoColors,
|
||||
MetricsEnabled: false,
|
||||
DiscoveryPort: 8090,
|
||||
BootstrapNodes: bootstrapNodes,
|
||||
})
|
||||
if err != nil {
|
||||
t.Fatalf("Failed to create codex: %v", err)
|
||||
}
|
||||
|
||||
node2 = newCodexNode(t, Config{
|
||||
if err := node1.Start(); err != nil {
|
||||
t.Fatalf("Failed to start codex: %v", err)
|
||||
}
|
||||
|
||||
node2, err = New(Config{
|
||||
DataDir: t.TempDir(),
|
||||
LogFormat: LogFormatNoColors,
|
||||
MetricsEnabled: false,
|
||||
DiscoveryPort: 8091,
|
||||
BootstrapNodes: bootstrapNodes,
|
||||
})
|
||||
if err != nil {
|
||||
t.Fatalf("Failed to create codex2: %v", err)
|
||||
}
|
||||
|
||||
if err := node2.Start(); err != nil {
|
||||
t.Fatalf("Failed to start codex2: %v", err)
|
||||
}
|
||||
|
||||
peerId, err := node2.PeerId()
|
||||
if err != nil {
|
||||
@ -112,14 +186,9 @@ func TestCodexPeerDebug(t *testing.T) {
|
||||
if err == nil {
|
||||
break
|
||||
}
|
||||
|
||||
time.Sleep(1 * time.Second)
|
||||
}
|
||||
|
||||
if err != nil {
|
||||
t.Fatalf("CodexPeerDebug call failed: %v", err)
|
||||
}
|
||||
|
||||
if record.PeerId == "" {
|
||||
t.Fatalf("CodexPeerDebug call failed: %v", err)
|
||||
}
|
||||
|
||||
@ -26,11 +26,8 @@ package codex
|
||||
*/
|
||||
import "C"
|
||||
import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"io"
|
||||
"sync/atomic"
|
||||
"unsafe"
|
||||
)
|
||||
|
||||
@ -148,7 +145,7 @@ func (node CodexNode) DownloadManifest(cid string) (Manifest, error) {
|
||||
// If options.writer is set, the data will be written into that writer.
|
||||
// The options filepath and writer are not mutually exclusive, i.e you can write
|
||||
// in different places in a same call.
|
||||
func (node CodexNode) DownloadStream(ctx context.Context, cid string, options DownloadStreamOptions) error {
|
||||
func (node CodexNode) DownloadStream(cid string, options DownloadStreamOptions) error {
|
||||
bridge := newBridgeCtx()
|
||||
defer bridge.free()
|
||||
|
||||
@ -192,16 +189,6 @@ func (node CodexNode) DownloadStream(ctx context.Context, cid string, options Do
|
||||
var cCid = C.CString(cid)
|
||||
defer C.free(unsafe.Pointer(cCid))
|
||||
|
||||
err := node.DownloadInit(cid, DownloadInitOptions{
|
||||
ChunkSize: options.ChunkSize,
|
||||
Local: options.Local,
|
||||
})
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
defer node.DownloadCancel(cid)
|
||||
|
||||
var cFilepath = C.CString(options.Filepath)
|
||||
defer C.free(unsafe.Pointer(cFilepath))
|
||||
|
||||
@ -211,45 +198,8 @@ func (node CodexNode) DownloadStream(ctx context.Context, cid string, options Do
|
||||
return bridge.callError("cGoCodexDownloadLocal")
|
||||
}
|
||||
|
||||
// Create a done channel to signal the goroutine to stop
|
||||
// when the download is complete and avoid goroutine leaks.
|
||||
done := make(chan struct{})
|
||||
defer close(done)
|
||||
|
||||
channelError := make(chan error, 1)
|
||||
var cancelled atomic.Bool
|
||||
go func() {
|
||||
select {
|
||||
case <-ctx.Done():
|
||||
channelError <- node.DownloadCancel(cid)
|
||||
cancelled.Store(true)
|
||||
case <-done:
|
||||
// Nothing to do, download finished
|
||||
}
|
||||
}()
|
||||
|
||||
_, err = bridge.wait()
|
||||
|
||||
// Extract the potential cancellation error
|
||||
var cancelError error
|
||||
select {
|
||||
case cancelError = <-channelError:
|
||||
default:
|
||||
}
|
||||
|
||||
if err != nil {
|
||||
if cancelError != nil {
|
||||
return fmt.Errorf("context canceled: %v, but failed to cancel download session: %v", ctx.Err(), cancelError)
|
||||
}
|
||||
|
||||
if cancelled.Load() {
|
||||
return context.Canceled
|
||||
}
|
||||
|
||||
return err
|
||||
}
|
||||
|
||||
return cancelError
|
||||
_, err := bridge.wait()
|
||||
return err
|
||||
}
|
||||
|
||||
// DownloadInit initializes the download process for a specific CID.
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
package codex
|
||||
|
||||
import (
|
||||
"context"
|
||||
"os"
|
||||
"strings"
|
||||
"testing"
|
||||
@ -33,7 +32,7 @@ func TestDownloadStream(t *testing.T) {
|
||||
},
|
||||
}
|
||||
|
||||
if err := codex.DownloadStream(context.Background(), cid, opt); err != nil {
|
||||
if err := codex.DownloadStream(cid, opt); err != nil {
|
||||
t.Fatal("Error happened:", err.Error())
|
||||
}
|
||||
|
||||
@ -73,7 +72,7 @@ func TestDownloadStreamWithAutosize(t *testing.T) {
|
||||
},
|
||||
}
|
||||
|
||||
if err := codex.DownloadStream(context.Background(), cid, opt); err != nil {
|
||||
if err := codex.DownloadStream(cid, opt); err != nil {
|
||||
t.Fatal("Error happened:", err.Error())
|
||||
}
|
||||
|
||||
@ -87,38 +86,14 @@ func TestDownloadStreamWithAutosize(t *testing.T) {
|
||||
}
|
||||
|
||||
func TestDownloadStreamWithNotExisting(t *testing.T) {
|
||||
codex := newCodexNode(t, Config{BlockRetries: 1})
|
||||
codex := newCodexNode(t, withBlockRetries(1))
|
||||
|
||||
opt := DownloadStreamOptions{}
|
||||
if err := codex.DownloadStream(context.Background(), "bafybeihdwdcefgh4dqkjv67uzcmw7ojee6xedzdetojuzjevtenxquvyku", opt); err == nil {
|
||||
if err := codex.DownloadStream("bafybeihdwdcefgh4dqkjv67uzcmw7ojee6xedzdetojuzjevtenxquvyku", opt); err == nil {
|
||||
t.Fatal("Error expected when downloading non-existing cid")
|
||||
}
|
||||
}
|
||||
|
||||
func TestDownloadStreamCancelled(t *testing.T) {
|
||||
ctx, cancel := context.WithCancel(context.Background())
|
||||
|
||||
codex := newCodexNode(t)
|
||||
cid, _ := uploadBigFileHelper(t, codex)
|
||||
|
||||
channelError := make(chan error, 1)
|
||||
go func() {
|
||||
err := codex.DownloadStream(ctx, cid, DownloadStreamOptions{Local: true})
|
||||
channelError <- err
|
||||
}()
|
||||
|
||||
cancel()
|
||||
err := <-channelError
|
||||
|
||||
if err == nil {
|
||||
t.Fatal("DownloadStream should have been canceled")
|
||||
}
|
||||
|
||||
if err.Error() != context.Canceled.Error() {
|
||||
t.Fatalf("DownloadStream returned unexpected error: %v", err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestDownloadManual(t *testing.T) {
|
||||
codex := newCodexNode(t)
|
||||
cid, _ := uploadHelper(t, codex)
|
||||
@ -159,7 +134,7 @@ func TestDownloadManifest(t *testing.T) {
|
||||
}
|
||||
|
||||
func TestDownloadManifestWithNotExistingCid(t *testing.T) {
|
||||
codex := newCodexNode(t, Config{BlockRetries: 1})
|
||||
codex := newCodexNode(t, withBlockRetries(1))
|
||||
|
||||
manifest, err := codex.DownloadManifest("bafybeihdwdcefgh4dqkjv67uzcmw7ojee6xedzdetojuzjevtenxquvyku")
|
||||
if err == nil {
|
||||
@ -172,7 +147,7 @@ func TestDownloadManifestWithNotExistingCid(t *testing.T) {
|
||||
}
|
||||
|
||||
func TestDownloadInitWithNotExistingCid(t *testing.T) {
|
||||
codex := newCodexNode(t, Config{BlockRetries: 1})
|
||||
codex := newCodexNode(t, withBlockRetries(1))
|
||||
|
||||
if err := codex.DownloadInit("bafybeihdwdcefgh4dqkjv67uzcmw7ojee6xedzdetojuzjevtenxquvyku", DownloadInitOptions{}); err == nil {
|
||||
t.Fatal("expected error when initializing download for non-existent cid")
|
||||
|
||||
@ -36,7 +36,6 @@ func TestConnectWithAddress(t *testing.T) {
|
||||
LogFormat: LogFormatNoColors,
|
||||
MetricsEnabled: false,
|
||||
DiscoveryPort: 8090,
|
||||
Nat: "none",
|
||||
})
|
||||
if err != nil {
|
||||
t.Fatalf("Failed to create codex1: %v", err)
|
||||
@ -74,10 +73,50 @@ func TestCodexWithPeerId(t *testing.T) {
|
||||
var bootstrap, node1, node2 *CodexNode
|
||||
var err error
|
||||
|
||||
bootstrap = newCodexNode(t, Config{
|
||||
DiscoveryPort: 8092,
|
||||
t.Cleanup(func() {
|
||||
if bootstrap != nil {
|
||||
if err := bootstrap.Stop(); err != nil {
|
||||
t.Logf("cleanup bootstrap: %v", err)
|
||||
}
|
||||
|
||||
if err := bootstrap.Destroy(); err != nil {
|
||||
t.Logf("cleanup bootstrap: %v", err)
|
||||
}
|
||||
}
|
||||
if node1 != nil {
|
||||
if err := node1.Stop(); err != nil {
|
||||
t.Logf("cleanup node1: %v", err)
|
||||
}
|
||||
|
||||
if err := node1.Destroy(); err != nil {
|
||||
t.Logf("cleanup node1: %v", err)
|
||||
}
|
||||
}
|
||||
if node2 != nil {
|
||||
if err := node2.Stop(); err != nil {
|
||||
t.Logf("cleanup node2: %v", err)
|
||||
}
|
||||
|
||||
if err := node2.Destroy(); err != nil {
|
||||
t.Logf("cleanup node2: %v", err)
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
bootstrap, err = New(Config{
|
||||
DataDir: t.TempDir(),
|
||||
LogFormat: LogFormatNoColors,
|
||||
MetricsEnabled: false,
|
||||
DiscoveryPort: 8092,
|
||||
})
|
||||
if err != nil {
|
||||
t.Fatalf("Failed to create bootstrap: %v", err)
|
||||
}
|
||||
|
||||
if err := bootstrap.Start(); err != nil {
|
||||
t.Fatalf("Failed to start bootstrap: %v", err)
|
||||
}
|
||||
|
||||
spr, err := bootstrap.Spr()
|
||||
if err != nil {
|
||||
t.Fatalf("Failed to get bootstrap spr: %v", err)
|
||||
@ -85,15 +124,35 @@ func TestCodexWithPeerId(t *testing.T) {
|
||||
|
||||
bootstrapNodes := []string{spr}
|
||||
|
||||
node1 = newCodexNode(t, Config{
|
||||
node1, err = New(Config{
|
||||
DataDir: t.TempDir(),
|
||||
LogFormat: LogFormatNoColors,
|
||||
MetricsEnabled: false,
|
||||
DiscoveryPort: 8090,
|
||||
BootstrapNodes: bootstrapNodes,
|
||||
})
|
||||
if err != nil {
|
||||
t.Fatalf("Failed to create codex: %v", err)
|
||||
}
|
||||
|
||||
node2 = newCodexNode(t, Config{
|
||||
if err := node1.Start(); err != nil {
|
||||
t.Fatalf("Failed to start codex: %v", err)
|
||||
}
|
||||
|
||||
node2, err = New(Config{
|
||||
DataDir: t.TempDir(),
|
||||
LogFormat: LogFormatNoColors,
|
||||
MetricsEnabled: false,
|
||||
DiscoveryPort: 8091,
|
||||
BootstrapNodes: bootstrapNodes,
|
||||
})
|
||||
if err != nil {
|
||||
t.Fatalf("Failed to create codex2: %v", err)
|
||||
}
|
||||
|
||||
if err := node2.Start(); err != nil {
|
||||
t.Fatalf("Failed to start codex2: %v", err)
|
||||
}
|
||||
|
||||
peerId, err := node2.PeerId()
|
||||
if err != nil {
|
||||
|
||||
@ -24,10 +24,6 @@ import (
|
||||
static int cGoCodexStorageDelete(void* codexCtx, char* cid, void* resp) {
|
||||
return codex_storage_delete(codexCtx, cid, (CodexCallback) callback, resp);
|
||||
}
|
||||
|
||||
static int cGoCodexStorageExists(void* codexCtx, char* cid, void* resp) {
|
||||
return codex_storage_exists(codexCtx, cid, (CodexCallback) callback, resp);
|
||||
}
|
||||
*/
|
||||
import "C"
|
||||
|
||||
@ -146,19 +142,3 @@ func (node CodexNode) Delete(cid string) error {
|
||||
_, err := bridge.wait()
|
||||
return err
|
||||
}
|
||||
|
||||
// Exists checks if a given cid exists in the local storage.
|
||||
func (node CodexNode) Exists(cid string) (bool, error) {
|
||||
bridge := newBridgeCtx()
|
||||
defer bridge.free()
|
||||
|
||||
var cCid = C.CString(cid)
|
||||
defer C.free(unsafe.Pointer(cCid))
|
||||
|
||||
if C.cGoCodexStorageExists(node.ctx, cCid, bridge.resp) != C.RET_OK {
|
||||
return false, bridge.callError("cGoCodexStorageExists")
|
||||
}
|
||||
|
||||
result, err := bridge.wait()
|
||||
return result == "true", err
|
||||
}
|
||||
|
||||
@ -84,7 +84,7 @@ func TestFetch(t *testing.T) {
|
||||
}
|
||||
|
||||
func TestFetchCidDoesNotExist(t *testing.T) {
|
||||
codex := newCodexNode(t, Config{BlockRetries: 1})
|
||||
codex := newCodexNode(t, withBlockRetries(1))
|
||||
|
||||
_, err := codex.Fetch("bafybeihdwdcefgh4dqkjv67uzcmw7ojee6xedzdetojuzjevtenxquvyku")
|
||||
if err == nil {
|
||||
@ -119,30 +119,3 @@ func TestDelete(t *testing.T) {
|
||||
t.Fatal("expected manifests to be empty after deletion")
|
||||
}
|
||||
}
|
||||
|
||||
func TestExists(t *testing.T) {
|
||||
codex := newCodexNode(t)
|
||||
|
||||
cid, _ := uploadHelper(t, codex)
|
||||
|
||||
exists, err := codex.Exists(cid)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if !exists {
|
||||
t.Fatal("expected cid to exist")
|
||||
}
|
||||
|
||||
err = codex.Delete(cid)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
exists, err = codex.Exists(cid)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if exists {
|
||||
t.Fatal("expected cid to not exist after deletion")
|
||||
}
|
||||
}
|
||||
|
||||
@ -2,78 +2,54 @@ package codex
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"context"
|
||||
"testing"
|
||||
)
|
||||
|
||||
func defaultConfigHelper(t *testing.T) Config {
|
||||
t.Helper()
|
||||
type codexNodeTestOption func(*codexNodeTestOptions)
|
||||
|
||||
return Config{
|
||||
type codexNodeTestOptions struct {
|
||||
noStart bool
|
||||
blockRetries int
|
||||
}
|
||||
|
||||
func withNoStart() codexNodeTestOption {
|
||||
return func(o *codexNodeTestOptions) { o.noStart = true }
|
||||
}
|
||||
|
||||
func withBlockRetries(n int) codexNodeTestOption {
|
||||
return func(o *codexNodeTestOptions) { o.blockRetries = n }
|
||||
}
|
||||
|
||||
func newCodexNode(t *testing.T, opts ...codexNodeTestOption) *CodexNode {
|
||||
o := codexNodeTestOptions{
|
||||
blockRetries: 3000,
|
||||
}
|
||||
for _, opt := range opts {
|
||||
opt(&o)
|
||||
}
|
||||
|
||||
node, err := New(Config{
|
||||
DataDir: t.TempDir(),
|
||||
LogFormat: LogFormatNoColors,
|
||||
MetricsEnabled: false,
|
||||
BlockRetries: 3000,
|
||||
Nat: "none",
|
||||
}
|
||||
}
|
||||
|
||||
func newCodexNode(t *testing.T, opts ...Config) *CodexNode {
|
||||
config := defaultConfigHelper(t)
|
||||
|
||||
if len(opts) > 0 {
|
||||
c := opts[0]
|
||||
|
||||
if c.BlockRetries > 0 {
|
||||
config.BlockRetries = c.BlockRetries
|
||||
}
|
||||
|
||||
if c.LogLevel != "" {
|
||||
config.LogLevel = c.LogLevel
|
||||
}
|
||||
|
||||
if c.LogFile != "" {
|
||||
config.LogFile = c.LogFile
|
||||
}
|
||||
|
||||
if len(c.BootstrapNodes) != 0 {
|
||||
config.BootstrapNodes = c.BootstrapNodes
|
||||
}
|
||||
|
||||
if c.DiscoveryPort != 0 {
|
||||
config.DiscoveryPort = c.DiscoveryPort
|
||||
}
|
||||
|
||||
if c.StorageQuota != 0 {
|
||||
config.StorageQuota = c.StorageQuota
|
||||
}
|
||||
|
||||
if c.NumThreads != 0 {
|
||||
config.NumThreads = c.NumThreads
|
||||
}
|
||||
|
||||
if c.BlockTtl != "" {
|
||||
config.BlockTtl = c.BlockTtl
|
||||
}
|
||||
|
||||
if c.BlockMaintenanceInterval != "" {
|
||||
config.BlockMaintenanceInterval = c.BlockMaintenanceInterval
|
||||
}
|
||||
}
|
||||
|
||||
node, err := New(config)
|
||||
BlockRetries: o.blockRetries,
|
||||
})
|
||||
if err != nil {
|
||||
t.Fatalf("Failed to create Codex node: %v", err)
|
||||
}
|
||||
|
||||
err = node.Start()
|
||||
if err != nil {
|
||||
t.Fatalf("Failed to start Codex node: %v", err)
|
||||
if !o.noStart {
|
||||
err = node.Start()
|
||||
if err != nil {
|
||||
t.Fatalf("Failed to start Codex node: %v", err)
|
||||
}
|
||||
}
|
||||
|
||||
t.Cleanup(func() {
|
||||
if err := node.Stop(); err != nil {
|
||||
t.Logf("cleanup codex: %v", err)
|
||||
if !o.noStart {
|
||||
if err := node.Stop(); err != nil {
|
||||
t.Logf("cleanup codex: %v", err)
|
||||
}
|
||||
}
|
||||
|
||||
if err := node.Destroy(); err != nil {
|
||||
@ -89,21 +65,7 @@ func uploadHelper(t *testing.T, codex *CodexNode) (string, int) {
|
||||
|
||||
buf := bytes.NewBuffer([]byte("Hello World!"))
|
||||
len := buf.Len()
|
||||
cid, err := codex.UploadReader(context.Background(), UploadOptions{Filepath: "hello.txt"}, buf)
|
||||
if err != nil {
|
||||
t.Fatalf("Error happened during upload: %v\n", err)
|
||||
}
|
||||
|
||||
return cid, len
|
||||
}
|
||||
|
||||
func uploadBigFileHelper(t *testing.T, codex *CodexNode) (string, int) {
|
||||
t.Helper()
|
||||
|
||||
len := 1024 * 1024 * 50
|
||||
buf := bytes.NewBuffer(make([]byte, len))
|
||||
|
||||
cid, err := codex.UploadReader(context.Background(), UploadOptions{Filepath: "hello.txt"}, buf)
|
||||
cid, err := codex.UploadReader(UploadOptions{Filepath: "hello.txt"}, buf)
|
||||
if err != nil {
|
||||
t.Fatalf("Error happened during upload: %v\n", err)
|
||||
}
|
||||
|
||||
@ -27,11 +27,9 @@ package codex
|
||||
import "C"
|
||||
import (
|
||||
"bytes"
|
||||
"context"
|
||||
"fmt"
|
||||
"io"
|
||||
"os"
|
||||
"sync/atomic"
|
||||
"unsafe"
|
||||
)
|
||||
|
||||
@ -166,12 +164,11 @@ func (node CodexNode) UploadCancel(sessionId string) error {
|
||||
// - UploadChunk to upload a chunk to codex.
|
||||
// - UploadFinalize to finalize the upload session.
|
||||
// - UploadCancel if an error occurs.
|
||||
func (node CodexNode) UploadReader(ctx context.Context, options UploadOptions, r io.Reader) (string, error) {
|
||||
func (node CodexNode) UploadReader(options UploadOptions, r io.Reader) (string, error) {
|
||||
sessionId, err := node.UploadInit(&options)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
defer node.UploadCancel(sessionId)
|
||||
|
||||
buf := make([]byte, options.ChunkSize.valOrDefault())
|
||||
total := 0
|
||||
@ -182,16 +179,6 @@ func (node CodexNode) UploadReader(ctx context.Context, options UploadOptions, r
|
||||
}
|
||||
|
||||
for {
|
||||
select {
|
||||
case <-ctx.Done():
|
||||
if cancelErr := node.UploadCancel(sessionId); cancelErr != nil {
|
||||
return "", fmt.Errorf("upload canceled: %v, but failed to cancel upload session: %v", ctx.Err(), cancelErr)
|
||||
}
|
||||
return "", context.Canceled
|
||||
default:
|
||||
// continue
|
||||
}
|
||||
|
||||
n, err := r.Read(buf)
|
||||
if err == io.EOF {
|
||||
break
|
||||
@ -235,9 +222,9 @@ func (node CodexNode) UploadReader(ctx context.Context, options UploadOptions, r
|
||||
}
|
||||
|
||||
// UploadReaderAsync is the asynchronous version of UploadReader using a goroutine.
|
||||
func (node CodexNode) UploadReaderAsync(ctx context.Context, options UploadOptions, r io.Reader, onDone func(cid string, err error)) {
|
||||
func (node CodexNode) UploadReaderAsync(options UploadOptions, r io.Reader, onDone func(cid string, err error)) {
|
||||
go func() {
|
||||
cid, err := node.UploadReader(ctx, options, r)
|
||||
cid, err := node.UploadReader(options, r)
|
||||
onDone(cid, err)
|
||||
}()
|
||||
}
|
||||
@ -262,7 +249,7 @@ func (node CodexNode) UploadReaderAsync(ctx context.Context, options UploadOptio
|
||||
// is sent to the stream.
|
||||
//
|
||||
// Internally, it calls UploadInit to create the upload session.
|
||||
func (node CodexNode) UploadFile(ctx context.Context, options UploadOptions) (string, error) {
|
||||
func (node CodexNode) UploadFile(options UploadOptions) (string, error) {
|
||||
bridge := newBridgeCtx()
|
||||
defer bridge.free()
|
||||
|
||||
@ -298,7 +285,6 @@ func (node CodexNode) UploadFile(ctx context.Context, options UploadOptions) (st
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
defer node.UploadCancel(sessionId)
|
||||
|
||||
var cSessionId = C.CString(sessionId)
|
||||
defer C.free(unsafe.Pointer(cSessionId))
|
||||
@ -307,51 +293,13 @@ func (node CodexNode) UploadFile(ctx context.Context, options UploadOptions) (st
|
||||
return "", bridge.callError("cGoCodexUploadFile")
|
||||
}
|
||||
|
||||
// Create a done channel to signal the goroutine to stop
|
||||
// when the download is complete and avoid goroutine leaks.
|
||||
done := make(chan struct{})
|
||||
defer close(done)
|
||||
|
||||
channelError := make(chan error, 1)
|
||||
var cancelled atomic.Bool
|
||||
go func() {
|
||||
select {
|
||||
case <-ctx.Done():
|
||||
channelError <- node.UploadCancel(sessionId)
|
||||
cancelled.Store(true)
|
||||
case <-done:
|
||||
// Nothing to do, upload finished
|
||||
}
|
||||
}()
|
||||
|
||||
_, err = bridge.wait()
|
||||
|
||||
// Extract the potential cancellation error
|
||||
var cancelErr error
|
||||
select {
|
||||
case cancelErr = <-channelError:
|
||||
default:
|
||||
}
|
||||
|
||||
if err != nil {
|
||||
if cancelErr != nil {
|
||||
return "", fmt.Errorf("context canceled: %v, but failed to cancel upload session: %v", ctx.Err(), cancelErr)
|
||||
}
|
||||
|
||||
if cancelled.Load() {
|
||||
return "", context.Canceled
|
||||
}
|
||||
|
||||
return "", err
|
||||
}
|
||||
|
||||
return bridge.result, cancelErr
|
||||
return bridge.wait()
|
||||
}
|
||||
|
||||
// UploadFileAsync is the asynchronous version of UploadFile using a goroutine.
|
||||
func (node CodexNode) UploadFileAsync(ctx context.Context, options UploadOptions, onDone func(cid string, err error)) {
|
||||
func (node CodexNode) UploadFileAsync(options UploadOptions, onDone func(cid string, err error)) {
|
||||
go func() {
|
||||
cid, err := node.UploadFile(ctx, options)
|
||||
cid, err := node.UploadFile(options)
|
||||
onDone(cid, err)
|
||||
}()
|
||||
}
|
||||
|
||||
@ -2,7 +2,6 @@ package codex
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"context"
|
||||
"log"
|
||||
"os"
|
||||
"testing"
|
||||
@ -17,7 +16,7 @@ func TestUploadReader(t *testing.T) {
|
||||
|
||||
buf := bytes.NewBuffer([]byte("Hello World!"))
|
||||
len := buf.Len()
|
||||
cid, err := codex.UploadReader(context.Background(), UploadOptions{Filepath: "hello.txt", OnProgress: func(read, total int, percent float64, err error) {
|
||||
cid, err := codex.UploadReader(UploadOptions{Filepath: "hello.txt", OnProgress: func(read, total int, percent float64, err error) {
|
||||
if err != nil {
|
||||
log.Fatalf("Error happened during upload: %v\n", err)
|
||||
}
|
||||
@ -43,30 +42,6 @@ func TestUploadReader(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
func TestUploadReaderCancel(t *testing.T) {
|
||||
ctx, cancel := context.WithCancel(context.Background())
|
||||
|
||||
codex := newCodexNode(t)
|
||||
buf := bytes.NewBuffer(make([]byte, 1024*1024*10))
|
||||
|
||||
channelErr := make(chan error, 1)
|
||||
go func() {
|
||||
_, e := codex.UploadReader(ctx, UploadOptions{Filepath: "hello.txt"}, buf)
|
||||
channelErr <- e
|
||||
}()
|
||||
|
||||
cancel()
|
||||
err := <-channelErr
|
||||
|
||||
if err == nil {
|
||||
t.Fatal("UploadReader should have been canceled")
|
||||
}
|
||||
|
||||
if err.Error() != context.Canceled.Error() {
|
||||
t.Fatalf("UploadReader returned unexpected error: %v expected %v", err, context.Canceled)
|
||||
}
|
||||
}
|
||||
|
||||
func TestUploadFile(t *testing.T) {
|
||||
codex := newCodexNode(t)
|
||||
totalBytes := 0
|
||||
@ -86,7 +61,7 @@ func TestUploadFile(t *testing.T) {
|
||||
finalPercent = percent
|
||||
}}
|
||||
|
||||
cid, err := codex.UploadFile(context.Background(), options)
|
||||
cid, err := codex.UploadFile(options)
|
||||
if err != nil {
|
||||
t.Fatalf("UploadReader failed: %v", err)
|
||||
}
|
||||
@ -104,47 +79,12 @@ func TestUploadFile(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
func TestUploadFileCancel(t *testing.T) {
|
||||
ctx, cancel := context.WithCancel(context.Background())
|
||||
|
||||
tmpFile, err := os.Create(os.TempDir() + "/large_file.txt")
|
||||
if err != nil {
|
||||
t.Fatalf("Failed to create temp file: %v", err)
|
||||
}
|
||||
defer os.Remove(tmpFile.Name())
|
||||
|
||||
largeContent := make([]byte, 1024*1024*50)
|
||||
if _, err := tmpFile.Write(largeContent); err != nil {
|
||||
t.Fatalf("Failed to write to temp file: %v", err)
|
||||
}
|
||||
tmpFile.Close()
|
||||
|
||||
codex := newCodexNode(t)
|
||||
|
||||
channelError := make(chan error, 1)
|
||||
go func() {
|
||||
_, err := codex.UploadFile(ctx, UploadOptions{Filepath: tmpFile.Name()})
|
||||
channelError <- err
|
||||
}()
|
||||
|
||||
cancel()
|
||||
err = <-channelError
|
||||
|
||||
if err == nil {
|
||||
t.Fatal("UploadFile should have been canceled")
|
||||
}
|
||||
|
||||
if err.Error() != context.Canceled.Error() {
|
||||
t.Fatalf("UploadFile returned unexpected error: %v", err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestUploadFileNoProgress(t *testing.T) {
|
||||
codex := newCodexNode(t)
|
||||
|
||||
options := UploadOptions{Filepath: "./testdata/doesnt_exist.txt"}
|
||||
|
||||
cid, err := codex.UploadFile(context.Background(), options)
|
||||
cid, err := codex.UploadFile(options)
|
||||
if err == nil {
|
||||
t.Fatalf("UploadReader should have failed")
|
||||
}
|
||||
|
||||
2
vendor/nim-codex
vendored
2
vendor/nim-codex
vendored
@ -1 +1 @@
|
||||
Subproject commit 2b9fc1eb554e5eee43b8a815084fb8c61687ada9
|
||||
Subproject commit 1105b81cc1b202006ca5a16485b3cfc5331468d5
|
||||
Loading…
x
Reference in New Issue
Block a user