feat: ✨ improve fwd/dep scripts

Author: tomgrv

src/larasets/_art.sh

@@ -1,7 +1,10 @@
 #!/bin/sh
 set -e
 
-workspace=${containerWorkspaceFolder:-${CODESPACE_VSCODE_FOLDER:-.}}
+#### Goto repository root
+cd "$(git rev-parse --show-toplevel)" >/dev/null
+
+#### Execute artisan command
 if [ -n "$LARAVEL_SAIL" ] && [ "$LARAVEL_SAIL" -eq 1 ] && sail ps --status running | grep --after-context=1 -q -; then
     sail artisan "$@"
 else

src/larasets/_dep.sh

@@ -1,25 +1,70 @@
 #!/bin/sh
+
 set -e
 
-### Help
-if [ "x$1" = "xhelp" ] || [ "x$1" = "x-h" ] || [ "x$1" = "x--help" ] || [ -z "$1" ]; then
-    echo "Usage: $0 [remote|local]"
-    echo "  remote: set APP_URL and VITE_HOST to use the codespace url"
-    echo "  local: remove APP_URL and VITE_HOST to use localhost"
-    exit 0
-fi >&2
-
-### Check if the environment variables are set
-if [ -z "$GITHUB_CODESPACES_PORT_FORWARDING_DOMAIN" ] || [ -z "$CODESPACE_NAME" ]; then
-    echo "GITHUB_CODESPACES_PORT_FORWARDING_DOMAIN and CODESPACE_NAME must be set, force to local"
-    $1=local
-fi >&2
-
-### Function to update or replace export entry in .bashrc
+# Source colors script
+. zz_colors
+
+# Function to print help and manage arguments
+eval $(
+    zz_args "Configure port forwarding" $0 "$@" <<-help
+        d domain        domain      Port formading domain
+        c codespace     codespace   Codespace name
+        p -             prefix      Port to prefix 
+        s -             suffix      Port to suffix
+        - preset        preset      Port forwarding preset (github/daytona/local)
+help
+)
+
+#### Goto repository root
+cd "$(git rev-parse --show-toplevel)" >/dev/null
+
+#### Load preset values
+case "$preset" in
+github)
+    domain="$GITHUB_CODESPACES_PORT_FORWARDING_DOMAIN"
+    codespace="$CODESPACE_NAME"
+    suffix="-suffix"
+    mode="remote"
+    ;;
+daytona)
+    domain="$DAYTONA_WS_DOMAIN"
+    codespace="$DAYTONA_WS_ID"
+    prefix="-prefix"
+    mode="remote"
+    ;;
+local)
+    domain=""
+    codespace="localhost"
+    prefix=""
+    suffix=""
+    mode="local"
+    ;;
+*)
+    if [ -z "$domain" ]; then
+        zz_log e "Domain is required."
+        exit 1
+    fi
+    if [ -z "$codespace" ]; then
+        zz_log e "Codespace is required."
+        exit 1
+    fi
+    if [ -z "$prefix" -o -z "$suffix" ]; then
+        zz_log e "One of prefix or suffix is required."
+        exit 1
+    fi
+    mode="remote"
+    ;;
+esac
+
+#### Function to update or replace export entry in .bashrc
 setexport() {
     local key="$1"
     local value="$2"
 
+    # Check if the key is provided
+    touch ./.env
+
     ### In .bashrc
     local bashrc="$HOME/.bashrc"
     if grep -q "^export $key=" "$bashrc"; then
@@ -41,21 +86,19 @@ setexport() {
     fi
 }
 
-### Define urls if using a web editor with http port redirection
-if [ "x$1" = "xremote" ]; then
-
-    ### update or add APP_URL
-    setexport APP_URL "https://$CODESPACE_NAME-${APP_PORT:-80}.$GITHUB_CODESPACES_PORT_FORWARDING_DOMAIN"
-
-    ### update of add VITE_HOST
-    setexport VITE_HOST "$CODESPACE_NAME-${VITE_PORT:-5173}.$GITHUB_CODESPACES_PORT_FORWARDING_DOMAIN"
-fi
-
-### Define urls if using a local editor with localhost port redirection
-if [ "x$1" = "xlocal" ] || [ -z "$1" ]; then
-    ### remove APP_URL
-    setexport APP_URL
-
-    ### remove VITE_HOST
-    setexport VITE_HOST
-fi
+case "$mode" in
+remote)
+    # Set the APP_URL and VITE_HOST for remote mode
+    setexport APP_URL "https://${prefix:+${APP_PORT:-80}-}$codespace${suffix:+-${APP_PORT:-80}}${domain:+.$domain}"
+    setexport VITE_HOST "${prefix:+${VITE_PORT:-5173}-}$codespace${suffix:+-${VITE_PORT:-5173}}${domain:+.$domain}"
+    ;;
+local)
+    # Set the APP_URL and VITE_HOST for local mode
+    setexport APP_URL "http://$codespace${domain:+.$domain}:${APP_PORT:-80}"
+    setexport VITE_HOST "$codespace${domain:+.$domain}:${VITE_PORT:-5173}"
+    ;;
+*)
+    zz_log e "Invalid mode. Use 'remote' or 'local'."
+    exit 1
+    ;;
+esac

src/larasets/_fwd.sh

@@ -1,46 +1,59 @@
 #!/bin/sh
 set -e
 
-workspace=${containerWorkspaceFolder:-${CODESPACE_VSCODE_FOLDER:-.}}
+#### Goto repository root
+cd "$(git rev-parse --show-toplevel)" >/dev/null
 
 ### Install composer dependencies if composer.json exists
-if [ -f $workspace/composer.json ]; then
+if [ -f "./composer.json" ]; then
     zz_log i "Install composer dependencies"
     composer install --ansi --ignore-platform-reqs --no-interaction --no-progress
 fi
 
 ### Install npm dependencies if package.json exists
-if [ -f $workspace/package.json ]; then
+if [ -f "./package.json" ]; then
     zz_log i "Install npm dependencies"
     npm install --ws --if-present --include-workspace-root || npm install
 fi
 
-### Init db if sqlite and not exists
-if [ -n "$DB_CONNECTION" ] && [ "$DB_CONNECTION" = "sqlite" ]; then
+### Default DB_CONNECTION
+if [ -z "$DB_CONNECTION" ]; then
+    export DB_CONNECTION=sqlite
+fi
 
+### Init db if sqlite and not exists
+case $DB_CONNECTION in
+sqlite)
+    zz_log i "DB_CONNECTION is {Purple $DB_CONNECTION}"
     ### Set default sqlite db
     if [ -z "$DB_DATABASE" ]; then
         export DB_DATABASE=database/database.sqlite
     fi
 
     zz_log i "Ensure sqlite db {Purple $DB_DATABASE} exist"
-    touch $workspace/$DB_DATABASE
-fi
+    touch ./$DB_DATABASE
+    ;;
+*)
+    zz_log w "DB_CONNECTION {Purple $DB_CONNECTION} is not supported yet"
+    exit 1
+    ;;
+esac
 
 ### Init env
 zz_log i "Init {B dotenv}"
-touch $workspace/.env
+touch ./.env
 
 ### Add APP_KEY to .env if it does not exist, in one line
-grep -q "APP_KEY" $workspace/.env || echo APP_KEY= >>$workspace/.env
+grep -q "APP_KEY"./.env || echo APP_KEY= >>./.env
 
 ### Daytona support (codeanywhere)
-if [ -n "DAYTONA_WS_ID" ]; then
-    echo "Running in Daytona workspace"
-
-    # Define if not defined or replace APP_URL in env file
-    export APP_URL="https://${APP_PORT:-80}-${DAYTONA_WS_ID}.${DAYTONA_WS_DOMAIN}"
-
-    # Replace APP_URL in .env file if it exists
-    grep -q "APP_URL" $workspace/.env || echo "APP_URL=${APP_URL}" >>$workspace/.env && sed -i "s|^APP_URL=.*|APP_URL=${APP_URL}|" $workspace/.env
+if [ -n "$DAYTONA_WS_ID" ]; then
+    zz_log i "Daytona/Codeanywhere support"
+    fwd daytona
+elif [ -n "$CODESPACE_NAME" ]; then
+    zz_log i "Github codespace support"
+    fwd github
+else
+    zz_log i "No fwd support"
+    fwd local
 fi

src/larasets/_init.sh

@@ -1,7 +1,6 @@
 #!/bin/sh
 set -e
 
-workspace=${containerWorkspaceFolder:-${CODESPACE_VSCODE_FOLDER:-.}}
 if [ -n "$LARAVEL_SAIL" ] && [ "$LARAVEL_SAIL" -eq 1 ] && sail ps --status running | grep --after-context=1 -q -; then
     sail npm run "$@"
 else

src/larasets/_run.sh

@@ -1,5 +1,8 @@
 #!/bin/sh
 set -e
 
-workspace=${containerWorkspaceFolder:-${CODESPACE_VSCODE_FOLDER:-.}}
-sh $([ -f "sail" ] && echo sail || [ -f "$workspace/vendor/bin/sail" ] && echo $workspace/vendor/bin/sail) "$@"
+#### Goto repository root
+cd "$(git rev-parse --show-toplevel)" >/dev/null
+
+#### Execute command
+sh $([ -f "sail" ] && echo sail || [ -f "./vendor/bin/sail" ] && echo ./vendor/bin/sail) "$@"

src/larasets/_sail.sh

@@ -1,7 +1,10 @@
 #!/bin/sh
 set -e
 
-workspace=${containerWorkspaceFolder:-${CODESPACE_VSCODE_FOLDER:-.}}
+#### Goto repository root
+cd "$(git rev-parse --show-toplevel)" >/dev/null
+
+#### Execute command
 if [ -n "$LARAVEL_SAIL" ] && [ "$LARAVEL_SAIL" -eq 1 ] && sail ps --status running | grep --after-context=1 -q -; then
     server='sail npx --yes pm2'
 else

src/larasets/_srv.sh

@@ -2,7 +2,7 @@
     "id": "larasets",
     "name": "Laravel settings",
     "description": "A feature to add useful laravel settings to your shell.",
-    "version": "5.0.1",
+    "version": "5.1.0",
     "dependsOn": {
         "ghcr.io/devcontainers/features/docker-in-docker": "",
         "ghcr.io/devcontainers/features/node:1": "lts",