@majikah/majik-file 0.0.10 → 0.0.11

package/dist/core/types.d.ts

@@ -1,6 +1,8 @@
 export type MajikMessagePublicKey = string;
 export type FileContext = "user_upload" | "chat_attachment" | "chat_image" | "thread_attachment";
 export type StorageType = "permanent" | "temporary";
+/** Allowed TTLs for temporary files in days. Maps 1:1 to R2 lifecycle prefixes. */
+export type TempFileDuration = 1 | 2 | 3 | 5 | 7 | 15;
 /**
  * The file owner's full identity.
  * Carries both keys — public for encryption, secret for decryption.
@@ -185,9 +187,9 @@ export interface CreateOptions {
      */
     bypassSizeLimit?: boolean;
     /**
-     * ISO-8601 expiry datetime. Required when isTemporary = true.
+     * Temporary file duration in days. Required when isTemporary = true.
      */
-    expiresAt?: string;
+    expiresAt?: TempFileDuration;
     /** Associate this file with a chat message (mutually exclusive with threadMessageId). */
     chatMessageId?: string;
     /** Associate this file with a thread message (mutually exclusive with chatMessageId). */

package/dist/core/utils.d.ts

@@ -11,7 +11,7 @@
  *  - Human-readable file size formatting
  *  - Expiry helpers
  */
-import type { DecodedMjkb, MajikFileRecipient, MjkbPayload } from "./types";
+import type { DecodedMjkb, MajikFileRecipient, MjkbPayload, TempFileDuration } from "./types";
 export declare function arrayToBase64(data: Uint8Array): string;
 export declare function arrayBufferToBase64(buffer: ArrayBuffer): string;
 export declare function base64ToUint8Array(base64: string): Uint8Array;
@@ -37,9 +37,9 @@ export declare function buildPermanentR2Key(userId: string, fileHash: string): s
 /**
  * Build an R2 object key for a temporary / public file.
  * Objects under this prefix are auto-deleted by the bucket lifecycle policy.
- *   files/public/<userId>_<fileHash>.mjkb
+ *   files/public/15/<userId>_<fileHash>.mjkb
  */
-export declare function buildTemporaryR2Key(userId: string, fileHash: string): string;
+export declare function buildTemporaryR2Key(userId: string, fileHash: string, duration?: TempFileDuration): string;
 /**
  * Build an R2 object key for an encrypted WebP chat image.
  *
@@ -97,7 +97,7 @@ export declare function isExpired(expiresAt: string | null): boolean;
  * Build a default expiry ISO string for temporary files.
  * @param days Days from now. Defaults to 15 (matching the R2 lifecycle policy).
  */
-export declare function buildExpiryDate(days?: number): string;
+export declare function buildExpiryDate(days?: TempFileDuration): string;
 /**
  * Deduplicate a recipient list and strip the owner's own key.
  *

package/dist/core/utils.js

@@ -83,10 +83,10 @@ export function buildPermanentR2Key(userId, fileHash) {
 /**
  * Build an R2 object key for a temporary / public file.
  * Objects under this prefix are auto-deleted by the bucket lifecycle policy.
- *   files/public/<userId>_<fileHash>.mjkb
+ *   files/public/15/<userId>_<fileHash>.mjkb
  */
-export function buildTemporaryR2Key(userId, fileHash) {
-    return `${R2_PREFIX.TEMPORARY}/${userId}_${fileHash}.mjkb`;
+export function buildTemporaryR2Key(userId, fileHash, duration = 15) {
+    return `${R2_PREFIX.TEMPORARY}/${duration}/${userId}_${fileHash}.mjkb`;
 }
 /**
  * Build an R2 object key for an encrypted WebP chat image.

package/dist/majik-file.d.ts

@@ -1,4 +1,4 @@
-import type { MajikFileJSON, CreateOptions, MajikFileIdentity, MajikFileStats, FileContext, StorageType } from "./core/types";
+import type { MajikFileJSON, CreateOptions, MajikFileIdentity, MajikFileStats, FileContext, StorageType, TempFileDuration } from "./core/types";
 /**
  * MajikFile
  * ----------------
@@ -181,17 +181,19 @@ export declare class MajikFile {
      * @throws MajikFileError when switching to temporary without an expiresAt,
      *         or if the instance has no userId / fileHash yet.
      */
-    setStorageType(type: StorageType, expiresAt: string | null): void;
+    setStorageType(type: StorageType, expiresAt: string | null, duration?: TempFileDuration): void;
     /**
      * Switch to permanent storage. Clears any expiry date and updates the R2 key.
      */
     setPermanent(): void;
     /**
-     * Switch to temporary storage with an optional TTL.
+     * Switch to temporary storage with a typed TTL duration.
+     * The duration determines both the R2 prefix bucket and the expiry date.
      *
-     * @param days  Days until expiry. Defaults to 15 to match R2 lifecycle policy.
+     * @param duration  Days until expiry. Must be one of: 1 | 2 | 3 | 5 | 7 | 15.
+     *                  Defaults to 15 to match the R2 lifecycle policy.
      */
-    setTemporary(days?: number): void;
+    setTemporary(duration?: TempFileDuration): void;
     /**
      * Serialise metadata to a plain object matching the `majik_files` Supabase table.
      * The encrypted binary (_binary) is intentionally excluded.
@@ -306,7 +308,7 @@ export declare class MajikFile {
      * Build a default ISO-8601 expiry date for temporary files.
      * @param days Days from now. Defaults to 15 (R2 lifecycle policy).
      */
-    static buildExpiryDate(days?: number): string;
+    static buildExpiryDate(days?: TempFileDuration): string;
     /** Format bytes as a human-readable string (e.g. "4.2 MB"). */
     static formatBytes(bytes: number): string;
     /**

package/dist/majik-file.js

@@ -214,7 +214,7 @@ export class MajikFile {
      * @throws MajikFileError on validation or crypto failure
      */
     static async create(options) {
-        const { data, identity, context, recipients = [], originalName = null, mimeType: rawMimeType = null, isTemporary = false, isShared = false, id = generateUUID(), bypassSizeLimit = false, expiresAt = null, chatMessageId = null, threadMessageId = null, conversationId = null, userId, } = options;
+        const { data, identity, context, recipients = [], originalName = null, mimeType: rawMimeType = null, isTemporary = false, isShared = false, id = generateUUID(), bypassSizeLimit = false, expiresAt = 15, chatMessageId = null, threadMessageId = null, conversationId = null, userId, } = options;
         // ── Input validation ─────────────────────────────────────────────────
         if (!data)
             throw MajikFileError.invalidInput("data is required");
@@ -365,7 +365,7 @@ export class MajikFile {
                 r2Key = buildChatImageR2Key(conversationId, userId, fileHash);
             }
             else if (isTemporary) {
-                r2Key = buildTemporaryR2Key(userId, fileHash);
+                r2Key = buildTemporaryR2Key(userId, fileHash, expiresAt); // default TTL at creation time
             }
             else {
                 r2Key = buildPermanentR2Key(userId, fileHash);
@@ -388,7 +388,7 @@ export class MajikFile {
                 chat_message_id: chatMessageId,
                 thread_message_id: threadMessageId,
                 conversation_id: conversationId,
-                expires_at: expiresAt,
+                expires_at: buildExpiryDate(expiresAt),
                 timestamp: now,
                 last_update: now,
             };
@@ -565,7 +565,7 @@ export class MajikFile {
      * @throws MajikFileError when switching to temporary without an expiresAt,
      *         or if the instance has no userId / fileHash yet.
      */
-    setStorageType(type, expiresAt) {
+    setStorageType(type, expiresAt, duration = 15) {
         if (!["permanent", "temporary"].includes(type)) {
             throw MajikFileError.invalidInput(`setStorageType: type must be "permanent" or "temporary" (got "${type}")`);
         }
@@ -573,13 +573,11 @@ export class MajikFile {
             throw MajikFileError.invalidInput("setStorageType: expiresAt is required when switching to temporary. " +
                 "Use setTemporary(days?) instead.");
         }
-        // Rebuild R2 key — context is preserved, only the storage tier changes.
-        // chat_image files are context-scoped and must never be rekeyed here.
         if (this._context === "chat_image") {
             throw MajikFileError.invalidInput("setStorageType: chat_image files are conversation-scoped and cannot change storage type.");
         }
         const newR2Key = type === "temporary"
-            ? buildTemporaryR2Key(this._userId, this._fileHash)
+            ? buildTemporaryR2Key(this._userId, this._fileHash, duration)
             : buildPermanentR2Key(this._userId, this._fileHash);
         this._storageType = type;
         this._expiresAt = type === "temporary" ? expiresAt : null;
@@ -593,12 +591,14 @@ export class MajikFile {
         this.setStorageType("permanent", null);
     }
     /**
-     * Switch to temporary storage with an optional TTL.
+     * Switch to temporary storage with a typed TTL duration.
+     * The duration determines both the R2 prefix bucket and the expiry date.
      *
-     * @param days  Days until expiry. Defaults to 15 to match R2 lifecycle policy.
+     * @param duration  Days until expiry. Must be one of: 1 | 2 | 3 | 5 | 7 | 15.
+     *                  Defaults to 15 to match the R2 lifecycle policy.
      */
-    setTemporary(days = 15) {
-        this.setStorageType("temporary", MajikFile.buildExpiryDate(days));
+    setTemporary(duration = 15) {
+        this.setStorageType("temporary", MajikFile.buildExpiryDate(duration), duration);
     }
     // ── SERIALISATION ─────────────────────────────────────────────────────────
     /**

package/package.json

@@ -2,7 +2,7 @@
   "name": "@majikah/majik-file",
   "type": "module",
   "description": "Majik File is the core cryptographic engine for secure file handling in the Majikah ecosystem. It provides a post-quantum secure \"MJKB\" format designed for file encryption, multi-recipient key encapsulation, and transparent compression using NIST-standardized algorithms.",
-  "version": "0.0.10",
+  "version": "0.0.11",
   "license": "Apache-2.0",
   "author": "Zelijah",
   "main": "./dist/index.js",