@nostrify/nostrify 0.47.0 → 0.48.1

package/dist/uploaders/NostrBuildUploader.ts

@@ -1,15 +1,15 @@
-import { z } from 'zod';
+import { z } from "zod";
 
-import { N64 } from '../utils/N64.ts';
-import { NIP98 } from '../NIP98.ts';
-import type { NostrSigner, NUploader } from '@nostrify/types';
+import { N64 } from "../utils/N64.ts";
+import { NIP98 } from "../NIP98.ts";
+import type { NostrSigner, NUploader } from "@nostrify/types";
 
 /** NostrBuildUploader options. */
 export interface NostrBuildUploaderOpts {
   /** nostr.build endpoint to use. Default: `https://nostr.build/api/v2/upload/files` */
   endpoint?: string;
   /** Signer to authenticate with NIP-98 requests. */
-  signer?: NostrSigner;
+  signer: NostrSigner;
   /** Custom fetch implementation. */
   fetch?: typeof fetch;
 }
@@ -17,11 +17,11 @@ export interface NostrBuildUploaderOpts {
 /** Upload files to nostr.build or another compatible server. */
 export class NostrBuildUploader implements NUploader {
   private endpoint: string;
-  private signer?: NostrSigner;
+  private signer: NostrSigner;
   private fetch: typeof fetch;
 
   constructor(opts?: NostrBuildUploaderOpts) {
-    this.endpoint = opts?.endpoint ?? 'https://nostr.build/api/v2/upload/files';
+    this.endpoint = opts?.endpoint ?? "https://nostr.build/api/v2/upload/files";
     this.signer = opts?.signer;
     this.fetch = opts?.fetch ?? globalThis.fetch.bind(globalThis);
   }
@@ -29,12 +29,12 @@ export class NostrBuildUploader implements NUploader {
   async upload(
     file: File,
     opts?: { signal?: AbortSignal },
-  ): Promise<[['url', string], ...string[][]]> {
+  ): Promise<[["url", string], ...string[][]]> {
     const formData = new FormData();
-    formData.append('fileToUpload', file);
+    formData.append("fileToUpload", file);
 
     const request = new Request(this.endpoint, {
-      method: 'POST',
+      method: "POST",
       body: formData,
       signal: opts?.signal,
     });
@@ -42,7 +42,7 @@ export class NostrBuildUploader implements NUploader {
     if (this.signer) {
       const t = await NIP98.template(request);
       const event = await this.signer.signEvent(t);
-      request.headers.set('authorization', `Nostr ${N64.encodeEvent(event)}`);
+      request.headers.set("authorization", `Nostr ${N64.encodeEvent(event)}`);
     }
 
     const response = await this.fetch(request);
@@ -50,20 +50,20 @@ export class NostrBuildUploader implements NUploader {
     console.log(json);
     const [data] = NostrBuildUploader.schema().parse(json).data;
 
-    const tags: [['url', string], ...string[][]] = [
-      ['url', data.url],
-      ['m', data.mime],
-      ['x', data.sha256],
-      ['ox', data.original_sha256],
-      ['size', data.size.toString()],
+    const tags: [["url", string], ...string[][]] = [
+      ["url", data.url],
+      ["m", data.mime],
+      ["x", data.sha256],
+      ["ox", data.original_sha256],
+      ["size", data.size.toString()],
     ];
 
     if (data.dimensions) {
-      tags.push(['dim', `${data.dimensions.width}x${data.dimensions.height}`]);
+      tags.push(["dim", `${data.dimensions.width}x${data.dimensions.height}`]);
     }
 
     if (data.blurhash) {
-      tags.push(['blurhash', data.blurhash]);
+      tags.push(["blurhash", data.blurhash]);
     }
 
     return tags;

package/dist/utils/N64.d.ts

@@ -1,4 +1,4 @@
-import type { NostrEvent } from '@nostrify/types';
+import type { NostrEvent } from "@nostrify/types";
 /** Nostr base64 helper utilities. */
 export declare class N64 {
     /** Encode an event as a base64 string. */

package/dist/utils/N64.js

@@ -1,13 +1,13 @@
-import { decodeBase64, encodeBase64 } from "@std/encoding/base64";
+import { fromBase64, toBase64 } from "@smithy/util-base64";
 import { NSchema as n } from "../NSchema.js";
 class N64 {
   /** Encode an event as a base64 string. */
   static encodeEvent(event) {
-    return encodeBase64(JSON.stringify(event));
+    return toBase64(JSON.stringify(event));
   }
   /** Decode an event from a base64 string. Validates the event's structure but does not verify its signature. */
   static decodeEvent(base64) {
-    const bytes = decodeBase64(base64);
+    const bytes = fromBase64(base64);
     const text = new TextDecoder().decode(bytes);
     return n.json().pipe(n.event()).parse(text);
   }

package/dist/utils/N64.ts

@@ -1,18 +1,18 @@
-import type { NostrEvent } from '@nostrify/types';
-import { decodeBase64, encodeBase64 } from '@std/encoding/base64';
+import type { NostrEvent } from "@nostrify/types";
+import { fromBase64, toBase64 } from "@smithy/util-base64";
 
-import { NSchema as n } from '../NSchema.ts';
+import { NSchema as n } from "../NSchema.ts";
 
 /** Nostr base64 helper utilities. */
 export class N64 {
   /** Encode an event as a base64 string. */
   static encodeEvent(event: NostrEvent): string {
-    return encodeBase64(JSON.stringify(event));
+    return toBase64(JSON.stringify(event));
   }
 
   /** Decode an event from a base64 string. Validates the event's structure but does not verify its signature. */
   static decodeEvent(base64: string): NostrEvent {
-    const bytes = decodeBase64(base64);
+    const bytes = fromBase64(base64);
     const text = new TextDecoder().decode(bytes);
 
     return n

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nostrify/nostrify",
-  "version": "0.47.0",
+  "version": "0.48.1",
   "exports": {
     ".": "./dist/mod.js",
     "./ln": "./dist/ln/mod.js",
@@ -12,14 +12,15 @@
   "types": "dist/mod.d.ts",
   "type": "module",
   "dependencies": {
-    "ws": "^8.18.3",
+    "@scure/base": "^2.0.0",
+    "@smithy/util-base64": "^4.3.0",
+    "@smithy/util-hex-encoding": "^4.2.0",
+    "@types/node": "^24.1.0",
     "lru-cache": "^10.2.0",
     "nostr-tools": "^2.13.0",
     "websocket-ts": "^2.2.1",
+    "ws": "^8.18.3",
     "zod": "^3.23.8",
-    "@types/node": "^24.1.0",
-    "@scure/base": "^1.2.6",
-    "@std/encoding": "npm:@jsr/std__encoding@^0.224.1",
     "@nostrify/types": "0.36.7"
   },
   "publishConfig": {

package/uploaders/BlossomUploader.ts

@@ -1,13 +1,13 @@
-import type { NostrSigner, NUploader } from '@nostrify/types';
-import { encodeHex } from '@std/encoding/hex';
-import { z } from 'zod';
+import type { NostrSigner, NUploader } from "@nostrify/types";
+import { toHex } from "@smithy/util-hex-encoding";
+import { z } from "zod";
 
-import { N64 } from '../utils/N64.ts';
+import { N64 } from "../utils/N64.ts";
 
 /** BlossomUploader options. */
 export interface BlossomUploaderOpts {
   /** Blossom servers to use. */
-  servers: Request['url'][];
+  servers: Request["url"][];
   /** Signer for Blossom authorizations. */
   signer: NostrSigner;
   /** Custom fetch implementation. */
@@ -18,7 +18,7 @@ export interface BlossomUploaderOpts {
 
 /** Upload files to Blossom servers. */
 export class BlossomUploader implements NUploader {
-  private servers: Request['url'][];
+  private servers: Request["url"][];
   private signer: NostrSigner;
   private fetch: typeof fetch;
   private expiresIn: number;
@@ -33,10 +33,12 @@ export class BlossomUploader implements NUploader {
   async upload(
     file: File,
     opts?: { signal?: AbortSignal },
-  ): Promise<[['url', string], ...string[][]]> {
-    const x = encodeHex(
-      await crypto.subtle.digest('SHA-256', await file.arrayBuffer()),
+  ): Promise<[["url", string], ...string[][]]> {
+    const digest = await crypto.subtle.digest(
+      "SHA-256",
+      await file.arrayBuffer(),
     );
+    const x = toHex(new Uint8Array(digest));
 
     const now = Date.now();
     const expiration = now + this.expiresIn;
@@ -46,24 +48,24 @@ export class BlossomUploader implements NUploader {
       content: `Upload ${file.name}`,
       created_at: Math.floor(now / 1000),
       tags: [
-        ['t', 'upload'],
-        ['x', x],
-        ['size', file.size.toString()],
-        ['expiration', Math.floor(expiration / 1000).toString()],
+        ["t", "upload"],
+        ["x", x],
+        ["size", file.size.toString()],
+        ["expiration", Math.floor(expiration / 1000).toString()],
       ],
     });
 
     const authorization = `Nostr ${N64.encodeEvent(event)}`;
 
     return Promise.any(this.servers.map(async (server) => {
-      const url = new URL('/upload', server);
+      const url = new URL("/upload", server);
 
       const response = await this.fetch(url, {
-        method: 'PUT',
+        method: "PUT",
         body: file,
         headers: {
           authorization,
-          'content-type': file.type,
+          "content-type": file.type,
         },
         signal: opts?.signal,
       });
@@ -71,15 +73,15 @@ export class BlossomUploader implements NUploader {
       const json = await response.json();
       const data = BlossomUploader.schema().parse(json);
 
-      const tags: [['url', string], ...string[][]] = [
-        ['url', data.url],
-        ['x', data.sha256],
-        ['ox', data.sha256],
-        ['size', data.size.toString()],
+      const tags: [["url", string], ...string[][]] = [
+        ["url", data.url],
+        ["x", data.sha256],
+        ["ox", data.sha256],
+        ["size", data.size.toString()],
       ];
 
       if (data.type) {
-        tags.push(['m', data.type]);
+        tags.push(["m", data.type]);
       }
 
       return tags;

package/uploaders/NostrBuildUploader.test.ts

@@ -6,6 +6,8 @@ import fs from "node:fs/promises";
 
 import { NostrBuildUploader } from "./NostrBuildUploader.ts";
 import { Readable } from "node:stream";
+import { NSecSigner } from "../NSecSigner.ts";
+import { hexToBytes } from "nostr-tools/utils";
 
 await test(
   "NostrBuildUploader.upload",
@@ -18,7 +20,20 @@ await test(
       .blob();
     const file = new File([blob], "voadi.png", { type: "image/png" });
 
-    const uploader = new NostrBuildUploader();
+    const seckey = process.env.NOSTRIFY_NBU_SECRET_KEY;
+    if (!seckey) {
+      throw new Error(
+        "nostr.build with default uploader requires a secret key to be configured",
+      );
+    }
+
+    const uploader = new NostrBuildUploader({
+      signer: new NSecSigner(
+        hexToBytes(
+          seckey,
+        ),
+      ),
+    });
     const tags = await uploader.upload(file);
 
     deepStrictEqual(tags, [

package/uploaders/NostrBuildUploader.ts

@@ -1,15 +1,15 @@
-import { z } from 'zod';
+import { z } from "zod";
 
-import { N64 } from '../utils/N64.ts';
-import { NIP98 } from '../NIP98.ts';
-import type { NostrSigner, NUploader } from '@nostrify/types';
+import { N64 } from "../utils/N64.ts";
+import { NIP98 } from "../NIP98.ts";
+import type { NostrSigner, NUploader } from "@nostrify/types";
 
 /** NostrBuildUploader options. */
 export interface NostrBuildUploaderOpts {
   /** nostr.build endpoint to use. Default: `https://nostr.build/api/v2/upload/files` */
   endpoint?: string;
   /** Signer to authenticate with NIP-98 requests. */
-  signer?: NostrSigner;
+  signer: NostrSigner;
   /** Custom fetch implementation. */
   fetch?: typeof fetch;
 }
@@ -17,11 +17,11 @@ export interface NostrBuildUploaderOpts {
 /** Upload files to nostr.build or another compatible server. */
 export class NostrBuildUploader implements NUploader {
   private endpoint: string;
-  private signer?: NostrSigner;
+  private signer: NostrSigner;
   private fetch: typeof fetch;
 
   constructor(opts?: NostrBuildUploaderOpts) {
-    this.endpoint = opts?.endpoint ?? 'https://nostr.build/api/v2/upload/files';
+    this.endpoint = opts?.endpoint ?? "https://nostr.build/api/v2/upload/files";
     this.signer = opts?.signer;
     this.fetch = opts?.fetch ?? globalThis.fetch.bind(globalThis);
   }
@@ -29,12 +29,12 @@ export class NostrBuildUploader implements NUploader {
   async upload(
     file: File,
     opts?: { signal?: AbortSignal },
-  ): Promise<[['url', string], ...string[][]]> {
+  ): Promise<[["url", string], ...string[][]]> {
     const formData = new FormData();
-    formData.append('fileToUpload', file);
+    formData.append("fileToUpload", file);
 
     const request = new Request(this.endpoint, {
-      method: 'POST',
+      method: "POST",
       body: formData,
       signal: opts?.signal,
     });
@@ -42,7 +42,7 @@ export class NostrBuildUploader implements NUploader {
     if (this.signer) {
       const t = await NIP98.template(request);
       const event = await this.signer.signEvent(t);
-      request.headers.set('authorization', `Nostr ${N64.encodeEvent(event)}`);
+      request.headers.set("authorization", `Nostr ${N64.encodeEvent(event)}`);
     }
 
     const response = await this.fetch(request);
@@ -50,20 +50,20 @@ export class NostrBuildUploader implements NUploader {
     console.log(json);
     const [data] = NostrBuildUploader.schema().parse(json).data;
 
-    const tags: [['url', string], ...string[][]] = [
-      ['url', data.url],
-      ['m', data.mime],
-      ['x', data.sha256],
-      ['ox', data.original_sha256],
-      ['size', data.size.toString()],
+    const tags: [["url", string], ...string[][]] = [
+      ["url", data.url],
+      ["m", data.mime],
+      ["x", data.sha256],
+      ["ox", data.original_sha256],
+      ["size", data.size.toString()],
     ];
 
     if (data.dimensions) {
-      tags.push(['dim', `${data.dimensions.width}x${data.dimensions.height}`]);
+      tags.push(["dim", `${data.dimensions.width}x${data.dimensions.height}`]);
     }
 
     if (data.blurhash) {
-      tags.push(['blurhash', data.blurhash]);
+      tags.push(["blurhash", data.blurhash]);
     }
 
     return tags;

package/utils/N64.ts

@@ -1,18 +1,18 @@
-import type { NostrEvent } from '@nostrify/types';
-import { decodeBase64, encodeBase64 } from '@std/encoding/base64';
+import type { NostrEvent } from "@nostrify/types";
+import { fromBase64, toBase64 } from "@smithy/util-base64";
 
-import { NSchema as n } from '../NSchema.ts';
+import { NSchema as n } from "../NSchema.ts";
 
 /** Nostr base64 helper utilities. */
 export class N64 {
   /** Encode an event as a base64 string. */
   static encodeEvent(event: NostrEvent): string {
-    return encodeBase64(JSON.stringify(event));
+    return toBase64(JSON.stringify(event));
   }
 
   /** Decode an event from a base64 string. Validates the event's structure but does not verify its signature. */
   static decodeEvent(base64: string): NostrEvent {
-    const bytes = decodeBase64(base64);
+    const bytes = fromBase64(base64);
     const text = new TextDecoder().decode(bytes);
 
     return n