diff --git a/apps/envited.ascs.digital/__mocks__/file-type.ts b/apps/envited.ascs.digital/__mocks__/file-type.ts index 2afeaa53..27bd343f 100644 --- a/apps/envited.ascs.digital/__mocks__/file-type.ts +++ b/apps/envited.ascs.digital/__mocks__/file-type.ts @@ -1,4 +1,4 @@ export const fileTypeFromBuffer = jest.fn().mockResolvedValue({ ext: 'jpg', - mime: 'image/jpeg' + mime: 'image/jpeg', }) diff --git a/apps/envited.ascs.digital/common/asset/utils.ts b/apps/envited.ascs.digital/common/asset/utils.ts index 23171685..4623fb87 100644 --- a/apps/envited.ascs.digital/common/asset/utils.ts +++ b/apps/envited.ascs.digital/common/asset/utils.ts @@ -147,12 +147,23 @@ export const getPathAndBufferFromFile = _getPathAndBufferFromFile({ export const _getFilenameFromFile = ({ createFilename }: { createFilename: (byteArray: Uint8Array) => Promise }) => - async (path: string, type: string, arrayBuffer: ArrayBuffer): Promise => ({ - cid: await createFilename(new Uint8Array(arrayBuffer)), - path, - type, - arrayBuffer, - }) + async (path: string, type: string, arrayBuffer: ArrayBuffer): Promise => { + console.log('path', path) + console.log('arrayBuffer', arrayBuffer) + console.log('uint8Array', new Uint8Array(arrayBuffer)) + const cid = await createFilename(new Uint8Array(arrayBuffer)) + console.log('cid', cid) + + const blob = new Blob([arrayBuffer], { type }) + const cid2 = await createFilename(blob as any) + console.log('cid2', cid2) + return { + cid, + path, + type, + arrayBuffer, + } + } export const getFilenameFromFile = _getFilenameFromFile({ createFilename, diff --git a/apps/envited.ascs.digital/common/aws/handlers/processAssetUpload/processAssetUpload.ts b/apps/envited.ascs.digital/common/aws/handlers/processAssetUpload/processAssetUpload.ts index 8843eb12..52d40fb6 100644 --- a/apps/envited.ascs.digital/common/aws/handlers/processAssetUpload/processAssetUpload.ts +++ b/apps/envited.ascs.digital/common/aws/handlers/processAssetUpload/processAssetUpload.ts @@ -107,7 +107,6 @@ export const _main = log.info(`Uploading ${path} to IPFS`) return createGroup(metadata.minter).then(async group => { log.info(`Uploading ${path} to IPFS with group ${group}`) - console.log(process.env.PINATA_JWT, process.env.PINATA_GATEWAY, process.env.PINATA_GATEWAY_KEY) const file = await uploadFile({ arrayBuffer, filename: last(split('/', path)) as string, group }) log.info(file) }) diff --git a/apps/envited.ascs.digital/common/ipfs/ipfs.ts b/apps/envited.ascs.digital/common/ipfs/ipfs.ts index 5a224ba5..5f88f521 100644 --- a/apps/envited.ascs.digital/common/ipfs/ipfs.ts +++ b/apps/envited.ascs.digital/common/ipfs/ipfs.ts @@ -35,7 +35,6 @@ export const createGroup = (pinata: PinataSDK) => async (groupName: string) => { const group = await pinata.groups.create({ name: groupName, }) - console.log(group) return group.id } diff --git a/apps/envited.ascs.digital/listener/listener.test.ts b/apps/envited.ascs.digital/listener/listener.test.ts index 5a16b394..12135dda 100644 --- a/apps/envited.ascs.digital/listener/listener.test.ts +++ b/apps/envited.ascs.digital/listener/listener.test.ts @@ -1,7 +1,8 @@ +import { fileTypeFromBuffer } from 'file-type' + import * as SUT from './listener' jest.mock('file-type') -import { fileTypeFromBuffer } from 'file-type' describe('createLocalCopy', () => { beforeEach(() => { @@ -11,11 +12,11 @@ describe('createLocalCopy', () => { it.only('should download a file from IPFS and upload it to S3', async () => { // Setup your mock as needed for specific tests - (fileTypeFromBuffer as jest.Mock).mockResolvedValue({ + ;(fileTypeFromBuffer as jest.Mock).mockResolvedValue({ ext: 'png', - mime: 'image/png' + mime: 'image/png', }) - + const cid = 'CID' const data = 'DATA' const contentType = 'CONTENT_TYPE'