feat: support pre caveat in store/list and upload/list

package.json

@@ -21,21 +21,22 @@
     "@serverless-stack/resources": "^1.18.0",
     "@tsconfig/node16": "^1.0.3",
     "@types/git-rev-sync": "^2.0.0",
-    "@ucanto/core": "^4.0.3",
-    "@ucanto/client": "^4.0.3",
-    "@ucanto/principal": "^4.0.3",
-    "@ucanto/transport": "^4.0.3",
-    "@web3-storage/access": "^9.2.0",
-    "@web3-storage/w3up-client": "^4.0.1",
+    "@ucanto/client": "^4.2.3",
+    "@ucanto/core": "^4.2.3",
+    "@ucanto/principal": "^4.2.3",
+    "@ucanto/transport": "^4.2.3",
     "@web-std/blob": "^3.0.4",
     "@web-std/fetch": "^4.1.0",
+    "@web3-storage/access": "^9.2.0",
+    "@web3-storage/w3up-client": "^4.1.0",
     "ava": "^4.3.3",
     "dotenv": "^16.0.3",
     "git-rev-sync": "^3.0.2",
     "hd-scripts": "^3.0.2",
     "lint-staged": "^13.0.3",
     "p-wait-for": "^5.0.0",
-    "typescript": "^4.9.3"
+    "typescript": "^4.9.3",
+    "multiformats": "^11.0.1"
   },
   "dependencies": {
     "@serverless-stack/node": "^1.18.0",

replicator/package.json

@@ -13,7 +13,7 @@
     "@ipld/car": "^5.0.1",
     "@ipld/dag-pb": "^3.0.0",
     "ava": "^4.3.3",
-    "multiformats": "^10.0.2",
+    "multiformats": "^11.0.0",
     "nanoid": "^4.0.0",
     "testcontainers": "^8.13.0",
     "uint8arrays": "^4.0.2"

satnav/package.json

@@ -11,7 +11,7 @@
     "@sentry/serverless": "^7.22.0",
     "@ipld/car": "^5.0.1",
     "cardex": "^1.0.0",
-    "multiformats": "^10.0.2",
+    "multiformats": "^11.0.1",
     "uint8arrays": "^4.0.2"
   },
   "devDependencies": {

upload-api/package.json

@@ -14,15 +14,15 @@
     "@ipld/dag-ucan": "^3.0.1",
     "@sentry/serverless": "^7.22.0",
     "@serverless-stack/node": "^1.18.2",
-    "@ucanto/client": "^4.0.3",
-    "@ucanto/interface": "^4.0.3",
-    "@ucanto/principal": "^4.0.3",
-    "@ucanto/server": "^4.0.3",
-    "@ucanto/transport": "^4.0.3",
+    "@ucanto/client": "^4.2.3",
+    "@ucanto/interface": "^4.2.3",
+    "@ucanto/principal": "^4.2.3",
+    "@ucanto/server": "^4.2.3",
+    "@ucanto/transport": "^4.2.3",
     "@web-std/fetch": "^4.1.0",
     "@web3-storage/access": "^9.0.0",
     "@web3-storage/capabilities": "^2.0.0",
-    "multiformats": "^10.0.2",
+    "multiformats": "^11.0.1",
     "p-retry": "^5.1.2",
     "uint8arrays": "^4.0.2"
   },

upload-api/service/store/list.js

@@ -17,12 +17,13 @@ export function storeListProvider(context) {
   return Server.provide(
     Store.list,
     async ({ capability }) => {
-      const { cursor, size } = capability.nb
+      const { cursor, size, pre } = capability.nb
       const space = Server.DID.parse(capability.with).did()
 
       return await context.storeTable.list(space, {
         size,
-        cursor
+        cursor,
+        pre
       })
     }
   )

upload-api/service/types.ts

@@ -116,11 +116,14 @@ export interface UploadListItem extends UploadAddResult {
 
 export interface ListOptions {
   size?: number,
-  cursor?: string
+  cursor?: string,
+  pre?: boolean
 }
 
 export interface ListResponse<R> {
   cursor?: string,
+  startCursor?: string,
+  endCursor?: string,
   size: number,
   results: R[]
 }

upload-api/service/upload/list.js

@@ -16,12 +16,13 @@ export function uploadListProvider(context) {
   return Server.provide(
     Upload.list,
     async ({ capability }) => {
-      const { cursor, size } = capability.nb
+      const { cursor, size, pre } = capability.nb
       const space = Server.DID.parse(capability.with).did()
 
       return await context.uploadTable.list(space, {
         size,
-        cursor
+        cursor,
+        pre
       })
   })
 }

upload-api/tables/store.js

@@ -119,20 +119,25 @@ export function createStoreTable (region, tableName, options = {}) {
             AttributeValueList: [{ S: space }],
           },
         },
+        ScanIndexForward: ! options.pre,
         ExclusiveStartKey: exclusiveStartKey,
         AttributesToGet: ['link', 'size', 'origin', 'insertedAt'],
       })
       const response = await dynamoDb.send(cmd)
 
       const results = response.Items?.map(i => toStoreListResult(unmarshall(i))) ?? []
+      const startCursor = results[0] ? results[0].link.toString() : undefined
       // Get cursor of the item where list operation stopped (inclusive).
       // This value can be used to start a new operation to continue listing.
       const lastKey = response.LastEvaluatedKey && unmarshall(response.LastEvaluatedKey)
       const cursor = lastKey ? lastKey.link : undefined
+      const endCursor = cursor
 
       return {
         size: results.length,
         cursor,
+        startCursor,
+        endCursor,
         results
       }
     }

upload-api/tables/upload.js

@@ -143,23 +143,28 @@ export function createUploadTable (region, tableName, options = {}) {
             AttributeValueList: [{ S: space }],
           },
         },
+        ScanIndexForward: ! options.pre,
         ExclusiveStartKey: exclusiveStartKey,
         AttributesToGet: ['space', 'root', 'shards', 'insertedAt', 'updatedAt'],
       })
       const response = await dynamoDb.send(cmd)
 
       /** @type {UploadListItem[]} */
       const results = response.Items?.map(i => toUploadListItem(unmarshall(i))) || []
+      const startCursor = results[0] ? results[0].root.toString() : undefined
 
       // Get cursor of the item where list operation stopped (inclusive).
       // This value can be used to start a new operation to continue listing.
       const lastKey = response.LastEvaluatedKey && unmarshall(response.LastEvaluatedKey)
       const cursor = lastKey ? lastKey.root : undefined
+      const endCursor = cursor
 
       return {
         size: results.length,
-        results,
-        cursor
+        cursor,
+        startCursor,
+        endCursor,
+        results
       }
     },
   }

upload-api/test/helpers/random.js

@@ -1,6 +1,5 @@
 import { webcrypto } from 'crypto'
 import { Blob } from '@web-std/blob'
-
 import { CarWriter } from '@ipld/car'
 import { CID } from 'multiformats/cid'
 import * as raw from 'multiformats/codecs/raw'

upload-api/test/service/ucan-invocation.test.js

@@ -4,6 +4,7 @@ import { GetObjectCommand } from '@aws-sdk/client-s3'
 import * as Signer from '@ucanto/principal/ed25519'
 import { CAR } from '@ucanto/transport'
 import * as UCAN from '@ipld/dag-ucan'
+import * as ucanto from '@ucanto/core';
 
 import { createSpace } from '../helpers/ucanto.js'
 import { createS3, createBucket } from '../helpers/resources.js'
@@ -30,7 +31,7 @@ test('parses ucan invocation request', async t => {
   const can = 'store/add'
 
   const request = await CAR.encode([
-    {
+    await ucanto.delegate({
       issuer: alice,
       audience: uploadService,
       capabilities: [{
@@ -39,7 +40,7 @@ test('parses ucan invocation request', async t => {
         nb
       }],
       proofs: [proof],
-    }
+    })
   ])
 
   // @ts-expect-error different type interface in AWS expected request
@@ -81,7 +82,7 @@ test('persists ucan invocation CAR file', async t => {
   const can = 'store/add'
 
   const request = await CAR.encode([
-    {
+    await ucanto.delegate({
       issuer: alice,
       audience: uploadService,
       capabilities: [{
@@ -90,7 +91,7 @@ test('persists ucan invocation CAR file', async t => {
         nb
       }],
       proofs: [proof],
-    }
+    })
   ])
 
   // @ts-expect-error different type interface in AWS expected request