@yimingliao/cms 0.0.20 → 0.0.22

package/dist/client/index.d.ts

@@ -0,0 +1,30 @@
+import { R as Result } from '../types-DHlRoJwv.js';
+import { Logger } from 'logry';
+
+interface FetchContext {
+    input: string;
+    init: RequestInit;
+    meta: {
+        baseUrl?: string;
+        url?: string;
+        startTime?: number;
+    };
+}
+type RequestInterceptor = (ctx: FetchContext) => Promise<FetchContext> | FetchContext;
+type ResponseInterceptor = <T>(response: Response, ctx: FetchContext) => Promise<Result<T>>;
+
+declare function createSmartFetch({ requestInterceptor, responseInterceptor, logger, }: {
+    requestInterceptor: RequestInterceptor;
+    responseInterceptor: ResponseInterceptor;
+    logger: Logger;
+}): <T>(input: string, init?: RequestInit) => Promise<Result<T>>;
+
+declare function createRequestInterceptor({ baseUrl }: {
+    baseUrl: string;
+}): RequestInterceptor;
+
+declare function createResponseInterceptor({ logger }: {
+    logger: Logger;
+}): ResponseInterceptor;
+
+export { createRequestInterceptor, createResponseInterceptor, createSmartFetch };

package/dist/client/index.js

@@ -0,0 +1,68 @@
+// src/client/infrastructure/smart-fetch/smart-fetch.ts
+function createSmartFetch({
+  requestInterceptor,
+  responseInterceptor,
+  logger
+}) {
+  const smartFetch = async (input, init = {}) => {
+    try {
+      let ctx = {
+        input,
+        init,
+        meta: {}
+      };
+      ctx = await requestInterceptor(ctx);
+      const response = await fetch(ctx.input, ctx.init);
+      return await responseInterceptor(response, ctx);
+    } catch (error) {
+      logger.error("smartFetch error", { error });
+      throw error instanceof Error ? error : new Error("Network Error");
+    }
+  };
+  return smartFetch;
+}
+
+// src/client/infrastructure/smart-fetch/request-interceptor.ts
+function createRequestInterceptor({ baseUrl }) {
+  const requestInterceptor = (ctx) => {
+    const normalizedBase = baseUrl.replace(/\/+$/, "");
+    const normalizedPath = ctx.input.replace(/^\/+/, "");
+    const isAbsolute = /^[a-zA-Z]+:\/\//.test(ctx.input);
+    const input = isAbsolute ? ctx.input : `${normalizedBase}/${normalizedPath}`;
+    return {
+      ...ctx,
+      input,
+      meta: {
+        ...ctx.meta,
+        baseUrl,
+        url: ctx.input,
+        startTime: Date.now()
+      }
+    };
+  };
+  return requestInterceptor;
+}
+
+// src/client/infrastructure/smart-fetch/response-interceptor.ts
+function createResponseInterceptor({ logger }) {
+  const responseInterceptor = async (response, ctx) => {
+    const duration = Date.now() - (ctx.meta.startTime ?? 0);
+    if (!response.ok) {
+      logger.warn("HTTP error", {
+        url: ctx.meta.url,
+        status: response.status,
+        duration
+      });
+      throw new Error(`HTTP Error ${response.status}`);
+    }
+    const data = await response.json();
+    logger.debug("Fetch success", {
+      url: ctx.meta.url,
+      duration
+    });
+    return data;
+  };
+  return responseInterceptor;
+}
+
+export { createRequestInterceptor, createResponseInterceptor, createSmartFetch };

package/dist/index.d.ts

@@ -1,6 +1,8 @@
 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';
 export { B as BlobFile } from './types-0oS1A2K5.js';
+import { E as ErrorDetail, S as SuccessResult, a as ErrorResult } from './types-DHlRoJwv.js';
+export { R as Result } from './types-DHlRoJwv.js';
 
 declare const ROOT_FOLDER_ID = "01ARZ3NDEKTSV4RRFFQ69G5FAV";
 declare const ROOT_FOLDER_NAME = "ROOT";
@@ -21,25 +23,6 @@ declare const getMediaInfo: (file: Blob) => Promise<MediaInfo>;
 
 declare const formatFileSize: (size: number, decimals?: number) => string;
 
-interface SuccessResult<D = unknown> {
-    success: true;
-    message?: string;
-    data?: D;
-    meta?: Record<string, unknown>;
-}
-interface ErrorResult {
-    success: false;
-    message?: string;
-    errors?: ErrorDetail[];
-    code?: string;
-}
-interface ErrorDetail {
-    field?: string;
-    message?: string;
-    code?: string;
-}
-type Result<D = unknown> = SuccessResult<D> | ErrorResult;
-
 interface SuccessResultParams<D = unknown> {
     message?: string;
     data?: D;
@@ -61,4 +44,4 @@ declare const result: {
     error: typeof error;
 };
 
-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 };
+export { ErrorDetail, ErrorResult, type ErrorResultParams, FolderFull, ROOT_FOLDER, ROOT_FOLDER_ID, ROOT_FOLDER_NAME, SIMPLE_UPLOAD_FOLDER_KEY, SIMPLE_UPLOAD_FOLDER_NAME, SuccessResult, type SuccessResultParams, classifyFileType, formatFileSize, getMediaInfo, mimeToExtension, result };

package/dist/server/index.d.ts

@@ -4,6 +4,8 @@ import { cookies } from 'next/headers';
 import Keyv from 'keyv';
 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 { BaseTranslator, LocaleMessages } from 'intor';
+import { S as SuccessResult, R as Result, E as ErrorDetail } from '../types-DHlRoJwv.js';
 
 interface CreateJwtServiceOptions {
     defaultSecret: string;
@@ -596,4 +598,37 @@ 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 };
+type Action<D> = (translator: BaseTranslator<LocaleMessages>) => Promise<Omit<SuccessResult<D>, "success"> & {
+    i18nKey?: string;
+}>;
+interface CreateServerActionOptions {
+    initI18n: () => Promise<BaseTranslator<LocaleMessages>>;
+    cacheResult: <T>({ key, ttl, load }: CacheResultOptions<T>) => Promise<T>;
+    cache: Keyv<unknown>;
+    logger: Logger;
+}
+interface ServerActionOptions {
+    type?: "command" | "query";
+    key?: RawCacheKey;
+    ttl?: number;
+}
+declare function createExecuteAction({ initI18n, cacheResult, cache, logger, }: CreateServerActionOptions): Promise<(<D = void>(fn: Action<D>, options?: ServerActionOptions) => Promise<Result<D>>)>;
+
+declare const normalizeError: (error: unknown, translator: BaseTranslator<LocaleMessages>) => {
+    message: string;
+    errors?: ErrorDetail[];
+    statusCode: number;
+    isInternal?: boolean;
+};
+
+declare class ServerError extends Error {
+    readonly i18nKey?: string;
+    readonly statusCode?: number;
+    constructor({ message, i18nKey, statusCode, }: {
+        message?: string;
+        i18nKey?: string;
+        statusCode?: number;
+    });
+}
+
+export { ADMIN_ORDER_BY, ORDER_BY, POST_ORDER_BY, type RawCacheKey, ServerError, createAdminCommandRepository, createAdminQueryRepository, createAdminRefreshTokenCommandRepository, createAdminRefreshTokenQueryRepository, createArgon2Service, createCache, createCacheResult, createCookieService, createCryptoService, createExecuteAction, createFileCommandRepository, createFileQueryRepository, createFolderCommandRepository, createFolderQueryRepository, createIpRateLimiter, createJwtService, createPostCommandRepository, createPostQueryRepository, createSeoMetadataCommandRepository, normalizeCacheKey, normalizeError };

package/dist/server/index.js

@@ -1,5 +1,5 @@
 import { ADMIN_ROLES, ROOT_FOLDER_ID } from '../chunk-ZCOYQ5BG.js';
-import { mimeToExtension, classifyFileType } from '../chunk-YX7IPIGU.js';
+import { result, mimeToExtension, classifyFileType } from '../chunk-YX7IPIGU.js';
 import jwt from 'jsonwebtoken';
 import argon2 from 'argon2';
 import crypto, { timingSafeEqual } from 'crypto';
@@ -7,6 +7,7 @@ import { headers } from 'next/headers';
 import KeyvRedis from '@keyv/redis';
 import Keyv from 'keyv';
 import { ulid } from 'ulid';
+import { ZodError } from 'zod';
 
 function createJwtService({
   defaultSecret,
@@ -1421,4 +1422,84 @@ 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 };
+// src/server/server-error.ts
+var ServerError = class extends Error {
+  i18nKey;
+  statusCode;
+  constructor({
+    message,
+    i18nKey,
+    statusCode
+  }) {
+    super(message);
+    this.name = this.constructor.name;
+    if (i18nKey) this.i18nKey = i18nKey;
+    if (statusCode) this.statusCode = statusCode;
+  }
+};
+
+// src/server/interfaces/execute-action/normalize-error.ts
+var normalizeError = (error, translator) => {
+  if (error instanceof ZodError) {
+    const errors = error.issues.map((issue) => {
+      let message = issue.message;
+      if (issue.code === "custom" && issue.params?.["i18nKey"]) {
+        message = translator.t(issue.params["i18nKey"]);
+      }
+      return {
+        field: issue.path.join("."),
+        // e.path: string[]  e.g. ["name", "email"]
+        message,
+        code: issue.code
+      };
+    });
+    return { message: "Validation faild", errors, statusCode: 422 };
+  }
+  if (error instanceof ServerError) {
+    const message = translator.t(
+      error.i18nKey ?? "error.internal-server-error"
+    );
+    return { message, statusCode: error.statusCode ?? 500 };
+  }
+  return {
+    message: error instanceof Error ? error.message : JSON.stringify(error),
+    statusCode: 500,
+    isInternal: true
+  };
+};
+
+// src/server/interfaces/execute-action/create-execute-action.ts
+async function createExecuteAction({
+  initI18n,
+  cacheResult,
+  cache,
+  logger
+}) {
+  return async function executeAction(fn, options = {}) {
+    const translator = await initI18n();
+    const withCache = options.key && options.type === "query";
+    try {
+      const { data, i18nKey, message, meta } = withCache ? await cacheResult({
+        key: options.key,
+        ...options.ttl ? { ttl: options.ttl } : {},
+        load: async () => fn(translator)
+      }) : await fn(translator);
+      if (options.type === "command") cache.clear();
+      const finalMessage = i18nKey ? translator.t(i18nKey) : message;
+      return result.success({
+        ...finalMessage ? { message: finalMessage } : {},
+        ...data ? { data: data ?? {} } : {},
+        ...meta ? { meta } : {}
+      });
+    } catch (error) {
+      const { message, errors, isInternal } = normalizeError(error, translator);
+      logger.error({ message, errors });
+      return result.error({
+        message: isInternal ? "Internal server error" : message,
+        ...errors !== void 0 ? { errors } : {}
+      });
+    }
+  };
+}
+
+export { ADMIN_ORDER_BY, ORDER_BY, POST_ORDER_BY, ServerError, createAdminCommandRepository, createAdminQueryRepository, createAdminRefreshTokenCommandRepository, createAdminRefreshTokenQueryRepository, createArgon2Service, createCache, createCacheResult, createCookieService, createCryptoService, createExecuteAction, createFileCommandRepository, createFileQueryRepository, createFolderCommandRepository, createFolderQueryRepository, createIpRateLimiter, createJwtService, createPostCommandRepository, createPostQueryRepository, createSeoMetadataCommandRepository, normalizeCacheKey, normalizeError };

package/dist/types-DHlRoJwv.d.ts

@@ -0,0 +1,20 @@
+interface SuccessResult<D = unknown> {
+    success: true;
+    message?: string;
+    data?: D;
+    meta?: Record<string, unknown>;
+}
+interface ErrorResult {
+    success: false;
+    message?: string;
+    errors?: ErrorDetail[];
+    code?: string;
+}
+interface ErrorDetail {
+    field?: string;
+    message?: string;
+    code?: string;
+}
+type Result<D = unknown> = SuccessResult<D> | ErrorResult;
+
+export type { ErrorDetail as E, Result as R, SuccessResult as S, ErrorResult as a };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yimingliao/cms",
-  "version": "0.0.20",
+  "version": "0.0.22",
   "author": "Yiming Liao",
   "license": "MIT",
   "type": "module",
@@ -10,6 +10,11 @@
       "import": "./dist/index.js",
       "require": "./dist/index.js"
     },
+    "./client": {
+      "types": "./dist/client/index.d.ts",
+      "import": "./dist/client/index.js",
+      "require": "./dist/client/index.js"
+    },
     "./server": {
       "types": "./dist/server/index.d.ts",
       "import": "./dist/server/index.js",
@@ -51,10 +56,12 @@
     "@types/mime-types": "^3.0.1",
     "@types/ssh2-sftp-client": "^9.0.6",
     "generic-pool": "^3.9.0",
+    "intor": "^2.5.0",
     "next": "^16.1.6",
     "prisma": "6.5.0",
     "tsup": "^8.5.1",
-    "typescript": "^5.9.3"
+    "typescript": "^5.9.3",
+    "zod": "^4.3.6"
   },
   "peerDependencies": {
     "@aws-sdk/client-s3": "^3.0.0",