@axium/storage 0.3.4 → 0.3.6

package/dist/plugin.d.ts

@@ -1,11 +1,11 @@
-import type { Database, InitOptions, OpOptions } from '@axium/server/database';
+import type { InitOptions, OpOptions } from '@axium/server/database';
 import './common.js';
 import './server.js';
 declare function statusText(): Promise<string>;
-declare function db_init(opt: InitOptions, db: Database): Promise<void>;
-declare function db_wipe(opt: OpOptions, db: Database): Promise<void>;
-declare function remove(opt: OpOptions, db: Database): Promise<void>;
-declare function clean(opt: OpOptions, db: Database): Promise<void>;
+declare function db_init(opt: InitOptions): Promise<void>;
+declare function db_wipe(opt: OpOptions): Promise<void>;
+declare function remove(opt: OpOptions): Promise<void>;
+declare function clean(opt: OpOptions): Promise<void>;
 declare const _default: {
     statusText: typeof statusText;
     hooks: {

package/dist/plugin.js

@@ -1,6 +1,7 @@
 import { formatBytes } from '@axium/core/format';
+import * as acl from '@axium/server/acl';
 import config from '@axium/server/config';
-import { count, database, warnExists } from '@axium/server/database';
+import { count, createIndex, database, warnExists } from '@axium/server/database';
 import { done, start } from '@axium/server/io';
 import { sql } from 'kysely';
 import pkg from '../package.json' with { type: 'json' };
@@ -14,13 +15,13 @@ async function statusText() {
         .executeTakeFirstOrThrow();
     return `${items} items totaling ${formatBytes(Number(size))}`;
 }
-async function db_init(opt, db) {
+async function db_init(opt) {
     start('Creating table storage');
-    await db.schema
+    await database.schema
         .createTable('storage')
         .addColumn('id', 'uuid', col => col.primaryKey().defaultTo(sql `gen_random_uuid()`))
         .addColumn('userId', 'uuid', col => col.notNull().references('users.id').onDelete('cascade').onUpdate('cascade'))
-        .addColumn('parentId', 'uuid', col => col.references('storage.itemId').onDelete('cascade').onUpdate('cascade').defaultTo(null))
+        .addColumn('parentId', 'uuid', col => col.references('storage.id').onDelete('cascade').onUpdate('cascade').defaultTo(null))
         .addColumn('createdAt', 'timestamptz', col => col.notNull().defaultTo(sql `now()`))
         .addColumn('modifiedAt', 'timestamptz', col => col.notNull().defaultTo(sql `now()`))
         .addColumn('size', 'integer', col => col.notNull())
@@ -34,25 +35,26 @@ async function db_init(opt, db) {
         .execute()
         .then(done)
         .catch(warnExists);
-    start('Creating index for storage.userId');
-    await db.schema.createIndex('storage_userId_index').on('storage').column('userId').execute().then(done).catch(warnExists);
-    start('Creating index for storage.parentId');
-    await db.schema.createIndex('storage_parentId_index').on('storage').column('parentId').execute().then(done).catch(warnExists);
+    await createIndex('storage', 'userId');
+    await createIndex('storage', 'parentId');
+    await acl.createTable('storage');
 }
-async function db_wipe(opt, db) {
+async function db_wipe(opt) {
     start('Removing data from user storage');
-    await db.deleteFrom('storage').execute();
+    await database.deleteFrom('storage').execute();
+    await acl.wipeTable('storage');
     done();
 }
-async function remove(opt, db) {
+async function remove(opt) {
     start('Dropping table storage');
-    await db.schema.dropTable('storage').execute();
+    await database.schema.dropTable('storage').execute();
+    await acl.dropTable('storage');
     done();
 }
-async function clean(opt, db) {
+async function clean(opt) {
     start('Removing expired trash items');
     const nDaysAgo = new Date(Date.now() - 86400000 * config.storage.trash_duration);
-    await db
+    await database
         .deleteFrom('storage')
         .where('trashedAt', 'is not', null)
         .where('trashedAt', '<', nDaysAgo)

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@axium/storage",
-	"version": "0.3.4",
+	"version": "0.3.6",
 	"author": "James Prevett <axium@jamespre.dev> (https://jamespre.dev)",
 	"description": "User file storage for Axium",
 	"funding": {