Browse Source

more logging in grpc

feature/dockerfile-arm
Evan Feenstra 5 years ago
parent
commit
fc114323eb
  1. 2
      .gitignore
  2. 22
      api/grpc/index.ts
  3. 2
      config/config.json
  4. 23
      dist/api/grpc/index.js
  5. 2
      dist/api/grpc/index.js.map

2
.gitignore

@ -1,6 +1,8 @@
notes.md notes.md
todo.md todo.md
sphinx.db
# just for testing # just for testing
binaries/nodeapp-macos binaries/nodeapp-macos
binaries/nodeapp-alpine binaries/nodeapp-alpine

22
api/grpc/index.ts

@ -24,9 +24,12 @@ async function parseAndVerifyPayload(data){
payload.sender = payload.sender||{} payload.sender = payload.sender||{}
payload.sender.pub_key=v.pubkey payload.sender.pub_key=v.pubkey
return payload return payload
} else {
console.error('[GRPC] invalid payload signature')
} }
} }
} catch(e) { } catch(e) {
console.error('[GRPC] failed to parse msg')
return null return null
} }
} }
@ -36,16 +39,27 @@ async function parseKeysendInvoice(i, actions){
const buf = recs && recs[SPHINX_CUSTOM_RECORD_KEY] const buf = recs && recs[SPHINX_CUSTOM_RECORD_KEY]
const data = buf && buf.toString() const data = buf && buf.toString()
const value = i && i.value && parseInt(i.value) const value = i && i.value && parseInt(i.value)
if(!data) return if(!data) {
console.error('[GRPC] no keysend data received')
return
}
let payload let payload
if(data[0]==='{'){ if(data[0]==='{'){
try { try {
payload = await parseAndVerifyPayload(data) payload = await parseAndVerifyPayload(data)
} catch(e){} } catch(e){
console.error('[GRPC] failed to parse and verify payload')
}
} else { } else {
const threads = weave(data) const threads = weave(data)
if(threads) payload = await parseAndVerifyPayload(threads) if(threads) {
try {
payload = await parseAndVerifyPayload(threads)
} catch(e){
console.error('[GRPC] failed to parse and verify payload II')
}
}
} }
if(payload){ if(payload){
const dat = payload.content || payload const dat = payload.content || payload
@ -57,6 +71,8 @@ async function parseKeysendInvoice(i, actions){
} else { } else {
console.log('Incorrect payload type:', payload.type) console.log('Incorrect payload type:', payload.type)
} }
} else {
console.error('[GRPC] no payload')
} }
} }

2
config/config.json

@ -1,7 +1,7 @@
{ {
"development": { "development": {
"dialect": "sqlite", "dialect": "sqlite",
"storage": "./sphinx.db" "storage": "/Users/Shared/sphinx.db"
}, },
"docker_development": { "docker_development": {
"dialect": "sqlite", "dialect": "sqlite",

23
dist/api/grpc/index.js

@ -35,9 +35,13 @@ function parseAndVerifyPayload(data) {
payload.sender.pub_key = v.pubkey; payload.sender.pub_key = v.pubkey;
return payload; return payload;
} }
else {
console.error('[GRPC] invalid payload signature');
}
} }
} }
catch (e) { catch (e) {
console.error('[GRPC] failed to parse msg');
return null; return null;
} }
}); });
@ -48,20 +52,30 @@ function parseKeysendInvoice(i, actions) {
const buf = recs && recs[lightning_1.SPHINX_CUSTOM_RECORD_KEY]; const buf = recs && recs[lightning_1.SPHINX_CUSTOM_RECORD_KEY];
const data = buf && buf.toString(); const data = buf && buf.toString();
const value = i && i.value && parseInt(i.value); const value = i && i.value && parseInt(i.value);
if (!data) if (!data) {
console.error('[GRPC] no keysend data received');
return; return;
}
let payload; let payload;
if (data[0] === '{') { if (data[0] === '{') {
try { try {
payload = yield parseAndVerifyPayload(data); payload = yield parseAndVerifyPayload(data);
} }
catch (e) { } catch (e) {
console.error('[GRPC] failed to parse and verify payload');
}
} }
else { else {
const threads = weave(data); const threads = weave(data);
if (threads) if (threads) {
try {
payload = yield parseAndVerifyPayload(threads); payload = yield parseAndVerifyPayload(threads);
} }
catch (e) {
console.error('[GRPC] failed to parse and verify payload II');
}
}
}
if (payload) { if (payload) {
const dat = payload.content || payload; const dat = payload.content || payload;
if (value && dat && dat.message) { if (value && dat && dat.message) {
@ -74,6 +88,9 @@ function parseKeysendInvoice(i, actions) {
console.log('Incorrect payload type:', payload.type); console.log('Incorrect payload type:', payload.type);
} }
} }
else {
console.error('[GRPC] no payload');
}
}); });
} }
const chunks = {}; const chunks = {};

2
dist/api/grpc/index.js.map

File diff suppressed because one or more lines are too long
Loading…
Cancel
Save