Compare commits

..

28 Commits

Author SHA1 Message Date
Renovate-Clanker 0711718881 chore(deps): update sonarsource/sonarqube-scan-action action to v8
Tests / Run Tests (pull_request) Successful in 1m16s
2026-06-19 19:11:38 +00:00
Renovate-Clanker 76df8d9f75 Merge pull request 'chore(deps): update sonarsource/sonarqube-scan-action action to v7.2.1' (#146) from renovate/all-dependencies into main
SonarQube Scan / SonarQube Trigger (push) Successful in 3m48s
Tests / Run Tests (pull_request) Failing after 1m18s
2026-04-29 16:04:58 +07:00
Renovate-Clanker b87c1f32c8 chore(deps): update sonarsource/sonarqube-scan-action action to v7.2.1
Tests / Run Tests (pull_request) Successful in 2m8s
2026-04-29 09:04:53 +00:00
Renovate-Clanker c4e0fe3279 Merge pull request 'chore(deps): update sonarsource/sonarqube-scan-action action to v7.2.0' (#145) from renovate/all-dependencies into main
SonarQube Scan / SonarQube Trigger (push) Successful in 3m57s
2026-04-28 21:07:15 +07:00
Renovate-Clanker 723758959e chore(deps): update sonarsource/sonarqube-scan-action action to v7.2.0
Tests / Run Tests (pull_request) Successful in 2m6s
2026-04-28 14:07:10 +00:00
Renovate-Clanker 4daaac079f Merge pull request 'fix(deps): update module github.com/caddyserver/certmagic to v0.25.3' (#144) from renovate/all-dependencies into main
SonarQube Scan / SonarQube Trigger (push) Successful in 3m50s
2026-04-25 01:05:27 +07:00
Renovate-Clanker bda3d7863d fix(deps): update module github.com/caddyserver/certmagic to v0.25.3
Tests / Run Tests (pull_request) Successful in 2m11s
2026-04-24 18:05:20 +00:00
Renovate-Clanker 666f5842ae Merge pull request 'fix(deps): update module golang.org/x/crypto to v0.50.0' (#143) from renovate/all-dependencies into main
SonarQube Scan / SonarQube Trigger (push) Successful in 4m51s
2026-04-10 00:05:32 +07:00
Renovate-Clanker 16185aa1c3 fix(deps): update module golang.org/x/crypto to v0.50.0
Tests / Run Tests (pull_request) Successful in 2m18s
2026-04-09 17:05:27 +00:00
Renovate-Clanker a1abe08469 Merge pull request 'chore(deps): update golang docker tag to v1.26.2' (#142) from renovate/all-dependencies into main
SonarQube Scan / SonarQube Trigger (push) Successful in 2m59s
2026-04-08 06:11:16 +07:00
Renovate-Clanker 82f9b4dc0c chore(deps): update golang docker tag to v1.26.2
Tests / Run Tests (pull_request) Successful in 2m7s
2026-04-07 23:11:12 +00:00
Renovate-Clanker aa069f333d chore(deps): update docker/build-push-action action to v7 (#139)
SonarQube Scan / SonarQube Trigger (push) Successful in 3m35s
Reviewed-on: #139
Co-authored-by: Renovate-Clanker <renovate-bot@fossy.my.id>
Co-committed-by: Renovate-Clanker <renovate-bot@fossy.my.id>
2026-04-01 22:19:14 +07:00
Renovate-Clanker a3d9d6f954 chore(deps): update docker/login-action action to v4 (#140)
SonarQube Scan / SonarQube Trigger (push) Successful in 3m50s
Reviewed-on: #140
Co-authored-by: Renovate-Clanker <renovate-bot@fossy.my.id>
Co-committed-by: Renovate-Clanker <renovate-bot@fossy.my.id>
2026-04-01 22:14:56 +07:00
Renovate-Clanker da3d5cc9d9 chore(deps): update docker/setup-buildx-action action to v4 (#141)
SonarQube Scan / SonarQube Trigger (push) Successful in 3m34s
This PR contains the following updates:

| Package | Type | Update | Change |
|---|---|---|---|
| [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) | action | major | `v3` → `v4` |

---

### Release Notes

<details>
<summary>docker/setup-buildx-action (docker/setup-buildx-action)</summary>

### [`v4`](https://github.com/docker/setup-buildx-action/compare/v3...v4)

[Compare Source](https://github.com/docker/setup-buildx-action/compare/v3...v4)

</details>

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box

---

This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0My4xMDAuMiIsInVwZGF0ZWRJblZlciI6IjQzLjEwMC4yIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6W119-->

Reviewed-on: #141
Co-authored-by: Renovate-Clanker <renovate-bot@fossy.my.id>
Co-committed-by: Renovate-Clanker <renovate-bot@fossy.my.id>
2026-04-01 22:09:24 +07:00
Renovate-Clanker 4ac0f6ed4d Merge pull request 'fix(deps): update all-dependencies' (#138) from renovate/all-dependencies into main
SonarQube Scan / SonarQube Trigger (push) Successful in 3m34s
2026-04-01 21:30:40 +07:00
Renovate-Clanker df8e746fc4 fix(deps): update all-dependencies
Tests / Run Tests (pull_request) Successful in 2m7s
2026-04-01 14:30:31 +00:00
bagas 51e8073c7e chore: configure renovate to group and automerge dependencies (#137)
SonarQube Scan / SonarQube Trigger (push) Successful in 3m45s
Reviewed-on: #137
2026-04-01 21:17:26 +07:00
Renovate-Clanker 1c175100b9 Merge pull request 'chore(deps): update sonarsource/sonarqube-scan-action action to v7.1.0' (#135) from renovate/sonarsource-sonarqube-scan-action-7.x into main
SonarQube Scan / SonarQube Trigger (push) Successful in 3m33s
2026-04-01 17:05:10 +07:00
Renovate-Clanker 24838172c7 chore(deps): update sonarsource/sonarqube-scan-action action to v7.1.0
Tests / Run Tests (pull_request) Successful in 2m6s
2026-04-01 10:05:05 +00:00
bagas 6d4403012f Merge pull request 'chore(deps): update golang docker tag to v1.26.1' (#124) from renovate/golang-1.x into main
SonarQube Scan / SonarQube Trigger (push) Successful in 3m32s
Reviewed-on: #124
2026-04-01 08:33:13 +07:00
Renovate-Clanker e69abd85b6 chore(deps): update golang docker tag to v1.26.1
Tests / Run Tests (pull_request) Successful in 2m34s
2026-04-01 01:07:17 +00:00
bagas 54179a7112 refactor: move server, session, and types package to internal
SonarQube Scan / SonarQube Trigger (push) Successful in 3m39s
Docker Build and Push / Run Tests (push) Successful in 2m10s
Docker Build and Push / Build and Push Docker Image (push) Successful in 19m55s
Reviewed-on: #123
2026-03-30 12:15:14 +07:00
bagas d7ec5e852b Merge pull request 'refactor: move types package to internal' (#122) from refactor/move-types-to-internal into staging
SonarQube Scan / SonarQube Trigger (push) Successful in 3m32s
Tests / Run Tests (pull_request) Successful in 2m6s
Reviewed-on: #122
2026-03-30 11:53:16 +07:00
bagas 4af011b91d refactor: move types package to internal
Tests / Run Tests (pull_request) Successful in 2m7s
2026-03-30 11:50:24 +07:00
bagas dc0a4af27f Merge pull request 'refactor: move session package to internal' (#121) from refactor/move-session-to-internal into staging
SonarQube Scan / SonarQube Trigger (push) Successful in 3m48s
Reviewed-on: #121
2026-03-30 11:47:35 +07:00
bagas 032b6e5096 Merge pull request 'refactor: move server package to internal' (#120) from refactor/move-server-to-internal into staging
SonarQube Scan / SonarQube Trigger (push) Successful in 3m36s
Reviewed-on: #120
2026-03-30 11:38:52 +07:00
bagas ae71b46482 refactor: move session package to internal
Tests / Run Tests (pull_request) Successful in 2m4s
2026-03-30 11:37:59 +07:00
bagas 7ecc56aa3c refactor: move server package to internal
Tests / Run Tests (pull_request) Successful in 2m37s
2026-03-30 11:18:44 +07:00
36 changed files with 212 additions and 165 deletions
+4 -4
View File
@@ -40,10 +40,10 @@ jobs:
uses: actions/checkout@v6 uses: actions/checkout@v6
- name: Set up Docker Buildx - name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3 uses: docker/setup-buildx-action@v4
- name: Log in to Docker Registry - name: Log in to Docker Registry
uses: docker/login-action@v3 uses: docker/login-action@v4
with: with:
registry: git.fossy.my.id registry: git.fossy.my.id
username: ${{ secrets.DOCKER_USERNAME }} username: ${{ secrets.DOCKER_USERNAME }}
@@ -79,7 +79,7 @@ jobs:
fi fi
- name: Build and push Docker image (release) - name: Build and push Docker image (release)
uses: docker/build-push-action@v6 uses: docker/build-push-action@v7
with: with:
context: . context: .
push: true push: true
@@ -97,7 +97,7 @@ jobs:
if: steps.version.outputs.IS_PRERELEASE == 'false' if: steps.version.outputs.IS_PRERELEASE == 'false'
- name: Build and push Docker image (pre-release) - name: Build and push Docker image (pre-release)
uses: docker/build-push-action@v6 uses: docker/build-push-action@v7
with: with:
context: . context: .
push: true push: true
+1 -1
View File
@@ -43,7 +43,7 @@ jobs:
--output.checkstyle.path=golangci-lint-report.xml --output.checkstyle.path=golangci-lint-report.xml
- name: SonarQube Scan - name: SonarQube Scan
uses: SonarSource/sonarqube-scan-action@v7.0.0 uses: SonarSource/sonarqube-scan-action@v8.2.0
env: env:
SONAR_HOST_URL: ${{ secrets.SONARQUBE_HOST }} SONAR_HOST_URL: ${{ secrets.SONARQUBE_HOST }}
SONAR_TOKEN: ${{ secrets.SONARQUBE_TOKEN }} SONAR_TOKEN: ${{ secrets.SONARQUBE_TOKEN }}
+1 -1
View File
@@ -1,4 +1,4 @@
FROM golang:1.26.0-alpine AS go_builder FROM golang:1.26.2-alpine AS go_builder
ARG VERSION=dev ARG VERSION=dev
ARG BUILD_DATE=unknown ARG BUILD_DATE=unknown
+14 -18
View File
@@ -3,32 +3,28 @@ module tunnel_pls
go 1.26.0 go 1.26.0
require ( require (
charm.land/bubbletea/v2 v2.0.0
git.fossy.my.id/bagas/tunnel-please-grpc v1.5.0 git.fossy.my.id/bagas/tunnel-please-grpc v1.5.0
github.com/caddyserver/certmagic v0.25.1 github.com/caddyserver/certmagic v0.25.3
github.com/charmbracelet/bubbles v1.0.0 github.com/charmbracelet/bubbles v1.0.0
github.com/charmbracelet/bubbletea v1.3.10
github.com/charmbracelet/lipgloss v1.1.0 github.com/charmbracelet/lipgloss v1.1.0
github.com/joho/godotenv v1.5.1 github.com/joho/godotenv v1.5.1
github.com/libdns/cloudflare v0.2.2 github.com/libdns/cloudflare v0.2.2
github.com/muesli/termenv v0.16.0 github.com/muesli/termenv v0.16.0
github.com/stretchr/testify v1.11.1 github.com/stretchr/testify v1.11.1
golang.org/x/crypto v0.48.0 golang.org/x/crypto v0.50.0
google.golang.org/grpc v1.78.0 google.golang.org/grpc v1.80.0
google.golang.org/protobuf v1.36.11 google.golang.org/protobuf v1.36.11
) )
require ( require (
github.com/atotto/clipboard v0.1.4 // indirect github.com/atotto/clipboard v0.1.4 // indirect
github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
github.com/caddyserver/zerossl v0.1.4 // indirect github.com/caddyserver/zerossl v0.1.5 // indirect
github.com/charmbracelet/bubbletea v1.3.10 // indirect
github.com/charmbracelet/colorprofile v0.4.1 // indirect github.com/charmbracelet/colorprofile v0.4.1 // indirect
github.com/charmbracelet/ultraviolet v0.0.0-20260205113103-524a6607adb8 // indirect
github.com/charmbracelet/x/ansi v0.11.6 // indirect github.com/charmbracelet/x/ansi v0.11.6 // indirect
github.com/charmbracelet/x/cellbuf v0.0.15 // indirect github.com/charmbracelet/x/cellbuf v0.0.15 // indirect
github.com/charmbracelet/x/term v0.2.2 // indirect github.com/charmbracelet/x/term v0.2.2 // indirect
github.com/charmbracelet/x/termios v0.1.1 // indirect
github.com/charmbracelet/x/windows v0.2.2 // indirect
github.com/clipperhouse/displaywidth v0.9.0 // indirect github.com/clipperhouse/displaywidth v0.9.0 // indirect
github.com/clipperhouse/stringish v0.1.1 // indirect github.com/clipperhouse/stringish v0.1.1 // indirect
github.com/clipperhouse/uax29/v2 v2.5.0 // indirect github.com/clipperhouse/uax29/v2 v2.5.0 // indirect
@@ -40,8 +36,8 @@ require (
github.com/mattn/go-isatty v0.0.20 // indirect github.com/mattn/go-isatty v0.0.20 // indirect
github.com/mattn/go-localereader v0.0.1 // indirect github.com/mattn/go-localereader v0.0.1 // indirect
github.com/mattn/go-runewidth v0.0.19 // indirect github.com/mattn/go-runewidth v0.0.19 // indirect
github.com/mholt/acmez/v3 v3.1.4 // indirect github.com/mholt/acmez/v3 v3.1.6 // indirect
github.com/miekg/dns v1.1.69 // indirect github.com/miekg/dns v1.1.72 // indirect
github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 // indirect github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 // indirect
github.com/muesli/cancelreader v0.2.2 // indirect github.com/muesli/cancelreader v0.2.2 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect
@@ -53,12 +49,12 @@ require (
go.uber.org/multierr v1.11.0 // indirect go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.27.1 // indirect go.uber.org/zap v1.27.1 // indirect
go.uber.org/zap/exp v0.3.0 // indirect go.uber.org/zap/exp v0.3.0 // indirect
golang.org/x/mod v0.32.0 // indirect golang.org/x/mod v0.35.0 // indirect
golang.org/x/net v0.49.0 // indirect golang.org/x/net v0.53.0 // indirect
golang.org/x/sync v0.19.0 // indirect golang.org/x/sync v0.20.0 // indirect
golang.org/x/sys v0.41.0 // indirect golang.org/x/sys v0.43.0 // indirect
golang.org/x/text v0.34.0 // indirect golang.org/x/text v0.36.0 // indirect
golang.org/x/tools v0.41.0 // indirect golang.org/x/tools v0.44.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20251222181119-0a764e51fe1b // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20260120221211-b8f7ae30c516 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect
) )
+48 -10
View File
@@ -1,5 +1,3 @@
charm.land/bubbletea/v2 v2.0.0 h1:p0d6CtWyJXJ9GfzMpUUqbP/XUUhhlk06+vCKWmox1wQ=
charm.land/bubbletea/v2 v2.0.0/go.mod h1:3LRff2U4WIYXy7MTxfbAQ+AdfM3D8Xuvz2wbsOD9OHQ=
git.fossy.my.id/bagas/tunnel-please-grpc v1.5.0 h1:3xszIhck4wo9CoeRq9vnkar4PhY7kz9QrR30qj2XszA= git.fossy.my.id/bagas/tunnel-please-grpc v1.5.0 h1:3xszIhck4wo9CoeRq9vnkar4PhY7kz9QrR30qj2XszA=
git.fossy.my.id/bagas/tunnel-please-grpc v1.5.0/go.mod h1:Weh6ZujgWmT8XxD3Qba7sJ6r5eyUMB9XSWynqdyOoLo= git.fossy.my.id/bagas/tunnel-please-grpc v1.5.0/go.mod h1:Weh6ZujgWmT8XxD3Qba7sJ6r5eyUMB9XSWynqdyOoLo=
github.com/atotto/clipboard v0.1.4 h1:EH0zSVneZPSuFR11BlR9YppQTVDbh5+16AmcJi4g1z4= github.com/atotto/clipboard v0.1.4 h1:EH0zSVneZPSuFR11BlR9YppQTVDbh5+16AmcJi4g1z4=
@@ -10,8 +8,14 @@ github.com/aymanbagabas/go-udiff v0.3.1 h1:LV+qyBQ2pqe0u42ZsUEtPiCaUoqgA9gYRDs3v
github.com/aymanbagabas/go-udiff v0.3.1/go.mod h1:G0fsKmG+P6ylD0r6N/KgQD/nWzgfnl8ZBcNLgcbrw8E= github.com/aymanbagabas/go-udiff v0.3.1/go.mod h1:G0fsKmG+P6ylD0r6N/KgQD/nWzgfnl8ZBcNLgcbrw8E=
github.com/caddyserver/certmagic v0.25.1 h1:4sIKKbOt5pg6+sL7tEwymE1x2bj6CHr80da1CRRIPbY= github.com/caddyserver/certmagic v0.25.1 h1:4sIKKbOt5pg6+sL7tEwymE1x2bj6CHr80da1CRRIPbY=
github.com/caddyserver/certmagic v0.25.1/go.mod h1:VhyvndxtVton/Fo/wKhRoC46Rbw1fmjvQ3GjHYSQTEY= github.com/caddyserver/certmagic v0.25.1/go.mod h1:VhyvndxtVton/Fo/wKhRoC46Rbw1fmjvQ3GjHYSQTEY=
github.com/caddyserver/certmagic v0.25.2 h1:D7xcS7ggX/WEY54x0czj7ioTkmDWKIgxtIi2OcQclUc=
github.com/caddyserver/certmagic v0.25.2/go.mod h1:llW/CvsNmza8S6hmsuggsZeiX+uS27dkqY27wDIuBWg=
github.com/caddyserver/certmagic v0.25.3 h1:mGf5ba8F7xA4c5jfDZZbK2buY1VEkbnwpMDixaju94A=
github.com/caddyserver/certmagic v0.25.3/go.mod h1:YVs43D5+H/Dckt4bTga1KSO/xYfFBfVZainGDywYPAA=
github.com/caddyserver/zerossl v0.1.4 h1:CVJOE3MZeFisCERZjkxIcsqIH4fnFdlYWnPYeFtBHRw= github.com/caddyserver/zerossl v0.1.4 h1:CVJOE3MZeFisCERZjkxIcsqIH4fnFdlYWnPYeFtBHRw=
github.com/caddyserver/zerossl v0.1.4/go.mod h1:CxA0acn7oEGO6//4rtrRjYgEoa4MFw/XofZnrYwGqG4= github.com/caddyserver/zerossl v0.1.4/go.mod h1:CxA0acn7oEGO6//4rtrRjYgEoa4MFw/XofZnrYwGqG4=
github.com/caddyserver/zerossl v0.1.5 h1:dkvOjBAEEtY6LIGAHei7sw2UgqSD6TrWweXpV7lvEvE=
github.com/caddyserver/zerossl v0.1.5/go.mod h1:CxA0acn7oEGO6//4rtrRjYgEoa4MFw/XofZnrYwGqG4=
github.com/charmbracelet/bubbles v1.0.0 h1:12J8/ak/uCZEMQ6KU7pcfwceyjLlWsDLAxB5fXonfvc= github.com/charmbracelet/bubbles v1.0.0 h1:12J8/ak/uCZEMQ6KU7pcfwceyjLlWsDLAxB5fXonfvc=
github.com/charmbracelet/bubbles v1.0.0/go.mod h1:9d/Zd5GdnauMI5ivUIVisuEm3ave1XwXtD1ckyV6r3E= github.com/charmbracelet/bubbles v1.0.0/go.mod h1:9d/Zd5GdnauMI5ivUIVisuEm3ave1XwXtD1ckyV6r3E=
github.com/charmbracelet/bubbletea v1.3.10 h1:otUDHWMMzQSB0Pkc87rm691KZ3SWa4KUlvF9nRvCICw= github.com/charmbracelet/bubbletea v1.3.10 h1:otUDHWMMzQSB0Pkc87rm691KZ3SWa4KUlvF9nRvCICw=
@@ -20,20 +24,14 @@ github.com/charmbracelet/colorprofile v0.4.1 h1:a1lO03qTrSIRaK8c3JRxJDZOvhvIeSco
github.com/charmbracelet/colorprofile v0.4.1/go.mod h1:U1d9Dljmdf9DLegaJ0nGZNJvoXAhayhmidOdcBwAvKk= github.com/charmbracelet/colorprofile v0.4.1/go.mod h1:U1d9Dljmdf9DLegaJ0nGZNJvoXAhayhmidOdcBwAvKk=
github.com/charmbracelet/lipgloss v1.1.0 h1:vYXsiLHVkK7fp74RkV7b2kq9+zDLoEU4MZoFqR/noCY= github.com/charmbracelet/lipgloss v1.1.0 h1:vYXsiLHVkK7fp74RkV7b2kq9+zDLoEU4MZoFqR/noCY=
github.com/charmbracelet/lipgloss v1.1.0/go.mod h1:/6Q8FR2o+kj8rz4Dq0zQc3vYf7X+B0binUUBwA0aL30= github.com/charmbracelet/lipgloss v1.1.0/go.mod h1:/6Q8FR2o+kj8rz4Dq0zQc3vYf7X+B0binUUBwA0aL30=
github.com/charmbracelet/ultraviolet v0.0.0-20260205113103-524a6607adb8 h1:eyFRbAmexyt43hVfeyBofiGSEmJ7krjLOYt/9CF5NKA=
github.com/charmbracelet/ultraviolet v0.0.0-20260205113103-524a6607adb8/go.mod h1:SQpCTRNBtzJkwku5ye4S3HEuthAlGy2n9VXZnWkEW98=
github.com/charmbracelet/x/ansi v0.11.6 h1:GhV21SiDz/45W9AnV2R61xZMRri5NlLnl6CVF7ihZW8= github.com/charmbracelet/x/ansi v0.11.6 h1:GhV21SiDz/45W9AnV2R61xZMRri5NlLnl6CVF7ihZW8=
github.com/charmbracelet/x/ansi v0.11.6/go.mod h1:2JNYLgQUsyqaiLovhU2Rv/pb8r6ydXKS3NIttu3VGZQ= github.com/charmbracelet/x/ansi v0.11.6/go.mod h1:2JNYLgQUsyqaiLovhU2Rv/pb8r6ydXKS3NIttu3VGZQ=
github.com/charmbracelet/x/cellbuf v0.0.15 h1:ur3pZy0o6z/R7EylET877CBxaiE1Sp1GMxoFPAIztPI= github.com/charmbracelet/x/cellbuf v0.0.15 h1:ur3pZy0o6z/R7EylET877CBxaiE1Sp1GMxoFPAIztPI=
github.com/charmbracelet/x/cellbuf v0.0.15/go.mod h1:J1YVbR7MUuEGIFPCaaZ96KDl5NoS0DAWkskup+mOY+Q= github.com/charmbracelet/x/cellbuf v0.0.15/go.mod h1:J1YVbR7MUuEGIFPCaaZ96KDl5NoS0DAWkskup+mOY+Q=
github.com/charmbracelet/x/exp/golden v0.0.0-20241212170349-ad4b7ae0f25f h1:UytXHv0UxnsDFmL/7Z9Q5SBYPwSuRLXHbwx+6LycZ2w= github.com/charmbracelet/x/exp/golden v0.0.0-20241011142426-46044092ad91 h1:payRxjMjKgx2PaCWLZ4p3ro9y97+TVLZNaRZgJwSVDQ=
github.com/charmbracelet/x/exp/golden v0.0.0-20241212170349-ad4b7ae0f25f/go.mod h1:wDlXFlCrmJ8J+swcL/MnGUuYnqgQdW9rhSD61oNMb6U= github.com/charmbracelet/x/exp/golden v0.0.0-20241011142426-46044092ad91/go.mod h1:wDlXFlCrmJ8J+swcL/MnGUuYnqgQdW9rhSD61oNMb6U=
github.com/charmbracelet/x/term v0.2.2 h1:xVRT/S2ZcKdhhOuSP4t5cLi5o+JxklsoEObBSgfgZRk= github.com/charmbracelet/x/term v0.2.2 h1:xVRT/S2ZcKdhhOuSP4t5cLi5o+JxklsoEObBSgfgZRk=
github.com/charmbracelet/x/term v0.2.2/go.mod h1:kF8CY5RddLWrsgVwpw4kAa6TESp6EB5y3uxGLeCqzAI= github.com/charmbracelet/x/term v0.2.2/go.mod h1:kF8CY5RddLWrsgVwpw4kAa6TESp6EB5y3uxGLeCqzAI=
github.com/charmbracelet/x/termios v0.1.1 h1:o3Q2bT8eqzGnGPOYheoYS8eEleT5ZVNYNy8JawjaNZY=
github.com/charmbracelet/x/termios v0.1.1/go.mod h1:rB7fnv1TgOPOyyKRJ9o+AsTU/vK5WHJ2ivHeut/Pcwo=
github.com/charmbracelet/x/windows v0.2.2 h1:IofanmuvaxnKHuV04sC0eBy/smG6kIKrWG2/jYn2GuM=
github.com/charmbracelet/x/windows v0.2.2/go.mod h1:/8XtdKZzedat74NQFn0NGlGL4soHB0YQZrETF96h75k=
github.com/clipperhouse/displaywidth v0.9.0 h1:Qb4KOhYwRiN3viMv1v/3cTBlz3AcAZX3+y9OLhMtAtA= github.com/clipperhouse/displaywidth v0.9.0 h1:Qb4KOhYwRiN3viMv1v/3cTBlz3AcAZX3+y9OLhMtAtA=
github.com/clipperhouse/displaywidth v0.9.0/go.mod h1:aCAAqTlh4GIVkhQnJpbL0T/WfcrJXHcj8C0yjYcjOZA= github.com/clipperhouse/displaywidth v0.9.0/go.mod h1:aCAAqTlh4GIVkhQnJpbL0T/WfcrJXHcj8C0yjYcjOZA=
github.com/clipperhouse/stringish v0.1.1 h1:+NSqMOr3GR6k1FdRhhnXrLfztGzuG+VuFDfatpWHKCs= github.com/clipperhouse/stringish v0.1.1 h1:+NSqMOr3GR6k1FdRhhnXrLfztGzuG+VuFDfatpWHKCs=
@@ -74,8 +72,12 @@ github.com/mattn/go-runewidth v0.0.19 h1:v++JhqYnZuu5jSKrk9RbgF5v4CGUjqRfBm05byF
github.com/mattn/go-runewidth v0.0.19/go.mod h1:XBkDxAl56ILZc9knddidhrOlY5R/pDhgLpndooCuJAs= github.com/mattn/go-runewidth v0.0.19/go.mod h1:XBkDxAl56ILZc9knddidhrOlY5R/pDhgLpndooCuJAs=
github.com/mholt/acmez/v3 v3.1.4 h1:DyzZe/RnAzT3rpZj/2Ii5xZpiEvvYk3cQEN/RmqxwFQ= github.com/mholt/acmez/v3 v3.1.4 h1:DyzZe/RnAzT3rpZj/2Ii5xZpiEvvYk3cQEN/RmqxwFQ=
github.com/mholt/acmez/v3 v3.1.4/go.mod h1:L1wOU06KKvq7tswuMDwKdcHeKpFFgkppZy/y0DFxagQ= github.com/mholt/acmez/v3 v3.1.4/go.mod h1:L1wOU06KKvq7tswuMDwKdcHeKpFFgkppZy/y0DFxagQ=
github.com/mholt/acmez/v3 v3.1.6 h1:eGVQNObP0pBN4sxqrXeg7MYqTOWyoiYpQqITVWlrevk=
github.com/mholt/acmez/v3 v3.1.6/go.mod h1:5nTPosTGosLxF3+LU4ygbgMRFDhbAVpqMI4+a4aHLBY=
github.com/miekg/dns v1.1.69 h1:Kb7Y/1Jo+SG+a2GtfoFUfDkG//csdRPwRLkCsxDG9Sc= github.com/miekg/dns v1.1.69 h1:Kb7Y/1Jo+SG+a2GtfoFUfDkG//csdRPwRLkCsxDG9Sc=
github.com/miekg/dns v1.1.69/go.mod h1:7OyjD9nEba5OkqQ/hB4fy3PIoxafSZJtducccIelz3g= github.com/miekg/dns v1.1.69/go.mod h1:7OyjD9nEba5OkqQ/hB4fy3PIoxafSZJtducccIelz3g=
github.com/miekg/dns v1.1.72 h1:vhmr+TF2A3tuoGNkLDFK9zi36F2LS+hKTRW0Uf8kbzI=
github.com/miekg/dns v1.1.72/go.mod h1:+EuEPhdHOsfk6Wk5TT2CzssZdqkmFhf8r+aVyDEToIs=
github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 h1:ZK8zHtRHOkbHy6Mmr5D264iyp3TiX5OmNcI5cIARiQI= github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 h1:ZK8zHtRHOkbHy6Mmr5D264iyp3TiX5OmNcI5cIARiQI=
github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6/go.mod h1:CJlz5H+gyd6CUWT45Oy4q24RdLyn7Md9Vj2/ldJBSIo= github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6/go.mod h1:CJlz5H+gyd6CUWT45Oy4q24RdLyn7Md9Vj2/ldJBSIo=
github.com/muesli/cancelreader v0.2.2 h1:3I4Kt4BQjOR54NavqnDogx/MIoWBFa0StPA8ELUXHmA= github.com/muesli/cancelreader v0.2.2 h1:3I4Kt4BQjOR54NavqnDogx/MIoWBFa0StPA8ELUXHmA=
@@ -122,30 +124,66 @@ go.uber.org/zap/exp v0.3.0 h1:6JYzdifzYkGmTdRR59oYH+Ng7k49H9qVpWwNSsGJj3U=
go.uber.org/zap/exp v0.3.0/go.mod h1:5I384qq7XGxYyByIhHm6jg5CHkGY0nsTfbDLgDDlgJQ= go.uber.org/zap/exp v0.3.0/go.mod h1:5I384qq7XGxYyByIhHm6jg5CHkGY0nsTfbDLgDDlgJQ=
golang.org/x/crypto v0.48.0 h1:/VRzVqiRSggnhY7gNRxPauEQ5Drw9haKdM0jqfcCFts= golang.org/x/crypto v0.48.0 h1:/VRzVqiRSggnhY7gNRxPauEQ5Drw9haKdM0jqfcCFts=
golang.org/x/crypto v0.48.0/go.mod h1:r0kV5h3qnFPlQnBSrULhlsRfryS2pmewsg+XfMgkVos= golang.org/x/crypto v0.48.0/go.mod h1:r0kV5h3qnFPlQnBSrULhlsRfryS2pmewsg+XfMgkVos=
golang.org/x/crypto v0.49.0 h1:+Ng2ULVvLHnJ/ZFEq4KdcDd/cfjrrjjNSXNzxg0Y4U4=
golang.org/x/crypto v0.49.0/go.mod h1:ErX4dUh2UM+CFYiXZRTcMpEcN8b/1gxEuv3nODoYtCA=
golang.org/x/crypto v0.50.0 h1:zO47/JPrL6vsNkINmLoo/PH1gcxpls50DNogFvB5ZGI=
golang.org/x/crypto v0.50.0/go.mod h1:3muZ7vA7PBCE6xgPX7nkzzjiUq87kRItoJQM1Yo8S+Q=
golang.org/x/exp v0.0.0-20231006140011-7918f672742d h1:jtJma62tbqLibJ5sFQz8bKtEM8rJBtfilJ2qTU199MI= golang.org/x/exp v0.0.0-20231006140011-7918f672742d h1:jtJma62tbqLibJ5sFQz8bKtEM8rJBtfilJ2qTU199MI=
golang.org/x/exp v0.0.0-20231006140011-7918f672742d/go.mod h1:ldy0pHrwJyGW56pPQzzkH36rKxoZW1tw7ZJpeKx+hdo= golang.org/x/exp v0.0.0-20231006140011-7918f672742d/go.mod h1:ldy0pHrwJyGW56pPQzzkH36rKxoZW1tw7ZJpeKx+hdo=
golang.org/x/mod v0.32.0 h1:9F4d3PHLljb6x//jOyokMv3eX+YDeepZSEo3mFJy93c= golang.org/x/mod v0.32.0 h1:9F4d3PHLljb6x//jOyokMv3eX+YDeepZSEo3mFJy93c=
golang.org/x/mod v0.32.0/go.mod h1:SgipZ/3h2Ci89DlEtEXWUk/HteuRin+HHhN+WbNhguU= golang.org/x/mod v0.32.0/go.mod h1:SgipZ/3h2Ci89DlEtEXWUk/HteuRin+HHhN+WbNhguU=
golang.org/x/mod v0.33.0 h1:tHFzIWbBifEmbwtGz65eaWyGiGZatSrT9prnU8DbVL8=
golang.org/x/mod v0.33.0/go.mod h1:swjeQEj+6r7fODbD2cqrnje9PnziFuw4bmLbBZFrQ5w=
golang.org/x/mod v0.34.0 h1:xIHgNUUnW6sYkcM5Jleh05DvLOtwc6RitGHbDk4akRI=
golang.org/x/mod v0.34.0/go.mod h1:ykgH52iCZe79kzLLMhyCUzhMci+nQj+0XkbXpNYtVjY=
golang.org/x/mod v0.35.0 h1:Ww1D637e6Pg+Zb2KrWfHQUnH2dQRLBQyAtpr/haaJeM=
golang.org/x/mod v0.35.0/go.mod h1:+GwiRhIInF8wPm+4AoT6L0FA1QWAad3OMdTRx4tFYlU=
golang.org/x/net v0.49.0 h1:eeHFmOGUTtaaPSGNmjBKpbng9MulQsJURQUAfUwY++o= golang.org/x/net v0.49.0 h1:eeHFmOGUTtaaPSGNmjBKpbng9MulQsJURQUAfUwY++o=
golang.org/x/net v0.49.0/go.mod h1:/ysNB2EvaqvesRkuLAyjI1ycPZlQHM3q01F02UY/MV8= golang.org/x/net v0.49.0/go.mod h1:/ysNB2EvaqvesRkuLAyjI1ycPZlQHM3q01F02UY/MV8=
golang.org/x/net v0.51.0 h1:94R/GTO7mt3/4wIKpcR5gkGmRLOuE/2hNGeWq/GBIFo=
golang.org/x/net v0.51.0/go.mod h1:aamm+2QF5ogm02fjy5Bb7CQ0WMt1/WVM7FtyaTLlA9Y=
golang.org/x/net v0.52.0 h1:He/TN1l0e4mmR3QqHMT2Xab3Aj3L9qjbhRm78/6jrW0=
golang.org/x/net v0.52.0/go.mod h1:R1MAz7uMZxVMualyPXb+VaqGSa3LIaUqk0eEt3w36Sw=
golang.org/x/net v0.53.0 h1:d+qAbo5L0orcWAr0a9JweQpjXF19LMXJE8Ey7hwOdUA=
golang.org/x/net v0.53.0/go.mod h1:JvMuJH7rrdiCfbeHoo3fCQU24Lf5JJwT9W3sJFulfgs=
golang.org/x/sync v0.19.0 h1:vV+1eWNmZ5geRlYjzm2adRgW2/mcpevXNg50YZtPCE4= golang.org/x/sync v0.19.0 h1:vV+1eWNmZ5geRlYjzm2adRgW2/mcpevXNg50YZtPCE4=
golang.org/x/sync v0.19.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI= golang.org/x/sync v0.19.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
golang.org/x/sync v0.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4=
golang.org/x/sync v0.20.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0=
golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.41.0 h1:Ivj+2Cp/ylzLiEU89QhWblYnOE9zerudt9Ftecq2C6k= golang.org/x/sys v0.41.0 h1:Ivj+2Cp/ylzLiEU89QhWblYnOE9zerudt9Ftecq2C6k=
golang.org/x/sys v0.41.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= golang.org/x/sys v0.41.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
golang.org/x/sys v0.42.0 h1:omrd2nAlyT5ESRdCLYdm3+fMfNFE/+Rf4bDIQImRJeo=
golang.org/x/sys v0.42.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
golang.org/x/sys v0.43.0 h1:Rlag2XtaFTxp19wS8MXlJwTvoh8ArU6ezoyFsMyCTNI=
golang.org/x/sys v0.43.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
golang.org/x/term v0.40.0 h1:36e4zGLqU4yhjlmxEaagx2KuYbJq3EwY8K943ZsHcvg= golang.org/x/term v0.40.0 h1:36e4zGLqU4yhjlmxEaagx2KuYbJq3EwY8K943ZsHcvg=
golang.org/x/term v0.40.0/go.mod h1:w2P8uVp06p2iyKKuvXIm7N/y0UCRt3UfJTfZ7oOpglM= golang.org/x/term v0.40.0/go.mod h1:w2P8uVp06p2iyKKuvXIm7N/y0UCRt3UfJTfZ7oOpglM=
golang.org/x/text v0.34.0 h1:oL/Qq0Kdaqxa1KbNeMKwQq0reLCCaFtqu2eNuSeNHbk= golang.org/x/text v0.34.0 h1:oL/Qq0Kdaqxa1KbNeMKwQq0reLCCaFtqu2eNuSeNHbk=
golang.org/x/text v0.34.0/go.mod h1:homfLqTYRFyVYemLBFl5GgL/DWEiH5wcsQ5gSh1yziA= golang.org/x/text v0.34.0/go.mod h1:homfLqTYRFyVYemLBFl5GgL/DWEiH5wcsQ5gSh1yziA=
golang.org/x/text v0.35.0 h1:JOVx6vVDFokkpaq1AEptVzLTpDe9KGpj5tR4/X+ybL8=
golang.org/x/text v0.35.0/go.mod h1:khi/HExzZJ2pGnjenulevKNX1W67CUy0AsXcNubPGCA=
golang.org/x/text v0.36.0 h1:JfKh3XmcRPqZPKevfXVpI1wXPTqbkE5f7JA92a55Yxg=
golang.org/x/text v0.36.0/go.mod h1:NIdBknypM8iqVmPiuco0Dh6P5Jcdk8lJL0CUebqK164=
golang.org/x/tools v0.41.0 h1:a9b8iMweWG+S0OBnlU36rzLp20z1Rp10w+IY2czHTQc= golang.org/x/tools v0.41.0 h1:a9b8iMweWG+S0OBnlU36rzLp20z1Rp10w+IY2czHTQc=
golang.org/x/tools v0.41.0/go.mod h1:XSY6eDqxVNiYgezAVqqCeihT4j1U2CCsqvH3WhQpnlg= golang.org/x/tools v0.41.0/go.mod h1:XSY6eDqxVNiYgezAVqqCeihT4j1U2CCsqvH3WhQpnlg=
golang.org/x/tools v0.42.0 h1:uNgphsn75Tdz5Ji2q36v/nsFSfR/9BRFvqhGBaJGd5k=
golang.org/x/tools v0.42.0/go.mod h1:Ma6lCIwGZvHK6XtgbswSoWroEkhugApmsXyrUmBhfr0=
golang.org/x/tools v0.43.0 h1:12BdW9CeB3Z+J/I/wj34VMl8X+fEXBxVR90JeMX5E7s=
golang.org/x/tools v0.43.0/go.mod h1:uHkMso649BX2cZK6+RpuIPXS3ho2hZo4FVwfoy1vIk0=
golang.org/x/tools v0.44.0 h1:UP4ajHPIcuMjT1GqzDWRlalUEoY+uzoZKnhOjbIPD2c=
golang.org/x/tools v0.44.0/go.mod h1:KA0AfVErSdxRZIsOVipbv3rQhVXTnlU6UhKxHd1seDI=
gonum.org/v1/gonum v0.16.0 h1:5+ul4Swaf3ESvrOnidPp4GZbzf0mxVQpDCYUQE7OJfk= gonum.org/v1/gonum v0.16.0 h1:5+ul4Swaf3ESvrOnidPp4GZbzf0mxVQpDCYUQE7OJfk=
gonum.org/v1/gonum v0.16.0/go.mod h1:fef3am4MQ93R2HHpKnLk4/Tbh/s0+wqD5nfa6Pnwy4E= gonum.org/v1/gonum v0.16.0/go.mod h1:fef3am4MQ93R2HHpKnLk4/Tbh/s0+wqD5nfa6Pnwy4E=
google.golang.org/genproto/googleapis/rpc v0.0.0-20251222181119-0a764e51fe1b h1:Mv8VFug0MP9e5vUxfBcE3vUkV6CImK3cMNMIDFjmzxU= google.golang.org/genproto/googleapis/rpc v0.0.0-20251222181119-0a764e51fe1b h1:Mv8VFug0MP9e5vUxfBcE3vUkV6CImK3cMNMIDFjmzxU=
google.golang.org/genproto/googleapis/rpc v0.0.0-20251222181119-0a764e51fe1b/go.mod h1:j9x/tPzZkyxcgEFkiKEEGxfvyumM01BEtsW8xzOahRQ= google.golang.org/genproto/googleapis/rpc v0.0.0-20251222181119-0a764e51fe1b/go.mod h1:j9x/tPzZkyxcgEFkiKEEGxfvyumM01BEtsW8xzOahRQ=
google.golang.org/genproto/googleapis/rpc v0.0.0-20260120221211-b8f7ae30c516 h1:sNrWoksmOyF5bvJUcnmbeAmQi8baNhqg5IWaI3llQqU=
google.golang.org/genproto/googleapis/rpc v0.0.0-20260120221211-b8f7ae30c516/go.mod h1:j9x/tPzZkyxcgEFkiKEEGxfvyumM01BEtsW8xzOahRQ=
google.golang.org/grpc v1.78.0 h1:K1XZG/yGDJnzMdd/uZHAkVqJE+xIDOcmdSFZkBUicNc= google.golang.org/grpc v1.78.0 h1:K1XZG/yGDJnzMdd/uZHAkVqJE+xIDOcmdSFZkBUicNc=
google.golang.org/grpc v1.78.0/go.mod h1:I47qjTo4OKbMkjA/aOOwxDIiPSBofUtQUI5EfpWvW7U= google.golang.org/grpc v1.78.0/go.mod h1:I47qjTo4OKbMkjA/aOOwxDIiPSBofUtQUI5EfpWvW7U=
google.golang.org/grpc v1.80.0 h1:Xr6m2WmWZLETvUNvIUmeD5OAagMw3FiKmMlTdViWsHM=
google.golang.org/grpc v1.80.0/go.mod h1:ho/dLnxwi3EDJA4Zghp7k2Ec1+c2jqup0bFkw07bwF4=
google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE= google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE=
google.golang.org/protobuf v1.36.11/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco= google.golang.org/protobuf v1.36.11/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
+2 -2
View File
@@ -15,10 +15,10 @@ import (
"tunnel_pls/internal/port" "tunnel_pls/internal/port"
"tunnel_pls/internal/random" "tunnel_pls/internal/random"
"tunnel_pls/internal/registry" "tunnel_pls/internal/registry"
"tunnel_pls/internal/server"
"tunnel_pls/internal/transport" "tunnel_pls/internal/transport"
"tunnel_pls/internal/types"
"tunnel_pls/internal/version" "tunnel_pls/internal/version"
"tunnel_pls/server"
"tunnel_pls/types"
"golang.org/x/crypto/ssh" "golang.org/x/crypto/ssh"
) )
+2 -2
View File
@@ -14,8 +14,8 @@ import (
"tunnel_pls/internal/config" "tunnel_pls/internal/config"
"tunnel_pls/internal/port" "tunnel_pls/internal/port"
"tunnel_pls/internal/registry" "tunnel_pls/internal/registry"
"tunnel_pls/session/slug" "tunnel_pls/internal/session/slug"
"tunnel_pls/types" "tunnel_pls/internal/types"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock" "github.com/stretchr/testify/mock"
+3 -1
View File
@@ -1,6 +1,8 @@
package config package config
import "tunnel_pls/types" import (
"tunnel_pls/internal/types"
)
type Config interface { type Config interface {
Domain() string Domain() string
+1 -1
View File
@@ -3,7 +3,7 @@ package config
import ( import (
"os" "os"
"testing" "testing"
"tunnel_pls/types" "tunnel_pls/internal/types"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
) )
+1 -1
View File
@@ -6,7 +6,7 @@ import (
"os" "os"
"strconv" "strconv"
"strings" "strings"
"tunnel_pls/types" "tunnel_pls/internal/types"
"github.com/joho/godotenv" "github.com/joho/godotenv"
) )
+1 -1
View File
@@ -9,7 +9,7 @@ import (
"time" "time"
"tunnel_pls/internal/config" "tunnel_pls/internal/config"
"tunnel_pls/internal/registry" "tunnel_pls/internal/registry"
"tunnel_pls/types" "tunnel_pls/internal/types"
proto "git.fossy.my.id/bagas/tunnel-please-grpc/gen" proto "git.fossy.my.id/bagas/tunnel-please-grpc/gen"
"google.golang.org/grpc" "google.golang.org/grpc"
+5 -5
View File
@@ -7,14 +7,14 @@ import (
"io" "io"
"testing" "testing"
"time" "time"
"tunnel_pls/internal/session/forwarder"
"tunnel_pls/internal/session/interaction"
"tunnel_pls/internal/session/lifecycle"
"tunnel_pls/internal/session/slug"
"tunnel_pls/internal/types"
"tunnel_pls/internal/port" "tunnel_pls/internal/port"
"tunnel_pls/internal/registry" "tunnel_pls/internal/registry"
"tunnel_pls/session/forwarder"
"tunnel_pls/session/interaction"
"tunnel_pls/session/lifecycle"
"tunnel_pls/session/slug"
"tunnel_pls/types"
proto "git.fossy.my.id/bagas/tunnel-please-grpc/gen" proto "git.fossy.my.id/bagas/tunnel-please-grpc/gen"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
+5 -5
View File
@@ -3,11 +3,11 @@ package registry
import ( import (
"fmt" "fmt"
"sync" "sync"
"tunnel_pls/session/forwarder" "tunnel_pls/internal/session/forwarder"
"tunnel_pls/session/interaction" "tunnel_pls/internal/session/interaction"
"tunnel_pls/session/lifecycle" "tunnel_pls/internal/session/lifecycle"
"tunnel_pls/session/slug" "tunnel_pls/internal/session/slug"
"tunnel_pls/types" "tunnel_pls/internal/types"
) )
type Key = types.SessionKey type Key = types.SessionKey
+5 -5
View File
@@ -5,11 +5,11 @@ import (
"testing" "testing"
"time" "time"
"tunnel_pls/internal/port" "tunnel_pls/internal/port"
"tunnel_pls/session/forwarder" "tunnel_pls/internal/session/forwarder"
"tunnel_pls/session/interaction" "tunnel_pls/internal/session/interaction"
"tunnel_pls/session/lifecycle" "tunnel_pls/internal/session/lifecycle"
"tunnel_pls/session/slug" "tunnel_pls/internal/session/slug"
"tunnel_pls/types" "tunnel_pls/internal/types"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock" "github.com/stretchr/testify/mock"
@@ -13,7 +13,7 @@ import (
"tunnel_pls/internal/port" "tunnel_pls/internal/port"
"tunnel_pls/internal/random" "tunnel_pls/internal/random"
"tunnel_pls/internal/registry" "tunnel_pls/internal/registry"
"tunnel_pls/session" "tunnel_pls/internal/session"
"golang.org/x/crypto/ssh" "golang.org/x/crypto/ssh"
) )
@@ -10,8 +10,8 @@ import (
"testing" "testing"
"time" "time"
"tunnel_pls/internal/registry" "tunnel_pls/internal/registry"
"tunnel_pls/session/slug" "tunnel_pls/internal/session/slug"
"tunnel_pls/types" "tunnel_pls/internal/types"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock" "github.com/stretchr/testify/mock"
@@ -10,8 +10,8 @@ import (
"strconv" "strconv"
"sync" "sync"
"tunnel_pls/internal/config" "tunnel_pls/internal/config"
"tunnel_pls/session/slug" "tunnel_pls/internal/session/slug"
"tunnel_pls/types" "tunnel_pls/internal/types"
"golang.org/x/crypto/ssh" "golang.org/x/crypto/ssh"
) )
@@ -10,8 +10,8 @@ import (
"sync/atomic" "sync/atomic"
"testing" "testing"
"time" "time"
"tunnel_pls/session/slug" "tunnel_pls/internal/session/slug"
"tunnel_pls/types" "tunnel_pls/internal/types"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock" "github.com/stretchr/testify/mock"
@@ -3,14 +3,14 @@ package interaction
import ( import (
"strings" "strings"
tea "charm.land/bubbletea/v2" "github.com/charmbracelet/bubbles/textinput"
tea "github.com/charmbracelet/bubbletea"
"github.com/charmbracelet/lipgloss" "github.com/charmbracelet/lipgloss"
) )
func (m *model) comingSoonUpdate(msg tea.KeyPressMsg) (tea.Model, tea.Cmd) { func (m *model) comingSoonUpdate(msg tea.KeyMsg) (tea.Model, tea.Cmd) {
_ = msg
m.showingComingSoon = false m.showingComingSoon = false
return m, nil return m, tea.Batch(tea.ClearScreen, textinput.Blink)
} }
func (m *model) comingSoonView() string { func (m *model) comingSoonView() string {
@@ -4,8 +4,9 @@ import (
"strings" "strings"
"time" "time"
tea "charm.land/bubbletea/v2"
"github.com/charmbracelet/bubbles/key" "github.com/charmbracelet/bubbles/key"
"github.com/charmbracelet/bubbles/textinput"
tea "github.com/charmbracelet/bubbletea"
"github.com/charmbracelet/lipgloss" "github.com/charmbracelet/lipgloss"
) )
@@ -16,22 +17,24 @@ func (m *model) handleCommandSelection(item commandItem) (tea.Model, tea.Cmd) {
m.editingSlug = true m.editingSlug = true
m.slugInput.SetValue(m.interaction.slug.String()) m.slugInput.SetValue(m.interaction.slug.String())
m.slugInput.Focus() m.slugInput.Focus()
return m, nil return m, tea.Batch(tea.ClearScreen, textinput.Blink)
case "tunnel-type": case "tunnel-type":
m.showingCommands = false m.showingCommands = false
m.showingComingSoon = true m.showingComingSoon = true
return m, tickCmd(5 * time.Second) return m, tea.Batch(tickCmd(5*time.Second), tea.ClearScreen, textinput.Blink)
default: default:
m.showingCommands = false m.showingCommands = false
return m, nil return m, nil
} }
} }
func (m *model) commandsUpdate(msg tea.KeyPressMsg) (tea.Model, tea.Cmd) { func (m *model) commandsUpdate(msg tea.KeyMsg) (tea.Model, tea.Cmd) {
var cmd tea.Cmd
switch { switch {
case key.Matches(msg, m.keymap.quit), msg.String() == "esc": case key.Matches(msg, m.keymap.quit), msg.String() == "esc":
m.showingCommands = false m.showingCommands = false
return m, nil return m, tea.Batch(tea.ClearScreen, textinput.Blink)
case msg.String() == "enter": case msg.String() == "enter":
selectedItem := m.commandList.SelectedItem() selectedItem := m.commandList.SelectedItem()
if selectedItem != nil { if selectedItem != nil {
@@ -39,8 +42,8 @@ func (m *model) commandsUpdate(msg tea.KeyPressMsg) (tea.Model, tea.Cmd) {
return m.handleCommandSelection(item) return m.handleCommandSelection(item)
} }
} }
m.commandList, _ = m.commandList.Update(msg) m.commandList, cmd = m.commandList.Update(msg)
return m, nil return m, cmd
} }
func (m *model) commandsView() string { func (m *model) commandsView() string {
@@ -4,19 +4,20 @@ import (
"fmt" "fmt"
"strings" "strings"
tea "charm.land/bubbletea/v2"
"github.com/charmbracelet/bubbles/key" "github.com/charmbracelet/bubbles/key"
"github.com/charmbracelet/bubbles/textinput"
tea "github.com/charmbracelet/bubbletea"
"github.com/charmbracelet/lipgloss" "github.com/charmbracelet/lipgloss"
) )
func (m *model) dashboardUpdate(msg tea.KeyPressMsg) (tea.Model, tea.Cmd) { func (m *model) dashboardUpdate(msg tea.KeyMsg) (tea.Model, tea.Cmd) {
switch { switch {
case key.Matches(msg, m.keymap.quit): case key.Matches(msg, m.keymap.quit):
m.quitting = true m.quitting = true
return m, tea.Quit return m, tea.Batch(tea.ClearScreen, textinput.Blink, tea.Quit)
case key.Matches(msg, m.keymap.command): case key.Matches(msg, m.keymap.command):
m.showingCommands = true m.showingCommands = true
return m, nil return m, tea.Batch(tea.ClearScreen, textinput.Blink)
} }
return m, nil return m, nil
} }
@@ -6,14 +6,14 @@ import (
"sync" "sync"
"tunnel_pls/internal/config" "tunnel_pls/internal/config"
"tunnel_pls/internal/random" "tunnel_pls/internal/random"
"tunnel_pls/session/slug" "tunnel_pls/internal/session/slug"
"tunnel_pls/types" "tunnel_pls/internal/types"
tea "charm.land/bubbletea/v2"
"github.com/charmbracelet/bubbles/help" "github.com/charmbracelet/bubbles/help"
"github.com/charmbracelet/bubbles/key" "github.com/charmbracelet/bubbles/key"
"github.com/charmbracelet/bubbles/list" "github.com/charmbracelet/bubbles/list"
"github.com/charmbracelet/bubbles/textinput" "github.com/charmbracelet/bubbles/textinput"
tea "github.com/charmbracelet/bubbletea"
"github.com/charmbracelet/lipgloss" "github.com/charmbracelet/lipgloss"
"github.com/muesli/termenv" "github.com/muesli/termenv"
"golang.org/x/crypto/ssh" "golang.org/x/crypto/ssh"
@@ -120,7 +120,7 @@ func (m *model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
switch msg := msg.(type) { switch msg := msg.(type) {
case tickMsg: case tickMsg:
m.showingComingSoon = false m.showingComingSoon = false
return m, nil return m, tea.Batch(tea.ClearScreen, textinput.Blink)
case tea.WindowSizeMsg: case tea.WindowSizeMsg:
m.width = msg.Width m.width = msg.Width
@@ -137,9 +137,9 @@ func (m *model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
case tea.QuitMsg: case tea.QuitMsg:
m.quitting = true m.quitting = true
return m, tea.Quit return m, tea.Batch(tea.ClearScreen, textinput.Blink, tea.Quit)
case tea.KeyPressMsg: case tea.KeyMsg:
if m.showingComingSoon { if m.showingComingSoon {
return m.comingSoonUpdate(msg) return m.comingSoonUpdate(msg)
} }
@@ -160,28 +160,28 @@ func (m *model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
func (i *interaction) Redraw() { func (i *interaction) Redraw() {
if i.program != nil { if i.program != nil {
i.program.Send(tea.WindowSizeMsg{}) i.program.Send(tea.ClearScreen())
} }
} }
func (m *model) View() tea.View { func (m *model) View() string {
var content string
if m.quitting { if m.quitting {
content = "" return ""
} else if m.showingComingSoon {
content = m.comingSoonView()
} else if m.editingSlug {
content = m.slugView()
} else if m.showingCommands {
content = m.commandsView()
} else {
content = m.dashboardView()
} }
v := tea.NewView(content) if m.showingComingSoon {
v.AltScreen = true return m.comingSoonView()
v.MouseMode = tea.MouseModeCellMotion }
return v
if m.editingSlug {
return m.slugView()
}
if m.showingCommands {
return m.commandsView()
}
return m.dashboardView()
} }
func (i *interaction) Start() { func (i *interaction) Start() {
@@ -249,6 +249,8 @@ func (i *interaction) Start() {
m, m,
tea.WithInput(i.channel), tea.WithInput(i.channel),
tea.WithOutput(i.channel), tea.WithOutput(i.channel),
tea.WithAltScreen(),
tea.WithMouseCellMotion(),
tea.WithoutSignals(), tea.WithoutSignals(),
tea.WithoutSignalHandler(), tea.WithoutSignalHandler(),
tea.WithFPS(30), tea.WithFPS(30),
@@ -7,12 +7,12 @@ import (
"net" "net"
"testing" "testing"
"time" "time"
"tunnel_pls/types" "tunnel_pls/internal/types"
tea "charm.land/bubbletea/v2"
"github.com/charmbracelet/bubbles/key" "github.com/charmbracelet/bubbles/key"
"github.com/charmbracelet/bubbles/list" "github.com/charmbracelet/bubbles/list"
"github.com/charmbracelet/bubbles/textinput" "github.com/charmbracelet/bubbles/textinput"
tea "github.com/charmbracelet/bubbletea"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock" "github.com/stretchr/testify/mock"
"golang.org/x/crypto/ssh" "golang.org/x/crypto/ssh"
@@ -694,7 +694,7 @@ func TestInteraction_Integration(t *testing.T) {
func TestModel_Update_KeyMessages(t *testing.T) { func TestModel_Update_KeyMessages(t *testing.T) {
tests := []struct { tests := []struct {
name string name string
key tea.KeyPressMsg key tea.KeyMsg
showingComingSoon bool showingComingSoon bool
editingSlug bool editingSlug bool
showingCommands bool showingCommands bool
@@ -702,25 +702,25 @@ func TestModel_Update_KeyMessages(t *testing.T) {
}{ }{
{ {
name: "key press while showing coming soon", name: "key press while showing coming soon",
key: tea.KeyPressMsg{Code: tea.KeyEnter}, key: tea.KeyMsg{Type: tea.KeyEnter},
showingComingSoon: true, showingComingSoon: true,
description: "should call comingSoonUpdate", description: "should call comingSoonUpdate",
}, },
{ {
name: "key press while editing slug", name: "key press while editing slug",
key: tea.KeyPressMsg{Code: tea.KeyEnter}, key: tea.KeyMsg{Type: tea.KeyEnter},
editingSlug: true, editingSlug: true,
description: "should call slugUpdate", description: "should call slugUpdate",
}, },
{ {
name: "key press while showing commands", name: "key press while showing commands",
key: tea.KeyPressMsg{Code: tea.KeyEnter}, key: tea.KeyMsg{Type: tea.KeyEnter},
showingCommands: true, showingCommands: true,
description: "should call commandsUpdate", description: "should call commandsUpdate",
}, },
{ {
name: "key press in dashboard view", name: "key press in dashboard view",
key: tea.KeyPressMsg{Code: 'c', Text: "c"}, key: tea.KeyMsg{Type: tea.KeyRunes, Runes: []rune{'c'}},
description: "should call dashboardUpdate", description: "should call dashboardUpdate",
}, },
} }
@@ -777,7 +777,7 @@ func TestModel_SlugUpdate(t *testing.T) {
tests := []struct { tests := []struct {
name string name string
tunnelType types.TunnelType tunnelType types.TunnelType
keyMsg tea.KeyPressMsg keyMsg tea.KeyMsg
inputValue string inputValue string
setupMocks func(*MockSessionRegistry, *MockSlug, *MockRandom) setupMocks func(*MockSessionRegistry, *MockSlug, *MockRandom)
expectedEdit bool expectedEdit bool
@@ -787,21 +787,21 @@ func TestModel_SlugUpdate(t *testing.T) {
{ {
name: "escape key cancels editing", name: "escape key cancels editing",
tunnelType: types.TunnelTypeHTTP, tunnelType: types.TunnelTypeHTTP,
keyMsg: tea.KeyPressMsg{Code: tea.KeyEsc}, keyMsg: tea.KeyMsg{Type: tea.KeyEsc},
setupMocks: func(msr *MockSessionRegistry, ms *MockSlug, mr *MockRandom) {}, setupMocks: func(msr *MockSessionRegistry, ms *MockSlug, mr *MockRandom) {},
expectedEdit: false, expectedEdit: false,
}, },
{ {
name: "ctrl+c cancels editing", name: "ctrl+c cancels editing",
tunnelType: types.TunnelTypeHTTP, tunnelType: types.TunnelTypeHTTP,
keyMsg: tea.KeyPressMsg{Code: 'c', Mod: tea.ModCtrl}, keyMsg: tea.KeyMsg{Type: tea.KeyCtrlC},
setupMocks: func(msr *MockSessionRegistry, ms *MockSlug, mr *MockRandom) {}, setupMocks: func(msr *MockSessionRegistry, ms *MockSlug, mr *MockRandom) {},
expectedEdit: false, expectedEdit: false,
}, },
{ {
name: "enter key saves valid slug", name: "enter key saves valid slug",
tunnelType: types.TunnelTypeHTTP, tunnelType: types.TunnelTypeHTTP,
keyMsg: tea.KeyPressMsg{Code: tea.KeyEnter}, keyMsg: tea.KeyMsg{Type: tea.KeyEnter},
inputValue: "my-custom-slug", inputValue: "my-custom-slug",
setupMocks: func(msr *MockSessionRegistry, ms *MockSlug, mr *MockRandom) { setupMocks: func(msr *MockSessionRegistry, ms *MockSlug, mr *MockRandom) {
ms.On("String").Return("old-slug") ms.On("String").Return("old-slug")
@@ -816,7 +816,7 @@ func TestModel_SlugUpdate(t *testing.T) {
{ {
name: "enter key with error shows error message", name: "enter key with error shows error message",
tunnelType: types.TunnelTypeHTTP, tunnelType: types.TunnelTypeHTTP,
keyMsg: tea.KeyPressMsg{Code: tea.KeyEnter}, keyMsg: tea.KeyMsg{Type: tea.KeyEnter},
inputValue: "invalid", inputValue: "invalid",
setupMocks: func(msr *MockSessionRegistry, ms *MockSlug, mr *MockRandom) { setupMocks: func(msr *MockSessionRegistry, ms *MockSlug, mr *MockRandom) {
ms.On("String").Return("old-slug") ms.On("String").Return("old-slug")
@@ -831,7 +831,7 @@ func TestModel_SlugUpdate(t *testing.T) {
{ {
name: "ctrl+r generates random slug", name: "ctrl+r generates random slug",
tunnelType: types.TunnelTypeHTTP, tunnelType: types.TunnelTypeHTTP,
keyMsg: tea.KeyPressMsg{Code: 'r', Mod: tea.ModCtrl}, keyMsg: tea.KeyMsg{Type: tea.KeyCtrlR},
setupMocks: func(msr *MockSessionRegistry, ms *MockSlug, mr *MockRandom) { setupMocks: func(msr *MockSessionRegistry, ms *MockSlug, mr *MockRandom) {
mr.On("String", 20).Return("random-generated-slug", nil) mr.On("String", 20).Return("random-generated-slug", nil)
}, },
@@ -841,7 +841,7 @@ func TestModel_SlugUpdate(t *testing.T) {
{ {
name: "ctrl+r with error does nothing", name: "ctrl+r with error does nothing",
tunnelType: types.TunnelTypeHTTP, tunnelType: types.TunnelTypeHTTP,
keyMsg: tea.KeyPressMsg{Code: 'r', Mod: tea.ModCtrl}, keyMsg: tea.KeyMsg{Type: tea.KeyCtrlR},
setupMocks: func(msr *MockSessionRegistry, ms *MockSlug, mr *MockRandom) { setupMocks: func(msr *MockSessionRegistry, ms *MockSlug, mr *MockRandom) {
mr.On("String", 20).Return("", assert.AnError) mr.On("String", 20).Return("", assert.AnError)
}, },
@@ -850,14 +850,14 @@ func TestModel_SlugUpdate(t *testing.T) {
{ {
name: "regular key updates input", name: "regular key updates input",
tunnelType: types.TunnelTypeHTTP, tunnelType: types.TunnelTypeHTTP,
keyMsg: tea.KeyPressMsg{Code: 'a', Text: "a"}, keyMsg: tea.KeyMsg{Type: tea.KeyRunes, Runes: []rune{'a'}},
setupMocks: func(msr *MockSessionRegistry, ms *MockSlug, mr *MockRandom) {}, setupMocks: func(msr *MockSessionRegistry, ms *MockSlug, mr *MockRandom) {},
expectedEdit: true, expectedEdit: true,
}, },
{ {
name: "tcp tunnel exits editing immediately", name: "tcp tunnel exits editing immediately",
tunnelType: types.TunnelTypeTCP, tunnelType: types.TunnelTypeTCP,
keyMsg: tea.KeyPressMsg{Code: 'a', Text: "a"}, keyMsg: tea.KeyMsg{Type: tea.KeyRunes, Runes: []rune{'a'}},
setupMocks: func(msr *MockSessionRegistry, ms *MockSlug, mr *MockRandom) {}, setupMocks: func(msr *MockSessionRegistry, ms *MockSlug, mr *MockRandom) {},
expectedEdit: false, expectedEdit: false,
}, },
@@ -1006,19 +1006,19 @@ func TestModel_SlugView(t *testing.T) {
func TestModel_ComingSoonUpdate(t *testing.T) { func TestModel_ComingSoonUpdate(t *testing.T) {
tests := []struct { tests := []struct {
name string name string
keyMsg tea.KeyPressMsg keyMsg tea.KeyMsg
}{ }{
{ {
name: "any key dismisses coming soon", name: "any key dismisses coming soon",
keyMsg: tea.KeyPressMsg{Code: tea.KeyEnter}, keyMsg: tea.KeyMsg{Type: tea.KeyEnter},
}, },
{ {
name: "escape key dismisses", name: "escape key dismisses",
keyMsg: tea.KeyPressMsg{Code: tea.KeyEsc}, keyMsg: tea.KeyMsg{Type: tea.KeyEsc},
}, },
{ {
name: "space key dismisses", name: "space key dismisses",
keyMsg: tea.KeyPressMsg{Code: ' ', Text: " "}, keyMsg: tea.KeyMsg{Type: tea.KeySpace},
}, },
} }
@@ -1097,7 +1097,7 @@ func TestModel_ComingSoonView(t *testing.T) {
func TestModel_CommandsUpdate(t *testing.T) { func TestModel_CommandsUpdate(t *testing.T) {
tests := []struct { tests := []struct {
name string name string
keyMsg tea.KeyPressMsg keyMsg tea.KeyMsg
selectedItem list.Item selectedItem list.Item
expectCommands bool expectCommands bool
expectEditSlug bool expectEditSlug bool
@@ -1105,31 +1105,31 @@ func TestModel_CommandsUpdate(t *testing.T) {
}{ }{
{ {
name: "escape key closes commands", name: "escape key closes commands",
keyMsg: tea.KeyPressMsg{Code: tea.KeyEsc}, keyMsg: tea.KeyMsg{Type: tea.KeyEsc},
expectCommands: false, expectCommands: false,
}, },
{ {
name: "q key closes commands", name: "q key closes commands",
keyMsg: tea.KeyPressMsg{Code: 'q', Text: "q"}, keyMsg: tea.KeyMsg{Type: tea.KeyRunes, Runes: []rune{'q'}},
expectCommands: false, expectCommands: false,
}, },
{ {
name: "enter on slug command starts editing", name: "enter on slug command starts editing",
keyMsg: tea.KeyPressMsg{Code: tea.KeyEnter}, keyMsg: tea.KeyMsg{Type: tea.KeyEnter},
selectedItem: commandItem{name: "slug", desc: "Set custom subdomain"}, selectedItem: commandItem{name: "slug", desc: "Set custom subdomain"},
expectCommands: false, expectCommands: false,
expectEditSlug: true, expectEditSlug: true,
}, },
{ {
name: "enter on tunnel-type shows coming soon", name: "enter on tunnel-type shows coming soon",
keyMsg: tea.KeyPressMsg{Code: tea.KeyEnter}, keyMsg: tea.KeyMsg{Type: tea.KeyEnter},
selectedItem: commandItem{name: "tunnel-type", desc: "Change tunnel type"}, selectedItem: commandItem{name: "tunnel-type", desc: "Change tunnel type"},
expectCommands: false, expectCommands: false,
expectComingSoon: true, expectComingSoon: true,
}, },
{ {
name: "arrow key navigates list", name: "arrow key navigates list",
keyMsg: tea.KeyPressMsg{Code: tea.KeyDown}, keyMsg: tea.KeyMsg{Type: tea.KeyDown},
expectCommands: true, expectCommands: true,
}, },
} }
@@ -1261,28 +1261,28 @@ func TestModel_CommandsView(t *testing.T) {
func TestModel_DashboardUpdate(t *testing.T) { func TestModel_DashboardUpdate(t *testing.T) {
tests := []struct { tests := []struct {
name string name string
keyMsg tea.KeyPressMsg keyMsg tea.KeyMsg
expectQuit bool expectQuit bool
expectCommands bool expectCommands bool
}{ }{
{ {
name: "q key quits", name: "q key quits",
keyMsg: tea.KeyPressMsg{Code: 'q', Text: "q"}, keyMsg: tea.KeyMsg{Type: tea.KeyRunes, Runes: []rune{'q'}},
expectQuit: true, expectQuit: true,
}, },
{ {
name: "ctrl+c quits", name: "ctrl+c quits",
keyMsg: tea.KeyPressMsg{Code: 'c', Mod: tea.ModCtrl}, keyMsg: tea.KeyMsg{Type: tea.KeyCtrlC},
expectQuit: true, expectQuit: true,
}, },
{ {
name: "c key opens commands", name: "c key opens commands",
keyMsg: tea.KeyPressMsg{Code: 'c', Text: "c"}, keyMsg: tea.KeyMsg{Type: tea.KeyRunes, Runes: []rune{'c'}},
expectCommands: true, expectCommands: true,
}, },
{ {
name: "other keys do nothing", name: "other keys do nothing",
keyMsg: tea.KeyPressMsg{Code: 'x', Text: "x"}, keyMsg: tea.KeyMsg{Type: tea.KeyRunes, Runes: []rune{'x'}},
}, },
} }
@@ -4,13 +4,13 @@ import (
"fmt" "fmt"
"time" "time"
"tunnel_pls/internal/random" "tunnel_pls/internal/random"
"tunnel_pls/types" "tunnel_pls/internal/types"
tea "charm.land/bubbletea/v2"
"github.com/charmbracelet/bubbles/help" "github.com/charmbracelet/bubbles/help"
"github.com/charmbracelet/bubbles/key" "github.com/charmbracelet/bubbles/key"
"github.com/charmbracelet/bubbles/list" "github.com/charmbracelet/bubbles/list"
"github.com/charmbracelet/bubbles/textinput" "github.com/charmbracelet/bubbles/textinput"
tea "github.com/charmbracelet/bubbletea"
) )
type commandItem struct { type commandItem struct {
@@ -77,7 +77,7 @@ type keymap struct {
type tickMsg time.Time type tickMsg time.Time
func (m *model) Init() tea.Cmd { func (m *model) Init() tea.Cmd {
return tea.RequestWindowSize return tea.Batch(textinput.Blink, tea.WindowSize())
} }
func getResponsiveWidth(screenWidth, padding, minWidth, maxWidth int) int { func getResponsiveWidth(screenWidth, padding, minWidth, maxWidth int) int {
@@ -3,26 +3,28 @@ package interaction
import ( import (
"fmt" "fmt"
"strings" "strings"
"tunnel_pls/types" "tunnel_pls/internal/types"
tea "charm.land/bubbletea/v2"
"github.com/charmbracelet/bubbles/key" "github.com/charmbracelet/bubbles/key"
"github.com/charmbracelet/bubbles/textinput"
tea "github.com/charmbracelet/bubbletea"
"github.com/charmbracelet/lipgloss" "github.com/charmbracelet/lipgloss"
) )
func (m *model) slugUpdate(msg tea.KeyPressMsg) (tea.Model, tea.Cmd) { func (m *model) slugUpdate(msg tea.KeyMsg) (tea.Model, tea.Cmd) {
var cmd tea.Cmd
if m.tunnelType != types.TunnelTypeHTTP { if m.tunnelType != types.TunnelTypeHTTP {
m.editingSlug = false m.editingSlug = false
m.slugError = "" m.slugError = ""
return m, nil return m, tea.Batch(tea.ClearScreen, textinput.Blink)
} }
switch msg.String() { switch msg.String() {
case "esc", "ctrl+c": case "esc", "ctrl+c":
m.editingSlug = false m.editingSlug = false
m.slugError = "" m.slugError = ""
return m, nil return m, tea.Batch(tea.ClearScreen, textinput.Blink)
case "enter": case "enter":
inputValue := m.slugInput.Value() inputValue := m.slugInput.Value()
if err := m.interaction.sessionRegistry.Update(m.interaction.user, types.SessionKey{ if err := m.interaction.sessionRegistry.Update(m.interaction.user, types.SessionKey{
@@ -37,18 +39,18 @@ func (m *model) slugUpdate(msg tea.KeyPressMsg) (tea.Model, tea.Cmd) {
} }
m.editingSlug = false m.editingSlug = false
m.slugError = "" m.slugError = ""
return m, nil return m, tea.Batch(tea.ClearScreen, textinput.Blink)
default: default:
if key.Matches(msg, m.keymap.random) { if key.Matches(msg, m.keymap.random) {
newSubdomain, err := m.randomizer.String(20) newSubdomain, err := m.randomizer.String(20)
if err != nil { if err != nil {
return m, nil return m, cmd
} }
m.slugInput.SetValue(newSubdomain) m.slugInput.SetValue(newSubdomain)
} }
m.slugError = "" m.slugError = ""
m.slugInput, _ = m.slugInput.Update(msg) m.slugInput, cmd = m.slugInput.Update(msg)
return m, nil return m, cmd
} }
} }
@@ -6,10 +6,10 @@ import (
"net" "net"
"sync" "sync"
"time" "time"
"tunnel_pls/internal/session/slug"
"tunnel_pls/internal/types"
portUtil "tunnel_pls/internal/port" portUtil "tunnel_pls/internal/port"
"tunnel_pls/session/slug"
"tunnel_pls/types"
"golang.org/x/crypto/ssh" "golang.org/x/crypto/ssh"
) )
@@ -6,7 +6,7 @@ import (
"io" "io"
"net" "net"
"testing" "testing"
"tunnel_pls/types" "tunnel_pls/internal/types"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock" "github.com/stretchr/testify/mock"
@@ -12,12 +12,12 @@ import (
portUtil "tunnel_pls/internal/port" portUtil "tunnel_pls/internal/port"
"tunnel_pls/internal/random" "tunnel_pls/internal/random"
"tunnel_pls/internal/registry" "tunnel_pls/internal/registry"
"tunnel_pls/internal/session/forwarder"
"tunnel_pls/internal/session/interaction"
"tunnel_pls/internal/session/lifecycle"
"tunnel_pls/internal/session/slug"
"tunnel_pls/internal/transport" "tunnel_pls/internal/transport"
"tunnel_pls/session/forwarder" "tunnel_pls/internal/types"
"tunnel_pls/session/interaction"
"tunnel_pls/session/lifecycle"
"tunnel_pls/session/slug"
"tunnel_pls/types"
"golang.org/x/crypto/ssh" "golang.org/x/crypto/ssh"
) )
@@ -15,8 +15,8 @@ import (
"time" "time"
"tunnel_pls/internal/config" "tunnel_pls/internal/config"
"tunnel_pls/internal/registry" "tunnel_pls/internal/registry"
"tunnel_pls/session/lifecycle" "tunnel_pls/internal/session/lifecycle"
"tunnel_pls/types" "tunnel_pls/internal/types"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock" "github.com/stretchr/testify/mock"
+1 -1
View File
@@ -16,7 +16,7 @@ import (
"tunnel_pls/internal/http/stream" "tunnel_pls/internal/http/stream"
"tunnel_pls/internal/middleware" "tunnel_pls/internal/middleware"
"tunnel_pls/internal/registry" "tunnel_pls/internal/registry"
"tunnel_pls/types" "tunnel_pls/internal/types"
"golang.org/x/crypto/ssh" "golang.org/x/crypto/ssh"
) )
+5 -5
View File
@@ -11,11 +11,11 @@ import (
"testing" "testing"
"time" "time"
"tunnel_pls/internal/registry" "tunnel_pls/internal/registry"
"tunnel_pls/session/forwarder" "tunnel_pls/internal/session/forwarder"
"tunnel_pls/session/interaction" "tunnel_pls/internal/session/interaction"
"tunnel_pls/session/lifecycle" "tunnel_pls/internal/session/lifecycle"
"tunnel_pls/session/slug" "tunnel_pls/internal/session/slug"
"tunnel_pls/types" "tunnel_pls/internal/types"
"golang.org/x/crypto/ssh" "golang.org/x/crypto/ssh"
+1 -1
View File
@@ -14,7 +14,7 @@ import (
"testing" "testing"
"time" "time"
"tunnel_pls/internal/config" "tunnel_pls/internal/config"
"tunnel_pls/types" "tunnel_pls/internal/types"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock" "github.com/stretchr/testify/mock"
+5 -2
View File
@@ -2,6 +2,8 @@
"extends": [ "extends": [
"config:recommended" "config:recommended"
], ],
"prConcurrentLimit": 1,
"prHourlyLimit": 1,
"packageRules": [ "packageRules": [
{ {
"matchUpdateTypes": [ "matchUpdateTypes": [
@@ -10,9 +12,10 @@
"pin", "pin",
"digest" "digest"
], ],
"groupName": "all-dependencies",
"automerge": true, "automerge": true,
"baseBranchPatterns": [ "matchPackageNames": [
"staging" "*"
] ]
} }
] ]