aiolabs/lightning-pub
2
0
Fork 0
Code Issues 9 Pull requests 4 Projects Releases Packages Wiki Activity Actions

Merge pull request #367 from shocknet/bug/slow-tunnel

Browse source 
Move tunnel logic after HTTP starts listening
This commit is contained in:
CapDog 2021-05-03 13:18:26 -04:00 • committed by GitHub
commit b2576a8147
1 changed files with 48 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

91
src/server.js
View file

@ -303,49 +303,6 @@ const server = program => {
await Storage.removeItem('tunnel/subdomain') await Storage.removeItem('tunnel/subdomain')
await Storage.removeItem('tunnel/url') await Storage.removeItem('tunnel/url')
}*/ }*/
if (program.tunnel) {
// setup localtunnel ==========
const [tunnelToken, tunnelSubdomain, tunnelUrl] = await Promise.all([
Storage.getItem('tunnel/token'),
Storage.getItem('tunnel/subdomain'),
Storage.getItem('tunnel/url')
])
const tunnelOpts = { port: serverPort, host: tunnelHost }
if (tunnelToken && tunnelSubdomain) {
tunnelOpts.tunnelToken = tunnelToken
tunnelOpts.subdomain = tunnelSubdomain
logger.info('Recreating tunnel... with subdomain: ' + tunnelSubdomain)
} else {
logger.info('Creating new tunnel...This will require a pair ')
}
tunnelHealthManager.emit('fork', {
params: tunnelOpts,
cb: async tunnel => {
if (tunnelSubdomain !== tunnel.clientId && !tunnel.token) {
logger.error(
'An error occurred while opening tunnel, will try again in 2 sec with a new one'
)
return
}
logger.info('Tunnel created! connect to: ' + tunnel.url)
const dataToQr = JSON.stringify({
internalIP: tunnel.url,
walletPort: 443,
externalIP: tunnel.url
})
qrcode.generate(dataToQr, { small: true })
if (tunnel.token) {
console.log('writing to storage...')
await Promise.all([
Storage.setItem('tunnel/token', tunnel.token),
Storage.setItem('tunnel/subdomain', tunnel.clientId),
Storage.setItem('tunnel/url', tunnel.url)
])
}
}
})
}
const storePersistentRandomField = async ({ fieldName, length = 16 }) => { const storePersistentRandomField = async ({ fieldName, length = 16 }) => {
const randomField = await Storage.getItem(fieldName) const randomField = await Storage.getItem(fieldName)
@ -471,6 +428,54 @@ const server = program => {
serverInstance.listen(serverPort, serverHost) serverInstance.listen(serverPort, serverHost)
if (program.tunnel) {
// setup localtunnel ==========
const [tunnelToken, tunnelSubdomain, tunnelUrl] = await Promise.all([
Storage.getItem('tunnel/token'),
Storage.getItem('tunnel/subdomain'),
Storage.getItem('tunnel/url')
])
const tunnelOpts = {
port: serverPort,
host: tunnelHost,
print_requests: true
}
if (tunnelToken && tunnelSubdomain) {
tunnelOpts.tunnelToken = tunnelToken
tunnelOpts.subdomain = tunnelSubdomain
logger.info('Recreating tunnel... with subdomain: ' + tunnelSubdomain)
} else {
logger.info('Creating new tunnel...This will require a pair ')
}
tunnelHealthManager.emit('fork', {
params: tunnelOpts,
cb: async tunnel => {
if (tunnelSubdomain !== tunnel.clientId && !tunnel.token) {
logger.error(
'An error occurred while opening tunnel, will try again in 2 sec with a new one'
)
return
}
logger.info('Tunnel created! connect to: ' + tunnel.url)
const dataToQr = JSON.stringify({
internalIP: tunnel.url,
walletPort: 443,
externalIP: tunnel.url
})
qrcode.generate(dataToQr, { small: true })
if (tunnel.token) {
console.log('writing to storage...')
await Promise.all([
Storage.setItem('tunnel/token', tunnel.token),
Storage.setItem('tunnel/subdomain', tunnel.clientId),
Storage.setItem('tunnel/url', tunnel.url)
])
}
}
})
}
logger.info('App listening on ' + serverHost + ' port ' + serverPort) logger.info('App listening on ' + serverHost + ' port ' + serverPort)
module.server = serverInstance module.server = serverInstance