split wasm and non wasm

Author: cxjava

.vscode/settings.json

@@ -0,0 +1,8 @@
+{
+  "gopls": {
+    "build.env": {
+      "GOOS": "js",
+      "GOARCH": "wasm"
+    }
+  }
+}

handler/config.go

@@ -13,5 +13,5 @@ type Config struct {
 // DefaultConfig for an installer handler
 var DefaultConfig = Config{
 	Port: 3000,
-	User: "jpillora",
+	User: "cxjava",
 }

handler/handler.go

@@ -1,7 +1,6 @@
 package handler
 
 import (
-	"context"
 	"crypto/sha256"
 	"encoding/base64"
 	"encoding/json"
@@ -14,16 +13,13 @@ import (
 	"strings"
 	"sync"
 	"time"
-
-	"github.com/syumai/workers/cloudflare/fetch"
 )
 
 const (
 	cacheTTL = time.Hour
 )
 
 var (
-	cli          = fetch.NewClient()
 	isTermRe     = regexp.MustCompile(`(?i)^(curl|wget)\/`)
 	isHomebrewRe = regexp.MustCompile(`(?i)^homebrew`)
 	errMsgRe     = regexp.MustCompile(`[^A-Za-z0-9\ :\/\.]`)
@@ -90,7 +86,7 @@ func (h *Handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		}
 		http.Error(w, cleaned, http.StatusInternalServerError)
 	}
-	
+
 	q := Query{
 		User:      "",
 		Program:   "",
@@ -135,7 +131,7 @@ func (h *Handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	// validate query
 	valid := q.Program != ""
 	if !valid && path == "" {
-		http.Redirect(w, r, "https://github.com/jpillora/installer", http.StatusMovedPermanently)
+		http.Redirect(w, r, "https://github.com/cxjava/installer", http.StatusMovedPermanently)
 		return
 	}
 	if !valid {
@@ -212,20 +208,10 @@ func (as Assets) HasM1() bool {
 }
 
 func (h *Handler) get(url string, v interface{}) error {
-	r, err := fetch.NewRequest(context.TODO(), http.MethodGet, url, nil)
+	resp, err := httpGetWithToken(url, h.Config.Token)
 	if err != nil {
-		fmt.Println(err)
 		return err
 	}
-	r.Header.Set("Accept", "application/vnd.github.v3+json")
-	r.Header.Set("User-Agent", "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.0.0 Safari/537.36")
-	if h.Config.Token != "" {
-		r.Header.Set("Authorization", "token "+h.Config.Token)
-	}
-	resp, err := cli.Do(r, nil)
-	if err != nil {
-		return fmt.Errorf("request failed: %s: %s", url, err)
-	}
 	defer resp.Body.Close()
 
 	if resp.StatusCode == 404 {

handler/handler_execute.go

@@ -2,16 +2,12 @@ package handler
 
 import (
 	"bufio"
-	"context"
 	"errors"
 	"fmt"
 	"log"
-	"net/http"
 	"sort"
 	"strings"
 	"time"
-
-	"github.com/syumai/workers/cloudflare/fetch"
 )
 
 func (h *Handler) execute(q Query) (Result, error) {
@@ -201,16 +197,11 @@ func (as ghAssets) getSumIndex() (map[string]string, error) {
 	if url == "" {
 		return nil, errors.New("no sum file found")
 	}
-	r, err := fetch.NewRequest(context.TODO(), http.MethodGet, url, nil)
+	resp, err := httpGet(url)
 	if err != nil {
 		fmt.Println(err)
 		return nil, err
 	}
-	r.Header.Set("User-Agent", "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.0.0 Safari/537.36")
-	resp, err := cli.Do(r, nil)
-	if err != nil {
-		return nil, err
-	}
 	defer resp.Body.Close()
 	// take each line and insert into the index
 	index := map[string]string{}

handler/http_nonwasm.go

@@ -0,0 +1,48 @@
+//go:build !wasm
+
+package handler
+
+import (
+	"fmt"
+	"net/http"
+)
+
+var (
+	userAgent = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.0.0 Safari/537.36"
+)
+
+func httpGet(url string) (*http.Response, error) {
+	req, err := http.NewRequest(http.MethodGet, url, nil)
+	if err != nil {
+		return nil, err
+	}
+	req.Header.Set("Accept", "*/*")
+	//I'm a browser... :)
+	req.Header.Set("User-Agent", userAgent)
+
+	resp, err := http.DefaultClient.Do(req)
+	if err != nil {
+		return nil, fmt.Errorf("request failed: %s", err)
+	}
+
+	return resp, nil
+}
+
+func httpGetWithToken(url, token string) (*http.Response, error) {
+	r, err := http.NewRequest(http.MethodGet, url, nil)
+	if err != nil {
+		fmt.Println(err)
+		return nil, err
+	}
+	r.Header.Set("Accept", "application/vnd.github.v3+json")
+	//I'm a browser... :)
+	r.Header.Set("User-Agent", userAgent)
+	if len(token) > 0 {
+		r.Header.Set("Authorization", "token "+token)
+	}
+	resp, err := http.DefaultClient.Do(r)
+	if err != nil {
+		return nil, fmt.Errorf("request failed: %s: %s", url, err)
+	}
+	return resp, nil
+}

handler/http_wasm.go

@@ -0,0 +1,50 @@
+//go:build wasm
+
+package handler
+
+import (
+	"context"
+	"fmt"
+	"net/http"
+
+	"github.com/syumai/workers/cloudflare/fetch"
+)
+
+var (
+	cli       = fetch.NewClient()
+	userAgent = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.0.0 Safari/537.36"
+)
+
+func httpGetWithToken(url, token string) (*http.Response, error) {
+	r, err := fetch.NewRequest(context.TODO(), http.MethodGet, url, nil)
+	if err != nil {
+		fmt.Println(err)
+		return nil, err
+	}
+	r.Header.Set("Accept", "application/vnd.github.v3+json")
+	//I'm a browser... :)
+	r.Header.Set("User-Agent", userAgent)
+	if len(token) > 0 {
+		r.Header.Set("Authorization", "token "+token)
+	}
+	resp, err := cli.Do(r, nil)
+	if err != nil {
+		return nil, fmt.Errorf("request failed: %s: %s", url, err)
+	}
+	return resp, nil
+}
+
+func httpGet(url string) (*http.Response, error) {
+	req, err := fetch.NewRequest(context.TODO(), http.MethodGet, url, nil)
+	if err != nil {
+		return nil, err
+	}
+	req.Header.Set("Accept", "*/*")
+	//I'm a browser... :)
+	req.Header.Set("User-Agent", userAgent)
+	resp, err := cli.Do(req, nil)
+	if err != nil {
+		return nil, fmt.Errorf("request failed: %s", err)
+	}
+	return resp, nil
+}

handler/install.rb.qtpl

@@ -19,7 +19,7 @@ class Installer < Formula
   end
 
   def caveats
-    "{%s r.Program %} was installed using https://github.com/jpillora/installer"
+    "{%s r.Program %} was installed using https://github.com/cxjava/installer"
   end
 end
 {% endfunc %}

handler/install.rb.qtpl.go

@@ -18,5 +18,5 @@ has-m1-asset: {%v r.M1Asset %}
 
 to see shell script, append ?type=script
 for more information on this server, visit:
-  github.com/jpillora/installer
+  github.com/cxjava/installer
 {% endfunc %}