Merge branch 'master' of gitlab.com:MrFry/mrfrys-node-server

.dockerignore

@@ -4,5 +4,6 @@ dist
 stats
 data
 publicDirs
+nextStatic
 devel
 .git

scripts/make.sh

@@ -1,7 +1,9 @@
 #!/bin/bash
 
 hr() {
+  if [ -t 0 ]; then
     printf '\033[0;32m%*s\033[0m\n' "$(tput cols)" '' | tr ' ' '='
+  fi
 }
 
 log() {
@@ -80,16 +82,14 @@ touch publicDirs/qminingPublic/version
 touch publicDirs/qminingPublic/motd
 
 if [ -z "$(ls -A ./data/dbs)" ]; then
+  log "Making DB-s"
   pushd src/standaloneUtils
   NS_LOGLEVEL=2 node dbSetup.js
   mv *.db ../../data/dbs
   popd
 fi
 
+log "Disabling next telemetry"
 npx --yes next telemetry disable
 
-hr
+log "Done!"
-echo "Done!"
-echo "npm start {loglevel}"
-echo "To start server"
-hr

scripts/runDocker.sh

@@ -21,14 +21,18 @@ elif [ "$1" == "stop" ]; then
   docker stop $(getContainerId)
 elif [ "$1" == "start" ]; then
   # --entrypoint bash \
-  docker start -i $(getContainerId)
+  scripts/setup.sh
+  docker start $(getContainerId)
 elif [ "$1" == "run" ]; then
   # --entrypoint bash \
-  docker run -it \
+  scripts/setup.sh
-    -p 8080:80 \
+
-    --mount src="$(pwd)/stats",target=/server/stats,type=bind \
+  docker run \
-    --mount src="$(pwd)/data",target=/server/data,type=bind \
+    --network host \
-    --mount src="$(pwd)/publicDirs",target=/server/publicDirs,type=bind \
+    --mount src="$(pwd)/stats",target="/server/stats",type=bind \
+    --mount src="$(pwd)/data",target="/server/data",type=bind \
+    --mount src="$(pwd)/publicDirs",target="/server/publicDirs",type=bind \
+    --mount src="/etc/letsencrypt",target="/etc/letsencrypt",type=bind \
     qminer/mrfrys-node-server
 elif [ "$1" == "bash" ]; then
   docker exec -it $(getContainerId) /bin/bash

scripts/serverStats.js

@@ -74,7 +74,8 @@ const filterFromDailyStats = [
   '.xml',
   '.aspx',
   '/questionDbs/',
-  '/chatFiles/'
+  '/chatFiles/',
+  'rss'
 ]
 
 // -----------------------------------------------------------------
@@ -291,7 +292,7 @@ function pCols(cols, rowTitles, colorNames, firstRowColor) {
 
 // ------------------------------------------------------------------------------
 printHeader('Daily stats')
-
+try {
   const dailyStats = readJSON(`${dir}stats/vstats`)
   function preProcessDailyStats(obj) {
     const formatted = Object.keys(obj).reduce((acc, key) => {
@@ -349,9 +350,13 @@ pCols(
     null,
     true
   )
+} catch (e) {
+  console.error(e)
+}
 
 // ------------------------------------------------------------------------------
 printHeader('User id test solving')
+try {
   const userIdTestSolving = readJSON(`${dir}stats/idvstats`)
   function preProcessUIdTestSolving(obj, minLength) {
     if (!obj) {
@@ -384,9 +389,13 @@ pCols(
     false,
     'green'
   )
+} catch(e) {
+  console.error(e)
+}
 
 // ------------------------------------------------------------------------------
 printHeader('User id requests')
+try {
   const clientIdTestSolving = readJSON(`${dir}stats/uvstats`)
   function getUserIdRequests(day) {
     return [
@@ -430,8 +439,12 @@ function printLastDataCount(data) {
 
     pCols(res, ['', 'Users', 'Subjects', 'Questions'], false, 'green')
   }
+} catch(e) {
+  console.error(e)
+}
 // ------------------------------------------------------------------------------
 printHeader('Daily script install / update check count')
+try {
   function getDailyScriptStat(day) {
     const log =
       !day || day === 0
@@ -453,3 +466,6 @@ const installs = [...Array(colsToPrint).keys()].map((x) => {
   })
 
   pCols(installs, ['', 'Installs', 'Updates'], false, 'green')
+} catch(e) {
+  console.error(e)
+}

scripts/start.sh

@@ -1,4 +1,4 @@
 #!/bin/bash
 
 scripts/make.sh
-npm run start
+npm run start > /dev/null

src/server.ts

@@ -24,8 +24,8 @@ console.log('Current working directory: ' + process.cwd())
 const startHTTPS = true
 const isRoot = process.getuid && process.getuid() === 0
 
-const port = isRoot ? 80 : 8080
+const port = 8080
-const httpsport = isRoot ? 443 : 5001
+const httpsport = 5001
 
 // import os from 'os'
 // os.setPriority(10)