ep_images_extended 1.0.51 → 1.0.62

package/ep.json

@@ -2,6 +2,10 @@
   "parts": [
     {
       "name": "main",
+      "pre": [
+        "ep_font_color/main",
+        "ep_hyperlinked_text/main"
+      ],
       "client_hooks": {
         "postToolbarInit": "ep_images_extended/static/js/toolbar",
         "aceAttribsToClasses" : "ep_images_extended/static/js/clientHooks",

package/index.js

@@ -8,7 +8,6 @@ const url = require('url');
 const fs = require('fs');
 const fsp = fs.promises;
 const { JSDOM } = require('jsdom');
-const log4js = require('log4js');
 const { exec } = require('child_process');
 const util = require('util');
 const execPromise = util.promisify(exec);
@@ -23,7 +22,14 @@ try {
   console.warn('[ep_images_extended] AWS SDK not installed; s3_presigned storage will not work.');
 }
 
-const logger = log4js.getLogger('ep_images_extended');
+// Replaced log4js with lightweight console wrapper to avoid external dependency
+// while preserving same API surface used below.
+const logger = {
+  debug: console.debug.bind(console),
+  info: console.info.bind(console),
+  warn: console.warn.bind(console),
+  error: console.error.bind(console),
+};
 
 // Simple in-memory IP rate limiter
 const _presignRateStore = new Map();

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "ep_images_extended",
   "description": "Insert images inline with text, float them, resize them, and more.",
-  "version": "1.0.51",
+  "version": "1.0.62",
   "author": {
     "name": "DCastelone",
     "url": "https://github.com/dcastelone"

package/static/js/clientHooks.js

@@ -1,6 +1,18 @@
 'use strict';
 // Modified from ep_image_insert 1.0.7 
 
+// Optional helper (shared with ep_docx_html_customizer) that provides a CORS fetch with
+// automatic same-origin proxy fallback.  If the plugin is not present we simply fall back
+// to the native fetch logic.
+let fetchWithCorsProxy;
+try {
+  ({fetchWithCorsProxy} = require('../../../ep_docx_html_customizer/transform_common'));
+} catch (_) { /* helper not available – fallback to plain fetch */ }
+
+if (!fetchWithCorsProxy && typeof window !== 'undefined') {
+  fetchWithCorsProxy = window.fetchWithCorsProxy;
+}
+
 // Simple UUID generator
 function generateUUID() {
   return 'xxxx-xxxx-4xxx-yxxx-xxxx'.replace(/[xy]/g, function(c) {
@@ -1146,9 +1158,19 @@ exports.postAceInit = function (hook, context) {
                 // For HTTP URLs, fetch and convert to PNG
                 else if (imageSrc.startsWith('http')) {
                     // First try to fetch the image
-                    const response = await fetch(imageSrc, { mode: 'cors' });
-                    if (!response.ok) {
-                        throw new Error(`HTTP ${response.status}`);
+                    let response;
+                    try {
+                        if (typeof fetchWithCorsProxy === 'function') {
+                            response = await fetchWithCorsProxy(imageSrc);
+                        } else {
+                            response = await fetch(imageSrc, {mode: 'cors'});
+                            if (!response.ok) throw new Error(`status ${response.status}`);
+                        }
+                    } catch (fetchErr) {
+                        // Remote fetch failed – fall back to copying the URL as plain text
+                        await navigator.clipboard.writeText(imageSrc);
+                        showCopyFeedback(shouldCut ? 'Image URL cut to clipboard (fallback)' : 'Image URL copied to clipboard (fallback)');
+                        return; // Abort PNG-blob path
                     }
                     
                     // Convert the fetched image to a data URL, then to PNG