@sillsdev/docu-notion 0.13.3 → 0.13.4

package/dist/MakeImagePersistencePlan.d.ts

@@ -1,2 +1,3 @@
 import { ImageSet } from "./images";
 export declare function makeImagePersistencePlan(imageSet: ImageSet, imageOutputRootPath: string, imagePrefix: string): void;
+export declare function hashOfString(s: string): number;

package/dist/MakeImagePersistencePlan.js

@@ -23,21 +23,21 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeImagePersistencePlan = void 0;
+exports.hashOfString = exports.makeImagePersistencePlan = void 0;
 const Path = __importStar(require("path"));
 const log_1 = require("./log");
 const process_1 = require("process");
 function makeImagePersistencePlan(imageSet, imageOutputRootPath, imagePrefix) {
-    var _a;
+    var _a, _b;
     if ((_a = imageSet.fileType) === null || _a === void 0 ? void 0 : _a.ext) {
         // Since most images come from pasting screenshots, there isn't normally a filename. That's fine, we just make a hash of the url
         // Images that are stored by notion come to us with a complex url that changes over time, so we pick out the UUID that doesn't change. Example:
         //    https://s3.us-west-2.amazonaws.com/secure.notion-static.com/d1058f46-4d2f-4292-8388-4ad393383439/Untitled.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Content-Sha256=UNSIGNED-PAYLOAD&X-Amz-Credential=AKIAT73L2G45EIPT3X45%2F20220516%2Fus-west-2%2Fs3%2Faws4_request&X-Amz-Date=20220516T233630Z&X-Amz-Expires=3600&X-Amz-Signature=f215704094fcc884d37073b0b108cf6d1c9da9b7d57a898da38bc30c30b4c4b5&X-Amz-SignedHeaders=host&x-id=GetObject
-        let thingToHash = imageSet.primaryUrl;
-        const m = /.*secure\.notion-static\.com\/(.*)\//gm.exec(imageSet.primaryUrl);
-        if (m && m.length > 1) {
-            thingToHash = m[1];
-        }
+        // But around Sept 2023, they changed the url to be something like:
+        //    https://prod-files-secure.s3.us-west-2.amazonaws.com/d9a2b712-cf69-4bd6-9d65-87a4ceeacca2/d1bcdc8c-b065-4e40-9a11-392aabeb220e/Untitled.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Content-Sha256=UNSIGNED-PAYLOAD&X-Amz-Credential=AKIAT73L2G45EIPT3X45%2F20230915%2Fus-west-2%2Fs3%2Faws4_request&X-Amz-Date=20230915T161258Z&X-Amz-Expires=3600&X-Amz-Signature=28fca48e65fba86d539c3c4b7676fce1fa0857aa194f7b33dd4a468ecca6ab24&X-Amz-SignedHeaders=host&x-id=GetObject
+        // The thing we want is the last UUID before the ?
+        const urlBeforeQuery = imageSet.primaryUrl.split("?")[0];
+        const thingToHash = (_b = findLastUuid(urlBeforeQuery)) !== null && _b !== void 0 ? _b : urlBeforeQuery;
         const hash = hashOfString(thingToHash);
         imageSet.outputFileName = `${hash}.${imageSet.fileType.ext}`;
         imageSet.primaryFileOutputPath = Path.posix.join((imageOutputRootPath === null || imageOutputRootPath === void 0 ? void 0 : imageOutputRootPath.length) > 0
@@ -58,9 +58,18 @@ function makeImagePersistencePlan(imageSet, imageOutputRootPath, imagePrefix) {
     }
 }
 exports.makeImagePersistencePlan = makeImagePersistencePlan;
+function findLastUuid(url) {
+    // Regex for a UUID surrounded by slashes
+    const uuidPattern = /(?<=\/)[0-9a-f]{8}-[0-9a-f]{4}-[0-5][0-9a-f]{3}-[089ab][0-9a-f]{3}-[0-9a-f]{12}(?=\/)/gi;
+    // Find all UUIDs
+    const uuids = url.match(uuidPattern);
+    // Return the last UUID if any exist, else return null
+    return uuids ? uuids[uuids.length - 1].trim() : null;
+}
 function hashOfString(s) {
     let hash = 0;
     for (let i = 0; i < s.length; ++i)
         hash = Math.imul(31, hash) + s.charCodeAt(i);
     return Math.abs(hash);
 }
+exports.hashOfString = hashOfString;

package/dist/makeImagePersistencePlan.spec.js

@@ -9,9 +9,10 @@ test("primary file with explicit file output path and prefix", () => {
         fileType: { ext: "png", mime: "image/png" },
     };
     (0, MakeImagePersistencePlan_1.makeImagePersistencePlan)(imageSet, "./static/notion_imgs", "/notion_imgs");
-    expect(imageSet.outputFileName).toBe("463556435.png");
-    expect(imageSet.primaryFileOutputPath).toBe("static/notion_imgs/463556435.png");
-    expect(imageSet.filePathToUseInMarkdown).toBe("/notion_imgs/463556435.png");
+    const expectedHash = (0, MakeImagePersistencePlan_1.hashOfString)("https://s3.us-west-2.amazonaws.com/primaryImage");
+    expect(imageSet.outputFileName).toBe(`${expectedHash}.png`);
+    expect(imageSet.primaryFileOutputPath).toBe(`static/notion_imgs/${expectedHash}.png`);
+    expect(imageSet.filePathToUseInMarkdown).toBe(`/notion_imgs/${expectedHash}.png`);
 });
 test("primary file with defaults for image output path and prefix", () => {
     const imageSet = {
@@ -21,10 +22,31 @@ test("primary file with defaults for image output path and prefix", () => {
         fileType: { ext: "png", mime: "image/png" },
     };
     (0, MakeImagePersistencePlan_1.makeImagePersistencePlan)(imageSet, "", "");
-    expect(imageSet.outputFileName).toBe("463556435.png");
+    const expectedHash = (0, MakeImagePersistencePlan_1.hashOfString)("https://s3.us-west-2.amazonaws.com/primaryImage");
+    expect(imageSet.outputFileName).toBe(`${expectedHash}.png`);
     // the default behavior is to put the image next to the markdown file
-    expect(imageSet.primaryFileOutputPath).toBe("/pathToParentSomewhere/463556435.png");
-    expect(imageSet.filePathToUseInMarkdown).toBe("./463556435.png");
+    expect(imageSet.primaryFileOutputPath).toBe(`/pathToParentSomewhere/${expectedHash}.png`);
+    expect(imageSet.filePathToUseInMarkdown).toBe(`./${expectedHash}.png`);
+});
+test("properly extract UUID from old-style notion image url", () => {
+    const imageSet = {
+        primaryUrl: "https://s3.us-west-2.amazonaws.com/secure.notion-static.com/e1058f46-4d2f-4292-8388-4ad393383439/Untitled.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Content-Sha256=UNSIGNED-PAYLOAD&X-Amz-Credential=AKIAT73L2G45EIPT3X45%2F20220516%2Fus-west-2%2Fs3%2Faws4_request&X-Amz-Date=20220516T233630Z&X-Amz-Expires=3600&X-Amz-Signature=f215704094fcc884d37073b0b108cf6d1c9da9b7d57a898da38bc30c30b4c4b5&X-Amz-SignedHeaders=host&x-id=GetObject",
+        localizedUrls: [],
+        fileType: { ext: "png", mime: "image/png" },
+    };
+    (0, MakeImagePersistencePlan_1.makeImagePersistencePlan)(imageSet, "./static/notion_imgs", "/notion_imgs");
+    const expectedHash = (0, MakeImagePersistencePlan_1.hashOfString)("e1058f46-4d2f-4292-8388-4ad393383439");
+    expect(imageSet.outputFileName).toBe(`${expectedHash}.png`);
+});
+test("properly extract UUID from new-style (Sept 2023) notion image url", () => {
+    const imageSet = {
+        primaryUrl: "https://prod-files-secure.s3.us-west-2.amazonaws.com/d9a2b712-cf69-4bd6-9d65-87a4ceeacca2/d1bcdc8c-b065-4e40-9a11-392aabeb220e/Untitled.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Content-Sha256=UNSIGNED-PAYLOAD&X-Amz-Credential=AKIAT73L2G45EIPT3X45%2F20230915%2Fus-west-2%2Fs3%2Faws4_request&X-Amz-Date=20230915T161258Z&X-Amz-Expires=3600&X-Amz-Signature=28fca48e65fba86d539c3c4b7676fce1fa0857aa194f7b33dd4a468ecca6ab24&X-Amz-SignedHeaders=host&x-id=GetObject",
+        localizedUrls: [],
+        fileType: { ext: "png", mime: "image/png" },
+    };
+    (0, MakeImagePersistencePlan_1.makeImagePersistencePlan)(imageSet, "./static/notion_imgs", "/notion_imgs");
+    const expectedHash = (0, MakeImagePersistencePlan_1.hashOfString)("d1bcdc8c-b065-4e40-9a11-392aabeb220e");
+    expect(imageSet.outputFileName).toBe(`${expectedHash}.png`);
 });
 // In order to make image fallback work with other languages, we have to have
 // a file for each image, in each Docusaurus language directory. This is true

package/package.json

@@ -90,5 +90,5 @@
   "volta": {
     "node": "18.16.0"
   },
-  "version": "0.13.3"
+  "version": "0.13.4"
 }