Phase 2 of the 4-package split (RoadMap #3). Moves ~35 files — events / event-bus / identity-service / packet-pipeline / element- builder / bridge-oidb / qq-info / msg-push/* / highway/* / web/* + the bridge-side formatters — out of `packages/core/src/bridge/` into the new `@snowluma/bridge` workspace package. Everything that translates QQ wire bytes ↔ typed events/elements now lives there. Why --- - `packages/core/src/bridge/` was actually two layers: a low-level "protocol decoder + I/O" set (msg-push, highway, packet-pipeline, identity, element-builder) AND the Api-class host (bridge.ts + apis/*). The Api layer can't move without the protocol layer moving first, but the two had grown into one directory. - Bridge-internal consumers (highway uploaders, OIDB envelope helper, element-builder, msg-push parsers) only ever needed `bridge.identity` + `bridge.sendRawPacket` + the upload-metadata cache. Splitting them out lets that minimal surface live in the bridge package as `BridgeContext` while the api-layer's extended context (with `apis: ApiHub`) stays in @snowluma/core. What stays in @snowluma/core (apis layer): - bridge.ts ── the god-class that composes the protocol building blocks + mounts apis - bridge-interface.ts ── public façade for OneBot consumers - manager.ts ── per-uin BridgeManager hub - apis/* ── the 13 typed Api classes - bridge-context.ts (NEW) ── extends @snowluma/bridge's slim BridgeContext with `apis: ApiHub` so the 13 Api classes keep their typed `this.ctx.apis.X.method()` access. Layout ------ Moved via `git mv` (history preserved): events / event-bus / identity-service / packet-pipeline / element-builder / bridge-oidb / qq-info / msg-push/* / highway/* / web/* → @snowluma/bridge/<sub> utils/event-format.ts → @snowluma/bridge/format.ts (the last one renamed because the destination directory only has bridge-related files; `format.ts` reads cleaner than `event-format`. Listed as a rename in git's `RM` output — content unchanged.) Layering fixes (functionality preserved, just type signatures) -------------------------------------------------------------- - `element-builder.SendContext.bridge` → typed as `BridgeContext` instead of `Bridge`. Reads only `bridge.identity` and the upload-cache (both on BridgeContext); the concrete `Bridge` instance still passes via free upcast. - `bridge-oidb.runOidb` signature widened from `Bridge` to `BridgeContext` — same reason. - `highway/{highway-client,pipeline,image-upload,ptt-upload, video-upload}.ts` — same. - `format.ts::formatReply` parameter typed as a new local `ReplyEventLookup` structural type (`{ findEvent(id): JsonObject | null }`) instead of `MessageStore` from @snowluma/onebot. The OneBot `MessageStore` is a structural superset; consumers pass it through unchanged. - JSON value types moved to a new `@snowluma/common/json` subpath (consumed by format.ts) — `onebot/types.ts` re-exports them so external `import { JsonValue } from '<…>/onebot/types'` paths keep working. - `UploadedFileMeta` interface moved from `core/src/bridge/bridge.ts` into `@snowluma/bridge/bridge-context.ts` — element-builder + the forward-builder both read the upload cache through BridgeContext, so the type has to live in @snowluma/bridge. `bridge.ts` keeps its re-export for back-compat. Changes ------- - New package `packages/bridge/` (package.json with per-file subpath exports mirroring legacy `core/src/bridge/<x>` layout 1:1, tsconfig.json, typecheck script). - 35 `.ts` files moved via `git mv` (3 files counted by git as RM — rename + modify because Bridge → BridgeContext type swap). - 150+ import sites rewritten across `packages/core/src` and `packages/core/tests`: `'../bridge/<x>'`, `'../../bridge/<x>'`, `'../src/bridge/<x>'`, `'@/bridge/web/<x>'`, and vitest `vi.mock(...)` literals all collapse to `@snowluma/bridge/<x>`. - `@snowluma/core` depends on `@snowluma/bridge` (workspace:*). - `@snowluma/bridge` depends on `@snowluma/common`, `@snowluma/proto-defs`, `@snowluma/proton`. - `packages/core/src/utils/` directory removed (empty). Verification ------------ - Full workspace `pnpm -r typecheck`: all 10 projects clean. - core test suite: 552 passed / 552 total (pre-existing websocket-darwin-arm64.node addon failure unchanged — same baseline as the previous refactor commits). - Vite build (with stubbed native binary): clean — 143 modules, 2.84 MB bundle / 224 KB gzip, identical envelope to the pre-split build. Phase 3 (next): OneBot + WebUI move into @snowluma/onebot. The runnable `index.ts` stays in @snowluma/core as the application entry, importing `OneBotManager` from `@snowluma/onebot`.
121 lines
4.5 KiB
TypeScript
121 lines
4.5 KiB
TypeScript
// Regression test for the c2c-vs-group businessType asymmetry that made
|
|
// private-chat video / record sends bounce with `send private message
|
|
// rejected: result=79`. The receive-side decoder
|
|
// (msg-push/rich-body-decoder.ts) explicitly treats the businessType
|
|
// pairs as:
|
|
//
|
|
// image : c2c=10, group=20
|
|
// video : c2c=11, group=21
|
|
// record : c2c=12, group=22
|
|
//
|
|
// `makeImageElem` always honoured this split (`isGroup ? 20 : 10`).
|
|
// `makeVideoElem` and `makePttElem` used to hardcode the group value
|
|
// for both scenes, so any c2c video / private voice send arrived at the
|
|
// QQ NT server with a businessType the c2c routing path did not
|
|
// recognise and got rejected with result=79.
|
|
|
|
import { describe, expect, it, vi } from 'vitest';
|
|
|
|
vi.mock('@snowluma/bridge/highway/image-upload', () => ({
|
|
uploadImageMsgInfo: vi.fn(async () => new Uint8Array([7, 8, 9])),
|
|
}));
|
|
vi.mock('@snowluma/bridge/highway/ptt-upload', () => ({
|
|
uploadPttMsgInfo: vi.fn(async () => new Uint8Array([4, 5, 6])),
|
|
}));
|
|
vi.mock('@snowluma/bridge/highway/video-upload', () => ({
|
|
uploadVideoMsgInfo: vi.fn(async () => new Uint8Array([1, 2, 3])),
|
|
}));
|
|
|
|
import { buildSendElems } from '@snowluma/bridge/element-builder';
|
|
|
|
const fakeBridge = {} as any;
|
|
|
|
function commonElem(elem: any): { serviceType: number; businessType: number; pbElem: Uint8Array } {
|
|
return elem.commonElem;
|
|
}
|
|
|
|
describe('element-builder / commonElem.businessType per scene', () => {
|
|
describe('image', () => {
|
|
it('c2c → businessType 10', async () => {
|
|
const [elem] = await buildSendElems(
|
|
[{ type: 'image', url: 'file:///tmp/a.png' } as any],
|
|
{ bridge: fakeBridge, userUid: 'u_peer' },
|
|
);
|
|
expect(commonElem(elem).serviceType).toBe(48);
|
|
expect(commonElem(elem).businessType).toBe(10);
|
|
});
|
|
|
|
it('group → businessType 20', async () => {
|
|
const [elem] = await buildSendElems(
|
|
[{ type: 'image', url: 'file:///tmp/a.png' } as any],
|
|
{ bridge: fakeBridge, groupId: 12345 },
|
|
);
|
|
expect(commonElem(elem).businessType).toBe(20);
|
|
});
|
|
});
|
|
|
|
describe('video', () => {
|
|
it('c2c → businessType 11 (regression: was 21, server returned result=79)', async () => {
|
|
const [elem] = await buildSendElems(
|
|
[{ type: 'video', url: 'file:///tmp/clip.mp4' } as any],
|
|
{ bridge: fakeBridge, userUid: 'u_peer' },
|
|
);
|
|
expect(commonElem(elem).serviceType).toBe(48);
|
|
expect(commonElem(elem).businessType).toBe(11);
|
|
});
|
|
|
|
it('group → businessType 21', async () => {
|
|
const [elem] = await buildSendElems(
|
|
[{ type: 'video', url: 'file:///tmp/clip.mp4' } as any],
|
|
{ bridge: fakeBridge, groupId: 12345 },
|
|
);
|
|
expect(commonElem(elem).businessType).toBe(21);
|
|
});
|
|
});
|
|
|
|
describe('record', () => {
|
|
it('c2c → businessType 12 (regression: was 22)', async () => {
|
|
const [elem] = await buildSendElems(
|
|
[{ type: 'record', url: 'file:///tmp/voice.amr' } as any],
|
|
{ bridge: fakeBridge, userUid: 'u_peer' },
|
|
);
|
|
expect(commonElem(elem).serviceType).toBe(48);
|
|
expect(commonElem(elem).businessType).toBe(12);
|
|
});
|
|
|
|
it('group → businessType 22', async () => {
|
|
const [elem] = await buildSendElems(
|
|
[{ type: 'record', url: 'file:///tmp/voice.amr' } as any],
|
|
{ bridge: fakeBridge, groupId: 12345 },
|
|
);
|
|
expect(commonElem(elem).businessType).toBe(22);
|
|
});
|
|
});
|
|
});
|
|
|
|
describe('element-builder / file element is no longer carried in elems[]', () => {
|
|
// Regression for the `result=79` class: previously the element-builder
|
|
// emitted a `transElem(elemType=24, ...)` for `{type:'file'}` segments
|
|
// and the QQ-NT server rejected the outgoing PbSendMsg with that wire
|
|
// shape. The fix moves group-file publishing onto a dedicated OIDB
|
|
// call (`OidbSvcTrpcTcp.0x6d9_4`), driven from the OneBot layer in
|
|
// `modules/message-actions.ts::sendGroupMessage` after the file
|
|
// segment is split off. The element-builder therefore must NOT emit
|
|
// any element for `{type:'file'}` anymore — if it does, the message
|
|
// ships with a transElem(24) payload and result=79 returns.
|
|
it('produces an empty elems[] for a {type:"file"} segment (must be split out at OneBot layer)', async () => {
|
|
const result = await buildSendElems(
|
|
[{
|
|
type: 'file',
|
|
fileId: 'fid-abc',
|
|
fileName: 'doc.txt',
|
|
fileSize: 123,
|
|
md5Hex: 'aabbccddeeff00112233445566778899',
|
|
sha1Hex: '0102030405060708090a0b0c0d0e0f1011121314',
|
|
} as any],
|
|
{ bridge: fakeBridge, groupId: 12345 },
|
|
);
|
|
expect(result).toEqual([]);
|
|
});
|
|
});
|