Make http and url global.

lib/preload.go

@@ -37,14 +37,12 @@ var Loads = []Load{
 
 	art.Preload,
 	bcrypt.Preload,
-	http.Preload,
 	mail.Preload,
 	odbc.Preload,
 	pwdchecker.Preload,
 	re.Preload,
 	readline.Preload,
 	uuid.Preload,
-	url.Preload,
 	urlpath.Preload,
 
 	base64.Preload,
@@ -56,7 +54,9 @@ var Loads = []Load{
 }
 
 var Loaders = map[string]Loader{
+	"http": http.Loader,
 	"json": json.Loader,
+	"url":  url.Loader,
 }
 
 func Open(L *lua.LState) {
@@ -65,7 +65,7 @@ func Open(L *lua.LState) {
 	}
 	for name, loader := range Loaders {
 		if loader(L) != 1 {
-			panic("loader must return only one value")
+			panic("loader must return and only return one value")
 		}
 		obj := L.Get(1)
 		L.SetGlobal(name, obj)

lib/url/api.go

@@ -78,7 +78,7 @@ func Decode(L *lua.LState) int {
 	return 1
 }
 
-var URLExports = map[string]lua.LGFunction{
+var urlAPI = map[string]lua.LGFunction{
 	"resolve": URLJoin,
 }
 
@@ -123,7 +123,7 @@ func URLGet(L *lua.LState) int {
 	case "username":
 		L.Push(lua.LString(u.User.Username()))
 	default:
-		if v, ok := URLExports[k]; ok {
+		if v, ok := urlAPI[k]; ok {
 			L.Push(L.NewFunction(v))
 		} else {
 			L.Push(lua.LNil)

main.go

@@ -80,7 +80,6 @@ var (
 var DefaultPidFile = "mirai.pid"
 
 func main() {
-	time.Sleep(100 * time.Millisecond)
 	app := cli.NewApp()
 	app.Usage = "Server for the Mirai Project"
 	app.Version = fmt.Sprintf("%s %s", version, build)
@@ -104,16 +103,16 @@ func main() {
 		{
 			Name:  "start",
 			Usage: "Start the server (default)",
-			Description: "Start command finds project.lua in the specified project path. \n" +
-				"Then, it starts the server based on the configuration. \n" +
+			Description: "Start command finds project.lua in the specified project path.\n" +
+				"Then, it starts the server based on the configuration.\n" +
 				"If it is not found, it will set up a temporary server and database and enter interactive mode.",
 			ArgsUsage:       "arguments are passed to Lua scripts without parsing",
 			SkipFlagParsing: true,
 			Action:          start,
 		},
 		{
 			Name:            "run",
-			Usage:           "Run command",
+			Usage:           "Run command specified in the project.lua.",
 			ArgsUsage:       "arguments are passed to Lua scripts without parsing",
 			SkipFlagParsing: true,
 			Action:          run,
@@ -216,7 +215,7 @@ func worker(ctx *cli.Context, c config.Config) error {
 
 	app := fiber.
 		New(fiber.Config{
-			ServerHeader:          "Mirai Server",
+			ServerHeader:          servername,
 			DisableStartupMessage: true,
 		})
 	app.
@@ -366,6 +365,7 @@ func worker(ctx *cli.Context, c config.Config) error {
 		Register("db", ledb.New(c.DB)).
 		Register("cli", lecli.New(ctx.Args().Slice(), colors)).
 		Run(c.Index)
+	defer G.Close()
 
 	if err := G.Err(); err != nil {
 		return err
@@ -415,6 +415,7 @@ func startInteractive(ctx *cli.Context) {
 		Register("app", leapp.New(capp)).
 		Register("db", ledb.New(db)).
 		Register("cli", lecli.New(ctx.Args().Slice(), colors))
+	defer G.Close()
 	if err := G.Err(); err != nil {
 		fail("%v\n", err)
 	}
@@ -441,6 +442,7 @@ func run(ctx *cli.Context) error {
 		Register("db", ledb.New(c.DB)).
 		Register("cli", lecli.New(args.Tail(), colors)).
 		Run(cmd)
+	defer G.Close()
 	if err := G.Err(); err != nil {
 		fail("%v\n", err)
 	}

types/libraries/http.lua → types/globals/http.lua

@@ -1,7 +1,7 @@
 ---@meta
 
 ---@class httplib
-local http = {}
+http = {}
 
 --- 发送请求。
 ---@param verb string 方法
@@ -94,5 +94,3 @@ function Request:auth(username, password) end
 ---@param key string
 ---@param value string
 function Request.set(key, value) end
-
-return http

types/libraries/url.lua → types/globals/url.lua

@@ -1,7 +1,7 @@
 ---@meta
 
 ---@class uuidlib
-local url = {}
+url = {}
 
 --- 解析 URL。
 ---@param input string 要解析的绝对或相对的输入网址。
@@ -89,5 +89,3 @@ URL.username = ""
 ---@param path string 路径
 ---@return url_URL
 function URL.join(path) end
-
-return url