@alteran/astro 0.3.2 → 0.3.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alteran/astro",
-  "version": "0.3.2",
+  "version": "0.3.4",
   "description": "Astro integration for running a Cloudflare-hosted Bluesky PDS with Alteran.",
   "module": "index.js",
   "types": "index.d.ts",

package/src/db/repo.ts

@@ -6,6 +6,7 @@ import { RepoManager } from '../services/repo-manager';
 import { createCommit, signCommit, commitCid, generateTid, serializeCommit } from '../lib/commit';
 import { CID } from 'multiformats/cid';
 import { resolveSecret } from '../lib/secrets';
+import { encodeBlocksForCommit } from '../services/car';
 
 export async function getRoot(env: Env) {
   const db = drizzle(env.DB);
@@ -21,6 +22,9 @@ export async function bumpRoot(env: Env, prevMstRoot?: CID): Promise<{
   rev: string;
   ops: import('../lib/firehose/frames').RepoOp[];
   mstRoot: CID;
+  commitData: string;
+  sig: string;
+  blocks: string; // base64-encoded CAR
 }> {
   const db = drizzle(env.DB);
   const did = (await resolveSecret(env.PDS_DID)) ?? 'did:example:single-user';
@@ -89,7 +93,14 @@ export async function bumpRoot(env: Env, prevMstRoot?: CID): Promise<{
   // Append to commit log
   await appendCommit(env, cidString, rev, commitData, sigBase64);
 
-  return { commitCid: cidString, rev, ops, mstRoot: mstRootCid };
+  // Encode blocks as CAR for firehose
+  const blocksBytes = await encodeBlocksForCommit(env, cid, mstRootCid, ops);
+  // Encode to base64 (workers-safe)
+  let blocksBase64 = '';
+  for (const b of blocksBytes) blocksBase64 += String.fromCharCode(b);
+  blocksBase64 = btoa(blocksBase64);
+
+  return { commitCid: cidString, rev, ops, mstRoot: mstRootCid, commitData, sig: sigBase64, blocks: blocksBase64 };
 }
 
 export async function appendCommit(env: Env, cid: string, rev: string, data: string, sig: string) {

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

@@ -28,7 +28,15 @@ export async function POST({ locals, request }: APIContext) {
 
   const repo = new RepoManager(env);
   const commit = await repo.createRecord(collection, record, rkey);
-  await notifySequencer(env, { type: 'commit', did: env.PDS_DID ?? 'did:example:single-user', commitCid: commit.commitCid, rev: commit.rev, ops: commit.ops });
+  await notifySequencer(env, { 
+    did: env.PDS_DID ?? 'did:example:single-user', 
+    commitCid: commit.commitCid, 
+    rev: commit.rev, 
+    data: commit.commitData,
+    sig: commit.sig,
+    ops: commit.ops,
+    blocks: commit.blocks
+  });
 
   return new Response(JSON.stringify(commit), {
     headers: { 'Content-Type': 'application/json' },

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

@@ -28,7 +28,15 @@ export async function POST({ locals, request }: APIContext) {
 
   const repo = new RepoManager(env);
   const commit = await repo.deleteRecord(collection, rkey);
-  await notifySequencer(env, { type: 'commit', did: env.PDS_DID ?? 'did:example:single-user', commitCid: commit.commitCid, rev: commit.rev, ops: commit.ops });
+  await notifySequencer(env, { 
+    did: env.PDS_DID ?? 'did:example:single-user', 
+    commitCid: commit.commitCid, 
+    rev: commit.rev, 
+    data: commit.commitData,
+    sig: commit.sig,
+    ops: commit.ops,
+    blocks: commit.blocks
+  });
 
   return new Response(JSON.stringify(commit), {
     headers: { 'Content-Type': 'application/json' },

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

@@ -28,7 +28,15 @@ export async function POST({ locals, request }: APIContext) {
 
   const repo = new RepoManager(env);
   const commit = await repo.putRecord(collection, rkey, record);
-  await notifySequencer(env, { type: 'commit', did: env.PDS_DID ?? 'did:example:single-user', commitCid: commit.commitCid, rev: commit.rev, ops: commit.ops });
+  await notifySequencer(env, { 
+    did: env.PDS_DID ?? 'did:example:single-user', 
+    commitCid: commit.commitCid, 
+    rev: commit.rev, 
+    data: commit.commitData,
+    sig: commit.sig,
+    ops: commit.ops,
+    blocks: commit.blocks
+  });
 
   return new Response(JSON.stringify(commit), {
     headers: { 'Content-Type': 'application/json' },

package/src/services/repo-manager.ts

@@ -98,6 +98,9 @@ export class RepoManager {
     commitCid: string;
     rev: string;
     ops: RepoOp[];
+    commitData: string;
+    sig: string;
+    blocks: string;
   }> {
     const key = rkey ?? generateTid();
     const { mst, recordCid, prevMstRoot } = await this.addRecord(collection, key, record);
@@ -107,9 +110,9 @@ export class RepoManager {
     await dalPutRecord(this.env, { uri, did: this.did, cid: recordCid.toString(), json: JSON.stringify(record) } as any);
 
     // Update repo root with signed commit and extract ops
-    const { commitCid, rev, ops } = await bumpRoot(this.env, prevMstRoot ?? undefined);
+    const { commitCid, rev, ops, commitData, sig, blocks } = await bumpRoot(this.env, prevMstRoot ?? undefined);
 
-    return { uri, cid: recordCid.toString(), commitCid, rev, ops };
+    return { uri, cid: recordCid.toString(), commitCid, rev, ops, commitData, sig, blocks };
   }
 
   /**
@@ -147,12 +150,15 @@ export class RepoManager {
     commitCid: string;
     rev: string;
     ops: RepoOp[];
+    commitData: string;
+    sig: string;
+    blocks: string;
   }> {
     const { mst, recordCid, prevMstRoot } = await this.updateRecord(collection, rkey, record);
     const uri = `at://${this.did}/${collection}/${rkey}`;
     await dalPutRecord(this.env, { uri, did: this.did, cid: recordCid.toString(), json: JSON.stringify(record) } as any);
-    const { commitCid, rev, ops } = await bumpRoot(this.env, prevMstRoot ?? undefined);
-    return { uri, cid: recordCid.toString(), commitCid, rev, ops };
+    const { commitCid, rev, ops, commitData, sig, blocks } = await bumpRoot(this.env, prevMstRoot ?? undefined);
+    return { uri, cid: recordCid.toString(), commitCid, rev, ops, commitData, sig, blocks };
   }
 
   /**
@@ -163,6 +169,9 @@ export class RepoManager {
     commitCid: string;
     rev: string;
     ops: RepoOp[];
+    commitData: string;
+    sig: string;
+    blocks: string;
   }> {
     const key = `${collection}/${rkey}`;
 
@@ -180,8 +189,8 @@ export class RepoManager {
     const uri = `at://${this.did}/${collection}/${rkey}`;
     await dalDeleteRecord(this.env, uri);
 
-    const { commitCid, rev, ops } = await bumpRoot(this.env, prevMstRoot ?? undefined);
-    return { uri, commitCid, rev, ops };
+    const { commitCid, rev, ops, commitData, sig, blocks } = await bumpRoot(this.env, prevMstRoot ?? undefined);
+    return { uri, commitCid, rev, ops, commitData, sig, blocks };
   }
 
   /**

package/src/worker/runtime.ts

@@ -79,8 +79,16 @@ export function createPdsFetchHandler(options?: CreatePdsFetchHandlerOptions): P
 
     // Fire-and-forget: let relays know this PDS exists and is reachable.
     // Throttled per isolate and safe to call frequently.
+    // Best-effort: notify relays, but avoid doing so on relay-initiated endpoints
+    // to prevent feedback loops (describeServer/subscribeRepos).
     try {
-      ctx.waitUntil(notifyRelaysIfNeeded(resolvedEnv as any, request.url));
+      const pathname = new URL(request.url).pathname;
+      const isRelayPath =
+        pathname === '/xrpc/com.atproto.server.describeServer' ||
+        pathname === '/xrpc/com.atproto.sync.subscribeRepos';
+      if (!isRelayPath) {
+        ctx.waitUntil(notifyRelaysIfNeeded(resolvedEnv as any, request.url));
+      }
     } catch (err) {
       // Never block on relay notification
     }

package/src/worker/sequencer.ts

@@ -266,6 +266,16 @@ export class Sequencer {
       console.error('Failed to send info frame:', error);
     }
 
+    // Keep the connection alive to avoid intermediary idle timeouts (e.g., CF edge)
+    // Send a lightweight #info heartbeat every ~25s. Most clients ignore unknown #info
+    // messages; this is safe and keeps the socket active.
+    const keepalive = setInterval(() => {
+      try {
+        const ka = createInfoFrame('keepalive', 'ping');
+        ws.send(ka.toFramedBytes());
+      } catch {}
+    }, 25_000);
+
     // Set up event handlers
     ws.addEventListener('message', (evt) => {
       try {
@@ -280,10 +290,12 @@ export class Sequencer {
 
     ws.addEventListener('close', () => {
       this.clients.delete(id);
+      clearInterval(keepalive);
     });
 
     ws.addEventListener('error', () => {
       this.clients.delete(id);
+      clearInterval(keepalive);
     });
 
     // Replay buffered events if cursor provided