caprover-api 0.0.11 → 0.0.14

package/dist/api/ApiManager.d.ts

@@ -42,10 +42,11 @@ export declare class SimpleAuthenticationProvider implements AuthenticationProvi
     onAuthTokenUpdated(newAuthToken: string): void;
 }
 export default class ApiManager {
+    private authProvider;
     private http;
     constructor(baseDomain: string, authProvider: AuthenticationProvider);
     destroy(): void;
-    login(password: string, otpToken?: string): Promise<string>;
+    login(password: string, otpToken?: string): Promise<void>;
     getAllThemes(): Promise<{
         themes: CapRoverTheme[] | undefined;
     }>;

package/dist/api/ApiManager.js

@@ -23,6 +23,7 @@ class SimpleAuthenticationProvider {
 exports.SimpleAuthenticationProvider = SimpleAuthenticationProvider;
 class ApiManager {
     constructor(baseDomain, authProvider) {
+        this.authProvider = authProvider;
         const self = this;
         const URL = baseDomain + '/api/v2';
         this.http = new HttpClient_1.default(URL, () => {
@@ -34,9 +35,6 @@ class ApiManager {
             })
                 .then((authContent) => {
                 return self.login(authContent.password, authContent.otpToken);
-            }) //
-                .then((authToken) => {
-                authProvider.onAuthTokenUpdated(authToken);
             });
         });
     }
@@ -56,6 +54,9 @@ class ApiManager {
         })
             .then(function (data) {
             return data.token;
+        })
+            .then((authToken) => {
+            self.authProvider.onAuthTokenUpdated(authToken);
         });
     }
     getAllThemes() {

package/dist/api/HttpClient.d.ts

@@ -9,7 +9,7 @@ export default class HttpClient {
     createHeaders(): Promise<any>;
     destroy(): void;
     fetch(method: 'GET' | 'POST', endpoint: string, variables: any): () => Promise<any>;
-    fetchInternal(method: 'GET' | 'POST', endpoint: string, variables: any): Promise<import("axios").AxiosResponse<any, any>>;
-    getReq(endpoint: string, variables: any): Promise<import("axios").AxiosResponse<any, any>>;
-    postReq(endpoint: string, variables: any): Promise<import("axios").AxiosResponse<any, any>>;
+    fetchInternal(method: 'GET' | 'POST', endpoint: string, variables: any): Promise<any>;
+    getReq(endpoint: string, variables: any): Promise<any>;
+    postReq(endpoint: string, variables: any): Promise<any>;
 }

package/dist/api/HttpClient.js

@@ -3,11 +3,54 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const axios_1 = __importDefault(require("axios"));
 const ErrorFactory_1 = __importDefault(require("./ErrorFactory"));
+const cross_fetch_1 = __importDefault(require("cross-fetch"));
+function buildQueryParams(params) {
+    if (!params || Object.keys(params).length === 0)
+        return '';
+    return ('?' +
+        Object.entries(params)
+            .map(([key, value]) => encodeURIComponent(key) + '=' + encodeURIComponent(value))
+            .join('&'));
+}
 let TOKEN_HEADER = 'x-captain-auth';
 let NAMESPACE = 'x-namespace';
 let CAPTAIN = 'captain';
+class CrossFetchEngine {
+    static async post(url, variables, headers) {
+        const res = await (0, cross_fetch_1.default)(url, {
+            method: 'POST',
+            headers: {
+                'Content-Type': 'application/json',
+                ...headers,
+            },
+            body: JSON.stringify(variables),
+        });
+        if (!res.ok) {
+            const errBody = await res.text();
+            throw new Error(`HTTP ${res.status}: ${errBody}`);
+        }
+        return res.json();
+    }
+    static async get(url, params, headers) {
+        const fullUrl = url +
+            (params && Object.keys(params).length > 0
+                ? buildQueryParams(params)
+                : '');
+        const res = await (0, cross_fetch_1.default)(fullUrl, {
+            method: 'GET',
+            headers: {
+                'Content-Type': 'application/json',
+                ...headers,
+            },
+        });
+        if (!res.ok) {
+            const errBody = await res.text();
+            throw new Error(`HTTP ${res.status}: ${errBody}`);
+        }
+        return res.json();
+    }
+}
 class HttpClient {
     constructor(baseUrl, authTokenProvider, onLoginRequested) {
         this.baseUrl = baseUrl;
@@ -42,18 +85,18 @@ class HttpClient {
                 .then(function () {
                 return self.fetchInternal(method, endpoint, variables); //
             })
-                .then(function (axiosResponse) {
-                const data = axiosResponse.data; // this is an axios thing!
+                .then(function (fetchResponse) {
                 if (
                 // if we ever get STATUS_ERROR_NOT_AUTHORIZED when trying to log in, we will end up in an infinite loop!
-                data.status === ErrorFactory_1.default.STATUS_AUTH_TOKEN_INVALID) {
+                fetchResponse.status ===
+                    ErrorFactory_1.default.STATUS_AUTH_TOKEN_INVALID) {
                     return self
                         .onLoginRequested() //
                         .then(function () {
                         return self
                             .fetchInternal(method, endpoint, variables)
-                            .then(function (newAxiosResponse) {
-                            return newAxiosResponse.data;
+                            .then(function (httpResponse) {
+                            return httpResponse;
                         });
                     })
                         .catch(function (error) {
@@ -61,7 +104,7 @@ class HttpClient {
                     });
                 }
                 else {
-                    return data;
+                    return fetchResponse;
                 }
             })
                 .then(function (data) {
@@ -105,10 +148,7 @@ class HttpClient {
             return self.createHeaders();
         })
             .then(function (headers) {
-            return axios_1.default.get(self.baseUrl + endpoint, {
-                params: variables,
-                headers: headers,
-            });
+            return CrossFetchEngine.get(self.baseUrl + endpoint, variables, headers);
         })
             .then(function (data) {
             // console.log(data);
@@ -122,10 +162,8 @@ class HttpClient {
             return self.createHeaders();
         })
             .then(function (headers) {
-            return axios_1.default.post(self.baseUrl + endpoint, variables, {
-                headers: headers,
-            }); //
-        }) //
+            return CrossFetchEngine.post(self.baseUrl + endpoint, variables, headers);
+        })
             .then(function (data) {
             // console.log(data);
             return data;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "caprover-api",
-    "version": "0.0.11",
+    "version": "0.0.14",
     "description": "API client for CapRover",
     "types": "dist/index.d.ts",
     "main": "dist/index.js",
@@ -25,7 +25,7 @@
     "author": "",
     "license": "ISC",
     "dependencies": {
-        "axios": "^1.10.0"
+        "cross-fetch": "^4.1.0"
     },
     "devDependencies": {
         "@types/node": "^24.0.10",

package/src/api/ApiManager.ts

@@ -65,7 +65,10 @@ export class SimpleAuthenticationProvider implements AuthenticationProvider {
 export default class ApiManager {
     private http: HttpClient
 
-    constructor(baseDomain: string, authProvider: AuthenticationProvider) {
+    constructor(
+        baseDomain: string,
+        private authProvider: AuthenticationProvider
+    ) {
         const self = this
         const URL = baseDomain + '/api/v2'
         this.http = new HttpClient(
@@ -83,9 +86,6 @@ export default class ApiManager {
                             authContent.password,
                             authContent.otpToken
                         )
-                    }) //
-                    .then((authToken) => {
-                        authProvider.onAuthTokenUpdated(authToken)
                     })
             }
         )
@@ -95,7 +95,7 @@ export default class ApiManager {
         this.http.destroy()
     }
 
-    login(password: string, otpToken?: string): Promise<string> {
+    login(password: string, otpToken?: string): Promise<void> {
         const self = this
         const http = self.http
 
@@ -112,6 +112,9 @@ export default class ApiManager {
             .then(function (data) {
                 return data.token
             })
+            .then((authToken) => {
+                self.authProvider.onAuthTokenUpdated(authToken)
+            })
     }
 
     getAllThemes(): Promise<{ themes: CapRoverTheme[] | undefined }> {

package/src/api/HttpClient.ts

@@ -1,11 +1,71 @@
-import axios from 'axios'
 import ErrorFactory from './ErrorFactory'
-import { AuthenticationProvider } from './ApiManager'
+import fetch from 'cross-fetch'
 
+function buildQueryParams(params: Record<string, any>): string {
+    if (!params || Object.keys(params).length === 0) return ''
+    return (
+        '?' +
+        Object.entries(params)
+            .map(
+                ([key, value]) =>
+                    encodeURIComponent(key) + '=' + encodeURIComponent(value)
+            )
+            .join('&')
+    )
+}
 let TOKEN_HEADER = 'x-captain-auth'
 let NAMESPACE = 'x-namespace'
 let CAPTAIN = 'captain'
 
+class CrossFetchEngine {
+    public static async post(
+        url: string,
+        variables: Record<string, any>,
+        headers: Record<string, string>
+    ): Promise<any> {
+        const res = await fetch(url, {
+            method: 'POST',
+            headers: {
+                'Content-Type': 'application/json',
+                ...headers,
+            },
+            body: JSON.stringify(variables),
+        })
+
+        if (!res.ok) {
+            const errBody = await res.text()
+            throw new Error(`HTTP ${res.status}: ${errBody}`)
+        }
+        return res.json()
+    }
+
+    public static async get(
+        url: string,
+        params: Record<string, any>,
+        headers: Record<string, string>
+    ): Promise<any> {
+        const fullUrl =
+            url +
+            (params && Object.keys(params).length > 0
+                ? buildQueryParams(params)
+                : '')
+
+        const res = await fetch(fullUrl, {
+            method: 'GET',
+            headers: {
+                'Content-Type': 'application/json',
+                ...headers,
+            },
+        })
+
+        if (!res.ok) {
+            const errBody = await res.text()
+            throw new Error(`HTTP ${res.status}: ${errBody}`)
+        }
+        return res.json()
+    }
+}
+
 export default class HttpClient {
     public readonly GET = 'GET'
     public readonly POST = 'POST'
@@ -46,27 +106,26 @@ export default class HttpClient {
                 .then(function () {
                     return self.fetchInternal(method, endpoint, variables) //
                 })
-                .then(function (axiosResponse) {
-                    const data = axiosResponse.data // this is an axios thing!
-
+                .then(function (fetchResponse) {
                     if (
                         // if we ever get STATUS_ERROR_NOT_AUTHORIZED when trying to log in, we will end up in an infinite loop!
-                        data.status === ErrorFactory.STATUS_AUTH_TOKEN_INVALID
+                        fetchResponse.status ===
+                        ErrorFactory.STATUS_AUTH_TOKEN_INVALID
                     ) {
                         return self
                             .onLoginRequested() //
                             .then(function () {
                                 return self
                                     .fetchInternal(method, endpoint, variables)
-                                    .then(function (newAxiosResponse) {
-                                        return newAxiosResponse.data
+                                    .then(function (httpResponse) {
+                                        return httpResponse
                                     })
                             })
                             .catch(function (error) {
                                 return Promise.reject(error)
                             })
                     } else {
-                        return data
+                        return fetchResponse
                     }
                 })
                 .then(function (data) {
@@ -115,10 +174,11 @@ export default class HttpClient {
                 return self.createHeaders()
             })
             .then(function (headers) {
-                return axios.get(self.baseUrl + endpoint, {
-                    params: variables,
-                    headers: headers,
-                })
+                return CrossFetchEngine.get(
+                    self.baseUrl + endpoint,
+                    variables,
+                    headers
+                )
             })
             .then(function (data) {
                 // console.log(data);
@@ -133,10 +193,12 @@ export default class HttpClient {
                 return self.createHeaders()
             })
             .then(function (headers) {
-                return axios.post(self.baseUrl + endpoint, variables, {
-                    headers: headers,
-                }) //
-            }) //
+                return CrossFetchEngine.post(
+                    self.baseUrl + endpoint,
+                    variables,
+                    headers
+                )
+            })
             .then(function (data) {
                 // console.log(data);
                 return data