diff --git a/PORTING_GUIDE.md b/PORTING_GUIDE.md index db0f831..4c544ac 100644 --- a/PORTING_GUIDE.md +++ b/PORTING_GUIDE.md @@ -22,11 +22,11 @@ ## 새 언어 추가 절차 -1. 새 언어 디렉터리를 만들기 전에 `agent-ops/skills/project/add-toki-socket-crosstest-language/templates/`의 문서를 복사해 패키지 README와 체크리스트 초안으로 사용한다. +1. 새 언어 디렉터리를 만들기 전에 `agent-ops/skills/project/add-proto-socket-crosstest-language/templates/`의 문서를 복사해 패키지 README와 체크리스트 초안으로 사용한다. 2. `PROTOCOL.md`와 `VERSIONING.md`의 현재 protocol version을 기준으로 지원 범위를 정한다. 3. canonical proto인 `proto/message_common.proto`에서 언어별 protobuf binding을 생성한다. Go처럼 generator 전용 option이 필요하면 언어 패키지 안에 copy를 둘 수 있지만, message schema는 `tools/check_proto_sync.sh`로 검증 가능해야 한다. 4. `Transport`와 `Communicator`를 먼저 구현하고, 그 위에 TCP/TLS+TCP/WS/WSS client/server를 올린다. -5. 같은 언어 단위 테스트를 작성한 뒤 `agent-ops/skills/project/add-toki-socket-crosstest-language/SKILL.md`의 runner 배치 규칙에 맞춰 양방향 crosstest를 추가한다. +5. 같은 언어 단위 테스트를 작성한 뒤 `agent-ops/skills/project/add-proto-socket-crosstest-language/SKILL.md`의 runner 배치 규칙에 맞춰 양방향 crosstest를 추가한다. 6. README의 Implementations 표를 `Available`로 바꾸기 전에 formatter/linter, 단위 테스트, cross-language tests를 모두 통과시킨다. 템플릿은 시작점과 완료 조건만 고정한다. 실제 소스 구조, 패키지 매니저, async runtime은 각 언어의 관용적 선택을 따른다. diff --git a/PROTOCOL.md b/PROTOCOL.md index c72c4cf..e7c4410 100644 --- a/PROTOCOL.md +++ b/PROTOCOL.md @@ -1,4 +1,4 @@ -# Toki Socket Protocol +# Proto Socket Protocol Binary TCP and WebSocket protocol using Protocol Buffers for message framing and type-based routing. Designed for bidirectional, heterogeneous communication across languages and platforms. diff --git a/README.md b/README.md index 2498ffa..5f2b498 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Toki Socket +# Proto Socket Binary socket protocol library for bidirectional, heterogeneous communication across languages and platforms. @@ -42,14 +42,14 @@ Protocol compatibility is tracked separately from language package versions. See | TypeScript | Available | [typescript/](typescript/) | Browser, Node.js | | Python | Available | [python/](python/) | Server, tooling, scripting | -New language implementations should start from [PORTING_GUIDE.md](PORTING_GUIDE.md) and the templates in [agent-ops/skills/project/add-toki-socket-crosstest-language/templates/](agent-ops/skills/project/add-toki-socket-crosstest-language/templates/). Mark an implementation available only after its same-language tests and cross-language tests pass. +New language implementations should start from [PORTING_GUIDE.md](PORTING_GUIDE.md) and the templates in [agent-ops/skills/project/add-proto-socket-crosstest-language/templates/](agent-ops/skills/project/add-proto-socket-crosstest-language/templates/). Mark an implementation available only after its same-language tests and cross-language tests pass. --- ## Quick Start (Dart) ```dart -import 'package:toki_socket/toki_socket.dart'; +import 'package:proto_socket/proto_socket.dart'; // 1. Define your message in message_common.proto, generate with protoc @@ -107,13 +107,13 @@ import ( "google.golang.org/protobuf/proto" - toki "toki-labs.com/toki_socket/go" - "toki-labs.com/toki_socket/go/packets" + protoSocket "git.toki-labs.com/toki/common-proto-socket/go" + "git.toki-labs.com/toki/common-proto-socket/go/packets" ) -func parserMap() toki.ParserMap { - return toki.ParserMap{ - toki.TypeNameOf(&packets.TestData{}): func(b []byte) (proto.Message, error) { +func parserMap() protoSocket.ParserMap { + return protoSocket.ParserMap{ + protoSocket.TypeNameOf(&packets.TestData{}): func(b []byte) (proto.Message, error) { m := &packets.TestData{} return m, proto.Unmarshal(b, m) }, @@ -123,11 +123,11 @@ func parserMap() toki.ParserMap { func main() { ctx := context.Background() - server := toki.NewTcpServer("127.0.0.1", 9090, func(conn net.Conn) *toki.TcpClient { - return toki.NewTcpClient(conn, 30, 10, parserMap()) + server := protoSocket.NewTcpServer("127.0.0.1", 9090, func(conn net.Conn) *protoSocket.TcpClient { + return protoSocket.NewTcpClient(conn, 30, 10, parserMap()) }) - server.OnClientConnected = func(client *toki.TcpClient) { - toki.AddRequestListenerTyped[*packets.TestData, *packets.TestData]( + server.OnClientConnected = func(client *protoSocket.TcpClient) { + protoSocket.AddRequestListenerTyped[*packets.TestData, *packets.TestData]( &client.Communicator, func(req *packets.TestData) (*packets.TestData, error) { return &packets.TestData{Index: req.GetIndex(), Message: "echo: " + req.GetMessage()}, nil @@ -139,13 +139,13 @@ func main() { } defer server.Stop() - client, err := toki.DialTcp(ctx, "127.0.0.1", 9090, 30, 10, parserMap()) + client, err := protoSocket.DialTcp(ctx, "127.0.0.1", 9090, 30, 10, parserMap()) if err != nil { panic(err) } defer client.Close() - res, err := toki.SendRequestTyped[*packets.TestData, *packets.TestData]( + res, err := protoSocket.SendRequestTyped[*packets.TestData, *packets.TestData]( &client.Communicator, &packets.TestData{Index: 1, Message: "hello"}, 2*time.Second, @@ -200,7 +200,7 @@ dart run crosstest/dart_go.dart ```bash cd kotlin -./gradlew run -PmainClass=com.tokilabs.toki_socket.crosstest.KotlinGoKt +./gradlew run -PmainClass=com.tokilabs.proto_socket.crosstest.KotlinGoKt ``` When proto files change, also run: diff --git a/VERSIONING.md b/VERSIONING.md index 621ec37..8908039 100644 --- a/VERSIONING.md +++ b/VERSIONING.md @@ -1,6 +1,6 @@ # Versioning -Toki Socket tracks protocol compatibility separately from language package versions. +Proto Socket tracks protocol compatibility separately from language package versions. ## Current Versions diff --git a/agent-ops/rules/project/domain/dart/rules.md b/agent-ops/rules/project/domain/dart/rules.md index cf03015..0de7e4d 100644 --- a/agent-ops/rules/project/domain/dart/rules.md +++ b/agent-ops/rules/project/domain/dart/rules.md @@ -2,7 +2,7 @@ ## 목적 / 책임 -Toki Socket의 Dart/Flutter 구현체를 담당한다. ProtobufClient, ProtobufServer 등 핵심 클래스를 제공하며, 크로스 언어 테스트의 기준 구현으로 동작한다. +Proto Socket의 Dart/Flutter 구현체를 담당한다. ProtobufClient, ProtobufServer 등 핵심 클래스를 제공하며, 크로스 언어 테스트의 기준 구현으로 동작한다. ## 포함 경로 diff --git a/agent-ops/rules/project/domain/go/rules.md b/agent-ops/rules/project/domain/go/rules.md index 95fb7ac..ccced52 100644 --- a/agent-ops/rules/project/domain/go/rules.md +++ b/agent-ops/rules/project/domain/go/rules.md @@ -2,7 +2,7 @@ ## 목적 / 책임 -Toki Socket의 Go 구현체를 담당한다. TCP/WebSocket 서버·클라이언트, TLS 지원, 타입 헬퍼 함수를 제공하며, 서버·툴링·스크립팅 용도로 사용된다. +Proto Socket의 Go 구현체를 담당한다. TCP/WebSocket 서버·클라이언트, TLS 지원, 타입 헬퍼 함수를 제공하며, 서버·툴링·스크립팅 용도로 사용된다. ## 포함 경로 diff --git a/agent-ops/rules/project/domain/kotlin/rules.md b/agent-ops/rules/project/domain/kotlin/rules.md index 1204330..060c2b6 100644 --- a/agent-ops/rules/project/domain/kotlin/rules.md +++ b/agent-ops/rules/project/domain/kotlin/rules.md @@ -2,7 +2,7 @@ ## 목적 / 책임 -Toki Socket의 Kotlin/Android 구현체를 담당한다. Android 및 JVM 환경을 대상으로 한다. +Proto Socket의 Kotlin/Android 구현체를 담당한다. Android 및 JVM 환경을 대상으로 한다. ## 포함 경로 diff --git a/agent-ops/rules/project/rules.md b/agent-ops/rules/project/rules.md index 370b880..4db992c 100644 --- a/agent-ops/rules/project/rules.md +++ b/agent-ops/rules/project/rules.md @@ -6,7 +6,7 @@ ## 프로젝트 개요 -**Toki Socket** — 다중 언어/플랫폼 간 양방향 통신을 위한 바이너리 소켓 프로토콜 라이브러리. +**Proto Socket** — 다중 언어/플랫폼 간 양방향 통신을 위한 바이너리 소켓 프로토콜 라이브러리. - Protocol Buffers 기반 직렬화 - TCP 4바이트 빅엔디안 길이 프리픽스 프레이밍 / WebSocket 바이너리 프레임 @@ -69,4 +69,4 @@ VERSIONING.md — 프로토콜/패키지 버전 정책 | 요청 키워드 | SKILL.md | |------------|----------| -| 새 언어 구현, 언어 포팅, language scaffold, 템플릿, 크로스 언어 테스트 추가, 새 언어 crosstest | `agent-ops/skills/project/add-toki-socket-crosstest-language/SKILL.md` | +| 새 언어 구현, 언어 포팅, language scaffold, 템플릿, 크로스 언어 테스트 추가, 새 언어 crosstest | `agent-ops/skills/project/add-proto-socket-crosstest-language/SKILL.md` | diff --git a/agent-ops/skills/project/add-toki-socket-crosstest-language/SKILL.md b/agent-ops/skills/project/add-proto-socket-crosstest-language/SKILL.md similarity index 86% rename from agent-ops/skills/project/add-toki-socket-crosstest-language/SKILL.md rename to agent-ops/skills/project/add-proto-socket-crosstest-language/SKILL.md index 90a7052..5054d6e 100644 --- a/agent-ops/skills/project/add-toki-socket-crosstest-language/SKILL.md +++ b/agent-ops/skills/project/add-proto-socket-crosstest-language/SKILL.md @@ -1,14 +1,14 @@ --- -name: add-toki-socket-crosstest-language +name: add-proto-socket-crosstest-language version: 1.0.0 -description: Plan and create new-language implementation scaffolding and toki_socket language-matrix integration tests. Use when adding language package README/checklist templates, crosstest folders, server-row orchestrators, subprocess clients, or review notes for Dart/Go/other language protocol compatibility tests, especially tests that must verify every supported server/client language pair over TCP and WebSocket for send, push, request-response, concurrent request nonce mapping, and protobuf typeName compatibility without cluttering the repository root. +description: Plan and create new-language implementation scaffolding and proto_socket language-matrix integration tests. Use when adding language package README/checklist templates, crosstest folders, server-row orchestrators, subprocess clients, or review notes for Dart/Go/other language protocol compatibility tests, especially tests that must verify every supported server/client language pair over TCP and WebSocket for send, push, request-response, concurrent request nonce mapping, and protobuf typeName compatibility without cluttering the repository root. --- -# Add Toki Socket Crosstest Language +# Add Proto Socket Crosstest Language ## Purpose -Create the package-local scaffold for a new Toki Socket language implementation and add or update the full language compatibility matrix. Keep implementation checklists and crosstest code inside the relevant language package or this skill's templates, preserve the repository root for shared docs, and match the Dart/Go baseline behavior. +Create the package-local scaffold for a new Proto Socket language implementation and add or update the full language compatibility matrix. Keep implementation checklists and crosstest code inside the relevant language package or this skill's templates, preserve the repository root for shared docs, and match the Dart/Go baseline behavior. ## Plan-First Workflow @@ -34,7 +34,7 @@ Do not create plan files for casual analysis, status checks, or review-only requ When starting a new language implementation, copy the relevant files from: ```text -agent-ops/skills/project/add-toki-socket-crosstest-language/templates/ +agent-ops/skills/project/add-proto-socket-crosstest-language/templates/ ``` Use the README and checklists as package-local starting points. Fill in language-specific commands, supported transports, proto generation, same-language tests, and crosstest commands before marking the implementation available. diff --git a/agent-ops/skills/project/add-proto-socket-crosstest-language/agents/openai.yaml b/agent-ops/skills/project/add-proto-socket-crosstest-language/agents/openai.yaml new file mode 100644 index 0000000..4e58c73 --- /dev/null +++ b/agent-ops/skills/project/add-proto-socket-crosstest-language/agents/openai.yaml @@ -0,0 +1,4 @@ +interface: + display_name: "Add Proto Socket Crosstest Language" + short_description: "Plan and add Proto Socket matrix crosstests" + default_prompt: "Use $add-proto-socket-crosstest-language to plan and add language-matrix integration tests for a new proto_socket implementation." diff --git a/agent-ops/skills/project/add-toki-socket-crosstest-language/templates/CROSSTEST_CHECKLIST.md b/agent-ops/skills/project/add-proto-socket-crosstest-language/templates/CROSSTEST_CHECKLIST.md similarity index 93% rename from agent-ops/skills/project/add-toki-socket-crosstest-language/templates/CROSSTEST_CHECKLIST.md rename to agent-ops/skills/project/add-proto-socket-crosstest-language/templates/CROSSTEST_CHECKLIST.md index 09995e7..5c2618e 100644 --- a/agent-ops/skills/project/add-toki-socket-crosstest-language/templates/CROSSTEST_CHECKLIST.md +++ b/agent-ops/skills/project/add-proto-socket-crosstest-language/templates/CROSSTEST_CHECKLIST.md @@ -1,6 +1,6 @@ # Cross-language Test Checklist -Use the runner layout from `agent-ops/skills/project/add-toki-socket-crosstest-language/SKILL.md`. +Use the runner layout from `agent-ops/skills/project/add-proto-socket-crosstest-language/SKILL.md`. ## Runner Layout diff --git a/agent-ops/skills/project/add-toki-socket-crosstest-language/templates/IMPLEMENTATION_CHECKLIST.md b/agent-ops/skills/project/add-proto-socket-crosstest-language/templates/IMPLEMENTATION_CHECKLIST.md similarity index 100% rename from agent-ops/skills/project/add-toki-socket-crosstest-language/templates/IMPLEMENTATION_CHECKLIST.md rename to agent-ops/skills/project/add-proto-socket-crosstest-language/templates/IMPLEMENTATION_CHECKLIST.md diff --git a/agent-ops/skills/project/add-toki-socket-crosstest-language/templates/README.md b/agent-ops/skills/project/add-proto-socket-crosstest-language/templates/README.md similarity index 91% rename from agent-ops/skills/project/add-toki-socket-crosstest-language/templates/README.md rename to agent-ops/skills/project/add-proto-socket-crosstest-language/templates/README.md index c5e140a..0ef7281 100644 --- a/agent-ops/skills/project/add-toki-socket-crosstest-language/templates/README.md +++ b/agent-ops/skills/project/add-proto-socket-crosstest-language/templates/README.md @@ -1,8 +1,8 @@ -# Toki Socket +# Proto Socket Status: planned -This package implements Toki Socket protocol version `0.1` for . +This package implements Proto Socket protocol version `0.1` for . ## Required Structure diff --git a/agent-ops/skills/project/add-toki-socket-crosstest-language/agents/openai.yaml b/agent-ops/skills/project/add-toki-socket-crosstest-language/agents/openai.yaml deleted file mode 100644 index 3a43174..0000000 --- a/agent-ops/skills/project/add-toki-socket-crosstest-language/agents/openai.yaml +++ /dev/null @@ -1,4 +0,0 @@ -interface: - display_name: "Add Toki Socket Crosstest Language" - short_description: "Plan and add Toki Socket matrix crosstests" - default_prompt: "Use $add-toki-socket-crosstest-language to plan and add language-matrix integration tests for a new toki_socket implementation." diff --git a/dart/crosstest/dart_go.dart b/dart/crosstest/dart_go.dart index 1ed4580..50057a5 100644 --- a/dart/crosstest/dart_go.dart +++ b/dart/crosstest/dart_go.dart @@ -2,7 +2,7 @@ import 'dart:async'; import 'dart:convert'; import 'dart:io'; -import 'package:toki_socket/toki_socket.dart'; +import 'package:proto_socket/proto_socket.dart'; const _host = '127.0.0.1'; const _tcpPort = 29090; diff --git a/dart/crosstest/dart_kotlin.dart b/dart/crosstest/dart_kotlin.dart index d02eb74..379c599 100644 --- a/dart/crosstest/dart_kotlin.dart +++ b/dart/crosstest/dart_kotlin.dart @@ -2,7 +2,7 @@ import 'dart:async'; import 'dart:convert'; import 'dart:io'; -import 'package:toki_socket/toki_socket.dart'; +import 'package:proto_socket/proto_socket.dart'; const _host = '127.0.0.1'; const _tcpPort = 29590; @@ -301,7 +301,7 @@ Future _runKotlinClient( './gradlew', [ 'run', - '-PmainClass=com.tokilabs.toki_socket.crosstest.DartKotlinClientKt', + '-PmainClass=com.tokilabs.proto_socket.crosstest.DartKotlinClientKt', '--args=$clientArgs', ], workingDirectory: _kotlinDir, diff --git a/dart/crosstest/dart_python.dart b/dart/crosstest/dart_python.dart index 5ebda0a..cd66a6e 100644 --- a/dart/crosstest/dart_python.dart +++ b/dart/crosstest/dart_python.dart @@ -2,7 +2,7 @@ import 'dart:async'; import 'dart:convert'; import 'dart:io'; -import 'package:toki_socket/toki_socket.dart'; +import 'package:proto_socket/proto_socket.dart'; const _host = '127.0.0.1'; const _tcpPort = 29694; diff --git a/dart/crosstest/dart_typescript.dart b/dart/crosstest/dart_typescript.dart index e0bc7f4..2d2fec2 100644 --- a/dart/crosstest/dart_typescript.dart +++ b/dart/crosstest/dart_typescript.dart @@ -2,7 +2,7 @@ import 'dart:async'; import 'dart:convert'; import 'dart:io'; -import 'package:toki_socket/toki_socket.dart'; +import 'package:proto_socket/proto_socket.dart'; const _host = '127.0.0.1'; const _tcpPort = 29790; diff --git a/dart/crosstest/go_dart_client.dart b/dart/crosstest/go_dart_client.dart index 7c22c5b..da7f07a 100644 --- a/dart/crosstest/go_dart_client.dart +++ b/dart/crosstest/go_dart_client.dart @@ -1,7 +1,7 @@ import 'dart:async'; import 'dart:io'; -import 'package:toki_socket/toki_socket.dart'; +import 'package:proto_socket/proto_socket.dart'; const _host = '127.0.0.1'; const _wsPath = '/'; diff --git a/dart/crosstest/kotlin_dart_client.dart b/dart/crosstest/kotlin_dart_client.dart index ebe02d1..8b7834f 100644 --- a/dart/crosstest/kotlin_dart_client.dart +++ b/dart/crosstest/kotlin_dart_client.dart @@ -1,7 +1,7 @@ import 'dart:async'; import 'dart:io'; -import 'package:toki_socket/toki_socket.dart'; +import 'package:proto_socket/proto_socket.dart'; const _host = '127.0.0.1'; const _wsPath = '/'; diff --git a/dart/crosstest/python_dart_client.dart b/dart/crosstest/python_dart_client.dart index 45eab23..3f07b12 100644 --- a/dart/crosstest/python_dart_client.dart +++ b/dart/crosstest/python_dart_client.dart @@ -1,7 +1,7 @@ import 'dart:async'; import 'dart:io'; -import 'package:toki_socket/toki_socket.dart'; +import 'package:proto_socket/proto_socket.dart'; const _host = '127.0.0.1'; const _wsPath = '/'; diff --git a/dart/crosstest/typescript_dart_client.dart b/dart/crosstest/typescript_dart_client.dart index 63b933c..f188892 100644 --- a/dart/crosstest/typescript_dart_client.dart +++ b/dart/crosstest/typescript_dart_client.dart @@ -1,7 +1,7 @@ import 'dart:async'; import 'dart:io'; -import 'package:toki_socket/toki_socket.dart'; +import 'package:proto_socket/proto_socket.dart'; const _host = '127.0.0.1'; const _wsPath = '/'; diff --git a/dart/lib/toki_socket.dart b/dart/lib/proto_socket.dart similarity index 93% rename from dart/lib/toki_socket.dart rename to dart/lib/proto_socket.dart index 9e3a450..b55ceff 100644 --- a/dart/lib/toki_socket.dart +++ b/dart/lib/proto_socket.dart @@ -1,4 +1,4 @@ -library toki_socket; +library proto_socket; export 'src/communicator.dart'; export 'src/transport.dart'; diff --git a/dart/pubspec.yaml b/dart/pubspec.yaml index 08de0f2..d9d8abd 100644 --- a/dart/pubspec.yaml +++ b/dart/pubspec.yaml @@ -1,4 +1,4 @@ -name: toki_socket +name: proto_socket description: Multi-language standard socket protocol library. Dart implementation. version: 1.0.5 publish_to: none diff --git a/dart/test/communicator_test.dart b/dart/test/communicator_test.dart index 8125430..acbf6aa 100644 --- a/dart/test/communicator_test.dart +++ b/dart/test/communicator_test.dart @@ -2,7 +2,7 @@ import 'dart:async'; import 'dart:mirrors'; import 'package:test/test.dart'; -import 'package:toki_socket/toki_socket.dart'; +import 'package:proto_socket/proto_socket.dart'; class _FakeCommunicator extends Communicator { final _FakeTransport transport = _FakeTransport(); diff --git a/dart/test/socket_test.dart b/dart/test/socket_test.dart index 9c9d4b9..e6e2e13 100644 --- a/dart/test/socket_test.dart +++ b/dart/test/socket_test.dart @@ -3,7 +3,7 @@ import 'dart:io'; import 'dart:typed_data'; import 'package:test/test.dart'; -import 'package:toki_socket/toki_socket.dart'; +import 'package:proto_socket/proto_socket.dart'; const _testPort = 19090; const _testPortSsl = 19091; @@ -207,13 +207,13 @@ void main() { test('TestData 메시지를 서버가 수신한다', () async { await client.send(TestData() ..index = 42 - ..message = 'hello toki-socket'); + ..message = 'hello proto-socket'); await Future.delayed(const Duration(milliseconds: 200)); expect(server.receivedMessages, hasLength(1)); expect(server.receivedMessages.first.index, equals(42)); expect( - server.receivedMessages.first.message, equals('hello toki-socket')); + server.receivedMessages.first.message, equals('hello proto-socket')); }); test('여러 메시지를 순서대로 수신한다', () async { diff --git a/go/base_client.go b/go/base_client.go index ef387bb..da22186 100644 --- a/go/base_client.go +++ b/go/base_client.go @@ -1,4 +1,4 @@ -package toki_socket +package proto_socket import ( "sync" diff --git a/go/communicator.go b/go/communicator.go index f01d108..24011b7 100644 --- a/go/communicator.go +++ b/go/communicator.go @@ -1,4 +1,4 @@ -package toki_socket +package proto_socket import ( "errors" diff --git a/go/communicator_nonce_test.go b/go/communicator_nonce_test.go index fe61b73..027a394 100644 --- a/go/communicator_nonce_test.go +++ b/go/communicator_nonce_test.go @@ -1,4 +1,4 @@ -package toki_socket +package proto_socket import ( "sync" diff --git a/go/heartbeat_timer.go b/go/heartbeat_timer.go index 7168e00..30cfc84 100644 --- a/go/heartbeat_timer.go +++ b/go/heartbeat_timer.go @@ -1,4 +1,4 @@ -package toki_socket +package proto_socket import ( "sync" diff --git a/go/tcp_client.go b/go/tcp_client.go index da62a90..6e0dbb9 100644 --- a/go/tcp_client.go +++ b/go/tcp_client.go @@ -1,4 +1,4 @@ -package toki_socket +package proto_socket import ( "context" diff --git a/go/tcp_server.go b/go/tcp_server.go index 9c029b7..90ea2b8 100644 --- a/go/tcp_server.go +++ b/go/tcp_server.go @@ -1,4 +1,4 @@ -package toki_socket +package proto_socket import ( "context" diff --git a/go/test/communicator_test.go b/go/test/communicator_test.go index a0bb2b4..a452cba 100644 --- a/go/test/communicator_test.go +++ b/go/test/communicator_test.go @@ -1,4 +1,4 @@ -package toki_socket_test +package proto_socket_test import ( "strings" diff --git a/go/test/heartbeat_test.go b/go/test/heartbeat_test.go index 5cc3b10..fed9920 100644 --- a/go/test/heartbeat_test.go +++ b/go/test/heartbeat_test.go @@ -1,4 +1,4 @@ -package toki_socket_test +package proto_socket_test import ( "context" diff --git a/go/test/tcp_test.go b/go/test/tcp_test.go index 5e6a213..9ea05b2 100644 --- a/go/test/tcp_test.go +++ b/go/test/tcp_test.go @@ -1,4 +1,4 @@ -package toki_socket_test +package proto_socket_test import ( "context" @@ -232,7 +232,7 @@ func TestTcpSendReceive(t *testing.T) { } defer client.Close() - if err := client.Send(&packets.TestData{Index: 42, Message: "hello toki-socket"}); err != nil { + if err := client.Send(&packets.TestData{Index: 42, Message: "hello proto-socket"}); err != nil { t.Fatal(err) } diff --git a/go/test/test_helpers_test.go b/go/test/test_helpers_test.go index 88b2e9b..2984e91 100644 --- a/go/test/test_helpers_test.go +++ b/go/test/test_helpers_test.go @@ -1,4 +1,4 @@ -package toki_socket_test +package proto_socket_test import ( "crypto/ecdsa" @@ -58,7 +58,7 @@ func generateSelfSignedCert(t *testing.T) (serverCfg, clientCfg *tls.Config) { tmpl := &x509.Certificate{ SerialNumber: big.NewInt(1), - Subject: pkix.Name{CommonName: "toki-socket-test"}, + Subject: pkix.Name{CommonName: "proto-socket-test"}, NotBefore: time.Now().Add(-time.Hour), NotAfter: time.Now().Add(time.Hour), IPAddresses: []net.IP{net.ParseIP("127.0.0.1")}, diff --git a/go/test/tls_test.go b/go/test/tls_test.go index 96a1703..8b03b0e 100644 --- a/go/test/tls_test.go +++ b/go/test/tls_test.go @@ -1,4 +1,4 @@ -package toki_socket_test +package proto_socket_test import ( "context" diff --git a/go/test/ws_test.go b/go/test/ws_test.go index dc8ff73..d2e56fd 100644 --- a/go/test/ws_test.go +++ b/go/test/ws_test.go @@ -1,4 +1,4 @@ -package toki_socket_test +package proto_socket_test import ( "context" @@ -137,13 +137,13 @@ func TestWsSendReceive(t *testing.T) { } defer client.Close() - if err := client.Send(&packets.TestData{Index: 42, Message: "hello toki-socket ws"}); err != nil { + if err := client.Send(&packets.TestData{Index: 42, Message: "hello proto-socket ws"}); err != nil { t.Fatal(err) } select { case msg := <-received: - if msg.GetIndex() != 42 || msg.GetMessage() != "hello toki-socket ws" { + if msg.GetIndex() != 42 || msg.GetMessage() != "hello proto-socket ws" { t.Fatalf("unexpected message: %v", msg) } case <-time.After(2 * time.Second): diff --git a/go/ws_client.go b/go/ws_client.go index 8ba9d6a..0530dce 100644 --- a/go/ws_client.go +++ b/go/ws_client.go @@ -1,4 +1,4 @@ -package toki_socket +package proto_socket import ( "context" diff --git a/go/ws_server.go b/go/ws_server.go index 4079092..9373508 100644 --- a/go/ws_server.go +++ b/go/ws_server.go @@ -1,4 +1,4 @@ -package toki_socket +package proto_socket import ( "context" diff --git a/kotlin/build.gradle.kts b/kotlin/build.gradle.kts index bf19157..ba80c3a 100644 --- a/kotlin/build.gradle.kts +++ b/kotlin/build.gradle.kts @@ -45,7 +45,7 @@ protobuf { application { mainClass.set( (findProperty("mainClass") as String?) - ?: "com.tokilabs.toki_socket.crosstest.MainKt", + ?: "com.tokilabs.proto_socket.crosstest.MainKt", ) } @@ -55,7 +55,7 @@ tasks.named("run") { classpath = crosstestSourceSet.runtimeClasspath mainClass.set( (findProperty("mainClass") as String?) - ?: "com.tokilabs.toki_socket.crosstest.MainKt", + ?: "com.tokilabs.proto_socket.crosstest.MainKt", ) } diff --git a/kotlin/crosstest/dart_kotlin_client.kt b/kotlin/crosstest/dart_kotlin_client.kt index 78a0dd7..9e73afe 100644 --- a/kotlin/crosstest/dart_kotlin_client.kt +++ b/kotlin/crosstest/dart_kotlin_client.kt @@ -1,18 +1,18 @@ @file:JvmName("DartKotlinClientKt") -package com.tokilabs.toki_socket.crosstest +package com.tokilabs.proto_socket.crosstest -import com.tokilabs.toki_socket.DialTcp -import com.tokilabs.toki_socket.DialTcpTls -import com.tokilabs.toki_socket.DialWs -import com.tokilabs.toki_socket.DialWss -import com.tokilabs.toki_socket.ParserMap -import com.tokilabs.toki_socket.WsClient -import com.tokilabs.toki_socket.TcpClient -import com.tokilabs.toki_socket.addListenerTyped -import com.tokilabs.toki_socket.sendRequestTyped -import com.tokilabs.toki_socket.typeNameOf -import com.tokilabs.toki_socket.packets.TestData +import com.tokilabs.proto_socket.DialTcp +import com.tokilabs.proto_socket.DialTcpTls +import com.tokilabs.proto_socket.DialWs +import com.tokilabs.proto_socket.DialWss +import com.tokilabs.proto_socket.ParserMap +import com.tokilabs.proto_socket.WsClient +import com.tokilabs.proto_socket.TcpClient +import com.tokilabs.proto_socket.addListenerTyped +import com.tokilabs.proto_socket.sendRequestTyped +import com.tokilabs.proto_socket.typeNameOf +import com.tokilabs.proto_socket.packets.TestData import kotlinx.coroutines.CompletableDeferred import kotlinx.coroutines.async import kotlinx.coroutines.coroutineScope @@ -31,7 +31,7 @@ private interface DartClientHandle { suspend fun close() - val communicator: com.tokilabs.toki_socket.Communicator + val communicator: com.tokilabs.proto_socket.Communicator } private class DartTcpHandle( diff --git a/kotlin/crosstest/go_kotlin_client/src/main/kotlin/com/tokilabs/toki_socket/crosstest/Main.kt b/kotlin/crosstest/go_kotlin_client/src/main/kotlin/com/tokilabs/proto_socket/crosstest/Main.kt similarity index 92% rename from kotlin/crosstest/go_kotlin_client/src/main/kotlin/com/tokilabs/toki_socket/crosstest/Main.kt rename to kotlin/crosstest/go_kotlin_client/src/main/kotlin/com/tokilabs/proto_socket/crosstest/Main.kt index 0ad49b9..74fc576 100644 --- a/kotlin/crosstest/go_kotlin_client/src/main/kotlin/com/tokilabs/toki_socket/crosstest/Main.kt +++ b/kotlin/crosstest/go_kotlin_client/src/main/kotlin/com/tokilabs/proto_socket/crosstest/Main.kt @@ -1,16 +1,16 @@ -package com.tokilabs.toki_socket.crosstest +package com.tokilabs.proto_socket.crosstest -import com.tokilabs.toki_socket.DialTcp -import com.tokilabs.toki_socket.DialTcpTls -import com.tokilabs.toki_socket.DialWs -import com.tokilabs.toki_socket.DialWss -import com.tokilabs.toki_socket.ParserMap -import com.tokilabs.toki_socket.WsClient -import com.tokilabs.toki_socket.TcpClient -import com.tokilabs.toki_socket.addListenerTyped -import com.tokilabs.toki_socket.sendRequestTyped -import com.tokilabs.toki_socket.typeNameOf -import com.tokilabs.toki_socket.packets.TestData +import com.tokilabs.proto_socket.DialTcp +import com.tokilabs.proto_socket.DialTcpTls +import com.tokilabs.proto_socket.DialWs +import com.tokilabs.proto_socket.DialWss +import com.tokilabs.proto_socket.ParserMap +import com.tokilabs.proto_socket.WsClient +import com.tokilabs.proto_socket.TcpClient +import com.tokilabs.proto_socket.addListenerTyped +import com.tokilabs.proto_socket.sendRequestTyped +import com.tokilabs.proto_socket.typeNameOf +import com.tokilabs.proto_socket.packets.TestData import kotlinx.coroutines.CompletableDeferred import kotlinx.coroutines.async import kotlinx.coroutines.coroutineScope @@ -29,7 +29,7 @@ private interface ClientHandle { suspend fun close() - val communicator: com.tokilabs.toki_socket.Communicator + val communicator: com.tokilabs.proto_socket.Communicator } private class TcpHandle( diff --git a/kotlin/crosstest/kotlin_dart.kt b/kotlin/crosstest/kotlin_dart.kt index 5ec2507..a32b66e 100644 --- a/kotlin/crosstest/kotlin_dart.kt +++ b/kotlin/crosstest/kotlin_dart.kt @@ -1,16 +1,16 @@ @file:JvmName("KotlinDartKt") -package com.tokilabs.toki_socket.crosstest +package com.tokilabs.proto_socket.crosstest -import com.tokilabs.toki_socket.TcpClient -import com.tokilabs.toki_socket.TcpServer -import com.tokilabs.toki_socket.ParserMap -import com.tokilabs.toki_socket.WsClient -import com.tokilabs.toki_socket.WsServer -import com.tokilabs.toki_socket.addListenerTyped -import com.tokilabs.toki_socket.addRequestListenerTyped -import com.tokilabs.toki_socket.typeNameOf -import com.tokilabs.toki_socket.packets.TestData +import com.tokilabs.proto_socket.TcpClient +import com.tokilabs.proto_socket.TcpServer +import com.tokilabs.proto_socket.ParserMap +import com.tokilabs.proto_socket.WsClient +import com.tokilabs.proto_socket.WsServer +import com.tokilabs.proto_socket.addListenerTyped +import com.tokilabs.proto_socket.addRequestListenerTyped +import com.tokilabs.proto_socket.typeNameOf +import com.tokilabs.proto_socket.packets.TestData import kotlinx.coroutines.CompletableDeferred import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.coroutineScope diff --git a/kotlin/crosstest/kotlin_go.kt b/kotlin/crosstest/kotlin_go.kt index 1eef472..8df1af4 100644 --- a/kotlin/crosstest/kotlin_go.kt +++ b/kotlin/crosstest/kotlin_go.kt @@ -1,16 +1,16 @@ @file:JvmName("KotlinGoKt") -package com.tokilabs.toki_socket.crosstest +package com.tokilabs.proto_socket.crosstest -import com.tokilabs.toki_socket.TcpClient -import com.tokilabs.toki_socket.TcpServer -import com.tokilabs.toki_socket.ParserMap -import com.tokilabs.toki_socket.WsClient -import com.tokilabs.toki_socket.WsServer -import com.tokilabs.toki_socket.addListenerTyped -import com.tokilabs.toki_socket.addRequestListenerTyped -import com.tokilabs.toki_socket.typeNameOf -import com.tokilabs.toki_socket.packets.TestData +import com.tokilabs.proto_socket.TcpClient +import com.tokilabs.proto_socket.TcpServer +import com.tokilabs.proto_socket.ParserMap +import com.tokilabs.proto_socket.WsClient +import com.tokilabs.proto_socket.WsServer +import com.tokilabs.proto_socket.addListenerTyped +import com.tokilabs.proto_socket.addRequestListenerTyped +import com.tokilabs.proto_socket.typeNameOf +import com.tokilabs.proto_socket.packets.TestData import kotlinx.coroutines.CompletableDeferred import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.coroutineScope diff --git a/kotlin/crosstest/kotlin_python.kt b/kotlin/crosstest/kotlin_python.kt index af818f0..60a005f 100644 --- a/kotlin/crosstest/kotlin_python.kt +++ b/kotlin/crosstest/kotlin_python.kt @@ -1,16 +1,16 @@ @file:JvmName("KotlinPythonKt") -package com.tokilabs.toki_socket.crosstest +package com.tokilabs.proto_socket.crosstest -import com.tokilabs.toki_socket.TcpClient -import com.tokilabs.toki_socket.TcpServer -import com.tokilabs.toki_socket.ParserMap -import com.tokilabs.toki_socket.WsClient -import com.tokilabs.toki_socket.WsServer -import com.tokilabs.toki_socket.addListenerTyped -import com.tokilabs.toki_socket.addRequestListenerTyped -import com.tokilabs.toki_socket.typeNameOf -import com.tokilabs.toki_socket.packets.TestData +import com.tokilabs.proto_socket.TcpClient +import com.tokilabs.proto_socket.TcpServer +import com.tokilabs.proto_socket.ParserMap +import com.tokilabs.proto_socket.WsClient +import com.tokilabs.proto_socket.WsServer +import com.tokilabs.proto_socket.addListenerTyped +import com.tokilabs.proto_socket.addRequestListenerTyped +import com.tokilabs.proto_socket.typeNameOf +import com.tokilabs.proto_socket.packets.TestData import kotlinx.coroutines.CompletableDeferred import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.coroutineScope diff --git a/kotlin/crosstest/kotlin_typescript.kt b/kotlin/crosstest/kotlin_typescript.kt index 837520a..e690635 100644 --- a/kotlin/crosstest/kotlin_typescript.kt +++ b/kotlin/crosstest/kotlin_typescript.kt @@ -1,16 +1,16 @@ @file:JvmName("KotlinTypescriptKt") -package com.tokilabs.toki_socket.crosstest +package com.tokilabs.proto_socket.crosstest -import com.tokilabs.toki_socket.ParserMap -import com.tokilabs.toki_socket.TcpClient -import com.tokilabs.toki_socket.TcpServer -import com.tokilabs.toki_socket.WsClient -import com.tokilabs.toki_socket.WsServer -import com.tokilabs.toki_socket.addListenerTyped -import com.tokilabs.toki_socket.addRequestListenerTyped -import com.tokilabs.toki_socket.packets.TestData -import com.tokilabs.toki_socket.typeNameOf +import com.tokilabs.proto_socket.ParserMap +import com.tokilabs.proto_socket.TcpClient +import com.tokilabs.proto_socket.TcpServer +import com.tokilabs.proto_socket.WsClient +import com.tokilabs.proto_socket.WsServer +import com.tokilabs.proto_socket.addListenerTyped +import com.tokilabs.proto_socket.addRequestListenerTyped +import com.tokilabs.proto_socket.packets.TestData +import com.tokilabs.proto_socket.typeNameOf import kotlinx.coroutines.CompletableDeferred import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.coroutineScope diff --git a/kotlin/crosstest/python_kotlin_client.kt b/kotlin/crosstest/python_kotlin_client.kt index 62c9e43..d0e24af 100644 --- a/kotlin/crosstest/python_kotlin_client.kt +++ b/kotlin/crosstest/python_kotlin_client.kt @@ -1,18 +1,18 @@ @file:JvmName("PythonKotlinClientKt") -package com.tokilabs.toki_socket.crosstest +package com.tokilabs.proto_socket.crosstest -import com.tokilabs.toki_socket.DialTcp -import com.tokilabs.toki_socket.DialTcpTls -import com.tokilabs.toki_socket.DialWs -import com.tokilabs.toki_socket.DialWss -import com.tokilabs.toki_socket.ParserMap -import com.tokilabs.toki_socket.WsClient -import com.tokilabs.toki_socket.TcpClient -import com.tokilabs.toki_socket.addListenerTyped -import com.tokilabs.toki_socket.sendRequestTyped -import com.tokilabs.toki_socket.typeNameOf -import com.tokilabs.toki_socket.packets.TestData +import com.tokilabs.proto_socket.DialTcp +import com.tokilabs.proto_socket.DialTcpTls +import com.tokilabs.proto_socket.DialWs +import com.tokilabs.proto_socket.DialWss +import com.tokilabs.proto_socket.ParserMap +import com.tokilabs.proto_socket.WsClient +import com.tokilabs.proto_socket.TcpClient +import com.tokilabs.proto_socket.addListenerTyped +import com.tokilabs.proto_socket.sendRequestTyped +import com.tokilabs.proto_socket.typeNameOf +import com.tokilabs.proto_socket.packets.TestData import kotlinx.coroutines.CompletableDeferred import kotlinx.coroutines.async import kotlinx.coroutines.coroutineScope @@ -29,7 +29,7 @@ private const val REQUEST_WINDOW_MS = 2_000L private interface PythonClientHandle { suspend fun send(data: TestData) suspend fun close() - val communicator: com.tokilabs.toki_socket.Communicator + val communicator: com.tokilabs.proto_socket.Communicator } private class PythonTcpHandle( diff --git a/kotlin/crosstest/typescript_kotlin_client.kt b/kotlin/crosstest/typescript_kotlin_client.kt index f605292..414e0c3 100644 --- a/kotlin/crosstest/typescript_kotlin_client.kt +++ b/kotlin/crosstest/typescript_kotlin_client.kt @@ -1,19 +1,19 @@ @file:JvmName("TypescriptKotlinClientKt") -package com.tokilabs.toki_socket.crosstest +package com.tokilabs.proto_socket.crosstest -import com.tokilabs.toki_socket.Communicator -import com.tokilabs.toki_socket.DialTcp -import com.tokilabs.toki_socket.DialTcpTls -import com.tokilabs.toki_socket.DialWs -import com.tokilabs.toki_socket.DialWss -import com.tokilabs.toki_socket.ParserMap -import com.tokilabs.toki_socket.TcpClient -import com.tokilabs.toki_socket.WsClient -import com.tokilabs.toki_socket.addListenerTyped -import com.tokilabs.toki_socket.packets.TestData -import com.tokilabs.toki_socket.sendRequestTyped -import com.tokilabs.toki_socket.typeNameOf +import com.tokilabs.proto_socket.Communicator +import com.tokilabs.proto_socket.DialTcp +import com.tokilabs.proto_socket.DialTcpTls +import com.tokilabs.proto_socket.DialWs +import com.tokilabs.proto_socket.DialWss +import com.tokilabs.proto_socket.ParserMap +import com.tokilabs.proto_socket.TcpClient +import com.tokilabs.proto_socket.WsClient +import com.tokilabs.proto_socket.addListenerTyped +import com.tokilabs.proto_socket.packets.TestData +import com.tokilabs.proto_socket.sendRequestTyped +import com.tokilabs.proto_socket.typeNameOf import kotlinx.coroutines.CompletableDeferred import kotlinx.coroutines.async import kotlinx.coroutines.coroutineScope diff --git a/kotlin/settings.gradle.kts b/kotlin/settings.gradle.kts index e21134a..656191c 100644 --- a/kotlin/settings.gradle.kts +++ b/kotlin/settings.gradle.kts @@ -14,4 +14,4 @@ dependencyResolutionManagement { } } -rootProject.name = "toki-socket-kotlin" +rootProject.name = "proto-socket-kotlin" diff --git a/kotlin/src/main/kotlin/com/tokilabs/toki_socket/BaseClient.kt b/kotlin/src/main/kotlin/com/tokilabs/proto_socket/BaseClient.kt similarity index 97% rename from kotlin/src/main/kotlin/com/tokilabs/toki_socket/BaseClient.kt rename to kotlin/src/main/kotlin/com/tokilabs/proto_socket/BaseClient.kt index 89eac7e..88d244d 100644 --- a/kotlin/src/main/kotlin/com/tokilabs/toki_socket/BaseClient.kt +++ b/kotlin/src/main/kotlin/com/tokilabs/proto_socket/BaseClient.kt @@ -1,6 +1,6 @@ -package com.tokilabs.toki_socket +package com.tokilabs.proto_socket -import com.tokilabs.toki_socket.packets.HeartBeat +import com.tokilabs.proto_socket.packets.HeartBeat import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.SupervisorJob diff --git a/kotlin/src/main/kotlin/com/tokilabs/toki_socket/Communicator.kt b/kotlin/src/main/kotlin/com/tokilabs/proto_socket/Communicator.kt similarity index 98% rename from kotlin/src/main/kotlin/com/tokilabs/toki_socket/Communicator.kt rename to kotlin/src/main/kotlin/com/tokilabs/proto_socket/Communicator.kt index 25209eb..e42140b 100644 --- a/kotlin/src/main/kotlin/com/tokilabs/toki_socket/Communicator.kt +++ b/kotlin/src/main/kotlin/com/tokilabs/proto_socket/Communicator.kt @@ -1,9 +1,9 @@ -package com.tokilabs.toki_socket +package com.tokilabs.proto_socket import com.google.protobuf.Message import com.google.protobuf.MessageLite -import com.tokilabs.toki_socket.packets.HeartBeat -import com.tokilabs.toki_socket.packets.PacketBase +import com.tokilabs.proto_socket.packets.HeartBeat +import com.tokilabs.proto_socket.packets.PacketBase import kotlinx.coroutines.CompletableDeferred import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.channels.Channel diff --git a/kotlin/src/main/kotlin/com/tokilabs/toki_socket/HeartbeatTimer.kt b/kotlin/src/main/kotlin/com/tokilabs/proto_socket/HeartbeatTimer.kt similarity index 94% rename from kotlin/src/main/kotlin/com/tokilabs/toki_socket/HeartbeatTimer.kt rename to kotlin/src/main/kotlin/com/tokilabs/proto_socket/HeartbeatTimer.kt index b2896b5..19cd0dc 100644 --- a/kotlin/src/main/kotlin/com/tokilabs/toki_socket/HeartbeatTimer.kt +++ b/kotlin/src/main/kotlin/com/tokilabs/proto_socket/HeartbeatTimer.kt @@ -1,4 +1,4 @@ -package com.tokilabs.toki_socket +package com.tokilabs.proto_socket import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Job diff --git a/kotlin/src/main/kotlin/com/tokilabs/toki_socket/TcpClient.kt b/kotlin/src/main/kotlin/com/tokilabs/proto_socket/TcpClient.kt similarity index 96% rename from kotlin/src/main/kotlin/com/tokilabs/toki_socket/TcpClient.kt rename to kotlin/src/main/kotlin/com/tokilabs/proto_socket/TcpClient.kt index 5ee0485..05c56d0 100644 --- a/kotlin/src/main/kotlin/com/tokilabs/toki_socket/TcpClient.kt +++ b/kotlin/src/main/kotlin/com/tokilabs/proto_socket/TcpClient.kt @@ -1,7 +1,7 @@ -package com.tokilabs.toki_socket +package com.tokilabs.proto_socket -import com.tokilabs.toki_socket.packets.HeartBeat -import com.tokilabs.toki_socket.packets.PacketBase +import com.tokilabs.proto_socket.packets.HeartBeat +import com.tokilabs.proto_socket.packets.PacketBase import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import kotlinx.coroutines.runBlocking diff --git a/kotlin/src/main/kotlin/com/tokilabs/toki_socket/TcpServer.kt b/kotlin/src/main/kotlin/com/tokilabs/proto_socket/TcpServer.kt similarity index 98% rename from kotlin/src/main/kotlin/com/tokilabs/toki_socket/TcpServer.kt rename to kotlin/src/main/kotlin/com/tokilabs/proto_socket/TcpServer.kt index 3d5b955..0315415 100644 --- a/kotlin/src/main/kotlin/com/tokilabs/toki_socket/TcpServer.kt +++ b/kotlin/src/main/kotlin/com/tokilabs/proto_socket/TcpServer.kt @@ -1,4 +1,4 @@ -package com.tokilabs.toki_socket +package com.tokilabs.proto_socket import com.google.protobuf.MessageLite import kotlinx.coroutines.CoroutineScope diff --git a/kotlin/src/main/kotlin/com/tokilabs/toki_socket/WsClient.kt b/kotlin/src/main/kotlin/com/tokilabs/proto_socket/WsClient.kt similarity index 97% rename from kotlin/src/main/kotlin/com/tokilabs/toki_socket/WsClient.kt rename to kotlin/src/main/kotlin/com/tokilabs/proto_socket/WsClient.kt index 2d29365..82150ad 100644 --- a/kotlin/src/main/kotlin/com/tokilabs/toki_socket/WsClient.kt +++ b/kotlin/src/main/kotlin/com/tokilabs/proto_socket/WsClient.kt @@ -1,7 +1,7 @@ -package com.tokilabs.toki_socket +package com.tokilabs.proto_socket -import com.tokilabs.toki_socket.packets.HeartBeat -import com.tokilabs.toki_socket.packets.PacketBase +import com.tokilabs.proto_socket.packets.HeartBeat +import com.tokilabs.proto_socket.packets.PacketBase import kotlinx.coroutines.runBlocking import okhttp3.OkHttpClient import okhttp3.Request diff --git a/kotlin/src/main/kotlin/com/tokilabs/toki_socket/WsServer.kt b/kotlin/src/main/kotlin/com/tokilabs/proto_socket/WsServer.kt similarity index 99% rename from kotlin/src/main/kotlin/com/tokilabs/toki_socket/WsServer.kt rename to kotlin/src/main/kotlin/com/tokilabs/proto_socket/WsServer.kt index e10ed2e..2f982a7 100644 --- a/kotlin/src/main/kotlin/com/tokilabs/toki_socket/WsServer.kt +++ b/kotlin/src/main/kotlin/com/tokilabs/proto_socket/WsServer.kt @@ -1,4 +1,4 @@ -package com.tokilabs.toki_socket +package com.tokilabs.proto_socket import com.google.protobuf.MessageLite import kotlinx.coroutines.runBlocking diff --git a/kotlin/src/main/proto/message_common.proto b/kotlin/src/main/proto/message_common.proto index 08069f5..1e38a71 100644 --- a/kotlin/src/main/proto/message_common.proto +++ b/kotlin/src/main/proto/message_common.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -option java_package = "com.tokilabs.toki_socket.packets"; +option java_package = "com.tokilabs.proto_socket.packets"; option java_outer_classname = "MessageCommonProto"; option java_multiple_files = true; diff --git a/kotlin/src/test/kotlin/com/tokilabs/toki_socket/CommunicatorTest.kt b/kotlin/src/test/kotlin/com/tokilabs/proto_socket/CommunicatorTest.kt similarity index 96% rename from kotlin/src/test/kotlin/com/tokilabs/toki_socket/CommunicatorTest.kt rename to kotlin/src/test/kotlin/com/tokilabs/proto_socket/CommunicatorTest.kt index 7819441..fd7bce0 100644 --- a/kotlin/src/test/kotlin/com/tokilabs/toki_socket/CommunicatorTest.kt +++ b/kotlin/src/test/kotlin/com/tokilabs/proto_socket/CommunicatorTest.kt @@ -1,8 +1,8 @@ -package com.tokilabs.toki_socket +package com.tokilabs.proto_socket -import com.tokilabs.toki_socket.packets.HeartBeat -import com.tokilabs.toki_socket.packets.PacketBase -import com.tokilabs.toki_socket.packets.TestData +import com.tokilabs.proto_socket.packets.HeartBeat +import com.tokilabs.proto_socket.packets.PacketBase +import com.tokilabs.proto_socket.packets.TestData import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.SupervisorJob diff --git a/kotlin/src/test/kotlin/com/tokilabs/toki_socket/HeartbeatTest.kt b/kotlin/src/test/kotlin/com/tokilabs/proto_socket/HeartbeatTest.kt similarity index 95% rename from kotlin/src/test/kotlin/com/tokilabs/toki_socket/HeartbeatTest.kt rename to kotlin/src/test/kotlin/com/tokilabs/proto_socket/HeartbeatTest.kt index ff2bb76..66c69c6 100644 --- a/kotlin/src/test/kotlin/com/tokilabs/toki_socket/HeartbeatTest.kt +++ b/kotlin/src/test/kotlin/com/tokilabs/proto_socket/HeartbeatTest.kt @@ -1,7 +1,7 @@ -package com.tokilabs.toki_socket +package com.tokilabs.proto_socket -import com.tokilabs.toki_socket.packets.HeartBeat -import com.tokilabs.toki_socket.packets.PacketBase +import com.tokilabs.proto_socket.packets.HeartBeat +import com.tokilabs.proto_socket.packets.PacketBase import kotlinx.coroutines.delay import kotlinx.coroutines.runBlocking import java.util.Collections diff --git a/kotlin/src/test/kotlin/com/tokilabs/toki_socket/HeartbeatTimerTest.kt b/kotlin/src/test/kotlin/com/tokilabs/proto_socket/HeartbeatTimerTest.kt similarity index 97% rename from kotlin/src/test/kotlin/com/tokilabs/toki_socket/HeartbeatTimerTest.kt rename to kotlin/src/test/kotlin/com/tokilabs/proto_socket/HeartbeatTimerTest.kt index e3fb975..fa9a483 100644 --- a/kotlin/src/test/kotlin/com/tokilabs/toki_socket/HeartbeatTimerTest.kt +++ b/kotlin/src/test/kotlin/com/tokilabs/proto_socket/HeartbeatTimerTest.kt @@ -1,4 +1,4 @@ -package com.tokilabs.toki_socket +package com.tokilabs.proto_socket import kotlinx.coroutines.CompletableDeferred import kotlinx.coroutines.test.runTest diff --git a/kotlin/src/test/kotlin/com/tokilabs/toki_socket/TcpTest.kt b/kotlin/src/test/kotlin/com/tokilabs/proto_socket/TcpTest.kt similarity index 97% rename from kotlin/src/test/kotlin/com/tokilabs/toki_socket/TcpTest.kt rename to kotlin/src/test/kotlin/com/tokilabs/proto_socket/TcpTest.kt index 5db0b49..cadabc8 100644 --- a/kotlin/src/test/kotlin/com/tokilabs/toki_socket/TcpTest.kt +++ b/kotlin/src/test/kotlin/com/tokilabs/proto_socket/TcpTest.kt @@ -1,6 +1,6 @@ -package com.tokilabs.toki_socket +package com.tokilabs.proto_socket -import com.tokilabs.toki_socket.packets.TestData +import com.tokilabs.proto_socket.packets.TestData import kotlinx.coroutines.CompletableDeferred import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.async @@ -28,7 +28,7 @@ class TcpTest { val client = DialTcp("127.0.0.1", port, 0, 0, testParserMap()) listenerReady.await() - client.send(TestData.newBuilder().setIndex(42).setMessage("hello toki-socket").build()) + client.send(TestData.newBuilder().setIndex(42).setMessage("hello proto-socket").build()) assertEquals(42, received.await().index) client.close() diff --git a/kotlin/src/test/kotlin/com/tokilabs/toki_socket/TestHelpers.kt b/kotlin/src/test/kotlin/com/tokilabs/proto_socket/TestHelpers.kt similarity index 96% rename from kotlin/src/test/kotlin/com/tokilabs/toki_socket/TestHelpers.kt rename to kotlin/src/test/kotlin/com/tokilabs/proto_socket/TestHelpers.kt index b0c33f6..c4627c6 100644 --- a/kotlin/src/test/kotlin/com/tokilabs/toki_socket/TestHelpers.kt +++ b/kotlin/src/test/kotlin/com/tokilabs/proto_socket/TestHelpers.kt @@ -1,6 +1,6 @@ -package com.tokilabs.toki_socket +package com.tokilabs.proto_socket -import com.tokilabs.toki_socket.packets.TestData +import com.tokilabs.proto_socket.packets.TestData import java.io.File import java.security.KeyFactory import java.security.KeyStore diff --git a/kotlin/src/test/kotlin/com/tokilabs/toki_socket/TlsTcpTest.kt b/kotlin/src/test/kotlin/com/tokilabs/proto_socket/TlsTcpTest.kt similarity index 96% rename from kotlin/src/test/kotlin/com/tokilabs/toki_socket/TlsTcpTest.kt rename to kotlin/src/test/kotlin/com/tokilabs/proto_socket/TlsTcpTest.kt index 42efa97..88d3618 100644 --- a/kotlin/src/test/kotlin/com/tokilabs/toki_socket/TlsTcpTest.kt +++ b/kotlin/src/test/kotlin/com/tokilabs/proto_socket/TlsTcpTest.kt @@ -1,6 +1,6 @@ -package com.tokilabs.toki_socket +package com.tokilabs.proto_socket -import com.tokilabs.toki_socket.packets.TestData +import com.tokilabs.proto_socket.packets.TestData import kotlinx.coroutines.CompletableDeferred import kotlinx.coroutines.runBlocking import java.nio.file.Paths diff --git a/kotlin/src/test/kotlin/com/tokilabs/toki_socket/TlsWsTest.kt b/kotlin/src/test/kotlin/com/tokilabs/proto_socket/TlsWsTest.kt similarity index 97% rename from kotlin/src/test/kotlin/com/tokilabs/toki_socket/TlsWsTest.kt rename to kotlin/src/test/kotlin/com/tokilabs/proto_socket/TlsWsTest.kt index e4d4176..a6b6296 100644 --- a/kotlin/src/test/kotlin/com/tokilabs/toki_socket/TlsWsTest.kt +++ b/kotlin/src/test/kotlin/com/tokilabs/proto_socket/TlsWsTest.kt @@ -1,6 +1,6 @@ -package com.tokilabs.toki_socket +package com.tokilabs.proto_socket -import com.tokilabs.toki_socket.packets.TestData +import com.tokilabs.proto_socket.packets.TestData import kotlinx.coroutines.CompletableDeferred import kotlinx.coroutines.delay import kotlinx.coroutines.runBlocking diff --git a/kotlin/src/test/kotlin/com/tokilabs/toki_socket/WsTest.kt b/kotlin/src/test/kotlin/com/tokilabs/proto_socket/WsTest.kt similarity index 97% rename from kotlin/src/test/kotlin/com/tokilabs/toki_socket/WsTest.kt rename to kotlin/src/test/kotlin/com/tokilabs/proto_socket/WsTest.kt index f7591ba..b141f29 100644 --- a/kotlin/src/test/kotlin/com/tokilabs/toki_socket/WsTest.kt +++ b/kotlin/src/test/kotlin/com/tokilabs/proto_socket/WsTest.kt @@ -1,6 +1,6 @@ -package com.tokilabs.toki_socket +package com.tokilabs.proto_socket -import com.tokilabs.toki_socket.packets.TestData +import com.tokilabs.proto_socket.packets.TestData import kotlinx.coroutines.CompletableDeferred import kotlinx.coroutines.async import kotlinx.coroutines.awaitAll @@ -26,7 +26,7 @@ class WsTest { val client = DialWs("127.0.0.1", port, "/", 0, 0, testParserMap()) listenerReady.await() - client.send(TestData.newBuilder().setIndex(42).setMessage("hello toki-socket ws").build()) + client.send(TestData.newBuilder().setIndex(42).setMessage("hello proto-socket ws").build()) assertEquals(42, received.await().index) client.close() diff --git a/python/README.md b/python/README.md index eb290bb..b43908c 100644 --- a/python/README.md +++ b/python/README.md @@ -1,6 +1,6 @@ -# Toki Socket Python +# Proto Socket Python -Python 3.11+ implementation of the Toki Socket protocol. +Python 3.11+ implementation of the Proto Socket protocol. ## Supported Transports diff --git a/python/crosstest/dart_python_client.py b/python/crosstest/dart_python_client.py index 8745fa0..d766db3 100644 --- a/python/crosstest/dart_python_client.py +++ b/python/crosstest/dart_python_client.py @@ -9,10 +9,10 @@ from pathlib import Path sys.path.insert(0, str(Path(__file__).resolve().parents[1])) -from toki_socket.communicator import type_name_of -from toki_socket.packets.message_common_pb2 import TestData -from toki_socket.tcp_client import connect_tcp, connect_tcp_tls -from toki_socket.ws_client import connect_ws, connect_wss +from proto_socket.communicator import type_name_of +from proto_socket.packets.message_common_pb2 import TestData +from proto_socket.tcp_client import connect_tcp, connect_tcp_tls +from proto_socket.ws_client import connect_ws, connect_wss HOST = "127.0.0.1" WS_PATH = "/" diff --git a/python/crosstest/go_python_client.py b/python/crosstest/go_python_client.py index 292208f..48d9a92 100644 --- a/python/crosstest/go_python_client.py +++ b/python/crosstest/go_python_client.py @@ -9,10 +9,10 @@ from pathlib import Path sys.path.insert(0, str(Path(__file__).resolve().parents[1])) -from toki_socket.communicator import type_name_of -from toki_socket.packets.message_common_pb2 import TestData -from toki_socket.tcp_client import connect_tcp, connect_tcp_tls -from toki_socket.ws_client import connect_ws, connect_wss +from proto_socket.communicator import type_name_of +from proto_socket.packets.message_common_pb2 import TestData +from proto_socket.tcp_client import connect_tcp, connect_tcp_tls +from proto_socket.ws_client import connect_ws, connect_wss HOST = "127.0.0.1" WS_PATH = "/" diff --git a/python/crosstest/kotlin_python_client.py b/python/crosstest/kotlin_python_client.py index 88d56f8..b0a2a7f 100644 --- a/python/crosstest/kotlin_python_client.py +++ b/python/crosstest/kotlin_python_client.py @@ -9,10 +9,10 @@ from pathlib import Path sys.path.insert(0, str(Path(__file__).resolve().parents[1])) -from toki_socket.communicator import type_name_of -from toki_socket.packets.message_common_pb2 import TestData -from toki_socket.tcp_client import connect_tcp, connect_tcp_tls -from toki_socket.ws_client import connect_ws, connect_wss +from proto_socket.communicator import type_name_of +from proto_socket.packets.message_common_pb2 import TestData +from proto_socket.tcp_client import connect_tcp, connect_tcp_tls +from proto_socket.ws_client import connect_ws, connect_wss HOST = "127.0.0.1" WS_PATH = "/" diff --git a/python/crosstest/python_dart.py b/python/crosstest/python_dart.py index 30ba68b..674b7fc 100644 --- a/python/crosstest/python_dart.py +++ b/python/crosstest/python_dart.py @@ -8,10 +8,10 @@ from pathlib import Path sys.path.insert(0, str(Path(__file__).resolve().parents[1])) -from toki_socket.communicator import type_name_of -from toki_socket.packets.message_common_pb2 import TestData -from toki_socket.tcp_server import TcpServer -from toki_socket.ws_server import WsServer +from proto_socket.communicator import type_name_of +from proto_socket.packets.message_common_pb2 import TestData +from proto_socket.tcp_server import TcpServer +from proto_socket.ws_server import WsServer HOST = "127.0.0.1" PYTHON_DART_TCP_PORT = 29494 diff --git a/python/crosstest/python_go.py b/python/crosstest/python_go.py index d305c43..0728189 100644 --- a/python/crosstest/python_go.py +++ b/python/crosstest/python_go.py @@ -8,10 +8,10 @@ from pathlib import Path sys.path.insert(0, str(Path(__file__).resolve().parents[1])) -from toki_socket.communicator import type_name_of -from toki_socket.packets.message_common_pb2 import TestData -from toki_socket.tcp_server import TcpServer -from toki_socket.ws_server import WsServer +from proto_socket.communicator import type_name_of +from proto_socket.packets.message_common_pb2 import TestData +from proto_socket.tcp_server import TcpServer +from proto_socket.ws_server import WsServer HOST = "127.0.0.1" PYTHON_GO_TCP_PORT = 29490 diff --git a/python/crosstest/python_kotlin.py b/python/crosstest/python_kotlin.py index 628bca2..9675215 100644 --- a/python/crosstest/python_kotlin.py +++ b/python/crosstest/python_kotlin.py @@ -8,10 +8,10 @@ from pathlib import Path sys.path.insert(0, str(Path(__file__).resolve().parents[1])) -from toki_socket.communicator import type_name_of -from toki_socket.packets.message_common_pb2 import TestData -from toki_socket.tcp_server import TcpServer -from toki_socket.ws_server import WsServer +from proto_socket.communicator import type_name_of +from proto_socket.packets.message_common_pb2 import TestData +from proto_socket.tcp_server import TcpServer +from proto_socket.ws_server import WsServer HOST = "127.0.0.1" PYTHON_KOTLIN_TCP_PORT = 29498 @@ -272,7 +272,7 @@ async def run_kotlin_client( process = await asyncio.create_subprocess_exec( "./gradlew", "run", - f"-PmainClass=com.tokilabs.toki_socket.crosstest.PythonKotlinClientKt", + f"-PmainClass=com.tokilabs.proto_socket.crosstest.PythonKotlinClientKt", f"--args={client_args}", cwd=kotlin_dir, stdout=asyncio.subprocess.PIPE, diff --git a/python/crosstest/python_typescript.py b/python/crosstest/python_typescript.py index 93c8be5..734dc86 100644 --- a/python/crosstest/python_typescript.py +++ b/python/crosstest/python_typescript.py @@ -8,10 +8,10 @@ from pathlib import Path sys.path.insert(0, str(Path(__file__).resolve().parents[1])) -from toki_socket.communicator import type_name_of -from toki_socket.packets.message_common_pb2 import TestData -from toki_socket.tcp_server import TcpServer -from toki_socket.ws_server import WsServer +from proto_socket.communicator import type_name_of +from proto_socket.packets.message_common_pb2 import TestData +from proto_socket.tcp_server import TcpServer +from proto_socket.ws_server import WsServer HOST = "127.0.0.1" PYTHON_TYPESCRIPT_TCP_PORT = 29798 diff --git a/python/crosstest/typescript_python_client.py b/python/crosstest/typescript_python_client.py index f18ebcd..1cd5ce6 100644 --- a/python/crosstest/typescript_python_client.py +++ b/python/crosstest/typescript_python_client.py @@ -9,10 +9,10 @@ from pathlib import Path sys.path.insert(0, str(Path(__file__).resolve().parents[1])) -from toki_socket.communicator import type_name_of -from toki_socket.packets.message_common_pb2 import TestData -from toki_socket.tcp_client import connect_tcp, connect_tcp_tls -from toki_socket.ws_client import connect_ws, connect_wss +from proto_socket.communicator import type_name_of +from proto_socket.packets.message_common_pb2 import TestData +from proto_socket.tcp_client import connect_tcp, connect_tcp_tls +from proto_socket.ws_client import connect_ws, connect_wss HOST = "127.0.0.1" WS_PATH = "/" diff --git a/python/toki_socket/__init__.py b/python/proto_socket/__init__.py similarity index 53% rename from python/toki_socket/__init__.py rename to python/proto_socket/__init__.py index 7711ef4..777a34f 100644 --- a/python/toki_socket/__init__.py +++ b/python/proto_socket/__init__.py @@ -1,15 +1,15 @@ -from toki_socket.base_client import BaseClient -from toki_socket.communicator import ( +from proto_socket.base_client import BaseClient +from proto_socket.communicator import ( Communicator, NotConnectedError, ParserMap, Transport, type_name_of, ) -from toki_socket.tcp_client import MAX_PACKET_SIZE, TcpClient, connect_tcp, connect_tcp_tls -from toki_socket.tcp_server import TcpServer -from toki_socket.ws_client import WsClient, connect_ws, connect_wss -from toki_socket.ws_server import WsServer +from proto_socket.tcp_client import MAX_PACKET_SIZE, TcpClient, connect_tcp, connect_tcp_tls +from proto_socket.tcp_server import TcpServer +from proto_socket.ws_client import WsClient, connect_ws, connect_wss +from proto_socket.ws_server import WsServer __all__ = [ "BaseClient", diff --git a/python/toki_socket/base_client.py b/python/proto_socket/base_client.py similarity index 96% rename from python/toki_socket/base_client.py rename to python/proto_socket/base_client.py index 4cce046..25809cd 100644 --- a/python/toki_socket/base_client.py +++ b/python/proto_socket/base_client.py @@ -6,8 +6,8 @@ from collections.abc import Awaitable, Callable from contextlib import suppress from typing import Any -from toki_socket.communicator import Communicator -from toki_socket.packets.message_common_pb2 import HeartBeat +from proto_socket.communicator import Communicator +from proto_socket.packets.message_common_pb2 import HeartBeat class _HbTimer: diff --git a/python/toki_socket/communicator.py b/python/proto_socket/communicator.py similarity index 99% rename from python/toki_socket/communicator.py rename to python/proto_socket/communicator.py index 8cb467b..4f29a73 100644 --- a/python/toki_socket/communicator.py +++ b/python/proto_socket/communicator.py @@ -7,7 +7,7 @@ from typing import Any, Protocol, TypeAlias, TypeVar, runtime_checkable from google.protobuf.message import Message -from toki_socket.packets.message_common_pb2 import HeartBeat, PacketBase +from proto_socket.packets.message_common_pb2 import HeartBeat, PacketBase T = TypeVar("T", bound=Message) ParserMap: TypeAlias = dict[str, Callable[[bytes], Message]] diff --git a/python/proto_socket/packets/__init__.py b/python/proto_socket/packets/__init__.py new file mode 100644 index 0000000..6bcec23 --- /dev/null +++ b/python/proto_socket/packets/__init__.py @@ -0,0 +1,4 @@ +from proto_socket.packets.message_common_pb2 import HeartBeat, PacketBase, TestData + +__all__ = ["HeartBeat", "PacketBase", "TestData"] + diff --git a/python/toki_socket/packets/message_common.proto b/python/proto_socket/packets/message_common.proto similarity index 100% rename from python/toki_socket/packets/message_common.proto rename to python/proto_socket/packets/message_common.proto diff --git a/python/toki_socket/packets/message_common_pb2.py b/python/proto_socket/packets/message_common_pb2.py similarity index 100% rename from python/toki_socket/packets/message_common_pb2.py rename to python/proto_socket/packets/message_common_pb2.py diff --git a/python/toki_socket/packets/message_common_pb2.pyi b/python/proto_socket/packets/message_common_pb2.pyi similarity index 100% rename from python/toki_socket/packets/message_common_pb2.pyi rename to python/proto_socket/packets/message_common_pb2.pyi diff --git a/python/toki_socket/tcp_client.py b/python/proto_socket/tcp_client.py similarity index 94% rename from python/toki_socket/tcp_client.py rename to python/proto_socket/tcp_client.py index ca5ee96..e04f605 100644 --- a/python/toki_socket/tcp_client.py +++ b/python/proto_socket/tcp_client.py @@ -7,9 +7,9 @@ from contextlib import suppress from google.protobuf.message import DecodeError -from toki_socket.base_client import BaseClient -from toki_socket.communicator import ParserMap, type_name_of -from toki_socket.packets.message_common_pb2 import HeartBeat, PacketBase +from proto_socket.base_client import BaseClient +from proto_socket.communicator import ParserMap, type_name_of +from proto_socket.packets.message_common_pb2 import HeartBeat, PacketBase MAX_PACKET_SIZE = 64 << 20 diff --git a/python/toki_socket/tcp_server.py b/python/proto_socket/tcp_server.py similarity index 96% rename from python/toki_socket/tcp_server.py rename to python/proto_socket/tcp_server.py index b060c46..c7967d7 100644 --- a/python/toki_socket/tcp_server.py +++ b/python/proto_socket/tcp_server.py @@ -7,8 +7,8 @@ from collections.abc import Callable from google.protobuf.message import Message -from toki_socket.communicator import ParserMap -from toki_socket.tcp_client import TcpClient +from proto_socket.communicator import ParserMap +from proto_socket.tcp_client import TcpClient class TcpServer: diff --git a/python/toki_socket/ws_client.py b/python/proto_socket/ws_client.py similarity index 93% rename from python/toki_socket/ws_client.py rename to python/proto_socket/ws_client.py index 4f254ad..8f665bd 100644 --- a/python/toki_socket/ws_client.py +++ b/python/proto_socket/ws_client.py @@ -13,9 +13,9 @@ try: except ImportError: # websockets 12.x legacy API from websockets import connect as ws_connect -from toki_socket.base_client import BaseClient -from toki_socket.communicator import ParserMap, type_name_of -from toki_socket.packets.message_common_pb2 import HeartBeat, PacketBase +from proto_socket.base_client import BaseClient +from proto_socket.communicator import ParserMap, type_name_of +from proto_socket.packets.message_common_pb2 import HeartBeat, PacketBase class WsClient(BaseClient): diff --git a/python/toki_socket/ws_server.py b/python/proto_socket/ws_server.py similarity index 97% rename from python/toki_socket/ws_server.py rename to python/proto_socket/ws_server.py index de41e1a..fad5c7e 100644 --- a/python/toki_socket/ws_server.py +++ b/python/proto_socket/ws_server.py @@ -16,8 +16,8 @@ except ImportError: # websockets 12.x legacy API _NEW_WEBSOCKETS_API = False -from toki_socket.communicator import ParserMap -from toki_socket.ws_client import WsClient +from proto_socket.communicator import ParserMap +from proto_socket.ws_client import WsClient class WsServer: diff --git a/python/pyproject.toml b/python/pyproject.toml index cec07cb..dccffdc 100644 --- a/python/pyproject.toml +++ b/python/pyproject.toml @@ -3,9 +3,9 @@ requires = ["setuptools>=68"] build-backend = "setuptools.build_meta" [project] -name = "toki-socket" +name = "proto-socket" version = "1.0.5" -description = "Python implementation of the Toki Socket binary socket protocol." +description = "Python implementation of the Proto Socket binary socket protocol." readme = "README.md" requires-python = ">=3.11" dependencies = [ @@ -21,7 +21,7 @@ dev = [ [tool.setuptools.packages.find] where = ["."] -include = ["toki_socket*"] +include = ["proto_socket*"] [tool.setuptools.package-data] -"toki_socket.packets" = ["*.proto", "*.pyi"] +"proto_socket.packets" = ["*.proto", "*.pyi"] diff --git a/python/test/test_communicator.py b/python/test/test_communicator.py index 25ce59a..725ae11 100644 --- a/python/test/test_communicator.py +++ b/python/test/test_communicator.py @@ -4,8 +4,8 @@ import asyncio import pytest -from toki_socket.communicator import MAX_NONCE, Communicator, type_name_of -from toki_socket.packets.message_common_pb2 import PacketBase, TestData as ProtoTestData +from proto_socket.communicator import MAX_NONCE, Communicator, type_name_of +from proto_socket.packets.message_common_pb2 import PacketBase, TestData as ProtoTestData class FakeTransport: diff --git a/python/test/test_tcp.py b/python/test/test_tcp.py index 2fbfee8..7759e8e 100644 --- a/python/test/test_tcp.py +++ b/python/test/test_tcp.py @@ -6,10 +6,10 @@ from pathlib import Path import pytest -from toki_socket.communicator import type_name_of -from toki_socket.packets.message_common_pb2 import TestData as ProtoTestData -from toki_socket.tcp_client import TcpClient, connect_tcp, connect_tcp_tls -from toki_socket.tcp_server import TcpServer +from proto_socket.communicator import type_name_of +from proto_socket.packets.message_common_pb2 import TestData as ProtoTestData +from proto_socket.tcp_client import TcpClient, connect_tcp, connect_tcp_tls +from proto_socket.tcp_server import TcpServer def _make_server_ssl_context() -> ssl.SSLContext: diff --git a/python/test/test_ws.py b/python/test/test_ws.py index a924a8f..e9e19df 100644 --- a/python/test/test_ws.py +++ b/python/test/test_ws.py @@ -6,10 +6,10 @@ from pathlib import Path import pytest -from toki_socket.communicator import type_name_of -from toki_socket.packets.message_common_pb2 import TestData as ProtoTestData -from toki_socket.ws_client import WsClient, connect_ws, connect_wss -from toki_socket.ws_server import WsServer +from proto_socket.communicator import type_name_of +from proto_socket.packets.message_common_pb2 import TestData as ProtoTestData +from proto_socket.ws_client import WsClient, connect_ws, connect_wss +from proto_socket.ws_server import WsServer def _make_server_ssl_context() -> ssl.SSLContext: diff --git a/python/toki_socket/packets/__init__.py b/python/toki_socket/packets/__init__.py deleted file mode 100644 index ae31658..0000000 --- a/python/toki_socket/packets/__init__.py +++ /dev/null @@ -1,4 +0,0 @@ -from toki_socket.packets.message_common_pb2 import HeartBeat, PacketBase, TestData - -__all__ = ["HeartBeat", "PacketBase", "TestData"] - diff --git a/typescript/README.md b/typescript/README.md index 925acb0..04ac065 100644 --- a/typescript/README.md +++ b/typescript/README.md @@ -1,8 +1,8 @@ -# TypeScript Toki Socket +# TypeScript Proto Socket Status: planned -This package implements Toki Socket protocol version `0.1` for TypeScript. +This package implements Proto Socket protocol version `0.1` for TypeScript. ## Scope diff --git a/typescript/crosstest/typescript_kotlin.ts b/typescript/crosstest/typescript_kotlin.ts index 73cc020..ad8cd3d 100644 --- a/typescript/crosstest/typescript_kotlin.ts +++ b/typescript/crosstest/typescript_kotlin.ts @@ -306,7 +306,7 @@ async function runKotlinClient( "./gradlew", [ "run", - "-PmainClass=com.tokilabs.toki_socket.crosstest.TypescriptKotlinClientKt", + "-PmainClass=com.tokilabs.proto_socket.crosstest.TypescriptKotlinClientKt", `--args=${clientArgs}`, ], kotlinDir, diff --git a/typescript/package-lock.json b/typescript/package-lock.json index 9fce089..9ac9bb0 100644 --- a/typescript/package-lock.json +++ b/typescript/package-lock.json @@ -1,11 +1,11 @@ { - "name": "toki-socket", + "name": "proto-socket", "version": "1.0.5", "lockfileVersion": 3, "requires": true, "packages": { "": { - "name": "toki-socket", + "name": "proto-socket", "version": "1.0.5", "dependencies": { "@bufbuild/protobuf": "^2.2.5", diff --git a/typescript/package.json b/typescript/package.json index 6de3ddb..3591888 100644 --- a/typescript/package.json +++ b/typescript/package.json @@ -1,5 +1,5 @@ { - "name": "toki-socket", + "name": "proto-socket", "version": "1.0.5", "private": true, "type": "module",