emusks 2.0.4 → 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,6 +1,6 @@
 {
   "name": "emusks",
-  "version": "2.0.4",
+  "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": [
     "client",

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;
 }

package/src/helpers/account.js

@@ -1,271 +1,269 @@
 import parseUser from "../parsers/user.js";
 
-export default (client) => ({
-  async settings() {
-    const res = await client.v1_1("get:account/settings", {});
-    return await res.json();
-  },
-
-  async updateSettings(params = {}) {
-    const res = await client.v1_1("post:account/settings", {
-      body: JSON.stringify(params),
-    });
-    return await res.json();
-  },
-
-  async verifyPassword(password) {
-    const res = await client.v1_1("account/verify_password", {
-      body: `password=${encodeURIComponent(password)}`,
-      headers: { "content-type": "application/x-www-form-urlencoded" },
-    });
-    return await res.json();
-  },
-
-  async changePassword(currentPassword, newPassword) {
-    const res = await client.v1_1("account/change_password", {
-      body: JSON.stringify({
-        current_password: currentPassword,
-        password: newPassword,
-        password_confirmation: newPassword,
-      }),
-    });
-    return await res.json();
-  },
-
-  async deactivate() {
-    const res = await client.v1_1("account/deactivate", {});
-    return await res.json();
-  },
-
-  async logout() {
-    const res = await client.v1_1("account/logout", {});
-    return await res.json();
-  },
-
-  async rateLimitStatus(params = {}) {
-    const res = await client.v1_1("application/rate_limit_status", { params });
-    return await res.json();
-  },
-
-  async viewer() {
-    const res = await client.graphql("Viewer", {
-      variables: { withCommunitiesMemberships: true },
-      fieldToggles: { withAuxiliaryUserLabels: false },
-    });
-    const user = res?.data?.viewer?.user_results?.result;
-    return user ? parseUser(user) : res;
-  },
-
-  async sessions() {
-    return await client.graphql("UserSessionsList", {
-      variables: {},
-    });
-  },
-
-  async preferences() {
-    return await client.graphql("UserPreferences", {
-      variables: {},
-    });
-  },
-
-  async claims() {
-    return await client.graphql("GetUserClaims", {
-      variables: {},
-    });
-  },
-
-  async phoneState() {
-    return await client.graphql("ProfileUserPhoneState", {
-      variables: {},
-    });
-  },
-
-  async passwordStrength(password) {
-    const res = await client.v1_1("account/password_strength", {
-      body: JSON.stringify({ password }),
-    });
-    return await res.json();
-  },
-
-  async resendConfirmationEmail() {
-    const res = await client.v1_1("account/resend_confirmation_email", {});
-    return await res.json();
-  },
-
-  async emailPhoneInfo(params = {}) {
-    const res = await client.v1_1("users/email_phone_info", { params });
-    return await res.json();
-  },
-
-  async emailAvailable(email) {
-    const res = await client.v1_1("users/email_available", {
-      params: { email },
-    });
-    return await res.json();
-  },
-
-  async phoneAvailable(phone) {
-    const res = await client.v1_1("users/phone_number_available", {
-      params: { phone_number: phone },
-    });
-    return await res.json();
-  },
-
-  async usernameAvailable(username) {
-    return await client.graphql("GetUsernameAvailabilityAndSuggestions", {
-      body: { variables: { username } },
-    });
-  },
-
-  async backupCode() {
-    const res = await client.v1_1("get:account/backup_code", {});
-    return await res.json();
-  },
-
-  async generateBackupCode() {
-    const res = await client.v1_1("post:account/backup_code", {});
-    return await res.json();
-  },
-
-  async disable2FA() {
-    const res = await client.v1_1("account/login_verification_enrollment", {});
-    return await res.json();
-  },
-
-  async remove2FAMethod(methodId) {
-    const res = await client.v1_1("account/login_verification/remove_method", {
-      body: JSON.stringify({ method_id: methodId }),
-    });
-    return await res.json();
-  },
-
-  async tempPassword() {
-    const res = await client.v1_1("account/login_verification/temporary_password", {});
-    return await res.json();
-  },
-
-  async renameSecurityKey(methodId, name) {
-    const res = await client.v1_1("account/login_verification/rename_security_key_method", {
-      body: JSON.stringify({ method_id: methodId, name }),
-    });
-    return await res.json();
-  },
-
-  async connectedApps() {
-    const res = await client.v1_1("oauth/list", {});
-    return await res.json();
-  },
-
-  async revokeApp(token) {
-    const res = await client.v1_1("oauth/revoke", {
-      body: JSON.stringify({ token }),
-    });
-    return await res.json();
-  },
-
-  async deleteSSOConnection(connectionId) {
-    const res = await client.v1_1("sso/delete_connection", {
-      body: JSON.stringify({ connection_id: connectionId }),
-    });
-    return await res.json();
-  },
-
-  async personalizationInterests() {
-    const res = await client.v1_1("account/personalization/twitter_interests", {});
-    return await res.json();
-  },
-
-  async emailYourData() {
-    const res = await client.v1_1("account/personalization/email_your_data", {});
-    return await res.json();
-  },
-
-  async multiList() {
-    const res = await client.v1_1("account/multi/list", {});
-    return await res.json();
-  },
-
-  async enableVerifiedPhoneLabel() {
-    return await client.graphql("EnableVerifiedPhoneLabel", {
-      body: { variables: {} },
-    });
-  },
-
-  async disableVerifiedPhoneLabel() {
-    return await client.graphql("DisableVerifiedPhoneLabel", {
-      body: { variables: {} },
-    });
-  },
-
-  async dataSaverMode() {
-    return await client.graphql("DataSaverMode", {
-      variables: {},
-    });
-  },
-
-  async setDataSaver(dataSaverMode) {
-    return await client.graphql("WriteDataSaverPreferences", {
-      body: { variables: { dataSaverMode } },
-    });
-  },
-
-  async mutedKeywords() {
-    const res = await client.v1_1("mutes/keywords/list", {});
-    return await res.json();
-  },
-
-  async deleteMutedKeyword(keywordId) {
-    const res = await client.v1_1("mutes/keywords/destroy", {
-      body: JSON.stringify({ ids: keywordId }),
-    });
-    return await res.json();
-  },
-
-  async updateMutedKeyword(params = {}) {
-    const res = await client.v1_1("mutes/keywords/update", {
-      body: JSON.stringify(params),
-    });
-    return await res.json();
-  },
-
-  async advancedFilters() {
-    const res = await client.v1_1("get:mutes/advanced_filters", {});
-    return await res.json();
-  },
-
-  async updateAdvancedFilters(params = {}) {
-    const res = await client.v1_1("post:mutes/advanced_filters", {
-      body: JSON.stringify(params),
-    });
-    return await res.json();
-  },
-
-  async helpSettings() {
-    const res = await client.v1_1("help/settings", {});
-    return await res.json();
-  },
-
-  async emailNotificationSettings(params = {}) {
-    return await client.graphql("WriteEmailNotificationSettings", {
-      body: { variables: { ...params } },
-    });
-  },
-
-  async viewerEmailSettings() {
-    return await client.graphql("ViewerEmailSettings", {
-      variables: {},
-    });
-  },
-
-  async accountLabel() {
-    return await client.graphql("UserAccountLabel", {
-      variables: {},
-    });
-  },
-
-  async disableAccountLabel() {
-    return await client.graphql("DisableUserAccountLabel", {
-      body: { variables: {} },
-    });
-  },
-});
+export async function settings() {
+  const res = await this.v1_1("get:account/settings", {});
+  return await res.json();
+}
+
+export async function updateSettings(params = {}) {
+  const res = await this.v1_1("post:account/settings", {
+    body: JSON.stringify(params),
+  });
+  return await res.json();
+}
+
+export async function verifyPassword(password) {
+  const res = await this.v1_1("account/verify_password", {
+    body: `password=${encodeURIComponent(password)}`,
+    headers: { "content-type": "application/x-www-form-urlencoded" },
+  });
+  return await res.json();
+}
+
+export async function changePassword(currentPassword, newPassword) {
+  const res = await this.v1_1("account/change_password", {
+    body: JSON.stringify({
+      current_password: currentPassword,
+      password: newPassword,
+      password_confirmation: newPassword,
+    }),
+  });
+  return await res.json();
+}
+
+export async function deactivate() {
+  const res = await this.v1_1("account/deactivate", {});
+  return await res.json();
+}
+
+export async function logout() {
+  const res = await this.v1_1("account/logout", {});
+  return await res.json();
+}
+
+export async function rateLimitStatus(params = {}) {
+  const res = await this.v1_1("application/rate_limit_status", { params });
+  return await res.json();
+}
+
+export async function viewer() {
+  const res = await this.graphql("Viewer", {
+    variables: { withCommunitiesMemberships: true },
+    fieldToggles: { withAuxiliaryUserLabels: false },
+  });
+  const user = res?.data?.viewer?.user_results?.result;
+  return user ? parseUser(user) : res;
+}
+
+export async function sessions() {
+  return await this.graphql("UserSessionsList", {
+    variables: {},
+  });
+}
+
+export async function preferences() {
+  return await this.graphql("UserPreferences", {
+    variables: {},
+  });
+}
+
+export async function claims() {
+  return await this.graphql("GetUserClaims", {
+    variables: {},
+  });
+}
+
+export async function phoneState() {
+  return await this.graphql("ProfileUserPhoneState", {
+    variables: {},
+  });
+}
+
+export async function passwordStrength(password) {
+  const res = await this.v1_1("account/password_strength", {
+    body: JSON.stringify({ password }),
+  });
+  return await res.json();
+}
+
+export async function resendConfirmationEmail() {
+  const res = await this.v1_1("account/resend_confirmation_email", {});
+  return await res.json();
+}
+
+export async function emailPhoneInfo(params = {}) {
+  const res = await this.v1_1("users/email_phone_info", { params });
+  return await res.json();
+}
+
+export async function emailAvailable(email) {
+  const res = await this.v1_1("users/email_available", {
+    params: { email },
+  });
+  return await res.json();
+}
+
+export async function phoneAvailable(phone) {
+  const res = await this.v1_1("users/phone_number_available", {
+    params: { phone_number: phone },
+  });
+  return await res.json();
+}
+
+export async function usernameAvailable(username) {
+  return await this.graphql("GetUsernameAvailabilityAndSuggestions", {
+    body: { variables: { username } },
+  });
+}
+
+export async function backupCode() {
+  const res = await this.v1_1("get:account/backup_code", {});
+  return await res.json();
+}
+
+export async function generateBackupCode() {
+  const res = await this.v1_1("post:account/backup_code", {});
+  return await res.json();
+}
+
+export async function disable2FA() {
+  const res = await this.v1_1("account/login_verification_enrollment", {});
+  return await res.json();
+}
+
+export async function remove2FAMethod(methodId) {
+  const res = await this.v1_1("account/login_verification/remove_method", {
+    body: JSON.stringify({ method_id: methodId }),
+  });
+  return await res.json();
+}
+
+export async function tempPassword() {
+  const res = await this.v1_1("account/login_verification/temporary_password", {});
+  return await res.json();
+}
+
+export async function renameSecurityKey(methodId, name) {
+  const res = await this.v1_1("account/login_verification/rename_security_key_method", {
+    body: JSON.stringify({ method_id: methodId, name }),
+  });
+  return await res.json();
+}
+
+export async function connectedApps() {
+  const res = await this.v1_1("oauth/list", {});
+  return await res.json();
+}
+
+export async function revokeApp(token) {
+  const res = await this.v1_1("oauth/revoke", {
+    body: JSON.stringify({ token }),
+  });
+  return await res.json();
+}
+
+export async function deleteSSOConnection(connectionId) {
+  const res = await this.v1_1("sso/delete_connection", {
+    body: JSON.stringify({ connection_id: connectionId }),
+  });
+  return await res.json();
+}
+
+export async function personalizationInterests() {
+  const res = await this.v1_1("account/personalization/twitter_interests", {});
+  return await res.json();
+}
+
+export async function emailYourData() {
+  const res = await this.v1_1("account/personalization/email_your_data", {});
+  return await res.json();
+}
+
+export async function multiList() {
+  const res = await this.v1_1("account/multi/list", {});
+  return await res.json();
+}
+
+export async function enableVerifiedPhoneLabel() {
+  return await this.graphql("EnableVerifiedPhoneLabel", {
+    body: { variables: {} },
+  });
+}
+
+export async function disableVerifiedPhoneLabel() {
+  return await this.graphql("DisableVerifiedPhoneLabel", {
+    body: { variables: {} },
+  });
+}
+
+export async function dataSaverMode() {
+  return await this.graphql("DataSaverMode", {
+    variables: {},
+  });
+}
+
+export async function setDataSaver(dataSaverMode) {
+  return await this.graphql("WriteDataSaverPreferences", {
+    body: { variables: { dataSaverMode } },
+  });
+}
+
+export async function mutedKeywords() {
+  const res = await this.v1_1("mutes/keywords/list", {});
+  return await res.json();
+}
+
+export async function deleteMutedKeyword(keywordId) {
+  const res = await this.v1_1("mutes/keywords/destroy", {
+    body: JSON.stringify({ ids: keywordId }),
+  });
+  return await res.json();
+}
+
+export async function updateMutedKeyword(params = {}) {
+  const res = await this.v1_1("mutes/keywords/update", {
+    body: JSON.stringify(params),
+  });
+  return await res.json();
+}
+
+export async function advancedFilters() {
+  const res = await this.v1_1("get:mutes/advanced_filters", {});
+  return await res.json();
+}
+
+export async function updateAdvancedFilters(params = {}) {
+  const res = await this.v1_1("post:mutes/advanced_filters", {
+    body: JSON.stringify(params),
+  });
+  return await res.json();
+}
+
+export async function helpSettings() {
+  const res = await this.v1_1("help/settings", {});
+  return await res.json();
+}
+
+export async function emailNotificationSettings(params = {}) {
+  return await this.graphql("WriteEmailNotificationSettings", {
+    body: { variables: { ...params } },
+  });
+}
+
+export async function viewerEmailSettings() {
+  return await this.graphql("ViewerEmailSettings", {
+    variables: {},
+  });
+}
+
+export async function accountLabel() {
+  return await this.graphql("UserAccountLabel", {
+    variables: {},
+  });
+}
+
+export async function disableAccountLabel() {
+  return await this.graphql("DisableUserAccountLabel", {
+    body: { variables: {} },
+  });
+}