@alteran/astro 0.1.3 → 0.1.5

package/README.md

@@ -27,19 +27,40 @@ 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
 });
 ```
 
 The integration automatically:
-- Adds a Vite alias of `@alteran/*` that points to the package runtime
+- 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

@@ -56,10 +56,9 @@ export default function alteran(options = {}) {
   const {
     debugRoutes = false,
     includeRootEndpoint = false,
-    injectServerEntry = true,
+    injectServerEntry = false,
   } = options;
 
-  const aliasTarget = resolvePackagePath('./src');
   const middlewareEntrypoint = resolvePackagePath('./src/middleware.ts');
   const serverEntrypoint = resolvePackagePath('./src/_worker.ts');
 
@@ -79,16 +78,6 @@ export default function alteran(options = {}) {
           updateConfig({ output: 'server' });
         }
 
-        updateConfig({
-          vite: {
-            resolve: {
-              alias: {
-                '@alteran': aliasTarget,
-              },
-            },
-          },
-        });
-
         if (injectServerEntry) {
           if (config.build?.serverEntry && config.build.serverEntry !== serverEntrypoint) {
             logger.info(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alteran/astro",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "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",

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/pages/debug/db/commits.ts

@@ -1,6 +1,6 @@
 import type { APIContext } from 'astro';
 import { drizzle } from 'drizzle-orm/d1';
-import { commit_log } from '@alteran/db/schema';
+import { commit_log } from '../../../db/schema';
 import { desc } from 'drizzle-orm';
 
 export const prerender = false;

package/src/pages/debug/gc/blobs.ts

@@ -1,5 +1,5 @@
 import type { APIContext } from 'astro';
-import { listOrphanBlobKeys, deleteBlobByKey } from '@alteran/db/dal';
+import { listOrphanBlobKeys, deleteBlobByKey } from '../../../db/dal';
 
 export const prerender = false;
 

package/src/pages/debug/record.ts

@@ -1,5 +1,5 @@
 import type { APIContext } from 'astro';
-import { getRecord as dalGetRecord, putRecord as dalPutRecord } from '@alteran/db/dal';
+import { getRecord as dalGetRecord, putRecord as dalPutRecord } from '../../db/dal';
 
 export const prerender = false;
 

package/src/pages/xrpc/com.atproto.identity.updateHandle.ts

@@ -1,5 +1,5 @@
 import type { APIContext } from 'astro';
-import { readJson } from '@alteran/lib/util';
+import { readJson } from '../../lib/util';
 
 export const prerender = false;
 

package/src/pages/xrpc/com.atproto.repo.applyWrites.ts

@@ -1,7 +1,7 @@
 import type { APIContext } from 'astro';
-import { RepoManager } from '@alteran/services/repo-manager';
-import { readJson } from '@alteran/lib/util';
-import { bumpRoot } from '@alteran/db/repo';
+import { RepoManager } from '../../services/repo-manager';
+import { readJson } from '../../lib/util';
+import { bumpRoot } from '../../db/repo';
 
 export const prerender = false;
 

package/src/pages/xrpc/com.atproto.repo.createRecord.ts

@@ -1,9 +1,9 @@
 import type { APIContext } from 'astro';
-import { isAuthorized, unauthorized } from '@alteran/lib/auth';
-import { checkRate } from '@alteran/lib/ratelimit';
-import { readJsonBounded } from '@alteran/lib/util';
-import { RepoManager } from '@alteran/services/repo-manager';
-import { notifySequencer } from '@alteran/lib/sequencer';
+import { isAuthorized, unauthorized } from '../../lib/auth';
+import { checkRate } from '../../lib/ratelimit';
+import { readJsonBounded } from '../../lib/util';
+import { RepoManager } from '../../services/repo-manager';
+import { notifySequencer } from '../../lib/sequencer';
 
 export const prerender = false;
 

package/src/pages/xrpc/com.atproto.repo.deleteRecord.ts

@@ -1,9 +1,9 @@
 import type { APIContext } from 'astro';
-import { isAuthorized, unauthorized } from '@alteran/lib/auth';
-import { checkRate } from '@alteran/lib/ratelimit';
-import { readJsonBounded } from '@alteran/lib/util';
-import { RepoManager } from '@alteran/services/repo-manager';
-import { notifySequencer } from '@alteran/lib/sequencer';
+import { isAuthorized, unauthorized } from '../../lib/auth';
+import { checkRate } from '../../lib/ratelimit';
+import { readJsonBounded } from '../../lib/util';
+import { RepoManager } from '../../services/repo-manager';
+import { notifySequencer } from '../../lib/sequencer';
 
 export const prerender = false;
 

package/src/pages/xrpc/com.atproto.repo.describeRepo.ts

@@ -1,5 +1,5 @@
 import type { APIContext } from 'astro';
-import { getRoot } from '@alteran/db/repo';
+import { getRoot } from '../../db/repo';
 
 export const prerender = false;
 

package/src/pages/xrpc/com.atproto.repo.getRecord.ts

@@ -1,5 +1,5 @@
 import type { APIContext } from 'astro';
-import { getRecord as dalGetRecord } from '@alteran/db/dal';
+import { getRecord as dalGetRecord } from '../../db/dal';
 
 export const prerender = false;
 

package/src/pages/xrpc/com.atproto.repo.listRecords.ts

@@ -1,5 +1,5 @@
 import type { APIContext } from 'astro';
-import { RepoManager } from '@alteran/services/repo-manager';
+import { RepoManager } from '../../services/repo-manager';
 
 export const prerender = false;
 

package/src/pages/xrpc/com.atproto.repo.putRecord.ts

@@ -1,9 +1,9 @@
 import type { APIContext } from 'astro';
-import { isAuthorized, unauthorized } from '@alteran/lib/auth';
-import { checkRate } from '@alteran/lib/ratelimit';
-import { readJsonBounded } from '@alteran/lib/util';
-import { RepoManager } from '@alteran/services/repo-manager';
-import { notifySequencer } from '@alteran/lib/sequencer';
+import { isAuthorized, unauthorized } from '../../lib/auth';
+import { checkRate } from '../../lib/ratelimit';
+import { readJsonBounded } from '../../lib/util';
+import { RepoManager } from '../../services/repo-manager';
+import { notifySequencer } from '../../lib/sequencer';
 
 export const prerender = false;
 

package/src/pages/xrpc/com.atproto.repo.uploadBlob.ts

@@ -1,9 +1,9 @@
 import type { APIContext } from 'astro';
-import { isAuthorized, unauthorized } from '@alteran/lib/auth';
-import { checkRate } from '@alteran/lib/ratelimit';
-import { isAllowedMime } from '@alteran/lib/util';
-import { R2BlobStore } from '@alteran/services/r2-blob-store';
-import { putBlobRef, checkBlobQuota, updateBlobQuota } from '@alteran/db/dal';
+import { isAuthorized, unauthorized } from '../../lib/auth';
+import { checkRate } from '../../lib/ratelimit';
+import { isAllowedMime } from '../../lib/util';
+import { R2BlobStore } from '../../services/r2-blob-store';
+import { putBlobRef, checkBlobQuota, updateBlobQuota } from '../../db/dal';
 
 export const prerender = false;
 

package/src/pages/xrpc/com.atproto.server.createSession.ts

@@ -1,8 +1,8 @@
 import type { APIContext } from 'astro';
-import { signJwt } from '@alteran/lib/jwt';
-import { readJson } from '@alteran/lib/util';
+import { signJwt } from '../../lib/jwt';
+import { readJson } from '../../lib/util';
 import { drizzle } from 'drizzle-orm/d1';
-import { login_attempts } from '@alteran/db/schema';
+import { login_attempts } from '../../db/schema';
 import { eq } from 'drizzle-orm';
 
 export const prerender = false;

package/src/pages/xrpc/com.atproto.server.refreshSession.ts

@@ -1,9 +1,9 @@
 import type { APIContext } from 'astro';
-import { signJwt, verifyJwt } from '@alteran/lib/jwt';
-import { bearerToken } from '@alteran/lib/util';
-import { lazyCleanupExpiredTokens } from '@alteran/lib/token-cleanup';
+import { signJwt, verifyJwt } from '../../lib/jwt';
+import { bearerToken } from '../../lib/util';
+import { lazyCleanupExpiredTokens } from '../../lib/token-cleanup';
 import { drizzle } from 'drizzle-orm/d1';
-import { token_revocation } from '@alteran/db/schema';
+import { token_revocation } from '../../db/schema';
 import { eq } from 'drizzle-orm';
 
 export const prerender = false;

package/src/pages/xrpc/com.atproto.sync.getBlocks.json.ts

@@ -1,6 +1,6 @@
 import type { APIContext } from 'astro';
-import { getRecordsByCids as dalGetByCids } from '@alteran/db/dal';
-import { tryParse } from '@alteran/lib/util';
+import { getRecordsByCids as dalGetByCids } from '../../db/dal';
+import { tryParse } from '../../lib/util';
 
 export const prerender = false;
 

package/src/pages/xrpc/com.atproto.sync.getBlocks.ts

@@ -1,8 +1,8 @@
 import type { APIContext } from 'astro';
-import { NotFound } from '@alteran/lib/errors';
-import { D1Blockstore } from '@alteran/lib/mst';
+import { NotFound } from '../../lib/errors';
+import { D1Blockstore } from '../../lib/mst';
 import { CID } from 'multiformats/cid';
-import { encodeExistingBlocksToCAR } from '@alteran/services/car';
+import { encodeExistingBlocksToCAR } from '../../services/car';
 
 export const prerender = false;
 

package/src/pages/xrpc/com.atproto.sync.getCheckout.json.ts

@@ -1,7 +1,7 @@
 import type { APIContext } from 'astro';
-import { getRoot as getRepoRoot } from '@alteran/db/repo';
-import { listRecords as dalListRecords } from '@alteran/db/dal';
-import { tryParse } from '@alteran/lib/util';
+import { getRoot as getRepoRoot } from '../../db/repo';
+import { listRecords as dalListRecords } from '../../db/dal';
+import { tryParse } from '../../lib/util';
 
 export const prerender = false;
 

package/src/pages/xrpc/com.atproto.sync.getCheckout.ts

@@ -1,5 +1,5 @@
 import type { APIContext } from 'astro';
-import { buildRepoCar, buildRepoCarRange } from '@alteran/services/car';
+import { buildRepoCar, buildRepoCarRange } from '../../services/car';
 
 export const prerender = false;
 

package/src/pages/xrpc/com.atproto.sync.getHead.ts

@@ -1,5 +1,5 @@
 import type { APIContext } from 'astro';
-import { getRoot as getRepoRoot } from '@alteran/db/repo';
+import { getRoot as getRepoRoot } from '../../db/repo';
 
 export const prerender = false;
 

package/src/pages/xrpc/com.atproto.sync.getLatestCommit.ts

@@ -1,5 +1,5 @@
 import type { APIContext } from 'astro';
-import { getRoot } from '@alteran/db/repo';
+import { getRoot } from '../../db/repo';
 
 export const prerender = false;
 

package/src/pages/xrpc/com.atproto.sync.getRecord.ts

@@ -1,6 +1,6 @@
 import type { APIContext } from 'astro';
-import { RepoManager } from '@alteran/services/repo-manager';
-import { encodeRecordBlock } from '@alteran/services/car';
+import { RepoManager } from '../../services/repo-manager';
+import { encodeRecordBlock } from '../../services/car';
 import * as dagCbor from '@ipld/dag-cbor';
 import { CID } from 'multiformats/cid';
 import { sha256 } from 'multiformats/hashes/sha2';

package/src/pages/xrpc/com.atproto.sync.getRepo.json.ts

@@ -1,7 +1,7 @@
 import type { APIContext } from 'astro';
-import { getRoot as getRepoRoot } from '@alteran/db/repo';
-import { listRecords as dalListRecords } from '@alteran/db/dal';
-import { tryParse } from '@alteran/lib/util';
+import { getRoot as getRepoRoot } from '../../db/repo';
+import { listRecords as dalListRecords } from '../../db/dal';
+import { tryParse } from '../../lib/util';
 
 export const prerender = false;
 

package/src/pages/xrpc/com.atproto.sync.getRepo.range.ts

@@ -1,5 +1,5 @@
 import type { APIContext } from 'astro';
-import { buildRepoCarRange } from '@alteran/services/car';
+import { buildRepoCarRange } from '../../services/car';
 
 export const prerender = false;
 

package/src/pages/xrpc/com.atproto.sync.getRepo.ts

@@ -1,5 +1,5 @@
 import type { APIContext } from 'astro';
-import { buildRepoCar } from '@alteran/services/car';
+import { buildRepoCar } from '../../services/car';
 
 export const prerender = false;
 

package/src/pages/xrpc/com.atproto.sync.listBlobs.ts

@@ -1,6 +1,6 @@
 import type { APIContext } from 'astro';
 import { drizzle } from 'drizzle-orm/d1';
-import { blob_ref } from '@alteran/db/schema';
+import { blob_ref } from '../../db/schema';
 import { eq, gt, and } from 'drizzle-orm';
 
 export const prerender = false;

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';