pub tribe last_active to tribe server, broadcast action for testing github integration

api/controllers/actions.ts

@@ -2,8 +2,16 @@ import { success, failure } from '../utils/res'
 import * as path from 'path'
 import * as fs from 'fs'
 import * as network from '../network'
+import { models } from '../models'
+import * as short from 'short-uuid'
+import * as rsa from '../crypto/rsa'
+
+/*
+hexdump -n 16 -e '4/4 "%08X" 1 "\n"' /dev/random
+*/
 
 const actionFile = '../../../actions.json'
+const constants = require(path.join(__dirname,'../../config/constants.json'))
 
 export async function doAction(req, res) {
     const thePath = path.join(__dirname,actionFile)
@@ -24,7 +32,7 @@ async function processExtra(req, res) {
     if(!(actions&&actions.length)) {
         return failure(res, 'no actions defined')
     }
-    const {action,app,secret,pubkey,amount} = req.body
+    const {action,app,secret,pubkey,amount,chat_uuid,text} = req.body
     
     const theApp = actions.find(a=>a.app===app)
     if(!theApp) {
@@ -33,11 +41,14 @@ async function processExtra(req, res) {
     if(!(theApp.secret&&theApp.secret===secret)) {
         return failure(res, 'wrong secret')
     }
-    if(!(pubkey&&pubkey.length===66&&amount&&action)) {
-        return failure(res, 'wrong params')
+    if(!action){
+        return failure(res, 'no action')
     }
 
     if(action==='keysend') {
+        if(!(pubkey&&pubkey.length===66&&amount)) {
+            return failure(res, 'wrong params')
+        }
         const MIN_SATS = 3
         const destkey = pubkey
         const opts = {
@@ -51,6 +62,38 @@ async function processExtra(req, res) {
         } catch(e) {
             return failure(res, e)
         }
+    } else if (action==='broadcast') {
+        if(!chat_uuid || !text) return failure(res,'no uuid or text')
+        const owner = await models.Contact.findOne({ where: { isOwner: true } })
+        const theChat = await models.Chat.findOne({where:{uuid: chat_uuid}})
+        if(!theChat) return failure(res,'no chat')
+        if(!theChat.type===constants.chat_types.tribe) return failure(res,'not a tribe')
+        
+        const encryptedForMeText = rsa.encrypt(owner.contactKey, text)
+        const encryptedText = rsa.encrypt(theChat.groupKey, text)
+        const textMap = {'chat': encryptedText}
+        var date = new Date();
+	    date.setMilliseconds(0)
+        const msg:{[k:string]:any}={
+            chatId: theChat.id,
+            uuid: short.generate(),
+            type: constants.message_types.message,
+            sender: owner.id,
+            amount: amount||0,
+            date: date,
+            messageContent: encryptedForMeText,
+            remoteMessageContent: JSON.stringify(textMap),
+            status: constants.statuses.confirmed,
+            createdAt: date,
+            updatedAt: date,
+        }
+        const message = await models.Message.create(msg)
+        network.sendMessage({
+            chat: theChat,
+            sender: owner,
+            message: { content:textMap, id:message.id, uuid: message.uuid },
+            type: constants.message_types.message,
+        })
     } else {
         return failure(res, 'no action')
     }

api/network/send.ts

@@ -48,6 +48,8 @@ export async function sendMessage(params) {
 			networkType = 'mqtt' // broadcast to all
 			// decrypt message.content and message.mediaKey w groupKey
 			msg = await decryptMessage(msg, chat)
+			// post last_active to tribes server
+			tribes.putActivity(chat.uuid, chat.host)
 		} else {
 			// if tribe, send to owner only
 			const tribeOwner = await models.Contact.findOne({where: {publicKey:tribeOwnerPubKey}})

api/utils/tribes.ts

@@ -123,6 +123,19 @@ export async function edit({ uuid, host, name, description, tags, img, price_per
   }
 }
 
+export async function putActivity( uuid:string, host:string ) {
+  try {
+    const token = await genSignedTimestamp()
+    await fetch(`https://${host}/tribeactivity/${uuid}?token=` + token, {
+      method: 'PUT',
+      headers: { 'Content-Type': 'application/json' }
+    })
+  } catch(e) {
+    console.log('[tribes] unauthorized to putActivity')
+    throw e
+  }
+}
+
 export async function putstats({ uuid, host, member_count }) {
   try {
     const token = await genSignedTimestamp()

dist/api/controllers/actions.js

@@ -13,7 +13,14 @@ const res_1 = require("../utils/res");
 const path = require("path");
 const fs = require("fs");
 const network = require("../network");
+const models_1 = require("../models");
+const short = require("short-uuid");
+const rsa = require("../crypto/rsa");
+/*
+hexdump -n 16 -e '4/4 "%08X" 1 "\n"' /dev/random
+*/
 const actionFile = '../../../actions.json';
+const constants = require(path.join(__dirname, '../../config/constants.json'));
 function doAction(req, res) {
     return __awaiter(this, void 0, void 0, function* () {
         const thePath = path.join(__dirname, actionFile);
@@ -38,7 +45,7 @@ function processExtra(req, res) {
         if (!(actions && actions.length)) {
             return res_1.failure(res, 'no actions defined');
         }
-        const { action, app, secret, pubkey, amount } = req.body;
+        const { action, app, secret, pubkey, amount, chat_uuid, text } = req.body;
         const theApp = actions.find(a => a.app === app);
         if (!theApp) {
             return res_1.failure(res, 'app not found');
@@ -46,10 +53,13 @@ function processExtra(req, res) {
         if (!(theApp.secret && theApp.secret === secret)) {
             return res_1.failure(res, 'wrong secret');
         }
-        if (!(pubkey && pubkey.length === 66 && amount && action)) {
-            return res_1.failure(res, 'wrong params');
+        if (!action) {
+            return res_1.failure(res, 'no action');
         }
         if (action === 'keysend') {
+            if (!(pubkey && pubkey.length === 66 && amount)) {
+                return res_1.failure(res, 'wrong params');
+            }
             const MIN_SATS = 3;
             const destkey = pubkey;
             const opts = {
@@ -65,6 +75,41 @@ function processExtra(req, res) {
                 return res_1.failure(res, e);
             }
         }
+        else if (action === 'broadcast') {
+            if (!chat_uuid || !text)
+                return res_1.failure(res, 'no uuid or text');
+            const owner = yield models_1.models.Contact.findOne({ where: { isOwner: true } });
+            const theChat = yield models_1.models.Chat.findOne({ where: { uuid: chat_uuid } });
+            if (!theChat)
+                return res_1.failure(res, 'no chat');
+            if (!theChat.type === constants.chat_types.tribe)
+                return res_1.failure(res, 'not a tribe');
+            const encryptedForMeText = rsa.encrypt(owner.contactKey, text);
+            const encryptedText = rsa.encrypt(theChat.groupKey, text);
+            const textMap = { 'chat': encryptedText };
+            var date = new Date();
+            date.setMilliseconds(0);
+            const msg = {
+                chatId: theChat.id,
+                uuid: short.generate(),
+                type: constants.message_types.message,
+                sender: owner.id,
+                amount: amount || 0,
+                date: date,
+                messageContent: encryptedForMeText,
+                remoteMessageContent: JSON.stringify(textMap),
+                status: constants.statuses.confirmed,
+                createdAt: date,
+                updatedAt: date,
+            };
+            const message = yield models_1.models.Message.create(msg);
+            network.sendMessage({
+                chat: theChat,
+                sender: owner,
+                message: { content: textMap, id: message.id, uuid: message.uuid },
+                type: constants.message_types.message,
+            });
+        }
         else {
             return res_1.failure(res, 'no action');
         }

dist/api/controllers/actions.js.map

@@ -1 +1 @@
-{"version":3,"file":"actions.js","sourceRoot":"","sources":["../../../api/controllers/actions.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,sCAA+C;AAC/C,6BAA4B;AAC5B,yBAAwB;AACxB,sCAAqC;AAErC,MAAM,UAAU,GAAG,uBAAuB,CAAA;AAE1C,SAAsB,QAAQ,CAAC,GAAG,EAAE,GAAG;;QACnC,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAC,UAAU,CAAC,CAAA;QAC/C,IAAI;YACA,IAAI,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE;gBACxB,YAAY,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;aACzB;iBAAM;gBACH,aAAO,CAAC,GAAG,EAAE,SAAS,CAAC,CAAA;aAC1B;SACJ;QAAC,OAAM,GAAG,EAAE;YACT,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;YAClB,aAAO,CAAC,GAAG,EAAE,MAAM,CAAC,CAAA;SACvB;IACL,CAAC;CAAA;AAZD,4BAYC;AAED,SAAe,YAAY,CAAC,GAAG,EAAE,GAAG;;QAChC,MAAM,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAC,UAAU,CAAC,CAAC,CAAA;QACxD,IAAG,CAAC,CAAC,OAAO,IAAE,OAAO,CAAC,MAAM,CAAC,EAAE;YAC3B,OAAO,aAAO,CAAC,GAAG,EAAE,oBAAoB,CAAC,CAAA;SAC5C;QACD,MAAM,EAAC,MAAM,EAAC,GAAG,EAAC,MAAM,EAAC,MAAM,EAAC,MAAM,EAAC,GAAG,GAAG,CAAC,IAAI,CAAA;QAElD,MAAM,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAA,EAAE,CAAA,CAAC,CAAC,GAAG,KAAG,GAAG,CAAC,CAAA;QAC3C,IAAG,CAAC,MAAM,EAAE;YACR,OAAO,aAAO,CAAC,GAAG,EAAE,eAAe,CAAC,CAAA;SACvC;QACD,IAAG,CAAC,CAAC,MAAM,CAAC,MAAM,IAAE,MAAM,CAAC,MAAM,KAAG,MAAM,CAAC,EAAE;YACzC,OAAO,aAAO,CAAC,GAAG,EAAE,cAAc,CAAC,CAAA;SACtC;QACD,IAAG,CAAC,CAAC,MAAM,IAAE,MAAM,CAAC,MAAM,KAAG,EAAE,IAAE,MAAM,IAAE,MAAM,CAAC,EAAE;YAC9C,OAAO,aAAO,CAAC,GAAG,EAAE,cAAc,CAAC,CAAA;SACtC;QAED,IAAG,MAAM,KAAG,SAAS,EAAE;YACnB,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,IAAE,CAAC,CAAC,EAAE,QAAQ,CAAC;aACvC,CAAA;YACD,IAAI;gBACA,MAAM,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,CAAA;gBAC/B,OAAO,aAAO,CAAC,GAAG,EAAE,EAAC,OAAO,EAAC,IAAI,EAAC,CAAC,CAAA;aACtC;YAAC,OAAM,CAAC,EAAE;gBACP,OAAO,aAAO,CAAC,GAAG,EAAE,CAAC,CAAC,CAAA;aACzB;SACJ;aAAM;YACH,OAAO,aAAO,CAAC,GAAG,EAAE,WAAW,CAAC,CAAA;SACnC;IACL,CAAC;CAAA"}
+{"version":3,"file":"actions.js","sourceRoot":"","sources":["../../../api/controllers/actions.ts"],"names":[],"mappings":"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"}

dist/api/network/send.js

@@ -53,6 +53,8 @@ function sendMessage(params) {
                 networkType = 'mqtt'; // broadcast to all
                 // decrypt message.content and message.mediaKey w groupKey
                 msg = yield msg_1.decryptMessage(msg, chat);
+                // post last_active to tribes server
+                tribes.putActivity(chat.uuid, chat.host);
             }
             else {
                 // if tribe, send to owner only

dist/api/utils/tribes.js

@@ -146,6 +146,22 @@ function edit({ uuid, host, name, description, tags, img, price_per_message, pri
     });
 }
 exports.edit = edit;
+function putActivity(uuid, host) {
+    return __awaiter(this, void 0, void 0, function* () {
+        try {
+            const token = yield genSignedTimestamp();
+            yield fetch(`https://${host}/tribeactivity/${uuid}?token=` + token, {
+                method: 'PUT',
+                headers: { 'Content-Type': 'application/json' }
+            });
+        }
+        catch (e) {
+            console.log('[tribes] unauthorized to putActivity');
+            throw e;
+        }
+    });
+}
+exports.putActivity = putActivity;
 function putstats({ uuid, host, member_count }) {
     return __awaiter(this, void 0, void 0, function* () {
         try {