Merge pull request #2 from Darckfast/dev

feat: more reworks, perf changes and testing

Author: Darckfast

.github/workflows/pull_request.yaml

@@ -17,16 +17,16 @@ jobs:
 
       - uses: pnpm/action-setup@v4
         name: Install pnpm
-        with:
-          version: 10
 
       - uses: actions/setup-node@v4
         with:
           node-version: 22
+      - run: echo "$(go env GOROOT)/lib/wasm" >> $GITHUB_PATH
+      - run: pnpm i
 
       - name: Test Go
         shell: bash
-        run: PATH='$PATH:$(go env GOROOT)/lib/wasm' pnpm run test:go
+        run: pnpm run test:go
 
       - name: Test Worker
         shell: bash

.gitignore

@@ -4,3 +4,4 @@ node_modules
 .wrangler
 .dev.vars
 .env
+.vite

cloudflare/cache/client.go

@@ -5,16 +5,16 @@ import (
 	"net/http"
 	"syscall/js"
 
+	jsclass "github.com/syumai/workers/internal/class"
 	jshttp "github.com/syumai/workers/internal/http"
-	jsutil "github.com/syumai/workers/internal/utils"
 )
 
 type Cache struct {
 	instance js.Value
 }
 
 func (c *Cache) Open(namespace string) error {
-	v, err := jsutil.AwaitPromise(jsutil.RuntimeCache.Call("open", namespace))
+	v, err := jsclass.Await(jsclass.Caches.Call("open", namespace))
 	if err != nil {
 		return err
 	}
@@ -25,7 +25,7 @@ func (c *Cache) Open(namespace string) error {
 
 func New() *Cache {
 	return &Cache{
-		instance: jsutil.RuntimeCache.Get("default"),
+		instance: jsclass.Caches.Get("default"),
 	}
 }
 
@@ -36,7 +36,9 @@ func New() *Cache {
 // - Cache-Control instructs not to cache or if the response is too large.
 // docs: https://developers.cloudflare.com/workers/runtime-apis/cache/#put
 func (c *Cache) Put(req *http.Request, res *http.Response) error {
-	_, err := jsutil.AwaitPromise(c.instance.Call("put", jshttp.ToJSRequest(req), jshttp.ToJSResponse(res)))
+	r := jshttp.ToJSRequest(req)
+	rs := jshttp.ToJSResponse(res)
+	_, err := jsclass.Await(c.instance.Call("put", r, rs))
 	if err != nil {
 		return err
 	}
@@ -45,47 +47,41 @@ func (c *Cache) Put(req *http.Request, res *http.Response) error {
 
 var ErrCacheNotFound = errors.New("cache not found")
 
-// MatchOptions represents the options of the Match method.
 type MatchOptions struct {
-	// IgnoreMethod - Consider the request method a GET regardless of its actual value.
 	IgnoreMethod bool
 }
 
-// toJS converts MatchOptions to JS object.
 func (opts *MatchOptions) toJS() js.Value {
 	if opts == nil {
 		return js.Undefined()
 	}
-	obj := jsutil.NewObject()
+	obj := jsclass.Object.New()
 	obj.Set("ignoreMethod", opts.IgnoreMethod)
 	return obj
 }
 
 // Match returns the response object keyed to that request.
 // docs: https://developers.cloudflare.com/workers/runtime-apis/cache/#match
 func (c *Cache) Match(req *http.Request, opts *MatchOptions) (*http.Response, error) {
-	res, err := jsutil.AwaitPromise(c.instance.Call("match", jshttp.ToJSRequest(req), opts.toJS()))
+	res, err := jsclass.Await(c.instance.Call("match", jshttp.ToJSRequest(req), opts.toJS()))
 	if err != nil {
 		return nil, err
 	}
 	if res.IsUndefined() {
 		return nil, ErrCacheNotFound
 	}
-	return jshttp.ToResponse(res)
+	return jshttp.ToResponse(res), nil
 }
 
-// DeleteOptions represents the options of the Delete method.
 type DeleteOptions struct {
-	// IgnoreMethod - Consider the request method a GET regardless of its actual value.
 	IgnoreMethod bool
 }
 
-// toJS converts DeleteOptions to JS object.
 func (opts *DeleteOptions) toJS() js.Value {
 	if opts == nil {
 		return js.Undefined()
 	}
-	obj := jsutil.NewObject()
+	obj := jsclass.Object.New()
 	obj.Set("ignoreMethod", opts.IgnoreMethod)
 	return obj
 }
@@ -94,7 +90,7 @@ func (opts *DeleteOptions) toJS() js.Value {
 // This method only purges content of the cache in the data center that the Worker was invoked.
 // Returns ErrCacheNotFount if the response was not cached.
 func (c *Cache) Delete(req *http.Request, opts *DeleteOptions) error {
-	res, err := jsutil.AwaitPromise(c.instance.Call("delete", jshttp.ToJSRequest(req), opts.toJS()))
+	res, err := jsclass.Await(c.instance.Call("delete", jshttp.ToJSRequest(req), opts.toJS()))
 	if err != nil {
 		return err
 	}

cloudflare/cron/scheduler.go

@@ -1,22 +1,24 @@
 package cron
 
 import (
-	"fmt"
+	"errors"
 	"syscall/js"
 
-	jsutil "github.com/syumai/workers/internal/utils"
+	"github.com/syumai/workers/cloudflare/env"
+	jsclass "github.com/syumai/workers/internal/class"
 )
 
 type Task func(evt *CronEvent) error
 
 var scheduledTask Task = func(_ *CronEvent) error {
-	return fmt.Errorf("no scheduled implemented")
+	return errors.New("no scheduled implemented")
 }
 
-func runScheduler(eventObj js.Value, envObj js.Value, ctxObj js.Value) error {
-	jsutil.RuntimeEnv = envObj
-	jsutil.RuntimeExcutionContext = ctxObj
-	event := NewEvent(eventObj)
+func runScheduler(jsEvent js.Value, envObj js.Value, ctxObj js.Value) error {
+	jsclass.Env = envObj
+	jsclass.ExcutionContext = ctxObj
+	event := NewEvent(jsEvent)
+	env.LoadEnvs()
 
 	return scheduledTask(event)
 }
@@ -33,17 +35,19 @@ func init() {
 			resolve := pArgs[0]
 			reject := pArgs[1]
 
-			err := runScheduler(controllerObj, envObj, ctxObj)
+			go func() {
+				err := runScheduler(controllerObj, envObj, ctxObj)
 
-			if err != nil {
-				reject.Invoke(jsutil.Error(err.Error()))
-			} else {
-				resolve.Invoke(js.Undefined())
-			}
+				if err != nil {
+					reject.Invoke(jsclass.ToJSError(err))
+				} else {
+					resolve.Invoke(js.Undefined())
+				}
+			}()
 			return nil
 		})
 
-		return jsutil.NewPromise(cb)
+		return jsclass.Promise.New(cb)
 	})
 
 	js.Global().Get("cf").Set("scheduled", runSchedulerCallback)

cloudflare/ctx/fetch_event.go

@@ -3,15 +3,14 @@ package contx
 import (
 	"syscall/js"
 
-	jsutil "github.com/syumai/workers/internal/utils"
+	jsclass "github.com/syumai/workers/internal/class"
 )
 
 // WaitUntil extends the lifetime of the "fetch" event.
 // It accepts an asynchronous task which the Workers runtime will execute before the handler terminates but without blocking the response.
 // see: https://developers.cloudflare.com/workers/runtime-apis/fetch-event/#waituntil
 func WaitUntil(task func()) {
-	exCtx := jsutil.RuntimeExcutionContext
-	exCtx.Call("waitUntil", jsutil.NewPromise(js.FuncOf(func(this js.Value, pArgs []js.Value) any {
+	jsclass.ExcutionContext.Call("waitUntil", jsclass.Promise.New(js.FuncOf(func(this js.Value, pArgs []js.Value) any {
 		resolve := pArgs[0]
 		go func() {
 			task()
@@ -25,11 +24,10 @@ func WaitUntil(task func()) {
 // Instead, the request forwards to the origin server as if it had not gone through the worker.
 // see: https://developers.cloudflare.com/workers/runtime-apis/fetch-event/#passthroughonexception
 func PassThroughOnException() {
-	exCtx := jsutil.RuntimeExcutionContext
-	jsutil.AwaitPromise(jsutil.NewPromise(js.FuncOf(func(this js.Value, pArgs []js.Value) any {
+	jsclass.Await(jsclass.Promise.New(js.FuncOf(func(this js.Value, pArgs []js.Value) any {
 		resolve := pArgs[0]
 		go func() {
-			exCtx.Call("passThroughOnException")
+			jsclass.ExcutionContext.Call("passThroughOnException")
 			resolve.Invoke(js.Undefined())
 		}()
 		return js.Undefined()

cloudflare/d1/connector.go

@@ -5,7 +5,7 @@ import (
 	"database/sql/driver"
 	"syscall/js"
 
-	jsutil "github.com/syumai/workers/internal/utils"
+	jsclass "github.com/syumai/workers/internal/class"
 )
 
 type Connector struct {
@@ -19,7 +19,7 @@ var (
 // OpenConnector returns Connector of D1.
 // This method checks DB existence. If DB was not found, this function returns error.
 func OpenConnector(name string) (driver.Connector, error) {
-	v := jsutil.RuntimeEnv.Get(name)
+	v := jsclass.Env.Get(name)
 	if v.IsUndefined() {
 		return nil, ErrDatabaseNotFound
 	}

cloudflare/d1/rows.go

@@ -8,7 +8,7 @@ import (
 	"sync"
 	"syscall/js"
 
-	jsutil "github.com/syumai/workers/internal/utils"
+	jsclass "github.com/syumai/workers/internal/class"
 )
 
 type rows struct {
@@ -64,7 +64,7 @@ func convertRowColumnValueToAny(v js.Value) (driver.Value, error) {
 		return v.String(), nil
 	case js.TypeObject:
 		// handle BLOB type (ArrayBuffer).
-		src := jsutil.Uint8ArrayClass.New(v)
+		src := jsclass.Uint8Array.New(v)
 		dst := make([]byte, src.Length())
 		n := js.CopyBytesToGo(dst, src)
 		if n != len(dst) {

cloudflare/d1/stmt.go

@@ -6,7 +6,7 @@ import (
 	"errors"
 	"syscall/js"
 
-	jsutil "github.com/syumai/workers/internal/utils"
+	jsclass "github.com/syumai/workers/internal/class"
 )
 
 type stmt struct {
@@ -39,7 +39,7 @@ func (s *stmt) ExecContext(_ context.Context, args []driver.NamedValue) (driver.
 	argValues := make([]any, len(args))
 	for i, arg := range args {
 		if src, ok := arg.Value.([]byte); ok {
-			dst := jsutil.Uint8ArrayClass.New(len(src))
+			dst := jsclass.Uint8Array.New(len(src))
 			if n := js.CopyBytesToJS(dst, src); n != len(src) {
 				return nil, errors.New("incomplete copy into Uint8Array")
 			}
@@ -49,7 +49,7 @@ func (s *stmt) ExecContext(_ context.Context, args []driver.NamedValue) (driver.
 		}
 	}
 	resultPromise := s.stmtObj.Call("bind", argValues...).Call("run")
-	resultObj, err := jsutil.AwaitPromise(resultPromise)
+	resultObj, err := jsclass.Await(resultPromise)
 	if err != nil {
 		return nil, err
 	}
@@ -66,7 +66,7 @@ func (s *stmt) QueryContext(_ context.Context, args []driver.NamedValue) (driver
 	argValues := make([]any, len(args))
 	for i, arg := range args {
 		if src, ok := arg.Value.([]byte); ok {
-			dst := jsutil.Uint8ArrayClass.New(len(src))
+			dst := jsclass.Uint8Array.New(len(src))
 			if n := js.CopyBytesToJS(dst, src); n != len(src) {
 				return nil, errors.New("incomplete copy into Uint8Array")
 			}
@@ -76,7 +76,7 @@ func (s *stmt) QueryContext(_ context.Context, args []driver.NamedValue) (driver
 		}
 	}
 	resultPromise := s.stmtObj.Call("bind", argValues...).Call("raw", map[string]any{"columnNames": true})
-	rowsArray, err := jsutil.AwaitPromise(resultPromise)
+	rowsArray, err := jsclass.Await(resultPromise)
 	if err != nil {
 		return nil, err
 	}
@@ -92,7 +92,7 @@ func (s *stmt) QueryContext(_ context.Context, args []driver.NamedValue) (driver
 	colsArray := rowsArray.Call("shift")
 	colsLen := colsArray.Length()
 	cols := make([]string, colsLen)
-	for i := 0; i < colsLen; i++ {
+	for i := range colsLen {
 		cols[i] = colsArray.Index(i).String()
 	}
 	return &rows{

cloudflare/durable_objects/container.go

@@ -5,7 +5,6 @@ import (
 
 	jsclass "github.com/syumai/workers/internal/class"
 	jshttp "github.com/syumai/workers/internal/http"
-	jsutil "github.com/syumai/workers/internal/utils"
 )
 
 type Container struct {
@@ -21,11 +20,11 @@ func (s *Container) ContainerFetch(req *http.Request) (*http.Response, error) {
 		return nil, err
 	}
 
-	return jshttp.ToResponse(jsRes)
+	return jshttp.ToResponse(jsRes), nil
 }
 
 func GetContainer(binding string, id string) (*Container, error) {
-	inst := jsutil.RuntimeEnv.Get(binding)
+	inst := jsclass.Env.Get(binding)
 	donamespace := &DurableObjectNamespace{instance: inst}
 	objId := donamespace.IdFromName(id)
 	obj, err := donamespace.Get(objId)

cloudflare/durable_objects/stub.go

@@ -1,23 +1,23 @@
 package durableobjects
 
 import (
-	"fmt"
+	"errors"
 	"net/http"
 	"syscall/js"
 
 	jsclass "github.com/syumai/workers/internal/class"
 	jshttp "github.com/syumai/workers/internal/http"
-	jsutil "github.com/syumai/workers/internal/utils"
+	jstry "github.com/syumai/workers/internal/try"
 )
 
 type DurableObjectNamespace struct {
 	instance js.Value
 }
 
 func NewDurableObjectNamespace(varName string) (*DurableObjectNamespace, error) {
-	inst := jsutil.RuntimeEnv.Get(varName)
+	inst := jsclass.Env.Get(varName)
 	if inst.IsUndefined() {
-		return nil, fmt.Errorf("%s is undefined", varName)
+		return nil, errors.New("%s is undefined" + varName)
 	}
 	return &DurableObjectNamespace{instance: inst}, nil
 }
@@ -28,7 +28,7 @@ func (ns *DurableObjectNamespace) IdFromName(name string) *DurableObjectId {
 }
 
 func (ns *DurableObjectNamespace) IdFromString(id string) (*DurableObjectId, error) {
-	idStr, err := jsutil.TryCatch(js.FuncOf(func(_ js.Value, args []js.Value) any {
+	idStr, err := jstry.TryCatch(js.FuncOf(func(_ js.Value, args []js.Value) any {
 		return ns.instance.Call("idFromString", id)
 	}))
 
@@ -51,7 +51,7 @@ func (ns *DurableObjectNamespace) Jurisdiction(jur string) *DurableObjectNamespa
 
 func (ns *DurableObjectNamespace) Get(id *DurableObjectId) (*DurableObjectStub, error) {
 	if id == nil || id.val.IsUndefined() {
-		return nil, fmt.Errorf("invalid UniqueGlobalId")
+		return nil, errors.New("invalid UniqueGlobalId")
 	}
 	stub := ns.instance.Call("get", id.val)
 	return &DurableObjectStub{val: stub}, nil
@@ -74,7 +74,7 @@ func (s *DurableObjectStub) Fetch(req *http.Request) (*http.Response, error) {
 		return nil, err
 	}
 
-	return jshttp.ToResponse(jsRes)
+	return jshttp.ToResponse(jsRes), nil
 }
 
 func (s *DurableObjectStub) Call(funcName string) (any, error) {