Merge pull request #4 from YunoHost-Apps/testing

Compile from source

conf/app.src

@@ -1,6 +1,6 @@
-SOURCE_URL=https://github.com/zwave-js/zwave-js-ui/releases/download/v8.4.1/zwave-js-ui-v8.4.1-linux.zip
+SOURCE_URL=https://github.com/zwave-js/zwave-js-ui/archive/refs/tags/v8.4.1.zip
-SOURCE_SUM=3adcfd96e10c87fd0161d0ebefe8e930f43f368946940cdea5060a2209be38de
+SOURCE_SUM=71f2cac714f7fd0a7779fb1fac059636810d3261d7e82fc33fe3b1cdf0ac9391
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=zip
-SOURCE_IN_SUBDIR=false
+SOURCE_IN_SUBDIR=true
 SOURCE_EXTRACT=true

conf/systemd.service

@@ -6,8 +6,10 @@ After=network.target
 Type=simple
 User=__APP__
 Group=__APP__
+#Environment not working, don't know why, have to add env command to ExecStart, if you know a better way, don't hesitate to make a PR
+#Environment="__YNH_NODE_LOAD_PATH__"
 WorkingDirectory=__FINALPATH__/
-ExecStart=__FINALPATH__/zwave-js-ui-linux
+ExecStart=env __YNH_NODE_LOAD_PATH__ yarn start
 StandardOutput=append:/var/log/__APP__/__APP__.log
 StandardError=inherit
 

scripts/_common.sh

@@ -4,7 +4,7 @@
 # COMMON VARIABLES
 #=================================================
 # dependencies used by the app (must be on a single line)
-#pkg_dependencies="deb1 deb2 $php_dependencies"
+NODEJS_VERSION=19
 
 #=================================================
 # PERSONAL HELPERS

scripts/install

@@ -32,12 +32,9 @@ app=$YNH_APP_INSTANCE_NAME
 #=================================================
 # CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS
 #=================================================
-ynh_script_progression --message="Validating installation parameters..." --weight=1
+ynh_script_progression --message="Validating installation parameters..." --weight=4
 
-### If the app uses NGINX as web server (written in HTML/PHP in most cases), the final path should be "/var/www/$app".
+final_path=/var/www/$app
-### If the app provides an internal web server (or uses another application server such as uWSGI), the final path should be "/opt/yunohost/$app"
-##TO BE CHECKED??
-final_path=/opt/yunohost/$app
 test ! -e "$final_path" || ynh_die --message="This path already contains a folder"
 
 # Register (book) web path
@@ -70,10 +67,20 @@ ynh_script_progression --message="Configuring system user..." --weight=1
 # Create a system user
 ynh_system_user_create --username=$app --home_dir="$final_path"
 
+
+#=================================================
+# INSTALL EXTRA DEPENDENCIES
+#=================================================
+ynh_script_progression --message="Installing dependencies..." --weight=15
+
+ynh_install_nodejs --nodejs_version=$NODEJS_VERSION
+ynh_use_nodejs
+ynh_exec_warn_less $ynh_npm install ---global yarn
+
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
-ynh_script_progression --message="Setting up source files..." --weight=15
+ynh_script_progression --message="Setting up source files..." --weight=8
 
 ynh_app_setting_set --app=$app --key=final_path --value=$final_path
 # Download, check integrity, uncompress and patch the source from app.src
@@ -83,21 +90,36 @@ chmod 750 "$final_path"
 chmod -R o-rwx "$final_path"
 chown -R $app: "$final_path"
 
+#=================================================
+# BUILD FROM SOURCE
+#=================================================
+ynh_script_progression --message="Building from sources..." --weight=1
+
+pushd "$final_path"
+	ynh_script_progression --message="Fetching Yarn dependencies... This can be very long, be patient !" --weight=40
+	ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn install
+	ynh_script_progression --message="Cleaning cache... " --weight=3
+	ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn cache clean 2>&1
+	ynh_script_progression --message="Building Yarn dependencies... This can be very long, be patient !" --weight=30
+	ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn run build
+	ynh_script_progression --message="Cleaning cache... " --weight=3
+	ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn cache clean 2>&1
+popd
+
+chmod 750 "$final_path"
+chmod -R o-rwx "$final_path"
+chown -R $app: "$final_path"
+
+
+
 #=================================================
 # NGINX CONFIGURATION
 #=================================================
-ynh_script_progression --message="Configuring NGINX web server..." --weight=5
+ynh_script_progression --message="Configuring NGINX web server..." --weight=2
 
 # Create a dedicated NGINX config
 ynh_add_nginx_config
 
-#=================================================
-# SPECIFIC SETUP
-#=================================================
-# ...
-#=================================================
-
-
 #=================================================
 # ADD A CONFIGURATION
 #=================================================
@@ -133,7 +155,7 @@ ynh_add_nginx_config
 #=================================================
 # SETUP SYSTEMD
 #=================================================
-ynh_script_progression --message="Configuring a systemd service..." --weight=5
+ynh_script_progression --message="Configuring a systemd service..." --weight=2
 
 # Create a dedicated systemd config
 ynh_add_systemd_config
@@ -182,7 +204,7 @@ yunohost service add $app --description="Zwave integration in domoticz" --log="/
 ynh_script_progression --message="Starting a systemd service..." --weight=1
 
 # Start a systemd service
-ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log"
+ynh_systemd_action --service_name=$app --action="start" --line_match="Listening on port" -t 30 --log_path="/var/log/$app/$app.log"
 
 #=================================================
 # SETUP FAIL2BAN
@@ -195,7 +217,7 @@ ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$ap
 #=================================================
 # SETUP SSOWAT
 #=================================================
-ynh_script_progression --message="Configuring permissions..." --weight=11
+ynh_script_progression --message="Configuring permissions..." --weight=5
 
 # Make app public if necessary
 if [ $is_public -eq 1 ]
@@ -205,17 +227,6 @@ then
 	ynh_permission_update --permission="main" --add="visitors"
 fi
 
-### N.B. : the following extra permissions only make sense if your app
-### does have for example an admin interface or an API.
-
-# Only the admin can access the admin panel of the app (if the app has an admin panel)
-#ynh_permission_create --permission="admin" --url="/admin" --allowed=$admin
-
-# Everyone can access the API part
-# We don't want to display the tile in the SSO so we put --show_tile="false"
-# And we don't want the YunoHost admin to be able to remove visitors group to this permission, so we put --protected="true"
-#ynh_permission_create --permission="api" --url="/api" --allowed="visitors" --show_tile="false" --protected="true"
-
 #=================================================
 # RELOAD NGINX
 #=================================================

scripts/remove

@@ -49,6 +49,13 @@ ynh_script_progression --message="Removing logrotate configuration..." --weight=
 # Remove the app-specific logrotate config
 ynh_remove_logrotate
 
+#=================================================
+# REMOVE DEPENDENCIES
+#=================================================
+ynh_script_progression --message="Removing dependencies..." --weight=1
+
+ynh_remove_nodejs
+
 #=================================================
 # REMOVE APP MAIN DIR
 #=================================================
@@ -80,12 +87,6 @@ ynh_remove_nginx_config
 #=================================================
 ynh_script_progression --message="Removing various files..." --weight=1
 
-# Remove a cron file
-#ynh_secure_remove --file="/etc/cron.d/$app"
-
-# Remove a directory securely
-#ynh_secure_remove --file="/etc/$app"
-
 # Remove the log files
 ynh_secure_remove --file="/var/log/$app"
 

scripts/restore

@@ -50,6 +50,15 @@ ynh_script_progression --message="Recreating the dedicated system user..." --wei
 # Create the dedicated user (if not existing)
 ynh_system_user_create --username=$app --home_dir="$final_path"
 
+#=================================================
+# INSTALL EXTRA DEPENDENCIES
+#=================================================
+ynh_script_progression --message="Installing dependencies..." --weight=15
+
+ynh_install_nodejs --nodejs_version=$NODEJS_VERSION
+ynh_use_nodejs
+ynh_exec_warn_less $ynh_npm install ---global yarn
+
 #=================================================
 # RESTORE THE APP MAIN DIR
 #=================================================
@@ -76,16 +85,6 @@ chown -R $app: "$final_path"
 #ynh_restore_file --origin_path="/etc/fail2ban/filter.d/$app.conf"
 #ynh_systemd_action --action=restart --service_name=fail2ban
 
-#=================================================
-# SPECIFIC RESTORATION
-#=================================================
-# REINSTALL DEPENDENCIES
-#=================================================
-#ynh_script_progression --message="Reinstalling dependencies..." --weight=1
-
-# Define and install dependencies
-#ynh_install_app_dependencies $pkg_dependencies
-
 #=================================================
 # RESTORE THE NGINX CONFIGURATION
 #=================================================
@@ -127,7 +126,7 @@ yunohost service add $app --description="Zwave integration in domoticz" --log="/
 #=================================================
 ynh_script_progression --message="Starting a systemd service..." --weight=1
 
-ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log"
+ynh_systemd_action --service_name=$app --action="start" --line_match="Listening on port" -t 30 --log_path="/var/log/$app/$app.log"
 
 #=================================================
 # GENERIC FINALIZATION

scripts/upgrade

@@ -65,6 +65,15 @@ ynh_script_progression --message="Making sure dedicated system user exists..." -
 # Create a dedicated user (if not existing)
 ynh_system_user_create --username=$app --home_dir="$final_path"
 
+#=================================================
+# UPGRADE DEPENDENCIES
+#=================================================
+ynh_script_progression --message="Upgrading dependencies..." --weight=1
+
+ynh_install_nodejs --nodejs_version=$NODEJS_VERSION
+ynh_use_nodejs
+ynh_exec_warn_less $ynh_npm install ---global yarn
+
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
@@ -75,25 +84,29 @@ then
 
 	# Download, check integrity, uncompress and patch the source from app.src
 	ynh_setup_source --dest_dir="$final_path"
+
+	chmod 750 "$final_path"
+	chmod -R o-rwx "$final_path"
+	chown -R $app: "$final_path"
+	
+	ynh_script_progression --message="Building from sources..." --weight=15
+	pushd "$final_path"
+		ynh_script_progression --message="Fetching Yarn dependencies... This can be very long, be patient !" --weight=18
+		ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn install
+		ynh_script_progression --message="Cleaning cache... " --weight=3
+		ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn cache clean 2>&1
+		ynh_script_progression --message="Building Yarn dependencies... This can be very long, be patient !" --weight=18
+		ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn run build
+		ynh_script_progression --message="Cleaning cache... " --weight=3
+		ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn cache clean 2>&1
+	popd
+
+	chmod 750 "$final_path"
+	chmod -R o-rwx "$final_path"
+	chown -R $app: "$final_path"
+
 fi
 
-# FIXME: this should be managed by the core in the future
-# Here, as a packager, you may have to tweak the ownerhsip/permissions
-# such that the appropriate users (e.g. maybe www-data) can access
-# files in some cases.
-# But FOR THE LOVE OF GOD, do not allow r/x for "others" on the entire folder -
-# this will be treated as a security issue.
-chmod 750 "$final_path"
-chmod -R o-rwx "$final_path"
-chown -R $app: "$final_path"
-
-#=================================================
-# UPGRADE DEPENDENCIES
-#=================================================
-#ynh_script_progression --message="Upgrading dependencies..." --weight=1
-
-#ynh_install_app_dependencies $pkg_dependencies
-
 #=================================================
 # NGINX CONFIGURATION
 #=================================================
@@ -163,7 +176,7 @@ yunohost service add $app --description="Zwave integration in domoticz" --log="/
 #=================================================
 ynh_script_progression --message="Starting a systemd service..." --weight=1
 
-ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log"
+ynh_systemd_action --service_name=$app --action="start" --line_match="Listening on port" -t 30 --log_path="/var/log/$app/$app.log"
 
 #=================================================
 # UPGRADE FAIL2BAN