feat: new UI

ui_src/src/App.tsx

@@ -0,0 +1,13 @@
+import Header from "./views/header";
+import Upload from "./views/upload";
+
+function App() {
+  return (
+    <div className="flex flex-col gap-4 w-[700px] mx-auto mt-[10dvh]">
+      <Header />
+      <Upload />
+    </div>
+  );
+}
+
+export default App;

ui_src/src/assets/react.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="35.93" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 228"><path fill="#00D8FF" d="M210.483 73.824a171.49 171.49 0 0 0-8.24-2.597c.465-1.9.893-3.777 1.273-5.621c6.238-30.281 2.16-54.676-11.769-62.708c-13.355-7.7-35.196.329-57.254 19.526a171.23 171.23 0 0 0-6.375 5.848a155.866 155.866 0 0 0-4.241-3.917C100.759 3.829 77.587-4.822 63.673 3.233C50.33 10.957 46.379 33.89 51.995 62.588a170.974 170.974 0 0 0 1.892 8.48c-3.28.932-6.445 1.924-9.474 2.98C17.309 83.498 0 98.307 0 113.668c0 15.865 18.582 31.778 46.812 41.427a145.52 145.52 0 0 0 6.921 2.165a167.467 167.467 0 0 0-2.01 9.138c-5.354 28.2-1.173 50.591 12.134 58.266c13.744 7.926 36.812-.22 59.273-19.855a145.567 145.567 0 0 0 5.342-4.923a168.064 168.064 0 0 0 6.92 6.314c21.758 18.722 43.246 26.282 56.54 18.586c13.731-7.949 18.194-32.003 12.4-61.268a145.016 145.016 0 0 0-1.535-6.842c1.62-.48 3.21-.974 4.76-1.488c29.348-9.723 48.443-25.443 48.443-41.52c0-15.417-17.868-30.326-45.517-39.844Zm-6.365 70.984c-1.4.463-2.836.91-4.3 1.345c-3.24-10.257-7.612-21.163-12.963-32.432c5.106-11 9.31-21.767 12.459-31.957c2.619.758 5.16 1.557 7.61 2.4c23.69 8.156 38.14 20.213 38.14 29.504c0 9.896-15.606 22.743-40.946 31.14Zm-10.514 20.834c2.562 12.94 2.927 24.64 1.23 33.787c-1.524 8.219-4.59 13.698-8.382 15.893c-8.067 4.67-25.32-1.4-43.927-17.412a156.726 156.726 0 0 1-6.437-5.87c7.214-7.889 14.423-17.06 21.459-27.246c12.376-1.098 24.068-2.894 34.671-5.345a134.17 134.17 0 0 1 1.386 6.193ZM87.276 214.515c-7.882 2.783-14.16 2.863-17.955.675c-8.075-4.657-11.432-22.636-6.853-46.752a156.923 156.923 0 0 1 1.869-8.499c10.486 2.32 22.093 3.988 34.498 4.994c7.084 9.967 14.501 19.128 21.976 27.15a134.668 134.668 0 0 1-4.877 4.492c-9.933 8.682-19.886 14.842-28.658 17.94ZM50.35 144.747c-12.483-4.267-22.792-9.812-29.858-15.863c-6.35-5.437-9.555-10.836-9.555-15.216c0-9.322 13.897-21.212 37.076-29.293c2.813-.98 5.757-1.905 8.812-2.773c3.204 10.42 7.406 21.315 12.477 32.332c-5.137 11.18-9.399 22.249-12.634 32.792a134.718 134.718 0 0 1-6.318-1.979Zm12.378-84.26c-4.811-24.587-1.616-43.134 6.425-47.789c8.564-4.958 27.502 2.111 47.463 19.835a144.318 144.318 0 0 1 3.841 3.545c-7.438 7.987-14.787 17.08-21.808 26.988c-12.04 1.116-23.565 2.908-34.161 5.309a160.342 160.342 0 0 1-1.76-7.887Zm110.427 27.268a347.8 347.8 0 0 0-7.785-12.803c8.168 1.033 15.994 2.404 23.343 4.08c-2.206 7.072-4.956 14.465-8.193 22.045a381.151 381.151 0 0 0-7.365-13.322Zm-45.032-43.861c5.044 5.465 10.096 11.566 15.065 18.186a322.04 322.04 0 0 0-30.257-.006c4.974-6.559 10.069-12.652 15.192-18.18ZM82.802 87.83a323.167 323.167 0 0 0-7.227 13.238c-3.184-7.553-5.909-14.98-8.134-22.152c7.304-1.634 15.093-2.97 23.209-3.984a321.524 321.524 0 0 0-7.848 12.897Zm8.081 65.352c-8.385-.936-16.291-2.203-23.593-3.793c2.26-7.3 5.045-14.885 8.298-22.6a321.187 321.187 0 0 0 7.257 13.246c2.594 4.48 5.28 8.868 8.038 13.147Zm37.542 31.03c-5.184-5.592-10.354-11.779-15.403-18.433c4.902.192 9.899.29 14.978.29c5.218 0 10.376-.117 15.453-.343c-4.985 6.774-10.018 12.97-15.028 18.486Zm52.198-57.817c3.422 7.8 6.306 15.345 8.596 22.52c-7.422 1.694-15.436 3.058-23.88 4.071a382.417 382.417 0 0 0 7.859-13.026a347.403 347.403 0 0 0 7.425-13.565Zm-16.898 8.101a358.557 358.557 0 0 1-12.281 19.815a329.4 329.4 0 0 1-23.444.823c-7.967 0-15.716-.248-23.178-.732a310.202 310.202 0 0 1-12.513-19.846h.001a307.41 307.41 0 0 1-10.923-20.627a310.278 310.278 0 0 1 10.89-20.637l-.001.001a307.318 307.318 0 0 1 12.413-19.761c7.613-.576 15.42-.876 23.31-.876H128c7.926 0 15.743.303 23.354.883a329.357 329.357 0 0 1 12.335 19.695a358.489 358.489 0 0 1 11.036 20.54a329.472 329.472 0 0 1-11 20.722Zm22.56-122.124c8.572 4.944 11.906 24.881 6.52 51.026c-.344 1.668-.73 3.367-1.15 5.09c-10.622-2.452-22.155-4.275-34.23-5.408c-7.034-10.017-14.323-19.124-21.64-27.008a160.789 160.789 0 0 1 5.888-5.4c18.9-16.447 36.564-22.941 44.612-18.3ZM128 90.808c12.625 0 22.86 10.235 22.86 22.86s-10.235 22.86-22.86 22.86s-22.86-10.235-22.86-22.86s10.235-22.86 22.86-22.86Z"></path></svg>

ui_src/src/components/button.tsx

@@ -0,0 +1,33 @@
+import { HTMLProps, useState } from "react";
+
+export default function Button({
+  children,
+  className,
+  onClick,
+  ...props
+}: { onClick?: (e: React.MouseEvent) => Promise<void> } & Omit<
+  HTMLProps<HTMLButtonElement>,
+  "type" | "onClick"
+>) {
+  const [loading, setLoading] = useState(false);
+
+  async function doClick(e: React.MouseEvent) {
+    if (!onClick) return;
+    try {
+      setLoading(true);
+      onClick(e);
+    } finally {
+      setLoading(false);
+    }
+  }
+  return (
+    <button
+      className={`py-2 px-4 rounded-md border-0 text-sm font-semibold bg-neutral-600 hover:bg-neutral-500 ${className} ${props.disabled ? "opacity-50" : ""}`}
+      onClick={doClick}
+      {...props}
+      disabled={loading || (props.disabled ?? false)}
+    >
+      {children}
+    </button>
+  );
+}

ui_src/src/components/profile.tsx

@@ -0,0 +1,20 @@
+import { hexToBech32 } from "@snort/shared";
+import { NostrLink } from "@snort/system";
+import { useUserProfile } from "@snort/system-react";
+
+export default function Profile({ link }: { link: NostrLink }) {
+  const profile = useUserProfile(link.id);
+  return (
+    <div className="flex gap-2 items-center">
+      <img
+        src={profile?.picture}
+        className="rounded-full w-12 h-12 object-fit object-center"
+      />
+      <div>
+        {profile?.display_name ??
+          profile?.name ??
+          hexToBech32("npub", link.id).slice(0, 12)}
+      </div>
+    </div>
+  );
+}

ui_src/src/hooks/login.ts

@@ -0,0 +1,9 @@
+import { useSyncExternalStore } from "react";
+import { Login } from "../login";
+
+export default function useLogin() {
+  return useSyncExternalStore(
+    (c) => Login.hook(c),
+    () => Login.snapshot(),
+  );
+}

ui_src/src/hooks/publisher.ts

@@ -0,0 +1,10 @@
+import { EventPublisher, Nip7Signer } from "@snort/system";
+import useLogin from "./login";
+
+export default function usePublisher() {
+  const login = useLogin();
+  switch (login?.type) {
+    case "nip7":
+      return new EventPublisher(new Nip7Signer(), login.pubkey);
+  }
+}

ui_src/src/index.css

@@ -0,0 +1,8 @@
+@tailwind base;
+@tailwind components;
+@tailwind utilities;
+
+html,
+body {
+  @apply bg-neutral-900 text-white;
+}

ui_src/src/login.ts

@@ -0,0 +1,21 @@
+import { ExternalStore } from "@snort/shared";
+
+export interface LoginSession {
+  type: "nip7" | "amber";
+  pubkey: string;
+}
+
+class LoginStore extends ExternalStore<LoginSession | undefined> {
+  #session?: LoginSession;
+
+  login(session: LoginSession) {
+    this.#session = session;
+    this.notifyChange();
+  }
+
+  takeSnapshot(): LoginSession | undefined {
+    return this.#session ? { ...this.#session } : undefined;
+  }
+}
+
+export const Login = new LoginStore();

ui_src/src/main.tsx

@@ -0,0 +1,22 @@
+import { StrictMode } from "react";
+import { createRoot } from "react-dom/client";
+import App from "./App.tsx";
+import "./index.css";
+import { NostrSystem } from "@snort/system";
+import { SnortContext } from "@snort/system-react";
+
+const system = new NostrSystem({});
+[
+  "wss://nos.lol/",
+  "wss://relay.damus.io/",
+  "wss://relay.nostr.band/",
+  "wss://relay.snort.social/",
+].map((a) => system.ConnectToRelay(a, { read: true, write: true }));
+
+createRoot(document.getElementById("root")!).render(
+  <StrictMode>
+    <SnortContext.Provider value={system}>
+      <App />
+    </SnortContext.Provider>
+  </StrictMode>,
+);

ui_src/src/upload/blossom.ts

@@ -0,0 +1,71 @@
+import { base64, bytesToString } from "@scure/base";
+import { throwIfOffline, unixNow } from "@snort/shared";
+import { EventKind, EventPublisher } from "@snort/system";
+
+export interface BlobDescriptor {
+  url?: string;
+  sha256: string;
+  size: number;
+  type?: string;
+  uploaded?: number;
+}
+
+export class Blossom {
+  constructor(
+    readonly url: string,
+    readonly publisher: EventPublisher,
+  ) {
+    this.url = new URL(this.url).toString();
+  }
+
+  async upload(file: File) {
+    const hash = await window.crypto.subtle.digest(
+      "SHA-256",
+      await file.arrayBuffer(),
+    );
+    const tags = [["x", bytesToString("hex", new Uint8Array(hash))]];
+
+    const rsp = await this.#req("/upload", "PUT", file, tags);
+    if (rsp.ok) {
+      return (await rsp.json()) as BlobDescriptor;
+    } else {
+      const text = await rsp.text();
+      throw new Error(text);
+    }
+  }
+
+  async #req(
+    path: string,
+    method: "GET" | "POST" | "DELETE" | "PUT",
+    body?: BodyInit,
+    tags?: Array<Array<string>>,
+  ) {
+    throwIfOffline();
+
+    const url = `${this.url}upload`;
+    const now = unixNow();
+    const auth = async (url: string, method: string) => {
+      const auth = await this.publisher.generic((eb) => {
+        eb.kind(24_242 as EventKind)
+          .tag(["u", url])
+          .tag(["method", method])
+          .tag(["t", path.slice(1)])
+          .tag(["expiration", (now + 10).toString()]);
+        tags?.forEach((t) => eb.tag(t));
+        return eb;
+      });
+      return `Nostr ${base64.encode(
+        new TextEncoder().encode(JSON.stringify(auth)),
+      )}`;
+    };
+
+    return await fetch(url, {
+      method,
+      body,
+      headers: {
+        accept: "application/json",
+        authorization: await auth(url, method),
+      },
+    });
+  }
+}

ui_src/src/upload/index.ts

@@ -0,0 +1,30 @@
+export async function openFile(): Promise<File | undefined> {
+  return new Promise((resolve) => {
+    const elm = document.createElement("input");
+    let lock = false;
+    elm.type = "file";
+    const handleInput = (e: Event) => {
+      lock = true;
+      const elm = e.target as HTMLInputElement;
+      if ((elm.files?.length ?? 0) > 0) {
+        resolve(elm.files![0]);
+      } else {
+        resolve(undefined);
+      }
+    };
+
+    elm.onchange = (e) => handleInput(e);
+    elm.click();
+    window.addEventListener(
+      "focus",
+      () => {
+        setTimeout(() => {
+          if (!lock) {
+            resolve(undefined);
+          }
+        }, 300);
+      },
+      { once: true },
+    );
+  });
+}

ui_src/src/upload/nip96.ts

@@ -0,0 +1,108 @@
+import { base64 } from "@scure/base";
+import { throwIfOffline } from "@snort/shared";
+import { EventKind, EventPublisher, NostrEvent } from "@snort/system";
+
+export class Nip96 {
+  #info?: Nip96Info;
+
+  constructor(
+    readonly url: string,
+    readonly publisher: EventPublisher,
+  ) {
+    this.url = new URL(this.url).toString();
+  }
+
+  async loadInfo() {
+    const u = new URL(this.url);
+
+    const rsp = await fetch(
+      `${u.protocol}//${u.host}/.well-known/nostr/nip96.json`,
+    );
+    this.#info = (await rsp.json()) as Nip96Info;
+    return this.#info;
+  }
+
+  async listFiles(page = 0, count = 50) {
+    const rsp = await this.#req(`?page=${page}&count=${count}`, "GET");
+    const data = await this.#handleResponse<Nip96FileList>(rsp);
+    return data;
+  }
+
+  async upload(file: File) {
+    const fd = new FormData();
+    fd.append("size", file.size.toString());
+    fd.append("caption", file.name);
+    fd.append("media_type", file.type);
+    fd.append("file", file);
+
+    const rsp = await this.#req("", "POST", fd);
+    const data = await this.#handleResponse<Nip96Result>(rsp);
+    if(data.status !== "success") {
+      throw new Error(data.message);
+    }
+    return data;
+  }
+
+  async #handleResponse<T extends Nip96Status>(rsp: Response) {
+    if (rsp.ok) {
+      return (await rsp.json()) as T;
+    } else {
+      const text = await rsp.text();
+      try {
+        const obj = JSON.parse(text) as Nip96Result;
+        throw new Error(obj.message);
+      } catch {
+        throw new Error(`Upload failed: ${text}`);
+      }
+    }
+  }
+
+  async #req(path: string, method: "GET" | "POST" | "DELETE", body?: BodyInit) {
+    throwIfOffline();
+    const auth = async (url: string, method: string) => {
+      const auth = await this.publisher.generic((eb) => {
+        return eb
+          .kind(EventKind.HttpAuthentication)
+          .tag(["u", url])
+          .tag(["method", method]);
+      });
+      return `Nostr ${base64.encode(
+        new TextEncoder().encode(JSON.stringify(auth)),
+      )}`;
+    };
+
+    const info = this.#info ?? (await this.loadInfo());
+    let u = info.api_url;
+    if (u.startsWith("/")) {
+      u = `${this.url}${u.slice(1)}`;
+    }
+    u += path;
+    return await fetch(u, {
+      method,
+      body,
+      headers: {
+        accept: "application/json",
+        authorization: await auth(u, method),
+      },
+    });
+  }
+}
+
+export interface Nip96Info {
+  api_url: string;
+  download_url?: string;
+}
+
+export interface Nip96Status {status: string, message?: string}
+
+export type Nip96Result = Nip96Status & {
+  processing_url?: string;
+  nip94_event: NostrEvent;
+}
+
+export type Nip96FileList = Nip96Status & {
+  count: number;
+  total: number;
+  page: number;
+  files: Array<NostrEvent>;
+}

ui_src/src/views/files.tsx

@@ -0,0 +1,28 @@
+export default function FileList({ files }: { files: Array<File> }) {
+  if (files.length === 0) {
+    return <b>No Files</b>;
+  }
+
+  function renderInner(f: File) {
+    if (f.type.startsWith("image/")) {
+      return (
+        <img src={URL.createObjectURL(f)} className="object-cover bg-center" />
+      );
+    }
+  }
+  return (
+    <div className="grid grid-cols-4 gap-2">
+      {files.map((a) => (
+        <div
+          key={a.name}
+          className="relative rounded-md aspect-square overflow-hidden bg-neutral-800"
+        >
+          <div className="absolute flex flex-col items-center justify-center w-full h-full bg-black/50 text-wrap text-sm break-all text-center">
+            {a.name}
+          </div>
+          {renderInner(a)}
+        </div>
+      ))}
+    </div>
+  );
+}

ui_src/src/views/header.tsx

@@ -0,0 +1,32 @@
+import { Nip7Signer, NostrLink } from "@snort/system";
+import Button from "../components/button";
+import Profile from "../components/profile";
+import useLogin from "../hooks/login";
+import { Login } from "../login";
+
+export default function Header() {
+  const login = useLogin();
+
+  async function tryLogin() {
+    try {
+      const n7 = new Nip7Signer();
+      const pubkey = await n7.getPubKey();
+      Login.login({
+        type: "nip7",
+        pubkey,
+      });
+    } catch {
+      //ignore
+    }
+  }
+  return (
+    <div className="flex justify-between items-center">
+      <div className="text-xl font-bold">route96</div>
+      {login ? (
+        <Profile link={NostrLink.publicKey(login.pubkey)} />
+      ) : (
+        <Button onClick={tryLogin}>Login</Button>
+      )}
+    </div>
+  );
+}

ui_src/src/views/upload.tsx

@@ -0,0 +1,119 @@
+import { useState } from "react";
+import Button from "../components/button";
+import FileList from "./files";
+import { openFile } from "../upload";
+import { Blossom } from "../upload/blossom";
+import useLogin from "../hooks/login";
+import usePublisher from "../hooks/publisher";
+import { Nip96 } from "../upload/nip96";
+
+export default function Upload() {
+    const [type, setType] = useState<"blossom" | "nip96">("nip96");
+    const [noCompress, setNoCompress] = useState(false);
+    const [toUpload, setToUpload] = useState<File>();
+    const [error, setError] = useState<string>();
+    const [results, setResults] = useState<Array<object>>([]);
+    const login = useLogin();
+    const pub = usePublisher();
+
+    async function doUpload() {
+        if (!pub) return;
+        if (!toUpload) return;
+        try {
+            setError(undefined);
+            const url = `${location.protocol}//${location.host}`;
+            if (type === "blossom") {
+                const uploader = new Blossom(url, pub);
+                const result = await uploader.upload(toUpload);
+                setResults(s => [...s, result]);
+            }
+            if (type === "nip96") {
+                const uploader = new Nip96(url, pub);
+                await uploader.loadInfo();
+                const result = await uploader.upload(toUpload);
+                setResults(s => [...s, result]);
+            }
+        } catch (e) {
+            if (e instanceof Error) {
+                setError(e.message.length > 0 ? e.message : "Upload failed");
+            } else if (typeof e === "string") {
+                setError(e);
+            } else {
+                setError("Upload failed");
+            }
+        }
+    }
+
+    async function listUploads() {
+        if (!pub) return;
+        try {
+            setError(undefined);
+            const url = `${location.protocol}//${location.host}`;
+            const uploader = new Nip96(url, pub);
+            await uploader.loadInfo();
+            const result = await uploader.listFiles();
+            setResults(s => [...s, result]);
+        } catch (e) {
+            if (e instanceof Error) {
+                setError(e.message.length > 0 ? e.message : "Upload failed");
+            } else if (typeof e === "string") {
+                setError(e);
+            } else {
+                setError("List files failed");
+            }
+        }
+    }
+
+    return (
+        <div className="flex flex-col gap-2 bg-neutral-700 p-8 rounded-xl w-full">
+            <h1 className="text-lg font-bold">
+                Welcome to {window.location.hostname}
+            </h1>
+            <div className="text-neutral-400 uppercase text-xs font-medium">
+                Upload Method
+            </div>
+            <div className="flex gap-4 items-center">
+                <div
+                    className="flex gap-2 cursor-pointer"
+                    onClick={() => setType("blossom")}
+                >
+                    Blossom
+                    <input type="radio" checked={type === "blossom"} />
+                </div>
+                <div
+                    className="flex gap-2 cursor-pointer"
+                    onClick={() => setType("nip96")}
+                >
+                    NIP-96
+                    <input type="radio" checked={type === "nip96"} />
+                </div>
+            </div>
+
+            {type === "nip96" && (
+                <div
+                    className="flex gap-2 cursor-pointer"
+                    onClick={() => setNoCompress((s) => !s)}
+                >
+                    Disable Compression
+                    <input type="checkbox" checked={noCompress} />
+                </div>
+            )}
+
+            <Button
+                onClick={async () => {
+                    const f = await openFile();
+                    setToUpload(f);
+                }}
+            >
+                Choose Files
+            </Button>
+            <FileList files={toUpload ? [toUpload] : []} />
+            <Button onClick={doUpload} disabled={login === undefined}>
+                Upload
+            </Button>
+            <Button disabled={login === undefined} onClick={listUploads}>List Uploads</Button>
+            {error && <b className="text-red-500">{error}</b>}
+            <pre className="text-xs font-monospace overflow-wrap">{JSON.stringify(results, undefined, 2)}</pre>
+        </div>
+    );
+}

ui_src/src/vite-env.d.ts

@@ -0,0 +1 @@
+/// <reference types="vite/client" />