Merge branch 'main' into stage

Author: frozenbanana

.env.example

@@ -1,5 +1,5 @@
 ENV=development
-NC_VERSION=31
+NC_VERSION=33
 APP_URL=localhost
 API_URL=https://hejbit.local
 

.github/workflows/staging.yml

@@ -17,6 +17,9 @@ jobs:
         uses: appleboy/ssh-action@master
         with:
           host: ${{ vars.STAGING_SERVER_HOST }}
-          username: deploy
+          username: ${{ vars.STAGING_SERVER_USER }}
           key: ${{ secrets.STAGING_SSH_PRIVATE_KEY }}
+          proxy_host: ${{ vars.STAGING_PROXY_HOST }}
+          proxy_username: ${{ vars.STAGING_PROXY_USER }}
+          proxy_key: ${{ secrets.STAGING_PROXY_SSH_PRIVATE_KEY }}
           script: bash deploy

.gitignore

@@ -11,6 +11,7 @@ js/nextcloud-swarm-plugin*.*
 
 # IDE
 .idea
+.history
 
 # OS
 .DS_Store

README.md

@@ -21,7 +21,7 @@ This plugin integrates [Swarm](https://www.ethswarm.org/) (a decentralized, bloc
 
 Before using the plugin, ensure you have the following:
 
--   An active Nextcloud instance (version 31 or 32)
+-   An active Nextcloud instance (version 32 or 33)
 -   A valid Access Key and URL to activate the service
     -   [Get Your Free Trial for the Nextcloud Swarm Plugin](https://app.hejbit.com)
 

appinfo/info.xml

@@ -26,7 +26,7 @@ This plugin integrates [Swarm](https://www.ethswarm.org/) (a decentralized, bloc
 
 Before using the plugin, ensure you have the following:
 
-- An active Nextcloud instance (version 31 or 32)
+- An active Nextcloud instance (version 32 or 33)
 - A valid Access Key and URL to activate the service
   - [Get Your Free Trial for the Nextcloud Swarm Plugin](https://app.hejbit.com)
 
@@ -89,7 +89,7 @@ Experience the future of data storage with 5GB of free, decentralized storage on
 This program is licensed under the AGPLv3 or later.
 
     ]]></description>
-    <version>0.6.0</version>
+    <version>1.0.3</version>
     <licence>agpl</licence>
     <author>MetaProvide</author>
     <namespace>Files_External_Ethswarm</namespace>
@@ -104,7 +104,7 @@ This program is licensed under the AGPLv3 or later.
     <repository type="git">https://github.com/MetaProvide/nextcloud-swarm-plugin.git</repository>
 	<screenshot>https://raw.githubusercontent.com/MetaProvide/nextcloud-swarm-plugin/main/assets/images/swarm_Files.png</screenshot>
     <dependencies>
-        <nextcloud min-version="31" max-version="32"/>
+        <nextcloud min-version="32" max-version="33"/>
     </dependencies>
 	<settings>
 		<admin>OCA\Files_External_Ethswarm\Settings\Admin</admin>

cli/staging/deploy.sh

@@ -64,7 +64,7 @@ action() {
 
 deploy() {
 	local version=$1
-	cd hejbit-"$version" || failed "hejbit-$version not found"
+	cd "/opt/hejbit/hejbit-$version" || failed "$version" "/opt/hejbit/hejbit-$version not found"
 
 	buffer "$(log_note "deploying hejbit-$version")"
 
@@ -85,6 +85,24 @@ sync_code() {
 	git pull 2>&1 || return 1
 }
 
+setup_node() {
+	command -v npm > /dev/null 2>&1 && return 0
+
+	export NVM_DIR="$HOME/.nvm"
+	if [ -s "$NVM_DIR/nvm.sh" ]; then
+		. "$NVM_DIR/nvm.sh"
+
+		NODE_20_VERSION=$(nvm version 20 2> /dev/null)
+		if [ "$NODE_20_VERSION" != "N/A" ]; then
+			nvm use --silent "$NODE_20_VERSION" > /dev/null 2>&1 || return 1
+		else
+			nvm use --silent default > /dev/null 2>&1 || return 1
+		fi
+	fi
+
+	command -v npm > /dev/null 2>&1 || return 1
+}
+
 build_app() {
 	result=$(npm install 2>&1)
 	status=$?
@@ -114,24 +132,19 @@ nextcloud_upgrade() {
 }
 
 cd /opt/hejbit || log_error "/opt/hejbit not found"
+
+if ! setup_node; then
+	log_error "npm not found for user $(whoami)"
+	log_error "install node/npm or configure nvm default"
+	exit 1
+fi
+
 log_note "deploying hejbit to staging"
 log_gap
 
-DEPLOYMENT=()
 TIMESTAMP=$(date +%s)
-for version in {30..32}; do
-	deploy "$version" &
-	DEPLOYMENT+=($!)
-done
-
-statuses=0
-for pid in "${DEPLOYMENT[@]}"; do
-	wait "$pid"
-	statuses+=$?
+for version in {32..33}; do
+	deploy "$version"
 done
 
-if [ $statuses -ne 0 ]; then
-	log_error "failed to deploy hejbit to staging"
-	exit 1
-fi
 log_success "deployed hejbit to staging"

composer.lock

@@ -1,13 +1,4 @@
 .hejbit-overlay {
-	position: absolute;
-	top: 30px;
-	left: 75px;
-	width: 16px;
-	height: 16px;
-	pointer-events: none;
-}
-
-.hejbit-overlay-32 {
 	position: absolute;
 	top: 23px;
 	left: 60px;
@@ -21,11 +12,6 @@
 	height: 16px;
 }
 
-.hejbit-overlay-32 svg {
-	width: 16px;
-	height: 16px;
-}
-
 
 .hejbit-archive svg {
 	filter: grayscale(100%);

css/app.css

@@ -6,6 +6,8 @@
 #  127.0.0.1 adminer.hejbit.local
 #  127.0.0.1 features.hejbit.local
 
+services:
+
 services:
   web:
     build: ./docker/web
@@ -76,7 +78,6 @@ services:
 
   redis:
     image: redis:alpine
-    command: redis-server --requirepass secret
     #    ports:
     #      - '6379:6379'
     restart: unless-stopped
@@ -98,42 +99,13 @@ services:
     volumes:
       - nc-db:/var/lib/postgresql/data
     healthcheck:
-      test:
-        [
-          "CMD",
-          "pg_isready",
-          "-q",
-          "-d",
-          "${POSTGRES_DB}",
-          "-U",
-          "${POSTGRES_USER}",
-        ]
+      test: [ "CMD", "pg_isready", "-q", "-d", "${POSTGRES_DB}", "-U", "${POSTGRES_USER}" ]
       start_period: 3s
       timeout: 5s
       interval: 30s
     networks:
       - backend
 
-  adminer: # visit https://adminer.hejbit.local/?pgsql=postgres&username=swarmbox&db=swarmbox
-    image: adminer:latest
-    restart: unless-stopped
-    #    ports:
-    #      - '8080:8080'
-    networks:
-      - backend
-      - proxy
-
-    depends_on:
-      postgres:
-        condition: service_healthy
-      proxy:
-        condition: service_healthy
-    labels:
-      caddy: adminer.hejbit.local
-      caddy.reverse_proxy: "{{upstreams 8080}}"
-    environment:
-      ADMINER_DEFAULT_SERVER: postgres
-
   rsync:
     build:
       context: ./docker/rsync
@@ -151,26 +123,50 @@ services:
     networks:
       - backend
 
+  adminer:
+    profiles:
+      - development
+    # visit https://adminer.hejbit.local/?pgsql=postgres&username=swarmbox&db=swarmbox
+    image: adminer:latest
+    restart: unless-stopped
+    #    ports:
+    #      - '8080:8080'
+    networks:
+      - backend
+      - proxy
+    depends_on:
+      postgres:
+        condition: service_healthy
+      proxy:
+        condition: service_healthy
+    labels:
+      caddy: adminer.hejbit.local
+      caddy.reverse_proxy: '{{upstreams 8080}}'
+    environment:
+      ADMINER_DEFAULT_SERVER: postgres
+
   flagd:
+    profiles:
+      - feature
     image: ghcr.io/open-feature/flagd:latest
     restart: unless-stopped
-    command: "start --uri file:/etc/flagd/hejbit.flagd.json --cors-origin *"
+    command: 'start --uri file:/etc/flagd/hejbit.flagd.json --cors-origin *'
     #    ports:
     #      - '8013:8013'
     volumes:
-      - "./docker/flagd/hejbit.flagd.json:/etc/flagd/hejbit.flagd.json"
+      - './docker/flagd/hejbit.flagd.json:/etc/flagd/hejbit.flagd.json'
     networks:
       - proxy
     labels:
       caddy: features.hejbit.local
-      caddy.reverse_proxy: "{{upstreams 8013}}"
+      caddy.reverse_proxy: '{{upstreams 8013}}'
     depends_on:
       proxy:
         condition: service_healthy
-    profiles:
-      - feature
 
   onlyoffice:
+    profiles:
+      - onlyoffice
     image: onlyoffice/documentserver
     environment:
       JWT_ENABLED: true
@@ -191,12 +187,10 @@ services:
       - proxy
     labels:
       caddy: onlyoffice.local
-      caddy.reverse_proxy: "{{upstreams 80}}"
+      caddy.reverse_proxy: '{{upstreams 80}}'
     depends_on:
       proxy:
         condition: service_healthy
-    profiles:
-      - onlyoffice
 
   proxy:
     image: lucaslorentz/caddy-docker-proxy:alpine
@@ -235,6 +229,7 @@ volumes:
   onlyoffice_lib:
   onlyoffice_logs:
 
+
 networks:
   frontend:
   backend:

docker-compose.yml

@@ -28,11 +28,13 @@
 /**
  * Basic Http Authentication.
  */
-class AccessKey extends AuthMechanism {
+class AccessKey extends AuthMechanism
+{
 	/** @const string */
 	public const SCHEME = 'access_key';
 
-	public function __construct(IL10N $l) {
+	public function __construct(IL10N $l)
+	{
 		$this
 			->setIdentifier('access:key')
 			->setScheme(self::SCHEME)
@@ -44,4 +46,4 @@ public function __construct(IL10N $l) {
 			])
 		;
 	}
-}
+}