feat: Use Indexing Service when feature flag is present #132
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| declare module '@storacha/cli/lib.js' { | ||
| import { Client } from '@storacha/client' | ||
| export declare function getClient(): Promise<Client> | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,73 +1,147 @@ | ||
| import sade from 'sade' | ||
| import { getClient } from '@storacha/cli/lib.js' | ||
| import { Space } from '@web3-storage/capabilities' | ||
| import * as serve from '../src/capabilities/serve.js' | ||
| /** | ||
| * @import * as Ucanto from '@ucanto/interface' | ||
| */ | ||
|
|
||
| /** | ||
| * @template {string} Method | ||
| * @param {string} str | ||
| * @param {Method} [method] | ||
| * @returns {str is Ucanto.DID<Method>} | ||
| */ | ||
| const isDID = (str, method) => | ||
| str.startsWith(`did:${method ? `${method}:` : ''}`) | ||
|
There was a problem hiding this comment. You could use ucanto schema for this. import { Schema } from '@ucanto/core'
Schema.did({ method }).is(str)There was a problem hiding this comment. Aha! I couldn't figure out how to get that to work before. Not sure what wasn't clicking, but it all makes sense now. Pushed as |
||
|
|
||
| /** | ||
| * @param {string} str | ||
| * @returns {str is `did:mailto:${string}:${string}`} | ||
| */ | ||
| const isMailtoDID = (str) => /^did:mailto:.*:.*$/.test(str) | ||
|
|
||
| sade('delegate-serve.js [space]') | ||
| .option( | ||
| '--token', | ||
| 'The auth token to use. If not provided, the delegation will not be authenticated.' | ||
| ) | ||
| .option('--accountDID', 'The account DID to use when creating a new space.') | ||
| .option( | ||
| '--gatewayDID', | ||
| 'The gateway DID to use when delegating the space/content/serve capability. Defaults to did:web:staging.w3s.link.' | ||
| ) | ||
| .describe( | ||
| `Delegates ${Space.contentServe.can} to the Gateway for a test space generated by the script, with an optional auth token. Outputs a base64url string suitable for the stub_delegation query parameter.` | ||
| ) | ||
| .action( | ||
| /** | ||
| * @param {string} [space] | ||
| * @param {object} [options] | ||
| * @param {string} [options.token] | ||
| * @param {string} [options.accountDID] | ||
| * @param {string} [options.gatewayDID] | ||
| */ | ||
| async ( | ||
| space, | ||
| { token, accountDID, gatewayDID = 'did:web:staging.w3s.link' } = {} | ||
| ) => { | ||
| const client = await getClient() | ||
|
|
||
| space ??= await createSpace(client, accountDID) | ||
|
|
||
| if (!isDID(space)) { | ||
| throw new Error(`Invalid space DID: ${space}`) | ||
| } | ||
|
|
||
| const proofs = client.proofs([ | ||
| { | ||
| can: Space.contentServe.can, | ||
| with: space, | ||
| }, | ||
| ]) | ||
|
|
||
| if (proofs.length === 0) { | ||
| throw new Error( | ||
| `No proofs found. Are you authorized to ${serve.star.can} ${space}?` | ||
| ) | ||
| } | ||
|
|
||
| if (!isDID(gatewayDID)) { | ||
| throw new Error(`Invalid gateway DID: ${gatewayDID}`) | ||
| } | ||
|
|
||
| const gatewayIdentity = { | ||
| did: () => gatewayDID, | ||
| } | ||
|
|
||
| // NOTE: This type assertion is wrong. It's a hack to let us use this | ||
| // ability. `client.createDelegation` currently only accepts abilities it | ||
| // knows about. That should probably be expanded, but this little script | ||
| // isn't going to be the reason to go change that, as it involves updating | ||
| // multiple packages. | ||
| const ability = /** @type {"*"} */ (Space.contentServe.can) | ||
|
|
||
| const delegation = await client.createDelegation( | ||
| gatewayIdentity, | ||
| [ability], | ||
| { | ||
| expiration: Infinity, | ||
| proofs, | ||
| } | ||
| ) | ||
|
|
||
| await client.capability.access.delegate({ | ||
| delegations: [delegation], | ||
| }) | ||
|
|
||
| const carResult = await delegation.archive() | ||
| if (carResult.error) throw carResult.error | ||
| const base64Url = Buffer.from(carResult.ok).toString('base64url') | ||
| process.stdout.write( | ||
| `Agent Proofs: ${proofs | ||
| .flatMap((p) => p.capabilities) | ||
| .map((c) => `${c.can} with ${c.with}`) | ||
| .join('\n')}\n` | ||
| ) | ||
| process.stdout.write(`Issuer: ${client.agent.issuer.did()}\n`) | ||
| process.stdout.write(`Audience: ${gatewayIdentity.did()}\n`) | ||
| process.stdout.write(`Space: ${space}\n`) | ||
| process.stdout.write(`Token: ${token ?? 'none'}\n`) | ||
| process.stdout.write( | ||
| `Delegation: ${delegation.capabilities | ||
| .map((c) => `${c.can} with ${c.with}`) | ||
| .join('\n')}\n` | ||
| ) | ||
| process.stdout.write( | ||
| `Stubs: stub_space=${space}&stub_delegation=${base64Url}&authToken=${ | ||
| token ?? '' | ||
| }\n` | ||
| ) | ||
| } | ||
| ) | ||
| .parse(process.argv) | ||
|
|
||
| /** | ||
| * @param {import('@storacha/client').Client} client | ||
| * @param {string} [accountDID] | ||
| */ | ||
| async function createSpace(client, accountDID) { | ||
| const provider = client.defaultProvider() | ||
| if (!isDID(provider, 'web')) { | ||
| throw new Error(`Invalid provider DID: ${provider}`) | ||
| } | ||
| if (!accountDID) { | ||
| throw new Error('Must provide an account DID to create a space') | ||
| } | ||
| if (!isMailtoDID(accountDID)) { | ||
| throw new Error(`Invalid account DID: ${accountDID}`) | ||
| } | ||
| const account = client.accounts()[accountDID] | ||
| const newSpace = await client.agent.createSpace('test') | ||
| const provision = await account.provision(newSpace.did(), { provider }) | ||
| if (provision.error) throw provision.error | ||
| await newSpace.save() | ||
| await newSpace.createAuthorization(client.agent) | ||
| return newSpace.did() | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Needs update before merge.