From 0ca6c73a0fc521d1f6b22f675d94b1c82eacb5e3 Mon Sep 17 00:00:00 2001 From: Irakli Gozalishvili Date: Wed, 8 Mar 2023 09:52:23 -0800 Subject: [PATCH 1/2] fix: incompatibility with w3infra --- packages/upload-api/src/types.ts | 2 +- packages/upload-api/test/car-store-bucket.js | 2 +- packages/upload-api/test/store.js | 2 +- packages/upload-api/test/store.spec.js | 36 ++++++++++++-------- packages/upload-api/test/upload.spec.js | 36 ++++++++++++-------- 5 files changed, 45 insertions(+), 33 deletions(-) diff --git a/packages/upload-api/src/types.ts b/packages/upload-api/src/types.ts index 5c0ba9f1a..c6adcdabf 100644 --- a/packages/upload-api/src/types.ts +++ b/packages/upload-api/src/types.ts @@ -158,7 +158,7 @@ export interface StoreAddOk { with: API.URI<'did:'> link: UnknownLink url?: URL - headers?: Record + headers?: Record } export interface StoreRemoveOk {} diff --git a/packages/upload-api/test/car-store-bucket.js b/packages/upload-api/test/car-store-bucket.js index e694c1b47..e7e070ca9 100644 --- a/packages/upload-api/test/car-store-bucket.js +++ b/packages/upload-api/test/car-store-bucket.js @@ -134,7 +134,7 @@ export class CarStoreBucket { url, headers: { 'x-amz-checksum-sha256': checksum, - 'content-length': String(size), + 'content-length': size, }, } } diff --git a/packages/upload-api/test/store.js b/packages/upload-api/test/store.js index 63d53782a..a381e1393 100644 --- a/packages/upload-api/test/store.js +++ b/packages/upload-api/test/store.js @@ -43,7 +43,7 @@ export const test = { assert.equal(storeAdd.with, spaceDid) assert.deepEqual(storeAdd.link, link) - assert.equal(storeAdd.headers?.['content-length'], String(size)) + assert.equal(storeAdd.headers?.['content-length'], size) assert.deepEqual( storeAdd.headers?.['x-amz-checksum-sha256'], base64pad.baseEncode(link.multihash.digest) diff --git a/packages/upload-api/test/store.spec.js b/packages/upload-api/test/store.spec.js index 1015e743f..56c180250 100644 --- a/packages/upload-api/test/store.spec.js +++ b/packages/upload-api/test/store.spec.js @@ -26,22 +26,28 @@ describe('store/*', () => { const access = AccessVerifier.create({ id }) try { - await test(assert, { - id, - errorReporter: { - catch(error) { - assert.fail(error) - }, + await test( + { + equal: assert.strictEqual, + deepEqual: assert.deepStrictEqual, }, - maxUploadSize: 5_000_000_000, - storeTable, - testStoreTable: storeTable, - uploadTable, - carStoreBucket, - dudewhereBucket, - access, - testSpaceRegistry: access, - }) + { + id, + errorReporter: { + catch(error) { + assert.fail(error) + }, + }, + maxUploadSize: 5_000_000_000, + storeTable, + testStoreTable: storeTable, + uploadTable, + carStoreBucket, + dudewhereBucket, + access, + testSpaceRegistry: access, + } + ) } finally { await carStoreBucket.deactivate() } diff --git a/packages/upload-api/test/upload.spec.js b/packages/upload-api/test/upload.spec.js index 92d0484c7..c4f90e48e 100644 --- a/packages/upload-api/test/upload.spec.js +++ b/packages/upload-api/test/upload.spec.js @@ -26,22 +26,28 @@ describe('upload/*', () => { const access = AccessVerifier.create({ id }) try { - await test(assert, { - id, - errorReporter: { - catch(error) { - assert.fail(error) - }, + await test( + { + equal: assert.strictEqual, + deepEqual: assert.deepStrictEqual, }, - maxUploadSize: 5_000_000_000, - storeTable, - testStoreTable: storeTable, - uploadTable, - carStoreBucket, - dudewhereBucket, - access, - testSpaceRegistry: access, - }) + { + id, + errorReporter: { + catch(error) { + assert.fail(error) + }, + }, + maxUploadSize: 5_000_000_000, + storeTable, + testStoreTable: storeTable, + uploadTable, + carStoreBucket, + dudewhereBucket, + access, + testSpaceRegistry: access, + } + ) } finally { await carStoreBucket.deactivate() } From 07c2e95470a274230884a615b2473ab157a2335d Mon Sep 17 00:00:00 2001 From: Irakli Gozalishvili Date: Wed, 8 Mar 2023 10:00:23 -0800 Subject: [PATCH 2/2] fix: make types more precise --- packages/upload-api/src/types.ts | 10 ++++++++-- packages/upload-api/test/car-store-bucket.js | 2 +- packages/upload-api/test/store.js | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/packages/upload-api/src/types.ts b/packages/upload-api/src/types.ts index c6adcdabf..692b368e5 100644 --- a/packages/upload-api/src/types.ts +++ b/packages/upload-api/src/types.ts @@ -84,7 +84,13 @@ export interface CarStoreBucket { createUploadUrl: ( link: UnknownLink, size: number - ) => Promise<{ url: URL; headers: { 'x-amz-checksum-sha256': string } }> + ) => Promise<{ + url: URL + headers: { + 'x-amz-checksum-sha256': string + 'content-length': string + } & Record + }> } export interface CarStoreBucketOptions { @@ -158,7 +164,7 @@ export interface StoreAddOk { with: API.URI<'did:'> link: UnknownLink url?: URL - headers?: Record + headers?: Record } export interface StoreRemoveOk {} diff --git a/packages/upload-api/test/car-store-bucket.js b/packages/upload-api/test/car-store-bucket.js index e7e070ca9..e694c1b47 100644 --- a/packages/upload-api/test/car-store-bucket.js +++ b/packages/upload-api/test/car-store-bucket.js @@ -134,7 +134,7 @@ export class CarStoreBucket { url, headers: { 'x-amz-checksum-sha256': checksum, - 'content-length': size, + 'content-length': String(size), }, } } diff --git a/packages/upload-api/test/store.js b/packages/upload-api/test/store.js index a381e1393..63d53782a 100644 --- a/packages/upload-api/test/store.js +++ b/packages/upload-api/test/store.js @@ -43,7 +43,7 @@ export const test = { assert.equal(storeAdd.with, spaceDid) assert.deepEqual(storeAdd.link, link) - assert.equal(storeAdd.headers?.['content-length'], size) + assert.equal(storeAdd.headers?.['content-length'], String(size)) assert.deepEqual( storeAdd.headers?.['x-amz-checksum-sha256'], base64pad.baseEncode(link.multihash.digest)