Dockerfile

@@ -0,0 +1,11 @@
+# docker build -t dndmusicbot-js-build .
+# docker run -it -v $(pwd)/public:/app/public dndmusicbot-js-build
+FROM node:19-alpine3.16
+
+WORKDIR /app
+
+COPY . /app
+
+RUN yarn
+
+ENTRYPOINT ["yarn", "build"]

bot.go

@@ -3,7 +3,6 @@ package main
 import (
 	"context"
 	"log"
-	"net/http"
 	"os"
 	"os/signal"
 	"sync"
@@ -41,11 +40,6 @@ func init() {
 	if err != nil {
 		log.Fatal(err)
 	}
-
-	app.mux = http.NewServeMux()
-
-	go http.ListenAndServe(":8826", app.mux)
-
 	log.Println("bot.go done.")
 }
 
@@ -66,7 +60,6 @@ type App struct {
 	playlist *Playlist
 	plm      *sync.RWMutex
 	hubbub   *gohubbub.Client
-	mux      *http.ServeMux
 }
 
 func main() {

js/script.js

@@ -168,7 +168,7 @@ window.onload = function () {
 		url.innerText = ""
 	})
 
-	document.querySelectorAll("#items").forEach(item => item.addEventListener("click", (e) => {
+	document.querySelectorAll("#items .item").forEach(item => item.addEventListener("click", (e) => {
 		e.preventDefault()
 		e.target.parentElement.style.pointerEvents = 'none'
 		const disableui = setTimeout((t) => {
@@ -182,7 +182,7 @@ window.onload = function () {
 		}))
 	}));
 
-	document.querySelectorAll("#ambiance").forEach(item => item.addEventListener("click", (e) => {
+	document.querySelectorAll("#ambiance .item").forEach(item => item.addEventListener("click", (e) => {
 		e.preventDefault()
 		e.target.parentElement.style.pointerEvents = 'none'
 		const disableui = setTimeout((t) => {

youtube.go

@@ -18,7 +18,6 @@ import (
 )
 
 var (
-	// apikey = "AIzaSyCWO1F6n6UAtOm3L_K-kzF-4UQoS_DmJW0"
 	yt_url = "https://www.youtube.com/watch?v=%s"
 )
 

ytdl/ytdl.go

@@ -3,13 +3,24 @@ package ytdl
 import (
 	"errors"
 	"fmt"
+	"log"
 	"os/exec"
 	"path/filepath"
 	"time"
 
+	"github.com/gohugoio/hugo/cache/filecache"
+	"github.com/spf13/afero"
 	"github.com/tidwall/gjson"
 )
 
+var cache *filecache.Cache
+var yturl = "https://youtu.be/%s"
+
+func init() {
+	fs := afero.NewMemMapFs()
+	cache = filecache.NewCache(fs, 6*time.Hour, "")
+}
+
 type YTdl struct {
 	Title   string
 	Url     string
@@ -17,10 +28,13 @@ type YTdl struct {
 	Len     time.Duration
 }
 
-func NewYTdl(uri string) (*YTdl, error) {
-	ytdl_js, err := exec.Command(
+func NewYTdl(vid string) (*YTdl, error) {
+	log.Printf("Loading %s from youtube\n", vid)
+	_, ytdl_js, err := cache.GetOrCreateBytes(vid+".json", func() ([]byte, error) {
+		log.Printf("%s not found in cache, downloading info.\n", vid)
+		js, err := exec.Command(
 			"./bin/yt-dlp_linux",
-		uri,
+			fmt.Sprintf(yturl, vid),
 			"--cookies", "./cookies.txt",
 			"--no-call-home",
 			"--no-cache-dir",
@@ -30,6 +44,14 @@ func NewYTdl(uri string) (*YTdl, error) {
 			"-f", "140",
 			"-j",
 		).Output()
+		if err != nil {
+			return nil, err
+		}
+
+		log.Printf("%s is now cached.\n", vid)
+
+		return js, nil
+	})
 
 	if err != nil {
 		return nil, err