@adminforth/markdown 1.4.0 → 1.6.0

package/build.log

@@ -10,5 +10,5 @@ custom/package-lock.json
 custom/package.json
 custom/tsconfig.json
 
-sent 25,820 bytes  received 115 bytes  51,870.00 bytes/sec
-total size is 25,388  speedup is 0.98
+sent 29,778 bytes  received 115 bytes  59,786.00 bytes/sec
+total size is 29,346  speedup is 0.98

package/custom/MarkdownEditor.vue

@@ -240,6 +240,8 @@ let removePasteListener: (() => void) | null = null;
 let removePasteListenerSecondary: (() => void) | null = null;
 let removeGlobalPasteListener: (() => void) | null = null;
 let removeGlobalKeydownListener: (() => void) | null = null;
+let removeDragOverListener: (() => void) | null = null;
+let removeDropListener: (() => void) | null = null;
 
 type MarkdownImageRef = {
   lineNumber: number;
@@ -387,6 +389,62 @@ function fileFromClipboardImage(blob: Blob): File {
   return new File([blob], filename, { type });
 }
 
+function escapeMarkdownLinkText(text: string): string {
+  return text.replace(/[\[\]\\]/g, '\\$&');
+}
+
+function showAdminforthError(message: string) {
+  const api = (window as any).adminforth;
+  if (api && typeof api.alert === 'function') {
+    api.alert({
+      message,
+      variant: 'danger',
+      timeout: 30,
+    });
+    return;
+  }
+  console.error('[adminforth-markdown]', message);
+}
+
+function extractErrorMessage(error: any): string {
+  if (!error) return 'Upload failed';
+  if (typeof error === 'string') return error;
+  if (typeof error?.error === 'string') return error.error;
+  if (typeof error?.message === 'string') return error.message;
+  try {
+    return JSON.stringify(error);
+  } catch {
+    return 'Upload failed';
+  }
+}
+
+function markdownForUploadedFile(file: File, url: string): string {
+  if (file.type?.startsWith('image/')) {
+    return `![](${url})`;
+  }
+
+  if (file.type?.startsWith('video/')) {
+    const mediaType = file.type || 'video/mp4';
+    return `<video width="400">\n<!-- For gif-like videos use: <video width="400" autoplay loop muted playsinline> -->\n  <source src="${url}" type="${mediaType}">\n</video>`;
+  }
+
+  // alert that file cant be uploaded
+  showAdminforthError(`Uploaded file "${file.name}" is not an image or video and cannot be embedded. It has been uploaded and can be accessed at: ${url}`);
+}
+
+async function uploadFileAndGetMarkdownTag(file: File): Promise<string | undefined> {
+  try {
+    const url = await uploadFileToS3(file);
+    if (!url) return;
+    return markdownForUploadedFile(file, url);
+  } catch (error) {
+    const message = extractErrorMessage(error);
+    showAdminforthError(message);
+    console.error('[adminforth-markdown] upload failed', error);
+    return;
+  }
+}
+
 onMounted(async () => {
   if (!editorContainer.value) return;
   try {
@@ -433,6 +491,59 @@ onMounted(async () => {
       const noopPaste = () => {};
       domNode.addEventListener('paste', noopPaste, true);
       removePasteListener = () => domNode.removeEventListener('paste', noopPaste, true);
+
+      const onDragOver = (e: DragEvent) => {
+        if (!e.dataTransfer) return;
+        if (!Array.from(e.dataTransfer.types).includes('Files')) return;
+        e.preventDefault();
+        e.dataTransfer.dropEffect = 'copy';
+      };
+
+      const onDrop = async (e: DragEvent) => {
+        const dt = e.dataTransfer;
+        if (!dt) return;
+        if (!dt.files || !dt.files.length) return;
+
+        e.preventDefault();
+        e.stopPropagation();
+
+        if (!editor) return;
+        editor.focus();
+
+        const target = editor.getTargetAtClientPoint(e.clientX, e.clientY);
+        const dropPosition = target?.position || target?.range?.getStartPosition?.();
+        if (dropPosition) {
+          editor.setPosition(dropPosition);
+          editor.setSelection(new monaco.Selection(
+            dropPosition.lineNumber,
+            dropPosition.column,
+            dropPosition.lineNumber,
+            dropPosition.column,
+          ));
+        }
+
+        if (!props.meta?.uploadPluginInstanceId) {
+          const msg = 'uploadPluginInstanceId is missing; cannot upload dropped file.';
+          showAdminforthError(msg);
+          console.error('[adminforth-markdown]', msg);
+          return;
+        }
+
+        const markdownTags: string[] = [];
+        for (const file of Array.from(dt.files)) {
+          const tag = await uploadFileAndGetMarkdownTag(file);
+          if (tag) markdownTags.push(tag);
+        }
+
+        if (markdownTags.length) {
+          insertAtCursor(`${markdownTags.join('\n\n')}\n`);
+        }
+      };
+
+      domNode.addEventListener('dragover', onDragOver, true);
+      domNode.addEventListener('drop', onDrop, true);
+      removeDragOverListener = () => domNode.removeEventListener('dragover', onDragOver, true);
+      removeDropListener = () => domNode.removeEventListener('drop', onDrop, true);
     }
     if (editorContainer.value) {
       const noopPaste = () => {};
@@ -496,15 +607,9 @@ onMounted(async () => {
         const markdownTags: string[] = [];
         for (const blob of imageBlobs) {
           const file = blob instanceof File ? blob : fileFromClipboardImage(blob);
-          try {
-            const url = await uploadFileToS3(file);
-            debug('upload result', { url });
-            if (typeof url === 'string' && url.length) {
-              markdownTags.push(`![](${url})`);
-            }
-          } catch (err) {
-            console.error('[adminforth-markdown] upload failed', err);
-          }
+          const tag = await uploadFileAndGetMarkdownTag(file);
+          if (!tag) continue;
+          markdownTags.push(tag);
         }
 
         if (markdownTags.length) {
@@ -570,7 +675,7 @@ async function uploadFileToS3(file: File): Promise<string | undefined> {
   const originalFilename = file.name.split('.').slice(0, -1).join('.');
   const originalExtension = file.name.split('.').pop();
 
-  const { uploadUrl, tagline, previewUrl, s3Path, error } = await callAdminForthApi({
+  const { uploadUrl, tagline, previewUrl, error } = await callAdminForthApi({
     path: `/plugin/${props.meta.uploadPluginInstanceId}/get_file_upload_url`,
     method: 'POST',
     body: {
@@ -582,8 +687,13 @@ async function uploadFileToS3(file: File): Promise<string | undefined> {
   });
 
   if (error) {
-    console.error('Upload failed:', error);
-    return;
+    const message = extractErrorMessage(error);
+    if (/too\s*large|max\s*file\s*size|size\s*limit|limit\s*reached|exceed/i.test(message)) {
+      showAdminforthError(message);
+    } else {
+      showAdminforthError(message);
+    }
+    throw new Error(message);
   }
 
   const xhr = new XMLHttpRequest();
@@ -597,12 +707,16 @@ async function uploadFileToS3(file: File): Promise<string | undefined> {
       if (xhr.status === 200) {
         resolve(previewUrl as string);
       } else {
-        reject('Error uploading to S3');
+        const message = `Error uploading to S3 (status ${xhr.status})`;
+        showAdminforthError(message);
+        reject(message);
       }
     };
 
     xhr.onerror = () => {
-      reject('Error uploading to S3');
+      const message = 'Error uploading to S3';
+      showAdminforthError(message);
+      reject(message);
     };
   });
 }
@@ -627,6 +741,12 @@ onBeforeUnmount(() => {
   removeGlobalKeydownListener?.();
   removeGlobalKeydownListener = null;
 
+  removeDragOverListener?.();
+  removeDragOverListener = null;
+
+  removeDropListener?.();
+  removeDropListener = null;
+
   for (const d of disposables) d.dispose();
   disposables.length = 0;
 

package/dist/custom/MarkdownEditor.vue

@@ -240,6 +240,8 @@ let removePasteListener: (() => void) | null = null;
 let removePasteListenerSecondary: (() => void) | null = null;
 let removeGlobalPasteListener: (() => void) | null = null;
 let removeGlobalKeydownListener: (() => void) | null = null;
+let removeDragOverListener: (() => void) | null = null;
+let removeDropListener: (() => void) | null = null;
 
 type MarkdownImageRef = {
   lineNumber: number;
@@ -387,6 +389,62 @@ function fileFromClipboardImage(blob: Blob): File {
   return new File([blob], filename, { type });
 }
 
+function escapeMarkdownLinkText(text: string): string {
+  return text.replace(/[\[\]\\]/g, '\\$&');
+}
+
+function showAdminforthError(message: string) {
+  const api = (window as any).adminforth;
+  if (api && typeof api.alert === 'function') {
+    api.alert({
+      message,
+      variant: 'danger',
+      timeout: 30,
+    });
+    return;
+  }
+  console.error('[adminforth-markdown]', message);
+}
+
+function extractErrorMessage(error: any): string {
+  if (!error) return 'Upload failed';
+  if (typeof error === 'string') return error;
+  if (typeof error?.error === 'string') return error.error;
+  if (typeof error?.message === 'string') return error.message;
+  try {
+    return JSON.stringify(error);
+  } catch {
+    return 'Upload failed';
+  }
+}
+
+function markdownForUploadedFile(file: File, url: string): string {
+  if (file.type?.startsWith('image/')) {
+    return `![](${url})`;
+  }
+
+  if (file.type?.startsWith('video/')) {
+    const mediaType = file.type || 'video/mp4';
+    return `<video width="400">\n<!-- For gif-like videos use: <video width="400" autoplay loop muted playsinline> -->\n  <source src="${url}" type="${mediaType}">\n</video>`;
+  }
+
+  // alert that file cant be uploaded
+  showAdminforthError(`Uploaded file "${file.name}" is not an image or video and cannot be embedded. It has been uploaded and can be accessed at: ${url}`);
+}
+
+async function uploadFileAndGetMarkdownTag(file: File): Promise<string | undefined> {
+  try {
+    const url = await uploadFileToS3(file);
+    if (!url) return;
+    return markdownForUploadedFile(file, url);
+  } catch (error) {
+    const message = extractErrorMessage(error);
+    showAdminforthError(message);
+    console.error('[adminforth-markdown] upload failed', error);
+    return;
+  }
+}
+
 onMounted(async () => {
   if (!editorContainer.value) return;
   try {
@@ -433,6 +491,59 @@ onMounted(async () => {
       const noopPaste = () => {};
       domNode.addEventListener('paste', noopPaste, true);
       removePasteListener = () => domNode.removeEventListener('paste', noopPaste, true);
+
+      const onDragOver = (e: DragEvent) => {
+        if (!e.dataTransfer) return;
+        if (!Array.from(e.dataTransfer.types).includes('Files')) return;
+        e.preventDefault();
+        e.dataTransfer.dropEffect = 'copy';
+      };
+
+      const onDrop = async (e: DragEvent) => {
+        const dt = e.dataTransfer;
+        if (!dt) return;
+        if (!dt.files || !dt.files.length) return;
+
+        e.preventDefault();
+        e.stopPropagation();
+
+        if (!editor) return;
+        editor.focus();
+
+        const target = editor.getTargetAtClientPoint(e.clientX, e.clientY);
+        const dropPosition = target?.position || target?.range?.getStartPosition?.();
+        if (dropPosition) {
+          editor.setPosition(dropPosition);
+          editor.setSelection(new monaco.Selection(
+            dropPosition.lineNumber,
+            dropPosition.column,
+            dropPosition.lineNumber,
+            dropPosition.column,
+          ));
+        }
+
+        if (!props.meta?.uploadPluginInstanceId) {
+          const msg = 'uploadPluginInstanceId is missing; cannot upload dropped file.';
+          showAdminforthError(msg);
+          console.error('[adminforth-markdown]', msg);
+          return;
+        }
+
+        const markdownTags: string[] = [];
+        for (const file of Array.from(dt.files)) {
+          const tag = await uploadFileAndGetMarkdownTag(file);
+          if (tag) markdownTags.push(tag);
+        }
+
+        if (markdownTags.length) {
+          insertAtCursor(`${markdownTags.join('\n\n')}\n`);
+        }
+      };
+
+      domNode.addEventListener('dragover', onDragOver, true);
+      domNode.addEventListener('drop', onDrop, true);
+      removeDragOverListener = () => domNode.removeEventListener('dragover', onDragOver, true);
+      removeDropListener = () => domNode.removeEventListener('drop', onDrop, true);
     }
     if (editorContainer.value) {
       const noopPaste = () => {};
@@ -496,15 +607,9 @@ onMounted(async () => {
         const markdownTags: string[] = [];
         for (const blob of imageBlobs) {
           const file = blob instanceof File ? blob : fileFromClipboardImage(blob);
-          try {
-            const url = await uploadFileToS3(file);
-            debug('upload result', { url });
-            if (typeof url === 'string' && url.length) {
-              markdownTags.push(`![](${url})`);
-            }
-          } catch (err) {
-            console.error('[adminforth-markdown] upload failed', err);
-          }
+          const tag = await uploadFileAndGetMarkdownTag(file);
+          if (!tag) continue;
+          markdownTags.push(tag);
         }
 
         if (markdownTags.length) {
@@ -570,7 +675,7 @@ async function uploadFileToS3(file: File): Promise<string | undefined> {
   const originalFilename = file.name.split('.').slice(0, -1).join('.');
   const originalExtension = file.name.split('.').pop();
 
-  const { uploadUrl, tagline, previewUrl, s3Path, error } = await callAdminForthApi({
+  const { uploadUrl, tagline, previewUrl, error } = await callAdminForthApi({
     path: `/plugin/${props.meta.uploadPluginInstanceId}/get_file_upload_url`,
     method: 'POST',
     body: {
@@ -582,8 +687,13 @@ async function uploadFileToS3(file: File): Promise<string | undefined> {
   });
 
   if (error) {
-    console.error('Upload failed:', error);
-    return;
+    const message = extractErrorMessage(error);
+    if (/too\s*large|max\s*file\s*size|size\s*limit|limit\s*reached|exceed/i.test(message)) {
+      showAdminforthError(message);
+    } else {
+      showAdminforthError(message);
+    }
+    throw new Error(message);
   }
 
   const xhr = new XMLHttpRequest();
@@ -597,12 +707,16 @@ async function uploadFileToS3(file: File): Promise<string | undefined> {
       if (xhr.status === 200) {
         resolve(previewUrl as string);
       } else {
-        reject('Error uploading to S3');
+        const message = `Error uploading to S3 (status ${xhr.status})`;
+        showAdminforthError(message);
+        reject(message);
       }
     };
 
     xhr.onerror = () => {
-      reject('Error uploading to S3');
+      const message = 'Error uploading to S3';
+      showAdminforthError(message);
+      reject(message);
     };
   });
 }
@@ -627,6 +741,12 @@ onBeforeUnmount(() => {
   removeGlobalKeydownListener?.();
   removeGlobalKeydownListener = null;
 
+  removeDragOverListener?.();
+  removeDragOverListener = null;
+
+  removeDropListener?.();
+  removeDropListener = null;
+
   for (const d of disposables) d.dispose();
   disposables.length = 0;
 

package/dist/index.js

@@ -17,6 +17,14 @@ export default class MarkdownPlugin extends AdminForthPlugin {
     instanceUniqueRepresentation(pluginOptions) {
         return pluginOptions.fieldName;
     }
+    // Placeholder for future Upload Plugin API integration.
+    // For now, treat all extracted URLs as plugin-owned public URLs.
+    isPluginPublicUrl(_url) {
+        // todo: here we need to check that host name is same as upload plugin, probably create upload plugin endpoint
+        // should handle cases that user might define custom preview url
+        // and that local storage has no host name, here, the fact of luck of hostname might be used as 
+        return true;
+    }
     validateConfigAfterDiscover(adminforth, resourceConfig) {
         this.adminforth = adminforth;
         const column = resourceConfig.columns.find(c => c.name === this.options.fieldName);
@@ -111,31 +119,94 @@ export default class MarkdownPlugin extends AdminForthPlugin {
             };
             const editorRecordPkField = resourceConfig.columns.find(c => c.primaryKey);
             if (this.options.attachments) {
-                const extractKeyFromUrl = (url) => url.replace(/^https:\/\/[^\/]+\/+/, '');
+                const stripQueryAndHash = (value) => value.split('#')[0].split('?')[0];
+                const extractKeyFromUrl = (url) => {
+                    // Supports absolute https/http URLs and protocol-relative URLs.
+                    // Returns the object key as a path without leading slashes.
+                    try {
+                        const normalized = url.startsWith('//') ? `https:${url}` : url;
+                        const u = new URL(normalized);
+                        return u.pathname.replace(/^\/+/, '');
+                    }
+                    catch (_a) {
+                        // Fallback: strip scheme/host if it looks like a URL, otherwise treat as a path.
+                        return stripQueryAndHash(url).replace(/^https?:\/\/[^\/]+\/+/, '').replace(/^\/+/, '');
+                    }
+                };
+                const shouldTrackUrl = (url) => {
+                    try {
+                        return this.isPluginPublicUrl(url);
+                    }
+                    catch (err) {
+                        console.error('Error checking URL ownership', url, err);
+                        return false;
+                    }
+                };
+                const getKeyFromTrackedUrl = (rawUrl) => {
+                    const srcTrimmed = rawUrl.trim().replace(/^<|>$/g, '');
+                    if (!srcTrimmed || srcTrimmed.startsWith('data:') || srcTrimmed.startsWith('javascript:')) {
+                        return null;
+                    }
+                    if (!shouldTrackUrl(srcTrimmed)) {
+                        return null;
+                    }
+                    const srcNoQuery = stripQueryAndHash(srcTrimmed);
+                    const key = extractKeyFromUrl(srcNoQuery);
+                    if (!key) {
+                        return null;
+                    }
+                    return key;
+                };
+                const upsertMeta = (byKey, key, next) => {
+                    var _a, _b;
+                    const existing = byKey.get(key);
+                    if (!existing) {
+                        byKey.set(key, {
+                            key,
+                            alt: (_a = next.alt) !== null && _a !== void 0 ? _a : null,
+                            title: (_b = next.title) !== null && _b !== void 0 ? _b : null,
+                        });
+                        return;
+                    }
+                    if ((existing.alt === null || existing.alt === '') && next.alt !== undefined && next.alt !== null) {
+                        existing.alt = next.alt;
+                    }
+                    if ((existing.title === null || existing.title === '') && next.title !== undefined && next.title !== null) {
+                        existing.title = next.title;
+                    }
+                };
                 function getAttachmentMetas(markdown) {
-                    var _a, _b, _c;
+                    var _a, _b, _c, _d, _e, _f;
                     if (!markdown) {
                         return [];
                     }
-                    // Minimal image syntax: ![alt](src) or ![alt](src "title") or ![alt](src 'title')
-                    // We only track https URLs and only those that look like S3/AWS public URLs.
-                    const imageRegex = /!\[([^\]]*)\]\(\s*(https:\/\/[^\s)]+)\s*(?:\s+(?:"([^"]*)"|'([^']*)'))?\s*\)/g;
+                    // Markdown image syntax: ![alt](src) or ![alt](src "title") or ![alt](src 'title')
+                    const imageRegex = /!\[([^\]]*)\]\(\s*([^\s)]+)\s*(?:\s+(?:\"([^\"]*)\"|'([^']*)'))?\s*\)/g;
+                    // HTML embedded media links.
+                    const htmlSrcRegex = /<(?:source|video)\b[^>]*\bsrc\s*=\s*(?:"([^"]+)"|'([^']+)'|([^\s"'=<>`]+))[^>]*>/gi;
                     const byKey = new Map();
                     for (const match of markdown.matchAll(imageRegex)) {
                         const altRaw = (_a = match[1]) !== null && _a !== void 0 ? _a : '';
                         const srcRaw = match[2];
                         const titleRaw = (_c = ((_b = match[3]) !== null && _b !== void 0 ? _b : match[4])) !== null && _c !== void 0 ? _c : null;
-                        const srcNoQuery = srcRaw.split('?')[0];
-                        if (!srcNoQuery.includes('s3') && !srcNoQuery.includes('amazonaws')) {
+                        const key = getKeyFromTrackedUrl(srcRaw);
+                        if (!key) {
                             continue;
                         }
-                        const key = extractKeyFromUrl(srcNoQuery);
-                        byKey.set(key, {
-                            key,
+                        upsertMeta(byKey, key, {
                             alt: altRaw,
                             title: titleRaw,
                         });
                     }
+                    let srcMatch;
+                    while ((srcMatch = htmlSrcRegex.exec(markdown)) !== null) {
+                        const srcRaw = (_f = (_e = (_d = srcMatch[1]) !== null && _d !== void 0 ? _d : srcMatch[2]) !== null && _e !== void 0 ? _e : srcMatch[3]) !== null && _f !== void 0 ? _f : '';
+                        const key = getKeyFromTrackedUrl(srcRaw);
+                        if (!key) {
+                            continue;
+                        }
+                        upsertMeta(byKey, key, {});
+                    }
                     return [...byKey.values()];
                 }
                 const createAttachmentRecords = (adminforth, options, recordId, metas, adminUser) => __awaiter(this, void 0, void 0, function* () {

package/index.ts

@@ -17,6 +17,15 @@ export default class MarkdownPlugin extends AdminForthPlugin {
     return pluginOptions.fieldName;
   }
 
+  // Placeholder for future Upload Plugin API integration.
+  // For now, treat all extracted URLs as plugin-owned public URLs.
+  isPluginPublicUrl(_url: string): boolean {
+    // todo: here we need to check that host name is same as upload plugin, probably create upload plugin endpoint
+    // should handle cases that user might define custom preview url
+    // and that local storage has no host name, here, the fact of luck of hostname might be used as 
+    return true;
+  }
+
   validateConfigAfterDiscover(adminforth: IAdminForth, resourceConfig: AdminForthResource) {
     this.adminforth = adminforth;
     const column = resourceConfig.columns.find(c => c.name === this.options.fieldName);
@@ -122,16 +131,79 @@ export default class MarkdownPlugin extends AdminForthPlugin {
 
       type AttachmentMeta = { key: string; alt: string | null; title: string | null };
 
-      const extractKeyFromUrl = (url: string) => url.replace(/^https:\/\/[^\/]+\/+/, '');
+      const stripQueryAndHash = (value: string) => value.split('#')[0].split('?')[0];
+
+      const extractKeyFromUrl = (url: string) => {
+        // Supports absolute https/http URLs and protocol-relative URLs.
+        // Returns the object key as a path without leading slashes.
+        try {
+          const normalized = url.startsWith('//') ? `https:${url}` : url;
+          const u = new URL(normalized);
+          return u.pathname.replace(/^\/+/, '');
+        } catch {
+          // Fallback: strip scheme/host if it looks like a URL, otherwise treat as a path.
+          return stripQueryAndHash(url).replace(/^https?:\/\/[^\/]+\/+/, '').replace(/^\/+/, '');
+        }
+      };
+
+      const shouldTrackUrl = (url: string) => {
+        try {
+          return this.isPluginPublicUrl(url);
+        } catch (err) {
+          console.error('Error checking URL ownership', url, err);
+          return false;
+        }
+      };
+
+      const getKeyFromTrackedUrl = (rawUrl: string): string | null => {
+        const srcTrimmed = rawUrl.trim().replace(/^<|>$/g, '');
+        if (!srcTrimmed || srcTrimmed.startsWith('data:') || srcTrimmed.startsWith('javascript:')) {
+          return null;
+        }
+        if (!shouldTrackUrl(srcTrimmed)) {
+          return null;
+        }
+        const srcNoQuery = stripQueryAndHash(srcTrimmed);
+        const key = extractKeyFromUrl(srcNoQuery);
+        if (!key) {
+          return null;
+        }
+        return key;
+      };
+
+      const upsertMeta = (
+        byKey: Map<string, AttachmentMeta>,
+        key: string,
+        next: { alt?: string | null; title?: string | null }
+      ) => {
+        const existing = byKey.get(key);
+        if (!existing) {
+          byKey.set(key, {
+            key,
+            alt: next.alt ?? null,
+            title: next.title ?? null,
+          });
+          return;
+        }
+
+        if ((existing.alt === null || existing.alt === '') && next.alt !== undefined && next.alt !== null) {
+          existing.alt = next.alt;
+        }
+        if ((existing.title === null || existing.title === '') && next.title !== undefined && next.title !== null) {
+          existing.title = next.title;
+        }
+      };
 
       function getAttachmentMetas(markdown: string): AttachmentMeta[] {
         if (!markdown) {
           return [];
         }
 
-        // Minimal image syntax: ![alt](src) or ![alt](src "title") or ![alt](src 'title')
-        // We only track https URLs and only those that look like S3/AWS public URLs.
-        const imageRegex = /!\[([^\]]*)\]\(\s*(https:\/\/[^\s)]+)\s*(?:\s+(?:"([^"]*)"|'([^']*)'))?\s*\)/g;
+        // Markdown image syntax: ![alt](src) or ![alt](src "title") or ![alt](src 'title')
+        const imageRegex = /!\[([^\]]*)\]\(\s*([^\s)]+)\s*(?:\s+(?:\"([^\"]*)\"|'([^']*)'))?\s*\)/g;
+
+        // HTML embedded media links.
+        const htmlSrcRegex = /<(?:source|video)\b[^>]*\bsrc\s*=\s*(?:"([^"]+)"|'([^']+)'|([^\s"'=<>`]+))[^>]*>/gi;
 
         const byKey = new Map<string, AttachmentMeta>();
         for (const match of markdown.matchAll(imageRegex)) {
@@ -139,18 +211,26 @@ export default class MarkdownPlugin extends AdminForthPlugin {
           const srcRaw = match[2];
           const titleRaw = (match[3] ?? match[4]) ?? null;
 
-          const srcNoQuery = srcRaw.split('?')[0];
-          if (!srcNoQuery.includes('s3') && !srcNoQuery.includes('amazonaws')) {
+          const key = getKeyFromTrackedUrl(srcRaw);
+          if (!key) {
             continue;
           }
-
-          const key = extractKeyFromUrl(srcNoQuery);
-          byKey.set(key, {
-            key,
+          upsertMeta(byKey, key, {
             alt: altRaw,
             title: titleRaw,
           });
         }
+
+        let srcMatch: RegExpExecArray | null;
+        while ((srcMatch = htmlSrcRegex.exec(markdown)) !== null) {
+          const srcRaw = srcMatch[1] ?? srcMatch[2] ?? srcMatch[3] ?? '';
+          const key = getKeyFromTrackedUrl(srcRaw);
+          if (!key) {
+            continue;
+          }
+          upsertMeta(byKey, key, {});
+        }
+
         return [...byKey.values()];
       }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adminforth/markdown",
-  "version": "1.4.0",
+  "version": "1.6.0",
   "description": "Markdown plugin for adminforth",
   "type": "module",
   "main": "dist/index.js",