Merge branch 'main' of github.com:fosrl/pangolin into copilot/fix-1112

This commit is contained in:
Owen
2025-08-10 10:11:19 -07:00
4 changed files with 360 additions and 297 deletions

View File

@@ -18,6 +18,7 @@ import (
"syscall" "syscall"
"text/template" "text/template"
"time" "time"
"net"
"golang.org/x/term" "golang.org/x/term"
) )
@@ -75,6 +76,17 @@ func main() {
fmt.Println("Lets get started!") fmt.Println("Lets get started!")
fmt.Println("") fmt.Println("")
for _, p := range []int{80, 443} {
if err := checkPortsAvailable(p); err != nil {
fmt.Fprintln(os.Stderr, err)
fmt.Printf("Please close any services on ports 80/443 in order to run the installation smoothly")
os.Exit(1)
}
}
reader := bufio.NewReader(os.Stdin) reader := bufio.NewReader(os.Stdin)
inputContainer := readString(reader, "Would you like to run Pangolin as Docker or Podman containers?", "docker") inputContainer := readString(reader, "Would you like to run Pangolin as Docker or Podman containers?", "docker")
@@ -776,3 +788,21 @@ func run(name string, args ...string) error {
cmd.Stderr = os.Stderr cmd.Stderr = os.Stderr
return cmd.Run() return cmd.Run()
} }
func checkPortsAvailable(port int) error {
addr := fmt.Sprintf(":%d", port)
ln, err := net.Listen("tcp", addr)
if err != nil {
return fmt.Errorf(
"ERROR: port %d is occupied or cannot be bound: %w\n\n",
port, err,
)
}
if closeErr := ln.Close(); closeErr != nil {
fmt.Fprintf(os.Stderr,
"WARNING: failed to close test listener on port %d: %v\n",
port, closeErr,
)
}
return nil
}

585
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@@ -50,15 +50,15 @@
"@radix-ui/react-tabs": "1.1.12", "@radix-ui/react-tabs": "1.1.12",
"@radix-ui/react-toast": "1.2.14", "@radix-ui/react-toast": "1.2.14",
"@radix-ui/react-tooltip": "^1.2.7", "@radix-ui/react-tooltip": "^1.2.7",
"@react-email/components": "0.3.1", "@react-email/components": "0.5.0",
"@react-email/render": "^1.1.2", "@react-email/render": "^1.2.0",
"@simplewebauthn/browser": "^13.1.0", "@simplewebauthn/browser": "^13.1.0",
"@simplewebauthn/server": "^9.0.3", "@simplewebauthn/server": "^9.0.3",
"@react-email/tailwind": "1.2.1", "@react-email/tailwind": "1.2.2",
"@tailwindcss/forms": "^0.5.10", "@tailwindcss/forms": "^0.5.10",
"@tanstack/react-table": "8.21.3", "@tanstack/react-table": "8.21.3",
"arctic": "^3.7.0", "arctic": "^3.7.0",
"axios": "1.10.0", "axios": "1.11.0",
"better-sqlite3": "11.7.0", "better-sqlite3": "11.7.0",
"canvas-confetti": "1.9.3", "canvas-confetti": "1.9.3",
"class-variance-authority": "^0.7.1", "class-variance-authority": "^0.7.1",
@@ -69,9 +69,9 @@
"cookies": "^0.9.1", "cookies": "^0.9.1",
"cors": "2.8.5", "cors": "2.8.5",
"crypto-js": "^4.2.0", "crypto-js": "^4.2.0",
"drizzle-orm": "0.44.2", "drizzle-orm": "0.44.4",
"eslint": "9.31.0", "eslint": "9.32.0",
"eslint-config-next": "15.3.5", "eslint-config-next": "15.4.6",
"express": "4.21.2", "express": "4.21.2",
"express-rate-limit": "7.5.1", "express-rate-limit": "7.5.1",
"glob": "11.0.3", "glob": "11.0.3",
@@ -82,28 +82,28 @@
"jmespath": "^0.16.0", "jmespath": "^0.16.0",
"js-yaml": "4.1.0", "js-yaml": "4.1.0",
"jsonwebtoken": "^9.0.2", "jsonwebtoken": "^9.0.2",
"lucide-react": "0.525.0", "lucide-react": "0.536.0",
"moment": "2.30.1", "moment": "2.30.1",
"next": "15.3.5", "next": "15.4.6",
"next-intl": "^4.3.4", "next-intl": "^4.3.4",
"next-themes": "0.4.6", "next-themes": "0.4.6",
"node-cache": "5.1.2", "node-cache": "5.1.2",
"node-fetch": "3.3.2", "node-fetch": "3.3.2",
"nodemailer": "7.0.5", "nodemailer": "7.0.5",
"npm": "^11.4.2", "npm": "^11.5.2",
"oslo": "1.2.1", "oslo": "1.2.1",
"pg": "^8.16.2", "pg": "^8.16.2",
"qrcode.react": "4.2.0", "qrcode.react": "4.2.0",
"react": "19.1.0", "react": "19.1.1",
"react-dom": "19.1.0", "react-dom": "19.1.1",
"react-easy-sort": "^1.6.0", "react-easy-sort": "^1.6.0",
"react-hook-form": "7.60.0", "react-hook-form": "7.62.0",
"react-icons": "^5.5.0", "react-icons": "^5.5.0",
"rebuild": "0.1.2", "rebuild": "0.1.2",
"semver": "^7.7.2", "semver": "^7.7.2",
"swagger-ui-express": "^5.0.1", "swagger-ui-express": "^5.0.1",
"tailwind-merge": "3.3.1", "tailwind-merge": "3.3.1",
"tw-animate-css": "^1.3.5", "tw-animate-css": "^1.3.6",
"uuid": "^11.1.0", "uuid": "^11.1.0",
"vaul": "1.1.2", "vaul": "1.1.2",
"winston": "3.17.0", "winston": "3.17.0",
@@ -114,7 +114,7 @@
"yargs": "18.0.0" "yargs": "18.0.0"
}, },
"devDependencies": { "devDependencies": {
"@dotenvx/dotenvx": "1.47.6", "@dotenvx/dotenvx": "1.48.4",
"@esbuild-plugins/tsconfig-paths": "0.1.2", "@esbuild-plugins/tsconfig-paths": "0.1.2",
"@tailwindcss/postcss": "^4.1.10", "@tailwindcss/postcss": "^4.1.10",
"@types/better-sqlite3": "7.6.12", "@types/better-sqlite3": "7.6.12",
@@ -129,8 +129,8 @@
"@types/node": "^24", "@types/node": "^24",
"@types/nodemailer": "6.4.17", "@types/nodemailer": "6.4.17",
"@types/pg": "8.15.4", "@types/pg": "8.15.4",
"@types/react": "19.1.8", "@types/react": "19.1.9",
"@types/react-dom": "19.1.6", "@types/react-dom": "19.1.7",
"@types/semver": "^7.7.0", "@types/semver": "^7.7.0",
"@types/swagger-ui-express": "^4.1.8", "@types/swagger-ui-express": "^4.1.8",
"@types/ws": "8.18.1", "@types/ws": "8.18.1",
@@ -139,12 +139,12 @@
"esbuild": "0.25.6", "esbuild": "0.25.6",
"esbuild-node-externals": "1.18.0", "esbuild-node-externals": "1.18.0",
"postcss": "^8", "postcss": "^8",
"react-email": "4.1.0", "react-email": "4.2.8",
"tailwindcss": "^4.1.4", "tailwindcss": "^4.1.4",
"tsc-alias": "1.8.16", "tsc-alias": "1.8.16",
"tsx": "4.20.3", "tsx": "4.20.3",
"typescript": "^5", "typescript": "^5",
"typescript-eslint": "^8.36.0" "typescript-eslint": "^8.39.0"
}, },
"overrides": { "overrides": {
"emblor": { "emblor": {

View File

@@ -291,10 +291,10 @@ WantedBy=default.target`
}, },
nixos: { nixos: {
x86_64: [ x86_64: [
`nix run 'nixpkgs#fosrl-newt' --id ${id} --secret ${secret} --endpoint ${endpoint}` `nix run 'nixpkgs#fosrl-newt' -- --id ${id} --secret ${secret} --endpoint ${endpoint}`
], ],
aarch64: [ aarch64: [
`nix run 'nixpkgs#fosrl-newt' --id ${id} --secret ${secret} --endpoint ${endpoint}` `nix run 'nixpkgs#fosrl-newt' -- --id ${id} --secret ${secret} --endpoint ${endpoint}`
] ]
} }
}; };