nodejs

zengming00 · zengming00 · commit 5c95fa2d4304 · 2018-01-10T11:18:31.000+08:00
diff --git a/lib/db/db.go b/lib/db/db.go
@@ -45,7 +45,6 @@ func (This *_db) close(call goja.FunctionCall) goja.Value {
 
 func (This *_db) exec(call goja.FunctionCall) goja.Value {
 	args := lib.GetAllArgs(&call)
-	retVal := This.runtime.NewObject()
 
 	if query, ok := args[0].(string); ok {
 		var result sql.Result
@@ -56,14 +55,15 @@ func (This *_db) exec(call goja.FunctionCall) goja.Value {
 			result, err = This.db.Exec(query, args[1:]...)
 		}
 		if err != nil {
-			retVal.Set("err", err.Error())
-			return retVal
+			return This.runtime.ToValue(map[string]interface{}{
+				"err": err.Error(),
+			})
 		}
-		retVal.Set("value", NewResult(This.runtime, result))
-	} else {
-		retVal.Set("err", "p0 is not a string")
+		return This.runtime.ToValue(map[string]interface{}{
+			"value": NewResult(This.runtime, result),
+		})
 	}
-	return retVal
+	panic(This.runtime.NewTypeError("p0 is not a string"))
 }
 
 func (This *_db) prepare(call goja.FunctionCall) goja.Value {
diff --git a/lib/db/redis/redis.go b/lib/db/redis/redis.go
@@ -2,7 +2,7 @@ package redis
 
 import (
 	"github.com/dop251/goja"
-	"github.com/dop251/goja_nodejs/require"
+	"github.com/zengming00/go-server-js/nodejs/require"
 	"github.com/garyburd/redigo/redis"
 	"github.com/zengming00/go-server-js/lib"
 )
diff --git a/lib/db/sql.go b/lib/db/sql.go
@@ -4,7 +4,7 @@ import (
 	"database/sql"
 
 	"github.com/dop251/goja"
-	"github.com/dop251/goja_nodejs/require"
+	"github.com/zengming00/go-server-js/nodejs/require"
 )
 
 type _sql struct {
diff --git a/lib/file.go b/lib/file.go
@@ -5,7 +5,7 @@ import (
 	"os"
 
 	"github.com/dop251/goja"
-	"github.com/dop251/goja_nodejs/require"
+	"github.com/zengming00/go-server-js/nodejs/require"
 )
 
 type _file struct {
diff --git a/lib/fmt.go b/lib/fmt.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 
 	"github.com/dop251/goja"
-	"github.com/dop251/goja_nodejs/require"
+	"github.com/zengming00/go-server-js/nodejs/require"
 )
 
 type _fmt struct {
diff --git a/lib/image/image.go b/lib/image/image.go
@@ -4,7 +4,7 @@ import (
 	"image"
 
 	"github.com/dop251/goja"
-	"github.com/dop251/goja_nodejs/require"
+	"github.com/zengming00/go-server-js/nodejs/require"
 	"github.com/zengming00/go-server-js/lib/image/lib"
 )
 
diff --git a/lib/image/png/png.go b/lib/image/png/png.go
@@ -6,7 +6,7 @@ import (
 	"io"
 
 	"github.com/dop251/goja"
-	"github.com/dop251/goja_nodejs/require"
+	"github.com/zengming00/go-server-js/nodejs/require"
 )
 
 type _png struct {
diff --git a/lib/io.go b/lib/io.go
@@ -4,7 +4,7 @@ import (
 	"io"
 
 	"github.com/dop251/goja"
-	"github.com/dop251/goja_nodejs/require"
+	"github.com/zengming00/go-server-js/nodejs/require"
 )
 
 type _io struct {
diff --git a/lib/net/http/http.go b/lib/net/http/http.go
@@ -7,7 +7,7 @@ import (
 	"time"
 
 	"github.com/dop251/goja"
-	"github.com/dop251/goja_nodejs/require"
+	"github.com/zengming00/go-server-js/nodejs/require"
 )
 
 type _http struct {
diff --git a/lib/net/url/url.go b/lib/net/url/url.go
@@ -4,7 +4,7 @@ import (
 	"net/url"
 
 	"github.com/dop251/goja"
-	"github.com/dop251/goja_nodejs/require"
+	"github.com/zengming00/go-server-js/nodejs/require"
 	"github.com/zengming00/go-server-js/lib"
 )
 
diff --git a/lib/os.go b/lib/os.go
@@ -4,7 +4,7 @@ import (
 	"os"
 
 	"github.com/dop251/goja"
-	"github.com/dop251/goja_nodejs/require"
+	"github.com/zengming00/go-server-js/nodejs/require"
 )
 
 type _os struct {
diff --git a/lib/time.go b/lib/time.go
@@ -4,7 +4,7 @@ import (
 	"time"
 
 	"github.com/dop251/goja"
-	"github.com/dop251/goja_nodejs/require"
+	"github.com/zengming00/go-server-js/nodejs/require"
 )
 
 type _time struct {
diff --git a/lib/types.go b/lib/types.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 
 	"github.com/dop251/goja"
-	"github.com/dop251/goja_nodejs/require"
+	"github.com/zengming00/go-server-js/nodejs/require"
 )
 
 type _types struct {
diff --git a/lib/utils.go b/lib/utils.go
@@ -8,7 +8,7 @@ import (
 	"fmt"
 
 	"github.com/dop251/goja"
-	"github.com/dop251/goja_nodejs/require"
+	"github.com/zengming00/go-server-js/nodejs/require"
 )
 
 type _utils struct {
diff --git a/main.go b/main.go
@@ -24,7 +24,7 @@ import (
 
 	"github.com/dop251/goja"
 	"github.com/dop251/goja_nodejs/console"
-	"github.com/dop251/goja_nodejs/require"
+	"github.com/zengming00/go-server-js/nodejs/require"
 	_ "github.com/go-sql-driver/mysql"
 )
 
diff --git a/nodejs/console/module.go b/nodejs/console/module.go
@@ -0,0 +1,51 @@
+package console
+
+import (
+	"log"
+
+	"github.com/dop251/goja"
+	"github.com/zengming00/go-server-js/nodejs/require"
+	_ "github.com/dop251/goja_nodejs/util"
+)
+
+type Console struct {
+	runtime *goja.Runtime
+	util    *goja.Object
+}
+
+func (c *Console) log(call goja.FunctionCall) goja.Value {
+	if format, ok := goja.AssertFunction(c.util.Get("format")); ok {
+		ret, err := format(c.util, call.Arguments...)
+		if err != nil {
+			panic(err)
+		}
+
+		log.Print(ret.String())
+	} else {
+		panic(c.runtime.NewTypeError("util.format is not a function"))
+	}
+
+	return nil
+}
+
+func Require(runtime *goja.Runtime, module *goja.Object) {
+	c := &Console{
+		runtime: runtime,
+	}
+
+	c.util = require.Require(runtime, "util").(*goja.Object)
+
+	o := module.Get("exports").(*goja.Object)
+	o.Set("log", c.log)
+	o.Set("error", c.log)
+	o.Set("warn", c.log)
+
+}
+
+func Enable(runtime *goja.Runtime) {
+	runtime.Set("console", require.Require(runtime, "console"))
+}
+
+func init() {
+	require.RegisterNativeModule("console", Require)
+}
diff --git a/nodejs/console/module_test.go b/nodejs/console/module_test.go
@@ -0,0 +1,31 @@
+package console
+
+import (
+	"testing"
+
+	"github.com/dop251/goja"
+	"github.com/zengming00/go-server-js/nodejs/require"
+)
+
+func TestConsole(t *testing.T) {
+	vm := goja.New()
+
+	new(require.Registry).Enable(vm)
+	Enable(vm)
+
+	if c := vm.Get("console"); c == nil {
+		t.Fatal("console not found")
+	}
+
+	if _, err := vm.RunString("console.log('')"); err != nil {
+		t.Fatal("console.log() error", err)
+	}
+
+	if _, err := vm.RunString("console.error('')"); err != nil {
+		t.Fatal("console.error() error", err)
+	}
+
+	if _, err := vm.RunString("console.warn('')"); err != nil {
+		t.Fatal("console.warn() error", err)
+	}
+}
diff --git a/nodejs/eventloop/eventloop.go b/nodejs/eventloop/eventloop.go
diff --git a/nodejs/eventloop/eventloop_test.go b/nodejs/eventloop/eventloop_test.go
diff --git a/nodejs/require/module.go b/nodejs/require/module.go
diff --git a/nodejs/require/module_test.go b/nodejs/require/module_test.go
diff --git a/nodejs/require/testdata/m.js b/nodejs/require/testdata/m.js
diff --git a/nodejs/util/module.go b/nodejs/util/module.go
diff --git a/nodejs/util/module_test.go b/nodejs/util/module_test.go

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ package redis`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"github.com/dop251/goja"`
`5`		`- "github.com/dop251/goja_nodejs/require"`
	`5`	`+ "github.com/zengming00/go-server-js/nodejs/require"`
`6`	`6`	`"github.com/garyburd/redigo/redis"`
`7`	`7`	`"github.com/zengming00/go-server-js/lib"`
`8`	`8`	`)`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ import (`
`4`	`4`	`"database/sql"`
`5`	`5`
`6`	`6`	`"github.com/dop251/goja"`
`7`		`- "github.com/dop251/goja_nodejs/require"`
	`7`	`+ "github.com/zengming00/go-server-js/nodejs/require"`
`8`	`8`	`)`
`9`	`9`
`10`	`10`	`type _sql struct {`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ import (`
`5`	`5`	`"os"`
`6`	`6`
`7`	`7`	`"github.com/dop251/goja"`
`8`		`- "github.com/dop251/goja_nodejs/require"`
	`8`	`+ "github.com/zengming00/go-server-js/nodejs/require"`
`9`	`9`	`)`
`10`	`10`
`11`	`11`	`type _file struct {`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ import (`
`4`	`4`	`"fmt"`
`5`	`5`
`6`	`6`	`"github.com/dop251/goja"`
`7`		`- "github.com/dop251/goja_nodejs/require"`
	`7`	`+ "github.com/zengming00/go-server-js/nodejs/require"`
`8`	`8`	`)`
`9`	`9`
`10`	`10`	`type _fmt struct {`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ import (`
`4`	`4`	`"image"`
`5`	`5`
`6`	`6`	`"github.com/dop251/goja"`
`7`		`- "github.com/dop251/goja_nodejs/require"`
	`7`	`+ "github.com/zengming00/go-server-js/nodejs/require"`
`8`	`8`	`"github.com/zengming00/go-server-js/lib/image/lib"`
`9`	`9`	`)`
`10`	`10`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ import (`
`6`	`6`	`"io"`
`7`	`7`
`8`	`8`	`"github.com/dop251/goja"`
`9`		`- "github.com/dop251/goja_nodejs/require"`
	`9`	`+ "github.com/zengming00/go-server-js/nodejs/require"`
`10`	`10`	`)`
`11`	`11`
`12`	`12`	`type _png struct {`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ import (`
`7`	`7`	`"time"`
`8`	`8`
`9`	`9`	`"github.com/dop251/goja"`
`10`		`- "github.com/dop251/goja_nodejs/require"`
	`10`	`+ "github.com/zengming00/go-server-js/nodejs/require"`
`11`	`11`	`)`
`12`	`12`
`13`	`13`	`type _http struct {`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ import (`
`4`	`4`	`"net/url"`
`5`	`5`
`6`	`6`	`"github.com/dop251/goja"`
`7`		`- "github.com/dop251/goja_nodejs/require"`
	`7`	`+ "github.com/zengming00/go-server-js/nodejs/require"`
`8`	`8`	`"github.com/zengming00/go-server-js/lib"`
`9`	`9`	`)`
`10`	`10`