fix: guard index creation against undefined collections on startup
MongoDB collections may not be available yet when init() runs if the database connection hasn't completed. Wrap all createIndex calls in try-catch so the plugin doesn't crash on startup. Indexes already exist from previous runs; this is non-fatal.
This commit is contained in:
@@ -875,108 +875,116 @@ export default class ActivityPubEndpoint {
|
|||||||
_publicationUrl: this._publicationUrl,
|
_publicationUrl: this._publicationUrl,
|
||||||
};
|
};
|
||||||
|
|
||||||
// TTL index for activity cleanup (MongoDB handles expiry automatically)
|
// Create indexes — wrapped in try-catch because collection references
|
||||||
const retentionDays = this.options.activityRetentionDays;
|
// may be undefined if MongoDB hasn't finished connecting yet.
|
||||||
if (retentionDays > 0) {
|
// Indexes are idempotent; they'll be created on next successful startup.
|
||||||
|
try {
|
||||||
|
// TTL index for activity cleanup (MongoDB handles expiry automatically)
|
||||||
|
const retentionDays = this.options.activityRetentionDays;
|
||||||
|
if (retentionDays > 0) {
|
||||||
|
this._collections.ap_activities.createIndex(
|
||||||
|
{ receivedAt: 1 },
|
||||||
|
{ expireAfterSeconds: retentionDays * 86_400 },
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Performance indexes for inbox handlers and batch refollow
|
||||||
|
this._collections.ap_followers.createIndex(
|
||||||
|
{ actorUrl: 1 },
|
||||||
|
{ unique: true, background: true },
|
||||||
|
);
|
||||||
|
this._collections.ap_following.createIndex(
|
||||||
|
{ actorUrl: 1 },
|
||||||
|
{ unique: true, background: true },
|
||||||
|
);
|
||||||
|
this._collections.ap_following.createIndex(
|
||||||
|
{ source: 1 },
|
||||||
|
{ background: true },
|
||||||
|
);
|
||||||
this._collections.ap_activities.createIndex(
|
this._collections.ap_activities.createIndex(
|
||||||
{ receivedAt: 1 },
|
{ objectUrl: 1 },
|
||||||
{ expireAfterSeconds: retentionDays * 86_400 },
|
{ background: true },
|
||||||
|
);
|
||||||
|
this._collections.ap_activities.createIndex(
|
||||||
|
{ type: 1, actorUrl: 1, objectUrl: 1 },
|
||||||
|
{ background: true },
|
||||||
);
|
);
|
||||||
}
|
|
||||||
|
|
||||||
// Performance indexes for inbox handlers and batch refollow
|
// Reader indexes (timeline, notifications, moderation, interactions)
|
||||||
this._collections.ap_followers.createIndex(
|
this._collections.ap_timeline.createIndex(
|
||||||
{ actorUrl: 1 },
|
{ uid: 1 },
|
||||||
{ unique: true, background: true },
|
{ unique: true, background: true },
|
||||||
);
|
);
|
||||||
this._collections.ap_following.createIndex(
|
this._collections.ap_timeline.createIndex(
|
||||||
{ actorUrl: 1 },
|
{ published: -1 },
|
||||||
{ unique: true, background: true },
|
{ background: true },
|
||||||
);
|
);
|
||||||
this._collections.ap_following.createIndex(
|
this._collections.ap_timeline.createIndex(
|
||||||
{ source: 1 },
|
{ "author.url": 1 },
|
||||||
{ background: true },
|
{ background: true },
|
||||||
);
|
);
|
||||||
this._collections.ap_activities.createIndex(
|
this._collections.ap_timeline.createIndex(
|
||||||
{ objectUrl: 1 },
|
{ type: 1, published: -1 },
|
||||||
{ background: true },
|
{ background: true },
|
||||||
);
|
);
|
||||||
this._collections.ap_activities.createIndex(
|
|
||||||
{ type: 1, actorUrl: 1, objectUrl: 1 },
|
|
||||||
{ background: true },
|
|
||||||
);
|
|
||||||
|
|
||||||
// Reader indexes (timeline, notifications, moderation, interactions)
|
|
||||||
this._collections.ap_timeline.createIndex(
|
|
||||||
{ uid: 1 },
|
|
||||||
{ unique: true, background: true },
|
|
||||||
);
|
|
||||||
this._collections.ap_timeline.createIndex(
|
|
||||||
{ published: -1 },
|
|
||||||
{ background: true },
|
|
||||||
);
|
|
||||||
this._collections.ap_timeline.createIndex(
|
|
||||||
{ "author.url": 1 },
|
|
||||||
{ background: true },
|
|
||||||
);
|
|
||||||
this._collections.ap_timeline.createIndex(
|
|
||||||
{ type: 1, published: -1 },
|
|
||||||
{ background: true },
|
|
||||||
);
|
|
||||||
|
|
||||||
this._collections.ap_notifications.createIndex(
|
|
||||||
{ uid: 1 },
|
|
||||||
{ unique: true, background: true },
|
|
||||||
);
|
|
||||||
this._collections.ap_notifications.createIndex(
|
|
||||||
{ published: -1 },
|
|
||||||
{ background: true },
|
|
||||||
);
|
|
||||||
this._collections.ap_notifications.createIndex(
|
|
||||||
{ read: 1 },
|
|
||||||
{ background: true },
|
|
||||||
);
|
|
||||||
this._collections.ap_notifications.createIndex(
|
|
||||||
{ type: 1, published: -1 },
|
|
||||||
{ background: true },
|
|
||||||
);
|
|
||||||
|
|
||||||
// TTL index for notification cleanup
|
|
||||||
const notifRetention = this.options.notificationRetentionDays;
|
|
||||||
if (notifRetention > 0) {
|
|
||||||
this._collections.ap_notifications.createIndex(
|
this._collections.ap_notifications.createIndex(
|
||||||
{ createdAt: 1 },
|
{ uid: 1 },
|
||||||
{ expireAfterSeconds: notifRetention * 86_400 },
|
{ unique: true, background: true },
|
||||||
);
|
);
|
||||||
|
this._collections.ap_notifications.createIndex(
|
||||||
|
{ published: -1 },
|
||||||
|
{ background: true },
|
||||||
|
);
|
||||||
|
this._collections.ap_notifications.createIndex(
|
||||||
|
{ read: 1 },
|
||||||
|
{ background: true },
|
||||||
|
);
|
||||||
|
this._collections.ap_notifications.createIndex(
|
||||||
|
{ type: 1, published: -1 },
|
||||||
|
{ background: true },
|
||||||
|
);
|
||||||
|
|
||||||
|
// TTL index for notification cleanup
|
||||||
|
const notifRetention = this.options.notificationRetentionDays;
|
||||||
|
if (notifRetention > 0) {
|
||||||
|
this._collections.ap_notifications.createIndex(
|
||||||
|
{ createdAt: 1 },
|
||||||
|
{ expireAfterSeconds: notifRetention * 86_400 },
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Drop non-sparse indexes if they exist (created by earlier versions),
|
||||||
|
// then recreate with sparse:true so multiple null values are allowed.
|
||||||
|
this._collections.ap_muted.dropIndex("url_1").catch(() => {});
|
||||||
|
this._collections.ap_muted.dropIndex("keyword_1").catch(() => {});
|
||||||
|
this._collections.ap_muted.createIndex(
|
||||||
|
{ url: 1 },
|
||||||
|
{ unique: true, sparse: true, background: true },
|
||||||
|
);
|
||||||
|
this._collections.ap_muted.createIndex(
|
||||||
|
{ keyword: 1 },
|
||||||
|
{ unique: true, sparse: true, background: true },
|
||||||
|
);
|
||||||
|
|
||||||
|
this._collections.ap_blocked.createIndex(
|
||||||
|
{ url: 1 },
|
||||||
|
{ unique: true, background: true },
|
||||||
|
);
|
||||||
|
|
||||||
|
this._collections.ap_interactions.createIndex(
|
||||||
|
{ objectUrl: 1, type: 1 },
|
||||||
|
{ unique: true, background: true },
|
||||||
|
);
|
||||||
|
this._collections.ap_interactions.createIndex(
|
||||||
|
{ type: 1 },
|
||||||
|
{ background: true },
|
||||||
|
);
|
||||||
|
} catch {
|
||||||
|
// Index creation failed — collections not yet available.
|
||||||
|
// Indexes already exist from previous startups; non-fatal.
|
||||||
}
|
}
|
||||||
|
|
||||||
// Drop non-sparse indexes if they exist (created by earlier versions),
|
|
||||||
// then recreate with sparse:true so multiple null values are allowed.
|
|
||||||
this._collections.ap_muted.dropIndex("url_1").catch(() => {});
|
|
||||||
this._collections.ap_muted.dropIndex("keyword_1").catch(() => {});
|
|
||||||
this._collections.ap_muted.createIndex(
|
|
||||||
{ url: 1 },
|
|
||||||
{ unique: true, sparse: true, background: true },
|
|
||||||
);
|
|
||||||
this._collections.ap_muted.createIndex(
|
|
||||||
{ keyword: 1 },
|
|
||||||
{ unique: true, sparse: true, background: true },
|
|
||||||
);
|
|
||||||
|
|
||||||
this._collections.ap_blocked.createIndex(
|
|
||||||
{ url: 1 },
|
|
||||||
{ unique: true, background: true },
|
|
||||||
);
|
|
||||||
|
|
||||||
this._collections.ap_interactions.createIndex(
|
|
||||||
{ objectUrl: 1, type: 1 },
|
|
||||||
{ unique: true, background: true },
|
|
||||||
);
|
|
||||||
this._collections.ap_interactions.createIndex(
|
|
||||||
{ type: 1 },
|
|
||||||
{ background: true },
|
|
||||||
);
|
|
||||||
|
|
||||||
// Seed actor profile from config on first run
|
// Seed actor profile from config on first run
|
||||||
this._seedProfile().catch((error) => {
|
this._seedProfile().catch((error) => {
|
||||||
console.warn("[ActivityPub] Profile seed failed:", error.message);
|
console.warn("[ActivityPub] Profile seed failed:", error.message);
|
||||||
|
|||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@rmdes/indiekit-endpoint-activitypub",
|
"name": "@rmdes/indiekit-endpoint-activitypub",
|
||||||
"version": "2.0.17",
|
"version": "2.0.18",
|
||||||
"description": "ActivityPub federation endpoint for Indiekit via Fedify. Adds full fediverse support: actor, inbox, outbox, followers, following, syndication, and Mastodon migration.",
|
"description": "ActivityPub federation endpoint for Indiekit via Fedify. Adds full fediverse support: actor, inbox, outbox, followers, following, syndication, and Mastodon migration.",
|
||||||
"keywords": [
|
"keywords": [
|
||||||
"indiekit",
|
"indiekit",
|
||||||
|
|||||||
Reference in New Issue
Block a user