@realfavicongenerator/check-favicon 0.4.6 → 0.4.8

package/dist/helper.js

@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fetchFetcher = exports.bufferToDataUrl = exports.parseSizesAttribute = exports.mergeUrlAndPath = exports.checkIcon = exports.pathToMimeType = exports.readableStreamToBuffer = exports.readableStreamToString = exports.stringToReadableStream = exports.filePathToString = exports.filePathToReadableStream = void 0;
+exports.fetchFetcher = exports.filePathToDataUrl = exports.bufferToDataUrl = exports.parseSizesAttribute = exports.mergeUrlAndPath = exports.checkIcon = exports.pathToMimeType = exports.readableStreamToBuffer = exports.readableStreamToString = exports.stringToReadableStream = exports.filePathToString = exports.filePathToReadableStream = void 0;
 const promises_1 = __importDefault(require("fs/promises"));
 const sharp_1 = __importDefault(require("sharp"));
 const filePathToReadableStream = (path) => __awaiter(void 0, void 0, void 0, function* () {
@@ -35,9 +35,11 @@ const filePathToString = (path) => __awaiter(void 0, void 0, void 0, function* (
 });
 exports.filePathToString = filePathToString;
 const stringToReadableStream = (str) => {
+    const encoder = new TextEncoder();
+    const uint8Array = encoder.encode(str);
     return new ReadableStream({
         start(controller) {
-            controller.enqueue(str);
+            controller.enqueue(uint8Array);
             controller.close();
         }
     });
@@ -114,13 +116,13 @@ const checkIcon = (iconUrl, processor, fetcher, mimeType, expectedWidthHeight) =
     }
     else if (res.readableStream) {
         processor.downloadable();
-        const content = yield (0, exports.readableStreamToBuffer)(res.readableStream);
-        const meta = yield (0, sharp_1.default)(content).metadata();
+        const rawContent = yield (0, exports.readableStreamToBuffer)(res.readableStream);
+        const meta = yield (0, sharp_1.default)(rawContent).metadata();
         const contentType = res.contentType || (0, exports.pathToMimeType)(iconUrl);
+        const content = yield (0, exports.bufferToDataUrl)(rawContent, contentType);
         if (meta.width && meta.height) {
             if (meta.width !== meta.height) {
                 processor.notSquare(meta.width, meta.height);
-                return null;
             }
             else {
                 processor.square(meta.width);
@@ -134,9 +136,19 @@ const checkIcon = (iconUrl, processor, fetcher, mimeType, expectedWidthHeight) =
                 }
             }
         }
-        return (0, exports.bufferToDataUrl)(content, contentType);
+        return {
+            content,
+            url: iconUrl,
+            width: meta.width || null,
+            height: meta.height || null
+        };
     }
-    return null;
+    return {
+        content: null,
+        url: iconUrl,
+        width: null,
+        height: null
+    };
 });
 exports.checkIcon = checkIcon;
 const mergeUrlAndPath = (baseUrl, absoluteOrRelativePath) => {
@@ -145,8 +157,12 @@ const mergeUrlAndPath = (baseUrl, absoluteOrRelativePath) => {
         return absoluteOrRelativePath;
     }
     const url = new URL(baseUrl);
-    // If the path starts with a slash, replace the pathname
-    if (absoluteOrRelativePath.startsWith('/')) {
+    // Protocol-relative URL
+    if (absoluteOrRelativePath.startsWith('//')) {
+        return `${url.protocol}${absoluteOrRelativePath}`;
+    }
+    else if (absoluteOrRelativePath.startsWith('/')) {
+        // If the path starts with a slash, replace the pathname
         return `${url.origin}${absoluteOrRelativePath}`;
     }
     else {
@@ -173,6 +189,13 @@ const bufferToDataUrl = (buffer, mimeType) => {
     return `data:${mimeType};base64,${buffer.toString('base64')}`;
 };
 exports.bufferToDataUrl = bufferToDataUrl;
+const filePathToDataUrl = (filePath) => __awaiter(void 0, void 0, void 0, function* () {
+    const readStream = yield (0, exports.filePathToReadableStream)(filePath);
+    const rawContent = yield (0, exports.readableStreamToBuffer)(readStream);
+    const contentType = (0, exports.pathToMimeType)(filePath);
+    return (0, exports.bufferToDataUrl)(rawContent, contentType);
+});
+exports.filePathToDataUrl = filePathToDataUrl;
 const fetchFetcher = (url, contentType) => __awaiter(void 0, void 0, void 0, function* () {
     const res = yield fetch(url, {
         headers: {

package/dist/helper.test.js

@@ -34,7 +34,12 @@ test('checkIcon - noHref', () => __awaiter(void 0, void 0, void 0, function* ()
 }));
 test('checkIcon - icon404', () => __awaiter(void 0, void 0, void 0, function* () {
     const processor = getTestProcessor();
-    expect(yield (0, helper_1.checkIcon)('/does-not-exist.png', processor.processor, (0, test_helper_1.testFetcher)({}), 'image/png')).toBeNull();
+    expect(yield (0, helper_1.checkIcon)('/does-not-exist.png', processor.processor, (0, test_helper_1.testFetcher)({}), 'image/png')).toEqual({
+        content: null,
+        url: '/does-not-exist.png',
+        width: null,
+        height: null
+    });
     expect(processor.messages).toEqual(['icon404']);
 }));
 test('checkIcon - icon404', () => __awaiter(void 0, void 0, void 0, function* () {
@@ -44,7 +49,12 @@ test('checkIcon - icon404', () => __awaiter(void 0, void 0, void 0, function* ()
             contentType: 'image/png',
             status: 500
         }
-    }), 'image/png')).toBeNull();
+    }), 'image/png')).toEqual({
+        content: null,
+        url: '/bad-icon.png',
+        width: null,
+        height: null
+    });
     expect(processor.messages).toEqual(['cannotGet 500']);
 }));
 test('checkIcon - downloadable & square', () => __awaiter(void 0, void 0, void 0, function* () {
@@ -99,7 +109,12 @@ test('checkIcon - downloadable & notSquare', () => __awaiter(void 0, void 0, voi
             contentType: 'image/png',
             readableStream: yield (0, helper_1.filePathToReadableStream)(nonSquareIcon)
         }
-    }), 'image/png', 500)).toBeNull();
+    }), 'image/png', 500)).toEqual({
+        content: yield (0, helper_1.filePathToDataUrl)(nonSquareIcon),
+        url: '/non-square-icon.png',
+        width: 240,
+        height: 180
+    });
     expect(processor.messages).toEqual([
         'downloadable',
         'notSquare 240x180'
@@ -112,6 +127,10 @@ test('mergeUrlAndPath', () => {
     expect((0, helper_1.mergeUrlAndPath)('https://example.com/sub-page', '/some-path')).toBe('https://example.com/some-path');
     expect((0, helper_1.mergeUrlAndPath)('https://example.com/sub-page', 'some/path')).toBe('https://example.com/sub-page/some/path');
     expect((0, helper_1.mergeUrlAndPath)('https://example.com', 'https://elsewhere.com/some-path')).toBe('https://elsewhere.com/some-path');
+    // Protocol-relative URL
+    // For https://github.com/RealFaviconGenerator/core/issues/2
+    expect((0, helper_1.mergeUrlAndPath)('https://example.com', '//elsewhere.com/some-path')).toBe('https://elsewhere.com/some-path');
+    expect((0, helper_1.mergeUrlAndPath)('http://example.com', '//elsewhere.com/some-other/path')).toBe('http://elsewhere.com/some-other/path');
 });
 test('parseSizesAttribute', () => {
     expect((0, helper_1.parseSizesAttribute)(null)).toEqual(null);

package/dist/touch-icon.js

@@ -159,7 +159,7 @@ const checkTouchIconIcon = (baseUrl_2, head_2, ...args_2) => __awaiter(void 0, [
         }
     };
     touchIcon = yield (0, helper_1.checkIcon)(touchIconUrl, processor, fetcher, undefined);
-    return { messages, touchIcon };
+    return { messages, touchIcon: touchIcon ? touchIcon.content : null };
 });
 exports.checkTouchIconIcon = checkTouchIconIcon;
 const getDuplicatedSizes = (sizes) => {

package/dist/types.d.ts

@@ -72,7 +72,15 @@ export declare enum MessageId {
     manifestIconNotSquare = 65,
     manifestIconRightSize = 66,
     manifestIconSquare = 67,
-    manifestIconWrongSize = 68
+    manifestIconWrongSize = 68,
+    googleNoRobotsFile = 69,
+    googleRobotsFileFound = 70,
+    googleIcoBlockedByRobots = 71,
+    googleIcoAllowedByRobots = 72,
+    googleSvgIconBlockedByRobots = 73,
+    googleSvgIconAllowedByRobots = 74,
+    googlePngIconBlockedByRobots = 75,
+    googlePngIconAllowedByRobots = 76
 }
 export type CheckerMessage = {
     status: CheckerStatus;
@@ -85,9 +93,24 @@ export type FetchResponse = {
     readableStream?: ReadableStream | null;
 };
 export type Fetcher = (url: string, contentType?: string) => Promise<FetchResponse>;
+export type CheckedIcon = {
+    content: string | null;
+    url: string | null;
+    width: number | null;
+    height: number | null;
+};
+export type DesktopSingleReport = {
+    messages: CheckerMessage[];
+    icon: CheckedIcon | null;
+};
 export type DesktopFaviconReport = {
     messages: CheckerMessage[];
     icon: string | null;
+    icons: {
+        png: CheckedIcon | null;
+        ico: CheckedIcon | null;
+        svg: CheckedIcon | null;
+    };
 };
 export type TouchIconTitleReport = {
     messages: CheckerMessage[];
@@ -111,3 +134,8 @@ export type FaviconReport = {
     webAppManifest: WebAppManifestReport;
 };
 export type TouchIconReport = TouchIconIconReport & TouchIconTitleReport;
+export type GoogleReport = {
+    messages: CheckerMessage[];
+    icon: string | null;
+    icons: CheckedIcon[];
+};

package/dist/types.js

@@ -78,4 +78,12 @@ var MessageId;
     MessageId[MessageId["manifestIconRightSize"] = 66] = "manifestIconRightSize";
     MessageId[MessageId["manifestIconSquare"] = 67] = "manifestIconSquare";
     MessageId[MessageId["manifestIconWrongSize"] = 68] = "manifestIconWrongSize";
+    MessageId[MessageId["googleNoRobotsFile"] = 69] = "googleNoRobotsFile";
+    MessageId[MessageId["googleRobotsFileFound"] = 70] = "googleRobotsFileFound";
+    MessageId[MessageId["googleIcoBlockedByRobots"] = 71] = "googleIcoBlockedByRobots";
+    MessageId[MessageId["googleIcoAllowedByRobots"] = 72] = "googleIcoAllowedByRobots";
+    MessageId[MessageId["googleSvgIconBlockedByRobots"] = 73] = "googleSvgIconBlockedByRobots";
+    MessageId[MessageId["googleSvgIconAllowedByRobots"] = 74] = "googleSvgIconAllowedByRobots";
+    MessageId[MessageId["googlePngIconBlockedByRobots"] = 75] = "googlePngIconBlockedByRobots";
+    MessageId[MessageId["googlePngIconAllowedByRobots"] = 76] = "googlePngIconAllowedByRobots";
 })(MessageId || (exports.MessageId = MessageId = {}));

package/dist/web-app-manifest.js

@@ -257,6 +257,6 @@ const checkWebAppManifestFile = (manifest, baseUrl, fetcher) => __awaiter(void 0
         }
         finally { if (e_1) throw e_1.error; }
     }
-    return { messages, name, shortName, backgroundColor, themeColor, icon };
+    return { messages, name, shortName, backgroundColor, themeColor, icon: icon ? icon.content : null };
 });
 exports.checkWebAppManifestFile = checkWebAppManifestFile;

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@realfavicongenerator/check-favicon",
-  "version": "0.4.6",
+  "version": "0.4.8",
   "description": "Check the favicon of a website",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "scripts": {
-    "test": "jest",
-    "test:watch": "jest --watch",
+    "test": "jest src",
+    "test:watch": "jest src --watch",
     "build": "tsc",
     "prepublishOnly": "npm run build"
   },
@@ -37,7 +37,8 @@
   "dependencies": {
     "decode-ico": "^0.4.1",
     "node-html-parser": "^6.1.13",
+    "robots-parser": "^3.0.1",
     "sharp": "^0.32.6"
   },
-  "gitHead": "f62941a779e6ce1b49ad97bfea8a9eb71e7ceba5"
+  "gitHead": "723c35120dced8dac83b7938c1cf76844d27a535"
 }

package/src/desktop/desktop.test.ts

@@ -1,10 +1,13 @@
 import { parse } from 'node-html-parser'
 import { checkPngFavicon, checkSvgFavicon } from "./desktop";
-import { CheckerMessage, CheckerStatus, FetchResponse, MessageId } from '../types';
-import { filePathToReadableStream, filePathToString, stringToReadableStream } from '../helper';
+import { CheckerMessage, CheckerStatus, DesktopFaviconReport, FetchResponse, MessageId } from '../types';
+import { filePathToDataUrl, filePathToReadableStream, filePathToString, stringToReadableStream } from '../helper';
 import { testFetcher } from '../test-helper';
 
-type TestOutput = Pick<CheckerMessage, 'id' | 'status'>[];
+type TestOutput = {
+  messages: Pick<CheckerMessage, 'id' | 'status'>[];
+  icons: DesktopFaviconReport['icons'];
+}
 
 const runSvgTest = async (
   headFragment: string | null,
@@ -13,62 +16,140 @@ const runSvgTest = async (
 ) => {
   const root = headFragment ? parse(headFragment) : null;
   const result = await checkSvgFavicon('https://example.com/', root, testFetcher(fetchDatabase));
-  const filteredMessages = result.map(m => ({ status: m.status, id: m.id }));
-  expect(filteredMessages).toEqual(output);
+  const filteredMessages = result.messages.map(m => ({ status: m.status, id: m.id }));
+  expect(filteredMessages).toEqual(output.messages);
 }
 
 test('checkSvgFavicon - noHead', async () => {
-  await runSvgTest(null, [{
-    status: CheckerStatus.Error,
-    id: MessageId.noHead,
-  }]);
+  await runSvgTest(null, {
+    messages: [{
+      status: CheckerStatus.Error,
+      id: MessageId.noHead,
+    }],
+    icons: {
+      png: null,
+      ico: null,
+      svg: null,
+    }
+  });
 })
 
 test('checkSvgFavicon - noSvgFavicon', async () => {
-  await runSvgTest(`<title>SOme text</title>`, [{
-    status: CheckerStatus.Error,
-    id: MessageId.noSvgFavicon,
-  }]);
+  await runSvgTest(`<title>Some text</title>`, {
+    messages: [{
+      status: CheckerStatus.Error,
+      id: MessageId.noSvgFavicon,
+    }],
+    icons: {
+      png: null,
+      ico: null,
+      svg: null,
+    }
+  });
 })
 
 test('checkSvgFavicon - multipleSvgFavicons', async () => {
   await runSvgTest(`
   <link rel="icon" type="image/svg+xml" href="/the-icon.svg" />
   <link rel="icon" type="image/svg+xml" href="/another-icon.svg" />
-  `, [{
-    status: CheckerStatus.Error,
-    id: MessageId.multipleSvgFavicons,
-  }]);
+  `, {
+    messages: [{
+      status: CheckerStatus.Error,
+      id: MessageId.multipleSvgFavicons,
+    }], icons: {
+      png: null,
+      ico: null,
+      svg: null,
+    }
+  });
 })
 
 test('checkSvgFavicon - svgFaviconDeclared & noSvgFaviconHref', async () => {
-  await runSvgTest(`<link rel="icon" type="image/svg+xml" />`, [{
-    status: CheckerStatus.Ok,
-    id: MessageId.svgFaviconDeclared,
-  }, {
-    status: CheckerStatus.Error,
-    id: MessageId.noSvgFaviconHref,
-  }]);
+  await runSvgTest(`<link rel="icon" type="image/svg+xml" />`, {
+    messages: [{
+      status: CheckerStatus.Ok,
+      id: MessageId.svgFaviconDeclared,
+    }, {
+      status: CheckerStatus.Error,
+      id: MessageId.noSvgFaviconHref,
+    }],
+    icons: {
+      png: null,
+      ico: null,
+      svg: null,
+    }
+  });
 })
 
 test('checkSvgFavicon - svgFaviconDeclared & svgFavicon404', async () => {
-  await runSvgTest(`<link rel="icon" type="image/svg+xml" href="/the-icon.svg" />`, [{
-    status: CheckerStatus.Ok,
-    id: MessageId.svgFaviconDeclared,
-  }, {
-    status: CheckerStatus.Error,
-    id: MessageId.svgFavicon404,
-  }]);
+  await runSvgTest(`<link rel="icon" type="image/svg+xml" href="/the-icon.svg" />`, {
+    messages: [{
+      status: CheckerStatus.Ok,
+      id: MessageId.svgFaviconDeclared,
+    }, {
+      status: CheckerStatus.Error,
+      id: MessageId.svgFavicon404,
+    }],
+    icons: {
+      png: null,
+      ico: null,
+      svg: {
+        content: null,
+        url: 'https://example.com/the-icon.svg',
+        width: null,
+        height: null,
+      },
+    }
+  });
 })
 
 test('checkSvgFavicon - svgFaviconDeclared & svgFaviconCannotGet', async () => {
-  await runSvgTest(`<link rel="icon" type="image/svg+xml" href="/the-icon.svg" />`, [{
-    status: CheckerStatus.Ok,
-    id: MessageId.svgFaviconDeclared,
+  await runSvgTest(`<link rel="icon" type="image/svg+xml" href="/the-icon.svg" />`, {
+    messages: [{
+      status: CheckerStatus.Ok,
+      id: MessageId.svgFaviconDeclared,
+    }, {
+      status: CheckerStatus.Error,
+      id: MessageId.svgFaviconCannotGet,
+    }],
+    icons: {
+      png: null,
+      ico: null,
+      svg: {
+        content: null,
+        url: 'https://example.com/the-icon.svg',
+        width: null,
+        height: null,
+      },
+    }
+  }, {
+    'https://example.com/the-icon.svg': {
+      status: 403,
+      contentType: 'image/svg+xml'
+    }
+  });
+})
+
+// For https://github.com/RealFaviconGenerator/core/issues/2
+test('checkSvgFavicon - Protocol-relative URL', async () => {
+  await runSvgTest(`<link rel="icon" type="image/svg+xml" href="//example.com/the-icon.svg" />`, {
+    messages: [{
+      status: CheckerStatus.Ok,
+      id: MessageId.svgFaviconDeclared,
+    }, {
+      status: CheckerStatus.Error,
+      id: MessageId.svgFaviconCannotGet,
+    }], icons: {
+      png: null,
+      ico: null,
+      svg: {
+        content: null,
+        url: 'https://example.com/the-icon.svg',
+        width: null,
+        height: null,
+      },
+    }
   }, {
-    status: CheckerStatus.Error,
-    id: MessageId.svgFaviconCannotGet,
-  }], {
     'https://example.com/the-icon.svg': {
       status: 403,
       contentType: 'image/svg+xml'
@@ -81,17 +162,29 @@ test('checkSvgFavicon - svgFaviconDeclared & svgFaviconDownloadable & svgFavicon
 
   const serpIcon = await filePathToString(testIconPath);
 
-  await runSvgTest(`<link rel="icon" type="image/svg+xml" href="/the-icon.svg" />`, [
-    {
-      status: CheckerStatus.Ok,
-      id: MessageId.svgFaviconDeclared,
-    }, {
-      status: CheckerStatus.Ok,
-      id: MessageId.svgFaviconDownloadable,
+  await runSvgTest(`<link rel="icon" type="image/svg+xml" href="/the-icon.svg" />`, {
+    messages: [
+      {
+        status: CheckerStatus.Ok,
+        id: MessageId.svgFaviconDeclared,
+      }, {
+        status: CheckerStatus.Ok,
+        id: MessageId.svgFaviconDownloadable,
+      }, {
+        status: CheckerStatus.Ok,
+        id: MessageId.svgFaviconSquare,
+      }],
+      icons: {
+        png: null,
+        ico: null,
+        svg: {
+          content: await filePathToDataUrl(testIconPath),
+          url: 'https://example.com/the-icon.svg',
+          width: 36,
+          height: 36,
+        },
+      }
     }, {
-      status: CheckerStatus.Ok,
-      id: MessageId.svgFaviconSquare,
-    }], {
     'https://example.com/the-icon.svg': {
       status: 200,
       contentType: 'image/svg+xml',
@@ -108,7 +201,7 @@ const runPngTest = async (
   const root = headFragment ? parse(headFragment) : null;
   const result = await checkPngFavicon('https://example.com/', root, testFetcher(fetchDatabase));
   const filteredMessages = result.messages.map(m => ({ status: m.status, id: m.id }));
-  expect(filteredMessages).toEqual(output);
+  expect(filteredMessages).toEqual(output.messages);
 }
 
 const testIcon16 = './fixtures/16x16.png';
@@ -122,16 +215,27 @@ test('checkSvgFavicon - Three PNG icons with different sizes', async () => {
     <link rel="icon" type="image/png" sizes="32x32" href="/favicon/favicon-32x32.png">
     <link rel="icon" type="image/png" sizes="48x48" href="/favicon/favicon-48x48.png">
     <link rel="icon" type="image/png" sizes="96x96" href="/favicon/favicon-96x96.png">
-  `, [{
-    status: CheckerStatus.Ok,
-    id: MessageId.desktopPngFaviconDeclared,
-  }, {
-    status: CheckerStatus.Ok,
-    id: MessageId.desktopPngFaviconDownloadable,
-  }, {
-    status: CheckerStatus.Ok,
-    id: MessageId.desktopPngFaviconRightSize,
-  }],
+  `, { messages: [{
+      status: CheckerStatus.Ok,
+      id: MessageId.desktopPngFaviconDeclared,
+    }, {
+      status: CheckerStatus.Ok,
+      id: MessageId.desktopPngFaviconDownloadable,
+    }, {
+      status: CheckerStatus.Ok,
+      id: MessageId.desktopPngFaviconRightSize,
+    }],
+    icons: {
+      png: {
+        content: await filePathToDataUrl(testIcon96),
+        url: 'https://example.com/favicon/favicon-96x96.png',
+        width: 96,
+        height: 96,
+      },
+      ico: null,
+      svg: null,
+    }
+  },
   {
     'https://example.com/favicon/favicon-16x16.png': {
       status: 200,

package/src/desktop/desktop.ts

@@ -1,12 +1,12 @@
-import { CheckerMessage, CheckerStatus, DesktopFaviconReport, Fetcher, MessageId } from "../types";
+import { CheckerMessage, CheckerStatus, DesktopFaviconReport, DesktopSingleReport, Fetcher, MessageId } from "../types";
 import { HTMLElement } from 'node-html-parser'
 import sharp from 'sharp'
-import { CheckIconProcessor, checkIcon, fetchFetcher, mergeUrlAndPath, readableStreamToString } from "../helper";
+import { CheckIconProcessor, bufferToDataUrl, checkIcon, fetchFetcher, mergeUrlAndPath, readableStreamToString } from "../helper";
 import { checkIcoFavicon } from "./ico";
 
 export const PngFaviconFileSize = 96;
 
-export const checkSvgFavicon = async (baseUrl: string, head: HTMLElement | null, fetcher: Fetcher = fetchFetcher): Promise<CheckerMessage[]> => {
+export const checkSvgFavicon = async (baseUrl: string, head: HTMLElement | null, fetcher: Fetcher = fetchFetcher): Promise<DesktopSingleReport> => {
   const messages: CheckerMessage[] = [];
 
   if (!head) {
@@ -16,7 +16,10 @@ export const checkSvgFavicon = async (baseUrl: string, head: HTMLElement | null,
       text: 'No <head> element'
     });
 
-    return messages;
+    return {
+      messages,
+      icon: { content: null, url: null, width: null, height: null }
+    };
   }
 
   const svgs = head?.querySelectorAll("link[rel='icon'][type='image/svg+xml']");
@@ -47,20 +50,29 @@ export const checkSvgFavicon = async (baseUrl: string, head: HTMLElement | null,
         text: 'The SVG markup has no href attribute'
       });
     } else {
-      const iconMessages = await checkSvgFaviconFile(baseUrl, href, fetcher)
-      return [ ...messages, ...iconMessages ];
+      const iconReport = await checkSvgFaviconFile(baseUrl, href, fetcher)
+      return {
+        messages: [ ...messages, ...iconReport.messages ],
+        icon: iconReport.icon
+      };
     }
   }
 
-  return messages;
+  return {
+    messages,
+    icon: { content: null, url: null, width: null, height: null }
+  };
 }
 
-export const checkSvgFaviconFile = async (baseUrl: string, url: string, fetcher: Fetcher): Promise<CheckerMessage[]> => {
+export const checkSvgFaviconFile = async (baseUrl: string, url: string, fetcher: Fetcher): Promise<DesktopSingleReport> => {
   const messages: CheckerMessage[] = [];
 
   const svgUrl = mergeUrlAndPath(baseUrl, url);
 
   const res = await fetcher(svgUrl, 'image/svg+xml');
+  let content;
+  let width: number | null = null;
+  let height: number | null = null;
   if (res.status === 404) {
     messages.push({
       status: CheckerStatus.Error,
@@ -80,28 +92,37 @@ export const checkSvgFaviconFile = async (baseUrl: string, url: string, fetcher:
       text: `The SVG favicon is accessible at \`${url}\``
     });
 
-    const content = await readableStreamToString(res.readableStream);
+    content = await readableStreamToString(res.readableStream);
     const meta = await sharp(Buffer.from(content)).metadata();
+    width = meta.width || null;
+    height = meta.height || null;
 
-    if (meta.width !== meta.height) {
+    if (width && height && width !== height) {
       messages.push({
         status: CheckerStatus.Error,
         id: MessageId.svgFaviconNotSquare,
-        text: `The SVG is not square (${meta.width}x${meta.height})`
+        text: `The SVG is not square (${width}x${height})`
       });
     } else {
       messages.push({
         status: CheckerStatus.Ok,
         id: MessageId.svgFaviconSquare,
-        text: `The SVG is square (${meta.width}x${meta.height})`
+        text: `The SVG is square (${width}x${height})`
       });
     }
   }
 
-  return messages;
+  return {
+    messages,
+    icon: {
+      content: content ? await bufferToDataUrl(Buffer.from(content), 'image/svg+xml') : null,
+      url: svgUrl,
+      width, height
+    }
+  };
 }
 
-export const checkPngFavicon = async (baseUrl: string, head: HTMLElement | null, fetcher: Fetcher = fetchFetcher): Promise<DesktopFaviconReport> => {
+export const checkPngFavicon = async (baseUrl: string, head: HTMLElement | null, fetcher: Fetcher = fetchFetcher): Promise<DesktopSingleReport> => {
   const messages: CheckerMessage[] = [];
 
   if (!head) {
@@ -111,7 +132,7 @@ export const checkPngFavicon = async (baseUrl: string, head: HTMLElement | null,
       text: 'No <head> element'
     });
 
-    return { messages, icon: null };
+    return { messages, icon: { content: null, url: null, width: null, height: null } };
   }
 
   const icons = head?.querySelectorAll("link[rel='icon'][type='image/png']");
@@ -193,15 +214,21 @@ export const checkPngFavicon = async (baseUrl: string, head: HTMLElement | null,
     }
   }
 
-  return { messages, icon: null };
+  return { messages, icon: { content: null, url: null, width: null, height: null } };
 }
 
 export const checkDesktopFavicon = async (baseUrl: string, head: HTMLElement | null, fetcher: Fetcher = fetchFetcher): Promise<DesktopFaviconReport> => {
-  const svgMessages = await checkSvgFavicon(baseUrl, head, fetcher);
+  const svgReport = await checkSvgFavicon(baseUrl, head, fetcher);
   const pngReport = await checkPngFavicon(baseUrl, head, fetcher);
   const icoReport = await checkIcoFavicon(baseUrl, head, fetcher);
+
   return {
-    messages: [ ...svgMessages, ...pngReport.messages, ...icoReport ],
-    icon: pngReport.icon
+    messages: [ ...svgReport.messages, ...pngReport.messages, ...icoReport.messages ],
+    icon: pngReport.icon ? pngReport.icon.content : null,
+    icons: {
+      png: pngReport.icon,
+      ico: icoReport.icon,
+      svg: svgReport.icon
+    }
   };
 }