@ibertran/fortytwo-intra-client 2.0.0 → 3.1.0

package/README.md

@@ -107,9 +107,9 @@ await client.delete('teams/123');
 The `getAll` method automatically handles pagination and returns all results:
 
 ```typescript
-// Get all users from 42 Lyon (handles pagination automatically)
+// Get all users from 42Lyon (handles pagination automatically)
 const lyonUsers = await client.getAll('campus/9/users');
-console.log(`Paris campus has ${lyonUsers.length} users`);
+console.log(`42Lyon campus has ${lyonUsers.length} users`);
 
 // Get all projects with custom page size
 const allProjects = await client.getAll('projects', {

package/dist/HttpError.d.ts

@@ -1,9 +1 @@
-declare class HttpError extends Error {
-    status: number | null;
-    url: string | null;
-    details: any;
-    constructor(err: any);
-}
-export declare function simplifySuperagentError(err: any): HttpError;
-export declare function isSuperAgentError(err: any): boolean;
 export {};

package/dist/HttpError.js

@@ -1,25 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.simplifySuperagentError = simplifySuperagentError;
-exports.isSuperAgentError = isSuperAgentError;
-class HttpError extends Error {
-    status;
-    url;
-    details;
-    constructor(err) {
-        super(err.message || "Unknown API error");
-        this.name = "HttpError";
-        this.status = err.status || null;
-        this.url = err.response?.request?.url || null;
-        this.details = err.response?.body || null;
-    }
-}
-function simplifySuperagentError(err) {
-    if (!err) {
-        return new HttpError({ message: "Unknown error" });
-    }
-    return new HttpError(err);
-}
-function isSuperAgentError(err) {
-    return (err && typeof err === "object" && ("status" in err || "response" in err));
-}
+// class HttpError extends Error {
+//   status: number | null;
+//   url: string | null;
+//   details: any;
+//   constructor(err: any) {
+//     super(err.message || "Unknown API error");
+//     this.name = "HttpError";
+//     this.status = err.status || err.response?.status || null;
+//     this.url = err.config?.url || err.request?.responseURL || null;
+//     this.details = err.response?.data || null;
+//   }
+// }
+// export function simplifyAxiosError(err: any): HttpError {
+//   if (!err) {
+//     return new HttpError({ message: "Unknown error" });
+//   }
+//   return new HttpError(err);
+// }
+// export function isAxiosError(err: any): err is AxiosError {
+//   return err && err.isAxiosError === true;
+// }

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { inputOptions, perPage } from "./types";
+import { inputOptions } from "./types";
 export interface FortytwoIntraClientConf {
     redirect_uri: string | null;
     base_url: string;
@@ -6,10 +6,12 @@ export interface FortytwoIntraClientConf {
     oauth_url: string;
     token_info_url: string;
     scopes: string[];
-    rate: number;
+    rateLimitMaxRequests: number;
+    rateLimitPerMilliseconds: number;
     maxRetry: number;
-    logs: boolean;
-    errors: boolean;
+    logLine: boolean;
+    errLogBody: boolean;
+    throwOnError: boolean;
 }
 export declare class FortytwoIntraClient {
     private client_id;
@@ -20,10 +22,14 @@ export declare class FortytwoIntraClient {
     private oauth_url;
     private token_info_url;
     private scopes;
-    private throttler;
+    private rateLimitMaxRequests;
+    private rateLimitPerMilliseconds;
+    private axiosInstance;
     private retryOn;
     private maxRetry;
-    private logs;
+    private logLine;
+    private errLogBody;
+    private throwOnError;
     private access_token;
     constructor(client_id: string, client_secret: string, conf: Partial<FortytwoIntraClientConf>);
     private generateToken;
@@ -31,13 +37,20 @@ export declare class FortytwoIntraClient {
     private reqHandler;
     private logSuccess;
     private logError;
-    get(endpoint: URL | string, options?: Omit<inputOptions, "body">): Promise<any>;
-    post(endpoint: URL | string, options?: inputOptions): Promise<any>;
-    patch(endpoint: URL | string, options: inputOptions): Promise<any>;
-    delete(endpoint: URL | string, options: inputOptions): Promise<any>;
-    getAll(endpoint: URL | string, options?: inputOptions & perPage): Promise<any>;
+    get(endpoint: URL | string, options?: Omit<inputOptions, "body" | "perPage" | "maxPage">): Promise<any>;
+    post(endpoint: URL | string, options?: Omit<inputOptions, "perPage" | "maxPage">): Promise<any>;
+    put(endpoint: URL | string, options?: Omit<inputOptions, "perPage" | "maxPage">): Promise<any>;
+    patch(endpoint: URL | string, options?: Omit<inputOptions, "perPage" | "maxPage">): Promise<any>;
+    delete(endpoint: URL | string, options?: Omit<inputOptions, "perPage" | "maxPage">): Promise<any>;
+    getAll(endpoint: URL | string, options?: Omit<inputOptions, "body">): Promise<any>;
     URL(endpoint: string): URL;
-    getOAuthUrl(redirect_uri?: string | null): string;
+    getOAuthUrl(options?: {
+        redirect_uri?: string;
+        state?: string;
+    }): {
+        url: string;
+        state: string;
+    };
     exchangeOAuthCode(code: string, redirect_uri?: string): Promise<any>;
-    tokenInfos(): Promise<any>;
+    tokenInfos(options: Omit<inputOptions, "body" | "perPage" | "maxPage">): Promise<any>;
 }

package/dist/index.js

@@ -1,47 +1,14 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FortytwoIntraClient = void 0;
-const superagent = __importStar(require("superagent"));
-// @ts-ignore
-const superagent_throttle_1 = __importDefault(require("superagent-throttle"));
-const utils_1 = require("./utils");
-const HttpError_1 = require("./HttpError");
+const axios_1 = __importDefault(require("axios"));
+const axios_rate_limit_1 = __importDefault(require("axios-rate-limit"));
+const pagination_1 = require("./lib/pagination");
+const logs_1 = require("./lib/logs");
+const crypto_1 = __importDefault(require("crypto"));
 const defaultConf = {
     redirect_uri: null,
     base_url: "https://api.intra.42.fr/v2/",
@@ -49,10 +16,12 @@ const defaultConf = {
     oauth_url: "https://api.intra.42.fr/oauth/authorize",
     token_info_url: "https://api.intra.42.fr/oauth/token/info",
     scopes: ["public"],
-    rate: 2,
+    rateLimitMaxRequests: 2,
+    rateLimitPerMilliseconds: 1200,
     maxRetry: 5,
-    logs: true,
-    errors: true,
+    logLine: true,
+    errLogBody: true,
+    throwOnError: true,
 };
 class FortytwoIntraClient {
     client_id;
@@ -63,10 +32,14 @@ class FortytwoIntraClient {
     oauth_url;
     token_info_url;
     scopes;
-    throttler;
+    rateLimitMaxRequests;
+    rateLimitPerMilliseconds;
+    axiosInstance;
     retryOn;
     maxRetry;
-    logs;
+    logLine;
+    errLogBody;
+    throwOnError;
     access_token;
     constructor(client_id, client_secret, conf) {
         this.client_id = client_id;
@@ -78,28 +51,32 @@ class FortytwoIntraClient {
         this.oauth_url = config.oauth_url;
         this.token_info_url = config.token_info_url;
         this.scopes = config.scopes;
-        this.throttler = new superagent_throttle_1.default({
-            rate: config.rate,
-            ratePer: 1100,
-            concurrent: config.rate - 1 > 0 ? config.rate - 1 : 1,
+        this.rateLimitMaxRequests = config.rateLimitMaxRequests;
+        this.rateLimitPerMilliseconds = config.rateLimitPerMilliseconds;
+        // Create axios instance with rate limiting
+        const axiosInstance = axios_1.default.create();
+        this.axiosInstance = (0, axios_rate_limit_1.default)(axiosInstance, {
+            maxRequests: this.rateLimitMaxRequests,
+            perMilliseconds: this.rateLimitPerMilliseconds,
         });
         this.retryOn = [401, 429, 500];
         this.maxRetry = config.maxRetry;
-        this.logs = config.logs;
+        this.logLine = config.logLine;
+        this.errLogBody = config.errLogBody;
+        this.throwOnError = config.throwOnError;
         this.access_token = null;
     }
     async generateToken() {
-        const res = await superagent.post(this.token_url).send({
+        const res = await this.axiosInstance.post(this.token_url, {
             grant_type: "client_credentials",
             client_id: this.client_id,
             client_secret: this.client_secret,
             scope: this.scopes.join(" "),
         });
-        return res.body.access_token;
+        return res.data.access_token;
     }
     async fetch(url, options) {
-        const { method, body } = options;
-        const req = (0, utils_1.initRequest)(method, url);
+        const { method, body, query } = options;
         if (!options.token && !this.access_token) {
             this.access_token = await this.generateToken();
         }
@@ -107,16 +84,26 @@ class FortytwoIntraClient {
         const accessToken = options.token
             ? options.token.access_token
             : this.access_token;
-        req.set("Authorization", `Bearer ${accessToken}`);
-        // Add query string
-        if (options.query)
-            req.query(options.query);
-        // Send body if any is provided
-        if (body)
-            req.send(body);
-        // Throttle resquest based on rate limit
-        req.use(this.throttler.plugin());
-        return req;
+        // Extract query parameters from URL and combine with options.query
+        const urlParams = {};
+        url.searchParams.forEach((value, key) => {
+            urlParams[key] = value;
+        });
+        // Combine URL params with query params (query params take precedence)
+        const combinedParams = { ...urlParams, ...query };
+        // Create clean URL without query parameters
+        const cleanUrl = new URL(url);
+        cleanUrl.search = '';
+        // Use the rate-limited axios instance
+        return this.axiosInstance.request({
+            method: method.toLowerCase(),
+            url: cleanUrl.toString(),
+            headers: {
+                Authorization: `Bearer ${accessToken}`,
+            },
+            params: combinedParams,
+            data: body ? body : undefined,
+        });
     }
     async reqHandler(url, options) {
         try {
@@ -125,20 +112,20 @@ class FortytwoIntraClient {
             return res;
         }
         catch (err) {
-            if ((0, HttpError_1.isSuperAgentError)(err)) {
+            if (err.isAxiosError) {
+                this.logError(err, options);
                 const { attempt, maxRetry } = options;
-                this.logError(err, url, options);
-                if (maxRetry > 0 &&
-                    attempt < maxRetry &&
-                    this.retryOn.includes(err.status)) {
-                    if (err.status === 401) {
+                const status = err.response?.status;
+                if (maxRetry > 0 && attempt < maxRetry && status && this.retryOn.includes(status)) {
+                    if (status === 401) {
                         this.access_token = null;
                     }
                     options.attempt++;
                     return this.reqHandler(url, options);
                 }
                 else {
-                    throw (0, HttpError_1.simplifySuperagentError)(err);
+                    if (this.throwOnError)
+                        throw err;
                 }
             }
             else {
@@ -147,18 +134,23 @@ class FortytwoIntraClient {
         }
     }
     logSuccess(res, options) {
-        const method = options.method.padEnd(6, " ");
-        const color = "\x1b[42m";
-        const reset = "\x1b[0m";
-        const msg = `${color + res.status + reset} ${method} ${res.request.url}${options.attempt ? ` retry ${options.attempt}/${options.maxRetry}` : ``}`;
-        console.log(msg);
+        if (!options.logLine)
+            return;
+        const line = (0, logs_1.getLogLine)(res, options);
+        console.log(line);
     }
-    logError(err, url, options) {
-        const method = options.method.padEnd(6, " ");
-        const color = "\x1b[41m";
-        const reset = "\x1b[0m";
-        const msg = `${color + err.status + reset} ${method} ${err.response.request.url}${options.attempt ? ` retry ${options.attempt}/${options.maxRetry}` : ``}`;
-        console.log(msg, JSON.stringify(err.response.body, null, 2));
+    logError(err, options) {
+        if (!options.logLine)
+            return;
+        const line = (0, logs_1.getErrorLogLine)(err, options);
+        const body = err.response?.data;
+        const logBody = options.errLogBody && body && Object.keys(body).length;
+        try {
+            console.log(line, logBody ? JSON.stringify(body, null, 2) : "");
+        }
+        catch {
+            console.log(line, logBody ? body : "");
+        }
     }
     // Public methods
     async get(endpoint, options = {}) {
@@ -169,9 +161,11 @@ class FortytwoIntraClient {
             method: "GET",
             attempt: 0,
             maxRetry: this.maxRetry,
+            logLine: this.logLine,
+            errLogBody: this.errLogBody,
             ...options,
         });
-        return res.body;
+        return res?.data;
     }
     async post(endpoint, options = {}) {
         if (endpoint instanceof URL === false) {
@@ -181,11 +175,27 @@ class FortytwoIntraClient {
             method: "POST",
             attempt: 0,
             maxRetry: this.maxRetry,
+            logLine: this.logLine,
+            errLogBody: this.errLogBody,
+            ...options,
+        });
+        return res?.data;
+    }
+    async put(endpoint, options = {}) {
+        if (endpoint instanceof URL === false) {
+            endpoint = new URL(endpoint, this.base_url);
+        }
+        const res = await this.reqHandler(endpoint, {
+            method: "PUT",
+            attempt: 0,
+            maxRetry: this.maxRetry,
+            logLine: this.logLine,
+            errLogBody: this.errLogBody,
             ...options,
         });
-        return res.body;
+        return res?.data;
     }
-    async patch(endpoint, options) {
+    async patch(endpoint, options = {}) {
         if (endpoint instanceof URL === false) {
             endpoint = new URL(endpoint, this.base_url);
         }
@@ -193,11 +203,13 @@ class FortytwoIntraClient {
             method: "PATCH",
             attempt: 0,
             maxRetry: this.maxRetry,
+            logLine: this.logLine,
+            errLogBody: this.errLogBody,
             ...options,
         });
-        return res.body;
+        return res?.data;
     }
-    async delete(endpoint, options) {
+    async delete(endpoint, options = {}) {
         if (endpoint instanceof URL === false) {
             endpoint = new URL(endpoint, this.base_url);
         }
@@ -205,9 +217,11 @@ class FortytwoIntraClient {
             method: "DELETE",
             attempt: 0,
             maxRetry: this.maxRetry,
+            logLine: this.logLine,
+            errLogBody: this.errLogBody,
             ...options,
         });
-        return res.body;
+        return res?.data;
     }
     async getAll(endpoint, options = {}) {
         if (endpoint instanceof URL === false) {
@@ -218,63 +232,76 @@ class FortytwoIntraClient {
         const initialRes = await this.reqHandler(url, {
             method: "GET",
             attempt: 0,
+            currpage: 1,
+            lastPage: Infinity,
             maxRetry: this.maxRetry,
+            logLine: this.logLine,
+            errLogBody: this.errLogBody,
             ...options,
             query: {
+                ...options.query,
                 page: 1,
-                per_page: 100,
-            },
+                per_page: perPage,
+            }
         });
         let lastPage;
         try {
-            lastPage = (0, utils_1.getLastPage)(initialRes.header["link"]);
+            lastPage = Math.min((0, pagination_1.getLastPage)(initialRes.headers["link"]), options.maxPages || Infinity);
         }
         catch (err) {
-            return initialRes.body;
+            return initialRes?.data;
         }
         const promises = [];
         for (let i = 2; i <= lastPage; i++) {
             url = new URL(endpoint);
-            url.searchParams.append("per_page", perPage.toString());
-            url.searchParams.append("page", i.toString());
             promises.push(this.reqHandler(url, {
                 method: "GET",
                 attempt: 0,
+                currpage: i,
+                lastPage: lastPage,
                 maxRetry: this.maxRetry,
+                logLine: this.logLine,
+                errLogBody: this.errLogBody,
                 ...options,
+                query: {
+                    ...options.query,
+                    page: i,
+                    per_page: perPage,
+                }
             }));
         }
         return Promise.all(promises).then((values) => {
-            return initialRes.body.concat(...values.map((value) => value.body));
+            return initialRes?.data.concat(...values.map((value) => value.data));
         });
     }
     URL(endpoint) {
         return new URL(endpoint, this.base_url);
     }
-    getOAuthUrl(redirect_uri = null) {
-        redirect_uri ??= this.redirect_uri;
-        if (!redirect_uri) {
-            throw new Error(`undefined redirect_uri`);
-        }
+    getOAuthUrl(options = {}) {
+        const redirectUri = options.redirect_uri || this.redirect_uri;
+        if (!redirectUri)
+            throw new Error(`Missing redirect_uri parameter`);
+        const state = options.state || crypto_1.default.randomBytes(32).toString('base64url');
         const url = new URL(this.oauth_url);
         url.searchParams.set("client_id", this.client_id);
-        url.searchParams.set("redirect_uri", redirect_uri);
+        url.searchParams.set("redirect_uri", redirectUri);
         url.searchParams.set("response_type", "code");
         url.searchParams.set("scope", this.scopes.join(" "));
-        return url.toString();
+        url.searchParams.set("state", state);
+        return { url: url.toString(), state };
     }
     async exchangeOAuthCode(code, redirect_uri) {
-        const res = await superagent.post(this.token_url).send({
+        const res = await this.axiosInstance.post(this.token_url, {
             grant_type: "authorization_code",
             client_id: this.client_id,
             client_secret: this.client_secret,
             redirect_uri: redirect_uri ? redirect_uri : this.redirect_uri,
             code: code,
         });
-        return res.body;
+        return res?.data;
     }
-    async tokenInfos() {
-        return this.get(this.token_info_url);
+    async tokenInfos(options) {
+        return this.get(this.token_info_url, options);
     }
 }
 exports.FortytwoIntraClient = FortytwoIntraClient;

package/dist/lib/logs.d.ts

@@ -0,0 +1,4 @@
+import { reqOptions } from "../types";
+import { AxiosResponse, AxiosError } from "axios";
+export declare function getLogLine(res: AxiosResponse, options: reqOptions): string;
+export declare function getErrorLogLine(err: AxiosError, options: reqOptions): string;

package/dist/lib/logs.js

@@ -0,0 +1,47 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getLogLine = getLogLine;
+exports.getErrorLogLine = getErrorLogLine;
+const green = "\x1b[42m";
+const red = "\x1b[41m";
+const reset = "\x1b[0m";
+function getLogLine(res, options) {
+    const tokens = [];
+    // Get query parameters as object
+    const queryParams = res.config?.params || {};
+    tokens.push(`${green}${res.status}${reset}`);
+    tokens.push(options.method.padEnd(6, " "));
+    // Add the base URL path
+    if (res.config?.url) {
+        const url = new URL(res.config.url);
+        tokens.push(url.pathname);
+    }
+    // Add query parameters as object if they exist
+    console.log(queryParams);
+    if (Object.keys(queryParams).length > 0) {
+        delete queryParams.per_page;
+        delete queryParams.page;
+        tokens.push(JSON.stringify(queryParams));
+    }
+    if (options.currpage) {
+        tokens.push(`| page: ${options.currpage}/${options.lastPage === Infinity ? "unknown" : options.lastPage}`);
+    }
+    return tokens.join(" ");
+}
+function getErrorLogLine(err, options) {
+    const tokens = [];
+    // Get query parameters as object
+    const queryParams = err.config?.params || {};
+    tokens.push(`${red}${err.status}${reset}`);
+    tokens.push(options.method.padEnd(6, " "));
+    // Add the base URL path
+    if (err.config?.url) {
+        const url = new URL(err.config.url);
+        tokens.push(url.pathname);
+    }
+    // Add query parameters as object if they exist
+    if (Object.keys(queryParams).length > 0) {
+        tokens.push(JSON.stringify(queryParams));
+    }
+    return tokens.join(" ");
+}

package/dist/lib/pagination.d.ts

@@ -0,0 +1 @@
+export declare function getLastPage(header: string | undefined): number;

package/dist/lib/pagination.js

@@ -0,0 +1,29 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getLastPage = getLastPage;
+function getLastPage(header) {
+    if (!header) {
+        throw Error("No pagination link header");
+    }
+    const paginationlinks = header
+        .split(",")
+        .reduce((links, part) => {
+        const match = part.match(/<([^>]+)>\s*;\s*rel="([^"]+)"/);
+        if (match) {
+            const url = match[1];
+            const rel = match[2];
+            links[rel] = url;
+        }
+        return links;
+    }, {});
+    if (!paginationlinks.last) {
+        throw Error("Missing last page link");
+    }
+    const lastPageUrl = new URL(paginationlinks.last);
+    const rawLastPage = lastPageUrl.searchParams.get("page");
+    const lastPage = rawLastPage ? parseInt(rawLastPage, 10) : undefined;
+    if (!lastPage || isNaN(lastPage)) {
+        throw Error("Invalid last page link");
+    }
+    return lastPage;
+}

package/dist/log.d.ts

@@ -0,0 +1,4 @@
+import { reqOptions } from "./types";
+import { AxiosResponse, AxiosError } from "axios";
+export declare function getLogLine(res: AxiosResponse, options: reqOptions): string;
+export declare function getErrorLogLine(err: AxiosError, options: reqOptions): string;

package/dist/log.js

@@ -0,0 +1,51 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getLogLine = getLogLine;
+exports.getErrorLogLine = getErrorLogLine;
+const green = "\x1b[42m";
+const red = "\x1b[41m";
+const reset = "\x1b[0m";
+function getLogLine(res, options) {
+    const tokens = [];
+    // Get query parameters as object
+    const queryParams = res.config?.params || {};
+    if (process.stdout.isTTY) {
+        tokens.push(`${green}${res.status}${reset}`);
+    }
+    else {
+        tokens.push(`${res.status}`);
+    }
+    tokens.push(options.method.padEnd(6, " "));
+    // Add the base URL path
+    if (res.config?.url) {
+        const url = new URL(res.config.url);
+        tokens.push(url.pathname);
+    }
+    // Add query parameters as object if they exist
+    if (Object.keys(queryParams).length > 0) {
+        tokens.push(JSON.stringify(queryParams));
+    }
+    return tokens.join(" ");
+}
+function getErrorLogLine(err, options) {
+    const tokens = [];
+    // Get query parameters as object
+    const queryParams = err.config?.params || {};
+    if (process.stdout.isTTY) {
+        tokens.push(`${red}${err.status}${reset}`);
+    }
+    else {
+        tokens.push(`${err.status}`);
+    }
+    tokens.push(options.method.padEnd(6, " "));
+    // Add the base URL path
+    if (err.config?.url) {
+        const url = new URL(err.config.url);
+        tokens.push(url.pathname);
+    }
+    // Add query parameters as object if they exist
+    if (Object.keys(queryParams).length > 0) {
+        tokens.push(JSON.stringify(queryParams));
+    }
+    return tokens.join(" ");
+}

package/dist/types.d.ts

@@ -1,20 +1,26 @@
-export type Method = "GET" | "POST" | "PATCH" | "DELETE";
+export type Method = "GET" | "POST" | "PUT" | "PATCH" | "DELETE";
 export type userToken = {
     access_token: string;
 };
 export type reqOptions = {
     method: Method;
-    maxRetry: number;
     attempt: number;
+    currpage?: number;
+    lastPage?: number;
+    maxRetry: number;
+    perPage?: number;
+    maxPages?: number;
     body?: any;
     token?: userToken;
     query?: querystring;
+    logLine?: boolean;
+    errLogBody?: boolean;
 };
 export type querystring = Record<string, string | number | boolean | Array<string | number | boolean>>;
 export type perPage = {
     perPage?: number;
 };
-type internal = "method" | "attempt";
+type internal = "method" | "attempt" | "page";
 type optional = "maxRetry";
 export type inputOptions = Omit<reqOptions, internal | optional> & Partial<Pick<reqOptions, optional>>;
 export {};

package/dist/utils.d.ts

@@ -1,4 +1 @@
-import * as superagent from "superagent";
-import { Method } from "./types";
-export declare function initRequest(method: Method, url: URL): superagent.Request;
 export declare function getLastPage(header: string | undefined): number;

package/dist/utils.js

@@ -1,56 +1,6 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.initRequest = initRequest;
 exports.getLastPage = getLastPage;
-const superagent = __importStar(require("superagent"));
-function initRequest(method, url) {
-    const endpoint = url.toString();
-    switch (method) {
-        case "GET":
-            return superagent.get(endpoint);
-        case "POST":
-            return superagent.post(endpoint);
-        case "PATCH":
-            return superagent.patch(endpoint);
-        case "DELETE":
-            return superagent.delete(endpoint);
-        default:
-            throw Error("Invalid HTTP method");
-    }
-}
 function getLastPage(header) {
     if (!header) {
         throw Error("No pagination link header");

package/package.json

@@ -1,20 +1,20 @@
 {
   "name": "@ibertran/fortytwo-intra-client",
-  "version": "2.0.0",
+  "version": "3.1.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "scripts": {
-    "build": "tsc",
-    "prepare": "npm run build"
+    "build": "tsc"
   },
   "dependencies": {
-    "superagent": "^10.2.1",
-    "superagent-throttle": "^1.0.1"
+    "axios": "^1.6.2",
+    "axios-rate-limit": "^1.3.0"
   },
   "devDependencies": {
-    "@types/superagent": "^8.1.9",
+    "typescript": "^5.9.3",
+    "dotenv": "^16.6.1",
     "ts-node": "^10.9.2",
-    "tsc": "^2.0.4"
+    "express": "^4.18.2"
   },
   "files": [
     "dist",