steamutils 1.3.97 → 1.3.99

package/index.js

@@ -8,7 +8,7 @@ import URL, { fileURLToPath } from "url";
 import Url from "url-parse";
 import qs from "qs";
 import xml2js from "xml2js";
-import { console_log, getCleanObject, JSON_parse, JSON_stringify, removeSpaceKeys, sleep } from "./utils.js";
+import { console_log, getCleanObject, JSON_parse, JSON_stringify, removeSpaceKeys, secretAsBuffer, sleep } from "./utils.js";
 import { Header, request } from "./axios.js";
 import { getTableHasHeaders, querySelectorAll, table2json } from "./cheerio.js";
 import { getJSObjectFronXML } from "./xml2json.js";
@@ -5931,7 +5931,7 @@ export default class SteamUser {
         });
 
         if (checkLoginResult.request?.res?.responseUrl?.startsWith("https://store.steampowered.com/login/")) {
-          break;
+          continue;
         }
       } catch (e) {
         error = e;
@@ -7254,44 +7254,14 @@ export default class SteamUser {
     });
     return revokeRefreshTokenResult?.data;
   }
-  async revokeAccessToken(accessToken, tokenId, sharedSecret, clientId) {
+  async revokeAccessToken(accessToken, tokenId, sharedSecret) {
     const version = 1;
-    // const clientId = tokenId;
-    let signatureData = Buffer.alloc(2 + 8 + 8);
+    const signatureData = Buffer.alloc(2 + 8 + 8);
     signatureData.writeUInt16LE(version, 0);
-    signatureData.writeBigUInt64LE(BigInt(clientId), 2);
+    signatureData.writeBigUInt64LE(BigInt(tokenId), 2);
     signatureData.writeBigUInt64LE(BigInt(this._steamIdUser), 10);
-    const secretAsBuffer = (sharedSecret) => {
-      if (Buffer.isBuffer(sharedSecret)) {
-        return sharedSecret;
-      }
-
-      if (sharedSecret.match(/^[0-9a-f]{40}$/i)) {
-        // Looks like it's hex
-        return Buffer.from(sharedSecret, "hex");
-      }
-
-      // It must be base64
-      return Buffer.from(sharedSecret, "base64");
-    };
-
     const signature = createHmac("sha256", secretAsBuffer(sharedSecret)).update(signatureData).digest();
 
-    /*const approver = new LoginApprover(accessToken, sharedSecret, {});
-    const sessionInfo = await approver._handler.sendRequest({
-      apiInterface: "Authentication",
-      apiMethod: "RevokeRefreshToken",
-      apiVersion: 1,
-      data: {
-        token_id: tokenId,
-        steamid: this._steamIdUser,
-        revoke_action: 1,
-        signature: signature.toString(),
-      },
-      accessToken: accessToken,
-    });
-    console.log("sessionInfo", sessionInfo);*/
-
     const Protos = helpers([
       {
         name: "csgo",
@@ -7311,25 +7281,21 @@ export default class SteamUser {
       }).toString("base64"),
     };
 
-    // const params = {
-    //   access_token: accessToken,
-    //   token_id: tokenId,
-    //   steamid: this._steamIdUser,
-    //   // revoke_action: Protos.csgo.EAuthTokenRevokeAction.k_EAuthTokenRevokePermanent,
-    //   revoke_action: 1,
-    //   signature: signature,
-    // };
-
-    const revokeRefreshTokenResult = await this._httpRequest({
+    const result = await this._httpRequest({
       url: `https://api.steampowered.com/IAuthenticationService/RevokeRefreshToken/v1?${qs.stringify(params)}`,
       // responseType: "arraybuffer",
       method: "POST",
-      data: params,
+      data: {
+        token_id: tokenId,
+        steamid: this._steamIdUser,
+        revoke_action: 1,
+        signature: signature,
+      },
       headers: {
         "Content-Type": "multipart/form-data",
       },
     });
-    return revokeRefreshTokenResult?.data;
+    return result?.data;
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "steamutils",
-  "version": "1.3.97",
+  "version": "1.3.99",
   "main": "index.js",
   "dependencies": {
     "alpha-common-utils": "^1.0.6",

package/utils.js

@@ -1,141 +1,155 @@
-const isBrowser = typeof window !== "undefined";
-
-export const sleep = (ms) => {
-  return new Promise((resolve) => {
-    setTimeout(resolve, ms);
-  });
-};
-
-export const sleepRandom = async (startMs, endMs) => {
-  return await sleep(Math.random() * (endMs - startMs) + startMs);
-};
-
-/**
- * const audioTrack = stream.getAudioTracks()[0]
- * const videoStream = UserMedia.createBlankVideoTrack()
- * videoStream.addTrack(audioTrack)
- * stream = videoStream
- * **/
-export const createBlankVideoTrack = (opts = {}) => {
-  const { width = 1920, height = 1080 } = opts;
-
-  const canvas = Object.assign(document.createElement("canvas"), {
-    width,
-    height,
-  });
-
-  canvas.getContext("2d").fillRect(0, 0, width, height);
-
-  return canvas.captureStream();
-};
-
-const minDate = new Date(0),
-  maxDate = new Date(parseInt("ffffffff", 16) * 1000);
-
-export function objectIdFromDate(date) {
-  if (date < minDate || date > maxDate) {
-    return `Error: date must be between ${minDate.getFullYear()} and ${maxDate.getFullYear()}`;
-  }
-  var pad = "00000000";
-  var hexSeconds = Math.floor(date.getTime() / 1000).toString(16);
-  return `${pad.substring(0, pad.length - hexSeconds.length) + hexSeconds}0000000000000000`;
-}
-
-export function dateFromObjectId(objectId) {
-  return new Date(parseInt(objectId.substring(0, 8), 16) * 1000);
-}
-
-export function console_log(...args) {
-  const params = [];
-  params.push(new Date().toUTCString());
-  const errorStack = new Error().stack;
-  const fnName = errorStack
-    .split("\n")
-    .map((e) => e?.trim())
-    .filter((e) => e.startsWith("at") && !e.startsWith("at console_log") && !e.startsWith("at processTicksAndRejections"))[0]
-    .substr(3);
-  params.push(fnName);
-  console.log(
-    params
-      .filter(Boolean)
-      .map((p) => `[${p.trim()}]`)
-      .join(" "),
-    ...args,
-  );
-}
-
-export function removeSpaceKeys(object) {
-  //mutate object
-  if (!object || Array.isArray(object)) {
-    return object;
-  }
-
-  Object.entries(object).forEach(([key, value]) => {
-    const newKey = key.replaceAll(/[^a-zA-Z0-9]/gi, "_");
-    if (newKey !== key) {
-      delete object[key];
-      object[newKey] = value;
-    }
-  });
-  return object;
-}
-
-export function getCleanObject(object) {
-  //like removeSpaceKeys but not mutate object
-  if (!object || Array.isArray(object)) {
-    return object;
-  }
-
-  const newObject = {};
-  Object.entries(object).forEach(([key, value]) => {
-    const newKey = key.replaceAll(/[^a-zA-Z0-9]/gi, "_");
-    newObject[newKey] = value;
-  });
-  return newObject;
-}
-
-export function JSON_parse(data) {
-  try {
-    return JSON.parse(data);
-  } catch (e) {
-    return null;
-  }
-}
-
-export function JSON_stringify(data) {
-  try {
-    return JSON.stringify(data);
-  } catch (e) {
-    return null;
-  }
-}
-
-export async function throttle(fn, delay) {
-  let canFire = true;
-  let queue = [];
-
-  async function pop() {
-    if (queue.length < 1) return;
-
-    const [that, args] = queue.pop();
-    await fn.apply(that, args);
-    canFire = false;
-    setTimeout(async () => {
-      canFire = true;
-      await pop();
-    }, delay);
-  }
-
-  async function push() {
-    queue.push([this, arguments]);
-    if (canFire) {
-      await pop();
-    }
-  }
-
-  push.cancel = () => {
-    queue = [];
-  };
-
-  return push;
-}
+const isBrowser = typeof window !== "undefined";
+
+export const sleep = (ms) => {
+  return new Promise((resolve) => {
+    setTimeout(resolve, ms);
+  });
+};
+
+export const sleepRandom = async (startMs, endMs) => {
+  return await sleep(Math.random() * (endMs - startMs) + startMs);
+};
+
+/**
+ * const audioTrack = stream.getAudioTracks()[0]
+ * const videoStream = UserMedia.createBlankVideoTrack()
+ * videoStream.addTrack(audioTrack)
+ * stream = videoStream
+ * **/
+export const createBlankVideoTrack = (opts = {}) => {
+  const { width = 1920, height = 1080 } = opts;
+
+  const canvas = Object.assign(document.createElement("canvas"), {
+    width,
+    height,
+  });
+
+  canvas.getContext("2d").fillRect(0, 0, width, height);
+
+  return canvas.captureStream();
+};
+
+const minDate = new Date(0),
+  maxDate = new Date(parseInt("ffffffff", 16) * 1000);
+
+export function objectIdFromDate(date) {
+  if (date < minDate || date > maxDate) {
+    return `Error: date must be between ${minDate.getFullYear()} and ${maxDate.getFullYear()}`;
+  }
+  var pad = "00000000";
+  var hexSeconds = Math.floor(date.getTime() / 1000).toString(16);
+  return `${pad.substring(0, pad.length - hexSeconds.length) + hexSeconds}0000000000000000`;
+}
+
+export function dateFromObjectId(objectId) {
+  return new Date(parseInt(objectId.substring(0, 8), 16) * 1000);
+}
+
+export function console_log(...args) {
+  const params = [];
+  params.push(new Date().toUTCString());
+  const errorStack = new Error().stack;
+  const fnName = errorStack
+    .split("\n")
+    .map((e) => e?.trim())
+    .filter((e) => e.startsWith("at") && !e.startsWith("at console_log") && !e.startsWith("at processTicksAndRejections"))[0]
+    .substr(3);
+  params.push(fnName);
+  console.log(
+    params
+      .filter(Boolean)
+      .map((p) => `[${p.trim()}]`)
+      .join(" "),
+    ...args,
+  );
+}
+
+export function removeSpaceKeys(object) {
+  //mutate object
+  if (!object || Array.isArray(object)) {
+    return object;
+  }
+
+  Object.entries(object).forEach(([key, value]) => {
+    const newKey = key.replaceAll(/[^a-zA-Z0-9]/gi, "_");
+    if (newKey !== key) {
+      delete object[key];
+      object[newKey] = value;
+    }
+  });
+  return object;
+}
+
+export function getCleanObject(object) {
+  //like removeSpaceKeys but not mutate object
+  if (!object || Array.isArray(object)) {
+    return object;
+  }
+
+  const newObject = {};
+  Object.entries(object).forEach(([key, value]) => {
+    const newKey = key.replaceAll(/[^a-zA-Z0-9]/gi, "_");
+    newObject[newKey] = value;
+  });
+  return newObject;
+}
+
+export function JSON_parse(data) {
+  try {
+    return JSON.parse(data);
+  } catch (e) {
+    return null;
+  }
+}
+
+export function JSON_stringify(data) {
+  try {
+    return JSON.stringify(data);
+  } catch (e) {
+    return null;
+  }
+}
+
+export async function throttle(fn, delay) {
+  let canFire = true;
+  let queue = [];
+
+  async function pop() {
+    if (queue.length < 1) return;
+
+    const [that, args] = queue.pop();
+    await fn.apply(that, args);
+    canFire = false;
+    setTimeout(async () => {
+      canFire = true;
+      await pop();
+    }, delay);
+  }
+
+  async function push() {
+    queue.push([this, arguments]);
+    if (canFire) {
+      await pop();
+    }
+  }
+
+  push.cancel = () => {
+    queue = [];
+  };
+
+  return push;
+}
+
+export const secretAsBuffer = (sharedSecret) => {
+  if (Buffer.isBuffer(sharedSecret)) {
+    return sharedSecret;
+  }
+
+  if (sharedSecret.match(/^[0-9a-f]{40}$/i)) {
+    // Looks like it's hex
+    return Buffer.from(sharedSecret, "hex");
+  }
+
+  // It must be base64
+  return Buffer.from(sharedSecret, "base64");
+};