From 405904183f31565169dcf7da5f2b996de54d73a4 Mon Sep 17 00:00:00 2001 From: RainbowBird Date: Fri, 27 Mar 2026 03:49:47 +0800 Subject: [PATCH] refactor(server): revert a8f445a17985a90d7eb5d981b4231114c3066e94 --- apps/server/Dockerfile | 6 +-- ...inny_leech.sql => 0005_tearful_kronos.sql} | 5 +- apps/server/drizzle/meta/0005_snapshot.json | 4 +- apps/server/drizzle/meta/_journal.json | 6 +-- apps/server/package.json | 2 +- apps/server/production/railway/Dockerfile | 6 +-- apps/server/src/routes/chat-ws.ts | 2 +- apps/server/src/services/chats.ts | 2 +- apps/server/tsconfig.json | 10 ++-- apps/server/vitest.config.ts | 7 +++ packages/server-protocol/README.md | 20 ------- packages/server-protocol/src/index.ts | 2 - packages/server-runtime/package.json | 1 - packages/server-runtime/src/index.ts | 4 +- .../src/middlewares/route.test.ts | 2 +- .../server-runtime/src/middlewares/route.ts | 2 +- .../src/middlewares/route/match-expression.ts | 2 +- packages/server-runtime/src/types/conn.ts | 2 +- packages/server-runtime/tsconfig.json | 8 +-- packages/server-sdk-shared/README.md | 20 +++++++ .../package.json | 13 ++--- .../src/index.ts} | 0 .../tsconfig.json | 0 .../tsdown.config.ts | 3 +- packages/server-sdk/package.json | 2 +- packages/server-sdk/src/client.ts | 4 +- packages/server-sdk/src/events/chat.ts | 2 +- packages/server-sdk/src/index.ts | 4 +- packages/server-sdk/test/client.test.ts | 2 +- packages/server-sdk/tsconfig.json | 14 +++++ packages/server-shared/package.json | 8 ++- packages/server-shared/src/index.ts | 1 + .../src/types/index.ts | 0 .../src/types/websocket/events.ts | 0 .../src/types/websocket/index.ts | 0 packages/server-shared/tsdown.config.ts | 3 +- packages/stage-pages/package.json | 2 +- .../components/context-flow-actions.vue | 2 +- .../use-context-flow-formatters.ts | 2 +- .../context-flow/context-flow-types.ts | 2 +- .../src/pages/devtools/context-flow/index.vue | 4 +- packages/stage-ui/package.json | 2 +- .../event-handler-spark-notify/index.ts | 2 +- .../character/orchestrator/index.test.ts | 2 +- .../stores/character/orchestrator/store.ts | 2 +- packages/stage-ui/src/stores/chat.ts | 2 +- .../stores/chat/context-providers/datetime.ts | 2 +- .../stage-ui/src/stores/chat/context-store.ts | 2 +- .../stores/devtools/websocket-inspector.ts | 2 +- .../src/stores/mods/api/channel-server.ts | 4 +- .../src/stores/modules/vision/orchestrator.ts | 2 +- packages/stage-ui/src/types/chat.ts | 2 +- packages/stage-ui/src/utils/event-source.ts | 2 +- pnpm-lock.yaml | 52 +++++++++---------- services/discord-bot/package.json | 2 +- .../discord-bot/src/adapters/airi-adapter.ts | 4 +- .../src/bots/discord/commands/summon.ts | 2 +- 57 files changed, 140 insertions(+), 127 deletions(-) rename apps/server/drizzle/{0005_skinny_leech.sql => 0005_tearful_kronos.sql} (95%) delete mode 100644 packages/server-protocol/README.md delete mode 100644 packages/server-protocol/src/index.ts create mode 100644 packages/server-sdk-shared/README.md rename packages/{server-protocol => server-sdk-shared}/package.json (64%) rename packages/{server-protocol/src/events/chat.ts => server-sdk-shared/src/index.ts} (100%) rename packages/{server-protocol => server-sdk-shared}/tsconfig.json (100%) rename packages/{server-protocol => server-sdk-shared}/tsdown.config.ts (67%) rename packages/{server-protocol => server-shared}/src/types/index.ts (100%) rename packages/{server-protocol => server-shared}/src/types/websocket/events.ts (100%) rename packages/{server-protocol => server-shared}/src/types/websocket/index.ts (100%) diff --git a/apps/server/Dockerfile b/apps/server/Dockerfile index 6520e476b..03004b6b6 100644 --- a/apps/server/Dockerfile +++ b/apps/server/Dockerfile @@ -7,16 +7,14 @@ RUN corepack enable COPY pnpm-lock.yaml pnpm-workspace.yaml package.json tsconfig.json ./ COPY patches/ ./patches/ COPY apps/server apps/server -COPY packages/server-protocol packages/server-protocol COPY packages/server-schema packages/server-schema -COPY packages/plugin-protocol packages/plugin-protocol +COPY packages/server-sdk-shared packages/server-sdk-shared RUN --mount=type=cache,id=pnpm-store,target=/root/.pnpm-store \ pnpm install --frozen-lockfile --ignore-scripts RUN pnpm -F @proj-airi/server-schema run build -RUN pnpm -F @proj-airi/server-protocol run build -RUN pnpm -F @proj-airi/plugin-protocol run build +RUN pnpm -F @proj-airi/server-sdk-shared run build RUN pnpm -F @proj-airi/server run build EXPOSE 3000 diff --git a/apps/server/drizzle/0005_skinny_leech.sql b/apps/server/drizzle/0005_tearful_kronos.sql similarity index 95% rename from apps/server/drizzle/0005_skinny_leech.sql rename to apps/server/drizzle/0005_tearful_kronos.sql index 74d42fe73..6b0e72155 100644 --- a/apps/server/drizzle/0005_skinny_leech.sql +++ b/apps/server/drizzle/0005_tearful_kronos.sql @@ -32,6 +32,7 @@ CREATE TABLE "outbox_events" ( ALTER TABLE "llm_request_log" DROP CONSTRAINT "llm_request_log_user_id_user_id_fk"; --> statement-breakpoint ALTER TABLE "messages" ALTER COLUMN "sender_id" DROP NOT NULL;--> statement-breakpoint +ALTER TABLE "stripe_subscription" ALTER COLUMN "cancel_at_period_end" SET DATA TYPE boolean;--> statement-breakpoint ALTER TABLE "messages" ADD COLUMN "seq" integer;--> statement-breakpoint ALTER TABLE "stripe_checkout_session" ADD COLUMN "flux_credited" boolean DEFAULT false NOT NULL;--> statement-breakpoint ALTER TABLE "stripe_invoice" ADD COLUMN "flux_credited" boolean DEFAULT false NOT NULL;--> statement-breakpoint @@ -42,6 +43,4 @@ CREATE UNIQUE INDEX "flux_ledger_user_request_uniq" ON "flux_ledger" USING btree CREATE UNIQUE INDEX "outbox_events_event_id_idx" ON "outbox_events" USING btree ("event_id");--> statement-breakpoint CREATE INDEX "outbox_events_publish_scan_idx" ON "outbox_events" USING btree ("published_at","available_at","claim_expires_at","created_at");--> statement-breakpoint CREATE INDEX "outbox_events_claimed_by_idx" ON "outbox_events" USING btree ("claimed_by");--> statement-breakpoint -ALTER TABLE "llm_request_log" DROP COLUMN "settled"; ---> statement-breakpoint -ALTER TABLE "stripe_subscription" ALTER COLUMN "cancel_at_period_end" SET DATA TYPE boolean; +ALTER TABLE "llm_request_log" DROP COLUMN "settled"; \ No newline at end of file diff --git a/apps/server/drizzle/meta/0005_snapshot.json b/apps/server/drizzle/meta/0005_snapshot.json index 3bd48d8bc..aa35261e1 100644 --- a/apps/server/drizzle/meta/0005_snapshot.json +++ b/apps/server/drizzle/meta/0005_snapshot.json @@ -1,5 +1,5 @@ { - "id": "a5a18f1d-badd-401b-8f55-a4745aade80c", + "id": "22b43247-dc0b-4bde-8869-955460dbd3e2", "prevId": "45bc0dad-65f5-4695-9115-3d7d376b6440", "version": "7", "dialect": "postgresql", @@ -2294,7 +2294,7 @@ }, "cancel_at_period_end": { "name": "cancel_at_period_end", - "type": "text", + "type": "boolean", "primaryKey": false, "notNull": false }, diff --git a/apps/server/drizzle/meta/_journal.json b/apps/server/drizzle/meta/_journal.json index b6409295b..46c361540 100644 --- a/apps/server/drizzle/meta/_journal.json +++ b/apps/server/drizzle/meta/_journal.json @@ -40,9 +40,9 @@ { "idx": 5, "version": "7", - "when": 1774527361016, - "tag": "0005_skinny_leech", + "when": 1774552566896, + "tag": "0005_tearful_kronos", "breakpoints": true } ] -} +} \ No newline at end of file diff --git a/apps/server/package.json b/apps/server/package.json index 489234ec9..35d5c72ab 100644 --- a/apps/server/package.json +++ b/apps/server/package.json @@ -38,8 +38,8 @@ "@opentelemetry/sdk-trace-node": "^2.6.1", "@opentelemetry/semantic-conventions": "^1.40.0", "@proj-airi/drizzle-orm-browser-migrator": "^0.1.6", - "@proj-airi/server-protocol": "workspace:*", "@proj-airi/server-schema": "workspace:*", + "@proj-airi/server-sdk-shared": "workspace:*", "better-auth": "^1.5.6", "cac": "catalog:", "drizzle-orm": "^0.45.1", diff --git a/apps/server/production/railway/Dockerfile b/apps/server/production/railway/Dockerfile index a35cd831c..08998eba8 100644 --- a/apps/server/production/railway/Dockerfile +++ b/apps/server/production/railway/Dockerfile @@ -7,15 +7,13 @@ RUN corepack enable COPY pnpm-lock.yaml pnpm-workspace.yaml package.json tsconfig.json ./ COPY patches/ ./patches/ COPY apps/server apps/server -COPY packages/server-protocol packages/server-protocol COPY packages/server-schema packages/server-schema -COPY packages/plugin-protocol packages/plugin-protocol +COPY packages/server-sdk-shared packages/server-sdk-shared RUN pnpm install --frozen-lockfile --ignore-scripts RUN pnpm -F @proj-airi/server-schema run build -RUN pnpm -F @proj-airi/server-protocol run build -RUN pnpm -F @proj-airi/plugin-protocol run build +RUN pnpm -F @proj-airi/server-sdk-shared run build RUN pnpm -F @proj-airi/server run build EXPOSE 3000 diff --git a/apps/server/src/routes/chat-ws.ts b/apps/server/src/routes/chat-ws.ts index 47125e696..e46cbe8f8 100644 --- a/apps/server/src/routes/chat-ws.ts +++ b/apps/server/src/routes/chat-ws.ts @@ -6,7 +6,7 @@ import type { ChatService } from '../services/chats' import { useLogger } from '@guiiai/logg' import { defineInvokeHandler } from '@moeru/eventa' -import { newMessages, pullMessages, sendMessages } from '@proj-airi/server-protocol' +import { newMessages, pullMessages, sendMessages } from '@proj-airi/server-sdk-shared' import { createPeerHooks, wsDisconnectedEvent } from '../libs/eventa-hono-adapter' diff --git a/apps/server/src/services/chats.ts b/apps/server/src/services/chats.ts index 8401ef892..377619bc1 100644 --- a/apps/server/src/services/chats.ts +++ b/apps/server/src/services/chats.ts @@ -1,4 +1,4 @@ -import type { MessageRole, WireMessage } from '@proj-airi/server-protocol' +import type { MessageRole, WireMessage } from '@proj-airi/server-sdk-shared' import type { Database } from '../libs/db' import type { EngagementMetrics } from '../libs/otel' diff --git a/apps/server/tsconfig.json b/apps/server/tsconfig.json index be2537d47..9eb440a45 100644 --- a/apps/server/tsconfig.json +++ b/apps/server/tsconfig.json @@ -12,11 +12,11 @@ "module": "ESNext", "moduleResolution": "Bundler", "paths": { - "@proj-airi/server-protocol": [ - "../../packages/server-protocol/src/index.ts" + "@proj-airi/server-sdk-shared": [ + "../../packages/server-sdk-shared/src/index.ts" ], - "@proj-airi/server-protocol/*": [ - "../../packages/server-protocol/src/*" + "@proj-airi/server-sdk-shared/*": [ + "../../packages/server-sdk-shared/src/*" ] }, "resolveJsonModule": true, @@ -29,7 +29,7 @@ "skipLibCheck": true }, "include": [ - "../../packages/server-protocol/src/**/*.ts", + "../../packages/server-sdk-shared/src/**/*.ts", "src/**/*.ts", "src/**/*.d.ts" ] diff --git a/apps/server/vitest.config.ts b/apps/server/vitest.config.ts index 9e551b734..58857b62d 100644 --- a/apps/server/vitest.config.ts +++ b/apps/server/vitest.config.ts @@ -1,6 +1,13 @@ +import { resolve } from 'node:path' + import { defineConfig } from 'vitest/config' export default defineConfig({ + resolve: { + alias: { + '@proj-airi/server-sdk-shared': resolve(import.meta.dirname, '..', '..', 'packages', 'server-sdk-shared', 'src', 'index.ts'), + }, + }, test: { environment: 'node', globals: true, diff --git a/packages/server-protocol/README.md b/packages/server-protocol/README.md deleted file mode 100644 index eaf7f09f7..000000000 --- a/packages/server-protocol/README.md +++ /dev/null @@ -1,20 +0,0 @@ -# @proj-airi/server-protocol - -Shared protocol types for AIRI server runtimes, SDKs, and frontend consumers. - -## Usage - -```shell -ni @proj-airi/server-protocol -D # from @antfu/ni, can be installed via `npm i -g @antfu/ni` -pnpm i @proj-airi/server-protocol -D -yarn i @proj-airi/server-protocol -D -npm i @proj-airi/server-protocol -D -``` - -```typescript -import type { WebSocketEvents } from '@proj-airi/server-protocol' -``` - -## License - -[MIT](../../LICENSE) diff --git a/packages/server-protocol/src/index.ts b/packages/server-protocol/src/index.ts deleted file mode 100644 index 9cce78989..000000000 --- a/packages/server-protocol/src/index.ts +++ /dev/null @@ -1,2 +0,0 @@ -export * from './events/chat' -export * from './types' diff --git a/packages/server-runtime/package.json b/packages/server-runtime/package.json index 59d95e84e..67b3d6fbe 100644 --- a/packages/server-runtime/package.json +++ b/packages/server-runtime/package.json @@ -41,7 +41,6 @@ "dependencies": { "@guiiai/logg": "catalog:", "@moeru/std": "catalog:", - "@proj-airi/server-protocol": "workspace:^", "@proj-airi/server-shared": "workspace:^", "crossws": "^0.4.4", "h3": "^2.0.1-rc.19", diff --git a/packages/server-runtime/src/index.ts b/packages/server-runtime/src/index.ts index a7bd994d4..8270e13c4 100644 --- a/packages/server-runtime/src/index.ts +++ b/packages/server-runtime/src/index.ts @@ -1,4 +1,4 @@ -import type { MetadataEventSource, WebSocketEvent } from '@proj-airi/server-protocol' +import type { MetadataEventSource, WebSocketEvent } from '@proj-airi/server-shared/types' import type { RouteContext, @@ -11,11 +11,11 @@ import type { AuthenticatedPeer, Peer } from './types' import { timingSafeEqual } from 'node:crypto' import { availableLogLevelStrings, Format, LogLevelString, logLevelStringToLogLevelMap, useLogg } from '@guiiai/logg' -import { MessageHeartbeat, MessageHeartbeatKind, WebSocketEventSource } from '@proj-airi/server-protocol' import { createInvalidJsonServerErrorMessage, ServerErrorMessages, } from '@proj-airi/server-shared' +import { MessageHeartbeat, MessageHeartbeatKind, WebSocketEventSource } from '@proj-airi/server-shared/types' import { defineWebSocketHandler, H3 } from 'h3' import { nanoid } from 'nanoid' import { parse, stringify } from 'superjson' diff --git a/packages/server-runtime/src/middlewares/route.test.ts b/packages/server-runtime/src/middlewares/route.test.ts index 2c7c641df..05fb0ced4 100644 --- a/packages/server-runtime/src/middlewares/route.test.ts +++ b/packages/server-runtime/src/middlewares/route.test.ts @@ -1,4 +1,4 @@ -import type { RouteTargetExpression, WebSocketBaseEvent, WebSocketEventOf, WebSocketEvents } from '@proj-airi/server-protocol' +import type { RouteTargetExpression, WebSocketBaseEvent, WebSocketEventOf, WebSocketEvents } from '@proj-airi/server-shared/types' import type { AuthenticatedPeer } from '../types' diff --git a/packages/server-runtime/src/middlewares/route.ts b/packages/server-runtime/src/middlewares/route.ts index f0c215549..0bbef2960 100644 --- a/packages/server-runtime/src/middlewares/route.ts +++ b/packages/server-runtime/src/middlewares/route.ts @@ -1,4 +1,4 @@ -import type { RouteTargetExpression, WebSocketEvent } from '@proj-airi/server-protocol' +import type { RouteTargetExpression, WebSocketEvent } from '@proj-airi/server-shared/types' import type { AuthenticatedPeer } from '../types' diff --git a/packages/server-runtime/src/middlewares/route/match-expression.ts b/packages/server-runtime/src/middlewares/route/match-expression.ts index 3fe59e458..a1d6201fb 100644 --- a/packages/server-runtime/src/middlewares/route/match-expression.ts +++ b/packages/server-runtime/src/middlewares/route/match-expression.ts @@ -1,4 +1,4 @@ -import type { RouteTargetExpression } from '@proj-airi/server-protocol' +import type { RouteTargetExpression } from '@proj-airi/server-shared/types' import type { AuthenticatedPeer } from '../../types' diff --git a/packages/server-runtime/src/types/conn.ts b/packages/server-runtime/src/types/conn.ts index 495ec69c7..e5702c1aa 100644 --- a/packages/server-runtime/src/types/conn.ts +++ b/packages/server-runtime/src/types/conn.ts @@ -1,4 +1,4 @@ -import type { MetadataEventSource } from '@proj-airi/server-protocol' +import type { MetadataEventSource } from '@proj-airi/server-shared/types' export interface Peer { /** diff --git a/packages/server-runtime/tsconfig.json b/packages/server-runtime/tsconfig.json index 6e8cedbfe..7ac9034c1 100644 --- a/packages/server-runtime/tsconfig.json +++ b/packages/server-runtime/tsconfig.json @@ -8,11 +8,11 @@ "module": "ESNext", "moduleResolution": "bundler", "paths": { - "@proj-airi/server-protocol": [ - "../server-protocol/src/index.ts" + "@proj-airi/server-shared": [ + "../server-shared/src/index.ts" ], - "@proj-airi/server-protocol/*": [ - "../server-protocol/src/*" + "@proj-airi/server-shared/*": [ + "../server-shared/src/*" ] }, "esModuleInterop": true, diff --git a/packages/server-sdk-shared/README.md b/packages/server-sdk-shared/README.md new file mode 100644 index 000000000..a12f7f67d --- /dev/null +++ b/packages/server-sdk-shared/README.md @@ -0,0 +1,20 @@ +# @proj-airi/server-sdk-shared + +Shared event contracts and types for AIRI server SDK consumers and server-side handlers. + +## Usage + +```shell +ni @proj-airi/server-sdk-shared -D +pnpm i @proj-airi/server-sdk-shared -D +``` + +```typescript +import type { WireMessage } from '@proj-airi/server-sdk-shared' + +import { newMessages, pullMessages, sendMessages } from '@proj-airi/server-sdk-shared' +``` + +## License + +[MIT](../../LICENSE) diff --git a/packages/server-protocol/package.json b/packages/server-sdk-shared/package.json similarity index 64% rename from packages/server-protocol/package.json rename to packages/server-sdk-shared/package.json index 8fa61f53f..84578834d 100644 --- a/packages/server-protocol/package.json +++ b/packages/server-sdk-shared/package.json @@ -1,8 +1,8 @@ { - "name": "@proj-airi/server-protocol", + "name": "@proj-airi/server-sdk-shared", "type": "module", "version": "0.9.0-alpha.22", - "description": "Shared protocol types for AIRI server clients, frontends, and runtimes", + "description": "Shared event contracts and types consumed by AIRI server-sdk clients and server-side handlers", "author": { "name": "Moeru AI Project AIRI Team", "email": "airi@moeru.ai", @@ -12,16 +12,12 @@ "repository": { "type": "git", "url": "https://github.com/moeru-ai/airi.git", - "directory": "packages/server-protocol" + "directory": "packages/server-sdk-shared" }, "exports": { ".": { "types": "./dist/index.d.mts", "default": "./dist/index.mjs" - }, - "./types": { - "types": "./dist/types/index.d.mts", - "default": "./dist/types/index.mjs" } }, "main": "./dist/index.mjs", @@ -37,7 +33,6 @@ "typecheck": "tsc --noEmit" }, "dependencies": { - "@moeru/eventa": "catalog:", - "@proj-airi/plugin-protocol": "workspace:*" + "@moeru/eventa": "catalog:" } } diff --git a/packages/server-protocol/src/events/chat.ts b/packages/server-sdk-shared/src/index.ts similarity index 100% rename from packages/server-protocol/src/events/chat.ts rename to packages/server-sdk-shared/src/index.ts diff --git a/packages/server-protocol/tsconfig.json b/packages/server-sdk-shared/tsconfig.json similarity index 100% rename from packages/server-protocol/tsconfig.json rename to packages/server-sdk-shared/tsconfig.json diff --git a/packages/server-protocol/tsdown.config.ts b/packages/server-sdk-shared/tsdown.config.ts similarity index 67% rename from packages/server-protocol/tsdown.config.ts rename to packages/server-sdk-shared/tsdown.config.ts index ddbc43fc5..e69541b02 100644 --- a/packages/server-protocol/tsdown.config.ts +++ b/packages/server-sdk-shared/tsdown.config.ts @@ -2,8 +2,7 @@ import { defineConfig } from 'tsdown' export default defineConfig({ entry: { - 'index': 'src/index.ts', - 'types/index': 'src/types/index.ts', + index: 'src/index.ts', }, sourcemap: true, unused: true, diff --git a/packages/server-sdk/package.json b/packages/server-sdk/package.json index fc4104bfd..e72c9cfe5 100644 --- a/packages/server-sdk/package.json +++ b/packages/server-sdk/package.json @@ -39,7 +39,7 @@ "dependencies": { "@moeru/eventa": "catalog:", "@moeru/std": "catalog:", - "@proj-airi/server-protocol": "workspace:^", + "@proj-airi/server-sdk-shared": "workspace:^", "@proj-airi/server-shared": "workspace:^", "crossws": "^0.4.4", "superjson": "catalog:" diff --git a/packages/server-sdk/src/client.ts b/packages/server-sdk/src/client.ts index b017c304d..c57e866ac 100644 --- a/packages/server-sdk/src/client.ts +++ b/packages/server-sdk/src/client.ts @@ -6,14 +6,14 @@ import type { WebSocketEvent, WebSocketEventOptionalSource, WebSocketEvents, -} from '@proj-airi/server-protocol' +} from '@proj-airi/server-shared/types' import WebSocket from 'crossws/websocket' import superjson from 'superjson' import { errorMessageFrom, sleep } from '@moeru/std' -import { MessageHeartbeat, MessageHeartbeatKind } from '@proj-airi/server-protocol' import { isTerminalAuthenticationServerErrorMessage, parseServerErrorMessage } from '@proj-airi/server-shared' +import { MessageHeartbeat, MessageHeartbeatKind } from '@proj-airi/server-shared/types' export type ClientStatus = | 'idle' diff --git a/packages/server-sdk/src/events/chat.ts b/packages/server-sdk/src/events/chat.ts index 2b9041801..268d1ead7 100644 --- a/packages/server-sdk/src/events/chat.ts +++ b/packages/server-sdk/src/events/chat.ts @@ -1 +1 @@ -export * from '@proj-airi/server-protocol' +export * from '@proj-airi/server-sdk-shared' diff --git a/packages/server-sdk/src/index.ts b/packages/server-sdk/src/index.ts index 49df2a0ec..8b471545a 100644 --- a/packages/server-sdk/src/index.ts +++ b/packages/server-sdk/src/index.ts @@ -1,4 +1,4 @@ export * from './client' export * from './events/chat' -export type * from '@proj-airi/server-protocol' -export { ContextUpdateStrategy, WebSocketEventSource } from '@proj-airi/server-protocol' +export type * from '@proj-airi/server-shared/types' +export { ContextUpdateStrategy, WebSocketEventSource } from '@proj-airi/server-shared/types' diff --git a/packages/server-sdk/test/client.test.ts b/packages/server-sdk/test/client.test.ts index 2d9fdbcb2..653b67373 100644 --- a/packages/server-sdk/test/client.test.ts +++ b/packages/server-sdk/test/client.test.ts @@ -1,4 +1,4 @@ -import type { WebSocketEvent } from '@proj-airi/server-protocol' +import type { WebSocketEvent } from '@proj-airi/server-shared/types' import superjson from 'superjson' diff --git a/packages/server-sdk/tsconfig.json b/packages/server-sdk/tsconfig.json index 00dcfd807..93f9f81ce 100644 --- a/packages/server-sdk/tsconfig.json +++ b/packages/server-sdk/tsconfig.json @@ -4,8 +4,20 @@ "lib": [ "ESNext" ], + "baseUrl": ".", "module": "ESNext", "moduleResolution": "bundler", + "paths": { + "@proj-airi/server-shared": [ + "../server-shared/src/index.ts" + ], + "@proj-airi/server-shared/*": [ + "../server-shared/src/*" + ], + "@proj-airi/server-sdk-shared": [ + "../server-sdk-shared/src/index.ts" + ] + }, "esModuleInterop": true, "forceConsistentCasingInFileNames": true, "isolatedModules": true, @@ -13,6 +25,8 @@ "skipLibCheck": true }, "include": [ + "../server-shared/src/**/*.ts", + "../server-sdk-shared/src/**/*.ts", "src/**/*.ts" ] } diff --git a/packages/server-shared/package.json b/packages/server-shared/package.json index 770f7230d..8537077f3 100644 --- a/packages/server-shared/package.json +++ b/packages/server-shared/package.json @@ -18,6 +18,10 @@ ".": { "types": "./dist/index.d.mts", "default": "./dist/index.mjs" + }, + "./types": { + "types": "./dist/types/index.d.mts", + "default": "./dist/types/index.mjs" } }, "main": "./dist/index.mjs", @@ -32,5 +36,7 @@ "build": "tsdown", "typecheck": "tsc --noEmit" }, - "dependencies": {} + "dependencies": { + "@proj-airi/plugin-protocol": "workspace:*" + } } diff --git a/packages/server-shared/src/index.ts b/packages/server-shared/src/index.ts index 183e8bd09..979493029 100644 --- a/packages/server-shared/src/index.ts +++ b/packages/server-shared/src/index.ts @@ -1 +1,2 @@ export * from './errors' +export * from './types' diff --git a/packages/server-protocol/src/types/index.ts b/packages/server-shared/src/types/index.ts similarity index 100% rename from packages/server-protocol/src/types/index.ts rename to packages/server-shared/src/types/index.ts diff --git a/packages/server-protocol/src/types/websocket/events.ts b/packages/server-shared/src/types/websocket/events.ts similarity index 100% rename from packages/server-protocol/src/types/websocket/events.ts rename to packages/server-shared/src/types/websocket/events.ts diff --git a/packages/server-protocol/src/types/websocket/index.ts b/packages/server-shared/src/types/websocket/index.ts similarity index 100% rename from packages/server-protocol/src/types/websocket/index.ts rename to packages/server-shared/src/types/websocket/index.ts diff --git a/packages/server-shared/tsdown.config.ts b/packages/server-shared/tsdown.config.ts index e69541b02..ddbc43fc5 100644 --- a/packages/server-shared/tsdown.config.ts +++ b/packages/server-shared/tsdown.config.ts @@ -2,7 +2,8 @@ import { defineConfig } from 'tsdown' export default defineConfig({ entry: { - index: 'src/index.ts', + 'index': 'src/index.ts', + 'types/index': 'src/types/index.ts', }, sourcemap: true, unused: true, diff --git a/packages/stage-pages/package.json b/packages/stage-pages/package.json index 01c4009b2..68c121482 100644 --- a/packages/stage-pages/package.json +++ b/packages/stage-pages/package.json @@ -26,8 +26,8 @@ "@moeru/std": "catalog:", "@proj-airi/ccc": "workspace:*", "@proj-airi/i18n": "workspace:*", - "@proj-airi/server-protocol": "workspace:*", "@proj-airi/server-sdk": "workspace:*", + "@proj-airi/server-shared": "workspace:*", "@proj-airi/stage-ui": "workspace:*", "@proj-airi/stage-ui-live2d": "workspace:*", "@proj-airi/stage-ui-three": "workspace:*", diff --git a/packages/stage-pages/src/pages/devtools/context-flow/components/context-flow-actions.vue b/packages/stage-pages/src/pages/devtools/context-flow/components/context-flow-actions.vue index 1dca0bdeb..587e3b063 100644 --- a/packages/stage-pages/src/pages/devtools/context-flow/components/context-flow-actions.vue +++ b/packages/stage-pages/src/pages/devtools/context-flow/components/context-flow-actions.vue @@ -1,5 +1,5 @@