@theholocron/holocron-plugin-discord 5.0.0-alpha.115 → 5.0.0-alpha.117

package/dist/index.d.mts

@@ -1,31 +1,8 @@
-import { AuthError, Notifications, ResolveTokenInput } from "@theholocron/cli";
+import { AuthError, Notifications, ResolveTokenInput, VerifyTokenFailure, VerifyTokenResult, VerifyTokenResult as VerifyTokenResult$1, VerifyTokenSuccess } from "@theholocron/cli";
+import { DiscordClient, DiscordClientOptions, DiscordWebhookInfo, createDiscordClient, parseWebhookUrl } from "@theholocron/discord-client";
 //#region src/auth.d.ts
 declare const resolveToken: (input?: ResolveTokenInput) => string;
 //#endregion
-//#region src/rest.d.ts
-interface DiscordClientOptions {
-  /** Override base URL for tests. Default: https://discord.com/api/v10 */
-  baseUrl?: string;
-  fetch?: typeof fetch;
-}
-interface DiscordWebhookInfo {
-  id: string;
-  name: string;
-  guild_id?: string;
-}
-interface DiscordClient {
-  webhooks: {
-    get(id: string, token: string): Promise<DiscordWebhookInfo>;
-    execute(id: string, token: string, content: string): Promise<void>;
-  };
-}
-declare function createDiscordClient({ baseUrl, fetch: fetchImpl }?: DiscordClientOptions): DiscordClient;
-/** Parse a Discord webhook URL into its id and token parts. */
-declare function parseWebhookUrl(url: string): {
-  id: string;
-  token: string;
-};
-//#endregion
 //#region src/capabilities/notifications.d.ts
 interface DiscordNotificationsOptions {
   /**
@@ -54,20 +31,11 @@ declare class DiscordNotifications implements Notifications {
 }
 //#endregion
 //#region src/verify-token.d.ts
-interface VerifyTokenSuccess {
-  ok: true;
-  subject: string;
-}
-interface VerifyTokenFailure {
-  ok: false;
-  message: string;
-}
-type VerifyTokenResult = VerifyTokenSuccess | VerifyTokenFailure;
 interface VerifyTokenOptions {
   baseUrl?: string;
   fetch?: typeof fetch;
 }
-declare function verifyToken(webhookUrl: string, opts?: VerifyTokenOptions): Promise<VerifyTokenResult>;
+declare function verifyToken(webhookUrl: string, opts?: VerifyTokenOptions): Promise<VerifyTokenResult$1>;
 //#endregion
 //#region src/index.d.ts
 interface DiscordPluginOptions extends ResolveTokenInput, DiscordNotificationsOptions {

package/dist/index.mjs

@@ -1,4 +1,6 @@
-import { AuthError, ProviderApiError, createResolveToken } from "@theholocron/cli";
+import { AuthError, createResolveToken } from "@theholocron/cli";
+import { createDiscordClient, parseWebhookUrl } from "@theholocron/discord-client";
+import { errorMessage } from "@theholocron/misc-utils";
 //#region src/auth.ts
 const resolveToken = createResolveToken({
 	envName: "HOLOCRON_DISCORD_WEBHOOK",
@@ -7,36 +9,6 @@ const resolveToken = createResolveToken({
 	errorMessage: "no Discord webhook URL found. Pass --token <WEBHOOK_URL>, set HOLOCRON_DISCORD_WEBHOOK / DISCORD_WEBHOOK_URL, or run: holocron auth set discord <https://discord.com/api/webhooks/...>"
 });
 //#endregion
-//#region src/rest.ts
-function createDiscordClient({ baseUrl, fetch: fetchImpl } = {}) {
-	const base = baseUrl ?? "https://discord.com/api/v10";
-	const f = fetchImpl ?? globalThis.fetch;
-	return { webhooks: {
-		get: async (id, token) => {
-			const res = await f(`${base}/webhooks/${id}/${token}`, { method: "GET" });
-			if (!res.ok) throw new ProviderApiError(`Discord webhook not found or invalid (${res.status})`, res.status, void 0);
-			return res.json();
-		},
-		execute: async (id, token, content) => {
-			const res = await f(`${base}/webhooks/${id}/${token}`, {
-				method: "POST",
-				headers: { "content-type": "application/json" },
-				body: JSON.stringify({ content })
-			});
-			if (!res.ok) throw new ProviderApiError(`Discord webhook POST failed (${res.status})`, res.status, void 0);
-		}
-	} };
-}
-/** Parse a Discord webhook URL into its id and token parts. */
-function parseWebhookUrl(url) {
-	const match = url.match(/webhooks\/(\d+)\/([^/?#]+)/);
-	if (!match) throw new Error(`Invalid Discord webhook URL: ${url}`);
-	return {
-		id: match[1],
-		token: match[2]
-	};
-}
-//#endregion
 //#region src/capabilities/notifications.ts
 var DiscordNotifications = class {
 	client;
@@ -50,7 +22,8 @@ var DiscordNotifications = class {
 		this.defaultWebhookUrl = defaultWebhookUrl;
 	}
 	async send(channel, message) {
-		const { id, token } = parseWebhookUrl(this.resolve(channel || this.opts.defaultChannel || ""));
+		const webhookUrl = this.resolve(channel || this.opts.defaultChannel || "");
+		const { id, token } = parseWebhookUrl(webhookUrl);
 		await this.client.webhooks.execute(id, token, message);
 	}
 	resolve(channel) {
@@ -78,7 +51,7 @@ async function verifyToken(webhookUrl, opts = {}) {
 	} catch (err) {
 		return {
 			ok: false,
-			message: err instanceof Error ? err.message : String(err)
+			message: errorMessage(err)
 		};
 	}
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@theholocron/holocron-plugin-discord",
-  "version": "5.0.0-alpha.115",
+  "version": "5.0.0-alpha.117",
   "description": "Holocron plugin for Discord. Implements the notifications capability via Discord incoming webhooks.",
   "keywords": [
     "discord",
@@ -30,8 +30,10 @@
     "dist"
   ],
   "devDependencies": {
+    "@theholocron/discord-client": "^1.37.1",
     "@theholocron/eslint-config": "^8.7.0",
-    "@theholocron/http-client": "^1.37.1",
+    "@theholocron/http-client": "^1.38.0",
+    "@theholocron/misc-utils": "^1.9.2",
     "@theholocron/tsconfig": "^8.7.0",
     "@theholocron/tsdown-config": "^8.7.0",
     "@theholocron/vitest-config": "^8.7.0",
@@ -46,10 +48,12 @@
     "tsx": "4.23.12",
     "typescript": "^5.9.3",
     "vitest": "^4.1.11",
-    "@theholocron/cli": "5.0.0-alpha.115"
+    "@theholocron/cli": "5.0.0-alpha.117"
   },
   "peerDependencies": {
-    "@theholocron/cli": "5.0.0-alpha.115"
+    "@theholocron/discord-client": "^1.37.1",
+    "@theholocron/misc-utils": "^1.9.2",
+    "@theholocron/cli": "5.0.0-alpha.117"
   },
   "engines": {
     "node": ">=22"