Merge acceptallorigins into master and update README

This commit is contained in:
Maciej Krzyżanowski 2024-06-21 13:59:49 +02:00
commit c2ed49cd0a
3 changed files with 75 additions and 6 deletions

View File

@ -1,7 +1,8 @@
# 🔀 Archat # 🔀 Archat
*It is not working application yet, work in progress!* *This application in in alpha stage, some features may not be working correctly or there may be bugs*
Simple P2P server (and client - for testing purposes only, client for end user will be written in NodeJS using Electron, soon). Simple P2P server (and client - for testing purposes only, client for end user is written in Electron - you can
get it [there](https://github.com/DamianLaczynski/archat-client).
## Starting ## Starting
You can use these commands to start client and/or server: You can use these commands to start client and/or server:

View File

@ -24,6 +24,7 @@ import (
type InitiationInfo struct { type InitiationInfo struct {
otherSideNick string otherSideNick string
punchLaddrUsed *net.UDPAddr
} }
type Context struct { type Context struct {
@ -144,12 +145,23 @@ func (cliCtx *Context) handleStartChatD(reqFrame cm.RFrame) (res cm.Response, er
return nil, nil return nil, nil
} }
conn, err := net.Dial("udp", cliCtx.settings.UdpAddr) raddr, err := net.ResolveUDPAddr("udp", cliCtx.settings.UdpAddr)
if err != nil {
logger.Error(err)
return nil, nil
}
conn, err := net.DialUDP("udp", nil, raddr)
defer func() {
conn.Close()
logger.Debug("UDP 'connection' closed", "laddr", conn.LocalAddr())
}()
if err != nil { if err != nil {
logger.Error("error udp dialing for punch", err) logger.Error("error udp dialing for punch", err)
return nil, nil return nil, nil
} }
cliCtx.initiations[idx].punchLaddrUsed, _ = conn.LocalAddr().(*net.UDPAddr)
enc := json.NewEncoder(conn) enc := json.NewEncoder(conn)
err = enc.Encode(cm.PunchRequest{PunchCode: startChatDReq.PunchCode}) err = enc.Encode(cm.PunchRequest{PunchCode: startChatDReq.PunchCode})
@ -159,6 +171,8 @@ func (cliCtx *Context) handleStartChatD(reqFrame cm.RFrame) (res cm.Response, er
} }
logger.Debug("punch request sent!") logger.Debug("punch request sent!")
conn.Close()
logger.Debug("UDP 'connection' closed", "laddr", conn.LocalAddr())
return nil, nil return nil, nil
} }
@ -174,6 +188,56 @@ func (ctx *Context) handleChatStartFinish(reqFrame common.RFrame) (res common.Re
"nick", startChatFinishReq.OtherSideNickname, "nick", startChatFinishReq.OtherSideNickname,
"addr", startChatFinishReq.OtherSideAddress) "addr", startChatFinishReq.OtherSideAddress)
ctx.initiationsLock.RLock()
defer ctx.initiationsLock.RUnlock()
idx := slices.IndexFunc(ctx.initiations, func(i InitiationInfo) bool {
return i.otherSideNick == startChatFinishReq.OtherSideNickname
})
relatedInitiation := ctx.initiations[idx]
logger.Debug("punch laddr used", "laddr", relatedInitiation.punchLaddrUsed)
raddr, err := net.ResolveUDPAddr("udp", startChatFinishReq.OtherSideAddress)
if err != nil {
logger.Error(err)
return nil, nil
}
logger.Debug("resolved raddr", "raddr", raddr.String())
logger.Debug("dialing udp")
conn, err := net.DialUDP("udp", relatedInitiation.punchLaddrUsed, raddr)
if err != nil {
logger.Error(err)
return nil, nil
}
logger.Debugf("dialed udp L%s<->R%s", relatedInitiation.punchLaddrUsed.String(), raddr.String())
go func() {
logger.Debug("waiting for message from other peer")
bb := make([]byte, 1024)
conn.SetDeadline(time.Now().Add(time.Second * 5))
n, _, err := conn.ReadFrom(bb)
if err != nil {
logger.Error(err)
return
}
bb = bb[:n]
logger.Debug("got info from other peer", "info", string(bb))
}()
for i := 0; i < 5; i++ {
logger.Debugf("writing Hello to other peer")
_, err = conn.Write([]byte("Hello"))
if err != nil {
logger.Error(err)
return nil, nil
}
time.Sleep(time.Second)
}
return nil, nil return nil, nil
} }
@ -445,7 +509,7 @@ func RunClient(settings common.ClientSettings) {
cliCtx.initiationsLock.RLock() cliCtx.initiationsLock.RLock()
for _, i := range cliCtx.initiations { for _, i := range cliCtx.initiations {
logger.Debugf("with %s", i.otherSideNick) logger.Debugf("with %+v", i)
} }
cliCtx.initiationsLock.RUnlock() cliCtx.initiationsLock.RUnlock()
} else if cmdName == "startchatc" { } else if cmdName == "startchatc" {

View File

@ -548,7 +548,11 @@ func testEcho(hdlCtx *handlerContext) {
} }
func (ctx *serverContext) wsapiHandler(w http.ResponseWriter, r *http.Request) { func (ctx *serverContext) wsapiHandler(w http.ResponseWriter, r *http.Request) {
upgrader := websocket.Upgrader{} upgrader := websocket.Upgrader{
CheckOrigin: func(r *http.Request) bool {
return true // Allow all origins
},
}
conn, err := upgrader.Upgrade(w, r, nil) conn, err := upgrader.Upgrade(w, r, nil)