@jsreport/jsreport-cli 3.0.0-beta.2 → 3.1.1

package/lib/commands/win-uninstall.js

@@ -1,102 +1,100 @@
-'use strict'
-
-const path = require('path')
-const fs = require('fs')
-const platform = require('os').platform()
-const Winser = require('winser-with-api').Winser
-
-const description = 'WINDOWS ONLY - Stop and uninstall service'
-const command = 'win-uninstall'
-
-exports.command = command
-exports.description = description
-
-exports.handler = (argv) => {
-  return new Promise((resolve, reject) => {
-    const verbose = argv.verbose
-    const context = argv.context
-    const logger = context.logger
-    const cwd = context.cwd
-    const staticPaths = context.staticPaths || {}
-    const appInfo = context.appInfo
-    const existsPackageJson = fs.existsSync(path.join(cwd, './package.json'))
-    let pathToApp
-    let serviceName
-    let customError
-
-    logger.info('Platform is ' + platform)
-
-    if (platform !== 'win32') {
-      logger.info('Unstalling windows service for app only works on windows platforms..')
-
-      return resolve({
-        uninstalled: false,
-        serviceName: null
-      })
-    }
-
-    if (!existsPackageJson && !appInfo) {
-      customError = new Error('To uninstall windows service for app you need a package.json file')
-      customError.cleanState = true
-      return reject(customError)
-    }
-
-    if (appInfo) {
-      if (!appInfo.path) {
-        customError = new Error('To uninstall windows service for app you need to pass "path" in appInfo')
-        customError.cleanState = true
-        return reject(customError)
-      }
-
-      pathToApp = appInfo.path
-
-      if (!appInfo.name) {
-        customError = new Error('To uninstall windows service for app you need to pass "name" in appInfo')
-        customError.cleanState = true
-        return reject(customError)
-      }
-
-      serviceName = appInfo.name
-    } else {
-      pathToApp = cwd
-
-      const userPkg = require(path.join(pathToApp, './package.json'))
-
-      if (!userPkg.name) {
-        customError = new Error('To uninstall windows service for app you need a "name" field in package.json file')
-        customError.cleanState = true
-        return reject(customError)
-      }
-
-      serviceName = userPkg.name
-    }
-
-    logger.info('Uninstalling windows service "' + serviceName + '".')
-
-    let winser
-
-    if (appInfo) {
-      winser = Winser({ silent: !verbose, nssmPath: staticPaths.nssm, app: appInfo })
-    } else {
-      winser = Winser({ silent: !verbose, nssmPath: staticPaths.nssm })
-    }
-
-    winser.remove({
-      path: pathToApp,
-      stop: true
-    }, (err) => {
-      if (err) {
-        const error = 'Error while trying to uninstall windows service'
-        error.originalError = err
-        return reject(error)
-      }
-
-      logger.info('Windows service "' + serviceName + '" uninstalled')
-
-      resolve({
-        uninstalled: true,
-        serviceName: serviceName
-      })
-    })
-  })
-}
+const path = require('path')
+const fs = require('fs')
+const platform = require('os').platform()
+const Winser = require('winser-with-api').Winser
+
+const description = 'WINDOWS ONLY - Stop and uninstall service'
+const command = 'win-uninstall'
+
+exports.command = command
+exports.description = description
+
+exports.handler = (argv) => {
+  return new Promise((resolve, reject) => {
+    const verbose = argv.verbose
+    const context = argv.context
+    const logger = context.logger
+    const cwd = context.cwd
+    const staticPaths = context.staticPaths || {}
+    const appInfo = context.appInfo
+    const existsPackageJson = fs.existsSync(path.join(cwd, './package.json'))
+    let pathToApp
+    let serviceName
+    let customError
+
+    logger.info('Platform is ' + platform)
+
+    if (platform !== 'win32') {
+      logger.info('Unstalling windows service for app only works on windows platforms..')
+
+      return resolve({
+        uninstalled: false,
+        serviceName: null
+      })
+    }
+
+    if (!existsPackageJson && !appInfo) {
+      customError = new Error('To uninstall windows service for app you need a package.json file')
+      customError.cleanState = true
+      return reject(customError)
+    }
+
+    if (appInfo) {
+      if (!appInfo.path) {
+        customError = new Error('To uninstall windows service for app you need to pass "path" in appInfo')
+        customError.cleanState = true
+        return reject(customError)
+      }
+
+      pathToApp = appInfo.path
+
+      if (!appInfo.name) {
+        customError = new Error('To uninstall windows service for app you need to pass "name" in appInfo')
+        customError.cleanState = true
+        return reject(customError)
+      }
+
+      serviceName = appInfo.name
+    } else {
+      pathToApp = cwd
+
+      const userPkg = require(path.join(pathToApp, './package.json'))
+
+      if (!userPkg.name) {
+        customError = new Error('To uninstall windows service for app you need a "name" field in package.json file')
+        customError.cleanState = true
+        return reject(customError)
+      }
+
+      serviceName = userPkg.name
+    }
+
+    logger.info('Uninstalling windows service "' + serviceName + '".')
+
+    let winser
+
+    if (appInfo) {
+      winser = Winser({ silent: !verbose, nssmPath: staticPaths.nssm, app: appInfo })
+    } else {
+      winser = Winser({ silent: !verbose, nssmPath: staticPaths.nssm })
+    }
+
+    winser.remove({
+      path: pathToApp,
+      stop: true
+    }, (err) => {
+      if (err) {
+        const error = 'Error while trying to uninstall windows service'
+        error.originalError = err
+        return reject(error)
+      }
+
+      logger.info('Windows service "' + serviceName + '" uninstalled')
+
+      resolve({
+        uninstalled: true,
+        serviceName: serviceName
+      })
+    })
+  })
+}

package/lib/daemonHandler.js

@@ -1,164 +1,164 @@
-'use strict'
-
-const util = require('util')
-const path = require('path')
-const fs = require('fs')
-const nssocket = require('nssocket')
-const lockfile = require('lockfile')
-const getTempPaths = require('./getTempPaths')
-const normalizeSocketPath = require('./normalizeSocketPath')
-
-const lock = util.promisify(lockfile.lock.bind(lockfile))
-const unlock = util.promisify(lockfile.unlock.bind(lockfile))
-
-exports.findProcessByCWD = findProcessByCWD
-exports.findProcessByUidOrPid = findProcessByUidOrPid
-exports.getAllProcesses = getAllProcesses
-exports.getSockets = getSockets
-exports.kill = kill
-
-async function findProcessByCWD (sockPath, cwd) {
-  const processes = await getAllProcesses(sockPath)
-
-  const procs = processes.filter((p) => {
-    return p.cwd === cwd
-  })
-
-  if (procs.length === 0) {
-    return null
-  }
-
-  return procs[0]
-}
-
-async function findProcessByUidOrPid (sockPath, id) {
-  const processes = await getAllProcesses(sockPath)
-
-  const procs = search([(p) => {
-    return p.uid === id
-  }, (p) => {
-    return String(p.pid) === String(id)
-  }])
-
-  if (procs.length === 0) {
-    return null
-  }
-
-  return procs[0]
-
-  function search (filters) {
-    let result = []
-
-    filters.forEach((filter) => {
-      if (result.length > 0) {
-        return
-      }
-
-      result = processes.filter(filter)
-    })
-
-    return result
-  }
-}
-
-async function kill (proc) {
-  const socketFile = proc.normalizedSocketFile
-  const lockfilePath = path.join(getTempPaths().cliPath, 'jsreport-keepAlive-kill.lock')
-
-  await lock(lockfilePath, {
-    stale: 3500,
-    retries: 30,
-    retryWait: 100
-  })
-
-  try {
-    await new Promise((resolve, reject) => {
-      const socket = new nssocket.NsSocket()
-
-      socket.connect(socketFile, (err) => {
-        if (err) {
-          return reject(err)
-        }
-
-        socket.send(['kill'], (err) => {
-          if (err) {
-            return reject(err)
-          }
-
-          resolve()
-          socket.end()
-        })
-      })
-
-      socket.on('close', () => {
-        // we only care to reject on close when there was no other event fired
-        // that resolved the promise.
-        // this can happen when we are in the middle of sending data and the socket
-        // was detroyed for some reason (like daemon process exit)
-        reject(new Error(`connection to socket "${socketFile}" was closed unexpectedly`))
-      })
-
-      socket.on('error', (err) => {
-        reject(err)
-      })
-    })
-  } finally {
-    await unlock(lockfilePath)
-  }
-}
-
-async function getAllProcesses (sockPath) {
-  const sockets = await getSockets(sockPath)
-
-  const processes = await Promise.all(sockets.map(async function getProcess (name) {
-    let fullPath = path.join(sockPath, name)
-    const socket = new nssocket.NsSocket()
-
-    fullPath = normalizeSocketPath(fullPath)
-
-    return new Promise((resolve, reject) => {
-      socket.connect(fullPath, (connectErr) => {
-        if (connectErr) {
-          return reject(connectErr)
-        }
-
-        socket.dataOnce(['info'], (info) => {
-          resolve(info)
-          socket.end()
-        })
-
-        socket.send(['info'], (err) => {
-          if (err) {
-            return resolve()
-          }
-        })
-      })
-
-      socket.on('close', () => {
-        resolve()
-      })
-
-      socket.on('error', (err) => {
-        if (err.code === 'ECONNREFUSED') {
-          try {
-            fs.unlinkSync(fullPath)
-          } catch (e) {}
-
-          resolve()
-        } else {
-          resolve()
-        }
-      })
-    })
-  }))
-
-  return processes.filter(Boolean)
-}
-
-async function getSockets (sockPath) {
-  let sockets = []
-
-  sockets = fs.readdirSync(sockPath)
-
-  return sockets
-}
+'use strict'
+
+const util = require('util')
+const path = require('path')
+const fs = require('fs')
+const nssocket = require('nssocket')
+const lockfile = require('lockfile')
+const getTempPaths = require('./utils/getTempPaths')
+const normalizeSocketPath = require('./utils/normalizeSocketPath')
+
+const lock = util.promisify(lockfile.lock.bind(lockfile))
+const unlock = util.promisify(lockfile.unlock.bind(lockfile))
+
+exports.findProcessByCWD = findProcessByCWD
+exports.findProcessByUidOrPid = findProcessByUidOrPid
+exports.getAllProcesses = getAllProcesses
+exports.getSockets = getSockets
+exports.kill = kill
+
+async function findProcessByCWD (sockPath, cwd) {
+  const processes = await getAllProcesses(sockPath)
+
+  const procs = processes.filter((p) => {
+    return p.cwd === cwd
+  })
+
+  if (procs.length === 0) {
+    return null
+  }
+
+  return procs[0]
+}
+
+async function findProcessByUidOrPid (sockPath, id) {
+  const processes = await getAllProcesses(sockPath)
+
+  const procs = search([(p) => {
+    return p.uid === id
+  }, (p) => {
+    return String(p.pid) === String(id)
+  }])
+
+  if (procs.length === 0) {
+    return null
+  }
+
+  return procs[0]
+
+  function search (filters) {
+    let result = []
+
+    filters.forEach((filter) => {
+      if (result.length > 0) {
+        return
+      }
+
+      result = processes.filter(filter)
+    })
+
+    return result
+  }
+}
+
+async function kill (proc) {
+  const socketFile = proc.normalizedSocketFile
+  const lockfilePath = path.join(getTempPaths().cliPath, 'jsreport-keepAlive-kill.lock')
+
+  await lock(lockfilePath, {
+    stale: 3500,
+    retries: 30,
+    retryWait: 100
+  })
+
+  try {
+    await new Promise((resolve, reject) => {
+      const socket = new nssocket.NsSocket()
+
+      socket.connect(socketFile, (err) => {
+        if (err) {
+          return reject(err)
+        }
+
+        socket.send(['kill'], (err) => {
+          if (err) {
+            return reject(err)
+          }
+
+          resolve()
+          socket.end()
+        })
+      })
+
+      socket.on('close', () => {
+        // we only care to reject on close when there was no other event fired
+        // that resolved the promise.
+        // this can happen when we are in the middle of sending data and the socket
+        // was detroyed for some reason (like daemon process exit)
+        reject(new Error(`connection to socket "${socketFile}" was closed unexpectedly`))
+      })
+
+      socket.on('error', (err) => {
+        reject(err)
+      })
+    })
+  } finally {
+    await unlock(lockfilePath)
+  }
+}
+
+async function getAllProcesses (sockPath) {
+  const sockets = await getSockets(sockPath)
+
+  const processes = await Promise.all(sockets.map(async function getProcess (name) {
+    let fullPath = path.join(sockPath, name)
+    const socket = new nssocket.NsSocket()
+
+    fullPath = normalizeSocketPath(fullPath)
+
+    return new Promise((resolve, reject) => {
+      socket.connect(fullPath, (connectErr) => {
+        if (connectErr) {
+          return reject(connectErr)
+        }
+
+        socket.dataOnce(['info'], (info) => {
+          resolve(info)
+          socket.end()
+        })
+
+        socket.send(['info'], (err) => {
+          if (err) {
+            return resolve()
+          }
+        })
+      })
+
+      socket.on('close', () => {
+        resolve()
+      })
+
+      socket.on('error', (err) => {
+        if (err.code === 'ECONNREFUSED') {
+          try {
+            fs.unlinkSync(fullPath)
+          } catch (e) {}
+
+          resolve()
+        } else {
+          resolve()
+        }
+      })
+    })
+  }))
+
+  return processes.filter(Boolean)
+}
+
+async function getSockets (sockPath) {
+  let sockets = []
+
+  sockets = fs.readdirSync(sockPath)
+
+  return sockets
+}