full forwarding loop from keysend to external bot, back to action route, to mqtt, forwarded to tribe again

api/controllers/actions.ts

@@ -6,6 +6,8 @@ import * as rsa from '../crypto/rsa'
 import * as jsonUtils from '../utils/json'
 import * as socket from '../utils/socket'
 import { success, failure } from '../utils/res'
+import * as tribes from '../utils/tribes'
+
 
 /*
 hexdump -n 8 -e '4/4 "%08X" 1 "\n"' /dev/random
@@ -52,15 +54,40 @@ export async function processAction(req, res) {
     }
 
     try {
-        const r = await finalAction(a)
+        const r = await finalAction(a,bot_id)
         success(res, r)
     } catch(e) {
         failure(res, e)
     }
 }
 
-export async function finalAction(a:Action){
+export async function finalAction(a:Action, bot_id:string){
     const {action,pubkey,amount,content,bot_name,chat_uuid} = a
+    if (!chat_uuid) throw 'no chat_uuid' 
+
+    const owner = await models.Contact.findOne({ where: { isOwner: true } })
+
+    let theChat = await models.Chat.findOne({ where: { uuid: chat_uuid } })
+    if(!theChat) {
+        // is this a bot member cmd res
+        const botMember = await models.BotMember.findOne({where:{
+            tribeUuid: chat_uuid, botId: bot_id
+        }})
+        if(!botMember) return console.log('no botMember')
+
+        const dest = botMember.memberPubkey
+        if(!dest) return console.log('no dest to send to')
+        const topic = `${dest}/${chat_uuid}`
+        const data = {
+            ...a,
+            bot_id,
+            sender:{pub_key: owner.publicKey} // for verify sig
+        }
+        await tribes.publish(topic, data, function(){
+            
+        })
+        return
+    }
 
     if (action === 'keysend') {
         console.log('=> BOT KEYSEND')
@@ -83,10 +110,8 @@ export async function finalAction(a:Action){
 
     } else if (action === 'broadcast') {
         console.log('=> BOT BROADCAST')
-        if (!chat_uuid || !content) throw 'no chatID or content'
+        if (!content) throw 'no content'
-        const owner = await models.Contact.findOne({ where: { isOwner: true } })
+        if (!theChat) throw 'no chat'
-        const theChat = await models.Chat.findOne({ where: { uuid: chat_uuid } })
-        if (!theChat || !owner) throw 'no chat'
         if (!theChat.type === constants.chat_types.tribe) throw 'not a tribe'
 
         const encryptedForMeText = rsa.encrypt(owner.contactKey, content)

api/controllers/bots.ts

@@ -5,6 +5,8 @@ import { models } from '../models'
 import * as jsonUtils from '../utils/json'
 import { success, failure } from '../utils/res'
 import * as network from '../network'
+import * as intercept from '../network/intercept'
+import {finalAction} from './actions'
 
 const constants = require(path.join(__dirname, '../../config/constants.json'))
 
@@ -32,7 +34,7 @@ export const createBot = async (req, res) => {
   try {
     const owner = await models.Contact.findOne({ where: { isOwner: true } })
     const theBot = await models.Bot.create(newBot)
-    // post to bots.sphinx.chat
+    // post to tribes.sphinx.chat
     tribes.declare_bot({
       uuid,
       owner_pubkey: owner.publicKey,
@@ -73,8 +75,8 @@ export async function installBot(chatId:number, bot_json) {
     pricePerUse: price_per_use
   }
   console.log("installBot INSTALL BOT NOW",chatBot)
-  keysendBotInstall(chatBot)
+  const succeeded = await keysendBotInstall(chatBot)
-  await models.ChatBot.create(chatBot)
+  if(succeeded) models.ChatBot.create(chatBot)
 }
 
 export async function keysendBotInstall(b): Promise<boolean> {
@@ -88,24 +90,12 @@ export async function keysendBotCmd(msg, b): Promise<boolean> {
   return await botKeysend(
     constants.message_types.bot_cmd,
     b.botUuid, b.botMakerPubkey, b.pricePerUse,
-    msg.message.content
+    msg.message.content,
+    msg.chat.uuid,
   )
 }
 
-export async function receiveBotInstall(payload) {
+export async function botKeysend(msg_type, bot_uuid, botmaker_pubkey, price_per_use, content?:string, chat_uuid?:string): Promise<boolean> {
-  console.log('=> receiveBotInstall')
-
-  // const dat = payload.content || payload
-  // const sender_pub_key = dat.sender.pub_key
-  // const bot_uuid = dat.bot_uuid
-
-  // verify tribe ownership (verify signed timestamp)
-
-  // CHECK PUBKEY - is it me? install it! (create botmember)
-  // if the pubkey=the botOwnerPubkey, (create chatbot)
-}
-
-export async function botKeysend(msg_type, bot_uuid, botmaker_pubkey, price_per_use, content?:string): Promise<boolean> {
   const owner = await models.Contact.findOne({ where: { isOwner: true } })
   const MIN_SATS = 3
   const destkey = botmaker_pubkey
@@ -117,10 +107,14 @@ export async function botKeysend(msg_type, bot_uuid, botmaker_pubkey, price_per_
       message: {content: content||''},
       sender: {
         pub_key: owner.publicKey,
-      }
+      },
+      chat: {}
     },
     amt: Math.max(price_per_use || MIN_SATS)
   }
+  if(chat_uuid) {
+    opts.data.chat = {uuid:chat_uuid}
+  }
   try {
     await network.signAndSend(opts)
     return true
@@ -129,24 +123,70 @@ export async function botKeysend(msg_type, bot_uuid, botmaker_pubkey, price_per_
   }
 }
 
-// type BotCmdType = 'install' | 'message' | 'broadcast' | 'keysend'
+export async function receiveBotInstall(payload) {
+  console.log('=> receiveBotInstall',payload)
+
+  const dat = payload.content || payload
+  const sender_pub_key = dat.sender && dat.sender.pub_key
+  const bot_uuid = dat.bot_uuid
+  const chat_uuid = dat.chat && dat.chat.uuid
+  if(!chat_uuid || !sender_pub_key) return console.log('no chat uuid or sender pub key')
+
+  const owner = await models.Contact.findOne({ where: { isOwner: true } })
+
+  const bot = await models.Bot.findOne({where:{
+    uuid: bot_uuid
+  }})
+  if(!bot) return
+
+  const verifiedOwnerPubkey = await tribes.verifySignedTimestamp(bot_uuid)
+  if(verifiedOwnerPubkey===owner.publicKey){
+    const botMember = {
+      botId: bot.id,
+      memberPubkey:sender_pub_key,
+      tribeUuid:chat_uuid,
+      msgCount:0,
+    }
+    console.log("CREATE bot MEMBER", botMember)
+    await models.BotMember.create(botMember)
+  }
+  
+  //- need to pub back MQTT bot_install??
+  //- and if the pubkey=the botOwnerPubkey, confirm chatbot?
+}
 
 export async function receiveBotCmd(payload) {
-  console.log("=> receiveBotCmd")
+  console.log("=> receiveBotCmd", payload)
-  console.log(constants.message_types.bot_cmd)
-  // forward to the entire Action back
 
-  // const dat = payload.content || payload
+  const dat = payload.content || payload
   // const sender_pub_key = dat.sender.pub_key
-  // const bot_uuid = dat.bot_uuid
+  const bot_uuid = dat.bot_uuid
-  // const content = dat.message.content - check prefix
+  const chat_uuid = dat.chat && dat.chat.uuid
-  // const amount = dat.message.amount
+  if(!chat_uuid) return console.log('no chat uuid')
+  // const amount = dat.message.amount - check price_per_use
+
+  const bot = await models.Bot.findOne({where:{
+    uuid: bot_uuid
+  }})
+  if(!bot) return
+
+  const botMember = await models.BotMember.findOne({ where:{
+    botId: bot.id,
+    tribeUuid: chat_uuid,
+  }})
+  if(!botMember) return
+
+  botMember.update({ msgCount: (botMember||0)+1 })
+
+  console.log('=> post to remote BOT!!!!! bot owner')
+	return intercept.postToBotServer(payload, bot)
+   // forward to the entire Action back over MQTT
 }
 
 export async function receiveBotRes(payload) {
-  console.log("=> receiveBotRes")
+  console.log("=> receiveBotRes", payload)
-  console.log(constants.message_types.bot_res)
   // forward to the tribe
   // received the entire action?
-
+  const bot_id = payload.bot_id
+  finalAction(payload, bot_id)
 }

api/models/ts/botMember.ts

@@ -15,6 +15,9 @@ export default class BotMember extends Model<BotMember> {
   })
   id: number
 
+  @Column
+  botId: string
+
   @Column
   memberPubkey: string
 

api/network/intercept.ts

@@ -62,7 +62,10 @@ async function emitMessageToBot(msg, botInTribe): Promise<boolean> {
       builtinBotEmit(msg)
       return true
     case constants.bot_types.local:
-      return postToBotServer(msg, botInTribe)
+      const bot = await models.Bot.findOne({where:{
+        uuid: botInTribe.botUuid
+      }})
+      return postToBotServer(msg, bot)
     case constants.bot_types.remote:
       return keysendBotCmd(msg, botInTribe)
     default:
@@ -70,10 +73,8 @@ async function emitMessageToBot(msg, botInTribe): Promise<boolean> {
   }
 }
 
-async function postToBotServer(msg, botInTribe): Promise<boolean> {
+export async function postToBotServer(msg, bot): Promise<boolean> {
-  const bot = await models.Bot.findOne({where:{
+  if(!bot) return false
-    uuid: botInTribe.botUuid
-  }})
   if(!bot.webhook || !bot.secret) return false
   const r = await fetch(bot.webhook, {
     method:'POST',

api/network/receive.ts

@@ -11,7 +11,6 @@ import {modifyPayloadAndSaveMediaKey,purchaseFromOriginalSender,sendFinalMemeIfF
 import {decryptMessage,encryptTribeBroadcast} from '../utils/msg'
 import { Op } from 'sequelize'
 import * as timers from '../utils/timers'
-// import * as intercept from './intercept'
 
 /*
 delete type:
@@ -34,14 +33,28 @@ const typesThatNeedPricePerMessage = [
 export const typesToReplay=[ // should match typesToForward
 	msgtypes.message, msgtypes.group_join, msgtypes.group_leave
 ]
+const botTypes=[
+	constants.message_types.bot_install,
+	constants.message_types.bot_cmd,
+	constants.message_types.bot_res
+]
 async function onReceive(payload){
 	console.log('===> onReceive',JSON.stringify(payload,null,2))
+	if(!payload.type) return console.log('no payload.type')
+
+	if(botTypes.includes(payload.type)) {
+		console.log("=> got bot msg type!!!!")
+		if(!payload.bot_uuid) return console.log('no bot uuid')
+		return ACTIONS[payload.type](payload)
+	}
+	
 	// if tribe, owner must forward to MQTT
 	let doAction = true
 	const toAddIn:{[k:string]:any} = {}
 	let isTribe = false
 	let isTribeOwner = false
 	let chat
+
 	if(payload.chat&&payload.chat.uuid) {
 		isTribe = payload.chat.type===constants.chat_types.tribe
 		chat = await models.Chat.findOne({where:{uuid:payload.chat.uuid}})

api/utils/setup.ts

@@ -69,6 +69,10 @@ async function migrate(){
     )`)
   } catch(e){}
 
+  addTableColumn('sphinx_bot_members', 'bot_id')
+
+  //////////
+
   try{
     await sequelize.query(`
     CREATE TABLE sphinx_bots (

dist/api/controllers/actions.js

@@ -17,6 +17,7 @@ const rsa = require("../crypto/rsa");
 const jsonUtils = require("../utils/json");
 const socket = require("../utils/socket");
 const res_1 = require("../utils/res");
+const tribes = require("../utils/tribes");
 /*
 hexdump -n 8 -e '4/4 "%08X" 1 "\n"' /dev/random
 hexdump -n 16 -e '4/4 "%08X" 1 "\n"' /dev/random
@@ -53,7 +54,7 @@ function processAction(req, res) {
             bot_name: bot.name, chat_uuid
         };
         try {
-            const r = yield finalAction(a);
+            const r = yield finalAction(a, bot_id);
             res_1.success(res, r);
         }
         catch (e) {
@@ -62,9 +63,30 @@ function processAction(req, res) {
     });
 }
 exports.processAction = processAction;
-function finalAction(a) {
+function finalAction(a, bot_id) {
     return __awaiter(this, void 0, void 0, function* () {
         const { action, pubkey, amount, content, bot_name, chat_uuid } = a;
+        if (!chat_uuid)
+            throw 'no chat_uuid';
+        const owner = yield models_1.models.Contact.findOne({ where: { isOwner: true } });
+        let theChat = yield models_1.models.Chat.findOne({ where: { uuid: chat_uuid } });
+        if (!theChat) {
+            // is this a bot member cmd res
+            const botMember = yield models_1.models.BotMember.findOne({ where: {
+                    tribeUuid: chat_uuid, botId: bot_id
+                } });
+            if (!botMember)
+                return console.log('no botMember');
+            const dest = botMember.memberPubkey;
+            if (!dest)
+                return console.log('no dest to send to');
+            const topic = `${dest}/${chat_uuid}`;
+            const data = Object.assign(Object.assign({}, a), { bot_id, sender: { pub_key: owner.publicKey } // for verify sig
+             });
+            yield tribes.publish(topic, data, function () {
+            });
+            return;
+        }
         if (action === 'keysend') {
             console.log('=> BOT KEYSEND');
             if (!(pubkey && pubkey.length === 66 && amount)) {
@@ -87,11 +109,9 @@ function finalAction(a) {
         }
         else if (action === 'broadcast') {
             console.log('=> BOT BROADCAST');
-            if (!chat_uuid || !content)
+            if (!content)
-                throw 'no chatID or content';
+                throw 'no content';
-            const owner = yield models_1.models.Contact.findOne({ where: { isOwner: true } });
+            if (!theChat)
-            const theChat = yield models_1.models.Chat.findOne({ where: { uuid: chat_uuid } });
-            if (!theChat || !owner)
                 throw 'no chat';
             if (!theChat.type === constants.chat_types.tribe)
                 throw 'not a tribe';

dist/api/controllers/actions.js.map

@@ -1 +1 @@
-{"version":3,"file":"actions.js","sourceRoot":"","sources":["../../../api/controllers/actions.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,6BAA4B;AAC5B,sCAAqC;AACrC,sCAAkC;AAClC,oCAAmC;AACnC,qCAAoC;AACpC,2CAA0C;AAC1C,0CAAyC;AACzC,sCAA+C;AAE/C;;;EAGE;AAEF,MAAM,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,6BAA6B,CAAC,CAAC,CAAA;AAW9E,SAAsB,aAAa,CAAC,GAAG,EAAE,GAAG;;QACxC,IAAI,IAAI,GAAG,GAAG,CAAC,IAAI,CAAA;QACnB,IAAI,IAAI,CAAC,IAAI,IAAI,OAAO,IAAI,CAAC,IAAI,KAAK,QAAQ,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE;YACpE,IAAI,EAAE,uDAAuD;gBACzD,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,CAAA;gBACzD,IAAI,QAAQ;oBAAE,IAAI,GAAG,QAAQ,CAAA;aAChC;YAAC,OAAO,CAAC,EAAE;gBACR,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;gBACd,OAAO,aAAO,CAAC,GAAG,EAAE,mCAAmC,CAAC,CAAA;aAC3D;SACJ;QACD,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,GAAG,IAAI,CAAA;QAC/E,IAAI,CAAC,MAAM;YAAE,OAAO,aAAO,CAAC,GAAG,EAAE,WAAW,CAAC,CAAA;QAC7C,MAAM,GAAG,GAAG,MAAM,eAAM,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,CAAC,CAAA;QAC/D,IAAI,CAAC,GAAG;YAAE,OAAO,aAAO,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAA;QAEvC,IAAI,CAAC,CAAC,GAAG,CAAC,MAAM,IAAI,GAAG,CAAC,MAAM,KAAK,UAAU,CAAC,EAAE;YAC5C,OAAO,aAAO,CAAC,GAAG,EAAE,cAAc,CAAC,CAAA;SACtC;QACD,IAAI,CAAC,MAAM,EAAE;YACT,OAAO,aAAO,CAAC,GAAG,EAAE,WAAW,CAAC,CAAA;SACnC;QAED,MAAM,CAAC,GAAU;YACb,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;YAC/B,QAAQ,EAAC,GAAG,CAAC,IAAI,EAAE,SAAS;SAC/B,CAAA;QAED,IAAI;YACA,MAAM,CAAC,GAAG,MAAM,WAAW,CAAC,CAAC,CAAC,CAAA;YAC9B,aAAO,CAAC,GAAG,EAAE,CAAC,CAAC,CAAA;SAClB;QAAC,OAAM,CAAC,EAAE;YACP,aAAO,CAAC,GAAG,EAAE,CAAC,CAAC,CAAA;SAClB;IACL,CAAC;CAAA;AAlCD,sCAkCC;AAED,SAAsB,WAAW,CAAC,CAAQ;;QACtC,MAAM,EAAC,MAAM,EAAC,MAAM,EAAC,MAAM,EAAC,OAAO,EAAC,QAAQ,EAAC,SAAS,EAAC,GAAG,CAAC,CAAA;QAE3D,IAAI,MAAM,KAAK,SAAS,EAAE;YACtB,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAA;YAC7B,IAAI,CAAC,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,KAAK,EAAE,IAAI,MAAM,CAAC,EAAE;gBAC7C,MAAM,cAAc,CAAA;aACvB;YACD,MAAM,QAAQ,GAAG,CAAC,CAAA;YAClB,MAAM,OAAO,GAAG,MAAM,CAAA;YACtB,MAAM,IAAI,GAAG;gBACT,IAAI,EAAE,OAAO;gBACb,IAAI,EAAE,EAAE;gBACR,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC,EAAE,QAAQ,CAAC;aACzC,CAAA;YACD,IAAI;gBACA,MAAM,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,CAAA;gBAC/B,OAAO,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAA;aAC7B;YAAC,OAAO,CAAC,EAAE;gBACR,MAAM,CAAC,CAAA;aACV;SAEJ;aAAM,IAAI,MAAM,KAAK,WAAW,EAAE;YAC/B,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAA;YAC/B,IAAI,CAAC,SAAS,IAAI,CAAC,OAAO;gBAAE,MAAM,sBAAsB,CAAA;YACxD,MAAM,KAAK,GAAG,MAAM,eAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,CAAC,CAAA;YACxE,MAAM,OAAO,GAAG,MAAM,eAAM,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE,CAAC,CAAA;YACzE,IAAI,CAAC,OAAO,IAAI,CAAC,KAAK;gBAAE,MAAM,SAAS,CAAA;YACvC,IAAI,CAAC,OAAO,CAAC,IAAI,KAAK,SAAS,CAAC,UAAU,CAAC,KAAK;gBAAE,MAAM,aAAa,CAAA;YAErE,MAAM,kBAAkB,GAAG,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,UAAU,EAAE,OAAO,CAAC,CAAA;YACjE,MAAM,aAAa,GAAG,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAA;YAC5D,MAAM,OAAO,GAAG,EAAE,MAAM,EAAE,aAAa,EAAE,CAAA;YACzC,IAAI,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC;YACtB,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,CAAA;YACvB,MAAM,KAAK,GAAG,QAAQ,IAAI,KAAK,CAAA;YAC/B,MAAM,YAAY,GAAG,CAAC,CAAC,CAAA;YACvB,MAAM,GAAG,GAAyB;gBAC9B,MAAM,EAAE,OAAO,CAAC,EAAE;gBAClB,IAAI,EAAE,KAAK,CAAC,QAAQ,EAAE;gBACtB,IAAI,EAAE,SAAS,CAAC,aAAa,CAAC,OAAO;gBACrC,MAAM,EAAE,YAAY;gBACpB,MAAM,EAAE,MAAM,IAAI,CAAC;gBACnB,IAAI,EAAE,IAAI;gBACV,cAAc,EAAE,kBAAkB;gBAClC,oBAAoB,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC;gBAC7C,MAAM,EAAE,SAAS,CAAC,QAAQ,CAAC,SAAS;gBACpC,SAAS,EAAE,IAAI;gBACf,SAAS,EAAE,IAAI;gBACf,WAAW,EAAE,KAAK;aACrB,CAAA;YACD,MAAM,OAAO,GAAG,MAAM,eAAM,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;YAChD,MAAM,CAAC,QAAQ,CAAC;gBACZ,IAAI,EAAE,SAAS;gBACf,QAAQ,EAAE,SAAS,CAAC,aAAa,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,CAAC;aAC7D,CAAC,CAAA;YACF,MAAM,OAAO,CAAC,WAAW,CAAC;gBACtB,IAAI,EAAE,OAAO;gBACb,MAAM,kCAAO,KAAK,CAAC,UAAU,KAAE,KAAK,EAAE,EAAE,EAAC,YAAY,GAAE;gBACvD,OAAO,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE,OAAO,CAAC,EAAE,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE;gBACjE,IAAI,EAAE,SAAS,CAAC,aAAa,CAAC,OAAO;gBACrC,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;gBAClC,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE;oBACX,MAAM,CAAC,CAAA;gBACX,CAAC;aACJ,CAAC,CAAA;SAEL;aAAM;YACH,MAAM,WAAW,CAAA;SACpB;IACL,CAAC;CAAA;AAtED,kCAsEC"}
+{"version":3,"file":"actions.js","sourceRoot":"","sources":["../../../api/controllers/actions.ts"],"names":[],"mappings":"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"}

dist/api/controllers/bots.js

@@ -16,6 +16,8 @@ const models_1 = require("../models");
 const jsonUtils = require("../utils/json");
 const res_1 = require("../utils/res");
 const network = require("../network");
+const intercept = require("../network/intercept");
+const actions_1 = require("./actions");
 const constants = require(path.join(__dirname, '../../config/constants.json'));
 exports.getBots = (req, res) => __awaiter(void 0, void 0, void 0, function* () {
     try {
@@ -40,7 +42,7 @@ exports.createBot = (req, res) => __awaiter(void 0, void 0, void 0, function* ()
     try {
         const owner = yield models_1.models.Contact.findOne({ where: { isOwner: true } });
         const theBot = yield models_1.models.Bot.create(newBot);
-        // post to bots.sphinx.chat
+        // post to tribes.sphinx.chat
         tribes.declare_bot({
             uuid,
             owner_pubkey: owner.publicKey,
@@ -83,8 +85,9 @@ function installBot(chatId, bot_json) {
             pricePerUse: price_per_use
         };
         console.log("installBot INSTALL BOT NOW", chatBot);
-        keysendBotInstall(chatBot);
+        const succeeded = yield keysendBotInstall(chatBot);
-        yield models_1.models.ChatBot.create(chatBot);
+        if (succeeded)
+            models_1.models.ChatBot.create(chatBot);
     });
 }
 exports.installBot = installBot;
@@ -96,23 +99,11 @@ function keysendBotInstall(b) {
 exports.keysendBotInstall = keysendBotInstall;
 function keysendBotCmd(msg, b) {
     return __awaiter(this, void 0, void 0, function* () {
-        return yield botKeysend(constants.message_types.bot_cmd, b.botUuid, b.botMakerPubkey, b.pricePerUse, msg.message.content);
+        return yield botKeysend(constants.message_types.bot_cmd, b.botUuid, b.botMakerPubkey, b.pricePerUse, msg.message.content, msg.chat.uuid);
     });
 }
 exports.keysendBotCmd = keysendBotCmd;
-function receiveBotInstall(payload) {
+function botKeysend(msg_type, bot_uuid, botmaker_pubkey, price_per_use, content, chat_uuid) {
-    return __awaiter(this, void 0, void 0, function* () {
-        console.log('=> receiveBotInstall');
-        // const dat = payload.content || payload
-        // const sender_pub_key = dat.sender.pub_key
-        // const bot_uuid = dat.bot_uuid
-        // verify tribe ownership (verify signed timestamp)
-        // CHECK PUBKEY - is it me? install it! (create botmember)
-        // if the pubkey=the botOwnerPubkey, (create chatbot)
-    });
-}
-exports.receiveBotInstall = receiveBotInstall;
-function botKeysend(msg_type, bot_uuid, botmaker_pubkey, price_per_use, content) {
     return __awaiter(this, void 0, void 0, function* () {
         const owner = yield models_1.models.Contact.findOne({ where: { isOwner: true } });
         const MIN_SATS = 3;
@@ -125,10 +116,14 @@ function botKeysend(msg_type, bot_uuid, botmaker_pubkey, price_per_use, content)
                 message: { content: content || '' },
                 sender: {
                     pub_key: owner.publicKey,
-                }
+                },
+                chat: {}
             },
             amt: Math.max(price_per_use || MIN_SATS)
         };
+        if (chat_uuid) {
+            opts.data.chat = { uuid: chat_uuid };
+        }
         try {
             yield network.signAndSend(opts);
             return true;
@@ -139,26 +134,72 @@ function botKeysend(msg_type, bot_uuid, botmaker_pubkey, price_per_use, content)
     });
 }
 exports.botKeysend = botKeysend;
-// type BotCmdType = 'install' | 'message' | 'broadcast' | 'keysend'
+function receiveBotInstall(payload) {
+    return __awaiter(this, void 0, void 0, function* () {
+        console.log('=> receiveBotInstall', payload);
+        const dat = payload.content || payload;
+        const sender_pub_key = dat.sender && dat.sender.pub_key;
+        const bot_uuid = dat.bot_uuid;
+        const chat_uuid = dat.chat && dat.chat.uuid;
+        if (!chat_uuid || !sender_pub_key)
+            return console.log('no chat uuid or sender pub key');
+        const owner = yield models_1.models.Contact.findOne({ where: { isOwner: true } });
+        const bot = yield models_1.models.Bot.findOne({ where: {
+                uuid: bot_uuid
+            } });
+        if (!bot)
+            return;
+        const verifiedOwnerPubkey = yield tribes.verifySignedTimestamp(bot_uuid);
+        if (verifiedOwnerPubkey === owner.publicKey) {
+            const botMember = {
+                botId: bot.id,
+                memberPubkey: sender_pub_key,
+                tribeUuid: chat_uuid,
+                msgCount: 0,
+            };
+            console.log("CREATE bot MEMBER", botMember);
+            yield models_1.models.BotMember.create(botMember);
+        }
+        //- need to pub back MQTT bot_install??
+        //- and if the pubkey=the botOwnerPubkey, confirm chatbot?
+    });
+}
+exports.receiveBotInstall = receiveBotInstall;
 function receiveBotCmd(payload) {
     return __awaiter(this, void 0, void 0, function* () {
-        console.log("=> receiveBotCmd");
+        console.log("=> receiveBotCmd", payload);
-        console.log(constants.message_types.bot_cmd);
+        const dat = payload.content || payload;
-        // forward to the entire Action back
-        // const dat = payload.content || payload
         // const sender_pub_key = dat.sender.pub_key
-        // const bot_uuid = dat.bot_uuid
+        const bot_uuid = dat.bot_uuid;
-        // const content = dat.message.content - check prefix
+        const chat_uuid = dat.chat && dat.chat.uuid;
-        // const amount = dat.message.amount
+        if (!chat_uuid)
+            return console.log('no chat uuid');
+        // const amount = dat.message.amount - check price_per_use
+        const bot = yield models_1.models.Bot.findOne({ where: {
+                uuid: bot_uuid
+            } });
+        if (!bot)
+            return;
+        const botMember = yield models_1.models.BotMember.findOne({ where: {
+                botId: bot.id,
+                tribeUuid: chat_uuid,
+            } });
+        if (!botMember)
+            return;
+        botMember.update({ msgCount: (botMember || 0) + 1 });
+        console.log('=> post to remote BOT!!!!! bot owner');
+        return intercept.postToBotServer(payload, bot);
+        // forward to the entire Action back over MQTT
     });
 }
 exports.receiveBotCmd = receiveBotCmd;
 function receiveBotRes(payload) {
     return __awaiter(this, void 0, void 0, function* () {
-        console.log("=> receiveBotRes");
+        console.log("=> receiveBotRes", payload);
-        console.log(constants.message_types.bot_res);
         // forward to the tribe
         // received the entire action?
+        const bot_id = payload.bot_id;
+        actions_1.finalAction(payload, bot_id);
     });
 }
 exports.receiveBotRes = receiveBotRes;

dist/api/models/ts/botMember.js

@@ -24,6 +24,10 @@ __decorate([
     }),
     __metadata("design:type", Number)
 ], BotMember.prototype, "id", void 0);
+__decorate([
+    sequelize_typescript_1.Column,
+    __metadata("design:type", String)
+], BotMember.prototype, "botId", void 0);
 __decorate([
     sequelize_typescript_1.Column,
     __metadata("design:type", String)

dist/api/models/ts/botMember.js.map

@@ -1 +1 @@
-{"version":3,"file":"botMember.js","sourceRoot":"","sources":["../../../../api/models/ts/botMember.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+DAAsE;AAEtE;;EAEE;AAGF,IAAqB,SAAS,GAA9B,MAAqB,SAAU,SAAQ,4BAAgB;CAyBtD,CAAA;AAjBC;IANC,6BAAM,CAAC;QACN,IAAI,EAAE,+BAAQ,CAAC,MAAM;QACrB,UAAU,EAAE,IAAI;QAChB,MAAM,EAAE,IAAI;QACZ,aAAa,EAAE,IAAI;KACpB,CAAC;;qCACQ;AAGV;IADC,6BAAM;;+CACa;AAGpB;IADC,6BAAM;;4CACU;AAGjB;IADC,6BAAM;;2CACS;AAGhB;IADC,6BAAM;8BACI,IAAI;4CAAA;AAGf;IADC,6BAAM;8BACI,IAAI;4CAAA;AAvBI,SAAS;IAD7B,4BAAK,CAAC,EAAC,SAAS,EAAE,oBAAoB,EAAE,WAAW,EAAE,IAAI,EAAC,CAAC;GACvC,SAAS,CAyB7B;kBAzBoB,SAAS"}
+{"version":3,"file":"botMember.js","sourceRoot":"","sources":["../../../../api/models/ts/botMember.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+DAAsE;AAEtE;;EAEE;AAGF,IAAqB,SAAS,GAA9B,MAAqB,SAAU,SAAQ,4BAAgB;CA4BtD,CAAA;AApBC;IANC,6BAAM,CAAC;QACN,IAAI,EAAE,+BAAQ,CAAC,MAAM;QACrB,UAAU,EAAE,IAAI;QAChB,MAAM,EAAE,IAAI;QACZ,aAAa,EAAE,IAAI;KACpB,CAAC;;qCACQ;AAGV;IADC,6BAAM;;wCACM;AAGb;IADC,6BAAM;;+CACa;AAGpB;IADC,6BAAM;;4CACU;AAGjB;IADC,6BAAM;;2CACS;AAGhB;IADC,6BAAM;8BACI,IAAI;4CAAA;AAGf;IADC,6BAAM;8BACI,IAAI;4CAAA;AA1BI,SAAS;IAD7B,4BAAK,CAAC,EAAC,SAAS,EAAE,oBAAoB,EAAE,WAAW,EAAE,IAAI,EAAC,CAAC;GACvC,SAAS,CA4B7B;kBA5BoB,SAAS"}

dist/api/network/intercept.js

@@ -71,7 +71,10 @@ function emitMessageToBot(msg, botInTribe) {
                 bots_1.builtinBotEmit(msg);
                 return true;
             case constants.bot_types.local:
-                return postToBotServer(msg, botInTribe);
+                const bot = yield models_1.models.Bot.findOne({ where: {
+                        uuid: botInTribe.botUuid
+                    } });
+                return postToBotServer(msg, bot);
             case constants.bot_types.remote:
                 return bots_2.keysendBotCmd(msg, botInTribe);
             default:
@@ -79,11 +82,10 @@ function emitMessageToBot(msg, botInTribe) {
         }
     });
 }
-function postToBotServer(msg, botInTribe) {
+function postToBotServer(msg, bot) {
     return __awaiter(this, void 0, void 0, function* () {
-        const bot = yield models_1.models.Bot.findOne({ where: {
+        if (!bot)
-                uuid: botInTribe.botUuid
+            return false;
-            } });
         if (!bot.webhook || !bot.secret)
             return false;
         const r = yield node_fetch_1.default(bot.webhook, {
@@ -97,6 +99,7 @@ function postToBotServer(msg, botInTribe) {
         return r.ok;
     });
 }
+exports.postToBotServer = postToBotServer;
 function asyncForEach(array, callback) {
     return __awaiter(this, void 0, void 0, function* () {
         for (let index = 0; index < array.length; index++) {

dist/api/network/intercept.js.map

@@ -1 +1 @@
-{"version":3,"file":"intercept.js","sourceRoot":"","sources":["../../../api/network/intercept.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"intercept.js","sourceRoot":"","sources":["../../../api/network/intercept.ts"],"names":[],"mappings":"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"}

dist/api/network/receive.js

@@ -22,7 +22,6 @@ const modify_1 = require("./modify");
 const msg_1 = require("../utils/msg");
 const sequelize_1 = require("sequelize");
 const timers = require("../utils/timers");
-// import * as intercept from './intercept'
 /*
 delete type:
 owner needs to check that the delete is the one who made the msg
@@ -42,9 +41,22 @@ const typesThatNeedPricePerMessage = [
 exports.typesToReplay = [
     msgtypes.message, msgtypes.group_join, msgtypes.group_leave
 ];
+const botTypes = [
+    constants.message_types.bot_install,
+    constants.message_types.bot_cmd,
+    constants.message_types.bot_res
+];
 function onReceive(payload) {
     return __awaiter(this, void 0, void 0, function* () {
         console.log('===> onReceive', JSON.stringify(payload, null, 2));
+        if (!payload.type)
+            return console.log('no payload.type');
+        if (botTypes.includes(payload.type)) {
+            console.log("=> got bot msg type!!!!");
+            if (!payload.bot_uuid)
+                return console.log('no bot uuid');
+            return controllers_1.ACTIONS[payload.type](payload);
+        }
         // if tribe, owner must forward to MQTT
         let doAction = true;
         const toAddIn = {};

dist/api/utils/setup.js

@@ -80,6 +80,8 @@ function migrate() {
     )`);
         }
         catch (e) { }
+        addTableColumn('sphinx_bot_members', 'bot_id');
+        //////////
         try {
             yield models_1.sequelize.query(`
     CREATE TABLE sphinx_bots (

dist/api/utils/setup.js.map

@@ -1 +1 @@
-{"version":3,"file":"setup.js","sourceRoot":"","sources":["../../../api/utils/setup.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"setup.js","sourceRoot":"","sources":["../../../api/utils/setup.ts"],"names":[],"mappings":"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"}