xnotif 0.2.0 → 0.2.1

package/dist/index.mjs

@@ -1,6 +1,4 @@
 import { EventEmitter } from "events";
-import { TwitterOpenApi } from "twitter-openapi-typescript";
-import { BaseAPI } from "twitter-openapi-typescript-generated";
 
 //#region src/utils.ts
 function base64urlToBuffer(b64url) {
@@ -274,70 +272,83 @@ var AutopushClient = class {
 
 //#endregion
 //#region src/twitter.ts
-const API_HEADER_NAMES = [
-	"Accept",
-	"x-twitter-client-language",
-	"Priority",
-	"Referer",
-	"Sec-Fetch-Dest",
-	"Sec-Ch-Ua-Platform",
-	"Sec-Fetch-Mode",
-	"x-csrf-token",
-	"x-client-uuid",
-	"x-guest-token",
-	"Sec-Ch-Ua",
-	"x-twitter-active-user",
-	"user-agent",
-	"Accept-Language",
-	"Sec-Fetch-Site",
-	"x-twitter-auth-type",
-	"Sec-Ch-Ua-Mobile",
-	"Accept-Encoding"
-];
-var NotificationApi = class extends BaseAPI {
-	constructor(config) {
-		super(config);
-	}
-	async post(path, body, initOverride) {
-		const headers = {};
-		const apiKey = this.configuration.apiKey;
-		if (apiKey) for (const name of API_HEADER_NAMES) {
-			const value = await apiKey(name);
-			if (value) headers[name] = value;
-		}
-		const accessToken = this.configuration.accessToken;
-		if (accessToken) headers["Authorization"] = `Bearer ${await accessToken()}`;
-		headers["Content-Type"] = "application/json";
-		return this.request({
-			path,
-			method: "POST",
-			headers,
-			body
-		}, initOverride);
-	}
-};
-async function createClient$1(cookies) {
-	return new TwitterOpenApi().getClientFromCookies(cookies);
+const BEARER_TOKEN = "AAAAAAAAAAAAAAAAAAAAANRILgAAAAAAnNwIzUejRCOuH5E6I8xnZz4puTs%3D1Zv7ttfk8LF81IUq16cHjhLTvJu4FA33AGWWjCpTnA";
+const HEADER_URL = "https://raw.githubusercontent.com/fa0311/latest-user-agent/refs/heads/main/header.json";
+const PAIR_URL = "https://raw.githubusercontent.com/fa0311/x-client-transaction-pair-dict/refs/heads/main/pair.json";
+async function generateTransactionId(method, path, key, animationKey) {
+	const DEFAULT_KEYWORD = "obfiowerehiring";
+	const ADDITIONAL_RANDOM_NUMBER = 3;
+	const timeNow = Math.floor((Date.now() - 1682924400 * 1e3) / 1e3);
+	const timeNowBytes = [
+		timeNow & 255,
+		timeNow >> 8 & 255,
+		timeNow >> 16 & 255,
+		timeNow >> 24 & 255
+	];
+	const data = `${method}!${path}!${timeNow}${DEFAULT_KEYWORD}${animationKey}`;
+	const hashBuffer = await crypto.subtle.digest("SHA-256", new TextEncoder().encode(data));
+	const hashBytes = Array.from(new Uint8Array(hashBuffer));
+	const keyBytes = Array.from(Buffer.from(key, "base64"));
+	const randomNum = Math.floor(Math.random() * 256);
+	const bytesArr = [
+		...keyBytes,
+		...timeNowBytes,
+		...hashBytes.slice(0, 16),
+		ADDITIONAL_RANDOM_NUMBER
+	];
+	const out = new Uint8Array([randomNum, ...bytesArr.map((b) => b ^ randomNum)]);
+	return Buffer.from(out).toString("base64").replace(/=/g, "");
 }
-function makeInitOverride(client, path) {
-	return client.initOverrides({
-		"@method": "POST",
-		"@path": path
-	});
+function encodeCookies(cookies) {
+	return Object.entries(cookies).map(([k, v]) => `${k}=${v}`).join("; ");
+}
+async function createClient$1(cookies) {
+	const [headerJson, pairs] = await Promise.all([fetch(HEADER_URL).then((r) => r.json()), fetch(PAIR_URL).then((r) => r.json())]);
+	const ignore = new Set(["host", "connection"]);
+	const headers = {
+		...Object.fromEntries(Object.entries(headerJson["chrome-fetch"]).filter(([k]) => !ignore.has(k))),
+		"accept-encoding": "identity",
+		pragma: "no-cache",
+		referer: "https://x.com",
+		priority: "u=1, i",
+		"x-twitter-client-language": "en",
+		"x-twitter-active-user": "yes",
+		authorization: `Bearer ${BEARER_TOKEN}`
+	};
+	if (cookies["ct0"]) {
+		headers["x-twitter-auth-type"] = "OAuth2Session";
+		headers["x-csrf-token"] = cookies["ct0"];
+	}
+	if (cookies["gt"]) headers["x-guest-token"] = cookies["gt"];
+	return {
+		headers,
+		cookies,
+		pairs
+	};
 }
 async function registerPush(client, subscription) {
-	const api = new NotificationApi(client.config);
 	const path = "/1.1/notifications/settings/login.json";
-	const res = await api.post(path, { push_device_info: {
-		os_version: "Web/Chrome",
-		udid: "Web/Chrome",
-		env: 3,
-		locale: "en",
-		protocol_version: 1,
-		token: subscription.endpoint,
-		encryption_key1: subscription.p256dh,
-		encryption_key2: subscription.auth
-	} }, makeInitOverride(client, path));
+	const pair = client.pairs[Math.floor(Math.random() * client.pairs.length)];
+	const tid = await generateTransactionId("POST", path, pair.verification, pair.animationKey);
+	const res = await fetch(`https://x.com/i/api${path}`, {
+		method: "POST",
+		headers: {
+			...client.headers,
+			cookie: encodeCookies(client.cookies),
+			"content-type": "application/json",
+			"x-client-transaction-id": tid
+		},
+		body: JSON.stringify({ push_device_info: {
+			os_version: "Web/Chrome",
+			udid: "Web/Chrome",
+			env: 3,
+			locale: "en",
+			protocol_version: 1,
+			token: subscription.endpoint,
+			encryption_key1: subscription.p256dh,
+			encryption_key2: subscription.auth
+		} })
+	});
 	if (!res.ok) {
 		const text = await res.text();
 		throw new Error(`login.json failed (${res.status}): ${text}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xnotif",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "Receive Twitter/X push notifications programmatically via Mozilla Autopush",
   "keywords": [
     "autopush",
@@ -30,10 +30,7 @@
       "import": "./dist/index.mjs"
     }
   },
-  "dependencies": {
-    "twitter-openapi-typescript": "^0.0.55",
-    "twitter-openapi-typescript-generated": "^0.0.38"
-  },
+  "dependencies": {},
   "devDependencies": {
     "@types/node": "^22.0.0",
     "@vitest/coverage-v8": "^4.0.18",