[add] http.* processes & http JSAPI

.github/workflows/release-linux.yml

@@ -69,13 +69,13 @@ jobs:
       - name: Checkout XGen v0.9
         uses: actions/checkout@v2
         with:
-          repository: yaoapp/xgen
+          repository: yaoapp/xgen-deprecated
           path: xgen-v0.9
 
       - name: Checkout XGen v1.0
         uses: actions/checkout@v2
         with:
-          repository: yaoapp/xgen-next
+          repository: yaoapp/xgen
           # ref: 9ce17a22904b3f09de90f08abbbdaf42f6b0ef68
           path: xgen-v1.0
 

.github/workflows/release-macos.yml

@@ -61,13 +61,13 @@ jobs:
       - name: Checkout XGen v0.9
         uses: actions/checkout@v2
         with:
-          repository: yaoapp/xgen
+          repository: yaoapp/xgen-deprecated
           path: xgen-v0.9
 
       - name: Checkout XGen v1.0
         uses: actions/checkout@v2
         with:
-          repository: yaoapp/xgen-next
+          repository: yaoapp/xgen
           # ref: 9ce17a22904b3f09de90f08abbbdaf42f6b0ef68
           path: xgen-v1.0
 

Makefile

@@ -273,7 +273,7 @@ release: clean
 
 #	Building XGEN v1.0
 	export NODE_ENV=production
-	git clone https://github.com/YaoApp/xgen-next.git .tmp/xgen/v1.0
+	git clone https://github.com/YaoApp/xgen.git .tmp/xgen/v1.0
 # 	cd .tmp/xgen/v1.0 && git checkout 9ce17a22904b3f09de90f08abbbdaf42f6b0ef68
 	echo "BASE=__yao_admin_root" > .tmp/xgen/v1.0/packages/xgen/.env
 	cd .tmp/xgen/v1.0 && pnpm install && pnpm run build
@@ -310,7 +310,7 @@ linux-release: clean
 	mkdir .tmp
 
 #	Building XGEN v0.9
-	git clone https://github.com/YaoApp/xgen.git .tmp/xgen/v0.9
+	git clone https://github.com/YaoApp/xgen-deprecated.git .tmp/xgen/v0.9
 	sed -ie "s/url('\/icon/url('\/xiang\/icon/g" .tmp/xgen/v0.9/public/icon/md_icon.css
 	cd .tmp/xgen/v0.9 && yarn install && yarn build
 	mkdir -p .tmp/xgen/v0.9
@@ -318,7 +318,7 @@ linux-release: clean
 
 #	Building XGEN v1.0
 	export NODE_ENV=production
-	git clone https://github.com/YaoApp/xgen-next.git .tmp/xgen/v1.0
+	git clone https://github.com/YaoApp/xgen.git .tmp/xgen/v1.0
 	rm -f .tmp/xgen/v1.0/pnpm-lock.yaml
 	echo "BASE=__yao_admin_root" > .tmp/xgen/v1.0/packages/xgen/.env
 	cd .tmp/xgen/v1.0 && pnpm install && pnpm run build

chart/process_test.go

@@ -14,10 +14,12 @@ import (
 	_ "github.com/yaoapp/yao/helper"
 	"github.com/yaoapp/yao/model"
 	"github.com/yaoapp/yao/query"
+	"github.com/yaoapp/yao/runtime"
 	"github.com/yaoapp/yao/share"
 )
 
 func init() {
+	runtime.Load(config.Conf)
 	share.DBConnect(config.Conf.DB)
 	model.Load(config.Conf)
 	query.Load(config.Conf)

engine/load.go

@@ -23,6 +23,7 @@ import (
 	"github.com/yaoapp/yao/page"
 	"github.com/yaoapp/yao/plugin"
 	"github.com/yaoapp/yao/query"
+	"github.com/yaoapp/yao/runtime"
 	"github.com/yaoapp/yao/schedule"
 	"github.com/yaoapp/yao/script"
 	"github.com/yaoapp/yao/share"
@@ -40,6 +41,12 @@ import (
 func Load(cfg config.Config) (err error) {
 	defer func() { err = exception.Catch(recover()) }()
 
+	// Load Runtime
+	err = runtime.Load(cfg)
+	if err != nil {
+		printErr(cfg.Mode, "Runtime", err)
+	}
+
 	// 加载应用信息
 	// 第一步: 加载应用信息
 	app.Load(cfg)

flow/flow_test.go

@@ -6,9 +6,11 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/yaoapp/gou"
 	"github.com/yaoapp/yao/config"
+	"github.com/yaoapp/yao/runtime"
 )
 
 func TestLoad(t *testing.T) {
+	runtime.Load(config.Conf)
 	gou.Flows = make(map[string]*gou.Flow)
 	Load(config.Conf)
 	LoadFrom("not a path", "404.")

helper/hex_test.go

@@ -7,7 +7,9 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/yaoapp/gou"
+	"github.com/yaoapp/yao/config"
 	"github.com/yaoapp/yao/flow"
+	"github.com/yaoapp/yao/runtime"
 	"github.com/yaoapp/yao/share"
 )
 
@@ -35,6 +37,7 @@ func TestProcessHexToStringInFlow(t *testing.T) {
 }
 
 func TestProcessHexToStringInScript(t *testing.T) {
+	runtime.Load(config.Conf)
 	testscirpt := path.Join(os.Getenv("YAO_DEV"), "tests", "scripts")
 	share.LoadFrom(testscirpt)
 

importer/init_test.go

@@ -7,11 +7,13 @@ import (
 	"github.com/yaoapp/yao/config"
 	"github.com/yaoapp/yao/model"
 	"github.com/yaoapp/yao/query"
+	"github.com/yaoapp/yao/runtime"
 	"github.com/yaoapp/yao/script"
 	"github.com/yaoapp/yao/share"
 )
 
 func TestMain(m *testing.M) {
+	runtime.Load(config.Conf)
 	share.DBConnect(config.Conf.DB)
 	model.Load(config.Conf)
 	query.Load(config.Conf)

network/process.go

@@ -1,5 +1,9 @@
 package network
 
+// *******************************************************
+// * DEPRECATED	→ http								     *
+// *******************************************************
+
 import "github.com/yaoapp/gou"
 
 func init() {

network/request.go

@@ -1,5 +1,9 @@
 package network
 
+// *******************************************************
+// * DEPRECATED	→ http								     *
+// *******************************************************
+
 import (
 	"bytes"
 	"crypto/tls"

network/request.process.go

@@ -6,6 +6,10 @@ import (
 	"github.com/yaoapp/gou"
 )
 
+// *******************************************************
+// * DEPRECATED	→ http								     *
+// *******************************************************
+
 // ProcessPost  xiang.helper.Post HTTP Post
 func ProcessPost(process *gou.Process) interface{} {
 	process.ValidateArgNums(1)

page/process_test.go

@@ -12,10 +12,12 @@ import (
 	_ "github.com/yaoapp/yao/helper"
 	"github.com/yaoapp/yao/model"
 	"github.com/yaoapp/yao/query"
+	"github.com/yaoapp/yao/runtime"
 	"github.com/yaoapp/yao/share"
 )
 
 func init() {
+	runtime.Load(config.Conf)
 	share.DBConnect(config.Conf.DB)
 	model.Load(config.Conf)
 	query.Load(config.Conf)

runtime/runtime.go

@@ -0,0 +1,18 @@
+package runtime
+
+import (
+	"github.com/yaoapp/gou"
+	"github.com/yaoapp/gou/runtime"
+	"github.com/yaoapp/yao/config"
+	"github.com/yaoapp/yao/fs"
+)
+
+// Load runtime
+func Load(cfg config.Config) error {
+	dataRoot, err := fs.Root(cfg)
+	if err != nil {
+		return err
+	}
+	gou.LoadRuntime(runtime.Option{FileRoot: dataRoot})
+	return nil
+}

script/script_test.go

@@ -7,9 +7,12 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/yaoapp/gou"
+	"github.com/yaoapp/yao/config"
+	"github.com/yaoapp/yao/runtime"
 )
 
 func init() {
+	runtime.Load(config.Conf)
 	rootLib := path.Join(os.Getenv("YAO_DEV"), "/tests/scripts")
 	LoadFrom(rootLib, "")
 }

studio/studio_test.go

@@ -13,12 +13,14 @@ import (
 	"github.com/yaoapp/gou"
 	"github.com/yaoapp/yao/config"
 	"github.com/yaoapp/yao/helper"
+	"github.com/yaoapp/yao/runtime"
 )
 
 type kv map[string]interface{}
 type arr []interface{}
 
 func TestLoad(t *testing.T) {
+	runtime.Load(config.Conf)
 	err := Load(config.Conf)
 	if err != nil {
 		t.Fatal(err)

table/process_test.go

@@ -16,11 +16,13 @@ import (
 	_ "github.com/yaoapp/yao/helper"
 	"github.com/yaoapp/yao/model"
 	"github.com/yaoapp/yao/query"
+	"github.com/yaoapp/yao/runtime"
 	"github.com/yaoapp/yao/script"
 	"github.com/yaoapp/yao/share"
 )
 
 func init() {
+	runtime.Load(config.Conf)
 	share.DBConnect(config.Conf.DB)
 	model.Load(config.Conf)
 	share.Load(config.Conf)

websocket/websocket_test.go

@@ -12,16 +12,19 @@ import (
 	"github.com/yaoapp/gou"
 	"github.com/yaoapp/gou/websocket"
 	"github.com/yaoapp/yao/config"
+	"github.com/yaoapp/yao/runtime"
 	"github.com/yaoapp/yao/script"
 )
 
 func TestLoad(t *testing.T) {
+	runtime.Load(config.Conf)
 	Load(config.Conf)
 	LoadFrom("not a path", "404.")
 	check(t)
 }
 
 func TestWebSocketOpen(t *testing.T) {
+	runtime.Load(config.Conf)
 	Load(config.Conf)
 	script.Load(config.Conf)
 	srv, url := serve(t)

widget/widget_test.go

@@ -7,10 +7,12 @@ import (
 	"github.com/yaoapp/gou"
 	"github.com/yaoapp/kun/any"
 	"github.com/yaoapp/yao/config"
+	"github.com/yaoapp/yao/runtime"
 	"github.com/yaoapp/yao/share"
 )
 
 func TestLoad(t *testing.T) {
+	runtime.Load(config.Conf)
 	share.DBConnect(config.Conf.DB) // 创建数据库连接
 	Load(config.Conf)
 	LoadFrom("not a path")

widgets/app/app_test.go

@@ -11,6 +11,7 @@ import (
 	"github.com/yaoapp/yao/config"
 	"github.com/yaoapp/yao/flow"
 	"github.com/yaoapp/yao/i18n"
+	"github.com/yaoapp/yao/runtime"
 	"github.com/yaoapp/yao/script"
 	"github.com/yaoapp/yao/widgets/login"
 )
@@ -274,6 +275,7 @@ func TestProcessService(t *testing.T) {
 }
 
 func loadApp(t *testing.T) {
+	runtime.Load(config.Conf)
 
 	err := script.Load(config.Conf)
 	if err != nil {

widgets/chart/chart_test.go

@@ -7,6 +7,7 @@ import (
 	"github.com/yaoapp/yao/config"
 	"github.com/yaoapp/yao/i18n"
 	"github.com/yaoapp/yao/model"
+	"github.com/yaoapp/yao/runtime"
 	"github.com/yaoapp/yao/script"
 	"github.com/yaoapp/yao/share"
 )
@@ -21,7 +22,7 @@ func TestLoad(t *testing.T) {
 }
 
 func prepare(t *testing.T, language ...string) {
-
+	runtime.Load(config.Conf)
 	i18n.Load(config.Conf)
 	share.DBConnect(config.Conf.DB) // removed later
 

widgets/form/form_test.go

@@ -7,6 +7,7 @@ import (
 	"github.com/yaoapp/yao/config"
 	"github.com/yaoapp/yao/i18n"
 	"github.com/yaoapp/yao/model"
+	"github.com/yaoapp/yao/runtime"
 	"github.com/yaoapp/yao/script"
 	"github.com/yaoapp/yao/share"
 	"github.com/yaoapp/yao/table"
@@ -24,7 +25,7 @@ func TestLoad(t *testing.T) {
 }
 
 func prepare(t *testing.T, language ...string) {
-
+	runtime.Load(config.Conf)
 	i18n.Load(config.Conf)
 
 	share.DBConnect(config.Conf.DB) // removed later

widgets/login/login_test.go

@@ -9,10 +9,11 @@ import (
 	"github.com/yaoapp/gou"
 	"github.com/yaoapp/yao/config"
 	"github.com/yaoapp/yao/i18n"
+	"github.com/yaoapp/yao/runtime"
 )
 
 func TestLoad(t *testing.T) {
-
+	runtime.Load(config.Conf)
 	i18n.Load(config.Conf)
 	err := Load(config.Conf)
 	if err != nil {
@@ -43,7 +44,7 @@ func TestLoad(t *testing.T) {
 }
 
 func TestLoadHK(t *testing.T) {
-
+	runtime.Load(config.Conf)
 	i18n.Load(config.Conf)
 	err := Load(config.Conf)
 	if err != nil {

widgets/table/table_test.go

@@ -8,6 +8,7 @@ import (
 	"github.com/yaoapp/yao/config"
 	"github.com/yaoapp/yao/flow"
 	"github.com/yaoapp/yao/model"
+	"github.com/yaoapp/yao/runtime"
 	"github.com/yaoapp/yao/script"
 	"github.com/yaoapp/yao/widgets/app"
 	"github.com/yaoapp/yao/widgets/component"
@@ -34,7 +35,7 @@ func TestLoadID(t *testing.T) {
 }
 
 func prepare(t *testing.T, language ...string) {
-
+	runtime.Load(config.Conf)
 	err := test.LoadEngine(language...)
 	if err != nil {
 		t.Fatal(err)

widgets/test/engine.go

@@ -8,12 +8,13 @@ import (
 	"github.com/yaoapp/yao/config"
 	"github.com/yaoapp/yao/i18n"
 	"github.com/yaoapp/yao/model"
+	"github.com/yaoapp/yao/runtime"
 	"github.com/yaoapp/yao/share"
 )
 
 // LoadEngine load engine
 func LoadEngine(language ...string) error {
-
+	runtime.Load(config.Conf)
 	i18n.Load(config.Conf)
 	share.DBConnect(config.Conf.DB) // removed later
 	gou.LoadCrypt(`{}`, "PASSWORD")

widgets/widgets_test.go

@@ -7,6 +7,7 @@ import (
 	"github.com/yaoapp/yao/config"
 	"github.com/yaoapp/yao/i18n"
 	"github.com/yaoapp/yao/model"
+	"github.com/yaoapp/yao/runtime"
 	"github.com/yaoapp/yao/script"
 	"github.com/yaoapp/yao/share"
 )
@@ -18,7 +19,7 @@ func TestLoad(t *testing.T) {
 }
 
 func prepare(t *testing.T, language ...string) {
-
+	runtime.Load(config.Conf)
 	i18n.Load(config.Conf)
 	share.DBConnect(config.Conf.DB) // removed later