Merge remote-tracking branch 'upstream/dev' into bugfix/misc

Author: reloxx13

.ddev/commands/host/build

@@ -0,0 +1,5 @@
+#!/bin/bash
+set -euo pipefail
+
+# Host helper to run the project build inside DDEV without recursing back into this script
+ddev exec -s web npm run build

.ddev/commands/host/npm

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+# Run npm commands inside the ddev web container, reusing npm cache volume
+ddev .npm-cache >/dev/null 2>&1 || true
+ddev ssh --service web -d /var/www/html -c "npm $@"

.ddev/commands/host/pre-commit

@@ -0,0 +1,9 @@
+#!/bin/bash
+set -euo pipefail
+
+# Run standard pre-commit checks inside DDEV.
+# Order: JS lint -> build -> PHP QA suite.
+
+ddev npm run eslint
+ddev build
+ddev qa

.ddev/commands/web/build

@@ -0,0 +1,6 @@
+#!/bin/bash
+set -euo pipefail
+
+# Run project build inside web container
+npm install
+npm run build

.ddev/commands/web/getserver

@@ -0,0 +1,8 @@
+#!/bin/bash
+set -euo pipefail
+
+# Start the lightweight GET request receiver used by Photobooth callbacks.
+GETSERVER_PORT=${GETSERVER_PORT:-9100}
+export GETSERVER_PORT
+
+node .ddev/scripts/getserver.js

.ddev/commands/web/qa

@@ -0,0 +1,5 @@
+#!/bin/bash
+set -euo pipefail
+
+# Run full PHP QA suite inside the web container (composer cgl+lint+phpstan+phpunit).
+composer cgl && composer lint && composer phpstan && composer phpunit

.ddev/config.yaml

@@ -0,0 +1,49 @@
+name: photobooth
+type: php
+docroot: .
+php_version: "8.4"
+webserver_type: apache-fpm
+router_http_port: "9080"
+router_https_port: "9443"
+xdebug_enabled: false
+additional_hostnames: [ ]
+additional_fqdns: [ ]
+omit_containers: [ db, dba ]
+nfs_mount_enabled: false
+mutagen_enabled: false
+composer_version: ""
+use_dns_when_possible: true
+upload_dir: uploads
+webimage_extra_packages: [ ]
+nodejs_version: ""
+webimage_build:
+  dockerfile: .ddev/web-build/Dockerfile
+hooks:
+  post-start:
+    - name: Ensure Node.js 20 for frontend build
+      exec: |
+        if ! command -v node >/dev/null 2>&1 || [ "$(node -v | cut -c2- | cut -d. -f1)" -lt 20 ]; then
+          curl -fsSL https://deb.nodesource.com/setup_20.x | bash - && \
+          apt-get update && apt-get install -y nodejs
+        fi
+    - name: Install npm deps if missing
+      exec: |
+        if [ ! -d node_modules ]; then
+          npm install
+        fi
+    - name: One-time frontend build
+      exec: |
+        if [ ! -f .ddev/.built ]; then
+          npm run build
+          touch .ddev/.built
+        fi
+    - name: Start GET request helper (9100)
+      exec: |
+        if ! pgrep -f ".ddev/scripts/getserver.js" >/dev/null; then
+          GETSERVER_PORT=9100 node .ddev/scripts/getserver.js >/tmp/ddev-getserver.log 2>&1 &
+        fi
+    - name: Start gulp watch (assets) in background
+      exec: |
+        if ! pgrep -f "gulp watch" >/dev/null; then
+          npm run watch:gulp >/tmp/ddev-gulp-watch.log 2>&1 &
+        fi

.ddev/docker-compose.getserver.yaml

@@ -0,0 +1,7 @@
+services:
+  web:
+    ports:
+      # Remotebuzzer server (default 14711) exposed to host/router
+      - "14711:14711"
+      # GET request test server (default 9100) exposed for callbacks
+      - "9100:9100"

.ddev/docker-compose.php-extra.yaml

@@ -0,0 +1,11 @@
+services:
+  web:
+    volumes:
+      # persist npm cache for faster installs
+      - npm-cache:/home/node/.npm
+    environment:
+      COMPOSER_ALLOW_SUPERUSER: "1"
+      PHP_IDE_CONFIG: "serverName=photobooth.ddev.site"
+
+volumes:
+  npm-cache:

.ddev/scripts/getserver.js

@@ -0,0 +1,21 @@
+#!/usr/bin/env node
+/**
+ * Minimal GET request receiver for development.
+ * Photobooth sends GET callbacks to `config.get_request.server`.
+ * This helper responds 200 OK and logs incoming paths.
+ */
+
+const http = require('http');
+
+const PORT = process.env.GETSERVER_PORT || 9100;
+
+const server = http.createServer((req, res) => {
+    // Log method + path; keep response simple
+    console.log(`[getserver] ${req.method} ${req.url}`);
+    res.writeHead(200, { 'Content-Type': 'text/plain' });
+    res.end('ok\n');
+});
+
+server.listen(PORT, '0.0.0.0', () => {
+    console.log(`[getserver] listening on ${PORT}`);
+});