@ashx-j/lunr 0.2.25 → 0.2.26

package/dist/node-runtime/{chunk-QTU6AKNJ.js → chunk-3MISGG4S.js}

@@ -12,7 +12,7 @@ import {
   NO_HANDLER_REASON,
   registerApprovalHandler,
   setPermissionMode
-} from "./chunk-ZXSGTGJ6.js";
+} from "./chunk-WIF24I7G.js";
 import {
   gatewayConfigPath,
   loadGatewayConfig,
@@ -32,15 +32,12 @@ function globalAllowedUsers() {
   let raw = process.env.LUNR_GATEWAY_ALLOWED_USERS;
   return raw ? raw.split(",").map((u) => u.trim()).filter((u) => u.length > 0) : [];
 }
-function isGatewayOwner(source, cfg) {
-  return source.chatType !== "dm" || source.platform !== "telegram" && source.platform !== "discord" ? !1 : cfg.owners?.[source.platform].includes(source.userId) ?? !1;
+function requireAuthorized(source, cfg = loadGatewayConfig()) {
+  if (!isAuthorized(source, cfg))
+    throw new Error("Gateway access is not approved for this user or chat.");
 }
-function requireGatewayOwner(source, cfg = loadGatewayConfig()) {
-  if (!isGatewayOwner(source, cfg))
-    throw new Error("This command is available only to the configured owner in a private chat. Use lunr gateway setup to configure owner access.");
-}
-function isAuthorized(source, cfg, pairing) {
-  if (isGatewayOwner(source, cfg) || envFlagEnabled("LUNR_GATEWAY_ALLOW_ALL_USERS"))
+function isAuthorized(source, cfg, pairing = createPairingStore()) {
+  if ((source.platform === "telegram" || source.platform === "discord") && cfg.owners?.[source.platform].includes(source.userId) || envFlagEnabled("LUNR_GATEWAY_ALLOW_ALL_USERS"))
     return !0;
   let platformCfg = platformConfigFor(cfg, source.platform);
   return !!(platformCfg?.allowedChats.includes(source.chatId) || source.roleAuthorized === !0 || source.userId && pairing.isPaired(source.platform, source.userId) || source.userId && (platformCfg?.allowedUsers.includes(source.userId) || globalAllowedUsers().includes(source.userId)));
@@ -230,8 +227,8 @@ async function handleApprovalCallback(event, adapter) {
     }), !0;
   clearTimeout(entry.timeout), pending.delete(parsed.id);
   let response = parsed.action === "reject" || parsed.action === "cancel" ? "reject" : parsed.action, binding = entry.key ? conversationBinding(entry.key) : void 0;
-  if (binding?.owner && (!isGatewayOwner(entry.source, loadGatewayConfig()) || binding.owner !== event.userId))
-    return entry.resolve("reject"), await entry.adapter.answerCallback(event.id, "Owner access was removed.").catch(() => {
+  if (binding?.owner && binding.owner !== event.userId)
+    return entry.resolve("reject"), await entry.adapter.answerCallback(event.id, "This session belongs to a different user.").catch(() => {
     }), !0;
   if (binding && !isAuthorized(entry.source, loadGatewayConfig(), createPairingStore()))
     return entry.resolve("reject"), !0;
@@ -544,7 +541,7 @@ function canDeliver(key) {
   if (!binding)
     return !1;
   let cfg = loadGatewayConfig();
-  return binding.owner && (binding.owner !== binding.source.userId || !isGatewayOwner(binding.source, cfg)) ? !1 : isAuthorized(sourceWithCurrentRole(key, binding.source), cfg, createPairingStore());
+  return binding.owner && binding.owner !== binding.source.userId ? !1 : isAuthorized(sourceWithCurrentRole(key, binding.source), cfg, createPairingStore());
 }
 function gatewayDestination(key) {
   let binding = conversationBinding(key), adapter = binding && adapters.get(binding.source.platform);
@@ -634,7 +631,7 @@ async function drainKey(key) {
     if (!source)
       break;
     let cfg = existsSync3(gatewayConfigPath()) ? loadGatewayConfig() : deliveryConfigs.get(item.key) ?? loadGatewayConfig();
-    if (binding && (binding.source.platform !== source.platform || binding.source.chatId !== source.chatId || binding.source.userId !== source.userId || binding.source.threadId !== source.threadId) || !isAuthorized(sourceWithCurrentRole(key, source), cfg, createPairingStore()) || binding?.owner && (binding.owner !== source.userId || !isGatewayOwner(source, cfg))) {
+    if (binding && (binding.source.platform !== source.platform || binding.source.chatId !== source.chatId || binding.source.userId !== source.userId || binding.source.threadId !== source.threadId) || !isAuthorized(sourceWithCurrentRole(key, source), cfg, createPairingStore()) || binding?.owner && binding.owner !== source.userId) {
       outbox = outbox.filter((v) => v.id !== item.id), atomicJson(path2(), outbox);
       continue;
     }
@@ -738,8 +735,7 @@ ${message}`, ["Approve", "Decline"], opts) === "Approve",
 }
 
 export {
-  isGatewayOwner,
-  requireGatewayOwner,
+  requireAuthorized,
   isAuthorized,
   addAllowedUser,
   conversationBinding,