@xhub-short/adapters 0.1.0-beta.16 → 0.1.0-beta.20

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { IDataSource, VideoItem, FeedResponse, IPlaylistDataSource, PlaylistData, PlaylistCollectionResponse, ILogger, LogLevel, LogEntry, IStorage, ISessionStorage, SessionSnapshot, IInteraction, Comment, ICommentAdapter, MockCommentAdapterConfig, CommentListResponse, ReplyListResponse, PostCommentPayload, CommentItem, PostReplyPayload, ReplyItem, EditCommentPayload, DeleteCommentPayload, ReportCommentPayload, IAnalytics, AnalyticsEvent, INetworkAdapter, NetworkType, NetworkQuality, IPosterLoader, IVideoLoader, VideoSource, PreloadConfig, PreloadResult, PreloadStatus, ReportReason, CommentTransformers } from '@xhub-short/contracts';
+import { IDataSource, ContentItem, FeedResponse, VideoItem, IPlaylistDataSource, PlaylistData, PlaylistCollectionResponse, ILogger, LogLevel, LogEntry, IStorage, ISessionStorage, SessionSnapshot, IInteraction, Comment, ICommentAdapter, MockCommentAdapterConfig, CommentListResponse, ReplyListResponse, PostCommentPayload, CommentItem, PostReplyPayload, ReplyItem, EditCommentPayload, DeleteCommentPayload, ReportCommentPayload, IAnalytics, AnalyticsEvent, INetworkAdapter, NetworkType, NetworkQuality, IPosterLoader, IVideoLoader, VideoSource, PreloadConfig, PreloadResult, PreloadStatus, ReportReason, CommentTransformers } from '@xhub-short/contracts';
 
 /**
  * MockDataAdapter - Development/Testing Data Source
@@ -13,16 +13,20 @@ import { IDataSource, VideoItem, FeedResponse, IPlaylistDataSource, PlaylistData
  * ```
  */
 declare class MockDataAdapter implements IDataSource {
-    private readonly videos;
+    private readonly items;
     private readonly pageSize;
     private readonly delay;
     constructor(options?: MockDataAdapterOptions);
     /**
-     * Fetch a page of mock videos
+     * Fetch a page of mock items
      */
-    fetchFeed(cursor?: string): Promise<FeedResponse>;
+    fetchFeed(cursor?: string): Promise<FeedResponse<ContentItem>>;
+    /**
+     * Get a single content item by ID
+     */
+    getContentDetail(id: string): Promise<ContentItem>;
     /**
-     * Get a single video by ID
+     * @deprecated Use getContentDetail instead
      */
     getVideoDetail(id: string): Promise<VideoItem>;
     /**
@@ -38,8 +42,10 @@ declare class MockDataAdapter implements IDataSource {
  * Configuration options for MockDataAdapter
  */
 interface MockDataAdapterOptions {
-    /** Custom mock video data */
-    videos?: VideoItem[];
+    /** Custom mock content data */
+    items?: ContentItem[];
+    /** @deprecated Use items instead */
+    videos?: ContentItem[];
     /** Number of items per page (default: 3) */
     pageSize?: number;
     /** Simulated network delay in ms (default: 300) */
@@ -463,7 +469,7 @@ declare class MockInteractionAdapter implements IInteraction {
      * @param reason - Report reason code
      * @param description - Optional additional description
      */
-    report(videoId: string, reason: string, description?: string): Promise<void>;
+    report(_videoId: string, _reason: string, _description?: string): Promise<void>;
     /**
      * Check if video is liked (for testing)
      *
@@ -1148,9 +1154,13 @@ interface ReportReasonItem {
  */
 interface TransformConfig {
     /**
-     * Transform single video item from API response
+     * Transform single content item from API response
      * If not provided, uses default transform
      */
+    contentItem?: (apiResponse: unknown) => ContentItem;
+    /**
+     * @deprecated Use contentItem instead. Will be removed in v3.0
+     */
     videoItem?: (apiResponse: unknown) => VideoItem;
     /**
      * Transform feed response from API
@@ -1222,6 +1232,11 @@ interface FieldMapConfig {
      * Example: { 'author.name': 'creator.display_name' }
      */
     video?: Record<string, string>;
+    /**
+     * Article field mapping
+     * Example: { 'author.name': 'creator.display_name' }
+     */
+    article?: Record<string, string>;
     /**
      * FeedResponse field mapping
      */
@@ -2187,6 +2202,9 @@ declare function defaultFeedResponseTransform(apiResponse: unknown, fieldMap?: F
  * Create transforms with custom overrides
  */
 interface ResolvedTransforms {
+    /** Map raw API item to ContentItem (Video or Article) */
+    contentItem: (data: unknown) => ContentItem;
+    /** @deprecated Use contentItem instead */
     videoItem: (data: unknown) => VideoItem;
     feedResponse: (data: unknown) => {
         items: unknown[];
@@ -2202,8 +2220,8 @@ declare function createTransforms(config?: TransformConfig, logger?: ILogger): R
  * REST Data Adapter - IDataSource implementation for REST APIs
  *
  * Implements:
- * - fetchFeed: GET /videos with pagination
- * - getVideoDetail: GET /videos/:id
+ * - fetchFeed: GET /items with pagination
+ * - getContentDetail: GET /items/:id
  * - prefetch: Optional prefetch support
  */
 
@@ -2232,11 +2250,15 @@ declare class RESTDataAdapter implements IDataSource {
      */
     fetchFeed(cursor?: string): Promise<FeedResponse>;
     /**
-     * Get video detail by ID
+     * Get content detail by ID
+     */
+    getContentDetail(id: string): Promise<ContentItem>;
+    /**
+     * @deprecated Use getContentDetail instead
      */
     getVideoDetail(id: string): Promise<VideoItem>;
     /**
-     * Optional: Prefetch videos
+     * Optional: Prefetch content
      * This is a no-op by default, can be overridden if API supports batch fetch
      */
     prefetch(ids: string[]): Promise<void>;
@@ -2245,9 +2267,9 @@ declare class RESTDataAdapter implements IDataSource {
      */
     private unwrapResponse;
     /**
-     * Create fallback video item when transform fails
+     * Create fallback content item when transform fails
      */
-    private createFallbackVideoItem;
+    private createFallbackItem;
 }
 
 /**

package/dist/index.js

@@ -549,20 +549,20 @@ var MOCK_VIDEOS = [
 ];
 var MockDataAdapter = class {
   constructor(options = {}) {
-    this.videos = options.videos ?? MOCK_VIDEOS;
+    this.items = options.items ?? options.videos ?? MOCK_VIDEOS;
     this.pageSize = options.pageSize ?? 3;
     this.delay = options.delay ?? 300;
   }
   /**
-   * Fetch a page of mock videos
+   * Fetch a page of mock items
    */
   async fetchFeed(cursor) {
     await this.simulateDelay();
     const offset = cursor ? Number.parseInt(cursor, 10) : 0;
     const start = offset;
     const end = start + this.pageSize;
-    const items = this.videos.slice(start, end);
-    const hasMore = end < this.videos.length;
+    const items = this.items.slice(start, end);
+    const hasMore = end < this.items.length;
     const nextCursor = hasMore ? String(end) : null;
     return {
       items,
@@ -571,15 +571,21 @@ var MockDataAdapter = class {
     };
   }
   /**
-   * Get a single video by ID
+   * Get a single content item by ID
    */
-  async getVideoDetail(id) {
+  async getContentDetail(id) {
     await this.simulateDelay();
-    const video = this.videos.find((v) => v.id === id);
-    if (!video) {
-      throw new Error(`Video not found: ${id}`);
+    const item = this.items.find((v) => v.id === id);
+    if (!item) {
+      throw new Error(`Content not found: ${id}`);
     }
-    return video;
+    return item;
+  }
+  /**
+   * @deprecated Use getContentDetail instead
+   */
+  async getVideoDetail(id) {
+    return this.getContentDetail(id);
   }
   /**
    * Prefetch videos (no-op for mock)
@@ -595,6 +601,7 @@ var MockDataAdapter = class {
     }
   }
 };
+var MOCK_ITEMS = MOCK_VIDEOS;
 
 // src/playlist/MockPlaylistAdapter.ts
 var MOCK_PLAYLISTS = [
@@ -641,10 +648,10 @@ var MockPlaylistAdapter = class {
     const playlist = MOCK_PLAYLISTS.find((p) => p.id === id);
     if (!playlist) throw new Error(`Playlist ${id} not found`);
     let items = [];
-    if (id === "p1") items = MOCK_VIDEOS.slice(0, 4);
-    else if (id === "p2") items = MOCK_VIDEOS.slice(4, 8);
-    else if (id === "p3") items = MOCK_VIDEOS.slice(8, 12);
-    else if (id === "p4") items = MOCK_VIDEOS.slice(12, 16);
+    if (id === "p1") items = MOCK_ITEMS.slice(0, 4);
+    else if (id === "p2") items = MOCK_ITEMS.slice(4, 8);
+    else if (id === "p3") items = MOCK_ITEMS.slice(8, 12);
+    else if (id === "p4") items = MOCK_ITEMS.slice(12, 16);
     return { ...playlist, items };
   }
   async fetchPlaylistCollection(cursor) {
@@ -1211,10 +1218,9 @@ var MockInteractionAdapter = class {
    * @param reason - Report reason code
    * @param description - Optional additional description
    */
-  async report(videoId, reason, description) {
+  async report(_videoId, _reason, _description) {
     await this.simulateDelay();
     this.maybeThrowError();
-    console.log("[MockInteractionAdapter] Report called (mock)", { videoId, reason, description });
   }
   // ═══════════════════════════════════════════════════════════════
   // TESTING HELPERS (not part of IInteraction interface)
@@ -2650,10 +2656,10 @@ var RESTDataAdapter = class {
       const feedData = this.transforms.feedResponse(response);
       const items = feedData.items.map((item) => {
         try {
-          return this.transforms.videoItem(item);
+          return this.transforms.contentItem(item);
         } catch (error) {
-          this.logger?.error("[RESTDataAdapter] Failed to transform video item", error);
-          return this.createFallbackVideoItem(item);
+          this.logger?.error("[RESTDataAdapter] Failed to transform content item", error);
+          return this.createFallbackItem(item);
         }
       });
       return {
@@ -2667,24 +2673,30 @@ var RESTDataAdapter = class {
     }
   }
   /**
-   * Get video detail by ID
+   * Get content detail by ID
    */
-  async getVideoDetail(id) {
+  async getContentDetail(id) {
     try {
       const response = await this.httpClient.request({
         method: "GET",
         path: this.endpoints.detail,
         pathParams: { id }
       });
-      const videoData = this.unwrapResponse(response);
-      return this.transforms.videoItem(videoData);
+      const itemData = this.unwrapResponse(response);
+      return this.transforms.contentItem(itemData);
     } catch (error) {
-      this.logger?.error("[RESTDataAdapter] getVideoDetail failed", error);
+      this.logger?.error("[RESTDataAdapter] getContentDetail failed", error);
       throw error;
     }
   }
   /**
-   * Optional: Prefetch videos
+   * @deprecated Use getContentDetail instead
+   */
+  async getVideoDetail(id) {
+    return this.getContentDetail(id);
+  }
+  /**
+   * Optional: Prefetch content
    * This is a no-op by default, can be overridden if API supports batch fetch
    */
   async prefetch(ids) {
@@ -2705,13 +2717,27 @@ var RESTDataAdapter = class {
     return response;
   }
   /**
-   * Create fallback video item when transform fails
+   * Create fallback content item when transform fails
    */
-  createFallbackVideoItem(data) {
+  createFallbackItem(data) {
     const obj = data ?? {};
+    const id = String(obj.id ?? obj.video_id ?? obj.article_id ?? `fallback-${Date.now()}`);
+    if (obj.type === "article" || obj.images || obj.photos) {
+      return {
+        type: "article",
+        id,
+        images: [],
+        caption: "",
+        author: { id: "unknown", name: "Unknown" },
+        stats: { likes: 0, comments: 0, shares: 0, views: 0 },
+        isLiked: false,
+        isFollowing: false,
+        createdAt: (/* @__PURE__ */ new Date()).toISOString()
+      };
+    }
     return {
       type: "video",
-      id: String(obj.id ?? obj.video_id ?? `fallback-${Date.now()}`),
+      id,
       source: {
         url: String(obj.video_url ?? obj.url ?? ""),
         type: "mp4"
@@ -2725,7 +2751,8 @@ var RESTDataAdapter = class {
         views: 0,
         likes: 0,
         comments: 0,
-        shares: 0
+        shares: 0,
+        bookmarks: 0
       },
       isLiked: false,
       isFollowing: false,
@@ -3535,7 +3562,7 @@ var HttpClient = class {
 };
 
 // src/preset/transforms/playlist.ts
-function defaultPlaylistTransform(apiResponse, videoItemTransform, logger) {
+function defaultPlaylistTransform(apiResponse, contentItemTransform, logger) {
   if (!apiResponse || typeof apiResponse !== "object") {
     logger?.error("[PlaylistTransform] Invalid API response", void 0, {
       apiResponse: String(apiResponse)
@@ -3551,7 +3578,7 @@ function defaultPlaylistTransform(apiResponse, videoItemTransform, logger) {
   }
   const items = rawItems.map((item) => {
     try {
-      return videoItemTransform(item);
+      return contentItemTransform(item);
     } catch (error) {
       logger?.error("[PlaylistTransform] Failed to transform item", error);
       return null;
@@ -3673,9 +3700,11 @@ function defaultAuthorTransform(data) {
   return {
     id: toSafeString(tryFields(author, "id", "user_id", "author_id"), ""),
     name: toSafeString(
-      tryFields(author, "display_name", "name", "username", "nickname"),
+      tryFields(author, "display_name", "name", "username", "nickname", "first_name"),
       "Unknown"
     ),
+    // Combine first/last name if present and name is default
+    // Note: This is a simple fallback, specialized logic should be in a custom transform if needed
     avatar: toSafeString(
       tryFields(author, "avatar", "avatar_url", "profile_picture", "photo"),
       void 0
@@ -3691,7 +3720,8 @@ function defaultStatsTransform(data) {
     views: toNumber(tryFields(stats, "view_count", "views", "play_count"), 0),
     likes: toNumber(tryFields(stats, "like_count", "likes", "digg_count"), 0),
     comments: toNumber(tryFields(stats, "comment_count", "comments"), 0),
-    shares: toNumber(tryFields(stats, "share_count", "shares"), 0)
+    shares: toNumber(tryFields(stats, "share_count", "shares"), 0),
+    bookmarks: toNumber(tryFields(stats, "bookmark_count", "bookmarks", "saves"), 0)
   };
 }
 function defaultVideoItemTransform(apiResponse, fieldMap, logger) {
@@ -3745,6 +3775,110 @@ function defaultVideoItemTransform(apiResponse, fieldMap, logger) {
   };
   return videoItem;
 }
+function defaultArticleItemTransform(apiResponse, fieldMap, logger) {
+  const obj = apiResponse;
+  const getMapped = (sdkField, ...fallbacks) => {
+    if (fieldMap?.[sdkField]) {
+      const mapped = getNestedValue(obj, fieldMap[sdkField]);
+      if (mapped !== void 0) return mapped;
+    }
+    return tryFields(obj, ...fallbacks);
+  };
+  const id = toSafeString(getMapped("id", "id", "article_id", "post_id", "_id"), "");
+  if (!id) {
+    logger?.warn("[Transform article] Missing required field: id", { data: obj });
+  }
+  let images = getMapped("images", "images", "media", "photos", "gallery") ?? [];
+  if (!Array.isArray(images) || images.length === 0) {
+    const singleImage = toSafeString(
+      getMapped("image", "image_url", "url", "thumbnail", "cover"),
+      void 0
+    );
+    images = singleImage ? [singleImage] : [];
+  }
+  return {
+    type: "article",
+    id,
+    images,
+    caption: toSafeString(
+      getMapped("caption", "caption", "description", "text", "content", "title", "subject"),
+      ""
+    ),
+    author: defaultAuthorTransform(obj),
+    stats: defaultStatsTransform(obj),
+    isLiked: toBoolean(getMapped("isLiked", "is_liked", "liked", "user_liked"), false),
+    isFollowing: toBoolean(getMapped("isFollowing", "is_following", "following"), false),
+    createdAt: toSafeString(
+      getMapped("createdAt", "created_at", "create_time", "timestamp"),
+      (/* @__PURE__ */ new Date()).toISOString()
+    ),
+    hashtags: getMapped("hashtags", "hashtags", "tags", "hash_tags") ?? []
+  };
+}
+function extractMediaInfo(obj) {
+  const mediaList = tryFields(obj, "media", "medias") ?? [];
+  let videoMedia;
+  let imageMedias = [];
+  if (Array.isArray(mediaList) && mediaList.length > 0) {
+    videoMedia = mediaList.find((m) => m.type === "video");
+    imageMedias = mediaList.filter((m) => m.type === "image");
+  }
+  return { videoMedia, imageMedias };
+}
+function extractMusicInfo(obj) {
+  const soundObj = tryFields(obj, "sound", "music", "audio");
+  if (soundObj && (soundObj.id || soundObj.url || soundObj.name || soundObj.title)) {
+    return {
+      id: toSafeString(tryFields(soundObj, "id", "uuid"), "unknown"),
+      title: toSafeString(tryFields(soundObj, "title", "name", "song"), "Unknown Sound"),
+      artist: toSafeString(tryFields(soundObj, "artist", "author", "singer"), "Unknown Artist"),
+      cover: toSafeString(tryFields(soundObj, "cover", "poster", "thumbnail", "image"), void 0),
+      audioUrl: toSafeString(tryFields(soundObj, "url", "audio_url", "download_url"), void 0)
+    };
+  }
+  return void 0;
+}
+function defaultContentItemTransform(apiResponse, fieldMap, logger) {
+  const obj = apiResponse;
+  const { videoMedia, imageMedias } = extractMediaInfo(obj);
+  const musicInfo = extractMusicInfo(obj);
+  const typeField = toSafeString(tryFields(obj, "type", "content_type", "item_type")).toLowerCase();
+  let isVideo = false;
+  if (["article", "image", "post", "photo"].includes(typeField)) {
+    isVideo = false;
+  } else if (["video", "reel", "short"].includes(typeField)) {
+    isVideo = true;
+  } else {
+    if (videoMedia || tryFields(obj, "video_url", "playback_url", "source")) {
+      isVideo = true;
+    } else if (imageMedias.length > 0 || tryFields(obj, "images", "photos", "gallery")) {
+      isVideo = false;
+    } else {
+      isVideo = true;
+    }
+  }
+  if (isVideo) {
+    if (videoMedia) {
+      Object.assign(obj, {
+        video_url: videoMedia.url || videoMedia.download_url,
+        poster: videoMedia.poster || videoMedia.thumbnail,
+        duration: videoMedia.duration
+      });
+    }
+    const item2 = defaultVideoItemTransform(apiResponse, fieldMap?.video, logger);
+    if (musicInfo) item2.music = musicInfo;
+    return item2;
+  }
+  if (imageMedias.length > 0) {
+    const imageUrls = imageMedias.map((m) => toSafeString(m.url || m.download_url)).filter(Boolean);
+    if (imageUrls.length > 0) {
+      obj.images = imageUrls;
+    }
+  }
+  const item = defaultArticleItemTransform(apiResponse, fieldMap?.article, logger);
+  if (musicInfo) item.music = musicInfo;
+  return item;
+}
 function defaultFeedResponseTransform(apiResponse, fieldMap, logger) {
   const obj = apiResponse;
   const itemsPath = fieldMap?.items;
@@ -3798,12 +3932,19 @@ function defaultFeedResponseTransform(apiResponse, fieldMap, logger) {
   return { items, nextCursor, hasMore };
 }
 function createTransforms(config, logger) {
+  const contentItem = (data) => {
+    if (config?.contentItem) return config.contentItem(data);
+    if (config?.videoItem) return config.videoItem(data);
+    return defaultContentItemTransform(data, config?.fieldMap, logger);
+  };
   return {
-    videoItem: config?.videoItem ? config.videoItem : (data) => defaultVideoItemTransform(data, config?.fieldMap?.video, logger),
+    contentItem,
+    videoItem: (data) => contentItem(data),
     feedResponse: config?.feedResponse ? config.feedResponse : (data) => defaultFeedResponseTransform(data, config?.fieldMap?.feed, logger),
     playlist: config?.playlist ? config.playlist : (data) => defaultPlaylistTransform(
       data,
-      (item) => config?.videoItem ? config.videoItem(item) : defaultVideoItemTransform(item, config?.fieldMap?.video, logger),
+      (item) => contentItem(item),
+      // Pass the generic contentItem transform
       logger
     ),
     playlistCollection: config?.playlistCollection ? config.playlistCollection : (data) => defaultPlaylistCollectionTransform(data, logger)

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@xhub-short/adapters",
   "sideEffects": false,
-  "version": "0.1.0-beta.16",
+  "version": "0.1.0-beta.20",
   "type": "module",
   "publishConfig": {
     "access": "public"
@@ -20,7 +20,7 @@
     "dist"
   ],
   "dependencies": {
-    "@xhub-short/contracts": "0.1.0-beta.16"
+    "@xhub-short/contracts": "0.1.0-beta.20"
   },
   "optionalDependencies": {
     "hls.js": "^1.5.0"