Merge branch 'master' into 2685-Desktop-Sub-Menu

deployment/bare_metal/.env.dist

@@ -57,10 +57,15 @@ EMAIL_CODE_REQUEST_TIME=10
 WEBHOOK_ELOPAGE_SECRET=secret
 
 # Federation
-# if you set the value of FEDERATION_DHT_TOPIC, the DHT hyperswarm will start to announce and listen
+FEDERATION_DHT_CONFIG_VERSION=v2.2023-02-07
-# on an hash created from this topic
+# if you set the value of FEDERATION_DHT_TOPIC, the DHT hyperswarm will start to announce and listen on an hash created from this topic
 # FEDERATION_DHT_TOPIC=GRADIDO_HUB
 # FEDERATION_DHT_SEED=64ebcb0e3ad547848fef4197c6e2332f
+FEDERATION_COMMUNITY_URL=http://stage1.gradido.net
+# the api port is the baseport, which will be added with the api-version, e.g. 1_0 = 5010
+FEDERATION_COMMUNITY_API_PORT=5000
+
+
 
 # database
 DATABASE_CONFIG_VERSION=v1.2022-03-18

deployment/bare_metal/install.sh

@@ -137,6 +137,9 @@ envsubst "$(env | sed -e 's/=.*//' -e 's/^/\$/g')" < $PROJECT_ROOT/frontend/.env
 # Configure admin
 envsubst "$(env | sed -e 's/=.*//' -e 's/^/\$/g')" < $PROJECT_ROOT/admin/.env.template > $PROJECT_ROOT/admin/.env
 
+# Configure dht-node
+envsubst "$(env | sed -e 's/=.*//' -e 's/^/\$/g')" < $PROJECT_ROOT/dht-node/.env.template > $PROJECT_ROOT/dht-node/.env
+
 # create cronjob to delete yarn output in /tmp
 # crontab -e
 # hourly job: 0 * * * * find /tmp -name "yarn--*" -cmin +60 -exec rm -r {} \; > /dev/null

deployment/bare_metal/start.sh

@@ -93,10 +93,12 @@ cp -f $PROJECT_ROOT/database/.env $PROJECT_ROOT/database/.env.bak
 cp -f $PROJECT_ROOT/backend/.env $PROJECT_ROOT/backend/.env.bak
 cp -f $PROJECT_ROOT/frontend/.env $PROJECT_ROOT/frontend/.env.bak
 cp -f $PROJECT_ROOT/admin/.env $PROJECT_ROOT/admin/.env.bak
+cp -f $PROJECT_ROOT/dht-node/.env $PROJECT_ROOT/dht-node/.env.bak
 envsubst "$(env | sed -e 's/=.*//' -e 's/^/\$/g')" < $PROJECT_ROOT/database/.env.template > $PROJECT_ROOT/database/.env
 envsubst "$(env | sed -e 's/=.*//' -e 's/^/\$/g')" < $PROJECT_ROOT/backend/.env.template > $PROJECT_ROOT/backend/.env
 envsubst "$(env | sed -e 's/=.*//' -e 's/^/\$/g')" < $PROJECT_ROOT/frontend/.env.template > $PROJECT_ROOT/frontend/.env
 envsubst "$(env | sed -e 's/=.*//' -e 's/^/\$/g')" < $PROJECT_ROOT/admin/.env.template > $PROJECT_ROOT/admin/.env
+envsubst "$(env | sed -e 's/=.*//' -e 's/^/\$/g')" < $PROJECT_ROOT/dht-node/.env.template > $PROJECT_ROOT/dht-node/.env
 
 # Install & build database
 echo 'Updating database' >> $UPDATE_HTML
@@ -152,6 +154,25 @@ pm2 delete gradido-admin
 pm2 start --name gradido-admin "yarn --cwd $PROJECT_ROOT/admin start" -l $GRADIDO_LOG_PATH/pm2.admin.$TODAY.log --log-date-format 'YYYY-MM-DD HH:mm:ss.SSS'
 pm2 save
 
+# Install & build dht-node
+echo 'Updating dht-node' >> $UPDATE_HTML
+cd $PROJECT_ROOT/dht-node
+# TODO maybe handle this differently?
+unset NODE_ENV
+yarn install
+yarn build
+# TODO maybe handle this differently?
+export NODE_ENV=production
+pm2 delete gradido-dht-node
+if [ ! -z $FEDERATION_DHT_TOPIC ]; then
+  pm2 start --name gradido-dht-node "yarn --cwd $PROJECT_ROOT/dht-node start" -l $GRADIDO_LOG_PATH/pm2.dht-node.$TODAY.log --log-date-format 'YYYY-MM-DD HH:mm:ss.SSS'
+else
+  echo "====================================================================="
+  echo "WARNING: FEDERATION_DHT_TOPIC not configured. DHT-Node not started..."  
+  echo "====================================================================="
+fi  
+pm2 save
+
 # let nginx showing gradido
 echo 'Configuring nginx to serve gradido again' >> $UPDATE_HTML
 ln -s /etc/nginx/sites-available/gradido.conf /etc/nginx/sites-enabled/

dht-node/.env.dist

@@ -11,9 +11,9 @@ TYPEORM_LOGGING_RELATIVE_PATH=typeorm.dht-node.log
 # LOG_LEVEL=info
 
 # Federation
-# if you set the value of FEDERATION_DHT_TOPIC, the DHT hyperswarm will start to announce and listen
+# if you set the value of FEDERATION_DHT_TOPIC, the DHT hyperswarm will start to announce and listen on an hash created from this topic
-# on an hash created from this topic
 FEDERATION_DHT_TOPIC=GRADIDO_HUB
 # FEDERATION_DHT_SEED=64ebcb0e3ad547848fef4197c6e2332f
-# FEDERATION_COMMUNITY_URL=http://localhost
+FEDERATION_COMMUNITY_URL=http://localhost
-# FEDERATION_COMMUNITY_API_PORT=5000
+# the api port is the dht baseport, which will be added with the supported api-versions, e.g. 1_0 = 5010
+FEDERATION_COMMUNITY_API_PORT=5000

dht-node/.env.template

@@ -1,4 +1,4 @@
-CONFIG_VERSION=$BACKEND_CONFIG_VERSION
+CONFIG_VERSION=$FEDERATION_DHT_CONFIG_VERSION
 
 # Database
 DB_HOST=localhost

dht-node/log4js-config.json

@@ -8,7 +8,7 @@
       "pattern": "yyyy-MM-dd",
       "layout": 
       {
-        "type": "pattern", "pattern": "%d{ISO8601} %c [%X{user}] [%f : %l] -  %m"
+        "type": "pattern", "pattern": "%d{ISO8601} %p %c [%X{user}] [%f : %l] -  %m"
       },
       "keepFileExt" : true,
       "fileNameSep" : "_",
@@ -21,7 +21,7 @@
       "pattern": "yyyy-MM-dd",
       "layout": 
       {
-        "type": "pattern", "pattern": "%d{ISO8601} %c [%X{user}] [%f : %l] -  %m"
+        "type": "pattern", "pattern": "%d{ISO8601} %p %c [%X{user}] [%f : %l] -  %m"
       },
       "keepFileExt" : true,
       "fileNameSep" : "_",

dht-node/src/dht_node/index.ts

@@ -31,8 +31,8 @@ export const startDHT = async (topic: string): Promise<void> => {
     logger.info(`keyPairDHT: publicKey=${keyPair.publicKey.toString('hex')}`)
     logger.debug(`keyPairDHT: secretKey=${keyPair.secretKey.toString('hex')}`)
 
-    const ownApiVersions = writeHomeCommunityEnries(keyPair.publicKey)
+    const ownApiVersions = await writeHomeCommunityEnries(keyPair.publicKey)
-    logger.debug(`ApiList: ${JSON.stringify(ownApiVersions)}`)
+    logger.info(`ApiList: ${JSON.stringify(ownApiVersions)}`)
 
     const node = new DHT({ keyPair })