feat: use go tools for golang binary dependencies (#809)

* upd

* upd

* upd

Author: Satont

.env.example

@@ -2,11 +2,10 @@
 BOT_ACCESS_TOKEN=
 BOT_REFRESH_TOKEN=
 
-SITE_BASE_URL=localhost:3005
+SITE_BASE_URL=http://localhost:3005
 
 TWITCH_CLIENTID=
 TWITCH_CLIENTSECRET=
-TWITCH_CALLBACKURL=http://$SITE_BASE_URL/login
 
 # you can get the token from https://dashboard.ngrok.com/get-started/your-authtoken
 NGROK_AUTH_TOKEN=

.github/workflows/build-and-lint.yml

@@ -20,28 +20,8 @@ jobs:
         with:
           bun-version-file: ".bun-version"
 
-      - name: Cache node_modules
-        id: cache-node_modules
-        uses: actions/cache@v4
-        with:
-          path: node_modules
-          key: ${{ runner.os }}-node_modules-${{ hashFiles('**/bun.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-node_modules-
-      - name: Install js
-        if: steps.cache-node_modules.outputs.cache-hit != 'true'
-        run: bun install
-
       - name: Install go dependencies
-        run: bun cli deps --skip-node
+        run: bun cli deps
 
       - name: Build
         run: bun cli build
-
-      # - name: Lint javascript
-      #   run: pnpm run lint
-
-      # - name: golangci-lint
-      #   uses: golangci/golangci-lint-action@v3
-      #   with:
-      #     version: v1.55.2

Caddyfile.dev

@@ -1,4 +1,4 @@
-http://localhost:3005 https://twir.localhost {
+{$SITE_BASE_URL} {
     reverse_proxy http://127.0.0.1:3010
 
     handle_path /api/* {

README.md

@@ -72,10 +72,9 @@ We'll use `twir.localhost` domain, which is enables ability to grant ssl out of
 
 * Add `https://twir.localhost/login` to your twitch application redirect url's
 
-* Edit `.env`, change site base url and protocol for twitch callback:
+* Edit `.env`, change site base url:
 ```ini
-SITE_BASE_URL=twir.localhost
-TWITCH_CALLBACKURL=https://$SITE_BASE_URL/login
+SITE_BASE_URL=https://twir.localhost
 ```
 
 * Start application as usual:

apps/api-gql/internal/delivery/gql/resolvers/user.resolver.go

@@ -31,7 +31,7 @@ func (c *Integrations) IntegrationsDiscordGetAuthLink(
 		return nil, errors.New("discord not enabled on our side, please be patient")
 	}
 
-	redirectUrl := fmt.Sprintf("http://%s/dashboard/integrations/discord", c.Config.SiteBaseUrl)
+	redirectUrl := fmt.Sprintf("%s/dashboard/integrations/discord", c.Config.SiteBaseUrl)
 
 	q := u.Query()
 	q.Add("client_id", c.Config.DiscordClientID)
@@ -242,7 +242,7 @@ func (c *Integrations) IntegrationDiscordConnectGuild(
 				"grant_type": "authorization_code",
 				"code":       data.GetCode(),
 				"redirect_uri": fmt.Sprintf(
-					"http://%s/dashboard/integrations/discord",
+					"%s/dashboard/integrations/discord",
 					c.Config.SiteBaseUrl,
 				),
 			},

apps/api/internal/impl_protected/integrations/discord.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"log/slog"
 	"net"
+	"net/url"
 	"time"
 
 	"github.com/avast/retry-go/v4"
@@ -69,12 +70,14 @@ func New(cfg config.Config, lc fx.Lifecycle, log logger.Logger) (*AppTunnel, err
 }
 
 func (c *AppTunnel) GetAddr() string {
+	baseUrl, _ := url.Parse(c.cfg.SiteBaseUrl)
+
 	return lo.
 		If(
 			c.cfg.AppEnv != "production",
 			"https://"+c.Listener.Addr().String(),
 		).
-		Else(fmt.Sprintf("https://eventsub.%s", c.cfg.SiteBaseUrl))
+		Else(fmt.Sprintf("https://eventsub.%s", baseUrl.Host))
 }
 
 func createDefaultTun() (net.Listener, error) {

apps/eventsub/internal/tunnel/tunnel.go

@@ -7,8 +7,6 @@ import (
 	"github.com/guregu/null"
 	"github.com/satont/twir/apps/parser/internal/types"
 
-	"github.com/samber/lo"
-
 	model "github.com/satont/twir/libs/gomodels"
 )
 
@@ -27,14 +25,13 @@ var SrListCommand = &types.DefaultCommand{
 	) {
 		result := &types.CommandsHandlerResult{}
 
-		url := fmt.Sprintf(
-			"%s://%s/p/%s/songs-requests",
-			lo.If(parseCtx.Services.Config.AppEnv == "development", "http").Else("https"),
+		link := fmt.Sprintf(
+			"%s/p/%s/songs-requests",
 			parseCtx.Services.Config.SiteBaseUrl,
 			parseCtx.Channel.Name,
 		)
 
-		result.Result = append(result.Result, url)
+		result.Result = append(result.Result, link)
 		return result, nil
 	},
 }

apps/parser/internal/commands/songrequest/youtube/list.go

@@ -78,7 +78,7 @@ func NewTokens(opts Opts) error {
 		&helix.Options{
 			ClientID:      opts.Config.TwitchClientId,
 			ClientSecret:  opts.Config.TwitchClientSecret,
-			RedirectURI:   opts.Config.TwitchCallbackUrl,
+			RedirectURI:   opts.Config.GetTwitchCallbackUrl(),
 			RateLimitFunc: rateLimitFunc,
 		},
 	)