mirror of
https://github.com/GopeedLab/gopeed.git
synced 2026-11-18 14:23:42 +00:00
feat: add WebView support for extension (#1359)
This commit is contained in:
92 files changed
+10248
-2676
No files matched your search
@@ -144,7 +144,11 @@ func NewDownloader(cfg *DownloaderConfig) *Downloader {
|
||||
}
|
||||
|
||||
func (d *Downloader) Setup() error {
|
||||
d.gblob = protogblob.NewRegistry(filepath.Join(d.cfg.StorageDir, protogblob.Scheme))
|
||||
gblobDir := filepath.Join(d.cfg.StorageDir, "gblob")
|
||||
if err := os.RemoveAll(gblobDir); err != nil && !errors.Is(err, os.ErrNotExist) {
|
||||
return err
|
||||
}
|
||||
d.gblob = protogblob.NewRegistry(gblobDir)
|
||||
|
||||
// setup storage
|
||||
if err := d.storage.Setup([]string{bucketTask, bucketSave, bucketProtocolState, bucketConfig, bucketExtension, bucketExtensionStorage}); err != nil {
|
||||
@@ -498,6 +502,11 @@ func (d *Downloader) CreateDirect(req *base.Request, opts *base.Options) (taskId
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
if strings.HasPrefix(strings.ToLower(req.URL), protogblob.Scheme+":") {
|
||||
if err = fetcher.Resolve(req, initOpt); err != nil {
|
||||
return
|
||||
}
|
||||
}
|
||||
return d.doCreate(fetcher, initOpt)
|
||||
}
|
||||
|
||||
@@ -802,7 +811,7 @@ func (d *Downloader) Stats(id string) (sr any, err error) {
|
||||
}
|
||||
|
||||
func (d *Downloader) doDelete(task *Task, force bool) (err error) {
|
||||
defer d.unpinGBlobTask(task)
|
||||
defer d.releaseGBlobTask(task)
|
||||
err = func() error {
|
||||
if err := d.storage.Delete(bucketTask, task.ID); err != nil {
|
||||
return err
|
||||
@@ -1073,7 +1082,7 @@ func (d *Downloader) watch(task *Task) {
|
||||
d.emit(EventKeyDone, task)
|
||||
d.emit(EventKeyFinally, task, err)
|
||||
d.notifyRunning()
|
||||
d.unpinGBlobTask(task)
|
||||
d.releaseGBlobTask(task)
|
||||
d.triggerOnDone(task)
|
||||
d.triggerWebhooks(WebhookEventDownloadDone, task, nil)
|
||||
d.triggerScripts(ScriptEventDownloadDone, task, nil)
|
||||
@@ -1141,9 +1150,11 @@ func (d *Downloader) watch(task *Task) {
|
||||
func (d *Downloader) doOnError(task *Task, err error) {
|
||||
d.Logger.Warn().Err(err).Msgf("task download failed, task id: %s", task.ID)
|
||||
task.updateStatus(base.DownloadStatusError)
|
||||
d.unpinGBlobTask(task)
|
||||
d.triggerOnError(task, err)
|
||||
if task.Status == base.DownloadStatusError {
|
||||
if !d.isResumableGBlobTask(task) {
|
||||
d.releaseGBlobTask(task)
|
||||
}
|
||||
d.emit(EventKeyError, task, err)
|
||||
d.emit(EventKeyFinally, task, err)
|
||||
d.notifyRunning()
|
||||
@@ -1281,7 +1292,7 @@ func (d *Downloader) statusMut(task *Task, fn func() (bool, error)) (bool, error
|
||||
}
|
||||
|
||||
func (d *Downloader) doStart(task *Task) (err error) {
|
||||
var needCreate bool
|
||||
var isCreate bool
|
||||
isReturn, err := d.statusMut(task, func() (isReturn bool, err error) {
|
||||
if task.Status == base.DownloadStatusRunning || task.Status == base.DownloadStatusDone {
|
||||
isReturn = true
|
||||
@@ -1293,7 +1304,7 @@ func (d *Downloader) doStart(task *Task) (err error) {
|
||||
d.Logger.Error().Stack().Err(err).Msgf("restore fetcher failed, task id: %s", task.ID)
|
||||
return
|
||||
}
|
||||
needCreate = !task.IsCreated
|
||||
isCreate = task.Status == base.DownloadStatusReady
|
||||
task.updateStatus(base.DownloadStatusRunning)
|
||||
|
||||
return
|
||||
@@ -1311,6 +1322,11 @@ func (d *Downloader) doStart(task *Task) (err error) {
|
||||
defer task.lock.Unlock()
|
||||
|
||||
d.triggerOnStart(task)
|
||||
if task.fetcher != nil {
|
||||
task.fetcher.Meta().Req = task.Meta.Req
|
||||
task.fetcher.Meta().Res = task.Meta.Res
|
||||
task.fetcher.Meta().Opts = task.Meta.Opts
|
||||
}
|
||||
if task.Meta.Res == nil {
|
||||
err := task.fetcher.Resolve(task.Meta.Req, task.Meta.Opts)
|
||||
if err != nil {
|
||||
@@ -1319,7 +1335,7 @@ func (d *Downloader) doStart(task *Task) (err error) {
|
||||
task.Meta.Res = task.fetcher.Meta().Res
|
||||
}
|
||||
|
||||
if needCreate {
|
||||
if isCreate {
|
||||
if task.fetcherManager.AutoRename() {
|
||||
d.checkDuplicateLock.Lock()
|
||||
defer d.checkDuplicateLock.Unlock()
|
||||
@@ -1343,9 +1359,10 @@ func (d *Downloader) doStart(task *Task) (err error) {
|
||||
task.Meta.Opts.Name = newName
|
||||
}
|
||||
}
|
||||
task.IsCreated = true
|
||||
|
||||
task.Meta.Res.CalcSize(task.Meta.Opts.SelectFiles)
|
||||
}
|
||||
|
||||
task.Progress.Speed = 0
|
||||
task.timer.Start()
|
||||
if err := task.fetcher.Start(); err != nil {
|
||||
@@ -1842,6 +1859,28 @@ func (d *Downloader) unpinGBlobTask(task *Task) {
|
||||
d.gblob.Unpin(task.Meta.Req.URL)
|
||||
}
|
||||
|
||||
func (d *Downloader) isResumableGBlobTask(task *Task) bool {
|
||||
if task == nil || task.Meta == nil || task.Meta.Res == nil {
|
||||
return false
|
||||
}
|
||||
return task.Protocol == protogblob.Scheme && task.Meta.Res.Range
|
||||
}
|
||||
|
||||
func (d *Downloader) revokeGBlobTask(task *Task) {
|
||||
if d.gblob == nil || task == nil || task.Meta == nil || task.Meta.Req == nil || task.Meta.Req.URL == "" {
|
||||
return
|
||||
}
|
||||
if task.Protocol != protogblob.Scheme {
|
||||
return
|
||||
}
|
||||
_ = d.gblob.Revoke(task.Meta.Req.URL)
|
||||
}
|
||||
|
||||
func (d *Downloader) releaseGBlobTask(task *Task) {
|
||||
d.revokeGBlobTask(task)
|
||||
d.unpinGBlobTask(task)
|
||||
}
|
||||
|
||||
var defaultDownloader = NewDownloader(nil)
|
||||
|
||||
type boot struct {
|
||||
|
||||
@@ -21,12 +21,14 @@ import (
|
||||
"github.com/GopeedLab/gopeed/pkg/util"
|
||||
)
|
||||
|
||||
var testDownloadOpt = &base.Options{
|
||||
Path: test.Dir,
|
||||
Name: test.DownloadName,
|
||||
Extra: http.OptsExtra{
|
||||
Connections: 4,
|
||||
},
|
||||
func newTestDownloadOpt() *base.Options {
|
||||
return &base.Options{
|
||||
Path: test.Dir,
|
||||
Name: test.DownloadName,
|
||||
Extra: http.OptsExtra{
|
||||
Connections: 4,
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
func TestDownloader_Resolve(t *testing.T) {
|
||||
@@ -61,6 +63,51 @@ func TestDownloader_Resolve(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
func TestDownloader_UsesStorageDirForGBlobRegistry(t *testing.T) {
|
||||
storageDir := t.TempDir()
|
||||
downloader := NewDownloader(&DownloaderConfig{
|
||||
Storage: NewMemStorage(),
|
||||
StorageDir: storageDir,
|
||||
})
|
||||
if err := downloader.Setup(); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
defer downloader.Clear()
|
||||
|
||||
if downloader.gblob == nil {
|
||||
t.Fatal("expected gblob registry to be initialized")
|
||||
}
|
||||
expectedDir := filepath.Join(storageDir, "gblob")
|
||||
if filepath.Clean(downloader.gblob.Dir()) != filepath.Clean(expectedDir) {
|
||||
t.Fatalf("expected gblob registry dir under storage dir, got %s want %s", downloader.gblob.Dir(), expectedDir)
|
||||
}
|
||||
}
|
||||
|
||||
func TestDownloader_SetupCleansStaleGBlobDir(t *testing.T) {
|
||||
storageDir := t.TempDir()
|
||||
gblobDir := filepath.Join(storageDir, "gblob")
|
||||
if err := os.MkdirAll(gblobDir, 0o755); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
staleFile := filepath.Join(gblobDir, "stale")
|
||||
if err := os.WriteFile(staleFile, []byte("stale"), 0o644); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
downloader := NewDownloader(&DownloaderConfig{
|
||||
Storage: NewMemStorage(),
|
||||
StorageDir: storageDir,
|
||||
})
|
||||
if err := downloader.Setup(); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
defer downloader.Clear()
|
||||
|
||||
if _, err := os.Stat(staleFile); !os.IsNotExist(err) {
|
||||
t.Fatalf("expected stale gblob file to be removed on setup, got err=%v", err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestDownloader_Create(t *testing.T) {
|
||||
listener := test.StartTestFileServer()
|
||||
defer listener.Close()
|
||||
@@ -73,7 +120,7 @@ func TestDownloader_Create(t *testing.T) {
|
||||
req := &base.Request{
|
||||
URL: "http://" + listener.Addr().String() + "/" + test.BuildName,
|
||||
}
|
||||
rr, err := downloader.Resolve(req, testDownloadOpt)
|
||||
rr, err := downloader.Resolve(req, newTestDownloadOpt())
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
@@ -113,7 +160,7 @@ func TestDownloader_CreateNotInWhite(t *testing.T) {
|
||||
}
|
||||
// With new fetcher design, white list check happens during Resolve (not Create)
|
||||
// because Resolve now requires Options which includes the download path
|
||||
_, err := downloader.Resolve(req, testDownloadOpt)
|
||||
_, err := downloader.Resolve(req, newTestDownloadOpt())
|
||||
if err == nil {
|
||||
t.Error("TestDownloader_CreateNotInWhite() expected error but got nil")
|
||||
}
|
||||
@@ -162,7 +209,7 @@ func TestDownloader_CreateDirectBatch(t *testing.T) {
|
||||
|
||||
_, err := downloader.CreateDirectBatch(&base.CreateTaskBatch{
|
||||
Reqs: reqs,
|
||||
Opts: testDownloadOpt,
|
||||
Opts: newTestDownloadOpt(),
|
||||
})
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
@@ -266,6 +313,9 @@ func TestDownloader_CreateWithProxy(t *testing.T) {
|
||||
}
|
||||
|
||||
func doTestDownloaderCreateWithProxy(t *testing.T, auth bool, buildReqProxy func(reqProxy *base.RequestProxy) *base.RequestProxy, buildProxyConfig func(proxyCfg *base.DownloaderProxyConfig) *base.DownloaderProxyConfig, errHandler func(err error)) {
|
||||
listener := test.StartTestFileServer()
|
||||
defer listener.Close()
|
||||
|
||||
usr, pwd := "", ""
|
||||
if auth {
|
||||
usr, pwd = "admin", "123"
|
||||
@@ -291,7 +341,7 @@ func doTestDownloaderCreateWithProxy(t *testing.T, auth bool, buildReqProxy func
|
||||
downloader.cfg.DownloaderStoreConfig.Proxy = globalProxyCfg
|
||||
|
||||
req := &base.Request{
|
||||
URL: test.ExternalDownloadUrl,
|
||||
URL: "http://" + listener.Addr().String() + "/" + test.BuildName,
|
||||
}
|
||||
if buildReqProxy != nil {
|
||||
req.Proxy = buildReqProxy(&base.RequestProxy{
|
||||
@@ -310,13 +360,13 @@ func doTestDownloaderCreateWithProxy(t *testing.T, auth bool, buildReqProxy func
|
||||
return
|
||||
}
|
||||
want := &base.Resource{
|
||||
Size: test.ExternalDownloadSize,
|
||||
Size: test.BuildSize,
|
||||
Range: true,
|
||||
Files: []*base.FileInfo{
|
||||
{
|
||||
Name: test.ExternalDownloadName,
|
||||
Name: test.BuildName,
|
||||
Path: "",
|
||||
Size: test.ExternalDownloadSize,
|
||||
Size: test.BuildSize,
|
||||
},
|
||||
},
|
||||
}
|
||||
@@ -384,7 +434,7 @@ func TestDownloader_StoreAndRestore(t *testing.T) {
|
||||
req := &base.Request{
|
||||
URL: "http://" + listener.Addr().String() + "/" + test.BuildName,
|
||||
}
|
||||
rr, err := downloader.Resolve(req, testDownloadOpt)
|
||||
rr, err := downloader.Resolve(req, newTestDownloadOpt())
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
@@ -653,7 +703,7 @@ func TestDownloader_Stats(t *testing.T) {
|
||||
req := &base.Request{
|
||||
URL: "http://" + listener.Addr().String() + "/" + test.BuildName,
|
||||
}
|
||||
rr, err := downloader.Resolve(req, testDownloadOpt)
|
||||
rr, err := downloader.Resolve(req, newTestDownloadOpt())
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
@@ -708,7 +758,7 @@ func TestDownloader_Delete(t *testing.T) {
|
||||
req := &base.Request{
|
||||
URL: "http://" + listener.Addr().String() + "/" + test.BuildName,
|
||||
}
|
||||
taskId, err := downloader.CreateDirect(req, testDownloadOpt)
|
||||
taskId, err := downloader.CreateDirect(req, newTestDownloadOpt())
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
@@ -772,7 +822,7 @@ func TestDownloader_PauseAndContinue(t *testing.T) {
|
||||
req := &base.Request{
|
||||
URL: "http://" + listener.Addr().String() + "/" + test.BuildName,
|
||||
}
|
||||
rr, err := downloader.Resolve(req, testDownloadOpt)
|
||||
rr, err := downloader.Resolve(req, newTestDownloadOpt())
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
@@ -843,7 +893,7 @@ func TestDownloader_PauseAllAndContinueAll(t *testing.T) {
|
||||
req := &base.Request{
|
||||
URL: "http://" + listener.Addr().String() + "/" + test.BuildName,
|
||||
}
|
||||
rr, err := downloader.Resolve(req, testDownloadOpt)
|
||||
rr, err := downloader.Resolve(req, newTestDownloadOpt())
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
+107
-43
@@ -3,6 +3,8 @@ package engine
|
||||
import (
|
||||
_ "embed"
|
||||
"errors"
|
||||
"fmt"
|
||||
"sync"
|
||||
|
||||
"github.com/GopeedLab/gopeed/pkg/base"
|
||||
gojaerror "github.com/GopeedLab/gopeed/pkg/download/engine/inject/error"
|
||||
@@ -14,7 +16,6 @@ import (
|
||||
"github.com/dop251/goja"
|
||||
"github.com/dop251/goja_nodejs/eventloop"
|
||||
gojaurl "github.com/dop251/goja_nodejs/url"
|
||||
"time"
|
||||
)
|
||||
|
||||
//go:embed polyfill/out/index.js
|
||||
@@ -26,6 +27,8 @@ type Engine struct {
|
||||
Runtime *goja.Runtime
|
||||
}
|
||||
|
||||
type JSFunction func(goja.FunctionCall) goja.Value
|
||||
|
||||
// RunString executes the script and returns the go type value
|
||||
// if script result is promise, it will be resolved
|
||||
func (e *Engine) RunString(script string) (value any, err error) {
|
||||
@@ -36,37 +39,88 @@ func (e *Engine) RunString(script string) (value any, err error) {
|
||||
|
||||
// CallFunction calls the function and returns the go type value
|
||||
// if function result is promise, it will be resolved
|
||||
func (e *Engine) CallFunction(fn goja.Callable, args ...any) (value any, err error) {
|
||||
func (e *Engine) CallFunction(fn any, args ...any) (value any, err error) {
|
||||
return e.runOnLoop(func(runtime *goja.Runtime) (goja.Value, error) {
|
||||
if args == nil {
|
||||
return fn(nil)
|
||||
}
|
||||
var jsArgs []goja.Value
|
||||
for _, arg := range args {
|
||||
jsArgs = append(jsArgs, runtime.ToValue(arg))
|
||||
}
|
||||
return fn(nil, jsArgs...)
|
||||
switch f := fn.(type) {
|
||||
case goja.Callable:
|
||||
if args == nil {
|
||||
return f(nil)
|
||||
}
|
||||
return f(nil, jsArgs...)
|
||||
case JSFunction:
|
||||
return callExportedFunction(func(call goja.FunctionCall) goja.Value {
|
||||
return f(call)
|
||||
}, jsArgs...)
|
||||
default:
|
||||
return nil, fmt.Errorf("unsupported function type: %T", fn)
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
func (e *Engine) runOnLoop(fn func(runtime *goja.Runtime) (goja.Value, error)) (any, error) {
|
||||
type result struct {
|
||||
value goja.Value
|
||||
value any
|
||||
err error
|
||||
}
|
||||
ch := make(chan result, 1)
|
||||
ok := e.loop.RunOnLoop(func(runtime *goja.Runtime) {
|
||||
var once sync.Once
|
||||
sendResult := func(res result) {
|
||||
once.Do(func() {
|
||||
ch <- res
|
||||
})
|
||||
}
|
||||
defer func() {
|
||||
if r := recover(); r != nil {
|
||||
if err, ok := r.(error); ok {
|
||||
ch <- result{err: err}
|
||||
return
|
||||
switch v := r.(type) {
|
||||
case error:
|
||||
sendResult(result{err: v})
|
||||
case goja.Value:
|
||||
sendResult(result{err: exportJSError(v)})
|
||||
default:
|
||||
sendResult(result{err: fmt.Errorf("panic: %v", r)})
|
||||
}
|
||||
ch <- result{err: errors.New("panic")}
|
||||
}
|
||||
}()
|
||||
value, err := fn(runtime)
|
||||
ch <- result{value: value, err: err}
|
||||
if err != nil {
|
||||
sendResult(result{err: err})
|
||||
return
|
||||
}
|
||||
if p, ok := value.Export().(*goja.Promise); ok {
|
||||
switch p.State() {
|
||||
case goja.PromiseStateFulfilled:
|
||||
sendResult(result{value: exportJSValue(p.Result())})
|
||||
return
|
||||
case goja.PromiseStateRejected:
|
||||
sendResult(result{err: exportJSError(p.Result())})
|
||||
return
|
||||
}
|
||||
promiseObj := value.ToObject(runtime)
|
||||
thenVal := promiseObj.Get("then")
|
||||
thenFn, ok := goja.AssertFunction(thenVal)
|
||||
if !ok {
|
||||
sendResult(result{err: errors.New("promise.then is not callable")})
|
||||
return
|
||||
}
|
||||
onFulfilled := runtime.ToValue(func(call goja.FunctionCall) goja.Value {
|
||||
sendResult(result{value: exportJSValue(call.Argument(0))})
|
||||
return goja.Undefined()
|
||||
})
|
||||
onRejected := runtime.ToValue(func(call goja.FunctionCall) goja.Value {
|
||||
sendResult(result{err: exportJSError(call.Argument(0))})
|
||||
return goja.Undefined()
|
||||
})
|
||||
if _, err := thenFn(promiseObj, onFulfilled, onRejected); err != nil {
|
||||
sendResult(result{err: err})
|
||||
}
|
||||
return
|
||||
}
|
||||
sendResult(result{value: exportJSValue(value)})
|
||||
})
|
||||
if !ok {
|
||||
return nil, errors.New("engine loop terminated")
|
||||
@@ -75,7 +129,7 @@ func (e *Engine) runOnLoop(fn func(runtime *goja.Runtime) (goja.Value, error)) (
|
||||
if res.err != nil {
|
||||
return nil, res.err
|
||||
}
|
||||
return resolveResult(res.value)
|
||||
return res.value, nil
|
||||
}
|
||||
|
||||
func (e *Engine) Close() {
|
||||
@@ -130,7 +184,7 @@ func NewEngine(cfg *Config) *Engine {
|
||||
if _, err := runtime.RunString("global.location = new URL('http://localhost');"); err != nil {
|
||||
return
|
||||
}
|
||||
if err := stream.Enable(runtime, cfg.StreamConfig); err != nil {
|
||||
if err := stream.Enable(runtime, loop, cfg.StreamConfig); err != nil {
|
||||
return
|
||||
}
|
||||
return
|
||||
@@ -144,35 +198,45 @@ func Run(script string) (value any, err error) {
|
||||
return engine.RunString(script)
|
||||
}
|
||||
|
||||
// if the value is Promise, it will be resolved and return the result.
|
||||
func resolveResult(value goja.Value) (any, error) {
|
||||
export := value.Export()
|
||||
switch export.(type) {
|
||||
case *goja.Promise:
|
||||
p := export.(*goja.Promise)
|
||||
for p.State() == goja.PromiseStatePending {
|
||||
time.Sleep(time.Millisecond * 10)
|
||||
}
|
||||
switch p.State() {
|
||||
case goja.PromiseStatePending:
|
||||
return nil, nil
|
||||
case goja.PromiseStateFulfilled:
|
||||
return p.Result().Export(), nil
|
||||
case goja.PromiseStateRejected:
|
||||
if err, ok := p.Result().Export().(error); ok {
|
||||
return nil, err
|
||||
} else {
|
||||
stack := p.Result().String()
|
||||
result := p.Result()
|
||||
if ro, ok := result.(*goja.Object); ok {
|
||||
stackVal := ro.Get("stack")
|
||||
if stackVal != nil && stackVal.String() != "" {
|
||||
stack = stackVal.String()
|
||||
}
|
||||
}
|
||||
return nil, errors.New(stack)
|
||||
}
|
||||
func exportJSValue(value goja.Value) any {
|
||||
if value == nil {
|
||||
return nil
|
||||
}
|
||||
return value.Export()
|
||||
}
|
||||
|
||||
func exportJSError(value goja.Value) error {
|
||||
if value == nil || goja.IsUndefined(value) || goja.IsNull(value) {
|
||||
return errors.New("promise rejected")
|
||||
}
|
||||
if err, ok := value.Export().(error); ok {
|
||||
return err
|
||||
}
|
||||
stack := value.String()
|
||||
if ro, ok := value.(*goja.Object); ok {
|
||||
stackVal := ro.Get("stack")
|
||||
if stackVal != nil && stackVal.String() != "" {
|
||||
stack = stackVal.String()
|
||||
}
|
||||
}
|
||||
return export, nil
|
||||
return errors.New(stack)
|
||||
}
|
||||
|
||||
func callExportedFunction(fn func(goja.FunctionCall) goja.Value, args ...goja.Value) (ret goja.Value, err error) {
|
||||
defer func() {
|
||||
if r := recover(); r != nil {
|
||||
switch v := r.(type) {
|
||||
case error:
|
||||
err = v
|
||||
case goja.Value:
|
||||
err = exportJSError(v)
|
||||
default:
|
||||
err = fmt.Errorf("panic: %v", r)
|
||||
}
|
||||
}
|
||||
}()
|
||||
return fn(goja.FunctionCall{
|
||||
This: nil,
|
||||
Arguments: args,
|
||||
}), nil
|
||||
}
|
||||
@@ -26,7 +26,11 @@ func TestPolyfill(t *testing.T) {
|
||||
doTestPolyfill(t, "MessageError")
|
||||
doTestPolyfill(t, "XMLHttpRequest")
|
||||
doTestPolyfill(t, "Blob")
|
||||
doTestPolyfill(t, "Event")
|
||||
doTestPolyfill(t, "EventTarget")
|
||||
doTestPolyfill(t, "FormData")
|
||||
doTestPolyfill(t, "AbortController")
|
||||
doTestPolyfill(t, "AbortSignal")
|
||||
doTestPolyfill(t, "TextDecoder")
|
||||
doTestPolyfill(t, "TextEncoder")
|
||||
doTestPolyfill(t, "fetch")
|
||||
@@ -36,13 +40,90 @@ func TestPolyfill(t *testing.T) {
|
||||
func TestError(t *testing.T) {
|
||||
engine := NewEngine(nil)
|
||||
_, err := engine.RunString(`
|
||||
throw new MessageError('test');
|
||||
throw new MessageError('test');
|
||||
`)
|
||||
if me, ok := gojautil.AssertError[*gojaerror.MessageError](err); !ok {
|
||||
t.Fatalf("expect MessageError, but got %v", me)
|
||||
}
|
||||
}
|
||||
|
||||
func TestURLCreateObjectURLRejectsUnsupportedType(t *testing.T) {
|
||||
engine := NewEngine(nil)
|
||||
defer engine.Close()
|
||||
|
||||
_, err := engine.RunString(`
|
||||
URL.createObjectURL({});
|
||||
`)
|
||||
if err == nil {
|
||||
t.Fatal("expected unsupported type error")
|
||||
}
|
||||
if !strings.Contains(err.Error(), "Unsupported object type for URL.createObjectURL: Object") {
|
||||
t.Fatalf("unexpected unsupported type error: %v", err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestCallFunction_DetachedAsyncWorkDoesNotBlockReturn(t *testing.T) {
|
||||
engine := NewEngine(nil)
|
||||
defer engine.Close()
|
||||
if _, err := engine.RunString(`
|
||||
globalThis.__done = false;
|
||||
async function testDetached() {
|
||||
(async () => {
|
||||
await new Promise((resolve) => setTimeout(resolve, 500));
|
||||
globalThis.__done = true;
|
||||
})();
|
||||
return "ok";
|
||||
}
|
||||
`); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
fn, ok := goja.AssertFunction(engine.Runtime.Get("testDetached"))
|
||||
if !ok {
|
||||
t.Fatal("testDetached is not callable")
|
||||
}
|
||||
startedAt := time.Now()
|
||||
value, err := engine.CallFunction(fn)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
elapsed := time.Since(startedAt)
|
||||
if elapsed > 200*time.Millisecond {
|
||||
t.Fatalf("detached async work blocked return for %s", elapsed)
|
||||
}
|
||||
if value != "ok" {
|
||||
t.Fatalf("unexpected return value: %#v", value)
|
||||
}
|
||||
}
|
||||
|
||||
func TestCallFunction_AwaitedPromiseBlocksUntilSettled(t *testing.T) {
|
||||
engine := NewEngine(nil)
|
||||
defer engine.Close()
|
||||
if _, err := engine.RunString(`
|
||||
async function testAwaited() {
|
||||
await new Promise((resolve) => setTimeout(resolve, 120));
|
||||
return "ok";
|
||||
}
|
||||
`); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
fn, ok := goja.AssertFunction(engine.Runtime.Get("testAwaited"))
|
||||
if !ok {
|
||||
t.Fatal("testAwaited is not callable")
|
||||
}
|
||||
startedAt := time.Now()
|
||||
value, err := engine.CallFunction(fn)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
elapsed := time.Since(startedAt)
|
||||
if elapsed < 100*time.Millisecond {
|
||||
t.Fatalf("awaited promise returned too early: %s", elapsed)
|
||||
}
|
||||
if value != "ok" {
|
||||
t.Fatalf("unexpected return value: %#v", value)
|
||||
}
|
||||
}
|
||||
|
||||
func TestFetch(t *testing.T) {
|
||||
server := startServer()
|
||||
defer server.Close()
|
||||
@@ -64,6 +145,50 @@ async function testText(){
|
||||
return await resp.text();
|
||||
}
|
||||
|
||||
async function testResponseBodyGetReader() {
|
||||
const resp = await fetch(host+'/text', {
|
||||
method: 'POST',
|
||||
body: 'stream-body'
|
||||
});
|
||||
if (!resp.body || typeof resp.body.getReader !== 'function') {
|
||||
throw new Error('response.body.getReader is not available');
|
||||
}
|
||||
const reader = resp.body.getReader();
|
||||
const decoder = new TextDecoder();
|
||||
let result = '';
|
||||
while (true) {
|
||||
const { done, value } = await reader.read();
|
||||
if (done) {
|
||||
break;
|
||||
}
|
||||
result += decoder.decode(value, { stream: true });
|
||||
}
|
||||
result += decoder.decode();
|
||||
return result;
|
||||
}
|
||||
|
||||
async function testStreamingFetchResponseBody() {
|
||||
const startedAt = Date.now();
|
||||
const resp = await fetch(host+'/stream');
|
||||
const resolvedAt = Date.now() - startedAt;
|
||||
const reader = resp.body.getReader();
|
||||
const decoder = new TextDecoder();
|
||||
const first = await reader.read();
|
||||
const firstAt = Date.now() - startedAt;
|
||||
const second = await reader.read();
|
||||
const secondAt = Date.now() - startedAt;
|
||||
let result = '';
|
||||
result += decoder.decode(first.value, { stream: true });
|
||||
result += decoder.decode(second.value, { stream: true });
|
||||
result += decoder.decode();
|
||||
return {
|
||||
resolvedAt,
|
||||
firstAt,
|
||||
secondAt,
|
||||
text: result
|
||||
};
|
||||
}
|
||||
|
||||
async function testOctetStream(file){
|
||||
const resp = await fetch(host+'/octetStream',{
|
||||
method: 'POST',
|
||||
@@ -251,6 +376,32 @@ async function testFingerprintSafari(){
|
||||
t.Fatalf("testText failed, want %s, got %s", "test", result)
|
||||
}
|
||||
|
||||
result, err = callTestFun(engine, "testResponseBodyGetReader")
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if result != "stream-body" {
|
||||
t.Fatalf("testResponseBodyGetReader failed, want %s, got %s", "stream-body", result)
|
||||
}
|
||||
|
||||
result, err = callTestFun(engine, "testStreamingFetchResponseBody")
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
streaming := result.(map[string]any)
|
||||
if streaming["text"] != "chunk-1chunk-2" {
|
||||
t.Fatalf("testStreamingFetchResponseBody failed, want %s, got %v", "chunk-1chunk-2", streaming["text"])
|
||||
}
|
||||
if int(streaming["resolvedAt"].(int64)) >= 120 {
|
||||
t.Fatalf("fetch resolved too late, got %dms", streaming["resolvedAt"].(int64))
|
||||
}
|
||||
if int(streaming["firstAt"].(int64)) >= 120 {
|
||||
t.Fatalf("first chunk arrived too late, got %dms", streaming["firstAt"].(int64))
|
||||
}
|
||||
if int(streaming["secondAt"].(int64)) < 120 {
|
||||
t.Fatalf("second chunk arrived too early, got %dms", streaming["secondAt"].(int64))
|
||||
}
|
||||
|
||||
func() {
|
||||
jsFile, _, md5 := buildFile(t, engine.Runtime)
|
||||
result, err = callTestFun(engine, "testOctetStream", jsFile)
|
||||
@@ -464,6 +615,18 @@ func startServer() net.Listener {
|
||||
w.WriteHeader(http.StatusOK)
|
||||
w.Write(buf)
|
||||
})
|
||||
mux.HandleFunc("/stream", func(w http.ResponseWriter, r *http.Request) {
|
||||
w.WriteHeader(http.StatusOK)
|
||||
if flusher, ok := w.(http.Flusher); ok {
|
||||
_, _ = w.Write([]byte("chunk-1"))
|
||||
flusher.Flush()
|
||||
time.Sleep(150 * time.Millisecond)
|
||||
_, _ = w.Write([]byte("chunk-2"))
|
||||
flusher.Flush()
|
||||
return
|
||||
}
|
||||
_, _ = w.Write([]byte("chunk-1chunk-2"))
|
||||
})
|
||||
mux.HandleFunc("/octetStream", func(w http.ResponseWriter, r *http.Request) {
|
||||
md5 := calcMd5(r.Body)
|
||||
w.WriteHeader(http.StatusOK)
|
||||
|
||||
File diff suppressed because it is too large.
Load diff
File diff suppressed because it is too large.
Load diff
@@ -1,6 +1,8 @@
|
||||
package vm
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
|
||||
"github.com/dop251/goja"
|
||||
"github.com/dop251/goja_nodejs/eventloop"
|
||||
)
|
||||
@@ -25,7 +27,12 @@ func (vm *Vm) Get(name string) (value any) {
|
||||
func (vm *Vm) RunString(script string) (value any, err error) {
|
||||
defer func() {
|
||||
if r := recover(); r != nil {
|
||||
err = r.(error)
|
||||
switch v := r.(type) {
|
||||
case error:
|
||||
err = v
|
||||
default:
|
||||
err = fmt.Errorf("panic: %v", r)
|
||||
}
|
||||
}
|
||||
}()
|
||||
|
||||
|
||||
@@ -1 +1 @@
|
||||
(()=>{var e={725:function(e,t,r){var o,n,i;i="undefined"!=typeof self&&self||"undefined"!=typeof window&&window||void 0!==r.g&&r.g||this,o=function(e){"use strict";var t=i.BlobBuilder||i.WebKitBlobBuilder||i.MSBlobBuilder||i.MozBlobBuilder,r=i.URL||i.webkitURL||function(e,t){return(t=document.createElement("a")).href=e,t},o=i.Blob,n=r.createObjectURL,a=r.revokeObjectURL,s=i.Symbol&&i.Symbol.toStringTag,u=!1,f=!1,l=t&&t.prototype.append&&t.prototype.getBlob;try{u=2===new Blob(["ä"]).size,f=2===new Blob([new Uint8Array([1,2])]).size}catch(e){}function c(e){return e.map((function(e){if(e.buffer instanceof ArrayBuffer){var t=e.buffer;if(e.byteLength!==t.byteLength){var r=new Uint8Array(e.byteLength);r.set(new Uint8Array(t,e.byteOffset,e.byteLength)),t=r.buffer}return t}return e}))}function h(e,r){r=r||{};var o=new t;return c(e).forEach((function(e){o.append(e)})),r.type?o.getBlob(r.type):o.getBlob()}function d(e,t){return new o(c(e),t||{})}i.Blob&&(h.prototype=Blob.prototype,d.prototype=Blob.prototype);var p="function"==typeof TextEncoder?TextEncoder.prototype.encode.bind(new TextEncoder):function(e){for(var t=0,r=e.length,o=i.Uint8Array||Array,n=0,a=Math.max(32,r+(r>>1)+7),s=new o(a>>3<<3);t<r;){var u=e.charCodeAt(t++);if(u>=55296&&u<=56319){if(t<r){var f=e.charCodeAt(t);56320==(64512&f)&&(++t,u=((1023&u)<<10)+(1023&f)+65536)}if(u>=55296&&u<=56319)continue}if(n+4>s.length){a+=8,a=(a*=1+t/e.length*2)>>3<<3;var l=new Uint8Array(a);l.set(s),s=l}if(0!=(4294967168&u)){if(0==(4294965248&u))s[n++]=u>>6&31|192;else if(0==(4294901760&u))s[n++]=u>>12&15|224,s[n++]=u>>6&63|128;else{if(0!=(4292870144&u))continue;s[n++]=u>>18&7|240,s[n++]=u>>12&63|128,s[n++]=u>>6&63|128}s[n++]=63&u|128}else s[n++]=u}return s.slice(0,n)},y="function"==typeof TextDecoder?TextDecoder.prototype.decode.bind(new TextDecoder):function(e){for(var t=e.length,r=[],o=0;o<t;){var n,i,a,s,u=e[o],f=null,l=u>239?4:u>223?3:u>191?2:1;if(o+l<=t)switch(l){case 1:u<128&&(f=u);break;case 2:128==(192&(n=e[o+1]))&&(s=(31&u)<<6|63&n)>127&&(f=s);break;case 3:n=e[o+1],i=e[o+2],128==(192&n)&&128==(192&i)&&(s=(15&u)<<12|(63&n)<<6|63&i)>2047&&(s<55296||s>57343)&&(f=s);break;case 4:n=e[o+1],i=e[o+2],a=e[o+3],128==(192&n)&&128==(192&i)&&128==(192&a)&&(s=(15&u)<<18|(63&n)<<12|(63&i)<<6|63&a)>65535&&s<1114112&&(f=s)}null===f?(f=65533,l=1):f>65535&&(f-=65536,r.push(f>>>10&1023|55296),f=56320|1023&f),r.push(f),o+=l}for(var c=r.length,h="",d=0;d<c;)h+=String.fromCharCode.apply(String,r.slice(d,d+=4096));return h};function b(){var t=!!i.ActiveXObject||"-ms-scroll-limit"in document.documentElement.style&&"-ms-ime-align"in document.documentElement.style,r=i.XMLHttpRequest&&i.XMLHttpRequest.prototype.send;t&&r&&(XMLHttpRequest.prototype.send=function(e){e instanceof Blob?(this.setRequestHeader("Content-Type",e.type),r.call(this,e)):r.call(this,e)});try{new File([],""),e.File=i.File,e.FileReader=i.FileReader}catch(t){try{e.File=new Function('class File extends Blob {constructor(chunks, name, opts) {opts = opts || {};super(chunks, opts || {});this.name = name.replace(/\\//g, ":");this.lastModifiedDate = opts.lastModified ? new Date(opts.lastModified) : new Date();this.lastModified = +this.lastModifiedDate;}};return new File([], ""), File')()}catch(t){e.File=function(e,t,r){var o=new Blob(e,r),n=r&&void 0!==r.lastModified?new Date(r.lastModified):new Date;return o.name=t.replace(/\//g,":"),o.lastModifiedDate=n,o.lastModified=+n,o.toString=function(){return"[object File]"},s&&(o[s]="File"),o}}}}u?(b(),e.Blob=f?i.Blob:d):l?(b(),e.Blob=h):function(){function t(e){for(var t=new Array(e.byteLength),r=new Uint8Array(e),o=t.length;o--;)t[o]=r[o];return t}function o(e){for(var t="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=",r=[],o=0;o<e.length;o+=3){var n=e[o],i=o+1<e.length,a=i?e[o+1]:0,s=o+2<e.length,u=s?e[o+2]:0,f=n>>2,l=(3&n)<<4|a>>4,c=(15&a)<<2|u>>6,h=63&u;s||(h=64,i||(c=64)),r.push(t[f],t[l],t[c],t[h])}return r.join("")}var s=Object.create||function(e){function t(){}return t.prototype=e,new t};function u(e){return Object.prototype.toString.call(e).slice(8,-1)}function f(e,t){return"object"==typeof e&&Object.prototype.isPrototypeOf.call(e.prototype,t)}var l=["Int8Array","Uint8Array","Uint8ClampedArray","Int16Array","Uint16Array","Int32Array","Uint32Array","Float32Array","Float64Array","ArrayBuffer"];function c(e){return t=l,r=u(e),-1!==t.indexOf(r)||f(i.ArrayBuffer,e);var t,r}function h(e,r){r=null==r?{}:r;for(var o=0,n=(e=e?e.slice():[]).length;o<n;o++){var a=e[o];a instanceof h?e[o]=a._buffer:"string"==typeof a?e[o]=p(a):"DataView"===u(s=a)||f(i.DataView,s)?e[o]=t(a.buffer):c(a)?e[o]=t(a):e[o]=p(String(a))}var s;this._buffer=i.Uint8Array?function(e){for(var t=0,r=e.length;r--;)t+=e[r].length;for(var o=new Uint8Array(t),n=0,i=0;i<e.length;i++){var a=e[i];o.set(a,n),n+=a.byteLength||a.length}return o}(e):[].concat.apply([],e),this.size=this._buffer.length,this.type=r.type||"",/[^\u0020-\u007E]/.test(this.type)?this.type="":this.type=this.type.toLowerCase()}funcLine truncated
|
||||
(()=>{var e={847(e,t,r){var n,o;n=function(){"use strict";function e(e,t){(null==t||t>e.length)&&(t=e.length);for(var r=0,n=Array(t);r<t;r++)n[r]=e[r];return n}function t(e,t,r){return t=l(t),function(e,t){if(t&&("object"==typeof t||"function"==typeof t))return t;if(void 0!==t)throw new TypeError("Derived constructors may only return object or undefined");return function(e){if(void 0===e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return e}(e)}(e,c()?Reflect.construct(t,r||[],l(e).constructor):t.apply(e,r))}function n(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function o(e,t){for(var r=0;r<t.length;r++){var n=t[r];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(e,f(n.key),n)}}function i(e,t,r){return t&&o(e.prototype,t),r&&o(e,r),Object.defineProperty(e,"prototype",{writable:!1}),e}function a(t,r){var n="undefined"!=typeof Symbol&&t[Symbol.iterator]||t["@@iterator"];if(!n){if(Array.isArray(t)||(n=function(t,r){if(t){if("string"==typeof t)return e(t,r);var n={}.toString.call(t).slice(8,-1);return"Object"===n&&t.constructor&&(n=t.constructor.name),"Map"===n||"Set"===n?Array.from(t):"Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)?e(t,r):void 0}}(t))||r&&t&&"number"==typeof t.length){n&&(t=n);var o=0,i=function(){};return{s:i,n:function(){return o>=t.length?{done:!0}:{done:!1,value:t[o++]}},e:function(e){throw e},f:i}}throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}var a,s=!0,l=!1;return{s:function(){n=n.call(t)},n:function(){var e=n.next();return s=e.done,e},e:function(e){l=!0,a=e},f:function(){try{s||null==n.return||n.return()}finally{if(l)throw a}}}}function s(){return s="undefined"!=typeof Reflect&&Reflect.get?Reflect.get.bind():function(e,t,r){var n=function(e,t){for(;!{}.hasOwnProperty.call(e,t)&&null!==(e=l(e)););return e}(e,t);if(n){var o=Object.getOwnPropertyDescriptor(n,t);return o.get?o.get.call(arguments.length<3?e:r):o.value}},s.apply(null,arguments)}function l(e){return l=Object.setPrototypeOf?Object.getPrototypeOf.bind():function(e){return e.__proto__||Object.getPrototypeOf(e)},l(e)}function c(){try{var e=!Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],function(){}))}catch(e){}return(c=function(){return!!e})()}function u(e,t){return u=Object.setPrototypeOf?Object.setPrototypeOf.bind():function(e,t){return e.__proto__=t,e},u(e,t)}function f(e){var t=function(e,t){if("object"!=typeof e||!e)return e;var r=e[Symbol.toPrimitive];if(void 0!==r){var n=r.call(e,t||"default");if("object"!=typeof n)return n;throw new TypeError("@@toPrimitive must return a primitive value.")}return("string"===t?String:Number)(e)}(e,"string");return"symbol"==typeof t?t:t+""}!function(e){e.AbortSignal,e.AbortController}("undefined"!=typeof self?self:r.g);var p=function(){return i(function e(){n(this,e),Object.defineProperty(this,"listeners",{value:{},writable:!0,configurable:!0})},[{key:"addEventListener",value:function(e,t,r){e in this.listeners||(this.listeners[e]=[]),this.listeners[e].push({callback:t,options:r})}},{key:"removeEventListener",value:function(e,t){if(e in this.listeners)for(var r=this.listeners[e],n=0,o=r.length;n<o;n++)if(r[n].callback===t)return void r.splice(n,1)}},{key:"dispatchEvent",value:function(e){var t=this;if(e.type in this.listeners){for(var r=this.listeners[e.type].slice(),n=function(){var n=r[o];try{n.callback.call(t,e)}catch(e){Promise.resolve().then(function(){throw e})}n.options&&n.options.once&&t.removeEventListener(e.type,n.callback)},o=0,i=r.length;o<i;o++)n();return!e.defaultPrevented}}}])}(),d=function(e){function r(){var e;return n(this,r),(e=t(this,r)).listeners||p.call(e),Object.defineProperty(e,"aborted",{value:!1,writable:!0,configurable:!0}),Object.defineProperty(e,"onabort",{value:null,writable:!0,configurable:!0}),Object.defineProperty(e,"reason",{value:void 0,writable:!0,configurable:!0}),e}return function(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function");e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,writable:!0,configurable:!0}}),Object.defineProperty(e,"prototype",{writable:!1}),t&&u(e,t)}(r,e),i(r,[{key:"toString",value:function(){return"[object AbortSignal]"}},{key:"dispatchEvent",value:function(e){var t,n,o,i,a;"abort"===e.type&&(this.aborted=!0,"function"==typeof this.onabort&&this.onabort.call(this,e)),(t=r,n="dispatchEvent",o=this,a=s(l(1&(i=3)?t.prototype:t),n,o),2&i&&"function"==typeof a?function(e){return a.apply(o,e)}:a)([e])}},{key:"throwIfAborted",value:function(){var e=this.aborted,t=this.reason;if(e)throw void 0===t?"Aborted":t}}],[{key:"timeout",value:function(e){var t=new h;return setTimeout(function(){return t.abort(new DOMException("This signal is timeout in ".concat(e,"ms"),"TimeoutError"))},e),t.signal}},{keLine truncated
|
||||
+893
-2128
File diff suppressed because it is too large.
Load diff
@@ -18,7 +18,9 @@
|
||||
"webpack-cli": "^5.0.1"
|
||||
},
|
||||
"dependencies": {
|
||||
"abortcontroller-polyfill": "^1.7.8",
|
||||
"blob-polyfill": "^7.0.20220408",
|
||||
"event-target-shim": "^6.0.2",
|
||||
"fastestsmallesttextencoderdecoder": "^1.0.22",
|
||||
"whatwg-fetch": "^3.6.20"
|
||||
}
|
||||
|
||||
@@ -0,0 +1,2 @@
|
||||
import "../event/index.js";
|
||||
import "abortcontroller-polyfill/dist/abortcontroller-polyfill-only.js";
|
||||
@@ -0,0 +1,9 @@
|
||||
import { Event, EventTarget } from "event-target-shim";
|
||||
|
||||
if (typeof globalThis.Event !== "function") {
|
||||
globalThis.Event = Event;
|
||||
}
|
||||
|
||||
if (typeof globalThis.EventTarget !== "function") {
|
||||
globalThis.EventTarget = EventTarget;
|
||||
}
|
||||
@@ -1,5 +1,7 @@
|
||||
import "./event/index.js"
|
||||
import "./abort/index.js"
|
||||
import "./blob/index.js"
|
||||
import "./crypto/index.js"
|
||||
// polyfill TextEncoder
|
||||
import 'fastestsmallesttextencoderdecoder';
|
||||
import "./fetch/index.js"
|
||||
import "./fetch/index.js"
|
||||
@@ -0,0 +1,20 @@
|
||||
package webview
|
||||
|
||||
type Provider interface {
|
||||
IsAvailable() bool
|
||||
Open(opts OpenOptions) (Page, error)
|
||||
}
|
||||
|
||||
type unavailableProvider struct{}
|
||||
|
||||
func NewUnavailableProvider() Provider {
|
||||
return unavailableProvider{}
|
||||
}
|
||||
|
||||
func (unavailableProvider) IsAvailable() bool {
|
||||
return false
|
||||
}
|
||||
|
||||
func (unavailableProvider) Open(OpenOptions) (Page, error) {
|
||||
return nil, ErrUnavailable
|
||||
}
|
||||
@@ -0,0 +1,143 @@
|
||||
package webview
|
||||
|
||||
import "encoding/json"
|
||||
|
||||
const RPCEndpointPath = "/webview"
|
||||
|
||||
const (
|
||||
MethodIsAvailable = "webview.isAvailable"
|
||||
MethodPageOpen = "page.open"
|
||||
MethodPageAddInitScript = "page.addInitScript"
|
||||
MethodPageGoto = "page.goto"
|
||||
MethodPageExecute = "page.execute"
|
||||
MethodPageGetCookies = "page.getCookies"
|
||||
MethodPageSetCookie = "page.setCookie"
|
||||
MethodPageDeleteCookie = "page.deleteCookie"
|
||||
MethodPageClearCookies = "page.clearCookies"
|
||||
MethodPageClose = "page.close"
|
||||
)
|
||||
|
||||
const (
|
||||
ErrorCodeInvalidRequest = "INVALID_REQUEST"
|
||||
ErrorCodeUnknownMethod = "UNKNOWN_METHOD"
|
||||
ErrorCodeUnavailable = "UNAVAILABLE"
|
||||
ErrorCodeBrowserNotFound = "BROWSER_NOT_FOUND"
|
||||
ErrorCodePageNotFound = "PAGE_NOT_FOUND"
|
||||
ErrorCodeNavigationFailed = "NAVIGATION_FAILED"
|
||||
ErrorCodeEvaluationFailed = "EVALUATION_FAILED"
|
||||
ErrorCodeTimeout = "TIMEOUT"
|
||||
ErrorCodeInternal = "INTERNAL_ERROR"
|
||||
)
|
||||
|
||||
type RPCConfig struct {
|
||||
Network string `json:"network"`
|
||||
Address string `json:"address"`
|
||||
Token string `json:"token,omitempty"`
|
||||
}
|
||||
|
||||
func (c RPCConfig) Enabled() bool {
|
||||
return c.Network != "" && c.Address != ""
|
||||
}
|
||||
|
||||
type RPCRequest struct {
|
||||
Method string `json:"method"`
|
||||
Params any `json:"params"`
|
||||
}
|
||||
|
||||
type RPCResponse struct {
|
||||
Result json.RawMessage `json:"result"`
|
||||
Error *RPCError `json:"error"`
|
||||
}
|
||||
|
||||
type RPCError struct {
|
||||
Code string `json:"code"`
|
||||
Message string `json:"message"`
|
||||
}
|
||||
|
||||
func (e *RPCError) Error() string {
|
||||
if e == nil {
|
||||
return ""
|
||||
}
|
||||
return e.Message
|
||||
}
|
||||
|
||||
type IsAvailableParams struct{}
|
||||
|
||||
type IsAvailableResult struct {
|
||||
Available bool `json:"available"`
|
||||
}
|
||||
|
||||
type PageOpenParams struct {
|
||||
Headless bool `json:"headless,omitempty"`
|
||||
Debug bool `json:"debug,omitempty"`
|
||||
Title string `json:"title,omitempty"`
|
||||
Width int `json:"width,omitempty"`
|
||||
Height int `json:"height,omitempty"`
|
||||
UserAgent string `json:"userAgent,omitempty"`
|
||||
}
|
||||
|
||||
func NewPageOpenParams(opts OpenOptions) PageOpenParams {
|
||||
return PageOpenParams{
|
||||
Headless: opts.Headless,
|
||||
Debug: opts.Debug,
|
||||
Title: opts.Title,
|
||||
Width: opts.Width,
|
||||
Height: opts.Height,
|
||||
UserAgent: opts.UserAgent,
|
||||
}
|
||||
}
|
||||
|
||||
type PageOpenResult struct {
|
||||
PageID string `json:"pageId"`
|
||||
}
|
||||
|
||||
type PageAddInitScriptParams struct {
|
||||
PageID string `json:"pageId"`
|
||||
Script string `json:"script"`
|
||||
}
|
||||
|
||||
type PageGotoParams struct {
|
||||
PageID string `json:"pageId"`
|
||||
URL string `json:"url"`
|
||||
TimeoutMS int64 `json:"timeoutMs,omitempty"`
|
||||
WaitUntil string `json:"waitUntil,omitempty"`
|
||||
}
|
||||
|
||||
func NewPageGotoParams(pageID string, url string, opts GotoOptions) PageGotoParams {
|
||||
return PageGotoParams{
|
||||
PageID: pageID,
|
||||
URL: url,
|
||||
TimeoutMS: opts.TimeoutMS,
|
||||
WaitUntil: opts.WaitUntil,
|
||||
}
|
||||
}
|
||||
|
||||
type PageExecuteParams struct {
|
||||
PageID string `json:"pageId"`
|
||||
Expression string `json:"expression"`
|
||||
Args []any `json:"args,omitempty"`
|
||||
}
|
||||
|
||||
type PageGetCookiesParams struct {
|
||||
PageID string `json:"pageId"`
|
||||
}
|
||||
|
||||
type PageSetCookieParams struct {
|
||||
PageID string `json:"pageId"`
|
||||
Cookie Cookie `json:"cookie"`
|
||||
}
|
||||
|
||||
type PageDeleteCookieParams struct {
|
||||
PageID string `json:"pageId"`
|
||||
Cookie Cookie `json:"cookie"`
|
||||
}
|
||||
|
||||
type PageClearCookiesParams struct {
|
||||
PageID string `json:"pageId"`
|
||||
}
|
||||
|
||||
type PageCloseParams struct {
|
||||
PageID string `json:"pageId"`
|
||||
}
|
||||
|
||||
type EmptyResult struct{}
|
||||
File diff suppressed because it is too large.
Load diff
@@ -0,0 +1,338 @@
|
||||
package webview
|
||||
|
||||
import (
|
||||
"strings"
|
||||
"testing"
|
||||
|
||||
"github.com/dop251/goja"
|
||||
)
|
||||
|
||||
func TestRuntimeOpenAndExecuteFunctionSource(t *testing.T) {
|
||||
opener := &fakeOpener{
|
||||
page: &fakePage{executeValue: "ok"},
|
||||
}
|
||||
runtime := NewRuntime(opener, true)
|
||||
page, err := runtime.Open(map[string]any{
|
||||
"headless": true,
|
||||
"debug": true,
|
||||
"title": "Gopeed",
|
||||
"width": 1280,
|
||||
"height": 720,
|
||||
"userAgent": "UA",
|
||||
})
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
vm := goja.New()
|
||||
fnValue, err := vm.RunString(`(a, b) => a + b`)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
value, err := page.Execute(fnValue, int64(1), int64(2))
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if value != "ok" {
|
||||
t.Fatalf("unexpected execute result: %#v", value)
|
||||
}
|
||||
if opener.opts.Title != "Gopeed" || opener.opts.UserAgent != "UA" {
|
||||
t.Fatalf("unexpected open options: %+v", opener.opts)
|
||||
}
|
||||
if opener.page.lastExecuteSource != "((a, b) => a + b)" {
|
||||
t.Fatalf("unexpected function source: %q", opener.page.lastExecuteSource)
|
||||
}
|
||||
if len(opener.page.lastExecuteArgs) != 2 || opener.page.lastExecuteArgs[0] != int64(1) || opener.page.lastExecuteArgs[1] != int64(2) {
|
||||
t.Fatalf("unexpected execute args: %#v", opener.page.lastExecuteArgs)
|
||||
}
|
||||
}
|
||||
|
||||
func TestRuntimeExecuteRepairsObjectLiteralArrowFunction(t *testing.T) {
|
||||
opener := &fakeOpener{
|
||||
page: &fakePage{executeValue: map[string]any{"ok": true}},
|
||||
}
|
||||
runtime := NewRuntime(opener, true)
|
||||
page, err := runtime.Open()
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
vm := goja.New()
|
||||
fnValue, err := vm.RunString(`() => ({ ok: true })`)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if _, err := page.Execute(fnValue); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if opener.page.lastExecuteSource != "(() => ({ ok: true }))" {
|
||||
t.Fatalf("expected repaired function source, got %q", opener.page.lastExecuteSource)
|
||||
}
|
||||
}
|
||||
|
||||
func TestRuntimeExecuteRepairsMultilineObjectLiteralArrowFunction(t *testing.T) {
|
||||
opener := &fakeOpener{
|
||||
page: &fakePage{executeValue: map[string]any{"ok": true}},
|
||||
}
|
||||
runtime := NewRuntime(opener, true)
|
||||
page, err := runtime.Open()
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
vm := goja.New()
|
||||
fnValue, err := vm.RunString(`() => ({
|
||||
title: document.title || "",
|
||||
url: String(location.href || ""),
|
||||
userAgent: navigator.userAgent,
|
||||
readyState: document.readyState,
|
||||
})`)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if _, err := page.Execute(fnValue); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
expected := `(() => ({
|
||||
title: document.title || "",
|
||||
url: String(location.href || ""),
|
||||
userAgent: navigator.userAgent,
|
||||
readyState: document.readyState,
|
||||
}))`
|
||||
if opener.page.lastExecuteSource != expected {
|
||||
t.Fatalf("expected repaired multiline function source, got %q", opener.page.lastExecuteSource)
|
||||
}
|
||||
}
|
||||
|
||||
func TestRuntimeHelpers(t *testing.T) {
|
||||
opener := &fakeOpener{
|
||||
page: &fakePage{
|
||||
executeQueue: []any{
|
||||
false,
|
||||
true,
|
||||
map[string]any{"matched": false, "value": nil},
|
||||
map[string]any{"matched": true, "value": "ready"},
|
||||
"https://example.com",
|
||||
"<html></html>",
|
||||
},
|
||||
cookies: []Cookie{
|
||||
{Name: "a", Value: "1", Domain: "example.com", Path: "/"},
|
||||
{Name: "b", Value: "two", Domain: "example.com", Path: "/"},
|
||||
},
|
||||
},
|
||||
}
|
||||
runtime := NewRuntime(opener, true)
|
||||
page, err := runtime.Open()
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := page.AddInitScript("window.__TEST__ = true"); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if opener.page.lastInitScript != "window.__TEST__ = true" {
|
||||
t.Fatalf("unexpected init script: %q", opener.page.lastInitScript)
|
||||
}
|
||||
if err := page.Goto("https://example.com", map[string]any{"waitUntil": "domcontentloaded"}); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if opener.page.lastGotoURL != "https://example.com" {
|
||||
t.Fatalf("unexpected goto url: %q", opener.page.lastGotoURL)
|
||||
}
|
||||
if opener.page.lastGotoOpts.WaitUntil != "domcontentloaded" {
|
||||
t.Fatalf("unexpected goto waitUntil: %q", opener.page.lastGotoOpts.WaitUntil)
|
||||
}
|
||||
found, err := page.WaitForSelector("#app", map[string]any{"timeoutMs": 50, "pollIntervalMs": 1})
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if !found {
|
||||
t.Fatal("expected selector to be found")
|
||||
}
|
||||
value, err := page.WaitForFunction(`() => window.__READY__`, map[string]any{"timeoutMs": 50, "pollIntervalMs": 1})
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if value != "ready" {
|
||||
t.Fatalf("unexpected waitForFunction value: %#v", value)
|
||||
}
|
||||
cookies, err := page.GetCookies()
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if len(cookies) != 2 || cookies[0].Name != "a" || cookies[0].Value != "1" || cookies[1].Name != "b" || cookies[1].Value != "two" {
|
||||
t.Fatalf("unexpected cookies: %#v", cookies)
|
||||
}
|
||||
if err := page.SetCookie(map[string]any{
|
||||
"name": "session",
|
||||
"value": "abc",
|
||||
"domain": "example.com",
|
||||
"path": "/",
|
||||
"secure": true,
|
||||
"httpOnly": true,
|
||||
}); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if opener.page.lastSetCookie.Name != "session" || !opener.page.lastSetCookie.Secure || !opener.page.lastSetCookie.HTTPOnly {
|
||||
t.Fatalf("unexpected set cookie: %#v", opener.page.lastSetCookie)
|
||||
}
|
||||
if err := page.DeleteCookie(map[string]any{
|
||||
"name": "session",
|
||||
"domain": "example.com",
|
||||
"path": "/",
|
||||
}); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if opener.page.lastDeleteCookie.Name != "session" || opener.page.lastDeleteCookie.Domain != "example.com" {
|
||||
t.Fatalf("unexpected delete cookie: %#v", opener.page.lastDeleteCookie)
|
||||
}
|
||||
if err := page.ClearCookies(); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if !opener.page.cookiesCleared {
|
||||
t.Fatal("expected cookies to be cleared")
|
||||
}
|
||||
url, err := page.URL()
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if url != "https://example.com" {
|
||||
t.Fatalf("unexpected url: %q", url)
|
||||
}
|
||||
content, err := page.Content()
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if content != "<html></html>" {
|
||||
t.Fatalf("unexpected content: %q", content)
|
||||
}
|
||||
if err := page.Close(); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if !opener.page.closed {
|
||||
t.Fatal("expected page to be closed")
|
||||
}
|
||||
}
|
||||
|
||||
func TestRuntimeInteractionHelpers(t *testing.T) {
|
||||
opener := &fakeOpener{
|
||||
page: &fakePage{executeValue: true},
|
||||
}
|
||||
runtime := NewRuntime(opener, true)
|
||||
page, err := runtime.Open()
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
if err := page.Focus("#search"); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if len(opener.page.lastExecuteArgs) != 1 || opener.page.lastExecuteArgs[0] != "#search" {
|
||||
t.Fatalf("unexpected focus args: %#v", opener.page.lastExecuteArgs)
|
||||
}
|
||||
if !strings.Contains(opener.page.lastExecuteSource, "element.focus()") {
|
||||
t.Fatalf("unexpected focus source: %q", opener.page.lastExecuteSource)
|
||||
}
|
||||
|
||||
if err := page.Click("#submit", map[string]any{"delay": 12}); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if len(opener.page.lastExecuteArgs) != 2 || opener.page.lastExecuteArgs[0] != "#submit" || opener.page.lastExecuteArgs[1] != int64(12) {
|
||||
t.Fatalf("unexpected click args: %#v", opener.page.lastExecuteArgs)
|
||||
}
|
||||
if !strings.Contains(opener.page.lastExecuteSource, "performClick") {
|
||||
t.Fatalf("unexpected click source: %q", opener.page.lastExecuteSource)
|
||||
}
|
||||
|
||||
if err := page.Type("#search", "Gopeed", map[string]any{"delay": 5}); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if len(opener.page.lastExecuteArgs) != 3 || opener.page.lastExecuteArgs[0] != "#search" || opener.page.lastExecuteArgs[1] != "Gopeed" || opener.page.lastExecuteArgs[2] != int64(5) {
|
||||
t.Fatalf("unexpected type args: %#v", opener.page.lastExecuteArgs)
|
||||
}
|
||||
if !strings.Contains(opener.page.lastExecuteSource, "element is not typable") {
|
||||
t.Fatalf("unexpected type source: %q", opener.page.lastExecuteSource)
|
||||
}
|
||||
}
|
||||
|
||||
func TestRuntimeGotoRejectsInvalidWaitUntil(t *testing.T) {
|
||||
opener := &fakeOpener{
|
||||
page: &fakePage{},
|
||||
}
|
||||
runtime := NewRuntime(opener, true)
|
||||
page, err := runtime.Open()
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
err = page.Goto("https://example.com", map[string]any{"waitUntil": "networkidle"})
|
||||
if err == nil || !strings.Contains(err.Error(), "invalid waitUntil") {
|
||||
t.Fatalf("unexpected error: %v", err)
|
||||
}
|
||||
}
|
||||
|
||||
type fakeOpener struct {
|
||||
opts OpenOptions
|
||||
page *fakePage
|
||||
}
|
||||
|
||||
func (o *fakeOpener) Open(opts OpenOptions) (Page, error) {
|
||||
o.opts = opts
|
||||
return o.page, nil
|
||||
}
|
||||
|
||||
type fakePage struct {
|
||||
lastInitScript string
|
||||
lastGotoURL string
|
||||
lastGotoOpts GotoOptions
|
||||
lastExecuteSource string
|
||||
lastExecuteArgs []any
|
||||
executeValue any
|
||||
executeQueue []any
|
||||
cookies []Cookie
|
||||
lastSetCookie Cookie
|
||||
lastDeleteCookie Cookie
|
||||
cookiesCleared bool
|
||||
closed bool
|
||||
}
|
||||
|
||||
func (p *fakePage) AddInitScript(script string) error {
|
||||
p.lastInitScript = script
|
||||
return nil
|
||||
}
|
||||
|
||||
func (p *fakePage) Goto(url string, opts GotoOptions) error {
|
||||
p.lastGotoURL = url
|
||||
p.lastGotoOpts = opts
|
||||
return nil
|
||||
}
|
||||
|
||||
func (p *fakePage) Execute(expression string, args ...any) (any, error) {
|
||||
p.lastExecuteSource = expression
|
||||
p.lastExecuteArgs = args
|
||||
if len(p.executeQueue) > 0 {
|
||||
value := p.executeQueue[0]
|
||||
p.executeQueue = p.executeQueue[1:]
|
||||
return value, nil
|
||||
}
|
||||
return p.executeValue, nil
|
||||
}
|
||||
|
||||
func (p *fakePage) GetCookies() ([]Cookie, error) {
|
||||
return append([]Cookie(nil), p.cookies...), nil
|
||||
}
|
||||
|
||||
func (p *fakePage) SetCookie(cookie Cookie) error {
|
||||
p.lastSetCookie = cookie
|
||||
return nil
|
||||
}
|
||||
|
||||
func (p *fakePage) DeleteCookie(cookie Cookie) error {
|
||||
p.lastDeleteCookie = cookie
|
||||
return nil
|
||||
}
|
||||
|
||||
func (p *fakePage) ClearCookies() error {
|
||||
p.cookiesCleared = true
|
||||
return nil
|
||||
}
|
||||
|
||||
func (p *fakePage) Close() error {
|
||||
p.closed = true
|
||||
return nil
|
||||
}
|
||||
+36
-12
@@ -13,8 +13,10 @@ import (
|
||||
|
||||
"github.com/GopeedLab/gopeed/internal/logger"
|
||||
"github.com/GopeedLab/gopeed/pkg/base"
|
||||
"github.com/GopeedLab/gopeed/pkg/download/engine"
|
||||
gojaerror "github.com/GopeedLab/gopeed/pkg/download/engine/inject/error"
|
||||
gojautil "github.com/GopeedLab/gopeed/pkg/download/engine/util"
|
||||
enginewebview "github.com/GopeedLab/gopeed/pkg/download/engine/webview"
|
||||
"github.com/GopeedLab/gopeed/pkg/util"
|
||||
"github.com/dop251/goja"
|
||||
"github.com/go-git/go-git/v5"
|
||||
@@ -269,6 +271,7 @@ func (d *Downloader) triggerOnResolve(req *base.Request) (res *base.Resource, er
|
||||
}
|
||||
ensureResourceRequestRawURLs(req, ctx.Res)
|
||||
ctx.Res.CalcSize(nil)
|
||||
d.applyGBlobResourceMetadata(ctx.Res)
|
||||
}
|
||||
res = ctx.Res
|
||||
},
|
||||
@@ -276,6 +279,19 @@ func (d *Downloader) triggerOnResolve(req *base.Request) (res *base.Resource, er
|
||||
return
|
||||
}
|
||||
|
||||
func (d *Downloader) applyGBlobResourceMetadata(res *base.Resource) {
|
||||
if d.gblob == nil || res == nil {
|
||||
return
|
||||
}
|
||||
for _, file := range res.Files {
|
||||
if file == nil || file.Req == nil {
|
||||
continue
|
||||
}
|
||||
_ = d.gblob.SetSize(file.Req.URL, file.Size)
|
||||
_ = d.gblob.SetRange(file.Req.URL, res.Range)
|
||||
}
|
||||
}
|
||||
|
||||
func (d *Downloader) triggerOnStart(task *Task) {
|
||||
doTrigger(d,
|
||||
EventOnStart,
|
||||
@@ -363,7 +379,10 @@ func doTrigger[T any](d *Downloader, event ActivationEvent, req *base.Request, c
|
||||
}
|
||||
engine, session := d.newExtensionEngine()
|
||||
defer session.CloseIfIdle()
|
||||
err = engine.Runtime.Set("gopeed", gopeed)
|
||||
gopeed.Runtime = &InstanceRuntime{
|
||||
WebView: d.newExtensionWebViewRuntime(session),
|
||||
}
|
||||
err = injectGopeed(engine.Runtime, gopeed)
|
||||
if err != nil {
|
||||
gopeed.Logger.logger.Error().Err(err).Msgf("[%s] engine inject failed", ext.buildIdentity())
|
||||
return
|
||||
@@ -603,32 +622,37 @@ type Option struct {
|
||||
|
||||
// Instance inject to js context when extension script is activated
|
||||
type Instance struct {
|
||||
Events InstanceEvents `json:"events"`
|
||||
Info *ExtensionInfo `json:"info"`
|
||||
Logger *InstanceLogger `json:"logger"`
|
||||
Settings map[string]any `json:"settings"`
|
||||
Storage *ContextStorage `json:"storage"`
|
||||
Events InstanceEvents `json:"events"`
|
||||
Info *ExtensionInfo `json:"info"`
|
||||
Logger *InstanceLogger `json:"logger"`
|
||||
Settings map[string]any `json:"settings"`
|
||||
Storage *ContextStorage `json:"storage"`
|
||||
Runtime *InstanceRuntime `json:"runtime"`
|
||||
}
|
||||
|
||||
type InstanceEvents map[ActivationEvent]goja.Callable
|
||||
type InstanceRuntime struct {
|
||||
WebView *enginewebview.Runtime `json:"webview"`
|
||||
}
|
||||
|
||||
func (h InstanceEvents) register(name ActivationEvent, fn goja.Callable) {
|
||||
type InstanceEvents map[ActivationEvent]engine.JSFunction
|
||||
|
||||
func (h InstanceEvents) register(name ActivationEvent, fn engine.JSFunction) {
|
||||
h[name] = fn
|
||||
}
|
||||
|
||||
func (h InstanceEvents) OnResolve(fn goja.Callable) {
|
||||
func (h InstanceEvents) OnResolve(fn engine.JSFunction) {
|
||||
h.register(EventOnResolve, fn)
|
||||
}
|
||||
|
||||
func (h InstanceEvents) OnStart(fn goja.Callable) {
|
||||
func (h InstanceEvents) OnStart(fn engine.JSFunction) {
|
||||
h.register(EventOnStart, fn)
|
||||
}
|
||||
|
||||
func (h InstanceEvents) OnError(fn goja.Callable) {
|
||||
func (h InstanceEvents) OnError(fn engine.JSFunction) {
|
||||
h.register(EventOnError, fn)
|
||||
}
|
||||
|
||||
func (h InstanceEvents) OnDone(fn goja.Callable) {
|
||||
func (h InstanceEvents) OnDone(fn engine.JSFunction) {
|
||||
h.register(EventOnDone, fn)
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,75 @@
|
||||
package download
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"os"
|
||||
)
|
||||
|
||||
type extensionEngineRunner interface {
|
||||
Close()
|
||||
RunString(script string) (any, error)
|
||||
}
|
||||
|
||||
type ExtensionEngine struct {
|
||||
engine extensionEngineRunner
|
||||
session *engineSession
|
||||
}
|
||||
|
||||
func (d *Downloader) NewExtensionEngine(ext *Extension, settings map[string]any) (*ExtensionEngine, error) {
|
||||
if ext == nil {
|
||||
return nil, fmt.Errorf("extension is nil")
|
||||
}
|
||||
engine, session := d.newExtensionEngine()
|
||||
gopeed := &Instance{
|
||||
Events: make(InstanceEvents),
|
||||
Info: NewExtensionInfo(ext),
|
||||
Logger: newInstanceLogger(ext, d.ExtensionLogger),
|
||||
Settings: settings,
|
||||
Storage: &ContextStorage{
|
||||
storage: d.storage,
|
||||
identity: ext.buildIdentity(),
|
||||
},
|
||||
Runtime: &InstanceRuntime{
|
||||
WebView: d.newExtensionWebViewRuntime(session),
|
||||
},
|
||||
}
|
||||
if err := injectGopeed(engine.Runtime, gopeed); err != nil {
|
||||
session.CloseIfIdle()
|
||||
return nil, err
|
||||
}
|
||||
return &ExtensionEngine{
|
||||
engine: engine,
|
||||
session: session,
|
||||
}, nil
|
||||
}
|
||||
|
||||
func (r *ExtensionEngine) Eval(script string) (any, error) {
|
||||
if r == nil || r.engine == nil {
|
||||
return nil, fmt.Errorf("extension engine not initialized")
|
||||
}
|
||||
return r.engine.RunString(script)
|
||||
}
|
||||
|
||||
func (r *ExtensionEngine) EvalFile(path string) (any, error) {
|
||||
if path == "" {
|
||||
return nil, fmt.Errorf("script path is empty")
|
||||
}
|
||||
buf, err := os.ReadFile(path)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return r.Eval(string(buf))
|
||||
}
|
||||
|
||||
func (r *ExtensionEngine) Close() {
|
||||
if r == nil {
|
||||
return
|
||||
}
|
||||
if r.session != nil {
|
||||
r.session.CloseIfIdle()
|
||||
} else if r.engine != nil {
|
||||
r.engine.Close()
|
||||
}
|
||||
r.engine = nil
|
||||
r.session = nil
|
||||
}
|
||||
@@ -4,8 +4,10 @@ import (
|
||||
"fmt"
|
||||
"sync"
|
||||
|
||||
"github.com/GopeedLab/gopeed/internal/protocol/gblob"
|
||||
"github.com/GopeedLab/gopeed/pkg/download/engine"
|
||||
"github.com/GopeedLab/gopeed/pkg/download/engine/inject/stream"
|
||||
enginewebview "github.com/GopeedLab/gopeed/pkg/download/engine/webview"
|
||||
"github.com/dop251/goja"
|
||||
)
|
||||
|
||||
@@ -15,6 +17,7 @@ type engineSession struct {
|
||||
mu sync.Mutex
|
||||
refs int
|
||||
closed bool
|
||||
close []func()
|
||||
}
|
||||
|
||||
func newEngineSession(e *engine.Engine) *engineSession {
|
||||
@@ -47,6 +50,7 @@ func (s *engineSession) Release() {
|
||||
}
|
||||
s.mu.Unlock()
|
||||
if shouldClose {
|
||||
s.runClosers()
|
||||
if s.engine != nil {
|
||||
go s.engine.Close()
|
||||
}
|
||||
@@ -61,12 +65,37 @@ func (s *engineSession) CloseIfIdle() {
|
||||
}
|
||||
s.mu.Unlock()
|
||||
if shouldClose {
|
||||
s.runClosers()
|
||||
if s.engine != nil {
|
||||
s.engine.Close()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func (s *engineSession) OnClose(fn func()) {
|
||||
if fn == nil {
|
||||
return
|
||||
}
|
||||
s.mu.Lock()
|
||||
if s.closed {
|
||||
s.mu.Unlock()
|
||||
fn()
|
||||
return
|
||||
}
|
||||
s.close = append(s.close, fn)
|
||||
s.mu.Unlock()
|
||||
}
|
||||
|
||||
func (s *engineSession) runClosers() {
|
||||
s.mu.Lock()
|
||||
closeFns := s.close
|
||||
s.close = nil
|
||||
s.mu.Unlock()
|
||||
for _, fn := range closeFns {
|
||||
fn()
|
||||
}
|
||||
}
|
||||
|
||||
func normalizeStreamChunk(data any) ([]byte, error) {
|
||||
switch v := data.(type) {
|
||||
case nil:
|
||||
@@ -88,8 +117,18 @@ func (d *Downloader) newExtensionEngine() (*engine.Engine, *engineSession) {
|
||||
CreateBlobObjectURL: func(data []byte, contentType string) (string, error) {
|
||||
return d.gblob.CreateBlob(data, contentType)
|
||||
},
|
||||
CreateWritableStreamObjectURL: func() (string, error) {
|
||||
return d.gblob.CreateWritableStream(session)
|
||||
CreateWritableStreamObjectURL: func(opts *stream.WritableStreamObjectURLOptions) (string, error) {
|
||||
reopenable := false
|
||||
if opts != nil {
|
||||
reopenable = opts.Reopenable
|
||||
}
|
||||
return d.gblob.CreateWritableStream(&gblob.CreateWritableStreamOptions{
|
||||
Session: session,
|
||||
Reopenable: reopenable,
|
||||
})
|
||||
},
|
||||
RegisterWritableStreamResume: func(url string, reopen func(offset int64) error) error {
|
||||
return d.gblob.SetResumeOpener(url, reopen)
|
||||
},
|
||||
WriteWritableStreamObjectURL: func(url string, data any) error {
|
||||
chunk, err := normalizeStreamChunk(data)
|
||||
@@ -107,6 +146,7 @@ func (d *Downloader) newExtensionEngine() (*engine.Engine, *engineSession) {
|
||||
RevokeObjectURL: func(url string) error {
|
||||
return d.gblob.Revoke(url)
|
||||
},
|
||||
ProxyHandler: d.cfg.Proxy.ToHandler(),
|
||||
}
|
||||
e := engine.NewEngine(&engine.Config{
|
||||
ProxyConfig: d.cfg.Proxy,
|
||||
@@ -115,3 +155,19 @@ func (d *Downloader) newExtensionEngine() (*engine.Engine, *engineSession) {
|
||||
session.SetEngine(e)
|
||||
return e, session
|
||||
}
|
||||
|
||||
func (d *Downloader) newExtensionWebViewRuntime(session *engineSession) *enginewebview.Runtime {
|
||||
var (
|
||||
opener enginewebview.Opener
|
||||
available bool
|
||||
)
|
||||
if provider := d.cfg.WebViewProvider; provider != nil && provider.IsAvailable() {
|
||||
opener = provider
|
||||
available = true
|
||||
}
|
||||
runtime := enginewebview.NewRuntime(opener, available)
|
||||
session.OnClose(func() {
|
||||
_ = runtime.Close()
|
||||
})
|
||||
return runtime
|
||||
}
|
||||
@@ -0,0 +1,258 @@
|
||||
package download
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
|
||||
"github.com/GopeedLab/gopeed/pkg/download/engine"
|
||||
enginewebview "github.com/GopeedLab/gopeed/pkg/download/engine/webview"
|
||||
"github.com/dop251/goja"
|
||||
)
|
||||
|
||||
func injectGopeed(vm *goja.Runtime, gopeed *Instance) error {
|
||||
gopeedObject := vm.NewObject()
|
||||
if gopeed == nil {
|
||||
return vm.Set("gopeed", gopeedObject)
|
||||
}
|
||||
if err := gopeedObject.Set("events", newJSEventsRuntime(vm, gopeed.Events)); err != nil {
|
||||
return err
|
||||
}
|
||||
if err := gopeedObject.Set("info", gopeed.Info); err != nil {
|
||||
return err
|
||||
}
|
||||
if err := gopeedObject.Set("logger", gopeed.Logger); err != nil {
|
||||
return err
|
||||
}
|
||||
if err := gopeedObject.Set("settings", gopeed.Settings); err != nil {
|
||||
return err
|
||||
}
|
||||
if err := gopeedObject.Set("storage", gopeed.Storage); err != nil {
|
||||
return err
|
||||
}
|
||||
runtimeObject := vm.NewObject()
|
||||
if gopeed.Runtime != nil && gopeed.Runtime.WebView != nil {
|
||||
if err := runtimeObject.Set("webview", newJSWebViewRuntime(vm, gopeed.Runtime.WebView)); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
if err := gopeedObject.Set("runtime", runtimeObject); err != nil {
|
||||
return err
|
||||
}
|
||||
return vm.Set("gopeed", gopeedObject)
|
||||
}
|
||||
|
||||
func newJSEventsRuntime(vm *goja.Runtime, events InstanceEvents) *goja.Object {
|
||||
obj := vm.NewObject()
|
||||
register := func(event ActivationEvent, call goja.FunctionCall) goja.Value {
|
||||
if len(call.Arguments) == 0 {
|
||||
panic(vm.ToValue(fmt.Errorf("missing handler")))
|
||||
}
|
||||
fnValue := call.Argument(0)
|
||||
exported, ok := fnValue.Export().(func(goja.FunctionCall) goja.Value)
|
||||
if !ok {
|
||||
panic(vm.ToValue(fmt.Errorf("handler must be a function")))
|
||||
}
|
||||
events.register(event, engine.JSFunction(exported))
|
||||
return goja.Undefined()
|
||||
}
|
||||
_ = obj.Set("onResolve", func(call goja.FunctionCall) goja.Value {
|
||||
return register(EventOnResolve, call)
|
||||
})
|
||||
_ = obj.Set("onStart", func(call goja.FunctionCall) goja.Value {
|
||||
return register(EventOnStart, call)
|
||||
})
|
||||
_ = obj.Set("onError", func(call goja.FunctionCall) goja.Value {
|
||||
return register(EventOnError, call)
|
||||
})
|
||||
_ = obj.Set("onDone", func(call goja.FunctionCall) goja.Value {
|
||||
return register(EventOnDone, call)
|
||||
})
|
||||
return obj
|
||||
}
|
||||
|
||||
func newJSWebViewRuntime(vm *goja.Runtime, runtime *enginewebview.Runtime) *goja.Object {
|
||||
obj := vm.NewObject()
|
||||
_ = obj.Set("isAvailable", func(goja.FunctionCall) goja.Value {
|
||||
return vm.ToValue(runtime.IsAvailable())
|
||||
})
|
||||
_ = obj.Set("open", func(call goja.FunctionCall) goja.Value {
|
||||
page, err := runtime.Open(optionalMap(call.Argument(0)))
|
||||
if err != nil {
|
||||
panic(vm.ToValue(err))
|
||||
}
|
||||
return newJSWebViewPage(vm, page)
|
||||
})
|
||||
return obj
|
||||
}
|
||||
|
||||
func newJSWebViewPage(vm *goja.Runtime, page *enginewebview.PageHandle) *goja.Object {
|
||||
obj := vm.NewObject()
|
||||
_ = obj.Set("addInitScript", func(call goja.FunctionCall) goja.Value {
|
||||
script, err := requireStringArg(call, 0, "script")
|
||||
if err != nil {
|
||||
panic(vm.ToValue(err))
|
||||
}
|
||||
if err := page.AddInitScript(script); err != nil {
|
||||
panic(vm.ToValue(err))
|
||||
}
|
||||
return goja.Undefined()
|
||||
})
|
||||
_ = obj.Set("goto", func(call goja.FunctionCall) goja.Value {
|
||||
url, err := requireStringArg(call, 0, "url")
|
||||
if err != nil {
|
||||
panic(vm.ToValue(err))
|
||||
}
|
||||
if err := page.Goto(
|
||||
url,
|
||||
optionalMap(call.Argument(1)),
|
||||
); err != nil {
|
||||
panic(vm.ToValue(err))
|
||||
}
|
||||
return goja.Undefined()
|
||||
})
|
||||
_ = obj.Set("execute", func(call goja.FunctionCall) goja.Value {
|
||||
expression, err := enginewebview.NormalizeExecutableValue(call.Argument(0))
|
||||
if err != nil {
|
||||
panic(vm.ToValue(err))
|
||||
}
|
||||
result, err := page.Execute(expression, exportArgs(call.Arguments[1:])...)
|
||||
if err != nil {
|
||||
panic(vm.ToValue(err))
|
||||
}
|
||||
return vm.ToValue(result)
|
||||
})
|
||||
_ = obj.Set("focus", func(call goja.FunctionCall) goja.Value {
|
||||
selector, err := requireStringArg(call, 0, "selector")
|
||||
if err != nil {
|
||||
panic(vm.ToValue(err))
|
||||
}
|
||||
if err := page.Focus(selector); err != nil {
|
||||
panic(vm.ToValue(err))
|
||||
}
|
||||
return goja.Undefined()
|
||||
})
|
||||
_ = obj.Set("click", func(call goja.FunctionCall) goja.Value {
|
||||
selector, err := requireStringArg(call, 0, "selector")
|
||||
if err != nil {
|
||||
panic(vm.ToValue(err))
|
||||
}
|
||||
if err := page.Click(selector, optionalMap(call.Argument(1))); err != nil {
|
||||
panic(vm.ToValue(err))
|
||||
}
|
||||
return goja.Undefined()
|
||||
})
|
||||
_ = obj.Set("type", func(call goja.FunctionCall) goja.Value {
|
||||
selector, err := requireStringArg(call, 0, "selector")
|
||||
if err != nil {
|
||||
panic(vm.ToValue(err))
|
||||
}
|
||||
text, err := requireStringArg(call, 1, "text")
|
||||
if err != nil {
|
||||
panic(vm.ToValue(err))
|
||||
}
|
||||
if err := page.Type(selector, text, optionalMap(call.Argument(2))); err != nil {
|
||||
panic(vm.ToValue(err))
|
||||
}
|
||||
return goja.Undefined()
|
||||
})
|
||||
_ = obj.Set("waitForSelector", func(call goja.FunctionCall) goja.Value {
|
||||
selector, err := requireStringArg(call, 0, "selector")
|
||||
if err != nil {
|
||||
panic(vm.ToValue(err))
|
||||
}
|
||||
result, err := page.WaitForSelector(
|
||||
selector,
|
||||
optionalMap(call.Argument(1)),
|
||||
)
|
||||
if err != nil {
|
||||
panic(vm.ToValue(err))
|
||||
}
|
||||
return vm.ToValue(result)
|
||||
})
|
||||
_ = obj.Set("waitForFunction", func(call goja.FunctionCall) goja.Value {
|
||||
expression, err := enginewebview.NormalizeExecutableValue(call.Argument(0))
|
||||
if err != nil {
|
||||
panic(vm.ToValue(err))
|
||||
}
|
||||
args := exportArgs(call.Arguments[1:])
|
||||
result, err := page.WaitForFunction(expression, args...)
|
||||
if err != nil {
|
||||
panic(vm.ToValue(err))
|
||||
}
|
||||
return vm.ToValue(result)
|
||||
})
|
||||
_ = obj.Set("getCookies", func(goja.FunctionCall) goja.Value {
|
||||
result, err := page.GetCookies()
|
||||
if err != nil {
|
||||
panic(vm.ToValue(err))
|
||||
}
|
||||
return vm.ToValue(result)
|
||||
})
|
||||
_ = obj.Set("setCookie", func(call goja.FunctionCall) goja.Value {
|
||||
if err := page.SetCookie(optionalMap(call.Argument(0))); err != nil {
|
||||
panic(vm.ToValue(err))
|
||||
}
|
||||
return goja.Undefined()
|
||||
})
|
||||
_ = obj.Set("deleteCookie", func(call goja.FunctionCall) goja.Value {
|
||||
if err := page.DeleteCookie(optionalMap(call.Argument(0))); err != nil {
|
||||
panic(vm.ToValue(err))
|
||||
}
|
||||
return goja.Undefined()
|
||||
})
|
||||
_ = obj.Set("clearCookies", func(goja.FunctionCall) goja.Value {
|
||||
if err := page.ClearCookies(); err != nil {
|
||||
panic(vm.ToValue(err))
|
||||
}
|
||||
return goja.Undefined()
|
||||
})
|
||||
_ = obj.Set("url", func(goja.FunctionCall) goja.Value {
|
||||
result, err := page.URL()
|
||||
if err != nil {
|
||||
panic(vm.ToValue(err))
|
||||
}
|
||||
return vm.ToValue(result)
|
||||
})
|
||||
_ = obj.Set("content", func(goja.FunctionCall) goja.Value {
|
||||
result, err := page.Content()
|
||||
if err != nil {
|
||||
panic(vm.ToValue(err))
|
||||
}
|
||||
return vm.ToValue(result)
|
||||
})
|
||||
_ = obj.Set("close", func(goja.FunctionCall) goja.Value {
|
||||
if err := page.Close(); err != nil {
|
||||
panic(vm.ToValue(err))
|
||||
}
|
||||
return goja.Undefined()
|
||||
})
|
||||
return obj
|
||||
}
|
||||
|
||||
func optionalMap(value goja.Value) map[string]any {
|
||||
if value == nil || goja.IsUndefined(value) || goja.IsNull(value) {
|
||||
return nil
|
||||
}
|
||||
if exported, ok := value.Export().(map[string]any); ok {
|
||||
return exported
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func exportArgs(values []goja.Value) []any {
|
||||
if len(values) == 0 {
|
||||
return nil
|
||||
}
|
||||
args := make([]any, 0, len(values))
|
||||
for _, value := range values {
|
||||
args = append(args, value.Export())
|
||||
}
|
||||
return args
|
||||
}
|
||||
|
||||
func requireStringArg(call goja.FunctionCall, index int, name string) (string, error) {
|
||||
value := call.Argument(index)
|
||||
if value == nil || goja.IsUndefined(value) || goja.IsNull(value) {
|
||||
return "", fmt.Errorf(`missing or invalid "%s"`, name)
|
||||
}
|
||||
return value.String(), nil
|
||||
}
|
||||
+1406
-84
File diff suppressed because it is too large.
Load diff
@@ -1,87 +0,0 @@
|
||||
package download
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"os"
|
||||
)
|
||||
|
||||
func NewExtMockDownloader() (*Downloader, func(), error) {
|
||||
d := NewDownloader(&DownloaderConfig{
|
||||
Storage: NewMemStorage(),
|
||||
})
|
||||
if err := d.Setup(); err != nil {
|
||||
return nil, nil, err
|
||||
}
|
||||
cleanup := func() {
|
||||
_ = d.Clear()
|
||||
}
|
||||
return d, cleanup, nil
|
||||
}
|
||||
|
||||
type ExtMockRuntime struct {
|
||||
engine engineWrapper
|
||||
session *engineSession
|
||||
}
|
||||
|
||||
type engineWrapper interface {
|
||||
Close()
|
||||
RunString(script string) (any, error)
|
||||
}
|
||||
|
||||
func (d *Downloader) NewExtMockRuntime() (*ExtMockRuntime, error) {
|
||||
engine, session := d.newExtensionEngine()
|
||||
ext := &Extension{
|
||||
Name: "extmock",
|
||||
Author: "gopeed",
|
||||
Title: "Gopeed ExtMock Runtime",
|
||||
Version: "0.0.0",
|
||||
DevMode: true,
|
||||
}
|
||||
gopeed := &Instance{
|
||||
Events: make(InstanceEvents),
|
||||
Info: NewExtensionInfo(ext),
|
||||
Logger: newInstanceLogger(ext, d.ExtensionLogger),
|
||||
Settings: map[string]any{},
|
||||
Storage: &ContextStorage{
|
||||
storage: d.storage,
|
||||
identity: ext.buildIdentity(),
|
||||
},
|
||||
}
|
||||
if err := engine.Runtime.Set("gopeed", gopeed); err != nil {
|
||||
engine.Close()
|
||||
return nil, err
|
||||
}
|
||||
return &ExtMockRuntime{
|
||||
engine: engine,
|
||||
session: session,
|
||||
}, nil
|
||||
}
|
||||
|
||||
func (r *ExtMockRuntime) Eval(script string) (any, error) {
|
||||
if r == nil || r.engine == nil {
|
||||
return nil, fmt.Errorf("extmock runtime not initialized")
|
||||
}
|
||||
return r.engine.RunString(script)
|
||||
}
|
||||
|
||||
func (r *ExtMockRuntime) EvalFile(path string) (any, error) {
|
||||
if path == "" {
|
||||
return nil, fmt.Errorf("script path is empty")
|
||||
}
|
||||
buf, err := os.ReadFile(path)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return r.Eval(string(buf))
|
||||
}
|
||||
|
||||
func (r *ExtMockRuntime) Close() {
|
||||
if r == nil {
|
||||
return
|
||||
}
|
||||
if r.engine != nil {
|
||||
r.engine.Close()
|
||||
}
|
||||
r.engine = nil
|
||||
r.session = nil
|
||||
}
|
||||
@@ -12,6 +12,7 @@ import (
|
||||
"github.com/GopeedLab/gopeed/internal/protocol/gblob"
|
||||
"github.com/GopeedLab/gopeed/internal/protocol/http"
|
||||
"github.com/GopeedLab/gopeed/pkg/base"
|
||||
enginewebview "github.com/GopeedLab/gopeed/pkg/download/engine/webview"
|
||||
"github.com/GopeedLab/gopeed/pkg/util"
|
||||
gonanoid "github.com/matoous/go-nanoid/v2"
|
||||
)
|
||||
@@ -28,7 +29,6 @@ type Task struct {
|
||||
Status base.Status `json:"status"`
|
||||
Uploading bool `json:"uploading"`
|
||||
Progress *Progress `json:"progress"`
|
||||
IsCreated bool `json:"isCreated"`
|
||||
CreatedAt time.Time `json:"createdAt"`
|
||||
UpdatedAt time.Time `json:"updatedAt"`
|
||||
|
||||
@@ -51,7 +51,6 @@ func NewTask() *Task {
|
||||
Status: base.DownloadStatusReady,
|
||||
CreatedAt: time.Now(),
|
||||
UpdatedAt: time.Now(),
|
||||
IsCreated: false,
|
||||
}
|
||||
}
|
||||
|
||||
@@ -154,6 +153,7 @@ type DownloaderConfig struct {
|
||||
Storage Storage
|
||||
StorageDir string
|
||||
WhiteDownloadDirs []string
|
||||
WebViewProvider enginewebview.Provider
|
||||
|
||||
ProductionMode bool
|
||||
|
||||
|
||||
+133
-12
@@ -1,4 +1,6 @@
|
||||
gopeed.events.onResolve(async function (ctx) {
|
||||
const encoder = new TextEncoder();
|
||||
|
||||
if (ctx.req.url.endsWith("/blob")) {
|
||||
const blob = new Blob(["hello world"], {type: "text/plain"});
|
||||
const url = URL.createObjectURL(blob);
|
||||
@@ -17,17 +19,132 @@ gopeed.events.onResolve(async function (ctx) {
|
||||
return;
|
||||
}
|
||||
|
||||
const transform = new TransformStream();
|
||||
const writer = transform.writable.getWriter();
|
||||
const url = URL.createObjectURL(transform.writable);
|
||||
if (ctx.req.url.includes("/http-stream")) {
|
||||
const source = new URL(ctx.req.url);
|
||||
const target = source.searchParams.get("target");
|
||||
const pair = source.searchParams.get("pair") === "1";
|
||||
const resumable = ctx.req.url.includes("/http-stream-range");
|
||||
const fileName = source.searchParams.get("name") || "http-stream.bin";
|
||||
const headResponse = await fetch(target, {method: "HEAD"});
|
||||
const headLength = parseInt(headResponse.headers.get("content-length") || "", 10);
|
||||
|
||||
const createOpen = () => async (offset) => {
|
||||
const headers = {};
|
||||
if (offset > 0) {
|
||||
headers.Range = `bytes=${offset}-`;
|
||||
}
|
||||
const response = await fetch(target, {headers});
|
||||
if (!response.body) {
|
||||
throw new Error("empty response body");
|
||||
}
|
||||
return response.body;
|
||||
};
|
||||
|
||||
ctx.res = {
|
||||
name: "gblob-http-stream",
|
||||
range: resumable,
|
||||
files: pair ? [
|
||||
{
|
||||
name: "pair-video.bin",
|
||||
size: Number.isFinite(headLength) ? headLength : 0,
|
||||
req: {
|
||||
url: URL.createObjectURL(createOpen()),
|
||||
}
|
||||
},
|
||||
{
|
||||
name: "pair-audio.bin",
|
||||
size: Number.isFinite(headLength) ? headLength : 0,
|
||||
req: {
|
||||
url: URL.createObjectURL(createOpen()),
|
||||
}
|
||||
}
|
||||
] : [
|
||||
{
|
||||
name: fileName,
|
||||
size: Number.isFinite(headLength) ? headLength : 0,
|
||||
req: {
|
||||
url: URL.createObjectURL(createOpen()),
|
||||
}
|
||||
}
|
||||
]
|
||||
};
|
||||
return;
|
||||
}
|
||||
|
||||
if (ctx.req.url.includes("/http-blob")) {
|
||||
const source = new URL(ctx.req.url);
|
||||
const target = source.searchParams.get("target");
|
||||
const fileName = source.searchParams.get("name") || "http-blob.bin";
|
||||
const headResponse = await fetch(target, {method: "HEAD"});
|
||||
const headLength = parseInt(headResponse.headers.get("content-length") || "", 10);
|
||||
const response = await fetch(target);
|
||||
const blob = await response.blob();
|
||||
|
||||
ctx.res = {
|
||||
name: "gblob-http-blob",
|
||||
files: [
|
||||
{
|
||||
name: fileName,
|
||||
size: Number.isFinite(headLength) ? headLength : 0,
|
||||
req: {
|
||||
url: URL.createObjectURL(blob),
|
||||
}
|
||||
}
|
||||
]
|
||||
};
|
||||
return;
|
||||
}
|
||||
|
||||
if (ctx.req.url.endsWith("/stream-range")) {
|
||||
const payload = encoder.encode("line 1\nline 2\nline 3\n");
|
||||
const firstChunkLength = encoder.encode("line 1\n").byteLength;
|
||||
let firstAttempt = true;
|
||||
|
||||
const open = async (offset) => new ReadableStream({
|
||||
async start(controller) {
|
||||
try {
|
||||
if (offset === 0 && firstAttempt) {
|
||||
firstAttempt = false;
|
||||
controller.enqueue(payload.slice(0, firstChunkLength));
|
||||
await new Promise((resolve) => setTimeout(resolve, 120));
|
||||
controller.error(new Error("resume required"));
|
||||
return;
|
||||
}
|
||||
controller.enqueue(payload.slice(offset));
|
||||
controller.close();
|
||||
} catch (err) {
|
||||
controller.error(err);
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
const url = URL.createObjectURL(open);
|
||||
|
||||
ctx.res = {
|
||||
name: "gblob-stream-range",
|
||||
range: true,
|
||||
files: [
|
||||
{
|
||||
name: "stream-range.txt",
|
||||
size: payload.byteLength,
|
||||
req: {
|
||||
url,
|
||||
}
|
||||
}
|
||||
]
|
||||
};
|
||||
return;
|
||||
}
|
||||
|
||||
if (ctx.req.url.endsWith("/stream-unknown")) {
|
||||
(async () => {
|
||||
await writer.write(new TextEncoder().encode("line 1\n"));
|
||||
await new Promise((resolve) => setTimeout(resolve, 120));
|
||||
await writer.write(new TextEncoder().encode("line 2\n"));
|
||||
await writer.close();
|
||||
})();
|
||||
const url = URL.createObjectURL(new ReadableStream({
|
||||
async start(controller) {
|
||||
controller.enqueue(encoder.encode("line 1\n"));
|
||||
await new Promise((resolve) => setTimeout(resolve, 350));
|
||||
controller.enqueue(encoder.encode("line 2\n"));
|
||||
controller.close();
|
||||
},
|
||||
}));
|
||||
|
||||
ctx.res = {
|
||||
name: "gblob-stream-unknown",
|
||||
@@ -43,9 +160,13 @@ gopeed.events.onResolve(async function (ctx) {
|
||||
return;
|
||||
}
|
||||
|
||||
await writer.write(new TextEncoder().encode("line 1\n"));
|
||||
await writer.write(new TextEncoder().encode("line 2\n"));
|
||||
await writer.close();
|
||||
const url = URL.createObjectURL(new ReadableStream({
|
||||
start(controller) {
|
||||
controller.enqueue(encoder.encode("line 1\n"));
|
||||
controller.enqueue(encoder.encode("line 2\n"));
|
||||
controller.close();
|
||||
},
|
||||
}));
|
||||
|
||||
ctx.res = {
|
||||
name: "gblob-stream",
|
||||
|
||||
+7
-9
@@ -3,15 +3,13 @@ gopeed.events.onResolve(async function (ctx) {
|
||||
return;
|
||||
}
|
||||
|
||||
const transform = new TransformStream();
|
||||
const writer = transform.writable.getWriter();
|
||||
const url = URL.createObjectURL(transform.writable);
|
||||
|
||||
(async () => {
|
||||
await writer.write(new TextEncoder().encode("stale\n"));
|
||||
await new Promise((resolve) => setTimeout(resolve, 50));
|
||||
await writer.abort("expired");
|
||||
})();
|
||||
const url = URL.createObjectURL(new ReadableStream({
|
||||
async start(controller) {
|
||||
controller.enqueue(new TextEncoder().encode("stale\n"));
|
||||
await new Promise((resolve) => setTimeout(resolve, 50));
|
||||
controller.error(new Error("expired"));
|
||||
},
|
||||
}));
|
||||
|
||||
ctx.res = {
|
||||
name: "gblob-recover",
|
||||
|
||||
@@ -0,0 +1,58 @@
|
||||
function createRangeGBlobUrl(target) {
|
||||
return URL.createObjectURL(async (offset) => {
|
||||
const headers = {};
|
||||
if (offset > 0) {
|
||||
headers.Range = `bytes=${offset}-`;
|
||||
}
|
||||
const response = await fetch(target, { headers });
|
||||
if (!response.body) {
|
||||
throw new Error('empty response body');
|
||||
}
|
||||
return response.body;
|
||||
});
|
||||
}
|
||||
|
||||
gopeed.events.onResolve(async function (ctx) {
|
||||
if (!ctx.req.url.includes('/restart-range')) {
|
||||
return;
|
||||
}
|
||||
|
||||
ctx.res = {
|
||||
name: 'gblob-restart',
|
||||
range: true,
|
||||
files: [
|
||||
{
|
||||
name: 'restart.bin',
|
||||
size: 262144,
|
||||
req: {
|
||||
url: createRangeGBlobUrl(ctx.req.rawUrl || ctx.req.url),
|
||||
rawUrl: ctx.req.rawUrl || ctx.req.url,
|
||||
labels: {
|
||||
mode: 'restart',
|
||||
},
|
||||
},
|
||||
},
|
||||
],
|
||||
};
|
||||
});
|
||||
|
||||
gopeed.events.onError(async function (ctx) {
|
||||
const req = ctx.task?.meta?.req;
|
||||
if (!req || !req.rawUrl || !req.url || !req.url.startsWith('gblob:')) {
|
||||
return;
|
||||
}
|
||||
req.labels = req.labels || {};
|
||||
if (req.labels.rebuilt === 'true') {
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
req.url = createRangeGBlobUrl(req.rawUrl);
|
||||
req.labels.started = 'true';
|
||||
req.labels.rebuilt = 'true';
|
||||
ctx.task.continue();
|
||||
} catch (error) {
|
||||
req.labels.rebuildError = String(error);
|
||||
throw error;
|
||||
}
|
||||
});
|
||||
@@ -0,0 +1,28 @@
|
||||
{
|
||||
"name": "gblob-restart",
|
||||
"title": "gopeed extension gblob restart resume test",
|
||||
"version": "0.0.1",
|
||||
"scripts": [
|
||||
{
|
||||
"event": "onResolve",
|
||||
"match": {
|
||||
"urls": [
|
||||
"*://*/restart-range*"
|
||||
]
|
||||
},
|
||||
"entry": "index.js"
|
||||
},
|
||||
{
|
||||
"event": "onError",
|
||||
"match": {
|
||||
"labels": [
|
||||
"mode"
|
||||
],
|
||||
"urls": [
|
||||
"*://*/restart-range*"
|
||||
]
|
||||
},
|
||||
"entry": "index.js"
|
||||
}
|
||||
]
|
||||
}
|
||||
File mode changed.
File mode changed.
File mode changed.
File mode changed.
Reference in new issue
Block a user