@naisys/supervisor-database 3.0.0-beta.4 → 3.0.0-beta.5

package/dist/sessionService.js

@@ -14,195 +14,191 @@ let supervisorDb = null;
  * No-ops gracefully if NAISYS_FOLDER is unset or the database doesn't exist.
  */
 export async function createSupervisorDatabaseClient() {
-    if (supervisorDb)
-        return true;
-    const dbPath = supervisorDbPath();
-    if (!existsSync(dbPath))
-        return false;
-    supervisorDb = await createPrismaClient(dbPath);
-    return true;
+  if (supervisorDb) return true;
+  const dbPath = supervisorDbPath();
+  if (!existsSync(dbPath)) return false;
+  supervisorDb = await createPrismaClient(dbPath);
+  return true;
 }
 /**
  * Find a session user by session token hash. Returns null if not found or expired.
  */
 export async function findSession(tokenHash) {
-    if (!supervisorDb)
-        return null;
-    const session = await supervisorDb.session.findUnique({
-        where: {
-            tokenHash,
-            expiresAt: { gt: new Date() },
-        },
-        include: { user: true },
-    });
-    if (!session)
-        return null;
-    return {
-        userId: session.user.id,
-        username: session.user.username,
-        passwordHash: session.user.passwordHash,
-        uuid: session.user.uuid,
-    };
+  if (!supervisorDb) return null;
+  const session = await supervisorDb.session.findUnique({
+    where: {
+      tokenHash,
+      expiresAt: { gt: new Date() },
+    },
+    include: { user: true },
+  });
+  if (!session) return null;
+  return {
+    userId: session.user.id,
+    username: session.user.username,
+    passwordHash: session.user.passwordHash,
+    uuid: session.user.uuid,
+  };
 }
 /**
  * Look up a session user by username.
  */
 export async function lookupUsername(username) {
-    if (!supervisorDb)
-        return null;
-    const user = await supervisorDb.user.findUnique({
-        where: { username },
-    });
-    if (!user)
-        return null;
-    return {
-        userId: user.id,
-        username: user.username,
-        passwordHash: user.passwordHash,
-        uuid: user.uuid,
-    };
+  if (!supervisorDb) return null;
+  const user = await supervisorDb.user.findUnique({
+    where: { username },
+  });
+  if (!user) return null;
+  return {
+    userId: user.id,
+    username: user.username,
+    passwordHash: user.passwordHash,
+    uuid: user.uuid,
+  };
 }
 /**
  * Find a supervisor user by API key. Returns null if not found or DB not initialized.
  */
 export async function findUserByApiKey(apiKey) {
-    if (!supervisorDb)
-        return null;
-    const user = await supervisorDb.user.findUnique({
-        where: { apiKey },
-        select: { uuid: true, username: true },
-    });
-    return user;
+  if (!supervisorDb) return null;
+  const user = await supervisorDb.user.findUnique({
+    where: { apiKey },
+    select: { uuid: true, username: true },
+  });
+  return user;
 }
 /**
  * Authenticate a user by username/password and create a session.
  * Returns null if credentials are invalid or DB is not initialized.
  */
 export async function authenticateAndCreateSession(username, password) {
-    const user = await lookupUsername(username);
-    if (!user)
-        return null;
-    const valid = await bcrypt.compare(password, user.passwordHash);
-    if (!valid)
-        return null;
-    const token = randomUUID();
-    const tokenHash = hashToken(token);
-    const expiresAt = new Date(Date.now() + SESSION_DURATION_MS);
-    const dbUser = await supervisorDb.user.findUnique({
-        where: { username },
-    });
-    await supervisorDb.session.create({
-        data: {
-            userId: dbUser.id,
-            tokenHash,
-            expiresAt,
-        },
-    });
-    return { token, user, expiresAt };
+  const user = await lookupUsername(username);
+  if (!user) return null;
+  const valid = await bcrypt.compare(password, user.passwordHash);
+  if (!valid) return null;
+  const token = randomUUID();
+  const tokenHash = hashToken(token);
+  const expiresAt = new Date(Date.now() + SESSION_DURATION_MS);
+  const dbUser = await supervisorDb.user.findUnique({
+    where: { username },
+  });
+  await supervisorDb.session.create({
+    data: {
+      userId: dbUser.id,
+      tokenHash,
+      expiresAt,
+    },
+  });
+  return { token, user, expiresAt };
 }
 /**
  * Update a user's password hash. No-op if not initialized.
  */
 export async function updateUserPassword(username, passwordHash) {
-    if (!supervisorDb)
-        return;
-    await supervisorDb.user.update({
-        where: { username },
-        data: { passwordHash },
-    });
+  if (!supervisorDb) return;
+  await supervisorDb.user.update({
+    where: { username },
+    data: { passwordHash },
+  });
 }
 /**
  * Delete a session by token hash.
  */
 export async function deleteSession(tokenHash) {
-    if (!supervisorDb)
-        return;
-    await supervisorDb.session.deleteMany({
-        where: { tokenHash },
-    });
+  if (!supervisorDb) return;
+  await supervisorDb.session.deleteMany({
+    where: { tokenHash },
+  });
 }
 /**
  * Ensure a "superadmin" user exists in the supervisor database.
  * If already exists, returns it as-is. Otherwise creates with generated credentials.
  */
 export async function ensureSuperAdmin() {
-    if (!supervisorDb)
-        throw new Error("Supervisor DB not initialized");
-    const existing = await supervisorDb.user.findUnique({
-        where: { username: SUPER_ADMIN_USERNAME },
-    });
-    if (existing) {
-        return {
-            created: false,
-            user: {
-                uuid: existing.uuid,
-                username: existing.username,
-                passwordHash: existing.passwordHash,
-                apiKey: existing.apiKey,
-            },
-        };
-    }
-    const uuid = randomUUID();
-    const password = randomUUID().slice(0, 8);
-    const passwordHash = await bcrypt.hash(password, 10);
-    const apiKey = randomBytes(32).toString("hex");
-    const user = await supervisorDb.user.create({
-        data: { uuid, username: SUPER_ADMIN_USERNAME, passwordHash, apiKey },
-    });
-    await supervisorDb.userPermission.create({
-        data: { userId: user.id, permission: "supervisor_admin" },
-    });
+  if (!supervisorDb) throw new Error("Supervisor DB not initialized");
+  const existing = await supervisorDb.user.findUnique({
+    where: { username: SUPER_ADMIN_USERNAME },
+  });
+  if (existing) {
     return {
-        created: true,
-        generatedPassword: password,
-        user: { uuid, username: SUPER_ADMIN_USERNAME, passwordHash, apiKey },
+      created: false,
+      user: {
+        uuid: existing.uuid,
+        username: existing.username,
+        passwordHash: existing.passwordHash,
+        apiKey: existing.apiKey,
+      },
     };
+  }
+  const uuid = randomUUID();
+  const password = randomUUID().slice(0, 8);
+  const passwordHash = await bcrypt.hash(password, 10);
+  const apiKey = randomBytes(32).toString("hex");
+  const user = await supervisorDb.user.create({
+    data: { uuid, username: SUPER_ADMIN_USERNAME, passwordHash, apiKey },
+  });
+  await supervisorDb.userPermission.create({
+    data: { userId: user.id, permission: "supervisor_admin" },
+  });
+  return {
+    created: true,
+    generatedPassword: password,
+    user: { uuid, username: SUPER_ADMIN_USERNAME, passwordHash, apiKey },
+  };
 }
 /**
  * CLI entry point for --reset-password. Initializes supervisor sessions,
  * then runs the interactive password reset.
  */
 export async function handleResetPassword(options) {
-    console.log(`NAISYS_FOLDER: ${process.env.NAISYS_FOLDER}`);
-    await createSupervisorDatabaseClient();
-    await resetPassword(options.findLocalUser, options.updateLocalPassword, options.username, options.password);
+  console.log(`NAISYS_FOLDER: ${process.env.NAISYS_FOLDER}`);
+  await createSupervisorDatabaseClient();
+  await resetPassword(
+    options.findLocalUser,
+    options.updateLocalPassword,
+    options.username,
+    options.password,
+  );
 }
 /**
  * CLI to reset a user's password. Updates both local DB (via callbacks) and
  * the supervisor DB. If username/password are provided, skips interactive
  * prompts.
  */
-export async function resetPassword(findLocalUser, updateLocalPassword, usernameArg, passwordArg) {
-    let username;
-    let password;
-    if (usernameArg && passwordArg) {
-        username = usernameArg;
-        password = passwordArg;
-    }
-    else {
-        const rl = readline.createInterface({
-            input: process.stdin,
-            output: process.stdout,
-        });
-        try {
-            username = usernameArg || (await rl.question("Username: "));
-            password = passwordArg || (await rl.question("New password: "));
-        }
-        finally {
-            rl.close();
-        }
-    }
-    const user = await findLocalUser(username);
-    if (!user) {
-        console.error(`User '${username}' not found.`);
-        process.exit(1);
-    }
-    if (password.length < 6) {
-        console.error("Password must be at least 6 characters.");
-        process.exit(1);
+export async function resetPassword(
+  findLocalUser,
+  updateLocalPassword,
+  usernameArg,
+  passwordArg,
+) {
+  let username;
+  let password;
+  if (usernameArg && passwordArg) {
+    username = usernameArg;
+    password = passwordArg;
+  } else {
+    const rl = readline.createInterface({
+      input: process.stdin,
+      output: process.stdout,
+    });
+    try {
+      username = usernameArg || (await rl.question("Username: "));
+      password = passwordArg || (await rl.question("New password: "));
+    } finally {
+      rl.close();
     }
-    const hash = await bcrypt.hash(password, 10);
-    await updateLocalPassword(user.id, hash);
-    await updateUserPassword(username, hash);
-    console.log(`Password reset for '${username}'.`);
+  }
+  const user = await findLocalUser(username);
+  if (!user) {
+    console.error(`User '${username}' not found.`);
+    process.exit(1);
+  }
+  if (password.length < 6) {
+    console.error("Password must be at least 6 characters.");
+    process.exit(1);
+  }
+  const hash = await bcrypt.hash(password, 10);
+  await updateLocalPassword(user.id, hash);
+  await updateUserPassword(username, hash);
+  console.log(`Password reset for '${username}'.`);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naisys/supervisor-database",
-  "version": "3.0.0-beta.4",
+  "version": "3.0.0-beta.5",
   "type": "module",
   "description": "[internal] Supervisor database schema and Prisma client for NAISYS",
   "files": [
@@ -8,7 +8,9 @@
     "prisma.config.ts",
     "prisma/schema.prisma",
     "prisma/migrations",
-    "!dist/**/*.map"
+    "!dist/**/*.map",
+    "!dist/**/*.d.ts",
+    "!dist/**/*.d.ts.map"
   ],
   "scripts": {
     "clean": "rimraf dist",
@@ -24,8 +26,8 @@
     "typescript": "^5.9.3"
   },
   "dependencies": {
-    "@naisys/common": "3.0.0-beta.4",
-    "@naisys/common-node": "3.0.0-beta.4",
+    "@naisys/common": "3.0.0-beta.5",
+    "@naisys/common-node": "3.0.0-beta.5",
     "bcryptjs": "^3.0.2",
     "@prisma/adapter-better-sqlite3": "^7.5.0",
     "@prisma/client": "^7.5.0",

package/dist/dbConfig.d.ts

@@ -1,5 +0,0 @@
-export declare function supervisorDbPath(): string;
-export declare function supervisorDbUrl(): string;
-/** We run migration scripts if this is greater than what's in the schema_version table */
-export declare const SUPERVISOR_DB_VERSION = 8;
-//# sourceMappingURL=dbConfig.d.ts.map

package/dist/generated/prisma/browser.d.ts

@@ -1,25 +0,0 @@
-import * as Prisma from './internal/prismaNamespaceBrowser.js';
-export { Prisma };
-export * as $Enums from './enums.js';
-export * from './enums.js';
-/**
- * Model User
- *
- */
-export type User = Prisma.UserModel;
-/**
- * Model Session
- *
- */
-export type Session = Prisma.SessionModel;
-/**
- * Model UserPermission
- *
- */
-export type UserPermission = Prisma.UserPermissionModel;
-/**
- * Model SchemaVersion
- *
- */
-export type SchemaVersion = Prisma.SchemaVersionModel;
-//# sourceMappingURL=browser.d.ts.map

package/dist/generated/prisma/client.d.ts

@@ -1,44 +0,0 @@
-import * as runtime from "@prisma/client/runtime/client";
-import * as $Class from "./internal/class.js";
-import * as Prisma from "./internal/prismaNamespace.js";
-export * as $Enums from './enums.js';
-export * from "./enums.js";
-/**
- * ## Prisma Client
- *
- * Type-safe database client for TypeScript
- * @example
- * ```
- * const prisma = new PrismaClient({
- *   adapter: new PrismaPg({ connectionString: process.env.DATABASE_URL })
- * })
- * // Fetch zero or more Users
- * const users = await prisma.user.findMany()
- * ```
- *
- * Read more in our [docs](https://pris.ly/d/client).
- */
-export declare const PrismaClient: $Class.PrismaClientConstructor;
-export type PrismaClient<LogOpts extends Prisma.LogLevel = never, OmitOpts extends Prisma.PrismaClientOptions["omit"] = Prisma.PrismaClientOptions["omit"], ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = $Class.PrismaClient<LogOpts, OmitOpts, ExtArgs>;
-export { Prisma };
-/**
- * Model User
- *
- */
-export type User = Prisma.UserModel;
-/**
- * Model Session
- *
- */
-export type Session = Prisma.SessionModel;
-/**
- * Model UserPermission
- *
- */
-export type UserPermission = Prisma.UserPermissionModel;
-/**
- * Model SchemaVersion
- *
- */
-export type SchemaVersion = Prisma.SchemaVersionModel;
-//# sourceMappingURL=client.d.ts.map