attlaz-client 1.18.2 → 1.18.3

package/dist/Service/FirewallEndpoint.d.ts

@@ -1,4 +1,6 @@
 import { Endpoint } from './Endpoint.js';
+import { CollectionResult } from '../Model/Result/CollectionResult.js';
+import { CursorPagination } from '../Model/Pagination/CursorPagination.js';
 export type BlockedIp = {
     ip: string;
     from: Date;
@@ -15,13 +17,10 @@ export type IpRule = {
     action: string;
     description: string;
 };
-export type FirewallInfo = {
-    blockedIps: BlockedIp[];
-    flaggedIps: FlaggedIp[];
-    ipRules: IpRule[];
-};
 export declare class FirewallEndpoint extends Endpoint {
-    getInformation(): Promise<FirewallInfo | null>;
+    getBlockedIps(pagination: CursorPagination): Promise<CollectionResult<BlockedIp>>;
+    getFlaggedIps(pagination: CursorPagination): Promise<CollectionResult<FlaggedIp>>;
+    getIpRules(pagination: CursorPagination): Promise<CollectionResult<IpRule>>;
     createIpRule(ip: string, action: string, description?: string): Promise<boolean>;
     unblockIP(ip: string): Promise<boolean>;
 }

package/dist/Service/FirewallEndpoint.js

@@ -1,44 +1,54 @@
 import { Endpoint } from './Endpoint.js';
 import { Utils } from '../Utils.js';
+import { QueryString } from '../Http/Data/QueryString.js';
 export class FirewallEndpoint extends Endpoint {
-    async getInformation() {
-        const cmd = '/system/firewall/';
-        try {
-            const parser = (raw) => {
-                const info = {
-                    blockedIps: [],
-                    flaggedIps: [],
-                    ipRules: [],
-                };
-                for (const blockedIp of raw.blocked_ips) {
-                    blockedIp.from = Utils.parseRawDate(blockedIp.from);
-                    blockedIp.to = Utils.parseRawDate(blockedIp.to);
-                    info.blockedIps.push(blockedIp);
-                }
-                for (const flaggedIp of raw.flagged_ips) {
-                    flaggedIp.date = Utils.parseRawDate(flaggedIp.date);
-                    info.flaggedIps.push(flaggedIp);
-                }
-                for (const ipRule of raw.ip_rules) {
-                    info.ipRules.push(ipRule);
-                }
-                return info;
+    async getBlockedIps(pagination) {
+        const parser = (raw) => {
+            return {
+                ip: raw.ip,
+                from: Utils.parseRawDate(raw.from),
+                to: Utils.parseRawDate(raw.to),
+                reason: raw.reason,
             };
-            const result = await this.requestObject(cmd, null, parser, 'GET');
-            return result.getData();
-        }
-        catch (ex) {
-            if (this.httpClient.isDebugEnabled()) {
-                console.error('Failed to get firewall information', ex);
-            }
-            throw ex;
-        }
+        };
+        const queryString = new QueryString('/system/firewall/blocked');
+        queryString.addPagination(pagination);
+        const result = await this.requestCollection(queryString, parser);
+        return result;
+    }
+    async getFlaggedIps(pagination) {
+        const parser = (raw) => {
+            return {
+                ip: raw.ip,
+                date: Utils.parseRawDate(raw.date),
+                reason: raw.reason,
+            };
+        };
+        const queryString = new QueryString('/system/firewall/flagged');
+        queryString.addPagination(pagination);
+        const result = await this.requestCollection(queryString, parser);
+        return result;
+    }
+    async getIpRules(pagination) {
+        const parser = (raw) => {
+            return {
+                ip: raw.ip,
+                action: raw.action,
+                description: raw.description,
+            };
+        };
+        const queryString = new QueryString('/system/firewall/rules');
+        queryString.addPagination(pagination);
+        const result = await this.requestCollection(queryString, parser);
+        return result;
     }
     async createIpRule(ip, action, description = '') {
         const cmd = '/system/firewall/ip_rules';
         try {
             const parser = (raw) => raw.success;
-            const result = await this.requestObject(cmd, { ip, action, description }, parser, 'PUT');
+            const result = await this.requestObject(cmd, {
+                ip, action, description,
+            }, parser, 'PUT');
             const re = result.getData();
             if (re === null) {
                 console.log('createIPRule wrong result', { result, parsed: re });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "attlaz-client",
-  "version": "1.18.2",
+  "version": "1.18.3",
   "description": "Javascript Client to access Attlaz API",
   "types": "./dist/index.d.ts",
   "main": "./dist/index.js",