@podlite/publisher 0.0.43 → 0.0.44

package/CHANGELOG.podlite

@@ -2,6 +2,10 @@
 
 =head1 Upcoming
 
+=head1 0.0.44
+
+=item skip an image whose declared orientation is outside the range a build can read, instead of letting one such file stop the whole site
+
 =head1 0.0.43
 
 =item C<:language> on the index page reaches site data, so a site states the language of its own content

package/esm/images-plugin.d.ts

@@ -1,3 +1,4 @@
 import { PodliteWebPlugin } from '.';
+export declare const readOrientation: (file: string) => number | null;
 declare const plugin: () => PodliteWebPlugin;
 export default plugin;

package/esm/images-plugin.js

@@ -3,6 +3,53 @@ import { ASSETS_PATH, IMAGE_LIB } from './constants';
 import pathMod from 'path';
 import * as fs from 'fs';
 import { getPathToOpen } from './node-utils';
+const ORIENTATION_TAG = 0x0112;
+export const readOrientation = (file) => {
+    let bytes;
+    try {
+        bytes = fs.readFileSync(file);
+    }
+    catch {
+        return null;
+    }
+    if (bytes.length < 4 || bytes.readUInt16BE(0) !== 0xffd8)
+        return null;
+    let at = 2;
+    while (at + 4 <= bytes.length) {
+        if (bytes[at] !== 0xff)
+            return null;
+        const marker = bytes.readUInt16BE(at);
+        const size = bytes.readUInt16BE(at + 2);
+        if (marker === 0xffe1 && bytes.toString('ascii', at + 4, at + 8) === 'Exif') {
+            const tiff = at + 10;
+            if (tiff + 8 > bytes.length)
+                return null;
+            const little = bytes.toString('ascii', tiff, tiff + 2) === 'II';
+            const u16 = (o) => (little ? bytes.readUInt16LE(o) : bytes.readUInt16BE(o));
+            const u32 = (o) => (little ? bytes.readUInt32LE(o) : bytes.readUInt32BE(o));
+            const dir = tiff + u32(tiff + 4);
+            if (dir + 2 > bytes.length)
+                return null;
+            const count = u16(dir);
+            for (let i = 0; i < count; i++) {
+                const entry = dir + 2 + i * 12;
+                if (entry + 12 > bytes.length)
+                    return null;
+                if (u16(entry) === ORIENTATION_TAG)
+                    return u16(entry + 8);
+            }
+            return null;
+        }
+        at += 2 + size;
+    }
+    return null;
+};
+// the build reads the orientation of every image it imports and stops on a value
+// outside 1..8; one such file in a corpus used to cost the whole site
+const isReadable = (file) => {
+    const orientation = readOrientation(file);
+    return orientation === null || (orientation >= 1 && orientation <= 8);
+};
 const plugin = () => {
     const outCtx = {};
     const imagesMap = new Map();
@@ -15,6 +62,10 @@ const plugin = () => {
                 if (!fs.existsSync(key)) {
                     continue;
                 }
+                if (!isReadable(key)) {
+                    console.warn(`image skipped, its orientation is not a value the build can read: ${key}`);
+                    continue;
+                }
                 libFileContent += `import ${variable_name} from "${key}"
 export { ${variable_name} }
     `;

package/esm/images-plugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"images-plugin.js","sourceRoot":"","sources":["../src/images-plugin.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"images-plugin.js","sourceRoot":"","sources":["../src/images-plugin.ts"],"names":[],"mappings":"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"}

package/esm/version.d.ts

@@ -1 +1 @@
-export declare const version = "0.0.43";
+export declare const version = "0.0.44";

package/esm/version.js

@@ -1,3 +1,3 @@
 // generated by scripts/inject-version.mjs — do not edit by hand
-export const version = '0.0.43';
+export const version = '0.0.44';
 //# sourceMappingURL=version.js.map

package/lib/images-plugin.d.ts

@@ -1,3 +1,4 @@
 import { PodliteWebPlugin } from '.';
+export declare const readOrientation: (file: string) => number | null;
 declare const plugin: () => PodliteWebPlugin;
 export default plugin;

package/lib/images-plugin.js

@@ -36,11 +36,60 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.readOrientation = void 0;
 const schema_1 = require("@podlite/schema");
 const constants_1 = require("./constants");
 const path_1 = __importDefault(require("path"));
 const fs = __importStar(require("fs"));
 const node_utils_1 = require("./node-utils");
+const ORIENTATION_TAG = 0x0112;
+const readOrientation = (file) => {
+    let bytes;
+    try {
+        bytes = fs.readFileSync(file);
+    }
+    catch {
+        return null;
+    }
+    if (bytes.length < 4 || bytes.readUInt16BE(0) !== 0xffd8)
+        return null;
+    let at = 2;
+    while (at + 4 <= bytes.length) {
+        if (bytes[at] !== 0xff)
+            return null;
+        const marker = bytes.readUInt16BE(at);
+        const size = bytes.readUInt16BE(at + 2);
+        if (marker === 0xffe1 && bytes.toString('ascii', at + 4, at + 8) === 'Exif') {
+            const tiff = at + 10;
+            if (tiff + 8 > bytes.length)
+                return null;
+            const little = bytes.toString('ascii', tiff, tiff + 2) === 'II';
+            const u16 = (o) => (little ? bytes.readUInt16LE(o) : bytes.readUInt16BE(o));
+            const u32 = (o) => (little ? bytes.readUInt32LE(o) : bytes.readUInt32BE(o));
+            const dir = tiff + u32(tiff + 4);
+            if (dir + 2 > bytes.length)
+                return null;
+            const count = u16(dir);
+            for (let i = 0; i < count; i++) {
+                const entry = dir + 2 + i * 12;
+                if (entry + 12 > bytes.length)
+                    return null;
+                if (u16(entry) === ORIENTATION_TAG)
+                    return u16(entry + 8);
+            }
+            return null;
+        }
+        at += 2 + size;
+    }
+    return null;
+};
+exports.readOrientation = readOrientation;
+// the build reads the orientation of every image it imports and stops on a value
+// outside 1..8; one such file in a corpus used to cost the whole site
+const isReadable = (file) => {
+    const orientation = (0, exports.readOrientation)(file);
+    return orientation === null || (orientation >= 1 && orientation <= 8);
+};
 const plugin = () => {
     const outCtx = {};
     const imagesMap = new Map();
@@ -53,6 +102,10 @@ const plugin = () => {
                 if (!fs.existsSync(key)) {
                     continue;
                 }
+                if (!isReadable(key)) {
+                    console.warn(`image skipped, its orientation is not a value the build can read: ${key}`);
+                    continue;
+                }
                 libFileContent += `import ${variable_name} from "${key}"
 export { ${variable_name} }
     `;

package/lib/version.d.ts

@@ -1 +1 @@
-export declare const version = "0.0.43";
+export declare const version = "0.0.44";

package/lib/version.js

@@ -2,5 +2,5 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.version = void 0;
 // generated by scripts/inject-version.mjs — do not edit by hand
-exports.version = '0.0.43';
+exports.version = '0.0.44';
 //# sourceMappingURL=version.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@podlite/publisher",
-  "version": "0.0.43",
+  "version": "0.0.44",
   "description": "Publishing toolkit for Podlite — transform documents to HTML, generate sites",
   "main": "./lib/index.js",
   "sideEffects": false,
@@ -66,13 +66,13 @@
     "transform"
   ],
   "dependencies": {
-    "@podlite/markdown": "0.0.55",
-    "@podlite/schema": "0.0.62",
+    "@podlite/markdown": "0.0.56",
+    "@podlite/schema": "0.0.63",
     "crc-32": "^1.2.2",
     "gray-matter": "^4.0.3",
     "iso_9": "^1.0.4",
     "newbase60": "^1.3.1",
-    "podlite": "0.0.75"
+    "podlite": "0.0.76"
   },
   "devDependencies": {
     "@types/node": "^17.0.7",