refactor: UUID

This commit is contained in:
手瓜一十雪
2024-07-24 10:44:55 +08:00
parent 39915e633b
commit a9ac0ad4c8
5 changed files with 8 additions and 10 deletions

View File

@@ -3,7 +3,7 @@ import { encode, getDuration, getWavFileInfo, isWav, isSilk } from 'silk-wasm';
import fsPromise from 'fs/promises';
import { log, logError } from './log';
import path from 'node:path';
import { v4 as uuidv4 } from 'uuid';
import { randomUUID } from 'crypto';
import { spawn } from 'node:child_process';
import { getTempDir } from '@/common/utils/file';
@@ -64,7 +64,7 @@ export async function encodeSilk(filePath: string) {
try {
const file = await fsPromise.readFile(filePath);
const pttPath = path.join(TEMP_DIR, uuidv4());
const pttPath = path.join(TEMP_DIR, randomUUID());
if (!isSilk(file)) {
log(`语音文件${filePath}需要转换成silk`);
const _isWav = isWav(file);

View File

@@ -5,7 +5,7 @@ import util from 'util';
import path from 'node:path';
import { log, logError } from './log';
import * as fileType from 'file-type';
import { v4 as uuidv4 } from 'uuid';
import { randomUUID } from 'crypto';
import { napCatCore } from '@/core';
export const getNapCatDir = () => {
@@ -191,7 +191,7 @@ export async function uri2local(uri: string, fileName: string | null = null): Pr
isLocal: false
};
if (!fileName) {
fileName = uuidv4();
fileName = randomUUID();
}
let filePath = path.join(getTempDir(), fileName);
let url = null;
@@ -234,7 +234,7 @@ export async function uri2local(uri: string, fileName: string | null = null): Pr
}
fileName = fileName.replace(/[/\\:*?"<>|]/g, '_');
res.fileName = fileName;
filePath = path.join(getTempDir(), uuidv4() + fileName);
filePath = path.join(getTempDir(), randomUUID() + fileName);
fs.writeFileSync(filePath, buffer);
} catch (e: any) {
res.errMsg = `${url}下载失败,` + e.toString();

View File

@@ -1,7 +1,7 @@
import os from 'node:os';
import path from 'node:path';
import { networkInterfaces } from 'os';
import { v4 as uuidv4 } from 'uuid';
import { randomUUID } from 'crypto';
// 缓解Win7设备兼容性问题
let osName: string;
@@ -30,7 +30,7 @@ export async function getMachineId(): Promise<string> {
if (!machineId) {
machineId = (async () => {
const id = await getMacMachineId();
return id || uuidv4(); // fallback, generate a UUID
return id || randomUUID(); // fallback, generate a UUID
})();
}