mirror of
https://github.com/stakwork/sphinx-relay.git
synced 2026-08-17 13:07:31 +02:00
sender socket
This commit is contained in:
parent
58d5c32226
commit
afb2dbf104
21 changed files with 37 additions and 34 deletions
|
|
@ -45,7 +45,7 @@ export async function receiveConfirmation(payload) {
|
|||
})
|
||||
socket.sendJson({
|
||||
type: 'confirmation',
|
||||
response: jsonUtils.messageToJson(message, chat)
|
||||
response: jsonUtils.messageToJson(message, chat, sender)
|
||||
})
|
||||
}
|
||||
done()
|
||||
|
|
@ -71,7 +71,7 @@ export async function receiveConfirmation(payload) {
|
|||
|
||||
socket.sendJson({
|
||||
type: 'confirmation',
|
||||
response: jsonUtils.messageToJson(message, chat)
|
||||
response: jsonUtils.messageToJson(message, chat, sender)
|
||||
})
|
||||
}
|
||||
}
|
||||
|
|
@ -212,7 +212,7 @@ const receiveInvoice = async (payload) => {
|
|||
|
||||
socket.sendJson({
|
||||
type: 'invoice',
|
||||
response: jsonUtils.messageToJson(message, chat)
|
||||
response: jsonUtils.messageToJson(message, chat, sender)
|
||||
})
|
||||
|
||||
sendNotification(chat, sender.alias, 'message')
|
||||
|
|
|
|||
|
|
@ -185,7 +185,7 @@ const purchase = async (req, res) => {
|
|||
message: msg,
|
||||
success: async (data) => {
|
||||
console.log('purchase sent', { data })
|
||||
resUtils.success(res, jsonUtils.messageToJson(message))
|
||||
resUtils.success(res, jsonUtils.messageToJson(message, chat))
|
||||
},
|
||||
failure: error=> resUtils.failure(res, error.message),
|
||||
})
|
||||
|
|
@ -318,7 +318,7 @@ const receivePurchaseAccept = async (payload) => {
|
|||
})
|
||||
socket.sendJson({
|
||||
type: 'purchase_accept',
|
||||
response: jsonUtils.messageToJson(msg, chat)
|
||||
response: jsonUtils.messageToJson(msg, chat, sender)
|
||||
})
|
||||
}
|
||||
|
||||
|
|
@ -344,7 +344,7 @@ const receivePurchaseDeny = async (payload) => {
|
|||
})
|
||||
socket.sendJson({
|
||||
type: 'purchase_deny',
|
||||
response: jsonUtils.messageToJson(msg, chat)
|
||||
response: jsonUtils.messageToJson(msg, chat, sender)
|
||||
})
|
||||
}
|
||||
|
||||
|
|
@ -378,7 +378,7 @@ const receiveAttachment = async (payload) => {
|
|||
|
||||
socket.sendJson({
|
||||
type: 'attachment',
|
||||
response: jsonUtils.messageToJson(message, chat)
|
||||
response: jsonUtils.messageToJson(message, chat, sender)
|
||||
})
|
||||
|
||||
sendNotification(chat, sender.alias, 'message')
|
||||
|
|
|
|||
|
|
@ -166,7 +166,7 @@ const receiveMessage = async (payload) => {
|
|||
|
||||
socket.sendJson({
|
||||
type: 'message',
|
||||
response: jsonUtils.messageToJson(message, chat)
|
||||
response: jsonUtils.messageToJson(message, chat, sender)
|
||||
})
|
||||
|
||||
sendNotification(chat, sender.alias, 'message')
|
||||
|
|
|
|||
|
|
@ -145,7 +145,7 @@ const receivePayment = async (payload) => {
|
|||
|
||||
socket.sendJson({
|
||||
type: 'direct_payment',
|
||||
response: jsonUtils.messageToJson(message, chat)
|
||||
response: jsonUtils.messageToJson(message, chat, sender)
|
||||
})
|
||||
|
||||
sendNotification(chat, sender.alias, 'message')
|
||||
|
|
|
|||
|
|
@ -112,12 +112,14 @@ function subscribeInvoices(actions) {
|
|||
createdAt: new Date(settleDate),
|
||||
updatedAt: new Date(settleDate)
|
||||
})
|
||||
socket.sendJson({
|
||||
type: 'payment',
|
||||
response: jsonUtils.messageToJson(message, chat)
|
||||
})
|
||||
|
||||
const sender = await models.Contact.findOne({ where: { id: senderId } })
|
||||
|
||||
socket.sendJson({
|
||||
type: 'payment',
|
||||
response: jsonUtils.messageToJson(message, chat, sender)
|
||||
})
|
||||
|
||||
sendNotification(chat, sender.alias, 'message')
|
||||
}
|
||||
});
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ function chatToJson(c) {
|
|||
})
|
||||
}
|
||||
|
||||
function messageToJson(msg, chat = null) {
|
||||
function messageToJson(msg, chat, contact?) {
|
||||
const message = msg.dataValues||msg
|
||||
let statusMap = message.statusMap || null
|
||||
if(message.statusMap && typeof message.statusMap==='string'){
|
||||
|
|
@ -23,6 +23,7 @@ function messageToJson(msg, chat = null) {
|
|||
...message,
|
||||
statusMap,
|
||||
chat: chat ? chatToJson(chat) : null,
|
||||
contact: contact ? contactToJson(contact) : null
|
||||
})
|
||||
}
|
||||
|
||||
|
|
|
|||
4
dist/api/controllers/confirmations.js
vendored
4
dist/api/controllers/confirmations.js
vendored
|
|
@ -53,7 +53,7 @@ function receiveConfirmation(payload) {
|
|||
});
|
||||
socket.sendJson({
|
||||
type: 'confirmation',
|
||||
response: jsonUtils.messageToJson(message, chat)
|
||||
response: jsonUtils.messageToJson(message, chat, sender)
|
||||
});
|
||||
}
|
||||
done();
|
||||
|
|
@ -79,7 +79,7 @@ function receiveConfirmation(payload) {
|
|||
message.update({ status: constants.statuses.received });
|
||||
socket.sendJson({
|
||||
type: 'confirmation',
|
||||
response: jsonUtils.messageToJson(message, chat)
|
||||
response: jsonUtils.messageToJson(message, chat, sender)
|
||||
});
|
||||
}
|
||||
});
|
||||
|
|
|
|||
2
dist/api/controllers/confirmations.js.map
vendored
2
dist/api/controllers/confirmations.js.map
vendored
|
|
@ -1 +1 @@
|
|||
{"version":3,"file":"confirmations.js","sourceRoot":"","sources":["../../../api/controllers/confirmations.ts"],"names":[],"mappings":"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"}
|
||||
{"version":3,"file":"confirmations.js","sourceRoot":"","sources":["../../../api/controllers/confirmations.ts"],"names":[],"mappings":"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"}
|
||||
2
dist/api/controllers/invoices.js
vendored
2
dist/api/controllers/invoices.js
vendored
|
|
@ -194,7 +194,7 @@ const receiveInvoice = (payload) => __awaiter(void 0, void 0, void 0, function*
|
|||
console.log('received keysend invoice message', message.id);
|
||||
socket.sendJson({
|
||||
type: 'invoice',
|
||||
response: jsonUtils.messageToJson(message, chat)
|
||||
response: jsonUtils.messageToJson(message, chat, sender)
|
||||
});
|
||||
hub_1.sendNotification(chat, sender.alias, 'message');
|
||||
const theChat = Object.assign(Object.assign({}, chat.dataValues), { contactIds: [sender.id] });
|
||||
|
|
|
|||
2
dist/api/controllers/invoices.js.map
vendored
2
dist/api/controllers/invoices.js.map
vendored
File diff suppressed because one or more lines are too long
8
dist/api/controllers/media.js
vendored
8
dist/api/controllers/media.js
vendored
|
|
@ -164,7 +164,7 @@ const purchase = (req, res) => __awaiter(void 0, void 0, void 0, function* () {
|
|||
message: msg,
|
||||
success: (data) => __awaiter(void 0, void 0, void 0, function* () {
|
||||
console.log('purchase sent', { data });
|
||||
resUtils.success(res, jsonUtils.messageToJson(message));
|
||||
resUtils.success(res, jsonUtils.messageToJson(message, chat));
|
||||
}),
|
||||
failure: error => resUtils.failure(res, error.message),
|
||||
});
|
||||
|
|
@ -287,7 +287,7 @@ const receivePurchaseAccept = (payload) => __awaiter(void 0, void 0, void 0, fun
|
|||
});
|
||||
socket.sendJson({
|
||||
type: 'purchase_accept',
|
||||
response: jsonUtils.messageToJson(msg, chat)
|
||||
response: jsonUtils.messageToJson(msg, chat, sender)
|
||||
});
|
||||
});
|
||||
exports.receivePurchaseAccept = receivePurchaseAccept;
|
||||
|
|
@ -313,7 +313,7 @@ const receivePurchaseDeny = (payload) => __awaiter(void 0, void 0, void 0, funct
|
|||
});
|
||||
socket.sendJson({
|
||||
type: 'purchase_deny',
|
||||
response: jsonUtils.messageToJson(msg, chat)
|
||||
response: jsonUtils.messageToJson(msg, chat, sender)
|
||||
});
|
||||
});
|
||||
exports.receivePurchaseDeny = receivePurchaseDeny;
|
||||
|
|
@ -345,7 +345,7 @@ const receiveAttachment = (payload) => __awaiter(void 0, void 0, void 0, functio
|
|||
console.log('saved attachment', message.dataValues);
|
||||
socket.sendJson({
|
||||
type: 'attachment',
|
||||
response: jsonUtils.messageToJson(message, chat)
|
||||
response: jsonUtils.messageToJson(message, chat, sender)
|
||||
});
|
||||
hub_1.sendNotification(chat, sender.alias, 'message');
|
||||
const theChat = Object.assign(Object.assign({}, chat.dataValues), { contactIds: [sender.id] });
|
||||
|
|
|
|||
2
dist/api/controllers/media.js.map
vendored
2
dist/api/controllers/media.js.map
vendored
File diff suppressed because one or more lines are too long
2
dist/api/controllers/messages.js
vendored
2
dist/api/controllers/messages.js
vendored
|
|
@ -144,7 +144,7 @@ const receiveMessage = (payload) => __awaiter(void 0, void 0, void 0, function*
|
|||
console.log('saved message', message.dataValues);
|
||||
socket.sendJson({
|
||||
type: 'message',
|
||||
response: jsonUtils.messageToJson(message, chat)
|
||||
response: jsonUtils.messageToJson(message, chat, sender)
|
||||
});
|
||||
hub_1.sendNotification(chat, sender.alias, 'message');
|
||||
const theChat = Object.assign(Object.assign({}, chat.dataValues), { contactIds: [sender.id] });
|
||||
|
|
|
|||
2
dist/api/controllers/messages.js.map
vendored
2
dist/api/controllers/messages.js.map
vendored
File diff suppressed because one or more lines are too long
2
dist/api/controllers/payment.js
vendored
2
dist/api/controllers/payment.js
vendored
|
|
@ -133,7 +133,7 @@ const receivePayment = (payload) => __awaiter(void 0, void 0, void 0, function*
|
|||
console.log('saved message', message.dataValues);
|
||||
socket.sendJson({
|
||||
type: 'direct_payment',
|
||||
response: jsonUtils.messageToJson(message, chat)
|
||||
response: jsonUtils.messageToJson(message, chat, sender)
|
||||
});
|
||||
hub_1.sendNotification(chat, sender.alias, 'message');
|
||||
});
|
||||
|
|
|
|||
2
dist/api/controllers/payment.js.map
vendored
2
dist/api/controllers/payment.js.map
vendored
File diff suppressed because one or more lines are too long
4
dist/api/grpc/index.js
vendored
4
dist/api/grpc/index.js
vendored
|
|
@ -120,11 +120,11 @@ function subscribeInvoices(actions) {
|
|||
createdAt: new Date(settleDate),
|
||||
updatedAt: new Date(settleDate)
|
||||
});
|
||||
const sender = yield models_1.models.Contact.findOne({ where: { id: senderId } });
|
||||
socket.sendJson({
|
||||
type: 'payment',
|
||||
response: jsonUtils.messageToJson(message, chat)
|
||||
response: jsonUtils.messageToJson(message, chat, sender)
|
||||
});
|
||||
const sender = yield models_1.models.Contact.findOne({ where: { id: senderId } });
|
||||
hub_1.sendNotification(chat, sender.alias, 'message');
|
||||
}
|
||||
});
|
||||
|
|
|
|||
2
dist/api/grpc/index.js.map
vendored
2
dist/api/grpc/index.js.map
vendored
File diff suppressed because one or more lines are too long
4
dist/api/utils/json.js
vendored
4
dist/api/utils/json.js
vendored
|
|
@ -11,13 +11,13 @@ function chatToJson(c) {
|
|||
return case_1.toSnake(Object.assign(Object.assign({}, chat), { contactIds }));
|
||||
}
|
||||
exports.chatToJson = chatToJson;
|
||||
function messageToJson(msg, chat = null) {
|
||||
function messageToJson(msg, chat, contact) {
|
||||
const message = msg.dataValues || msg;
|
||||
let statusMap = message.statusMap || null;
|
||||
if (message.statusMap && typeof message.statusMap === 'string') {
|
||||
statusMap = JSON.parse(message.statusMap);
|
||||
}
|
||||
return case_1.toSnake(Object.assign(Object.assign({}, message), { statusMap, chat: chat ? chatToJson(chat) : null }));
|
||||
return case_1.toSnake(Object.assign(Object.assign({}, message), { statusMap, chat: chat ? chatToJson(chat) : null, contact: contact ? contactToJson(contact) : null }));
|
||||
}
|
||||
exports.messageToJson = messageToJson;
|
||||
const contactToJson = (contact) => case_1.toSnake(contact.dataValues || contact);
|
||||
|
|
|
|||
2
dist/api/utils/json.js.map
vendored
2
dist/api/utils/json.js.map
vendored
|
|
@ -1 +1 @@
|
|||
{"version":3,"file":"json.js","sourceRoot":"","sources":["../../../api/utils/json.ts"],"names":[],"mappings":";;AAAA,wCAA6C;AAC7C,oCAAmC;AAEnC,SAAS,UAAU,CAAC,CAAC;IACnB,MAAM,IAAI,GAAG,CAAC,CAAC,UAAU,IAAE,CAAC,CAAA;IAC5B,IAAI,UAAU,GAAG,IAAI,CAAC,UAAU,IAAI,IAAI,CAAA;IACxC,IAAG,IAAI,CAAC,UAAU,IAAI,OAAO,IAAI,CAAC,UAAU,KAAG,QAAQ,EAAC;QACtD,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;KACzC;IACD,OAAO,cAAO,iCACT,IAAI,KACP,UAAU,IACV,CAAA;AACJ,CAAC;AAqCC,gCAAU;AAnCZ,SAAS,aAAa,CAAC,GAAG,EAAE,IAAI,GAAG,IAAI;IACrC,MAAM,OAAO,GAAG,GAAG,CAAC,UAAU,IAAE,GAAG,CAAA;IACnC,IAAI,SAAS,GAAG,OAAO,CAAC,SAAS,IAAI,IAAI,CAAA;IACzC,IAAG,OAAO,CAAC,SAAS,IAAI,OAAO,OAAO,CAAC,SAAS,KAAG,QAAQ,EAAC;QAC1D,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,CAAA;KAC1C;IACD,OAAO,cAAO,iCACT,OAAO,KACV,SAAS,EACT,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,IACpC,CAAA;AACJ,CAAC;AAoBC,sCAAa;AAlBf,MAAM,aAAa,GAAG,CAAC,OAAO,EAAE,EAAE,CAAC,cAAO,CAAC,OAAO,CAAC,UAAU,IAAE,OAAO,CAAC,CAAA;AAmBrE,sCAAa;AAjBf,MAAM,YAAY,GAAG,CAAC,MAAM,EAAE,EAAE,CAAC,cAAO,CAAC,MAAM,CAAC,UAAU,IAAE,MAAM,CAAC,CAAA;AAkBjE,oCAAY;AAhBd,MAAM,aAAa,GAAG,CAAC,IAAI,EAAE,EAAE,CAAC,cAAO,CAAC,IAAI,CAAC,CAAA;AAiB3C,sCAAa;AAff,SAAS,kBAAkB,CAAC,YAAY,EAAE,IAAI;IAC5C,MAAM,GAAG,GAAG,YAAY,CAAC,UAAU,IAAI,YAAY,CAAA;IACnD,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;IACpD,OAAO,cAAO,iCACT,GAAG,KACN,QAAQ;QACR,IAAI,EACJ,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,IACpC,CAAA;AACJ,CAAC;AAQC,gDAAkB"}
|
||||
{"version":3,"file":"json.js","sourceRoot":"","sources":["../../../api/utils/json.ts"],"names":[],"mappings":";;AAAA,wCAA6C;AAC7C,oCAAmC;AAEnC,SAAS,UAAU,CAAC,CAAC;IACnB,MAAM,IAAI,GAAG,CAAC,CAAC,UAAU,IAAE,CAAC,CAAA;IAC5B,IAAI,UAAU,GAAG,IAAI,CAAC,UAAU,IAAI,IAAI,CAAA;IACxC,IAAG,IAAI,CAAC,UAAU,IAAI,OAAO,IAAI,CAAC,UAAU,KAAG,QAAQ,EAAC;QACtD,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;KACzC;IACD,OAAO,cAAO,iCACT,IAAI,KACP,UAAU,IACV,CAAA;AACJ,CAAC;AAsCC,gCAAU;AApCZ,SAAS,aAAa,CAAC,GAAG,EAAE,IAAI,EAAE,OAAQ;IACxC,MAAM,OAAO,GAAG,GAAG,CAAC,UAAU,IAAE,GAAG,CAAA;IACnC,IAAI,SAAS,GAAG,OAAO,CAAC,SAAS,IAAI,IAAI,CAAA;IACzC,IAAG,OAAO,CAAC,SAAS,IAAI,OAAO,OAAO,CAAC,SAAS,KAAG,QAAQ,EAAC;QAC1D,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,CAAA;KAC1C;IACD,OAAO,cAAO,iCACT,OAAO,KACV,SAAS,EACT,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,EACpC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,IAChD,CAAA;AACJ,CAAC;AAoBC,sCAAa;AAlBf,MAAM,aAAa,GAAG,CAAC,OAAO,EAAE,EAAE,CAAC,cAAO,CAAC,OAAO,CAAC,UAAU,IAAE,OAAO,CAAC,CAAA;AAmBrE,sCAAa;AAjBf,MAAM,YAAY,GAAG,CAAC,MAAM,EAAE,EAAE,CAAC,cAAO,CAAC,MAAM,CAAC,UAAU,IAAE,MAAM,CAAC,CAAA;AAkBjE,oCAAY;AAhBd,MAAM,aAAa,GAAG,CAAC,IAAI,EAAE,EAAE,CAAC,cAAO,CAAC,IAAI,CAAC,CAAA;AAiB3C,sCAAa;AAff,SAAS,kBAAkB,CAAC,YAAY,EAAE,IAAI;IAC5C,MAAM,GAAG,GAAG,YAAY,CAAC,UAAU,IAAI,YAAY,CAAA;IACnD,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;IACpD,OAAO,cAAO,iCACT,GAAG,KACN,QAAQ;QACR,IAAI,EACJ,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,IACpC,CAAA;AACJ,CAAC;AAQC,gDAAkB"}
|
||||
Loading…
Add table
Add a link
Reference in a new issue