steamutils 1.4.31 → 1.4.32

package/utils.js

@@ -1,238 +1,249 @@
-import { EAuthTokenPlatformType, LoginApprover, LoginSession } from "steam-session";
-
-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");
-};
-
-export function decodeLoginQrUrl(qrUrl) {
-  if (!qrUrl || typeof qrUrl !== "string") {
-    return null;
-  }
-  const match = qrUrl.match(/^https?:\/\/s\.team\/q\/(\d+)\/(\d+)(\?|$)/);
-  if (!match) {
-    console.log("Invalid QR code URL");
-    return null;
-  }
-
-  return { clientId: match[2], version: parseInt(match[1], 10) };
-}
-
-export function decodeJwt(jwt) {
-  try {
-    const parts = jwt.split(".");
-    if (parts.length !== 3) {
-      console.err("decodeJwt Error", new Error("Invalid JWT"));
-      return;
-    }
-
-    const standardBase64 = parts[1].replace(/-/g, "+").replace(/_/g, "/");
-    return JSON.parse(Buffer.from(standardBase64, "base64").toString("utf8"));
-  } catch (e) {
-    console.err("decodeJwt Error", e);
-  }
-}
-
-export async function renewRefreshToken({ refreshToken, accessToken }) {
-  try {
-    const { aud } = decodeJwt(accessToken);
-    let platformType = EAuthTokenPlatformType.SteamClient;
-    if (aud.includes("mobile")) {
-      platformType = EAuthTokenPlatformType.MobileApp;
-    } else if (aud.includes("client")) {
-      platformType = EAuthTokenPlatformType.SteamClient;
-    } else if (aud.includes("web")) {
-      platformType = EAuthTokenPlatformType.WebBrowser;
-    }
-    const session = new LoginSession(platformType);
-    session.refreshToken = refreshToken;
-    await session.refreshAccessToken();
-    const cookie = (await session.getWebCookies())?.join?.(";");
-    return {
-      cookie,
-      accessToken: session.accessToken,
-      accessTokenDecoded: decodeJwt(session.accessToken),
-    };
-  } catch (e) {
-    console.error("renewRefreshToken Error", e);
-  }
-}
-
-export async function approveLogin({ steamId, url, sharedSecret, accessToken, shouldApprove }) {
-  try {
-    const approver = new LoginApprover(accessToken, sharedSecret, {});
-    const sessionInfo = await approver.getAuthSessionInfo(url);
-    sessionInfo.steamId = steamId;
-
-    if (typeof shouldApprove === "function" && !shouldApprove(sessionInfo)) {
-      return;
-    }
-
-    await approver.approveAuthSession({
-      qrChallengeUrl: url,
-      approve: true,
-    });
-
-    return {
-      steamId,
-      sessionInfo,
-    };
-  } catch (error) {
-    console.error("approveLogin Error", error);
-    return {
-      steamId,
-      error,
-    };
-  }
-}
+import { EAuthTokenPlatformType, LoginApprover, LoginSession } from "steam-session";
+
+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");
+};
+
+export function decodeLoginQrUrl(qrUrl) {
+  if (!qrUrl || typeof qrUrl !== "string") {
+    return null;
+  }
+  const match = qrUrl.match(/^https?:\/\/s\.team\/q\/(\d+)\/(\d+)(\?|$)/);
+  if (!match) {
+    console.log("Invalid QR code URL");
+    return null;
+  }
+
+  return { clientId: match[2], version: parseInt(match[1], 10) };
+}
+
+export function decodeJwt(jwt) {
+  try {
+    const parts = jwt.split(".");
+    if (parts.length !== 3) {
+      console.err("decodeJwt Error", new Error("Invalid JWT"));
+      return;
+    }
+
+    const standardBase64 = parts[1].replace(/-/g, "+").replace(/_/g, "/");
+    return JSON.parse(Buffer.from(standardBase64, "base64").toString("utf8"));
+  } catch (e) {
+    console.error("decodeJwt Error", e);
+  }
+}
+
+export async function renewRefreshToken({ refreshToken, accessToken }) {
+  try {
+    const { aud } = decodeJwt(accessToken);
+    let platformType = EAuthTokenPlatformType.SteamClient;
+    if (aud.includes("mobile")) {
+      platformType = EAuthTokenPlatformType.MobileApp;
+    } else if (aud.includes("client")) {
+      platformType = EAuthTokenPlatformType.SteamClient;
+    } else if (aud.includes("web")) {
+      platformType = EAuthTokenPlatformType.WebBrowser;
+    }
+    const session = new LoginSession(platformType);
+    session.refreshToken = refreshToken;
+    await session.refreshAccessToken();
+    const cookie = (await session.getWebCookies())?.join?.(";");
+    return {
+      cookie,
+      accessToken: session.accessToken,
+      accessTokenDecoded: decodeJwt(session.accessToken),
+    };
+  } catch (e) {
+    console.error("renewRefreshToken Error", e);
+  }
+}
+
+export async function approveLogin({ steamId, url, sharedSecret, accessToken, shouldApprove }) {
+  try {
+    const approver = new LoginApprover(accessToken, sharedSecret, {});
+    const sessionInfo = await approver.getAuthSessionInfo(url);
+    sessionInfo.steamId = steamId;
+
+    if (typeof shouldApprove === "function" && !shouldApprove(sessionInfo)) {
+      return;
+    }
+
+    await approver.approveAuthSession({
+      qrChallengeUrl: url,
+      approve: true,
+    });
+
+    return {
+      steamId,
+      sessionInfo,
+    };
+  } catch (error) {
+    console.error("approveLogin Error", error);
+    return {
+      steamId,
+      error,
+    };
+  }
+}
+
+export function getBonusXpTimeRefresh() {
+  let resetDay = moment.utc().startOf("isoWeek").add(2, "days").add(1, "hours");
+  while (moment().isAfter(resetDay)) {
+    resetDay = resetDay.add(7, "days");
+  }
+  if (moment().isBefore(resetDay)) {
+    resetDay = resetDay.subtract(7, "days");
+  }
+  return resetDay;
+}

package/.idea/deployment.xml

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="PublishConfigData" remoteFilesAllowedToDisappearOnAutoupload="false">
-    <serverData>
-      <paths name="botnatridiscord">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
-    </serverData>
-  </component>
-</project>