oft-agt 0.5.13 → 0.5.15

package/cli.mjs

@@ -11,6 +11,7 @@ import { fileURLToPath } from 'node:url';
 import { spawn } from 'node:child_process';
 import WebSocket from 'ws';
 import {secretOperation,readApiSecret} from './runtime/api-secrets.mjs';
+import {validatePresence} from './runtime/presence.mjs';
 import {requestApi} from './runtime/api-request.mjs';
 import { writeBot, compile } from './compiler.mjs';
 import { acceptSecret } from './secret.mjs';
@@ -160,7 +161,7 @@ async function start(config) {
             try { const response = await fetch('https://discord.com/api/v10/users/@me', { headers: { Authorization: 'Bot ' + secret.token }, signal: AbortSignal.timeout(15000) }); if (response.ok) { const user = await response.json(); profile = { id: user.id, username: user.username, avatar: user.avatar }; } } finally { secret.token = ''; }
           } catch {}
         }
-        send({ type: 'hello', agentVersion: AGENT_VERSION, updatesVersion: 1, officialUpdatesVersion: 1, protocol: 2, errorBranch: true, diagnosticsVersion: 2, optionsVersion: 1, conditionsVersion: 1, eventsVersion: 1, apiVersion: 1, complementaryBlocksVersion: 1, discordActionsVersion: 1, messageButtonsVersion: 2, variablesVersion: Number(process.versions.node.split('.')[0]) > 22 || (Number(process.versions.node.split('.')[0]) === 22 && Number(process.versions.node.split('.')[1]) >= 5) ? 1 : 0, metricsVersion: usageReady ? 1 : 0, profile, running: Boolean(child && child.exitCode === null && !child.signalCode), hasToken: await exists(secretPath), deploymentId: active });
+        send({ type: 'hello', agentVersion: AGENT_VERSION, updatesVersion: 1, officialUpdatesVersion: 1, protocol: 2, errorBranch: true, diagnosticsVersion: 2, optionsVersion: 1, conditionsVersion: 1, eventsVersion: 1, apiVersion: 1, presenceVersion:1, complementaryBlocksVersion: 1, discordActionsVersion: 1, messageButtonsVersion: 2, variablesVersion: Number(process.versions.node.split('.')[0]) > 22 || (Number(process.versions.node.split('.')[0]) === 22 && Number(process.versions.node.split('.')[1]) >= 5) ? 1 : 0, metricsVersion: usageReady ? 1 : 0, profile, running: Boolean(child && child.exitCode === null && !child.signalCode), hasToken: await exists(secretPath), deploymentId: active });
         if (process.connected) process.send?.({ type: 'agent-ready' }, () => {});
         await usage.flush(send).catch(() => console.error('Statistiques locales indisponibles.'));
         usageTimer = setInterval(() => usage.flush(send).catch(() => console.error('Statistiques locales indisponibles.')), 60000);
@@ -195,6 +196,8 @@ async function start(config) {
               if (message.command === 'stop') { await save(path.join(home, 'paused.json'), {}); await stopBot(); await usage.flush(send).catch(() => {}); send({ type: 'runtime-status', state: 'stopped' }); }
               else if (message.command === 'restart') { await restartBot(config); if (await exists(path.join(home, 'paused.json'))) await unlink(path.join(home, 'paused.json')); send({ type: 'runtime-status', state: 'running' }); }
             } catch { send({ type: 'runtime-status', state: 'failed' }); }
+          } else if(message.type==='presence'){
+            try{const presence=validatePresence(message.config);await save(path.join(home,'presence.json'),presence);if(child?.connected)child.send({type:'presence',config:presence});}catch{console.error('Presence invalide.');}return;
           } else if(message.type==='api-tool'){try{const result=message.payload.op==='test'?await requestApi(message.payload.config,{resolveSecret:name=>readApiSecret(name,home)}):await secretOperation(home,config.agentId,message.payload);const encoded=Buffer.from(JSON.stringify({result})).toString('base64');if(encoded.length>560000)throw Error('Réponse trop volumineuse.');const total=Math.ceil(encoded.length/1400);for(let index=0;index<total;index++)send({type:'api-result',id:message.id,index,total,chunk:encoded.slice(index*1400,(index+1)*1400)});}catch{send({type:'api-result',id:message.id,error:'Opération API impossible. Vérifiez la requête et les secrets.'});}return;}
           if (message.type === 'deploy') {
             console.log(`[${new Date().toISOString()}] Nouveau déploiement reçu.`);

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "oft-agt",
-  "version": "0.5.13",
+  "version": "0.5.15",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "oft-agt",
-      "version": "0.5.13",
+      "version": "0.5.15",
       "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.15",
   "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/runtime/presence.mjs

@@ -0,0 +1,14 @@
+export const DEFAULT_PRESENCE = Object.freeze({status:'online',type:'none',name:'',url:''});
+export function validatePresence(value) {
+ if(!value||typeof value!=='object'||Array.isArray(value))throw Error('Présence invalide.');
+ const {status,type,name='',url=''}=value;
+ if(!['online','idle','dnd','invisible'].includes(status)||!['none','playing','streaming','listening','watching','competing','custom'].includes(type))throw Error('Statut ou activité invalide.');
+ if(typeof name!=='string'||name.trim().length>128||typeof url!=='string'||url.length>512)throw Error('Activité invalide.');
+ if(type!=='none'&&!name.trim())throw Error('Indiquez le texte de l’activité.');
+ if(type==='streaming'&&!/^https:\/\/(www\.)?(twitch\.tv\/[^\s]+|youtube\.com\/(watch\?v=|live\/)[^\s]+)$/.test(url))throw Error('Lien Twitch ou YouTube HTTPS requis.');
+ return {status,type,name:type==='none'?'':name.trim(),url:type==='streaming'?url:''};
+}
+export function discordPresence(config){
+ const c=validatePresence(config),types={playing:0,streaming:1,listening:2,watching:3,custom:4,competing:5};
+ return {status:c.status,afk:c.status==='idle',activities:c.type==='none'?[]:[{name:c.type==='custom'?'Custom Status':c.name,type:types[c.type],...(c.type==='custom'?{state:c.name}:{}),...(c.url?{url:c.url}:{})}]};
+}

package/templates/bot.mjs

@@ -1,3 +1,5 @@
+import {DEFAULT_PRESENCE,discordPresence} from './runtime/presence.mjs';
+import path from 'node:path';
 import { EVENTS } from './runtime/events.mjs';
 import { registerEvents } from './runtime/event-runtime.mjs';
 import { fileURLToPath } from 'node:url';
@@ -29,7 +31,11 @@ if (process.argv.includes('--deploy')) {
   const client = new Client({ intents:[...intentNames].map(name=>GatewayIntentBits[name]), partials:[Partials.Message,Partials.Channel,Partials.Reaction,Partials.User,Partials.GuildMember] });
   registerEvents(client,eventGraphs,variableOptions);
   const commands = new Map(plan.commands.filter(command=>!command.trigger).map(command => [command.name, command]));
-  client.once('ready', () => console.log(`Bot connecté : ${client.user.tag}`));
+  let presenceConfig=DEFAULT_PRESENCE;
+  try{presenceConfig=JSON.parse(await readFile(path.join(process.env.OFTONE_API_HOME||'.','presence.json'),'utf8'));}catch{}
+  const applyPresence=config=>{client.user.setPresence(discordPresence(config));};
+  process.on('message',message=>{if(message?.type==='presence')try{discordPresence(message.config);presenceConfig=message.config;if(client.isReady())applyPresence(presenceConfig);}catch{}});
+  client.once('ready', () => {applyPresence(presenceConfig);console.log(`Bot connecté : ${client.user.tag}`);});
   client.on('interactionCreate', async interaction => {
     if(interaction.isButton?.()) {
       try{await executeButtonInteraction(interaction,client,{...variableOptions,onExecution: sample => { if(process.connected&&process.send)try{process.send({type:'usage',hour:Math.floor(Date.now()/3600000)*3600000,...sample},()=>{});}catch{} }});}catch(error){

package/version.mjs

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