@axium/storage 0.2.1 → 0.2.3

package/dist/common.d.ts

@@ -42,7 +42,6 @@ export declare const StorageItemUpdate: z.ZodObject<{
     name: z.ZodOptional<z.ZodString>;
     owner: z.ZodOptional<z.ZodUUID>;
     trash: z.ZodOptional<z.ZodBoolean>;
-    restrict: z.ZodOptional<z.ZodBoolean>;
     publicPermission: z.ZodOptional<z.ZodNumber>;
 }, z.core.$strip>;
 export type StorageItemUpdate = z.infer<typeof StorageItemUpdate>;

package/dist/common.js

@@ -7,7 +7,6 @@ export const StorageItemUpdate = z
     name: z.string(),
     owner: z.uuid(),
     trash: z.boolean(),
-    restrict: z.boolean(),
     publicPermission: z.number().min(0).max(5),
 })
     .partial();

package/dist/plugin.js

@@ -23,7 +23,6 @@ async function db_init(opt, db) {
         .addColumn('parentId', 'uuid', col => col.references('storage.itemId').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('restricted', 'boolean', col => col.notNull().defaultTo(false))
         .addColumn('size', 'integer', col => col.notNull())
         .addColumn('trashedAt', 'timestamptz', col => col.defaultTo(null))
         .addColumn('hash', 'bytea', col => col.notNull())

package/dist/server.d.ts

@@ -1,5 +1,5 @@
 import { type Schema } from '@axium/server/database';
-import type { ExpressionBuilder, Generated, Selectable } from 'kysely';
+import type { Generated, Selectable } from 'kysely';
 import type { StorageItemMetadata, StorageLimits, StorageUsage } from './common.js';
 import './polyfills.js';
 declare module '@axium/server/database' {
@@ -12,7 +12,6 @@ declare module '@axium/server/database' {
             modifiedAt: Generated<Date>;
             name: string;
             parentId: string | null;
-            restricted: Generated<boolean>;
             size: number;
             trashedAt: Date | null;
             type: string;
@@ -53,15 +52,12 @@ declare module '@axium/server/config' {
 export interface StorageItem extends StorageItemMetadata {
     data: Uint8Array<ArrayBufferLike>;
 }
-export declare function parseItem<T extends Record<string, unknown> = Record<string, unknown>>(item: Selectable<Schema['storage']> & {
-    hash: string;
-}): StorageItemMetadata<T>;
+export declare function parseItem<T extends Record<string, unknown> = Record<string, unknown>>(item: Selectable<Schema['storage']>): StorageItemMetadata<T>;
 /**
  * Returns the current usage of the storage for a user in bytes.
  */
 export declare function currentUsage(userId: string): Promise<StorageUsage>;
 export declare function get<T extends Record<string, unknown> = Record<string, unknown>>(itemId: string): Promise<StorageItemMetadata<T>>;
-export declare function withEncodedHash(eb: ExpressionBuilder<Schema, 'storage'>): import("kysely").AliasedExpression<string, "hash">;
 export type ExternalLimitHandler = (userId?: string) => StorageLimits | Promise<StorageLimits>;
 /**
  * Define the handler to get limits for a user externally.

package/dist/server.js

@@ -1,4 +1,4 @@
-import { Permission } from '@axium/core';
+import { Permission } from '@axium/core/access';
 import { checkAuthForItem, checkAuthForUser, getSessionAndUser } from '@axium/server/auth';
 import { addConfigDefaults, config } from '@axium/server/config';
 import { connect, database, expectedTypes } from '@axium/server/database';
@@ -21,7 +21,6 @@ expectedTypes.storage = {
     modifiedAt: { type: 'timestamptz', required: true, hasDefault: true },
     name: { type: 'text' },
     parentId: { type: 'uuid' },
-    restricted: { type: 'bool', required: true, hasDefault: true },
     size: { type: 'int4', required: true },
     trashedAt: { type: 'timestampz' },
     type: { type: 'text', required: true },
@@ -53,6 +52,7 @@ export function parseItem(item) {
         ...item,
         metadata: item.metadata,
         dataURL: `/raw/storage/${item.id}`,
+        hash: item.hash.toHex(),
     };
 }
 /**
@@ -74,13 +74,10 @@ export async function get(itemId) {
         .selectFrom('storage')
         .where('id', '=', itemId)
         .selectAll()
-        .select(withEncodedHash)
+        .$narrowType()
         .executeTakeFirstOrThrow();
     return parseItem(result);
 }
-export function withEncodedHash(eb) {
-    return eb.fn('encode', ['hash', eb.val('hex')]).as('hash');
-}
 let _getLimits = null;
 /**
  * Define the handler to get limits for a user externally.
@@ -104,7 +101,7 @@ addRoute({
             error(503, 'User storage is disabled');
         const itemId = event.params.id;
         const { item } = await checkAuthForItem(event, 'storage', itemId, Permission.Read);
-        return item;
+        return parseItem(item);
     },
     async PATCH(event) {
         if (!config.storage.enabled)
@@ -128,7 +125,6 @@ addRoute({
             .where('id', '=', itemId)
             .set(values)
             .returningAll()
-            .returning(withEncodedHash)
             .executeTakeFirstOrThrow()
             .catch(withError('Could not update item')));
     },
@@ -136,7 +132,8 @@ addRoute({
         if (!config.storage.enabled)
             error(503, 'User storage is disabled');
         const itemId = event.params.id;
-        const { item } = await checkAuthForItem(event, 'storage', itemId, Permission.Manage);
+        const auth = await checkAuthForItem(event, 'storage', itemId, Permission.Manage);
+        const item = parseItem(auth.item);
         await database
             .deleteFrom('storage')
             .where('id', '=', itemId)
@@ -168,7 +165,6 @@ addRoute({
             .where('parentId', '=', itemId)
             .where('trashedAt', '!=', null)
             .selectAll()
-            .select(withEncodedHash)
             .execute();
         return items.map(parseItem);
     },
@@ -217,7 +213,6 @@ addRoute({
             .insertInto('storage')
             .values({ userId: userId, hash, name, size, type, immutable: useCAS, parentId })
             .returningAll()
-            .returning(withEncodedHash)
             .executeTakeFirstOrThrow()
             .catch(withError('Could not create item'));
         const path = join(config.storage.data, result.id);
@@ -289,7 +284,6 @@ addRoute({
             .where('id', '=', itemId)
             .set({ size, modifiedAt: new Date(), hash })
             .returningAll()
-            .returning(withEncodedHash)
             .executeTakeFirstOrThrow()
             .catch(withError('Could not update item'));
         await writeFile(join(config.storage.data, result.id), content).catch(withError('Could not write'));
@@ -313,7 +307,7 @@ addRoute({
         const userId = event.params.id;
         await checkAuthForUser(event, userId);
         const [items, usage, limits] = await Promise.all([
-            database.selectFrom('storage').where('userId', '=', userId).selectAll().select(withEncodedHash).execute(),
+            database.selectFrom('storage').where('userId', '=', userId).selectAll().execute(),
             currentUsage(userId),
             getLimits(userId),
         ]).catch(withError('Could not fetch data'));

package/package.json

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