start network abstracter

api/controllers/chats.ts

@@ -2,6 +2,7 @@ import { models } from '../models'
 import * as jsonUtils from '../utils/json'
 import { success, failure } from '../utils/res'
 import * as helpers from '../helpers'
+import * as network from '../network'
 import * as socket from '../utils/socket'
 import { sendNotification } from '../hub'
 import * as md5 from 'md5'
@@ -36,6 +37,8 @@ async function mute(req, res) {
 	success(res, jsonUtils.chatToJson(chat))
 }
 
+// just add self here if tribes
+// or can u add contacts as members?
 async function createGroupChat(req, res) {
 	const {
 		name,
@@ -72,7 +75,7 @@ async function createGroupChat(req, res) {
 		chatParams = createGroupChatParams(owner, contact_ids, members, name)
 	}
 
-	helpers.sendMessage({
+	network.sendMessage({
 		chat: { ...chatParams, members },
 		sender: owner,
 		type: constants.message_types.group_create,
@@ -127,7 +130,7 @@ async function addGroupMembers(req, res) {
 
 	success(res, jsonUtils.chatToJson(chat))
 
-	helpers.sendMessage({ // send ONLY to new members
+	network.sendMessage({ // send ONLY to new members
 		chat: { ...chat.dataValues, contactIds:contact_ids, members },
 		sender: owner,
 		type: constants.message_types.group_invite,
@@ -140,7 +143,7 @@ const deleteChat = async (req, res) => {
 
 	const owner = await models.Contact.findOne({ where: { isOwner: true } })
 	const chat = await models.Chat.findOne({ where: { id } })
-	helpers.sendMessage({
+	network.sendMessage({
 		chat,
 		sender: owner,
 		message: {},
@@ -203,6 +206,7 @@ async function receiveGroupLeave(payload) {
 
 // here: can only join if enough $$$!
 // forward to all over mqtt
+// add to ChatMember table
 async function receiveGroupJoin(payload) {
 	console.log('=> receiveGroupJoin')
 	const { sender_pub_key, chat_uuid, chat_members } = await helpers.parseReceiveParams(payload)
@@ -337,7 +341,7 @@ async function receiveGroupCreateOrInvite(payload) {
 
 	if (payload.type === constants.message_types.group_invite) {
 		const owner = await models.Contact.findOne({ where: { isOwner: true } })
-		helpers.sendMessage({
+		network.sendMessage({
 			chat: {
 				...chat.dataValues, members: {
 					[owner.publicKey]: {

api/controllers/confirmations.ts

@@ -2,13 +2,13 @@ import lock from '../utils/lock'
 import {models} from '../models'
 import * as socket from '../utils/socket'
 import * as jsonUtils from '../utils/json'
-import * as helpers from '../helpers'
+import * as network from '../network'
 import * as path from 'path'
 
 const constants = require(path.join(__dirname,'../../config/constants.json'))
 
 export function sendConfirmation({ chat, sender, msg_id }) {
-	helpers.sendMessage({
+	network.sendMessage({
 		chat,
 		sender,
 		message: {id:msg_id},

api/controllers/invoices.ts

@@ -8,6 +8,7 @@ import { sendNotification } from '../hub'
 import { success } from '../utils/res'
 import {sendConfirmation} from './confirmations'
 import * as path from 'path'
+import * as network from '../network'
 
 const constants = require(path.join(__dirname,'../../config/constants.json'))
 
@@ -140,7 +141,7 @@ const createInvoice = async (req, res) => {
               })
               success(res, jsonUtils.messageToJson(message, chat))
 
-              helpers.sendMessage({
+              network.sendMessage({
                 chat: chat,
                 sender: owner,
                 type: constants.message_types.invoice,

api/controllers/media.ts

@@ -13,6 +13,7 @@ import * as zbase32 from '../utils/zbase32'
 import * as schemas from './schemas'
 import {sendConfirmation} from './confirmations'
 import * as path from 'path'
+import * as network from '../network'
 
 const env = process.env.NODE_ENV || 'development';
 const config = require(path.join(__dirname,'../../config/app.json'))[env]
@@ -115,7 +116,7 @@ const sendAttachmentMessage = async (req, res) => {
     mediaKey: media_key_map,
     mediaType: mediaType,
   }
-  helpers.sendMessage({
+  network.sendMessage({
     chat: chat,
     sender: owner,
     type: constants.message_types.attachment,
@@ -183,7 +184,7 @@ const purchase = async (req, res) => {
   const msg={
     amount, mediaToken:media_token, id:message.id,
   }
-  helpers.sendMessage({
+  network.sendMessage({
     chat: {...chat.dataValues, contactIds:[contact_id]},
     sender: owner,
     type: constants.message_types.purchase,
@@ -258,7 +259,7 @@ const receivePurchase = async (payload) => {
   }
 
   if (amount < price) { // didnt pay enough
-    return helpers.sendMessage({ // "purchase_deny"
+    return network.sendMessage({ // "purchase_deny"
       chat: {...chat.dataValues, contactIds:[sender.id]}, // only send back to sender
       sender: owner,
       amount: amount,
@@ -287,7 +288,7 @@ const receivePurchase = async (payload) => {
     meta: {amt:amount},
     pubkey: sender.publicKey,
   })
-  helpers.sendMessage({
+  network.sendMessage({
     chat: {...chat.dataValues, contactIds:[sender.id]}, // only to sender
     sender: owner,
     type: constants.message_types.purchase_accept,

api/controllers/messages.ts

@@ -8,6 +8,7 @@ import * as helpers from '../helpers'
 import { success } from '../utils/res'
 import {sendConfirmation} from './confirmations'
 import * as path from 'path'
+import * as network from '../network'
 
 const constants = require(path.join(__dirname,'../../config/constants.json'))
 
@@ -136,7 +137,7 @@ const sendMessage = async (req, res) => {
 
 	success(res, jsonUtils.messageToJson(message, chat))
 
-	helpers.sendMessage({
+	network.sendMessage({
 		chat: chat,
 		sender: owner,
 		type: constants.message_types.message,

api/controllers/payment.ts

@@ -7,6 +7,7 @@ import { success } from '../utils/res'
 import * as lightning from '../utils/lightning'
 import {tokenFromTerms} from '../utils/ldat'
 import * as constants from '../../config/constants.json'
+import * as network from '../network'
 
 const sendPayment = async (req, res) => {
   const {
@@ -95,7 +96,7 @@ const sendPayment = async (req, res) => {
     theChat = {...chat.dataValues, contactIds:contact_ids}
     if(remote_text_map) msgToSend.content = remote_text_map
   }
-  helpers.sendMessage({
+  network.sendMessage({
     chat: theChat,
     sender: owner,
     type: constants.message_types.direct_payment,

api/controllers/subscriptions.ts

@@ -9,6 +9,7 @@ import * as helpers from '../helpers'
 import * as rsa from '../crypto/rsa'
 import * as moment from 'moment'
 import * as path from 'path'
+import * as network from '../network'
 
 const constants = require(path.join(__dirname,'../../config/constants.json'))
 
@@ -121,7 +122,7 @@ async function sendSubscriptionPayment(sub, isFirstMessage) {
   const contact = await models.Contact.findByPk(sub.contactId)
   const enc = rsa.encrypt(contact.contactKey, text)
 
-  helpers.sendMessage({
+  network.sendMessage({
     chat: chat,
     sender: owner,
     type: constants.message_types.direct_payment,

api/helpers.ts

@@ -1,7 +1,6 @@
 import { models } from './models'
 import * as md5 from 'md5'
-import * as LND from './utils/lightning'
+import * as network from './network'
-import {personalizeMessage} from './utils/msg'
 
 const constants = require('../config/constants.json');
 
@@ -76,47 +75,6 @@ const sendContactKeys = async (args) => {
 	}
 }
 
-const sendMessage = async (params) => {
-	const { type, chat, message, sender, amount, success, failure } = params
-	const m = newmsg(type, chat, sender, message)
-
-	const contactIds = typeof chat.contactIds==='string' ? JSON.parse(chat.contactIds) : chat.contactIds
-
-	let yes:any = null
-	let no:any = null
-	console.log('all contactIds',contactIds)
-	await asyncForEach(contactIds, async contactId => {
-		if (contactId == sender.id) {
-			return
-		}
-
-		console.log('-> sending to contact #', contactId)
-
-		const contact = await models.Contact.findOne({ where: { id: contactId } })
-		const destkey = contact.publicKey
-
-		const finalMsg = await personalizeMessage(m, contactId, destkey)
-
-		const opts = {
-			dest: destkey,
-			data: JSON.stringify(finalMsg),
-			amt: amount || 3,
-		}
-		try {
-			const r = await LND.keysendMessage(opts)
-			yes = r
-		} catch (e) {
-			console.log("KEYSEND ERROR", e)
-			no = e
-		}
-	})
-	if(yes){
-		if(success) success(yes)
-	} else {
-		if(failure) failure(no)
-	}
-}
-
 const performKeysendMessage = async ({ destination_key, amount, msg, success, failure }) => {
 	const opts = {
 		dest: destination_key,
@@ -124,7 +82,7 @@ const performKeysendMessage = async ({ destination_key, amount, msg, success, fa
 		amt: Math.max(amount, 3)
 	}
 	try {
-		const r = await LND.keysendMessage(opts)
+		const r = await network.signAndSend(opts)
 		console.log("=> external keysend")
 		if (success) success(r)
 	} catch (e) {
@@ -206,7 +164,6 @@ async function parseReceiveParams(payload) {
 
 export {
 	findOrCreateChat,
-	sendMessage,
 	sendContactKeys,
 	findOrCreateContactByPubkey,
 	findOrCreateChatByUUID,
@@ -221,25 +178,6 @@ async function asyncForEach(array, callback) {
 	}
 }
 
-function newmsg(type, chat, sender, message){
-	return {
-		type: type,
-		chat: {
-			uuid: chat.uuid,
-			...chat.name && { name: chat.name },
-			...chat.type && { type: chat.type },
-			...chat.members && { members: chat.members },
-			...chat.groupKey && { groupKey: chat.groupKey },
-			...chat.host && { host: chat.host }
-		},
-		message: message,
-		// sender: {
-		// 	pub_key: sender.publicKey,
-		// 	// ...sender.contactKey && {contact_key: sender.contactKey}
-		// }
-	}
-}
-
 function newkeyexchangemsg(type, sender){
 	return {
 		type: type,

api/network.ts

@@ -0,0 +1,93 @@
+import { models } from './models'
+import * as LND from './utils/lightning'
+import {personalizeMessage} from './utils/msg'
+
+// const constants = require('../config/constants.json');
+
+/*
+Abstracts between lightning network and MQTT depending on Chat type and sender
+*/
+
+export function signAndSend(opts){
+	return new Promise(async function(resolve, reject) {
+		if(!opts.data || typeof opts.data!=='object') {
+			return reject('object plz')
+		}
+		let data = JSON.stringify(opts.data)
+		// SIGN HERE and append sig
+		const sig = await LND.signAscii(data)
+		data = data + sig
+
+		// if tribe 
+			// if owner pub to mqtt
+			// else keysend to owner ONLY
+		// else:
+		LND.keysendMessage({...opts,data})
+	})
+}
+
+export async function sendMessage(params) {
+	const { type, chat, message, sender, amount, success, failure } = params
+	const m = newmsg(type, chat, sender, message)
+
+	const contactIds = typeof chat.contactIds==='string' ? JSON.parse(chat.contactIds) : chat.contactIds
+
+	let yes:any = null
+	let no:any = null
+	console.log('all contactIds',contactIds)
+	await asyncForEach(contactIds, async contactId => {
+		if (contactId == sender.id) {
+			return
+		}
+
+		console.log('-> sending to contact #', contactId)
+
+		const contact = await models.Contact.findOne({ where: { id: contactId } })
+		const destkey = contact.publicKey
+
+		const finalMsg = await personalizeMessage(m, contactId, destkey)
+
+		const opts = {
+			dest: destkey,
+			data: finalMsg,
+			amt: Math.max(amount, 3)
+		}
+		try {
+			const r = await signAndSend(opts)
+			yes = r
+		} catch (e) {
+			console.log("KEYSEND ERROR", e)
+			no = e
+		}
+	})
+	if(yes){
+		if(success) success(yes)
+	} else {
+		if(failure) failure(no)
+	}
+}
+
+function newmsg(type, chat, sender, message){
+	return {
+		type: type,
+		chat: {
+			uuid: chat.uuid,
+			...chat.name && { name: chat.name },
+			...chat.type && { type: chat.type },
+			...chat.members && { members: chat.members },
+			...chat.groupKey && { groupKey: chat.groupKey },
+			...chat.host && { host: chat.host }
+		},
+		message: message,
+		// sender: {
+		// 	pub_key: sender.publicKey,
+		// 	// ...sender.contactKey && {contact_key: sender.contactKey}
+		// }
+	}
+}
+
+async function asyncForEach(array, callback) {
+	for (let index = 0; index < array.length; index++) {
+	  	await callback(array[index], index, array);
+	}
+}

api/utils/lightning.ts

@@ -141,9 +141,6 @@ async function keysendMessage(opts) {
     if(!opts.data || typeof opts.data!=='string') {
       return reject('string plz')
     }
-    // SIGN HERE and append sig
-    const sig = await signAscii(opts.data)
-    opts.data = opts.data + sig
 
     if(opts.data.length<MAX_MSG_LENGTH){
       try {

api/utils/msg.ts

@@ -18,6 +18,17 @@ function removeRecipientFromChatMembers(full:{[k:string]:any}, destkey){
 	return fillchatmsg(full, {members})
 }
 
+function removeAllNonAdminMembersIfTribe(full:{[k:string]:any}, destkey){
+	return full
+	// const c = full && full.chat
+	// if (!(c && c.members)) return full
+	// if (!(typeof c.members==='object')) return full
+
+    // const members = {...c.members}
+	// if(members[destkey]) delete members[destkey]
+	// return fillchatmsg(full, {members})
+}
+
 function addInMediaKey(full:{[k:string]:any}, contactId){
 	const m = full && full.message
 	if (!(m && m.mediaKey)) return full
@@ -53,7 +64,8 @@ async function personalizeMessage(m,contactId,destkey){
 	const cloned = JSON.parse(JSON.stringify(m))
 	const msg = addInRemoteText(cloned, contactId)
 	const cleanMsg = removeRecipientFromChatMembers(msg, destkey)
-	const msgWithMediaKey = addInMediaKey(cleanMsg, contactId)
+	const cleanerMsg = removeAllNonAdminMembersIfTribe(msg, destkey)
+	const msgWithMediaKey = addInMediaKey(cleanerMsg, contactId)
 	const finalMsg = await finishTermsAndReceipt(msgWithMediaKey, destkey)
     return finalMsg
 }

api/utils/tribes.ts

@@ -20,12 +20,12 @@ export async function connect() {
     })
 
     client.on('connect', function () {
-        console.log("MQTT CLIENT CONNECTED!")
+        console.log("[tribes] connected!")
         // subscribe to all public groups here
         // that you are NOT admin of (dont sub to your own!)
     })
     client.on('close', function () {
-        console.log("MQTT CLOSED")
+        //console.log("MQTT CLOSED")
     })
 }
 

app.ts

@@ -29,7 +29,7 @@ async function connectToLND(){
 	console.log(`=> [lnd] connecting... attempt #${i}`)
 	try {
 		await controllers.iniGrpcSubscriptions()
-		mainSetup()
+		await mainSetup()
 		tribes.connect()
 	} catch(e) {
 		setTimeout(async()=>{ // retry each 2 secs

dist/api/controllers/chats.js

@@ -13,6 +13,7 @@ const models_1 = require("../models");
 const jsonUtils = require("../utils/json");
 const res_1 = require("../utils/res");
 const helpers = require("../helpers");
+const network = require("../network");
 const socket = require("../utils/socket");
 const hub_1 = require("../hub");
 const md5 = require("md5");
@@ -44,6 +45,8 @@ function mute(req, res) {
     });
 }
 exports.mute = mute;
+// just add self here if tribes
+// or can u add contacts as members?
 function createGroupChat(req, res) {
     return __awaiter(this, void 0, void 0, function* () {
         const { name, contact_ids, is_tribe, is_listed, } = req.body;
@@ -71,7 +74,7 @@ function createGroupChat(req, res) {
         else {
             chatParams = createGroupChatParams(owner, contact_ids, members, name);
         }
-        helpers.sendMessage({
+        network.sendMessage({
             chat: Object.assign(Object.assign({}, chatParams), { members }),
             sender: owner,
             type: constants.message_types.group_create,
@@ -126,7 +129,7 @@ function addGroupMembers(req, res) {
             }
         }));
         res_1.success(res, jsonUtils.chatToJson(chat));
-        helpers.sendMessage({
+        network.sendMessage({
             chat: Object.assign(Object.assign({}, chat.dataValues), { contactIds: contact_ids, members }),
             sender: owner,
             type: constants.message_types.group_invite,
@@ -139,7 +142,7 @@ const deleteChat = (req, res) => __awaiter(void 0, void 0, void 0, function* ()
     const { id } = req.params;
     const owner = yield models_1.models.Contact.findOne({ where: { isOwner: true } });
     const chat = yield models_1.models.Chat.findOne({ where: { id } });
-    helpers.sendMessage({
+    network.sendMessage({
         chat,
         sender: owner,
         message: {},
@@ -198,6 +201,7 @@ function receiveGroupLeave(payload) {
 exports.receiveGroupLeave = receiveGroupLeave;
 // here: can only join if enough $$$!
 // forward to all over mqtt
+// add to ChatMember table
 function receiveGroupJoin(payload) {
     return __awaiter(this, void 0, void 0, function* () {
         console.log('=> receiveGroupJoin');
@@ -325,7 +329,7 @@ function receiveGroupCreateOrInvite(payload) {
         hub_1.sendNotification(chat, chat_name, 'group');
         if (payload.type === constants.message_types.group_invite) {
             const owner = yield models_1.models.Contact.findOne({ where: { isOwner: true } });
-            helpers.sendMessage({
+            network.sendMessage({
                 chat: Object.assign(Object.assign({}, chat.dataValues), { members: {
                         [owner.publicKey]: {
                             key: owner.contactKey,

dist/api/controllers/confirmations.js

@@ -13,11 +13,11 @@ const lock_1 = require("../utils/lock");
 const models_1 = require("../models");
 const socket = require("../utils/socket");
 const jsonUtils = require("../utils/json");
-const helpers = require("../helpers");
+const network = require("../network");
 const path = require("path");
 const constants = require(path.join(__dirname, '../../config/constants.json'));
 function sendConfirmation({ chat, sender, msg_id }) {
-    helpers.sendMessage({
+    network.sendMessage({
         chat,
         sender,
         message: { id: msg_id },

dist/api/controllers/invoices.js

@@ -19,6 +19,7 @@ const hub_1 = require("../hub");
 const res_1 = require("../utils/res");
 const confirmations_1 = require("./confirmations");
 const path = require("path");
+const network = require("../network");
 const constants = require(path.join(__dirname, '../../config/constants.json'));
 const payInvoice = (req, res) => __awaiter(void 0, void 0, void 0, function* () {
     const lightning = yield lightning_1.loadLightning();
@@ -125,7 +126,7 @@ const createInvoice = (req, res) => __awaiter(void 0, void 0, void 0, function*
                                 updatedAt: new Date(timestamp)
                             });
                             res_1.success(res, jsonUtils.messageToJson(message, chat));
-                            helpers.sendMessage({
+                            network.sendMessage({
                                 chat: chat,
                                 sender: owner,
                                 type: constants.message_types.invoice,

dist/api/controllers/media.js

@@ -24,6 +24,7 @@ const zbase32 = require("../utils/zbase32");
 const schemas = require("./schemas");
 const confirmations_1 = require("./confirmations");
 const path = require("path");
+const network = require("../network");
 const env = process.env.NODE_ENV || 'development';
 const config = require(path.join(__dirname, '../../config/app.json'))[env];
 const constants = require(path.join(__dirname, '../../config/constants.json'));
@@ -103,7 +104,7 @@ const sendAttachmentMessage = (req, res) => __awaiter(void 0, void 0, void 0, fu
         mediaKey: media_key_map,
         mediaType: mediaType,
     };
-    helpers.sendMessage({
+    network.sendMessage({
         chat: chat,
         sender: owner,
         type: constants.message_types.attachment,
@@ -162,7 +163,7 @@ const purchase = (req, res) => __awaiter(void 0, void 0, void 0, function* () {
     const msg = {
         amount, mediaToken: media_token, id: message.id,
     };
-    helpers.sendMessage({
+    network.sendMessage({
         chat: Object.assign(Object.assign({}, chat.dataValues), { contactIds: [contact_id] }),
         sender: owner,
         type: constants.message_types.purchase,
@@ -230,7 +231,7 @@ const receivePurchase = (payload) => __awaiter(void 0, void 0, void 0, function*
             price = 0;
     }
     if (amount < price) { // didnt pay enough
-        return helpers.sendMessage({
+        return network.sendMessage({
             chat: Object.assign(Object.assign({}, chat.dataValues), { contactIds: [sender.id] }),
             sender: owner,
             amount: amount,
@@ -258,7 +259,7 @@ const receivePurchase = (payload) => __awaiter(void 0, void 0, void 0, function*
         meta: { amt: amount },
         pubkey: sender.publicKey,
     });
-    helpers.sendMessage({
+    network.sendMessage({
         chat: Object.assign(Object.assign({}, chat.dataValues), { contactIds: [sender.id] }),
         sender: owner,
         type: constants.message_types.purchase_accept,

dist/api/controllers/messages.js

@@ -19,6 +19,7 @@ const helpers = require("../helpers");
 const res_1 = require("../utils/res");
 const confirmations_1 = require("./confirmations");
 const path = require("path");
+const network = require("../network");
 const constants = require(path.join(__dirname, '../../config/constants.json'));
 const getMessages = (req, res) => __awaiter(void 0, void 0, void 0, function* () {
     const dateToReturn = req.query.date;
@@ -121,7 +122,7 @@ const sendMessage = (req, res) => __awaiter(void 0, void 0, void 0, function* ()
     // console.log(msg)
     const message = yield models_1.models.Message.create(msg);
     res_1.success(res, jsonUtils.messageToJson(message, chat));
-    helpers.sendMessage({
+    network.sendMessage({
         chat: chat,
         sender: owner,
         type: constants.message_types.message,

dist/api/controllers/payment.js

@@ -18,6 +18,7 @@ const res_1 = require("../utils/res");
 const lightning = require("../utils/lightning");
 const ldat_1 = require("../utils/ldat");
 const constants = require("../../config/constants.json");
+const network = require("../network");
 const sendPayment = (req, res) => __awaiter(void 0, void 0, void 0, function* () {
     const { amount, chat_id, contact_id, destination_key, media_type, muid, text, remote_text, dimensions, remote_text_map, contact_ids, } = req.body;
     console.log('[send payment]', req.body);
@@ -87,7 +88,7 @@ const sendPayment = (req, res) => __awaiter(void 0, void 0, void 0, function* ()
         if (remote_text_map)
             msgToSend.content = remote_text_map;
     }
-    helpers.sendMessage({
+    network.sendMessage({
         chat: theChat,
         sender: owner,
         type: constants.message_types.direct_payment,

dist/api/controllers/subscriptions.js

@@ -20,6 +20,7 @@ const helpers = require("../helpers");
 const rsa = require("../crypto/rsa");
 const moment = require("moment");
 const path = require("path");
+const network = require("../network");
 const constants = require(path.join(__dirname, '../../config/constants.json'));
 // store all current running jobs in memory
 let jobs = {};
@@ -126,7 +127,7 @@ function sendSubscriptionPayment(sub, isFirstMessage) {
         const text = msgForSubPayment(owner, sub, isFirstMessage, forMe);
         const contact = yield models_1.models.Contact.findByPk(sub.contactId);
         const enc = rsa.encrypt(contact.contactKey, text);
-        helpers.sendMessage({
+        network.sendMessage({
             chat: chat,
             sender: owner,
             type: constants.message_types.direct_payment,

dist/api/helpers.js

@@ -11,8 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 const models_1 = require("./models");
 const md5 = require("md5");
-const LND = require("./utils/lightning");
+const network = require("./network");
-const msg_1 = require("./utils/msg");
 const constants = require('../config/constants.json');
 const findOrCreateChat = (params) => __awaiter(void 0, void 0, void 0, function* () {
     const { chat_id, owner_id, recipient_id } = params;
@@ -83,45 +82,6 @@ const sendContactKeys = (args) => __awaiter(void 0, void 0, void 0, function* ()
     }
 });
 exports.sendContactKeys = sendContactKeys;
-const sendMessage = (params) => __awaiter(void 0, void 0, void 0, function* () {
-    const { type, chat, message, sender, amount, success, failure } = params;
-    const m = newmsg(type, chat, sender, message);
-    const contactIds = typeof chat.contactIds === 'string' ? JSON.parse(chat.contactIds) : chat.contactIds;
-    let yes = null;
-    let no = null;
-    console.log('all contactIds', contactIds);
-    yield asyncForEach(contactIds, (contactId) => __awaiter(void 0, void 0, void 0, function* () {
-        if (contactId == sender.id) {
-            return;
-        }
-        console.log('-> sending to contact #', contactId);
-        const contact = yield models_1.models.Contact.findOne({ where: { id: contactId } });
-        const destkey = contact.publicKey;
-        const finalMsg = yield msg_1.personalizeMessage(m, contactId, destkey);
-        const opts = {
-            dest: destkey,
-            data: JSON.stringify(finalMsg),
-            amt: amount || 3,
-        };
-        try {
-            const r = yield LND.keysendMessage(opts);
-            yes = r;
-        }
-        catch (e) {
-            console.log("KEYSEND ERROR", e);
-            no = e;
-        }
-    }));
-    if (yes) {
-        if (success)
-            success(yes);
-    }
-    else {
-        if (failure)
-            failure(no);
-    }
-});
-exports.sendMessage = sendMessage;
 const performKeysendMessage = ({ destination_key, amount, msg, success, failure }) => __awaiter(void 0, void 0, void 0, function* () {
     const opts = {
         dest: destination_key,
@@ -129,7 +89,7 @@ const performKeysendMessage = ({ destination_key, amount, msg, success, failure
         amt: Math.max(amount, 3)
     };
     try {
-        const r = yield LND.keysendMessage(opts);
+        const r = yield network.signAndSend(opts);
         console.log("=> external keysend");
         if (success)
             success(r);
@@ -224,13 +184,6 @@ function asyncForEach(array, callback) {
         }
     });
 }
-function newmsg(type, chat, sender, message) {
-    return {
-        type: type,
-        chat: Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ uuid: chat.uuid }, chat.name && { name: chat.name }), chat.type && { type: chat.type }), chat.members && { members: chat.members }), chat.groupKey && { groupKey: chat.groupKey }), chat.host && { host: chat.host }),
-        message: message,
-    };
-}
 function newkeyexchangemsg(type, sender) {
     return {
         type: type,

dist/api/network.js

@@ -0,0 +1,88 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const models_1 = require("./models");
+const LND = require("./utils/lightning");
+const msg_1 = require("./utils/msg");
+// const constants = require('../config/constants.json');
+/*
+Abstracts between lightning network and MQTT depending on Chat type and sender
+*/
+function signAndSend(opts) {
+    return new Promise(function (resolve, reject) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!opts.data || typeof opts.data !== 'string') {
+                return reject('string plz');
+            }
+            // SIGN HERE and append sig
+            const sig = yield LND.signAscii(opts.data);
+            opts.data = opts.data + sig;
+            LND.keysendMessage(opts);
+        });
+    });
+}
+exports.signAndSend = signAndSend;
+function sendMessage(params) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const { type, chat, message, sender, amount, success, failure } = params;
+        const m = newmsg(type, chat, sender, message);
+        const contactIds = typeof chat.contactIds === 'string' ? JSON.parse(chat.contactIds) : chat.contactIds;
+        let yes = null;
+        let no = null;
+        console.log('all contactIds', contactIds);
+        yield asyncForEach(contactIds, (contactId) => __awaiter(this, void 0, void 0, function* () {
+            if (contactId == sender.id) {
+                return;
+            }
+            console.log('-> sending to contact #', contactId);
+            const contact = yield models_1.models.Contact.findOne({ where: { id: contactId } });
+            const destkey = contact.publicKey;
+            const finalMsg = yield msg_1.personalizeMessage(m, contactId, destkey);
+            const opts = {
+                dest: destkey,
+                data: JSON.stringify(finalMsg),
+                amt: amount || 3,
+            };
+            try {
+                const r = yield signAndSend(opts);
+                yes = r;
+            }
+            catch (e) {
+                console.log("KEYSEND ERROR", e);
+                no = e;
+            }
+        }));
+        if (yes) {
+            if (success)
+                success(yes);
+        }
+        else {
+            if (failure)
+                failure(no);
+        }
+    });
+}
+exports.sendMessage = sendMessage;
+function newmsg(type, chat, sender, message) {
+    return {
+        type: type,
+        chat: Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ uuid: chat.uuid }, chat.name && { name: chat.name }), chat.type && { type: chat.type }), chat.members && { members: chat.members }), chat.groupKey && { groupKey: chat.groupKey }), chat.host && { host: chat.host }),
+        message: message,
+    };
+}
+function asyncForEach(array, callback) {
+    return __awaiter(this, void 0, void 0, function* () {
+        for (let index = 0; index < array.length; index++) {
+            yield callback(array[index], index, array);
+        }
+    });
+}
+//# sourceMappingURL=network.js.map

dist/api/network.js.map

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

dist/api/utils/lightning.js

@@ -154,9 +154,6 @@ function keysendMessage(opts) {
                 if (!opts.data || typeof opts.data !== 'string') {
                     return reject('string plz');
                 }
-                // SIGN HERE and append sig
-                const sig = yield signAscii(opts.data);
-                opts.data = opts.data + sig;
                 if (opts.data.length < MAX_MSG_LENGTH) {
                     try {
                         const res = yield keysend(opts);

dist/api/utils/tribes.js

@@ -26,12 +26,12 @@ function connect() {
             password: pwd,
         });
         client.on('connect', function () {
-            console.log("MQTT CLIENT CONNECTED!");
+            console.log("[tribes] connected!");
             // subscribe to all public groups here
             // that you are NOT admin of (dont sub to your own!)
         });
         client.on('close', function () {
-            console.log("MQTT CLOSED");
+            //console.log("MQTT CLOSED")
         });
     });
 }

dist/api/utils/tribes.js.map

@@ -1 +1 @@
-{"version":3,"file":"tribes.js","sourceRoot":"","sources":["../../../api/utils/tribes.ts"],"names":[],"mappings":";;;;;;;;;;;AACA,iCAAgC;AAChC,qCAAoC;AACpC,mCAAkC;AAClC,6BAA4B;AAC5B,6BAA4B;AAE5B,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,aAAa,CAAA;AACjD,MAAM,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAC,uBAAuB,CAAC,CAAC,CAAC,GAAG,CAAC,CAAA;AAEzE,SAAsB,OAAO;;QACzB,MAAM,GAAG,GAAG,MAAM,kBAAkB,EAAE,CAAA;QACtC,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,OAAO,EAAE,CAAA;QAEhC,OAAO,CAAC,GAAG,CAAC,4BAA4B,EAAC,SAAS,MAAM,CAAC,WAAW,EAAE,CAAC,CAAA;QAEvE,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,MAAM,CAAC,WAAW,EAAE,EAAC;YACtD,QAAQ,EAAC,IAAI,CAAC,eAAe;YAC7B,QAAQ,EAAC,GAAG;SACf,CAAC,CAAA;QAEF,MAAM,CAAC,EAAE,CAAC,SAAS,EAAE;YACjB,OAAO,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAA;YACrC,sCAAsC;YACtC,oDAAoD;QACxD,CAAC,CAAC,CAAA;QACF,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE;YACf,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAA;QAC9B,CAAC,CAAC,CAAA;IACN,CAAC;CAAA;AAnBD,0BAmBC;AAED,SAAsB,kBAAkB;;QACpC,MAAM,GAAG,GAAG,MAAM,EAAE,CAAC,IAAI,EAAE,CAAA;QAC3B,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE,KAAK,CAAC,CAAA;QACpD,MAAM,GAAG,GAAG,MAAM,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,CAAA;QACzC,MAAM,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;QACpC,MAAM,WAAW,GAAG,OAAO,CAAC,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAA;QACpD,MAAM,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,QAAQ,CAAC,EAAE,WAAW,CAAC,CAAA;QAC3D,OAAO,SAAS,CAAC,GAAG,CAAC,CAAA;IACzB,CAAC;CAAA;AARD,gDAQC;AAED,SAAsB,qBAAqB,CAAC,SAAS;;QACjD,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAA;QAC/C,MAAM,GAAG,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC,EAAC,EAAE,CAAC,CAAA;QACjC,MAAM,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;QACtC,MAAM,CAAC,GAAG,MAAM,GAAG,CAAC,WAAW,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,EAAC,CAAC,CAAC,EAAE,UAAU,CAAC,CAAA,CAAC,6BAA6B;QAC/F,IAAI,CAAC,CAAC,KAAK,EAAE;YACT,OAAO,CAAC,CAAC,MAAM,CAAA;SAClB;aAAM;YACH,OAAO,KAAK,CAAA;SACf;IACL,CAAC;CAAA;AAVD,sDAUC;AAED,SAAgB,OAAO;IACnB,OAAO,MAAM,CAAC,WAAW,IAAI,EAAE,CAAA;AACnC,CAAC;AAFD,0BAEC;AAED,SAAS,SAAS,CAAC,GAAG;IAClB,OAAO,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAA;AACzE,CAAC"}
+{"version":3,"file":"tribes.js","sourceRoot":"","sources":["../../../api/utils/tribes.ts"],"names":[],"mappings":";;;;;;;;;;;AACA,iCAAgC;AAChC,qCAAoC;AACpC,mCAAkC;AAClC,6BAA4B;AAC5B,6BAA4B;AAE5B,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,aAAa,CAAA;AACjD,MAAM,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAC,uBAAuB,CAAC,CAAC,CAAC,GAAG,CAAC,CAAA;AAEzE,SAAsB,OAAO;;QACzB,MAAM,GAAG,GAAG,MAAM,kBAAkB,EAAE,CAAA;QACtC,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,OAAO,EAAE,CAAA;QAEhC,OAAO,CAAC,GAAG,CAAC,4BAA4B,EAAC,SAAS,MAAM,CAAC,WAAW,EAAE,CAAC,CAAA;QAEvE,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,MAAM,CAAC,WAAW,EAAE,EAAC;YACtD,QAAQ,EAAC,IAAI,CAAC,eAAe;YAC7B,QAAQ,EAAC,GAAG;SACf,CAAC,CAAA;QAEF,MAAM,CAAC,EAAE,CAAC,SAAS,EAAE;YACjB,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAA;YAClC,sCAAsC;YACtC,oDAAoD;QACxD,CAAC,CAAC,CAAA;QACF,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE;YACf,4BAA4B;QAChC,CAAC,CAAC,CAAA;IACN,CAAC;CAAA;AAnBD,0BAmBC;AAED,SAAsB,kBAAkB;;QACpC,MAAM,GAAG,GAAG,MAAM,EAAE,CAAC,IAAI,EAAE,CAAA;QAC3B,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE,KAAK,CAAC,CAAA;QACpD,MAAM,GAAG,GAAG,MAAM,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,CAAA;QACzC,MAAM,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;QACpC,MAAM,WAAW,GAAG,OAAO,CAAC,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAA;QACpD,MAAM,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,QAAQ,CAAC,EAAE,WAAW,CAAC,CAAA;QAC3D,OAAO,SAAS,CAAC,GAAG,CAAC,CAAA;IACzB,CAAC;CAAA;AARD,gDAQC;AAED,SAAsB,qBAAqB,CAAC,SAAS;;QACjD,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAA;QAC/C,MAAM,GAAG,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC,EAAC,EAAE,CAAC,CAAA;QACjC,MAAM,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;QACtC,MAAM,CAAC,GAAG,MAAM,GAAG,CAAC,WAAW,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,EAAC,CAAC,CAAC,EAAE,UAAU,CAAC,CAAA,CAAC,6BAA6B;QAC/F,IAAI,CAAC,CAAC,KAAK,EAAE;YACT,OAAO,CAAC,CAAC,MAAM,CAAA;SAClB;aAAM;YACH,OAAO,KAAK,CAAA;SACf;IACL,CAAC;CAAA;AAVD,sDAUC;AAED,SAAgB,OAAO;IACnB,OAAO,MAAM,CAAC,WAAW,IAAI,EAAE,CAAA;AACnC,CAAC;AAFD,0BAEC;AAED,SAAS,SAAS,CAAC,GAAG;IAClB,OAAO,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAA;AACzE,CAAC"}

dist/app.js

@@ -36,7 +36,7 @@ function connectToLND() {
         console.log(`=> [lnd] connecting... attempt #${i}`);
         try {
             yield controllers.iniGrpcSubscriptions();
-            mainSetup();
+            yield mainSetup();
             tribes.connect();
         }
         catch (e) {

dist/app.js.map

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