增加更新重启逻辑

This commit is contained in:
2025-10-17 17:03:19 +08:00
parent 7184defc50
commit 248f9a28e7
24 changed files with 604 additions and 65 deletions

View File

@@ -2,7 +2,6 @@ package cmd
import (
"context"
"net"
"time"
"github.com/ayflying/p2p/internal/controller/p2p"
@@ -23,6 +22,8 @@ func init() {
}
var (
s = g.Server()
Main = gcmd.Command{
Name: "main",
Usage: "main",
@@ -38,7 +39,6 @@ var (
ws := parser.GetOpt("ws", addr).String()
//port := parser.GetOpt("port", 0).Int()
s := g.Server()
s.Group("/", func(group *ghttp.RouterGroup) {
group.Middleware(ghttp.MiddlewareHandlerResponse)
group.Bind(
@@ -64,12 +64,12 @@ var (
err = service.P2P().Start(ctx, ws)
g.Log().Debugf(ctx, "当前监听端口:%v", s.GetListenedPort())
addrs, _ := net.InterfaceAddrs()
for _, addr := range addrs {
if ipnet, ok := addr.(*net.IPNet); ok && !ipnet.IP.IsLoopback() && ipnet.IP.To4() != nil {
g.Log().Infof(ctx, "访问地址:http://%v:%d", ipnet.IP.String(), s.GetListenedPort())
}
}
//addrs, _ := net.InterfaceAddrs()
//for _, addr := range addrs {
// if ipnet, ok := addr.(*net.IPNet); ok && !ipnet.IP.IsLoopback() && ipnet.IP.To4() != nil {
// g.Log().Infof(ctx, "访问地址:http://%v:%d", ipnet.IP.String(), s.GetListenedPort())
// }
//}
})

View File

@@ -3,6 +3,7 @@ package cmd
import (
"context"
"github.com/ayflying/p2p/internal/service"
"github.com/dop251/goja"
"github.com/gogf/gf/v2/frame/g"
"github.com/gogf/gf/v2/os/gcmd"
@@ -50,11 +51,13 @@ var (
msg = res.Export()
g.Dump(res.ToNumber())
case "p2p":
// host, err := service.P2P().Start(ctx)
// if err != nil {
// break
// }
// g.Dump(host.ID().String(), host.Addrs())
// host, err := service.P2P().Start(ctx)
// if err != nil {
// break
// }
// g.Dump(host.ID().String(), host.Addrs())
case "update":
service.OS().Update("v1.0.0", "http://127.0.0.1:8080")
}
g.Log().Debug(ctx, msg)
return

View File

@@ -84,9 +84,7 @@ var (
publicIp, err := service.P2P().GetIPv4PublicIP()
err = service.P2P().StoreAddrToDHT(ctx, "ip", publicIp)
if err != nil {
return
}
case "dht2":
h, _ := service.P2P().CreateLibp2pHost(ctx, 0)
err := service.P2P().DHTStart(ctx, h)
@@ -95,7 +93,7 @@ var (
}
get, _ := service.P2P().FindAddrFromDHT(ctx, "ip")
g.Dump(get)
s.SetPort(0)
default:
// 显示帮助信息
g.Log().Info(ctx, p2pHelpDescription)