@finch_ren/x-scraper 0.1.3 → 0.1.5

package/dist/src/utils/api.d.ts

@@ -11,15 +11,15 @@ export declare const getKwargs: (flag: {
 export declare const errorCheck: <T>(data: T | undefined, error: i.ErrorResponse[] | undefined) => T;
 export declare const instructionToEntry: (item: i.InstructionUnion[]) => i.TimelineAddEntry[];
 export declare const instructionConverter: (item: i.InstructionUnion[]) => TweetApiUtilsData[];
-export declare const tweetEntriesConverter: (item: i.TimelineAddEntry[]) => TweetApiUtilsData[];
-export declare const moduleConverter: (item: i.ModuleItem[]) => TweetApiUtilsData[];
+export declare const tweetEntriesConverter: (item: i.TimelineAddEntry[] | any) => TweetApiUtilsData[];
+export declare const moduleConverter: (item: i.ModuleItem[] | any) => TweetApiUtilsData[];
 type buildTweetApiUtilsArgs = {
-    result: i.ItemResult;
+    result: i.ItemResult | any;
     promotedMetadata?: any;
-    reply?: i.TimelineTweet[];
+    reply?: Array<i.TimelineTweet | any>;
 };
 export declare const buildTweetApiUtils: (args: buildTweetApiUtilsArgs) => TweetApiUtilsData | undefined;
-export declare const tweetResultsConverter: (tweetResults: i.ItemResult) => i.Tweet | undefined;
+export declare const tweetResultsConverter: (tweetResults: i.ItemResult | any) => i.Tweet | undefined;
 export declare const userOrNullConverter: (userResults: i.UserUnion) => i.User | undefined;
 export declare const userEntriesConverter: (item: i.TimelineAddEntry[]) => i.UserResults[];
 export declare const userResultConverter: (user: i.UserResults[]) => UserApiUtilsData[];

package/dist/src/utils/api.js

@@ -90,8 +90,44 @@ const instructionConverter = (item) => {
         .flat();
 };
 exports.instructionConverter = instructionConverter;
+const isTimelineAddEntry = (value) => {
+    return value != undefined && typeof value == 'object' && 'content' in value && 'entryId' in value;
+};
+const isInstructionLike = (value) => {
+    return value != undefined && typeof value == 'object' && typeof value.type == 'string';
+};
+const normalizeTimelineEntries = (value) => {
+    if (value == undefined)
+        return [];
+    if (Array.isArray(value)) {
+        if (value.length == 0)
+            return [];
+        if (value.every(isTimelineAddEntry)) {
+            return value;
+        }
+        if (value.every(isInstructionLike)) {
+            return (0, exports.instructionToEntry)(value);
+        }
+        return [];
+    }
+    if (typeof value != 'object')
+        return [];
+    if (Array.isArray(value.instructions)) {
+        return (0, exports.instructionToEntry)(value.instructions);
+    }
+    if (Array.isArray(value.entries)) {
+        return value.entries;
+    }
+    if (value.entry != undefined) {
+        return [value.entry];
+    }
+    if (isTimelineAddEntry(value)) {
+        return [value];
+    }
+    return [];
+};
 const tweetEntriesConverter = (item) => {
-    return item
+    return normalizeTimelineEntries(item)
         .map((e) => {
         if (e.content.entryType == i.ContentEntryType.TimelineTimelineItem) {
             const item = e.content.itemContent;
@@ -100,8 +136,8 @@ const tweetEntriesConverter = (item) => {
                 return undefined;
             return [
                 (0, exports.buildTweetApiUtils)({
-                    result: timeline.tweetResults,
-                    promotedMetadata: timeline.promotedMetadata,
+                    result: getTimelineTweetResult(timeline),
+                    promotedMetadata: getTimelinePromotedMetadata(timeline),
                 }),
             ];
         }
@@ -117,16 +153,16 @@ const tweetEntriesConverter = (item) => {
 };
 exports.tweetEntriesConverter = tweetEntriesConverter;
 const moduleConverter = (item) => {
-    const timelineList = item
-        .filter((e) => e.item.itemContent.itemType == i.ContentItemType.TimelineTweet)
+    const timelineList = (item ?? [])
+        .filter((e) => e?.item?.itemContent?.itemType == i.ContentItemType.TimelineTweet)
         .map((e) => e.item.itemContent);
     if (timelineList.length == 0)
         return [];
     if (timelineList[0].tweetDisplayType == i.TimelineTweetTweetDisplayTypeEnum.MediaGrid) {
         return timelineList
             .map((e) => (0, exports.buildTweetApiUtils)({
-            result: e.tweetResults,
-            promotedMetadata: e.promotedMetadata,
+            result: getTimelineTweetResult(e),
+            promotedMetadata: getTimelinePromotedMetadata(e),
         }))
             .filter((e) => e != undefined);
     }
@@ -134,26 +170,43 @@ const moduleConverter = (item) => {
         const timeline = timelineList[0];
         return [
             (0, exports.buildTweetApiUtils)({
-                result: timeline.tweetResults,
-                promotedMetadata: timeline.promotedMetadata,
+                result: getTimelineTweetResult(timeline),
+                promotedMetadata: getTimelinePromotedMetadata(timeline),
                 reply: timelineList.slice(1),
             }),
         ].filter((e) => e != undefined);
     }
 };
 exports.moduleConverter = moduleConverter;
+const getTimelineTweetResult = (timeline) => {
+    return timeline?.tweetResults ?? timeline?.tweet_results;
+};
+const getTimelinePromotedMetadata = (timeline) => {
+    return timeline?.promotedMetadata ?? timeline?.promoted_metadata;
+};
+const getTweetUserResult = (tweet) => {
+    return tweet?.core?.userResults?.result ?? tweet?.core?.user_results?.result;
+};
+const getQuotedStatusResult = (tweet) => {
+    return tweet?.quotedStatusResult ?? tweet?.quoted_status_result;
+};
+const getRetweetedStatusResult = (tweet) => {
+    return tweet?.legacy?.retweetedStatusResult ?? tweet?.legacy?.retweeted_status_result;
+};
 const buildTweetApiUtils = (args) => {
+    if (args.result == undefined)
+        return undefined;
     const tweet = (0, exports.tweetResultsConverter)(args.result);
     if (tweet == undefined)
         return undefined;
-    const result = tweet.core?.userResults.result;
+    const result = getTweetUserResult(tweet);
     const user = result && (0, exports.userOrNullConverter)(result);
     if (user == undefined)
         return undefined;
-    const quoted = tweet.quotedStatusResult;
-    const retweeted = tweet.legacy?.retweetedStatusResult;
+    const quoted = getQuotedStatusResult(tweet);
+    const retweeted = getRetweetedStatusResult(tweet);
     const reply = args.reply
-        ?.map((e) => (0, exports.buildTweetApiUtils)({ result: e.tweetResults, promotedMetadata: e.promotedMetadata }))
+        ?.map((e) => (0, exports.buildTweetApiUtils)({ result: getTimelineTweetResult(e), promotedMetadata: getTimelinePromotedMetadata(e) }))
         .filter((e) => e != undefined) ?? [];
     return {
         raw: args.result,
@@ -167,6 +220,8 @@ const buildTweetApiUtils = (args) => {
 };
 exports.buildTweetApiUtils = buildTweetApiUtils;
 const tweetResultsConverter = (tweetResults) => {
+    if (tweetResults == undefined)
+        return undefined;
     if (tweetResults.result == undefined)
         return undefined;
     switch (tweetResults.result.typename) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@finch_ren/x-scraper",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "description": "A TypeScript SDK for X (Twitter) internal GraphQL endpoints with cookie-based authentication.",
   "keywords": [
     "twitter",