Phase 3 of the 4-package split (RoadMap #3). Moves the entire `packages/core/src/onebot/` subtree (43 source files + 20 test files spanning network adapters, action handlers, event converters, message parser, message store, media store, instance + manager) into the new `@snowluma/onebot` workspace package. The remaining `@snowluma/core` now hosts only the api-layer (Bridge class + 13 Api classes), the hook tooling, the WebUI server, and the runnable `index.ts`. Why --- - The OneBot adapter is the public-facing OneBot11 protocol surface; it has its own version cadence and its own consumers (third-party bots talking OneBot WS / HTTP). Splitting it lets that cadence move independently of the Api-on-ctx layer. - The two were sharing the `packages/core/` build pipeline only because they happened to live in the same directory. Nothing in the api-layer reaches into OneBot internals. - Mirrors NapCat / Lagrange.OneBot's repo split (their OneBot adapter is a separate assembly from the Core protocol library). Layout ------ Moved via `git mv` (history preserved): packages/core/src/onebot/* → @snowluma/onebot/src/<x> packages/core/tests/onebot/* (6 files) → @snowluma/onebot/tests/ packages/core/tests/{message-parser,message-store,event-pipeline, media-store,media-url-resolver,event-converter, http-server-hot-reload,http-server-content-type, api-handler-logging,message-id,group-msg-emoji-like, config,media-indexer,network-manager}.test.ts (14 files) → @snowluma/onebot/tests/ What stays in @snowluma/core ---------------------------- - `bridge/{bridge,bridge-interface,bridge-context,manager}.ts` - `bridge/apis/*` (the 13 typed Api classes) - `hook/*` (debugger/injector — tooling for the core protocol layer) - `webui/*` (admin UI server — application wiring, not the OneBot adapter itself) - `index.ts` (application entry that wires BridgeManager + OneBotManager + HookManager + WebUI together) Changes ------- - New package `packages/onebot/` (package.json with subpath exports mirroring legacy `core/src/onebot/<x>` 1:1, tsconfig.json, vitest.config.ts with `SNOWLUMA_LOG_LEVEL=debug` env so the action- dispatch logging tests see debug-level subscribers — copied verbatim from core's vitest.config.ts). - @snowluma/core grows new subpath exports for the api-layer files OneBot's type-only imports need: `./bridge`, `./bridge-interface`, `./bridge-context`, `./manager`, `./apis`. - `@snowluma/onebot` depends on `@snowluma/bridge`, `@snowluma/common`, `@snowluma/core`, `@snowluma/proto-defs`, `@snowluma/proton`, `@snowluma/websocket`. - `@snowluma/core` depends on `@snowluma/onebot` (for index.ts + webui/server.ts wiring). - 100+ import sites rewritten via sed: * OneBot → core: `'../bridge/bridge'` → `'@snowluma/core/bridge'`, `'../bridge/manager'` → `'@snowluma/core/manager'`, `'../bridge/bridge-interface'` → `'@snowluma/core/bridge-interface'`, `'@/bridge/bridge'` (vite path alias) → `'@snowluma/core/bridge'`. * Core → OneBot: `'./onebot/manager'` → `'@snowluma/onebot/manager'`, `'../onebot/config'` → `'@snowluma/onebot/config'`, etc. * Test relative paths: `'../../src/onebot/<x>'` → `'../src/<x>'` after the test file move (one level shallower). - New `packages/onebot/src/env.d.ts` declaring `__APP_VERSION__` and `__BUILD_WEBUI__` (the vite-injected globals `info.ts` reads). Workspace cycle --------------- core ↔ onebot is allowed by pnpm workspaces. The runtime direction is one-way: core → onebot (index.ts constructs OneBotManager, webui/server reads OneBot config). OneBot only reaches into core for TYPES (Bridge, BridgeInterface, BridgeManager, ClientKeyInfo, DownloadRKeyInfo); those imports use `import type` so they compile out at runtime and don't introduce a real cycle. Verification ------------ - Full workspace `pnpm -r typecheck`: all 11 projects clean. - `@snowluma/core` test suite: 302/302 pass (33 test files). - `@snowluma/onebot` test suite: 250/250 pass (20 test files; pre-existing `network-manager.test.ts` native-addon failure unchanged — same baseline as before the split). - Combined: 552/552 — identical pass count to the pre-Phase-3 baseline. - Vite build with stubbed native binary: clean, 2.84 MB bundle / 224 KB gzip (identical envelope).
145 lines
4.8 KiB
TypeScript
145 lines
4.8 KiB
TypeScript
import type { MessageElement } from '@snowluma/bridge/events';
|
|
import type { DownloadRKeyInfo } from '@snowluma/core/bridge';
|
|
import type { BridgeInterface } from '@snowluma/core/bridge-interface';
|
|
import { createLogger } from '@snowluma/common/logger';
|
|
|
|
const log = createLogger('OneBot');
|
|
|
|
interface CachedRKey {
|
|
value: string;
|
|
type: number;
|
|
createTime: number;
|
|
ttlSeconds: number;
|
|
expiresAt: number;
|
|
}
|
|
|
|
const RKEY_REFRESH_SKEW = 60;
|
|
const RKEY_REFRESH_COOLDOWN = 30;
|
|
const PRIVATE_IMAGE_RKEY_TYPE = 10;
|
|
const GROUP_IMAGE_RKEY_TYPE = 20;
|
|
const PRIVATE_VIDEO_RKEY_TYPE = 12;
|
|
const GROUP_VIDEO_RKEY_TYPE = 22;
|
|
const PRIVATE_PTT_RKEY_TYPE = 14;
|
|
const GROUP_PTT_RKEY_TYPE = 24;
|
|
const FALLBACK_IMAGE_RKEY_TYPE = 2;
|
|
|
|
export class RKeyCache {
|
|
private cache = new Map<number, CachedRKey>();
|
|
private lastRefreshAttempt = 0;
|
|
|
|
warmUp(bridge: BridgeInterface, uin: string): void {
|
|
bridge.apis.contacts.fetchDownloadRKeys().then(
|
|
(rkeys) => {
|
|
this.updateCache(rkeys);
|
|
log.info('rkeys loaded: UIN=%s count=%d', uin, rkeys.length);
|
|
},
|
|
(err) => {
|
|
log.warn('failed to load rkeys for UIN %s: %s', uin, err instanceof Error ? err.message : String(err));
|
|
},
|
|
);
|
|
}
|
|
|
|
resolveImageUrl(bridge: BridgeInterface, element: MessageElement, isGroup: boolean): string {
|
|
const url = element.imageUrl ?? '';
|
|
if (!urlNeedsRKey(url)) return url;
|
|
|
|
const rkey = this.findRKey(bridge, isGroup);
|
|
if (!rkey) return url;
|
|
|
|
const cleanRKey = stripRKeyPrefix(rkey);
|
|
const separator = url.includes('?') ? '&rkey=' : '?rkey=';
|
|
return url + separator + encodeURIComponent(cleanRKey);
|
|
}
|
|
|
|
/**
|
|
* Resolve a URL for video/record/file media elements.
|
|
* Appends the correct RKey type based on media kind and group/private context.
|
|
*/
|
|
resolveMediaUrl(bridge: BridgeInterface, element: MessageElement, isGroup: boolean): string {
|
|
const url = element.url ?? '';
|
|
if (!url || !urlNeedsRKey(url)) return url;
|
|
|
|
const mediaType = element.type;
|
|
let primaryType: number;
|
|
if (mediaType === 'video') {
|
|
primaryType = isGroup ? GROUP_VIDEO_RKEY_TYPE : PRIVATE_VIDEO_RKEY_TYPE;
|
|
} else if (mediaType === 'record') {
|
|
primaryType = isGroup ? GROUP_PTT_RKEY_TYPE : PRIVATE_PTT_RKEY_TYPE;
|
|
} else {
|
|
// For file types, try image rkeys as a fallback (file URLs typically use image rkeys)
|
|
primaryType = isGroup ? GROUP_IMAGE_RKEY_TYPE : PRIVATE_IMAGE_RKEY_TYPE;
|
|
}
|
|
|
|
const rkey = this.findRKeyForType(bridge, primaryType);
|
|
if (!rkey) return url;
|
|
|
|
const cleanRKey = stripRKeyPrefix(rkey);
|
|
const separator = url.includes('?') ? '&rkey=' : '?rkey=';
|
|
return url + separator + encodeURIComponent(cleanRKey);
|
|
}
|
|
|
|
private updateCache(rkeys: DownloadRKeyInfo[]): void {
|
|
const now = Math.floor(Date.now() / 1000);
|
|
for (const rk of rkeys) {
|
|
if (!rk.rkey || !rk.type) continue;
|
|
const baseTime = rk.createTime || now;
|
|
const ttl = rk.ttlSeconds || 3600;
|
|
this.cache.set(rk.type, {
|
|
value: rk.rkey,
|
|
type: rk.type,
|
|
createTime: rk.createTime,
|
|
ttlSeconds: rk.ttlSeconds,
|
|
expiresAt: baseTime + ttl,
|
|
});
|
|
}
|
|
}
|
|
|
|
private findRKey(bridge: BridgeInterface, isGroup: boolean): string | null {
|
|
const primaryType = isGroup ? GROUP_IMAGE_RKEY_TYPE : PRIVATE_IMAGE_RKEY_TYPE;
|
|
return this.findRKeyForType(bridge, primaryType);
|
|
}
|
|
|
|
private findRKeyForType(bridge: BridgeInterface, primaryType: number): string | null {
|
|
const now = Math.floor(Date.now() / 1000);
|
|
|
|
const tryFind = (type: number): string | null => {
|
|
const cached = this.cache.get(type);
|
|
if (!cached || !cached.value) return null;
|
|
if (cached.expiresAt !== 0 && now + RKEY_REFRESH_SKEW >= cached.expiresAt) return null;
|
|
return cached.value;
|
|
};
|
|
|
|
let result = tryFind(primaryType) ?? tryFind(FALLBACK_IMAGE_RKEY_TYPE);
|
|
if (result) return result;
|
|
|
|
// Refresh check cooldown
|
|
if (now - this.lastRefreshAttempt < RKEY_REFRESH_COOLDOWN) return null;
|
|
this.lastRefreshAttempt = now;
|
|
|
|
// Schedule async refresh
|
|
bridge.apis.contacts.fetchDownloadRKeys().then(
|
|
(rkeys) => this.updateCache(rkeys),
|
|
() => { /* ignore */ },
|
|
);
|
|
|
|
// Try again (won't be ready yet for this call, but future calls will benefit)
|
|
result = tryFind(primaryType) ?? tryFind(FALLBACK_IMAGE_RKEY_TYPE);
|
|
return result;
|
|
}
|
|
}
|
|
|
|
function urlNeedsRKey(url: string): boolean {
|
|
if (!url || url.includes('rkey=')) return false;
|
|
if (url.includes('gchat.qpic.cn')) return false;
|
|
return url.includes('multimedia.nt.qq.com.cn') ||
|
|
url.includes('.nt.qq.com.cn') ||
|
|
url.includes('/download');
|
|
}
|
|
|
|
function stripRKeyPrefix(rkey: string): string {
|
|
for (const prefix of ['&rkey=', '?rkey=']) {
|
|
if (rkey.startsWith(prefix)) return rkey.slice(prefix.length);
|
|
}
|
|
return rkey;
|
|
}
|