add jsvm to lint schema and update otto vendor

cli/lint/schema.go

@@ -236,6 +236,9 @@ const confSchema = `{
 	"enable_jsvm": {
 		"type": "boolean"
 	},
+	"jsvm":{
+		"type": "string"
+	},
 	"jsvm_timeout": {
 		"type": "integer"
 	},

jsvm_goja.go

@@ -12,10 +12,11 @@ import (
 	"time"
 
 	"github.com/Sirupsen/logrus"
+	"github.com/dop251/goja"
+
 	"github.com/TykTechnologies/tyk/apidef"
 	"github.com/TykTechnologies/tyk/config"
 	"github.com/TykTechnologies/tyk/user"
-	"github.com/dop251/goja"
 )
 
 type TykJSVM interface {
@@ -154,7 +155,6 @@ func (j *GojaJSVM) RunJSRequestDynamic(d *DynamicMiddleware, logger *logrus.Entr
 
 func (j *GojaJSVM) RunJSRequestVirtual(d *VirtualEndpoint, logger *logrus.Entry, vmeta *apidef.VirtualMeta, requestAsJson string, sessionAsJson string, specAsJson string) (error, int, string) {
 
-	interrupt := make(chan func(), 1)
 	d.Logger().Debug("Running: ", vmeta.ResponseFunctionName)
 	// buffered, leaving no chance of a goroutine leak since the
 	// spawned goroutine will send 0 or 1 values.
@@ -180,14 +180,12 @@ func (j *GojaJSVM) RunJSRequestVirtual(d *VirtualEndpoint, logger *logrus.Entry,
 			return nil, -1, ""
 		}
 		t.Stop()
+
 	case <-t.C:
 		t.Stop()
 		d.Logger().Error("JS middleware timed out after ", j.GetTimeout())
-		interrupt <- func() {
-			// only way to stop the VM is to send it a func
-			// that panics.
-			panic("stop")
-		}
+
+		j.VM.Interrupt("Stopping VM for timeout")
 		return nil, -1, ""
 	}
 	returnDataStr := returnRaw.String()

jsvm_otto.go

@@ -12,11 +12,12 @@ import (
 	"strings"
 	"time"
 
+	"github.com/robertkrimen/otto"
+	_ "github.com/robertkrimen/otto/underscore"
+
 	"github.com/TykTechnologies/tyk/apidef"
 	"github.com/TykTechnologies/tyk/config"
 	"github.com/TykTechnologies/tyk/user"
-	"github.com/robertkrimen/otto"
-	_ "github.com/robertkrimen/otto/underscore"
 
 	"github.com/Sirupsen/logrus"
 )

mw_js_plugin.go

@@ -139,9 +139,10 @@ func (d *DynamicMiddleware) ProcessRequest(w http.ResponseWriter, r *http.Reques
 	err, code, returnDataStr := d.Spec.JSVM.RunJSRequestDynamic(d, logger, string(requestAsJson), string(sessionAsJson), specAsJson)
 	if err != nil {
 		log.Errorf("JSVM error: %v", err)
+		return err, code
 	}
 
-	if code != -1 {
+	if code != -1 || returnDataStr == "" {
 		return nil, code
 	}
 	// Decode the return object

mw_virtual_endpoint.go

@@ -5,7 +5,6 @@ import (
 	"encoding/base64"
 	"encoding/json"
 	"errors"
-	"fmt"
 	"io"
 	"io/ioutil"
 	"net/http"
@@ -172,8 +171,8 @@ func (d *VirtualEndpoint) ServeHTTPForCache(w http.ResponseWriter, r *http.Reque
 	// Run the middleware
 	err, code, returnDataStr := d.Spec.JSVM.RunJSRequestVirtual(d, d.logger, vmeta, string(requestAsJson), string(sessionAsJson), specAsJson)
 	if err != nil {
-		//TODO
-		fmt.Println(err)
+		log.Errorf("JSVM VE error: %v", err)
+		return nil
 	}
 	if code != -1 {
 		return nil