fix hwid generation #20

Merged
HorizonCode merged 1 commits from dev into master 2024-07-21 12:59:44 +00:00
2 changed files with 13 additions and 9 deletions
Showing only changes of commit 6551f0b369 - Show all commits

View File

@ -16,17 +16,21 @@ const platforms = {
};
const crypto = require("crypto");
const defaultHWID = "recorderinthesandybridge";
/**
* Returns machine hardware id.
* Returns `undefined` if cannot determine.
* @return {string?}
* @return {Promise<string>}
*/
function getHwId() {
const getter = platforms[process.platform];
if (!getter) return;
const result = getter[1].exec(child_process.execSync(getter[0], options));
if (!result) return;
return crypto.createHash("md5").update(result[1]).digest("hex") ||
undefined;
return new Promise((resolve) => {
const getter = platforms[process.platform];
if (getter) {
const result = getter[1].exec(child_process.execSync(getter[0], options));
if (result) resolve(crypto.createHash("md5").update(result[1]).digest("hex"));
}
resolve(crypto.createHash("md5").update(defaultHWID).digest("hex"));
})
}
exports.getHwId = getHwId;

View File

@ -248,7 +248,7 @@ function registerIPCPipes() {
ipcMain.handle("ezpplauncher:login", async (e, args) => {
let hwid = "";
try {
hwid = getHwId();
hwid = await getHwId();
} catch (err) {
logger.error(`Failed to get HWID.`, err);
return {
@ -315,7 +315,7 @@ function registerIPCPipes() {
});
ipcMain.handle("ezpplauncher:autologin", async (e) => {
const hwid = getHwId();
const hwid = await getHwId();
const username = config.get("username");
const guest = config.get("guest");
if (guest) return { code: 200, message: "Login as guest", guest: true };