@theholocron/holocron-plugin-discord 5.0.0-alpha.184 → 5.0.0-alpha.185

package/dist/index.d.mts

@@ -47,6 +47,25 @@ declare class DiscordNotifications implements Notifications {
     target: string;
   } | null>;
   private guild;
+  /**
+   * The server's channel list, fetched once per instance. Every ensure* call used
+   * to refetch it -- about 40 identical GETs in one setup run -- and Discord
+   * rate-limited the route. Our own creates and edits update the copy, so it
+   * stays accurate for the run; a new run builds a new instance.
+   *
+   * It is the in-flight promise that is shared, not the array: callers that start
+   * while the first fetch is pending all get the same snapshot, so a later
+   * response can never overwrite what an earlier caller added.
+   */
+  private channelLoad?;
+  private channelList;
+  /**
+   * Create a channel and add it to the shared list. If the create fails, Discord
+   * may still have applied it (a timeout looks the same as a refusal), so forget the
+   * list: the next ensure refetches the server's real state instead of creating a
+   * duplicate.
+   */
+  private createChannel;
   private static same;
   ensureCategory(name: string): Promise<EnsuredResource>;
   /**

package/dist/index.mjs

@@ -58,18 +58,50 @@ var DiscordNotifications = class DiscordNotifications {
 		if (!this.opts.guildId) throw new Error("no Discord server id — set `guildId` in the discord provider options in holocron.config.ts");
 		return this.opts.guildId;
 	}
+	/**
+	* The server's channel list, fetched once per instance. Every ensure* call used
+	* to refetch it -- about 40 identical GETs in one setup run -- and Discord
+	* rate-limited the route. Our own creates and edits update the copy, so it
+	* stays accurate for the run; a new run builds a new instance.
+	*
+	* It is the in-flight promise that is shared, not the array: callers that start
+	* while the first fetch is pending all get the same snapshot, so a later
+	* response can never overwrite what an earlier caller added.
+	*/
+	channelLoad;
+	channelList() {
+		return this.channelLoad ??= this.bot().guilds.channels(this.guild()).catch((err) => {
+			this.channelLoad = void 0;
+			throw err;
+		});
+	}
+	/**
+	* Create a channel and add it to the shared list. If the create fails, Discord
+	* may still have applied it (a timeout looks the same as a refusal), so forget the
+	* list: the next ensure refetches the server's real state instead of creating a
+	* duplicate.
+	*/
+	async createChannel(body) {
+		try {
+			const made = await this.bot().guilds.createChannel(this.guild(), body);
+			(await this.channelList()).push(made);
+			return made;
+		} catch (err) {
+			this.channelLoad = void 0;
+			throw err;
+		}
+	}
 	static same(a, b) {
 		return a.toLowerCase() === b.toLowerCase();
 	}
 	async ensureCategory(name) {
-		const bot = this.bot();
-		const existing = (await bot.guilds.channels(this.guild())).find((c) => c.type === ChannelType.Category && DiscordNotifications.same(c.name, name));
+		const existing = (await this.channelList()).find((c) => c.type === ChannelType.Category && DiscordNotifications.same(c.name, name));
 		if (existing) return {
 			id: existing.id,
 			created: false
 		};
 		return {
-			id: (await bot.guilds.createChannel(this.guild(), {
+			id: (await this.createChannel({
 				name,
 				type: ChannelType.Category
 			})).id,
@@ -90,20 +122,28 @@ var DiscordNotifications = class DiscordNotifications {
 	async ensureChannel(input) {
 		const bot = this.bot();
 		const parent = input.category ? (await this.ensureCategory(input.category)).id : void 0;
-		const existing = DiscordNotifications.findChannel(await bot.guilds.channels(this.guild()), input.name, parent);
+		const existing = DiscordNotifications.findChannel(await this.channelList(), input.name, parent);
 		if (existing) {
 			const patch = {
 				...parent && existing.parent_id !== parent ? { parent_id: parent } : {},
 				...input.topic !== void 0 && (existing.topic ?? "") !== input.topic ? { topic: input.topic } : {}
 			};
-			if (Object.keys(patch).length > 0) await bot.channels.modify(existing.id, patch);
+			if (Object.keys(patch).length > 0) {
+				try {
+					await bot.channels.modify(existing.id, patch);
+				} catch (err) {
+					this.channelLoad = void 0;
+					throw err;
+				}
+				Object.assign(existing, patch);
+			}
 			return {
 				id: existing.id,
 				created: false
 			};
 		}
 		return {
-			id: (await bot.guilds.createChannel(this.guild(), {
+			id: (await this.createChannel({
 				name: input.name,
 				type: ChannelType.Text,
 				...input.topic ? { topic: input.topic } : {},
@@ -114,8 +154,8 @@ var DiscordNotifications = class DiscordNotifications {
 	}
 	async ensureWebhook(input) {
 		const bot = this.bot();
-		const parent = input.category ? (await bot.guilds.channels(this.guild())).find((c) => c.type === ChannelType.Category && DiscordNotifications.same(c.name, input.category))?.id : void 0;
-		const channel = DiscordNotifications.findChannel(await bot.guilds.channels(this.guild()), input.channel, parent);
+		const parent = input.category ? (await this.channelList()).find((c) => c.type === ChannelType.Category && DiscordNotifications.same(c.name, input.category))?.id : void 0;
+		const channel = DiscordNotifications.findChannel(await this.channelList(), input.channel, parent);
 		if (!channel) throw new Error(`no channel named \`${input.channel}\` — create it first`);
 		const existing = (await bot.channels.webhooks(channel.id)).find((w) => DiscordNotifications.same(w.name ?? "", input.name));
 		if (existing) return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@theholocron/holocron-plugin-discord",
-  "version": "5.0.0-alpha.184",
+  "version": "5.0.0-alpha.185",
   "description": "Holocron plugin for Discord. Implements the notifications capability via Discord incoming webhooks.",
   "keywords": [
     "discord",
@@ -48,12 +48,12 @@
     "tsx": "4.23.15",
     "typescript": "^5.9.3",
     "vitest": "^4.1.11",
-    "@theholocron/cli": "5.0.0-alpha.184"
+    "@theholocron/cli": "5.0.0-alpha.185"
   },
   "peerDependencies": {
     "@theholocron/discord-client": "^1.43.1",
     "@theholocron/misc-utils": "^1.16.0",
-    "@theholocron/cli": "5.0.0-alpha.184"
+    "@theholocron/cli": "5.0.0-alpha.185"
   },
   "engines": {
     "node": ">=22"