Evan Feenstra
5 years ago
committed by
GitHub
GitHub
15 changed files with 192 additions and 187 deletions
@ -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) |
|||
}) |
|||
} |
|||
} |
|||
@ -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
|
|||
@ -0,0 +1 @@ |
|||
{"version":3,"file":"confirmations.js","sourceRoot":"","sources":["../../../api/controllers/confirmations.ts"],"names":[],"mappings":"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"} |
|||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Loading…
Reference in new issue