diff --git a/package.json b/package.json
index 023539d2..d018892e 100644
--- a/package.json
+++ b/package.json
@@ -47,6 +47,7 @@
"@konemono/svelte5-i18n": "^0.2.3",
"@melt-ui/pp": "^0.3.2",
"@rx-nostr/crypto": "^0.0.0",
+ "@sveltejs/adapter-static": "^3.0.10",
"@tanstack/svelte-query": "^5.90.2",
"@tanstack/svelte-query-devtools": "^5.90.2",
"eruda": "^3.4.3",
diff --git a/src/routes/+layout.ts b/src/routes/+layout.ts
index 5fc45cdb..ede415e9 100644
--- a/src/routes/+layout.ts
+++ b/src/routes/+layout.ts
@@ -6,6 +6,9 @@ import * as nip19 from "nostr-tools/nip19";
import { relayRegex2 } from "$lib/func/regex";
import { error } from "@sveltejs/kit";
+export const ssr = false;
+export const prerender = false;
+
//デフォリレーを設定するために必要
//めんどくさいから必要なもの(relays)だけ
export const load: LayoutLoad = async (
diff --git a/src/routes/+page.server.ts b/src/routes/+page.server.ts
deleted file mode 100644
index d218a8d1..00000000
--- a/src/routes/+page.server.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { ogDescription, ogTitle } from "$lib/stores/stores";
-
-export const load = async () => {
- ogTitle.set("Lumilumi");
- ogDescription.set("The Nostr Client");
-};
diff --git a/src/routes/[naddr=naddr]/+page.server.ts b/src/routes/[naddr=naddr]/+page.server.ts
deleted file mode 100644
index 9cb87f29..00000000
--- a/src/routes/[naddr=naddr]/+page.server.ts
+++ /dev/null
@@ -1,151 +0,0 @@
-// /page/[naddr]/+page.server.ts
-import type { PageServerLoad } from "./$types";
-import * as nip19 from "nostr-tools/nip19";
-import { error } from "@sveltejs/kit";
-import * as Nostr from "nostr-typedef";
-import { ogDescription, ogTitle } from "$lib/stores/stores";
-import { eventKinds } from "$lib/func/kinds";
-import { locale } from "@konemono/svelte5-i18n";
-import { get } from "svelte/store";
-
-interface CustomParams {
- naddr: string;
-}
-
-const defaultRelays = [
- // "wss://relay.nostr.band",
- "wss://nos.lol",
- "wss://nostr.bitcoiner.social",
- "wss://relay.nostr.wirednet.jp",
-];
-
-const fetchEvent = async (
- naddrPointer: nip19.AddressPointer,
-): Promise<Nostr.Event | undefined> => {
- try {
- const naddr = nip19.naddrEncode(naddrPointer);
- console.debug("[api request id]", naddr);
- const response = await fetch(`https://restr.mono3.workers.dev/${naddr}`, {
- headers: { "User-Agent": "lumilumi" },
- });
-
- if (!response.ok) {
- console.warn("[api event not found]", await response.text());
- return undefined;
- }
-
- const event = (await response.json()) as Nostr.Event;
- console.debug("[api response]", event);
- return event;
- } catch (error) {
- return undefined;
- }
-};
-
-export const load: PageServerLoad = async ({
- params,
- request,
- setHeaders,
-}: {
- params: CustomParams;
- request: Request;
- setHeaders: (headers: Record<string, string>) => void;
-}) => {
- const { naddr } = params;
-
- setHeaders({
- "Cache-Control": "public, max-age=3600",
- "X-Robots-Tag": "noindex, nofollow",
- "Content-Type": "text/html; charset=utf-8",
- });
-
- console.debug("[naddr page load]", naddr);
-
- // リファラーをチェックして自分のサイトからの遷移かどうかを判定
- const referer = request.headers.get("referer") || "";
- const host = request.headers.get("host") || "";
-
- // 自分のサイトからの遷移かどうか
- const isInternalNavigation = referer.includes(host) && host !== "";
-
- // 自分のサイトからの遷移でない場合にフェッチする
- const shouldFetch = !isInternalNavigation;
-
- console.debug("[naddr page] referer:", referer);
- console.debug("[naddr page] host:", host);
- console.debug("[naddr page] is internal navigation:", isInternalNavigation);
- console.debug("[naddr page] should fetch:", shouldFetch);
-
- try {
- const { type, data } = nip19.decode(naddr);
-
- if (type !== "naddr") throw Error();
-
- const addr = data as nip19.AddressPointer;
-
- const res: {
- identifier: string;
- pubkey: string;
- kind: number;
- relays?: string[];
- event?: Nostr.Event;
- encoded: string;
- skipFetch?: boolean;
- } = {
- identifier: addr.identifier,
- pubkey: addr.pubkey,
- kind: addr.kind,
- relays: addr.relays,
- event: undefined,
- encoded: naddr,
- skipFetch: !shouldFetch,
- };
-
- const kindString = eventKinds.get(res.kind)?.[
- get(locale) === "ja" ? "ja" : "en"
- ];
-
- // OGPクローラーの場合のみフェッチする
- if (shouldFetch) {
- res.event = await fetchEvent({
- identifier: res.identifier,
- pubkey: res.pubkey,
- kind: res.kind,
- relays: (res.relays?.length ? res.relays : defaultRelays).slice(0, 3),
- });
-
- if (res.event) {
- const title = res.event.tags.find((tag) => tag[0] === "title")?.[1];
- const desc = res.event.tags.find(
- (tag) => tag[0] === "description" || tag[0] === "summary",
- )?.[1];
- ogTitle.set(
- `Lumilumi - kind:${res.kind} ${
- title ? title : kindString ? `(${kindString})` : ""
- }`,
- );
- ogDescription.set(desc || "");
- } else {
- ogTitle.set(
- `Lumilumi - kind:${res.kind} ${kindString ? `(${kindString})` : ""}`,
- );
- ogDescription.set(`Id:${res.identifier}`);
- }
- } else {
- console.debug(
- "[naddr page] skipping fetch - internal navigation from same site",
- );
-
- // 内部遷移の場合でも最低限のOG設定
- ogTitle.set(
- `Lumilumi - kind:${res.kind} ${kindString ? `(${kindString})` : ""}`,
- );
- ogDescription.set(`Id:${res.identifier}`);
- }
-
- return res;
- } catch (e) {
- console.error("[naddr page decode error]", e);
- throw error(404, "Not Found");
- }
-};
diff --git a/src/routes/[nostr=nostr]/+page.server.ts b/src/routes/[nostr=nostr]/+page.server.ts
deleted file mode 100644
index fe4b51f2..00000000
--- a/src/routes/[nostr=nostr]/+page.server.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { redirect } from "@sveltejs/kit";
-
-export const load = async ({ params }) => {
- const { nostr } = params;
- let decodedNostr: string;
-
- try {
- decodedNostr = decodeURIComponent(nostr);
- } catch {
- decodedNostr = nostr; // デコード失敗時はそのまま使用
- }
-
- const newPath = decodedNostr.replace(/^(?:web\+)?nostr:\/?\/?/, "");
- throw redirect(302, newPath);
-};
diff --git a/src/routes/[note=note]/+page.server.ts b/src/routes/[note=note]/+page.server.ts
deleted file mode 100644
index 2cbe270f..00000000
--- a/src/routes/[note=note]/+page.server.ts
+++ /dev/null
@@ -1,156 +0,0 @@
-import * as nip19 from "nostr-tools/nip19";
-import { error } from "@sveltejs/kit";
-import * as Nostr from "nostr-typedef";
-import { ogDescription, ogTitle } from "$lib/stores/stores";
-import { eventKinds } from "$lib/func/kinds";
-import { locale } from "@konemono/svelte5-i18n";
-import { get } from "svelte/store";
-
-interface CustomParams {
- note: string;
-}
-
-const defaultRelays = ["wss://nos.lol", "wss://nostr.bitcoiner.social"];
-
-const fetchEvent = async (
- id: string,
- relays: string[],
-): Promise<Nostr.Event | undefined> => {
- try {
- const nevent = nip19.neventEncode({ id: id, relays: relays.slice(0, 3) });
-
- console.debug("[api request id]", nevent, relays);
- const response = await fetch(`https://restr.mono3.workers.dev/${nevent}`, {
- headers: { "User-Agent": "lumilumi" },
- });
-
- if (!response.ok) {
- console.warn("[api event not found]", await response.text());
- return undefined;
- }
-
- const event = (await response.json()) as Nostr.Event;
- console.debug("[api response]", event);
- return event;
- } catch (error) {
- return undefined;
- }
-};
-
-export const load = async ({
- params,
- request,
- setHeaders,
-}: {
- params: CustomParams;
- request: Request;
- setHeaders: (headers: Record<string, string>) => void;
-}) => {
- const { note } = params;
-
- setHeaders({
- "Cache-Control": "public, max-age=3600",
- "X-Robots-Tag": "noindex, nofollow",
- "Content-Type": "text/html; charset=utf-8",
- });
-
- console.debug("[thread page load]", note);
-
- // リファラーをチェックして自分のサイトからの遷移かどうかを判定
- const referer = request.headers.get("referer") || "";
- const host = request.headers.get("host") || "";
-
- // 自分のサイトからの遷移かどうか
- const isInternalNavigation = referer.includes(host) && host !== "";
-
- // 自分のサイトからの遷移でない場合にフェッチする
- const shouldFetch = !isInternalNavigation;
-
- console.debug("[thread page] referer:", referer);
- console.debug("[thread page] host:", host);
- console.debug("[thread page] is internal navigation:", isInternalNavigation);
- console.debug("[thread page] should fetch:", shouldFetch);
-
- try {
- const { type, data } = nip19.decode(note);
- console.debug("[thread decode]", type, data);
-
- const res: {
- id: string;
- relays?: string[];
- kind?: number;
- author?: string;
- event?: Nostr.Event;
- encoded: string;
- skipFetch?: boolean;
- } = {
- id: "",
- relays: undefined,
- kind: undefined,
- author: undefined,
- event: undefined,
- encoded: note,
- skipFetch: !shouldFetch,
- };
-
- switch (type) {
- case "note":
- res.id = data;
- break;
- case "nevent":
- res.id = data.id;
- res.kind = data.kind;
- res.author = data.author;
- break;
- default:
- error(500);
- }
-
- // OGPクローラーの場合のみフェッチする
- if (shouldFetch) {
- res.event = await fetchEvent(
- res.id,
- res.relays?.length ? res.relays : defaultRelays,
- );
- console.log(res.event);
-
- if (res.event) {
- const kindString = eventKinds.get(res.event.kind)?.[
- get(locale) === "ja" ? "ja" : "en"
- ];
- ogTitle.set(
- `Lumilumi - kind:${res.event.kind} ${
- kindString ? `(${kindString})` : ""
- }`,
- );
- ogDescription.set(res.event.content);
- } else if (res.kind) {
- const kindString = eventKinds.get(res.kind)?.[
- get(locale) === "ja" ? "ja" : "en"
- ];
- ogTitle.set(
- `Lumilumi - kind:${res.kind} ${kindString ? `(${kindString})` : ""}`,
- );
- }
- } else {
- console.debug(
- "[thread page] skipping fetch - internal navigation from same site",
- );
-
- // 内部遷移の場合でも、kindが分かっている場合は最低限のOG設定
- if (res.kind) {
- const kindString = eventKinds.get(res.kind)?.[
- get(locale) === "ja" ? "ja" : "en"
- ];
- ogTitle.set(
- `Lumilumi - kind:${res.kind} ${kindString ? `(${kindString})` : ""}`,
- );
- }
- }
-
- return res;
- } catch (e) {
- console.error("[thread page decode error]", e);
- error(404, "Not Found");
- }
-};
diff --git a/src/routes/[npub=npub]/+layout.server.ts b/src/routes/[npub=npub]/+layout.server.ts
deleted file mode 100644
index 84eb80d6..00000000
--- a/src/routes/[npub=npub]/+layout.server.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import type { LayoutServerLoad } from "./$types";
-
-export const load: LayoutServerLoad = async ({ setHeaders }) => {
- setHeaders({
- "X-Robots-Tag": "noindex, nofollow",
- });
-
- return {}; // 必要なデータがない場合は空オブジェクトを返す
-};
diff --git a/src/routes/[npub=npub]/+layout.ts b/src/routes/[npub=npub]/+layout.ts
index 7f8effa4..e047ade8 100644
--- a/src/routes/[npub=npub]/+layout.ts
+++ b/src/routes/[npub=npub]/+layout.ts
@@ -8,6 +8,9 @@ import { queryProfile } from "nostr-tools/nip05";
interface CustomParams {
npub: string;
}
+
+export const ssr = false;
+
//https://kit.svelte.jp/docs/load
//ページを読み込む前に有効なparamかチェック
export const load: LayoutLoad<{
diff --git a/src/routes/api/ogp/+server.ts b/src/routes/api/ogp/+server.ts
deleted file mode 100644
index 288c057b..00000000
--- a/src/routes/api/ogp/+server.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-// src/routes/api/ogp/+server.ts
-import { error } from "@sveltejs/kit";
-import { unfurl } from "unfurl.js";
-import type { RequestHandler } from "./$types";
-import type { Metadata } from "unfurl.js/dist/types";
-
-export const GET: RequestHandler = async ({ url: request }) => {
- const url = request.searchParams.get("url");
-
- if (!url) {
- throw error(404, {
- message: "require url param",
- });
- }
-
- const parsedUrl = new URL(url);
-
- const ALLOWED_PROTOCOLS = ["https:"];
- if (!ALLOWED_PROTOCOLS.includes(parsedUrl.protocol)) {
- throw error(400, { message: "Only HTTPS URLs are allowed" });
- }
-
- const blockedRanges =
- /^(localhost|127\.|10\.|192\.168\.|172\.(1[6-9]|2\d|3[01])\.|0\.0\.0\.0|169\.254\.|::1|\[::1\]|\[?fc[0-9a-f]{2}:|\[?fd[0-9a-f]{2}:|\[?fe80:)/i;
- if (blockedRanges.test(parsedUrl.hostname)) {
- throw error(403, { message: "Private addresses are not allowed" });
- }
-
- const host = parsedUrl.host.toLowerCase();
-
- let userAgent = "LumilumiOGPFetcher/1.0 (+https://lumilumi.app)";
-
- if (
- host.includes("amazon.") ||
- host.includes("twitter.com") ||
- host.includes("x.com") ||
- host.includes("t.co") ||
- host.includes("suno.com") ||
- host.includes("suno.ai")
- ) {
- userAgent = "facebookexternalhit";
- }
-
- const result: Metadata = await unfurl(url, {
- headers: {
- Accept: "text/html, application/xhtml+xml",
- "User-Agent": userAgent,
- },
- }).catch((err) => {
- throw error(404, {
- message: err.message ?? String(err),
- });
- });
-
- return new Response(JSON.stringify(result), {
- headers: { "Content-Type": "application/json" },
- });
-};
diff --git a/src/routes/api/url-check/+server.ts b/src/routes/api/url-check/+server.ts
deleted file mode 100644
index 1a07914a..00000000
--- a/src/routes/api/url-check/+server.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-// src/routes/api/url-check/+server.ts
-import { error } from "@sveltejs/kit";
-import type { RequestHandler } from "./$types";
-
-export const GET: RequestHandler = async ({ url: request }) => {
- const targetUrl = request.searchParams.get("url");
-
- if (!targetUrl) {
- throw error(400, { message: "URL parameter is required" });
- }
-
- try {
- const parsed = new URL(targetUrl);
-
- const ALLOWED_PROTOCOLS = ["https:"];
- if (!ALLOWED_PROTOCOLS.includes(parsed.protocol)) {
- throw error(400, { message: "Only HTTPS URLs are allowed" });
- }
-
- const blockedRanges =
- /^(localhost|127\.|10\.|192\.168\.|172\.(1[6-9]|2\d|3[01])\.|0\.0\.0\.0|169\.254\.|::1|\[::1\]|\[?fc[0-9a-f]{2}:|\[?fd[0-9a-f]{2}:|\[?fe80:)/i;
- if (blockedRanges.test(parsed.hostname)) {
- throw error(403, { message: "Private addresses are not allowed" });
- }
-
- const response = await fetch(targetUrl, { method: "HEAD" });
- const contentType = response.headers.get("Content-Type");
-
- return new Response(
- JSON.stringify({
- contentType,
- status: response.status,
- }),
- {
- headers: { "Content-Type": "application/json" },
- },
- );
- } catch (err) {
- if (err && typeof err === "object" && "status" in err) {
- throw err;
- }
- return new Response(
- JSON.stringify({
- contentType: null,
- error: err instanceof Error ? err.message : String(err),
- }),
- {
- headers: { "Content-Type": "application/json" },
- },
- );
- }
-};
diff --git a/src/routes/channel/+layout.server.ts b/src/routes/channel/+layout.server.ts
deleted file mode 100644
index 84eb80d6..00000000
--- a/src/routes/channel/+layout.server.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import type { LayoutServerLoad } from "./$types";
-
-export const load: LayoutServerLoad = async ({ setHeaders }) => {
- setHeaders({
- "X-Robots-Tag": "noindex, nofollow",
- });
-
- return {}; // 必要なデータがない場合は空オブジェクトを返す
-};
diff --git a/src/routes/global/+layout.server.ts b/src/routes/global/+layout.server.ts
deleted file mode 100644
index 84eb80d6..00000000
--- a/src/routes/global/+layout.server.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import type { LayoutServerLoad } from "./$types";
-
-export const load: LayoutServerLoad = async ({ setHeaders }) => {
- setHeaders({
- "X-Robots-Tag": "noindex, nofollow",
- });
-
- return {}; // 必要なデータがない場合は空オブジェクトを返す
-};
diff --git a/src/routes/list/+layout.server.ts b/src/routes/list/+layout.server.ts
deleted file mode 100644
index 84eb80d6..00000000
--- a/src/routes/list/+layout.server.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import type { LayoutServerLoad } from "./$types";
-
-export const load: LayoutServerLoad = async ({ setHeaders }) => {
- setHeaders({
- "X-Robots-Tag": "noindex, nofollow",
- });
-
- return {}; // 必要なデータがない場合は空オブジェクトを返す
-};
diff --git a/src/routes/notifications/+layout.server.ts b/src/routes/notifications/+layout.server.ts
deleted file mode 100644
index 84eb80d6..00000000
--- a/src/routes/notifications/+layout.server.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import type { LayoutServerLoad } from "./$types";
-
-export const load: LayoutServerLoad = async ({ setHeaders }) => {
- setHeaders({
- "X-Robots-Tag": "noindex, nofollow",
- });
-
- return {}; // 必要なデータがない場合は空オブジェクトを返す
-};
diff --git a/src/routes/post/+page.server.ts b/src/routes/post/+page.server.ts
deleted file mode 100644
index 708f9f9e..00000000
--- a/src/routes/post/+page.server.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-// +page.server.ts
-
-import { fail } from "@sveltejs/kit";
-
-let data: { title: any; text: any; url?: any; media?: any } = {
- title: "",
- text: "",
-};
-
-export const actions = {
- default: async ({ request }) => {
- try {
- const formData = await request.formData();
-
- data = {
- title: formData.get("title"),
- text: formData.get("text"),
- url: formData.get("url"),
- media: formData.get("media"),
- };
-
- if (!data.title && !data.text && !data.url && !data.media) {
- return fail(400, { message: "invalid" });
- }
-
- // フロントエンドにデータを返す
- return { success: true };
- } catch (err) {
- console.error(err);
- return fail(400, { message: "invalid" });
- }
- },
-};
diff --git a/src/routes/relay/+layout.server.ts b/src/routes/relay/+layout.server.ts
deleted file mode 100644
index 84eb80d6..00000000
--- a/src/routes/relay/+layout.server.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import type { LayoutServerLoad } from "./$types";
-
-export const load: LayoutServerLoad = async ({ setHeaders }) => {
- setHeaders({
- "X-Robots-Tag": "noindex, nofollow",
- });
-
- return {}; // 必要なデータがない場合は空オブジェクトを返す
-};
diff --git a/src/routes/search/+layout.server.ts b/src/routes/search/+layout.server.ts
deleted file mode 100644
index 84eb80d6..00000000
--- a/src/routes/search/+layout.server.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import type { LayoutServerLoad } from "./$types";
-
-export const load: LayoutServerLoad = async ({ setHeaders }) => {
- setHeaders({
- "X-Robots-Tag": "noindex, nofollow",
- });
-
- return {}; // 必要なデータがない場合は空オブジェクトを返す
-};
diff --git a/src/routes/search/+page.ts b/src/routes/search/+page.ts
index bf302eeb..b2176cce 100644
--- a/src/routes/search/+page.ts
+++ b/src/routes/search/+page.ts
@@ -3,6 +3,8 @@ import { ogDescription, ogTitle } from "$lib/stores/stores";
import type { PageLoad } from "./$types";
+export const ssr = false;
+
export const load: PageLoad = ({ url }) => {
const searchParams = url.searchParams;
diff --git a/svelte.config.js b/svelte.config.js
index 05d0b797..a3021bfb 100644
--- a/svelte.config.js
+++ b/svelte.config.js
@@ -1,5 +1,6 @@
import { preprocessMeltUI, sequence } from "@melt-ui/pp";
-import adapter from "@sveltejs/adapter-auto";
+//import adapter from "@sveltejs/adapter-auto";
+import adapter from "@sveltejs/adapter-static";
import { vitePreprocess } from "@sveltejs/vite-plugin-svelte";
/** @type {import('@sveltejs/kit').Config}*/
const config = {
@@ -10,7 +11,9 @@ const config = {
// adapter-auto only supports some environments, see https://kit.svelte.dev/docs/adapter-auto for a list.
// If your environment is not supported, or you settled on a specific environment, switch out the adapter.
// See https://kit.svelte.dev/docs/adapters for more information about adapters.
- adapter: adapter(),
+ adapter: adapter({
+ fallback: "index.html"
+ }),
serviceWorker: {
//pwa仮想モジュール（virtual:pwa-registerまたはvirtual:pwa-register/svelte）を使用している場合は、SvelteKitの設定からサービスワーカーの登録を除外する必要があります：
register: false,