From 44fd7ecb7302630dc706bd4538bd710021ababd5 Mon Sep 17 00:00:00 2001 From: zzstoatzz Date: Wed, 20 May 2026 15:10:07 -0500 Subject: [PATCH] Organize source by protocol boundary --- .../identity.zig} | 4 +- src/{atproto_repo.zig => atproto/repo.zig} | 8 +-- .../server.zig} | 4 +- src/{atproto_sync.zig => atproto/sync.zig} | 4 +- src/{auth.zig => auth/dev.zig} | 0 src/{ => bsky}/appview.zig | 4 +- src/{bsky_compat.zig => bsky/compat.zig} | 10 ++-- src/{bsky_state.zig => bsky/state.zig} | 2 +- src/{bsky_views.zig => bsky/views.zig} | 6 +- src/{ => core}/atid.zig | 0 src/{ => core}/repo.zig | 0 src/{ => core}/syntax.zig | 0 src/{ => core}/xrpc.zig | 0 src/{http_api.zig => http/api.zig} | 2 +- src/{ => http}/router.zig | 2 +- src/{ => http}/server.zig | 12 ++-- src/main.zig | 4 +- src/root.zig | 56 ++++++++++++++----- src/{ => storage}/store.zig | 4 +- 19 files changed, 74 insertions(+), 48 deletions(-) rename src/{atproto_identity.zig => atproto/identity.zig} (90%) rename src/{atproto_repo.zig => atproto/repo.zig} (98%) rename src/{atproto_server.zig => atproto/server.zig} (98%) rename src/{atproto_sync.zig => atproto/sync.zig} (93%) rename src/{auth.zig => auth/dev.zig} (100%) rename src/{ => bsky}/appview.zig (98%) rename src/{bsky_compat.zig => bsky/compat.zig} (99%) rename src/{bsky_state.zig => bsky/state.zig} (97%) rename src/{bsky_views.zig => bsky/views.zig} (98%) rename src/{ => core}/atid.zig (100%) rename src/{ => core}/repo.zig (100%) rename src/{ => core}/syntax.zig (100%) rename src/{ => core}/xrpc.zig (100%) rename src/{http_api.zig => http/api.zig} (99%) rename src/{ => http}/router.zig (99%) rename src/{ => http}/server.zig (94%) rename src/{ => storage}/store.zig (99%) diff --git a/src/atproto_identity.zig b/src/atproto/identity.zig similarity index 90% rename from src/atproto_identity.zig rename to src/atproto/identity.zig index c6f734e..78ddcb5 100644 --- a/src/atproto_identity.zig +++ b/src/atproto/identity.zig @@ -1,6 +1,6 @@ const std = @import("std"); -const auth = @import("auth.zig"); -const http_api = @import("http_api.zig"); +const auth = @import("../auth/dev.zig"); +const http_api = @import("../http/api.zig"); const http = std.http; diff --git a/src/atproto_repo.zig b/src/atproto/repo.zig similarity index 98% rename from src/atproto_repo.zig rename to src/atproto/repo.zig index f7741da..8eef17b 100644 --- a/src/atproto_repo.zig +++ b/src/atproto/repo.zig @@ -1,8 +1,8 @@ const std = @import("std"); -const auth = @import("auth.zig"); -const bsky_compat = @import("bsky_compat.zig"); -const http_api = @import("http_api.zig"); -const store = @import("store.zig"); +const auth = @import("../auth/dev.zig"); +const bsky_compat = @import("../bsky/compat.zig"); +const http_api = @import("../http/api.zig"); +const store = @import("../storage/store.zig"); const zat = @import("zat"); const http = std.http; diff --git a/src/atproto_server.zig b/src/atproto/server.zig similarity index 98% rename from src/atproto_server.zig rename to src/atproto/server.zig index 2844c77..0bc2f57 100644 --- a/src/atproto_server.zig +++ b/src/atproto/server.zig @@ -1,6 +1,6 @@ const std = @import("std"); -const auth = @import("auth.zig"); -const http_api = @import("http_api.zig"); +const auth = @import("../auth/dev.zig"); +const http_api = @import("../http/api.zig"); const zat = @import("zat"); const http = std.http; diff --git a/src/atproto_sync.zig b/src/atproto/sync.zig similarity index 93% rename from src/atproto_sync.zig rename to src/atproto/sync.zig index d13e818..0734533 100644 --- a/src/atproto_sync.zig +++ b/src/atproto/sync.zig @@ -1,6 +1,6 @@ const std = @import("std"); -const http_api = @import("http_api.zig"); -const store = @import("store.zig"); +const http_api = @import("../http/api.zig"); +const store = @import("../storage/store.zig"); const http = std.http; diff --git a/src/auth.zig b/src/auth/dev.zig similarity index 100% rename from src/auth.zig rename to src/auth/dev.zig diff --git a/src/appview.zig b/src/bsky/appview.zig similarity index 98% rename from src/appview.zig rename to src/bsky/appview.zig index 57d0309..84851ca 100644 --- a/src/appview.zig +++ b/src/bsky/appview.zig @@ -1,6 +1,6 @@ const std = @import("std"); -const auth = @import("auth.zig"); -const store = @import("store.zig"); +const auth = @import("../auth/dev.zig"); +const store = @import("../storage/store.zig"); const zat = @import("zat"); pub fn writeNotificationsJson( diff --git a/src/bsky_compat.zig b/src/bsky/compat.zig similarity index 99% rename from src/bsky_compat.zig rename to src/bsky/compat.zig index 86963ec..45959dd 100644 --- a/src/bsky_compat.zig +++ b/src/bsky/compat.zig @@ -1,10 +1,10 @@ const std = @import("std"); const appview = @import("appview.zig"); -const auth = @import("auth.zig"); -const bsky_state = @import("bsky_state.zig"); -const bsky_views = @import("bsky_views.zig"); -const http_api = @import("http_api.zig"); -const store = @import("store.zig"); +const auth = @import("../auth/dev.zig"); +const bsky_state = @import("state.zig"); +const bsky_views = @import("views.zig"); +const http_api = @import("../http/api.zig"); +const store = @import("../storage/store.zig"); const zat = @import("zat"); const http = std.http; diff --git a/src/bsky_state.zig b/src/bsky/state.zig similarity index 97% rename from src/bsky_state.zig rename to src/bsky/state.zig index 16c1baf..dd89383 100644 --- a/src/bsky_state.zig +++ b/src/bsky/state.zig @@ -1,5 +1,5 @@ const std = @import("std"); -const store = @import("store.zig"); +const store = @import("../storage/store.zig"); const zat = @import("zat"); pub fn followingCount(allocator: std.mem.Allocator, did: []const u8) usize { diff --git a/src/bsky_views.zig b/src/bsky/views.zig similarity index 98% rename from src/bsky_views.zig rename to src/bsky/views.zig index babbded..087280b 100644 --- a/src/bsky_views.zig +++ b/src/bsky/views.zig @@ -1,7 +1,7 @@ const std = @import("std"); -const auth = @import("auth.zig"); -const bsky_state = @import("bsky_state.zig"); -const store = @import("store.zig"); +const auth = @import("../auth/dev.zig"); +const bsky_state = @import("state.zig"); +const store = @import("../storage/store.zig"); const zat = @import("zat"); pub fn writeBookmarksJson( diff --git a/src/atid.zig b/src/core/atid.zig similarity index 100% rename from src/atid.zig rename to src/core/atid.zig diff --git a/src/repo.zig b/src/core/repo.zig similarity index 100% rename from src/repo.zig rename to src/core/repo.zig diff --git a/src/syntax.zig b/src/core/syntax.zig similarity index 100% rename from src/syntax.zig rename to src/core/syntax.zig diff --git a/src/xrpc.zig b/src/core/xrpc.zig similarity index 100% rename from src/xrpc.zig rename to src/core/xrpc.zig diff --git a/src/http_api.zig b/src/http/api.zig similarity index 99% rename from src/http_api.zig rename to src/http/api.zig index c8e99ea..543be7a 100644 --- a/src/http_api.zig +++ b/src/http/api.zig @@ -1,5 +1,5 @@ const std = @import("std"); -const auth = @import("auth.zig"); +const auth = @import("../auth/dev.zig"); const http = std.http; diff --git a/src/router.zig b/src/http/router.zig similarity index 99% rename from src/router.zig rename to src/http/router.zig index 4ddf81b..b9a5ae0 100644 --- a/src/router.zig +++ b/src/http/router.zig @@ -1,5 +1,5 @@ const std = @import("std"); -const xrpc = @import("xrpc.zig"); +const xrpc = @import("../core/xrpc.zig"); const http = std.http; diff --git a/src/server.zig b/src/http/server.zig similarity index 94% rename from src/server.zig rename to src/http/server.zig index 6f906d8..d0312ac 100644 --- a/src/server.zig +++ b/src/http/server.zig @@ -1,10 +1,10 @@ const std = @import("std"); -const atproto_identity = @import("atproto_identity.zig"); -const atproto_repo = @import("atproto_repo.zig"); -const atproto_server = @import("atproto_server.zig"); -const atproto_sync = @import("atproto_sync.zig"); -const bsky_compat = @import("bsky_compat.zig"); -const http_api = @import("http_api.zig"); +const atproto_identity = @import("../atproto/identity.zig"); +const atproto_repo = @import("../atproto/repo.zig"); +const atproto_server = @import("../atproto/server.zig"); +const atproto_sync = @import("../atproto/sync.zig"); +const bsky_compat = @import("../bsky/compat.zig"); +const http_api = @import("api.zig"); const router = @import("router.zig"); const http = std.http; diff --git a/src/main.zig b/src/main.zig index aad2a5d..026e3d8 100644 --- a/src/main.zig +++ b/src/main.zig @@ -32,8 +32,8 @@ pub fn main(init: std.process.Init) !void { return error.UnknownArgument; } - try zds.store.init(init.io, db_path); - try zds.server.listen(init.io, .{ .port = port }); + try zds.storage.store.init(init.io, db_path); + try zds.http.server.listen(init.io, .{ .port = port }); } fn usage() void { diff --git a/src/root.zig b/src/root.zig index a3207bc..5e6f6ec 100644 --- a/src/root.zig +++ b/src/root.zig @@ -1,19 +1,45 @@ -pub const atid = @import("atid.zig"); -pub const appview = @import("appview.zig"); -pub const auth = @import("auth.zig"); -pub const repo = @import("repo.zig"); -pub const server = @import("server.zig"); -pub const store = @import("store.zig"); -pub const syntax = @import("syntax.zig"); -pub const xrpc = @import("xrpc.zig"); +pub const atproto = struct { + pub const identity = @import("atproto/identity.zig"); + pub const repo = @import("atproto/repo.zig"); + pub const server = @import("atproto/server.zig"); + pub const sync = @import("atproto/sync.zig"); +}; + +pub const auth = struct { + pub const dev = @import("auth/dev.zig"); +}; + +pub const bsky = struct { + pub const appview = @import("bsky/appview.zig"); + pub const compat = @import("bsky/compat.zig"); + pub const state = @import("bsky/state.zig"); + pub const views = @import("bsky/views.zig"); +}; + +pub const core = struct { + pub const atid = @import("core/atid.zig"); + pub const repo = @import("core/repo.zig"); + pub const syntax = @import("core/syntax.zig"); + pub const xrpc = @import("core/xrpc.zig"); +}; + +pub const http = struct { + pub const api = @import("http/api.zig"); + pub const router = @import("http/router.zig"); + pub const server = @import("http/server.zig"); +}; + +pub const storage = struct { + pub const store = @import("storage/store.zig"); +}; + pub const zat = @import("zat"); test { - _ = atid; - _ = appview; - _ = repo; - _ = server; - _ = store; - _ = syntax; - _ = xrpc; + _ = atproto; + _ = auth; + _ = bsky; + _ = core; + _ = http; + _ = storage; } diff --git a/src/store.zig b/src/storage/store.zig similarity index 99% rename from src/store.zig rename to src/storage/store.zig index cfd9a36..e180b12 100644 --- a/src/store.zig +++ b/src/storage/store.zig @@ -1,6 +1,6 @@ const std = @import("std"); -const atid = @import("atid.zig"); -const auth = @import("auth.zig"); +const atid = @import("../core/atid.zig"); +const auth = @import("../auth/dev.zig"); const zat = @import("zat"); const zqlite = @import("zqlite"); const Io = std.Io; -- 2.51.2