Skip to content

Commit

Permalink
Update eslint config (#904)
Browse files Browse the repository at this point in the history
* Update eslint config

Fix linting issues

* Add eslint

* Use actor instead of service

* Add prettier
  • Loading branch information
aidenaio authored Mar 28, 2023
1 parent a55422c commit 53a5cca
Show file tree
Hide file tree
Showing 104 changed files with 3,442 additions and 3,415 deletions.
27 changes: 4 additions & 23 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,29 +1,10 @@
{
"[javascript]": {
"editor.formatOnPaste": false,
"editor.formatOnSave": false
},
"[javascriptreact]": {
"editor.formatOnPaste": false,
"editor.formatOnSave": false
},
"[typescript]": {
"editor.formatOnPaste": false,
"editor.formatOnSave": false
},
"[typescriptreact]": {
"editor.formatOnPaste": false,
"editor.formatOnSave": true,
"editor.formatOnSaveMode": "modifications",
"[javascript][javascriptreact][typescript][typescriptreact]": {
"editor.formatOnSave": false
},
"editor.formatOnSaveMode": "modificationsIfAvailable",
"editor.formatOnSave": true,
"editor.codeActionsOnSave": {
"source.fixAll": true
},
"eslint.validate": [
"javascript",
"javascriptreact",
"typescript",
"typescriptreact"
]
}
}
51 changes: 26 additions & 25 deletions main/idena-node.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ const kill = require('tree-kill')
const lineReader = require('reverse-line-reader')
// eslint-disable-next-line import/no-extraneous-dependencies
const appDataPath = require('./app-data-path')
const {sleep} = require('./utils')
const logger = require('./logger')

const idenaBin = 'idena-go'
Expand Down Expand Up @@ -52,7 +51,7 @@ const getReleaseUrl = async () => {
default:
}

const asset = data.assets.filter(x => x.name.startsWith(assetName))
const asset = data.assets.filter((x) => x.name.startsWith(assetName))

return asset.length ? asset[0].browser_download_url : null
}
Expand All @@ -69,6 +68,7 @@ const getRemoteVersion = async () => {
}

async function downloadNode(onProgress) {
// eslint-disable-next-line no-async-promise-executor
return new Promise(async (resolve, reject) => {
try {
const url = await getReleaseUrl()
Expand All @@ -93,13 +93,13 @@ async function downloadNode(onProgress) {
length: parseInt(response.headers['content-length'], 10),
})

str.on('progress', function(p) {
str.on('progress', (p) => {
onProgress({...p, version})
})

response.data.pipe(str).pipe(writer)
} catch (error) {
return reject(error)
reject(error)
}
})
}
Expand All @@ -121,6 +121,7 @@ async function startNode(
ipfsPort,
apiKey,
autoActivateMining,
// eslint-disable-next-line default-param-last
useLogging = true,
onLog,
onExit
Expand Down Expand Up @@ -152,24 +153,24 @@ async function startNode(

const idenaNode = spawn(getNodeFile(), parameters)

idenaNode.stdout.on('data', data => {
idenaNode.stdout.on('data', (data) => {
const str = data.toString()
if (onLog) onLog(str.split('\n').filter(x => x))
if (onLog) onLog(str.split('\n').filter((x) => x))
if (useLogging) {
console.log(str)
}
})

idenaNode.stderr.on('data', err => {
idenaNode.stderr.on('data', (err) => {
const str = err.toString()
writeError(str)
if (onLog) onLog(str.split('\n').filter(x => x))
if (onLog) onLog(str.split('\n').filter((x) => x))
if (useLogging) {
console.error(str)
}
})

idenaNode.on('exit', code => {
idenaNode.on('exit', (code) => {
if (useLogging) {
console.info(`child process exited with code ${code}`)
}
Expand All @@ -182,16 +183,16 @@ async function startNode(
}

async function stopNode(node) {
return new Promise(async (resolve, reject) => {
return new Promise((resolve, reject) => {
try {
if (!node) {
return resolve('node process not found')
resolve('node process not found')
}
if (node.exitCode != null) {
return resolve(`node already exited with code ${node.exitCode}`)
resolve(`node already exited with code ${node.exitCode}`)
}
if (process.platform !== 'win32') {
kill(node.pid, 'SIGINT', function(err) {
kill(node.pid, 'SIGINT', (err) => {
if (err) {
return reject(err)
}
Expand All @@ -203,7 +204,7 @@ async function stopNode(node) {
node.kill()
}
} catch (e) {
return reject(e)
reject(e)
}
})
}
Expand All @@ -214,7 +215,7 @@ function getCurrentVersion(tempNode) {

try {
const nodeVersion = spawn(node, ['--version'])
nodeVersion.stdout.on('data', data => {
nodeVersion.stdout.on('data', (data) => {
const {version} = semver.coerce(data.toString())
return semver.valid(version)
? resolve(version)
Expand All @@ -225,29 +226,29 @@ function getCurrentVersion(tempNode) {
)
})

nodeVersion.stderr.on('data', data =>
nodeVersion.stderr.on('data', (data) =>
reject(
new Error(`cannot resolve node version, stderr: ${data.toString()}`)
)
)

nodeVersion.on('exit', code => {
nodeVersion.on('exit', (code) => {
if (code) {
return reject(
new Error(`cannot resolve node version, exit code ${code}`)
)
}
})

nodeVersion.on('error', err => reject(err))
nodeVersion.on('error', (err) => reject(err))
} catch (e) {
return reject(e)
reject(e)
}
})
}

function updateNode() {
return new Promise(async (resolve, reject) => {
return new Promise((resolve, reject) => {
try {
const currentNode = getNodeFile()
const tempNode = getTempNodeFile()
Expand All @@ -260,22 +261,22 @@ function updateNode() {
}
done = true
} catch (e) {
await sleep(1000)
console.error('error checking current node')
} finally {
num -= 1
}
}
if (!done) {
return reject(new Error('cannot remove old idena-go file'))
reject(new Error('cannot remove old idena-go file'))
}

fs.renameSync(tempNode, currentNode)
if (process.platform !== 'win32') {
fs.chmodSync(currentNode, '755')
}
return resolve()
resolve()
} catch (e) {
return reject(e)
reject(e)
}
})
}
Expand All @@ -296,7 +297,7 @@ function getLastLogs() {
return new Promise((resolve, reject) => {
try {
const logs = []
lineReader.eachLine(getNodeLogsFile(), function(line, last) {
lineReader.eachLine(getNodeLogsFile(), (line, last) => {
logs.push(line)
if (logs.length === number || last) {
resolve(logs.reverse())
Expand Down
Loading

0 comments on commit 53a5cca

Please sign in to comment.