diff --git a/packages/editor/package.json b/packages/editor/package.json index 9574570..e54e999 100644 --- a/packages/editor/package.json +++ b/packages/editor/package.json @@ -41,7 +41,7 @@ "@tiptap/suggestion": "^2.11.5", "@welshman/lib": "workspace:*", "@welshman/util": "workspace:*", - "nostr-editor-coracle-workaround": "0.0.4-pre.18", + "nostr-editor": "^1.0.0", "nostr-tools": "^2.14.2", "tippy.js": "^6.3.7" }, diff --git a/packages/util/src/Nip86.ts b/packages/util/src/Nip86.ts index 2e82f3c..d59830d 100644 --- a/packages/util/src/Nip86.ts +++ b/packages/util/src/Nip86.ts @@ -1,4 +1,3 @@ -import {postJson} from "@welshman/lib" import {SignedEvent} from "./Events.js" import {makeHttpAuthHeader} from "./Nip98.js" @@ -28,14 +27,30 @@ export type ManagementRequest = { params: string[] } -export const sendManagementRequest = ( +export type ManagementResponse = { + result?: any + error?: string +} + +export const sendManagementRequest = async ( url: string, request: ManagementRequest, authEvent: SignedEvent, -) => - postJson(url, request, { - headers: { - "Content-Type": "application/nostr+json+rpc", - Authorization: makeHttpAuthHeader(authEvent), - }, - }) +): Promise => { + try { + const res = await fetch(url, { + method: "POST", + body: JSON.stringify(request), + headers: { + "Content-Type": "application/nostr+json+rpc", + Authorization: makeHttpAuthHeader(authEvent), + }, + }) + + return await res.json() + } catch (e) { + const msg = "Failed to send management request" + console.log(msg, ":", e) + return {error: "failed to send management request"} + } +} diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 62fc62f..97c17b3 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -175,9 +175,9 @@ importers: '@welshman/util': specifier: workspace:* version: link:../util - nostr-editor-coracle-workaround: - specifier: 0.0.4-pre.18 - version: 0.0.4-pre.18(@tiptap/core@2.11.7(@tiptap/pm@2.11.7))(@tiptap/extension-image@2.11.7(@tiptap/core@2.11.7(@tiptap/pm@2.11.7)))(@tiptap/extension-link@2.11.7(@tiptap/core@2.11.7(@tiptap/pm@2.11.7))(@tiptap/pm@2.11.7))(@tiptap/pm@2.11.7)(linkifyjs@4.2.0)(nostr-tools@2.14.2(typescript@5.8.2))(prosemirror-markdown@1.13.2)(prosemirror-model@1.25.0)(prosemirror-state@1.4.3)(tiptap-markdown@0.8.10(@tiptap/core@2.11.7(@tiptap/pm@2.11.7))) + nostr-editor: + specifier: ^1.0.0 + version: 1.0.0(@tiptap/core@2.11.7(@tiptap/pm@2.11.7))(@tiptap/extension-image@2.11.7(@tiptap/core@2.11.7(@tiptap/pm@2.11.7)))(@tiptap/extension-link@2.11.7(@tiptap/core@2.11.7(@tiptap/pm@2.11.7))(@tiptap/pm@2.11.7))(@tiptap/pm@2.11.7)(linkifyjs@4.2.0)(nostr-tools@2.14.2(typescript@5.8.2))(prosemirror-markdown@1.13.2)(prosemirror-model@1.25.0)(prosemirror-state@1.4.3)(prosemirror-view@1.38.1)(tiptap-markdown@0.8.10(@tiptap/core@2.11.7(@tiptap/pm@2.11.7))) nostr-tools: specifier: ^2.14.2 version: 2.14.2(typescript@5.8.2) @@ -1995,8 +1995,8 @@ packages: resolution: {integrity: sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==} engines: {node: '>=0.10.0'} - nostr-editor-coracle-workaround@0.0.4-pre.18: - resolution: {integrity: sha512-QAoySZ9uOsR7C4nnVbcEpVgT0vLxwZxlYhE2NsJzmeoK7nTgkcHFaZkn/QMlUem3qjT8AolW8X5TrRdnZ5eIZQ==} + nostr-editor@1.0.0: + resolution: {integrity: sha512-+TL3G0m7WsXeEAitxzQhun7hyARxqRANjGIS2z9CBbniCGvT/Wz6YLgUnUysnBg3tmSgMZg5FWhaDPwfvdvbSw==} engines: {node: '>=18.16.1'} peerDependencies: '@tiptap/core': ^2.6.6 @@ -2004,10 +2004,11 @@ packages: '@tiptap/extension-link': ^2.6.6 '@tiptap/pm': ^2.6.6 linkifyjs: ^4.1.3 - nostr-tools: ^2.14.2 + nostr-tools: ~2.14.2 prosemirror-markdown: ^1.13.0 prosemirror-model: ^1.22.3 prosemirror-state: ^1.4.3 + prosemirror-view: ^1.39.3 tiptap-markdown: ^0.8.10 nostr-signer-capacitor-plugin@0.0.4: @@ -4181,7 +4182,7 @@ snapshots: normalize-path@3.0.0: {} - nostr-editor-coracle-workaround@0.0.4-pre.18(@tiptap/core@2.11.7(@tiptap/pm@2.11.7))(@tiptap/extension-image@2.11.7(@tiptap/core@2.11.7(@tiptap/pm@2.11.7)))(@tiptap/extension-link@2.11.7(@tiptap/core@2.11.7(@tiptap/pm@2.11.7))(@tiptap/pm@2.11.7))(@tiptap/pm@2.11.7)(linkifyjs@4.2.0)(nostr-tools@2.14.2(typescript@5.8.2))(prosemirror-markdown@1.13.2)(prosemirror-model@1.25.0)(prosemirror-state@1.4.3)(tiptap-markdown@0.8.10(@tiptap/core@2.11.7(@tiptap/pm@2.11.7))): + nostr-editor@1.0.0(@tiptap/core@2.11.7(@tiptap/pm@2.11.7))(@tiptap/extension-image@2.11.7(@tiptap/core@2.11.7(@tiptap/pm@2.11.7)))(@tiptap/extension-link@2.11.7(@tiptap/core@2.11.7(@tiptap/pm@2.11.7))(@tiptap/pm@2.11.7))(@tiptap/pm@2.11.7)(linkifyjs@4.2.0)(nostr-tools@2.14.2(typescript@5.8.2))(prosemirror-markdown@1.13.2)(prosemirror-model@1.25.0)(prosemirror-state@1.4.3)(prosemirror-view@1.38.1)(tiptap-markdown@0.8.10(@tiptap/core@2.11.7(@tiptap/pm@2.11.7))): dependencies: '@tiptap/core': 2.11.7(@tiptap/pm@2.11.7) '@tiptap/extension-image': 2.11.7(@tiptap/core@2.11.7(@tiptap/pm@2.11.7)) @@ -4194,6 +4195,7 @@ snapshots: prosemirror-markdown: 1.13.2 prosemirror-model: 1.25.0 prosemirror-state: 1.4.3 + prosemirror-view: 1.38.1 tiptap-markdown: 0.8.10(@tiptap/core@2.11.7(@tiptap/pm@2.11.7)) nostr-signer-capacitor-plugin@0.0.4(@capacitor/core@7.2.0):