2021-05-26 04:17:53 +00:00
|
|
|
package plugin
|
|
|
|
|
|
|
|
import (
|
Toward better context handling (#1835)
* Use the request context
The code uses context.Background() in a flow where there is a
http.Request. Use the requests context instead.
* Use a true context in the plugin example
Let AddTag/RemoveTag take a context and use that context throughout
the example.
* Avoid the use of context.Background
Prefer context.TODO over context.Background deep in the call chain.
This marks the site as something which we need to context-handle
later, and also makes it clear to the reader that the context is
sort-of temporary in the code base.
While here, be consistent in handling the `act` variable in each
branch of the if .. { .. } .. check.
* Prefer context.TODO over context.Background
For the different scraping operations here, there is a context
higher up the call chain, which we ought to use. Mark the call-sites
as TODO for now, so we can come back later on a sweep of which parts
can be context-lifted.
* Thread context upwards
Initialization requires context for transactions. Thread the context
upward the call chain.
At the intialization call, add a context.TODO since we can't break this
yet. The singleton assumption prevents us from pulling it up into main for
now.
* make tasks context-aware
Change the task interface to understand contexts.
Pass the context down in some of the branches where it is needed.
* Make QueryStashBoxScene context-aware
This call naturally sits inside the request-context. Use it.
* Introduce a context in the JS plugin code
This allows us to use a context for HTTP calls inside the system.
Mark the context with a TODO at top level for now.
* Nitpick error formatting
Use %v rather than %s for error interfaces.
Do not begin an error strong with a capital letter.
* Avoid the use of http.Get in FFMPEG download chain
Since http.Get has no context, it isn't possible to break out or have
policy induced. The call will block until the GET completes. Rewrite
to use a http Request and provide a context.
Thread the context through the call chain for now. provide
context.TODO() at the top level of the initialization chain.
* Make getRemoteCDPWSAddress aware of contexts
Eliminate a call to http.Get and replace it with a context-aware
variant.
Push the context upwards in the call chain, but plug it before the
scraper interface so we don't have to rewrite said interface yet.
Plugged with context.TODO()
* Scraper: make the getImage function context-aware
Use a context, and pass it upwards. Plug it with context.TODO()
up the chain before the rewrite gets too much out of hand for now.
Minor tweaks along the way, remove a call to context.Background()
deep in the call chain.
* Make NOTIFY request context-aware
The call sits inside a Request-handler. So it's natural to use the
requests context as the context for the outgoing HTTP request.
* Use a context in the url scraper code
We are sitting in code which has a context, so utilize it for the
request as well.
* Use a context when checking versions
When we check the version of stash on Github, use a context. Thread
the context up to the initialization routine of the HTTP/GraphQL
server and plug it with a context.TODO() for now.
This paves the way for providing a context to the HTTP server code in a
future patch.
* Make utils func ReadImage context-aware
In almost all of the cases, there is a context in the call chain which
is a natural use. This is true for all the GraphQL mutations.
The exception is in task_stash_box_tag, so plug that task with
context.TODO() for now.
* Make stash-box get context-aware
Thread a context through the call chain until we hit the Client API.
Plug it with context.TODO() there for now.
* Enable the noctx linter
The code is now free of any uncontexted HTTP request. This means we
pass the noctx linter, and we can enable it in the code base.
2021-10-14 04:32:41 +00:00
|
|
|
"context"
|
2021-05-26 04:17:53 +00:00
|
|
|
"errors"
|
2021-09-20 23:34:25 +00:00
|
|
|
"fmt"
|
2021-05-26 04:17:53 +00:00
|
|
|
"path/filepath"
|
|
|
|
"sync"
|
|
|
|
|
|
|
|
"github.com/robertkrimen/otto"
|
|
|
|
"github.com/stashapp/stash/pkg/plugin/common"
|
|
|
|
"github.com/stashapp/stash/pkg/plugin/js"
|
|
|
|
)
|
|
|
|
|
|
|
|
var errStop = errors.New("stop")
|
|
|
|
|
|
|
|
type jsTaskBuilder struct{}
|
|
|
|
|
|
|
|
func (*jsTaskBuilder) build(task pluginTask) Task {
|
|
|
|
return &jsPluginTask{
|
|
|
|
pluginTask: task,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
type jsPluginTask struct {
|
|
|
|
pluginTask
|
|
|
|
|
|
|
|
started bool
|
|
|
|
waitGroup sync.WaitGroup
|
|
|
|
vm *otto.Otto
|
|
|
|
}
|
|
|
|
|
|
|
|
func (t *jsPluginTask) onError(err error) {
|
|
|
|
errString := err.Error()
|
|
|
|
t.result = &common.PluginOutput{
|
|
|
|
Error: &errString,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func (t *jsPluginTask) makeOutput(o otto.Value) {
|
|
|
|
t.result = &common.PluginOutput{}
|
|
|
|
|
|
|
|
asObj := o.Object()
|
|
|
|
if asObj == nil {
|
|
|
|
return
|
|
|
|
}
|
|
|
|
|
|
|
|
t.result.Output, _ = asObj.Get("Output")
|
|
|
|
err, _ := asObj.Get("Error")
|
|
|
|
if !err.IsUndefined() {
|
|
|
|
errStr := err.String()
|
|
|
|
t.result.Error = &errStr
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func (t *jsPluginTask) Start() error {
|
|
|
|
if t.started {
|
|
|
|
return errors.New("task already started")
|
|
|
|
}
|
|
|
|
|
|
|
|
t.started = true
|
|
|
|
|
|
|
|
if len(t.plugin.Exec) == 0 {
|
|
|
|
return errors.New("no script specified in exec")
|
|
|
|
}
|
|
|
|
|
|
|
|
scriptFile := t.plugin.Exec[0]
|
|
|
|
|
|
|
|
t.vm = otto.New()
|
|
|
|
pluginPath := t.plugin.getConfigPath()
|
|
|
|
script, err := t.vm.Compile(filepath.Join(pluginPath, scriptFile), nil)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
2021-09-20 23:34:25 +00:00
|
|
|
if err := t.vm.Set("input", t.input); err != nil {
|
|
|
|
return fmt.Errorf("error setting input: %w", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
if err := js.AddLogAPI(t.vm, t.progress); err != nil {
|
|
|
|
return fmt.Errorf("error adding log API: %w", err)
|
|
|
|
}
|
|
|
|
|
|
|
|
if err := js.AddUtilAPI(t.vm); err != nil {
|
|
|
|
return fmt.Errorf("error adding util API: %w", err)
|
|
|
|
}
|
|
|
|
|
Toward better context handling (#1835)
* Use the request context
The code uses context.Background() in a flow where there is a
http.Request. Use the requests context instead.
* Use a true context in the plugin example
Let AddTag/RemoveTag take a context and use that context throughout
the example.
* Avoid the use of context.Background
Prefer context.TODO over context.Background deep in the call chain.
This marks the site as something which we need to context-handle
later, and also makes it clear to the reader that the context is
sort-of temporary in the code base.
While here, be consistent in handling the `act` variable in each
branch of the if .. { .. } .. check.
* Prefer context.TODO over context.Background
For the different scraping operations here, there is a context
higher up the call chain, which we ought to use. Mark the call-sites
as TODO for now, so we can come back later on a sweep of which parts
can be context-lifted.
* Thread context upwards
Initialization requires context for transactions. Thread the context
upward the call chain.
At the intialization call, add a context.TODO since we can't break this
yet. The singleton assumption prevents us from pulling it up into main for
now.
* make tasks context-aware
Change the task interface to understand contexts.
Pass the context down in some of the branches where it is needed.
* Make QueryStashBoxScene context-aware
This call naturally sits inside the request-context. Use it.
* Introduce a context in the JS plugin code
This allows us to use a context for HTTP calls inside the system.
Mark the context with a TODO at top level for now.
* Nitpick error formatting
Use %v rather than %s for error interfaces.
Do not begin an error strong with a capital letter.
* Avoid the use of http.Get in FFMPEG download chain
Since http.Get has no context, it isn't possible to break out or have
policy induced. The call will block until the GET completes. Rewrite
to use a http Request and provide a context.
Thread the context through the call chain for now. provide
context.TODO() at the top level of the initialization chain.
* Make getRemoteCDPWSAddress aware of contexts
Eliminate a call to http.Get and replace it with a context-aware
variant.
Push the context upwards in the call chain, but plug it before the
scraper interface so we don't have to rewrite said interface yet.
Plugged with context.TODO()
* Scraper: make the getImage function context-aware
Use a context, and pass it upwards. Plug it with context.TODO()
up the chain before the rewrite gets too much out of hand for now.
Minor tweaks along the way, remove a call to context.Background()
deep in the call chain.
* Make NOTIFY request context-aware
The call sits inside a Request-handler. So it's natural to use the
requests context as the context for the outgoing HTTP request.
* Use a context in the url scraper code
We are sitting in code which has a context, so utilize it for the
request as well.
* Use a context when checking versions
When we check the version of stash on Github, use a context. Thread
the context up to the initialization routine of the HTTP/GraphQL
server and plug it with a context.TODO() for now.
This paves the way for providing a context to the HTTP server code in a
future patch.
* Make utils func ReadImage context-aware
In almost all of the cases, there is a context in the call chain which
is a natural use. This is true for all the GraphQL mutations.
The exception is in task_stash_box_tag, so plug that task with
context.TODO() for now.
* Make stash-box get context-aware
Thread a context through the call chain until we hit the Client API.
Plug it with context.TODO() there for now.
* Enable the noctx linter
The code is now free of any uncontexted HTTP request. This means we
pass the noctx linter, and we can enable it in the code base.
2021-10-14 04:32:41 +00:00
|
|
|
if err := js.AddGQLAPI(context.TODO(), t.vm, t.input.ServerConnection.SessionCookie, t.gqlHandler); err != nil {
|
2021-09-20 23:34:25 +00:00
|
|
|
return fmt.Errorf("error adding GraphQL API: %w", err)
|
|
|
|
}
|
2021-05-26 04:17:53 +00:00
|
|
|
|
|
|
|
t.vm.Interrupt = make(chan func(), 1)
|
|
|
|
|
|
|
|
t.waitGroup.Add(1)
|
|
|
|
|
|
|
|
go func() {
|
|
|
|
defer func() {
|
|
|
|
t.waitGroup.Done()
|
|
|
|
|
|
|
|
if caught := recover(); caught != nil {
|
Errorlint sweep + minor linter tweaks (#1796)
* Replace error assertions with Go 1.13 style
Use `errors.As(..)` over type assertions. This enables better use of
wrapped errors in the future, and lets us pass some errorlint checks
in the process.
The rewrite is entirely mechanical, and uses a standard idiom for
doing so.
* Use Go 1.13's errors.Is(..)
Rather than directly checking for error equality, use errors.Is(..).
This protects against error wrapping issues in the future.
Even though something like sql.ErrNoRows doesn't need the wrapping, do
so anyway, for the sake of consistency throughout the code base.
The change almost lets us pass the `errorlint` Go checker except for
a missing case in `js.go` which is to be handled separately; it isn't
mechanical, like these changes are.
* Remove goconst
goconst isn't a useful linter in many cases, because it's false positive
rate is high. It's 100% for the current code base.
* Avoid direct comparison of errors in recover()
Assert that we are catching an error from recover(). If we are,
check that the error caught matches errStop.
* Enable the "errorlint" checker
Configure the checker to avoid checking for errorf wraps. These are
often false positives since the suggestion is to blanket wrap errors
with %w, and that exposes the underlying API which you might not want
to do.
The other warnings are good however, and with the current patch stack,
the code base passes all these checks as well.
* Configure rowserrcheck
The project uses sqlx. Configure rowserrcheck to include said package.
* Mechanically rewrite a large set of errors
Mechanically search for errors that look like
fmt.Errorf("...%s", err.Error())
and rewrite those into
fmt.Errorf("...%v", err)
The `fmt` package is error-aware and knows how to call err.Error()
itself.
The rationale is that this is more idiomatic Go; it paves the
way for using error wrapping later with %w in some sites.
This patch only addresses the entirely mechanical rewriting caught by
a project-side search/replace. There are more individual sites not
addressed by this patch.
2021-10-12 03:03:08 +00:00
|
|
|
if err, ok := caught.(error); ok && errors.Is(err, errStop) {
|
2021-05-26 04:17:53 +00:00
|
|
|
// TODO - log this
|
|
|
|
return
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}()
|
|
|
|
|
|
|
|
output, err := t.vm.Run(script)
|
|
|
|
|
|
|
|
if err != nil {
|
|
|
|
t.onError(err)
|
|
|
|
} else {
|
|
|
|
t.makeOutput(output)
|
|
|
|
}
|
|
|
|
}()
|
|
|
|
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
func (t *jsPluginTask) Wait() {
|
|
|
|
t.waitGroup.Wait()
|
|
|
|
}
|
|
|
|
|
|
|
|
func (t *jsPluginTask) Stop() error {
|
|
|
|
// TODO - need another way of doing this that doesn't require panic
|
|
|
|
t.vm.Interrupt <- func() {
|
|
|
|
panic(errStop)
|
|
|
|
}
|
|
|
|
return nil
|
|
|
|
}
|