@axium/server 0.4.1 → 0.4.3

package/dist/database.d.ts

@@ -2,7 +2,7 @@ import type { AdapterAccountType as db } from '@auth/core/adapters';
 import { Kysely, type GeneratedAlways } from 'kysely';
 import type { Preferences } from './auth.js';
 import * as config from './config.js';
-import { type MaybeOutput } from './io.js';
+import { type MaybeOutput, type WithOutput } from './io.js';
 export interface Schema {
     User: {
         id: GeneratedAlways<string>;
@@ -66,6 +66,7 @@ export interface OpOptions extends MaybeOutput {
 export interface InitOptions extends OpOptions {
     skip: boolean;
 }
+export declare function shouldRecreate(opt: InitOptions & WithOutput): boolean;
 export declare function init(opt: InitOptions): Promise<config.Database>;
 /**
  * Completely remove Axium from the database.

package/dist/database.js

@@ -54,7 +54,7 @@ import { Kysely, PostgresDialect, sql } from 'kysely';
 import { randomBytes } from 'node:crypto';
 import pg from 'pg';
 import * as config from './config.js';
-import { _fixOutput, run } from './io.js';
+import { _fixOutput, run, someWarnings } from './io.js';
 export let database;
 export function connect() {
     if (database)
@@ -86,7 +86,7 @@ export async function statusText() {
         throw typeof error == 'object' && 'message' in error ? error.message : error;
     }
 }
-function shouldRecreate(opt) {
+export function shouldRecreate(opt) {
     if (opt.skip) {
         opt.output('warn', 'already exists. (skipped)\n');
         return true;
@@ -107,6 +107,7 @@ export async function init(opt) {
             opt.output('debug', 'Generated password and wrote to global config');
         }
         const _sql = (command, message) => run(opt, message, `sudo -u postgres psql -c "${command}"`);
+        const relationExists = someWarnings(opt.output, [/relation "\w+" already exists/, 'already exists.']);
         await _sql('CREATE DATABASE axium', 'Creating database').catch(async (error) => {
             if (error != 'database "axium" already exists')
                 throw error;
@@ -130,13 +131,6 @@ export async function init(opt) {
         await _sql('ALTER DATABASE axium OWNER TO axium', 'Setting database owner');
         await _sql('SELECT pg_reload_conf()', 'Reloading configuration');
         const db = __addDisposableResource(env_1, connect(), true);
-        const relationExists = (table) => (error) => {
-            error = typeof error == 'object' && 'message' in error ? error.message : error;
-            if (error == `relation "${table}" already exists`)
-                opt.output('warn', 'already exists.');
-            else
-                throw error;
-        };
         opt.output('start', 'Creating table User');
         await db.schema
             .createTable('User')
@@ -149,7 +143,7 @@ export async function init(opt) {
             .addColumn('salt', 'text')
             .addColumn('preferences', 'jsonb', col => col.notNull().defaultTo(sql `'{}'::jsonb`))
             .execute()
-            .catch(relationExists('User'));
+            .catch(relationExists);
         opt.output('done');
         opt.output('start', 'Creating table Account');
         await db.schema
@@ -167,10 +161,10 @@ export async function init(opt) {
             .addColumn('id_token', 'text')
             .addColumn('session_state', 'text')
             .execute()
-            .catch(relationExists('Account'));
+            .catch(relationExists);
         opt.output('done');
         opt.output('start', 'Creating index for Account.userId');
-        db.schema.createIndex('Account_userId_index').on('Account').column('userId').execute().catch(relationExists('Account_userId_index'));
+        db.schema.createIndex('Account_userId_index').on('Account').column('userId').execute().catch(relationExists);
         opt.output('done');
         opt.output('start', 'Creating table Session');
         await db.schema
@@ -180,10 +174,10 @@ export async function init(opt) {
             .addColumn('sessionToken', 'text', col => col.notNull().unique())
             .addColumn('expires', 'timestamptz', col => col.notNull())
             .execute()
-            .catch(relationExists('Session'));
+            .catch(relationExists);
         opt.output('done');
         opt.output('start', 'Creating index for Session.userId');
-        db.schema.createIndex('Session_userId_index').on('Session').column('userId').execute().catch(relationExists('Session_userId_index'));
+        db.schema.createIndex('Session_userId_index').on('Session').column('userId').execute().catch(relationExists);
         opt.output('done');
         opt.output('start', 'Creating table VerificationToken');
         await db.schema
@@ -192,7 +186,7 @@ export async function init(opt) {
             .addColumn('token', 'text', col => col.notNull().unique())
             .addColumn('expires', 'timestamptz', col => col.notNull())
             .execute()
-            .catch(relationExists('VerificationToken'));
+            .catch(relationExists);
         opt.output('done');
         opt.output('start', 'Creating table Authenticator');
         await db.schema
@@ -206,10 +200,10 @@ export async function init(opt) {
             .addColumn('credentialBackedUp', 'boolean', col => col.notNull())
             .addColumn('transports', 'text')
             .execute()
-            .catch(relationExists('Authenticator'));
+            .catch(relationExists);
         opt.output('done');
         opt.output('start', 'Creating index for Authenticator.credentialID');
-        db.schema.createIndex('Authenticator_credentialID_key').on('Authenticator').column('credentialID').execute().catch(relationExists('Authenticator_credentialID_key'));
+        db.schema.createIndex('Authenticator_credentialID_key').on('Authenticator').column('credentialID').execute().catch(relationExists);
         opt.output('done');
         return config.db;
     }

package/dist/io.d.ts

@@ -64,3 +64,9 @@ export interface PortOptions extends MaybeOutput {
  * If the origin has a port, passkeys do not work correctly with some password managers.
  */
 export declare function restrictedPorts(opt: PortOptions): Promise<void>;
+/**
+ * This is a factory for handling errors when performing operations.
+ * The handler will allow the parent scope to continue if a relation already exists,
+ * rather than fatally exiting.
+ */
+export declare function someWarnings(output: Output, ...allowList: [RegExp, string?][]): (error: string | Error) => void;

package/dist/io.js

@@ -1,5 +1,5 @@
 import { Logger } from 'logzen';
-import { exec, execSync } from 'node:child_process';
+import { exec } from 'node:child_process';
 import * as fs from 'node:fs';
 import { homedir } from 'node:os';
 import { join } from 'node:path/posix';
@@ -167,3 +167,18 @@ export async function restrictedPorts(opt) {
         }
     }
 }
+/**
+ * This is a factory for handling errors when performing operations.
+ * The handler will allow the parent scope to continue if a relation already exists,
+ * rather than fatally exiting.
+ */
+export function someWarnings(output, ...allowList) {
+    return (error) => {
+        error = typeof error == 'object' && 'message' in error ? error.message : error;
+        for (const [pattern, message = error] of allowList) {
+            if (pattern.test(error))
+                output('warn', message);
+        }
+        throw error;
+    };
+}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@axium/server",
-	"version": "0.4.1",
+	"version": "0.4.3",
 	"author": "James Prevett <axium@jamespre.dev> (https://jamespre.dev)",
 	"funding": {
 		"type": "individual",