ep_images_extended 1.0.62 → 1.1.1

package/index.js

@@ -1,7 +1,9 @@
 'use strict';
 // Modified from ep_image_insert 1.0.7 
 const eejs = require('ep_etherpad-lite/node/eejs/');
-const settings = require('ep_etherpad-lite/node/utils/Settings');
+// Compat: Etherpad 2.4 uses ESM for Settings. Support both CJS and ESM.
+const settingsModule = require('ep_etherpad-lite/node/utils/Settings');
+const settings = settingsModule.default || settingsModule;
 const { randomUUID } = require('crypto');
 const path = require('path');
 const url = require('url');
@@ -184,6 +186,9 @@ exports.expressConfigure = (hookName, context) => {
 
   // ADD LOCAL DISK STORAGE UPLOAD ENDPOINT ------------------------------
   // Register the route only if storage.type === 'local'
+  logger.info('[ep_images_extended] storageType at startup:',
+    settings.ep_images_extended?.storage?.type);
+    
   if (settings.ep_images_extended && settings.ep_images_extended.storage && settings.ep_images_extended.storage.type === 'local') {
     // Route: POST /p/:padId/pluginfw/ep_images_extended/upload
     // Accepts multipart/form-data with field "file" and saves it to the

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.62",
+  "version": "1.1.1",
   "author": {
     "name": "DCastelone",
     "url": "https://github.com/dcastelone"

package/settings.js

@@ -2,12 +2,24 @@
 
 'use strict';
 
-exports.loadSettings = (hookName, settings, cb) => {
-  if (!settings.settings.socketIo) {
+exports.loadSettings = (hookName, args, cb) => {
+  // Sync ep_images_extended config into the runtime Settings singleton that other
+  // parts of this plugin import, to avoid workspace/symlink doubletons.
+  try {
+    const settingsModule = require('ep_etherpad-lite/node/utils/Settings');
+    const runtimeSettings = settingsModule.default || settingsModule;
+    if (args && args.settings && args.settings.ep_images_extended) {
+      runtimeSettings.ep_images_extended = args.settings.ep_images_extended;
+    }
+  } catch (e) {
+    console.warn('[ep_images_extended] Failed to sync settings:', e);
+  }
+
+  if (!args.settings || !args.settings.socketIo) {
     console.warn('Please update Etherpad to >=1.8.8');
   } else {
     // Setting maxHttpBufferSize to 10 MiB :)
-    settings.settings.socketIo.maxHttpBufferSize = 100000000;
+    args.settings.socketIo.maxHttpBufferSize = 100000000;
   }
   cb();
 };

package/static/js/clientHooks.js

@@ -1,6 +1,8 @@
 'use strict';
 // Modified from ep_image_insert 1.0.7 
 
+console.log('ep_images_extended version 1.1.1');
+
 // 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.
@@ -892,8 +894,8 @@ exports.postAceInit = function (hook, context) {
                 if (isValid) {
                     evt.preventDefault();
 
-                    // Determine storage strategy (default base64)
-                    const storageType = (clientVars && clientVars.ep_images_extended && clientVars.ep_images_extended.storageType) || 'base64';
+                    // Determine storage strategy (default to s3_presigned)
+                    const storageType = (clientVars && clientVars.ep_images_extended && clientVars.ep_images_extended.storageType) || 's3_presigned';
 
                     // Global cache to avoid re-uploading the same blob within a pad session
                     window.epImageInsertUploadCache = window.epImageInsertUploadCache || {};
@@ -964,8 +966,8 @@ exports.postAceInit = function (hook, context) {
                                 probeImg.onerror = () => insertIntoPad(publicUrl);
                                 probeImg.src = publicUrl;
                             } catch (err) {
-                                console.error('[ep_images_extended paste] S3 upload failed, falling back to base64:', err);
-                                insertAsDataUrl(file);
+                                console.error('[ep_images_extended paste] S3 upload failed and base64 is disabled:', err);
+                                $.gritter.add({ title: errorTitle, text: 'Image upload to S3 failed. Base64 is disabled.', sticky: true, class_name: 'error' });
                             }
                         })();
                     } else {
@@ -996,8 +998,8 @@ exports.postAceInit = function (hook, context) {
                                 probeImg.onerror = () => insertIntoPad(publicUrl);
                                 probeImg.src = publicUrl;
                             } catch (err) {
-                                console.error('[ep_images_extended paste] Server upload failed, falling back to base64:', err);
-                                insertAsDataUrl(file);
+                                console.error('[ep_images_extended paste] Server upload failed and base64 is disabled:', err);
+                                $.gritter.add({ title: errorTitle, text: 'Image upload failed. Base64 is disabled.', sticky: true, class_name: 'error' });
                             }
                         })();
                     }