Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into feat/add-sessions-to-…
Browse files Browse the repository at this point in the history
…interface
  • Loading branch information
achingbrain committed Mar 1, 2024
2 parents d7d6334 + f9da283 commit 8c42ec5
Show file tree
Hide file tree
Showing 86 changed files with 919 additions and 2,941 deletions.
29 changes: 29 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
## Title

<!---
The title of the PR will be the commit message of the merge commit, so please make sure it is descriptive enough.
We utilize the Conventional Commits specification for our commit messages. See <https://www.conventionalcommits.org/en/v1.0.0/#specification> for more information.
The commit tag types can be of one of the following: feat, fix, deps, refactor, chore, docs. See <https://github.com/ipfs/helia/blob/main/.github/workflows/main.yml#L184-L192>
The title must also be fewer than 72 characters long or it will fail the Semantic PR check. See <https://github.com/ipfs/helia/blob/main/.github/workflows/semantic-pull-request.yml>
--->

## Description

<!--
Please write a summary of your changes and why you made them.
Please include any relevant issues in here, for example:
Related https://github.com/ipfs/helia/issues/ABCD.
Fixes https://github.com/ipfs/helia/issues/XYZ.
-->

## Notes & open questions

<!--
Any notes, remarks or open questions you have to make about the PR which don't need to go into the final commit message.
-->

## Change checklist

- [ ] I have performed a self-review of my own code
- [ ] I have made corresponding changes to the documentation if necessary (this includes comments as well)
- [ ] I have added tests that prove my fix is effective or that my feature works
24 changes: 16 additions & 8 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,11 @@ jobs:
node-version: ${{ matrix.node }}
- uses: ipfs/aegir/actions/cache-node-modules@master
- run: npm run --if-present test:node
- uses: codecov/codecov-action@4fe8c5f003fae66aa5ebb77cfd3e7bfbbda0b6b0 # v3.1.5
- uses: codecov/codecov-action@0cfda1dd0a4ad9efc75517f399d859cd1ea4ced1 # v4.0.2
with:
flags: node
files: .coverage/*,packages/*/.coverage/*
token: ${{ secrets.CODECOV_TOKEN }}

test-chrome:
needs: build
Expand All @@ -61,10 +62,11 @@ jobs:
node-version: lts/*
- uses: ipfs/aegir/actions/cache-node-modules@master
- run: npm run --if-present test:chrome
- uses: codecov/codecov-action@4fe8c5f003fae66aa5ebb77cfd3e7bfbbda0b6b0 # v3.1.5
- uses: codecov/codecov-action@0cfda1dd0a4ad9efc75517f399d859cd1ea4ced1 # v4.0.2
with:
flags: chrome
files: .coverage/*,packages/*/.coverage/*
token: ${{ secrets.CODECOV_TOKEN }}

test-chrome-webworker:
needs: build
Expand All @@ -76,10 +78,11 @@ jobs:
node-version: lts/*
- uses: ipfs/aegir/actions/cache-node-modules@master
- run: npm run --if-present test:chrome-webworker
- uses: codecov/codecov-action@4fe8c5f003fae66aa5ebb77cfd3e7bfbbda0b6b0 # v3.1.5
- uses: codecov/codecov-action@0cfda1dd0a4ad9efc75517f399d859cd1ea4ced1 # v4.0.2
with:
flags: chrome-webworker
files: .coverage/*,packages/*/.coverage/*
token: ${{ secrets.CODECOV_TOKEN }}

test-firefox:
needs: build
Expand All @@ -91,10 +94,11 @@ jobs:
node-version: lts/*
- uses: ipfs/aegir/actions/cache-node-modules@master
- run: npm run --if-present test:firefox
- uses: codecov/codecov-action@4fe8c5f003fae66aa5ebb77cfd3e7bfbbda0b6b0 # v3.1.5
- uses: codecov/codecov-action@0cfda1dd0a4ad9efc75517f399d859cd1ea4ced1 # v4.0.2
with:
flags: firefox
files: .coverage/*,packages/*/.coverage/*
token: ${{ secrets.CODECOV_TOKEN }}

test-firefox-webworker:
needs: build
Expand All @@ -106,10 +110,11 @@ jobs:
node-version: lts/*
- uses: ipfs/aegir/actions/cache-node-modules@master
- run: npm run --if-present test:firefox-webworker
- uses: codecov/codecov-action@4fe8c5f003fae66aa5ebb77cfd3e7bfbbda0b6b0 # v3.1.5
- uses: codecov/codecov-action@0cfda1dd0a4ad9efc75517f399d859cd1ea4ced1 # v4.0.2
with:
flags: firefox-webworker
files: .coverage/*,packages/*/.coverage/*
token: ${{ secrets.CODECOV_TOKEN }}

test-webkit:
needs: build
Expand All @@ -121,10 +126,11 @@ jobs:
node-version: lts/*
- uses: ipfs/aegir/actions/cache-node-modules@master
- run: npm run --if-present test:webkit
- uses: codecov/codecov-action@4fe8c5f003fae66aa5ebb77cfd3e7bfbbda0b6b0 # v3.1.5
- uses: codecov/codecov-action@0cfda1dd0a4ad9efc75517f399d859cd1ea4ced1 # v4.0.2
with:
flags: webkit
files: .coverage/*,packages/*/.coverage/*
token: ${{ secrets.CODECOV_TOKEN }}

test-electron-main:
needs: build
Expand All @@ -136,10 +142,11 @@ jobs:
node-version: lts/*
- uses: ipfs/aegir/actions/cache-node-modules@master
- run: npx xvfb-maybe npm run --if-present test:electron-main
- uses: codecov/codecov-action@4fe8c5f003fae66aa5ebb77cfd3e7bfbbda0b6b0 # v3.1.5
- uses: codecov/codecov-action@0cfda1dd0a4ad9efc75517f399d859cd1ea4ced1 # v4.0.2
with:
flags: electron-main
files: .coverage/*,packages/*/.coverage/*
token: ${{ secrets.CODECOV_TOKEN }}

test-electron-renderer:
needs: build
Expand All @@ -151,10 +158,11 @@ jobs:
node-version: lts/*
- uses: ipfs/aegir/actions/cache-node-modules@master
- run: npx xvfb-maybe npm run --if-present test:electron-renderer
- uses: codecov/codecov-action@4fe8c5f003fae66aa5ebb77cfd3e7bfbbda0b6b0 # v3.1.5
- uses: codecov/codecov-action@0cfda1dd0a4ad9efc75517f399d859cd1ea4ced1 # v4.0.2
with:
flags: electron-renderer
files: .coverage/*,packages/*/.coverage/*
token: ${{ secrets.CODECOV_TOKEN }}

release:
runs-on: ubuntu-latest
Expand Down
31 changes: 15 additions & 16 deletions .release-please-manifest.json
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@
{
"packages/block-brokers": "2.0.1",
"packages/car": "3.0.0",
"packages/dag-cbor": "3.0.0",
"packages/dag-json": "3.0.0",
"packages/helia": "4.0.1",
"packages/interface": "4.0.0",
"packages/interop": "5.0.0",
"packages/ipns": "6.0.0",
"packages/json": "3.0.0",
"packages/mfs": "3.0.0",
"packages/strings": "3.0.0",
"packages/unixfs": "3.0.0",
"packages/utils": "0.0.1",
"packages/http": "1.0.1",
"packages/routers": "1.0.0",
"packages/verified-fetch": "0.0.0"
"packages/block-brokers": "2.0.2",
"packages/car": "3.1.0",
"packages/dag-cbor": "3.0.1",
"packages/dag-json": "3.0.1",
"packages/helia": "4.0.2",
"packages/interface": "4.0.1",
"packages/interop": "5.1.0",
"packages/ipns": "6.0.1",
"packages/json": "3.0.1",
"packages/mfs": "3.0.1",
"packages/strings": "3.0.1",
"packages/unixfs": "3.0.1",
"packages/utils": "0.0.2",
"packages/http": "1.0.2",
"packages/routers": "1.0.1"
}
3 changes: 1 addition & 2 deletions .release-please.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
"packages/routers": {},
"packages/strings": {},
"packages/unixfs": {},
"packages/utils": {},
"packages/verified-fetch": {}
"packages/utils": {}
}
}
22 changes: 12 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -167,29 +167,31 @@ The basic Helia API is defined in:

The API is implemented by:

- [`/packages/helia`](./packages/helia) An implementation of the Helia API
- [`/packages/helia`](./packages/helia) An peer to peer implementation that uses [bitswap](https://docs.ipfs.tech/concepts/bitswap/), [libp2p](https://www.npmjs.com/package/libp2p) and [HTTP gateways](https://docs.ipfs.tech/reference/http/gateway/) as fallback
- [`/packages/http`](./packages/http) A lightweight implementation that uses [HTTP gateways](https://docs.ipfs.tech/reference/http/gateway/) exclusively

Helia also ships a number of supplemental libraries and tools.
Helia also ships a number of supplemental libraries and tools that can be combined with Helia API implementations to accomplish tasks in distributed and trustless ways.

These libraries are not intended to be the "one true implementation" of any given API, but are made available for users to include depending on the need of their particular application:

- [./packages/unixfs](./packages/unixfs) The `@helia/unixfs` module
- [./packages/car](./packages/car) The `@helia/car` module
- [./packages/dag-cbor](./packages/dag-cbor) The `@helia/dag-cbor` module
- [./packages/dag-json](./packages/dag-json) The `@helia/dag-json` module
- [./packages/ipns](./packages/ipns) The `@helia/ipns` module
- [./packages/json](./packages/json) The `@helia/json` module
- [./packages/mfs](./packages/mfs) The `@helia/mfs` module
- [./packages/ipns](./packages/ipns) `@helia/ipns`
- [./packages/car](./packages/car) `@helia/car`
- [./packages/strings](./packages/strings) `@helia/strings`
- [./packages/json](./packages/json) `@helia/json`
- [./packages/dag-json](./packages/dag-json) `@helia/dag-json`
- [./packages/dag-cbor](./packages/dag-cbor) `@helia/dag-cbor`
- [./packages/strings](./packages/strings) The `@helia/strings` module
- [./packages/unixfs](./packages/unixfs) The `@helia/unixfs` module

An interface suite ensures everything is compatible:
An interop suite ensures everything is compatible:

- [`/packages/interop`](./packages/interop) Interop tests for Helia

## Other modules

There are several other modules available outside this repo:

- [`@helia/verified-fetch`](https://github.com/ipfs/helia-verified-fetch) A [fetch](https://developer.mozilla.org/en-US/docs/Web/API/Fetch_API)-like API for retrieving trustless, verified content from the distributed web
- [`@helia/delegated-routing-v1-http-api`](https://github.com/ipfs/helia-delegated-routing-v1-http-api) An implementation of the [Delegated Routing v1 HTTP API](https://specs.ipfs.tech/routing/http-routing-v1/) including a server and a client
- [Helia WNFS](https://github.com/shovelers/helia-wnfs) a [WNFS](https://guide.fission.codes/developers/webnative/file-system-wnfs) implementation built on top of Helia
- [`@helia/remote-pinning`](https://github.com/ipfs/helia-remote-pinning) A Helia client for communicating with [IPFS Pinning Services](https://ipfs.github.io/pinning-services-api-spec/)
Expand Down
15 changes: 15 additions & 0 deletions packages/block-brokers/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,20 @@
# Changelog

## [2.0.2](https://github.com/ipfs/helia/compare/block-brokers-v2.0.1...block-brokers-v2.0.2) (2024-02-28)


### Bug Fixes

* update project deps and docs ([77e34fc](https://github.com/ipfs/helia/commit/77e34fc115cbfb82585fd954bcf389ecebf655bc))


### Dependencies

* update libp2p patch versions ([917a1bc](https://github.com/ipfs/helia/commit/917a1bceb9e9b56428a15dc3377a963f06affd12))
* The following workspace dependencies were updated
* dependencies
* @helia/interface bumped from ^4.0.0 to ^4.0.1

## [2.0.1](https://github.com/ipfs/helia/compare/block-brokers-v2.0.0...block-brokers-v2.0.1) (2024-01-31)


Expand Down
2 changes: 2 additions & 0 deletions packages/block-brokers/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
</a>
</p>

# @helia/block-brokers

[![ipfs.tech](https://img.shields.io/badge/project-IPFS-blue.svg?style=flat-square)](https://ipfs.tech)
[![Discuss](https://img.shields.io/discourse/https/discuss.ipfs.tech/posts.svg?style=flat-square)](https://discuss.ipfs.tech)
[![codecov](https://img.shields.io/codecov/c/github/ipfs/helia.svg?style=flat-square)](https://codecov.io/gh/ipfs/helia)
Expand Down
14 changes: 7 additions & 7 deletions packages/block-brokers/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@helia/block-brokers",
"version": "2.0.1",
"version": "2.0.2",
"description": "Block brokers for Helia",
"license": "Apache-2.0 OR MIT",
"homepage": "https://github.com/ipfs/helia/tree/main/packages/block-brokers#readme",
Expand Down Expand Up @@ -53,17 +53,17 @@
"test:electron-main": "aegir test -t electron-main"
},
"dependencies": {
"@helia/interface": "^4.0.0",
"@libp2p/interface": "^1.1.2",
"interface-blockstore": "^5.2.9",
"@helia/interface": "^4.0.1",
"@libp2p/interface": "^1.1.4",
"interface-blockstore": "^5.2.10",
"ipfs-bitswap": "^20.0.2",
"multiformats": "^13.0.1",
"multiformats": "^13.1.0",
"progress-events": "^1.0.0"
},
"devDependencies": {
"@libp2p/logger": "^4.0.5",
"@libp2p/logger": "^4.0.7",
"@types/sinon": "^17.0.3",
"aegir": "^42.2.2",
"aegir": "^42.2.5",
"sinon": "^17.0.1",
"sinon-ts": "^2.0.0"
}
Expand Down
23 changes: 23 additions & 0 deletions packages/car/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,29 @@
* devDependencies
* @helia/unixfs bumped from ^2.0.0 to ^2.0.1

## [3.1.0](https://github.com/ipfs/helia/compare/car-v3.0.0...car-v3.1.0) (2024-02-28)


### Features

* stream car file bytes from @helia/car ([#444](https://github.com/ipfs/helia/issues/444)) ([7c07e11](https://github.com/ipfs/helia/commit/7c07e113d644a1efc32b7fd0c268f5f892256ce9))


### Bug Fixes

* support reading identity cids ([#429](https://github.com/ipfs/helia/issues/429)) ([98308f7](https://github.com/ipfs/helia/commit/98308f77488b8196b2d18f78f05ecd2d37456834))
* update project deps and docs ([77e34fc](https://github.com/ipfs/helia/commit/77e34fc115cbfb82585fd954bcf389ecebf655bc))
* use blockstore interface where possible ([#417](https://github.com/ipfs/helia/issues/417)) ([30c8981](https://github.com/ipfs/helia/commit/30c8981934ffba72d572a7b8b2712ec93b7f4d31))


### Dependencies

* The following workspace dependencies were updated
* dependencies
* @helia/interface bumped from ^4.0.0 to ^4.0.1
* devDependencies
* @helia/unixfs bumped from ^3.0.0 to ^3.0.1

## [3.0.0](https://github.com/ipfs/helia/compare/car-v2.0.1...car-v3.0.0) (2024-01-24)


Expand Down
15 changes: 15 additions & 0 deletions packages/car/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,21 @@
# About

<!--
!IMPORTANT!
Everything in this README between "# About" and "# Install" is automatically
generated and will be overwritten the next time the doc generator is run.
To make changes to this section, please update the @packageDocumentation section
of src/index.js or src/index.ts
To experiment with formatting, please run "npm run docs" from the root of this
repo and examine the changes made.
-->

`@helia/car` provides `import` and `export` methods to read/write Car files to Helia's blockstore.

See the Car interface for all available operations.
Expand Down
18 changes: 9 additions & 9 deletions packages/car/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@helia/car",
"version": "3.0.0",
"version": "3.1.0",
"description": "Import/export car files from Helia",
"license": "Apache-2.0 OR MIT",
"homepage": "https://github.com/ipfs/helia/tree/main/packages/car#readme",
Expand Down Expand Up @@ -139,22 +139,22 @@
"release": "aegir release"
},
"dependencies": {
"@helia/interface": "^4.0.0",
"@ipld/car": "^5.2.6",
"@helia/interface": "^4.0.1",
"@ipld/car": "^5.3.0",
"@libp2p/interfaces": "^3.3.2",
"interface-blockstore": "^5.2.9",
"interface-blockstore": "^5.2.10",
"it-drain": "^3.0.5",
"it-map": "^3.0.5",
"multiformats": "^13.0.1",
"multiformats": "^13.1.0",
"p-defer": "^4.0.0",
"p-queue": "^8.0.1",
"progress-events": "^1.0.0"
},
"devDependencies": {
"@helia/unixfs": "^3.0.0",
"@ipld/dag-pb": "^4.0.8",
"aegir": "^42.2.2",
"blockstore-core": "^4.3.10",
"@helia/unixfs": "^3.0.1",
"@ipld/dag-pb": "^4.1.0",
"aegir": "^42.2.5",
"blockstore-core": "^4.4.0",
"ipfs-unixfs-importer": "^15.2.4",
"it-to-buffer": "^4.0.5"
}
Expand Down
Loading

0 comments on commit 8c42ec5

Please sign in to comment.