Now setting content-type for assets served in memory for capture.

Author: ashleydavis

package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "capture-template",
-    "version": "1.1.15",
+    "version": "1.1.16",
     "description": "This library is responsible for expanding a template web page and then capturing it PNG or PDF.",
     "main": "build/index.js",
     "types": "build/index.d.ts",
@@ -39,6 +39,7 @@
         "express": "^4.16.4",
         "fs-extra": "^7.0.1",
         "inflate-template": "^1.1.8",
+        "mime-types": "^2.1.26",
         "nightmare": "^3.0.1",
         "promisify-any": "^2.0.1",
         "yargs": "^12.0.5"
@@ -47,6 +48,7 @@
         "@types/chai": "4.0.4",
         "@types/express": "^4.16.1",
         "@types/fs-extra": "^5.0.5",
+        "@types/mime-types": "^2.1.0",
         "@types/mocha": "2.2.43",
         "@types/node": "8.0.28",
         "@types/yargs": "^11.1.2",

package.json

@@ -3,6 +3,7 @@ import * as http from 'http';
 import * as path from "path";
 import { ITemplate } from 'inflate-template';
 import { ILog } from "./index";
+import * as mime from "mime-types";
 
 /**
  * Defines an in-memory file served by the web server.
@@ -96,20 +97,6 @@ export class WebServer implements IWebServer {
         return "http://127.0.0.1:" + this.assignedPortNo;
     }
 
-    //
-    // Load a file from the template, caching it as necesary.
-    //
-    private async loadTemplateFile(template: ITemplate, url: string): Promise<Buffer> {
-        const fileSystemPath = path.join(...url.split('/'));
-        const templateFile = template.find(fileSystemPath);
-        if (!templateFile) {
-            throw new Error("Couldn't find file '" + url + "' in template.");
-        }
-
-        const expandedFileContent = await templateFile.expand();
-        return expandedFileContent;
-    }
-
     /**
      * Start the web-server.
      */
@@ -121,7 +108,19 @@ export class WebServer implements IWebServer {
             app.use("/", async (request, response, next) => {
                 try {
                     const fileName = request.url === "/" ? "index.html" : request.url;
-                    response.send(await this.loadTemplateFile(template, fileName));
+                    const fileSystemPath = path.join(...fileName.split('/'));
+                    const templateFile = template.find(fileSystemPath);
+                    if (!templateFile) {
+                        throw new Error("Couldn't find file '" + fileSystemPath + "' in template.");
+                    }
+            
+                    const fileContent = await templateFile.expand();
+                    const fileExt = path.extname(fileName);
+                    const mimeType = mime.lookup(fileExt);
+                    if (mimeType) {
+                        response.setHeader("content-type", mimeType);
+                    }
+                    response.send(fileContent);
                 }
                 catch (err) {
                     this.error("Error loading template file.");