Ipfs config and launch cmd (#86)

* add ipfs enable

* add timeout (#85)

* generate ipfs config

* pull ipfs docker when install

* ipfs cmd

* upgrade reload ipfs

* change port

* fix typo

Author: LowEntropyBody

config.yaml

@@ -4,6 +4,8 @@ node:
   chain: "authority"
   ## enable or disable sworker
   sworker: "enable"
+  ## enable or disable ipfs
+  ipfs: "disable"
 
 ## identity configurations
 identity:

generator/config-gen/api-config.gen.js

@@ -1,4 +1,3 @@
-
 async function genApiConfig(config, outputCfg) {
   const apiConfig = {
     port: 56666,

generator/config-gen/chain-config.gen.js

@@ -1,4 +1,3 @@
-
 async function genChainConfig(config, outputCfg) {
   const chainConfig = config.chain
   return {

generator/config-gen/index.js

@@ -4,6 +4,7 @@
 const path = require('path')
 const { createDir, writeConfig, } = require('../utils')
 const { genApiConfig, genApiComposeConfig } = require('./api-config.gen')
+const { genIpfsConfig, genIpfsComposeConfig } = require('./ipfs-config.gen')
 const { genChainConfig, genChainComposeConfig } = require('./chain-config.gen')
 const { genSworkerConfig, genSworkerComposeConfig } = require('./sworker-config.gen')
 const { logger } = require('../logger')
@@ -46,6 +47,12 @@ const configGenerators = [{
   to: path.join('sworker', 'sworker_config.json'),
   composeName: 'crust-sworker-b',
   composeFunc: genSworkerComposeConfig,
+}, {
+  name: 'ipfs',
+  configFunc: genIpfsConfig,
+  to: path.join('ipfs', 'ipfs_config.json'),
+  composeName: 'ipfs',
+  composeFunc: genIpfsComposeConfig,
 }]
 
 async function genConfig(config, outputOpts) {

generator/config-gen/ipfs-config.gen.js

@@ -0,0 +1,30 @@
+async function genIpfsConfig(config, outputCfg) {
+  const ipfsConfig = {
+    swarm_port: 4001,
+    api_port: 5001,
+    gateway_port: 37773,
+  }
+  return {
+    config: ipfsConfig,
+    paths: [],
+  }
+}
+
+async function genIpfsComposeConfig(config) {
+  return {
+    image: 'ipfs/go-ipfs:latest',
+    ports: [
+      '4001:4001',
+      '5001:5001',
+      '37773:8080',
+    ],
+    volumes: [
+      '/opt/crust/data/ipfs:/data/ipfs'
+    ]
+  }
+}
+
+module.exports = {
+  genIpfsConfig,
+  genIpfsComposeConfig,
+}

generator/schema/index.js

@@ -11,12 +11,15 @@ function getConfigSchema(config) {
     chain: chainSchema.required(),
   }
 
-  if (config.node.sworker != "enable") {
-    return Joi.object(sMap)
+  if (config.node.sworker == "enable") {
+    sMap["api"] = Joi.object().default()
+    sMap["identity"] = identitySchema.required()
+    sMap["sworker"] = sworkerSchema.required()
+  }
+
+  if (config.node.ipfs == "enable") {
+    sMap["ipfs"] = Joi.object().default()
   }
-  sMap["api"] = Joi.object().default()
-  sMap["identity"] = identitySchema.required()
-  sMap["sworker"] = sworkerSchema.required()
 
   return Joi.object(sMap)
 }

generator/schema/node.schema.js

@@ -3,6 +3,7 @@ const Joi = require('joi')
 const nodeSchema = Joi.object({
   chain: Joi.string().valid('authority', 'full').required(),
   sworker: Joi.string().valid('enable', 'disable').required(),
+  ipfs: Joi.string().valid('enable', 'disable').required(),
 })
 
 module.exports = {

install.sh

@@ -71,14 +71,18 @@ download_docker_images()
         docker pull $aliyun_address/crustio/crust-sworker
         res=$(($?|$res))
         docker tag $aliyun_address/crustio/crust-sworker crustio/crust-sworker
+        
+        docker pull $aliyun_address/crustio/go-ipfs
+        res=$(($?|$res))
+        docker tag $aliyun_address/crustio/go-ipfs ipfs/go-ipfs
     else
         docker pull crustio/config-generator
         res=$(($?|$res))
         docker pull crustio/crust
         res=$(($?|$res))
         docker pull crustio/crust-api
         res=$(($?|$res))
-        docker pull crustio/crust-sworker
+        docker pull ipfs/go-ipfs
         res=$(($?|$res))
     fi
 

scripts/crust.sh

@@ -39,6 +39,12 @@ start()
 		exit 1
 	fi
 
+	start_ipfs
+	if [ $? -ne 0 ]; then
+		docker-compose -f $builddir/docker-compose.yaml down
+		exit 1
+	fi
+
 	log_success "Start crust success"
 }
 
@@ -47,6 +53,7 @@ stop()
 	stop_chain
 	stop_api
 	stop_sworker
+	stop_ipfs
 
 	log_success "Stop crust success"
 }
@@ -75,6 +82,13 @@ logs()
 			return 0
 		fi
 		docker logs -f crust-sworker-$a_or_b
+	elif [ x"$1" == x"ipfs" ]; then
+		check_docker_status ipfs
+		if [ $? -eq 1 ]; then
+			log_info "Service ipfs is not started now"
+			return 0
+		fi
+		docker logs -f ipfs
 	elif [ x"$1" == x"sworker-a" ]; then
 		check_docker_status crust-sworker-a
 		if [ $? -eq 1 ]; then
@@ -235,6 +249,45 @@ stop_api()
 	fi
 	return 0
 }
+
+start_ipfs()
+{
+	if [ -d "$builddir/ipfs" ]; then
+		check_docker_status ipfs
+		if [ $? -ne 1 ]; then
+			return 0
+		fi
+
+		local res=0
+		check_port 4001
+		res=$(($?|$res))
+		check_port 5001
+		res=$(($?|$res))
+		check_port 37773
+		res=$(($?|$res))
+		if [ $res -ne 0 ]; then
+			return 1
+		fi
+
+		docker-compose -f $builddir/docker-compose.yaml up -d ipfs
+		if [ $? -ne 0 ]; then
+			log_err "[ERROR] Start ipfs failed"
+			return 1
+		fi
+	fi
+	return 0
+}
+
+stop_ipfs()
+{
+	check_docker_status ipfs
+	if [ $? -ne 1 ]; then
+		log_info "Stopping ipfs service"
+		docker stop ipfs &>/dev/null
+		docker rm ipfs &>/dev/null
+	fi
+	return 0
+}
 
 reload() {
 	if [ x"$1" = x"" ]; then
@@ -290,6 +343,21 @@ reload() {
 		return 0
 	fi
 
+	if [ x"$1" = x"ipfs" ]; then
+		log_info "Reload ipfs service"
+		
+		stop_ipfs
+		$scriptdir/gen_config.sh
+		if [ $? -ne 0 ]; then
+			log_err "[ERROR] Generate configuration files failed"
+			exit 1
+		fi
+		start_ipfs
+
+		log_success "Reload ipfs service success"
+		return 0
+	fi
+
 	help
 	return 0
 }
@@ -302,6 +370,8 @@ status()
 		api_status
 	elif [ x"$1" == x"sworker" ]; then
 		sworker_status
+	elif [ x"$1" == x"ipfs" ]; then
+		ipfs_status
 	elif [ x"$1" == x"" ]; then
 		all_status
 	else
@@ -314,6 +384,7 @@ all_status()
 	local chain_status="stop"
 	local api_status="stop"
 	local sworker_status="stop"
+	local ipfs_status="stop"
 
 	check_docker_status crust
 	local res=$?
@@ -340,13 +411,22 @@ all_status()
 		sworker_status="exited"
 	fi
 
+	check_docker_status ipfs
+	res=$?
+	if [ $res -eq 0 ]; then
+		ipfs_status="running"
+	elif [ $res -eq 2 ]; then
+		ipfs_status="exited"
+	fi
+
 cat << EOF
 -----------------------------------------
     Service                    Status
 -----------------------------------------
     chain                      ${chain_status}
     api                        ${api_status}
     sworker                    ${sworker_status}
+    ipfs                       ${ipfs_status}
 -----------------------------------------
 EOF
 }
@@ -433,6 +513,27 @@ cat << EOF
 EOF
 }
 
+ipfs_status()
+{
+	local ipfs_status="stop"
+
+	check_docker_status ipfs
+	res=$?
+	if [ $res -eq 0 ]; then
+		ipfs_status="running"
+	elif [ $res -eq 2 ]; then
+		ipfs_status="exited"
+	fi
+
+cat << EOF
+-----------------------------------------
+    Service                    Status
+-----------------------------------------
+    ipfs                       ${ipfs_status}
+-----------------------------------------
+EOF
+}
+
 help()
 {
 cat << EOF
@@ -441,9 +542,9 @@ Usage:
     start                           	start all crust service
     stop                            	stop all crust service
 
-    status {chain|api|sworker}          check status or reload one service status
-    reload {chain|api|sworker}          reload all service or reload one service
-    logs {chain|api|sworker}            track service logs, ctrl-c to exit
+    status {chain|api|sworker|ipfs}     check status or reload one service status
+    reload {chain|api|sworker|ipfs}     reload all service or reload one service
+    logs {chain|api|sworker|ipfs}       track service logs, ctrl-c to exit
     tools {...}                         use 'crust tools help' for more details
 EOF
 }
@@ -455,7 +556,7 @@ crust tools usage:
     help                                      show help information
     rotate-keys                               generate session key of chain node
     workload                                  show workload information
-    upgrade-reload {chain|api|c-gen}          upgrade one docker image and reload the service
+    upgrade-reload {chain|api|ipfs|c-gen}     upgrade one docker image and reload the service
     change-srd {number}                       change sworker's srd capacity(GB), for example: 'crust tools change-srd 100', 'crust tools change-srd -50'
 EOF
 }
@@ -543,6 +644,12 @@ upgrade_reload()
 			return 1
 		fi
 		reload api
+	elif [ x"$1" == x"ipfs" ]; then
+		upgrade_docker_image ipfs/go-ipfs crustio/go-ipfs
+		if [ $? -ne 0 ]; then
+			return 1
+		fi
+		reload api
 	elif [ x"$1" == x"c-gen" ]; then
 		upgrade_docker_image crustio/config-generator
 		if [ $? -ne 0 ]; then

scripts/upgrade.sh

@@ -71,7 +71,7 @@ sleep 100s
 while :
 do
 
-system_health=`curl $api_base_url/system/health 2>/dev/null`
+system_health=`curl --max-time 30 $api_base_url/system/health 2>/dev/null`
 if [ x"$system_health" = x"" ]; then
     echo "please run crust chain and api"
     sleep 60
@@ -91,7 +91,7 @@ if [ x"$is_syncing" = x"true" ]; then
     continue
 fi
 
-code=`curl $api_base_url/swork/code 2>/dev/null`
+code=`curl --max-time 30 $api_base_url/swork/code 2>/dev/null`
 if [ x"$code" = x"" ]; then
     echo "please run chain and api"
     sleep 60
@@ -107,7 +107,7 @@ fi
 code=`echo ${code: 3: 64}`
 echo "sWorker code on chain: $code"
 
-id_info=`curl $sworker_base_url/enclave/id_info 2>/dev/null`
+id_info=`curl --max-time 30 $sworker_base_url/enclave/id_info 2>/dev/null`
 if [ x"$id_info" = x"" ]; then
     echo "please run sworker"
     sleep 60

scripts/utils.sh

@@ -23,6 +23,10 @@ function log_err()
 function upgrade_docker_image()
 {
     local basedir=/opt/crust/crust-node
+    local crustio_name=$2
+    if [ x"$crustio_name" == x"" ]; then
+        crustio_name=$1
+    fi
 
     local old_image=(`docker images | grep '^\b'$1'\b ' | grep 'latest'`)
     old_image=${old_image[2]}
@@ -31,9 +35,9 @@ function upgrade_docker_image()
     local res=0
     if [ x"$region" == x"cn" ]; then
         local aliyun_address=registry.cn-hangzhou.aliyuncs.com
-        docker pull $aliyun_address/$1
+        docker pull $aliyun_address/$crustio_name
         res=$(($?|$res))
-        docker tag $aliyun_address/$1 $1
+        docker tag $aliyun_address/$crustio_name $1
     else
         docker pull $1
         res=$(($?|$res))