WIP

Author: Tom32i

.eslintrc.json

@@ -1,3 +1,3 @@
 /client.js
-/server.js
+/server.cjs
 /node_modules

.gitignore

@@ -18,24 +18,33 @@ build:
 demo-client:
 	php -S 0.0.0.0:8000 -t .
 
-# Launch demo server
-demo-server:
+# Launch Node demo server
+demo-server-node: build
+	node ./demo/server.js 8002
 
-	node ./demo-server.js 8002
-## Start server
+## Launch Golang demo server
 #demo-server-go: export GODEBUG=gctrace=1
 demo-server-go:
-	go run demo-server.go
+	go run demo/server.go
 
 # Lint and code style fix
-lint:
-	npx eslint src/* --ext .js,.json --fix
+lint: lint-js lint-go
+
+lint-js:
+	npx eslint demo/**/*.js src/** --fix
+
+lint-go:
 	gofmt -s -w .
 
 # Test
-test: build
+test: test-js test-go
+
+test-js: build
 	npx mocha
 
+test-go:
+	go test ./go/...
+
 # Publish package
 publish: build
 	npm publish . --access public

Makefile

@@ -1,5 +1,6 @@
+/* global netcode */
 window.addEventListener('load', () => {
-    const { Client, BinaryEncoder, Codec, UInt8Codec, UInt16Codec, UInt64Codec, UIntLongCodec, BooleanCodec, StringCodec, StringLongCodec } = netcode;
+    const { Client, BinaryEncoder, UInt8Codec, UIntLongCodec, BooleanCodec, StringLongCodec } = netcode;
 
     // Register your events
     const encoder = new BinaryEncoder([
@@ -22,25 +23,25 @@ window.addEventListener('load', () => {
 
     // Listen for an "id" event
     client.on('id', ({ detail: id }) => {
-        console.log('connected with id %s', id);
+        console.info('connected with id %s', id);
         ping = Date.now();
 
-        console.log('sending ping: %s', ping);
+        console.info('sending ping: %s', ping);
 
         // Send a "ping" event
         client.send('ping', ping);
     });
 
     // Listen for a "total" event
     client.on('total', ({ detail: total }) => {
-        console.log(`There is ${total} people connected.`)
+        console.info(`There is ${total} people connected.`);
     });
 
     // Listen for an "inverse" event
     client.on('inverse', ({ detail: status }) => {
         // Answer with an "inverse" event
         client.send('inverse', !status);
-        console.log('Inverse received: %s', status);
+        console.info('Inverse received: %s', status);
 
         // Send a "greeting" event
         client.send('greeting', 'Hello, I\'m client 😊! Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut imperdiet molestie libero, ut sollicitudin tortor dignissim quis. Nulla iaculis nisi turpis, a malesuada nibh faucibus a. Nunc tellus lorem, varius sit amet tellus eu, dictum consectetur nulla.');
@@ -49,7 +50,7 @@ window.addEventListener('load', () => {
 
     // Listen for a "greeting" event
     client.on('greeting', ({ detail: message }) => {
-        console.log('Servers geets you: "%s"', message);
+        console.info('Servers geets you: "%s"', message);
     });
 
     // Listen for oppening connection

demo-server.go

@@ -0,0 +1,101 @@
+package main
+
+import (
+	"flag"
+	netcode "github.com/Tom32i/netcode/go"
+	"github.com/gorilla/websocket"
+	"log"
+	"math"
+	"net/http"
+	"time"
+)
+
+type Demo struct {
+	sockets *netcode.Sockets
+}
+
+func main() {
+	port := flag.Int("port", 8002, "Port to run on")
+
+	flag.Parse()
+
+	encoder := netcode.CreateBinaryEncoder([]*netcode.RegisteredCodec{
+		{0, "id", netcode.UInt8Codec{}},
+		{1, "ping", netcode.LongUIntCodec{6}},
+		{2, "pong", netcode.LongUIntCodec{6}},
+		{3, "inverse", netcode.BooleanCodec{}},
+		{4, "greeting", netcode.StringLongCodec{}},
+		{5, "total", netcode.UInt8Codec{}},
+	}, netcode.UInt8Codec{})
+
+	demo := Demo{
+		netcode.CreateSockets(encoder, uint(math.Pow(2, 8))),
+	}
+
+	go demo.run()
+
+	netcode.Start(*port, "/", func(conn *websocket.Conn, request *http.Request) {
+		socket, err := demo.sockets.Add(conn)
+
+		if err != nil {
+			log.Fatal(err)
+		}
+
+		demo.onClientJoin(socket)
+	})
+}
+
+func (demo *Demo) run() {
+	log.Printf("Demo is running")
+	for {
+		select {
+		case m := <-demo.sockets.In:
+			switch m.Message.Name {
+			case "ping":
+				demo.handlePing(m.Socket, m.Message)
+			case "greeting":
+				demo.handleGreeting(m.Socket, m.Message)
+			default:
+				log.Printf("[socket #%d] '%s': %v", m.Socket.ID, m.Message.Name, m.Message.Data)
+			}
+		case socket := <-demo.sockets.Out:
+			demo.onClientLeave(socket)
+			// switch e.Name {
+			// case "socket:join":
+			// 	demo.onClientJoin(e.Data.(*netcode.Socket))
+			// case "socket:leave":
+			// 	demo.onClientLeave(e.Data.(*netcode.Socket))
+			// default:
+			// 	log.Printf("event '%s': %v", e.Name, e.Data)
+			// }
+		}
+	}
+}
+
+func (demo *Demo) broadcastTotal() {
+	demo.sockets.SendAll(
+		&netcode.Message{"total", uint8(demo.sockets.Count())},
+	)
+}
+
+func (demo *Demo) onClientJoin(s *netcode.Socket) {
+	log.Printf("Client #%d joined.", s.ID)
+	s.Send(&netcode.Message{"id", uint8(s.ID)})
+	demo.broadcastTotal()
+}
+
+func (demo *Demo) onClientLeave(s *netcode.Socket) {
+	log.Printf("Client #%d left.", s.ID)
+	demo.broadcastTotal()
+}
+
+func (demo *Demo) handlePing(s *netcode.Socket, m *netcode.Message) {
+	log.Printf("Client #%d ping: %d.", s.ID, m.Data)
+	s.Send(&netcode.Message{"pong", uint(time.Now().UnixMilli())})
+	s.Send(&netcode.Message{"inverse", true})
+}
+
+func (demo *Demo) handleGreeting(s *netcode.Socket, m *netcode.Message) {
+	log.Printf("Client #%d greets you: '%s'.", s.ID, m.Data)
+	s.Send(&netcode.Message{"greeting", "Hello, I'm server! 😊 Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut imperdiet molestie libero, ut sollicitudin tortor dignissim quis. Nulla iaculis nisi turpis, a malesuada nibh faucibus a. Nunc tellus lorem, varius sit amet tellus eu, dictum consectetur nulla."})
+}

demo-client.js demo/client.jsdemo-client.js renamed to demo/client.js

@@ -1,4 +1,5 @@
-const { Server, BinaryEncoder, Codec, UInt8Codec, UInt16Codec, UIntLongCodec, BooleanCodec, StringLongCodec } = require('./server');
+import netcode from '../server.cjs';
+const { Server, BinaryEncoder, UInt8Codec, UIntLongCodec, BooleanCodec, StringLongCodec, } = netcode;
 
 // Register your events
 const encoder = new BinaryEncoder([
@@ -16,26 +17,26 @@ const server = new Server(port, '127.0.0.1', encoder, 3);
 
 // Listen for new clients
 server.on('client:join', client => {
-    console.log('Client %s joined.', client.id);
+    console.info('Client %s joined.', client.id);
 
     // Listen for "ping" event
     client.on('ping', ping => {
         // Answer with a "pong" event
         client.send('pong', Date.now());
-        console.log('Client %s ping received: %s.', client.id, ping);
+        console.info('Client %s ping received: %s.', client.id, ping);
 
         // Send a "inverse" event
         client.send('inverse', true);
     });
 
     // Listen for "inverse" event
     client.on('inverse', status => {
-        console.log('Client %s inverse received: %s.', client.id, status);
+        console.info('Client %s inverse received: %s.', client.id, status);
     });
 
     // Listen for "greeting" event
     client.on('greeting', message => {
-        console.log('Client %s greets you: "%s"', client.id, message);
+        console.info('Client %s greets you: "%s"', client.id, message);
         // Send a "greeting" event
         client.send('greeting', 'Hello, I\'m server! 😊 Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut imperdiet molestie libero, ut sollicitudin tortor dignissim quis. Nulla iaculis nisi turpis, a malesuada nibh faucibus a. Nunc tellus lorem, varius sit amet tellus eu, dictum consectetur nulla.');
     });
@@ -48,15 +49,15 @@ server.on('client:join', client => {
 
 // Listen for disconnecting clients
 server.on('client:leave', client => {
-    console.log('Client %s left.', client.id);
+    console.info('Client %s left.', client.id);
     broadcastTotal();
 });
 
-server.on('ready', () => console.log('Listening on port %s', port));
+server.on('ready', () => console.info('Listening on port %s', port));
 
 function broadcastTotal() {
     const { length } = server.clients;
     server.clients.forEach(client => client.send('total', length));
 }
 
-module.exports = server;
+export default server;