@yimingliao/cms 0.0.17 → 0.0.18

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { F as FolderFull } from './base-DbGnfZr6.js';
-export { A as ADMIN_ROLES, a as Admin, b as AdminCard, c as AdminFull, d as AdminRefreshToken, e as AdminRole, f as AdminSafe, g as AdminTranslation, h as Alternate, B as BaseTranslation, D as DeviceInfo, E as ExternalLink, i as FILE_TYPES, j as Faq, k as File, l as FileCard, m as FileFull, n as FileTranslation, o as FileType, p as Folder, M as MultiItems, P as POST_TYPES, q as Post, r as PostFull, s as PostListCard, t as PostTranslation, u as PostType, S as SeoMetadata, v as SingleItem, T as TocItem, w as Translation } from './base-DbGnfZr6.js';
+import { F as FolderFull } from './types-Bhnz5Z1F.js';
+export { A as ADMIN_ROLES, a as Admin, b as AdminCard, c as AdminFull, d as AdminRefreshToken, e as AdminRole, f as AdminSafe, g as AdminTranslation, h as Alternate, B as BaseTranslation, i as BlobFile, D as DeviceInfo, E as ExternalLink, j as FILE_TYPES, k as Faq, l as File, m as FileCard, n as FileFull, o as FileTranslation, p as FileType, q as Folder, M as MultiItems, P as POST_TYPES, r as Post, s as PostFull, t as PostListCard, u as PostTranslation, v as PostType, S as SeoMetadata, w as SingleItem, T as TocItem, x as Translation } from './types-Bhnz5Z1F.js';
 
 declare const ROOT_FOLDER_ID = "01ARZ3NDEKTSV4RRFFQ69G5FAV";
 declare const ROOT_FOLDER_NAME = "ROOT";
@@ -20,13 +20,6 @@ declare const getMediaInfo: (file: Blob) => Promise<MediaInfo>;
 
 declare const formatFileSize: (size: number, decimals?: number) => string;
 
-interface BlobFile extends File {
-    id: string;
-    width: number | null;
-    height: number | null;
-    duration: number | null;
-}
-
 interface SuccessResult<D = unknown> {
     success: true;
     message?: string;
@@ -67,4 +60,4 @@ declare const result: {
     error: typeof error;
 };
 
-export { type BlobFile, type ErrorDetail, type ErrorResult, type ErrorResultParams, FolderFull, ROOT_FOLDER, ROOT_FOLDER_ID, ROOT_FOLDER_NAME, type Result, SIMPLE_UPLOAD_FOLDER_KEY, SIMPLE_UPLOAD_FOLDER_NAME, type SuccessResult, type SuccessResultParams, classifyFileType, formatFileSize, getMediaInfo, mimeToExtension, result };
+export { type ErrorDetail, type ErrorResult, type ErrorResultParams, FolderFull, ROOT_FOLDER, ROOT_FOLDER_ID, ROOT_FOLDER_NAME, type Result, SIMPLE_UPLOAD_FOLDER_KEY, SIMPLE_UPLOAD_FOLDER_NAME, type SuccessResult, type SuccessResultParams, classifyFileType, formatFileSize, getMediaInfo, mimeToExtension, result };

package/dist/server/index.d.ts

@@ -1,21 +1,17 @@
 import jwt from 'jsonwebtoken';
 import { BinaryLike } from 'node:crypto';
 import { cookies } from 'next/headers';
-import Keyv from 'keyv';
+import { S3Client } from '@aws-sdk/client-s3';
 import { Logger } from 'logry';
-import { e as AdminRole, v as SingleItem, B as BaseTranslation, a as Admin, c as AdminFull, f as AdminSafe, D as DeviceInfo, d as AdminRefreshToken, k as File, m as FileFull, o as FileType, p as Folder, F as FolderFull, u as PostType, M as MultiItems, E as ExternalLink, j as Faq, T as TocItem, q as Post, s as PostListCard, t as PostTranslation, r as PostFull, S as SeoMetadata, g as AdminTranslation, n as FileTranslation, h as Alternate } from '../base-DbGnfZr6.js';
+import { i as BlobFile, e as AdminRole, w as SingleItem, B as BaseTranslation, a as Admin, c as AdminFull, f as AdminSafe, D as DeviceInfo, d as AdminRefreshToken, l as File, n as FileFull, p as FileType, q as Folder, F as FolderFull, v as PostType, M as MultiItems, E as ExternalLink, k as Faq, T as TocItem, r as Post, t as PostListCard, u as PostTranslation, s as PostFull, S as SeoMetadata, g as AdminTranslation, o as FileTranslation, h as Alternate } from '../types-Bhnz5Z1F.js';
+import Keyv from 'keyv';
 
-interface JwtServiceConfig {
+interface CreateJwtServiceOptions {
     defaultSecret: string;
     issuer?: string;
     audience?: string;
 }
-/**
- * JWT service
- *
- * Sign, Verify
- */
-declare function createJwtService(config: JwtServiceConfig): {
+declare function createJwtService({ defaultSecret, ...options }: CreateJwtServiceOptions): {
     sign: ({ payload, secret, expiresIn, }: {
         payload: object;
         secret: string;
@@ -32,15 +28,10 @@ declare function createArgon2Service(): {
     verify: (hash: string, plain: string) => Promise<boolean>;
 };
 
-interface CryptoServiceConfig {
+interface CreateCryptoServiceOptions {
     defaultSecret: string;
 }
-/**
- * Crypto service
- *
- * Encrypt & Decrypt, Calculate checksum, Sign
- */
-declare function createCryptoService(config: CryptoServiceConfig): {
+declare function createCryptoService({ defaultSecret, }: CreateCryptoServiceOptions): {
     generateToken: () => string;
     hash: (value: BinaryLike) => string;
     hashBuffer: (value: BinaryLike) => Buffer;
@@ -56,11 +47,6 @@ declare function createCryptoService(config: CryptoServiceConfig): {
     };
 };
 
-/**
- * Cookie Service
- *
- * Set, Get, Verify, Delete
- */
 declare function createCookieService(nextCookies: () => Promise<Awaited<ReturnType<typeof cookies>>>, cryptoService: ReturnType<typeof createCryptoService>): {
     set: ({ name, value, expireSeconds, }: {
         name: string;
@@ -86,6 +72,25 @@ declare function createCookieService(nextCookies: () => Promise<Awaited<ReturnTy
     }) => Promise<void>;
 };
 
+interface CreateR2ServiceOptions {
+    r2Client: S3Client;
+    bucketName: string;
+    logger: Logger;
+}
+declare function createR2Service({ r2Client, bucketName, logger, }: CreateR2ServiceOptions): {
+    upload: ({ blobFile, folderKey, }: {
+        blobFile: BlobFile;
+        folderKey?: string;
+    }) => Promise<string>;
+    remove: ({ key }: {
+        key: string;
+    }) => Promise<void>;
+    move: ({ fromKey, toKey }: {
+        fromKey: string;
+        toKey: string;
+    }) => Promise<void>;
+};
+
 interface CreateServerCacheOptions {
     redisUrl: string;
     namespace: string;
@@ -611,4 +616,4 @@ declare const POST_ORDER_BY: ({
     index: "asc";
 })[];
 
-export { ADMIN_ORDER_BY, ORDER_BY, POST_ORDER_BY, type RawCacheKey, createAdminCommandRepository, createAdminQueryRepository, createAdminRefreshTokenCommandRepository, createAdminRefreshTokenQueryRepository, createArgon2Service, createCache, createCacheResult, createCookieService, createCryptoService, createFileCommandRepository, createFileQueryRepository, createFolderCommandRepository, createFolderQueryRepository, createIpRateLimiter, createJwtService, createPostCommandRepository, createPostQueryRepository, createSeoMetadataCommandRepository, normalizeCacheKey };
+export { ADMIN_ORDER_BY, ORDER_BY, POST_ORDER_BY, type RawCacheKey, createAdminCommandRepository, createAdminQueryRepository, createAdminRefreshTokenCommandRepository, createAdminRefreshTokenQueryRepository, createArgon2Service, createCache, createCacheResult, createCookieService, createCryptoService, createFileCommandRepository, createFileQueryRepository, createFolderCommandRepository, createFolderQueryRepository, createIpRateLimiter, createJwtService, createPostCommandRepository, createPostQueryRepository, createR2Service, createSeoMetadataCommandRepository, normalizeCacheKey };

package/dist/server/index.js

@@ -1,14 +1,18 @@
 import { ADMIN_ROLES, mimeToExtension, classifyFileType, ROOT_FOLDER_ID } from '../chunk-SEX4DOKX.js';
 import jwt from 'jsonwebtoken';
-import argon2, { argon2id } from 'argon2';
+import argon2 from 'argon2';
 import crypto, { timingSafeEqual } from 'crypto';
 import { headers } from 'next/headers';
+import { PutObjectCommand, DeleteObjectCommand, CopyObjectCommand } from '@aws-sdk/client-s3';
+import path from 'path/posix';
+import { ulid } from 'ulid';
 import KeyvRedis from '@keyv/redis';
 import Keyv from 'keyv';
-import { ulid } from 'ulid';
 
-function createJwtService(config) {
-  const { defaultSecret, ...options } = config;
+function createJwtService({
+  defaultSecret,
+  ...options
+}) {
   function sign({
     payload = {},
     secret = defaultSecret,
@@ -38,8 +42,8 @@ function createJwtService(config) {
     verify
   };
 }
-var OPTIONS = {
-  type: argon2id,
+var DEFAULT_OPTIONS = {
+  type: argon2.argon2id,
   memoryCost: 19456,
   // ~19MB
   timeCost: 2,
@@ -47,7 +51,7 @@ var OPTIONS = {
 };
 function createArgon2Service() {
   async function hash(password) {
-    return await argon2.hash(password, OPTIONS);
+    return await argon2.hash(password, DEFAULT_OPTIONS);
   }
   async function verify(hash2, plain) {
     return await argon2.verify(hash2, plain);
@@ -57,8 +61,9 @@ function createArgon2Service() {
     verify
   };
 }
-function createCryptoService(config) {
-  const { defaultSecret } = config;
+function createCryptoService({
+  defaultSecret
+}) {
   const SECRET = crypto.createHash("sha256").update(defaultSecret).digest();
   const ALGORITHM = "aes-256-gcm";
   const IV_LENGTH = 12;
@@ -118,7 +123,7 @@ function createCryptoService(config) {
     sign
   };
 }
-var DEFAULTS = {
+var DEFAULT_OPTIONS2 = {
   httpOnly: true,
   secure: process.env["NODE_ENV"] === "production",
   sameSite: "strict",
@@ -131,7 +136,7 @@ function createCookieService(nextCookies, cryptoService) {
     expireSeconds
   }) {
     const cookieStore = await nextCookies();
-    cookieStore.set(name, value, { ...DEFAULTS, maxAge: expireSeconds });
+    cookieStore.set(name, value, { ...DEFAULT_OPTIONS2, maxAge: expireSeconds });
   }
   async function setSignedCookie({
     name,
@@ -195,6 +200,93 @@ function createCookieService(nextCookies, cryptoService) {
     delete: deleteCokkie
   };
 }
+function createObjectKey({
+  filename,
+  mimeType,
+  folderKey = ""
+}) {
+  const extensionFromFilename = path.extname(filename ?? "").toLowerCase();
+  const extensionFromMime = !extensionFromFilename && mimeType ? `.${mimeToExtension(mimeType)}` : "";
+  const extension = extensionFromFilename || extensionFromMime;
+  const normalizedFolder = folderKey.replace(/^\/+/, "").replace(/\/+$/, "");
+  const id = ulid();
+  const filenameWithId = id + extension;
+  if (!normalizedFolder) return filenameWithId;
+  return path.join(normalizedFolder, filenameWithId);
+}
+
+// src/server/infrastructure/r2/r2.service.ts
+function createR2Service({
+  r2Client,
+  bucketName,
+  logger
+}) {
+  async function upload({
+    blobFile,
+    folderKey = ""
+  }) {
+    const key = createObjectKey({
+      filename: blobFile.name,
+      mimeType: blobFile.type,
+      folderKey
+    });
+    try {
+      const buffer = Buffer.from(await blobFile.arrayBuffer());
+      await r2Client.send(
+        new PutObjectCommand({
+          Bucket: bucketName,
+          Key: key,
+          Body: buffer,
+          ContentType: blobFile.type || void 0
+        })
+      );
+      logger.debug("R2 upload success", { key });
+      return key;
+    } catch (error) {
+      logger.error("upload failed", { key, error });
+      throw error;
+    }
+  }
+  async function remove({ key }) {
+    try {
+      await r2Client.send(
+        new DeleteObjectCommand({
+          Bucket: bucketName,
+          Key: key
+        })
+      );
+      logger.debug("R2 object removed", { key });
+    } catch (error) {
+      logger.error("Remove failed", { key, error });
+      throw error;
+    }
+  }
+  async function move({ fromKey, toKey }) {
+    if (fromKey === toKey) {
+      logger.debug("R2 move skipped (same key)", { key: fromKey });
+      return;
+    }
+    try {
+      await r2Client.send(
+        new CopyObjectCommand({
+          Bucket: bucketName,
+          CopySource: encodeURI(`${bucketName}/${fromKey}`),
+          Key: toKey
+        })
+      );
+      await remove({ key: fromKey });
+      logger.debug("R2 object moved", { fromKey, toKey });
+    } catch (error) {
+      logger.error("Move failed", { fromKey, toKey, error });
+      throw error;
+    }
+  }
+  return {
+    upload,
+    remove,
+    move
+  };
+}
 
 // src/server/infrastructure/cache/cache-key-delimiter.ts
 var CACHE_KEY_DELIMITER = "|";
@@ -1417,4 +1509,4 @@ function createSeoMetadataCommandRepository(prisma) {
   };
 }
 
-export { ADMIN_ORDER_BY, ORDER_BY, POST_ORDER_BY, createAdminCommandRepository, createAdminQueryRepository, createAdminRefreshTokenCommandRepository, createAdminRefreshTokenQueryRepository, createArgon2Service, createCache, createCacheResult, createCookieService, createCryptoService, createFileCommandRepository, createFileQueryRepository, createFolderCommandRepository, createFolderQueryRepository, createIpRateLimiter, createJwtService, createPostCommandRepository, createPostQueryRepository, createSeoMetadataCommandRepository, normalizeCacheKey };
+export { ADMIN_ORDER_BY, ORDER_BY, POST_ORDER_BY, createAdminCommandRepository, createAdminQueryRepository, createAdminRefreshTokenCommandRepository, createAdminRefreshTokenQueryRepository, createArgon2Service, createCache, createCacheResult, createCookieService, createCryptoService, createFileCommandRepository, createFileQueryRepository, createFolderCommandRepository, createFolderQueryRepository, createIpRateLimiter, createJwtService, createPostCommandRepository, createPostQueryRepository, createR2Service, createSeoMetadataCommandRepository, normalizeCacheKey };

package/dist/{base-DbGnfZr6.d.ts → types-Bhnz5Z1F.d.ts}

@@ -85,7 +85,7 @@ declare const FILE_TYPES: {
 };
 type FileType = (typeof FILE_TYPES)[keyof typeof FILE_TYPES];
 
-interface File {
+interface File$1 {
     id: string;
     key: string;
     checksum: string;
@@ -127,10 +127,10 @@ interface Folder {
 type FolderFull = Folder & {
     parentFolder: (Folder & {
         subFolders: Folder[];
-        files: File[];
+        files: File$1[];
     }) | null;
     subFolders: Folder[];
-    files: File[];
+    files: File$1[];
 };
 
 declare const POST_TYPES: {
@@ -242,7 +242,7 @@ type PostListCard = Post & {
     postsInTopic: Post[];
     children: Post[];
     taggedPosts: Post[];
-    coverImage: File | null;
+    coverImage: File$1 | null;
     translations: PostTranslation[];
 };
 
@@ -266,7 +266,7 @@ type PostFull = Post & {
     translations: PostTranslation[];
 };
 
-type FileFull = File & {
+type FileFull = File$1 & {
     folder: Folder | null;
     adminAsAvatarImage: Admin[];
     postsAsCoverImage: Post[];
@@ -280,13 +280,13 @@ type FileFull = File & {
     translations: FileTranslation[];
 };
 
-type FileCard = File & {
+type FileCard = File$1 & {
     translations: FileTranslation[];
 };
 
 type AdminFull = AdminSafe & {
     adminRefreshTokens: AdminRefreshToken[];
-    avatarImage: (File & {
+    avatarImage: (File$1 & {
         translations: FileTranslation[];
     }) | null;
     posts: Post[];
@@ -337,4 +337,11 @@ interface SeoMetadata {
     updatedAt: Date;
 }
 
-export { ADMIN_ROLES as A, type BaseTranslation as B, type DeviceInfo as D, type ExternalLink as E, type FolderFull as F, type MultiItems as M, POST_TYPES as P, type SeoMetadata as S, type TocItem as T, type Admin as a, type AdminCard as b, type AdminFull as c, type AdminRefreshToken as d, type AdminRole as e, type AdminSafe as f, type AdminTranslation as g, type Alternate as h, FILE_TYPES as i, type Faq as j, type File as k, type FileCard as l, type FileFull as m, type FileTranslation as n, type FileType as o, type Folder as p, type Post as q, type PostFull as r, type PostListCard as s, type PostTranslation as t, type PostType as u, type SingleItem as v, type Translation as w };
+interface BlobFile extends File {
+    id: string;
+    width: number | null;
+    height: number | null;
+    duration: number | null;
+}
+
+export { ADMIN_ROLES as A, type BaseTranslation as B, type DeviceInfo as D, type ExternalLink as E, type FolderFull as F, type MultiItems as M, POST_TYPES as P, type SeoMetadata as S, type TocItem as T, type Admin as a, type AdminCard as b, type AdminFull as c, type AdminRefreshToken as d, type AdminRole as e, type AdminSafe as f, type AdminTranslation as g, type Alternate as h, type BlobFile as i, FILE_TYPES as j, type Faq as k, type File$1 as l, type FileCard as m, type FileFull as n, type FileTranslation as o, type FileType as p, type Folder as q, type Post as r, type PostFull as s, type PostListCard as t, type PostTranslation as u, type PostType as v, type SingleItem as w, type Translation as x };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yimingliao/cms",
-  "version": "0.0.17",
+  "version": "0.0.18",
   "author": "Yiming Liao",
   "license": "MIT",
   "type": "module",
@@ -42,5 +42,13 @@
     "prisma": "6.5.0",
     "tsup": "^8.5.1",
     "typescript": "^5.9.3"
+  },
+  "peerDependencies": {
+    "@aws-sdk/client-s3": "^3.0.0"
+  },
+  "peerDependenciesMeta": {
+    "@aws-sdk/client-s3": {
+      "optional": true
+    }
   }
 }