emusks 2.0.3 → 2.0.5

package/build/graphql.js

@@ -3,21 +3,13 @@ const URL = `https://raw.githubusercontent.com/fa0311/TwitterInternalAPIDocument
 const json = await fetch(URL).then((r) => r.json());
 const graphql = json.graphql;
 
-const buildUrl = (base, features) => {
-  const params = new URLSearchParams();
-
-  if (features && Object.keys(features).length) {
-    params.set(`features`, JSON.stringify(features));
-  }
-
-  const query = params.toString();
-  return query ? `${base}?${query}` : base;
-};
-
 const transformed = Object.fromEntries(
   Object.entries(graphql).map(([name, data]) => {
-    const constructedUrl = buildUrl(data.url, data.features);
-    return [name, [data.method, constructedUrl]];
+    const features = data.features
+      ? Object.fromEntries(Object.keys(data.features).map((k) => [k, true]))
+      : undefined;
+    const queryId = data.url.match(/\/graphql\/([^\/]+)\//)?.[1];
+    return [name, [data.method, data.url, features, queryId]];
   }),
 );
 

package/package.json

@@ -1,10 +1,16 @@
 {
   "name": "emusks",
-  "version": "2.0.3",
+  "version": "2.0.5",
   "description": "Reverse-engineered Twitter API client. Log in and interact with the unofficial X API using any client identity — web, Android, iOS, or TweetDeck",
-  "keywords": ["twitter", "twitter-api", "x", "x-api", "reverse-engineering", "client"],
+  "keywords": [
+    "client",
+    "reverse-engineering",
+    "twitter",
+    "twitter-api",
+    "x",
+    "x-api"
+  ],
   "homepage": "https://github.com/tiagozip/emusks",
-  "main": "src/index.js",
   "bugs": {
     "url": "https://github.com/tiagozip/emusks/issues"
   },
@@ -13,6 +19,11 @@
     "type": "git",
     "url": "https://github.com/tiagozip/emusks.git"
   },
+  "type": "module",
+  "main": "src/index.js",
+  "exports": {
+    ".": "./src/index.js"
+  },
   "dependencies": {
     "cycletls": "^2.0.5",
     "x-client-transaction-id": "^0.1.9"

package/src/graphql.js

@@ -7,18 +7,35 @@ export default async function graphql(queryName, { variables, fieldToggles, body
     throw new Error(`graphql query ${queryName} not found`);
   }
 
-  const [method, baseUrl] = entry;
+  const [method, baseUrl, features, queryId] = entry;
+  const isPost = method.toLowerCase() === "post";
 
   let finalUrl = baseUrl;
+  let requestBody;
 
-  if (variables && Object.keys(variables).length) {
-    const separator = baseUrl.includes("?") ? "&" : "?";
-    finalUrl = `${baseUrl}${separator}variables=${encodeURIComponent(JSON.stringify(variables))}`;
-  }
-
-  if (fieldToggles && Object.keys(fieldToggles).length) {
-    const separator = finalUrl.includes("?") ? "&" : "?";
-    finalUrl = `${finalUrl}${separator}fieldToggles=${encodeURIComponent(JSON.stringify(fieldToggles))}`;
+  if (isPost) {
+    requestBody = {
+      ...body,
+      variables: { ...variables, ...body?.variables },
+      queryId,
+    };
+    if (features) requestBody.features = features;
+    if (fieldToggles && Object.keys(fieldToggles).length) {
+      requestBody.fieldToggles = fieldToggles;
+    }
+  } else {
+    if (variables && Object.keys(variables).length) {
+      const separator = finalUrl.includes("?") ? "&" : "?";
+      finalUrl = `${finalUrl}${separator}variables=${encodeURIComponent(JSON.stringify(variables))}`;
+    }
+    if (features) {
+      const separator = finalUrl.includes("?") ? "&" : "?";
+      finalUrl = `${finalUrl}${separator}features=${encodeURIComponent(JSON.stringify(features))}`;
+    }
+    if (fieldToggles && Object.keys(fieldToggles).length) {
+      const separator = finalUrl.includes("?") ? "&" : "?";
+      finalUrl = `${finalUrl}${separator}fieldToggles=${encodeURIComponent(JSON.stringify(fieldToggles))}`;
+    }
   }
 
   const url = new URL(finalUrl);
@@ -51,8 +68,7 @@ export default async function graphql(queryName, { variables, fieldToggles, body
   };
 
   const cycleTLS = await getCycleTLS();
-
-  return await (
+  const res = await (
     await cycleTLS(
       finalUrl,
       {
@@ -60,11 +76,17 @@ export default async function graphql(queryName, { variables, fieldToggles, body
         userAgent: this.auth.client.fingerprints.userAgent,
         ja3: this.auth.client.fingerprints.ja3,
         ja4r: this.auth.client.fingerprints.ja4r,
-        body: typeof body === "object" ? JSON.stringify(body) : undefined,
+        body: isPost ? JSON.stringify(requestBody) : undefined,
         proxy: this.proxy || undefined,
         referrer: "https://x.com/",
       },
       method,
     )
   ).json();
+  
+  if (res?.errors?.[0]) {
+    throw new Error(res.errors.map((err) => err.message).join(", "));
+  }
+
+  return res;
 }