5 Commits
dev ... master

Author SHA1 Message Date
78fc53a9a4 Fix build issue with server
All checks were successful
Run Tests / Test (push) Successful in 18s
Benchmark BufferPool / RunBenchmarks (push) Successful in 29s
2024-08-02 12:03:38 +02:00
0315a0877b Implement some sort of rate limiting
Some checks failed
Run Tests / Test (push) Failing after 17s
Benchmark BufferPool / RunBenchmarks (push) Failing after 28s
2024-08-02 11:15:24 +02:00
e8b9eb934b Implement a reactive value
Not useful yet... I thought it would be but I changed my mind...
Need to think about this a lot more
2024-08-01 23:27:46 +02:00
797e1f025b Add some sort of auto retry/management for client 2024-08-01 22:47:47 +02:00
4d7e13a304 Implement a basic smpp client
All checks were successful
Run Tests / Test (push) Successful in 17s
Benchmark BufferPool / RunBenchmarks (push) Successful in 31s
2024-07-31 22:59:56 +02:00
7 changed files with 291 additions and 40 deletions

1
.gitignore vendored
View File

@@ -1,3 +1,4 @@
jstester/node_modules jstester/node_modules
encoding/tmp encoding/tmp
pdu/tmp pdu/tmp
tmp

View File

@@ -1 +1,165 @@
package client package client
import (
"context"
"fmt"
"log"
"net"
"smpptester/pdu"
"smpptester/utils"
"time"
"golang.org/x/time/rate"
)
var (
SMPP_CLIENT_RETRY_TIMEOUT = 1 * time.Second
SMPP_CLIENT_SEND_QUEUE_SIZE = 1024 * 8
SMPP_CLIENT_RECEIVE_QUEUE_SIZE = 1024 * 8
SMPP_CLIENT_ASYNC_SEND_WORKERS = 16
SMPP_CLIENT_SEND_LIMIT = 4
)
type SMPPClient struct {
Id int
Connected bool
SendQueue chan pdu.PDU
ReceiveQueue chan pdu.PDU
SendLimit *utils.ReactiveValue[int]
sendLimiter *rate.Limiter
enabled bool
running bool
conn net.Conn
port string
log log.Logger
dcErr chan (error)
}
func NewSMPPClient(port string, id int) *SMPPClient {
client := &SMPPClient{
Id: id,
SendQueue: make(chan pdu.PDU, SMPP_CLIENT_SEND_QUEUE_SIZE),
ReceiveQueue: make(chan pdu.PDU, SMPP_CLIENT_RECEIVE_QUEUE_SIZE),
SendLimit: utils.NewReactiveValue[int](SMPP_CLIENT_SEND_LIMIT),
sendLimiter: rate.NewLimiter(rate.Limit(SMPP_CLIENT_SEND_LIMIT), SMPP_CLIENT_SEND_LIMIT),
port: port,
log: log.Logger{},
dcErr: make(chan error, 128),
}
client.log = *log.New(log.Writer(), "", log.LstdFlags|log.Lshortfile)
client.log.SetPrefix(fmt.Sprintf("SMPP client %d: ", client.Id))
go func() {
limit := client.SendLimit.Subscribe()
defer client.SendLimit.Unsubscribe(limit)
for {
v := <-limit
client.log.Printf("Send limit changed to %d", *v)
client.sendLimiter.SetLimit(rate.Limit(*v))
client.sendLimiter.SetBurst(*v)
}
}()
return client
}
func (c *SMPPClient) Enable() {
if c.enabled {
c.log.Printf("SMPP client %d is already enabled", c.Id)
return
}
c.enabled = true
c.start()
c.log.Printf("SMPP client %d enabled", c.Id)
}
func (c *SMPPClient) Disable() {
if !c.enabled {
c.log.Printf("SMPP client %d is already disabled", c.Id)
return
}
c.enabled = false
c.dcErr <- fmt.Errorf("client is disabled")
if c.conn != nil {
c.conn.Close()
}
c.log.Printf("SMPP client %d disabled", c.Id)
}
func (c *SMPPClient) start() {
if c.running {
c.log.Printf("SMPP client %d is already running", c.Id)
return
}
go func() {
c.running = true
defer func() {
c.running = false
}()
c.log.Printf("SMPP client %d started", c.Id)
for {
if c.enabled && !c.Connected {
c.log.Printf("Trying to connect to %s", c.port)
err := c.connect()
if err != nil {
c.dcErr <- err
}
}
err := <-c.dcErr
c.Connected = false
if c.enabled {
c.log.Printf("Disconnected: '%v' trying again in %d second(s)", err, int(SMPP_CLIENT_RETRY_TIMEOUT.Seconds()))
time.Sleep(SMPP_CLIENT_RETRY_TIMEOUT)
} else {
c.log.Printf("Disconnected: '%v' & client is disabled, quitting", err)
break
}
}
}()
}
func (c *SMPPClient) connect() error {
if !c.enabled {
return fmt.Errorf("client is not enabled")
}
if c.Connected {
return fmt.Errorf("client is already connected")
}
conn, err := net.Dial("tcp", c.port)
if err != nil {
return fmt.Errorf("failed to connect to SMPP server: %w", err)
}
c.log.Printf("SMPP client %d connected to %s", c.Id, c.port)
c.Connected = true
c.conn = conn
return nil
}
func (c *SMPPClient) Send(pdata pdu.PDU) error {
if c.conn == nil {
return fmt.Errorf("connection is not established")
}
pdata.UpdateSize()
buf := pdu.ByteBufferPool.Get(pdata.Size())
err := pdata.Encode(buf)
if err != nil {
return fmt.Errorf("failed to encode PDU: %w", err)
}
err = c.sendLimiter.Wait(context.Background())
if err != nil {
return fmt.Errorf("failed to wait for rate limiter: %w", err)
}
_, err = c.conn.Write(buf.Bytes())
if err != nil {
c.dcErr <- err
return fmt.Errorf("failed to send PDU: %w", err)
}
// c.log.Printf("SMPP client %d sent PDU: %+v", c.Id, pdata)
return nil
}

5
go.mod
View File

@@ -2,4 +2,7 @@ module smpptester
go 1.22.4 go 1.22.4
require github.com/yuin/gopher-lua v1.1.1 require (
github.com/yuin/gopher-lua v1.1.1
golang.org/x/time v0.5.0
)

2
go.sum
View File

@@ -1,2 +1,4 @@
github.com/yuin/gopher-lua v1.1.1 h1:kYKnWBjvbNP4XLT3+bPEwAXJx262OhaHDWDVOPjL46M= github.com/yuin/gopher-lua v1.1.1 h1:kYKnWBjvbNP4XLT3+bPEwAXJx262OhaHDWDVOPjL46M=
github.com/yuin/gopher-lua v1.1.1/go.mod h1:GBR0iDaNXjAgGg9zfCvksxSRnQx76gclCIb7kdAd1Pw= github.com/yuin/gopher-lua v1.1.1/go.mod h1:GBR0iDaNXjAgGg9zfCvksxSRnQx76gclCIb7kdAd1Pw=
golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=

54
main.go
View File

@@ -4,9 +4,10 @@ import (
"bytes" "bytes"
"encoding/binary" "encoding/binary"
"log" "log"
"net"
"sync" "sync"
"time"
"smpptester/client"
"smpptester/pdu" "smpptester/pdu"
) )
@@ -166,47 +167,26 @@ func main() {
buf := pdu.ByteBufferPool.Get(submit.Size()) buf := pdu.ByteBufferPool.Get(submit.Size())
defer pdu.ByteBufferPool.Put(buf) defer pdu.ByteBufferPool.Put(buf)
submit.Encode(buf) submit.Encode(buf)
log.Println(buf.Bytes())
log.Println(createSubmitSMPDU())
// log.Println(pdu.Encode())
// serviceType := "CMT"
// sourceAddrTON := byte(0x01)
// sourceAddrNPI := byte(0x01)
// sourceAddr := "12345"
// destAddrTON := byte(0x01)
// destAddrNPI := byte(0x01)
// destinationAddr := "67890"
// esmClass := byte(0x00)
// protocolID := byte(0x00)
// priorityFlag := byte(0x00)
// scheduleDeliveryTime := ""
// validityPeriod := ""
// registeredDelivery := byte(0x01)
// replaceIfPresentFlag := byte(0x00)
// dataCoding := byte(0x01)
// smDefaultMsgID := byte(0x00)
// shortMessage := "Hello, SMPP!"
wg := &sync.WaitGroup{} wg := &sync.WaitGroup{}
wg.Add(1) wg.Add(1)
conn, err := net.Dial("tcp", "localhost:2775") client := client.NewSMPPClient("localhost:2775", 1)
if err != nil { client.Enable()
log.Printf("Failed to connect to SMPP server: %+v", err) for {
return if client.Connected {
} // err := client.Send(submit)
log.Printf("Connected to SMPP server") // if err != nil {
defer conn.Close() // log.Printf("Failed to send PDU: %v", err)
// }
go func() { go client.Send(submit)
conn.Write(buf.Bytes()) // if rand.Int() % 1000 == 0 {
data, err := conn.Read(make([]byte, 1024)) // client.SendLimit.Set(rand.Int() % 1000)
if err != nil { // }
log.Printf("Failed to read from connection: %+v", err)
return
} }
log.Printf("Received data: %#v", data) time.Sleep(500 * time.Millisecond)
}() }
log.Println("Are we done")
wg.Wait() wg.Wait()
} }

View File

@@ -1 +1,66 @@
package server package server
import (
"fmt"
"log"
"net"
)
type SMPPServer struct {
Id int
conns []*net.Conn
listener net.Listener
port string
log log.Logger
}
func NewSMPPServer(port string, id int) *SMPPServer {
server := &SMPPServer{
port: port,
log: log.Logger{},
Id: id,
}
server.log = *log.New(log.Writer(), "", log.LstdFlags)
server.log.SetPrefix(fmt.Sprintf("SMPP server %d: ", server.Id))
return server
}
func (s *SMPPServer) Listen() error {
listener, err := net.Listen("tcp", s.port)
if err != nil {
return fmt.Errorf("failed to start SMPP server: %w", err)
}
// s.log.Printf("SMPP server %d started on %s", s.port)
s.listener = listener
return nil
}
// package main
// import (
// "net"
// "fmt"
// )
// func main() {
// ln, err := net.Listen("tcp", ":8080")
// if err != nil {
// fmt.Println(err)
// return
// }
// defer ln.Close()
// for {
// conn, err := ln.Accept()
// if err != nil {
// fmt.Println(err)
// continue
// }
// go handleConnection(conn)
// }
// }
// func handleConnection(conn net.Conn) {
// defer conn.Close()
// // Handle the connection
// }

36
utils/reactivevalue.go Normal file
View File

@@ -0,0 +1,36 @@
package utils
type ReactiveValue[T any] struct {
V T
subscribers []chan *T
}
func NewReactiveValue[T any](value T) *ReactiveValue[T] {
return &ReactiveValue[T]{
V: value,
subscribers: make([]chan *T, 0),
}
}
func (rv *ReactiveValue[T]) Set(value T) {
rv.V = value
for _, subscriber := range rv.subscribers {
subscriber <- &value
}
}
func (rv *ReactiveValue[T]) Subscribe() chan *T {
subscriber := make(chan *T)
rv.subscribers = append(rv.subscribers, subscriber)
return subscriber
}
func (rv *ReactiveValue[T]) Unsubscribe(subscriber chan *T) {
for i, s := range rv.subscribers {
if s == subscriber {
rv.subscribers = append(rv.subscribers[:i], rv.subscribers[i+1:]...)
close(subscriber)
return
}
}
}