macbid-ts-api 1.0.0-beta.3 → 1.0.0

package/MacBid.d.ts

@@ -8,6 +8,16 @@ export interface AuthInfo {
     refresh_token?: string;
     refresh_token_expiration?: Date;
     validation_code?: string;
+    device_id?: string;
+}
+/** JSON-serializable auth fields safe to persist (no credentials). */
+export interface SerializableAuthState {
+    token?: string;
+    refresh_token?: string;
+    token_expiration?: string;
+    refresh_token_expiration?: string;
+    user_id?: string;
+    device_id?: string;
 }
 export interface WatchlistFull {
     auction_lot_id: number;
@@ -64,9 +74,20 @@ export declare class MacBid {
     API_ROOT: string;
     private macbid_session_headers;
     private auth_info;
-    private tokenFilePath?;
-    constructor(auth_info: AuthInfo, tokenFilePath?: string);
-    authenticate: () => Promise<void>;
+    private mergeAuthInfo;
+    /** Returns persistable auth state (tokens and device_id). */
+    getAuthState: () => SerializableAuthState;
+    static serializeAuthState: (authInfo: Partial<AuthInfo>) => SerializableAuthState;
+    static parseAuthState: (data: string | SerializableAuthState) => Partial<AuthInfo>;
+    private clearLoginSession;
+    /** device_id saved without tokens means an SMS was sent and we're waiting for the code. */
+    private isAwaiting2FA;
+    /**
+     * Establish or refresh a session. Pass credentials and any saved tokens / device_id.
+     * Omit params on later calls to reuse the current session.
+     * Returns persistable auth state; use getAuthState() after API calls that may refresh tokens.
+     */
+    authenticate: (params?: Partial<AuthInfo>) => Promise<SerializableAuthState>;
     get: (path: string) => Promise<MacBidApiResponse>;
     post: (path: string, options?: RequestInit) => Promise<MacBidApiResponse>;
     /**
@@ -74,12 +95,13 @@ export declare class MacBid {
      */
     private check_auth;
     /**
-     * Do the login request
-     * @param email - User email
-     * @param password - User password
-     * @param validation_code - Optional validation code. If not provided, will check auth_info.validation_code
+     * Validate the access code and get tokens
      */
-    login: (email: string, password: string, validation_code?: string) => Promise<boolean>;
+    private validateCode;
+    /**
+     * Do the login request using auth_info fields.
+     */
+    private login;
     get_refresh_token_expiration: () => Date;
     /**
      * Check if the access token is expired or about to expire (within 5 minutes)
@@ -101,14 +123,6 @@ export declare class MacBid {
      * Returns the logged in user's favorites, and all of their (visible) attributes.
      */
     get_watchlist: () => Promise<WatchlistFull[]>;
-    /**
-     * Save tokens to file for persistence across restarts
-     */
-    private saveTokens;
-    /**
-     * Load tokens from file
-     */
-    static loadTokens: (tokenFilePath: string) => Promise<Partial<AuthInfo> | null>;
 }
 export default MacBid;
 //# sourceMappingURL=MacBid.d.ts.map

package/MacBid.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MacBid.d.ts","sourceRoot":"","sources":["MacBid.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"MacBid.d.ts","sourceRoot":"","sources":["MacBid.ts"],"names":[],"mappings":"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"}

package/MacBid.js

@@ -1,5 +1,5 @@
 import fetch from "node-fetch";
-import { promises as fs } from "node:fs";
+import { randomUUID } from "node:crypto";
 export var AuctionType;
 (function (AuctionType) {
     AuctionType["Pallet"] = "pallet";
@@ -17,50 +17,109 @@ export class MacBid {
     macbid_session_headers = {
         "Content-Type": "application/json",
     };
-    auth_info;
-    tokenFilePath;
-    constructor(auth_info, tokenFilePath) {
-        this.auth_info = auth_info;
-        this.tokenFilePath = tokenFilePath;
-        this.authenticate();
-    }
-    authenticate = async () => {
-        if (this.auth_info) {
-            // If we have a token, use it (will be auto-refreshed if expired)
-            if (this.auth_info.token) {
-                this.macbid_session_headers["Authorization"] = this.auth_info
-                    .token;
+    auth_info = {};
+    mergeAuthInfo = (params) => {
+        Object.assign(this.auth_info, params);
+    };
+    /** Returns persistable auth state (tokens and device_id). */
+    getAuthState = () => {
+        return MacBid.serializeAuthState(this.auth_info);
+    };
+    static serializeAuthState = (authInfo) => ({
+        token: authInfo.token,
+        refresh_token: authInfo.refresh_token,
+        token_expiration: authInfo.token_expiration?.toISOString(),
+        refresh_token_expiration: authInfo.refresh_token_expiration?.toISOString(),
+        user_id: authInfo.user_id,
+        device_id: authInfo.device_id,
+    });
+    static parseAuthState = (data) => {
+        const parsed = typeof data === "string"
+            ? JSON.parse(data)
+            : data;
+        return {
+            token: parsed.token,
+            refresh_token: parsed.refresh_token,
+            token_expiration: parsed.token_expiration
+                ? new Date(parsed.token_expiration)
+                : undefined,
+            refresh_token_expiration: parsed.refresh_token_expiration
+                ? new Date(parsed.refresh_token_expiration)
+                : undefined,
+            user_id: parsed.user_id,
+            device_id: parsed.device_id,
+        };
+    };
+    clearLoginSession = () => {
+        delete this.auth_info.token;
+        delete this.auth_info.refresh_token;
+        delete this.auth_info.token_expiration;
+        delete this.auth_info.refresh_token_expiration;
+        delete this.auth_info.user_id;
+        delete this.auth_info.device_id;
+        delete this.auth_info.validation_code;
+        delete this.macbid_session_headers["Authorization"];
+    };
+    /** device_id saved without tokens means an SMS was sent and we're waiting for the code. */
+    isAwaiting2FA = () => {
+        return !!(this.auth_info.device_id &&
+            !this.auth_info.token &&
+            !this.auth_info.refresh_token);
+    };
+    /**
+     * Establish or refresh a session. Pass credentials and any saved tokens / device_id.
+     * Omit params on later calls to reuse the current session.
+     * Returns persistable auth state; use getAuthState() after API calls that may refresh tokens.
+     */
+    authenticate = async (params) => {
+        if (params) {
+            this.mergeAuthInfo(params);
+        }
+        if (this.auth_info.token) {
+            this.macbid_session_headers["Authorization"] = this.auth_info.token;
+            if (!this.isTokenExpired()) {
                 console.log("Using existing access token");
-                // Token will be auto-refreshed by ensureValidToken if needed
-                return;
+                return this.getAuthState();
             }
-            // If we have a refresh token but no access token, try to refresh first
-            if (this.auth_info.refresh_token) {
-                if (this.isRefreshTokenExpired()) {
-                    console.log("Refresh token has expired, need to login");
+            if (this.auth_info.refresh_token && !this.isRefreshTokenExpired()) {
+                console.log("Access token expired, refreshing");
+                try {
+                    await this.refreshToken();
+                    return this.getAuthState();
                 }
-                else {
-                    console.log("No access token, attempting to refresh using refresh token");
-                    try {
-                        await this.refreshToken();
-                        console.log("Successfully refreshed token");
-                        return;
-                    }
-                    catch (error) {
-                        // If refresh fails, fall through to login
-                        console.warn("Failed to refresh token, attempting login:", error);
-                    }
+                catch (error) {
+                    console.warn("Failed to refresh token, attempting login:", error);
+                    this.clearLoginSession();
                 }
             }
-            // No valid tokens, need to login
-            if (this.auth_info.email && this.auth_info.password) {
-                console.log("No valid tokens found, attempting login");
-                await this.login(this.auth_info.email, this.auth_info.password);
+            else {
+                this.clearLoginSession();
+            }
+        }
+        else if (this.auth_info.refresh_token) {
+            if (this.isRefreshTokenExpired()) {
+                console.log("Refresh token has expired, need to login");
+                this.clearLoginSession();
             }
             else {
-                throw new Error("Invalid auth_info");
+                console.log("No access token, attempting to refresh using refresh token");
+                try {
+                    await this.refreshToken();
+                    console.log("Successfully refreshed token");
+                    return this.getAuthState();
+                }
+                catch (error) {
+                    console.warn("Failed to refresh token, attempting login:", error);
+                    this.clearLoginSession();
+                }
             }
         }
+        if (this.auth_info.email && this.auth_info.password) {
+            console.log("No valid tokens found, attempting login");
+            await this.login();
+            return this.getAuthState();
+        }
+        throw new Error("email and password are required to log in");
     };
     get = async (path) => {
         await this.ensureValidToken();
@@ -91,14 +150,88 @@ export class MacBid {
         return true;
     };
     /**
-     * Do the login request
-     * @param email - User email
-     * @param password - User password
-     * @param validation_code - Optional validation code. If not provided, will check auth_info.validation_code
+     * Validate the access code and get tokens
+     */
+    validateCode = async (code, device_id) => {
+        console.log("Validating code with device_id:", device_id);
+        const validation_params = {
+            code: code,
+            device_id: device_id,
+            new_password: "",
+            remember_me: false, // Match the browser behavior
+        };
+        console.log("Sending validation request to /auth/validate-access-code");
+        // Use PUT method like the browser does
+        const validation_res = await fetch(this.API_ROOT + "/auth/validate-access-code", {
+            method: "PUT",
+            body: JSON.stringify(validation_params),
+            headers: {
+                "Content-Type": "application/json",
+            },
+        });
+        const validation_resJson = (await validation_res.json());
+        console.log("Validation response status:", validation_res.status);
+        const errorMessage = validation_resJson["error"] || validation_resJson["message"] || "";
+        const hasError = validation_res.status !== 200 ||
+            !!validation_resJson["error"] ||
+            (typeof errorMessage === "string" && errorMessage.includes("Missing"));
+        if (hasError) {
+            console.error("Validation failed:", errorMessage || validation_res.status);
+            if (errorMessage.toLowerCase().includes("already verified")) {
+                this.clearLoginSession();
+                throw new Error("Validation code was already used. Clear saved auth state and authenticate again to request a new code.");
+            }
+            throw new Error(`Validation failed: ${errorMessage || "Unknown error"}`);
+        }
+        const access_token = validation_resJson["access_token"];
+        const refresh_token = validation_resJson["refresh_token"];
+        const user_id = validation_resJson["user_id"];
+        const expires = validation_resJson["expires"];
+        const expiration_refresh = validation_resJson["expiration_refresh"];
+        if (access_token) {
+            console.log("Access token received, saving tokens...");
+            this.auth_info.token = access_token;
+            this.auth_info.user_id = String(user_id);
+            this.macbid_session_headers["Authorization"] = this.auth_info.token;
+            this.auth_info.token_expiration = new Date(expires * 1000);
+            this.auth_info.refresh_token = refresh_token;
+            this.auth_info.refresh_token_expiration = new Date(expiration_refresh * 1000);
+            delete this.auth_info.validation_code;
+            console.log("✓ Login successful");
+            return true;
+        }
+        else {
+            console.error("No access token in validation response");
+            throw new Error("Login failed: No access token received");
+        }
+    };
+    /**
+     * Do the login request using auth_info fields.
      */
-    login = async (email, password, validation_code) => {
+    login = async () => {
+        const email = this.auth_info.email;
+        const password = this.auth_info.password;
+        if (!email || !password) {
+            throw new Error("email and password are required to log in");
+        }
+        const code = this.auth_info.validation_code;
+        if (code) {
+            const device_id = this.auth_info.device_id;
+            if (!device_id) {
+                throw new Error("device_id is required to validate a code");
+            }
+            console.log("Validation code present, attempting to validate...");
+            return await this.validateCode(code, device_id);
+        }
+        if (this.isAwaiting2FA()) {
+            throw new Error("A validation code was already sent for this device_id. Provide validation_code to continue.");
+        }
+        const device_id = randomUUID();
+        this.auth_info.device_id = device_id;
+        console.log("Generated new device_id:", device_id);
+        console.log("No validation code found, requesting new code...");
         const login_params = {
-            device_id: crypto.randomUUID(),
+            device_id: device_id,
             email: email,
             password: password,
             ref_code: null,
@@ -108,49 +241,15 @@ export class MacBid {
             utm_medium: null,
             utm_source: null,
         };
-        // https://api.macdiscount.com/auth/auth-validation
         const res = await this.post("/auth/auth-validation", {
             body: JSON.stringify(login_params),
         });
         const resJson = await res.json();
         if (resJson["message"] === "Login validation code sent") {
-            // Get validation code from parameter, auth_info, or throw error
-            const code = validation_code ||
-                this.auth_info.validation_code ||
-                process.env.MACBID_VALIDATION_CODE;
-            if (!code) {
-                throw new Error("Validation code required. Provide it via:\n" +
-                    "  1. login() method parameter: login(email, password, validation_code)\n" +
-                    "  2. AuthInfo.validation_code when creating MacBid instance\n" +
-                    "  3. MACBID_VALIDATION_CODE environment variable");
-            }
-            const validation_params = {
-                code: code,
-                device_id: login_params.device_id,
-                new_password: "",
-                remember_me: true,
-            };
-            const validation_res = await this.post("/auth/validate-access-code", {
-                body: JSON.stringify(validation_params),
-            });
-            const validation_resJson = await validation_res.json();
-            const access_token = validation_resJson["access_token"];
-            const refresh_token = validation_resJson["refresh_token"];
-            const user_id = validation_resJson["user_id"];
-            const expires = validation_resJson["expires"];
-            const expiration_refresh = validation_resJson["expiration_refresh"];
-            if (access_token) {
-                this.auth_info.token = access_token;
-                this.auth_info.user_id = user_id;
-                this.macbid_session_headers["Authorization"] = this.auth_info.token;
-                this.auth_info.token_expiration = new Date(expires * 1000);
-                this.auth_info.refresh_token = refresh_token;
-                this.auth_info.refresh_token_expiration = new Date(expiration_refresh * 1000);
-                await this.saveTokens();
-                return true;
-            }
+            console.log("✓ Validation code sent");
+            throw new Error("Validation code sent. Provide validation_code and authenticate again.");
         }
-        console.error(JSON.stringify(resJson, null, 2));
+        console.error("Unexpected login response:", JSON.stringify(resJson, null, 2));
         throw new Error("Login failed");
     };
     get_refresh_token_expiration = () => {
@@ -203,9 +302,8 @@ export class MacBid {
             },
         });
         const resJson = (await res.json());
-        // Check for error response
-        if (resJson["error"]) {
-            throw new Error(`Failed to refresh token: ${resJson["error"]}`);
+        if (!res.ok || resJson.error) {
+            throw new Error(`Failed to refresh token: ${resJson.error || res.status}`);
         }
         const access_token = resJson["access_token"];
         const refresh_token = resJson["refresh_token"];
@@ -222,7 +320,6 @@ export class MacBid {
             if (expiration_refresh) {
                 this.auth_info.refresh_token_expiration = new Date(expiration_refresh * 1000);
             }
-            await this.saveTokens();
             return true;
         }
         else {
@@ -245,49 +342,6 @@ export class MacBid {
         const res = await this.get(`/auctions/customer/${this.auth_info["user_id"]}/active-auctions`);
         return (await res.json())["watchlist_full"];
     };
-    /**
-     * Save tokens to file for persistence across restarts
-     */
-    saveTokens = async () => {
-        if (!this.tokenFilePath) {
-            console.log("No token file path provided, skipping token save");
-            return;
-        }
-        try {
-            const tokenData = {
-                token: this.auth_info.token,
-                refresh_token: this.auth_info.refresh_token,
-                token_expiration: this.auth_info.token_expiration?.toISOString(),
-                refresh_token_expiration: this.auth_info.refresh_token_expiration?.toISOString(),
-                user_id: this.auth_info.user_id,
-            };
-            await fs.writeFile(this.tokenFilePath, JSON.stringify(tokenData, null, 2), "utf-8");
-            console.log("Tokens saved to file:", this.tokenFilePath);
-        }
-        catch (error) {
-            console.warn("Failed to save tokens:", error);
-        }
-    };
-    /**
-     * Load tokens from file
-     */
-    static loadTokens = async (tokenFilePath) => {
-        try {
-            const data = await fs.readFile(tokenFilePath, "utf-8");
-            const tokenData = JSON.parse(data);
-            return {
-                token: tokenData.token,
-                refresh_token: tokenData.refresh_token,
-                token_expiration: tokenData.token_expiration ? new Date(tokenData.token_expiration) : undefined,
-                refresh_token_expiration: tokenData.refresh_token_expiration ? new Date(tokenData.refresh_token_expiration) : undefined,
-                user_id: tokenData.user_id,
-            };
-        }
-        catch (error) {
-            // File doesn't exist or is invalid, return null
-            return null;
-        }
-    };
 }
 export default MacBid;
 //# sourceMappingURL=MacBid.js.map

package/MacBid.js.map

@@ -1 +1 @@
-{"version":3,"file":"MacBid.js","sourceRoot":"","sources":["MacBid.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"MacBid.js","sourceRoot":"","sources":["MacBid.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "macbid-ts-api",
-    "version": "1.0.0-beta.3",
+    "version": "1.0.0",
     "repository": {
         "type": "git",
         "url": "git+https://github.com/pkmnct/macbid-ts-api.git"
@@ -17,35 +17,16 @@
         "node": ">=16.0.0"
     },
     "devDependencies": {
-        "@types/node-fetch": "^2.6.2",
-        "@typescript-eslint/eslint-plugin": "^5.61.0",
-        "@typescript-eslint/parser": "^5.61.0",
-        "eslint": "^8.44.0",
-        "eslint-plugin-import": "^2.27.5",
-        "eslint-plugin-promise": "^6.1.1",
-        "typescript": "^5.2.2"
-    },
-    "eslintConfig": {
-        "parser": "@typescript-eslint/parser",
-        "parserOptions": {
-            "ecmaVersion": 2021,
-            "sourceType": "module"
-        },
-        "extends": [
-            "eslint:recommended",
-            "plugin:@typescript-eslint/recommended",
-            "plugin:promise/recommended",
-            "plugin:import/recommended",
-            "plugin:import/typescript"
-        ],
-        "plugins": [
-            "@typescript-eslint",
-            "promise",
-            "import"
-        ]
+        "@eslint/js": "^10.0.1",
+        "@types/node-fetch": "^2.6.13",
+        "eslint": "^10.5.0",
+        "eslint-plugin-promise": "^7.3.0",
+        "typescript": "^6.0.3",
+        "typescript-eslint": "^8.61.1"
     },
     "scripts": {
         "build": "tsc",
+        "lint": "eslint .",
         "prepublish": "npm run build"
     },
     "type": "module",

package/readme.md

@@ -1 +1,83 @@
-# Mac.Bid Typescript API
+# macbid-ts-api
+
+Unofficial TypeScript client for the [Mac.Bid](https://www.mac.bid) API.
+
+## Requirements
+
+Node.js **>= 16**
+
+## Install
+
+```bash
+npm install macbid-ts-api
+```
+
+## Usage
+
+```typescript
+import MacBid, { type SerializableAuthState } from "macbid-ts-api";
+
+const api = new MacBid();
+let state: SerializableAuthState = {};
+
+state = await api.authenticate({
+  email: "you@example.com",
+  password: "your-password",
+  ...state,
+});
+
+const watchlist = await api.get_watchlist();
+```
+
+`authenticate()` returns persistable state (tokens and `device_id`, never credentials). Pass it back in on the next call with `...state`.
+
+### Two-factor authentication
+
+If SMS verification is required, the first call throws after sending a code. Set `state` from `api.getAuthState()` and call again with the code:
+
+```typescript
+let state: SerializableAuthState = {};
+
+try {
+  state = await api.authenticate({ email, password, ...state });
+} catch {
+  state = api.getAuthState();
+}
+
+// User receives SMS, then retry:
+state = await api.authenticate({
+  email,
+  password,
+  validation_code: "123456",
+  ...state,
+});
+```
+
+If `device_id` is set but there are no tokens and no `validation_code`, a code was already sent and a new SMS will not be requested.
+
+For JSON storage, use `MacBid.serializeAuthState` / `MacBid.parseAuthState`.
+
+`AuthInfo` is the type for `authenticate()` params (credentials, `validation_code`, etc.). `SerializableAuthState` is what comes back — safe to persist.
+
+## API
+
+| Method | Description |
+|---|---|
+| `authenticate(params?)` | Log in or refresh session; returns persistable state |
+| `get_watchlist()` | Active watchlist items |
+| `get(path)` / `post(path, options?)` | Authenticated API requests |
+| `refreshToken()` | Refresh the access token |
+| `getAuthState()` | Current persistable state |
+| `get_refresh_token_expiration()` | Refresh token expiry |
+
+## Development
+
+```bash
+npm install
+npm run build
+npm run lint
+```
+
+## License
+
+MIT

package/MacBid.ts

@@ -1,403 +0,0 @@
-import fetch, { Response } from "node-fetch";
-import { promises as fs } from "node:fs";
-
-export interface AuthInfo {
-  email?: string;
-  password?: string;
-  token?: string;
-  token_expiration?: Date;
-  user_id?: string;
-  refresh_token?: string;
-  refresh_token_expiration?: Date;
-  validation_code?: string;
-}
-
-export interface WatchlistFull {
-  auction_lot_id: number;
-  watchlist_date_created: Date;
-  id: number;
-  auction_id: number;
-  closed_date: null;
-  buyers_assurance_cost: number | null;
-  expected_close_date: Date;
-  inventory_id: number;
-  date_created: Date;
-  lot_number: string;
-  listing_url: null;
-  title: string;
-  is_open: number;
-  is_transferrable: number;
-  total_bids: number;
-  winning_customer_id: null;
-  winning_bid_id: null;
-  winning_bid_amount: number | null;
-  unique_bidders: number;
-  product_name: string;
-  quantity: number;
-  is_pallet: number;
-  shipping_height: number | null;
-  shipping_width: number | null;
-  shipping_length: number | null;
-  warehouse_location: string;
-  shipping_weight: number | null;
-  case_packed_qty: number | null;
-  auction_number: string;
-  retail_price: number;
-  condition_name: ConditionName;
-  category: null | string;
-  image_url: string;
-  auction_type: AuctionType;
-}
-
-export enum AuctionType {
-  Pallet = "pallet",
-  Standard = "standard",
-}
-
-export enum ConditionName {
-  Damaged = "DAMAGED",
-  LikeNew = "LIKE NEW",
-  OpenBox = "OPEN BOX",
-}
-
-export interface MacBidApiResponse extends Response {
-  json: () => Promise<{
-    [key: string]: unknown;
-  }>;
-}
-
-export class MacBid {
-  public LOGIN_PAGE_URL = "https://www.mac.bid";
-  public API_ROOT = "https://api.macdiscount.com";
-
-  private macbid_session_headers: { [key: string]: string } = {
-    "Content-Type": "application/json",
-  };
-  private auth_info: AuthInfo;
-  private tokenFilePath?: string;
-
-  constructor(auth_info: AuthInfo, tokenFilePath?: string) {
-    this.auth_info = auth_info;
-    this.tokenFilePath = tokenFilePath;
-    this.authenticate();
-  }
-
-  public authenticate = async () => {
-    if (this.auth_info) {
-      // If we have a token, use it (will be auto-refreshed if expired)
-      if (this.auth_info.token) {
-        this.macbid_session_headers["Authorization"] = this.auth_info
-          .token as string;
-        console.log("Using existing access token");
-        // Token will be auto-refreshed by ensureValidToken if needed
-        return;
-      }
-      
-      // If we have a refresh token but no access token, try to refresh first
-      if (this.auth_info.refresh_token) {
-        if (this.isRefreshTokenExpired()) {
-          console.log("Refresh token has expired, need to login");
-        } else {
-          console.log("No access token, attempting to refresh using refresh token");
-          try {
-            await this.refreshToken();
-            console.log("Successfully refreshed token");
-            return;
-          } catch (error) {
-            // If refresh fails, fall through to login
-            console.warn("Failed to refresh token, attempting login:", error);
-          }
-        }
-      }
-      
-      // No valid tokens, need to login
-      if (this.auth_info.email && this.auth_info.password) {
-        console.log("No valid tokens found, attempting login");
-        await this.login(this.auth_info.email, this.auth_info.password);
-      } else {
-        throw new Error("Invalid auth_info");
-      }
-    }
-  };
-
-  public get = async (path: string): Promise<MacBidApiResponse> => {
-    await this.ensureValidToken();
-    return (await fetch(this.API_ROOT + path, {
-      headers: this.macbid_session_headers,
-    })) as MacBidApiResponse;
-  };
-
-  public post = async (
-    path: string,
-    options?: RequestInit
-  ): Promise<MacBidApiResponse> => {
-    // Don't refresh token for auth endpoints
-    if (!path.includes("/auth/")) {
-      await this.ensureValidToken();
-    }
-    return (await fetch(this.API_ROOT + path, {
-      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-      // @ts-ignore
-      headers: this.macbid_session_headers,
-      method: "POST",
-      ...options,
-    })) as MacBidApiResponse;
-  };
-
-  /**
-   * Raise an exception if an endpoint requiring login is called without valid auth
-   */
-  private check_auth = (): boolean => {
-    if (!this.macbid_session_headers["Authorization"]) {
-      throw new Error("Not authenticated");
-    }
-    return true;
-  };
-
-  /**
-   * Do the login request
-   * @param email - User email
-   * @param password - User password
-   * @param validation_code - Optional validation code. If not provided, will check auth_info.validation_code
-   */
-  public login = async (
-    email: string,
-    password: string,
-    validation_code?: string
-  ): Promise<boolean> => {
-    const login_params = {
-      device_id: crypto.randomUUID(), // TODO: keep this the same to persist sms validation?
-      email: email,
-      password: password,
-      ref_code: null,
-      ref_r: null,
-      remember_me: true,
-      utm_campaign: null,
-      utm_medium: null,
-      utm_source: null,
-    };
-    // https://api.macdiscount.com/auth/auth-validation
-    const res = await this.post("/auth/auth-validation", {
-      body: JSON.stringify(login_params),
-    });
-
-    const resJson = await res.json();
-
-    if (resJson["message"] === "Login validation code sent") {
-      // Get validation code from parameter, auth_info, or throw error
-      const code =
-        validation_code ||
-        this.auth_info.validation_code ||
-        process.env.MACBID_VALIDATION_CODE;
-
-      if (!code) {
-        throw new Error(
-          "Validation code required. Provide it via:\n" +
-            "  1. login() method parameter: login(email, password, validation_code)\n" +
-            "  2. AuthInfo.validation_code when creating MacBid instance\n" +
-            "  3. MACBID_VALIDATION_CODE environment variable"
-        );
-      }
-
-      const validation_params = {
-        code: code,
-        device_id: login_params.device_id,
-        new_password: "",
-        remember_me: true,
-      };
-
-      const validation_res = await this.post("/auth/validate-access-code", {
-        body: JSON.stringify(validation_params),
-      });
-
-      const validation_resJson = await validation_res.json();
-
-      const access_token = validation_resJson["access_token"] as string;
-      const refresh_token = validation_resJson["refresh_token"] as string;
-      const user_id = validation_resJson["user_id"] as string;
-      const expires = validation_resJson["expires"] as number;
-      const expiration_refresh = validation_resJson["expiration_refresh"] as number;
-
-      if (access_token) {
-        this.auth_info.token = access_token as string;
-        this.auth_info.user_id = user_id as string;
-        this.macbid_session_headers["Authorization"] = this.auth_info.token;
-        this.auth_info.token_expiration = new Date(expires * 1000);
-        this.auth_info.refresh_token = refresh_token;
-        this.auth_info.refresh_token_expiration = new Date(expiration_refresh * 1000);
-        await this.saveTokens();
-        return true;
-      }
-    }
-    console.error(JSON.stringify(resJson, null, 2));
-    throw new Error("Login failed");
-  };
-
-  public get_refresh_token_expiration = (): Date => {
-    if (this.auth_info.refresh_token_expiration) {
-      return this.auth_info.refresh_token_expiration;
-    } else {
-      throw new Error("Refresh token expiration not set, make sure to login first.");
-    }
-  }
-
-  /**
-   * Check if the access token is expired or about to expire (within 5 minutes)
-   */
-  private isTokenExpired = (): boolean => {
-    if (!this.auth_info.token_expiration) {
-      return true;
-    }
-    // Refresh if token expires within 5 minutes
-    const bufferTime = 5 * 60 * 1000; // 5 minutes in milliseconds
-    return Date.now() >= this.auth_info.token_expiration.getTime() - bufferTime;
-  }
-
-  /**
-   * Check if the refresh token is expired
-   */
-  private isRefreshTokenExpired = (): boolean => {
-    if (!this.auth_info.refresh_token_expiration) {
-      return true;
-    }
-    return Date.now() >= this.auth_info.refresh_token_expiration.getTime();
-  }
-
-  /**
-   * Refresh the access token using the refresh token
-   */
-  public refreshToken = async (): Promise<boolean> => {
-    if (!this.auth_info.refresh_token) {
-      throw new Error("No refresh token available. Please login again.");
-    }
-
-    if (this.isRefreshTokenExpired()) {
-      throw new Error("Refresh token has expired. Please login again.");
-    }
-
-    const refresh_params = {
-      refresh_token: this.auth_info.refresh_token,
-    };
-
-    // Use fetch directly to avoid triggering ensureValidToken and use PUT method
-    const res = await fetch(this.API_ROOT + "/auth/refresh-token", {
-      method: "PUT",
-      body: JSON.stringify(refresh_params),
-      headers: {
-        "Content-Type": "application/json",
-      },
-    });
-
-    const resJson = (await res.json()) as {
-      error?: string;
-      access_token?: string;
-      refresh_token?: string;
-      expires?: number;
-      expiration_refresh?: number;
-    };
-
-    // Check for error response
-    if (resJson["error"]) {
-      throw new Error(`Failed to refresh token: ${resJson["error"]}`);
-    }
-
-    const access_token = resJson["access_token"] as string;
-    const refresh_token = resJson["refresh_token"] as string | undefined;
-    const expires = resJson["expires"] as number;
-    const expiration_refresh = resJson["expiration_refresh"] as number | undefined;
-
-    if (access_token) {
-      this.auth_info.token = access_token;
-      this.macbid_session_headers["Authorization"] = this.auth_info.token;
-      this.auth_info.token_expiration = new Date(expires * 1000);
-
-      // Update refresh token if a new one is provided
-      if (refresh_token) {
-        this.auth_info.refresh_token = refresh_token;
-      }
-      if (expiration_refresh) {
-        this.auth_info.refresh_token_expiration = new Date(expiration_refresh * 1000);
-      }
-
-      await this.saveTokens();
-      return true;
-    } else {
-      throw new Error("Failed to refresh token: no access token in response");
-    }
-  }
-
-  /**
-   * Ensure the access token is valid, refreshing if necessary
-   */
-  private ensureValidToken = async (): Promise<void> => {
-    if (this.isTokenExpired()) {
-      await this.refreshToken();
-    }
-  }
-
-  /**
-   * Returns the logged in user's favorites, and all of their (visible) attributes.
-   */
-  public get_watchlist = async (): Promise<WatchlistFull[]> => {
-    this.check_auth();
-    const res = await this.get(
-      `/auctions/customer/${this.auth_info["user_id"]}/active-auctions`
-    );
-
-    return (await res.json())["watchlist_full"] as WatchlistFull[];
-  };
-
-  /**
-   * Save tokens to file for persistence across restarts
-   */
-  private saveTokens = async (): Promise<void> => {
-    if (!this.tokenFilePath) {
-      console.log("No token file path provided, skipping token save");
-      return;
-    }
-
-    try {
-      const tokenData = {
-        token: this.auth_info.token,
-        refresh_token: this.auth_info.refresh_token,
-        token_expiration: this.auth_info.token_expiration?.toISOString(),
-        refresh_token_expiration: this.auth_info.refresh_token_expiration?.toISOString(),
-        user_id: this.auth_info.user_id,
-      };
-
-      await fs.writeFile(this.tokenFilePath, JSON.stringify(tokenData, null, 2), "utf-8");
-      console.log("Tokens saved to file:", this.tokenFilePath);
-    } catch (error) {
-      console.warn("Failed to save tokens:", error);
-    }
-  };
-
-  /**
-   * Load tokens from file
-   */
-  public static loadTokens = async (tokenFilePath: string): Promise<Partial<AuthInfo> | null> => {
-    try {
-      const data = await fs.readFile(tokenFilePath, "utf-8");
-      const tokenData = JSON.parse(data) as {
-        token?: string;
-        refresh_token?: string;
-        token_expiration?: string;
-        refresh_token_expiration?: string;
-        user_id?: string;
-      };
-
-      return {
-        token: tokenData.token,
-        refresh_token: tokenData.refresh_token,
-        token_expiration: tokenData.token_expiration ? new Date(tokenData.token_expiration) : undefined,
-        refresh_token_expiration: tokenData.refresh_token_expiration ? new Date(tokenData.refresh_token_expiration) : undefined,
-        user_id: tokenData.user_id,
-      };
-    } catch (error) {
-      // File doesn't exist or is invalid, return null
-      return null;
-    }
-  };
-}
-
-export default MacBid;

package/index.ts

@@ -1,2 +0,0 @@
-export { default } from "./MacBid.js";
-export * from "./MacBid.js";