readme: update description for JavaScript/NodeJS

Add Save As dialog to provide language examples

README.md

@@ -19,6 +19,10 @@ Here's an online editor to create customized error pages. Try it out [here](http
 Install `cloudflare-error-page` with pip.
 
 ``` Bash
+# Install from PyPI
+pip install cloudflare-error-page
+
+# Or, install the latest version from this repo
 pip install git+https://github.com/donlon/cloudflare-error-page.git
 ```
 
@@ -62,12 +66,52 @@ You can also see live demo [here](https://virt.moe/cferr/examples/default).
 
 A demo server using Flask is also available in [flask_demo.py](examples/flask_demo.py).
 
-### Node.js/NPM
+### JavaScript/NodeJS
 
-A Node.js package is available in [nodejs](nodejs) folder. However currently it supports only Node.js but not web browsers,
-and we plan to refactor it into a shared package, so it can work in both environments.
+Install the `cloudflare-error-page` package using npm:
 
-(Thanks [@junduck](https://github.com/junduck) for creating this.)
+``` Bash
+npm install cloudflare-error-page
+```
+
+The following example demonstrates how to create a simple Express server and return the error page to visitors.
+
+``` JavaScript
+import express from 'express';
+import { render as render_cf_error_page } from 'cloudflare-error-page';
+
+const app = express();
+const port = 3000;
+
+// Define a route for GET requests to the root URL
+app.get('/', (req, res) => {
+  res.status(500).send(render_cf_error_page({
+    title: "Internal server error",
+    // Browser status is ok
+    browser_status: {
+        status: 'ok',
+    },
+    // Cloudflare status is error
+    cloudflare_status: {
+        status: 'error',
+        status_text: 'Error',
+    },
+    // Host status is also ok
+    host_status: {
+        status: 'ok',
+        location: 'example.com',
+    },
+    error_source: "cloudflare",
+  }));
+});
+
+// Start the server and listen on the specified port
+app.listen(port, () => {
+  console.log(`Example app listening at http://localhost:${port}`);
+});
+```
+
+(Thanks [@junduck](https://github.com/junduck) for creating the original NodeJS version.)
 
 ### PHP
 

cloudflare_error_page/__init__.py

@@ -13,14 +13,14 @@ else:
 
 from jinja2 import Environment, PackageLoader, Template, select_autoescape
 
-env = Environment(
+jinja_env = Environment(
     loader=PackageLoader(__name__),
     autoescape=select_autoescape(),
     trim_blocks=True,
     lstrip_blocks=True,
 )
 
-base_template: Template = env.get_template("error.html")
+base_template: Template = jinja_env.get_template('template.html')
 
 
 class ErrorPageParams(TypedDict):
@@ -31,7 +31,7 @@ class ErrorPageParams(TypedDict):
         for_text: NotRequired[str]  # renamed to avoid Python keyword conflict
 
     class StatusItem(TypedDict):
-        status: NotRequired[Literal["ok", "error"]]
+        status: NotRequired[Literal['ok', 'error']]
         location: NotRequired[str]
         name: NotRequired[str]
         status_text: NotRequired[str]
@@ -57,7 +57,7 @@ class ErrorPageParams(TypedDict):
     cloudflare_status: NotRequired[StatusItem]
     host_status: NotRequired[StatusItem]
 
-    error_source: NotRequired[Literal["browser", "cloudflare", "host"]]
+    error_source: NotRequired[Literal['browser', 'cloudflare', 'host']]
 
     what_happened: NotRequired[str]
     what_can_i_do: NotRequired[str]
@@ -97,7 +97,7 @@ def render(params: ErrorPageParams,
 
     if not params.get('time'):
         utc_now = datetime.now(timezone.utc)
-        params['time'] = utc_now.strftime("%Y-%m-%d %H:%M:%S UTC")
+        params['time'] = utc_now.strftime('%Y-%m-%d %H:%M:%S UTC')
     if not params.get('ray_id'):
         params['ray_id'] = secrets.token_hex(8)
     if not allow_html:
@@ -106,5 +106,5 @@ def render(params: ErrorPageParams,
 
     return template.render(params=params, *args, **kwargs)
 
-__version__ = "0.1.0"
-__all__ = ['base_template', 'render']
+__version__ = '0.2.0'
+__all__ = ['jinja_env', 'base_template', 'render']

cloudflare_error_page/templates/template.html

@@ -14,7 +14,15 @@
 <meta name="robots" content="noindex, nofollow" />
 <meta name="viewport" content="width=device-width,initial-scale=1" />
 {% block html_head %}{% endblock %}
-<!-- @INLINE_CSS_HERE@ -->
+<style>
+{% if html_style %}
+    {# Support custom stylesheet #}
+    {{ html_style | safe }}
+{% else %}
+    {# Default stylesheet #}
+    {% include 'main.css' %}
+{% endif %}
+</style>
 </head>
 <body>
 <div id="cf-wrapper">

editor/server/config.example.toml

@@ -8,11 +8,14 @@ SHARE_LINK_DIGITS = 7
 SHORT_SHARE_URL = false
 
 # Icon URL for rendered pages
-PAGE_ICON_URL = ''
+PAGE_ICON_URL = 'https://virt.moe/cferr/editor/assets/icon-{status}-32x32.png'
 
 # MIME type of page icon
 PAGE_ICON_TYPE = 'image/png'
 
+# Image URL for rendered pages
+PAGE_IMAGE_URL = 'https://virt.moe/cferr/editor/assets/icon-{status}-large-white.png'
+
 # Set to true if trust X-Forwarded-For/X-Forwarded-Proto header
 BEHIND_PROXY = true
 

editor/server/utils.py

@@ -122,21 +122,23 @@ def render_extended_template(params: ErrorPageParams,
                              *args: Any,
                              **kwargs: Any) -> str:
     fill_cf_template_params(params)
-    description = params.get('what_happened') or 'Cloudflare error page'
-    description = re.sub(r'</?.*?>', '', description).strip()
+    description = params.get('what_happened') or 'There is an internal server error on Cloudflare\'s network.'
+    description = re.sub(r'<\/?.*?>', '', description).strip()
 
-    page_image_id = 'ok'
+    status = 'ok'
     cf_status_obj = params.get('cloudflare_status')
     if cf_status_obj:
         cf_status = cf_status_obj.get('status')
         if cf_status == 'error':
-            page_image_id = 'error'
-    page_image_url = f'https://virt.moe/cferr/editor/assets/icon-{page_image_id}-large.png'
+            status = 'error'
+    page_icon_url = current_app.config.get('PAGE_ICON_URL', '').replace('{status}', status)
+    page_icon_type = current_app.config.get('PAGE_ICON_TYPE')
+    page_image_url = current_app.config.get('PAGE_IMAGE_URL', '').replace('{status}', status)
     return render_cf_error_page(params=params,
                                 template=template,
                                 base=base_template,
-                                page_icon_url=current_app.config.get('PAGE_ICON_URL'),
-                                page_icon_type=current_app.config.get('PAGE_ICON_TYPE'),
+                                page_icon_url=page_icon_url,
+                                page_icon_type=page_icon_type,
                                 page_url=request.url,
                                 page_description=description,
                                 page_image_url=page_image_url,

editor/web/index.html

@@ -14,7 +14,7 @@
   <meta name="description" content="Online editor to create customized Cloudflare-style error pages.">
   <meta name="keywords" content="cloudflare,error,page,editor">
   <link rel="canonical" href="https://virt.moe/cferr/editor/" />
-  <link rel="icon" type="image/png" href="assets/icon-32x32.png">
+  <link rel="icon" type="image/png" href="assets/icon-ok-32x32.png">
 
   <meta property="og:type" content="website" />
   <meta property="og:site_name" content="moe::virt" />
@@ -532,6 +532,9 @@
               <button type="button" data-type="js" class="list-group-item list-group-item-action">
                 NodeJS Example
               </button>
+              <button type="button" data-type="static" class="list-group-item list-group-item-action">
+                Static Page
+              </button>
             </div>
             <div class="d-flex gap-1 save-as-dialog__buttons">
               <button type="button" class="btn btn-success" id="saveAsDialogCopyBtn" data-bs-toggle="popover"

editor/web/src/codegen/python.ejs

@@ -23,7 +23,7 @@ app = Flask(__name__)
 @app.route('/')
 def index():
     # Render the error page
-    return render_cf_error_page(<%=paramsArg.replaceAll('\n', '\n    ')%>), 500
+    return render_cf_error_page(<%- paramsArg.replaceAll('\n', '\n    ') %>), 500
 
 if __name__ == '__main__':
     app.run(debug=True, port=5000)

editor/web/src/index.js

@@ -305,10 +305,8 @@ function render() {
 let lastRenderedHtml = '';
 function openInNewTab() {
   if (!lastRenderedHtml) render();
-  const blob = new Blob([lastRenderedHtml], { type: 'text/html' });
-  const url = URL.createObjectURL(blob);
-  window.open(url, '_blank', 'noopener');
-  // note that this url won't be revoked
+  const wnd = window.open()
+  wnd.document.documentElement.innerHTML = lastRenderedHtml
 }
 
 function createShareableLink() {
@@ -447,7 +445,15 @@ function updateSaveAsDialog(e) {
   }
   const params = { ...lastCfg };
   delete params.time;
-  $('saveAsDialogCode').innerHTML = saveAsContent = codegen.generate(params);
+  if (codegen) {
+    saveAsContent = codegen.generate(params);
+  } else if (saveAsType == 'static') {
+    render() // rerender the page
+    saveAsContent = lastRenderedHtml;
+  } else {
+    throw new Error('unexpected saveAsType=' + saveAsType)
+  }
+  $('saveAsDialogCode').value = saveAsContent;
   $('saveAsDialogCode').scrollTop = 0;
 
   document.querySelectorAll('#saveAsDialogTypes button').forEach((element) => {
@@ -491,6 +497,10 @@ $('saveAsDialogSaveBtn').addEventListener('click', (e) => {
     case 'python':
       saveName = 'cf_error_page_example.py';
       break;
+    case 'static':
+      saveName = 'cf_error_page.html';
+      break;
+    // TODO: name output files using page title
   }
   saveFile(saveAsContent, saveName);
 });

javascript/.gitignore

@@ -1,5 +1,7 @@
 node_modules/
 dist/
+*.tgz
+
 *.log
 *.html
 .DS_Store

javascript/README.md

@@ -11,7 +11,7 @@ npm install cloudflare-error-page
 Or install from GitHub:
 
 ```bash
-npm install git+https://github.com/donlon/cloudflare-error-page.git#main:nodejs
+npm install git+https://github.com/donlon/cloudflare-error-page.git#javascriptnodejs
 ```
 
 ## Quick Start
@@ -34,7 +34,7 @@ fs.writeFileSync('error.html', errorPage);
 
 ## API Reference
 
-### `render(params: ErrorPageParams, allowHtml?: boolean): string`
+### `render(params: ErrorPageParams, allowHtml?: boolean, moreArgs?: { [name: string]: any; }): string`
 
 Generates an HTML error page based on the provided parameters.
 
@@ -42,6 +42,7 @@ Generates an HTML error page based on the provided parameters.
 
 - `params`: An object containing error page configuration
 - `allowHtml` (optional): Whether to allow HTML in `what_happened` and `what_can_i_do` fields. Default: `true`
+- `moreArgs` (optional): More arguments passed to the ejs template
 
 #### ErrorPageParams Interface
 

javascript/package-lock.json

@@ -0,0 +1,677 @@
+{
+  "name": "cloudflare-error-page",
+  "version": "0.0.1",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "cloudflare-error-page",
+      "version": "0.0.1",
+      "license": "MIT",
+      "dependencies": {
+        "ejs": "^3.1.10"
+      },
+      "devDependencies": {
+        "@rollup/plugin-typescript": "^12.3.0",
+        "@rollup/pluginutils": "^5.3.0",
+        "@types/ejs": "^3.1.5",
+        "@types/node": "^20.0.0",
+        "rollup": "^4.54.0",
+        "tslib": "^2.8.1"
+      },
+      "engines": {
+        "node": ">=18.0.0"
+      }
+    },
+    "node_modules/@rollup/plugin-typescript": {
+      "version": "12.3.0",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-typescript/-/plugin-typescript-12.3.0.tgz",
+      "integrity": "sha512-7DP0/p7y3t67+NabT9f8oTBFE6gGkto4SA6Np2oudYmZE/m1dt8RB0SjL1msMxFpLo631qjRCcBlAbq1ml/Big==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@rollup/pluginutils": "^5.1.0",
+        "resolve": "^1.22.1"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      },
+      "peerDependencies": {
+        "rollup": "^2.14.0||^3.0.0||^4.0.0",
+        "tslib": "*",
+        "typescript": ">=3.7.0"
+      },
+      "peerDependenciesMeta": {
+        "rollup": {
+          "optional": true
+        },
+        "tslib": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@rollup/pluginutils": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.3.0.tgz",
+      "integrity": "sha512-5EdhGZtnu3V88ces7s53hhfK5KSASnJZv8Lulpc04cWO3REESroJXg73DFsOmgbU2BhwV0E20bu2IDZb3VKW4Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/estree": "^1.0.0",
+        "estree-walker": "^2.0.2",
+        "picomatch": "^4.0.2"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      },
+      "peerDependencies": {
+        "rollup": "^1.20.0||^2.0.0||^3.0.0||^4.0.0"
+      },
+      "peerDependenciesMeta": {
+        "rollup": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@rollup/rollup-android-arm-eabi": {
+      "version": "4.54.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.54.0.tgz",
+      "integrity": "sha512-OywsdRHrFvCdvsewAInDKCNyR3laPA2mc9bRYJ6LBp5IyvF3fvXbbNR0bSzHlZVFtn6E0xw2oZlyjg4rKCVcng==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ]
+    },
+    "node_modules/@rollup/rollup-android-arm64": {
+      "version": "4.54.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.54.0.tgz",
+      "integrity": "sha512-Skx39Uv+u7H224Af+bDgNinitlmHyQX1K/atIA32JP3JQw6hVODX5tkbi2zof/E69M1qH2UoN3Xdxgs90mmNYw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ]
+    },
+    "node_modules/@rollup/rollup-darwin-arm64": {
+      "version": "4.54.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.54.0.tgz",
+      "integrity": "sha512-k43D4qta/+6Fq+nCDhhv9yP2HdeKeP56QrUUTW7E6PhZP1US6NDqpJj4MY0jBHlJivVJD5P8NxrjuobZBJTCRw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/@rollup/rollup-darwin-x64": {
+      "version": "4.54.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.54.0.tgz",
+      "integrity": "sha512-cOo7biqwkpawslEfox5Vs8/qj83M/aZCSSNIWpVzfU2CYHa2G3P1UN5WF01RdTHSgCkri7XOlTdtk17BezlV3A==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/@rollup/rollup-freebsd-arm64": {
+      "version": "4.54.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.54.0.tgz",
+      "integrity": "sha512-miSvuFkmvFbgJ1BevMa4CPCFt5MPGw094knM64W9I0giUIMMmRYcGW/JWZDriaw/k1kOBtsWh1z6nIFV1vPNtA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ]
+    },
+    "node_modules/@rollup/rollup-freebsd-x64": {
+      "version": "4.54.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.54.0.tgz",
+      "integrity": "sha512-KGXIs55+b/ZfZsq9aR026tmr/+7tq6VG6MsnrvF4H8VhwflTIuYh+LFUlIsRdQSgrgmtM3fVATzEAj4hBQlaqQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
+      "version": "4.54.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.54.0.tgz",
+      "integrity": "sha512-EHMUcDwhtdRGlXZsGSIuXSYwD5kOT9NVnx9sqzYiwAc91wfYOE1g1djOEDseZJKKqtHAHGwnGPQu3kytmfaXLQ==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm-musleabihf": {
+      "version": "4.54.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.54.0.tgz",
+      "integrity": "sha512-+pBrqEjaakN2ySv5RVrj/qLytYhPKEUwk+e3SFU5jTLHIcAtqh2rLrd/OkbNuHJpsBgxsD8ccJt5ga/SeG0JmA==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm64-gnu": {
+      "version": "4.54.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.54.0.tgz",
+      "integrity": "sha512-NSqc7rE9wuUaRBsBp5ckQ5CVz5aIRKCwsoa6WMF7G01sX3/qHUw/z4pv+D+ahL1EIKy6Enpcnz1RY8pf7bjwng==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm64-musl": {
+      "version": "4.54.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.54.0.tgz",
+      "integrity": "sha512-gr5vDbg3Bakga5kbdpqx81m2n9IX8M6gIMlQQIXiLTNeQW6CucvuInJ91EuCJ/JYvc+rcLLsDFcfAD1K7fMofg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-loong64-gnu": {
+      "version": "4.54.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.54.0.tgz",
+      "integrity": "sha512-gsrtB1NA3ZYj2vq0Rzkylo9ylCtW/PhpLEivlgWe0bpgtX5+9j9EZa0wtZiCjgu6zmSeZWyI/e2YRX1URozpIw==",
+      "cpu": [
+        "loong64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-ppc64-gnu": {
+      "version": "4.54.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.54.0.tgz",
+      "integrity": "sha512-y3qNOfTBStmFNq+t4s7Tmc9hW2ENtPg8FeUD/VShI7rKxNW7O4fFeaYbMsd3tpFlIg1Q8IapFgy7Q9i2BqeBvA==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-riscv64-gnu": {
+      "version": "4.54.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.54.0.tgz",
+      "integrity": "sha512-89sepv7h2lIVPsFma8iwmccN7Yjjtgz0Rj/Ou6fEqg3HDhpCa+Et+YSufy27i6b0Wav69Qv4WBNl3Rs6pwhebQ==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-riscv64-musl": {
+      "version": "4.54.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.54.0.tgz",
+      "integrity": "sha512-ZcU77ieh0M2Q8Ur7D5X7KvK+UxbXeDHwiOt/CPSBTI1fBmeDMivW0dPkdqkT4rOgDjrDDBUed9x4EgraIKoR2A==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-s390x-gnu": {
+      "version": "4.54.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.54.0.tgz",
+      "integrity": "sha512-2AdWy5RdDF5+4YfG/YesGDDtbyJlC9LHmL6rZw6FurBJ5n4vFGupsOBGfwMRjBYH7qRQowT8D/U4LoSvVwOhSQ==",
+      "cpu": [
+        "s390x"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-x64-gnu": {
+      "version": "4.54.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.54.0.tgz",
+      "integrity": "sha512-WGt5J8Ij/rvyqpFexxk3ffKqqbLf9AqrTBbWDk7ApGUzaIs6V+s2s84kAxklFwmMF/vBNGrVdYgbblCOFFezMQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-x64-musl": {
+      "version": "4.54.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.54.0.tgz",
+      "integrity": "sha512-JzQmb38ATzHjxlPHuTH6tE7ojnMKM2kYNzt44LO/jJi8BpceEC8QuXYA908n8r3CNuG/B3BV8VR3Hi1rYtmPiw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-openharmony-arm64": {
+      "version": "4.54.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.54.0.tgz",
+      "integrity": "sha512-huT3fd0iC7jigGh7n3q/+lfPcXxBi+om/Rs3yiFxjvSxbSB6aohDFXbWvlspaqjeOh+hx7DDHS+5Es5qRkWkZg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openharmony"
+      ]
+    },
+    "node_modules/@rollup/rollup-win32-arm64-msvc": {
+      "version": "4.54.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.54.0.tgz",
+      "integrity": "sha512-c2V0W1bsKIKfbLMBu/WGBz6Yci8nJ/ZJdheE0EwB73N3MvHYKiKGs3mVilX4Gs70eGeDaMqEob25Tw2Gb9Nqyw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@rollup/rollup-win32-ia32-msvc": {
+      "version": "4.54.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.54.0.tgz",
+      "integrity": "sha512-woEHgqQqDCkAzrDhvDipnSirm5vxUXtSKDYTVpZG3nUdW/VVB5VdCYA2iReSj/u3yCZzXID4kuKG7OynPnB3WQ==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@rollup/rollup-win32-x64-gnu": {
+      "version": "4.54.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.54.0.tgz",
+      "integrity": "sha512-dzAc53LOuFvHwbCEOS0rPbXp6SIhAf2txMP5p6mGyOXXw5mWY8NGGbPMPrs4P1WItkfApDathBj/NzMLUZ9rtQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@rollup/rollup-win32-x64-msvc": {
+      "version": "4.54.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.54.0.tgz",
+      "integrity": "sha512-hYT5d3YNdSh3mbCU1gwQyPgQd3T2ne0A3KG8KSBdav5TiBg6eInVmV+TeR5uHufiIgSFg0XsOWGW5/RhNcSvPg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@types/ejs": {
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/@types/ejs/-/ejs-3.1.5.tgz",
+      "integrity": "sha512-nv+GSx77ZtXiJzwKdsASqi+YQ5Z7vwHsTP0JY2SiQgjGckkBRKZnk8nIM+7oUZ1VCtuTz0+By4qVR7fqzp/Dfg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/estree": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz",
+      "integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/node": {
+      "version": "20.19.26",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.19.26.tgz",
+      "integrity": "sha512-0l6cjgF0XnihUpndDhk+nyD3exio3iKaYROSgvh/qSevPXax3L8p5DBRFjbvalnwatGgHEQn2R88y2fA3g4irg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "undici-types": "~6.21.0"
+      }
+    },
+    "node_modules/async": {
+      "version": "3.2.6",
+      "resolved": "https://registry.npmjs.org/async/-/async-3.2.6.tgz",
+      "integrity": "sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==",
+      "license": "MIT"
+    },
+    "node_modules/balanced-match": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+      "license": "MIT"
+    },
+    "node_modules/brace-expansion": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/ejs": {
+      "version": "3.1.10",
+      "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.10.tgz",
+      "integrity": "sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "jake": "^10.8.5"
+      },
+      "bin": {
+        "ejs": "bin/cli.js"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/estree-walker": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz",
+      "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/filelist": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz",
+      "integrity": "sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "minimatch": "^5.0.1"
+      }
+    },
+    "node_modules/fsevents": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
+    },
+    "node_modules/function-bind": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/hasown": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
+      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "function-bind": "^1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/is-core-module": {
+      "version": "2.16.1",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz",
+      "integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "hasown": "^2.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/jake": {
+      "version": "10.9.4",
+      "resolved": "https://registry.npmjs.org/jake/-/jake-10.9.4.tgz",
+      "integrity": "sha512-wpHYzhxiVQL+IV05BLE2Xn34zW1S223hvjtqk0+gsPrwd/8JNLXJgZZM/iPFsYc1xyphF+6M6EvdE5E9MBGkDA==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "async": "^3.2.6",
+        "filelist": "^1.0.4",
+        "picocolors": "^1.1.1"
+      },
+      "bin": {
+        "jake": "bin/cli.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/minimatch": {
+      "version": "5.1.6",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
+      "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/path-parse": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/picocolors": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
+      "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
+      "license": "ISC"
+    },
+    "node_modules/picomatch": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
+      "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
+    "node_modules/resolve": {
+      "version": "1.22.11",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.11.tgz",
+      "integrity": "sha512-RfqAvLnMl313r7c9oclB1HhUEAezcpLjz95wFH4LVuhk9JF/r22qmVP9AMmOU4vMX7Q8pN8jwNg/CSpdFnMjTQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-core-module": "^2.16.1",
+        "path-parse": "^1.0.7",
+        "supports-preserve-symlinks-flag": "^1.0.0"
+      },
+      "bin": {
+        "resolve": "bin/resolve"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/rollup": {
+      "version": "4.54.0",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.54.0.tgz",
+      "integrity": "sha512-3nk8Y3a9Ea8szgKhinMlGMhGMw89mqule3KWczxhIzqudyHdCIOHw8WJlj/r329fACjKLEh13ZSk7oE22kyeIw==",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@types/estree": "1.0.8"
+      },
+      "bin": {
+        "rollup": "dist/bin/rollup"
+      },
+      "engines": {
+        "node": ">=18.0.0",
+        "npm": ">=8.0.0"
+      },
+      "optionalDependencies": {
+        "@rollup/rollup-android-arm-eabi": "4.54.0",
+        "@rollup/rollup-android-arm64": "4.54.0",
+        "@rollup/rollup-darwin-arm64": "4.54.0",
+        "@rollup/rollup-darwin-x64": "4.54.0",
+        "@rollup/rollup-freebsd-arm64": "4.54.0",
+        "@rollup/rollup-freebsd-x64": "4.54.0",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.54.0",
+        "@rollup/rollup-linux-arm-musleabihf": "4.54.0",
+        "@rollup/rollup-linux-arm64-gnu": "4.54.0",
+        "@rollup/rollup-linux-arm64-musl": "4.54.0",
+        "@rollup/rollup-linux-loong64-gnu": "4.54.0",
+        "@rollup/rollup-linux-ppc64-gnu": "4.54.0",
+        "@rollup/rollup-linux-riscv64-gnu": "4.54.0",
+        "@rollup/rollup-linux-riscv64-musl": "4.54.0",
+        "@rollup/rollup-linux-s390x-gnu": "4.54.0",
+        "@rollup/rollup-linux-x64-gnu": "4.54.0",
+        "@rollup/rollup-linux-x64-musl": "4.54.0",
+        "@rollup/rollup-openharmony-arm64": "4.54.0",
+        "@rollup/rollup-win32-arm64-msvc": "4.54.0",
+        "@rollup/rollup-win32-ia32-msvc": "4.54.0",
+        "@rollup/rollup-win32-x64-gnu": "4.54.0",
+        "@rollup/rollup-win32-x64-msvc": "4.54.0",
+        "fsevents": "~2.3.2"
+      }
+    },
+    "node_modules/supports-preserve-symlinks-flag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
+      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/tslib": {
+      "version": "2.8.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+      "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+      "dev": true,
+      "license": "0BSD",
+      "peer": true
+    },
+    "node_modules/typescript": {
+      "version": "5.9.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz",
+      "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "peer": true,
+      "bin": {
+        "tsc": "bin/tsc",
+        "tsserver": "bin/tsserver"
+      },
+      "engines": {
+        "node": ">=14.17"
+      }
+    },
+    "node_modules/undici-types": {
+      "version": "6.21.0",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz",
+      "integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==",
+      "dev": true,
+      "license": "MIT"
+    }
+  }
+}

javascript/package.json

@@ -1,12 +1,13 @@
 {
   "name": "cloudflare-error-page",
-  "version": "0.0.1",
+  "version": "0.1.0",
   "description": "Cloudflare Error Page Generator",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "type": "module",
   "scripts": {
-    "build": "tsc",
+    "build": "node scripts/copy-files.js && rollup -c",
+    "dev": "rollup -c -w",
     "prepublishOnly": "pnpm run build",
     "example": "node examples/example.js"
   },
@@ -32,9 +33,12 @@
     "ejs": "^3.1.10"
   },
   "devDependencies": {
+    "@rollup/plugin-typescript": "^12.3.0",
+    "@rollup/pluginutils": "^5.3.0",
     "@types/ejs": "^3.1.5",
     "@types/node": "^20.0.0",
-    "typescript": "^5.3.0"
+    "rollup": "^4.54.0",
+    "tslib": "^2.8.1"
   },
   "files": [
     "dist/**/*",

javascript/rollup.config.ts

@@ -0,0 +1,35 @@
+import typescript from "@rollup/plugin-typescript";
+import { createFilter } from "@rollup/pluginutils";
+// import pkg from './package.json' with { type: 'json' };
+
+function createRawImportPlugin(include: string) {
+  const rawFilter = createFilter(include);
+
+  return {
+    name: "raw-import",
+
+    transform(code: string, id: string): any {
+      if (rawFilter(id)) {
+        return {
+          code: `export default ${JSON.stringify(code)};`,
+          map: { mappings: "" },
+        };
+      }
+    },
+  };
+}
+
+export default {
+  input: "src/index.ts",
+  output: {
+    // file: pkg.module,
+    file: "dist/index.js",
+    format: "esm",
+    sourcemap: true,
+  },
+  watch: {
+    include: "src/**",
+  },
+  external: ["ejs"],
+  plugins: [typescript(), createRawImportPlugin("**/templates/**")],
+};

javascript/scripts/copy-files.js

@@ -0,0 +1,14 @@
+import fs from "node:fs";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+
+// Resolve the directory of this script
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
+// Define paths relative to scripts/copy.js
+const src = path.resolve(__dirname, "../../resources/styles/main.css");
+const dest = path.resolve(__dirname, "../src/templates/main.css");
+
+// Copy file
+fs.copyFileSync(src, dest);

javascript/src/assets.d.ts

@@ -0,0 +1,4 @@
+declare module "./templates/*" {
+  const content: string;
+  export default content;
+}

javascript/src/index.ts

@@ -0,0 +1,101 @@
+import * as ejs from "ejs";
+
+import templateString from "./templates/template.ejs";
+import cssString from "./templates/main.css";
+
+export interface StatusItem {
+  status?: "ok" | "error";
+  status_text?: string;
+  status_text_color?: string;
+  location?: string;
+  name?: string;
+}
+
+export interface MoreInformation {
+  hidden?: boolean;
+  link?: string;
+  text?: string;
+  for?: string;
+}
+
+export interface PerfSecBy {
+  link?: string;
+  text?: string;
+}
+
+export interface CreatorInfo {
+  hidden?: boolean;
+  link?: string;
+  text?: string;
+}
+
+export interface ErrorPageParams {
+  error_code?: number;
+  title?: string;
+  html_title?: string;
+  time?: string;
+  ray_id?: string;
+  client_ip?: string;
+
+  browser_status?: StatusItem;
+  cloudflare_status?: StatusItem;
+  host_status?: StatusItem;
+
+  error_source?: "browser" | "cloudflare" | "host";
+
+  what_happened?: string;
+  what_can_i_do?: string;
+
+  more_information?: MoreInformation;
+  perf_sec_by?: PerfSecBy;
+  creator_info?: CreatorInfo;
+}
+
+// Load EJS template
+export const baseTemplate: ejs.TemplateFunction = ejs.compile(templateString);
+
+/**
+ * Generate random hex string for ray-id
+ */
+function genHexString(digits: number): string {
+  const hex = "0123456789ABCDEF";
+  let output = "";
+  for (let i = 0; i < digits; i++) {
+    output += hex.charAt(Math.floor(Math.random() * hex.length));
+  }
+  return output;
+}
+
+/**
+ * Render a customized Cloudflare error page
+ * @param params - The parameters for the error page
+ * @param allowHtml - Whether to allow HTML in what_happened and what_can_i_do fields (default: true)
+ * @param moreArgs - More arguments passed to the ejs template
+ * @returns The rendered HTML string
+ */
+export function render(
+  params: ErrorPageParams,
+  allowHtml: boolean = true,
+  moreArgs: {
+    [name: string]: any;
+  } = {}
+): string {
+  params = { ...params };
+
+  if (!params.time) {
+    const now = new Date();
+    params.time = now.toISOString().replace("T", " ").substring(0, 19) + " UTC";
+  }
+  if (!params.ray_id) {
+    params.ray_id = genHexString(16);
+  }
+
+  if (!allowHtml) {
+    params.what_happened = ejs.escapeXML(params.what_happened ?? "");
+    params.what_can_i_do = ejs.escapeXML(params.what_can_i_do ?? "");
+  }
+
+  return baseTemplate({ params, html_style: cssString, ...moreArgs });
+}
+
+export default render;

javascript/src/templates/.gitignore

@@ -0,0 +1 @@
+main.css

javascript/src/templates/template.ejs

@@ -4,31 +4,31 @@
 <!--[if IE 8]>    <html class="no-js ie8 oldie" lang="en-US"> <![endif]-->
 <!--[if gt IE 8]><!--> <html class="no-js" lang="en-US"> <!--<![endif]-->
 <head>
-<%
-let error_code = params.error_code || 500;
-let title = params.title || 'Internal server error';
-let html_title_output = params.html_title || (error_code + ': ' + title);
-%>
-<title><%= html_title_output %></title>
+<% const error_code = params.error_code || 500; %>
+<% const title = params.title || 'Internal server error'; %>
+<% const html_title = params.html_title || (error_code + ': ' + title); %>
+<title><%= html_title %></title>
 <meta charset="UTF-8" />
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <meta http-equiv="X-UA-Compatible" content="IE=Edge" />
 <meta name="robots" content="noindex, nofollow" />
 <meta name="viewport" content="width=device-width,initial-scale=1" />
-<!-- @INLINE_CSS_HERE@ -->
+<style>
+<%- html_style %>
+</style>
 </head>
 <body>
 <div id="cf-wrapper">
-        <div id="cf-error-details" class="p-0">
+    <div id="cf-error-details" class="p-0">
         <header class="mx-auto pt-10 lg:pt-6 lg:px-8 w-240 lg:w-full mb-8">
             <h1 class="inline-block sm:block sm:mb-2 font-light text-60 lg:text-4xl text-black-dark leading-tight mr-2">
                 <span class="inline-block"><%= title %></span>
                 <span class="code-label">Error code <%= error_code %></span>
             </h1>
-            <% let more_info = params.more_information || {}; %>
+            <% const more_info = params.more_information || {}; %>
             <% if (!more_info.hidden) { %>
             <div>
-                Visit <a href="<%= more_info.link || 'https://www.cloudflare.com/' %>" target="_blank" rel="noopener noreferrer"><%= more_info.text || 'cloudflare.com' %></a> for <%= more_info.for || "more information" %>.
+                Visit <a href="<%= more_info.link || 'https://www.cloudflare.com/' %>" target="_blank" rel="noopener noreferrer"><%= more_info.text || 'cloudflare.com' %></a> for <%= more_info.for || 'more information' %>.
             </div>
             <% } %>
             <div class="<%= more_info.hidden ? '' : 'mt-3' %>"><%= params.time %></div>
@@ -36,27 +36,16 @@ let html_title_output = params.html_title || (error_code + ': ' + title);
         <div class="my-8 bg-gradient-gray">
           <div class="w-240 lg:w-full mx-auto">
                 <div class="clearfix md:px-8">
-                <% for (let item_id of ['browser', 'cloudflare', 'host']) { %>
-                    <%
-                    let icon, default_location, default_name, text_color, status_text;
-
-                    if (item_id === 'browser') {
-                        icon = 'browser';
-                        default_location = 'You';
-                        default_name = 'Browser';
-                    } else if (item_id === 'cloudflare') {
-                        icon = 'cloud';
-                        default_location = 'San Francisco';
-                        default_name = 'Cloudflare';
-                    } else {
-                        icon = 'server';
-                        default_location = 'Website';
-                        default_name = 'Host';
-                    }
-
-                    let item = params[item_id + '_status'] || {};
-                    let status = item.status || 'ok';
-
+                <% 
+                const items = [
+                    { id: 'browser', icon: 'browser', default_location: 'You', default_name: 'Browser' },
+                    { id: 'cloudflare', icon: 'cloud', default_location: 'San Francisco', default_name: 'Cloudflare' },
+                    { id: 'host', icon: 'server', default_location: 'Website', default_name: 'Host' }
+                ];
+                items.forEach(({ id, icon, default_location, default_name }) => {
+                    const item = params[id + '_status'] || {};
+                    const status = item.status || 'ok';
+                    let text_color;
                     if (item.status_text_color) {
                         text_color = item.status_text_color;
                     } else if (status === 'ok') {
@@ -64,27 +53,19 @@ let html_title_output = params.html_title || (error_code + ': ' + title);
                     } else if (status === 'error') {
                         text_color = '#bd2426'; // text-red-error
                     }
-
-                    status_text = item.status_text || (status === 'ok' ? 'Working' : 'Error');
-                    %>
-                    <div id="cf-<%= item_id %>-status" class="<% if (params.error_source === item_id) { %>cf-error-source<% } %> relative w-1/3 md:w-full py-15 md:p-0 md:py-8 md:text-left md:border-solid md:border-0 md:border-b md:border-gray-400 overflow-hidden float-left md:float-none text-center">
+                    const status_text = item.status_text || (status === 'ok' ? 'Working' : 'Error');
+                    const is_error_source = params.error_source === id;
+                %>
+                    <div id="cf-<%= id %>-status" class="<%= is_error_source ? 'cf-error-source' : '' %> relative w-1/3 md:w-full py-15 md:p-0 md:py-8 md:text-left md:border-solid md:border-0 md:border-b md:border-gray-400 overflow-hidden float-left md:float-none text-center">
                         <div class="relative mb-10 md:m-0">
                             <span class="cf-icon-<%= icon %> block md:hidden h-20 bg-center bg-no-repeat"></span>
                             <span class="cf-icon-<%= status %> w-12 h-12 absolute left-1/2 md:left-auto md:right-0 md:top-0 -ml-6 -bottom-4"></span>
                         </div>
                         <span class="md:block w-full truncate"><%= item.location || default_location %></span>
-                        <%
-                        let _name_style;
-                        if ((item.name || default_name) === 'Cloudflare') {
-                            _name_style = 'style="color: #2f7bbf;"'
-                        } else{
-                            _name_style = ''
-                        }
-                        %>
-                        <h3 class="md:inline-block mt-3 md:mt-0 text-2xl text-gray-600 font-light leading-1.3" <%-_name_style %>><%= item.name || default_name %></h3>
+                        <h3 class="md:inline-block mt-3 md:mt-0 text-2xl text-gray-600 font-light leading-1.3" <%- (item.name || default_name) === 'Cloudflare' ? 'style="color: #2f7bbf;"' : '' %>><%= item.name || default_name %></h3>
                         <span class="leading-1.3 text-2xl" style="color: <%= text_color %>"><%= status_text %></span>
                     </div>
-                <% } %>
+                <% }); %>
                 </div>
             </div>
         </div>
@@ -93,11 +74,11 @@ let html_title_output = params.html_title || (error_code + ': ' + title);
             <div class="clearfix">
                 <div class="w-1/2 md:w-full float-left pr-6 md:pb-10 md:pr-0 leading-relaxed">
                     <h2 class="text-3xl font-normal leading-1.3 mb-4">What happened?</h2>
-                    <%= (params.what_happened || 'There is an internal server error on Cloudflare\'s network.') %>
+                    <%- params.what_happened || '<p>There is an internal server error on Cloudflare\'s network.</p>' %>
                 </div>
                 <div class="w-1/2 md:w-full float-left leading-relaxed">
                     <h2 class="text-3xl font-normal leading-1.3 mb-4">What can I do?</h2>
-                    <%= (params.what_can_i_do || 'Please try again in a few minutes.') %>
+                    <%- params.what_can_i_do || '<p>Please try again in a few minutes.</p>' %>
                 </div>
             </div>
         </div>
@@ -112,12 +93,18 @@ let html_title_output = params.html_title || (error_code + ': ' + title);
                     <span class="hidden" id="cf-footer-ip"><%= params.client_ip || '1.1.1.1' %></span>
                     <span class="cf-footer-separator sm:hidden">&bull;</span>
                 </span>
-                <% let perf_sec_by = params.perf_sec_by || {}; %>
+                <% const perf_sec_by = params.perf_sec_by || {}; %>
                 <span class="cf-footer-item sm:block sm:mb-1"><span>Performance &amp; security by</span> <a rel="noopener noreferrer" href="<%= perf_sec_by.link || 'https://www.cloudflare.com/' %>" id="brand_link" target="_blank"><%= perf_sec_by.text || 'Cloudflare' %></a></span>
+
+                <% const creator_info = params.creator_info || {}; %>
+                <% if (!(creator_info.hidden ?? true)) { %>
+                <span class="cf-footer-separator sm:hidden">&bull;</span>
+                <span class="cf-footer-item sm:block sm:mb-1">Created with <a href="<%= creator_info.link %>" target="_blank"><%= creator_info.text %></a></span>
+                <% } %>
             </p>
         </div><!-- /.error-footer -->
     </div>
 </div>
 <script>(function(){function d(){var b=a.getElementById("cf-footer-item-ip"),c=a.getElementById("cf-footer-ip-reveal");b&&"classList"in b&&(b.classList.remove("hidden"),c.addEventListener("click",function(){c.classList.add("hidden");a.getElementById("cf-footer-ip").classList.remove("hidden")}))}var a=document;document.addEventListener&&a.addEventListener("DOMContentLoaded",d)})();</script>
 </body>
-</html>
+</html>

nodejs/package-lock.json

@@ -1,142 +0,0 @@
-{
-  "name": "cloudflare-error-page",
-  "version": "0.0.1",
-  "lockfileVersion": 3,
-  "requires": true,
-  "packages": {
-    "": {
-      "name": "cloudflare-error-page",
-      "version": "0.0.1",
-      "license": "MIT",
-      "dependencies": {
-        "ejs": "^3.1.10"
-      },
-      "devDependencies": {
-        "@types/ejs": "^3.1.5",
-        "@types/node": "^20.0.0",
-        "typescript": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=18.0.0"
-      }
-    },
-    "node_modules/@types/ejs": {
-      "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/@types/ejs/-/ejs-3.1.5.tgz",
-      "integrity": "sha512-nv+GSx77ZtXiJzwKdsASqi+YQ5Z7vwHsTP0JY2SiQgjGckkBRKZnk8nIM+7oUZ1VCtuTz0+By4qVR7fqzp/Dfg==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@types/node": {
-      "version": "20.19.26",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.19.26.tgz",
-      "integrity": "sha512-0l6cjgF0XnihUpndDhk+nyD3exio3iKaYROSgvh/qSevPXax3L8p5DBRFjbvalnwatGgHEQn2R88y2fA3g4irg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "undici-types": "~6.21.0"
-      }
-    },
-    "node_modules/async": {
-      "version": "3.2.6",
-      "resolved": "https://registry.npmjs.org/async/-/async-3.2.6.tgz",
-      "integrity": "sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==",
-      "license": "MIT"
-    },
-    "node_modules/balanced-match": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
-      "license": "MIT"
-    },
-    "node_modules/brace-expansion": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
-      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
-      "license": "MIT",
-      "dependencies": {
-        "balanced-match": "^1.0.0"
-      }
-    },
-    "node_modules/ejs": {
-      "version": "3.1.10",
-      "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.10.tgz",
-      "integrity": "sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "jake": "^10.8.5"
-      },
-      "bin": {
-        "ejs": "bin/cli.js"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/filelist": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz",
-      "integrity": "sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "minimatch": "^5.0.1"
-      }
-    },
-    "node_modules/jake": {
-      "version": "10.9.4",
-      "resolved": "https://registry.npmjs.org/jake/-/jake-10.9.4.tgz",
-      "integrity": "sha512-wpHYzhxiVQL+IV05BLE2Xn34zW1S223hvjtqk0+gsPrwd/8JNLXJgZZM/iPFsYc1xyphF+6M6EvdE5E9MBGkDA==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "async": "^3.2.6",
-        "filelist": "^1.0.4",
-        "picocolors": "^1.1.1"
-      },
-      "bin": {
-        "jake": "bin/cli.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/minimatch": {
-      "version": "5.1.6",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
-      "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
-      "license": "ISC",
-      "dependencies": {
-        "brace-expansion": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/picocolors": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
-      "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
-      "license": "ISC"
-    },
-    "node_modules/typescript": {
-      "version": "5.9.3",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz",
-      "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "bin": {
-        "tsc": "bin/tsc",
-        "tsserver": "bin/tsserver"
-      },
-      "engines": {
-        "node": ">=14.17"
-      }
-    },
-    "node_modules/undici-types": {
-      "version": "6.21.0",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz",
-      "integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==",
-      "dev": true,
-      "license": "MIT"
-    }
-  }
-}

nodejs/src/index.ts

@@ -1,123 +0,0 @@
-import * as fs from "fs";
-import * as path from "path";
-import { fileURLToPath } from "url";
-import * as ejs from "ejs";
-import * as crypto from "crypto";
-
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
-
-export interface StatusItem {
-  status?: "ok" | "error";
-  status_text?: string;
-  status_text_color?: string;
-  location?: string;
-  name?: string;
-}
-
-export interface MoreInformation {
-  hidden?: boolean;
-  link?: string;
-  text?: string;
-  for?: string;
-}
-
-export interface PerfSecBy {
-  link?: string;
-  text?: string;
-}
-
-export interface CreatorInfo {
-  hidden?: boolean;
-  link?: string;
-  text?: string;
-}
-
-export interface ErrorPageParams {
-  error_code?: number;
-  title?: string;
-  html_title?: string;
-  time?: string;
-  ray_id?: string;
-  client_ip?: string;
-
-  browser_status?: StatusItem;
-  cloudflare_status?: StatusItem;
-  host_status?: StatusItem;
-
-  error_source?: "browser" | "cloudflare" | "host";
-
-  what_happened?: string;
-  what_can_i_do?: string;
-
-  more_information?: MoreInformation;
-  perf_sec_by?: PerfSecBy;
-  creator_info?: CreatorInfo;
-}
-
-/**
- * Fill default parameters if not provided
- */
-function fillParams(params: ErrorPageParams): ErrorPageParams {
-  const filledParams = { ...params };
-
-  if (!filledParams.time) {
-    const now = new Date();
-    filledParams.time =
-      now.toISOString().replace("T", " ").substring(0, 19) + " UTC";
-  }
-
-  if (!filledParams.ray_id) {
-    filledParams.ray_id = crypto.randomBytes(8).toString("hex");
-  }
-
-  return filledParams;
-}
-
-/**
- * Escape HTML special characters
- */
-function escapeHtml(text: string): string {
-  const htmlEscapeMap: Record<string, string> = {
-    "&": "&amp;",
-    "<": "&lt;",
-    ">": "&gt;",
-    '"': "&quot;",
-    "'": "&#39;",
-  };
-  return text.replace(/[&<>"']/g, (char) => htmlEscapeMap[char] || char);
-}
-
-/**
- * Render a customized Cloudflare error page
- * @param params - The parameters for the error page
- * @param allowHtml - Whether to allow HTML in what_happened and what_can_i_do fields (default: true)
- * @returns The rendered HTML string
- */
-export function render(
-  params: ErrorPageParams,
-  allowHtml: boolean = true
-): string {
-  let processedParams = fillParams(params);
-
-  if (!allowHtml) {
-    processedParams = { ...processedParams };
-    if (processedParams.what_happened) {
-      processedParams.what_happened = escapeHtml(processedParams.what_happened);
-    }
-    if (processedParams.what_can_i_do) {
-      processedParams.what_can_i_do = escapeHtml(processedParams.what_can_i_do);
-    }
-  }
-
-  // Load EJS template
-  const templatePath = path.join(__dirname, "..", "templates", "error.ejs");
-
-  const template = fs.readFileSync(templatePath, "utf-8");
-
-  const rendered = ejs.render(template, { params: processedParams });
-
-  return rendered;
-}
-
-export default render;

pyproject.toml

@@ -23,5 +23,8 @@ include = [
     "cloudflare_error_page/templates/*",
 ]
 
+[tool.hatch.build.targets.wheel.hooks.custom]
+path = "scripts/hatch_build.py"
+
 [tool.hatch.version]
 path = "cloudflare_error_page/__init__.py"

scripts/hatch_build.py

@@ -0,0 +1,17 @@
+import os
+import sys
+import shutil
+from pathlib import Path
+from typing import Any
+
+from hatchling.builders.hooks.plugin.interface import BuildHookInterface
+
+sys.path.append(os.path.dirname(__file__))
+from inline_resources import generate_inlined_css
+
+class CustomBuildHook(BuildHookInterface):
+    def initialize(self, version: str, build_data: dict[str, Any]):
+        generate_inlined_css()
+        src = Path(self.root) / 'resources' / 'styles' / 'main.css'
+        dst = Path(self.root) / 'cloudflare_error_page' / 'templates'
+        shutil.copy(src, dst)

scripts/inline_resources.py

@@ -4,7 +4,7 @@ from urllib.parse import quote
 
 
 root = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-resources_folder = os.path.join(root,'resources')
+resources_folder = os.path.join(root, 'resources')
 
 
 def read_file(path: str) -> str:
@@ -49,7 +49,7 @@ def inline_css_resource(original_file: str, css_file: str, output_file: str):
     write_file(output_file, original_data)
 
 
-if __name__ == '__main__':
+def generate_inlined_css():
     inline_svg_resources(
         os.path.join(resources_folder, 'styles/main-original.css'),
         [
@@ -61,13 +61,7 @@ if __name__ == '__main__':
         ],
         os.path.join(resources_folder, 'styles/main.css'),
         )
-    inline_css_resource(
-        os.path.join(resources_folder, 'templates/error.html'),
-        os.path.join(resources_folder, 'styles/main.css'),
-        os.path.join(root, 'cloudflare_error_page/templates/error.html'),
-    )
-    inline_css_resource(
-        os.path.join(resources_folder, 'templates/error.ejs'),
-        os.path.join(resources_folder, 'styles/main.css'),
-        os.path.join(root, 'editor/web/src/template.ejs'),
-    )
+
+
+if __name__ == '__main__':
+    generate_inlined_css()