更改部分lib_http接口

lollipopkit · Sep 30, 2022 · 5296f13 · 5296f13
1 parent d0973e9
commit 5296f13
Show file tree

Hide file tree

Showing 9 changed files with 73 additions and 40 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -9,8 +9,8 @@
             "type": "go",
             "request": "launch",
             "mode": "debug",
-            "program": "main.go",
-            "args": ["-f", "test/re.lk"]
+            "program": ".",
+            "args": ["-f", "test/basic.lk"]
         }
     ]
 }
diff --git a/state/auxlib.go b/state/auxlib.go
@@ -214,6 +214,14 @@ func (self *luaState) ToString2(idx int) string {
 			}
 		case LUA_TNIL:
 			self.PushString("nil")
+		case LUA_TTABLE:
+			tb, ok := self.ToPointer(idx).(*luaTable)
+			if ok {
+				s, err := tb.String()
+				if err == nil {
+					self.PushString(s)
+				}
+			}
 		default:
 			tt := self.GetMetafield(idx, "__name") /* try name */
 			var kind string
@@ -223,12 +231,7 @@ func (self *luaState) ToString2(idx int) string {
 				kind = self.TypeName2(idx)
 			}
 
-			tb, err := json.MarshalToString(self.ToPointer(idx))
-			if err != nil {
-				self.PushString(fmt.Sprintf("%s: %p", kind, self.ToPointer(idx)))
-			} else {
-				self.PushString(fmt.Sprintf("%s: %s", kind, tb))
-			}
+			self.PushString(fmt.Sprintf("%s: %v", kind, self.ToPointer(idx)))
 
 			if tt != LUA_TNIL {
 				self.Remove(-2) /* remove '__name' */

diff --git a/state/lua_table.go b/state/lua_table.go
@@ -16,6 +16,14 @@ type luaTable struct {
 	changed   bool        // used by next()
 }
 
+func (self *luaTable) String() (string, error) {
+	m := map[string]any{
+		"arr": self.arr,
+		"map": self._map,
+	}
+	return json.MarshalToString(m)
+}
+
 func newLuaTable(nArr, nRec int) *luaTable {
 	t := &luaTable{}
 	if nArr > 0 {

diff --git a/stdlib/lib_basic.go b/stdlib/lib_basic.go
@@ -386,7 +386,7 @@ func baseType(ls LkState) int {
 	return 1
 }
 
-// tostring (v)
+// str (v)
 // http://www.lua.org/manual/5.3/manual.html#pdf-tostring
 // lua-5.3.4/src/lbaselib.c#luaB_tostring()
 func baseToString(ls LkState) int {
@@ -395,7 +395,7 @@ func baseToString(ls LkState) int {
 	return 1
 }
 
-// tonumber (e [, base])
+// num (e [, base])
 // http://www.lua.org/manual/5.3/manual.html#pdf-tonumber
 // lua-5.3.4/src/lbaselib.c#luaB_tonumber()
 func baseToNumber(ls LkState) int {

diff --git a/stdlib/lib_http.go b/stdlib/lib_http.go
@@ -29,10 +29,27 @@ func OpenHttpLib(ls LkState) int {
 	return 1
 }
 
-func httpDo(method, url string, headers luaMap, body io.Reader) (int, string, error) {
+func genHeaderMap(h *http.Header) luaMap {
+	m := luaMap{}
+	for k := range *h {
+		v := strings.Join((*h)[k], ";")
+		m[k] = v
+	}
+	return m
+}
+
+func genReturn(code int, body string, header *http.Header) luaMap {
+	return luaMap{
+		"code": code,
+		"body": body,
+		"headers": genHeaderMap(header),
+	}
+}
+
+func httpDo(method, url string, headers luaMap, body io.Reader) (int, string, http.Header, error) {
 	request, err := http.NewRequest(method, url, body)
 	if err != nil {
-		return 0, "", err
+		return 0, "", nil, err
 	}
 
 	request.Header.Set("user-agent", "lk-http/"+consts.VERSION)
@@ -43,27 +60,27 @@ func httpDo(method, url string, headers luaMap, body io.Reader) (int, string, er
 
 	resp, err := client.Do(request)
 	if err != nil {
-		return 0, "", err
+		return 0, "", nil, err
 	}
 	respBody, err := ioutil.ReadAll(resp.Body)
 	if err != nil {
-		return 0, "", err
+		return 0, "", nil, err
 	}
 	defer resp.Body.Close()
-	return resp.StatusCode, string(respBody), nil
+	return resp.StatusCode, string(respBody), resp.Header, nil
 }
 
 func httpGet(ls LkState) int {
 	url := ls.CheckString(1)
 	headers := OptTable(ls, 2, luaMap{})
-	code, data, err := httpDo("GET", url, headers, nil)
+	code, data, respHeader, err := httpDo("GET", url, headers, nil)
 	if err != nil {
-		ls.PushInteger(0)
+		ls.PushNil()
 		ls.PushString(err.Error())
 		return 2
 	}
-	ls.PushInteger(int64(code))
-	ls.PushString(data)
+	pushTable(ls, genReturn(code, data, &respHeader))
+	ls.PushNil()
 	return 2
 }
 
@@ -79,14 +96,14 @@ func httpPost(ls LkState) int {
 		return nil
 	}()
 
-	code, data, err := httpDo("POST", url, headers, body)
+	code, data, respHeader, err := httpDo("POST", url, headers, body)
 	if err != nil {
-		ls.PushInteger(0)
+		ls.PushNil()
 		ls.PushString(err.Error())
 		return 2
 	}
-	ls.PushInteger(int64(code))
-	ls.PushString(data)
+	pushTable(ls, genReturn(code, data, &respHeader))
+	ls.PushNil()
 	return 2
 }
 
@@ -105,27 +122,27 @@ func httpReq(ls LkState) int {
 		return nil
 	}()
 
-	code, data, err := httpDo(method, url, headers, body)
+	code, data, respHeader, err := httpDo(method, url, headers, body)
 	if err != nil {
-		ls.PushInteger(0)
+		ls.PushNil()
 		ls.PushString(err.Error())
 		return 2
 	}
 
-	ls.PushInteger(int64(code))
+	pushTable(ls, genReturn(code, data, &respHeader))
 	ls.PushString(data)
 	return 2
 }
 
+
+
+
 func genReqTable(r *http.Request) (luaMap, error) {
 	body, err := ioutil.ReadAll(r.Body)
 	if err != nil {
 		return nil, err
 	}
-	headers := luaMap{}
-	for k := range r.Header {
-		headers[k] = r.Header[k]
-	}
+	headers := genHeaderMap(&r.Header)
 	return luaMap{
 		"method":  r.Method,
 		"url":     r.URL.String(),

diff --git a/stdlib/utils.go b/stdlib/utils.go
@@ -13,6 +13,8 @@ func pushValue(ls LkState, item any) {
 		ls.PushString(i)
 	case int64:
 		ls.PushInteger(i)
+	case int:
+		ls.PushInteger(int64(i))
 	case float64:
 		ls.PushNumber(i)
 	case bool:

diff --git a/test/basic.lk b/test/basic.lk
@@ -18,4 +18,5 @@ if #long >= 0 and '' {
 }
 
 print(6 ~/ 2, 6 & 2, 6 / 2)
-print({'a'} .. '', 1 .. 2, _VERSION, math.pi)
+print({'a'} .. '', 1 .. 2, _VERSION, math.pi)
+print(str({5, 'd': false}))
diff --git a/test/http_listen.lk b/test/http_listen.lk
@@ -2,11 +2,7 @@ shy headers = {}
 headers.__str = fn(a) {
     shy s = ''
     for k, v in a {
-        shy ss = ''
-        for _, vv in v {
-            ss = ss .. vv .. ';'
-        }
-        s = s .. k .. ': ' .. ss .. '\n'
+        s = s .. k .. ': ' .. v .. '\n'
     }
     rt s
 }

diff --git a/test/http_req.lk b/test/http_req.lk
@@ -1,14 +1,20 @@
-shy _, resp = http.post(
+shy resp, err = http.post(
     'http://httpbin.org/post', 
     {'accept': 'application/json'}, 
     '{"foo": "bar"}'
 )
-print(resp)
+if err == nil {
+    for k, v in resp.headers {
+        print(k, v)
+    }
+}
 
-shy code, resp = http.req(
+shy resp, _ = http.req(
     'delete',
     'http://httpbin.org/delete',
     {'accept': 'application/json'},
     '{"foo": "bar"}'
 )
-print(code, json.get(resp, 'json.foo'))
+if err == nil {
+    print(resp.code, json.get(resp.body, 'json.foo'))
+}