logz

api/controllers/subscriptions.ts

@@ -322,7 +322,7 @@ export async function createSubscription(req, res) {
 };
 
 export async function editSubscription(req, res) {
-  console.log('======> editSubscription')
+  console.log('=> editSubscription')
   const date = new Date()
   date.setMilliseconds(0)
   const id = parseInt(req.params.id)

api/network/modify.ts

@@ -26,6 +26,7 @@ export async function modifyPayloadAndSaveMediaKey(payload, chat, sender) {
 
 // "purchase" type
 export async function purchaseFromOriginalSender(payload, chat, purchaser){
+  console.log('==> purchaseFromOriginalSender',payload)
   if(payload.type!==msgtypes.purchase) return
 
   const mt = payload.message && payload.message.mediaToken
@@ -34,6 +35,7 @@ export async function purchaseFromOriginalSender(payload, chat, purchaser){
   if(!muid) return
 
   const mediaKey = await models.MediaKey.findOne({where:{originalMuid:muid}})
+  console.log("==> mediakey found",mediaKey.dataValues)
 
   const terms = parseLDAT(mt)
   let price = terms.meta && terms.meta.amt
@@ -63,6 +65,7 @@ export async function purchaseFromOriginalSender(payload, chat, purchaser){
       failure: ()=>{}
     })
     // PAY THE OG POSTER HERE!!!
+    console.log('==> pay to og poster here!')
     sendMessage({
       chat: {...chat.dataValues, contactIds:[mediaKey.sender]},
       sender: owner,
@@ -79,6 +82,7 @@ export async function purchaseFromOriginalSender(payload, chat, purchaser){
     const ogmsg = await models.Message.findOne({where:{chatId:chat.id,mediaToken:mt}})
     if(!ogmsg) return
     // purchase it from creator (send "purchase")
+    console.log('==> purchase from creator')
     const msg={mediaToken:mt,purchaser:purchaser.id}
     sendMessage({
       chat: {...chat.dataValues, contactIds:[ogmsg.sender]},

api/network/receive.ts

@@ -34,7 +34,7 @@ export const typesToReplay=[ // should match typesToForward
 	msgtypes.message, msgtypes.group_join, msgtypes.group_leave
 ]
 async function onReceive(payload){
-	// console.log("=> ON RECEIVE",payload)
+	console.log("==> ON RECEIVE",payload)
 	// if tribe, owner must forward to MQTT
 	let doAction = true
 	const toAddIn:{[k:string]:any} = {}
@@ -98,6 +98,7 @@ async function onReceive(payload){
 		else console.log('=> insufficient payment for this action')
 	}
 	if(isTribeOwner && payload.type===msgtypes.purchase) {
+		console.log('==> is purchase, i am trbie owner')
 		const mt = payload.message.mediaToken
 		const host = mt && mt.split('.').length && mt.split('.')[0]
 		const muid = mt && mt.split('.').length && mt.split('.')[1]
@@ -106,6 +107,7 @@ async function onReceive(payload){
 			type:msgtypes.attachment, sender:1,
 		}})
 		if(!myAttachmentMessage) { // someone else's attachment
+			console.log("==> someone else's attachment, purchase it")
 			const senderContact = await models.Contact.findOne({where:{publicKey:payload.sender.pub_key}})
 			purchaseFromOriginalSender(payload, chat, senderContact)
 			doAction = false
@@ -187,7 +189,6 @@ export async function initTribesSubscriptions(){
 	tribes.connect(async(topic, message)=>{ // onMessage callback
 		try{
 			const msg = message.toString()
-			// console.log("=====> msg received! TOPIC", topic, "MESSAGE", msg)
 			// check topic is signed by sender?
 			const payload = await parseAndVerifyPayload(msg)
 			onReceive(payload)

dist/api/controllers/chatTribes.js

@@ -150,7 +150,7 @@ function receiveMemberRequest(payload) {
         }
         if (!theSender)
             return console.log('no sender'); // fail (no contact key?)
-        models_1.models.ChatMember.upsert({
+        yield models_1.models.ChatMember.upsert({
             contactId: theSender.id,
             chatId: chat.id,
             role: constants.chat_roles.reader,

dist/api/controllers/subscriptions.js

@@ -347,7 +347,7 @@ exports.createSubscription = createSubscription;
 ;
 function editSubscription(req, res) {
     return __awaiter(this, void 0, void 0, function* () {
-        console.log('======> editSubscription');
+        console.log('=> editSubscription');
         const date = new Date();
         date.setMilliseconds(0);
         const id = parseInt(req.params.id);

dist/api/network/modify.js

@@ -40,6 +40,7 @@ exports.modifyPayloadAndSaveMediaKey = modifyPayloadAndSaveMediaKey;
 // "purchase" type
 function purchaseFromOriginalSender(payload, chat, purchaser) {
     return __awaiter(this, void 0, void 0, function* () {
+        console.log('==> purchaseFromOriginalSender', payload);
         if (payload.type !== msgtypes.purchase)
             return;
         const mt = payload.message && payload.message.mediaToken;
@@ -48,6 +49,7 @@ function purchaseFromOriginalSender(payload, chat, purchaser) {
         if (!muid)
             return;
         const mediaKey = yield models_1.models.MediaKey.findOne({ where: { originalMuid: muid } });
+        console.log("==> mediakey found", mediaKey.dataValues);
         const terms = ldat_1.parseLDAT(mt);
         let price = terms.meta && terms.meta.amt;
         if (amount < price)
@@ -75,6 +77,7 @@ function purchaseFromOriginalSender(payload, chat, purchaser) {
                 failure: () => { }
             });
             // PAY THE OG POSTER HERE!!!
+            console.log('==> pay to og poster here!');
             send_1.sendMessage({
                 chat: Object.assign(Object.assign({}, chat.dataValues), { contactIds: [mediaKey.sender] }),
                 sender: owner,
@@ -93,6 +96,7 @@ function purchaseFromOriginalSender(payload, chat, purchaser) {
             if (!ogmsg)
                 return;
             // purchase it from creator (send "purchase")
+            console.log('==> purchase from creator');
             const msg = { mediaToken: mt, purchaser: purchaser.id };
             send_1.sendMessage({
                 chat: Object.assign(Object.assign({}, chat.dataValues), { contactIds: [ogmsg.sender] }),

dist/api/network/receive.js

@@ -43,7 +43,7 @@ exports.typesToReplay = [
 ];
 function onReceive(payload) {
     return __awaiter(this, void 0, void 0, function* () {
-        // console.log("=> ON RECEIVE",payload)
+        console.log("==> ON RECEIVE", payload);
         // if tribe, owner must forward to MQTT
         let doAction = true;
         const toAddIn = {};
@@ -115,6 +115,7 @@ function onReceive(payload) {
                 console.log('=> insufficient payment for this action');
         }
         if (isTribeOwner && payload.type === msgtypes.purchase) {
+            console.log('==> is purchase, i am trbie owner');
             const mt = payload.message.mediaToken;
             const host = mt && mt.split('.').length && mt.split('.')[0];
             const muid = mt && mt.split('.').length && mt.split('.')[1];
@@ -123,6 +124,7 @@ function onReceive(payload) {
                     type: msgtypes.attachment, sender: 1,
                 } });
             if (!myAttachmentMessage) { // someone else's attachment
+                console.log("==> someone else's attachment, purchase it");
                 const senderContact = yield models_1.models.Contact.findOne({ where: { publicKey: payload.sender.pub_key } });
                 modify_1.purchaseFromOriginalSender(payload, chat, senderContact);
                 doAction = false;
@@ -209,7 +211,6 @@ function initTribesSubscriptions() {
         tribes.connect((topic, message) => __awaiter(this, void 0, void 0, function* () {
             try {
                 const msg = message.toString();
-                // console.log("=====> msg received! TOPIC", topic, "MESSAGE", msg)
                 // check topic is signed by sender?
                 const payload = yield parseAndVerifyPayload(msg);
                 onReceive(payload);