Merge e9d38e1 into 86d5f36

src/storage/FileResourceStore.ts

@@ -249,13 +249,18 @@ export class FileResourceStore implements ResourceStore {
   private async getFileRepresentation(path: string, stats: Stats): Promise<Representation> {
     const readStream = createReadStream(path);
     const contentType = getContentTypeFromExtension(extname(path));
-    let rawMetadata: Quad[] = [];
-    try {
+    const rawMetadataPromise = new Promise<Quad[]>((resolve): void => {
       const readMetadataStream = createReadStream(`${path}.metadata`);
-      rawMetadata = await this.metadataController.generateQuadsFromReadable(readMetadataStream);
-    } catch (_) {
-      // Metadata file doesn't exist so lets keep `rawMetaData` an empty array.
-    }
+      readMetadataStream.on('open', async(): Promise<void> => {
+        resolve(this.metadataController.generateQuadsFromReadable(readMetadataStream));
+      })
+        .on('error', (): void => {
+          // Metadata file doesn't exist so lets keep `rawMetaData` an empty array.
+          resolve([]);
+        });
+    });
+
+    const rawMetadata: Quad[] = await rawMetadataPromise;
     const metadata: RepresentationMetadata = {
       raw: rawMetadata,
       dateTime: stats.mtime,

test/unit/storage/FileResourceStore.test.ts

@@ -205,7 +205,15 @@ describe('A FileResourceStore', (): void => {
     stats.isFile = jest.fn((): any => true);
     (fsPromises.lstat as jest.Mock).mockReturnValueOnce(stats);
     (fs.createReadStream as jest.Mock).mockReturnValueOnce(streamifyArray([ rawData ]));
-    (fs.createReadStream as jest.Mock).mockImplementationOnce((): any => new Error('Metadata file does not exist.'));
+    const readable = streamifyArray([]);
+    readable.on('newListener', (event): void => {
+      if (event === 'open') {
+        setImmediate((): void => {
+          readable.emit('open');
+        });
+      }
+    });
+    (fs.createReadStream as jest.Mock).mockReturnValueOnce(readable);
 
     // Tests
     await store.setRepresentation({ path: `${base}file.txt` }, representation);
@@ -488,7 +496,8 @@ describe('A FileResourceStore', (): void => {
     stats.isFile = jest.fn((): any => true);
     (fsPromises.lstat as jest.Mock).mockReturnValueOnce(stats);
     (fs.createReadStream as jest.Mock).mockReturnValueOnce(streamifyArray([ rawData ]));
-    (fs.createReadStream as jest.Mock).mockImplementationOnce((): any => new Error('Metadata file does not exist.'));
+    (fs.createReadStream as jest.Mock).mockReturnValueOnce(new Readable()
+      .destroy(new Error('Metadata file does not exist.')));
 
     const result = await store.getRepresentation({ path: `${base}.htaccess` });
     expect(result).toEqual({