@oxy.so/federation 2.6.0 → 2.7.0

package/dist/cjs/node/delivery.js

@@ -353,27 +353,28 @@ function createDeliveryService(config) {
         }
         return true;
     }
-    async function sendAccept(localOxyUserId, localUsername, followActivityId, remoteActorUri) {
+    /** Answer a remote Follow: `Accept` or `Reject`, one envelope for both. */
+    async function sendFollowResponse(type, localOxyUserId, localUsername, followActivityId, remoteActorUri) {
         const actor = await config.store.findActorByUri(remoteActorUri);
         if (!actor)
             return;
         // `inboxUrl` is schema-optional (atproto actors have none); an AP actor we
-        // are sending Accept(Follow) to always has one. When neither inbox is known the
-        // local follow is already removed — just skip the outbound delivery.
+        // are answering always has one. When neither inbox is known, skip the
+        // outbound delivery.
         const targetInbox = actor.sharedInboxUrl ?? actor.inboxUrl;
         if (!targetInbox) {
-            logger.warn(`[FedSync] cannot send Accept(Follow) to ${remoteActorUri}: actor has no inbox`);
+            logger.warn(`[FedSync] cannot send ${type}(Follow) to ${remoteActorUri}: actor has no inbox`);
             return;
         }
         if (isBlockedUrl(targetInbox) || isBlockedUrl(remoteActorUri)) {
-            logger.warn(`[FedDeliver] refusing Accept(Follow) delivery to blocked origin ${remoteActorUri}`);
+            logger.warn(`[FedDeliver] refusing ${type}(Follow) delivery to blocked origin ${remoteActorUri}`);
             return;
         }
         const localActorUri = urls.actor(localUsername);
         const activity = {
             '@context': apContext_1.AP_CONTEXT,
-            id: `${localActorUri}/accepts/${Date.now()}`,
-            type: 'Accept',
+            id: `${localActorUri}/${type === 'Accept' ? 'accepts' : 'rejects'}/${Date.now()}`,
+            type,
             actor: localActorUri,
             object: {
                 id: followActivityId,
@@ -387,6 +388,12 @@ function createDeliveryService(config) {
             await queueDelivery(activity, targetInbox, localOxyUserId);
         }
     }
+    function sendAccept(localOxyUserId, localUsername, followActivityId, remoteActorUri) {
+        return sendFollowResponse('Accept', localOxyUserId, localUsername, followActivityId, remoteActorUri);
+    }
+    function sendReject(localOxyUserId, localUsername, followActivityId, remoteActorUri) {
+        return sendFollowResponse('Reject', localOxyUserId, localUsername, followActivityId, remoteActorUri);
+    }
     async function federateActorUpdate(actorOxyUserId, username) {
         if (!config.federationEnabled)
             return;
@@ -440,6 +447,7 @@ function createDeliveryService(config) {
         sendFollow,
         sendUndoFollow,
         sendAccept,
+        sendReject,
         federateActorUpdate,
     };
 }

package/dist/cjs/node/inboundDispatch.js

@@ -150,6 +150,14 @@ function createInboundDispatcher(config) {
             logger.debug(`[Federation] ignoring self-follow from ${actorUri} to ${username}`);
             return;
         }
+        if (config.refusesFollower && (await config.refusesFollower(localUserId, followerOxyUserId))) {
+            if (!config.delivery.sendReject) {
+                throw new Error('refusesFollower is wired without delivery.sendReject');
+            }
+            await config.delivery.sendReject(localUserId, username, String(activity.id), actorUri);
+            logger.info(`Rejected follow from ${actorUri} to ${username}`);
+            return;
+        }
         // Create the Oxy follow edge BEFORE sending Accept so a retry never spams
         // Accepts: the bridge is idempotent (safe to re-run), but an Accept delivered
         // before the edge was committed could be re-sent on every retry. On failure

package/dist/esm/node/delivery.js

@@ -348,27 +348,28 @@ export function createDeliveryService(config) {
         }
         return true;
     }
-    async function sendAccept(localOxyUserId, localUsername, followActivityId, remoteActorUri) {
+    /** Answer a remote Follow: `Accept` or `Reject`, one envelope for both. */
+    async function sendFollowResponse(type, localOxyUserId, localUsername, followActivityId, remoteActorUri) {
         const actor = await config.store.findActorByUri(remoteActorUri);
         if (!actor)
             return;
         // `inboxUrl` is schema-optional (atproto actors have none); an AP actor we
-        // are sending Accept(Follow) to always has one. When neither inbox is known the
-        // local follow is already removed — just skip the outbound delivery.
+        // are answering always has one. When neither inbox is known, skip the
+        // outbound delivery.
         const targetInbox = actor.sharedInboxUrl ?? actor.inboxUrl;
         if (!targetInbox) {
-            logger.warn(`[FedSync] cannot send Accept(Follow) to ${remoteActorUri}: actor has no inbox`);
+            logger.warn(`[FedSync] cannot send ${type}(Follow) to ${remoteActorUri}: actor has no inbox`);
             return;
         }
         if (isBlockedUrl(targetInbox) || isBlockedUrl(remoteActorUri)) {
-            logger.warn(`[FedDeliver] refusing Accept(Follow) delivery to blocked origin ${remoteActorUri}`);
+            logger.warn(`[FedDeliver] refusing ${type}(Follow) delivery to blocked origin ${remoteActorUri}`);
             return;
         }
         const localActorUri = urls.actor(localUsername);
         const activity = {
             '@context': AP_CONTEXT,
-            id: `${localActorUri}/accepts/${Date.now()}`,
-            type: 'Accept',
+            id: `${localActorUri}/${type === 'Accept' ? 'accepts' : 'rejects'}/${Date.now()}`,
+            type,
             actor: localActorUri,
             object: {
                 id: followActivityId,
@@ -382,6 +383,12 @@ export function createDeliveryService(config) {
             await queueDelivery(activity, targetInbox, localOxyUserId);
         }
     }
+    function sendAccept(localOxyUserId, localUsername, followActivityId, remoteActorUri) {
+        return sendFollowResponse('Accept', localOxyUserId, localUsername, followActivityId, remoteActorUri);
+    }
+    function sendReject(localOxyUserId, localUsername, followActivityId, remoteActorUri) {
+        return sendFollowResponse('Reject', localOxyUserId, localUsername, followActivityId, remoteActorUri);
+    }
     async function federateActorUpdate(actorOxyUserId, username) {
         if (!config.federationEnabled)
             return;
@@ -435,6 +442,7 @@ export function createDeliveryService(config) {
         sendFollow,
         sendUndoFollow,
         sendAccept,
+        sendReject,
         federateActorUpdate,
     };
 }

package/dist/esm/node/inboundDispatch.js

@@ -145,6 +145,14 @@ export function createInboundDispatcher(config) {
             logger.debug(`[Federation] ignoring self-follow from ${actorUri} to ${username}`);
             return;
         }
+        if (config.refusesFollower && (await config.refusesFollower(localUserId, followerOxyUserId))) {
+            if (!config.delivery.sendReject) {
+                throw new Error('refusesFollower is wired without delivery.sendReject');
+            }
+            await config.delivery.sendReject(localUserId, username, String(activity.id), actorUri);
+            logger.info(`Rejected follow from ${actorUri} to ${username}`);
+            return;
+        }
         // Create the Oxy follow edge BEFORE sending Accept so a retry never spams
         // Accepts: the bridge is idempotent (safe to re-run), but an Accept delivered
         // before the edge was committed could be re-sent on every retry. On failure

package/dist/types/node/delivery.d.ts

@@ -266,6 +266,8 @@ export interface DeliveryService {
     sendUndoFollow(localOxyUserId: string, localUsername: string, remoteActorUri: string): Promise<boolean>;
     /** Send an Accept(Follow) back to a remote actor. */
     sendAccept(localOxyUserId: string, localUsername: string, followActivityId: string, remoteActorUri: string): Promise<void>;
+    /** Send a Reject(Follow) back to a remote actor — the same envelope as the Accept. */
+    sendReject(localOxyUserId: string, localUsername: string, followActivityId: string, remoteActorUri: string): Promise<void>;
     /** Rebroadcast the FULL actor document as an Update(Person) to remote followers. */
     federateActorUpdate(actorOxyUserId: string, username: string): Promise<void>;
 }

package/dist/types/node/inboundDispatch.d.ts

@@ -108,6 +108,8 @@ export interface InboundFollowStore {
 /** The delivery subset the inbound Follow uses (send the Accept back). */
 export interface InboundDelivery {
     sendAccept(localOxyUserId: string, localUsername: string, followActivityId: string, remoteActorUri: string): Promise<void>;
+    /** Send a Reject(Follow) back — required when {@link InboundDispatcherConfig.refusesFollower} is wired. */
+    sendReject?(localOxyUserId: string, localUsername: string, followActivityId: string, remoteActorUri: string): Promise<void>;
 }
 /** Adapters + hooks an {@link InboundDispatcher} is built from. */
 export interface InboundDispatcherConfig {
@@ -132,8 +134,16 @@ export interface InboundDispatcherConfig {
     actorResolver: InboundActorResolver;
     /** The AP follow-record store. */
     follows: InboundFollowStore;
-    /** The delivery service (send the Accept). */
+    /** The delivery service (send the Accept, or the Reject). */
     delivery: InboundDelivery;
+    /**
+     * Whether the local account REFUSES this follower — a community that banned
+     * them. A refused Follow is answered with a `Reject` (the account exists and is
+     * public, so saying no reveals nothing), and no edge or follow row is written.
+     * Asked after the follower resolves, so the app answers by Oxy id. Absent ⇒
+     * every Follow is accepted, as before.
+     */
+    refusesFollower?(localUserId: string, followerOxyUserId: string): Promise<boolean>;
     /**
      * Best-effort: notify the local user of a newly-accepted inbound follow.
      * NEVER throws (it handles its own errors); a failure must not fail (and thus

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oxy.so/federation",
-  "version": "2.6.0",
+  "version": "2.7.0",
   "description": "Oxy Federation — the app-agnostic ActivityPub identity + follow engine substrate: the network-connector contract, normalized cross-network DTOs, HTTP signatures, actor resolution, the outbound delivery transport + follow lifecycle, the inbound dispatcher, and the webfinger/actor/inbox Express routers. Domain-parameterized so every Oxy app backend federates under its own domain.",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",

package/src/__tests__/inboundDispatch.test.ts

@@ -31,11 +31,13 @@ function makeRig(
     validate?: (activity: Record<string, unknown>) => InboundActivityValidation;
     blockedHosts?: string[];
     withMoveHandler?: boolean;
+    refusedFollowers?: string[];
   } = {},
 ) {
   const moves: Array<{ activityId: string; oldActorUri: string; targetActorUri: string }> = [];
   const bridgeFollowCalls: Array<[string, string]> = [];
   const bridgeUnfollowCalls: Array<[string, string]> = [];
+  const rejectsSent: string[] = [];
   const acceptsSent: Array<{
     localOxyUserId: string;
     localUsername: string;
@@ -109,7 +111,16 @@ function makeRig(
       sendAccept: async (localOxyUserId, localUsername, followActivityId, remoteActorUri) => {
         acceptsSent.push({ localOxyUserId, localUsername, followActivityId, remoteActorUri });
       },
+      sendReject: async (_localOxyUserId, _localUsername, followActivityId) => {
+        rejectsSent.push(followActivityId);
+      },
     },
+    ...(overrides.refusedFollowers
+      ? {
+          refusesFollower: async (_localUserId: string, followerOxyUserId: string) =>
+            overrides.refusedFollowers?.includes(followerOxyUserId) ?? false,
+        }
+      : {}),
     onInboundFollowAccepted: async (localUserId, followerOxyUserId, actorUri) => {
       onInboundFollowAcceptedCalls.push([localUserId, followerOxyUserId, actorUri]);
     },
@@ -140,6 +151,7 @@ function makeRig(
     bridgeFollowCalls,
     bridgeUnfollowCalls,
     acceptsSent,
+    rejectsSent,
     inboundAcceptedUpserts,
     deletedFollowIds,
     contentActivities,
@@ -174,6 +186,18 @@ describe('inbound Follow', () => {
     expect(rig.onInboundFollowAcceptedCalls).toEqual([['u-alice', 'u-bob', REMOTE_ACTOR]]);
   });
 
+  it('answers a refused follower with Reject, writing nothing', async () => {
+    const rig = makeRig({ refusedFollowers: ['u-bob'] });
+    await rig.dispatcher.processInboxActivity(
+      { type: 'Follow', id: 'f9', actor: REMOTE_ACTOR, object: LOCAL_ACTOR },
+      REMOTE_ACTOR,
+    );
+    expect(rig.rejectsSent).toEqual(['f9']);
+    expect(rig.acceptsSent).toEqual([]);
+    expect(rig.bridgeFollowCalls).toEqual([]);
+    expect(rig.inboundAcceptedUpserts).toEqual([]);
+  });
+
   it('drops the Follow (no bridge/accept) when the target has sharing OFF', async () => {
     const rig = makeRig({ sharingEnabled: false });
     await rig.dispatcher.processInboxActivity(

package/src/node/delivery.ts

@@ -351,6 +351,13 @@ export interface DeliveryService {
     followActivityId: string,
     remoteActorUri: string,
   ): Promise<void>;
+  /** Send a Reject(Follow) back to a remote actor — the same envelope as the Accept. */
+  sendReject(
+    localOxyUserId: string,
+    localUsername: string,
+    followActivityId: string,
+    remoteActorUri: string,
+  ): Promise<void>;
   /** Rebroadcast the FULL actor document as an Update(Person) to remote followers. */
   federateActorUpdate(actorOxyUserId: string, username: string): Promise<void>;
 }
@@ -716,7 +723,9 @@ export function createDeliveryService<TActor extends DeliveryActorFields>(
     return true;
   }
 
-  async function sendAccept(
+  /** Answer a remote Follow: `Accept` or `Reject`, one envelope for both. */
+  async function sendFollowResponse(
+    type: 'Accept' | 'Reject',
     localOxyUserId: string,
     localUsername: string,
     followActivityId: string,
@@ -725,16 +734,16 @@ export function createDeliveryService<TActor extends DeliveryActorFields>(
     const actor = await config.store.findActorByUri(remoteActorUri);
     if (!actor) return;
     // `inboxUrl` is schema-optional (atproto actors have none); an AP actor we
-    // are sending Accept(Follow) to always has one. When neither inbox is known the
-    // local follow is already removed — just skip the outbound delivery.
+    // are answering always has one. When neither inbox is known, skip the
+    // outbound delivery.
     const targetInbox = actor.sharedInboxUrl ?? actor.inboxUrl;
     if (!targetInbox) {
-      logger.warn(`[FedSync] cannot send Accept(Follow) to ${remoteActorUri}: actor has no inbox`);
+      logger.warn(`[FedSync] cannot send ${type}(Follow) to ${remoteActorUri}: actor has no inbox`);
       return;
     }
     if (isBlockedUrl(targetInbox) || isBlockedUrl(remoteActorUri)) {
       logger.warn(
-        `[FedDeliver] refusing Accept(Follow) delivery to blocked origin ${remoteActorUri}`,
+        `[FedDeliver] refusing ${type}(Follow) delivery to blocked origin ${remoteActorUri}`,
       );
       return;
     }
@@ -743,8 +752,8 @@ export function createDeliveryService<TActor extends DeliveryActorFields>(
 
     const activity: Record<string, unknown> = {
       '@context': AP_CONTEXT,
-      id: `${localActorUri}/accepts/${Date.now()}`,
-      type: 'Accept',
+      id: `${localActorUri}/${type === 'Accept' ? 'accepts' : 'rejects'}/${Date.now()}`,
+      type,
       actor: localActorUri,
       object: {
         id: followActivityId,
@@ -760,6 +769,36 @@ export function createDeliveryService<TActor extends DeliveryActorFields>(
     }
   }
 
+  function sendAccept(
+    localOxyUserId: string,
+    localUsername: string,
+    followActivityId: string,
+    remoteActorUri: string,
+  ): Promise<void> {
+    return sendFollowResponse(
+      'Accept',
+      localOxyUserId,
+      localUsername,
+      followActivityId,
+      remoteActorUri,
+    );
+  }
+
+  function sendReject(
+    localOxyUserId: string,
+    localUsername: string,
+    followActivityId: string,
+    remoteActorUri: string,
+  ): Promise<void> {
+    return sendFollowResponse(
+      'Reject',
+      localOxyUserId,
+      localUsername,
+      followActivityId,
+      remoteActorUri,
+    );
+  }
+
   async function federateActorUpdate(actorOxyUserId: string, username: string): Promise<void> {
     if (!config.federationEnabled) return;
     if (!(await config.consent.isSharingEnabled(actorOxyUserId))) return;
@@ -819,6 +858,7 @@ export function createDeliveryService<TActor extends DeliveryActorFields>(
     sendFollow,
     sendUndoFollow,
     sendAccept,
+    sendReject,
     federateActorUpdate,
   };
 }

package/src/node/inboundDispatch.ts

@@ -127,6 +127,13 @@ export interface InboundDelivery {
     followActivityId: string,
     remoteActorUri: string,
   ): Promise<void>;
+  /** Send a Reject(Follow) back — required when {@link InboundDispatcherConfig.refusesFollower} is wired. */
+  sendReject?(
+    localOxyUserId: string,
+    localUsername: string,
+    followActivityId: string,
+    remoteActorUri: string,
+  ): Promise<void>;
 }
 
 /** Adapters + hooks an {@link InboundDispatcher} is built from. */
@@ -152,8 +159,16 @@ export interface InboundDispatcherConfig {
   actorResolver: InboundActorResolver;
   /** The AP follow-record store. */
   follows: InboundFollowStore;
-  /** The delivery service (send the Accept). */
+  /** The delivery service (send the Accept, or the Reject). */
   delivery: InboundDelivery;
+  /**
+   * Whether the local account REFUSES this follower — a community that banned
+   * them. A refused Follow is answered with a `Reject` (the account exists and is
+   * public, so saying no reveals nothing), and no edge or follow row is written.
+   * Asked after the follower resolves, so the app answers by Oxy id. Absent ⇒
+   * every Follow is accepted, as before.
+   */
+  refusesFollower?(localUserId: string, followerOxyUserId: string): Promise<boolean>;
   /**
    * Best-effort: notify the local user of a newly-accepted inbound follow.
    * NEVER throws (it handles its own errors); a failure must not fail (and thus
@@ -306,6 +321,15 @@ export function createInboundDispatcher(config: InboundDispatcherConfig): Inboun
       return;
     }
 
+    if (config.refusesFollower && (await config.refusesFollower(localUserId, followerOxyUserId))) {
+      if (!config.delivery.sendReject) {
+        throw new Error('refusesFollower is wired without delivery.sendReject');
+      }
+      await config.delivery.sendReject(localUserId, username, String(activity.id), actorUri);
+      logger.info(`Rejected follow from ${actorUri} to ${username}`);
+      return;
+    }
+
     // Create the Oxy follow edge BEFORE sending Accept so a retry never spams
     // Accepts: the bridge is idempotent (safe to re-run), but an Accept delivered
     // before the edge was committed could be re-sent on every retry. On failure