From 18ae6f6044249350035bbc31145d4b665f92e533 Mon Sep 17 00:00:00 2001
From: Jon Staab <shtaab@gmail.com>
Date: Fri, 6 Jun 2025 16:38:11 -0700
Subject: [PATCH] Use new editor uploads

---
 package.json                                  |   3 +-
 pnpm-lock.yaml                                | Bin 336096 -> 336655 bytes
 .../components/ContentLinkBlockImage.svelte   |  11 +--
 src/app/components/SignUpKey.svelte           |   2 +-
 src/app/editor/index.ts                       |  91 +++++++++++++++---
 src/lib/util.ts                               |   3 +-
 src/routes/+layout.svelte                     |   3 -
 src/routes/settings/profile/+page.svelte      |   2 +-
 8 files changed, 87 insertions(+), 28 deletions(-)

diff --git a/package.json b/package.json
index 5a7208f1..3ba766d8 100644
--- a/package.json
+++ b/package.json
@@ -45,8 +45,6 @@
     "@capacitor/core": "^7.0.1",
     "@capacitor/ios": "^7.0.0",
     "@capacitor/keyboard": "^7.0.0",
-    "@noble/curves": "^1.5.0",
-    "@noble/hashes": "^1.4.0",
     "@poppanator/sveltekit-svg": "^4.2.1",
     "@sentry/browser": "^8.35.0",
     "@sveltejs/adapter-static": "^3.0.4",
@@ -66,6 +64,7 @@
     "@welshman/signer": "^0.3.0",
     "@welshman/store": "^0.3.0",
     "@welshman/util": "^0.3.0",
+    "compressorjs": "^1.2.1",
     "daisyui": "^4.12.10",
     "date-picker-svelte": "^2.13.0",
     "dotenv": "^16.4.5",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 59335baab6ae5030de3662be50f0130c248b96f1..59512765d7121fcf1ff1e384cdef572316813f62 100644
GIT binary patch
delta 835
zcmZ`%OH9)M7*1)42tFVTm4~t@iI_>(J-V$N%pPs`V9b@R-PXheXuGysY0LUp8DjLJ
zM`LEvqZ;o9gUR9zJm|?pZzf)dSB&xQMIdm~|MKVm^8bJGJ@)rJPd|FLXTY6zpfohd
zX={2*Fbu8LT^YUt2H;?K`I4vqu)~3!v5S*00Ia(louxC5DiVCKN^>IS$U!96Y%BSc
zS!>rdvK`K)n-;5=eHFzh;$boA=bWZp#$)x8p(RvZO0yElv$X|*$`(@=sZ@$<0gFJ~
zuS4Ku_t*C2o&7f!0K~e9>$7wtWnc==M+@zaE>`huJyHz$3ayNU`3*dhqIf5>(V((E
z$scLq1uYia(36hS38OS_v6&9m3YmpYwBTp5YKhSp-mDVYaCh(a_|DJmjmHy;CCF>~
z9Jiv{E5@9u&8;fhYCHr7G4~k-+++})E0xkt3Za~`Z-Z&dwv%12Ahj@~+znPscu}h-
z6YE+ou%2_o3?|4lp0`nCNp|E$ki#va?t~X3xQ=6Vn$?%2GD^kP#ooOrpiU2*YVH2s
z?VDqKqL6I}OKMS~eEGa>C!%d9Nf9W|3wb)K=R%~hKvv`y-j3KpEo5MF-bqkIJE~OE
z8C6Q<?4;EosESok(;b$xQ#RksQ@sxikbB;L#46|}62L9G#QN*yx`_(3L@h=%($B6W
zN+eG3t0W`Du<V**s+h&LkWianSmY`NrdC>PP({)d5tOnDO%qj6E)YTq#jX-m8fi7d
zW|z7@<?ed=&bSY@psViphrsj``~c|T2YqipgBToiAAJI0Fa{&t`1Y84=RG)oH1sy#
zgYgUybBm*pr}qVbh>_#vR{%6|g1U!j#eLZa-EiY)p#k^WC@|jpF$(<|_Ws{I7@7BO
zZuP#+K<>E<r!qH;_+gOUkrXr)SpDbiy!Xg?7#Z{)muwuzVcvU~{+<|sCiCZyb%X;a
K|2tby{q<ikS{2Oz

delta 389
zcmeA_Ci38*$OaYW>C;45_$FUw5@j~jGo5TGAi`>>XQ5{}ecmo+aj38fRM=e4aI-XX
zA@}Bsd?NE1Ev7dzGHQgDCl-|#7vyV)MurBY78nF-mzAW1Ihll}=UKSB2WDAhRyrA{
z=LLlqSC!<3dW3iy2OH*Pq-2Ks6$ga6`xum!rkH!>1O;UqM!1%m`xF{_yNBfYPH&vg
zD80FET@NFpIm8+#iwLKH;yjbG5PfeiNB2UPs-*I&k`!&T$dXj!0FyBD%*3=@Ba@_x
zbeB~9+?=3NZ?lTr@PJZhzasAvqcWGov?vSTG%uf=<O~;g{j$i!v_RJ^ur-tG)`@T4
zwIQKx`%ZJlH2LkD!x<f?Oy5|~B01f63zK~NwKt60uf1W~coyhm!IR7e%)nrn?6_Wh
z`lVgW79h@c-rdX&9$;1gGfTK2Gc@?5Ktj`jLYdnQL|N<ww@*=HnZ&cb)0jorXFJgR
GxWxeDv4O|{

diff --git a/src/app/components/ContentLinkBlockImage.svelte b/src/app/components/ContentLinkBlockImage.svelte
index 3848c081..19d4eca6 100644
--- a/src/app/components/ContentLinkBlockImage.svelte
+++ b/src/app/components/ContentLinkBlockImage.svelte
@@ -1,8 +1,7 @@
 <script lang="ts">
   import {onMount, onDestroy} from "svelte"
   import {displayUrl} from "@welshman/lib"
-  import {getTags, getTagValue, tagsFromIMeta} from "@welshman/util"
-  import {decryptFile} from "@welshman/editor"
+  import {getTags, decryptFile, getTagValue, tagsFromIMeta} from "@welshman/util"
   import Icon from "@lib/components/Icon.svelte"
   import {imgproxy} from "@app/state"
 
@@ -16,7 +15,7 @@
 
   const key = getTagValue("decryption-key", meta)
   const nonce = getTagValue("decryption-nonce", meta)
-  const encryptionAlgorithm = getTagValue("encryption-algorithm", meta)
+  const algorithm = getTagValue("encryption-algorithm", meta)
 
   const onError = () => {
     hasError = true
@@ -26,14 +25,14 @@
   let src = $state(imgproxy(url))
 
   onMount(async () => {
-    if (encryptionAlgorithm === "aes-gcm" && key && nonce) {
+    if (algorithm === "aes-gcm" && key && nonce) {
       const response = await fetch(url)
 
       if (response.ok) {
         const ciphertext = new Uint8Array(await response.arrayBuffer())
-        const decryptedData = decryptFile({ciphertext, key, nonce, encryptionAlgorithm})
+        const decryptedData = await decryptFile({ciphertext, key, nonce, algorithm})
 
-        src = URL.createObjectURL(new Blob([new Uint8Array(decryptedData)]))
+        src = URL.createObjectURL(new Blob([decryptedData]))
       }
     }
   })
diff --git a/src/app/components/SignUpKey.svelte b/src/app/components/SignUpKey.svelte
index 9afbacc4..c153f24d 100644
--- a/src/app/components/SignUpKey.svelte
+++ b/src/app/components/SignUpKey.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import {encrypt} from "nostr-tools/nip49"
-  import {hexToBytes} from "@noble/hashes/utils"
+  import {hexToBytes} from "@welshman/lib"
   import {makeSecret} from "@welshman/signer"
   import {preventDefault, downloadText} from "@lib/html"
   import Link from "@lib/components/Link.svelte"
diff --git a/src/app/editor/index.ts b/src/app/editor/index.ts
index cab84a05..7c5376a9 100644
--- a/src/app/editor/index.ts
+++ b/src/app/editor/index.ts
@@ -1,15 +1,25 @@
 import {mount} from "svelte"
 import type {Writable} from "svelte/store"
 import {get} from "svelte/store"
-import type {StampedEvent} from "@welshman/util"
-import {getTagValues, getListTags} from "@welshman/util"
+import {sha256} from "@welshman/lib"
+import {
+  getTagValues,
+  getTagValue,
+  encryptFile,
+  uploadBlob,
+  makeBlossomAuthEvent,
+  getListTags,
+} from "@welshman/util"
 import {Router} from "@welshman/router"
+import {Nip01Signer} from "@welshman/signer"
 import {signer, profileSearch, userBlossomServers} from "@welshman/app"
+import type {FileAttributes} from "@welshman/editor"
 import {Editor, MentionSuggestion, WelshmanExtension} from "@welshman/editor"
 import {makeMentionNodeView} from "./MentionNodeView"
 import ProfileSuggestion from "./ProfileSuggestion.svelte"
+import {pushToast} from "@app/toast"
 
-export const getUploadUrl = () => {
+export const getBlossomServer = () => {
   const userUrls = getTagValues("server", getListTags(userBlossomServers.get()))
 
   for (const url of userUrls) {
@@ -19,12 +29,6 @@ export const getUploadUrl = () => {
   return "https://cdn.satellite.earth"
 }
 
-export const signWithAssert = async (template: StampedEvent) => {
-  const event = await signer.get().sign(template)
-
-  return event!
-}
-
 export const makeEditor = async ({
   aggressive = false,
   autofocus = false,
@@ -53,9 +57,6 @@ export const makeEditor = async ({
     extensions: [
       WelshmanExtension.configure({
         submit,
-        sign: signWithAssert,
-        defaultUploadType: "blossom",
-        defaultUploadUrl: getUploadUrl(),
         extensions: {
           placeholder: {
             config: {
@@ -69,13 +70,77 @@ export const makeEditor = async ({
           },
           fileUpload: {
             config: {
-              encryptionAlgorithm: "aes-gcm",
+              upload: async (attrs: FileAttributes) => {
+                let file: Blob = attrs.file
+
+                if (!file.type.match("image/(webp|gif)")) {
+                  const {default: Compressor} = await import("compressorjs")
+
+                  file = await new Promise((resolve, _reject) => {
+                    new Compressor(file, {
+                      maxWidth: 1024,
+                      maxHeight: 1024,
+                      convertSize: 2 * 1024 * 1024,
+                      success: resolve,
+                      error: e => {
+                        // Non-images break compressor
+                        if (e.toString().includes("File or Blob")) {
+                          return resolve(file)
+                        }
+
+                        _reject(e)
+                      },
+                    })
+                  })
+                }
+
+                const {ciphertext, key, nonce, algorithm} = await encryptFile(file)
+                const tags = [
+                  ["decryption-key", key],
+                  ["decryption-nonce", nonce],
+                  ["encryption-algorithm", algorithm],
+                ]
+
+                file = new File([new Blob([ciphertext])], attrs.file.name, {type: attrs.file.type})
+
+                const server = getBlossomServer()
+                const hashes = [await sha256(await file.arrayBuffer())]
+                const $signer = signer.get() || Nip01Signer.ephemeral()
+                const authTemplate = makeBlossomAuthEvent({action: "upload", server, hashes})
+                const authEvent = await $signer.sign(authTemplate)
+
+                try {
+                  const res = await uploadBlob(server, file, {authEvent})
+                  let {uploaded, url, ...task} = await res.json()
+
+                  if (!uploaded) {
+                    return {error: "Server refused to process the file"}
+                  }
+
+                  // Always append file extension if missing
+                  if (new URL(url).pathname.split(".").length === 1) {
+                    url += "." + attrs.file.type.split("/")[1]
+                  }
+
+                  const result = {...task, tags, url}
+
+                  return {result}
+                } catch (e: any) {
+                  console.error(e)
+                  return {error: e.toString()}
+                }
+              },
               onDrop() {
                 uploading?.set(true)
               },
               onComplete() {
                 uploading?.set(false)
               },
+              onUploadError(currentEditor, task) {
+                currentEditor.commands.removeFailedUploads()
+                pushToast({theme: "error", message: "Failed to upload file"})
+                uploading?.set(false)
+              },
             },
           },
           nprofile: {
diff --git a/src/lib/util.ts b/src/lib/util.ts
index 343e48b9..f35952f6 100644
--- a/src/lib/util.ts
+++ b/src/lib/util.ts
@@ -1,6 +1,5 @@
-import {hexToBytes, bytesToHex} from "@noble/hashes/utils"
 import * as nip19 from "nostr-tools/nip19"
-import {range, DAY} from "@welshman/lib"
+import {range, DAY, hexToBytes, bytesToHex} from "@welshman/lib"
 
 export const nsecEncode = (secret: string) => nip19.nsecEncode(hexToBytes(secret))
 
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index 6b8797ea..da6d2282 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -7,7 +7,6 @@
   import {App} from "@capacitor/app"
   import {dev} from "$app/environment"
   import {goto} from "$app/navigation"
-  import {bytesToHex, hexToBytes} from "@noble/hashes/utils"
   import {identity, memoize, sleep, defer, ago, WEEK, TaskQueue} from "@welshman/lib"
   import type {TrustedEvent, StampedEvent} from "@welshman/util"
   import {
@@ -80,8 +79,6 @@
     Object.assign(window, {
       get,
       nip19,
-      bytesToHex,
-      hexToBytes,
       ...lib,
       ...welshmanSigner,
       ...util,
diff --git a/src/routes/settings/profile/+page.svelte b/src/routes/settings/profile/+page.svelte
index 2553635c..33a6e495 100644
--- a/src/routes/settings/profile/+page.svelte
+++ b/src/routes/settings/profile/+page.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import * as nip19 from "nostr-tools/nip19"
-  import {hexToBytes} from "@noble/hashes/utils"
+  import {hexToBytes} from "@welshman/lib"
   import {displayPubkey, displayProfile} from "@welshman/util"
   import {pubkey, session, displayNip05, deriveProfile} from "@welshman/app"
   import {slideAndFade} from "@lib/transition"