no-check-origin option & change cdn

unpkg returns 520, change to jsdelivr

Author: azurity

main.go

@@ -124,6 +124,7 @@ func main() {
 	keyFile := flag.String("key", "https.key", "path to https key file")
 	max := flag.Int("max", 0, "max number of connections, 0 means no limit")
 	credential := flag.String("credit", "", "credential for authentication")
+	noCheckOrigin := flag.Bool("no-check-origin", false, "do not check origin")
 	statics := StringArray{}
 	flag.Var(&statics, "static", "folder to provide extra static files")
 
@@ -169,10 +170,16 @@ func main() {
 		}
 	}
 
+	var originChecker func(r *http.Request) bool = nil
+	if *noCheckOrigin {
+		originChecker = func(r *http.Request) bool { return true }
+	}
+
 	tty := ttyd.NewTTYd(ttyd.Config{
 		OtherFSList: fsList,
 		Gen:         generator,
 		MaxConn:     int32(*max),
+		CheckOrigin: originChecker,
 	})
 	portString := fmt.Sprintf(":%d", *port)
 	_, crtErr := os.Stat(*crtFile)

ttyd/frontend/index.html

@@ -4,11 +4,11 @@
     <meta charset="UTF-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <link rel="stylesheet" href="https://unpkg.com/xterm@4.19.0/css/xterm.css" />
-    <script src="https://unpkg.com/xterm@4.19.0/lib/xterm.js"></script>
-    <script src="https://unpkg.com/xterm-addon-fit@0.5.0/lib/xterm-addon-fit.js"></script>
-    <script src="https://unpkg.com/xterm-addon-unicode11@0.3.0/lib/xterm-addon-unicode11.js"></script>
-    <!-- <script src="https://unpkg.com/xterm-addon-webgl@0.12.0/lib/xterm-addon-webgl.js"></script> -->
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/xterm@4.19.0/css/xterm.css" />
+    <script src="https://cdn.jsdelivr.net/npm/xterm@4.19.0/lib/xterm.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/xterm-addon-fit@0.5.0/lib/xterm-addon-fit.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/xterm-addon-unicode11@0.3.0/lib/xterm-addon-unicode11.js"></script>
+    <!-- <script src="https://cdn.jsdelivr.net/npm/xterm-addon-webgl@0.12.0/lib/xterm-addon-webgl.js"></script> -->
     <title>XtermJS</title>
     <style>
         body {

ttyd/frontend/main.js

@@ -221,7 +221,7 @@ globalThis.loadTermFont = loadTermFont;
 globalThis.RenderFonts = [];
 
 window.addEventListener('load', async function () {
-    await loadTermFont("PureNerdFont", [{ url: "https://unpkg.com/@azurity/pure-nerd-font@1.0.0/PureNerdFont.woff2" }]);
+    await loadTermFont("PureNerdFont", [{ url: "https://cdn.jsdelivr.net/npm/@azurity/pure-nerd-font@1.0.0/PureNerdFont.woff2" }]);
     await prepareTheme();
     if (globalThis.RenderFonts.length == 1) {
         // only nerd-font prepared, use go mono as default font

ttyd/ttyd.go

@@ -39,14 +39,13 @@ func init() {
 }
 
 type TTYd struct {
-	mux *http.ServeMux
+	mux      *http.ServeMux
+	upgrader websocket.Upgrader
 }
 
 type CmdGenerator func() *exec.Cmd
 
-var upgrader = websocket.Upgrader{} // use default options
-
-func ws(w http.ResponseWriter, r *http.Request, gen CmdGenerator, connCounter *int32, max int32) {
+func ws(upgrader websocket.Upgrader, w http.ResponseWriter, r *http.Request, gen CmdGenerator, connCounter *int32, max int32) {
 	c, err := upgrader.Upgrade(w, r, nil)
 	if err != nil {
 		Logger.Print("upgrade:", err)
@@ -83,11 +82,13 @@ type Config struct {
 	OtherFSList []fs.FS      // Other fs that need to be served as static files.
 	Gen         CmdGenerator // A generator that creates the actual command.
 	MaxConn     int32        // Maximum number of connections. Unlimited if <= 0.
+	CheckOrigin func(r *http.Request) bool
 }
 
 func NewTTYd(conf Config) *TTYd {
 	ttyd := &TTYd{
-		mux: http.NewServeMux(),
+		mux:      http.NewServeMux(),
+		upgrader: websocket.Upgrader{CheckOrigin: conf.CheckOrigin},
 	}
 	if conf.MaxConn < 0 {
 		conf.MaxConn = 0
@@ -104,7 +105,7 @@ func NewTTYd(conf Config) *TTYd {
 		Pair: map[string]string{},
 	}, "/index.html"))
 	ttyd.mux.HandleFunc("/ws", func(w http.ResponseWriter, r *http.Request) {
-		ws(w, r, conf.Gen, &connCounter, conf.MaxConn)
+		ws(ttyd.upgrader, w, r, conf.Gen, &connCounter, conf.MaxConn)
 	})
 	ttyd.mux.HandleFunc("/themes.json", func(w http.ResponseWriter, r *http.Request) {
 		themes := ThemeList(serveFS)