emusks 2.0.4 → 2.0.6

package/src/index.js

@@ -1,19 +1,16 @@
 import { ClientTransaction, handleXMigration } from "x-client-transaction-id";
-import parseUser from "./parsers/user.js";
-import getCycleTLS from "./cycletls.js";
 import clients from "./clients.js";
+import getCycleTLS from "./cycletls.js";
+import flowLogin from "./flow.js";
 import graphql from "./graphql.js";
+import initHelpers from "./helpers/index.js";
+import parseUser from "./parsers/user.js";
 import v1_1 from "./v1.1.js";
 import v2 from "./v2.js";
-import flowLogin from "./flow.js";
-import initHelpers from "./helpers/index.js";
 
 export default class Emusks {
   auth = null;
   elevatedCookies = null;
-  graphql = graphql;
-  v1_1 = v1_1;
-  v2 = v2;
 
   async elevate(password) {
     if (!this.auth) throw new Error("must be logged in before calling elevate");
@@ -78,6 +75,20 @@ export default class Emusks {
     if (typeof p.client === "string") p.client = clients[p.client];
     if (!p.client) throw new Error("invalid client!");
     if (p.proxy) this.proxy = p.proxy;
+    
+    if (!p.client.bearer) {
+      throw new Error("client is missing bearer token!");
+    }
+    if (!p.client.userAgent || !p.client.fingerprints) {
+      p.client.userAgent =
+        p.client.userAgent ||
+        "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/144.0.0.0 Safari/537.36";
+      
+      p.client.fingerprints = p.client.fingerprints || {
+        ja3: "771,4865-4866-4867-49195-49199-49196-49200-52393-52392-49171-49172-156-157-47-53,35-5-27-16-0-10-13-23-45-65037-17613-18-65281-51-43-11,4588-29-23-24,0",
+        ja4r: "t13d1516h2_002f,0035,009c,009d,1301,1302,1303,c013,c014,c02b,c02c,c02f,c030,cca8,cca9_0005,000a,000b,000d,0012,0017,001b,0023,002b,002d,0033,44cd,fe0d,ff01_0403,0804,0401,0503,0805,0501,0806,0601",
+      };
+    }
 
     p.client.headers = {
       "accept-language": "en-US,en;q=0.9",
@@ -128,6 +139,11 @@ export default class Emusks {
     }
     this.auth.client.headers.cookie = cookieParts.join("; ");
 
+    const document = await handleXMigration();
+    const transaction = new ClientTransaction(document);
+    await transaction.initialize();
+    this.auth.generateTransactionId = transaction.generateTransactionId.bind(transaction);
+
     const responseText = await res.text();
     const initialStateMatch = responseText.match(/window\.__INITIAL_STATE__\s*=\s*({.*?});/s);
 
@@ -148,14 +164,11 @@ export default class Emusks {
     this.user = parseUser(initialStateUser);
     this.settings = initialState?.settings?.remote?.settings;
 
-    const document = await handleXMigration();
-    const transaction = new ClientTransaction(document);
-    await transaction.initialize();
-    this.auth.generateTransactionId = transaction.generateTransactionId.bind(transaction);
-
-    const helpers = initHelpers(this);
-    Object.assign(this, helpers);
-
     return this.user;
   }
-}
+}
+
+Emusks.prototype.graphql = graphql;
+Emusks.prototype.v1_1 = v1_1;
+Emusks.prototype.v2 = v2;
+initHelpers(Emusks.prototype);