shardwire 1.2.0 → 1.3.0

package/dist/index.mjs

@@ -63,7 +63,9 @@ var EVENT_REQUIRED_INTENTS = {
 };
 function getAvailableEvents(intents) {
   const enabled = new Set(intents);
-  return BOT_EVENT_NAMES.filter((eventName) => EVENT_REQUIRED_INTENTS[eventName].every((intent) => enabled.has(intent)));
+  return BOT_EVENT_NAMES.filter(
+    (eventName) => EVENT_REQUIRED_INTENTS[eventName].every((intent) => enabled.has(intent))
+  );
 }
 
 // src/discord/runtime/adapter.ts
@@ -405,10 +407,19 @@ function mapDiscordErrorToActionExecutionError(error) {
     return new ActionExecutionError("INVALID_REQUEST", message, detailPayload);
   }
   if (details.status === 429) {
+    let retryAfterMs;
+    if (error instanceof DiscordAPIError) {
+      const raw = error.rawError;
+      const retryAfter = raw?.retry_after;
+      if (typeof retryAfter === "number" && Number.isFinite(retryAfter)) {
+        retryAfterMs = Math.max(0, Math.ceil(retryAfter * 1e3));
+      }
+    }
     return new ActionExecutionError("SERVICE_UNAVAILABLE", message, {
       discordStatus: 429,
       retryable: true,
-      ...details.code !== void 0 ? { discordCode: details.code } : {}
+      ...details.code !== void 0 ? { discordCode: details.code } : {},
+      ...retryAfterMs !== void 0 ? { retryAfterMs } : {}
     });
   }
   return null;
@@ -726,7 +737,10 @@ var DiscordJsRuntimeAdapter = class {
         throw mappedError;
       }
       this.logger.error("Discord action execution failed.", { action: name, error: String(error) });
-      throw new ActionExecutionError("INTERNAL_ERROR", error instanceof Error ? error.message : "Discord action failed.");
+      throw new ActionExecutionError(
+        "INTERNAL_ERROR",
+        error instanceof Error ? error.message : "Discord action failed."
+      );
     }
   }
   async fetchSendableChannel(channelId) {
@@ -794,7 +808,10 @@ var DiscordJsRuntimeAdapter = class {
   async replyToInteraction(payload) {
     const interaction = this.getReplyCapableInteraction(payload.interactionId);
     if (interaction.replied || interaction.deferred) {
-      throw new ActionExecutionError("INVALID_REQUEST", `Interaction "${payload.interactionId}" has already been acknowledged.`);
+      throw new ActionExecutionError(
+        "INVALID_REQUEST",
+        `Interaction "${payload.interactionId}" has already been acknowledged.`
+      );
     }
     const reply = await interaction.reply({
       ...toSendOptions(payload),
@@ -806,7 +823,10 @@ var DiscordJsRuntimeAdapter = class {
   async deferInteraction(payload) {
     const interaction = this.getReplyCapableInteraction(payload.interactionId);
     if (interaction.replied) {
-      throw new ActionExecutionError("INVALID_REQUEST", `Interaction "${payload.interactionId}" has already been replied to.`);
+      throw new ActionExecutionError(
+        "INVALID_REQUEST",
+        `Interaction "${payload.interactionId}" has already been replied to.`
+      );
     }
     if (!interaction.deferred) {
       await interaction.deferReply({
@@ -829,7 +849,10 @@ var DiscordJsRuntimeAdapter = class {
   async followUpInteraction(payload) {
     const interaction = this.getReplyCapableInteraction(payload.interactionId);
     if (!interaction.replied && !interaction.deferred) {
-      throw new ActionExecutionError("INVALID_REQUEST", `Interaction "${payload.interactionId}" has not been acknowledged yet.`);
+      throw new ActionExecutionError(
+        "INVALID_REQUEST",
+        `Interaction "${payload.interactionId}" has not been acknowledged yet.`
+      );
     }
     const followUp = await interaction.followUp({
       ...toSendOptions(payload),
@@ -938,7 +961,10 @@ var DiscordJsRuntimeAdapter = class {
       return candidate.emoji.identifier === payload.emoji || candidate.emoji.name === payload.emoji || candidate.emoji.toString() === payload.emoji;
     });
     if (!reaction) {
-      throw new ActionExecutionError("NOT_FOUND", `Reaction "${payload.emoji}" was not found on message "${payload.messageId}".`);
+      throw new ActionExecutionError(
+        "NOT_FOUND",
+        `Reaction "${payload.emoji}" was not found on message "${payload.messageId}".`
+      );
     }
     await reaction.users.remove(ownUserId);
     return {
@@ -981,7 +1007,9 @@ function normalizeKindList(value) {
     return void 0;
   }
   const rawValues = Array.isArray(value) ? value : [value];
-  const normalized = [...new Set(rawValues.filter((entry) => typeof entry === "string"))].sort();
+  const normalized = [
+    ...new Set(rawValues.filter((entry) => typeof entry === "string"))
+  ].sort();
   return normalized.length > 0 ? normalized : void 0;
 }
 function normalizeEventSubscriptionFilter(filter) {
@@ -1247,6 +1275,8 @@ var BridgeTransportServer = class {
     const maxConcurrent = config.options.server.maxConcurrentActions ?? 32;
     const queueTimeout = config.options.server.actionQueueTimeoutMs ?? 5e3;
     this.actionSemaphore = new AsyncSemaphore(maxConcurrent, queueTimeout);
+    this.idempotencyTtlMs = config.options.server.idempotencyTtlMs ?? 12e4;
+    this.idempotencyScope = config.options.server.idempotencyScope ?? "connection";
     this.wss = new WebSocketServer({
       host: config.options.server.host,
       port: config.options.server.port,
@@ -1269,7 +1299,8 @@ var BridgeTransportServer = class {
   stickyEvents = /* @__PURE__ */ new Map();
   actionSemaphore;
   idempotencyCache = /* @__PURE__ */ new Map();
-  idempotencyTtlMs = 12e4;
+  idempotencyTtlMs;
+  idempotencyScope;
   authBuckets = /* @__PURE__ */ new Map();
   connectionCount() {
     let count = 0;
@@ -1499,7 +1530,7 @@ var BridgeTransportServer = class {
         }
         const idempotencyRaw = payload.idempotencyKey;
         const idempotencyKey = typeof idempotencyRaw === "string" && idempotencyRaw.length > 0 && idempotencyRaw.length <= 256 ? idempotencyRaw : void 0;
-        const idempotencyCacheKey = idempotencyKey ? `${state.id}:${idempotencyKey}` : void 0;
+        const idempotencyCacheKey = idempotencyKey ? this.idempotencyScope === "secret" && activeSecret ? `secret:${activeSecret.id}:${idempotencyKey}` : `conn:${state.id}:${idempotencyKey}` : void 0;
         if (idempotencyCacheKey) {
           this.pruneIdempotencyCache(Date.now());
           const cached = this.idempotencyCache.get(idempotencyCacheKey);
@@ -1512,9 +1543,7 @@ var BridgeTransportServer = class {
             });
             this.safeSend(
               state.socket,
-              stringifyEnvelope(
-                makeEnvelope(replay.ok ? "action.result" : "action.error", replay, { requestId })
-              )
+              stringifyEnvelope(makeEnvelope(replay.ok ? "action.result" : "action.error", replay, { requestId }))
             );
             return;
           }
@@ -1705,11 +1734,7 @@ function normalizeSecretEntry(secret, index) {
     value: scoped.value,
     scope: {
       events: normalizeScopeList(scoped.allow?.events, BOT_EVENT_NAMES, `server.secrets[${index}].allow.events`),
-      actions: normalizeScopeList(
-        scoped.allow?.actions,
-        BOT_ACTION_NAMES,
-        `server.secrets[${index}].allow.actions`
-      )
+      actions: normalizeScopeList(scoped.allow?.actions, BOT_ACTION_NAMES, `server.secrets[${index}].allow.actions`)
     }
   };
 }
@@ -1736,6 +1761,14 @@ function assertBotBridgeOptions(options) {
   if (options.server.actionQueueTimeoutMs !== void 0) {
     assertPositiveNumber("server.actionQueueTimeoutMs", options.server.actionQueueTimeoutMs);
   }
+  if (options.server.idempotencyScope !== void 0) {
+    if (options.server.idempotencyScope !== "connection" && options.server.idempotencyScope !== "secret") {
+      throw new Error('server.idempotencyScope must be "connection" or "secret".');
+    }
+  }
+  if (options.server.idempotencyTtlMs !== void 0) {
+    assertPositiveNumber("server.idempotencyTtlMs", options.server.idempotencyTtlMs);
+  }
   if (!Array.isArray(options.server.secrets) || options.server.secrets.length === 0) {
     throw new Error("server.secrets must contain at least one secret.");
   }
@@ -1935,6 +1968,24 @@ var AppRequestError = class extends Error {
   code;
 };
 var DEFAULT_REQUEST_TIMEOUT_MS = 1e4;
+function metricsExtrasFromActionError(error) {
+  const details = error.details;
+  if (!details || typeof details !== "object" || Array.isArray(details)) {
+    return {};
+  }
+  const obj = details;
+  const extras = {};
+  if (typeof obj.retryAfterMs === "number" && Number.isFinite(obj.retryAfterMs)) {
+    extras.retryAfterMs = obj.retryAfterMs;
+  }
+  if (typeof obj.discordStatus === "number" && Number.isFinite(obj.discordStatus)) {
+    extras.discordStatus = obj.discordStatus;
+  }
+  if (typeof obj.discordCode === "number" && Number.isFinite(obj.discordCode)) {
+    extras.discordCode = obj.discordCode;
+  }
+  return extras;
+}
 function connectBotBridge(options) {
   assertAppBridgeOptions(options);
   const logger = withLogger(options.logger);
@@ -2243,7 +2294,7 @@ function connectBotBridge(options) {
         requestId,
         durationMs: Date.now() - started,
         ok: result.ok,
-        ...!result.ok ? { errorCode: result.error.code } : {}
+        ...!result.ok ? { errorCode: result.error.code, ...metricsExtrasFromActionError(result.error) } : {}
       });
       return result;
     } catch (error) {