lukechilds
/
sphinx-relay
mirror of https://github.com/lukechilds/sphinx-relay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

bot res and install to tribes server, deleted field on tribe

push-params
Evan Feenstra 4 years ago
parent
5ef5f845d0
commit
339e895344
15 changed files with 134 additions and 56 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      api/bots/mother.ts
  2. 50
      api/controllers/bots.ts
  3. 1
      api/controllers/chatTribes.ts
  4. 5
      api/network/intercept.ts
  5. 24
      api/utils/tribes.ts
  6. 9
      dist/api/bots/mother.js
  7. 2
      dist/api/bots/mother.js.map
  8. 53
      dist/api/controllers/bots.js
  9. 2
      dist/api/controllers/bots.js.map
  10. 1
      dist/api/controllers/chatTribes.js
  11. 2
      dist/api/controllers/chatTribes.js.map
  12. 2
      dist/api/network/intercept.js
  13. 2
      dist/api/network/intercept.js.map
  14. 27
      dist/api/utils/tribes.js
  15. 2
      dist/api/utils/tribes.js.map

8
api/bots/mother.ts
View File

@ -1,6 +1,7 @@
// import * as SphinxBot from '../../../sphinx-bot'
import * as Sphinx from 'sphinx-bot'
import { finalAction } from '../controllers/actions'
import { installBot } from '../controllers/bots'
import * as path from 'path'
import * as WelcomeBot from './welcome'
import * as LoopBot from './loop'
@ -85,8 +86,11 @@ export function init() {
const bot = await getBotByName(botName)
if(bot && bot.uuid) {
console.log('=> FOUDN BOT', bot)
// send msg to bot owner
// await models.ChatBot.create(chatBot)
const chat = await models.Chat.findOne({where:{
uuid: message.channel.id
}})
if(!chat) return
installBot(chat.id, bot)
} else {
const embed = new Sphinx.MessageEmbed()
.setAuthor('MotherBot')

50
api/controllers/bots.ts
View File

@ -20,18 +20,30 @@ export const getBots = async (req, res) => {
}
export const createBot = async (req, res) => {
const { name, webhook } = req.body
const { name, webhook, price_per_use, img, description, tags, } = req.body
const uuid = await tribes.genSignedTimestamp()
const newBot = {
name, uuid, webhook,
id: crypto.randomBytes(12).toString('hex').toUpperCase(),
secret: crypto.randomBytes(16).toString('hex').toUpperCase(),
pricePerUse: 0
pricePerUse: price_per_use||0
}
try {
const owner = await models.Contact.findOne({ where: { isOwner: true } })
const theBot = await models.Bot.create(newBot)
// post to bots.sphinx.chat
tribes.declare_bot({
uuid,
owner_pubkey: owner.publicKey,
price_per_use,
name: name,
description: description||'',
tags: tags||[],
img: img||'',
unlisted:false,
deleted:false,
})
success(res, jsonUtils.botToJson(theBot))
} catch (e) {
failure(res, 'bot creation failed')
@ -50,33 +62,29 @@ export const deleteBot = async (req, res) => {
}
}
// async function broadcastAction(chat,text){
// finalAction(<Action>{
// action:'broadcast',
// text, chatUUID: chat.uuid,
// botName:'MotherBot'
// })
// }
export function installBot(botname, botInTribe) {
console.log("INSTALL BOT NOW")
// search registry for bot (by name)
// need bot uuid and maker pubkey
// send bot_install to bot maker
// generate ChatMember with bot=true
// bot_maker_pubkey, bot_uuid, bot_prefix
export async function installBot(chatId:number, bot_json) {
const {uuid,owner_pubkey,unique_name,price_per_use} = bot_json
const chatBot = {
chatId,
botPrefix: '/' +unique_name,
botType: constants.bot_types.remote,
botUuid: uuid,
botMakerPubkey: owner_pubkey,
pricePerUse: price_per_use
}
console.log("installBot INSTALL BOT NOW",chatBot)
keysendBotInstall(chatBot)
await models.ChatBot.create(chatBot)
}
export async function sendBotInstall(_, b): Promise<boolean> {
export async function keysendBotInstall(b): Promise<boolean> {
return await botKeysend(
constants.message_types.bot_install,
b.botUuid, b.botMakerPubkey, b.pricePerUse,
)
}
export async function sendBotCmd(msg, b): Promise<boolean> {
export async function keysendBotCmd(msg, b): Promise<boolean> {
return await botKeysend(
constants.message_types.bot_cmd,
b.botUuid, b.botMakerPubkey, b.pricePerUse,

1
api/controllers/chatTribes.ts
View File

@ -222,6 +222,7 @@ export async function editTribe(req, res) {
unlisted,
is_private: req.body.private,
app_url,
deleted: false,
})
} catch(e) {
okToUpdate = false

5
api/network/intercept.ts
View File

@ -1,7 +1,7 @@
import {Msg} from './interfaces'
import { models } from '../models'
import {builtinBotEmit,buildBotPayload} from '../bots'
import {sendBotCmd} from '../controllers/bots'
import {keysendBotCmd} from '../controllers/bots'
import * as path from 'path'
import fetch from 'node-fetch'
@ -64,11 +64,10 @@ async function emitMessageToBot(msg, botInTribe): Promise<boolean> {
case constants.bot_types.local:
return postToBotServer(msg, botInTribe)
case constants.bot_types.remote:
return sendBotCmd(msg, botInTribe)
return keysendBotCmd(msg, botInTribe)
default:
return false
}
}
async function postToBotServer(msg, botInTribe): Promise<boolean> {

24
api/utils/tribes.ts
View File

@ -99,7 +99,28 @@ export async function declare({ uuid, name, description, tags, img, group_key, h
}
}
export async function edit({ uuid, host, name, description, tags, img, price_per_message, price_to_join, owner_alias, escrow_amount, escrow_millis, unlisted, is_private, app_url }) {
export async function declare_bot({ uuid, name, description, tags, img, price_per_use, owner_pubkey, unlisted, deleted }) {
const host = getHost()
try {
await fetch('https://' + host + '/bots', {
method: 'POST',
body: JSON.stringify({
uuid, owner_pubkey,
name, description, tags, img: img || '',
price_per_use: price_per_use || 0,
unlisted: unlisted||false,
deleted: deleted||false,
}),
headers: { 'Content-Type': 'application/json' }
})
// const j = await r.json()
} catch (e) {
console.log('[tribes] unauthorized to declare')
throw e
}
}
export async function edit({ uuid, host, name, description, tags, img, price_per_message, price_to_join, owner_alias, escrow_amount, escrow_millis, unlisted, is_private, app_url, deleted }) {
try {
const token = await genSignedTimestamp()
await fetch('https://' + host + '/tribe?token=' + token, {
@ -114,6 +135,7 @@ export async function edit({ uuid, host, name, description, tags, img, price_per
owner_alias,
unlisted: unlisted||false,
private: is_private||false,
deleted: deleted||false,
app_url: app_url||'',
}),
headers: { 'Content-Type': 'application/json' }

9
dist/api/bots/mother.js
View File

@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
// import * as SphinxBot from '../../../sphinx-bot'
const Sphinx = require("sphinx-bot");
const actions_1 = require("../controllers/actions");
const bots_1 = require("../controllers/bots");
const path = require("path");
const WelcomeBot = require("./welcome");
const LoopBot = require("./loop");
@ -92,8 +93,12 @@ function init() {
const bot = yield getBotByName(botName);
if (bot && bot.uuid) {
console.log('=> FOUDN BOT', bot);
// send msg to bot owner
// await models.ChatBot.create(chatBot)
const chat = yield models_1.models.Chat.findOne({ where: {
uuid: message.channel.id
} });
if (!chat)
return;
bots_1.installBot(chat.id, bot);
}
else {
const embed = new Sphinx.MessageEmbed()

2
dist/api/bots/mother.js.map
View File

File diff suppressed because one or more lines are too long

53
dist/api/controllers/bots.js
View File

@ -29,17 +29,29 @@ exports.getBots = (req, res) => __awaiter(void 0, void 0, void 0, function* () {
}
});
exports.createBot = (req, res) => __awaiter(void 0, void 0, void 0, function* () {
const { name, webhook } = req.body;
const { name, webhook, price_per_use, img, description, tags, } = req.body;
const uuid = yield tribes.genSignedTimestamp();
const newBot = {
name, uuid, webhook,
id: crypto.randomBytes(12).toString('hex').toUpperCase(),
secret: crypto.randomBytes(16).toString('hex').toUpperCase(),
pricePerUse: 0
pricePerUse: price_per_use || 0
};
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
tribes.declare_bot({
uuid,
owner_pubkey: owner.publicKey,
price_per_use,
name: name,
description: description || '',
tags: tags || [],
img: img || '',
unlisted: false,
deleted: false,
});
res_1.success(res, jsonUtils.botToJson(theBot));
}
catch (e) {
@ -59,34 +71,35 @@ exports.deleteBot = (req, res) => __awaiter(void 0, void 0, void 0, function* ()
res_1.failure(res, e);
}
});
// async function broadcastAction(chat,text){
// finalAction(<Action>{
// action:'broadcast',
// text, chatUUID: chat.uuid,
// botName:'MotherBot'
// })
// }
function installBot(botname, botInTribe) {
console.log("INSTALL BOT NOW");
// search registry for bot (by name)
// need bot uuid and maker pubkey
// send bot_install to bot maker
// generate ChatMember with bot=true
// bot_maker_pubkey, bot_uuid, bot_prefix
function installBot(chatId, bot_json) {
return __awaiter(this, void 0, void 0, function* () {
const { uuid, owner_pubkey, unique_name, price_per_use } = bot_json;
const chatBot = {
chatId,
botPrefix: '/' + unique_name,
botType: constants.bot_types.remote,
botUuid: uuid,
botMakerPubkey: owner_pubkey,
pricePerUse: price_per_use
};
console.log("installBot INSTALL BOT NOW", chatBot);
keysendBotInstall(chatBot);
yield models_1.models.ChatBot.create(chatBot);
});
}
exports.installBot = installBot;
function sendBotInstall(_, b) {
function keysendBotInstall(b) {
return __awaiter(this, void 0, void 0, function* () {
return yield botKeysend(constants.message_types.bot_install, b.botUuid, b.botMakerPubkey, b.pricePerUse);
});
}
exports.sendBotInstall = sendBotInstall;
function sendBotCmd(msg, 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);
});
}
exports.sendBotCmd = sendBotCmd;
exports.keysendBotCmd = keysendBotCmd;
function receiveBotInstall(payload) {
return __awaiter(this, void 0, void 0, function* () {
console.log('=> receiveBotInstall');

2
dist/api/controllers/bots.js.map
View File

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

1
dist/api/controllers/chatTribes.js
View File

@ -210,6 +210,7 @@ function editTribe(req, res) {
unlisted,
is_private: req.body.private,
app_url,
deleted: false,
});
}
catch (e) {

2
dist/api/controllers/chatTribes.js.map
View File

File diff suppressed because one or more lines are too long

2
dist/api/network/intercept.js
View File

@ -73,7 +73,7 @@ function emitMessageToBot(msg, botInTribe) {
case constants.bot_types.local:
return postToBotServer(msg, botInTribe);
case constants.bot_types.remote:
return bots_2.sendBotCmd(msg, botInTribe);
return bots_2.keysendBotCmd(msg, botInTribe);
default:
return false;
}

2
dist/api/network/intercept.js.map
View File

@ -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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"}

27
dist/api/utils/tribes.js
View File

@ -121,7 +121,31 @@ function declare({ uuid, name, description, tags, img, group_key, host, price_pe
});
}
exports.declare = declare;
function edit({ uuid, host, name, description, tags, img, price_per_message, price_to_join, owner_alias, escrow_amount, escrow_millis, unlisted, is_private, app_url }) {
function declare_bot({ uuid, name, description, tags, img, price_per_use, owner_pubkey, unlisted, deleted }) {
return __awaiter(this, void 0, void 0, function* () {
const host = getHost();
try {
yield node_fetch_1.default('https://' + host + '/bots', {
method: 'POST',
body: JSON.stringify({
uuid, owner_pubkey,
name, description, tags, img: img || '',
price_per_use: price_per_use || 0,
unlisted: unlisted || false,
deleted: deleted || false,
}),
headers: { 'Content-Type': 'application/json' }
});
// const j = await r.json()
}
catch (e) {
console.log('[tribes] unauthorized to declare');
throw e;
}
});
}
exports.declare_bot = declare_bot;
function edit({ uuid, host, name, description, tags, img, price_per_message, price_to_join, owner_alias, escrow_amount, escrow_millis, unlisted, is_private, app_url, deleted }) {
return __awaiter(this, void 0, void 0, function* () {
try {
const token = yield genSignedTimestamp();
@ -137,6 +161,7 @@ function edit({ uuid, host, name, description, tags, img, price_per_message, pri
owner_alias,
unlisted: unlisted || false,
private: is_private || false,
deleted: deleted || false,
app_url: app_url || '',
}),
headers: { 'Content-Type': 'application/json' }

2
dist/api/utils/tribes.js.map
View File

File diff suppressed because one or more lines are too long
Write Preview
Loading…
Cancel
Save