Modernized dpcore code

- Rewritten dpcore transport object with deprecated API removed
- Optimized concurrent connection counts from 32 to 256
- Updated random port range for plugins
- Added debug output to plugin library

example/plugins/debugger/mod/zoraxy_plugin/embed_webserver.go

@@ -12,12 +12,12 @@ import (
 )
 
 type PluginUiRouter struct {
-	PluginID       string    //The ID of the plugin
-	TargetFs       *embed.FS //The embed.FS where the UI files are stored
-	TargetFsPrefix string    //The prefix of the embed.FS where the UI files are stored, e.g. /web
-	HandlerPrefix  string    //The prefix of the handler used to route this router, e.g. /ui
-
-	terminateHandler func() //The handler to be called when the plugin is terminated
+	PluginID         string    //The ID of the plugin
+	TargetFs         *embed.FS //The embed.FS where the UI files are stored
+	TargetFsPrefix   string    //The prefix of the embed.FS where the UI files are stored, e.g. /web
+	HandlerPrefix    string    //The prefix of the handler used to route this router, e.g. /ui
+	EnableDebug      bool      //Enable debug mode
+	terminateHandler func()    //The handler to be called when the plugin is terminated
 }
 
 // NewPluginEmbedUIRouter creates a new PluginUiRouter with embed.FS
@@ -58,11 +58,6 @@ func (p *PluginUiRouter) populateCSRFToken(r *http.Request, fsHandler http.Handl
 	//Return the middleware
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		// Check if the request is for an HTML file
-		if strings.HasSuffix(r.URL.Path, "/") {
-			// Redirect to the index.html
-			http.Redirect(w, r, r.URL.Path+"index.html", http.StatusFound)
-			return
-		}
 		if strings.HasSuffix(r.URL.Path, ".html") {
 			//Read the target file from embed.FS
 			targetFilePath := strings.TrimPrefix(r.URL.Path, "/")
@@ -75,7 +70,9 @@ func (p *PluginUiRouter) populateCSRFToken(r *http.Request, fsHandler http.Handl
 			}
 			body := string(targetFileContent)
 			body = strings.ReplaceAll(body, "{{.csrfToken}}", csrfToken)
-			http.ServeContent(w, r, r.URL.Path, time.Now(), strings.NewReader(body))
+			w.Header().Set("Content-Type", "text/html")
+			w.WriteHeader(http.StatusOK)
+			w.Write([]byte(body))
 			return
 		}
 
@@ -89,11 +86,18 @@ func (p *PluginUiRouter) populateCSRFToken(r *http.Request, fsHandler http.Handl
 func (p *PluginUiRouter) Handler() http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		//Remove the plugin UI handler path prefix
+		if p.EnableDebug {
+			fmt.Print("Request URL:", r.URL.Path, " rewriting to ")
+		}
+
 		rewrittenURL := r.RequestURI
 		rewrittenURL = strings.TrimPrefix(rewrittenURL, p.HandlerPrefix)
 		rewrittenURL = strings.ReplaceAll(rewrittenURL, "//", "/")
 		r.URL, _ = url.Parse(rewrittenURL)
 		r.RequestURI = rewrittenURL
+		if p.EnableDebug {
+			fmt.Println(r.URL.Path)
+		}
 
 		//Serve the file from the embed.FS
 		subFS, err := fs.Sub(*p.TargetFs, strings.TrimPrefix(p.TargetFsPrefix, "/"))

example/plugins/helloworld/mod/zoraxy_plugin/embed_webserver.go

@@ -12,12 +12,12 @@ import (
 )
 
 type PluginUiRouter struct {
-	PluginID       string    //The ID of the plugin
-	TargetFs       *embed.FS //The embed.FS where the UI files are stored
-	TargetFsPrefix string    //The prefix of the embed.FS where the UI files are stored, e.g. /web
-	HandlerPrefix  string    //The prefix of the handler used to route this router, e.g. /ui
-
-	terminateHandler func() //The handler to be called when the plugin is terminated
+	PluginID         string    //The ID of the plugin
+	TargetFs         *embed.FS //The embed.FS where the UI files are stored
+	TargetFsPrefix   string    //The prefix of the embed.FS where the UI files are stored, e.g. /web
+	HandlerPrefix    string    //The prefix of the handler used to route this router, e.g. /ui
+	EnableDebug      bool      //Enable debug mode
+	terminateHandler func()    //The handler to be called when the plugin is terminated
 }
 
 // NewPluginEmbedUIRouter creates a new PluginUiRouter with embed.FS
@@ -58,11 +58,6 @@ func (p *PluginUiRouter) populateCSRFToken(r *http.Request, fsHandler http.Handl
 	//Return the middleware
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		// Check if the request is for an HTML file
-		if strings.HasSuffix(r.URL.Path, "/") {
-			// Redirect to the index.html
-			http.Redirect(w, r, r.URL.Path+"index.html", http.StatusFound)
-			return
-		}
 		if strings.HasSuffix(r.URL.Path, ".html") {
 			//Read the target file from embed.FS
 			targetFilePath := strings.TrimPrefix(r.URL.Path, "/")
@@ -75,7 +70,9 @@ func (p *PluginUiRouter) populateCSRFToken(r *http.Request, fsHandler http.Handl
 			}
 			body := string(targetFileContent)
 			body = strings.ReplaceAll(body, "{{.csrfToken}}", csrfToken)
-			http.ServeContent(w, r, r.URL.Path, time.Now(), strings.NewReader(body))
+			w.Header().Set("Content-Type", "text/html")
+			w.WriteHeader(http.StatusOK)
+			w.Write([]byte(body))
 			return
 		}
 
@@ -89,11 +86,18 @@ func (p *PluginUiRouter) populateCSRFToken(r *http.Request, fsHandler http.Handl
 func (p *PluginUiRouter) Handler() http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		//Remove the plugin UI handler path prefix
+		if p.EnableDebug {
+			fmt.Print("Request URL:", r.URL.Path, " rewriting to ")
+		}
+
 		rewrittenURL := r.RequestURI
 		rewrittenURL = strings.TrimPrefix(rewrittenURL, p.HandlerPrefix)
 		rewrittenURL = strings.ReplaceAll(rewrittenURL, "//", "/")
 		r.URL, _ = url.Parse(rewrittenURL)
 		r.RequestURI = rewrittenURL
+		if p.EnableDebug {
+			fmt.Println(r.URL.Path)
+		}
 
 		//Serve the file from the embed.FS
 		subFS, err := fs.Sub(*p.TargetFs, strings.TrimPrefix(p.TargetFsPrefix, "/"))

example/plugins/ztnc/main.go

@@ -53,6 +53,7 @@ func main() {
 
 	// Create a new PluginEmbedUIRouter that will serve the UI from web folder
 	uiRouter := plugin.NewPluginEmbedUIRouter(PLUGIN_ID, &content, EMBED_FS_ROOT, UI_RELPATH)
+	uiRouter.EnableDebug = true
 
 	// Register the shutdown handler
 	uiRouter.RegisterTerminateHandler(func() {
@@ -64,7 +65,8 @@ func main() {
 	}, nil)
 
 	// This will serve the index.html file embedded in the binary
-	http.Handle(UI_RELPATH+"/", uiRouter.Handler())
+	targetHandler := uiRouter.Handler()
+	http.Handle(UI_RELPATH+"/", targetHandler)
 
 	// Start the GAN Network Controller
 	err = startGanNetworkController()

example/plugins/ztnc/mod/ganserv/authkeyWin.go

@@ -5,12 +5,10 @@ package ganserv
 
 import (
 	"fmt"
-	"log"
 	"os"
 	"path/filepath"
 	"strings"
 	"syscall"
-	"time"
 
 	"aroz.org/zoraxy/ztnc/mod/utils"
 	"golang.org/x/sys/windows"
@@ -46,15 +44,6 @@ func readAuthTokenAsAdmin() (string, error) {
 		return "", err
 	}
 
-	log.Println("Please click agree to allow access to ZeroTier authtoken from ProgramData")
-	retry := 0
-	time.Sleep(3 * time.Second)
-	for !utils.FileExists("./conf/authtoken.secret") && retry < 10 {
-		time.Sleep(3 * time.Second)
-		log.Println("Waiting for ZeroTier authtoken extraction...")
-		retry++
-	}
-
 	authKey, err := os.ReadFile("./conf/authtoken.secret")
 	if err != nil {
 		return "", err

example/plugins/ztnc/mod/zoraxy_plugin/embed_webserver.go

@@ -12,12 +12,12 @@ import (
 )
 
 type PluginUiRouter struct {
-	PluginID       string    //The ID of the plugin
-	TargetFs       *embed.FS //The embed.FS where the UI files are stored
-	TargetFsPrefix string    //The prefix of the embed.FS where the UI files are stored, e.g. /web
-	HandlerPrefix  string    //The prefix of the handler used to route this router, e.g. /ui
-
-	terminateHandler func() //The handler to be called when the plugin is terminated
+	PluginID         string    //The ID of the plugin
+	TargetFs         *embed.FS //The embed.FS where the UI files are stored
+	TargetFsPrefix   string    //The prefix of the embed.FS where the UI files are stored, e.g. /web
+	HandlerPrefix    string    //The prefix of the handler used to route this router, e.g. /ui
+	EnableDebug      bool      //Enable debug mode
+	terminateHandler func()    //The handler to be called when the plugin is terminated
 }
 
 // NewPluginEmbedUIRouter creates a new PluginUiRouter with embed.FS
@@ -58,11 +58,6 @@ func (p *PluginUiRouter) populateCSRFToken(r *http.Request, fsHandler http.Handl
 	//Return the middleware
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		// Check if the request is for an HTML file
-		if strings.HasSuffix(r.URL.Path, "/") {
-			// Redirect to the index.html
-			http.Redirect(w, r, r.URL.Path+"index.html", http.StatusFound)
-			return
-		}
 		if strings.HasSuffix(r.URL.Path, ".html") {
 			//Read the target file from embed.FS
 			targetFilePath := strings.TrimPrefix(r.URL.Path, "/")
@@ -75,7 +70,9 @@ func (p *PluginUiRouter) populateCSRFToken(r *http.Request, fsHandler http.Handl
 			}
 			body := string(targetFileContent)
 			body = strings.ReplaceAll(body, "{{.csrfToken}}", csrfToken)
-			http.ServeContent(w, r, r.URL.Path, time.Now(), strings.NewReader(body))
+			w.Header().Set("Content-Type", "text/html")
+			w.WriteHeader(http.StatusOK)
+			w.Write([]byte(body))
 			return
 		}
 
@@ -89,11 +86,18 @@ func (p *PluginUiRouter) populateCSRFToken(r *http.Request, fsHandler http.Handl
 func (p *PluginUiRouter) Handler() http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		//Remove the plugin UI handler path prefix
+		if p.EnableDebug {
+			fmt.Print("Request URL:", r.URL.Path, " rewriting to ")
+		}
+
 		rewrittenURL := r.RequestURI
 		rewrittenURL = strings.TrimPrefix(rewrittenURL, p.HandlerPrefix)
 		rewrittenURL = strings.ReplaceAll(rewrittenURL, "//", "/")
 		r.URL, _ = url.Parse(rewrittenURL)
 		r.RequestURI = rewrittenURL
+		if p.EnableDebug {
+			fmt.Println(r.URL.Path)
+		}
 
 		//Serve the file from the embed.FS
 		subFS, err := fs.Sub(*p.TargetFs, strings.TrimPrefix(p.TargetFsPrefix, "/"))