@nodeart/cloudflare-provisioning 1.0.2 → 1.0.4

package/cloudflare.js

@@ -5,8 +5,9 @@ const { request } = require('undici')
 const CLOUDFLARE_API_URL = 'https://api.cloudflare.com/client/v4/'
 
 class CloudFlare {
-  constructor (zoneId, options) {
+  constructor (zoneId, domain, options) {
     this.zoneId = zoneId
+    this.domain = domain
 
     this.authorizationHeaders = null
     if (options.email !== undefined && options.apiKey !== undefined) {
@@ -189,6 +190,26 @@ class CloudFlare {
     return response
   }
 
+  async getFirewallRules () {
+    const url = CLOUDFLARE_API_URL + `zones/${this.zoneId}/firewall/rules`
+
+    const { statusCode, body } = await request(url, {
+      method: 'GET',
+      headers: {
+        ...this.authorizationHeaders,
+        'Content-Type': 'application/json'
+      }
+    })
+
+    const response = await body.json()
+
+    if (statusCode !== 200) {
+      throw new Error(`Could not get firewall rules: ${statusCode}, error: ${JSON.stringify(response)}`)
+    }
+
+    return response
+  }
+
   async createFirewallRule (firewallRule) {
     const url = CLOUDFLARE_API_URL + `zones/${this.zoneId}/firewall/rules`
 
@@ -210,15 +231,43 @@ class CloudFlare {
     return response
   }
 
-  async createFirewallRules (firewallRules) {
-    const results = await Promise.allSettled(firewallRules.map(firewallRule => this.createFirewallRule(firewallRule)))
+  async updateFirewallRule (id, firewallRule) {
+    const url = CLOUDFLARE_API_URL + `zones/${this.zoneId}/firewall/rules/${id}`
 
-    for (let i = 0; i < results.length; i++) {
-      const result = results[i]
-      const firewallRule = firewallRules[i]
+    const { statusCode, body } = await request(url, {
+      method: 'PATCH',
+      headers: {
+        ...this.authorizationHeaders,
+        'Content-Type': 'application/json'
+      },
+      body: JSON.stringify(firewallRule)
+    })
 
-      if (result.status === 'rejected') {
-        console.log(`Could not create firewallRule route ${JSON.stringify(firewallRule)}: ${result.reason}\n`)
+    const response = await body.json()
+
+    if (statusCode !== 200) {
+      throw new Error(`Could not update a firewall rule: ${statusCode}, error: ${JSON.stringify(response)}`)
+    }
+
+    return response
+  }
+
+  async rewriteFirewallRules (firewallRules) {
+    const currentFirewallRules = await this.getFirewallRules()
+
+    for (const firewallRule of firewallRules) {
+      const currentFirewallRule = currentFirewallRules.result.find(
+        rule => rule.description === firewallRule.description
+      )
+
+      try {
+        if (currentFirewallRule) {
+          await this.updateFirewallRule(currentFirewallRule.id, firewallRule)
+        } else {
+          await this.createFirewallRule(firewallRule)
+        }
+      } catch (error) {
+        console.error(`Could not update firewall rule for domain ${this.domain}: ${JSON.stringify(firewallRule)}, error: ${error}`)
       }
     }
   }
@@ -476,7 +525,7 @@ class CloudFlare {
           await this.createPageRule(pageRule)
         }
       } catch (error) {
-        console.log(`Could not update or create page rule: ${error.message}\n`)
+        console.log(`Could not update or create page rule for domain ${this.domain}: ${error.message}\n`)
       }
     }
   }
@@ -530,7 +579,7 @@ class CloudFlare {
       const workerRoute = workerRoutes[i]
 
       if (result.status === 'rejected') {
-        console.log(`Could not create worker route ${JSON.stringify(workerRoute)}: ${result.reason}\n`)
+        console.log(`Could not create worker route for domain ${this.domain} ${JSON.stringify(workerRoute)}: ${result.reason}\n`)
       }
     }
   }
@@ -583,7 +632,7 @@ class CloudFlare {
       const routeId = routeIds[i]
 
       if (result.status === 'rejected') {
-        console.log(`Could not delete worker route ${routeId}: ${result.reason}\n`)
+        console.log(`Could not delete worker route for domain ${this.domain} ${routeId}: ${result.reason}\n`)
       }
     }
   }

package/index.js

@@ -9,7 +9,7 @@ const cloudflareSettingsHandlers = {
   emailObfuscation: CloudFlare.prototype.setEmailObfuscation,
   brotli: CloudFlare.prototype.setBrotli,
   dnsRecords: CloudFlare.prototype.rewriteDNSRecords,
-  firewallRules: CloudFlare.prototype.createFirewallRules,
+  firewallRules: CloudFlare.prototype.rewriteFirewallRules,
   polish: CloudFlare.prototype.setPolish,
   minify: CloudFlare.prototype.setMinify,
   http2Prioritization: CloudFlare.prototype.setHTTP2Prioritization,
@@ -52,7 +52,7 @@ async function applyCloudflareSettings (config) {
       ? { email: accountEmail, apiKey: accountKey }
       : { token: site.token }
 
-    const cloudFlare = new CloudFlare(zoneId, options)
+    const cloudFlare = new CloudFlare(zoneId, site.domain, options)
     const domainSettings = substituteDomainName(settings, site.domain)
 
     for (const [key, value] of Object.entries(domainSettings)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nodeart/cloudflare-provisioning",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -11,10 +11,10 @@
   "author": "",
   "license": "ISC",
   "devDependencies": {
-    "husky": "^8.0.1",
+    "husky": "^8.0.2",
     "standard": "^17.0.0"
   },
   "dependencies": {
-    "undici": "^5.6.1"
+    "undici": "^5.10.0"
   }
 }

package/template.js

@@ -56,17 +56,17 @@ module.exports = {
     },
     dataExportCache: {
       targets: [{ target: 'url', constraint: { operator: 'matches', value: 'https://www.$DOMAIN/export/*' } }],
-      actions: [{ id: 'cache_level', value: 'bypass' }],
+      actions: [{ id: 'cache_level', value: 'bypass' }, { id: 'origin_error_page_pass_thru', value: 'on' }],
       status: 'active'
     },
     rootForward: {
-      targets: [{ target: 'url', constraint: { operator: 'matches', value: 'https://$DOMAIN/*' } }],
+      targets: [{ target: 'url', constraint: { operator: 'matches', value: '$DOMAIN/*' } }],
       actions: [{ id: 'forwarding_url', value: { status_code: 301, url: 'https://www.$DOMAIN/$1' } }],
       status: 'active'
     },
     ia: {
       targets: [{ target: 'url', constraint: { operator: 'matches', value: '*ia.$DOMAIN/*' } }],
-      actions: [{ id: 'disable_security' }, { id: 'cache_level', value: 'bypass' }],
+      actions: [{ id: 'disable_security' }, { id: 'cache_level', value: 'bypass' }, { id: 'ssl', value: 'flexible' }],
       status: 'active'
     }
   },