oft-agt 0.5.13 → 0.5.14

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "oft-agt",
-  "version": "0.5.13",
+  "version": "0.5.14",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "oft-agt",
-      "version": "0.5.13",
+      "version": "0.5.14",
       "dependencies": {
         "discord.js": "^14.14.0",
         "ws": "^8.18.0"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oft-agt",
-  "version": "0.5.13",
+  "version": "0.5.14",
   "private": false,
   "type": "module",
   "engines": {

package/runtime/api-request.mjs

@@ -1,3 +1,4 @@
+import {interpolateVariables} from './custom-variables.mjs';
 import http from 'node:http';
 import https from 'node:https';
 import {lookup} from 'node:dns';
@@ -20,3 +21,12 @@ export async function requestApi(raw,{resolveSecret=async()=>{throw Error('Secre
 export function responseVariables(c,result){const values={[c.name+'_status-code']:String(result.status),[c.name+'_status-text']:result.statusText,[c.name+'_response']:typeof result.response==='string'?result.response:JSON.stringify(result.response)};for(const o of c.outputs){let v=result.response;for(const key of o.path)v=v&&typeof v==='object'&&Object.hasOwn(v,key)?v[key]:undefined;values[c.name+'_'+o.name]=v===undefined?'':typeof v==='object'?JSON.stringify(v):String(v);}return values;}
 
 export function redactApiResult(value,secrets){const redact=s=>{for(const secret of secrets)if(secret)s=s.split(secret).join('••••');return s;};if(typeof value==='string')return redact(value);if(Array.isArray(value))return value.map(v=>redactApiResult(v,secrets));if(value&&typeof value==='object')return Object.fromEntries(Object.entries(value).map(([k,v])=>[redact(k),redactApiResult(v,secrets)]));return value;}
+
+export async function interpolateApiArguments(args, options) {
+ const {body = '', ...rest} = args;
+ const resolved = await interpolateVariables(rest, options);
+ if (['GET', 'HEAD'].includes(args.method)) return {...resolved, body: ''};
+ let json;
+ try { json = JSON.parse(body); } catch { return {...resolved, body: await interpolateVariables(body, options)}; }
+ return {...resolved, body: JSON.stringify(await interpolateVariables(json, options))};
+}

package/runtime/execute.mjs

@@ -1,3 +1,4 @@
+import {interpolateApiArguments} from './api-request.mjs';
 import { interpolateVariables, referencedVariables, VARIABLE_WARNING_CODES } from './custom-variables.mjs';
 import { variableRuntimeOptions } from './variable-actions.mjs';
 import { buttonRouter } from './button-router.mjs';
@@ -133,7 +134,7 @@ async function executeAdmitted(command, interaction, client, options) {
 
     context.signal.throwIfAborted();
 
-    const args=await interpolateVariables(call.args,context.variableOptions);
+    const args=await (call.fn==='apiRequest'?interpolateApiArguments:interpolateVariables)(call.args,context.variableOptions);
     const prepared=call.fn==='sendMessage'&&args.buttons?.length?(options.buttonRouter||buttonRouter).prepare(command,args.buttons,context,optionValues):null;
     const invoke=async()=>{try{return await registry[call.fn](context,{...args,...(prepared?{components:prepared.components}:{})});}catch(error){prepared?.cancel();throw error;}};
 
@@ -160,7 +161,7 @@ async function executeAdmitted(command, interaction, client, options) {
 
       context.signal.throwIfAborted();
 
-      const args=interpolateError(await interpolateVariables(call.args,{...context.variableOptions,base:{...context.variableOptions.base,...optionValues,...variables}}),variables);
+      const args=interpolateError(await (call.fn==='apiRequest'?interpolateApiArguments:interpolateVariables)(call.args,{...context.variableOptions,base:{...context.variableOptions.base,...optionValues,...variables}}),variables);
     const prepared=call.fn==='sendMessage'&&args.buttons?.length?(options.buttonRouter||buttonRouter).prepare(command,args.buttons,context,{...optionValues,...variables}):null;
     const invoke=async()=>{try{return await registry[call.fn](context,{...args,...(prepared?{components:prepared.components}:{})});}catch(error){prepared?.cancel();throw error;}};
 

package/version.mjs

@@ -1 +1 @@
-export const AGENT_VERSION = '0.5.13';
+export const AGENT_VERSION = '0.5.14';