Fix recover.js script
This commit is contained in:
+5
-52
@@ -1,16 +1,9 @@
|
|||||||
import fs from 'node:fs';
|
|
||||||
import process from 'node:process';
|
import process from 'node:process';
|
||||||
import yaml from 'yaml';
|
import { setConfigFilePath } from './src/util.js';
|
||||||
import storage from 'node-persist';
|
|
||||||
import {
|
|
||||||
initUserStorage,
|
|
||||||
getPasswordSalt,
|
|
||||||
getPasswordHash,
|
|
||||||
toKey,
|
|
||||||
} from './src/users.js';
|
|
||||||
|
|
||||||
const userAccount = process.argv[2];
|
const userAccount = process.argv[2];
|
||||||
const userPassword = process.argv[3];
|
const userPassword = process.argv[3];
|
||||||
|
const configPath = './config.yaml';
|
||||||
|
|
||||||
if (!userAccount) {
|
if (!userAccount) {
|
||||||
console.error('A tool for recovering lost SillyTavern accounts. Uses a "dataRoot" setting from config.yaml file.');
|
console.error('A tool for recovering lost SillyTavern accounts. Uses a "dataRoot" setting from config.yaml file.');
|
||||||
@@ -19,50 +12,10 @@ if (!userAccount) {
|
|||||||
process.exit(1);
|
process.exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
async function initStorage() {
|
|
||||||
const config = yaml.parse(fs.readFileSync('config.yaml', 'utf8'));
|
|
||||||
const dataRoot = config.dataRoot;
|
|
||||||
|
|
||||||
if (!dataRoot) {
|
|
||||||
console.error('No "dataRoot" setting found in config.yaml file.');
|
|
||||||
process.exit(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
await initUserStorage(dataRoot);
|
|
||||||
}
|
|
||||||
|
|
||||||
async function main() {
|
async function main() {
|
||||||
await initStorage();
|
setConfigFilePath(configPath);
|
||||||
|
const { recoverPassword } = await import('./src/recover-password.js');
|
||||||
/**
|
await recoverPassword(configPath, userAccount, userPassword);
|
||||||
* @type {import('./src/users').User}
|
|
||||||
*/
|
|
||||||
const user = await storage.get(toKey(userAccount));
|
|
||||||
|
|
||||||
if (!user) {
|
|
||||||
console.error(`User "${userAccount}" not found.`);
|
|
||||||
process.exit(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!user.enabled) {
|
|
||||||
console.log('User is disabled. Enabling...');
|
|
||||||
user.enabled = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (userPassword) {
|
|
||||||
console.log('Setting new password...');
|
|
||||||
const salt = getPasswordSalt();
|
|
||||||
const passwordHash = getPasswordHash(userPassword, salt);
|
|
||||||
user.password = passwordHash;
|
|
||||||
user.salt = salt;
|
|
||||||
} else {
|
|
||||||
console.log('Setting an empty password...');
|
|
||||||
user.password = '';
|
|
||||||
user.salt = '';
|
|
||||||
}
|
|
||||||
|
|
||||||
await storage.setItem(toKey(userAccount), user);
|
|
||||||
console.log('User recovered. A program will exit now.');
|
|
||||||
}
|
}
|
||||||
|
|
||||||
main();
|
main();
|
||||||
|
|||||||
@@ -0,0 +1,65 @@
|
|||||||
|
import fs from 'node:fs';
|
||||||
|
import yaml from 'yaml';
|
||||||
|
import storage from 'node-persist';
|
||||||
|
import {
|
||||||
|
initUserStorage,
|
||||||
|
getPasswordSalt,
|
||||||
|
getPasswordHash,
|
||||||
|
toKey,
|
||||||
|
} from './users.js';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Initializes the storage with the data root specified in the config file.
|
||||||
|
* @param {string} configPath - The path to the config file.
|
||||||
|
*/
|
||||||
|
async function initStorage(configPath) {
|
||||||
|
const config = yaml.parse(fs.readFileSync(configPath, 'utf8'));
|
||||||
|
const dataRoot = config.dataRoot;
|
||||||
|
|
||||||
|
if (!dataRoot) {
|
||||||
|
console.error('No "dataRoot" setting found in config.yaml file.');
|
||||||
|
process.exit(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
await initUserStorage(dataRoot);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Recovers a user account by enabling it and optionally setting a new password.
|
||||||
|
* @param {string} configPath - The path to the config file.
|
||||||
|
* @param {string} userAccount - The username of the account to recover.
|
||||||
|
* @param {string} [userPassword] - The new password for the account. If not provided, sets an empty password.
|
||||||
|
*/
|
||||||
|
export async function recoverPassword(configPath, userAccount, userPassword) {
|
||||||
|
await initStorage(configPath);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @type {import('./users').User}
|
||||||
|
*/
|
||||||
|
const user = await storage.get(toKey(userAccount));
|
||||||
|
|
||||||
|
if (!user) {
|
||||||
|
console.error(`User "${userAccount}" not found.`);
|
||||||
|
process.exit(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!user.enabled) {
|
||||||
|
console.log('User is disabled. Enabling...');
|
||||||
|
user.enabled = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (userPassword) {
|
||||||
|
console.log('Setting new password...');
|
||||||
|
const salt = getPasswordSalt();
|
||||||
|
const passwordHash = getPasswordHash(userPassword, salt);
|
||||||
|
user.password = passwordHash;
|
||||||
|
user.salt = salt;
|
||||||
|
} else {
|
||||||
|
console.log('Setting an empty password...');
|
||||||
|
user.password = '';
|
||||||
|
user.salt = '';
|
||||||
|
}
|
||||||
|
|
||||||
|
await storage.setItem(toKey(userAccount), user);
|
||||||
|
console.log('User recovered. A program will exit now.');
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user