Include size in metadata, and add dx-size header to partner dx-hash

Signed-off-by: Peter Broadhurst <[email protected]>

Author: peterbroadhurst

src/handlers/blobs.ts

@@ -46,11 +46,13 @@ export const storeBlob = async (file: IFile, filePath: string) => {
   const resolvedFilePath = path.join(utils.constants.DATA_DIRECTORY, utils.constants.BLOBS_SUBDIRECTORY, filePath);
   await fs.mkdir(path.parse(resolvedFilePath).dir, { recursive: true });
   let hash = crypto.createHash(utils.constants.TRANSFER_HASH_ALGORITHM);
+  let blobSize = 0;
   const writeStream = createWriteStream(resolvedFilePath);
   const blobHash = await new Promise<string>((resolve, reject) => {
     let hashCalculator = new stream.Transform({
       transform(chunk, _enc, cb) {
         hash.update(chunk);
+        blobSize += chunk.length
         cb(undefined, chunk);
       },
       flush(cb) {
@@ -63,7 +65,7 @@ export const storeBlob = async (file: IFile, filePath: string) => {
     });
     file.readableStream.pipe(hashCalculator).pipe(writeStream);
   });
-  return await upsertMetadata(filePath, blobHash);
+  return await upsertMetadata(filePath, blobHash, blobSize);
 };
 
 export const sendBlob = async (blobPath: string, recipient: string, recipientURL: string, requestID: string | undefined) => {
@@ -132,11 +134,12 @@ export const retreiveMetadata = async (filePath: string) => {
   }
 };
 
-export const upsertMetadata = async (filePath: string, hash: string) => {
+export const upsertMetadata = async (filePath: string, hash: string, size: number) => {
   const resolvedFilePath = path.join(utils.constants.DATA_DIRECTORY, utils.constants.BLOBS_SUBDIRECTORY, filePath + utils.constants.METADATA_SUFFIX);
   await fs.mkdir(path.parse(resolvedFilePath).dir, { recursive: true });
   let metadata: IMetadata = {
     hash,
+    size,
     lastUpdate: new Date().getTime()
   };
   await fs.writeFile(resolvedFilePath, JSON.stringify(metadata));

src/lib/interfaces.ts

@@ -73,6 +73,7 @@ export interface IBlobReceivedEvent {
   sender: string
   path: string
   hash: string
+  size: number
 }
 
 export interface IBlobDeliveredEvent {
@@ -133,5 +134,6 @@ export interface ICertData {
 
 export interface IMetadata {
   hash: string
+  size: number
   lastUpdate: number
 }

src/lib/utils.ts

@@ -43,6 +43,7 @@ export const constants = {
   REST_API_CALL_BLOB_REQUEST_TIMEOUT: 60000,
   MAX_EVENT_QUEUE_SIZE: 1000,
   HASH_HEADER_NAME: 'dx-hash',
+  SIZE_HEADER_NAME: 'dx-size',
   LAST_UPDATE_HEADER_NAME: 'dx-last-update'
 };
 const log = new Logger('utils.ts');

src/routers/api.ts

@@ -157,6 +157,7 @@ router.head('/blobs/*', async (req: Request, res, next) => {
     }
     const metadata = await blobsHandler.retreiveMetadata(blobPath);
     res.setHeader(utils.constants.HASH_HEADER_NAME, metadata.hash);
+    res.setHeader(utils.constants.SIZE_HEADER_NAME, metadata.size);
     res.setHeader(utils.constants.LAST_UPDATE_HEADER_NAME, metadata.lastUpdate);
     res.status(204).send();
   } catch (err) {
@@ -172,6 +173,7 @@ router.get('/blobs/*', async (req: Request, res, next) => {
     }
     const metadata = await blobsHandler.retreiveMetadata(blobPath);
     res.setHeader(utils.constants.HASH_HEADER_NAME, metadata.hash);
+    res.setHeader(utils.constants.SIZE_HEADER_NAME, metadata.size);
     res.setHeader(utils.constants.LAST_UPDATE_HEADER_NAME, metadata.lastUpdate);
     const blobStream = await blobsHandler.retreiveBlob(blobPath);
     blobStream.on('end', () => res.end());

src/routers/p2p.ts

@@ -58,6 +58,7 @@ router.put('/blobs/*', async (req: Request, res, next) => {
       sender,
       path: blobPath,
       hash: metadata.hash,
+      size: metadata.size,
       lastUpdate: metadata.lastUpdate
     } as IBlobReceivedEvent);
   } catch (err) {