@jsreport/jsreport-cli 4.0.4 → 4.1.0

package/README.md

@@ -7,6 +7,15 @@ See http://jsreport.net/learn/cli for documentation
 
 ## Changelog
 
+### 4.1.0
+
+- update deps to fix audit
+- add graceful shutdown to the server.js
+
+### 4.0.5
+
+- update dev prompt to prompts to fix audit
+
 ### 4.0.4
 
 - dont use console.error(e.stack) and just console.error(e) to avoid loosing e.cause inner error

package/example.server.js

@@ -12,3 +12,15 @@ if (process.env.JSREPORT_CLI) {
     process.exit(1)
   })
 }
+
+async function shutdown () {
+  try {
+    await jsreport.close()
+    process.exit(0)
+  } catch (e) {
+    console.error(e)
+    process.exit(1)
+  }
+}
+process.on('SIGTERM', shutdown)
+process.on('SIGINT', shutdown)

package/lib/commander/startProcessing.js

@@ -1,5 +1,5 @@
 const yargs = require('yargs')
-const prompt = require('prompt')
+const prompts = require('prompts')
 const startCommand = require('./startCommand')
 const jsreportInstance = require('./jsreportInstance')
 const cliPackageJson = require('../../package.json')
@@ -158,37 +158,27 @@ module.exports = async function startProcessing (commander, logger, args) {
         argv.password = needsPassword
       }, true)
     } else {
-      await new Promise((resolve, reject) => {
-        prompt.start()
-
-        prompt.message = ''
-
-        prompt.get([{
+      try {
+        const response = await prompts({
+          type: 'password',
           name: 'password',
-          description: 'Password',
-          message: 'Password can\'t be empty',
-          type: 'string',
-          hidden: true,
-          required: true
-        }], (err, result) => {
-          if (err) {
-            const errorToReject = new Error('No value for password option')
-            errorToReject.cleanState = true
-
-            commander.emit('started', errorToReject, null)
-
-            return reject(errorToReject)
-          }
+          message: 'Password',
+          validate: value => value.trim() === '' ? 'Password can\'t be empty' : true
+        })
 
-          // we add middleware to pre-define the "p/password" option to
-          commander._cli.middleware((argv) => {
-            argv.p = result.password
-            argv.password = result.password
-          }, true)
+        // we add middleware to pre-define the "p/password" option to
+        commander._cli.middleware((argv) => {
+          argv.p = response.password
+          argv.password = response.password
+        }, true)
+      } catch (error) {
+        const errorToReject = new Error('No value for password option')
+        errorToReject.cleanState = true
 
-          resolve()
-        })
-      })
+        commander.emit('started', errorToReject, null)
+
+        throw errorToReject
+      }
     }
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsreport/jsreport-cli",
-  "version": "4.0.4",
+  "version": "4.1.0",
   "description": "Command line interface for jsreport",
   "keywords": [
     "jsreport",
@@ -50,7 +50,7 @@
     "test:watch": "mocha --recursive \"./test/*.spec.js\" \"./test/commands/**/*.spec.js\" --timeout 28000 --exit --watch"
   },
   "dependencies": {
-    "@jsreport/nodejs-client": "4.0.2",
+    "@jsreport/nodejs-client": "4.0.4",
     "chalk": "2.4.2",
     "cliui": "7.0.4",
     "inquirer": "8.2.0",
@@ -60,20 +60,20 @@
     "liftoff": "4.0.0",
     "lockfile": "1.0.4",
     "lodash.omit": "4.5.0",
-    "nanoid": "3.2.0",
+    "nanoid": "3.3.8",
     "npm-install-package": "2.1.0",
     "nssocket": "0.6.0",
     "once": "1.4.0",
-    "prompt": "1.3.0",
+    "prompts": "2.4.2",
     "semver": "7.5.4",
     "silent-spawn": "0.4.0",
     "yargs": "17.3.1"
   },
   "devDependencies": {
-    "@jsreport/jsreport-authentication": "4.1.0",
-    "@jsreport/jsreport-core": "4.2.2",
-    "@jsreport/jsreport-express": "4.1.0",
-    "@jsreport/jsreport-fs-store": "4.0.3",
+    "@jsreport/jsreport-authentication": "4.2.3",
+    "@jsreport/jsreport-core": "4.6.0",
+    "@jsreport/jsreport-express": "4.2.0",
+    "@jsreport/jsreport-fs-store": "4.1.0",
     "@jsreport/jsreport-handlebars": "4.0.1",
     "cross-env": "5.2.1",
     "execa": "1.0.0",