@alteran/astro 0.1.4 → 0.1.6

package/README.md

@@ -27,7 +27,7 @@ By default the integration injects all `/xrpc/*` ATProto routes, health/ready ch
 alteran({
   debugRoutes: process.env.NODE_ENV !== 'production',
   includeRootEndpoint: false,
-  injectServerEntry: true,
+  injectServerEntry: true, // opt in if you don't maintain your own worker entrypoint
 });
 ```
 
@@ -35,11 +35,32 @@ The integration automatically:
 - Resolves all injected routes against the packaged runtime without requiring a Vite alias
 - Registers the middleware that applies structured logging and CORS enforcement
 - Injects all PDS HTTP endpoints into the host project
-- Sets `build.serverEntry` to the packaged Cloudflare worker (unless you opt out)
+- Offers the packaged Cloudflare worker entrypoint when you enable `{ injectServerEntry: true }`
 - Publishes ambient env typings so `Env` and `App.Locals` are available from TypeScript
 
 When deploying, continue to configure Wrangler/D1/R2 secrets exactly as before—the integration does not change the runtime requirements.
 
+### Custom Worker Entrypoint
+
+The integration no longer overrides `build.serverEntry` by default. If you need to export additional Durable Objects or otherwise customise the worker, keep your own entrypoint and compose Alteran's runtime helpers instead of copying the internal logic.
+
+```ts
+// src/_worker.ts in your Astro project
+import { createPdsFetchHandler, Sequencer } from '@alteran/astro/worker';
+
+const fetch = createPdsFetchHandler();
+
+export default { fetch };
+
+// Re-export Sequencer so Wrangler can bind the Durable Object namespace
+export { Sequencer };
+
+// Export any additional Durable Objects after this line
+export { MyDurableObject } from './worker/my-durable-object';
+```
+
+Helpers like `onRequest`, `seed`, and `validateConfigOrThrow` are also exported from `@alteran/astro/worker` if you need to build more advanced wrappers (for example, to add request instrumentation before delegating to the PDS handler).
+
 To install dependencies:
 
 ```bash

package/index.js

@@ -1,4 +1,5 @@
 import { readFileSync } from 'node:fs';
+import { isAbsolute, relative } from 'node:path';
 import { fileURLToPath } from 'node:url';
 
 const CORE_ROUTES = [
@@ -37,7 +38,7 @@ const CORE_ROUTES = [
 
 const ROOT_ROUTE = {
   pattern: '/',
-  entrypoint: './src/pages/index.ts',
+  entrypoint: './src/handlers/root.ts',
 };
 
 const DEBUG_ROUTES = [
@@ -56,7 +57,7 @@ export default function alteran(options = {}) {
   const {
     debugRoutes = false,
     includeRootEndpoint = false,
-    injectServerEntry = true,
+    injectServerEntry = false,
   } = options;
 
   const middlewareEntrypoint = resolvePackagePath('./src/middleware.ts');
@@ -96,8 +97,21 @@ export default function alteran(options = {}) {
           order: 'pre',
         });
 
+        const srcDirUrl = config.srcDir ?? config.root;
+        const pagesDirUrl = config.pagesDir ?? new URL('./pages/', srcDirUrl);
+        const projectPagesDir = fileURLToPath(pagesDirUrl);
+
         for (const route of routes) {
-          injectRoute({ pattern: route.pattern, entrypoint: resolvePackagePath(route.entrypoint) });
+          const entrypoint = resolvePackagePath(route.entrypoint);
+          const relativeToPages = relative(projectPagesDir, entrypoint);
+          const entrypointWithinPages =
+            relativeToPages === '' || (!relativeToPages.startsWith('..') && !isAbsolute(relativeToPages));
+
+          if (entrypointWithinPages) {
+            continue;
+          }
+
+          injectRoute({ pattern: route.pattern, entrypoint });
         }
       },
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alteran/astro",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "description": "Astro integration for running a Cloudflare-hosted Bluesky PDS with Alteran.",
   "module": "index.js",
   "types": "index.d.ts",
@@ -8,6 +8,10 @@
     ".": {
       "types": "./index.d.ts",
       "import": "./index.js"
+    },
+    "./worker": {
+      "types": "./types/worker.d.ts",
+      "import": "./src/worker/index.ts"
     }
   },
   "type": "module",
@@ -36,15 +40,13 @@
     "db:reset:local": "rm -rf .wrangler/state && rm -rf drizzle && bun run db:generate && bun run db:apply:local"
   },
   "devDependencies": {
-    "@astrojs/cloudflare": "^11.0.4",
+    "@astrojs/cloudflare": "^12.6.9",
     "@atproto/api": "^0.17.0",
     "@cloudflare/vite-plugin": "^1.13.8",
-    "alchemy": "^0.70.2",
     "@types/bun": "latest",
-    "astro": "^4.16.9",
     "drizzle-kit": "^0.31.5",
     "miniflare": "3",
-    "vite": "^7.1.8",
+    "vite": "^6.3.6",
     "wrangler": "^4.40.3"
   },
   "peerDependencies": {
@@ -55,6 +57,7 @@
     "@ipld/car": "^5.4.2",
     "@ipld/dag-cbor": "^9.2.5",
     "@noble/hashes": "^2.0.1",
+    "astro": "^5.14.1",
     "astro-icon": "^1.1.5",
     "dotenv": "^17.2.3",
     "drizzle-orm": "^0.44.6",

package/src/_worker.ts

@@ -1,44 +1,7 @@
-import { handle } from 'astro/internal/handler';
-import { onRequest } from './middleware';
-import { seed } from './db/seed';
-import { validateConfigOrThrow } from './lib/config';
-import type { Env } from './env';
+import { createPdsFetchHandler } from './worker/runtime';
 
-export default {
-  async fetch(request: Request, env: Env, ctx: ExecutionContext) {
-    // Validate configuration on startup (fail fast if invalid)
-    try {
-      validateConfigOrThrow(env);
-    } catch (error) {
-      return new Response(
-        JSON.stringify({
-          error: 'ConfigurationError',
-          message: error instanceof Error ? error.message : 'Invalid configuration',
-        }),
-        {
-          status: 500,
-          headers: { 'Content-Type': 'application/json' },
-        }
-      );
-    }
+const fetch = createPdsFetchHandler();
 
-    await seed(env.DB, env.PDS_DID ?? 'did:example:single-user');
+export default { fetch };
 
-    const url = new URL(request.url);
-    if (url.pathname === '/xrpc/com.atproto.sync.subscribeRepos') {
-      const upgrade = request.headers.get('upgrade');
-      if (upgrade !== 'websocket') return new Response('Expected websocket', { status: 426 });
-      if (!env.SEQUENCER) return new Response('Sequencer not configured', { status: 503 });
-
-      const id = env.SEQUENCER.idFromName('default');
-      const stub = env.SEQUENCER.get(id);
-      return stub.fetch(request as any);
-    }
-
-    const locals: any = { runtime: { env, ctx, request } };
-    return await onRequest(locals as any, async () => await handle(locals as any));
-  },
-};
-
-// Export Durable Object(s)
 export { Sequencer } from './worker/sequencer';

package/src/handlers/root.ts

@@ -1,5 +1,108 @@
 import type { APIContext } from 'astro';
 
-export async function GET(_ctx: APIContext) {
-  return new Response('Alteran is alive', { status: 200 });
+const HTML_TEMPLATE = (
+  handle,
+  did,
+) => `<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <title>Alteran PDS</title>
+    <style>
+      :root {
+        color-scheme: light dark;
+        font-family: system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif;
+      }
+      body {
+        margin: 0;
+        min-height: 100vh;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        background: radial-gradient(circle at top, #f5f7ff, #e2e8f0);
+      }
+      .card {
+        background: rgba(255, 255, 255, 0.92);
+        backdrop-filter: blur(6px);
+        padding: 2.5rem;
+        border-radius: 1rem;
+        box-shadow: 0 25px 45px rgba(15, 23, 42, 0.18);
+        text-align: center;
+        max-width: 28rem;
+      }
+      h1 {
+        margin: 0 0 1.5rem;
+        font-size: clamp(2rem, 4vw, 2.75rem);
+        letter-spacing: -0.02em;
+        color: #111827;
+      }
+      p {
+        margin: 0.75rem 0;
+        color: #334155;
+        line-height: 1.55;
+      }
+      .pill {
+        display: inline-block;
+        font-family: 'JetBrains Mono', 'Fira Code', monospace;
+        font-size: 0.95rem;
+        padding: 0.35rem 0.75rem;
+        border-radius: 999px;
+        background: rgba(59, 130, 246, 0.13);
+        color: #1d4ed8;
+      }
+      a {
+        display: inline-flex;
+        align-items: center;
+        gap: 0.5rem;
+        color: #2563eb;
+        text-decoration: none;
+        font-weight: 600;
+        margin-top: 1.5rem;
+      }
+      a:hover {
+        text-decoration: underline;
+      }
+      svg {
+        width: 1.25rem;
+        height: 1.25rem;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="card">
+      <h1>Alteran</h1>
+      <p>This single-user ATProto Personal Data Server runs on Cloudflare Workers.</p>
+      <p>
+        <strong>Handle:</strong>
+        <span class="pill">${handle}</span>
+      </p>
+      <p>
+        <strong>DID:</strong>
+        <span class="pill">${did}</span>
+      </p>
+      <a href="https://github.com/alteran-dev/alteran" target="_blank" rel="noopener noreferrer">
+        <svg viewBox="0 0 24 24" role="img" aria-hidden="true" focusable="false">
+          <path
+            fill="currentColor"
+            d="M12 .5a12 12 0 0 0-3.79 23.4c.6.11.82-.26.82-.58v-2.02c-3.34.73-4.04-1.61-4.04-1.61-.55-1.4-1.35-1.77-1.35-1.77-1.1-.75.08-.74.08-.74 1.22.09 1.87 1.26 1.87 1.26 1.08 1.85 2.83 1.32 3.52 1.01.11-.79.42-1.32.76-1.62-2.67-.3-5.47-1.34-5.47-5.98 0-1.32.47-2.39 1.25-3.24-.13-.3-.54-1.52.12-3.17 0 0 1.01-.32 3.3 1.24a11.5 11.5 0 0 1 6 0c2.29-1.56 3.3-1.24 3.3-1.24.66 1.65.25 2.87.12 3.17.78.85 1.25 1.92 1.25 3.24 0 4.66-2.8 5.68-5.48 5.97.43.37.81 1.09.81 2.2v3.26c0 .32.22.7.83.58A12 12 0 0 0 12 .5"
+          />
+        </svg>
+        Source Code
+      </a>
+    </div>
+  </body>
+</html>`;
+
+export async function GET({ locals }: APIContext) {
+  const { env } = locals.runtime ?? {};
+  const handle = env?.PDS_HANDLE ?? 'unknown.handle';
+  const did = env?.PDS_DID ?? 'did:plc:unknown';
+
+  return new Response(HTML_TEMPLATE(handle, did), {
+    status: 200,
+    headers: {
+      'Content-Type': 'text/html; charset=utf-8',
+    },
+  });
 }

package/src/worker/index.ts

@@ -0,0 +1,6 @@
+export { createPdsFetchHandler } from './runtime';
+export type { PdsFetchHandler } from './runtime';
+export { Sequencer } from './sequencer';
+export { onRequest } from '../middleware';
+export { seed } from '../db/seed';
+export { validateConfigOrThrow } from '../lib/config';

package/src/worker/runtime.ts

@@ -0,0 +1,63 @@
+import { handle } from 'astro/internal/handler';
+import { onRequest } from '../middleware';
+import { seed } from '../db/seed';
+import { validateConfigOrThrow } from '../lib/config';
+import type { Env } from '../env';
+import type {
+  ExecutionContext,
+  Request as WorkersRequest,
+  Response as WorkersResponse,
+} from '@cloudflare/workers-types';
+
+export type PdsFetchHandler = (
+  request: WorkersRequest,
+  env: Env,
+  ctx: ExecutionContext
+) => Promise<WorkersResponse>;
+
+/**
+ * Returns the Alteran PDS Worker fetch handler so downstream apps can
+ * compose it inside their own Cloudflare Worker entrypoint.
+ */
+export function createPdsFetchHandler(): PdsFetchHandler {
+  return async function fetch(request: WorkersRequest, env: Env, ctx: ExecutionContext) {
+    try {
+      validateConfigOrThrow(env);
+    } catch (error) {
+      return new Response(
+        JSON.stringify({
+          error: 'ConfigurationError',
+          message: error instanceof Error ? error.message : 'Invalid configuration',
+        }),
+        {
+          status: 500,
+          headers: { 'Content-Type': 'application/json' },
+        }
+      ) as unknown as WorkersResponse;
+    }
+
+    await seed(env.DB, env.PDS_DID ?? 'did:example:single-user');
+
+    const url = new URL(request.url);
+    if (url.pathname === '/xrpc/com.atproto.sync.subscribeRepos') {
+      const upgrade = request.headers.get('upgrade');
+      if (upgrade !== 'websocket') {
+        return new Response('Expected websocket', { status: 426 }) as unknown as WorkersResponse;
+      }
+      if (!env.SEQUENCER) {
+        return new Response('Sequencer not configured', { status: 503 }) as unknown as WorkersResponse;
+      }
+
+      const id = env.SEQUENCER.idFromName('default');
+      const stub = env.SEQUENCER.get(id);
+      return (await stub.fetch(request as any)) as unknown as WorkersResponse;
+    }
+
+    const locals: any = { runtime: { env, ctx, request } };
+    return (await onRequest(locals as any, async () => await handle(locals as any))) as unknown as WorkersResponse;
+  };
+}
+
+export { onRequest };
+export { seed };
+export { validateConfigOrThrow };

package/types/worker.d.ts

@@ -0,0 +1,5 @@
+export { createPdsFetchHandler, type PdsFetchHandler } from '../src/worker/runtime';
+export { Sequencer } from '../src/worker/sequencer';
+export { onRequest } from '../src/middleware';
+export { seed } from '../src/db/seed';
+export { validateConfigOrThrow } from '../src/lib/config';

package/src/pages/index.astro

@@ -1,57 +0,0 @@
----
-import { Icon } from 'astro-icon/components';
----
-
-<html lang="en">
-  <head>
-    <meta charset="utf-8" />
-    <link rel="icon" type="image/svg+xml" href="/favicon.svg" />
-    <meta name="viewport" content="width=device-width" />
-    <meta name="generator" content={Astro.generator} />
-    <title>Alteran PDS</title>
-    <style>
-      body {
-        font-family: sans-serif;
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        height: 100vh;
-        background-color: #f0f2f5;
-      }
-      .card {
-        background-color: white;
-        padding: 2rem;
-        border-radius: 0.5rem;
-        box-shadow: 0 0 1rem rgba(0, 0, 0, 0.1);
-        text-align: center;
-      }
-      h1 {
-        margin-top: 0;
-      }
-      .did, .handle {
-        font-family: monospace;
-        background-color: #eee;
-        padding: 0.25rem 0.5rem;
-        border-radius: 0.25rem;
-      }
-    </style>
-  </head>
-  <body>
-    <div class="card">
-      <h1>Alteran</h1>
-      <p>This is a single-user ATProto Personal Data Server running on Cloudflare.</p>
-      <p>
-        <strong>Handle:</strong> <span class="handle">{import.meta.env.PDS_HANDLE}</span>
-      </p>
-      <p>
-        <strong>DID:</strong> <span class="did">{import.meta.env.PDS_DID}</span>
-      </p>
-      <p>
-        <a href="https://github.com/alteran-dev/alteran" target="_blank" rel="noopener noreferrer">
-          <Icon name="simple-icons:github" />
-          Source Code
-        </a>
-      </p>
-    </div>
-  </body>
-</html>

package/src/pages/index.ts

@@ -1,2 +0,0 @@
-export { GET } from '../handlers/root';
-