feat: separate schema (#339)

* feat: separate schema from gateway

* chore: update turbo config

.gitignore

@@ -125,3 +125,6 @@ dist
 .yarn/build-state.yml
 .yarn/install-state.gz
 .pnp.*
+
+# turbo cache
+.turbo

packages/kanao-schema/package.json

@@ -0,0 +1,28 @@
+{
+  "name": "@nezuchan/kanao-schema",
+  "version": "1.0.0",
+  "description": "Cache schema for Kanao Gateway",
+  "main": "./dist/index.js",
+  "module": "./dist/index.js",
+  "types": "./dist/index.d.ts",
+  "exports": {
+    "types": "./dist/index.d.ts",
+    "import": "./dist/index.js",
+    "require": "./dist/index.js"
+  },
+  "scripts": {
+    "build": "rimraf dist && tsc",
+    "lint": "eslint src",
+    "lint:fix": "eslint src --fix"
+  },
+  "keywords": [],
+  "author": "KagChi",
+  "license": "GPL-3.0",
+  "devDependencies": {
+    "drizzle-kit": "^0.20.14"
+  },
+  "dependencies": {
+    "drizzle-orm": "^0.29.3",
+    "tslib": "^2.6.2"
+  }
+}

packages/kanao-schema/src/index.ts

@@ -0,0 +1,9 @@
+export * from "./Schema/member.js";
+export * from "./Schema/user.js";
+export * from "./Schema/roles.js";
+export * from "./Schema/guild.js";
+export * from "./Schema/channel.js";
+export * from "./Schema/voice.js";
+export * from "./Schema/message.js";
+export * from "./Schema/session.js";
+export * from "./Schema/status.js";

packages/kanao-schema/tsconfig.json

@@ -0,0 +1,10 @@
+{
+    "extends": "../../tsconfig.json",
+    "compilerOptions": {
+        "outDir": "dist",
+        "rootDir": "src",
+        "declaration": true,
+        "sourceMap": true
+    },
+    "include": ["src"]
+}

pnpm-workspace.yaml

@@ -1,2 +1,3 @@
 packages:
-  - 'services/*'
+  - 'services/*'
+  - 'packages/*'

services/kanao-gateway/package.json

@@ -18,6 +18,7 @@
     "@discordjs/rest": "^2.2.0",
     "@discordjs/ws": "^1.0.2",
     "@nezuchan/constants": "^0.8.0",
+    "@nezuchan/kanao-schema": "workspace:^",
     "@nezuchan/utilities": "^0.6.2",
     "@sapphire/pieces": "^4.2.2",
     "@sapphire/result": "^2.6.6",

services/kanao-gateway/src/Listeners/Caches/Channels/ChannelCreateListener.ts

@@ -1,10 +1,10 @@
 import { Buffer } from "node:buffer";
 import { RabbitMQ } from "@nezuchan/constants";
+import { channels, channelsOverwrite } from "@nezuchan/kanao-schema";
 import { RoutingKey } from "@nezuchan/utilities";
 import type { GatewayChannelCreateDispatch } from "discord-api-types/v10";
 import { GatewayDispatchEvents } from "discord-api-types/v10";
 import { eq } from "drizzle-orm";
-import { channels, channelsOverwrite } from "../../../Schema/index.js";
 import type { ListenerContext } from "../../../Stores/Listener.js";
 import { Listener } from "../../../Stores/Listener.js";
 import { clientId, stateChannels } from "../../../config.js";

services/kanao-gateway/src/Listeners/Caches/Channels/ChannelDeleteListener.ts

@@ -1,10 +1,10 @@
 import { Buffer } from "node:buffer";
 import { RabbitMQ } from "@nezuchan/constants";
+import { channels } from "@nezuchan/kanao-schema";
 import { RoutingKey } from "@nezuchan/utilities";
 import type { GatewayChannelDeleteDispatch } from "discord-api-types/v10";
 import { GatewayDispatchEvents } from "discord-api-types/v10";
 import { eq } from "drizzle-orm";
-import { channels } from "../../../Schema/index.js";
 import type { ListenerContext } from "../../../Stores/Listener.js";
 import { Listener } from "../../../Stores/Listener.js";
 import { clientId, stateChannels } from "../../../config.js";

services/kanao-gateway/src/Listeners/Caches/Channels/ChannelUpdateListener.ts

@@ -1,10 +1,10 @@
 import { Buffer } from "node:buffer";
 import { RabbitMQ } from "@nezuchan/constants";
+import { channels, channelsOverwrite } from "@nezuchan/kanao-schema";
 import { RoutingKey } from "@nezuchan/utilities";
 import type { GatewayChannelUpdateDispatch } from "discord-api-types/v10";
 import { GatewayDispatchEvents } from "discord-api-types/v10";
 import { eq } from "drizzle-orm";
-import { channels, channelsOverwrite } from "../../../Schema/index.js";
 import type { ListenerContext } from "../../../Stores/Listener.js";
 import { Listener } from "../../../Stores/Listener.js";
 import { clientId, stateChannels } from "../../../config.js";

services/kanao-gateway/src/Listeners/Caches/GuildMembers/GuildMemberAddListener.ts

@@ -1,9 +1,9 @@
 import { Buffer } from "node:buffer";
 import { RabbitMQ } from "@nezuchan/constants";
+import { memberRoles, members, users } from "@nezuchan/kanao-schema";
 import { RoutingKey } from "@nezuchan/utilities";
 import type { GatewayGuildMemberAddDispatch } from "discord-api-types/v10";
 import { GatewayDispatchEvents } from "discord-api-types/v10";
-import { memberRoles, members, users } from "../../../Schema/index.js";
 import type { ListenerContext } from "../../../Stores/Listener.js";
 import { Listener } from "../../../Stores/Listener.js";
 import { clientId, stateUsers } from "../../../config.js";

services/kanao-gateway/src/Listeners/Caches/GuildMembers/GuildMemberRemoveListener.ts

@@ -1,10 +1,10 @@
 import { Buffer } from "node:buffer";
 import { RabbitMQ } from "@nezuchan/constants";
+import { members } from "@nezuchan/kanao-schema";
 import { RoutingKey } from "@nezuchan/utilities";
 import type { GatewayGuildMemberRemoveDispatch } from "discord-api-types/v10";
 import { GatewayDispatchEvents } from "discord-api-types/v10";
 import { eq } from "drizzle-orm";
-import { members } from "../../../Schema/index.js";
 import type { ListenerContext } from "../../../Stores/Listener.js";
 import { Listener } from "../../../Stores/Listener.js";
 import { clientId } from "../../../config.js";

services/kanao-gateway/src/Listeners/Caches/GuildMembers/GuildMemberUpdateListener.ts

@@ -1,10 +1,10 @@
 import { Buffer } from "node:buffer";
 import { RabbitMQ } from "@nezuchan/constants";
+import { memberRoles, members, users } from "@nezuchan/kanao-schema";
 import { RoutingKey } from "@nezuchan/utilities";
 import type { GatewayGuildMemberUpdateDispatch } from "discord-api-types/v10";
 import { GatewayDispatchEvents } from "discord-api-types/v10";
 import { eq } from "drizzle-orm";
-import { memberRoles, members, users } from "../../../Schema/index.js";
 import type { ListenerContext } from "../../../Stores/Listener.js";
 import { Listener } from "../../../Stores/Listener.js";
 import { clientId, stateMembers, stateUsers } from "../../../config.js";

services/kanao-gateway/src/Listeners/Caches/GuildMembers/GuildMembersChunkListener.ts

@@ -1,9 +1,9 @@
 import { Buffer } from "node:buffer";
 import { RabbitMQ } from "@nezuchan/constants";
+import { members, users } from "@nezuchan/kanao-schema";
 import { RoutingKey } from "@nezuchan/utilities";
 import type { GatewayGuildMembersChunkDispatch } from "discord-api-types/v10";
 import { GatewayDispatchEvents } from "discord-api-types/v10";
-import { members, users } from "../../../Schema/index.js";
 import type { ListenerContext } from "../../../Stores/Listener.js";
 import { Listener } from "../../../Stores/Listener.js";
 import { clientId, stateMembers, stateUsers } from "../../../config.js";

services/kanao-gateway/src/Listeners/Caches/GuildRoles/GuildRoleCreateListener.ts

@@ -1,9 +1,9 @@
 import { Buffer } from "node:buffer";
 import { RabbitMQ } from "@nezuchan/constants";
+import { roles } from "@nezuchan/kanao-schema";
 import { RoutingKey } from "@nezuchan/utilities";
 import type { GatewayGuildRoleCreateDispatch } from "discord-api-types/v10";
 import { GatewayDispatchEvents } from "discord-api-types/v10";
-import { roles } from "../../../Schema/index.js";
 import type { ListenerContext } from "../../../Stores/Listener.js";
 import { Listener } from "../../../Stores/Listener.js";
 import { clientId, stateRoles } from "../../../config.js";

services/kanao-gateway/src/Listeners/Caches/GuildRoles/GuildRoleDeleteListener.ts

@@ -1,10 +1,10 @@
 import { Buffer } from "node:buffer";
 import { RabbitMQ } from "@nezuchan/constants";
+import { roles } from "@nezuchan/kanao-schema";
 import { RoutingKey } from "@nezuchan/utilities";
 import type { GatewayGuildRoleDeleteDispatch } from "discord-api-types/v10";
 import { GatewayDispatchEvents } from "discord-api-types/v10";
 import { eq } from "drizzle-orm";
-import { roles } from "../../../Schema/index.js";
 import type { ListenerContext } from "../../../Stores/Listener.js";
 import { Listener } from "../../../Stores/Listener.js";
 import { clientId } from "../../../config.js";

services/kanao-gateway/src/Listeners/Caches/GuildRoles/GuildRoleUpdateListener.ts

@@ -1,9 +1,9 @@
 import { Buffer } from "node:buffer";
 import { RabbitMQ } from "@nezuchan/constants";
+import { roles } from "@nezuchan/kanao-schema";
 import { RoutingKey } from "@nezuchan/utilities";
 import type { GatewayGuildRoleUpdateDispatch } from "discord-api-types/v10";
 import { GatewayDispatchEvents } from "discord-api-types/v10";
-import { roles } from "../../../Schema/index.js";
 import type { ListenerContext } from "../../../Stores/Listener.js";
 import { Listener } from "../../../Stores/Listener.js";
 import { clientId, stateRoles } from "../../../config.js";

services/kanao-gateway/src/Listeners/Caches/Guilds/GuildCreateListener.ts

@@ -1,10 +1,10 @@
 import { Buffer } from "node:buffer";
 import { RabbitMQ } from "@nezuchan/constants";
+import { channels, channelsOverwrite, guilds, guildsRoles, memberRoles, members, roles, users, voiceStates } from "@nezuchan/kanao-schema";
 import { RoutingKey } from "@nezuchan/utilities";
 import type { GatewayGuildCreateDispatch } from "discord-api-types/v10";
 import { GatewayDispatchEvents } from "discord-api-types/v10";
 import { eq } from "drizzle-orm";
-import { channels, channelsOverwrite, guilds, guildsRoles, memberRoles, members, roles, users, voiceStates } from "../../../Schema/index.js";
 import type { ListenerContext } from "../../../Stores/Listener.js";
 import { Listener } from "../../../Stores/Listener.js";
 import { clientId, stateChannels, stateMembers, stateRoles, stateUsers, stateVoices } from "../../../config.js";

services/kanao-gateway/src/Listeners/Caches/Guilds/GuildDeleteListener.ts

@@ -1,10 +1,10 @@
 import { Buffer } from "node:buffer";
 import { RabbitMQ } from "@nezuchan/constants";
+import { guilds } from "@nezuchan/kanao-schema";
 import { RoutingKey } from "@nezuchan/utilities";
 import type { GatewayGuildDeleteDispatch } from "discord-api-types/v10";
 import { GatewayDispatchEvents } from "discord-api-types/v10";
 import { eq } from "drizzle-orm";
-import { guilds } from "../../../Schema/index.js";
 import type { ListenerContext } from "../../../Stores/Listener.js";
 import { Listener } from "../../../Stores/Listener.js";
 import { clientId } from "../../../config.js";

services/kanao-gateway/src/Listeners/Caches/Guilds/GuildUpdateListener.ts

@@ -1,9 +1,9 @@
 import { Buffer } from "node:buffer";
 import { RabbitMQ } from "@nezuchan/constants";
+import { guilds } from "@nezuchan/kanao-schema";
 import { RoutingKey } from "@nezuchan/utilities";
 import type { GatewayGuildUpdateDispatch } from "discord-api-types/v10";
 import { GatewayDispatchEvents } from "discord-api-types/v10";
-import { guilds } from "../../../Schema/index.js";
 import type { ListenerContext } from "../../../Stores/Listener.js";
 import { Listener } from "../../../Stores/Listener.js";
 import { clientId } from "../../../config.js";

services/kanao-gateway/src/Listeners/Caches/Messages/MessageCreateListener.ts

@@ -1,10 +1,10 @@
 import { Buffer } from "node:buffer";
 import { RabbitMQ } from "@nezuchan/constants";
+import { memberRoles, members, messages, users } from "@nezuchan/kanao-schema";
 import { RoutingKey } from "@nezuchan/utilities";
 import type { GatewayMessageCreateDispatch } from "discord-api-types/v10";
 import { GatewayDispatchEvents } from "discord-api-types/v10";
 import { eq } from "drizzle-orm";
-import { memberRoles, members, messages, users } from "../../../Schema/index.js";
 import type { ListenerContext } from "../../../Stores/Listener.js";
 import { Listener } from "../../../Stores/Listener.js";
 import { clientId, stateMembers, stateMessages, stateUsers } from "../../../config.js";

services/kanao-gateway/src/Listeners/Caches/Messages/MessageDeleteBulkListener.ts

@@ -1,10 +1,10 @@
 import { Buffer } from "node:buffer";
 import { RabbitMQ } from "@nezuchan/constants";
+import { messages } from "@nezuchan/kanao-schema";
 import { RoutingKey } from "@nezuchan/utilities";
 import type { GatewayMessageDeleteBulkDispatch } from "discord-api-types/v10";
 import { GatewayDispatchEvents } from "discord-api-types/v10";
 import { inArray } from "drizzle-orm";
-import { messages } from "../../../Schema/index.js";
 import type { ListenerContext } from "../../../Stores/Listener.js";
 import { Listener } from "../../../Stores/Listener.js";
 import { clientId } from "../../../config.js";

services/kanao-gateway/src/Listeners/Caches/Messages/MessageDeleteListener.ts

@@ -1,10 +1,10 @@
 import { Buffer } from "node:buffer";
 import { RabbitMQ } from "@nezuchan/constants";
+import { messages } from "@nezuchan/kanao-schema";
 import { RoutingKey } from "@nezuchan/utilities";
 import type { GatewayMessageDeleteDispatch } from "discord-api-types/v10";
 import { GatewayDispatchEvents } from "discord-api-types/v10";
 import { eq } from "drizzle-orm";
-import { messages } from "../../../Schema/index.js";
 import type { ListenerContext } from "../../../Stores/Listener.js";
 import { Listener } from "../../../Stores/Listener.js";
 import { clientId } from "../../../config.js";

services/kanao-gateway/src/Listeners/Caches/Messages/MessageUpdateListener.ts

@@ -1,9 +1,9 @@
 import { Buffer } from "node:buffer";
 import { RabbitMQ } from "@nezuchan/constants";
+import { members, messages, users } from "@nezuchan/kanao-schema";
 import { RoutingKey } from "@nezuchan/utilities";
 import type { GatewayMessageUpdateDispatch } from "discord-api-types/v10";
 import { GatewayDispatchEvents } from "discord-api-types/v10";
-import { members, messages, users } from "../../../Schema/index.js";
 import type { ListenerContext } from "../../../Stores/Listener.js";
 import { Listener } from "../../../Stores/Listener.js";
 import { clientId, stateMembers, stateMessages, stateUsers } from "../../../config.js";

services/kanao-gateway/src/Listeners/Caches/Users/UserUpdateListener.ts

@@ -1,10 +1,10 @@
 import { Buffer } from "node:buffer";
 import { RabbitMQ } from "@nezuchan/constants";
+import { users } from "@nezuchan/kanao-schema";
 import { RoutingKey } from "@nezuchan/utilities";
 import type { GatewayUserUpdateDispatch } from "discord-api-types/v10";
 import { GatewayDispatchEvents } from "discord-api-types/v10";
 import { eq } from "drizzle-orm";
-import { users } from "../../../Schema/index.js";
 import type { ListenerContext } from "../../../Stores/Listener.js";
 import { Listener } from "../../../Stores/Listener.js";
 import { clientId } from "../../../config.js";

services/kanao-gateway/src/Listeners/Caches/Voices/VoiceStateUpdateListener.ts

@@ -1,10 +1,10 @@
 import { Buffer } from "node:buffer";
 import { RabbitMQ } from "@nezuchan/constants";
+import { memberRoles, members, users, voiceStates } from "@nezuchan/kanao-schema";
 import { RoutingKey } from "@nezuchan/utilities";
 import type { GatewayVoiceStateUpdateDispatch } from "discord-api-types/v10";
 import { GatewayDispatchEvents } from "discord-api-types/v10";
 import { eq } from "drizzle-orm";
-import { memberRoles, members, users, voiceStates } from "../../../Schema/index.js";
 import type { ListenerContext } from "../../../Stores/Listener.js";
 import { Listener } from "../../../Stores/Listener.js";
 import { clientId, stateMembers, stateUsers, stateVoices } from "../../../config.js";

services/kanao-gateway/src/Listeners/HeartBeatCompleteListener.ts

@@ -1,6 +1,6 @@
 import type { WebSocketShard } from "@discordjs/ws";
 import { WebSocketShardEvents } from "@discordjs/ws";
-import { status } from "../Schema/collections/status.js";
+import { status } from "@nezuchan/kanao-schema";
 import type { ListenerContext } from "../Stores/Listener.js";
 import { Listener } from "../Stores/Listener.js";
 

services/kanao-gateway/src/Listeners/ReadyListener.ts

@@ -1,6 +1,6 @@
 import { WebSocketShardEvents } from "@discordjs/ws";
+import { guilds } from "@nezuchan/kanao-schema";
 import type { GatewayReadyDispatch } from "discord-api-types/v10";
-import { guilds } from "../Schema/index.js";
 import type { ListenerContext } from "../Stores/Listener.js";
 import { Listener } from "../Stores/Listener.js";
 

services/kanao-gateway/src/Structures/NezuGateway.ts

@@ -6,13 +6,13 @@ import { REST } from "@discordjs/rest";
 import { CompressionMethod, WebSocketManager, WebSocketShardEvents, WebSocketShardStatus } from "@discordjs/ws";
 import type { SessionInfo, ShardRange } from "@discordjs/ws";
 import { RabbitMQ } from "@nezuchan/constants";
+import * as schema from "@nezuchan/kanao-schema";
 import { Util, createAmqpChannel, RoutingKey } from "@nezuchan/utilities";
 import type { Channel } from "amqplib";
 import { eq } from "drizzle-orm";
 import { drizzle } from "drizzle-orm/postgres-js";
 import postgres from "postgres";
 import APM from "prometheus-middleware";
-import * as schema from "../Schema/index.js";
 import { createLogger } from "../Utilities/Logger.js";
 import { ProcessShardingStrategy } from "../Utilities/WebSockets/ProcessShardingStrategy.js";
 import { amqp, clientId, databaseUrl, discordToken, enablePrometheus, gatewayCompression, gatewayGuildPerShard, gatewayHandShakeTimeout, gatewayHelloTimeout, gatewayIntents, gatewayLargeThreshold, gatewayPresenceName, gatewayPresenceStatus, gatewayPresenceType, gatewayReadyTimeout, gatewayResume, gatewayShardCount, gatewayShardsPerWorkers, getShardCount, lokiHost, prometheusPath, prometheusPort, proxy, replicaId, storeLogs } from "../config.js";

services/kanao-gateway/src/Utilities/WebSockets/ProcessBootstrapper.ts

@@ -14,13 +14,13 @@ import { Collection } from "@discordjs/collection";
 import type { BootstrapOptions, WorkerReceivePayload, WorkerSendPayload, WorkerData, WebSocketShardDestroyOptions } from "@discordjs/ws";
 import { WebSocketShardEvents, WebSocketShard, WorkerReceivePayloadOp, WorkerSendPayloadOp } from "@discordjs/ws";
 import { RabbitMQ, ShardOp } from "@nezuchan/constants";
+import * as schema from "@nezuchan/kanao-schema";
 import { RoutingKey, RoutingKeyToId, createAmqpChannel } from "@nezuchan/utilities";
 import { StoreRegistry } from "@sapphire/pieces";
 import type { Channel, ConsumeMessage } from "amqplib";
 import type { GatewaySendPayload } from "discord-api-types/v10";
 import { drizzle } from "drizzle-orm/postgres-js";
 import postgres from "postgres";
-import * as schema from "../../Schema/index.js";
 import type { Listener } from "../../Stores/Listener.js";
 import { ListenerStore } from "../../Stores/ListenerStore.js";
 import { discordToken, storeLogs, lokiHost, amqp, databaseUrl, clientId } from "../../config.js";

services/kanao-gateway/tsconfig.json

@@ -2,7 +2,8 @@
     "extends": "../../tsconfig.json",
     "compilerOptions": {
         "outDir": "dist",
-        "rootDir": "src"
+        "rootDir": "src",
+        "noEmit": true
     },
     "include": ["src"]
 }