diff --git a/api/controllers/confirmations.ts b/api/controllers/confirmations.ts new file mode 100644 index 0000000..4023c32 --- /dev/null +++ b/api/controllers/confirmations.ts @@ -0,0 +1,77 @@ +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' + +const constants = require(__dirname + '/../../config/constants.json') + +export function sendConfirmation({ chat, sender, msg_id }) { + helpers.sendMessage({ + chat, + sender, + message: {id:msg_id}, + type: constants.message_types.confirmation, + }) +} + +export async function receiveConfirmation(payload) { + console.log('received confirmation', { payload }) + + const dat = payload.content || payload + const chat_uuid = dat.chat.uuid + const msg_id = dat.message.id + const sender_pub_key = dat.sender.pub_key + + const owner = await models.Contact.findOne({ where: { isOwner: true }}) + const sender = await models.Contact.findOne({ where: { publicKey: sender_pub_key } }) + const chat = await models.Chat.findOne({ where: { uuid: chat_uuid } }) + + // new confirmation logic + if(msg_id){ + lock.acquire('confirmation', async function(done){ + console.log("update status map") + const message = await models.Message.findOne({ where:{id:msg_id} }) + if(message){ + let statusMap = {} + try{ + statusMap = JSON.parse(message.statusMap||'{}') + } catch(e){} + statusMap[sender.id] = constants.statuses.received + + await message.update({ + status: constants.statuses.received, + statusMap: JSON.stringify(statusMap) + }) + socket.sendJson({ + type: 'confirmation', + response: jsonUtils.messageToJson(message, chat) + }) + } + done() + }) + } else { // old logic + const messages = await models.Message.findAll({ + limit: 1, + where: { + chatId: chat.id, + sender: owner.id, + type: [ + constants.message_types.message, + constants.message_types.invoice, + constants.message_types.attachment, + ], + status: constants.statuses.pending, + }, + order: [['createdAt', 'desc']] + }) + + const message = messages[0] + message.update({ status: constants.statuses.received }) + + socket.sendJson({ + type: 'confirmation', + response: jsonUtils.messageToJson(message, chat) + }) + } +} \ No newline at end of file diff --git a/api/controllers/index.ts b/api/controllers/index.ts index ecc03b6..8a61cd6 100644 --- a/api/controllers/index.ts +++ b/api/controllers/index.ts @@ -19,6 +19,7 @@ let controllers = { chats: require('./chats'), subcriptions: require('./subscriptions'), media: require('./media'), + confirmations: require('./confirmations') } async function iniGrpcSubscriptions() { @@ -31,7 +32,7 @@ async function iniGrpcSubscriptions() { [types.message]: controllers.messages.receiveMessage, [types.invoice]: controllers.invoices.receiveInvoice, [types.direct_payment]: controllers.payments.receivePayment, - [types.confirmation]: controllers.messages.receiveConfirmation, + [types.confirmation]: controllers.confirmations.receiveConfirmation, [types.attachment]: controllers.media.receiveAttachment, [types.purchase]: controllers.media.receivePurchase, [types.purchase_accept]: controllers.media.receivePurchaseAccept, diff --git a/api/controllers/invoices.ts b/api/controllers/invoices.ts index 1c08012..cee9900 100644 --- a/api/controllers/invoices.ts +++ b/api/controllers/invoices.ts @@ -6,6 +6,7 @@ import * as decodeUtils from '../utils/decode' import * as helpers from '../helpers' import { sendNotification } from '../hub' import { success } from '../utils/res' +import {sendConfirmation} from './confirmations' const constants = require(__dirname + '/../../config/constants.json'); @@ -216,19 +217,10 @@ const receiveInvoice = async (payload) => { sendNotification(chat, sender.alias, 'message') - sendConfirmation({ chat, sender: owner, msg_id }) + const theChat = {...chat.dataValues, contactIds:[sender.id]} + sendConfirmation({ chat:theChat, sender: owner, msg_id }) } -const sendConfirmation = ({ chat, sender, msg_id }) => { - helpers.sendMessage({ - chat, - sender, - message: { id: msg_id }, - type: constants.message_types.confirmation, - }) -} - - export { listInvoices, payInvoice, diff --git a/api/controllers/media.ts b/api/controllers/media.ts index 4573e75..6004146 100644 --- a/api/controllers/media.ts +++ b/api/controllers/media.ts @@ -11,6 +11,7 @@ import {parseLDAT, tokenFromTerms, urlBase64FromBytes, testLDAT} from '../utils/ import {CronJob} from 'cron' import * as zbase32 from '../utils/zbase32' import * as schemas from './schemas' +import {sendConfirmation} from './confirmations' const env = process.env.NODE_ENV || 'development'; const config = require(__dirname + '/../../config/app.json')[env]; @@ -382,16 +383,8 @@ const receiveAttachment = async (payload) => { sendNotification(chat, sender.alias, 'message') - sendConfirmation({ chat, sender: owner, msg_id }) -} - -const sendConfirmation = ({ chat, sender, msg_id }) => { - helpers.sendMessage({ - chat, - sender, - message: {id:msg_id}, - type: constants.message_types.confirmation, - }) + const theChat = {...chat.dataValues, contactIds:[sender.id]} + sendConfirmation({ chat:theChat, sender: owner, msg_id }) } async function signer(req, res) { diff --git a/api/controllers/messages.ts b/api/controllers/messages.ts index ee3fdcd..12273a5 100644 --- a/api/controllers/messages.ts +++ b/api/controllers/messages.ts @@ -6,7 +6,7 @@ import * as socket from '../utils/socket' import * as jsonUtils from '../utils/json' import * as helpers from '../helpers' import { success } from '../utils/res' -import lock from '../utils/lock' +import {sendConfirmation} from './confirmations' const constants = require(__dirname + '/../../config/constants.json') @@ -171,77 +171,8 @@ const receiveMessage = async (payload) => { sendNotification(chat, sender.alias, 'message') - sendConfirmation({ chat, sender: owner, msg_id }) -} - -const sendConfirmation = ({ chat, sender, msg_id }) => { - helpers.sendMessage({ - chat, - sender, - message: {id:msg_id}, - type: constants.message_types.confirmation, - }) -} - -const receiveConfirmation = async (payload) => { - console.log('received confirmation', { payload }) - - const dat = payload.content || payload - const chat_uuid = dat.chat.uuid - const msg_id = dat.message.id - const sender_pub_key = dat.sender.pub_key - - const owner = await models.Contact.findOne({ where: { isOwner: true }}) - const sender = await models.Contact.findOne({ where: { publicKey: sender_pub_key } }) - const chat = await models.Chat.findOne({ where: { uuid: chat_uuid } }) - - // new confirmation logic - if(msg_id){ - lock.acquire('confirmation', async function(done){ - console.log("update status map") - const message = await models.Message.findOne({ where:{id:msg_id} }) - if(message){ - let statusMap = {} - try{ - statusMap = JSON.parse(message.statusMap||'{}') - } catch(e){} - statusMap[sender.id] = constants.statuses.received - - await message.update({ - status: constants.statuses.received, - statusMap: JSON.stringify(statusMap) - }) - socket.sendJson({ - type: 'confirmation', - response: jsonUtils.messageToJson(message, chat) - }) - } - done() - }) - } else { // old logic - const messages = await models.Message.findAll({ - limit: 1, - where: { - chatId: chat.id, - sender: owner.id, - type: [ - constants.message_types.message, - constants.message_types.invoice, - constants.message_types.attachment, - ], - status: constants.statuses.pending, - }, - order: [['createdAt', 'desc']] - }) - - const message = messages[0] - message.update({ status: constants.statuses.received }) - - socket.sendJson({ - type: 'confirmation', - response: jsonUtils.messageToJson(message, chat) - }) - } + const theChat = {...chat.dataValues, contactIds:[sender.id]} + sendConfirmation({ chat:theChat, sender: owner, msg_id }) } const readMessages = async (req, res) => { @@ -271,7 +202,6 @@ export { getMessages, sendMessage, receiveMessage, - receiveConfirmation, clearMessages, readMessages } \ No newline at end of file diff --git a/dist/api/controllers/confirmations.js b/dist/api/controllers/confirmations.js new file mode 100644 index 0000000..0c29d5e --- /dev/null +++ b/dist/api/controllers/confirmations.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 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 constants = require(__dirname + '/../../config/constants.json'); +function sendConfirmation({ chat, sender, msg_id }) { + helpers.sendMessage({ + chat, + sender, + message: { id: msg_id }, + type: constants.message_types.confirmation, + }); +} +exports.sendConfirmation = sendConfirmation; +function receiveConfirmation(payload) { + return __awaiter(this, void 0, void 0, function* () { + console.log('received confirmation', { payload }); + const dat = payload.content || payload; + const chat_uuid = dat.chat.uuid; + const msg_id = dat.message.id; + const sender_pub_key = dat.sender.pub_key; + const owner = yield models_1.models.Contact.findOne({ where: { isOwner: true } }); + const sender = yield models_1.models.Contact.findOne({ where: { publicKey: sender_pub_key } }); + const chat = yield models_1.models.Chat.findOne({ where: { uuid: chat_uuid } }); + // new confirmation logic + if (msg_id) { + lock_1.default.acquire('confirmation', function (done) { + return __awaiter(this, void 0, void 0, function* () { + console.log("update status map"); + const message = yield models_1.models.Message.findOne({ where: { id: msg_id } }); + if (message) { + let statusMap = {}; + try { + statusMap = JSON.parse(message.statusMap || '{}'); + } + catch (e) { } + statusMap[sender.id] = constants.statuses.received; + yield message.update({ + status: constants.statuses.received, + statusMap: JSON.stringify(statusMap) + }); + socket.sendJson({ + type: 'confirmation', + response: jsonUtils.messageToJson(message, chat) + }); + } + done(); + }); + }); + } + else { // old logic + const messages = yield models_1.models.Message.findAll({ + limit: 1, + where: { + chatId: chat.id, + sender: owner.id, + type: [ + constants.message_types.message, + constants.message_types.invoice, + constants.message_types.attachment, + ], + status: constants.statuses.pending, + }, + order: [['createdAt', 'desc']] + }); + const message = messages[0]; + message.update({ status: constants.statuses.received }); + socket.sendJson({ + type: 'confirmation', + response: jsonUtils.messageToJson(message, chat) + }); + } + }); +} +exports.receiveConfirmation = receiveConfirmation; +//# sourceMappingURL=confirmations.js.map \ No newline at end of file diff --git a/dist/api/controllers/confirmations.js.map b/dist/api/controllers/confirmations.js.map new file mode 100644 index 0000000..65a7890 --- /dev/null +++ b/dist/api/controllers/confirmations.js.map @@ -0,0 +1 @@ +{"version":3,"file":"confirmations.js","sourceRoot":"","sources":["../../../api/controllers/confirmations.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/api/controllers/index.js b/dist/api/controllers/index.js index f8cc432..059036e 100644 --- a/dist/api/controllers/index.js +++ b/dist/api/controllers/index.js @@ -27,6 +27,7 @@ let controllers = { chats: require('./chats'), subcriptions: require('./subscriptions'), media: require('./media'), + confirmations: require('./confirmations') }; function iniGrpcSubscriptions() { return __awaiter(this, void 0, void 0, function* () { @@ -39,7 +40,7 @@ function iniGrpcSubscriptions() { [types.message]: controllers.messages.receiveMessage, [types.invoice]: controllers.invoices.receiveInvoice, [types.direct_payment]: controllers.payments.receivePayment, - [types.confirmation]: controllers.messages.receiveConfirmation, + [types.confirmation]: controllers.confirmations.receiveConfirmation, [types.attachment]: controllers.media.receiveAttachment, [types.purchase]: controllers.media.receivePurchase, [types.purchase_accept]: controllers.media.receivePurchaseAccept, diff --git a/dist/api/controllers/index.js.map b/dist/api/controllers/index.js.map index eb36294..cf4b7da 100644 --- a/dist/api/controllers/index.js.map +++ b/dist/api/controllers/index.js.map @@ -1 +1 @@ -{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../api/controllers/index.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,sCAAgC;AAChC,sCAAqC;AACrC,8CAAyC;AACzC,kDAAkD;AAElD,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,GAAG,8BAA8B,CAAC,CAAC;AAEtE,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,aAAa,CAAC;AAClD,OAAO,CAAC,GAAG,CAAC,SAAS,EAAC,GAAG,CAAC,CAAA;AAE1B,IAAI,WAAW,GAAG;IACjB,QAAQ,EAAE,OAAO,CAAC,YAAY,CAAC;IAC/B,QAAQ,EAAE,OAAO,CAAC,YAAY,CAAC;IAC/B,OAAO,EAAE,OAAO,CAAC,WAAW,CAAC;IAC7B,QAAQ,EAAE,OAAO,CAAC,YAAY,CAAC;IAC/B,OAAO,EAAE,OAAO,CAAC,WAAW,CAAC;IAC7B,QAAQ,EAAE,OAAO,CAAC,WAAW,CAAC;IAC9B,OAAO,EAAE,OAAO,CAAC,WAAW,CAAC;IAC7B,KAAK,EAAE,OAAO,CAAC,SAAS,CAAC;IACzB,YAAY,EAAE,OAAO,CAAC,iBAAiB,CAAC;IACxC,KAAK,EAAE,OAAO,CAAC,SAAS,CAAC;CACzB,CAAA;AAED,SAAe,oBAAoB;;QAClC,IAAG;YACF,MAAM,2BAAe,EAAE,CAAA;YACvB,MAAM,KAAK,GAAG,SAAS,CAAC,aAAa,CAAA;YACrC,MAAM,UAAU,CAAC,iBAAiB,CAAC;gBAClC,CAAC,KAAK,CAAC,WAAW,CAAC,EAAE,WAAW,CAAC,QAAQ,CAAC,iBAAiB;gBAC3D,CAAC,KAAK,CAAC,wBAAwB,CAAC,EAAE,WAAW,CAAC,QAAQ,CAAC,wBAAwB;gBAC/E,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,WAAW,CAAC,QAAQ,CAAC,cAAc;gBACpD,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,WAAW,CAAC,QAAQ,CAAC,cAAc;gBACpD,CAAC,KAAK,CAAC,cAAc,CAAC,EAAE,WAAW,CAAC,QAAQ,CAAC,cAAc;gBAC3D,CAAC,KAAK,CAAC,YAAY,CAAC,EAAE,WAAW,CAAC,QAAQ,CAAC,mBAAmB;gBAC9D,CAAC,KAAK,CAAC,UAAU,CAAC,EAAE,WAAW,CAAC,KAAK,CAAC,iBAAiB;gBACvD,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,WAAW,CAAC,KAAK,CAAC,eAAe;gBACnD,CAAC,KAAK,CAAC,eAAe,CAAC,EAAE,WAAW,CAAC,KAAK,CAAC,qBAAqB;gBAChE,CAAC,KAAK,CAAC,aAAa,CAAC,EAAE,WAAW,CAAC,KAAK,CAAC,mBAAmB;gBAC5D,CAAC,KAAK,CAAC,YAAY,CAAC,EAAE,WAAW,CAAC,KAAK,CAAC,0BAA0B;gBAClE,CAAC,KAAK,CAAC,YAAY,CAAC,EAAE,WAAW,CAAC,KAAK,CAAC,0BAA0B;gBAClE,CAAC,KAAK,CAAC,UAAU,CAAC,EAAE,WAAW,CAAC,KAAK,CAAC,gBAAgB;gBACtD,CAAC,KAAK,CAAC,WAAW,CAAC,EAAE,WAAW,CAAC,KAAK,CAAC,iBAAiB;aACxD,CAAC,CAAA;SACF;QAAC,OAAM,CAAC,EAAE;YACV,MAAM,CAAC,CAAA;SACP;IACF,CAAC;CAAA;AA4FY,oDAAoB;AA1FjC,SAAe,GAAG,CAAC,GAAG;;QAErB,IAAG,eAAM,IAAI,eAAM,CAAC,YAAY,EAAC;YAChC,WAAW,CAAC,YAAY,CAAC,kBAAkB,EAAE,CAAA;SAC7C;QACD,IAAG;YACF,MAAM,WAAW,CAAC,KAAK,CAAC,eAAe,EAAE,CAAA;SACzC;QAAC,OAAM,CAAC,EAAE;YACV,OAAO,CAAC,GAAG,CAAC,qCAAqC,EAAE,CAAC,CAAC,OAAO,CAAC,CAAA;SAC7D;QAED,GAAG,CAAC,GAAG,CAAC,QAAQ,EAAE,WAAW,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;QAC7C,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,WAAW,CAAC,KAAK,CAAC,eAAe,CAAC,CAAA;QACrD,GAAG,CAAC,IAAI,CAAC,8BAA8B,EAAE,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;QAChE,GAAG,CAAC,MAAM,CAAC,WAAW,EAAE,WAAW,CAAC,KAAK,CAAC,UAAU,CAAC,CAAA;QACrD,GAAG,CAAC,GAAG,CAAC,WAAW,EAAE,WAAW,CAAC,KAAK,CAAC,eAAe,CAAC,CAAA;QAEvD,GAAG,CAAC,IAAI,CAAC,kBAAkB,EAAE,WAAW,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAA;QAEhE,GAAG,CAAC,IAAI,CAAC,SAAS,EAAE,WAAW,CAAC,OAAO,CAAC,YAAY,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,WAAW,CAAC,OAAO,CAAC,UAAU,CAAC,CAAA;QAEpG,GAAG,CAAC,IAAI,CAAC,UAAU,EAAE,WAAW,CAAC,OAAO,CAAC,YAAY,CAAC,CAAA;QACtD,GAAG,CAAC,IAAI,CAAC,6BAA6B,EAAE,WAAW,CAAC,OAAO,CAAC,SAAS,CAAC,CAAA;QACtE,GAAG,CAAC,IAAI,CAAC,iBAAiB,EAAE,WAAW,CAAC,OAAO,CAAC,YAAY,CAAC,CAAA;QAE7D,GAAG,CAAC,GAAG,CAAC,WAAW,EAAE,WAAW,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAA;QACtD,GAAG,CAAC,GAAG,CAAC,eAAe,EAAE,WAAW,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAA;QAC5D,GAAG,CAAC,IAAI,CAAC,oBAAoB,EAAE,WAAW,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAA;QACjE,GAAG,CAAC,IAAI,CAAC,WAAW,EAAE,WAAW,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAA;QACzD,GAAG,CAAC,MAAM,CAAC,eAAe,EAAE,WAAW,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAA;QAE/D,GAAG,CAAC,GAAG,CAAC,WAAW,EAAE,WAAW,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAA;QACtD,GAAG,CAAC,IAAI,CAAC,WAAW,EAAE,WAAW,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAA;QACvD,GAAG,CAAC,IAAI,CAAC,yBAAyB,EAAE,WAAW,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAA;QACtE,GAAG,CAAC,IAAI,CAAC,iBAAiB,EAAE,WAAW,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAA;QAE/D,GAAG,CAAC,GAAG,CAAC,gBAAgB,EAAE,WAAW,CAAC,YAAY,CAAC,mBAAmB,CAAC,CAAA;QACvE,GAAG,CAAC,GAAG,CAAC,mBAAmB,EAAE,WAAW,CAAC,YAAY,CAAC,eAAe,CAAC,CAAA;QACtE,GAAG,CAAC,MAAM,CAAC,mBAAmB,EAAE,WAAW,CAAC,YAAY,CAAC,kBAAkB,CAAC,CAAA;QAC5E,GAAG,CAAC,IAAI,CAAC,gBAAgB,EAAE,WAAW,CAAC,YAAY,CAAC,kBAAkB,CAAC,CAAA;QACvE,GAAG,CAAC,GAAG,CAAC,mBAAmB,EAAE,WAAW,CAAC,YAAY,CAAC,gBAAgB,CAAC,CAAA;QACvE,GAAG,CAAC,GAAG,CAAC,mCAAmC,EAAE,WAAW,CAAC,YAAY,CAAC,0BAA0B,CAAC,CAAA;QACjG,GAAG,CAAC,GAAG,CAAC,yBAAyB,EAAE,WAAW,CAAC,YAAY,CAAC,iBAAiB,CAAC,CAAA;QAC9E,GAAG,CAAC,GAAG,CAAC,2BAA2B,EAAE,WAAW,CAAC,YAAY,CAAC,mBAAmB,CAAC,CAAA;QAElF,GAAG,CAAC,IAAI,CAAC,aAAa,EAAE,WAAW,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAA;QAChE,GAAG,CAAC,IAAI,CAAC,WAAW,EAAE,WAAW,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;QACjD,GAAG,CAAC,GAAG,CAAC,oBAAoB,EAAE,WAAW,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;QAEvD,GAAG,CAAC,IAAI,CAAC,WAAW,EAAE,WAAW,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAA;QACzD,GAAG,CAAC,GAAG,CAAC,WAAW,EAAE,WAAW,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAA;QACvD,GAAG,CAAC,GAAG,CAAC,WAAW,EAAE,WAAW,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAA;QACrD,GAAG,CAAC,IAAI,CAAC,kBAAkB,EAAE,WAAW,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAA;QAEhE,GAAG,CAAC,IAAI,CAAC,UAAU,EAAE,WAAW,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAA;QACtD,GAAG,CAAC,GAAG,CAAC,WAAW,EAAE,WAAW,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAA;QAEvD,GAAG,CAAC,GAAG,CAAC,WAAW,EAAE,WAAW,CAAC,OAAO,CAAC,WAAW,CAAC,CAAA;QACrD,GAAG,CAAC,GAAG,CAAC,UAAU,EAAE,WAAW,CAAC,OAAO,CAAC,UAAU,CAAC,CAAA;QACnD,GAAG,CAAC,GAAG,CAAC,cAAc,EAAE,WAAW,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAA;QAClE,GAAG,CAAC,GAAG,CAAC,UAAU,EAAE,WAAW,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;QAChD,GAAG,CAAC,GAAG,CAAC,OAAO,EAAE,WAAW,CAAC,OAAO,CAAC,YAAY,CAAC,CAAA;QAClD,GAAG,CAAC,GAAG,CAAC,OAAO,EAAE,WAAW,CAAC,OAAO,CAAC,WAAW,CAAC,CAAA;QAEjD,GAAG,CAAC,GAAG,CAAC,UAAU,EAAE,UAAe,GAAG,EAAC,GAAG;;gBACzC,MAAM,OAAO,GAAG,MAAM,kBAAQ,EAAE,CAAA;gBAChC,GAAG,CAAC,IAAI,CAAC,EAAC,OAAO,EAAC,CAAC,CAAA;YACpB,CAAC;SAAA,CAAC,CAAA;QAEF,IAAI,GAAG,IAAI,YAAY,EAAE,EAAE,sBAAsB;YAChD,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAA;SACzB;IACF,CAAC;CAAA;AAkBO,kBAAG;AAhBX,MAAM,KAAK,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;IAC1B,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,CAAC,IAAI,CAAC;IAE1B,IAAI,IAAI,IAAI,QAAQ,EAAE;QACrB,eAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;YACjE,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YAChB,GAAG,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC,SAAS,EAAE,CAAC,CAAC;YACpD,GAAG,CAAC,GAAG,EAAE,CAAC;QACX,CAAC,CAAC,CAAA;KACF;SAAM;QACN,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAChB,GAAG,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;QAC7B,GAAG,CAAC,GAAG,EAAE,CAAC;KACV;AACF,CAAC,CAAA"} \ No newline at end of file +{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../api/controllers/index.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/api/controllers/invoices.js b/dist/api/controllers/invoices.js index 1e090a1..d888459 100644 --- a/dist/api/controllers/invoices.js +++ b/dist/api/controllers/invoices.js @@ -17,6 +17,7 @@ const decodeUtils = require("../utils/decode"); const helpers = require("../helpers"); const hub_1 = require("../hub"); const res_1 = require("../utils/res"); +const confirmations_1 = require("./confirmations"); const constants = require(__dirname + '/../../config/constants.json'); const payInvoice = (req, res) => __awaiter(void 0, void 0, void 0, function* () { const lightning = yield lightning_1.loadLightning(); @@ -196,17 +197,10 @@ const receiveInvoice = (payload) => __awaiter(void 0, void 0, void 0, function* response: jsonUtils.messageToJson(message, chat) }); hub_1.sendNotification(chat, sender.alias, 'message'); - sendConfirmation({ chat, sender: owner, msg_id }); + const theChat = Object.assign(Object.assign({}, chat.dataValues), { contactIds: [sender.id] }); + confirmations_1.sendConfirmation({ chat: theChat, sender: owner, msg_id }); }); exports.receiveInvoice = receiveInvoice; -const sendConfirmation = ({ chat, sender, msg_id }) => { - helpers.sendMessage({ - chat, - sender, - message: { id: msg_id }, - type: constants.message_types.confirmation, - }); -}; // lnd invoice stuff function decodePaymentRequest(paymentRequest) { var decodedPaymentRequest = decodeUtils.decode(paymentRequest); diff --git a/dist/api/controllers/invoices.js.map b/dist/api/controllers/invoices.js.map index d863555..0904dbf 100644 --- a/dist/api/controllers/invoices.js.map +++ b/dist/api/controllers/invoices.js.map @@ -1 +1 @@ -{"version":3,"file":"invoices.js","sourceRoot":"","sources":["../../../api/controllers/invoices.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"invoices.js","sourceRoot":"","sources":["../../../api/controllers/invoices.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/api/controllers/media.js b/dist/api/controllers/media.js index d75a60b..fe1afaf 100644 --- a/dist/api/controllers/media.js +++ b/dist/api/controllers/media.js @@ -22,6 +22,7 @@ const ldat_1 = require("../utils/ldat"); const cron_1 = require("cron"); const zbase32 = require("../utils/zbase32"); const schemas = require("./schemas"); +const confirmations_1 = require("./confirmations"); const env = process.env.NODE_ENV || 'development'; const config = require(__dirname + '/../../config/app.json')[env]; const constants = require(__dirname + '/../../config/constants.json'); @@ -347,17 +348,10 @@ const receiveAttachment = (payload) => __awaiter(void 0, void 0, void 0, functio response: jsonUtils.messageToJson(message, chat) }); hub_1.sendNotification(chat, sender.alias, 'message'); - sendConfirmation({ chat, sender: owner, msg_id }); + const theChat = Object.assign(Object.assign({}, chat.dataValues), { contactIds: [sender.id] }); + confirmations_1.sendConfirmation({ chat: theChat, sender: owner, msg_id }); }); exports.receiveAttachment = receiveAttachment; -const sendConfirmation = ({ chat, sender, msg_id }) => { - helpers.sendMessage({ - chat, - sender, - message: { id: msg_id }, - type: constants.message_types.confirmation, - }); -}; function signer(req, res) { return __awaiter(this, void 0, void 0, function* () { if (!req.params.challenge) diff --git a/dist/api/controllers/media.js.map b/dist/api/controllers/media.js.map index 5fefcef..dbd7fb7 100644 --- a/dist/api/controllers/media.js.map +++ b/dist/api/controllers/media.js.map @@ -1 +1 @@ -{"version":3,"file":"media.js","sourceRoot":"","sources":["../../../api/controllers/media.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"media.js","sourceRoot":"","sources":["../../../api/controllers/media.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/api/controllers/messages.js b/dist/api/controllers/messages.js index bf404f4..ba1d073 100644 --- a/dist/api/controllers/messages.js +++ b/dist/api/controllers/messages.js @@ -17,7 +17,7 @@ const socket = require("../utils/socket"); const jsonUtils = require("../utils/json"); const helpers = require("../helpers"); const res_1 = require("../utils/res"); -const lock_1 = require("../utils/lock"); +const confirmations_1 = require("./confirmations"); const constants = require(__dirname + '/../../config/constants.json'); const getMessages = (req, res) => __awaiter(void 0, void 0, void 0, function* () { const dateToReturn = req.query.date; @@ -147,76 +147,10 @@ const receiveMessage = (payload) => __awaiter(void 0, void 0, void 0, function* response: jsonUtils.messageToJson(message, chat) }); hub_1.sendNotification(chat, sender.alias, 'message'); - sendConfirmation({ chat, sender: owner, msg_id }); + const theChat = Object.assign(Object.assign({}, chat.dataValues), { contactIds: [sender.id] }); + confirmations_1.sendConfirmation({ chat: theChat, sender: owner, msg_id }); }); exports.receiveMessage = receiveMessage; -const sendConfirmation = ({ chat, sender, msg_id }) => { - helpers.sendMessage({ - chat, - sender, - message: { id: msg_id }, - type: constants.message_types.confirmation, - }); -}; -const receiveConfirmation = (payload) => __awaiter(void 0, void 0, void 0, function* () { - console.log('received confirmation', { payload }); - const dat = payload.content || payload; - const chat_uuid = dat.chat.uuid; - const msg_id = dat.message.id; - const sender_pub_key = dat.sender.pub_key; - const owner = yield models_1.models.Contact.findOne({ where: { isOwner: true } }); - const sender = yield models_1.models.Contact.findOne({ where: { publicKey: sender_pub_key } }); - const chat = yield models_1.models.Chat.findOne({ where: { uuid: chat_uuid } }); - // new confirmation logic - if (msg_id) { - lock_1.default.acquire('confirmation', function (done) { - return __awaiter(this, void 0, void 0, function* () { - console.log("update status map"); - const message = yield models_1.models.Message.findOne({ where: { id: msg_id } }); - if (message) { - let statusMap = {}; - try { - statusMap = JSON.parse(message.statusMap || '{}'); - } - catch (e) { } - statusMap[sender.id] = constants.statuses.received; - yield message.update({ - status: constants.statuses.received, - statusMap: JSON.stringify(statusMap) - }); - socket.sendJson({ - type: 'confirmation', - response: jsonUtils.messageToJson(message, chat) - }); - } - done(); - }); - }); - } - else { // old logic - const messages = yield models_1.models.Message.findAll({ - limit: 1, - where: { - chatId: chat.id, - sender: owner.id, - type: [ - constants.message_types.message, - constants.message_types.invoice, - constants.message_types.attachment, - ], - status: constants.statuses.pending, - }, - order: [['createdAt', 'desc']] - }); - const message = messages[0]; - message.update({ status: constants.statuses.received }); - socket.sendJson({ - type: 'confirmation', - response: jsonUtils.messageToJson(message, chat) - }); - } -}); -exports.receiveConfirmation = receiveConfirmation; const readMessages = (req, res) => __awaiter(void 0, void 0, void 0, function* () { const chat_id = req.params.chat_id; const owner = yield models_1.models.Contact.findOne({ where: { isOwner: true } }); diff --git a/dist/api/controllers/messages.js.map b/dist/api/controllers/messages.js.map index 6052cc0..bbde4f8 100644 --- a/dist/api/controllers/messages.js.map +++ b/dist/api/controllers/messages.js.map @@ -1 +1 @@ -{"version":3,"file":"messages.js","sourceRoot":"","sources":["../../../api/controllers/messages.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"messages.js","sourceRoot":"","sources":["../../../api/controllers/messages.ts"],"names":[],"mappings":"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"} \ No newline at end of file