create_group_file_folder 之前只回 data:null,拿不到新建文件夹的 folderId。现对齐
NapCat 返回结构,data 带回文件夹信息:
{ result: { retCode, retMsg }, groupItem: { folderInfo: { folderId, folderName,
folderPath, createTime, modifyTime, createUin, modifyUin } } }
- 0x6D7_0 创建响应本就在 field 4 携带 folderInfo,SnowLuma 旧 proto 没解(只读
retcode/retMsg/clientWording)。补上 OidbGroupFileFolderInfoResp 并让 create 的
deserialize / bridge / action 一路把它带出来。
- 真机验证(bot 在测试群建夹→读回 folderId→删除清理):确认 folderInfo 存在,且
**modifyUin 在 field 9 而非 Lagrange proto 标注的 field 7**——按真机 wire 修正。
- 新增两个解码回归测试(带 folderInfo / 缺 folderInfo 兜底)。catalog regen。
typecheck 12 包;protocol 587 / onebot 521 / core 472 全绿。
65 lines
2.8 KiB
TypeScript
65 lines
2.8 KiB
TypeScript
import { describe, expect, it, vi } from 'vitest';
|
|
import { protobuf_decode, protobuf_encode } from '@snowluma/proton';
|
|
import type { OidbBase } from '@snowluma/proto-defs/oidb';
|
|
import type {
|
|
OidbGroupFileFolderReq, OidbGroupFileFolderResp,
|
|
} from '@snowluma/proto-defs/oidb-actions/group-file';
|
|
import type { SendPacketResult } from '@snowluma/common/packet-sender';
|
|
|
|
import { CreateGroupFolder } from '../../../src/oidb-services/group-file/create-group-folder';
|
|
|
|
function makeDeps(body?: OidbGroupFileFolderResp) {
|
|
const responseData = body !== undefined
|
|
? Buffer.from(protobuf_encode<OidbBase<OidbGroupFileFolderResp>>({ body }))
|
|
: Buffer.alloc(0);
|
|
const r: SendPacketResult = { success: true, gotResponse: true, errorCode: 0, errorMessage: '', responseData };
|
|
return { sendRawPacket: vi.fn(async () => r) };
|
|
}
|
|
|
|
describe('CreateGroupFolder namespace', () => {
|
|
it('declares 0x6D7_0 with uinForm=true', () => {
|
|
expect(CreateGroupFolder.command).toBe(0x6D7);
|
|
expect(CreateGroupFolder.subCommand).toBe(0);
|
|
expect(CreateGroupFolder.uinForm).toBe(true);
|
|
});
|
|
|
|
it('packages create.{groupUin, rootDirectory, folderName}', async () => {
|
|
const deps = makeDeps({ create: {} as any });
|
|
await CreateGroupFolder.invoke(deps, { groupId: 12345, parentId: '/', folderName: 'docs' });
|
|
const env = protobuf_decode<OidbBase<OidbGroupFileFolderReq>>(deps.sendRawPacket.mock.calls[0]![1]);
|
|
expect(env.body?.create).toMatchObject({
|
|
groupUin: 12345, rootDirectory: '/', folderName: 'docs',
|
|
});
|
|
});
|
|
|
|
it('throws on retcode != 0 (note: lower-case retcode in this proto)', async () => {
|
|
const deps = makeDeps({ create: { retcode: 7, retMsg: 'denied' } as any });
|
|
await expect(CreateGroupFolder.invoke(deps, { groupId: 1, parentId: '/', folderName: 'f' }))
|
|
.rejects.toThrow(/code=7/);
|
|
});
|
|
|
|
it('returns the new folder info from the response folderInfo (#195)', async () => {
|
|
const deps = makeDeps({ create: {
|
|
retcode: 0,
|
|
folderInfo: {
|
|
folderId: '/0f1e2d', folderPath: '/docs', folderName: 'docs',
|
|
createTime: 100, modifyTime: 200, createUin: 111, modifyUin: 222,
|
|
},
|
|
} as any });
|
|
const r = await CreateGroupFolder.invoke(deps, { groupId: 1, parentId: '/', folderName: 'docs' });
|
|
expect(r).toEqual({
|
|
folderId: '/0f1e2d', folderName: 'docs', folderPath: '/docs',
|
|
createTime: 100, modifyTime: 200, createUin: 111, modifyUin: 222,
|
|
});
|
|
});
|
|
|
|
it('defaults every field when the response omits folderInfo (#195)', async () => {
|
|
const deps = makeDeps({ create: { retcode: 0 } as any });
|
|
const r = await CreateGroupFolder.invoke(deps, { groupId: 1, parentId: '/', folderName: 'f' });
|
|
expect(r).toEqual({
|
|
folderId: '', folderName: '', folderPath: '',
|
|
createTime: 0, modifyTime: 0, createUin: 0, modifyUin: 0,
|
|
});
|
|
});
|
|
});
|