⚡️⚡️⚡️ Self-hosted collaborative bookmark manager to collect, read, annotate, and fully preserve what matters, all in one place.
TypeScript bookmarkbookmark-managercollaborationnextjsreact-nativeread-it-laterself-hostedtypescript
Adopted other import functions to handle streams instead of text
dereulenspiegel8ff1346bf102
diff --git a/lib/api/controllers/migration/importFromHTMLFile.ts b/lib/api/controllers/migration/importFromHTMLFile.tsindex d245e7c5..94a19936 100644--- a/lib/api/controllers/migration/importFromHTMLFile.ts+++ b/lib/api/controllers/migration/importFromHTMLFile.ts@@ -3,12 +3,15 @@ import createFolder from "@/lib/api/storage/createFolder";import { JSDOM } from "jsdom";import { parse, Node, Element, TextNode } from "himalaya";import { hasPassedLimit } from "../../verifyCapacity";+import { Readable } from 'stream';+import streamToBlob from "stream-to-blob";export default async function importFromHTMLFile(userId: number,- rawData: any+ rawStream: Readable) {- const dom = new JSDOM(rawData);+ const rawData: Blob = await streamToBlob(rawStream);+ const dom = new JSDOM(await rawData.arrayBuffer());const document = dom.window.document;// remove bad tagsdiff --git a/lib/api/controllers/migration/importFromLinkwarden.ts b/lib/api/controllers/migration/importFromLinkwarden.tsindex ac6b92d4..374b687c 100644--- a/lib/api/controllers/migration/importFromLinkwarden.ts+++ b/lib/api/controllers/migration/importFromLinkwarden.ts@@ -2,12 +2,15 @@ import { prisma } from "@/lib/api/db";import { Backup } from "@/types/global";import createFolder from "@/lib/api/storage/createFolder";import { hasPassedLimit } from "../../verifyCapacity";+import { Readable } from 'stream';+import streamToBlob from "stream-to-blob";export default async function importFromLinkwarden(userId: number,- rawData: any+ rawStream: Readable) {- const data: Backup = JSON.parse(rawData);+ const rawData: Blob = await streamToBlob(rawStream);+ const data: Backup = JSON.parse(await rawData.text());let totalImports = 0;diff --git a/lib/api/controllers/migration/importFromWallabag.ts b/lib/api/controllers/migration/importFromWallabag.tsindex 0880502e..0450c8f5 100644--- a/lib/api/controllers/migration/importFromWallabag.ts+++ b/lib/api/controllers/migration/importFromWallabag.ts@@ -1,6 +1,8 @@import { prisma } from "@/lib/api/db";import createFolder from "@/lib/api/storage/createFolder";import { hasPassedLimit } from "../../verifyCapacity";+import { Readable } from 'stream';+import streamToBlob from "stream-to-blob";type WallabagBackup = {is_archived: number;@@ -27,9 +29,10 @@ type WallabagBackup = {export default async function importFromWallabag(userId: number,- rawData: any+ rawStream: Readable) {- const data: WallabagBackup = JSON.parse(rawData);+ const rawData: Blob = await streamToBlob(rawStream);+ const data: WallabagBackup = JSON.parse(await rawData.text());const backup = data.filter((e) => e.url);