Skip to content

feat: use HTTP principal resolver #564

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alanshaw merged 4 commits into from
Dec 3, 2025
Merged

feat: use HTTP principal resolver #564

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
871118e
feat: use HTTP principal resolver
alanshaw Nov 28, 2025
a2be103
chore: appease linter
alanshaw Nov 28, 2025
7297e2b
chore: update principal resolver dep
alanshaw Dec 2, 2025
19d7d91
chore: update filecoin-api dep
alanshaw Dec 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 24 additions & 9 deletions pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion pnpm-workspace.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,11 @@ catalog:
"@storacha/capabilities": ^1.12.0
"@storacha/client": ^1.8.17
"@storacha/did-mailto": ^1.0.2
"@storacha/filecoin-api": ^1.2.0
"@storacha/filecoin-api": ^1.3.4
"@storacha/filecoin-client": ^1.0.15
"@storacha/indexing-service-client": ^2.6.9
"@storacha/one-webcrypto": ^1.0.1
"@storacha/principal-resolver": ^1.0.0
"@storacha/router": ^1.1.1
"@storacha/upload-api": ^2.8.0-rc.0
"@storacha/upload-client": ^1.3.6
Expand Down
17 changes: 11 additions & 6 deletions upload-api/functions/ucan-invocation-router.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { Config } from 'sst/node/config'
import { API, error, ok } from '@ucanto/core'
import { API } from '@ucanto/core'
import * as Delegation from '@ucanto/core/delegation'
import { CAR, Legacy, Codec } from '@ucanto/transport'
import { DIDResolutionError, Schema } from '@ucanto/validator'
import { Schema } from '@ucanto/validator'
import * as Link from 'multiformats/link'
import { base64 } from 'multiformats/bases/base64'
import * as Sentry from '@sentry/serverless'
Expand All @@ -12,6 +12,7 @@ import * as Proof from '@storacha/client/proof'
import { Client as IndexingServiceClient } from '@storacha/indexing-service-client'
import * as UploadAPI from '@storacha/upload-api'
import * as UCANCaps from '@storacha/capabilities/ucan'
import { HTTPResolver, CacheResolver, MapResolver, TieredResolver } from '@storacha/principal-resolver'
import {
composeCarStoresWithOrderedHas,
createCarStore,
Expand Down Expand Up @@ -514,6 +515,13 @@ export async function ucanInvocationRouter(request) {
}
}

const principalResolver = TieredResolver.create([
MapResolver.create(principalMapping),
CacheResolver.create(
HTTPResolver.create([/^did:web:.*\.storacha\.network$/])
),
])

const server = createUcantoServer(serviceSigner, {
codec,
// @ts-expect-error needs update of upload-api
Expand All @@ -523,10 +531,7 @@ export async function ucanInvocationRouter(request) {
registry: allocationBlobRegistry,
blobsStorage,
blobRetriever,
resolveDIDKey: (did) =>
Schema.did({ method: 'web' }).is(did) && principalMapping[did]
? ok([principalMapping[did]])
: error(new DIDResolutionError(did)),
...principalResolver,
getServiceConnection: () => connection,
// TODO: to be deprecated with `store/*` protocol
storeTable: createStoreTable(AWS_REGION, storeTableName, {
Expand Down
1 change: 1 addition & 0 deletions upload-api/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
"@storacha/did-mailto": "catalog:",
"@storacha/indexing-service-client": "catalog:",
"@storacha/one-webcrypto": "catalog:",
"@storacha/principal-resolver": "catalog:",
"@storacha/router": "catalog:",
"@storacha/upload-api": "catalog:",
"@ucanto/client": "catalog:",
Expand Down