From d23cba468f9b6197624143e393e0831732f541eb Mon Sep 17 00:00:00 2001 From: Jazz Turner-Baggs <473256+jazzz@users.noreply.github.com> Date: Thu, 21 Aug 2025 12:35:55 -0700 Subject: [PATCH] Reorg project --- src/{ => chat_sdk}/client.nim | 10 ++++------ src/{ => chat_sdk}/conversation_store.nim | 4 ++-- src/chat_sdk/conversations.nim | 5 +++++ src/{ => chat_sdk/conversations}/convo_impl.nim | 8 +++----- .../conversations/convo_type.nim} | 1 - src/{ => chat_sdk}/conversations/private_v1.nim | 11 ++++++----- src/{ => chat_sdk}/crypto.nim | 0 src/{ => chat_sdk}/crypto/curve25519.nim | 0 src/{ => chat_sdk}/crypto/ecdh.nim | 0 src/{ => chat_sdk/delivery}/waku_client.nim | 2 +- src/{ => chat_sdk}/identity.nim | 0 src/{ => chat_sdk}/inbox.nim | 4 ++-- src/{ => chat_sdk}/proto_types.nim | 8 ++++---- src/{ => chat_sdk}/types.nim | 0 src/{ => chat_sdk}/utils.nim | 0 src/nim_chat_poc.nim | 4 ++-- 16 files changed, 29 insertions(+), 28 deletions(-) rename src/{ => chat_sdk}/client.nim (98%) rename src/{ => chat_sdk}/conversation_store.nim (90%) create mode 100644 src/chat_sdk/conversations.nim rename src/{ => chat_sdk/conversations}/convo_impl.nim (84%) rename src/{conversation.nim => chat_sdk/conversations/convo_type.nim} (90%) rename src/{ => chat_sdk}/conversations/private_v1.nim (96%) rename src/{ => chat_sdk}/crypto.nim (100%) rename src/{ => chat_sdk}/crypto/curve25519.nim (100%) rename src/{ => chat_sdk}/crypto/ecdh.nim (100%) rename src/{ => chat_sdk/delivery}/waku_client.nim (99%) rename src/{ => chat_sdk}/identity.nim (100%) rename src/{ => chat_sdk}/inbox.nim (98%) rename src/{ => chat_sdk}/proto_types.nim (93%) rename src/{ => chat_sdk}/types.nim (100%) rename src/{ => chat_sdk}/utils.nim (100%) diff --git a/src/client.nim b/src/chat_sdk/client.nim similarity index 98% rename from src/client.nim rename to src/chat_sdk/client.nim index 0a6a568..942d193 100644 --- a/src/client.nim +++ b/src/chat_sdk/client.nim @@ -13,18 +13,16 @@ import # Foreign import #local conversation_store, - conversation, - convo_impl, + conversations, + conversations/convo_impl, crypto, + delivery/waku_client, identity, inbox, proto_types, types, - utils, - waku_client + utils -import #to be removed - conversations/private_v1 logScope: topics = "chat client" diff --git a/src/conversation_store.nim b/src/chat_sdk/conversation_store.nim similarity index 90% rename from src/conversation_store.nim rename to src/chat_sdk/conversation_store.nim index 6e89f6b..360d49c 100644 --- a/src/conversation_store.nim +++ b/src/chat_sdk/conversation_store.nim @@ -1,5 +1,6 @@ import std/[options, times] -import conversation + +import ./conversations/convo_type import crypto import identity @@ -7,7 +8,6 @@ type ConvoId = string - type ConversationStore* = concept proc addConversation(self: Self, convo: Conversation) diff --git a/src/chat_sdk/conversations.nim b/src/chat_sdk/conversations.nim new file mode 100644 index 0000000..31409c1 --- /dev/null +++ b/src/chat_sdk/conversations.nim @@ -0,0 +1,5 @@ +import + ./conversations/[convo_type, private_v1] + + +export private_v1, convo_type diff --git a/src/convo_impl.nim b/src/chat_sdk/conversations/convo_impl.nim similarity index 84% rename from src/convo_impl.nim rename to src/chat_sdk/conversations/convo_impl.nim index f5cbc14..60fb9e5 100644 --- a/src/convo_impl.nim +++ b/src/chat_sdk/conversations/convo_impl.nim @@ -1,8 +1,6 @@ -import conversation_store -import conversation - -import inbox -import conversations/private_v1 +import ../conversation_store +import ../conversations +import ../inbox proc getType(convo: Conversation): ConvoTypes = diff --git a/src/conversation.nim b/src/chat_sdk/conversations/convo_type.nim similarity index 90% rename from src/conversation.nim rename to src/chat_sdk/conversations/convo_type.nim index 2e38d42..3490050 100644 --- a/src/conversation.nim +++ b/src/chat_sdk/conversations/convo_type.nim @@ -1,4 +1,3 @@ -# import conversations/private_v1 import strformat type diff --git a/src/conversations/private_v1.nim b/src/chat_sdk/conversations/private_v1.nim similarity index 96% rename from src/conversations/private_v1.nim rename to src/chat_sdk/conversations/private_v1.nim index 437226d..bff2033 100644 --- a/src/conversations/private_v1.nim +++ b/src/chat_sdk/conversations/private_v1.nim @@ -6,15 +6,16 @@ import std/[sequtils, strutils] import std/algorithm import sugar +import ../conversation_store +import ../crypto +import ../delivery/waku_client + import ../[ - conversation, - conversation_store, - crypto, identity, proto_types, - utils, - waku_client + utils ] +import convo_type diff --git a/src/crypto.nim b/src/chat_sdk/crypto.nim similarity index 100% rename from src/crypto.nim rename to src/chat_sdk/crypto.nim diff --git a/src/crypto/curve25519.nim b/src/chat_sdk/crypto/curve25519.nim similarity index 100% rename from src/crypto/curve25519.nim rename to src/chat_sdk/crypto/curve25519.nim diff --git a/src/crypto/ecdh.nim b/src/chat_sdk/crypto/ecdh.nim similarity index 100% rename from src/crypto/ecdh.nim rename to src/chat_sdk/crypto/ecdh.nim diff --git a/src/waku_client.nim b/src/chat_sdk/delivery/waku_client.nim similarity index 99% rename from src/waku_client.nim rename to src/chat_sdk/delivery/waku_client.nim index 2b55367..ad60ed7 100644 --- a/src/waku_client.nim +++ b/src/chat_sdk/delivery/waku_client.nim @@ -20,7 +20,7 @@ import waku_filter_v2/client, ] -import utils, proto_types +import ../utils, ../proto_types logScope: topics = "chat waku" diff --git a/src/identity.nim b/src/chat_sdk/identity.nim similarity index 100% rename from src/identity.nim rename to src/chat_sdk/identity.nim diff --git a/src/inbox.nim b/src/chat_sdk/inbox.nim similarity index 98% rename from src/inbox.nim rename to src/chat_sdk/inbox.nim index 916ebff..fa752ff 100644 --- a/src/inbox.nim +++ b/src/chat_sdk/inbox.nim @@ -5,8 +5,8 @@ import strformat import - conversation, - conversations/private_v1, + conversations/convo_type, + conversations, conversation_store, crypto, proto_types, diff --git a/src/proto_types.nim b/src/chat_sdk/proto_types.nim similarity index 93% rename from src/proto_types.nim rename to src/chat_sdk/proto_types.nim index 2dbfb7e..43c82cb 100644 --- a/src/proto_types.nim +++ b/src/chat_sdk/proto_types.nim @@ -8,13 +8,13 @@ import std/random export protobuf_serialization -import_proto3 "../protos/inbox.proto" +import_proto3 "../../protos/inbox.proto" # import_proto3 "../protos/invite.proto" // Import3 follows protobuf includes so this will result in a redefinition error -import_proto3 "../protos/encryption.proto" -import_proto3 "../protos/envelope.proto" +import_proto3 "../../protos/encryption.proto" +import_proto3 "../../protos/envelope.proto" # import_proto3 "../protos/common_frames.proto" -import_proto3 "../protos/private_v1.proto" +import_proto3 "../../protos/private_v1.proto" type EncryptableTypes = InboxV1Frame | EncryptedPayload diff --git a/src/types.nim b/src/chat_sdk/types.nim similarity index 100% rename from src/types.nim rename to src/chat_sdk/types.nim diff --git a/src/utils.nim b/src/chat_sdk/utils.nim similarity index 100% rename from src/utils.nim rename to src/chat_sdk/utils.nim diff --git a/src/nim_chat_poc.nim b/src/nim_chat_poc.nim index a31cfd6..03413aa 100644 --- a/src/nim_chat_poc.nim +++ b/src/nim_chat_poc.nim @@ -1,7 +1,7 @@ import chronos import chronicles -import client -import waku_client +import chat_sdk/client +import chat_sdk/delivery/waku_client proc initLogging() = when defined(chronicles_runtime_filtering):