@nodeart/cloudflare-provisioning 1.0.13 → 1.0.15

package/.github/workflows/npm-publish.yml

@@ -11,10 +11,10 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
-          node-version: 16
+          node-version: 24
       - run: npm ci
       - run: npm test
 
@@ -22,10 +22,10 @@ jobs:
     needs: build
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
-          node-version: 16
+          node-version: 24
           registry-url: https://registry.npmjs.org/
       - run: npm ci
       - run: npm publish

package/.github/workflows/test-on-pr.yaml

@@ -10,9 +10,9 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
-          node-version: 16
+          node-version: 24
       - run: npm ci
       - run: npm test

package/cloudflare.js

@@ -210,7 +210,43 @@ class CloudFlare {
       response = await body.text()
     }
 
-    if (statusCode !== 200) {
+    if (statusCode === 404) {
+      console.log('Firewall ruleset was not found. Initializing firewall ruleset creation...')
+      const createRulesetUrl = CLOUDFLARE_API_URL + `zones/${this.zoneId}/rulesets`
+      const payload = {
+        name: 'Custom firewall ruleset',
+        kind: 'zone',
+        phase: 'http_request_firewall_custom',
+        rules: []
+      }
+
+      const { statusCode: createStatusCode, body: createBody } = await this.requestWithDelay(createRulesetUrl, {
+        method: 'POST',
+        headers: {
+          ...this.authorizationHeaders,
+          'Content-Type': 'application/json'
+        },
+        body: JSON.stringify(payload)
+      })
+
+      let createResponse
+      try {
+        createResponse = await createBody.json()
+      } catch (e) {
+        createResponse = await createBody.text()
+      }
+
+      if (createStatusCode !== 200) {
+        throw new Error(`Could not create firewall ruleset: ${createStatusCode}, error: ${JSON.stringify(createResponse)}`)
+      }
+
+      const { id, rules } = createResponse?.result ?? {}
+      if (!id) {
+        throw new Error(`Could not get firewall rules ruleset ID: got ${id}, received value: ${JSON.stringify(createResponse)}`)
+      }
+
+      return { id, rules: rules ?? [] }
+    } else if (statusCode !== 200) {
       throw new Error(`Could not get firewall rules: ${statusCode}, error: ${JSON.stringify(response)}`)
     }
 
@@ -424,27 +460,33 @@ class CloudFlare {
   }
 
   async rewriteRedirectRules (redirectRules) {
-    const { id: rulesetId, rules: currentRedirectRules } = await this.getRedirectRules()
+    const { id: rulesetId } = await this.getRedirectRules()
 
     if (!rulesetId) {
       console.error(`Could not update redirect rules for domain ${this.domain}: custom firewall ruleset id is not found`)
       throw new Error('Custom redirect ruleset id is not found')
     }
 
-    for (const redirectRule of redirectRules) {
-      const currentRedirectRule = currentRedirectRules?.find(
-        rule => rule.description === redirectRule.description
-      )
+    const url = CLOUDFLARE_API_URL + `zones/${this.zoneId}/rulesets/${rulesetId}`
 
-      try {
-        if (currentRedirectRule) {
-          await this.updateRedirectRule(rulesetId, currentRedirectRule.id, redirectRule)
-        } else {
-          await this.createRedirectRule(rulesetId, redirectRule)
-        }
-      } catch (error) {
-        console.error(`Could not update redirect rule for domain ${this.domain}: ${JSON.stringify(redirectRule)}, error: ${error}`)
-      }
+    const { statusCode, body } = await this.requestWithDelay(url, {
+      method: 'PUT',
+      headers: {
+        ...this.authorizationHeaders,
+        'Content-Type': 'application/json'
+      },
+      body: JSON.stringify({ rules: redirectRules })
+    })
+
+    let response
+    try {
+      response = await body.json()
+    } catch (e) {
+      response = await body.text()
+    }
+
+    if (statusCode !== 200) {
+      throw new Error(`Could not update redirect rules: ${statusCode}, error: ${JSON.stringify(response)}`)
     }
   }
 
@@ -547,6 +589,9 @@ class CloudFlare {
     const response = await body.json()
 
     if (statusCode !== 200) {
+      if (response && response.errors && response.errors.find(e => e.code === 1015)) {
+        return response
+      }
       throw new Error(`Could not set HTTP2: ${statusCode}, error: ${JSON.stringify(response)}`)
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nodeart/cloudflare-provisioning",
-  "version": "1.0.13",
+  "version": "1.0.15",
   "description": "",
   "main": "index.js",
   "scripts": {