6.0.5

.gitignore

@@ -15,8 +15,6 @@ node_modules/
 
 # builds
 dist/
-dist_web/
-dist_serve/
-dist_ts_web/
+dist_*/
 
 # custom

.gitlab-ci.yml

@@ -1,126 +0,0 @@
-# gitzone ci_default
-image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
-
-cache:
-  paths:
-    - .npmci_cache/
-  key: '$CI_BUILD_STAGE'
-
-stages:
-  - security
-  - test
-  - release
-  - metadata
-
-# ====================
-# security stage
-# ====================
-mirror:
-  stage: security
-  script:
-    - npmci git mirror
-  tags:
-    - lossless
-    - docker
-    - notpriv
-
-snyk:
-  image: registry.gitlab.com/hosttoday/ht-docker-node:snyk
-  stage: security
-  script:
-    - npmci npm prepare
-    - npmci command npm install --ignore-scripts
-    - npmci command snyk test
-  tags:
-    - lossless
-    - docker
-    - notpriv
-
-# ====================
-# test stage
-# ====================
-
-testStable:
-  stage: test
-  script:
-    - npmci npm prepare
-    - npmci node install stable
-    - npmci npm install
-    - npmci npm test
-  coverage: /\d+.?\d+?\%\s*coverage/
-  tags:
-    - lossless
-    - docker
-    - priv
-
-testBuild:
-  stage: test
-  script:
-    - npmci npm prepare
-    - npmci node install stable
-    - npmci npm install
-    - npmci command npm run build
-  coverage: /\d+.?\d+?\%\s*coverage/
-  tags:
-    - lossless
-    - docker
-    - notpriv
-
-release:
-  stage: release
-  script:
-    - npmci node install stable
-    - npmci npm publish
-  only:
-    - tags
-  tags:
-    - lossless
-    - docker
-    - notpriv
-
-# ====================
-# metadata stage
-# ====================
-codequality:
-  stage: metadata
-  allow_failure: true
-  script:
-    - npmci command npm install -g tslint typescript
-    - npmci npm prepare
-    - npmci npm install
-    - npmci command "tslint -c tslint.json ./ts/**/*.ts"
-  tags:
-    - lossless
-    - docker
-    - priv
-
-trigger:
-  stage: metadata
-  script:
-    - npmci trigger
-  only:
-    - tags
-  tags:
-    - lossless
-    - docker
-    - notpriv
-
-pages:
-  stage: metadata
-  script:
-    - npmci node install lts
-    - npmci command npm install -g @gitzone/tsdoc
-    - npmci npm prepare
-    - npmci npm install
-    - npmci command tsdoc
-  tags:
-    - lossless
-    - docker
-    - notpriv
-  only:
-    - tags
-  artifacts:
-    expire_in: 1 week
-    paths:
-      - public
-  allow_failure: true

.vscode/launch.json

@@ -2,28 +2,10 @@
   "version": "0.2.0",
   "configurations": [
     {
-      "name": "current file",
-      "type": "node",
+      "command": "npm test",
+      "name": "Run npm test",
       "request": "launch",
-      "args": [
-        "${relativeFile}"
-      ],
-      "runtimeArgs": ["-r", "@gitzone/tsrun"],
-      "cwd": "${workspaceRoot}",
-      "protocol": "inspector",
-      "internalConsoleOptions": "openOnSessionStart"
-    },
-    {
-      "name": "test.ts",
-      "type": "node",
-      "request": "launch",
-      "args": [
-        "test/test.ts"
-      ],
-      "runtimeArgs": ["-r", "@gitzone/tsrun"],
-      "cwd": "${workspaceRoot}",
-      "protocol": "inspector",
-      "internalConsoleOptions": "openOnSessionStart"
+      "type": "node-terminal"
     }
   ]
 }

.vscode/settings.json

@@ -15,7 +15,7 @@
             "properties": {
               "projectType": {
                 "type": "string",
-                "enum": ["website", "element", "service", "npm"]
+                "enum": ["website", "element", "service", "npm", "wcc"]
               }
             }
           }

license

@@ -1,6 +1,4 @@
-The MIT License (MIT)
-
-Copyright (c) 2016 Lossless GmbH
+Copyright (c) 2014 Task Venture Capital GmbH (hello@task.vc)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

npmextra.json

@@ -9,9 +9,21 @@
       "githost": "gitlab.com",
       "gitscope": "mojoio",
       "gitrepo": "cloudflare",
-      "shortDescription": "easy cloudflare management",
-      "npmPackagename": "@mojoio/cloudflare",
-      "license": "MIT"
+      "description": "A TypeScript client for managing Cloudflare accounts, zones, DNS records, and workers with ease.",
+      "npmPackagename": "@apiclient.xyz/cloudflare",
+      "license": "MIT",
+      "keywords": [
+        "Cloudflare",
+        "DNS management",
+        "zone management",
+        "worker management",
+        "TypeScript",
+        "API client",
+        "cloud infrastructure",
+        "automated DNS",
+        "CDN management",
+        "open source"
+      ]
     }
   }
 }

package.json

@@ -1,21 +1,32 @@
 {
-  "name": "@mojoio/cloudflare",
-  "version": "4.0.4",
+  "name": "@apiclient.xyz/cloudflare",
+  "version": "6.0.5",
   "private": false,
-  "description": "easy cloudflare management",
-  "main": "dist/index.js",
-  "typings": "dist/index.d.ts",
+  "description": "A TypeScript client for managing Cloudflare accounts, zones, DNS records, and workers with ease.",
+  "main": "dist_ts/index.js",
+  "typings": "dist_ts/index.d.ts",
+  "type": "module",
   "scripts": {
     "test": "(tstest test/)",
-    "build": "(tsbuild)"
+    "build": "(tsbuild --web --allowimplicitany)",
+    "buildDocs": "tsdoc",
+    "updateOpenapi": "openapi-typescript https://raw.githubusercontent.com/cloudflare/api-schemas/main/openapi.yaml --output ts/openapi.spec.ts"
   },
   "repository": {
     "type": "git",
     "url": "git+https://gitlab.com/pushrocks/cflare.git"
   },
   "keywords": [
-    "Push.Rocks",
-    "cloudflare"
+    "Cloudflare",
+    "DNS management",
+    "zone management",
+    "worker management",
+    "TypeScript",
+    "API client",
+    "cloud infrastructure",
+    "automated DNS",
+    "CDN management",
+    "open source"
   ],
   "author": "Lossless GmbH",
   "license": "MIT",
@@ -24,32 +35,36 @@
   },
   "homepage": "https://gitlab.com/pushrocks/cflare#readme",
   "dependencies": {
-    "@pushrocks/smartdelay": "^2.0.6",
-    "@pushrocks/smartlog": "^2.0.21",
-    "@pushrocks/smartpromise": "^3.0.6",
-    "@pushrocks/smartrequest": "^1.1.47",
-    "@pushrocks/smartstring": "^3.0.18",
-    "@tsclass/tsclass": "^3.0.7"
+    "@push.rocks/smartdelay": "^3.0.1",
+    "@push.rocks/smartlog": "^3.0.2",
+    "@push.rocks/smartpromise": "^4.0.2",
+    "@push.rocks/smartrequest": "^2.0.15",
+    "@push.rocks/smartstring": "^4.0.5",
+    "@tsclass/tsclass": "^4.0.58",
+    "cloudflare": "^3.2.0"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.17",
-    "@gitzone/tsrun": "^1.2.8",
-    "@gitzone/tstest": "^1.0.28",
-    "@pushrocks/qenv": "^4.0.6",
-    "@pushrocks/tapbundle": "^3.2.0",
-    "@types/node": "^13.7.2",
-    "tslint": "^6.0.0",
-    "tslint-config-prettier": "^1.18.0"
+    "@git.zone/tsbuild": "^2.1.66",
+    "@git.zone/tsrun": "^1.2.42",
+    "@git.zone/tstest": "^1.0.74",
+    "@push.rocks/qenv": "^6.0.5",
+    "@push.rocks/tapbundle": "^5.0.4",
+    "@types/node": "^20.3.1",
+    "openapi-typescript": "^6.7.6"
   },
   "files": [
     "ts/**/*",
     "ts_web/**/*",
     "dist/**/*",
-    "dist_web/**/*",
+    "dist_*/**/*",
+    "dist_ts/**/*",
     "dist_ts_web/**/*",
     "assets/**/*",
     "cli.js",
     "npmextra.json",
     "readme.md"
+  ],
+  "browserslist": [
+    "last 1 chrome versions"
   ]
 }

qenv.yml

@@ -1,3 +1,2 @@
 required:
-  - CF_EMAIL
   - CF_KEY

readme.hints.md

@@ -0,0 +1 @@
+- unofficial TypeScript cloudflare api client coming with a lot of convenience.

readme.md

@@ -1,49 +1,250 @@
-# @mojoio/cloudflare
+# @apiclient.xyz/cloudflare
 easy cloudflare management
 
-## Availabililty and Links
-* [npmjs.org (npm package)](https://www.npmjs.com/package/@mojoio/cloudflare)
-* [gitlab.com (source)](https://gitlab.com/mojoio/cloudflare)
-* [github.com (source mirror)](https://github.com/mojoio/cloudflare)
-* [docs (typedoc)](https://mojoio.gitlab.io/cloudflare/)
+## Install
+To install the `@apiclient.xyz/cloudflare` package, you can use npm. Simply run the following command:
 
-## Status for master
-[![pipeline status](https://gitlab.com/mojoio/cloudflare/badges/master/pipeline.svg)](https://gitlab.com/mojoio/cloudflare/commits/master)
-[![coverage report](https://gitlab.com/mojoio/cloudflare/badges/master/coverage.svg)](https://gitlab.com/mojoio/cloudflare/commits/master)
-[![npm downloads per month](https://img.shields.io/npm/dm/@mojoio/cloudflare.svg)](https://www.npmjs.com/package/@mojoio/cloudflare)
-[![Known Vulnerabilities](https://snyk.io/test/npm/@mojoio/cloudflare/badge.svg)](https://snyk.io/test/npm/@mojoio/cloudflare)
-[![TypeScript](https://img.shields.io/badge/TypeScript->=%203.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
-[![node](https://img.shields.io/badge/node->=%2010.x.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
-[![JavaScript Style Guide](https://img.shields.io/badge/code%20style-prettier-ff69b4.svg)](https://prettier.io/)
+```bash
+npm install @apiclient.xyz/cloudflare
+```
+
+Make sure to include it in your `dependencies` in `package.json`.
 
 ## Usage
 
-Use TypeScript for best in class instellisense.
+### Initial Setup
 
-```javascript
-import * as cflare from '@mojoio/cloudflare';
+First, let's start by importing the required modules and setting up an instance of `CloudflareAccount` with your API token. This instance will be used to interact with the Cloudflare API.
 
-const myCflareAccount = new cflare.CflareAccount();
-testCflareAccount.auth({
-  email: 'someuser@example.com',
-  key: 'someLongApiKey'
-});
+```typescript
+import * as cflare from '@apiclient.xyz/cloudflare';
 
-const myAsyncCflareManagement = async () => {
-  // get things
-  const myZones = await myCflareAccount.listZones(); // zones are fully typed
-  const myIdForADomain = await myCflareAccount.getZoneId('example.com'); // type number
-  const myRecordsForADomain = await myCflareAccount.listRecords('example.com'); // records are fully typed
+// Initialize Cloudflare Account
+const myCflareAccount = new cflare.CloudflareAccount('mySuperAwesomeAccountToken');
+```
+
+### Managing Zones
+
+#### List All Zones
+
+To list all zones in your Cloudflare account, you can use the `listZones` method:
+
+```typescript
+const listAllZones = async () => {
+  const myZones = await myCflareAccount.convenience.listZones();
+  console.log(myZones);
 };
 ```
 
-## Contribution
+#### Get Zone ID
 
-We are always happy for code contributions. If you are not the code contributing type that is ok. Still, maintaining Open Source repositories takes considerable time and thought. If you like the quality of what we do and our modules are useful to you we would appreciate a little monthly contribution: You can [contribute one time](https://lossless.link/contribute-onetime) or [contribute monthly](https://lossless.link/contribute). :)
+To get the ID of a specific zone (domain), use the `getZoneId` method:
 
-For further information read the linked docs at the top of this readme.
+```typescript
+const getZoneId = async (domainName: string) => {
+  try {
+    const zoneId = await myCflareAccount.convenience.getZoneId(domainName);
+    console.log(`Zone ID for ${domainName}:`, zoneId);
+  } catch (error) {
+    console.error('Error getting zone ID:', error);
+  }
+};
+```
 
-> MIT licensed | **©** [Lossless GmbH](https://lossless.gmbh)
-| By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy)
+#### Purge Cache for a Zone
 
-[![repo-footer](https://lossless.gitlab.io/publicrelations/repofooter.svg)](https://maintainedby.lossless.com)
+To purge all cache for a specific zone:
+
+```typescript
+const purgeZoneCache = async (domainName: string) => {
+  await myCflareAccount.convenience.purgeZone(domainName);
+  console.log(`Purged cache for ${domainName}`);
+};
+```
+
+### Managing DNS Records
+
+#### List DNS Records
+
+To list all DNS records for a specific zone:
+
+```typescript
+const listDnsRecords = async (domainName: string) => {
+  try {
+    const records = await myCflareAccount.convenience.listRecords(domainName);
+    console.log(`DNS Records for ${domainName}:`, records);
+  } catch (error) {
+    console.error('Error listing DNS records:', error);
+  }
+};
+```
+
+#### Get a Specific Record
+
+To get a specific DNS record by type (e.g., A, AAAA, CNAME, etc.):
+
+```typescript
+const getDnsRecord = async (domainName: string, recordType: string) => {
+  try {
+    const record = await myCflareAccount.convenience.getRecord(domainName, recordType);
+    console.log(`DNS Record (${recordType}) for ${domainName}:`, record);
+  } catch (error) {
+    console.error('Error getting DNS record:', error);
+  }
+};
+```
+
+#### Create a DNS Record
+
+To create a new DNS record:
+
+```typescript
+const createDnsRecord = async (domainName: string, recordType: string, content: string) => {
+  try {
+    const response = await myCflareAccount.convenience.createRecord(domainName, recordType, content, 120);
+    console.log(`Created DNS record (${recordType}) for ${domainName}:`, response);
+  } catch (error) {
+    console.error('Error creating DNS record:', error);
+  }
+};
+```
+
+#### Remove a DNS Record
+
+To remove a DNS record:
+
+```typescript
+const removeDnsRecord = async (domainName: string, recordType: string) => {
+  try {
+    await myCflareAccount.convenience.removeRecord(domainName, recordType);
+    console.log(`Removed DNS record (${recordType}) for ${domainName}`);
+  } catch (error) {
+    console.error('Error removing DNS record:', error);
+  }
+};
+```
+
+#### Clean a DNS Record
+
+To clean (remove) all records of a specific type for a domain:
+
+```typescript
+const cleanDnsRecord = async (domainName: string, recordType: string) => {
+  try {
+    await myCflareAccount.convenience.cleanRecord(domainName, recordType);
+    console.log(`Cleaned DNS records (${recordType}) for ${domainName}`);
+  } catch (error) {
+    console.error('Error cleaning DNS record:', error);
+  }
+};
+```
+
+### Managing Workers
+
+#### Create a Worker
+
+To create a new Cloudflare Worker:
+
+```typescript
+const createWorker = async (workerName: string, workerScript: string) => {
+  try {
+    const worker = await myCflareAccount.workerManager.createWorker(workerName, workerScript);
+    console.log(`Created Worker (${workerName}):`, worker);
+  } catch (error) {
+    console.error('Error creating Worker:', error);
+  }
+};
+```
+
+#### List Workers
+
+To list all workers in your Cloudflare account:
+
+```typescript
+const listWorkers = async () => {
+  try {
+    const workers = await myCflareAccount.workerManager.listWorkers();
+    console.log('Workers:', workers);
+  } catch (error) {
+    console.error('Error listing workers:', error);
+  }
+};
+```
+
+#### Set Worker Routes
+
+To set routes for a Cloudflare Worker:
+
+```typescript
+import { CloudflareWorker } from '@apiclient.xyz/cloudflare';
+
+const setWorkerRoutes = async (worker: CloudflareWorker, routes: Array<{ zoneName: string, pattern: string }>) => {
+  try {
+    await worker.setRoutes(routes);
+    console.log('Routes set successfully for Worker:', worker.id);
+  } catch (error) {
+    console.error('Error setting routes for Worker:', error);
+  }
+};
+```
+
+#### Sample Complete Workflow
+
+Below is a sample workflow that includes all the above features:
+
+```typescript
+import * as cflare from '@apiclient.xyz/cloudflare';
+
+const myCflareAccount = new cflare.CloudflareAccount('mySuperAwesomeAccountToken');
+
+const manageCloudflare = async () => {
+  try {
+    // List all zones
+    const myZones = await myCflareAccount.convenience.listZones();
+    console.log('Zones:', myZones);
+
+    // Get Zone ID for a specific domain
+    const myZoneId = await myCflareAccount.convenience.getZoneId('example.com');
+    console.log('Zone ID:', myZoneId);
+
+    // Purge cache for a zone
+    await myCflareAccount.convenience.purgeZone('example.com');
+    console.log('Cache purged for example.com');
+
+    // List DNS records for a domain
+    const myRecords = await myCflareAccount.convenience.listRecords('example.com');
+    console.log('DNS Records:', myRecords);
+
+    // Get a specific DNS record
+    const myRecord = await myCflareAccount.convenience.getRecord('sub.example.com', 'A');
+    console.log('Specific DNS Record:', myRecord);
+
+    // Create a DNS record
+    const createResponse = await myCflareAccount.convenience.createRecord('sub.example.com', 'A', '127.0.0.1');
+    console.log('Created DNS Record:', createResponse);
+
+    // Clean DNS records
+    await myCflareAccount.convenience.cleanRecord('sub.example.com', 'A');
+    console.log('Cleaned DNS Records for sub.example.com');
+
+    // Create a Cloudflare Worker
+    const myWorker = await myCflareAccount.workerManager.createWorker('myWorker', `addEventListener('fetch', event => { event.respondWith(fetch(event.request)) })`);
+    console.log('Created Worker:', myWorker);
+
+    // Set routes for the Worker
+    await myWorker.setRoutes([{ zoneName: 'example.com', pattern: 'https://*example.com/*' }]);
+    console.log('Routes set for Worker');
+
+    // List all Workers
+    const workers = await myCflareAccount.workerManager.listWorkers();
+    console.log('Workers:', workers);
+  } catch (error) {
+    console.error('Error managing Cloudflare:', error);
+  }
+};
+
+manageCloudflare();
+```
+
+This complete guide covers initialization, managing Cloudflare zones, DNS records, and Cloudflare Workers comprehensively using TypeScript for enhanced type safety and intellisense. Always ensure to keep your API keys secure and avoid hardcoding them directly in your scripts.
+undefined

test/test.ts

@@ -1,9 +1,9 @@
 // tslint:disable-next-line: no-implicit-dependencies
-import { expect, tap } from '@pushrocks/tapbundle';
+import { expect, tap } from '@push.rocks/tapbundle';
 // tslint:disable-next-line: no-implicit-dependencies
-import { Qenv } from '@pushrocks/qenv';
+import { Qenv } from '@push.rocks/qenv';
 
-import cloudflare = require('../ts/index');
+import * as cloudflare from '../ts/index.js';
 
 const testQenv = new Qenv(process.cwd(), process.cwd() + '/.nogit');
 
@@ -11,59 +11,63 @@ const randomPrefix = Math.floor(Math.random() * 2000);
 let testCloudflareAccount: cloudflare.CloudflareAccount;
 
 tap.test('should create a valid instance of CloudflareAccount', async () => {
-  testCloudflareAccount = new cloudflare.CloudflareAccount({
-    email: testQenv.getEnvVarOnDemand('CF_EMAIL'),
-    key: testQenv.getEnvVarOnDemand('CF_KEY')
-  });
+  testCloudflareAccount = new cloudflare.CloudflareAccount(await testQenv.getEnvVarOnDemand('CF_KEY'));
 });
 
-tap.test('.listZones() -> should display an entire account', async tools => {
+tap.test('should preselect an account', async () => {
+  await testCloudflareAccount.preselectAccountByName('Sandbox Account');
+})
+
+tap.test('.listZones() -> should display an entire account', async (tools) => {
   tools.timeout(600000);
   const result = await testCloudflareAccount.convenience.listZones();
   console.log(result);
+  // await tools.delayFor(10000);
 });
 
 tap.test(
   '.getZoneId(domainName) -> should get an Cloudflare Id for a domain string',
-  async tools => {
+  async (tools) => {
     tools.timeout(600000);
-    await testCloudflareAccount.getZoneId('bleu.de');
+    const id = await testCloudflareAccount.convenience.getZoneId('bleu.de');
+    console.log(`The account id for bleu.de is: ${id}`);
   }
 );
 
 tap.test(
   '.listRecords(domainName) -> should list all records for a specific Domain Name',
-  async tools => {
+  async (tools) => {
     tools.timeout(600000);
-    await testCloudflareAccount.convenience.listRecords('bleu.de').then(async responseArg => {
+    await testCloudflareAccount.convenience.listRecords('bleu.de').then(async (responseArg) => {
       console.log(responseArg);
     });
   }
 );
 
-tap.test('should create a valid record for a subdomain', async tools => {
+tap.test('should create a valid record for a subdomain', async (tools) => {
   tools.timeout(600000);
   await testCloudflareAccount.convenience.createRecord(
     `${randomPrefix}subdomain.bleu.de`,
     'A',
-    '127.0.0.1'
+    '127.0.0.1',
+    120
   );
 });
 
-tap.test('should get a record from Cloudflare', async tools => {
+tap.test('should get a record from Cloudflare', async (tools) => {
   tools.timeout(600000);
   await testCloudflareAccount.convenience
     .getRecord(`${randomPrefix}subdomain.bleu.de`, 'A')
-    .then(responseArg => {
+    .then((responseArg) => {
       console.log(responseArg);
     });
 });
 
-tap.test('should remove a subdomain record from Cloudflare', async tools => {
+tap.test('should remove a subdomain record from Cloudflare', async (tools) => {
   tools.timeout(600000);
   await testCloudflareAccount.convenience
     .removeRecord(`${randomPrefix}subdomain.bleu.de`, 'A')
-    .then(async responseArg => {
+    .then(async (responseArg) => {
       console.log(responseArg);
     });
 });
@@ -72,6 +76,11 @@ tap.test('.purge(some.domain) -> should purge everything', async () => {
   await testCloudflareAccount.convenience.purgeZone('bleu.de');
 });
 
+tap.test('should list workers', async () => {
+  const workerArray = await testCloudflareAccount.workerManager.listWorkerScripts();
+  console.log(workerArray);
+});
+
 // WORKERS
 tap.test('should create a worker', async () => {
   const worker = await testCloudflareAccount.workerManager.createWorker(
@@ -81,14 +90,14 @@ tap.test('should create a worker', async () => {
   await worker.setRoutes([
     {
       zoneName: 'bleu.de',
-      pattern: 'https://*bleu.de/hello'
-    }
+      pattern: 'https://*bleu.de/hello',
+    },
   ]);
   console.log(worker);
 });
 
-tap.test('should get workers', async () => {
-  const workerArray = await testCloudflareAccount.workerManager.listWorkers();
+tap.test('should get workers again', async () => {
+  const workerArray = await testCloudflareAccount.workerManager.listWorkerScripts();
   console.log(workerArray);
 });
 

ts/00_commitinfo_data.ts

@@ -0,0 +1,8 @@
+/**
+ * autocreated commitinfo by @pushrocks/commitinfo
+ */
+export const commitinfo = {
+  name: '@apiclient.xyz/cloudflare',
+  version: '6.0.5',
+  description: 'A TypeScript client for managing Cloudflare accounts, zones, DNS records, and workers with ease.'
+}

ts/cloudflare.classes.account.ts

@@ -1,61 +1,71 @@
-import plugins = require('./cloudflare.plugins');
-import * as interfaces from './interfaces';
+import * as plugins from './cloudflare.plugins.js';
+import { logger } from './cloudflare.logger.js';
+import * as interfaces from './interfaces/index.js';
 
 // interfaces
-import { WorkerManager } from './cloudflare.classes.workermanager';
-import { ZoneManager } from './cloudflare.classes.zonemanager';
+import { WorkerManager } from './cloudflare.classes.workermanager.js';
+import { ZoneManager } from './cloudflare.classes.zonemanager.js';
 
 export class CloudflareAccount {
-  private authEmail: string;
-  private authKey: string;
-  private accountIdentifier: string;
+  private authToken: string;
+  public preselectedAccountId: string;
 
   public workerManager = new WorkerManager(this);
   public zoneManager = new ZoneManager(this);
 
+  public apiAccount: plugins.cloudflare.Cloudflare;
+
   /**
    * constructor sets auth information on the CloudflareAccountInstance
    * @param optionsArg
    */
-  constructor(optionsArg: { email: string; key: string }) {
-    this.authEmail = optionsArg.email;
-    this.authKey = optionsArg.key;
+  constructor(authTokenArg: string) {
+    this.authToken = authTokenArg;
+    this.apiAccount = new plugins.cloudflare.Cloudflare({
+      apiToken: this.authToken,
+    });
   }
 
+  public async preselectAccountByName(nameArg: string) {
+    const accounts = await this.convenience.listAccounts();
+    const account = accounts.find((accountArg) => {
+      return accountArg.name === nameArg;
+    });
+    if (account) {
+      this.preselectedAccountId = account.id;
+    } else {
+      throw new Error(`account with name ${nameArg} not found`);
+    }
+  }
+
+  public convenience = {
     /**
-   * gets you the account identifier
+     * listAccounts
      */
-  public async getAccountIdentifier() {
-    if (!this.accountIdentifier) {
-      const route = `/accounts?page=1&per_page=20&direction=desc`;
-      const response: any = await this.request('GET', route);
-      this.accountIdentifier = response.result[0].id;
+    listAccounts: async () => {
+      const accounts: plugins.ICloudflareTypes['Account'][] = [];
+      for await (const account of this.apiAccount.accounts.list()) {
+        accounts.push(account as interfaces.ICloudflareApiAccountObject);
       }
-    return this.accountIdentifier;
-  }
-
+      return accounts;
+    },
     /**
      * gets a zone id of a domain from cloudflare
      * @param domainName
      */
-  public async getZoneId(domainName: string) {
+    getZoneId: async (domainName: string) => {
       const domain = new plugins.smartstring.Domain(domainName);
       const zoneArray = await this.convenience.listZones(domain.zoneName);
-    const filteredResponse = zoneArray.filter(zoneArg => {
+      const filteredResponse = zoneArray.filter((zoneArg) => {
         return zoneArg.name === domainName;
       });
       if (filteredResponse.length >= 1) {
         return filteredResponse[0].id;
       } else {
-      plugins.smartlog.defaultLogger.log(
-        'error',
-        `the domain ${domainName} does not appear to be in this account!`
-      );
+        logger.log('error', `the domain ${domainName} does not appear to be in this account!`);
         throw new Error(`the domain ${domainName} does not appear to be in this account!`);
       }
-  }
-
-  public convenience = {
+    },
     /**
      * gets a record
      * @param domainNameArg
@@ -64,10 +74,10 @@ export class CloudflareAccount {
     getRecord: async (
       domainNameArg: string,
       typeArg: plugins.tsclass.network.TDnsRecordType
-    ): Promise<interfaces.ICflareRecord> => {
+    ): Promise<plugins.ICloudflareTypes['Record']> => {
       const domain = new plugins.smartstring.Domain(domainNameArg);
       const recordArrayArg = await this.convenience.listRecords(domain.zoneName);
-      const filteredResponse = recordArrayArg.filter(recordArg => {
+      const filteredResponse = recordArrayArg.filter((recordArg) => {
         return recordArg.type === typeArg && recordArg.name === domainNameArg;
       });
       return filteredResponse[0];
@@ -78,20 +88,18 @@ export class CloudflareAccount {
     createRecord: async (
       domainNameArg: string,
       typeArg: plugins.tsclass.network.TDnsRecordType,
-      contentArg: string
+      contentArg: string,
+      ttlArg = 1
     ): Promise<any> => {
       const domain = new plugins.smartstring.Domain(domainNameArg);
-      const domainIdArg = await this.getZoneId(domain.zoneName);
-      const dataObject = {
+      const zoneId = await this.convenience.getZoneId(domain.zoneName);
+      const response = await this.apiAccount.dns.records.create({
+        zone_id: zoneId,
+        type: typeArg as any,
         name: domain.fullName,
-        type: typeArg,
-        content: contentArg
-      };
-      const response = await this.request(
-        'POST',
-        '/zones/' + domainIdArg + '/dns_records',
-        dataObject
-      );
+        content: contentArg,
+        ttl: ttlArg,
+      })
       return response;
     },
     /**
@@ -104,27 +112,47 @@ export class CloudflareAccount {
       typeArg: plugins.tsclass.network.TDnsRecordType
     ): Promise<any> => {
       const domain = new plugins.smartstring.Domain(domainNameArg);
-      const cflareRecord = await this.convenience.getRecord(domain.fullName, typeArg);
-      if (cflareRecord) {
-        const requestRoute: string = `/zones/${cflareRecord.zone_id}/dns_records/${cflareRecord.id}`;
-        return await this.request('DELETE', requestRoute);
+      const zoneId = await this.convenience.getZoneId(domain.zoneName);
+      const records = await this.convenience.listRecords(domain.zoneName);
+      const recordToDelete = records.find((recordArg) => {
+        return recordArg.name === domainNameArg && recordArg.type === typeArg;
+      });
+      if (recordToDelete) {
+        await this.apiAccount.dns.records.delete(recordToDelete.id, {
+          zone_id: zoneId,
+        });
       } else {
-        throw new Error(`could not remove record for ${domainNameArg} with type ${typeArg}`);
+        logger.log('warn', `record ${domainNameArg} of type ${typeArg} not found`);
       }
     },
+
     /**
      * cleanrecord allows the cleaning of any previous records to avoid unwanted sideeffects
      */
     cleanRecord: async (domainNameArg: string, typeArg: plugins.tsclass.network.TDnsRecordType) => {
       console.log(`cleaning record for ${domainNameArg}`);
+      const records = await this.convenience.listRecords(domainNameArg);
+      const recordsToDelete = records.filter((recordArg) => {
+        return recordArg.type === typeArg;
+      });
+      for (const recordToDelete of recordsToDelete) {
+        await this.apiAccount.dns.records.delete(recordToDelete.id, {
+          zone_id: recordToDelete.zone_id,
+        });
+      }
     },
+
     /**
      * updates a record
      * @param domainNameArg
      * @param typeArg
      * @param valueArg
      */
-    updateRecord: async (domainNameArg: string, typeArg: plugins.tsclass.network.TDnsRecordType, valueArg) => {
+    updateRecord: async (
+      domainNameArg: string,
+      typeArg: plugins.tsclass.network.TDnsRecordType,
+      valueArg
+    ) => {
       // TODO: implement
       const domain = new plugins.smartstring.Domain(domainNameArg);
     },
@@ -132,111 +160,52 @@ export class CloudflareAccount {
      * list all records of a specified domain name
      * @param domainNameArg - the domain name that you want to get the records from
      */
-    listRecords: async (domainNameArg: string): Promise<interfaces.ICflareRecord[]> => {
+    listRecords: async (domainNameArg: string) => {
       const domain = new plugins.smartstring.Domain(domainNameArg);
-      const domainId = await this.getZoneId(domain.zoneName);
-      const responseArg: any = await this.request(
-        'GET',
-        '/zones/' + domainId + '/dns_records?per_page=100'
-      );
-      const result: interfaces.ICflareRecord[] = responseArg.result;
-      return result;
+      const zoneId = await this.convenience.getZoneId(domain.zoneName);
+      const records: plugins.ICloudflareTypes['Record'][] = [];
+      for await (const record of this.apiAccount.dns.records.list({
+        zone_id: zoneId,
+      })) {
+        records.push(record);
+      }
+      return records;
     },
     /**
      * list all zones in the associated authenticated account
      * @param domainName
      */
-    listZones: async (domainName?: string): Promise<interfaces.ICflareZone[]> => {
-      // TODO: handle pagination
-      let requestRoute = `/zones?per_page=50`;
-
-      // may be optionally filtered by domain name
-      if (domainName) {
-        requestRoute = `${requestRoute}&name=${domainName}`;
+    listZones: async (domainName?: string) => {
+      const zones: plugins.ICloudflareTypes['Zone'][] = [];
+      for await (const zone of this.apiAccount.zones.list()) {
+        zones.push(zone);
       }
-
-      const response: any = await this.request('GET', requestRoute);
-      const result = response.result;
-      return result;
+      return zones;
     },
     /**
      * purges a zone
      */
     purgeZone: async (domainName: string): Promise<void> => {
       const domain = new plugins.smartstring.Domain(domainName);
-      const domainId = await this.getZoneId(domain.zoneName);
-      const requestUrl = `/zones/${domainId}/purge_cache`;
-      const payload = {
-        purge_everything: true
-      };
-      const respone = await this.request('DELETE', requestUrl, payload);
+      const zoneId = await this.convenience.getZoneId(domain.zoneName);
+      await this.apiAccount.cache.purge({
+        zone_id: zoneId,
+        purge_everything: true,
+      });
     },
+
     // acme convenience functions
     acmeSetDnsChallenge: async (dnsChallenge: plugins.tsclass.network.IDnsChallenge) => {
       await this.convenience.cleanRecord(dnsChallenge.hostName, 'TXT');
-      await this.convenience.createRecord(dnsChallenge.hostName, 'TXT', dnsChallenge.challenge);
+      await this.convenience.createRecord(
+        dnsChallenge.hostName,
+        'TXT',
+        dnsChallenge.challenge,
+        120
+      );
     },
     acmeRemoveDnsChallenge: async (dnsChallenge: plugins.tsclass.network.IDnsChallenge) => {
       await this.convenience.removeRecord(dnsChallenge.hostName, 'TXT');
-    }
-  };
-
-  public request(
-    methodArg: string,
-    routeArg: string,
-    dataArg: any = {},
-    requestHeadersArg = {}
-  ): Promise<any> {
-    const done = plugins.smartpromise.defer();
-    const options: plugins.smartrequest.ISmartRequestOptions = {
-      method: methodArg,
-      headers: {
-        'Content-Type': 'application/json',
-        'X-Auth-Email': this.authEmail,
-        'X-Auth-Key': this.authKey,
-        'Content-Length': Buffer.byteLength(JSON.stringify(dataArg)),
-        ...requestHeadersArg
     },
-      requestBody: dataArg
   };
-
-    // console.log(options);
-
-    let retryCount = 0; // count the amount of retries
-
-    const makeRequest = async () => {
-      const response: any = await plugins.smartrequest.request(
-        `https://api.cloudflare.com/client/v4${routeArg}`,
-        options
-      );
-      if (response.statusCode === 200) {
-        done.resolve(response.body);
-      } else if (response.statusCode === 429) {
-        console.log('rate limited! Waiting for retry!');
-        retryRequest();
-      } else if (response.statusCode === 400) {
-        console.log(`bad request for route ${routeArg}! Going to retry!`);
-        console.log(response.body);
-      } else {
-        console.log(response.statusCode);
-        done.reject(new Error('request failed'));
-      }
-    };
-    const retryRequest = async (
-      delayTimeArg = Math.floor(Math.random() * (60000 - 8000) + 8000)
-    ) => {
-      console.log(`retry started and waiting for ${delayTimeArg} ms`);
-      await plugins.smartdelay.delayFor(delayTimeArg);
-      if (retryCount < 10) {
-        retryCount++;
-        return await makeRequest();
-      }
-    };
-    makeRequest();
-    return done.promise;
-  }
-
-  private authCheck() {
-    return this.authEmail && this.authKey; // check if auth is available
-  }
 }

ts/cloudflare.classes.record.ts

@@ -0,0 +1,3 @@
+import * as plugins from './cloudflare.plugins.js';
+
+export class CloudflareRecord {}

ts/cloudflare.classes.worker.ts

@@ -1,6 +1,7 @@
-import * as plugins from './cloudflare.plugins';
-import * as interfaces from './interfaces';
-import { WorkerManager } from './cloudflare.classes.workermanager';
+import * as plugins from './cloudflare.plugins.js';
+import * as interfaces from './interfaces/index.js';
+import { WorkerManager } from './cloudflare.classes.workermanager.js';
+import { logger } from './cloudflare.logger.js';
 
 export interface IWorkerRoute extends interfaces.ICflareWorkerRoute {
   zoneName: string;
@@ -66,25 +67,25 @@ export class CloudflareWorker {
           routeIdForUpdate = existingRoute.id;
           if (existingRoute.script === this.id) {
             routeStatus = 'alreadyUpToDate';
-            plugins.smartlog.defaultLogger.log('info', `route already exists, no update needed`);
+            logger.log('info', `route already exists, no update needed`);
           }
         }
       }
 
       // lets care about actually setting routes
       if (routeStatus === 'new') {
-        const zoneId = await this.workerManager.cfAccount.getZoneId(newRoute.zoneName);
+        const zoneId = await this.workerManager.cfAccount.convenience.getZoneId(newRoute.zoneName);
         const requestRoute = `/zones/${zoneId}/workers/routes`;
         await this.workerManager.cfAccount.request('POST', requestRoute, {
           pattern: newRoute.pattern,
-          script: this.id
+          script: this.id,
         });
       } else if (routeStatus === 'needsUpdate') {
-        const zoneId = await this.workerManager.cfAccount.getZoneId(newRoute.zoneName);
+        const zoneId = await this.workerManager.cfAccount.convenience.getZoneId(newRoute.zoneName);
         const requestRoute = `/zones/${zoneId}/workers/routes/${routeIdForUpdate}`;
         await this.workerManager.cfAccount.request('PUT', requestRoute, {
           pattern: newRoute.pattern,
-          script: this.id
+          script: this.id,
         });
       }
     }

ts/cloudflare.classes.workermanager.ts

@@ -1,6 +1,6 @@
-import * as plugins from './cloudflare.plugins';
-import { CloudflareAccount } from './cloudflare.classes.account';
-import { CloudflareWorker } from './cloudflare.classes.worker';
+import * as plugins from './cloudflare.plugins.js';
+import { CloudflareAccount } from './cloudflare.classes.account.js';
+import { CloudflareWorker } from './cloudflare.classes.worker.js';
 
 export class WorkerManager {
   public cfAccount: CloudflareAccount;
@@ -9,28 +9,30 @@ export class WorkerManager {
     this.cfAccount = cfAccountArg;
   }
 
-  public async createWorker(workerName: string, workerScript: string): Promise<CloudflareWorker> {
-    const accountIdentifier = await this.cfAccount.getAccountIdentifier();
-    const route = `/accounts/${accountIdentifier}/workers/scripts/${workerName}`;
-    const responseBody = await this.cfAccount.request('PUT', route, workerScript, {
-      'Content-Type': 'application/javascript',
-      'Content-Length': Buffer.byteLength(workerScript)
+  public async createWorker(workerName: string, workerScript: string): Promise<plugins.ICloudflareTypes['Script']> {
+    if (!this.cfAccount.preselectedAccountId) {
+      throw new Error('No account selected. Please select it first on the account.');
+    }
+    const worker = await this.cfAccount.apiAccount.workers.scripts.content.update(workerName, {
+      account_id: this.cfAccount.preselectedAccountId,
+      "CF-WORKER-BODY-PART": workerScript,
     });
-    return CloudflareWorker.fromApiObject(this, responseBody.result);
+    return worker;
   }
 
   /**
    * lists workers
    */
-  public async listWorkers() {
-    const accountIdentifier = await this.cfAccount.getAccountIdentifier();
-    const route = `/accounts/${accountIdentifier}/workers/scripts`;
-    const response = await this.cfAccount.request('GET', route);
-    const results = response.result;
-    const workers: CloudflareWorker[] = [];
-    for (const apiObject of results) {
-      workers.push(await CloudflareWorker.fromApiObject(this, apiObject));
+  public async listWorkerScripts() {
+    if (!this.cfAccount.preselectedAccountId) {
+      throw new Error('No account selected. Please select it first on the account.');
     }
-    return workers;
+    const workerScripts: plugins.ICloudflareTypes['Script'][] = [];
+    for await (const scriptArg of this.cfAccount.apiAccount.workers.scripts.list({
+      account_id: this.cfAccount.preselectedAccountId,
+    })) {
+      workerScripts.push(scriptArg);
+    }
+    return workerScripts;
   }
 }

ts/cloudflare.classes.zone.ts

@@ -1,6 +1,9 @@
-import * as plugins from './cloudflare.plugins';
-import * as interfaces from './interfaces';
+import * as plugins from './cloudflare.plugins.js';
 
 export class CloudflareZone {
-  public static async createFromApiObject() {}
+  public static createFromApiObject(apiObject: plugins.ICloudflareTypes['Zone']) {
+    const cloudflareZone = new CloudflareZone();
+    Object.assign(cloudflareZone, apiObject);
+    return cloudflareZone;
+  }
 }

ts/cloudflare.classes.zonemanager.ts

@@ -1,5 +1,7 @@
-import * as plugins from './cloudflare.plugins';
-import { CloudflareAccount } from './cloudflare.classes.account';
+import * as plugins from './cloudflare.plugins.js';
+import * as interfaces from './interfaces/index.js';
+import { CloudflareAccount } from './cloudflare.classes.account.js';
+import { CloudflareZone } from './cloudflare.classes.zone.js';
 
 export class ZoneManager {
   public cfAccount: CloudflareAccount;
@@ -9,5 +11,22 @@ export class ZoneManager {
     this.cfAccount = cfAccountArg;
   }
 
-  public getZones() {}
+  public async getZones(zoneName: string) {
+    let requestRoute = `/zones?per_page=50`;
+    // may be optionally filtered by domain name
+
+    if (zoneName) {
+      requestRoute = `${requestRoute}&name=${zoneName}`;
+    }
+
+    const response: any = await this.cfAccount.request('GET', requestRoute);
+    const apiObjects: interfaces.ICflareZone[] = response.result;
+
+    const cloudflareZoneArray = [];
+    for (const apiObject of apiObjects) {
+      cloudflareZoneArray.push(CloudflareZone.createFromApiObject(apiObject));
+    }
+
+    return cloudflareZoneArray;
+  }
 }

ts/cloudflare.logger.ts

@@ -0,0 +1,3 @@
+import * as plugins from './cloudflare.plugins.js';
+
+export const logger = new plugins.smartlog.ConsoleLog();

ts/cloudflare.plugins.ts

@@ -1,8 +1,24 @@
-import * as smartlog from '@pushrocks/smartlog';
-import * as smartpromise from '@pushrocks/smartpromise';
-import * as smartdelay from '@pushrocks/smartdelay';
-import * as smartrequest from '@pushrocks/smartrequest';
-import * as smartstring from '@pushrocks/smartstring';
+import * as smartlog from '@push.rocks/smartlog';
+import * as smartpromise from '@push.rocks/smartpromise';
+import * as smartdelay from '@push.rocks/smartdelay';
+import * as smartrequest from '@push.rocks/smartrequest';
+import * as smartstring from '@push.rocks/smartstring';
 import * as tsclass from '@tsclass/tsclass';
 
 export { smartlog, smartpromise, smartdelay, smartrequest, smartstring, tsclass };
+
+// third party
+import * as cloudflare from 'cloudflare';
+import * as interfaces from './interfaces/index.js';
+import type { Zone } from 'cloudflare/resources/zones/zones.js';
+import type { Record } from 'cloudflare/resources/dns/records.js';
+import type { Script } from 'cloudflare/resources/workers/scripts/index.js';
+
+export interface ICloudflareTypes {
+  Account: interfaces.ICloudflareApiAccountObject;
+  Record: Record;
+  Zone: Zone;
+  Script: Script;
+}
+
+export { cloudflare };

ts/index.ts

@@ -1,2 +1,2 @@
-export { CloudflareAccount } from './cloudflare.classes.account';
-export { CloudflareWorker } from './cloudflare.classes.worker';
+export { CloudflareAccount } from './cloudflare.classes.account.js';
+export { CloudflareWorker } from './cloudflare.classes.worker.js';

ts/interfaces/cloudflare.api.account.ts

@@ -0,0 +1,20 @@
+export interface ICloudflareApiAccountObject {
+  id: string;
+  name: string;
+  type: 'standard' | 'enterprise' | 'pro' | 'free'; // Assuming other possible types
+  settings: {
+    enforce_twofactor: boolean;
+    api_access_enabled: boolean | null;
+    access_approval_expiry: string | null; // Assuming ISO date string or null
+    use_account_custom_ns_by_default: boolean;
+    default_nameservers: string;
+  };
+  legacy_flags: {
+    enterprise_zone_quota: {
+      maximum: number;
+      current: number;
+      available: number;
+    };
+  };
+  created_on: string; // Assuming ISO date string
+}

ts/interfaces/cloudflare.api.record.ts

@@ -1,15 +0,0 @@
-export interface ICflareRecord {
-  id: string;
-  type: string;
-  name: string;
-  content: string;
-  proxiable: boolean;
-  proxied: boolean;
-  ttl: number;
-  locked: boolean;
-  zone_id: string;
-  zone_name: string;
-  created_on: string;
-  modified_on: string;
-  data: any;
-}

ts/interfaces/cloudflare.api.zone.ts

@@ -1,41 +0,0 @@
-export interface ICflareZone {
-  id: string;
-  name: string;
-  development_mode: number;
-  original_name_servers: string[];
-  original_registrar: string;
-  original_dnshost: string;
-  created_on: string;
-  modified_on: string;
-  name_servers: string[];
-  owner: {
-    id: string;
-    email: string;
-    owner_type: string;
-  };
-  permissions: string[];
-  plan: {
-    id: string;
-    name: string;
-    price: number;
-    currency: string;
-    frequency: string;
-    legacy_id: string;
-    is_subscribed: boolean;
-    can_subscribe: boolean;
-  };
-  plan_pending: {
-    id: string;
-    name: string;
-    price: number;
-    currency: string;
-    frequency: string;
-    legacy_id: string;
-    is_subscribed: string;
-    can_subscribe: string;
-  };
-  status: string;
-  paused: boolean;
-  type: string;
-  checked_on: string;
-}

ts/interfaces/index.ts

@@ -1,3 +1,2 @@
-export * from './cloudflare.api.record';
-export * from './cloudflare.api.zone';
-export * from './cloudflare.api.workerroute';
+export * from './cloudflare.api.account.js';
+export * from './cloudflare.api.workerroute.js';

tsconfig.json

@@ -0,0 +1,14 @@
+{
+  "compilerOptions": {
+    "experimentalDecorators": true,
+    "useDefineForClassFields": false,
+    "target": "ES2022",
+    "module": "NodeNext",
+    "moduleResolution": "NodeNext",
+    "esModuleInterop": true,
+    "verbatimModuleSyntax": true
+  },
+  "exclude": [
+    "dist_*/**/*.d.ts"
+  ]
+}

tslint.json

@@ -1,17 +0,0 @@
-{
-  "extends": ["tslint:latest", "tslint-config-prettier"],
-  "rules": {
-    "semicolon": [true, "always"],
-    "no-console": false,
-    "ordered-imports": false,
-    "object-literal-sort-keys": false,
-    "member-ordering": {
-      "options":{
-        "order": [
-          "static-method"
-        ]
-      }
-    }
-  },
-  "defaultSeverity": "warning"
-}