From 1a072bc6f1fc708fea541573ab963c8f49bb6591 Mon Sep 17 00:00:00 2001 From: DrSmoothl <1787882683@qq.com> Date: Fri, 15 May 2026 14:29:44 +0800 Subject: [PATCH] refactor(utils): consolidate uppercase hex into toHexUpper Adds toHexUpper alongside toHex in utils/hex.ts. Routes group-file's bytesToHexUpper through it so the incoming msg-push split can share one implementation. --- packages/core/src/bridge/actions/group-file.ts | 3 ++- packages/core/src/utils/hex.ts | 10 ++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/packages/core/src/bridge/actions/group-file.ts b/packages/core/src/bridge/actions/group-file.ts index 5cc61225..969b13ff 100644 --- a/packages/core/src/bridge/actions/group-file.ts +++ b/packages/core/src/bridge/actions/group-file.ts @@ -27,6 +27,7 @@ import { NTV2RichMediaRespSchema, } from '../proto/oidb-action'; import { FileUploadExtSchema } from '../proto/highway'; +import { toHexUpper } from '../../utils/hex'; import { ensureRetCodeZero, resolveSelfUid, toInt, type MediaIndexNode } from './shared'; // ─────────────── public result types ─────────────── @@ -76,7 +77,7 @@ function normalizeDirectory(dir?: string): string { function bytesToHexUpper(data: unknown): string { if (!(data instanceof Uint8Array) || data.length === 0) return ''; - return Buffer.from(data).toString('hex').toUpperCase(); + return toHexUpper(data); } function normalizeUploadFileName(name: string, fallback: string): string { diff --git a/packages/core/src/utils/hex.ts b/packages/core/src/utils/hex.ts index 79852e5f..26974244 100644 --- a/packages/core/src/utils/hex.ts +++ b/packages/core/src/utils/hex.ts @@ -1,4 +1,5 @@ const HEX_CHARS = '0123456789abcdef'; +const HEX_CHARS_UPPER = '0123456789ABCDEF'; export function toHex(data: Uint8Array | Buffer): string { let h = ''; @@ -9,6 +10,15 @@ export function toHex(data: Uint8Array | Buffer): string { return h; } +export function toHexUpper(data: Uint8Array | Buffer): string { + let h = ''; + for (const b of data) { + h += HEX_CHARS_UPPER[b >> 4]; + h += HEX_CHARS_UPPER[b & 0xf]; + } + return h; +} + export function hexPreview(data: Uint8Array | Buffer, maxBytes = 64): string { const limit = Math.max(0, Math.min(maxBytes, data.length)); const head = toHex(data.subarray(0, limit));