add serve command

add listen option and change default port not to interfere with running instance
upgrade node and libs
2023-01-03 16:59:09 +01:00 · 2023-01-03 16:58:08 +01:00
5 changed files with 69 additions and 47 deletions
--- a/.tool-versions
+++ b/.tool-versions
@ -1 +1 @@
-nodejs 18.4.0
+nodejs lts-gallium
--- a/bin/populate-vikunja.js
+++ b/bin/populate-vikunja.js
@ -10,6 +10,11 @@ function addGlobal (yargs) {
      alias: 's',
      description: 'Vikinja binary to be started before data are populated or Vikunja has to be started manually'
    })
+    .option('listen', {
+      alias: 'l',
+      description: 'Vikinja API will listen on this network interface',
+      default: ':3455'
+    })
    .option('workDir', {
      description: 'directory where Sqlite database will be created if startVikunja was provided, default is folder with Vikunja binary'
    })
@ -28,7 +33,7 @@ function addGlobal (yargs) {
      default: 'demo'
    })
    .option('baseUrl', {
-      default: 'http://localhost:3456'
+      default: 'http://localhost:3455'
    })

  return yargs
@ -36,7 +41,7 @@ function addGlobal (yargs) {

 async function startVikunjaFromArgv (argv) {
  if (argv.startVikunja) {
-    return startVikunja(argv.startVikunja, argv.jwtsecret, argv.workDir, argv.deleteDb).then(() => true)
+    return startVikunja(argv.startVikunja, argv.jwtsecret, argv.workDir, argv.deleteDb, argv.listen).then(() => true)
  }

  return false
@ -47,8 +52,18 @@ function initClientFromArgv (wasStarted, argv) {
 }

 yargs(hideBin(process.argv))
+    .command('serve', '', yargs => {
+      addGlobal(yargs)
+    }, async argv => {
+      const wasStarted = await startVikunjaFromArgv(argv)
+      if (wasStarted) {
+        console.log('population done, press any key to quit')
+        await keypress()
+        process.exit()
+      }
+    })
  .command(
-    '$0 person-as-list',
+    'person-as-list',
    'will populate Vikunja tasks with persons as lists',
    yargs => {
      addGlobal(yargs)
--- a/package.json
+++ b/package.json
@ -5,12 +5,12 @@
  "license": "MIT",
  "type": "module",
  "dependencies": {
-    "@faker-js/faker": "^7.2.0",
-    "axios": "^0.27.2",
-    "fs-extra": "^10.1.0",
-    "moment": "^2.29.3",
+    "@faker-js/faker": "^7.6.0",
+    "axios": "^1.2.2",
+    "fs-extra": "^11.1.0",
+    "moment": "^2.29.4",
    "swedish-ssn-generator": "^1.0.1",
    "weighted-random-distribution": "^1.2.2",
-    "yargs": "^17.5.1"
+    "yargs": "^17.6.2"
  }
 }
--- a/src/vikunja.js
+++ b/src/vikunja.js
@ -3,7 +3,7 @@ import path from 'path'
 import fs from 'fs-extra'
 import { spawn } from 'child_process'

-export function startVikunja (bin, jwtSecret, workDir = false, deleteDb = false) {
+export function startVikunja (bin, jwtSecret, workDir = false, deleteDb = false, serviceInterface = ':3456') {
  if (!workDir) {
    workDir = path.dirname(bin)
  }
@ -24,7 +24,8 @@ export function startVikunja (bin, jwtSecret, workDir = false, deleteDb = false)
      {
        cwd: workDir,
        env: {
-          VIKUNJA_SERVICE_JWTSECRET: jwtSecret
+          VIKUNJA_SERVICE_JWTSECRET: jwtSecret,
+          VIKUNJA_SERVICE_INTERFACE: serviceInterface
        }
      }
    )
--- a/yarn.lock
+++ b/yarn.lock
@ -2,10 +2,10 @@
 # yarn lockfile v1


-"@faker-js/faker@^7.2.0":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@faker-js/faker/-/faker-7.2.0.tgz#c5fe4c34f3a3664ac64fe1a21bac2004ea5faa22"
-  integrity sha512-dzjQ0LFT+bPLWg0yyV3MpxaLJp/+VW4a0SnjNSWJ4YpJ928LXDOZAN+kB2/JPPisI3Ra0w2BxbD4M9J7o0jcpw==
+"@faker-js/faker@^7.6.0":
+  version "7.6.0"
+  resolved "https://registry.yarnpkg.com/@faker-js/faker/-/faker-7.6.0.tgz#9ea331766084288634a9247fcd8b84f16ff4ba07"
+  integrity sha512-XK6BTq1NDMo9Xqw/YkYyGjSsg44fbNwYRx7QK2CuoQgyy+f1rrTDHoExVM5PsyXCtfl2vs2vVJ0MN0yN6LppRw==

 ansi-regex@^5.0.1:
  version "5.0.1"
@ -24,21 +24,22 @@ asynckit@^0.4.0:
  resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
  integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==

-axios@^0.27.2:
-  version "0.27.2"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-0.27.2.tgz#207658cc8621606e586c85db4b41a750e756d972"
-  integrity sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==
+axios@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-1.2.2.tgz#72681724c6e6a43a9fea860fc558127dbe32f9f1"
+  integrity sha512-bz/J4gS2S3I7mpN/YZfGFTqhXTYzRho8Ay38w2otuuDR322KzFIWm/4W2K6gIwvWaws5n+mnb7D1lN9uD+QH6Q==
  dependencies:
-    follow-redirects "^1.14.9"
+    follow-redirects "^1.15.0"
    form-data "^4.0.0"
+    proxy-from-env "^1.1.0"

-cliui@^7.0.2:
-  version "7.0.4"
-  resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f"
-  integrity sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==
+cliui@^8.0.1:
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-8.0.1.tgz#0c04b075db02cbfe60dc8e6cf2f5486b1a3608aa"
+  integrity sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==
  dependencies:
    string-width "^4.2.0"
-    strip-ansi "^6.0.0"
+    strip-ansi "^6.0.1"
    wrap-ansi "^7.0.0"

 color-convert@^2.0.1:
@ -75,10 +76,10 @@ escalade@^3.1.1:
  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
  integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==

-follow-redirects@^1.14.9:
-  version "1.15.1"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.1.tgz#0ca6a452306c9b276e4d3127483e29575e207ad5"
-  integrity sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA==
+follow-redirects@^1.15.0:
+  version "1.15.2"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13"
+  integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==

 form-data@^4.0.0:
  version "4.0.0"
@ -89,10 +90,10 @@ form-data@^4.0.0:
    combined-stream "^1.0.8"
    mime-types "^2.1.12"

-fs-extra@^10.1.0:
-  version "10.1.0"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.1.0.tgz#02873cfbc4084dde127eaa5f9905eef2325d1abf"
-  integrity sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==
+fs-extra@^11.1.0:
+  version "11.1.0"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-11.1.0.tgz#5784b102104433bb0e090f48bfc4a30742c357ed"
+  integrity sha512-0rcTq621PD5jM/e0a3EJoGC/1TC5ZBCERW82LQuwfGnCa1V8w7dpYH1yNu+SLb6E5dkeCBzKEyLGlFrnr+dUyw==
  dependencies:
    graceful-fs "^4.2.0"
    jsonfile "^6.0.1"
@ -149,10 +150,15 @@ mime-types@^2.1.12:
  dependencies:
    mime-db "1.52.0"

-moment@^2.29.3:
-  version "2.29.3"
-  resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.3.tgz#edd47411c322413999f7a5940d526de183c031f3"
-  integrity sha512-c6YRvhEo//6T2Jz/vVtYzqBzwvPT95JBQ+smCytzf7c50oMZRsR/a4w88aD34I+/QVSfnoAnSBFPJHItlOMJVw==
+moment@^2.29.4:
+  version "2.29.4"
+  resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.4.tgz#3dbe052889fe7c1b2ed966fcb3a77328964ef108"
+  integrity sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==
+
+proxy-from-env@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2"
+  integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==

 require-directory@^2.1.1:
  version "2.1.1"
@ -208,20 +214,20 @@ y18n@^5.0.5:
  resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"
  integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==

-yargs-parser@^21.0.0:
-  version "21.0.1"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.0.1.tgz#0267f286c877a4f0f728fceb6f8a3e4cb95c6e35"
-  integrity sha512-9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg==
+yargs-parser@^21.1.1:
+  version "21.1.1"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35"
+  integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==

-yargs@^17.5.1:
-  version "17.5.1"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.5.1.tgz#e109900cab6fcb7fd44b1d8249166feb0b36e58e"
-  integrity sha512-t6YAJcxDkNX7NFYiVtKvWUz8l+PaKTLiL63mJYWR2GnHq2gjEWISzsLp9wg3aY36dY1j+gfIEL3pIF+XlJJfbA==
+yargs@^17.6.2:
+  version "17.6.2"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.6.2.tgz#2e23f2944e976339a1ee00f18c77fedee8332541"
+  integrity sha512-1/9UrdHjDZc0eOU0HxOHoS78C69UD3JRMvzlJ7S79S2nTaWRA/whGCTV8o9e/N/1Va9YIV7Q4sOxD8VV4pCWOw==
  dependencies:
-    cliui "^7.0.2"
+    cliui "^8.0.1"
    escalade "^3.1.1"
    get-caller-file "^2.0.5"
    require-directory "^2.1.1"
    string-width "^4.2.3"
    y18n "^5.0.5"
-    yargs-parser "^21.0.0"
+    yargs-parser "^21.1.1"
Author	SHA1	Message	Date
k2s	36c62d603f	add serve command add listen option and change default port not to interfere with running instance	2023-01-03 16:59:09 +01:00
k2s	8c3b09082a	upgrade node and libs	2023-01-03 16:58:08 +01:00