@realfavicongenerator/check-favicon 0.4.5 → 0.4.7

package/dist/desktop/desktop.d.ts

@@ -1,6 +1,6 @@
 import { CheckerMessage, DesktopFaviconReport, Fetcher } from "../types";
 import { HTMLElement } from 'node-html-parser';
-export declare const PngFaviconFileSize = 48;
+export declare const PngFaviconFileSize = 96;
 export declare const checkSvgFavicon: (baseUrl: string, head: HTMLElement | null, fetcher?: Fetcher) => Promise<CheckerMessage[]>;
 export declare const checkSvgFaviconFile: (baseUrl: string, url: string, fetcher: Fetcher) => Promise<CheckerMessage[]>;
 export declare const checkPngFavicon: (baseUrl: string, head: HTMLElement | null, fetcher?: Fetcher) => Promise<DesktopFaviconReport>;

package/dist/desktop/desktop.js

@@ -17,7 +17,7 @@ const types_1 = require("../types");
 const sharp_1 = __importDefault(require("sharp"));
 const helper_1 = require("../helper");
 const ico_1 = require("./ico");
-exports.PngFaviconFileSize = 48;
+exports.PngFaviconFileSize = 96;
 const checkSvgFavicon = (baseUrl_1, head_1, ...args_1) => __awaiter(void 0, [baseUrl_1, head_1, ...args_1], void 0, function* (baseUrl, head, fetcher = helper_1.fetchFetcher) {
     const messages = [];
     if (!head) {
@@ -133,7 +133,7 @@ const checkPngFavicon = (baseUrl_2, head_2, ...args_2) => __awaiter(void 0, [bas
         if (sizedIconMarkup.length === 0) {
             messages.push({
                 status: types_1.CheckerStatus.Error,
-                id: types_1.MessageId.no48x48DesktopPngFavicon,
+                id: types_1.MessageId.no96x96DesktopPngFavicon,
                 text: `There is no ${size} desktop PNG favicon`
             });
         }

package/dist/desktop/desktop.test.js

@@ -73,6 +73,21 @@ test('checkSvgFavicon - svgFaviconDeclared & svgFaviconCannotGet', () => __await
         }
     });
 }));
+// For https://github.com/RealFaviconGenerator/core/issues/2
+test('checkSvgFavicon - Protocol-relative URL', () => __awaiter(void 0, void 0, void 0, function* () {
+    yield runSvgTest(`<link rel="icon" type="image/svg+xml" href="//example.com/the-icon.svg" />`, [{
+            status: types_1.CheckerStatus.Ok,
+            id: types_1.MessageId.svgFaviconDeclared,
+        }, {
+            status: types_1.CheckerStatus.Error,
+            id: types_1.MessageId.svgFaviconCannotGet,
+        }], {
+        'https://example.com/the-icon.svg': {
+            status: 403,
+            contentType: 'image/svg+xml'
+        }
+    });
+}));
 test('checkSvgFavicon - svgFaviconDeclared & svgFaviconDownloadable & svgFaviconSquare', () => __awaiter(void 0, void 0, void 0, function* () {
     const testIconPath = './fixtures/happy-face.svg';
     const serpIcon = yield (0, helper_1.filePathToString)(testIconPath);
@@ -104,11 +119,13 @@ const runPngTest = (headFragment_2, output_2, ...args_2) => __awaiter(void 0, [h
 const testIcon16 = './fixtures/16x16.png';
 const testIcon32 = './fixtures/32x32.png';
 const testIcon48 = './fixtures/48x48.png';
+const testIcon96 = './fixtures/96x96.png';
 test('checkSvgFavicon - Three PNG icons with different sizes', () => __awaiter(void 0, void 0, void 0, function* () {
     yield runPngTest(`
     <link rel="icon" type="image/png" sizes="16x16" href="/favicon/favicon-16x16.png">
     <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: types_1.CheckerStatus.Ok,
             id: types_1.MessageId.desktopPngFaviconDeclared,
@@ -133,6 +150,11 @@ test('checkSvgFavicon - Three PNG icons with different sizes', () => __awaiter(v
             status: 200,
             contentType: 'image/png',
             readableStream: yield (0, helper_1.filePathToReadableStream)(testIcon48),
+        },
+        'https://example.com/favicon/favicon-96x96.png': {
+            status: 200,
+            contentType: 'image/png',
+            readableStream: yield (0, helper_1.filePathToReadableStream)(testIcon96),
         }
     });
 }));

package/dist/helper.js

@@ -145,8 +145,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 {

package/dist/helper.test.js

@@ -112,6 +112,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/types.d.ts

@@ -25,7 +25,7 @@ export declare enum MessageId {
     icoFaviconMissingSizes = 18,
     icoFaviconExpectedSizes = 19,
     noDesktopPngFavicon = 20,
-    no48x48DesktopPngFavicon = 21,
+    no96x96DesktopPngFavicon = 21,
     desktopPngFaviconDeclared = 22,
     noDesktopPngFaviconHref = 23,
     desktopPngFaviconCannotGet = 24,

package/dist/types.js

@@ -30,7 +30,7 @@ var MessageId;
     MessageId[MessageId["icoFaviconMissingSizes"] = 18] = "icoFaviconMissingSizes";
     MessageId[MessageId["icoFaviconExpectedSizes"] = 19] = "icoFaviconExpectedSizes";
     MessageId[MessageId["noDesktopPngFavicon"] = 20] = "noDesktopPngFavicon";
-    MessageId[MessageId["no48x48DesktopPngFavicon"] = 21] = "no48x48DesktopPngFavicon";
+    MessageId[MessageId["no96x96DesktopPngFavicon"] = 21] = "no96x96DesktopPngFavicon";
     MessageId[MessageId["desktopPngFaviconDeclared"] = 22] = "desktopPngFaviconDeclared";
     MessageId[MessageId["noDesktopPngFaviconHref"] = 23] = "noDesktopPngFaviconHref";
     MessageId[MessageId["desktopPngFaviconCannotGet"] = 24] = "desktopPngFaviconCannotGet";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@realfavicongenerator/check-favicon",
-  "version": "0.4.5",
+  "version": "0.4.7",
   "description": "Check the favicon of a website",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -38,6 +38,5 @@
     "decode-ico": "^0.4.1",
     "node-html-parser": "^6.1.13",
     "sharp": "^0.32.6"
-  },
-  "gitHead": "ff517731a374ff42747e65aa036b064d1a1f1aa1"
+  }
 }

package/src/desktop/desktop.test.ts

@@ -76,6 +76,22 @@ test('checkSvgFavicon - svgFaviconDeclared & svgFaviconCannotGet', async () => {
   });
 })
 
+// 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" />`, [{
+    status: CheckerStatus.Ok,
+    id: MessageId.svgFaviconDeclared,
+  }, {
+    status: CheckerStatus.Error,
+    id: MessageId.svgFaviconCannotGet,
+  }], {
+    'https://example.com/the-icon.svg': {
+      status: 403,
+      contentType: 'image/svg+xml'
+    }
+  });
+})
+
 test('checkSvgFavicon - svgFaviconDeclared & svgFaviconDownloadable & svgFaviconSquare', async () => {
   const testIconPath = './fixtures/happy-face.svg';
 
@@ -114,12 +130,14 @@ const runPngTest = async (
 const testIcon16 = './fixtures/16x16.png';
 const testIcon32 = './fixtures/32x32.png';
 const testIcon48 = './fixtures/48x48.png';
+const testIcon96 = './fixtures/96x96.png';
 
 test('checkSvgFavicon - Three PNG icons with different sizes', async () => {
   await runPngTest(`
     <link rel="icon" type="image/png" sizes="16x16" href="/favicon/favicon-16x16.png">
     <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,
@@ -145,6 +163,11 @@ test('checkSvgFavicon - Three PNG icons with different sizes', async () => {
       status: 200,
       contentType: 'image/png',
       readableStream: await filePathToReadableStream(testIcon48),
+    },
+    'https://example.com/favicon/favicon-96x96.png': {
+      status: 200,
+      contentType: 'image/png',
+      readableStream: await filePathToReadableStream(testIcon96),
     }
   });
 })

package/src/desktop/desktop.ts

@@ -4,7 +4,7 @@ import sharp from 'sharp'
 import { CheckIconProcessor, checkIcon, fetchFetcher, mergeUrlAndPath, readableStreamToString } from "../helper";
 import { checkIcoFavicon } from "./ico";
 
-export const PngFaviconFileSize = 48;
+export const PngFaviconFileSize = 96;
 
 export const checkSvgFavicon = async (baseUrl: string, head: HTMLElement | null, fetcher: Fetcher = fetchFetcher): Promise<CheckerMessage[]> => {
   const messages: CheckerMessage[] = [];
@@ -128,7 +128,7 @@ export const checkPngFavicon = async (baseUrl: string, head: HTMLElement | null,
     if (sizedIconMarkup.length === 0) {
       messages.push({
         status: CheckerStatus.Error,
-        id: MessageId.no48x48DesktopPngFavicon,
+        id: MessageId.no96x96DesktopPngFavicon,
         text: `There is no ${size} desktop PNG favicon`
       });
     } else {

package/src/helper.test.ts

@@ -117,6 +117,11 @@ test('mergeUrlAndPath', () => {
   expect(mergeUrlAndPath('https://example.com/sub-page', 'some/path')).toBe('https://example.com/sub-page/some/path');
 
   expect(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(mergeUrlAndPath('https://example.com', '//elsewhere.com/some-path')).toBe('https://elsewhere.com/some-path');
+  expect(mergeUrlAndPath('http://example.com', '//elsewhere.com/some-other/path')).toBe('http://elsewhere.com/some-other/path');
 })
 
 test('parseSizesAttribute', () => {

package/src/helper.ts

@@ -156,8 +156,11 @@ export const mergeUrlAndPath = (baseUrl: string, absoluteOrRelativePath: string)
 
   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 {
     // Otherwise, append the path to the existing pathname

package/src/types.ts

@@ -30,7 +30,7 @@ export enum MessageId {
   icoFaviconExpectedSizes,
 
   noDesktopPngFavicon,
-  no48x48DesktopPngFavicon,
+  no96x96DesktopPngFavicon,
   desktopPngFaviconDeclared,
   noDesktopPngFaviconHref,
   desktopPngFaviconCannotGet,

package/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2024 RealFaviconGenerator
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.