notion formatter

- Add stream upload functionality to storage drivers\n- Improve ZIP file extraction with better encoding handling\n- Fix attachment ID rendering issues\n- Add AWS S3 upload stream support\n- Update dependencies for better compatibility

apps/server/package.json

@@ -31,6 +31,7 @@
   },
   "dependencies": {
     "@aws-sdk/client-s3": "3.701.0",
+    "@aws-sdk/lib-storage": "^3.701.0",
     "@aws-sdk/s3-request-presigner": "3.701.0",
     "@casl/ability": "^6.7.3",
     "@fastify/cookie": "^11.0.2",

apps/server/src/common/helpers/utils.ts

@@ -1,5 +1,6 @@
 import * as path from 'path';
 import * as bcrypt from 'bcrypt';
+import { sanitize } from 'sanitize-filename-ts';
 
 export const envPath = path.resolve(process.cwd(), '..', '..', '.env');
 
@@ -62,3 +63,8 @@ export function extractDateFromUuid7(uuid7: string) {
 
   return new Date(timestamp);
 }
+
+export function sanitizeFileName(fileName: string): string {
+  const sanitizedFilename = sanitize(fileName).replace(/ /g, '_');
+  return sanitizedFilename.slice(0, 255);
+}

apps/server/src/integrations/export/turndown-utils.ts

@@ -1,5 +1,6 @@
 import * as TurndownService from '@joplin/turndown';
 import * as TurndownPluginGfm from '@joplin/turndown-plugin-gfm';
+import * as path from 'path';
 
 export function turndown(html: string): string {
   const turndownService = new TurndownService({
@@ -23,6 +24,7 @@ export function turndown(html: string): string {
     mathInline,
     mathBlock,
     iframeEmbed,
+    video,
   ]);
   return turndownService.turndown(html).replaceAll('<br>', ' ');
 }
@@ -87,8 +89,12 @@ function preserveDetail(turndownService: TurndownService) {
       }
 
       const detailsContent = Array.from(node.childNodes)
-        .filter(child => child.nodeName !== 'SUMMARY')
-        .map(child => (child.nodeType === 1 ? turndownService.turndown((child as HTMLElement).outerHTML) : child.textContent))
+        .filter((child) => child.nodeName !== 'SUMMARY')
+        .map((child) =>
+          child.nodeType === 1
+            ? turndownService.turndown((child as HTMLElement).outerHTML)
+            : child.textContent,
+        )
         .join('');
 
       return `\n<details>\n${detailSummary}\n\n${detailsContent}\n\n</details>\n`;
@@ -135,3 +141,16 @@ function iframeEmbed(turndownService: TurndownService) {
     },
   });
 }
+
+function video(turndownService: TurndownService) {
+  turndownService.addRule('video', {
+    filter: function (node: HTMLInputElement) {
+      return node.tagName === 'VIDEO';
+    },
+    replacement: function (content: any, node: HTMLInputElement) {
+      const src = node.getAttribute('src') || '';
+      const name = path.basename(src);
+      return '[' + name + '](' + src + ')';
+    },
+  });
+}

apps/server/src/integrations/import/file-task.service.ts

@@ -3,17 +3,33 @@ import * as path from 'path';
 import { jsonToText } from '../../collaboration/collaboration.util';
 import { InjectKysely } from 'nestjs-kysely';
 import { KyselyDB } from '@docmost/db/types/kysely.types';
-import { extractZip, FileTaskStatus } from './file.utils';
+import { cleanUrlString, extractZip, FileTaskStatus } from './file.utils';
 import { StorageService } from '../storage/storage.service';
 import * as tmp from 'tmp-promise';
 import { pipeline } from 'node:stream/promises';
-import { createWriteStream } from 'node:fs';
+import { createReadStream, createWriteStream } from 'node:fs';
 import { ImportService } from './import.service';
 import { promises as fs } from 'fs';
-import { generateSlugId } from '../../common/helpers';
+import {
+  generateSlugId,
+  getMimeType,
+  sanitizeFileName,
+} from '../../common/helpers';
 import { v7 } from 'uuid';
 import { generateJitteredKeyBetween } from 'fractional-indexing-jittered';
 import { FileTask, InsertablePage } from '@docmost/db/types/entity.types';
+import {
+  DOMParser,
+  Node as HDNode,
+  Element as HDElement,
+  Window,
+} from 'happy-dom';
+import { markdownToHtml } from '@docmost/editor-ext';
+import { getAttachmentFolderPath } from '../../core/attachment/attachment.utils';
+import { AttachmentType } from '../../core/attachment/attachment.constants';
+import { getProsemirrorContent } from '../../common/helpers/prosemirror/utils';
+import { not } from 'rxjs/internal/util/not';
+import { notionFormatter } from './import-formatter';
 
 @Injectable()
 export class FileTaskService {
@@ -52,15 +68,17 @@ export class FileTaskService {
     await pipeline(fileStream, createWriteStream(tmpZipPath));
 
     await extractZip(tmpZipPath, tmpExtractDir);
+    console.log('extract here');
 
     // TODO: internal link mentions, backlinks, attachments
     try {
       await this.updateTaskStatus(fileTaskId, FileTaskStatus.Processing);
-
+      // if type == generic
       await this.processGenericImport({ extractDir: tmpExtractDir, fileTask });
       await this.updateTaskStatus(fileTaskId, FileTaskStatus.Success);
     } catch (error) {
       await this.updateTaskStatus(fileTaskId, FileTaskStatus.Failed);
+      console.error(error);
     } finally {
       await cleanupTmpFile();
       await cleanupTmpDir();
@@ -74,6 +92,10 @@ export class FileTaskService {
     const { extractDir, fileTask } = opts;
 
     const allFiles = await this.collectMarkdownAndHtmlFiles(extractDir);
+    const attachmentCandidates =
+      await this.buildAttachmentCandidates(extractDir);
+
+    console.log('attachment count: ', attachmentCandidates.size);
 
     const pagesMap = new Map<
       string,
@@ -95,7 +117,27 @@ export class FileTaskService {
         .split(path.sep)
         .join('/'); // normalize to forward-slashes
       const ext = path.extname(relPath).toLowerCase();
-      const content = await fs.readFile(absPath, 'utf-8');
+      let content = await fs.readFile(absPath, 'utf-8');
+
+      console.log('relative path: ', relPath, ' abs path: ', absPath);
+
+      if (ext.toLowerCase() === '.html' || ext.toLowerCase() === '.md') {
+        // we want to process all inputs as markr
+        if (ext === '.md') {
+          content = await markdownToHtml(content);
+        }
+
+        //content = this.stripAllStyles(content)
+
+        content = await this.rewriteLocalFilesInHtml({
+          html: content,
+          pageRelativePath: relPath,
+          extractDir,
+          pageId: v7(),
+          fileTask,
+          attachmentCandidates,
+        });
+      }
 
       pagesMap.set(relPath, {
         id: v7(),
@@ -159,28 +201,27 @@ export class FileTaskService {
 
     const insertablePages: InsertablePage[] = await Promise.all(
       Array.from(pagesMap.values()).map(async (page) => {
-        const pmState = await this.importService.markdownOrHtmlToProsemirror(
+        const htmlContent = await this.rewriteInternalLinksToMentionHtml(
           page.content,
-          page.fileExtension,
+          page.filePath,
+          filePathToPageMetaMap,
+          fileTask.creatorId,
         );
+
+        const pmState = getProsemirrorContent(
+          await this.importService.processHTML(notionFormatter(htmlContent)),
+        );
+
         const { title, prosemirrorJson } =
           this.importService.extractTitleAndRemoveHeading(pmState);
 
-        /*const rewDoc =
-          await this.importService.convertInternalLinksToMentionsPM(
-            jsonToNode(prosemirrorJson),
-            page.filePath,
-            filePathToPageMetaMap,
-          );*/
-        const proseJson = prosemirrorJson; //rewDoc.toJSON();
-
         return {
           id: page.id,
           slugId: page.slugId,
           title: title || page.name,
-          content: proseJson,
-          textContent: jsonToText(proseJson),
-          ydoc: await this.importService.createYdoc(proseJson),
+          content: prosemirrorJson,
+          textContent: jsonToText(prosemirrorJson),
+          ydoc: await this.importService.createYdoc(prosemirrorJson),
           position: page.position!,
           spaceId: fileTask.spaceId,
           workspaceId: fileTask.workspaceId,
@@ -191,7 +232,347 @@ export class FileTaskService {
       }),
     );
 
-    await this.db.insertInto('pages').values(insertablePages).execute();
+    try {
+      await this.db.insertInto('pages').values(insertablePages).execute();
+      //todo: avoid duplicates
+      // log success
+      // backlinks mapping
+      // handle svg diagram nodes
+    } catch (e) {
+      console.error(e);
+    }
+  }
+
+  async rewriteLocalFilesInHtml(opts: {
+    html: string;
+    pageRelativePath: string;
+    extractDir: string;
+    pageId: string;
+    fileTask: FileTask;
+    attachmentCandidates: Map<string, string>;
+  }): Promise<string> {
+    const {
+      html,
+      pageRelativePath,
+      extractDir,
+      pageId,
+      fileTask,
+      attachmentCandidates,
+    } = opts;
+
+    const window = new Window();
+    const doc = window.document;
+    doc.body.innerHTML = html;
+
+    const tasks: Promise<void>[] = [];
+
+    const processFile = (relPath: string) => {
+      const abs = attachmentCandidates.get(relPath)!;
+      const attachmentId = v7();
+      const ext = path.extname(abs);
+
+      const fileNameWithExt =
+        sanitizeFileName(path.basename(abs, ext)) + ext.toLowerCase();
+
+      const storageFilePath = `${getAttachmentFolderPath(AttachmentType.File, fileTask.workspaceId)}/${attachmentId}/${fileNameWithExt}`;
+
+      const apiFilePath = `/api/files/${attachmentId}/${fileNameWithExt}`;
+
+      tasks.push(
+        (async () => {
+          const fileStream = createReadStream(abs);
+          await this.storageService.uploadStream(storageFilePath, fileStream);
+          const stat = await fs.stat(abs);
+
+          const uploaded = await this.db
+            .insertInto('attachments')
+            .values({
+              id: attachmentId,
+              filePath: storageFilePath,
+              fileName: fileNameWithExt,
+              fileSize: stat.size,
+              mimeType: getMimeType(fileNameWithExt),
+              type: 'file',
+              fileExt: ext,
+              creatorId: fileTask.creatorId,
+              workspaceId: fileTask.workspaceId,
+              pageId,
+              spaceId: fileTask.spaceId,
+            })
+            .returningAll()
+            .execute();
+          console.log(uploaded);
+        })(),
+      );
+
+      return {
+        attachmentId,
+        storageFilePath,
+        apiFilePath,
+        fileNameWithExt,
+        abs,
+      };
+    };
+
+    const pageDir = path.dirname(pageRelativePath);
+
+    for (const img of Array.from(doc.getElementsByTagName('img'))) {
+      const src = cleanUrlString(img.getAttribute('src')) ?? '';
+      if (!src || src.startsWith('http')) continue;
+
+      const relPath = this.resolveRelativeAttachmentPath(
+        src,
+        pageDir,
+        attachmentCandidates,
+      );
+      if (!relPath) continue;
+
+      const { attachmentId, apiFilePath, abs } = processFile(relPath);
+      const stat = await fs.stat(abs);
+
+      const width = img.getAttribute('width') || '100%';
+      const align = img.getAttribute('data-align') || 'center';
+
+      img.setAttribute('src', apiFilePath);
+      img.setAttribute('data-attachment-id', attachmentId);
+      img.setAttribute('data-size', stat.size.toString());
+      img.setAttribute('width', width);
+      img.setAttribute('data-align', align);
+
+      this.unwrapFromParagraph(img);
+    }
+
+    // rewrite <video>
+    for (const vid of Array.from(doc.getElementsByTagName('video'))) {
+      const src = cleanUrlString(vid.getAttribute('src')) ?? '';
+      if (!src || src.startsWith('http')) continue;
+
+      const relPath = this.resolveRelativeAttachmentPath(
+        src,
+        pageDir,
+        attachmentCandidates,
+      );
+      if (!relPath) continue;
+
+      const { attachmentId, apiFilePath, abs } = processFile(relPath);
+      const stat = await fs.stat(abs);
+
+      const width = vid.getAttribute('width') || '100%';
+      const align = vid.getAttribute('data-align') || 'center';
+
+      vid.setAttribute('src', apiFilePath);
+      vid.setAttribute('data-attachment-id', attachmentId);
+      vid.setAttribute('data-size', stat.size.toString());
+      vid.setAttribute('width', width);
+      vid.setAttribute('data-align', align);
+
+      // @ts-ignore
+      this.unwrapFromParagraph(vid);
+    }
+
+    // rewrite other attachments via <a>
+    for (const a of Array.from(doc.getElementsByTagName('a'))) {
+      const href = cleanUrlString(a.getAttribute('href')) ?? '';
+      if (!href || href.startsWith('http')) continue;
+
+      const relPath = this.resolveRelativeAttachmentPath(
+        href,
+        pageDir,
+        attachmentCandidates,
+      );
+      if (!relPath) continue;
+
+      const { attachmentId, apiFilePath, abs } = processFile(relPath);
+      const stat = await fs.stat(abs);
+      const ext = path.extname(relPath).toLowerCase();
+
+      if (ext === '.mp4') {
+        const video = doc.createElement('video');
+        video.setAttribute('src', apiFilePath);
+        video.setAttribute('data-attachment-id', attachmentId);
+        video.setAttribute('data-size', stat.size.toString());
+        video.setAttribute('width', '100%');
+        video.setAttribute('data-align', 'center');
+
+        a.replaceWith(video);
+        // @ts-ignore
+        this.unwrapFromParagraph(video);
+      } else {
+        const div = doc.createElement('div') as HDElement;
+        div.setAttribute('data-type', 'attachment');
+        div.setAttribute('data-attachment-url', apiFilePath);
+        div.setAttribute('data-attachment-name', path.basename(abs));
+        div.setAttribute('data-attachment-mime', getMimeType(abs));
+        div.setAttribute('data-attachment-size', stat.size.toString());
+        div.setAttribute('data-attachment-id', attachmentId);
+
+        a.replaceWith(div);
+        this.unwrapFromParagraph(div);
+      }
+    }
+
+    const attachmentDivs = Array.from(
+      doc.querySelectorAll('div[data-type="attachment"]'),
+    );
+    for (const oldDiv of attachmentDivs) {
+      const rawUrl =
+        cleanUrlString(oldDiv.getAttribute('data-attachment-url')) ?? '';
+      if (!rawUrl || rawUrl.startsWith('http')) continue;
+
+      const relPath = this.resolveRelativeAttachmentPath(
+        rawUrl,
+        pageDir,
+        attachmentCandidates,
+      );
+      if (!relPath) continue;
+
+      const { attachmentId, apiFilePath, abs } = processFile(relPath);
+      const stat = await fs.stat(abs);
+      const fileName = path.basename(abs);
+      const mime = getMimeType(abs);
+
+      const div = doc.createElement('div') as HDElement;
+      div.setAttribute('data-type', 'attachment');
+      div.setAttribute('data-attachment-url', apiFilePath);
+      div.setAttribute('data-attachment-name', fileName);
+      div.setAttribute('data-attachment-mime', mime);
+      div.setAttribute('data-attachment-size', stat.size.toString());
+      div.setAttribute('data-attachment-id', attachmentId);
+
+      oldDiv.replaceWith(div);
+      this.unwrapFromParagraph(div);
+    }
+
+    for (const type of ['excalidraw', 'drawio'] as const) {
+      const selector = `div[data-type="${type}"]`;
+      const oldDivs = Array.from(doc.querySelectorAll(selector));
+
+      for (const oldDiv of oldDivs) {
+        const rawSrc = cleanUrlString(oldDiv.getAttribute('data-src')) ?? '';
+        if (!rawSrc || rawSrc.startsWith('http')) continue;
+
+        const relPath = this.resolveRelativeAttachmentPath(
+          rawSrc,
+          pageDir,
+          attachmentCandidates,
+        );
+        if (!relPath) continue;
+
+        const { attachmentId, apiFilePath, abs } = processFile(relPath);
+        const stat = await fs.stat(abs);
+        const fileName = path.basename(abs);
+
+        const width = oldDiv.getAttribute('data-width') || '100%';
+        const align = oldDiv.getAttribute('data-align') || 'center';
+
+        const newDiv = doc.createElement('div') as HDElement;
+        newDiv.setAttribute('data-type', type);
+        newDiv.setAttribute('data-src', apiFilePath);
+        newDiv.setAttribute('data-title', fileName);
+        newDiv.setAttribute('data-width', width);
+        newDiv.setAttribute('data-size', stat.size.toString());
+        newDiv.setAttribute('data-align', align);
+        newDiv.setAttribute('data-attachment-id', attachmentId);
+
+        oldDiv.replaceWith(newDiv);
+        this.unwrapFromParagraph(newDiv);
+      }
+    }
+
+    // wait for all uploads & DB inserts
+    await Promise.all(tasks);
+
+    return doc.documentElement.outerHTML;
+  }
+
+  async rewriteInternalLinksToMentionHtml(
+    html: string,
+    currentFilePath: string,
+    filePathToPageMetaMap: Map<
+      string,
+      { id: string; title: string; slugId: string }
+    >,
+    creatorId: string,
+  ): Promise<string> {
+    const window = new Window();
+    const doc = window.document;
+    doc.body.innerHTML = html;
+
+    // normalize helper
+    const normalize = (p: string) => p.replace(/\\/g, '/');
+
+    for (const a of Array.from(doc.getElementsByTagName('a'))) {
+      const rawHref = a.getAttribute('href');
+      if (!rawHref) continue;
+
+      // skip absolute/external URLs
+      if (rawHref.startsWith('http') || rawHref.startsWith('/api/')) {
+        continue;
+      }
+
+      const decodedRef = decodeURIComponent(rawHref);
+      const parentDir = path.dirname(currentFilePath);
+      const joined = path.join(parentDir, decodedRef);
+      const resolved = normalize(joined);
+
+      const pageMeta = filePathToPageMetaMap.get(resolved);
+      if (!pageMeta) {
+        // not an internal link we know about
+        continue;
+      }
+
+      const mentionEl = doc.createElement('span') as HDElement;
+      mentionEl.setAttribute('data-type', 'mention');
+      mentionEl.setAttribute('data-id', v7());
+      mentionEl.setAttribute('data-entity-type', 'page');
+      mentionEl.setAttribute('data-entity-id', pageMeta.id);
+      mentionEl.setAttribute('data-label', pageMeta.title);
+      mentionEl.setAttribute('data-slug-id', pageMeta.slugId);
+      mentionEl.setAttribute('data-creator-id', creatorId);
+      mentionEl.textContent = pageMeta.title;
+
+      a.replaceWith(mentionEl);
+    }
+
+    return doc.body.innerHTML;
+  }
+
+  unwrapFromParagraph(node: HDElement) {
+    let wrapper = node.closest('p, a') as HDElement | null;
+
+    while (wrapper) {
+      if (wrapper.childNodes.length === 1) {
+        // e.g. <p><node/></p> or <a><node/></a> → <node/>
+        wrapper.replaceWith(node);
+      } else {
+        wrapper.parentNode!.insertBefore(node, wrapper);
+      }
+      wrapper = node.closest('p, a') as HDElement | null;
+    }
+  }
+
+  async buildAttachmentCandidates(
+    extractDir: string,
+  ): Promise<Map<string, string>> {
+    const map = new Map<string, string>();
+    async function walk(dir: string) {
+      for (const ent of await fs.readdir(dir, { withFileTypes: true })) {
+        const abs = path.join(dir, ent.name);
+        if (ent.isDirectory()) {
+          await walk(abs);
+        } else {
+          if (['.md', '.html'].includes(path.extname(ent.name).toLowerCase())) {
+            continue;
+          }
+
+          const rel = path.relative(extractDir, abs).split(path.sep).join('/');
+          map.set(rel, abs);
+        }
+      }
+    }
+
+    await walk(extractDir);
+    return map;
   }
 
   async collectMarkdownAndHtmlFiles(dir: string): Promise<string[]> {
@@ -215,6 +596,23 @@ export class FileTaskService {
     return results;
   }
 
+  resolveRelativeAttachmentPath(
+    raw: string,
+    pageDir: string,
+    attachmentCandidates: Map<string, string>,
+  ): string | null {
+    const mainRel = decodeURIComponent(raw.replace(/^\.?\/+/, ''));
+    const fallback = path.normalize(path.join(pageDir, mainRel));
+
+    if (attachmentCandidates.has(mainRel)) {
+      return mainRel;
+    }
+    if (attachmentCandidates.has(fallback)) {
+      return fallback;
+    }
+    return null;
+  }
+
   async updateTaskStatus(fileTaskId: string, status: FileTaskStatus) {
     await this.db
       .updateTable('fileTasks')

apps/server/src/integrations/import/file.utils.ts

@@ -35,43 +35,60 @@ export function getFileTaskFolderPath(
 export function extractZip(source: string, target: string) {
   //https://github.com/Surfer-Org
   return new Promise((resolve, reject) => {
-    yauzl.open(source, { lazyEntries: true }, (err, zipfile) => {
-      if (err) return reject(err);
+    yauzl.open(
+      source,
+      { lazyEntries: true, decodeStrings: false, autoClose: true },
+      (err, zipfile) => {
+        if (err) return reject(err);
 
-      zipfile.readEntry();
-      zipfile.on('entry', (entry) => {
-        const fullPath = path.join(target, entry.fileName);
-        const directory = path.dirname(fullPath);
+        zipfile.readEntry();
+        zipfile.on('entry', (entry) => {
+          const name = entry.fileName.toString('utf8'); // or 'cp437' if you need the original DOS charset
+          const safeName = name.replace(/^\/+/, ''); // strip any leading slashes
 
-        if (/\/$/.test(entry.fileName)) {
-          // Directory entry
-          try {
-            fs.mkdirSync(fullPath, { recursive: true });
-            zipfile.readEntry();
-          } catch (err) {
-            reject(err);
+          const fullPath = path.join(target, safeName);
+          const directory = path.dirname(fullPath);
+
+          // <-- skip all macOS metadata
+          if (safeName.startsWith('__MACOSX/')) {
+            return zipfile.readEntry();
           }
-        } else {
-          // File entry
-          try {
-            fs.mkdirSync(directory, { recursive: true });
-            zipfile.openReadStream(entry, (err, readStream) => {
-              if (err) return reject(err);
-              const writeStream = fs.createWriteStream(fullPath);
-              readStream.on('end', () => {
-                writeStream.end();
-                zipfile.readEntry();
+
+          if (/\/$/.test(entry.fileName)) {
+            // Directory entry
+            try {
+              fs.mkdirSync(fullPath, { recursive: true });
+              zipfile.readEntry();
+            } catch (err) {
+              reject(err);
+            }
+          } else {
+            // File entry
+            try {
+              fs.mkdirSync(directory, { recursive: true });
+              zipfile.openReadStream(entry, (err, readStream) => {
+                if (err) return reject(err);
+                const writeStream = fs.createWriteStream(fullPath);
+                readStream.on('end', () => {
+                  writeStream.end();
+                  zipfile.readEntry();
+                });
+                readStream.pipe(writeStream);
               });
-              readStream.pipe(writeStream);
-            });
-          } catch (err) {
-            reject(err);
+            } catch (err) {
+              reject(err);
+            }
           }
-        }
-      });
+        });
 
-      zipfile.on('end', resolve);
-      zipfile.on('error', reject);
-    });
+        zipfile.on('end', resolve);
+        zipfile.on('error', reject);
+      },
+    );
   });
 }
+
+export function cleanUrlString(url: string): string {
+  const [maybePath] = url.split('?', 1);
+  return maybePath;
+}

apps/server/src/integrations/import/import-formatter.ts

@@ -0,0 +1,127 @@
+import { Window } from 'happy-dom';
+
+export function notionFormatter(html: string): string {
+  const window = new Window();
+  const doc = window.document;
+  doc.body.innerHTML = html;
+
+  // Block math
+  for (const fig of Array.from(doc.querySelectorAll('figure.equation'))) {
+    // get TeX source from the MathML <annotation>
+    const annotation = fig.querySelector(
+      'annotation[encoding="application/x-tex"]',
+    );
+    const tex = annotation?.textContent?.trim() ?? '';
+
+    const mathBlock = doc.createElement('div');
+    mathBlock.setAttribute('data-type', 'mathBlock');
+    mathBlock.setAttribute('data-katex', 'true');
+    mathBlock.textContent = tex;
+
+    fig.replaceWith(mathBlock);
+  }
+
+  // Inline math
+  for (const token of Array.from(
+    doc.querySelectorAll('span.notion-text-equation-token'),
+  )) {
+    // remove the preceding <style> if it’s that KaTeX import
+    const prev = token.previousElementSibling;
+    if (prev?.tagName === 'STYLE') prev.remove();
+
+    const annotation = token.querySelector(
+      'annotation[encoding="application/x-tex"]',
+    );
+    const tex = annotation?.textContent?.trim() ?? '';
+
+    const mathInline = doc.createElement('span');
+    mathInline.setAttribute('data-type', 'mathInline');
+    mathInline.setAttribute('data-katex', 'true');
+    mathInline.textContent = tex;
+    token.replaceWith(mathInline);
+  }
+
+  // Callouts
+  const figs = Array.from(doc.querySelectorAll('figure.callout')).reverse();
+
+  for (const fig of figs) {
+    // find the content <div> (always the 2nd child in a Notion callout)
+    const contentDiv = fig.querySelector(
+      'div:nth-of-type(2)',
+    ) as unknown as HTMLElement | null;
+    if (!contentDiv) continue;
+
+    // pull out every block inside (tables, p, nested callouts, lists…)
+    const blocks = Array.from(contentDiv.childNodes);
+
+    const wrapper = fig.ownerDocument.createElement('div');
+    wrapper.setAttribute('data-type', 'callout');
+    wrapper.setAttribute('data-callout-type', 'info');
+
+    // move each real node into the wrapper (preserves nested structure)
+    // @ts-ignore
+    wrapper.append(...blocks);
+    fig.replaceWith(wrapper);
+  }
+
+  // Todolist
+  const todoLists = Array.from(doc.querySelectorAll('ul.to-do-list'));
+
+  for (const oldList of todoLists) {
+    const newList = doc.createElement('ul');
+    newList.setAttribute('data-type', 'taskList');
+
+    // for each old <li>, create a <li data-type="taskItem" data-checked="…">
+    for (const li of oldList.querySelectorAll('li')) {
+      const isChecked = li.querySelector('.checkbox.checkbox-on') != null;
+      const textSpan = li.querySelector(
+        'span.to-do-children-unchecked, span.to-do-children-checked',
+      );
+      const text = textSpan?.textContent?.trim() ?? '';
+
+      // <li data-type="taskItem" data-checked="true|false">
+      const taskItem = doc.createElement('li');
+      taskItem.setAttribute('data-type', 'taskItem');
+      taskItem.setAttribute('data-checked', String(isChecked));
+
+      //  <label><input type="checkbox" [checked]><span></span></label>
+      const label = doc.createElement('label');
+      const input = doc.createElement('input');
+      input.type = 'checkbox';
+      if (isChecked) input.checked = true;
+      const spacer = doc.createElement('span');
+      label.append(input, spacer);
+
+      const container = doc.createElement('div');
+      const p = doc.createElement('p');
+      p.textContent = text;
+      container.appendChild(p);
+
+      taskItem.append(label, container);
+      newList.appendChild(taskItem);
+    }
+
+    oldList.replaceWith(newList);
+  }
+
+  // Fix toggle blocks
+  const detailsList = Array.from(
+    doc.querySelectorAll('ul.toggle details'),
+  ).reverse();
+
+  // unwrap from ul and li tags
+  for (const details of detailsList) {
+    const li = details.closest('li');
+    if (li) {
+      li.parentNode!.insertBefore(details, li);
+      if (li.childNodes.length === 0) li.remove();
+    }
+
+    const ul = details.closest('ul.toggle');
+    if (ul) {
+      ul.parentNode!.insertBefore(details, ul);
+      if (ul.childNodes.length === 0) ul.remove();
+    }
+  }
+  return doc.body.innerHTML;
+}

apps/server/src/integrations/import/import.service.ts

@@ -130,7 +130,7 @@ export class ImportService {
 
   async createYdoc(prosemirrorJson: any): Promise<Buffer | null> {
     if (prosemirrorJson) {
-     // this.logger.debug(`Converting prosemirror json state to ydoc`);
+      // this.logger.debug(`Converting prosemirror json state to ydoc`);
 
       const ydoc = TiptapTransformer.toYdoc(
         prosemirrorJson,
@@ -146,20 +146,34 @@ export class ImportService {
   }
 
   extractTitleAndRemoveHeading(prosemirrorState: any) {
-    let title = null;
+    let title: string | null = null;
+
+    const content = prosemirrorState.content ?? [];
 
     if (
-      prosemirrorState?.content?.length > 0 &&
-      prosemirrorState.content[0].type === 'heading' &&
-      prosemirrorState.content[0].attrs?.level === 1
+      content.length > 0 &&
+      content[0].type === 'heading' &&
+      content[0].attrs?.level === 1
     ) {
-      title = prosemirrorState.content[0].content[0].text;
-
-      // remove h1 header node from state
-      prosemirrorState.content.shift();
+      title = content[0].content?.[0]?.text ?? null;
+      content.shift();
     }
 
-    return { title, prosemirrorJson: prosemirrorState };
+    // ensure at least one paragraph
+    if (content.length === 0) {
+      content.push({
+        type: 'paragraph',
+        content: [],
+      });
+    }
+
+    return {
+      title,
+      prosemirrorJson: {
+        ...prosemirrorState,
+        content,
+      },
+    };
   }
 
   async getNewPagePosition(spaceId: string): Promise<string> {

apps/server/src/integrations/import/processors/file-task.processor.ts

@@ -22,6 +22,7 @@ export class FileTaskProcessor extends WorkerHost implements OnModuleDestroy {
           console.log('export task', job.data.fileTaskId);
       }
     } catch (err) {
+      console.error(err);
       throw err;
     }
   }

apps/server/src/integrations/storage/drivers/local.driver.ts

@@ -3,10 +3,11 @@ import {
   LocalStorageConfig,
   StorageOption,
 } from '../interfaces';
-import { join } from 'path';
+import { join, dirname } from 'path';
 import * as fs from 'fs-extra';
 import { Readable } from 'stream';
-import { createReadStream } from 'node:fs';
+import { createReadStream, createWriteStream } from 'node:fs';
+import { pipeline } from 'node:stream/promises';
 
 export class LocalDriver implements StorageDriver {
   private readonly config: LocalStorageConfig;
@@ -27,6 +28,16 @@ export class LocalDriver implements StorageDriver {
     }
   }
 
+  async uploadStream(filePath: string, file: Readable): Promise<void> {
+    try {
+      const fullPath = this._fullPath(filePath);
+      await fs.mkdir(dirname(fullPath), { recursive: true });
+      await pipeline(file, createWriteStream(fullPath));
+    } catch (err) {
+      throw new Error(`Failed to upload file: ${(err as Error).message}`);
+    }
+  }
+
   async copy(fromFilePath: string, toFilePath: string): Promise<void> {
     try {
       if (await this.exists(fromFilePath)) {

apps/server/src/integrations/storage/drivers/s3.driver.ts

@@ -12,6 +12,7 @@ import { streamToBuffer } from '../storage.utils';
 import { Readable } from 'stream';
 import { getSignedUrl } from '@aws-sdk/s3-request-presigner';
 import { getMimeType } from '../../../common/helpers';
+import { Upload } from '@aws-sdk/lib-storage';
 
 export class S3Driver implements StorageDriver {
   private readonly s3Client: S3Client;
@@ -40,6 +41,26 @@ export class S3Driver implements StorageDriver {
     }
   }
 
+  async uploadStream(filePath: string, file: Readable): Promise<void> {
+    try {
+      const contentType = getMimeType(filePath);
+
+      const upload = new Upload({
+        client: this.s3Client,
+        params: {
+          Bucket: this.config.bucket,
+          Key: filePath,
+          Body: file,
+          ContentType: contentType,
+        },
+      });
+
+      await upload.done();
+    } catch (err) {
+      throw new Error(`Failed to upload file: ${(err as Error).message}`);
+    }
+  }
+
   async copy(fromFilePath: string, toFilePath: string): Promise<void> {
     try {
       if (await this.exists(fromFilePath)) {

apps/server/src/integrations/storage/interfaces/storage-driver.interface.ts

@@ -3,13 +3,14 @@ import { Readable } from 'stream';
 export interface StorageDriver {
   upload(filePath: string, file: Buffer): Promise<void>;
 
+  uploadStream(filePath: string, file: Readable): Promise<void>;
+
   copy(fromFilePath: string, toFilePath: string): Promise<void>;
 
   read(filePath: string): Promise<Buffer>;
 
   readStream(filePath: string): Promise<Readable>;
 
-
   exists(filePath: string): Promise<boolean>;
 
   getUrl(filePath: string): string;

apps/server/src/integrations/storage/storage.service.ts

@@ -15,6 +15,11 @@ export class StorageService {
     this.logger.debug(`File uploaded successfully. Path: ${filePath}`);
   }
 
+  async uploadStream(filePath: string, fileContent: Readable) {
+    await this.storageDriver.uploadStream(filePath, fileContent);
+    this.logger.debug(`File uploaded successfully. Path: ${filePath}`);
+  }
+
   async copy(fromFilePath: string, toFilePath: string) {
     await this.storageDriver.copy(fromFilePath, toFilePath);
     this.logger.debug(`File copied successfully. Path: ${toFilePath}`);

packages/editor-ext/src/lib/image/image.ts

@@ -80,7 +80,7 @@ export const TiptapImage = Image.extend<ImageOptions>({
         default: undefined,
         parseHTML: (element) => element.getAttribute("data-attachment-id"),
         renderHTML: (attributes: ImageAttributes) => ({
-          "data-attachment-id": attributes.align,
+          "data-attachment-id": attributes.attachmentId,
         }),
       },
       size: {

packages/editor-ext/src/lib/trailing-node.ts

@@ -51,8 +51,13 @@ export const TrailingNode = Extension.create<TrailingNodeExtensionOptions>({
         },
         state: {
           init: (_, state) => {
-            const lastNode = state.tr.doc.lastChild
-            return !nodeEqualsType({ node: lastNode, types: disabledNodes })
+            try {
+              const lastNode = state.tr.doc.lastChild
+              return !nodeEqualsType({ node: lastNode, types: disabledNodes })
+            } catch (err){
+              console.log(err)
+            }
+            return true;
           },
           apply: (tr, value) => {
             if (!tr.docChanged) {

packages/editor-ext/src/lib/video/video.ts

@@ -57,7 +57,7 @@ export const TiptapVideo = Node.create<VideoOptions>({
         default: undefined,
         parseHTML: (element) => element.getAttribute("data-attachment-id"),
         renderHTML: (attributes: VideoAttributes) => ({
-          "data-attachment-id": attributes.align,
+          "data-attachment-id": attributes.attachmentId,
         }),
       },
       width: {

pnpm-lock.yaml

@@ -405,6 +405,9 @@ importers:
       '@aws-sdk/client-s3':
         specifier: 3.701.0
         version: 3.701.0
+      '@aws-sdk/lib-storage':
+        specifier: ^3.701.0
+        version: 3.817.0(@aws-sdk/client-s3@3.701.0)
       '@aws-sdk/s3-request-presigner':
         specifier: 3.701.0
         version: 3.701.0
@@ -778,6 +781,12 @@ packages:
     peerDependencies:
       '@aws-sdk/client-sts': ^3.696.0
 
+  '@aws-sdk/lib-storage@3.817.0':
+    resolution: {integrity: sha512-2zOO8+2EmiS049PjLSNdqmmZMQj7fzE1hZJ70A94vO+KNaVhVZYuMOOiOmwMw6ePkTCcFwK40vZIIXwEQQ1v1g==}
+    engines: {node: '>=18.0.0'}
+    peerDependencies:
+      '@aws-sdk/client-s3': ^3.817.0
+
   '@aws-sdk/middleware-bucket-endpoint@3.696.0':
     resolution: {integrity: sha512-V07jishKHUS5heRNGFpCWCSTjRJyQLynS/ncUeE8ZYtG66StOOQWftTwDfFOSoXlIqrXgb4oT9atryzXq7Z4LQ==}
     engines: {node: '>=16.0.0'}
@@ -3182,6 +3191,10 @@ packages:
     resolution: {integrity: sha512-yiW0WI30zj8ZKoSYNx90no7ugVn3khlyH/z5W8qtKBtVE6awRALbhSG+2SAHA1r6bO/6M9utxYKVZ3PCJ1rWxw==}
     engines: {node: '>=16.0.0'}
 
+  '@smithy/abort-controller@4.0.3':
+    resolution: {integrity: sha512-AqXFf6DXnuRBXy4SoK/n1mfgHaKaq36bmkphmD1KO0nHq6xK/g9KHSW4HEsPQUBCGdIEfuJifGHwxFXPIFay9Q==}
+    engines: {node: '>=18.0.0'}
+
   '@smithy/chunked-blob-reader-native@3.0.1':
     resolution: {integrity: sha512-VEYtPvh5rs/xlyqpm5NRnfYLZn+q0SRPELbvBV+C/G7IQ+ouTuo+NKKa3ShG5OaFR8NYVMXls9hPYLTvIKKDrQ==}
 
@@ -3196,6 +3209,10 @@ packages:
     resolution: {integrity: sha512-8olpW6mKCa0v+ibCjoCzgZHQx1SQmZuW/WkrdZo73wiTprTH6qhmskT60QLFdT9DRa5mXxjz89kQPZ7ZSsoqqg==}
     engines: {node: '>=16.0.0'}
 
+  '@smithy/core@3.4.0':
+    resolution: {integrity: sha512-dDYISQo7k0Ml/rXlFIjkTmTcQze/LxhtIRAEmZ6HJ/EI0inVxVEVnrUXJ7jPx6ZP0GHUhFm40iQcCgS5apXIXA==}
+    engines: {node: '>=18.0.0'}
+
   '@smithy/credential-provider-imds@3.2.8':
     resolution: {integrity: sha512-ZCY2yD0BY+K9iMXkkbnjo+08T2h8/34oHd0Jmh6BZUSZwaaGlGCyBT/3wnS7u7Xl33/EEfN4B6nQr3Gx5bYxgw==}
     engines: {node: '>=16.0.0'}
@@ -3222,6 +3239,10 @@ packages:
   '@smithy/fetch-http-handler@4.1.3':
     resolution: {integrity: sha512-6SxNltSncI8s689nvnzZQc/dPXcpHQ34KUj6gR/HBroytKOd/isMG3gJF/zBE1TBmTT18TXyzhg3O3SOOqGEhA==}
 
+  '@smithy/fetch-http-handler@5.0.3':
+    resolution: {integrity: sha512-yBZwavI31roqTndNI7ONHqesfH01JmjJK6L3uUpZAhyAmr86LN5QiPzfyZGIxQmed8VEK2NRSQT3/JX5V1njfQ==}
+    engines: {node: '>=18.0.0'}
+
   '@smithy/hash-blob-browser@3.1.10':
     resolution: {integrity: sha512-elwslXOoNunmfS0fh55jHggyhccobFkexLYC1ZeZ1xP2BTSrcIBaHV2b4xUQOdctrSNOpMqOZH1r2XzWTEhyfA==}
 
@@ -3244,6 +3265,10 @@ packages:
     resolution: {integrity: sha512-+Fsu6Q6C4RSJiy81Y8eApjEB5gVtM+oFKTffg+jSuwtvomJJrhUJBu2zS8wjXSgH/g1MKEWrzyChTBe6clb5FQ==}
     engines: {node: '>=16.0.0'}
 
+  '@smithy/is-array-buffer@4.0.0':
+    resolution: {integrity: sha512-saYhF8ZZNoJDTvJBEWgeBccCg+yvp1CX+ed12yORU3NilJScfc6gfch2oVb4QgxZrGUx3/ZJlb+c/dJbyupxlw==}
+    engines: {node: '>=18.0.0'}
+
   '@smithy/md5-js@3.0.11':
     resolution: {integrity: sha512-3NM0L3i2Zm4bbgG6Ymi9NBcxXhryi3uE8fIfHJZIOfZVxOkGdjdgjR9A06SFIZCfnEIWKXZdm6Yq5/aPXFFhsQ==}
 
@@ -3255,6 +3280,10 @@ packages:
     resolution: {integrity: sha512-OEJZKVUEhMOqMs3ktrTWp7UvvluMJEvD5XgQwRePSbDg1VvBaL8pX8mwPltFn6wk1GySbcVwwyldL8S+iqnrEQ==}
     engines: {node: '>=16.0.0'}
 
+  '@smithy/middleware-endpoint@4.1.7':
+    resolution: {integrity: sha512-KDzM7Iajo6K7eIWNNtukykRT4eWwlHjCEsULZUaSfi/SRSBK8BPRqG5FsVfp58lUxcvre8GT8AIPIqndA0ERKw==}
+    engines: {node: '>=18.0.0'}
+
   '@smithy/middleware-retry@3.0.34':
     resolution: {integrity: sha512-yVRr/AAtPZlUvwEkrq7S3x7Z8/xCd97m2hLDaqdz6ucP2RKHsBjEqaUA2ebNv2SsZoPEi+ZD0dZbOB1u37tGCA==}
     engines: {node: '>=16.0.0'}
@@ -3263,34 +3292,66 @@ packages:
     resolution: {integrity: sha512-KzPAeySp/fOoQA82TpnwItvX8BBURecpx6ZMu75EZDkAcnPtO6vf7q4aH5QHs/F1s3/snQaSFbbUMcFFZ086Mw==}
     engines: {node: '>=16.0.0'}
 
+  '@smithy/middleware-serde@4.0.6':
+    resolution: {integrity: sha512-YECyl7uNII+jCr/9qEmCu8xYL79cU0fqjo0qxpcVIU18dAPHam/iYwcknAu4Jiyw1uN+sAx7/SMf/Kmef/Jjsg==}
+    engines: {node: '>=18.0.0'}
+
   '@smithy/middleware-stack@3.0.11':
     resolution: {integrity: sha512-1HGo9a6/ikgOMrTrWL/WiN9N8GSVYpuRQO5kjstAq4CvV59bjqnh7TbdXGQ4vxLD3xlSjfBjq5t1SOELePsLnA==}
     engines: {node: '>=16.0.0'}
 
+  '@smithy/middleware-stack@4.0.3':
+    resolution: {integrity: sha512-baeV7t4jQfQtFxBADFmnhmqBmqR38dNU5cvEgHcMK/Kp3D3bEI0CouoX2Sr/rGuntR+Eg0IjXdxnGGTc6SbIkw==}
+    engines: {node: '>=18.0.0'}
+
   '@smithy/node-config-provider@3.1.12':
     resolution: {integrity: sha512-O9LVEu5J/u/FuNlZs+L7Ikn3lz7VB9hb0GtPT9MQeiBmtK8RSY3ULmsZgXhe6VAlgTw0YO+paQx4p8xdbs43vQ==}
     engines: {node: '>=16.0.0'}
 
+  '@smithy/node-config-provider@4.1.2':
+    resolution: {integrity: sha512-SUvNup8iU1v7fmM8XPk+27m36udmGCfSz+VZP5Gb0aJ3Ne0X28K/25gnsrg3X1rWlhcnhzNUUysKW/Ied46ivQ==}
+    engines: {node: '>=18.0.0'}
+
   '@smithy/node-http-handler@3.3.3':
     resolution: {integrity: sha512-BrpZOaZ4RCbcJ2igiSNG16S+kgAc65l/2hmxWdmhyoGWHTLlzQzr06PXavJp9OBlPEG/sHlqdxjWmjzV66+BSQ==}
     engines: {node: '>=16.0.0'}
 
+  '@smithy/node-http-handler@4.0.5':
+    resolution: {integrity: sha512-T7QglZC1vS7SPT44/1qSIAQEx5bFKb3LfO6zw/o4Xzt1eC5HNoH1TkS4lMYA9cWFbacUhx4hRl/blLun4EOCkg==}
+    engines: {node: '>=18.0.0'}
+
   '@smithy/property-provider@3.1.11':
     resolution: {integrity: sha512-I/+TMc4XTQ3QAjXfOcUWbSS073oOEAxgx4aZy8jHaf8JQnRkq2SZWw8+PfDtBvLUjcGMdxl+YwtzWe6i5uhL/A==}
     engines: {node: '>=16.0.0'}
 
+  '@smithy/property-provider@4.0.3':
+    resolution: {integrity: sha512-Wcn17QNdawJZcZZPBuMuzyBENVi1AXl4TdE0jvzo4vWX2x5df/oMlmr/9M5XAAC6+yae4kWZlOYIsNsgDrMU9A==}
+    engines: {node: '>=18.0.0'}
+
   '@smithy/protocol-http@4.1.8':
     resolution: {integrity: sha512-hmgIAVyxw1LySOwkgMIUN0kjN8TG9Nc85LJeEmEE/cNEe2rkHDUWhnJf2gxcSRFLWsyqWsrZGw40ROjUogg+Iw==}
     engines: {node: '>=16.0.0'}
 
+  '@smithy/protocol-http@5.1.1':
+    resolution: {integrity: sha512-Vsay2mzq05DwNi9jK01yCFtfvu9HimmgC7a4HTs7lhX12Sx8aWsH0mfz6q/02yspSp+lOB+Q2HJwi4IV2GKz7A==}
+    engines: {node: '>=18.0.0'}
+
   '@smithy/querystring-builder@3.0.11':
     resolution: {integrity: sha512-u+5HV/9uJaeLj5XTb6+IEF/dokWWkEqJ0XiaRRogyREmKGUgZnNecLucADLdauWFKUNbQfulHFEZEdjwEBjXRg==}
     engines: {node: '>=16.0.0'}
 
+  '@smithy/querystring-builder@4.0.3':
+    resolution: {integrity: sha512-UUzIWMVfPmDZcOutk2/r1vURZqavvQW0OHvgsyNV0cKupChvqg+/NKPRMaMEe+i8tP96IthMFeZOZWpV+E4RAw==}
+    engines: {node: '>=18.0.0'}
+
   '@smithy/querystring-parser@3.0.11':
     resolution: {integrity: sha512-Je3kFvCsFMnso1ilPwA7GtlbPaTixa3WwC+K21kmMZHsBEOZYQaqxcMqeFFoU7/slFjKDIpiiPydvdJm8Q/MCw==}
     engines: {node: '>=16.0.0'}
 
+  '@smithy/querystring-parser@4.0.3':
+    resolution: {integrity: sha512-K5M4ZJQpFCblOJ5Oyw7diICpFg1qhhR47m2/5Ef1PhGE19RaIZf50tjYFrxa6usqcuXyTiFPGo4d1geZdH4YcQ==}
+    engines: {node: '>=18.0.0'}
+
   '@smithy/service-error-classification@3.0.11':
     resolution: {integrity: sha512-QnYDPkyewrJzCyaeI2Rmp7pDwbUETe+hU8ADkXmgNusO1bgHBH7ovXJiYmba8t0fNfJx75fE8dlM6SEmZxheog==}
     engines: {node: '>=16.0.0'}
@@ -3299,6 +3360,10 @@ packages:
     resolution: {integrity: sha512-1xKSGI+U9KKdbG2qDvIR9dGrw3CNx+baqJfyr0igKEpjbHL5stsqAesYBzHChYHlelWtb87VnLWlhvfCz13H8Q==}
     engines: {node: '>=16.0.0'}
 
+  '@smithy/shared-ini-file-loader@4.0.3':
+    resolution: {integrity: sha512-vHwlrqhZGIoLwaH8vvIjpHnloShqdJ7SUPNM2EQtEox+yEDFTVQ7E+DLZ+6OhnYEgFUwPByJyz6UZaOu2tny6A==}
+    engines: {node: '>=18.0.0'}
+
   '@smithy/signature-v4@4.2.4':
     resolution: {integrity: sha512-5JWeMQYg81TgU4cG+OexAWdvDTs5JDdbEZx+Qr1iPbvo91QFGzjy0IkXAKaXUHqmKUJgSHK0ZxnCkgZpzkeNTA==}
     engines: {node: '>=16.0.0'}
@@ -3307,24 +3372,40 @@ packages:
     resolution: {integrity: sha512-9wYrjAZFlqWhgVo3C4y/9kpc68jgiSsKUnsFPzr/MSiRL93+QRDafGTfhhKAb2wsr69Ru87WTiqSfQusSmWipA==}
     engines: {node: '>=16.0.0'}
 
+  '@smithy/smithy-client@4.3.0':
+    resolution: {integrity: sha512-DNsRA38pN6tYHUjebmwD9e4KcgqTLldYQb2gC6K+oxXYdCTxPn6wV9+FvOa6wrU2FQEnGJoi+3GULzOTKck/tg==}
+    engines: {node: '>=18.0.0'}
+
   '@smithy/types@3.7.2':
     resolution: {integrity: sha512-bNwBYYmN8Eh9RyjS1p2gW6MIhSO2rl7X9QeLM8iTdcGRP+eDiIWDt66c9IysCc22gefKszZv+ubV9qZc7hdESg==}
     engines: {node: '>=16.0.0'}
 
-  '@smithy/types@4.1.0':
-    resolution: {integrity: sha512-enhjdwp4D7CXmwLtD6zbcDMbo6/T6WtuuKCY49Xxc6OMOmUWlBEBDREsxxgV2LIdeQPW756+f97GzcgAwp3iLw==}
+  '@smithy/types@4.3.0':
+    resolution: {integrity: sha512-+1iaIQHthDh9yaLhRzaoQxRk+l9xlk+JjMFxGRhNLz+m9vKOkjNeU8QuB4w3xvzHyVR/BVlp/4AXDHjoRIkfgQ==}
     engines: {node: '>=18.0.0'}
 
   '@smithy/url-parser@3.0.11':
     resolution: {integrity: sha512-TmlqXkSk8ZPhfc+SQutjmFr5FjC0av3GZP4B/10caK1SbRwe/v+Wzu/R6xEKxoNqL+8nY18s1byiy6HqPG37Aw==}
 
+  '@smithy/url-parser@4.0.3':
+    resolution: {integrity: sha512-n5/DnosDu/tweOqUUNtUbu7eRIR4J/Wz9nL7V5kFYQQVb8VYdj7a4G5NJHCw6o21ul7CvZoJkOpdTnsQDLT0tQ==}
+    engines: {node: '>=18.0.0'}
+
   '@smithy/util-base64@3.0.0':
     resolution: {integrity: sha512-Kxvoh5Qtt0CDsfajiZOCpJxgtPHXOKwmM+Zy4waD43UoEMA+qPxxa98aE/7ZhdnBFZFXMOiBR5xbcaMhLtznQQ==}
     engines: {node: '>=16.0.0'}
 
+  '@smithy/util-base64@4.0.0':
+    resolution: {integrity: sha512-CvHfCmO2mchox9kjrtzoHkWHxjHZzaFojLc8quxXY7WAAMAg43nuxwv95tATVgQFNDwd4M9S1qFzj40Ul41Kmg==}
+    engines: {node: '>=18.0.0'}
+
   '@smithy/util-body-length-browser@3.0.0':
     resolution: {integrity: sha512-cbjJs2A1mLYmqmyVl80uoLTJhAcfzMOyPgjwAYusWKMdLeNtzmMz9YxNl3/jRLoxSS3wkqkf0jwNdtXWtyEBaQ==}
 
+  '@smithy/util-body-length-browser@4.0.0':
+    resolution: {integrity: sha512-sNi3DL0/k64/LO3A256M+m3CDdG6V7WKWHdAiBBMUN8S3hK3aMPhwnPik2A/a2ONN+9doY9UxaLfgqsIRg69QA==}
+    engines: {node: '>=18.0.0'}
+
   '@smithy/util-body-length-node@3.0.0':
     resolution: {integrity: sha512-Tj7pZ4bUloNUP6PzwhN7K386tmSmEET9QtQg0TgdNOnxhZvCssHji+oZTUIuzxECRfG8rdm2PMw2WCFs6eIYkA==}
     engines: {node: '>=16.0.0'}
@@ -3337,6 +3418,10 @@ packages:
     resolution: {integrity: sha512-aEOHCgq5RWFbP+UDPvPot26EJHjOC+bRgse5A8V3FSShqd5E5UN4qc7zkwsvJPPAVsf73QwYcHN1/gt/rtLwQA==}
     engines: {node: '>=16.0.0'}
 
+  '@smithy/util-buffer-from@4.0.0':
+    resolution: {integrity: sha512-9TOQ7781sZvddgO8nxueKi3+yGvkY35kotA0Y6BWRajAv8jjmigQ1sBwz0UX47pQMYXJPahSKEKYFgt+rXdcug==}
+    engines: {node: '>=18.0.0'}
+
   '@smithy/util-config-provider@3.0.0':
     resolution: {integrity: sha512-pbjk4s0fwq3Di/ANL+rCvJMKM5bzAQdE5S/6RL5NXgMExFAi6UgQMPOm5yPaIWPpr+EOXKXRonJ3FoxKf4mCJQ==}
     engines: {node: '>=16.0.0'}
@@ -3357,10 +3442,18 @@ packages:
     resolution: {integrity: sha512-eFndh1WEK5YMUYvy3lPlVmYY/fZcQE1D8oSf41Id2vCeIkKJXPcYDCZD+4+xViI6b1XSd7tE+s5AmXzz5ilabQ==}
     engines: {node: '>=16.0.0'}
 
+  '@smithy/util-hex-encoding@4.0.0':
+    resolution: {integrity: sha512-Yk5mLhHtfIgW2W2WQZWSg5kuMZCVbvhFmC7rV4IO2QqnZdbEFPmQnCcGMAX2z/8Qj3B9hYYNjZOhWym+RwhePw==}
+    engines: {node: '>=18.0.0'}
+
   '@smithy/util-middleware@3.0.11':
     resolution: {integrity: sha512-dWpyc1e1R6VoXrwLoLDd57U1z6CwNSdkM69Ie4+6uYh2GC7Vg51Qtan7ITzczuVpqezdDTKJGJB95fFvvjU/ow==}
     engines: {node: '>=16.0.0'}
 
+  '@smithy/util-middleware@4.0.3':
+    resolution: {integrity: sha512-iIsC6qZXxkD7V3BzTw3b1uK8RVC1M8WvwNxK1PKrH9FnxntCd30CSunXjL/8iJBE8Z0J14r2P69njwIpRG4FBQ==}
+    engines: {node: '>=18.0.0'}
+
   '@smithy/util-retry@3.0.11':
     resolution: {integrity: sha512-hJUC6W7A3DQgaee3Hp9ZFcOxVDZzmBIRBPlUAk8/fSOEl7pE/aX7Dci0JycNOnm9Mfr0KV2XjIlUOcGWXQUdVQ==}
     engines: {node: '>=16.0.0'}
@@ -3369,10 +3462,18 @@ packages:
     resolution: {integrity: sha512-SGhGBG/KupieJvJSZp/rfHHka8BFgj56eek9px4pp7lZbOF+fRiVr4U7A3y3zJD8uGhxq32C5D96HxsTC9BckQ==}
     engines: {node: '>=16.0.0'}
 
+  '@smithy/util-stream@4.2.1':
+    resolution: {integrity: sha512-W3IR0x5DY6iVtjj5p902oNhD+Bz7vs5S+p6tppbPa509rV9BdeXZjGuRSCtVEad9FA0Mba+tNUtUmtnSI1nwUw==}
+    engines: {node: '>=18.0.0'}
+
   '@smithy/util-uri-escape@3.0.0':
     resolution: {integrity: sha512-LqR7qYLgZTD7nWLBecUi4aqolw8Mhza9ArpNEQ881MJJIU2sE5iHCK6TdyqqzcDLy0OPe10IY4T8ctVdtynubg==}
     engines: {node: '>=16.0.0'}
 
+  '@smithy/util-uri-escape@4.0.0':
+    resolution: {integrity: sha512-77yfbCbQMtgtTylO9itEAdpPXSog3ZxMe09AEhm0dU0NLTalV70ghDZFR+Nfi1C60jnJoh/Re4090/DuZh2Omg==}
+    engines: {node: '>=18.0.0'}
+
   '@smithy/util-utf8@2.3.0':
     resolution: {integrity: sha512-R8Rdn8Hy72KKcebgLiv8jQcQkXoLMOGGv5uI1/k0l+snqkOzQ1R0ChUBCxWMlBsFMekWjq0wRudIweFs7sKT5A==}
     engines: {node: '>=14.0.0'}
@@ -3381,6 +3482,10 @@ packages:
     resolution: {integrity: sha512-rUeT12bxFnplYDe815GXbq/oixEGHfRFFtcTF3YdDi/JaENIM6aSYYLJydG83UNzLXeRI5K8abYd/8Sp/QM0kA==}
     engines: {node: '>=16.0.0'}
 
+  '@smithy/util-utf8@4.0.0':
+    resolution: {integrity: sha512-b+zebfKCfRdgNJDknHCob3O7FpeYQN6ZG6YLExMcasDHsCXlsXCEuiPZeLnJLpwa5dvPetGlnGCiMHuLwGvFow==}
+    engines: {node: '>=18.0.0'}
+
   '@smithy/util-waiter@3.2.0':
     resolution: {integrity: sha512-PpjSboaDUE6yl+1qlg3Si57++e84oXdWGbuFUSAciXsVfEZJJJupR2Nb0QuXHiunt2vGR+1PTizOMvnUPaG2Qg==}
     engines: {node: '>=16.0.0'}
@@ -4631,6 +4736,9 @@ packages:
   buffer-from@1.1.2:
     resolution: {integrity: sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==}
 
+  buffer@5.6.0:
+    resolution: {integrity: sha512-/gDYp/UtU0eA1ys8bOs9J6a+E/KWIY+DZ+Q2WESNUA0jFRsJOc0SNUO6xJ5SGA1xueg3NL65W6s+NY5l9cunuw==}
+
   buffer@5.7.1:
     resolution: {integrity: sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==}
 
@@ -8075,6 +8183,9 @@ packages:
     resolution: {integrity: sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==}
     engines: {node: '>= 0.8'}
 
+  stream-browserify@3.0.0:
+    resolution: {integrity: sha512-H73RAHsVBapbim0tU2JwwOiXUj+fikfiaoYAKHF3VJfA0pe2BCzkhAHBlLG6REzE+2WNZcxOXjK7lkso+9euLA==}
+
   streamsearch@1.1.0:
     resolution: {integrity: sha512-Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg==}
     engines: {node: '>=10.0.0'}
@@ -9359,6 +9470,17 @@ snapshots:
       '@smithy/types': 3.7.2
       tslib: 2.8.1
 
+  '@aws-sdk/lib-storage@3.817.0(@aws-sdk/client-s3@3.701.0)':
+    dependencies:
+      '@aws-sdk/client-s3': 3.701.0
+      '@smithy/abort-controller': 4.0.3
+      '@smithy/middleware-endpoint': 4.1.7
+      '@smithy/smithy-client': 4.3.0
+      buffer: 5.6.0
+      events: 3.3.0
+      stream-browserify: 3.0.0
+      tslib: 2.8.1
+
   '@aws-sdk/middleware-bucket-endpoint@3.696.0':
     dependencies:
       '@aws-sdk/types': 3.696.0
@@ -9496,7 +9618,7 @@ snapshots:
 
   '@aws-sdk/types@3.734.0':
     dependencies:
-      '@smithy/types': 4.1.0
+      '@smithy/types': 4.3.0
       tslib: 2.8.1
 
   '@aws-sdk/util-arn-parser@3.693.0':
@@ -12186,6 +12308,11 @@ snapshots:
       '@smithy/types': 3.7.2
       tslib: 2.8.1
 
+  '@smithy/abort-controller@4.0.3':
+    dependencies:
+      '@smithy/types': 4.3.0
+      tslib: 2.8.1
+
   '@smithy/chunked-blob-reader-native@3.0.1':
     dependencies:
       '@smithy/util-base64': 3.0.0
@@ -12214,6 +12341,17 @@ snapshots:
       '@smithy/util-utf8': 3.0.0
       tslib: 2.8.1
 
+  '@smithy/core@3.4.0':
+    dependencies:
+      '@smithy/middleware-serde': 4.0.6
+      '@smithy/protocol-http': 5.1.1
+      '@smithy/types': 4.3.0
+      '@smithy/util-body-length-browser': 4.0.0
+      '@smithy/util-middleware': 4.0.3
+      '@smithy/util-stream': 4.2.1
+      '@smithy/util-utf8': 4.0.0
+      tslib: 2.8.1
+
   '@smithy/credential-provider-imds@3.2.8':
     dependencies:
       '@smithy/node-config-provider': 3.1.12
@@ -12260,6 +12398,14 @@ snapshots:
       '@smithy/util-base64': 3.0.0
       tslib: 2.8.1
 
+  '@smithy/fetch-http-handler@5.0.3':
+    dependencies:
+      '@smithy/protocol-http': 5.1.1
+      '@smithy/querystring-builder': 4.0.3
+      '@smithy/types': 4.3.0
+      '@smithy/util-base64': 4.0.0
+      tslib: 2.8.1
+
   '@smithy/hash-blob-browser@3.1.10':
     dependencies:
       '@smithy/chunked-blob-reader': 4.0.0
@@ -12293,6 +12439,10 @@ snapshots:
     dependencies:
       tslib: 2.8.1
 
+  '@smithy/is-array-buffer@4.0.0':
+    dependencies:
+      tslib: 2.8.1
+
   '@smithy/md5-js@3.0.11':
     dependencies:
       '@smithy/types': 3.7.2
@@ -12316,6 +12466,17 @@ snapshots:
       '@smithy/util-middleware': 3.0.11
       tslib: 2.8.1
 
+  '@smithy/middleware-endpoint@4.1.7':
+    dependencies:
+      '@smithy/core': 3.4.0
+      '@smithy/middleware-serde': 4.0.6
+      '@smithy/node-config-provider': 4.1.2
+      '@smithy/shared-ini-file-loader': 4.0.3
+      '@smithy/types': 4.3.0
+      '@smithy/url-parser': 4.0.3
+      '@smithy/util-middleware': 4.0.3
+      tslib: 2.8.1
+
   '@smithy/middleware-retry@3.0.34':
     dependencies:
       '@smithy/node-config-provider': 3.1.12
@@ -12333,11 +12494,22 @@ snapshots:
       '@smithy/types': 3.7.2
       tslib: 2.8.1
 
+  '@smithy/middleware-serde@4.0.6':
+    dependencies:
+      '@smithy/protocol-http': 5.1.1
+      '@smithy/types': 4.3.0
+      tslib: 2.8.1
+
   '@smithy/middleware-stack@3.0.11':
     dependencies:
       '@smithy/types': 3.7.2
       tslib: 2.8.1
 
+  '@smithy/middleware-stack@4.0.3':
+    dependencies:
+      '@smithy/types': 4.3.0
+      tslib: 2.8.1
+
   '@smithy/node-config-provider@3.1.12':
     dependencies:
       '@smithy/property-provider': 3.1.11
@@ -12345,6 +12517,13 @@ snapshots:
       '@smithy/types': 3.7.2
       tslib: 2.8.1
 
+  '@smithy/node-config-provider@4.1.2':
+    dependencies:
+      '@smithy/property-provider': 4.0.3
+      '@smithy/shared-ini-file-loader': 4.0.3
+      '@smithy/types': 4.3.0
+      tslib: 2.8.1
+
   '@smithy/node-http-handler@3.3.3':
     dependencies:
       '@smithy/abort-controller': 3.1.9
@@ -12353,27 +12532,56 @@ snapshots:
       '@smithy/types': 3.7.2
       tslib: 2.8.1
 
+  '@smithy/node-http-handler@4.0.5':
+    dependencies:
+      '@smithy/abort-controller': 4.0.3
+      '@smithy/protocol-http': 5.1.1
+      '@smithy/querystring-builder': 4.0.3
+      '@smithy/types': 4.3.0
+      tslib: 2.8.1
+
   '@smithy/property-provider@3.1.11':
     dependencies:
       '@smithy/types': 3.7.2
       tslib: 2.8.1
 
+  '@smithy/property-provider@4.0.3':
+    dependencies:
+      '@smithy/types': 4.3.0
+      tslib: 2.8.1
+
   '@smithy/protocol-http@4.1.8':
     dependencies:
       '@smithy/types': 3.7.2
       tslib: 2.8.1
 
+  '@smithy/protocol-http@5.1.1':
+    dependencies:
+      '@smithy/types': 4.3.0
+      tslib: 2.8.1
+
   '@smithy/querystring-builder@3.0.11':
     dependencies:
       '@smithy/types': 3.7.2
       '@smithy/util-uri-escape': 3.0.0
       tslib: 2.8.1
 
+  '@smithy/querystring-builder@4.0.3':
+    dependencies:
+      '@smithy/types': 4.3.0
+      '@smithy/util-uri-escape': 4.0.0
+      tslib: 2.8.1
+
   '@smithy/querystring-parser@3.0.11':
     dependencies:
       '@smithy/types': 3.7.2
       tslib: 2.8.1
 
+  '@smithy/querystring-parser@4.0.3':
+    dependencies:
+      '@smithy/types': 4.3.0
+      tslib: 2.8.1
+
   '@smithy/service-error-classification@3.0.11':
     dependencies:
       '@smithy/types': 3.7.2
@@ -12383,6 +12591,11 @@ snapshots:
       '@smithy/types': 3.7.2
       tslib: 2.8.1
 
+  '@smithy/shared-ini-file-loader@4.0.3':
+    dependencies:
+      '@smithy/types': 4.3.0
+      tslib: 2.8.1
+
   '@smithy/signature-v4@4.2.4':
     dependencies:
       '@smithy/is-array-buffer': 3.0.0
@@ -12404,11 +12617,21 @@ snapshots:
       '@smithy/util-stream': 3.3.4
       tslib: 2.8.1
 
+  '@smithy/smithy-client@4.3.0':
+    dependencies:
+      '@smithy/core': 3.4.0
+      '@smithy/middleware-endpoint': 4.1.7
+      '@smithy/middleware-stack': 4.0.3
+      '@smithy/protocol-http': 5.1.1
+      '@smithy/types': 4.3.0
+      '@smithy/util-stream': 4.2.1
+      tslib: 2.8.1
+
   '@smithy/types@3.7.2':
     dependencies:
       tslib: 2.8.1
 
-  '@smithy/types@4.1.0':
+  '@smithy/types@4.3.0':
     dependencies:
       tslib: 2.8.1
 
@@ -12418,16 +12641,32 @@ snapshots:
       '@smithy/types': 3.7.2
       tslib: 2.8.1
 
+  '@smithy/url-parser@4.0.3':
+    dependencies:
+      '@smithy/querystring-parser': 4.0.3
+      '@smithy/types': 4.3.0
+      tslib: 2.8.1
+
   '@smithy/util-base64@3.0.0':
     dependencies:
       '@smithy/util-buffer-from': 3.0.0
       '@smithy/util-utf8': 3.0.0
       tslib: 2.8.1
 
+  '@smithy/util-base64@4.0.0':
+    dependencies:
+      '@smithy/util-buffer-from': 4.0.0
+      '@smithy/util-utf8': 4.0.0
+      tslib: 2.8.1
+
   '@smithy/util-body-length-browser@3.0.0':
     dependencies:
       tslib: 2.8.1
 
+  '@smithy/util-body-length-browser@4.0.0':
+    dependencies:
+      tslib: 2.8.1
+
   '@smithy/util-body-length-node@3.0.0':
     dependencies:
       tslib: 2.8.1
@@ -12442,6 +12681,11 @@ snapshots:
       '@smithy/is-array-buffer': 3.0.0
       tslib: 2.8.1
 
+  '@smithy/util-buffer-from@4.0.0':
+    dependencies:
+      '@smithy/is-array-buffer': 4.0.0
+      tslib: 2.8.1
+
   '@smithy/util-config-provider@3.0.0':
     dependencies:
       tslib: 2.8.1
@@ -12474,11 +12718,20 @@ snapshots:
     dependencies:
       tslib: 2.8.1
 
+  '@smithy/util-hex-encoding@4.0.0':
+    dependencies:
+      tslib: 2.8.1
+
   '@smithy/util-middleware@3.0.11':
     dependencies:
       '@smithy/types': 3.7.2
       tslib: 2.8.1
 
+  '@smithy/util-middleware@4.0.3':
+    dependencies:
+      '@smithy/types': 4.3.0
+      tslib: 2.8.1
+
   '@smithy/util-retry@3.0.11':
     dependencies:
       '@smithy/service-error-classification': 3.0.11
@@ -12496,10 +12749,25 @@ snapshots:
       '@smithy/util-utf8': 3.0.0
       tslib: 2.8.1
 
+  '@smithy/util-stream@4.2.1':
+    dependencies:
+      '@smithy/fetch-http-handler': 5.0.3
+      '@smithy/node-http-handler': 4.0.5
+      '@smithy/types': 4.3.0
+      '@smithy/util-base64': 4.0.0
+      '@smithy/util-buffer-from': 4.0.0
+      '@smithy/util-hex-encoding': 4.0.0
+      '@smithy/util-utf8': 4.0.0
+      tslib: 2.8.1
+
   '@smithy/util-uri-escape@3.0.0':
     dependencies:
       tslib: 2.8.1
 
+  '@smithy/util-uri-escape@4.0.0':
+    dependencies:
+      tslib: 2.8.1
+
   '@smithy/util-utf8@2.3.0':
     dependencies:
       '@smithy/util-buffer-from': 2.2.0
@@ -12510,6 +12778,11 @@ snapshots:
       '@smithy/util-buffer-from': 3.0.0
       tslib: 2.8.1
 
+  '@smithy/util-utf8@4.0.0':
+    dependencies:
+      '@smithy/util-buffer-from': 4.0.0
+      tslib: 2.8.1
+
   '@smithy/util-waiter@3.2.0':
     dependencies:
       '@smithy/abort-controller': 3.1.9
@@ -13994,6 +14267,11 @@ snapshots:
 
   buffer-from@1.1.2: {}
 
+  buffer@5.6.0:
+    dependencies:
+      base64-js: 1.5.1
+      ieee754: 1.2.1
+
   buffer@5.7.1:
     dependencies:
       base64-js: 1.5.1
@@ -17981,6 +18259,11 @@ snapshots:
 
   statuses@2.0.1: {}
 
+  stream-browserify@3.0.0:
+    dependencies:
+      inherits: 2.0.4
+      readable-stream: 3.6.2
+
   streamsearch@1.1.0: {}
 
   string-length@4.0.2: