@infrab4a/connect 4.9.0-beta.1 → 4.9.0-beta.2

package/index.cjs.js

@@ -2500,28 +2500,34 @@ class DuplicatedResultsError extends tsCustomError.CustomError {
 class AxiosAdapter {
     constructor(config) {
         this.config = config;
+        this.logger = DebugHelper.from(this);
     }
     async get(index, id) {
+        const logger = this.logger.with('get');
+        const req = {
+            url: `${this.config.url}/${index}/_doc/${id}`,
+            method: 'GET',
+            responseType: 'json',
+            headers: {
+                'Content-Type': 'application/json',
+                Authorization: `ApiKey ${this.config.credential}`,
+            },
+        };
         try {
-            const { data } = await axios__default["default"]({
-                url: `${this.config.url}/${index}/_doc/${id}`,
-                method: 'GET',
-                responseType: 'json',
-                headers: {
-                    'Content-Type': 'application/json',
-                    Authorization: `ApiKey ${this.config.credential}`,
-                },
-            });
+            const { data } = await axios__default["default"](req);
+            logger.log({ req, res: data });
             return data._source;
         }
         catch (error) {
+            logger.error({ req, res: error });
             if (!(error instanceof Error))
                 throw error;
             throw new NotFoundError(error.message);
         }
     }
     async query(index, query) {
-        const { data } = await axios__default["default"]({
+        const logger = this.logger.with('query');
+        const req = {
             url: `${this.config.url}/${index}/_search`,
             method: 'POST',
             responseType: 'json',
@@ -2531,34 +2537,70 @@ class AxiosAdapter {
                 Authorization: `ApiKey ${this.config.credential}`,
             },
             data: query,
-        });
-        return {
-            total: data.hits.total.value,
-            hits: data.hits.hits,
         };
+        try {
+            const { data } = await axios__default["default"](req);
+            const res = {
+                total: data.hits.total.value,
+                hits: data.hits.hits,
+            };
+            logger.log({ req, res });
+            return res;
+        }
+        catch (error) {
+            logger.error({ req, res: error });
+            throw error;
+        }
     }
     async save(index, data) {
-        await axios__default["default"]({
+        const logger = this.logger.with('save');
+        const req = {
             url: `${this.config.url}/${index}/_doc`,
             method: 'POST',
             headers: { Authorization: `ApiKey ${this.config.credential}` },
             data,
-        });
+        };
+        try {
+            await axios__default["default"](req);
+            logger.log({ req, res: undefined });
+        }
+        catch (error) {
+            logger.error({ req, res: error });
+            throw error;
+        }
     }
     async update(index, id, data) {
-        await axios__default["default"]({
+        const logger = this.logger.with('update');
+        const req = {
             url: `${this.config.url}/${index}/_update/${id}`,
             method: 'PUT',
             headers: { Authorization: `ApiKey ${this.config.credential}` },
             data,
-        });
+        };
+        try {
+            await axios__default["default"](req);
+            logger.log({ req, res: undefined });
+        }
+        catch (error) {
+            logger.error({ req, res: error });
+            throw error;
+        }
     }
     async delete(index, id) {
-        await axios__default["default"]({
+        const logger = this.logger.with('delete');
+        const req = {
             url: `${this.config.url}/${index}/_doc/${id}`,
             method: 'DELETE',
             headers: { Authorization: `ApiKey ${this.config.credential}` },
-        });
+        };
+        try {
+            await axios__default["default"](req);
+            logger.log({ req, res: undefined });
+        }
+        catch (error) {
+            logger.error({ req, res: error });
+            throw error;
+        }
     }
 }
 

package/index.esm.js

@@ -2476,28 +2476,34 @@ class DuplicatedResultsError extends CustomError {
 class AxiosAdapter {
     constructor(config) {
         this.config = config;
+        this.logger = DebugHelper.from(this);
     }
     async get(index, id) {
+        const logger = this.logger.with('get');
+        const req = {
+            url: `${this.config.url}/${index}/_doc/${id}`,
+            method: 'GET',
+            responseType: 'json',
+            headers: {
+                'Content-Type': 'application/json',
+                Authorization: `ApiKey ${this.config.credential}`,
+            },
+        };
         try {
-            const { data } = await axios({
-                url: `${this.config.url}/${index}/_doc/${id}`,
-                method: 'GET',
-                responseType: 'json',
-                headers: {
-                    'Content-Type': 'application/json',
-                    Authorization: `ApiKey ${this.config.credential}`,
-                },
-            });
+            const { data } = await axios(req);
+            logger.log({ req, res: data });
             return data._source;
         }
         catch (error) {
+            logger.error({ req, res: error });
             if (!(error instanceof Error))
                 throw error;
             throw new NotFoundError(error.message);
         }
     }
     async query(index, query) {
-        const { data } = await axios({
+        const logger = this.logger.with('query');
+        const req = {
             url: `${this.config.url}/${index}/_search`,
             method: 'POST',
             responseType: 'json',
@@ -2507,34 +2513,70 @@ class AxiosAdapter {
                 Authorization: `ApiKey ${this.config.credential}`,
             },
             data: query,
-        });
-        return {
-            total: data.hits.total.value,
-            hits: data.hits.hits,
         };
+        try {
+            const { data } = await axios(req);
+            const res = {
+                total: data.hits.total.value,
+                hits: data.hits.hits,
+            };
+            logger.log({ req, res });
+            return res;
+        }
+        catch (error) {
+            logger.error({ req, res: error });
+            throw error;
+        }
     }
     async save(index, data) {
-        await axios({
+        const logger = this.logger.with('save');
+        const req = {
             url: `${this.config.url}/${index}/_doc`,
             method: 'POST',
             headers: { Authorization: `ApiKey ${this.config.credential}` },
             data,
-        });
+        };
+        try {
+            await axios(req);
+            logger.log({ req, res: undefined });
+        }
+        catch (error) {
+            logger.error({ req, res: error });
+            throw error;
+        }
     }
     async update(index, id, data) {
-        await axios({
+        const logger = this.logger.with('update');
+        const req = {
             url: `${this.config.url}/${index}/_update/${id}`,
             method: 'PUT',
             headers: { Authorization: `ApiKey ${this.config.credential}` },
             data,
-        });
+        };
+        try {
+            await axios(req);
+            logger.log({ req, res: undefined });
+        }
+        catch (error) {
+            logger.error({ req, res: error });
+            throw error;
+        }
     }
     async delete(index, id) {
-        await axios({
+        const logger = this.logger.with('delete');
+        const req = {
             url: `${this.config.url}/${index}/_doc/${id}`,
             method: 'DELETE',
             headers: { Authorization: `ApiKey ${this.config.credential}` },
-        });
+        };
+        try {
+            await axios(req);
+            logger.log({ req, res: undefined });
+        }
+        catch (error) {
+            logger.error({ req, res: error });
+            throw error;
+        }
     }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@infrab4a/connect",
-  "version": "4.9.0-beta.1",
+  "version": "4.9.0-beta.2",
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
   },

package/src/infra/elasticsearch/adapters/axios.adapter.d.ts

@@ -7,6 +7,7 @@ export type AxiosElasticSearchConfig = {
 };
 export declare class AxiosAdapter<T extends ModelBaseStructure<T>> implements ElasticSearchAdapter<T> {
     private readonly config;
+    private logger;
     constructor(config: AxiosElasticSearchConfig);
     get(index: string, id: string): Promise<T>;
     query(index: string, query: any): Promise<ElasticSearchResult<T>>;