cloudflare-ddns-sync 2.0.6 → 3.0.1

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## v3
+
+### v3.0.1
+
+- ⬆️ Update dependencies
+
+### v3.0.0
+
+**This package will now be released as native ECMAScript module.**
+
+- ✨ **Add possibility to use Cloudflare API Token**
+- ♻️ Reduce request if many DNS Records exist for one Zone
+- ⬆️ Update dependencies
+
 ## v2
 
 ### v2.0.6

package/README.md

@@ -1,9 +1,9 @@
 # Cloudflare-DDNS-Sync
 
-![](https://github.com/SteffenKn/Cloudflare-ddns-sync/workflows/Test-Workflow/badge.svg)
-
-[![NPM](https://nodei.co/npm/cloudflare-ddns-sync.png)](https://www.npmjs.com/package/cloudflare-ddns-sync)
-[![NPM](https://nodei.co/npm/cloudflare-ddns-sync-cli.png)](https://www.npmjs.com/package/cloudflare-ddns-sync-cli)
+![](https://github.com/SteffenKn/cloudflare-ddns-sync/actions/workflows/push.yml/badge.svg)
+[![npm version](https://badge.fury.io/js/cloudflare-ddns-sync.svg)](https://www.npmjs.com/package/cloudflare-ddns-sync)
+[![Downloads](https://img.shields.io/npm/dm/cloudflare-ddns-sync.svg)](https://www.npmjs.com/package/cloudflare-ddns-sync)
+[![CLI](https://img.shields.io/badge/CLI-npm-important.svg)](https://www.npmjs.com/package/cloudflare-ddns-sync-cli)
 
 ## Overview
 
@@ -17,7 +17,7 @@ You may also have a look at the **official** [CLI version](https://www.npmjs.com
 
 ### Prerequisites
 
-- Node (14, 16, 18)
+- Node
 - Cloudflare Account
 
 ### Installation
@@ -38,21 +38,26 @@ in your project folder.
 ### Javascript Example
 
 ```javascript
-const Cddnss = require("cloudflare-ddns-sync").default;
+const Cddnss = require('cloudflare-ddns-sync').default;
 
-const cddnss = new Cddnss("your@email.com", "<your-cloudflare-api-key>");
+// either email and key or token
+const cddnss = new Cddnss({
+  email: 'your@email.com',
+  key: '<your-cloudflare-api-key>',
+  token: '<your-cloudflare-api-token>',
+});
 
 const records = [
   {
-    name: "test-1.domain.com",
-    type: "A", // optional
+    name: 'test-1.domain.com',
+    type: 'A', // optional
     proxied: true, // optional
     ttl: 1, // optional
     priority: 0, // optional
-    content: "1.2.3.4", // optional
+    content: '1.2.3.4', // optional
   },
   {
-    name: "test-2.domain.com",
+    name: 'test-2.domain.com',
   },
 ];
 
@@ -64,24 +69,26 @@ cddnss.syncRecords(records).then((result) => {
 ### Typescript Example
 
 ```typescript
-import Cddnss, { Record, RecordData } from "cloudflare-ddns-sync";
+import Cddnss, {Record, RecordData} from 'cloudflare-ddns-sync';
 
-const cddnss: Cddnss = new Cddnss(
-  "your@email.com",
-  "<your-cloudflare-api-key>"
-);
+// either email and key or token
+const cddnss = new Cddnss({
+  email: 'your@email.com',
+  key: '<your-cloudflare-api-key>',
+  token: '<your-cloudflare-api-token>',
+});
 
 const records: Array<Record> = [
   {
-    name: "test-1.yourdomain.com",
-    type: "A", // optional
+    name: 'test-1.yourdomain.com',
+    type: 'A', // optional
     proxied: true, // optional
     ttl: 1, // optional
     priority: 0, // optional
-    content: "1.2.3.4", // optional
+    content: '1.2.3.4', // optional
   },
   {
-    name: "test-2.yourdomain.com",
+    name: 'test-2.yourdomain.com',
   },
 ];
 

package/dist/index.d.ts

@@ -1,8 +1,8 @@
 import { ScheduledTask } from 'node-cron';
-import { DomainRecordList, MultiSyncCallback, Record, RecordData } from './contracts/index';
+import { Auth, DomainRecordList, MultiSyncCallback, Record, RecordData } from './types/index.js';
 export default class CloudflareDDNSSync {
     private cloudflareClient;
-    constructor(email: string, authKey: string);
+    constructor(auth: Auth);
     getIp(): Promise<string>;
     getIpv6(): Promise<string>;
     getRecordDataForDomain(domain: string): Promise<Array<RecordData>>;
@@ -16,4 +16,4 @@ export default class CloudflareDDNSSync {
     syncRecord(record: Record, ip?: string): Promise<RecordData>;
     syncRecords(records: Array<Record>, ip?: string): Promise<Array<RecordData>>;
 }
-export * from './contracts/index';
+export * from './types/index.js';

package/dist/index.js

@@ -1,35 +1,16 @@
-"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 __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const cloudflare_client_1 = __importDefault(require("./lib/cloudflare-client"));
-const cron_1 = __importDefault(require("./lib/cron"));
-const ip_utils_1 = __importDefault(require("./lib/ip-utils"));
-class CloudflareDDNSSync {
+import CloudflareClient from './lib/cloudflare-client.js';
+import Cron from './lib/cron.js';
+import ipUtils from './lib/ip-utils.js';
+export default class CloudflareDDNSSync {
     cloudflareClient;
-    constructor(email, authKey) {
-        this.cloudflareClient = new cloudflare_client_1.default(email, authKey);
+    constructor(auth) {
+        this.cloudflareClient = new CloudflareClient(auth);
     }
     getIp() {
-        return ip_utils_1.default.getIpv4();
+        return ipUtils.getIpv4();
     }
     getIpv6() {
-        return ip_utils_1.default.getIpv6();
+        return ipUtils.getIpv6();
     }
     getRecordDataForDomain(domain) {
         return this.cloudflareClient.getRecordDataForDomain(domain);
@@ -47,21 +28,21 @@ class CloudflareDDNSSync {
         return this.cloudflareClient.removeRecordByNameAndType(recordName, recordType);
     }
     stopSyncOnIpChange(changeListenerId) {
-        ip_utils_1.default.removeIpChangeListener(changeListenerId);
+        ipUtils.removeIpChangeListener(changeListenerId);
     }
     syncByCronTime(cronExpression, records, callback, ip) {
-        return cron_1.default.createCronJob(cronExpression, async () => {
+        return Cron.createCronJob(cronExpression, async () => {
             const result = await this.syncRecords(records, ip);
             callback(result);
         });
     }
     async syncOnIpChange(records, callback) {
-        const changeListenerId = await ip_utils_1.default.addIpChangeListener(async (ip) => {
+        const changeListenerId = await ipUtils.addIpChangeListener(async (ip) => {
             const result = await this.syncRecords(records, ip);
             callback(result);
         });
         // Sync records to make sure the current ip is already set.
-        const currentIp = await ip_utils_1.default.getIpv4();
+        const currentIp = await ipUtils.getIpv4();
         this.syncRecords(records, currentIp).then((syncedRecords) => {
             callback(syncedRecords);
         });
@@ -74,5 +55,4 @@ class CloudflareDDNSSync {
         return this.cloudflareClient.syncRecords(records, ip);
     }
 }
-exports.default = CloudflareDDNSSync;
-__exportStar(require("./contracts/index"), exports);
+export * from './types/index.js';

package/dist/lib/cloudflare-client.d.ts

@@ -1,8 +1,9 @@
-import { DomainRecordList, Record, RecordData } from '../contracts';
+import Cloudflare from 'cloudflare';
+import { DomainRecordList, Record, RecordData } from '../types/index.js';
 export default class CloudflareClient {
     private cloudflare;
     private zoneMap;
-    constructor(email: string, authKey: string);
+    constructor(auth: Cloudflare.AuthObject);
     syncRecord(record: Record, ip?: string): Promise<RecordData>;
     syncRecords(records: Array<Record>, ip?: string): Promise<Array<RecordData>>;
     removeRecordByNameAndType(recordName: string, recordType?: string): Promise<void>;

package/dist/lib/cloudflare-client.js

@@ -1,27 +1,18 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const parse_domain_1 = require("parse-domain");
-const cloudflare_1 = __importDefault(require("cloudflare"));
-const ip_utils_1 = __importDefault(require("./ip-utils"));
+import { ParseResultType, fromUrl, parseDomain } from 'parse-domain';
+import Cloudflare from 'cloudflare';
+import IPUtils from './ip-utils.js';
 const ipv4Regex = /^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$/u;
-// eslint-disable-next-line max-len
 const ipv6Regex = /^(?:(?:(?:(?:(?:(?:(?:[0-9a-fA-F]{1,4})):){6})(?:(?:(?:(?:(?:[0-9a-fA-F]{1,4})):(?:(?:[0-9a-fA-F]{1,4})))|(?:(?:(?:(?:(?:25[0-5]|(?:[1-9]|1[0-9]|2[0-4])?[0-9]))\.){3}(?:(?:25[0-5]|(?:[1-9]|1[0-9]|2[0-4])?[0-9])))))))|(?:(?:::(?:(?:(?:[0-9a-fA-F]{1,4})):){5})(?:(?:(?:(?:(?:[0-9a-fA-F]{1,4})):(?:(?:[0-9a-fA-F]{1,4})))|(?:(?:(?:(?:(?:25[0-5]|(?:[1-9]|1[0-9]|2[0-4])?[0-9]))\.){3}(?:(?:25[0-5]|(?:[1-9]|1[0-9]|2[0-4])?[0-9])))))))|(?:(?:(?:(?:(?:[0-9a-fA-F]{1,4})))?::(?:(?:(?:[0-9a-fA-F]{1,4})):){4})(?:(?:(?:(?:(?:[0-9a-fA-F]{1,4})):(?:(?:[0-9a-fA-F]{1,4})))|(?:(?:(?:(?:(?:25[0-5]|(?:[1-9]|1[0-9]|2[0-4])?[0-9]))\.){3}(?:(?:25[0-5]|(?:[1-9]|1[0-9]|2[0-4])?[0-9])))))))|(?:(?:(?:(?:(?:(?:[0-9a-fA-F]{1,4})):){0,1}(?:(?:[0-9a-fA-F]{1,4})))?::(?:(?:(?:[0-9a-fA-F]{1,4})):){3})(?:(?:(?:(?:(?:[0-9a-fA-F]{1,4})):(?:(?:[0-9a-fA-F]{1,4})))|(?:(?:(?:(?:(?:25[0-5]|(?:[1-9]|1[0-9]|2[0-4])?[0-9]))\.){3}(?:(?:25[0-5]|(?:[1-9]|1[0-9]|2[0-4])?[0-9])))))))|(?:(?:(?:(?:(?:(?:[0-9a-fA-F]{1,4})):){0,2}(?:(?:[0-9a-fA-F]{1,4})))?::(?:(?:(?:[0-9a-fA-F]{1,4})):){2})(?:(?:(?:(?:(?:[0-9a-fA-F]{1,4})):(?:(?:[0-9a-fA-F]{1,4})))|(?:(?:(?:(?:(?:25[0-5]|(?:[1-9]|1[0-9]|2[0-4])?[0-9]))\.){3}(?:(?:25[0-5]|(?:[1-9]|1[0-9]|2[0-4])?[0-9])))))))|(?:(?:(?:(?:(?:(?:[0-9a-fA-F]{1,4})):){0,3}(?:(?:[0-9a-fA-F]{1,4})))?::(?:(?:[0-9a-fA-F]{1,4})):)(?:(?:(?:(?:(?:[0-9a-fA-F]{1,4})):(?:(?:[0-9a-fA-F]{1,4})))|(?:(?:(?:(?:(?:25[0-5]|(?:[1-9]|1[0-9]|2[0-4])?[0-9]))\.){3}(?:(?:25[0-5]|(?:[1-9]|1[0-9]|2[0-4])?[0-9])))))))|(?:(?:(?:(?:(?:(?:[0-9a-fA-F]{1,4})):){0,4}(?:(?:[0-9a-fA-F]{1,4})))?::)(?:(?:(?:(?:(?:[0-9a-fA-F]{1,4})):(?:(?:[0-9a-fA-F]{1,4})))|(?:(?:(?:(?:(?:25[0-5]|(?:[1-9]|1[0-9]|2[0-4])?[0-9]))\.){3}(?:(?:25[0-5]|(?:[1-9]|1[0-9]|2[0-4])?[0-9])))))))|(?:(?:(?:(?:(?:(?:[0-9a-fA-F]{1,4})):){0,5}(?:(?:[0-9a-fA-F]{1,4})))?::)(?:(?:[0-9a-fA-F]{1,4})))|(?:(?:(?:(?:(?:(?:[0-9a-fA-F]{1,4})):){0,6}(?:(?:[0-9a-fA-F]{1,4})))?::))))$/u;
-class CloudflareClient {
+export default class CloudflareClient {
     cloudflare;
     zoneMap = new Map();
-    constructor(email, authKey) {
-        this.cloudflare = new cloudflare_1.default({
-            email: email,
-            key: authKey,
-        });
+    constructor(auth) {
+        this.cloudflare = new Cloudflare(auth);
         this.updateZoneMap();
     }
     async syncRecord(record, ip) {
         const recordIds = await this.getRecordIdsForRecords([record]);
-        const ipToUse = ip ? ip : await ip_utils_1.default.getIpv4();
+        const ipToUse = ip ? ip : await IPUtils.getIpv4();
         const zoneId = await this.getZoneIdByRecordName(record.name);
         const recordId = recordIds.get(this.getRecordIdMapKey(record));
         const recordExists = recordId !== undefined;
@@ -34,7 +25,7 @@ class CloudflareClient {
     }
     async syncRecords(records, ip) {
         const recordIds = await this.getRecordIdsForRecords(records);
-        const ipToUse = ip ? ip : await ip_utils_1.default.getIpv4();
+        const ipToUse = ip ? ip : await IPUtils.getIpv4();
         const resultPromises = records.map(async (record) => {
             const zoneId = await this.getZoneIdByRecordName(record.name);
             const recordId = recordIds.get(this.getRecordIdMapKey(record));
@@ -53,7 +44,7 @@ class CloudflareClient {
         const recordTypeToUse = recordType ? recordType : 'A';
         const zoneId = await this.getZoneIdByRecordName(recordName);
         const recordId = await this.getRecordIdByNameAndType(recordName, recordTypeToUse);
-        return this.cloudflare.dnsRecords.del(zoneId, recordId);
+        await this.cloudflare.dnsRecords.del(zoneId, recordId);
     }
     async getRecordDataForRecord(record) {
         const domain = this.getDomainByRecordName(record.name);
@@ -65,9 +56,7 @@ class CloudflareClient {
         const domains = this.getDomainsFromRecords(records);
         const recordDataPromises = domains.map(async (domain) => {
             const recordDataForDomain = await this.getRecordsByDomain(domain);
-            const recordDataForDomainFilteredByRecords = recordDataForDomain
-                .filter((singleRecordData) => records
-                .some((record) => record.name.toLowerCase() === singleRecordData.name.toLowerCase()));
+            const recordDataForDomainFilteredByRecords = recordDataForDomain.filter((singleRecordData) => records.some((record) => record.name.toLowerCase() === singleRecordData.name.toLowerCase()));
             return recordDataForDomainFilteredByRecords;
         });
         const recordDataForDomains = await Promise.all(recordDataPromises);
@@ -88,61 +77,67 @@ class CloudflareClient {
         return recordData;
     }
     async createRecord(zoneId, record, ip) {
-        const copyOfRecord = { ...record };
-        copyOfRecord.name = record.name.toLowerCase();
-        copyOfRecord.content = copyOfRecord.content ? copyOfRecord.content : ip;
-        copyOfRecord.type = copyOfRecord.type ? copyOfRecord.type : 'A';
-        if (!copyOfRecord.content) {
-            throw Error(`Could not create Record "${copyOfRecord.name}": Content is missing!`);
-        }
-        if (copyOfRecord.type === 'A') {
-            if (!copyOfRecord.content.match(ipv4Regex)) {
-                throw Error(`Could not create Record "${copyOfRecord.name}": '${copyOfRecord.content}' is not a valid ipv4!`);
+        const dnsRecord = {
+            ...record,
+            name: record.name.toLowerCase(),
+            content: record.content ? record.content : ip,
+            type: record.type ? record.type : 'A',
+            ttl: record.ttl ? record.ttl : 1,
+        };
+        if (!dnsRecord.content) {
+            throw Error(`Could not create Record "${dnsRecord.name}": Content is missing!`);
+        }
+        if (dnsRecord.type === 'A') {
+            if (!dnsRecord.content.match(ipv4Regex)) {
+                throw Error(`Could not create Record "${dnsRecord.name}": '${dnsRecord.content}' is not a valid ipv4!`);
             }
         }
-        else if (copyOfRecord.type === 'AAAA') {
-            if (!copyOfRecord.content.match(ipv6Regex)) {
-                throw Error(`Could not create Record "${copyOfRecord.name}": '${copyOfRecord.content}' is not a valid ipv6!`);
+        else if (dnsRecord.type === 'AAAA') {
+            if (!dnsRecord.content.match(ipv6Regex)) {
+                throw Error(`Could not create Record "${dnsRecord.name}": '${dnsRecord.content}' is not a valid ipv6!`);
             }
         }
-        else if (copyOfRecord.type === 'CNAME') {
-            const parsedDomain = (0, parse_domain_1.parseDomain)((0, parse_domain_1.fromUrl)(copyOfRecord.content));
-            if (parsedDomain.type !== parse_domain_1.ParseResultType.Listed || !parsedDomain.domain) {
-                throw Error(`Could not create Record "${copyOfRecord.name}": '${copyOfRecord.content}' is not a valid domain name!`);
+        else if (dnsRecord.type === 'CNAME') {
+            const parsedDomain = parseDomain(fromUrl(dnsRecord.content));
+            if (parsedDomain.type !== ParseResultType.Listed || !parsedDomain.domain) {
+                throw Error(`Could not create Record "${dnsRecord.name}": '${dnsRecord.content}' is not a valid domain name!`);
             }
         }
-        const response = await this.cloudflare.dnsRecords.add(zoneId, copyOfRecord);
+        const response = (await this.cloudflare.dnsRecords.add(zoneId, dnsRecord));
         return response.result;
     }
     async updateRecord(zoneId, recordId, record, ip) {
-        const copyOfRecord = { ...record };
-        copyOfRecord.name = record.name.toLowerCase();
-        copyOfRecord.content = copyOfRecord.content ? copyOfRecord.content : ip;
-        copyOfRecord.type = copyOfRecord.type ? copyOfRecord.type : 'A';
-        if (!copyOfRecord.content) {
-            throw Error(`Could not update Record "${copyOfRecord.name}": Content is missing!`);
-        }
-        if (copyOfRecord.type === 'A') {
-            if (!copyOfRecord.content.match(ipv4Regex)) {
-                throw Error(`Could not update Record "${copyOfRecord.name}": '${copyOfRecord.content}' is not a valid ipv4!`);
+        const dnsRecord = {
+            ...record,
+            name: record.name.toLowerCase(),
+            content: record.content ? record.content : ip,
+            type: record.type ? record.type : 'A',
+            ttl: record.ttl ? record.ttl : 1,
+        };
+        if (!dnsRecord.content) {
+            throw Error(`Could not update Record "${dnsRecord.name}": Content is missing!`);
+        }
+        if (dnsRecord.type === 'A') {
+            if (!dnsRecord.content.match(ipv4Regex)) {
+                throw Error(`Could not update Record "${dnsRecord.name}": '${dnsRecord.content}' is not a valid ipv4!`);
             }
         }
-        else if (copyOfRecord.type === 'AAAA') {
-            if (!copyOfRecord.content.match(ipv6Regex)) {
-                throw Error(`Could not update Record "${copyOfRecord.name}": '${copyOfRecord.content}' is not a valid ipv6!`);
+        else if (dnsRecord.type === 'AAAA') {
+            if (!dnsRecord.content.match(ipv6Regex)) {
+                throw Error(`Could not update Record "${dnsRecord.name}": '${dnsRecord.content}' is not a valid ipv6!`);
             }
         }
-        else if (copyOfRecord.type === 'CNAME') {
-            const parsedDomain = (0, parse_domain_1.parseDomain)((0, parse_domain_1.fromUrl)(copyOfRecord.content));
-            if (parsedDomain.type !== parse_domain_1.ParseResultType.Listed || !parsedDomain.domain) {
-                throw Error(`Could not update Record "${copyOfRecord.name}": '${copyOfRecord.content}' is not a valid domain name!`);
+        else if (dnsRecord.type === 'CNAME') {
+            const parsedDomain = parseDomain(fromUrl(dnsRecord.content));
+            if (parsedDomain.type !== ParseResultType.Listed || !parsedDomain.domain) {
+                throw Error(`Could not update Record "${dnsRecord.name}": '${dnsRecord.content}' is not a valid domain name!`);
             }
         }
-        const response = await this.cloudflare.dnsRecords.edit(zoneId, recordId, copyOfRecord);
+        const response = (await this.cloudflare.dnsRecords.edit(zoneId, recordId, dnsRecord));
         return response.result;
     }
     async updateZoneMap() {
-        const response = await this.cloudflare.zones.browse();
+        const response = (await this.cloudflare.zones.browse());
         const zones = response.result;
         this.zoneMap = new Map();
         for (const zone of zones) {
@@ -160,8 +155,7 @@ class CloudflareClient {
     async getRecordByNameAndType(recordName, recordType) {
         const domain = this.getDomainByRecordName(recordName);
         const records = await this.getRecordsByDomain(domain);
-        const record = records.find((currentRecord) => currentRecord.name.toLowerCase() === recordName.toLowerCase()
-            && currentRecord.type.toLowerCase() === recordType.toLowerCase());
+        const record = records.find((currentRecord) => currentRecord.name.toLowerCase() === recordName.toLowerCase() && currentRecord.type.toLowerCase() === recordType.toLowerCase());
         const recordNotFound = record === undefined;
         if (recordNotFound) {
             throw new Error(`Record '${recordName}' not found.`);
@@ -186,13 +180,14 @@ class CloudflareClient {
         const records = [];
         let pageIndex = 1;
         let allRecordsFound = false;
+        const recordsPerPage = 5000;
         while (!allRecordsFound) {
-            const response = await this.cloudflare.dnsRecords.browse(zoneId, {
+            const response = (await this.cloudflare.dnsRecords.browse(zoneId, {
                 page: pageIndex,
-                per_page: 100,
-            });
+                per_page: recordsPerPage,
+            }));
             records.push(...response.result);
-            allRecordsFound = response.result.length < 100;
+            allRecordsFound = response.result.length < recordsPerPage;
             pageIndex++;
         }
         return records;
@@ -210,14 +205,12 @@ class CloudflareClient {
         return zoneId;
     }
     getDomainsFromRecords(records) {
-        const domains = records
-            .map((record) => this.getDomainByRecordName(record.name))
-            .filter((domain, index, domainList) => domainList.indexOf(domain.toLowerCase()) === index);
+        const domains = records.map((record) => this.getDomainByRecordName(record.name)).filter((domain, index, domainList) => domainList.indexOf(domain.toLowerCase()) === index);
         return domains;
     }
     getDomainByRecordName(recordName) {
-        const parsedDomain = (0, parse_domain_1.parseDomain)((0, parse_domain_1.fromUrl)(recordName));
-        if (parsedDomain.type !== parse_domain_1.ParseResultType.Listed || !parsedDomain.domain) {
+        const parsedDomain = parseDomain(fromUrl(recordName));
+        if (parsedDomain.type !== ParseResultType.Listed || !parsedDomain.domain) {
             throw new Error(`Could not parse domain. '${JSON.stringify(recordName)}' is not a valid record name.`);
         }
         let domain = '';
@@ -228,4 +221,3 @@ class CloudflareClient {
         return domain.toLowerCase();
     }
 }
-exports.default = CloudflareClient;

package/dist/lib/cron.js

@@ -1,22 +1,15 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const node_cron_1 = __importDefault(require("node-cron"));
-class Cron {
+import cron from 'node-cron';
+export default class Cron {
     static createCronJob(cronExpression, callback) {
         const cronExpressionIsInvalid = !this.isValid(cronExpression);
         if (cronExpressionIsInvalid) {
-            // eslint-disable-next-line max-len
             throw new Error(`'${cronExpression}' is not a valid cron expression.\nHere you can see how cron expressions work: https://cddnss.knaup.pw/cron-expression-syntax`);
         }
-        return node_cron_1.default.schedule(cronExpression, () => {
+        return cron.schedule(cronExpression, () => {
             callback();
         }, undefined);
     }
     static isValid(cronExpression) {
-        return node_cron_1.default.validate(cronExpression);
+        return cron.validate(cronExpression);
     }
 }
-exports.default = Cron;

package/dist/lib/ip-utils.d.ts

@@ -5,5 +5,5 @@ export default class IPUtils {
     static getIpv6(): Promise<string>;
     static addIpChangeListener(callback: Function): Promise<string>;
     static removeIpChangeListener(eventListenerId: string): void;
-    private static getRandomId;
+    private static getId;
 }

package/dist/lib/ip-utils.js

@@ -1,40 +1,12 @@
-"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 (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __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 });
-const wimIp = __importStar(require("what-is-my-ip-address"));
-const public_ip_1 = __importDefault(require("public-ip"));
-class IPUtils {
+import * as wimIp from 'what-is-my-ip-address';
+import { publicIpv4, publicIpv6 } from 'public-ip';
+export default class IPUtils {
     static ipPollingDelay = 10 * 1000;
     static ipChangeEventListeners = new Map();
     static async getIpv4() {
         /* c8 ignore start*/
         try {
-            return await public_ip_1.default.v4();
+            return await publicIpv4();
         }
         catch (error) {
             return wimIp.v4();
@@ -44,7 +16,7 @@ class IPUtils {
     static async getIpv6() {
         /* c8 ignore start */
         try {
-            return await public_ip_1.default.v6();
+            return await publicIpv6();
         }
         catch (error) {
             return wimIp.v6();
@@ -52,7 +24,7 @@ class IPUtils {
         /* c8 ignore stop*/
     }
     static async addIpChangeListener(callback) {
-        const eventListenerId = this.getRandomId();
+        const eventListenerId = this.getId();
         let previousIp = await this.getIpv4();
         /* c8 ignore start */
         const intervalId = setInterval(async () => {
@@ -72,15 +44,7 @@ class IPUtils {
         clearInterval(eventListenerIntervalId);
         IPUtils.ipChangeEventListeners.delete(eventListenerId);
     }
-    static getRandomId() {
-        const beginningRandomString = Math.random().toString(36)
-            .substr(2);
-        const currentDateAsString = new Date().valueOf()
-            .toString(36);
-        const endingRandomString = Math.random().toString(36)
-            .substr(2);
-        const randomString = beginningRandomString + currentDateAsString + endingRandomString;
-        return randomString;
+    static getId() {
+        return Math.random().toString(36).substring(2, 15) + Math.random().toString(36).substring(2, 15);
     }
 }
-exports.default = IPUtils;

package/dist/types/Auth.d.ts

@@ -0,0 +1,2 @@
+import Cloudflare from 'cloudflare';
+export type Auth = Cloudflare.AuthObject;

package/dist/types/Auth.js

@@ -0,0 +1 @@
+export {};

package/dist/{contracts → types}/Callbacks.d.ts

@@ -1,3 +1,3 @@
-import { RecordData } from './index';
+import { RecordData } from './index.js';
 export type SingleSyncCallback = (syncResult: RecordData) => void;
 export type MultiSyncCallback = (syncResult: Array<RecordData>) => void;

package/dist/types/Callbacks.js

@@ -0,0 +1 @@
+export {};

package/dist/{contracts → types}/DomainRecordList.d.ts

@@ -1,4 +1,4 @@
-import { RecordData } from './index';
+import { RecordData } from './index.js';
 export type DomainRecordList = {
     [domain: string]: Array<RecordData>;
 };

package/dist/types/DomainRecordList.js

@@ -0,0 +1 @@
+export {};

package/dist/types/Record.d.ts

@@ -0,0 +1,10 @@
+import { RecordTypes as CloudflareRecordTypes } from 'cloudflare';
+export type RecordTypes = Exclude<CloudflareRecordTypes, 'MX' | 'SRV' | 'URI'>;
+export type Record = {
+    name: string;
+    type?: RecordTypes;
+    proxied?: boolean;
+    ttl?: number;
+    priority?: number;
+    content?: string;
+};

package/dist/types/Record.js

@@ -0,0 +1 @@
+export {};

package/dist/types/ZoneMap.js

@@ -0,0 +1 @@
+export {};

package/dist/{contracts → types}/cloudflare/RecordData.d.ts

@@ -1,6 +1,7 @@
+import { RecordTypes } from '../index.js';
 export type RecordData = {
     id: string;
-    type: string;
+    type: RecordTypes;
     name: string;
     content: string;
     proxiable: boolean;

package/dist/types/cloudflare/RecordData.js

@@ -0,0 +1 @@
+export {};

package/dist/types/cloudflare/ZoneData.js

@@ -0,0 +1 @@
+export {};

package/dist/types/cloudflare/index.d.ts

@@ -0,0 +1,2 @@
+export * from './RecordData.js';
+export * from './ZoneData.js';

package/dist/types/cloudflare/index.js

@@ -0,0 +1,2 @@
+export * from './RecordData.js';
+export * from './ZoneData.js';

package/dist/types/index.d.ts

@@ -0,0 +1,6 @@
+export * from './cloudflare/index.js';
+export * from './Auth.js';
+export * from './Callbacks.js';
+export * from './DomainRecordList.js';
+export * from './Record.js';
+export * from './ZoneMap.js';

package/dist/types/index.js

@@ -0,0 +1,6 @@
+export * from './cloudflare/index.js';
+export * from './Auth.js';
+export * from './Callbacks.js';
+export * from './DomainRecordList.js';
+export * from './Record.js';
+export * from './ZoneMap.js';

package/package.json

@@ -1,10 +1,11 @@
 {
   "name": "cloudflare-ddns-sync",
-  "version": "2.0.6",
+  "version": "3.0.1",
   "description": "A simple module to update DNS records on Cloudflare whenever you want",
   "main": "dist/index.js",
   "author": "Steffen Knaup <SteffenKnaup@hotmail.de>",
   "license": "ISC",
+  "type": "module",
   "keywords": [
     "cloudflare",
     "cddnss",
@@ -20,8 +21,8 @@
   },
   "scripts": {
     "build": "tsc",
-    "lint": "eslint \"src/**/*.ts\"",
-    "lint:fix": "eslint --fix \"src/**/*.ts\"",
+    "lint": "prettier -c ./src",
+    "lint:fix": "prettier -w ./src",
     "test": "c8 mocha dist/tests/*.js --timeout 15000 --exit",
     "test:coverage": "npm run test:coverage-check && npm run test:coverage-report",
     "test:coverage-check": "c8 check-coverage --lines 70 --functions 70 --branches 70",
@@ -29,24 +30,23 @@
   },
   "dependencies": {
     "cloudflare": "2.9.1",
-    "node-cron": "3.0.2",
-    "parse-domain": "4.1.0",
-    "public-ip": "4.0.4",
+    "node-cron": "3.0.3",
+    "parse-domain": "8.0.1",
+    "public-ip": "6.0.1",
     "what-is-my-ip-address": "1.0.3"
   },
   "devDependencies": {
-    "@types/chai": "4.3.4",
-    "@types/minimist": "1.2.2",
-    "@types/mocha": "9.1.1",
-    "@types/node": "18.11.17",
-    "@types/node-cron": "3.0.6",
-    "@typescript-eslint/eslint-plugin": "5.46.1",
-    "@typescript-eslint/parser": "5.46.1",
-    "c8": "7.12.0",
-    "chai": "4.3.7",
-    "eslint": "8.30.0",
-    "minimist": "1.2.7",
-    "mocha": "9.2.2",
-    "typescript": "4.9.4"
+    "@types/chai": "4.3.11",
+    "@types/cloudflare": "^2.7.13",
+    "@types/minimist": "1.2.5",
+    "@types/mocha": "10.0.6",
+    "@types/node": "20.10.7",
+    "@types/node-cron": "3.0.11",
+    "c8": "9.0.0",
+    "chai": "5.0.0",
+    "minimist": "1.2.8",
+    "mocha": "10.2.0",
+    "prettier": "^3.1.1",
+    "typescript": "5.3.3"
   }
 }

package/.eslintrc.json

@@ -1,229 +0,0 @@
-{
-  "env": {
-      "es2021": true,
-      "node": true
-  },
-  "extends": [
-      "eslint:recommended",
-      "plugin:@typescript-eslint/recommended"
-  ],
-  "parser": "@typescript-eslint/parser",
-  "parserOptions": {
-      "ecmaVersion": "latest",
-      "sourceType": "module"
-  },
-  "plugins": [
-      "@typescript-eslint"
-  ],
-  "rules": {
-      "@typescript-eslint/ban-types": "off",
-      "@typescript-eslint/indent": ["error", 2],
-      "@typescript-eslint/no-shadow": "error",
-      "accessor-pairs": "error",
-      "array-bracket-newline": "error",
-      "array-bracket-spacing": "error",
-      "array-callback-return": "error",
-      "array-element-newline": "error",
-      "arrow-body-style": "error",
-      "arrow-parens": "error",
-      "arrow-spacing": "error",
-      "block-scoped-var": "error",
-      "block-spacing": "error",
-      "brace-style": "error",
-      "camelcase": "warn",
-      "capitalized-comments": "off",
-      "class-methods-use-this": "off",
-      "comma-dangle": ["error", "always-multiline"],
-      "comma-spacing": "error",
-      "comma-style": "error",
-      "complexity": "error",
-      "computed-property-spacing": "error",
-      "consistent-return": "error",
-      "consistent-this": "error",
-      "curly": "error",
-      "default-case": "error",
-      "default-case-last": "error",
-      "default-param-last": "error",
-      "dot-location": ["error", "property"],
-      "dot-notation": "error",
-      "eol-last": "error",
-      "eqeqeq": "error",
-      "func-call-spacing": "error",
-      "func-name-matching": "error",
-      "func-names": "error",
-      "func-style": ["error", "declaration", {
-          "allowArrowFunctions": true
-      }],
-      "function-call-argument-newline": ["error", "consistent"],
-      "function-paren-newline": "error",
-      "generator-star-spacing": "error",
-      "grouped-accessor-pairs": "error",
-      "guard-for-in": "error",
-      "id-denylist": "error",
-      "id-length": "off",
-      "id-match": "error",
-      "implicit-arrow-linebreak": "error",
-      "indent": "off",
-      "init-declarations": "off",
-      "key-spacing": "error",
-      "keyword-spacing": "error",
-      "line-comment-position": "error",
-      "linebreak-style": "error",
-      "lines-around-comment": "off",
-      "lines-between-class-members": "off",
-      "max-classes-per-file": "error",
-      "max-depth": "error",
-      "max-len": ["error", 150],
-      "max-lines": ["error", 1000],
-      "max-lines-per-function": "off",
-      "max-nested-callbacks": "error",
-      "max-params": ["warn", {"max": 4}],
-      "max-statements": "off",
-      "max-statements-per-line": "off",
-      "multiline-comment-style": "off",
-      "multiline-ternary": "off",
-      "new-cap": "error",
-      "new-parens": "error",
-      "newline-per-chained-call": "error",
-      "no-alert": "error",
-      "no-array-constructor": "error",
-      "no-await-in-loop": "off",
-      "no-bitwise": "error",
-      "no-caller": "error",
-      "no-confusing-arrow": "error",
-      "no-console": "error",
-      "no-constructor-return": "error",
-      "no-continue": "error",
-      "no-div-regex": "error",
-      "no-duplicate-imports": "error",
-      "no-else-return": "error",
-      "no-empty-function": "error",
-      "no-eq-null": "error",
-      "no-eval": "error",
-      "no-extend-native": "error",
-      "no-extra-bind": "error",
-      "no-extra-label": "error",
-      "no-extra-parens": "off",
-      "no-floating-decimal": "error",
-      "no-implicit-coercion": "error",
-      "no-implicit-globals": "error",
-      "no-implied-eval": "error",
-      "no-inline-comments": "error",
-      "no-invalid-this": "error",
-      "no-iterator": "error",
-      "no-label-var": "error",
-      "no-labels": "error",
-      "no-lone-blocks": "error",
-      "no-lonely-if": "error",
-      "no-loop-func": "error",
-      "no-magic-numbers": "off",
-      "no-mixed-operators": "error",
-      "no-multi-assign": "error",
-      "no-multi-spaces": "error",
-      "no-multi-str": "error",
-      "no-multiple-empty-lines": "error",
-      "no-negated-condition": "error",
-      "no-nested-ternary": "error",
-      "no-new": "error",
-      "no-new-func": "error",
-      "no-new-object": "error",
-      "no-new-wrappers": "error",
-      "no-octal-escape": "error",
-      "no-param-reassign": "error",
-      "no-plusplus": "off",
-      "no-promise-executor-return": "error",
-      "no-proto": "error",
-      "no-restricted-exports": "error",
-      "no-restricted-globals": "error",
-      "no-restricted-imports": "error",
-      "no-restricted-properties": "error",
-      "no-restricted-syntax": "error",
-      "no-return-assign": "error",
-      "no-return-await": "error",
-      "no-script-url": "error",
-      "no-self-compare": "error",
-      "no-sequences": "error",
-      "no-shadow": "off",
-      "no-tabs": "error",
-      "no-template-curly-in-string": "error",
-      "no-ternary": "off",
-      "no-throw-literal": "error",
-      "no-trailing-spaces": "error",
-      "no-undef-init": "error",
-      "no-undefined": "off",
-      "no-underscore-dangle": "error",
-      "no-unmodified-loop-condition": "error",
-      "no-unneeded-ternary": "error",
-      "no-unreachable-loop": "error",
-      "no-unused-expressions": "error",
-      "no-unused-private-class-members": "error",
-      "no-use-before-define": "off",
-      "no-useless-call": "error",
-      "no-useless-computed-key": "error",
-      "no-useless-concat": "error",
-      "no-useless-constructor": "error",
-      "no-useless-rename": "error",
-      "no-useless-return": "error",
-      "no-var": "error",
-      "no-void": "error",
-      "no-warning-comments": "error",
-      "no-whitespace-before-property": "error",
-      "nonblock-statement-body-position": "error",
-      "object-curly-newline": "error",
-      "object-curly-spacing": "error",
-      "object-property-newline": "error",
-      "object-shorthand": ["error", "never"],
-      "one-var": ["error", "never"],
-      "operator-assignment": "error",
-      "operator-linebreak": ["error", "before"],
-      "padded-blocks": ["error", "never"],
-      "padding-line-between-statements": "error",
-      "prefer-arrow-callback": "error",
-      "prefer-const": "error",
-      "prefer-destructuring": "error",
-      "prefer-exponentiation-operator": "error",
-      "prefer-named-capture-group": "off",
-      "prefer-numeric-literals": "error",
-      "prefer-object-spread": "error",
-      "prefer-promise-reject-errors": "error",
-      "prefer-regex-literals": "error",
-      "prefer-rest-params": "error",
-      "prefer-spread": "error",
-      "prefer-template": "error",
-      "quote-props": ["error", "as-needed"],
-      "quotes": ["error", "single"],
-      "radix": "error",
-      "require-atomic-updates": "error",
-      "require-await": "error",
-      "require-unicode-regexp": "error",
-      "rest-spread-spacing": "error",
-      "semi": "error",
-      "semi-spacing": "error",
-      "semi-style": "error",
-      "sort-imports": ["error", {
-          "ignoreCase": false,
-          "ignoreDeclarationSort": false,
-          "ignoreMemberSort": false,
-          "allowSeparatedGroups": true
-      }],
-      "sort-keys": "off",
-      "sort-vars": "error",
-      "space-before-blocks": "error",
-      "space-before-function-paren": ["error", "never"],
-      "space-in-parens": "error",
-      "space-infix-ops": "error",
-      "space-unary-ops": "error",
-      "spaced-comment": "error",
-      "strict": "error",
-      "switch-colon-spacing": "error",
-      "symbol-description": "error",
-      "template-curly-spacing": "error",
-      "template-tag-spacing": "error",
-      "unicode-bom": "error",
-      "vars-on-top": "error",
-      "wrap-iife": "error",
-      "wrap-regex": "error",
-      "yield-star-spacing": "error",
-      "yoda": "error"
-  }
-}

package/dist/contracts/Callbacks.js

@@ -1,2 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });

package/dist/contracts/DomainRecordList.js

@@ -1,2 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });

package/dist/contracts/Record.d.ts

@@ -1,8 +0,0 @@
-export type Record = {
-    name: string;
-    type?: string;
-    proxied?: boolean;
-    ttl?: number;
-    priority?: number;
-    content?: string;
-};

package/dist/contracts/Record.js

@@ -1,2 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });

package/dist/contracts/ZoneMap.js

@@ -1,2 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });

package/dist/contracts/cloudflare/RecordData.js

@@ -1,2 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });

package/dist/contracts/cloudflare/ZoneData.js

@@ -1,2 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });

package/dist/contracts/cloudflare/index.d.ts

@@ -1,2 +0,0 @@
-export * from './RecordData';
-export * from './ZoneData';

package/dist/contracts/cloudflare/index.js

@@ -1,18 +0,0 @@
-"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 __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./RecordData"), exports);
-__exportStar(require("./ZoneData"), exports);

package/dist/contracts/index.d.ts

@@ -1,5 +0,0 @@
-export * from './cloudflare/index';
-export * from './Callbacks';
-export * from './DomainRecordList';
-export * from './Record';
-export * from './ZoneMap';

package/dist/contracts/index.js

@@ -1,21 +0,0 @@
-"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 __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./cloudflare/index"), exports);
-__exportStar(require("./Callbacks"), exports);
-__exportStar(require("./DomainRecordList"), exports);
-__exportStar(require("./Record"), exports);
-__exportStar(require("./ZoneMap"), exports);