ServerKit is a lightweight, modern server control panel for managing web applications, databases, and services on your VPS or dedicated server. Built with Python/Flask backend and React frontend.
Python astracloudflarecontrol-panelcyberpaneldnsfablehosting-control-panelhosting-panelkimi-k3server-managementserverkitubuntu-web-panelwebserver
cutover(cloudflare-ops): the last in-place flagship leaves the tree (plan 52 Phase 2)
Juan Denis665d6775e450
diff --git a/.gitignore b/.gitignoreindex aaa01772..76848d50 100644--- a/.gitignore+++ b/.gitignore@@ -196,6 +196,7 @@ backend/app/plugins/serverkit-ftp/backend/app/plugins/serverkit-gpu/backend/app/plugins/serverkit-gui/backend/app/plugins/serverkit-localkit/+backend/app/plugins/serverkit-cloudflare-ops/backend/app/plugins/serverkit-k8s/backend/app/plugins/serverkit-mail/backend/app/plugins/serverkit-remote-access/@@ -206,6 +207,7 @@ frontend/src/plugins/serverkit-analytics/frontend/src/plugins/serverkit-crowdsec/frontend/src/plugins/serverkit-dns-server/frontend/src/plugins/serverkit-email/+frontend/src/plugins/serverkit-cloudflare-ops/frontend/src/plugins/serverkit-gpu/frontend/src/plugins/serverkit-gui/frontend/src/plugins/serverkit-k8s/diff --git a/backend/app/data/registry_index.json b/backend/app/data/registry_index.jsonindex 438a7066..7a3f303e 100644--- a/backend/app/data/registry_index.json+++ b/backend/app/data/registry_index.json@@ -50,16 +50,19 @@"category": "integration","author": "ServerKit","first_party": true,- "bundled": true,+ "bundled": false,"permissions": ["network"],"min_panel_version": "1.7.0","max_panel_version": null,- "repo": "https://github.com/jhd3197/ServerKit",+ "repo": "https://github.com/jhd3197/serverkit-cloudflare-ops","featured": true,"feature_score": 70,- "logo": "assets/serverkit-cloudflare-ops/logo.png"+ "logo": "assets/serverkit-cloudflare-ops/logo.png",+ "source": "https://github.com/jhd3197/serverkit-cloudflare-ops/releases/download/v1.0.0/serverkit-cloudflare-ops-1.0.0.zip",+ "sha256": "d6572be32ba4031504855f86b482316f3d8c2a863cc468873f458eebb3919363",+ "homepage": "https://github.com/jhd3197/serverkit-cloudflare-ops"},{"slug": "serverkit-crowdsec",diff --git a/backend/app/services/cloudflare_ops_bridge.py b/backend/app/services/cloudflare_ops_bridge.pyindex 48951250..fbf6777c 100644--- a/backend/app/services/cloudflare_ops_bridge.py+++ b/backend/app/services/cloudflare_ops_bridge.py@@ -28,7 +28,19 @@ def ensure_loadable():def load(module_name):- """Import a module from the extension backend (e.g. ``'cloudflare_service'``)."""+ """Import a module from the extension backend (e.g. ``'cloudflare_service'``).++ Resolution order (plan 52 Ph2 cutover): a copy-installed extension first+ (the registry install lands under the normal ``app.plugins`` path), then+ the builtin registration (pre-cutover trees), then the historical core+ location. Callers get ImportError when the extension truly is absent —+ every caller is behind the extension's own routes, so absence is a 404+ before this ever raises.+ """+ try:+ return importlib.import_module(f'{PKG}.{module_name}')+ except ImportError:+ passif ensure_loadable():try:return importlib.import_module(f'{PKG}.{module_name}')diff --git a/backend/app/services/plugin_service.py b/backend/app/services/plugin_service.pyindex 06403171..d09002f3 100644--- a/backend/app/services/plugin_service.py+++ b/backend/app/services/plugin_service.py@@ -72,7 +72,7 @@ BUILTIN_EXTENSIONS_DIR = os.environ.get(# onboarding via RECOMMENDED_EXTENSIONS_BY_USE_CASE. Its uninstall-marker# semantics are preserved (the settings key machinery below is untouched), so# a user who uninstalled WP before the extraction is never re-seeded.-FLAGSHIP_SLUGS = ['serverkit-cloudflare-ops']+FLAGSHIP_SLUGS = [] # cloudflare-ops left the tree (plan 52 Ph2 cutover); machinery kept for future flagships_FLAGSHIP_UNINSTALLED_KEY = 'extensions.flagship_uninstalled'# Wizard-optional flagships (plan 47): offered — not force-installed — duringdiff --git a/backend/tests/conftest.py b/backend/tests/conftest.pyindex a1f47254..5e51a292 100644--- a/backend/tests/conftest.py+++ b/backend/tests/conftest.py@@ -229,6 +229,7 @@ def app(request, _flask_app):needs_private_app = (request.node.get_closest_marker('fresh_app') is not Noneor 'wp_extension' in request.fixturenames+ or 'cf_extension' in request.fixturenames)target = create_app('testing') if needs_private_app else _flask_app@@ -400,6 +401,62 @@ def sibling_extension_dir(slug, env_var=None):return None+def mount_sibling_extension(app, slug, url_prefix, entry_module, entry_attr,+ display_name=None):+ """Mirror a real install of an extracted extension from its sibling repo:+ register its backend dir as the ``app.plugins.<slug>`` package, seed an+ active InstalledPlugin row (manifest included), and mount its blueprint.+ The plan 52 cutover analogue of _wp_support.ensure_plugin."""+ import importlib.util+ import json as _json++ src = sibling_extension_dir(slug)+ if not src:+ pytest.skip(f'{slug} checkout not available '+ f'(set SERVERKIT_{slug.replace("serverkit-", "").replace("-", "_").upper()}_DIR)')+ backend_dir = os.path.join(src, 'backend')+ pkg = f'app.plugins.{slug}'+ if pkg not in sys.modules:+ spec = importlib.util.spec_from_file_location(+ pkg, os.path.join(backend_dir, '__init__.py'),+ submodule_search_locations=[backend_dir])+ module = importlib.util.module_from_spec(spec)+ sys.modules[pkg] = module+ spec.loader.exec_module(module)++ from app import db+ from app.models.plugin import InstalledPlugin+ with open(os.path.join(src, 'plugin.json'), encoding='utf-8') as f:+ manifest = _json.load(f)+ plugin = InstalledPlugin.query.filter_by(slug=slug).first()+ if not plugin:+ plugin = InstalledPlugin(+ name=slug, display_name=display_name or manifest.get('display_name', slug),+ slug=slug, version=manifest.get('version', '0.0.0'),+ status=InstalledPlugin.STATUS_ACTIVE,+ has_backend=True, url_prefix=url_prefix,+ )+ db.session.add(plugin)+ plugin.status = InstalledPlugin.STATUS_ACTIVE+ plugin.manifest = manifest+ db.session.commit()++ mod = __import__(f'{pkg}.{entry_module}', fromlist=[entry_attr])+ bp = getattr(mod, entry_attr)+ if bp.name not in app.blueprints:+ app.register_blueprint(bp, url_prefix=url_prefix)+ return plugin+++def cf_extension(app):+ """serverkit-cloudflare-ops mounted from its sibling checkout (skip when+ absent). Structure-mutating — forces a private app like wp_extension."""+ return mount_sibling_extension(+ app, 'serverkit-cloudflare-ops', '/api/v1/cloudflare',+ 'cloudflare', 'cloudflare_bp', display_name='Cloudflare Zone Ops')++def _wp_ext_tests_dir():"""The standalone serverkit-wordpress repo's tests/ dir, or None."""env = os.environ.get('SERVERKIT_WORDPRESS_DIR')diff --git a/backend/tests/test_cloudflare_extraction.py b/backend/tests/test_cloudflare_extraction.pyindex 584d4222..dc8cb443 100644--- a/backend/tests/test_cloudflare_extraction.py+++ b/backend/tests/test_cloudflare_extraction.py@@ -1,9 +1,11 @@-"""Prove the Cloudflare zone-ops extraction (Phase 5, #36).--Zone-ops (the /api/v1/cloudflare blueprint + CloudflareService) physically moved-into the bundled, default-installed serverkit-cloudflare-ops extension (a flagship,-like WordPress). The DNS layer stays core: the moved service borrows the single-core CloudflareClient via DNSZoneService — there is no duplicate Cloudflare client.+"""Prove the Cloudflare zone-ops extraction (Phase 5, #36; standalone repo+since the plan 52 Ph2 cutover).++Zone-ops (the /api/v1/cloudflare blueprint + CloudflareService) lives in the+standalone serverkit-cloudflare-ops repo now — no longer a seeded flagship. A+lean panel boots with no cloudflare routes; the suite mounts the extension+from the sibling checkout (skip when absent). The DNS layer stays core: the+moved service borrows the single core CloudflareClient via DNSZoneService."""import importlib@@ -27,7 +29,7 @@ def test_dns_client_stays_core_single_source():assert CloudflareClient.__module__ == 'app.services.dns.cloudflare'-def test_bridge_resolves_service_from_extension():+def test_bridge_resolves_service_from_extension(cf_extension):CloudflareService = cloudflare_ops_bridge.cloudflare_service()assert CloudflareService.__name__ == 'CloudflareService'assert CloudflareService.__module__.startswith(f'app.plugins.{SLUG}')@@ -38,22 +40,24 @@ def test_bridge_resolves_service_from_extension():assert 'DNSZoneService._resolve_credential' in src-def test_cloudflare_seeded_as_flagship(app):- plugin = InstalledPlugin.query.filter_by(slug=SLUG).first()- assert plugin is not None, 'Cloudflare zone-ops flagship should be seeded on boot'- assert plugin.status == InstalledPlugin.STATUS_ACTIVE- assert plugin.url_prefix == '/api/v1/cloudflare'+def test_cloudflare_is_not_seeded_on_a_lean_panel(app):+ """The flagship era ended with the cutover: a fresh panel has no+ cloudflare-ops row and no zone routes until a registry install."""+ assert InstalledPlugin.query.filter_by(slug=SLUG).first() is None+ rules = {r.rule for r in app.url_map.iter_rules()}+ assert not any(r.startswith('/api/v1/cloudflare/') for r in rules)-def test_cloudflare_blueprint_registered_from_extension(app):+def test_cloudflare_blueprint_registered_from_extension(cf_extension, app):rules = [r.rule for r in app.url_map.iter_rules()]assert any(r.startswith('/api/v1/cloudflare/zones') for r in rules), \'Cloudflare zone-ops API should be registered from the extension'-def test_cloudflare_api_reachable_not_404(app, client, auth_headers):+def test_cloudflare_api_reachable_not_404(cf_extension, app, client, auth_headers):"""The extension blueprint is live (not 404) and the status guard passes for- the active flagship (not 503). It may 400/502 without a real CF zone — we only- assert the route is wired."""+ the mounted extension (not 503). It may 400/502 without a real CF zone — we+ only assert the route is wired."""resp = client.get('/api/v1/cloudflare/zones/1/settings', headers=auth_headers)assert resp.status_code not in (404, 503), resp.status_codediff --git a/backend/tests/test_cloudflare_round2.py b/backend/tests/test_cloudflare_round2.pyindex 6db54adf..6eea7058 100644--- a/backend/tests/test_cloudflare_round2.py+++ b/backend/tests/test_cloudflare_round2.py@@ -11,6 +11,14 @@ import typesimport pytest+# The zone-ops backend lives in the standalone serverkit-cloudflare-ops repo+# since the plan 52 Ph2 cutover; every test here runs against the extension+# mounted from the sibling checkout (module skips when it is absent).[email protected](autouse=True)+def _mounted_cf(cf_extension):+ yield++class _Resp:def __init__(self, js, status=200):diff --git a/backend/tests/test_cloudflare_zone_settings.py b/backend/tests/test_cloudflare_zone_settings.pyindex b6dbad7e..6bb73b54 100644--- a/backend/tests/test_cloudflare_zone_settings.py+++ b/backend/tests/test_cloudflare_zone_settings.py@@ -10,6 +10,14 @@ imported ``requests`` module (the generic helper uses ``requests.request``)."""import pytest+# The zone-ops backend lives in the standalone serverkit-cloudflare-ops repo+# since the plan 52 Ph2 cutover; every test here runs against the extension+# mounted from the sibling checkout (module skips when it is absent).[email protected](autouse=True)+def _mounted_cf(cf_extension):+ yield++class _Resp:def __init__(self, js, status=200):diff --git a/backend/tests/test_onboarding_recommendations.py b/backend/tests/test_onboarding_recommendations.pyindex bd34d4ec..d00dd783 100644--- a/backend/tests/test_onboarding_recommendations.py+++ b/backend/tests/test_onboarding_recommendations.py@@ -117,20 +117,24 @@ def test_finalize_setup_flagships_marks_uninstalled_when_absent(app, monkeypatchdef test_finalize_setup_flagships_keeps_installed(app, monkeypatch):- """An INSTALLED wizard-optional flagship is never marked uninstalled."""- monkeypatch.setattr(ps, 'WIZARD_OPTIONAL_FLAGSHIP_SLUGS', ['serverkit-cloudflare-ops'])+ """An INSTALLED wizard-optional flagship is never marked uninstalled.++ FLAGSHIP_SLUGS is empty since the cloudflare-ops cutover (plan 52 Ph2),+ so the machinery is proven with a fabricated installed row."""+ monkeypatch.setattr(ps, 'WIZARD_OPTIONAL_FLAGSHIP_SLUGS', ['serverkit-demo-opt'])with app.app_context():- # the flagship seeder keeps cloudflare-ops installed under TESTING- assert InstalledPlugin.query.filter_by(slug='serverkit-cloudflare-ops').first()+ db.session.add(InstalledPlugin(+ name='serverkit-demo-opt', display_name='Demo', slug='serverkit-demo-opt',+ version='1.0.0', status=InstalledPlugin.STATUS_ACTIVE))+ db.session.commit()ps.finalize_setup_flagships()- assert 'serverkit-cloudflare-ops' not in ps._flagship_uninstalled_set()+ assert 'serverkit-demo-opt' not in ps._flagship_uninstalled_set()def test_wordpress_not_seeded_post_extraction(app):- """Plan 52 Phase 5: WordPress is a registry extension now — the boot-time- flagship seeder never installs it (fresh OR completed setup), while the- remaining in-tree flagship (cloudflare-ops) still seeds. The wizard offers- WP through the use-case map instead (proven above)."""+ """Plan 52 Phase 5 + Ph2 cutover: WordPress AND cloudflare-ops are+ registry extensions now — the boot-time flagship seeder (an empty list)+ installs neither. The wizard offers them through the catalog instead."""with app.app_context():InstalledPlugin.query.filter_by(slug='serverkit-wordpress').delete()db.session.commit()@@ -140,7 +144,7 @@ def test_wordpress_not_seeded_post_extraction(app):assert InstalledPlugin.query.filter_by(slug='serverkit-wordpress').first() is Noneassert InstalledPlugin.query.filter_by(- slug='serverkit-cloudflare-ops').first() is not None+ slug='serverkit-cloudflare-ops').first() is Nonefinally:app.config['TESTING'] = Truediff --git a/builtin-extensions/serverkit-cloudflare-ops/backend/__init__.py b/builtin-extensions/serverkit-cloudflare-ops/backend/__init__.pydeleted file mode 100644index fe9ccee3..00000000--- a/builtin-extensions/serverkit-cloudflare-ops/backend/__init__.py+++ /dev/null@@ -1 +0,0 @@-"""ServerKit Cloudflare zone-ops extension backend package."""diff --git a/builtin-extensions/serverkit-cloudflare-ops/backend/cloudflare.py b/builtin-extensions/serverkit-cloudflare-ops/backend/cloudflare.pydeleted file mode 100644index f7ef9996..00000000--- a/builtin-extensions/serverkit-cloudflare-ops/backend/cloudflare.py+++ /dev/null@@ -1,547 +0,0 @@-"""Cloudflare operations API — zone settings (SSL/TLS, Speed, Caching, Security)-and one-click hardening, on top of the existing Cloudflare DNS connection.--Zones are addressed by their ServerKit ``DNSZone`` id (same as the ``/dns`` API);-the service resolves the Cloudflare credential + zone id server-side. Reads are-available to any authenticated user; writes require admin. Every mutating call is-captured by the global audit fallback (method, route args, sanitized body).-"""-from flask import Blueprint, request, jsonify-from flask_jwt_extended import jwt_required--from app.middleware.rbac import require_admin_user-from .cloudflare_service import CloudflareService, CloudflareError--cloudflare_bp = Blueprint('cloudflare', __name__)---def _service_response(res):- """Map a service result dict to JSON. A failed *provider* call (reached- Cloudflare, got an error back) is a 502; resolution errors are raised as- CloudflareError upstream and handled separately as 400s."""- if not res.get('success'):- return jsonify({'error': res.get('error', 'Cloudflare request failed')}), 502- return jsonify(res)---# ── Zone settings ────────────────────────────────────────────────────────────--@cloudflare_bp.route('/zones/<int:zone_id>/settings', methods=['GET'])-@jwt_required()-def get_zone_settings(zone_id):- try:- res = CloudflareService.get_settings(zone_id)- except CloudflareError as e:- return jsonify({'error': str(e)}), 400- return _service_response(res)---@cloudflare_bp.route('/zones/<int:zone_id>/settings/apply-preset', methods=['POST'])-@jwt_required()-def apply_preset(zone_id):- require_admin_user()- try:- res = CloudflareService.apply_recommended(zone_id)- except CloudflareError as e:- return jsonify({'error': str(e)}), 400- # A preset is best-effort across many toggles; return 200 with the per-setting- # report even when the plan gated some (the UI surfaces partial success).- return jsonify(res)---@cloudflare_bp.route('/zones/<int:zone_id>/settings/<setting_id>', methods=['GET'])-@jwt_required()-def get_zone_setting(zone_id, setting_id):- try:- res = CloudflareService.get_setting(zone_id, setting_id)- except CloudflareError as e:- return jsonify({'error': str(e)}), 400- return _service_response(res)---@cloudflare_bp.route('/zones/<int:zone_id>/settings/<setting_id>', methods=['PATCH'])-@jwt_required()-def update_zone_setting(zone_id, setting_id):- require_admin_user()- data = request.get_json(silent=True) or {}- if 'value' not in data:- return jsonify({'error': 'A "value" field is required'}), 400- try:- res = CloudflareService.update_setting(zone_id, setting_id, data['value'])- except CloudflareError as e:- return jsonify({'error': str(e)}), 400- return _service_response(res)---# ── Cache ────────────────────────────────────────────────────────────────────--@cloudflare_bp.route('/zones/<int:zone_id>/purge-cache', methods=['POST'])-@jwt_required()-def purge_cache(zone_id):- require_admin_user()- data = request.get_json(silent=True) or {}- try:- res = CloudflareService.purge_cache(- zone_id,- everything=bool(data.get('purge_everything') or data.get('everything')),- files=data.get('files'), hosts=data.get('hosts'),- prefixes=data.get('prefixes'), tags=data.get('tags'))- except CloudflareError as e:- return jsonify({'error': str(e)}), 400- return _service_response(res)---# ── WAF custom rules ─────────────────────────────────────────────────────────--@cloudflare_bp.route('/zones/<int:zone_id>/waf/rules', methods=['GET'])-@jwt_required()-def list_waf_rules(zone_id):- try:- res = CloudflareService.list_waf_rules(zone_id)- except CloudflareError as e:- return jsonify({'error': str(e)}), 400- return _service_response(res)---@cloudflare_bp.route('/zones/<int:zone_id>/waf/rules', methods=['POST'])-@jwt_required()-def add_waf_rule(zone_id):- require_admin_user()- data = request.get_json(silent=True) or {}- try:- res = CloudflareService.add_waf_rule(- zone_id,- description=data.get('description'),- expression=data.get('expression'),- action=data.get('action'),- enabled=data.get('enabled', True))- except CloudflareError as e:- return jsonify({'error': str(e)}), 400- return _service_response(res)---@cloudflare_bp.route('/zones/<int:zone_id>/waf/presets/<preset_key>', methods=['POST'])-@jwt_required()-def apply_waf_preset(zone_id, preset_key):- require_admin_user()- data = request.get_json(silent=True) or {}- try:- res = CloudflareService.apply_waf_preset(zone_id, preset_key, data.get('params') or {})- except CloudflareError as e:- return jsonify({'error': str(e)}), 400- return _service_response(res)---@cloudflare_bp.route('/zones/<int:zone_id>/waf/rulesets/<ruleset_id>/rules/<rule_id>',- methods=['PATCH'])-@jwt_required()-def update_waf_rule(zone_id, ruleset_id, rule_id):- require_admin_user()- data = request.get_json(silent=True) or {}- try:- res = CloudflareService.update_waf_rule(zone_id, ruleset_id, rule_id, data)- except CloudflareError as e:- return jsonify({'error': str(e)}), 400- return _service_response(res)---@cloudflare_bp.route('/zones/<int:zone_id>/waf/rulesets/<ruleset_id>/rules/<rule_id>',- methods=['DELETE'])-@jwt_required()-def delete_waf_rule(zone_id, ruleset_id, rule_id):- require_admin_user()- try:- res = CloudflareService.delete_waf_rule(zone_id, ruleset_id, rule_id)- except CloudflareError as e:- return jsonify({'error': str(e)}), 400- return _service_response(res)---# ── Workers (edge hosting) ───────────────────────────────────────────────────--@cloudflare_bp.route('/zones/<int:zone_id>/workers', methods=['GET'])-@jwt_required()-def list_workers(zone_id):- try:- res = CloudflareService.list_workers(zone_id)- except CloudflareError as e:- return jsonify({'error': str(e)}), 400- return _service_response(res)---@cloudflare_bp.route('/zones/<int:zone_id>/workers', methods=['POST'])-@jwt_required()-def deploy_worker(zone_id):- require_admin_user()- data = request.get_json(silent=True) or {}- try:- res = CloudflareService.deploy_worker(- zone_id,- name=data.get('name'),- code=data.get('code'),- compatibility_date=data.get('compatibility_date'),- route_pattern=data.get('route_pattern'))- except CloudflareError as e:- return jsonify({'error': str(e)}), 400- return _service_response(res)---@cloudflare_bp.route('/zones/<int:zone_id>/workers/routes', methods=['POST'])-@jwt_required()-def add_worker_route(zone_id):- require_admin_user()- data = request.get_json(silent=True) or {}- try:- res = CloudflareService.add_worker_route(zone_id, data.get('pattern'), data.get('script'))- except CloudflareError as e:- return jsonify({'error': str(e)}), 400- return _service_response(res)---@cloudflare_bp.route('/zones/<int:zone_id>/workers/routes/<route_id>', methods=['DELETE'])-@jwt_required()-def delete_worker_route(zone_id, route_id):- require_admin_user()- try:- res = CloudflareService.delete_worker_route(zone_id, route_id)- except CloudflareError as e:- return jsonify({'error': str(e)}), 400- return _service_response(res)---# Note: this dynamic <name> route is registered last so it can't shadow the more-# specific /workers/routes paths above.-@cloudflare_bp.route('/zones/<int:zone_id>/workers/<name>', methods=['DELETE'])-@jwt_required()-def delete_worker(zone_id, name):- require_admin_user()- try:- res = CloudflareService.delete_worker(zone_id, name)- except CloudflareError as e:- return jsonify({'error': str(e)}), 400- return _service_response(res)---# ── Tunnels (cloudflared) ────────────────────────────────────────────────────--@cloudflare_bp.route('/zones/<int:zone_id>/tunnels', methods=['GET'])-@jwt_required()-def list_tunnels(zone_id):- try:- res = CloudflareService.list_tunnels(zone_id)- except CloudflareError as e:- return jsonify({'error': str(e)}), 400- return _service_response(res)---@cloudflare_bp.route('/zones/<int:zone_id>/tunnels', methods=['POST'])-@jwt_required()-def create_tunnel(zone_id):- require_admin_user()- data = request.get_json(silent=True) or {}- try:- res = CloudflareService.create_tunnel(zone_id, data.get('name'))- except CloudflareError as e:- return jsonify({'error': str(e)}), 400- return _service_response(res)---@cloudflare_bp.route('/zones/<int:zone_id>/tunnels/<tunnel_id>/install', methods=['GET'])-@jwt_required()-def tunnel_install(zone_id, tunnel_id):- require_admin_user()- try:- res = CloudflareService.get_tunnel_install(zone_id, tunnel_id)- except CloudflareError as e:- return jsonify({'error': str(e)}), 400- return _service_response(res)---@cloudflare_bp.route('/zones/<int:zone_id>/tunnels/<tunnel_id>/hostnames', methods=['GET'])-@jwt_required()-def tunnel_hostnames(zone_id, tunnel_id):- try:- res = CloudflareService.get_tunnel_hostnames(zone_id, tunnel_id)- except CloudflareError as e:- return jsonify({'error': str(e)}), 400- return _service_response(res)---@cloudflare_bp.route('/zones/<int:zone_id>/tunnels/<tunnel_id>/hostnames', methods=['POST'])-@jwt_required()-def add_tunnel_hostname(zone_id, tunnel_id):- require_admin_user()- data = request.get_json(silent=True) or {}- try:- res = CloudflareService.add_tunnel_hostname(- zone_id, tunnel_id, data.get('hostname'), data.get('service'))- except CloudflareError as e:- return jsonify({'error': str(e)}), 400- return _service_response(res)---@cloudflare_bp.route('/zones/<int:zone_id>/tunnels/<tunnel_id>/hostnames', methods=['DELETE'])-@jwt_required()-def remove_tunnel_hostname(zone_id, tunnel_id):- require_admin_user()- data = request.get_json(silent=True) or {}- try:- res = CloudflareService.remove_tunnel_hostname(zone_id, tunnel_id, data.get('hostname'))- except CloudflareError as e:- return jsonify({'error': str(e)}), 400- return _service_response(res)---@cloudflare_bp.route('/zones/<int:zone_id>/tunnels/<tunnel_id>', methods=['DELETE'])-@jwt_required()-def delete_tunnel(zone_id, tunnel_id):- require_admin_user()- try:- res = CloudflareService.delete_tunnel(zone_id, tunnel_id)- except CloudflareError as e:- return jsonify({'error': str(e)}), 400- return _service_response(res)---# ── Developer platform: R2 / KV / D1 ─────────────────────────────────────────--@cloudflare_bp.route('/zones/<int:zone_id>/storage', methods=['GET'])-@jwt_required()-def list_storage(zone_id):- try:- res = CloudflareService.list_storage(zone_id)- except CloudflareError as e:- return jsonify({'error': str(e)}), 400- return _service_response(res)---@cloudflare_bp.route('/zones/<int:zone_id>/storage/r2', methods=['POST'])-@jwt_required()-def create_r2_bucket(zone_id):- require_admin_user()- data = request.get_json(silent=True) or {}- try:- res = CloudflareService.create_r2_bucket(zone_id, data.get('name'))- except CloudflareError as e:- return jsonify({'error': str(e)}), 400- return _service_response(res)---@cloudflare_bp.route('/zones/<int:zone_id>/storage/r2/<bucket>', methods=['DELETE'])-@jwt_required()-def delete_r2_bucket(zone_id, bucket):- require_admin_user()- try:- res = CloudflareService.delete_r2_bucket(zone_id, bucket)- except CloudflareError as e:- return jsonify({'error': str(e)}), 400- return _service_response(res)---@cloudflare_bp.route('/zones/<int:zone_id>/storage/kv', methods=['POST'])-@jwt_required()-def create_kv_namespace(zone_id):- require_admin_user()- data = request.get_json(silent=True) or {}- try:- res = CloudflareService.create_kv_namespace(zone_id, data.get('title'))- except CloudflareError as e:- return jsonify({'error': str(e)}), 400- return _service_response(res)---@cloudflare_bp.route('/zones/<int:zone_id>/storage/kv/<namespace_id>', methods=['DELETE'])-@jwt_required()-def delete_kv_namespace(zone_id, namespace_id):- require_admin_user()- try:- res = CloudflareService.delete_kv_namespace(zone_id, namespace_id)- except CloudflareError as e:- return jsonify({'error': str(e)}), 400- return _service_response(res)---@cloudflare_bp.route('/zones/<int:zone_id>/storage/d1', methods=['POST'])-@jwt_required()-def create_d1_database(zone_id):- require_admin_user()- data = request.get_json(silent=True) or {}- try:- res = CloudflareService.create_d1_database(zone_id, data.get('name'))- except CloudflareError as e:- return jsonify({'error': str(e)}), 400- return _service_response(res)---@cloudflare_bp.route('/zones/<int:zone_id>/storage/d1/<database_id>', methods=['DELETE'])-@jwt_required()-def delete_d1_database(zone_id, database_id):- require_admin_user()- try:- res = CloudflareService.delete_d1_database(zone_id, database_id)- except CloudflareError as e:- return jsonify({'error': str(e)}), 400- return _service_response(res)---# ── DNSSEC ────────────────────────────────────────────────────────────────────--@cloudflare_bp.route('/zones/<int:zone_id>/dnssec', methods=['GET'])-@jwt_required()-def get_dnssec(zone_id):- try:- res = CloudflareService.get_dnssec(zone_id)- except CloudflareError as e:- return jsonify({'error': str(e)}), 400- return _service_response(res)---@cloudflare_bp.route('/zones/<int:zone_id>/dnssec', methods=['PATCH'])-@jwt_required()-def set_dnssec(zone_id):- require_admin_user()- data = request.get_json(silent=True) or {}- if 'enabled' not in data:- return jsonify({'error': 'An "enabled" boolean is required'}), 400- try:- res = CloudflareService.set_dnssec(zone_id, bool(data['enabled']))- except CloudflareError as e:- return jsonify({'error': str(e)}), 400- return _service_response(res)---# ── Origin CA certificates ─────────────────────────────────────────────────────--@cloudflare_bp.route('/zones/<int:zone_id>/origin-certificates', methods=['GET'])-@jwt_required()-def list_origin_certificates(zone_id):- try:- res = CloudflareService.list_origin_certificates(zone_id)- except CloudflareError as e:- return jsonify({'error': str(e)}), 400- return _service_response(res)---@cloudflare_bp.route('/zones/<int:zone_id>/origin-certificates', methods=['POST'])-@jwt_required()-def issue_origin_certificate(zone_id):- require_admin_user()- data = request.get_json(silent=True) or {}- try:- res = CloudflareService.issue_origin_certificate(- zone_id,- hostnames=data.get('hostnames'),- validity_days=int(data.get('validity_days', 5475)),- install=bool(data.get('install', True)))- except CloudflareError as e:- return jsonify({'error': str(e)}), 400- except (TypeError, ValueError):- return jsonify({'error': 'validity_days must be a number'}), 400- return _service_response(res)---@cloudflare_bp.route('/zones/<int:zone_id>/origin-certificates/<certificate_id>',- methods=['DELETE'])-@jwt_required()-def revoke_origin_certificate(zone_id, certificate_id):- require_admin_user()- try:- res = CloudflareService.revoke_origin_certificate(zone_id, certificate_id)- except CloudflareError as e:- return jsonify({'error': str(e)}), 400- return _service_response(res)---# ── Redirect + Transform rules ─────────────────────────────────────────────────--@cloudflare_bp.route('/zones/<int:zone_id>/rules/<slug>', methods=['GET'])-@jwt_required()-def list_rules(zone_id, slug):- try:- res = CloudflareService.list_rules(zone_id, slug)- except CloudflareError as e:- return jsonify({'error': str(e)}), 400- return _service_response(res)---@cloudflare_bp.route('/zones/<int:zone_id>/rules/<slug>', methods=['POST'])-@jwt_required()-def add_rule(zone_id, slug):- require_admin_user()- data = request.get_json(silent=True) or {}- try:- res = CloudflareService.add_rule(- zone_id, slug,- description=data.get('description'),- expression=data.get('expression'),- action=data.get('action'),- action_parameters=data.get('action_parameters'),- enabled=data.get('enabled', True))- except CloudflareError as e:- return jsonify({'error': str(e)}), 400- return _service_response(res)---@cloudflare_bp.route('/zones/<int:zone_id>/rules/<slug>/presets/<preset_key>', methods=['POST'])-@jwt_required()-def apply_rule_preset(zone_id, slug, preset_key):- require_admin_user()- data = request.get_json(silent=True) or {}- try:- res = CloudflareService.apply_rule_preset(zone_id, slug, preset_key, data.get('params') or {})- except CloudflareError as e:- return jsonify({'error': str(e)}), 400- return _service_response(res)---@cloudflare_bp.route('/zones/<int:zone_id>/rules/<slug>/rulesets/<ruleset_id>/rules/<rule_id>',- methods=['PATCH'])-@jwt_required()-def update_rule(zone_id, slug, ruleset_id, rule_id):- require_admin_user()- data = request.get_json(silent=True) or {}- try:- res = CloudflareService.update_rule(zone_id, slug, ruleset_id, rule_id, data)- except CloudflareError as e:- return jsonify({'error': str(e)}), 400- return _service_response(res)---@cloudflare_bp.route('/zones/<int:zone_id>/rules/<slug>/rulesets/<ruleset_id>/rules/<rule_id>',- methods=['DELETE'])-@jwt_required()-def delete_rule(zone_id, slug, ruleset_id, rule_id):- require_admin_user()- try:- res = CloudflareService.delete_rule(zone_id, slug, ruleset_id, rule_id)- except CloudflareError as e:- return jsonify({'error': str(e)}), 400- return _service_response(res)---# ── Activity + scope diagnostics ───────────────────────────────────────────────--@cloudflare_bp.route('/zones/<int:zone_id>/activity', methods=['GET'])-@jwt_required()-def list_activity(zone_id):- try:- res = CloudflareService.list_activity(- zone_id,- product=request.args.get('product'),- result=request.args.get('result'),- limit=min(int(request.args.get('limit', 100) or 100), 500))- except CloudflareError as e:- return jsonify({'error': str(e)}), 400- except (TypeError, ValueError):- return jsonify({'error': 'limit must be a number'}), 400- return _service_response(res)---@cloudflare_bp.route('/zones/<int:zone_id>/scope-check', methods=['GET'])-@jwt_required()-def scope_check(zone_id):- try:- res = CloudflareService.scope_check(zone_id)- except CloudflareError as e:- return jsonify({'error': str(e)}), 400- return _service_response(res)diff --git a/builtin-extensions/serverkit-cloudflare-ops/backend/cloudflare_service.py b/builtin-extensions/serverkit-cloudflare-ops/backend/cloudflare_service.pydeleted file mode 100644index a397b11c..00000000--- a/builtin-extensions/serverkit-cloudflare-ops/backend/cloudflare_service.py+++ /dev/null@@ -1,1332 +0,0 @@-"""Cloudflare zone operations beyond DNS records.--ServerKit already connects Cloudflare as a DNS provider (``DNSProviderConfig`` +-the shared :class:`~app.services.dns.cloudflare.CloudflareClient`). This service-builds the *operations* surface on top of that same connection — starting with-zone settings (SSL/TLS, Speed, Caching, Security) and a one-click hardening-preset — so auth, encryption-at-rest, and credential resolution are reused, not-re-implemented.--A zone is addressed by its ServerKit ``DNSZone`` id (the same integer the rest of-the ``/dns`` API uses); credential + Cloudflare zone id are resolved server-side-via :meth:`DNSZoneService._resolve_credential`, the canonical resolver.-"""-import logging-import os-import re--logger = logging.getLogger(__name__)---class CloudflareError(Exception):- """A caller-facing problem resolving a zone (not found, not Cloudflare, no- connected credential). Mapped to a 400 by the API layer."""---class CloudflareService:- """Zone settings + hardening on a connected Cloudflare zone."""-- # Curated subset of Cloudflare zone settings ServerKit surfaces, grouped for- # the UI. Each setting: ``id`` (Cloudflare setting id), ``label``, ``type``- # (toggle | select | hsts) and, for selects, ``options`` ({value, label}).- # The page renders straight from this metadata; current values + the- # ``editable`` (plan-gating) flag come from the live settings response.- SETTING_GROUPS = [- {- 'key': 'ssl',- 'label': 'SSL/TLS',- 'settings': [- {'id': 'ssl', 'label': 'SSL/TLS encryption mode', 'type': 'select',- 'help': 'How Cloudflare connects to your origin. "Full (strict)" '- 'is the most secure and requires a valid origin certificate.',- 'options': [- {'value': 'off', 'label': 'Off (not secure)'},- {'value': 'flexible', 'label': 'Flexible'},- {'value': 'full', 'label': 'Full'},- {'value': 'strict', 'label': 'Full (strict)'},- ]},- {'id': 'always_use_https', 'label': 'Always use HTTPS', 'type': 'toggle',- 'help': 'Redirect every HTTP request to HTTPS.'},- {'id': 'automatic_https_rewrites', 'label': 'Automatic HTTPS rewrites',- 'type': 'toggle',- 'help': 'Rewrite insecure http:// links to https:// to avoid mixed content.'},- {'id': 'min_tls_version', 'label': 'Minimum TLS version', 'type': 'select',- 'options': [- {'value': '1.0', 'label': 'TLS 1.0'},- {'value': '1.1', 'label': 'TLS 1.1'},- {'value': '1.2', 'label': 'TLS 1.2 (recommended)'},- {'value': '1.3', 'label': 'TLS 1.3'},- ]},- {'id': 'tls_1_3', 'label': 'TLS 1.3', 'type': 'toggle',- 'help': 'Enable the latest, fastest TLS version.'},- {'id': 'security_header', 'label': 'HTTP Strict Transport Security (HSTS)',- 'type': 'hsts',- 'help': 'Tell browsers to only ever connect over HTTPS. Enable only once '- 'HTTPS works everywhere — it is hard to undo before max-age expires.'},- ],- },- {- 'key': 'speed',- 'label': 'Speed',- 'settings': [- {'id': 'brotli', 'label': 'Brotli compression', 'type': 'toggle',- 'help': 'Compress responses with Brotli for supporting browsers.'},- {'id': 'early_hints', 'label': 'Early Hints', 'type': 'toggle',- 'help': 'Send 103 Early Hints so browsers can preload assets sooner.'},- {'id': 'http3', 'label': 'HTTP/3 (with QUIC)', 'type': 'toggle'},- ],- },- {- 'key': 'caching',- 'label': 'Caching',- 'settings': [- {'id': 'cache_level', 'label': 'Caching level', 'type': 'select',- 'options': [- {'value': 'bypass', 'label': 'Bypass'},- {'value': 'basic', 'label': 'Basic'},- {'value': 'simplified', 'label': 'Simplified'},- {'value': 'aggressive', 'label': 'Aggressive (recommended)'},- {'value': 'cache_everything', 'label': 'Cache everything'},- ]},- {'id': 'browser_cache_ttl', 'label': 'Browser cache TTL', 'type': 'select',- 'options': [- {'value': 0, 'label': 'Respect existing headers'},- {'value': 1800, 'label': '30 minutes'},- {'value': 3600, 'label': '1 hour'},- {'value': 14400, 'label': '4 hours'},- {'value': 28800, 'label': '8 hours'},- {'value': 86400, 'label': '1 day'},- {'value': 604800, 'label': '1 week'},- ]},- {'id': 'development_mode', 'label': 'Development mode', 'type': 'toggle',- 'help': 'Temporarily bypass the cache while you work. Auto-expires after 3 hours.'},- {'id': 'always_online', 'label': 'Always Online', 'type': 'toggle',- 'help': 'Serve a cached copy of your site if your origin is unreachable.'},- ],- },- {- 'key': 'security',- 'label': 'Security',- 'settings': [- {'id': 'security_level', 'label': 'Security level', 'type': 'select',- 'options': [- {'value': 'off', 'label': 'Off'},- {'value': 'essentially_off', 'label': 'Essentially off'},- {'value': 'low', 'label': 'Low'},- {'value': 'medium', 'label': 'Medium'},- {'value': 'high', 'label': 'High'},- {'value': 'under_attack', 'label': "I'm under attack"},- ]},- {'id': 'browser_check', 'label': 'Browser integrity check', 'type': 'toggle',- 'help': 'Block requests from common malicious bots and crawlers.'},- {'id': 'challenge_ttl', 'label': 'Challenge passage', 'type': 'select',- 'help': 'How long a visitor stays verified after passing a challenge.',- 'options': [- {'value': 300, 'label': '5 minutes'},- {'value': 900, 'label': '15 minutes'},- {'value': 1800, 'label': '30 minutes'},- {'value': 3600, 'label': '1 hour'},- {'value': 7200, 'label': '2 hours'},- {'value': 10800, 'label': '3 hours'},- {'value': 14400, 'label': '4 hours'},- {'value': 28800, 'label': '8 hours'},- {'value': 86400, 'label': '1 day'},- ]},- ],- },- ]-- # One-click hardening (plan §Phase 1 Actions): Full (strict), Always HTTPS,- # HSTS (6 months), TLS 1.2 floor + 1.3, Brotli, HTTP/3, 4h browser cache.- RECOMMENDED_PRESET = [- ('ssl', 'strict'),- ('always_use_https', 'on'),- ('automatic_https_rewrites', 'on'),- ('min_tls_version', '1.2'),- ('tls_1_3', 'on'),- ('brotli', 'on'),- ('http3', 'on'),- ('browser_cache_ttl', 14400),- ('security_header', {'strict_transport_security': {- 'enabled': True, 'max_age': 15552000,- 'include_subdomains': True, 'preload': False, 'nosniff': True}}),- ]-- @staticmethod- def _zone_and_client(zone_id):- """Resolve ``(zone, CloudflareClient)`` for a ServerKit DNS zone id, or raise- :class:`CloudflareError` with a user-facing reason. Credential resolution- reuses the canonical resolver so the connection store is the single source- of truth."""- from app.services.dns_zone_service import DNSZoneService- from app.services.dns import CloudflareClient-- zone = DNSZoneService.get_zone(zone_id)- if not zone:- raise CloudflareError('Zone not found')- if (zone.provider or '').lower() != 'cloudflare':- raise CloudflareError('This zone is not managed by Cloudflare')- credential = DNSZoneService._resolve_credential(zone)- if not credential:- raise CloudflareError('No connected Cloudflare credential resolves for this zone')- if not zone.provider_zone_id:- raise CloudflareError("Cloudflare hasn't been matched to this domain yet — "- 'open the DNS zone once to link it, then retry')- return zone, CloudflareClient(credential)-- @staticmethod- def _zone_dict(zone):- return {'id': zone.id, 'domain': zone.domain,- 'provider_zone_id': zone.provider_zone_id}-- @staticmethod- def _record(zone, product, action, target=None, result='ok', error=None):- """Best-effort append to the Cloudflare-ops activity ledger. Never raises —- an audit write must not break the operation it describes."""- try:- from app.services.cf_ops_change_service import CfOpsChangeService- CfOpsChangeService.record(- provider_zone_id=getattr(zone, 'provider_zone_id', None),- product=product, action=action, target=target,- result=result, error=error,- config_id=getattr(zone, 'dns_provider_config_id', None))- except Exception: # pragma: no cover - ledger writes are best-effort- pass-- @classmethod- def get_settings(cls, zone_id):- """Live zone settings, indexed by id, plus the UI grouping metadata."""- zone, client = cls._zone_and_client(zone_id)- res = client.get_zone_settings(zone.provider_zone_id)- if not res.get('success'):- return {'success': False, 'error': res.get('error', 'Failed to load zone settings')}- by_id = {s.get('id'): s for s in (res.get('result') or []) if isinstance(s, dict)}- return {'success': True, 'zone': cls._zone_dict(zone),- 'groups': cls.SETTING_GROUPS, 'settings': by_id}-- @classmethod- def get_setting(cls, zone_id, setting_id):- zone, client = cls._zone_and_client(zone_id)- res = client.get_zone_setting(zone.provider_zone_id, setting_id)- if not res.get('success'):- return {'success': False, 'error': res.get('error', 'Failed to load setting')}- return {'success': True, 'setting': res.get('result')}-- @classmethod- def update_setting(cls, zone_id, setting_id, value):- zone, client = cls._zone_and_client(zone_id)- res = client.update_zone_setting(zone.provider_zone_id, setting_id, value)- if not res.get('success'):- cls._record(zone, 'settings', 'update', setting_id, 'error', res.get('error'))- return {'success': False, 'error': res.get('error', 'Update failed')}- cls._record(zone, 'settings', 'update', setting_id)- return {'success': True, 'setting': res.get('result')}-- @classmethod- def apply_recommended(cls, zone_id):- """Apply the recommended hardening preset, returning a per-setting report so- the UI can show which toggles the plan allowed and which it gated."""- zone, client = cls._zone_and_client(zone_id)- results = []- for setting_id, value in cls.RECOMMENDED_PRESET:- res = client.update_zone_setting(zone.provider_zone_id, setting_id, value)- results.append({'setting': setting_id,- 'success': bool(res.get('success')),- 'error': None if res.get('success') else res.get('error')})- applied = sum(1 for r in results if r['success'])- cls._record(zone, 'settings', 'apply-preset', 'recommended',- 'ok' if applied else 'error',- None if applied else 'No settings applied')- return {'success': applied > 0, 'applied': applied,- 'total': len(results), 'results': results}-- # Free/Pro plans can purge everything or up to 30 individual files per request;- # hosts/prefixes/tags are Enterprise-only (Cloudflare returns a plan error,- # which we surface verbatim).- MAX_PURGE_FILES = 30-- @classmethod- def purge_cache(cls, zone_id, *, everything=False, files=None, hosts=None,- prefixes=None, tags=None):- """Purge the zone's Cloudflare cache. Either ``everything`` or one/more of- ``files``/``hosts``/``prefixes``/``tags``. Raises :class:`CloudflareError`- when nothing was requested (a caller error)."""- zone, client = cls._zone_and_client(zone_id)-- if everything:- payload = {'purge_everything': True}- else:- payload = {}- clean = [f.strip() for f in (files or []) if f and f.strip()]- if clean:- payload['files'] = clean[:cls.MAX_PURGE_FILES]- for key, val in (('hosts', hosts), ('prefixes', prefixes), ('tags', tags)):- items = [v.strip() for v in (val or []) if v and v.strip()]- if items:- payload[key] = items- if not payload:- raise CloudflareError('Nothing to purge — choose "everything" or '- 'provide files, hosts, prefixes, or tags')-- res = client.purge_cache(zone.provider_zone_id, payload)- target = 'everything' if everything else 'files'- if not res.get('success'):- cls._record(zone, 'cache', 'purge', target, 'error', res.get('error'))- return {'success': False, 'error': res.get('error', 'Cache purge failed')}- cls._record(zone, 'cache', 'purge', target)- return {'success': True, 'purged': payload}-- # ── WAF custom rules ─────────────────────────────────────────────────────-- WAF_PHASE = 'http_request_firewall_custom'- # Actions ServerKit lets you set on a custom rule (a safe subset of- # Cloudflare's). Terminal actions only — no "skip", which can disable WAF.- WAF_ACTIONS = {'block', 'managed_challenge', 'js_challenge', 'challenge', 'log'}-- # One-click rule templates (plan §Phase 3). ``params`` are collected from the- # admin and validated before being interpolated into a Cloudflare expression.- WAF_PRESETS = [- {- 'key': 'lock_wp_admin',- 'label': 'Lock WordPress admin to an IP',- 'description': 'Block /wp-admin and /wp-login.php for everyone except a '- 'trusted IP address (e.g. your office or home).',- 'action': 'block',- 'params': [{'key': 'ip', 'label': 'Allowed IP address',- 'placeholder': 'e.g. 203.0.113.7'}],- },- {- 'key': 'block_exploit_paths',- 'label': 'Block common exploit paths',- 'description': 'Block requests probing for /xmlrpc.php, dotfiles like '- '/.env and /.git, and exposed config files.',- 'action': 'block',- 'params': [],- },- {- 'key': 'challenge_bad_bots',- 'label': 'Challenge suspicious bots',- 'description': 'Show a managed challenge to traffic with a low bot score. '- 'Requires Cloudflare Bot Management on some plans.',- 'action': 'managed_challenge',- 'params': [],- },- ]-- @classmethod- def _validate_action(cls, action):- if action not in cls.WAF_ACTIONS:- raise CloudflareError(- f'Unsupported action "{action}". Use one of: {", ".join(sorted(cls.WAF_ACTIONS))}')-- @classmethod- def _build_preset_rule(cls, key, params):- """Turn a preset key + admin-supplied params into a concrete rule dict.- Validates any user input that lands inside a Cloudflare expression (the IP)- so a preset can't be used to inject expression syntax."""- import ipaddress- if key == 'lock_wp_admin':- ip = (params.get('ip') or '').strip()- try:- ipaddress.ip_address(ip)- except ValueError:- raise CloudflareError('A valid IP address is required for this rule')- return {- 'description': 'ServerKit: lock WordPress admin to a trusted IP',- 'expression': ('(http.request.uri.path contains "/wp-admin" or '- 'http.request.uri.path contains "/wp-login.php") '- f'and ip.src ne {ip}'),- 'action': 'block',- }- if key == 'block_exploit_paths':- return {- 'description': 'ServerKit: block common exploit paths',- 'expression': ('(http.request.uri.path contains "/xmlrpc.php") or '- '(http.request.uri.path contains "/.env") or '- '(http.request.uri.path contains "/.git/") or '- '(http.request.uri.path contains "/wp-config.php")'),- 'action': 'block',- }- if key == 'challenge_bad_bots':- return {- 'description': 'ServerKit: challenge suspicious bots',- 'expression': '(cf.bot_management.score lt 30)',- 'action': 'managed_challenge',- }- raise CloudflareError(f'Unknown WAF preset: {key}')-- @classmethod- def _find_custom_ruleset(cls, client, provider_zone_id, phase=None):- """Return ``(ruleset_dict, listing_error)``. ``ruleset_dict`` is the zone's- custom-firewall entry-point ruleset or ``None`` when it doesn't exist yet;- ``listing_error`` is set only when the list call itself failed (auth/scope)."""- phase = phase or cls.WAF_PHASE- listing = client.list_rulesets(provider_zone_id)- if not listing.get('success'):- return None, listing.get('error', 'Failed to list rulesets')- custom = next((rs for rs in (listing.get('result') or [])- if rs.get('phase') == phase and rs.get('kind') == 'zone'), None)- return custom, None-- @staticmethod- def _rule_dict(r):- return {'id': r.get('id'), 'description': r.get('description'),- 'expression': r.get('expression'), 'action': r.get('action'),- 'enabled': r.get('enabled', True), 'ref': r.get('ref')}-- @classmethod- def list_waf_rules(cls, zone_id):- """Custom firewall rules for the zone, plus the preset catalog. A zone with- no custom ruleset yet returns an empty list (not an error)."""- zone, client = cls._zone_and_client(zone_id)- custom, err = cls._find_custom_ruleset(client, zone.provider_zone_id)- if err:- return {'success': False, 'error': err}- if not custom:- return {'success': True, 'ruleset_id': None, 'rules': [],- 'presets': cls.WAF_PRESETS}- detail = client.get_ruleset(zone.provider_zone_id, custom['id'])- if not detail.get('success'):- return {'success': False, 'error': detail.get('error', 'Failed to load ruleset')}- result = detail.get('result') or {}- rules = [cls._rule_dict(r) for r in (result.get('rules') or [])]- return {'success': True, 'ruleset_id': result.get('id'),- 'rules': rules, 'presets': cls.WAF_PRESETS}-- @classmethod- def add_waf_rule(cls, zone_id, *, description, expression, action, enabled=True):- """Append a custom firewall rule, creating the zone's custom ruleset on first- use. Returns the created rule's ruleset on success."""- cls._validate_action(action)- if not (expression or '').strip():- raise CloudflareError('A rule expression is required')- zone, client = cls._zone_and_client(zone_id)- rule = {'description': description or 'ServerKit rule',- 'expression': expression, 'action': action, 'enabled': bool(enabled)}-- custom, err = cls._find_custom_ruleset(client, zone.provider_zone_id)- if err:- return {'success': False, 'error': err}- if custom:- res = client.add_ruleset_rule(zone.provider_zone_id, custom['id'], rule)- else:- res = client.create_phase_ruleset(zone.provider_zone_id, cls.WAF_PHASE, [rule])- if not res.get('success'):- cls._record(zone, 'waf', 'add-rule', rule['description'], 'error', res.get('error'))- return {'success': False, 'error': res.get('error', 'Failed to add rule')}- cls._record(zone, 'waf', 'add-rule', rule['description'])- return {'success': True, 'result': res.get('result')}-- @classmethod- def apply_waf_preset(cls, zone_id, preset_key, params=None):- rule = cls._build_preset_rule(preset_key, params or {})- return cls.add_waf_rule(zone_id, description=rule['description'],- expression=rule['expression'], action=rule['action'])-- @classmethod- def update_waf_rule(cls, zone_id, ruleset_id, rule_id, fields):- """Patch a custom rule. Only known fields are forwarded; an ``action``, if- present, is validated."""- zone, client = cls._zone_and_client(zone_id)- rule = {}- for key in ('description', 'expression', 'action', 'enabled'):- if key in fields:- rule[key] = fields[key]- if 'action' in rule:- cls._validate_action(rule['action'])- if not rule:- raise CloudflareError('No updatable fields provided')- res = client.update_ruleset_rule(zone.provider_zone_id, ruleset_id, rule_id, rule)- if not res.get('success'):- cls._record(zone, 'waf', 'update-rule', rule_id, 'error', res.get('error'))- return {'success': False, 'error': res.get('error', 'Failed to update rule')}- cls._record(zone, 'waf', 'update-rule', rule_id)- return {'success': True, 'result': res.get('result')}-- @classmethod- def delete_waf_rule(cls, zone_id, ruleset_id, rule_id):- zone, client = cls._zone_and_client(zone_id)- res = client.delete_ruleset_rule(zone.provider_zone_id, ruleset_id, rule_id)- if not res.get('success'):- cls._record(zone, 'waf', 'delete-rule', rule_id, 'error', res.get('error'))- return {'success': False, 'error': res.get('error', 'Failed to delete rule')}- cls._record(zone, 'waf', 'delete-rule', rule_id)- return {'success': True}-- # ── Workers (edge hosting) ───────────────────────────────────────────────- # Workers are account-scoped; the owning account is read from the zone, so the- # whole feature reuses the same Cloudflare connection the DNS zone already has.-- WORKER_NAME_RE = re.compile(r'^[a-z0-9][a-z0-9_-]{0,62}$')- DEFAULT_COMPAT_DATE = '2025-01-01'-- @classmethod- def _account_id(cls, zone, client):- """The Cloudflare account that owns ``zone`` (for account-scoped resources)."""- res = client.get_zone_account_id(zone.provider_zone_id)- if not res.get('success'):- raise CloudflareError(- res.get('error') or 'Could not resolve the Cloudflare account for this zone')- acct = ((res.get('result') or {}).get('account') or {}).get('id')- if not acct:- raise CloudflareError('Cloudflare did not return an account for this zone')- return acct-- @classmethod- def list_workers(cls, zone_id):- """Live Worker scripts in the zone's account (flagged when ServerKit manages- them), plus the zone's Worker routes."""- from app.models.cloudflare_worker import CloudflareWorker- zone, client = cls._zone_and_client(zone_id)- account_id = cls._account_id(zone, client)- res = client.list_worker_scripts(account_id)- if not res.get('success'):- return {'success': False, 'error': res.get('error', 'Failed to list workers')}- managed = {w.name: w for w in- CloudflareWorker.query.filter_by(account_id=account_id).all()}- scripts = []- for s in (res.get('result') or []):- name = s.get('id') # Cloudflare returns the script name in `id`- rec = managed.get(name)- scripts.append({'name': name, 'created_on': s.get('created_on'),- 'modified_on': s.get('modified_on'),- 'managed': rec is not None,- 'has_source': bool(rec and rec.source)})- routes = []- rres = client.list_worker_routes(zone.provider_zone_id)- if rres.get('success'):- routes = [{'id': r.get('id'), 'pattern': r.get('pattern'), 'script': r.get('script')}- for r in (rres.get('result') or [])]- return {'success': True, 'account_id': account_id, 'workers': scripts, 'routes': routes}-- @classmethod- def deploy_worker(cls, zone_id, *, name, code, compatibility_date=None, route_pattern=None):- """Upload a module Worker, record the source locally, and optionally attach a- route in this zone."""- from app import db- from app.models.cloudflare_worker import CloudflareWorker-- name = (name or '').strip().lower()- if not cls.WORKER_NAME_RE.match(name):- raise CloudflareError('Worker name must be 1–63 chars: lowercase letters, '- 'digits, hyphens or underscores, starting alphanumeric')- if not (code or '').strip():- raise CloudflareError('Worker code is required')- compat = compatibility_date or cls.DEFAULT_COMPAT_DATE-- zone, client = cls._zone_and_client(zone_id)- account_id = cls._account_id(zone, client)- res = client.upload_worker_module(account_id, name, code, compat)- if not res.get('success'):- cls._record(zone, 'workers', 'deploy', name, 'error', res.get('error'))- return {'success': False, 'error': res.get('error', 'Worker upload failed')}-- rec = CloudflareWorker.query.filter_by(account_id=account_id, name=name).first()- if not rec:- rec = CloudflareWorker(account_id=account_id, name=name,- dns_provider_config_id=zone.dns_provider_config_id)- db.session.add(rec)- rec.source = code- rec.compatibility_date = compat- db.session.commit()-- route = None- if route_pattern and route_pattern.strip():- rr = client.add_worker_route(zone.provider_zone_id, route_pattern.strip(), name)- route = {'success': bool(rr.get('success')),- 'error': None if rr.get('success') else rr.get('error')}- cls._record(zone, 'workers', 'deploy', name)- return {'success': True, 'worker': rec.to_dict(), 'route': route}-- @classmethod- def delete_worker(cls, zone_id, name):- from app import db- from app.models.cloudflare_worker import CloudflareWorker- zone, client = cls._zone_and_client(zone_id)- account_id = cls._account_id(zone, client)- res = client.delete_worker_script(account_id, name)- if not res.get('success'):- cls._record(zone, 'workers', 'delete', name, 'error', res.get('error'))- return {'success': False, 'error': res.get('error', 'Failed to delete worker')}- rec = CloudflareWorker.query.filter_by(account_id=account_id, name=name).first()- if rec:- db.session.delete(rec)- db.session.commit()- cls._record(zone, 'workers', 'delete', name)- return {'success': True}-- @classmethod- def add_worker_route(cls, zone_id, pattern, script):- if not (pattern or '').strip() or not (script or '').strip():- raise CloudflareError('Both a route pattern and a worker name are required')- zone, client = cls._zone_and_client(zone_id)- res = client.add_worker_route(zone.provider_zone_id, pattern.strip(), script.strip())- if not res.get('success'):- cls._record(zone, 'workers', 'add-route', pattern.strip(), 'error', res.get('error'))- return {'success': False, 'error': res.get('error', 'Failed to add route')}- cls._record(zone, 'workers', 'add-route', pattern.strip())- return {'success': True, 'result': res.get('result')}-- @classmethod- def delete_worker_route(cls, zone_id, route_id):- zone, client = cls._zone_and_client(zone_id)- res = client.delete_worker_route(zone.provider_zone_id, route_id)- if not res.get('success'):- cls._record(zone, 'workers', 'delete-route', route_id, 'error', res.get('error'))- return {'success': False, 'error': res.get('error', 'Failed to delete route')}- cls._record(zone, 'workers', 'delete-route', route_id)- return {'success': True}-- # ── Tunnels (cloudflared) ────────────────────────────────────────────────- # Cloudflare Tunnels expose a local/private service through Cloudflare's edge- # without a public IP. Distinct from ServerKit's WireGuard remote-access- # tunnels. Account-scoped; account resolved from the zone.-- @staticmethod- def _install_command(token):- """The one-liner an operator runs on the target host to attach a connector."""- if not token:- return None- return f'cloudflared service install {token}'-- @classmethod- def list_tunnels(cls, zone_id):- from app.models.cloudflare_tunnel import CloudflareTunnel- zone, client = cls._zone_and_client(zone_id)- account_id = cls._account_id(zone, client)- res = client.list_tunnels(account_id)- if not res.get('success'):- return {'success': False, 'error': res.get('error', 'Failed to list tunnels')}- managed = {t.tunnel_id for t in- CloudflareTunnel.query.filter_by(account_id=account_id).all()}- tunnels = [{'id': t.get('id'), 'name': t.get('name'), 'status': t.get('status'),- 'created_at': t.get('created_at'),- 'connections': len(t.get('connections') or []),- 'managed': t.get('id') in managed}- for t in (res.get('result') or [])]- return {'success': True, 'account_id': account_id, 'tunnels': tunnels}-- @classmethod- def create_tunnel(cls, zone_id, name):- """Create a tunnel and return the connector token + install command (the- token is revealed once here and stored encrypted for later)."""- from app import db- from app.models.cloudflare_tunnel import CloudflareTunnel- from app.utils.crypto import encrypt_secret-- name = (name or '').strip()- if not name:- raise CloudflareError('A tunnel name is required')- zone, client = cls._zone_and_client(zone_id)- account_id = cls._account_id(zone, client)- res = client.create_tunnel(account_id, name)- if not res.get('success'):- cls._record(zone, 'tunnels', 'create', name, 'error', res.get('error'))- return {'success': False, 'error': res.get('error', 'Failed to create tunnel')}- result = res.get('result') or {}- tunnel_id = result.get('id')- token = result.get('token')- if not token and tunnel_id:- tres = client.get_tunnel_token(account_id, tunnel_id)- token = tres.get('result') if tres.get('success') else None-- rec = CloudflareTunnel(- tunnel_id=tunnel_id, name=name, account_id=account_id,- dns_provider_config_id=zone.dns_provider_config_id,- token_encrypted=encrypt_secret(token) if token else None)- db.session.add(rec)- db.session.commit()- cls._record(zone, 'tunnels', 'create', name)- return {'success': True, 'tunnel': rec.to_dict(),- 'token': token, 'install': cls._install_command(token)}-- @classmethod- def get_tunnel_install(cls, zone_id, tunnel_id):- """Re-fetch the connector token + install command for a tunnel."""- zone, client = cls._zone_and_client(zone_id)- account_id = cls._account_id(zone, client)- tres = client.get_tunnel_token(account_id, tunnel_id)- if not tres.get('success'):- return {'success': False, 'error': tres.get('error', 'Failed to fetch token')}- token = tres.get('result')- return {'success': True, 'token': token, 'install': cls._install_command(token)}-- @classmethod- def delete_tunnel(cls, zone_id, tunnel_id):- from app import db- from app.models.cloudflare_tunnel import CloudflareTunnel- zone, client = cls._zone_and_client(zone_id)- account_id = cls._account_id(zone, client)- res = client.delete_tunnel(account_id, tunnel_id)- if not res.get('success'):- cls._record(zone, 'tunnels', 'delete', tunnel_id, 'error', res.get('error'))- return {'success': False, 'error': res.get('error', 'Failed to delete tunnel')}- rec = CloudflareTunnel.query.filter_by(account_id=account_id, tunnel_id=tunnel_id).first()- if rec:- db.session.delete(rec)- db.session.commit()- cls._record(zone, 'tunnels', 'delete', tunnel_id)- return {'success': True}-- @classmethod- def get_tunnel_hostnames(cls, zone_id, tunnel_id):- """The public-hostname ingress rules configured on a tunnel."""- zone, client = cls._zone_and_client(zone_id)- account_id = cls._account_id(zone, client)- res = client.get_tunnel_configuration(account_id, tunnel_id)- if not res.get('success'):- return {'success': False, 'error': res.get('error', 'Failed to load tunnel config')}- ingress = ((res.get('result') or {}).get('config') or {}).get('ingress') or []- hostnames = [{'hostname': r.get('hostname'), 'service': r.get('service')}- for r in ingress if r.get('hostname')]- return {'success': True, 'hostnames': hostnames}-- @classmethod- def add_tunnel_hostname(cls, zone_id, tunnel_id, hostname, service):- """Route a public hostname to a local service through the tunnel, and- best-effort create the proxied CNAME that points it at the tunnel."""- hostname = (hostname or '').strip().lower().rstrip('.')- service = (service or '').strip()- if not hostname or not service:- raise CloudflareError('Both a hostname and a service '- '(e.g. http://localhost:8080) are required')- zone, client = cls._zone_and_client(zone_id)- account_id = cls._account_id(zone, client)-- cur = client.get_tunnel_configuration(account_id, tunnel_id)- config = ((cur.get('result') or {}).get('config') or {}) if cur.get('success') else {}- # Keep only real hostname rules, replace/insert this one, re-add catch-all.- ingress = [r for r in (config.get('ingress') or [])- if r.get('hostname') and r.get('hostname') != hostname]- ingress.append({'hostname': hostname, 'service': service})- ingress.append({'service': 'http_status:404'})- config['ingress'] = ingress-- res = client.put_tunnel_configuration(account_id, tunnel_id, config)- if not res.get('success'):- cls._record(zone, 'tunnels', 'add-hostname', hostname, 'error', res.get('error'))- return {'success': False, 'error': res.get('error', 'Failed to set tunnel route')}- dns = cls._ensure_tunnel_cname(zone, client, hostname, tunnel_id)- cls._record(zone, 'tunnels', 'add-hostname', hostname)- return {'success': True, 'dns': dns}-- @classmethod- def remove_tunnel_hostname(cls, zone_id, tunnel_id, hostname):- hostname = (hostname or '').strip().lower().rstrip('.')- if not hostname:- raise CloudflareError('A hostname is required')- zone, client = cls._zone_and_client(zone_id)- account_id = cls._account_id(zone, client)- cur = client.get_tunnel_configuration(account_id, tunnel_id)- config = ((cur.get('result') or {}).get('config') or {}) if cur.get('success') else {}- ingress = [r for r in (config.get('ingress') or [])- if r.get('hostname') and r.get('hostname') != hostname]- ingress.append({'service': 'http_status:404'})- config['ingress'] = ingress- res = client.put_tunnel_configuration(account_id, tunnel_id, config)- if not res.get('success'):- cls._record(zone, 'tunnels', 'remove-hostname', hostname, 'error', res.get('error'))- return {'success': False, 'error': res.get('error', 'Failed to remove tunnel route')}- cls._record(zone, 'tunnels', 'remove-hostname', hostname)- return {'success': True}-- @staticmethod- def _ensure_tunnel_cname(zone, client, hostname, tunnel_id):- """Best-effort: upsert the proxied CNAME ``hostname → <id>.cfargotunnel.com``- that publishes the tunnel. Reported, never fatal — the route is already set."""- try:- from app.services.dns.base import DnsRecordSpec- from app.services.dns_ownership_service import DnsOwnershipService- target = f'{tunnel_id}.cfargotunnel.com'- spec = DnsRecordSpec(record_type='CNAME', name=hostname, content=target,- ttl=1, proxied=True)- res = DnsOwnershipService.guarded_upsert(- client, provider='cloudflare', provider_zone_id=zone.provider_zone_id,- spec=spec, source='cf-tunnel', config_id=zone.dns_provider_config_id,- allow_foreign=True)- return {'created': bool(res.get('success')),- 'error': None if res.get('success') else res.get('error')}- except Exception as e:- return {'created': False, 'error': str(e)}-- # ── Developer platform: R2 / KV / D1 ─────────────────────────────────────- # Account-scoped storage. Management only — listing the inventory and- # creating/deleting resources. R2 is S3-compatible, so a bucket made here can- # later back ServerKit backups via the existing S3 storage backend (a separate- # follow-up that mints scoped R2 access keys).-- R2_BUCKET_RE = re.compile(r'^[a-z0-9][a-z0-9-]{1,61}[a-z0-9]$')-- @classmethod- def list_storage(cls, zone_id):- """Combined developer-platform inventory. Each product is fetched- independently so a missing token scope degrades to a per-product error- rather than failing the whole tab."""- zone, client = cls._zone_and_client(zone_id)- account_id = cls._account_id(zone, client)- out = {'success': True, 'account_id': account_id,- 'r2': [], 'kv': [], 'd1': [], 'errors': {}}-- r2 = client.list_r2_buckets(account_id)- if r2.get('success'):- out['r2'] = [{'name': b.get('name'), 'creation_date': b.get('creation_date')}- for b in ((r2.get('result') or {}).get('buckets') or [])]- else:- out['errors']['r2'] = r2.get('error')-- kv = client.list_kv_namespaces(account_id)- if kv.get('success'):- out['kv'] = [{'id': n.get('id'), 'title': n.get('title')}- for n in (kv.get('result') or [])]- else:- out['errors']['kv'] = kv.get('error')-- d1 = client.list_d1_databases(account_id)- if d1.get('success'):- out['d1'] = [{'uuid': d.get('uuid'), 'name': d.get('name')}- for d in (d1.get('result') or [])]- else:- out['errors']['d1'] = d1.get('error')- return out-- @classmethod- def create_r2_bucket(cls, zone_id, name):- name = (name or '').strip().lower()- if not cls.R2_BUCKET_RE.match(name):- raise CloudflareError('Bucket name must be 3–63 chars: lowercase letters, '- 'digits and hyphens, starting and ending alphanumeric')- zone, client = cls._zone_and_client(zone_id)- account_id = cls._account_id(zone, client)- res = client.create_r2_bucket(account_id, name)- if not res.get('success'):- cls._record(zone, 'storage', 'create-r2', name, 'error', res.get('error'))- return {'success': False, 'error': res.get('error', 'Failed to create bucket')}- cls._record(zone, 'storage', 'create-r2', name)- return {'success': True, 'bucket': name}-- @classmethod- def delete_r2_bucket(cls, zone_id, name):- zone, client = cls._zone_and_client(zone_id)- account_id = cls._account_id(zone, client)- res = client.delete_r2_bucket(account_id, name)- if not res.get('success'):- cls._record(zone, 'storage', 'delete-r2', name, 'error', res.get('error'))- return {'success': False, 'error': res.get('error', 'Failed to delete bucket')}- cls._record(zone, 'storage', 'delete-r2', name)- return {'success': True}-- @classmethod- def create_kv_namespace(cls, zone_id, title):- title = (title or '').strip()- if not title:- raise CloudflareError('A namespace title is required')- zone, client = cls._zone_and_client(zone_id)- account_id = cls._account_id(zone, client)- res = client.create_kv_namespace(account_id, title)- if not res.get('success'):- cls._record(zone, 'storage', 'create-kv', title, 'error', res.get('error'))- return {'success': False, 'error': res.get('error', 'Failed to create namespace')}- cls._record(zone, 'storage', 'create-kv', title)- return {'success': True, 'namespace': res.get('result')}-- @classmethod- def delete_kv_namespace(cls, zone_id, namespace_id):- zone, client = cls._zone_and_client(zone_id)- account_id = cls._account_id(zone, client)- res = client.delete_kv_namespace(account_id, namespace_id)- if not res.get('success'):- cls._record(zone, 'storage', 'delete-kv', namespace_id, 'error', res.get('error'))- return {'success': False, 'error': res.get('error', 'Failed to delete namespace')}- cls._record(zone, 'storage', 'delete-kv', namespace_id)- return {'success': True}-- @classmethod- def create_d1_database(cls, zone_id, name):- name = (name or '').strip()- if not name:- raise CloudflareError('A database name is required')- zone, client = cls._zone_and_client(zone_id)- account_id = cls._account_id(zone, client)- res = client.create_d1_database(account_id, name)- if not res.get('success'):- cls._record(zone, 'storage', 'create-d1', name, 'error', res.get('error'))- return {'success': False, 'error': res.get('error', 'Failed to create database')}- cls._record(zone, 'storage', 'create-d1', name)- return {'success': True, 'database': res.get('result')}-- @classmethod- def delete_d1_database(cls, zone_id, database_id):- zone, client = cls._zone_and_client(zone_id)- account_id = cls._account_id(zone, client)- res = client.delete_d1_database(account_id, database_id)- if not res.get('success'):- cls._record(zone, 'storage', 'delete-d1', database_id, 'error', res.get('error'))- return {'success': False, 'error': res.get('error', 'Failed to delete database')}- cls._record(zone, 'storage', 'delete-d1', database_id)- return {'success': True}-- # ── DNSSEC ────────────────────────────────────────────────────────────────- # Display-only: enabling DNSSEC returns the DS record the operator must place- # at their registrar. No registrar automation.-- @staticmethod- def _normalize_dnssec(r):- """Flatten Cloudflare's DNSSEC ``result`` to the fields the DS card needs."""- r = r or {}- return {- 'status': r.get('status'), # active | pending | pending-disabled | disabled- 'ds': r.get('ds'),- 'digest': r.get('digest'),- 'digest_type': r.get('digest_type'),- 'digest_algorithm': r.get('digest_algorithm'),- 'algorithm': r.get('algorithm'),- 'key_tag': r.get('key_tag'),- 'key_type': r.get('key_type'),- 'public_key': r.get('public_key'),- 'flags': r.get('flags'),- }-- @classmethod- def get_dnssec(cls, zone_id):- zone, client = cls._zone_and_client(zone_id)- res = client.get_dnssec(zone.provider_zone_id)- if not res.get('success'):- return {'success': False, 'error': res.get('error', 'Failed to load DNSSEC status')}- return {'success': True, 'zone': cls._zone_dict(zone),- 'dnssec': cls._normalize_dnssec(res.get('result'))}-- @classmethod- def set_dnssec(cls, zone_id, enabled):- """Enable or disable DNSSEC. Returns the DS record payload on enable."""- zone, client = cls._zone_and_client(zone_id)- action = 'enable' if enabled else 'disable'- res = client.set_dnssec(zone.provider_zone_id, 'active' if enabled else 'disabled')- if not res.get('success'):- cls._record(zone, 'dnssec', action, zone.domain, 'error', res.get('error'))- return {'success': False, 'error': res.get('error', 'Failed to update DNSSEC')}- cls._record(zone, 'dnssec', action, zone.domain)- return {'success': True, 'dnssec': cls._normalize_dnssec(res.get('result'))}-- # ── Origin CA certificates ────────────────────────────────────────────────- # Issue-and-install, honest about trust: Origin CA certs are valid ONLY behind- # the Cloudflare proxy. The CSR is generated panel-side; the private key never- # leaves the box (only the CSR is sent to Cloudflare). Install reuses the- # existing custom-cert seam (Linux-only). A credential lacking the Origin CA- # permission is surfaced as an actionable 400 (CloudflareError), never a 502.-- # Cloudflare's accepted Origin CA validity windows, in days (7d … 15y).- ORIGIN_CA_VALIDITY_DAYS = [7, 30, 90, 365, 730, 1095, 5475]-- # Substrings that mark a provider error as a credential/scope problem rather- # than a transient provider failure — surfaced as a scoped 400.- _SCOPE_ERROR_MARKERS = (- 'permission', 'not authorized', 'unauthorized', 'authentication',- 'not allowed', 'insufficient', 'invalid api', 'access denied',- 'forbidden', 'origin ca', 'service key', 'scope',- )-- @classmethod- def _is_scope_error(cls, error):- e = (error or '').lower()- return any(m in e for m in cls._SCOPE_ERROR_MARKERS)-- @staticmethod- def _origin_ca_service_key(zone):- """The optional account-level Origin CA service key stored (Fernet) on the- zone's DNS provider connection, or ``None`` (a suitably-scoped token also- authenticates the Origin CA endpoints)."""- try:- from app.models.email import DNSProviderConfig- from app.utils.crypto import decrypt_secret_safe- cfg_id = getattr(zone, 'dns_provider_config_id', None)- cfg = DNSProviderConfig.query.get(cfg_id) if cfg_id else None- if cfg and getattr(cfg, 'origin_ca_key', None):- return decrypt_secret_safe(cfg.origin_ca_key)- except Exception:- pass- return None-- @staticmethod- def _generate_csr(hostnames):- """Generate an RSA private key + CSR for ``hostnames`` panel-side. Returns- ``(csr_pem, key_pem)``; the key is kept locally for install and never sent- to Cloudflare."""- from cryptography import x509- from cryptography.x509.oid import NameOID- from cryptography.hazmat.primitives import hashes, serialization- from cryptography.hazmat.primitives.asymmetric import rsa-- key = rsa.generate_private_key(public_exponent=65537, key_size=2048)- builder = x509.CertificateSigningRequestBuilder().subject_name(- x509.Name([x509.NameAttribute(NameOID.COMMON_NAME, hostnames[0])]))- builder = builder.add_extension(- x509.SubjectAlternativeName([x509.DNSName(h) for h in hostnames]), critical=False)- csr = builder.sign(key, hashes.SHA256())- csr_pem = csr.public_bytes(serialization.Encoding.PEM).decode()- key_pem = key.private_bytes(- serialization.Encoding.PEM,- serialization.PrivateFormat.TraditionalOpenSSL,- serialization.NoEncryption()).decode()- return csr_pem, key_pem-- @staticmethod- def _proxy_warnings(zone, client, hostnames):- """Best-effort: warn when a covered hostname isn't proxied (grey cloud) or- has no DNS record — an Origin CA cert is only valid behind the proxy."""- warnings = []- try:- rec = client.list_records(zone.provider_zone_id)- records = (rec.get('records') or []) if rec.get('success') else []- by_name = {}- for r in records:- by_name.setdefault((r.get('name') or '').lower().rstrip('.'), []).append(r)- for h in hostnames:- base = h[2:] if h.startswith('*.') else h- matches = by_name.get(base, [])- if not matches:- warnings.append(- f'{h}: no DNS record found — an Origin CA certificate is only '- 'valid when traffic is proxied through Cloudflare.')- elif not any(m.get('proxied') for m in matches):- warnings.append(- f'{h}: the DNS record is not proxied (grey cloud). This '- 'certificate only works when traffic goes through Cloudflare.')- except Exception:- pass- return warnings-- @staticmethod- def _install_origin_cert(hostnames, cert_pem, key_pem):- """Install the issued cert + panel-generated key via the existing custom-cert- seam (writes PEMs to ``/etc/ssl/serverkit/<domain>/``, Linux-only)."""- try:- from app.services.advanced_ssl_service import AdvancedSSLService- install_domain = next((h for h in hostnames if not h.startswith('*.')), None)- if not install_domain:- install_domain = hostnames[0][2:] if hostnames[0].startswith('*.') else hostnames[0]- info = AdvancedSSLService.upload_custom_cert(install_domain, cert_pem, key_pem)- return {'success': True, **info}- except Exception as e:- return {'success': False, 'error': str(e)}-- @classmethod- def issue_origin_certificate(cls, zone_id, hostnames, validity_days=5475, install=True):- """Issue an Origin CA certificate for ``hostnames`` and (optionally) install- it on the origin. The private key is generated panel-side and never sent to- Cloudflare."""- zone, client = cls._zone_and_client(zone_id)- hostnames = [h.strip().lower().rstrip('.') for h in (hostnames or []) if h and h.strip()]- if not hostnames:- raise CloudflareError('At least one hostname is required')- if validity_days not in cls.ORIGIN_CA_VALIDITY_DAYS:- raise CloudflareError(- 'Unsupported validity — choose one of: '- + ', '.join(str(v) for v in cls.ORIGIN_CA_VALIDITY_DAYS) + ' days')-- csr_pem, key_pem = cls._generate_csr(hostnames)- res = client.create_origin_certificate(- csr=csr_pem, hostnames=hostnames, requested_validity=validity_days,- service_key=cls._origin_ca_service_key(zone))- if not res.get('success'):- err = res.get('error', 'Failed to issue Origin CA certificate')- cls._record(zone, 'origin_ca', 'issue', hostnames[0], 'error', err)- if cls._is_scope_error(err):- raise CloudflareError(- 'This Cloudflare credential lacks the Origin CA permission. Add the '- '"SSL and Certificates: Edit" scope to the token, or set an Origin CA '- f'key on the connection. ({err})')- return {'success': False, 'error': err}-- result = res.get('result') or {}- cert_pem = result.get('certificate')- out = {- 'success': True,- 'certificate_id': result.get('id'),- 'certificate': cert_pem,- 'hostnames': hostnames,- 'expires_on': result.get('expires_on'),- 'proxy_only': True,- 'warnings': cls._proxy_warnings(zone, client, hostnames),- }- if install and cert_pem and os.name != 'nt':- out['install'] = cls._install_origin_cert(hostnames, cert_pem, key_pem)- cls._record(zone, 'origin_ca', 'issue', hostnames[0])- return out-- @classmethod- def list_origin_certificates(cls, zone_id):- zone, client = cls._zone_and_client(zone_id)- res = client.list_origin_certificates(- zone.provider_zone_id, service_key=cls._origin_ca_service_key(zone))- if not res.get('success'):- err = res.get('error', 'Failed to list Origin CA certificates')- if cls._is_scope_error(err):- raise CloudflareError(- 'This Cloudflare credential lacks the Origin CA permission. Add the '- f'"SSL and Certificates: Read" scope to the token. ({err})')- return {'success': False, 'error': err}- certs = [{- 'id': c.get('id'),- 'hostnames': c.get('hostnames'),- 'expires_on': c.get('expires_on'),- 'requested_validity': c.get('requested_validity'),- 'certificate': c.get('certificate'),- } for c in (res.get('result') or [])]- return {'success': True, 'certificates': certs, 'proxy_only': True}-- @classmethod- def revoke_origin_certificate(cls, zone_id, certificate_id):- zone, client = cls._zone_and_client(zone_id)- res = client.revoke_origin_certificate(- certificate_id, service_key=cls._origin_ca_service_key(zone))- if not res.get('success'):- err = res.get('error', 'Failed to revoke certificate')- cls._record(zone, 'origin_ca', 'revoke', certificate_id, 'error', err)- if cls._is_scope_error(err):- raise CloudflareError(- 'This Cloudflare credential lacks the Origin CA permission. '- f'({err})')- return {'success': False, 'error': err}- cls._record(zone, 'origin_ca', 'revoke', certificate_id)- return {'success': True, 'certificate_id': certificate_id}-- # ── Redirect + Transform rules ────────────────────────────────────────────- # The same ruleset machinery as WAF, in different phases, with per-phase action- # allowlists + the shared expression-injection guard.-- RULE_PHASES = {- 'redirect': 'http_request_dynamic_redirect',- 'transform': 'http_request_transform',- }- RULE_ACTIONS = {- 'redirect': {'redirect'},- 'transform': {'rewrite'},- }-- # Preset library per rule type (plan §Phase 3). Presets take no free-form user- # input that lands in an expression — the only interpolated value is the zone's- # own (validated) domain — so there is no injection surface.- RULE_PRESETS = {- 'redirect': [- {'key': 'force_www', 'label': 'Redirect apex to www',- 'description': 'Send https://example.com/* to https://www.example.com/*.',- 'params': []},- {'key': 'www_to_apex', 'label': 'Redirect www to apex',- 'description': 'Send https://www.example.com/* to https://example.com/*.',- 'params': []},- {'key': 'strip_trailing_slash', 'label': 'Remove trailing slash',- 'description': 'Redirect /path/ to /path (except the root).',- 'params': []},- ],- 'transform': [- {'key': 'strip_tracking', 'label': 'Strip tracking parameters',- 'description': 'Remove utm_*, gclid and fbclid query parameters.',- 'params': []},- ],- }-- _SAFE_HOST_RE = re.compile(r'^[a-z0-9.-]+$')-- @classmethod- def _resolve_rule_phase(cls, slug):- phase = cls.RULE_PHASES.get(slug)- if not phase:- raise CloudflareError(- f'Unknown rule type "{slug}". Use one of: '- + ', '.join(sorted(cls.RULE_PHASES)))- return phase-- @classmethod- def _validate_rule_action(cls, slug, action):- allowed = cls.RULE_ACTIONS.get(slug, set())- if action not in allowed:- raise CloudflareError(- f'Unsupported action "{action}" for {slug} rules. '- f'Use one of: {", ".join(sorted(allowed))}')-- @staticmethod- def _full_rule_dict(r):- return {'id': r.get('id'), 'description': r.get('description'),- 'expression': r.get('expression'), 'action': r.get('action'),- 'action_parameters': r.get('action_parameters'),- 'enabled': r.get('enabled', True), 'ref': r.get('ref')}-- @classmethod- def list_rules(cls, zone_id, slug):- """Rules for a phase (redirect|transform), plus the preset catalog. A zone- with no ruleset in that phase yet returns an empty list (not an error)."""- phase = cls._resolve_rule_phase(slug)- zone, client = cls._zone_and_client(zone_id)- custom, err = cls._find_custom_ruleset(client, zone.provider_zone_id, phase)- if err:- return {'success': False, 'error': err}- presets = cls.RULE_PRESETS.get(slug, [])- if not custom:- return {'success': True, 'ruleset_id': None, 'rules': [], 'presets': presets}- detail = client.get_ruleset(zone.provider_zone_id, custom['id'])- if not detail.get('success'):- return {'success': False, 'error': detail.get('error', 'Failed to load ruleset')}- result = detail.get('result') or {}- rules = [cls._full_rule_dict(r) for r in (result.get('rules') or [])]- return {'success': True, 'ruleset_id': result.get('id'),- 'rules': rules, 'presets': presets}-- @classmethod- def add_rule(cls, zone_id, slug, *, description, expression, action,- action_parameters=None, enabled=True):- """Append a rule to the phase's entry-point ruleset, creating it on first use."""- phase = cls._resolve_rule_phase(slug)- cls._validate_rule_action(slug, action)- if not (expression or '').strip():- raise CloudflareError('A rule expression is required')- zone, client = cls._zone_and_client(zone_id)- rule = {'description': description or 'ServerKit rule', 'expression': expression,- 'action': action, 'enabled': bool(enabled)}- if action_parameters:- rule['action_parameters'] = action_parameters-- custom, err = cls._find_custom_ruleset(client, zone.provider_zone_id, phase)- if err:- return {'success': False, 'error': err}- if custom:- res = client.add_ruleset_rule(zone.provider_zone_id, custom['id'], rule)- else:- res = client.create_phase_ruleset(zone.provider_zone_id, phase, [rule])- if not res.get('success'):- cls._record(zone, slug, 'add-rule', rule['description'], 'error', res.get('error'))- return {'success': False, 'error': res.get('error', 'Failed to add rule')}- cls._record(zone, slug, 'add-rule', rule['description'])- return {'success': True, 'result': res.get('result')}-- @classmethod- def _build_rule_preset(cls, slug, key, domain, params):- """Turn a preset key + the zone domain into a concrete rule dict. The domain- is validated before interpolation so a preset can't inject expression syntax."""- domain = (domain or '').strip().lower().rstrip('.')- if not cls._SAFE_HOST_RE.match(domain or ''):- raise CloudflareError('The zone domain is not a valid hostname')- if slug == 'redirect':- if key == 'force_www':- return {'description': 'ServerKit: redirect apex to www',- 'expression': f'(http.host eq "{domain}")',- 'action': 'redirect',- 'action_parameters': {'from_value': {- 'status_code': 301,- 'target_url': {'expression':- f'concat("https://www.{domain}", http.request.uri.path)'},- 'preserve_query_string': True}}}- if key == 'www_to_apex':- return {'description': 'ServerKit: redirect www to apex',- 'expression': f'(http.host eq "www.{domain}")',- 'action': 'redirect',- 'action_parameters': {'from_value': {- 'status_code': 301,- 'target_url': {'expression':- f'concat("https://{domain}", http.request.uri.path)'},- 'preserve_query_string': True}}}- if key == 'strip_trailing_slash':- return {'description': 'ServerKit: remove trailing slash',- 'expression': ('(ends_with(http.request.uri.path, "/") and '- 'http.request.uri.path ne "/")'),- 'action': 'redirect',- 'action_parameters': {'from_value': {- 'status_code': 301,- 'target_url': {'expression':- 'concat("https://", http.host, '- 'substring(http.request.uri.path, 0, -1))'},- 'preserve_query_string': True}}}- elif slug == 'transform':- if key == 'strip_tracking':- return {'description': 'ServerKit: strip tracking parameters',- 'expression': '(http.request.uri.query ne "")',- 'action': 'rewrite',- 'action_parameters': {'uri': {'query': {'expression':- 'regex_replace(http.request.uri.query, '- '"(^|&)(utm_[a-z]+|gclid|fbclid)=[^&]*", "")'}}}}- raise CloudflareError(f'Unknown {slug} preset: {key}')-- @classmethod- def apply_rule_preset(cls, zone_id, slug, preset_key, params=None):- cls._resolve_rule_phase(slug) # validates slug up front- zone, _ = cls._zone_and_client(zone_id)- rule = cls._build_rule_preset(slug, preset_key, zone.domain, params or {})- return cls.add_rule(zone_id, slug, description=rule['description'],- expression=rule['expression'], action=rule['action'],- action_parameters=rule.get('action_parameters'))-- @classmethod- def update_rule(cls, zone_id, slug, ruleset_id, rule_id, fields):- cls._resolve_rule_phase(slug)- zone, client = cls._zone_and_client(zone_id)- rule = {}- for k in ('description', 'expression', 'action', 'enabled', 'action_parameters'):- if k in fields:- rule[k] = fields[k]- if 'action' in rule:- cls._validate_rule_action(slug, rule['action'])- if not rule:- raise CloudflareError('No updatable fields provided')- res = client.update_ruleset_rule(zone.provider_zone_id, ruleset_id, rule_id, rule)- if not res.get('success'):- cls._record(zone, slug, 'update-rule', rule_id, 'error', res.get('error'))- return {'success': False, 'error': res.get('error', 'Failed to update rule')}- cls._record(zone, slug, 'update-rule', rule_id)- return {'success': True, 'result': res.get('result')}-- @classmethod- def delete_rule(cls, zone_id, slug, ruleset_id, rule_id):- cls._resolve_rule_phase(slug)- zone, client = cls._zone_and_client(zone_id)- res = client.delete_ruleset_rule(zone.provider_zone_id, ruleset_id, rule_id)- if not res.get('success'):- cls._record(zone, slug, 'delete-rule', rule_id, 'error', res.get('error'))- return {'success': False, 'error': res.get('error', 'Failed to delete rule')}- cls._record(zone, slug, 'delete-rule', rule_id)- return {'success': True}-- # ── Activity (local ops ledger) ───────────────────────────────────────────-- @classmethod- def list_activity(cls, zone_id, product=None, result=None, limit=100):- """The per-zone Cloudflare-ops change ledger, newest first."""- zone, _ = cls._zone_and_client(zone_id)- from app.services.cf_ops_change_service import CfOpsChangeService- rows = CfOpsChangeService.list(- provider_zone_id=zone.provider_zone_id,- product=product, result=result, limit=limit)- return {'success': True, 'zone': cls._zone_dict(zone),- 'changes': [r.to_dict() for r in rows]}-- # ── Token scope diagnosability ────────────────────────────────────────────-- @classmethod- def scope_check(cls, zone_id):- """Probe each product with a cheap read and report- ``{product: ok|missing_scope|error}`` — round 2 is exactly where DNS-only- tokens start failing."""- zone, client = cls._zone_and_client(zone_id)-- def classify(res):- if res.get('success'):- return 'ok'- return 'missing_scope' if cls._is_scope_error(res.get('error')) else 'error'-- products = {- 'dns': classify(client.list_records(zone.provider_zone_id)),- 'settings': classify(client.get_zone_settings(zone.provider_zone_id)),- 'dnssec': classify(client.get_dnssec(zone.provider_zone_id)),- 'waf': classify(client.list_rulesets(zone.provider_zone_id)),- 'origin_ca': classify(client.list_origin_certificates(- zone.provider_zone_id, service_key=cls._origin_ca_service_key(zone))),- }- try:- account_id = cls._account_id(zone, client)- except CloudflareError:- account_id = None- if account_id:- products['workers'] = classify(client.list_worker_scripts(account_id))- products['tunnels'] = classify(client.list_tunnels(account_id))- products['storage'] = classify(client.list_r2_buckets(account_id))- else:- products['workers'] = products['tunnels'] = products['storage'] = 'missing_scope'- return {'success': True, 'zone': cls._zone_dict(zone), 'products': products}diff --git a/builtin-extensions/serverkit-cloudflare-ops/frontend/components/CloudflareWafPanel.jsx b/builtin-extensions/serverkit-cloudflare-ops/frontend/components/CloudflareWafPanel.jsxdeleted file mode 100644index fbb7a2ea..00000000--- a/builtin-extensions/serverkit-cloudflare-ops/frontend/components/CloudflareWafPanel.jsx+++ /dev/null@@ -1,335 +0,0 @@-import { useState, useEffect, useCallback } from 'react';-import { ShieldAlert } from 'lucide-react';-import api from '../services/cloudflare';-import {- Button, Input, Textarea, Switch, Badge,- Select, SelectTrigger, SelectContent, SelectItem, SelectValue,- EmptyState, useToast,-} from 'serverkit-sdk';-import { useTranslation } from 'react-i18next';--const ACTION_OPTIONS = [- { value: 'block', labelKey: 'app.cloudflareWafPanel.block', label: 'Block' },- { value: 'managed_challenge', labelKey: 'app.cloudflareWafPanel.managedChallenge', label: 'Managed Challenge' },- { value: 'js_challenge', labelKey: 'app.cloudflareWafPanel.jsChallenge', label: 'JS Challenge' },- { value: 'log', labelKey: 'app.cloudflareWafPanel.log', label: 'Log' },-];--const EXPRESSION_PLACEHOLDER = '(http.request.uri.path contains "/admin")';--export default function CloudflareWafPanel({ zoneId, isAdmin }) {- const { t } = useTranslation();- const toast = useToast();-- const [loading, setLoading] = useState(true);- const [error, setError] = useState(null);- const [rulesetId, setRulesetId] = useState(null);- const [rules, setRules] = useState([]);- const [presets, setPresets] = useState([]);-- // Preset form state- const [selectedPreset, setSelectedPreset] = useState('');- const [presetParams, setPresetParams] = useState({});-- // Custom rule form state- const [customDescription, setCustomDescription] = useState('');- const [customExpression, setCustomExpression] = useState('');- const [customAction, setCustomAction] = useState('block');-- // Tracks any in-flight write so buttons can disable- const [applying, setApplying] = useState(false);-- const loadRules = useCallback(async () => {- try {- const data = await api.getCloudflareWafRules(zoneId);- setRulesetId(data.ruleset_id ?? null);- setRules(data.rules || []);- setPresets(data.presets || []);- setError(null);- } catch (err) {- setError(err.message);- }- }, [zoneId]);-- useEffect(() => {- let active = true;- setLoading(true);- (async () => {- try {- const data = await api.getCloudflareWafRules(zoneId);- if (!active) return;- setRulesetId(data.ruleset_id ?? null);- setRules(data.rules || []);- setPresets(data.presets || []);- setError(null);- } catch (err) {- if (active) setError(err.message);- } finally {- if (active) setLoading(false);- }- })();- return () => {- active = false;- };- }, [zoneId]);-- const activePreset = presets.find((p) => p.key === selectedPreset) || null;- const presetParamDefs = activePreset?.params || [];-- const handleSelectPreset = (key) => {- setSelectedPreset(key);- setPresetParams({});- };-- const handleParamChange = (key, value) => {- setPresetParams((prev) => ({ ...prev, [key]: value }));- };-- const handleApplyPreset = async () => {- if (!activePreset) return;- setApplying(true);- try {- await api.applyCloudflareWafPreset(zoneId, activePreset.key, presetParams);- await loadRules();- setPresetParams({});- toast.success(t('app.cloudflareWafPanel.addedQuickRule', 'Added quick rule: {{label}}', { label: activePreset.label }));- } catch (err) {- toast.error(err.message);- } finally {- setApplying(false);- }- };-- const handleAddCustomRule = async () => {- setApplying(true);- try {- await api.addCloudflareWafRule(zoneId, {- description: customDescription,- expression: customExpression,- action: customAction,- enabled: true,- });- await loadRules();- setCustomDescription('');- setCustomExpression('');- setCustomAction('block');- toast.success(t('app.cloudflareWafPanel.customRuleAdded', 'Custom rule added'));- } catch (err) {- toast.error(err.message);- } finally {- setApplying(false);- }- };-- const handleToggleRule = async (rule) => {- setApplying(true);- try {- await api.updateCloudflareWafRule(zoneId, rulesetId, rule.id, {- enabled: !rule.enabled,- });- await loadRules();- } catch (err) {- toast.error(err.message);- } finally {- setApplying(false);- }- };-- const handleDeleteRule = async (rule) => {- setApplying(true);- try {- await api.deleteCloudflareWafRule(zoneId, rulesetId, rule.id);- await loadRules();- toast.success(t('app.cloudflareWafPanel.ruleDeleted', 'Rule deleted'));- } catch (err) {- toast.error(err.message);- } finally {- setApplying(false);- }- };-- if (loading) {- return <div className="cf-waf__loading">{t('app.cloudflareWafPanel.loadingFirewallRules', 'Loading firewall rules…')}</div>;- }-- if (error) {- return (- <EmptyState- icon={ShieldAlert}- title={t('app.cloudflareWafPanel.firewallRulesUnavailable', 'Firewall rules unavailable')}- description={error}- />- );- }-- const writeDisabled = !isAdmin || applying;-- return (- <div className="cf-waf">- {/* Presets / quick rules */}- <section className="cf-waf__section">- <h3 className="cf-waf__heading">{t('app.cloudflareWafPanel.quickRules', 'Quick rules')}</h3>- <p className="cf-waf__hint">- {t('app.cloudflareWafPanel.applyACuratedCloudflareRuleWithout', 'Apply a curated Cloudflare rule without writing an expression by hand.')}- </p>-- <div className="cf-waf__field">- <Select- value={selectedPreset}- onValueChange={handleSelectPreset}- disabled={writeDisabled}- >- <SelectTrigger className="cf-waf__select">- <SelectValue placeholder={t('app.cloudflareWafPanel.chooseAQuickRule', 'Choose a quick rule…')} />- </SelectTrigger>- <SelectContent>- {presets.map((preset) => (- <SelectItem key={preset.key} value={preset.key}>- {preset.label}- </SelectItem>- ))}- </SelectContent>- </Select>- </div>-- {activePreset && (- <p className="cf-waf__preset-desc">{activePreset.description}</p>- )}-- {presetParamDefs.length > 0 && (- <div className="cf-waf__params">- {presetParamDefs.map((param) => (- <div className="cf-waf__field" key={param.key}>- <label className="cf-waf__label">{param.label}</label>- <Input- value={presetParams[param.key] || ''}- placeholder={param.placeholder}- onChange={(e) => handleParamChange(param.key, e.target.value)}- disabled={writeDisabled}- />- </div>- ))}- </div>- )}-- <div className="cf-waf__actions">- <Button- size="sm"- onClick={handleApplyPreset}- disabled={writeDisabled || !activePreset}- >- {t('app.cloudflareWafPanel.addRule', 'Add rule')}- </Button>- </div>- </section>-- {/* Custom rule */}- <section className="cf-waf__section">- <h3 className="cf-waf__heading">{t('app.cloudflareWafPanel.customRule', 'Custom rule')}</h3>- <p className="cf-waf__hint">- {t('app.cloudflareWafPanel.writeYourOwnCloudflareFirewallExpression', 'Write your own Cloudflare firewall expression for full control.')}- </p>-- <div className="cf-waf__field">- <label className="cf-waf__label">{t('common.labels.description', 'Description')}</label>- <Input- value={customDescription}- placeholder={t('app.cloudflareWafPanel.blockAdminFromOutsideTheOffice', 'Block admin from outside the office')}- onChange={(e) => setCustomDescription(e.target.value)}- disabled={writeDisabled}- />- </div>-- <div className="cf-waf__field">- <label className="cf-waf__label">{t('app.cloudflareWafPanel.expression', 'Expression')}</label>- <Textarea- rows={3}- value={customExpression}- placeholder={EXPRESSION_PLACEHOLDER}- onChange={(e) => setCustomExpression(e.target.value)}- disabled={writeDisabled}- />- </div>-- <div className="cf-waf__field">- <label className="cf-waf__label">{t('common.labels.action', 'Action')}</label>- <Select- value={customAction}- onValueChange={setCustomAction}- disabled={writeDisabled}- >- <SelectTrigger className="cf-waf__select">- <SelectValue />- </SelectTrigger>- <SelectContent>- {ACTION_OPTIONS.map((opt) => (- <SelectItem key={opt.value} value={opt.value}>- {opt.label}- </SelectItem>- ))}- </SelectContent>- </Select>- </div>-- <div className="cf-waf__actions">- <Button- size="sm"- onClick={handleAddCustomRule}- disabled={writeDisabled || !customExpression.trim()}- >- {t('app.cloudflareWafPanel.addCustomRule', 'Add custom rule')}- </Button>- </div>- </section>-- {/* Active rules list */}- <section className="cf-waf__section">- <h3 className="cf-waf__heading">{t('app.cloudflareWafPanel.activeRules', 'Active rules (')}{rules.length})</h3>-- {rules.length === 0 ? (- <EmptyState- icon={ShieldAlert}- title={t('app.cloudflareWafPanel.noCustomFirewallRules', 'No custom firewall rules')}- description={t('app.cloudflareWafPanel.addAQuickRuleOrA', 'Add a quick rule or a custom rule above.')}- />- ) : (- <ul className="cf-waf__list">- {rules.map((rule) => (- <li className="cf-waf__rule" key={rule.id}>- <div className="cf-waf__rule-main">- <div className="cf-waf__rule-head">- <Badge- variant={rule.action === 'block' ? 'destructive' : 'secondary'}- >- {rule.action}- </Badge>- <span className="cf-waf__rule-desc">- {rule.description || 'Untitled rule'}- </span>- </div>- <code className="cf-waf__rule-expr">{rule.expression}</code>- </div>-- <div className="cf-waf__rule-actions">- <Switch- checked={rule.enabled}- onCheckedChange={() => handleToggleRule(rule)}- disabled={writeDisabled}- />- <Button- variant="destructive"- size="sm"- onClick={() => handleDeleteRule(rule)}- disabled={writeDisabled}- >- {t('common.actions.delete', 'Delete')}- </Button>- </div>- </li>- ))}- </ul>- )}- </section>- </div>- );-}diff --git a/builtin-extensions/serverkit-cloudflare-ops/frontend/components/StoragePanel.jsx b/builtin-extensions/serverkit-cloudflare-ops/frontend/components/StoragePanel.jsxdeleted file mode 100644index 36fd6dfd..00000000--- a/builtin-extensions/serverkit-cloudflare-ops/frontend/components/StoragePanel.jsx+++ /dev/null@@ -1,266 +0,0 @@-import { useState, useEffect, useCallback } from 'react';-import { HardDrive } from 'lucide-react';-import api from '../services/cloudflare';-import { Button, Input, EmptyState, useToast } from 'serverkit-sdk';-import { useTranslation } from 'react-i18next';--function StorageSection({- title,- items,- error,- placeholder,- hint,- renderItem,- onCreate,- onDelete,- isAdmin,- busy,-}) {- const { t } = useTranslation();- const [value, setValue] = useState('');-- const writeDisabled = !isAdmin || busy;-- const handleCreate = async () => {- const trimmed = value.trim();- if (!trimmed) return;- // Only clear the input when the create succeeds; a throw leaves the text intact.- await onCreate(trimmed);- setValue('');- };-- return (- <section className="cf-storage__section">- <h3 className="cf-storage__heading">- {title} ({error ? 0 : items.length})- </h3>-- {hint && <p className="cf-storage__hint">{hint}</p>}-- {error ? (- <p className="cf-storage__error">{error}</p>- ) : (- <>- <div className="cf-storage__create">- <Input- value={value}- placeholder={placeholder}- onChange={(e) => setValue(e.target.value)}- disabled={writeDisabled}- />- <Button- size="sm"- onClick={handleCreate}- disabled={writeDisabled || !value.trim()}- >- {t('common.actions.add', 'Add')}- </Button>- </div>-- {items.length === 0 ? (- <p className="cf-storage__hint">{`No ${title.toLowerCase()} yet.`}</p>- ) : (- <ul className="cf-storage__list">- {items.map((item) => {- const { key, label } = renderItem(item);- return (- <li className="cf-storage__item" key={key}>- <code className="cf-storage__name">{label}</code>- <Button- variant="destructive"- size="sm"- onClick={() => onDelete(item)}- disabled={writeDisabled}- >- {t('common.actions.delete', 'Delete')}- </Button>- </li>- );- })}- </ul>- )}- </>- )}- </section>- );-}--export default function StoragePanel({ zoneId, isAdmin }) {- const { t } = useTranslation();- const toast = useToast();-- const [loading, setLoading] = useState(true);- const [error, setError] = useState(null);- const [data, setData] = useState(null);-- // Tracks any in-flight write so all write controls can disable- const [working, setWorking] = useState(false);-- const loadData = useCallback(async () => {- try {- const res = await api.getCloudflareStorage(zoneId);- setData(res);- setError(null);- } catch (err) {- setError(err.message);- }- }, [zoneId]);-- useEffect(() => {- let active = true;- setLoading(true);- (async () => {- try {- const res = await api.getCloudflareStorage(zoneId);- if (!active) return;- setData(res);- setError(null);- } catch (err) {- if (active) setError(err.message);- } finally {- if (active) setLoading(false);- }- })();- return () => {- active = false;- };- }, [zoneId]);-- const handleCreateR2 = async (name) => {- setWorking(true);- try {- await api.createCloudflareR2Bucket(zoneId, name);- toast.success(t('app.storagePanel.createdBucket', 'Created bucket "{{name}}"', { name: name }));- await loadData();- } catch (err) {- toast.error(err.message);- throw err;- } finally {- setWorking(false);- }- };-- const handleDeleteR2 = async (bucket) => {- setWorking(true);- try {- await api.deleteCloudflareR2Bucket(zoneId, bucket.name);- toast.success(t('app.storagePanel.deleted', 'Deleted'));- await loadData();- } catch (err) {- toast.error(err.message);- } finally {- setWorking(false);- }- };-- const handleCreateKv = async (title) => {- setWorking(true);- try {- await api.createCloudflareKvNamespace(zoneId, title);- toast.success(t('app.storagePanel.createdNamespace', 'Created namespace "{{title}}"', { title: title }));- await loadData();- } catch (err) {- toast.error(err.message);- throw err;- } finally {- setWorking(false);- }- };-- const handleDeleteKv = async (namespace) => {- setWorking(true);- try {- await api.deleteCloudflareKvNamespace(zoneId, namespace.id);- toast.success(t('app.storagePanel.deleted', 'Deleted'));- await loadData();- } catch (err) {- toast.error(err.message);- } finally {- setWorking(false);- }- };-- const handleCreateD1 = async (name) => {- setWorking(true);- try {- await api.createCloudflareD1Database(zoneId, name);- toast.success(t('app.storagePanel.createdDatabase', 'Created database "{{name}}"', { name: name }));- await loadData();- } catch (err) {- toast.error(err.message);- throw err;- } finally {- setWorking(false);- }- };-- const handleDeleteD1 = async (database) => {- setWorking(true);- try {- await api.deleteCloudflareD1Database(zoneId, database.uuid);- toast.success(t('app.storagePanel.deleted', 'Deleted'));- await loadData();- } catch (err) {- toast.error(err.message);- } finally {- setWorking(false);- }- };-- if (loading) {- return <div className="cf-storage__loading">{t('app.storagePanel.loadingStorage', 'Loading storage…')}</div>;- }-- if (error) {- return (- <EmptyState- icon={HardDrive}- title={t('app.storagePanel.storageUnavailable', 'Storage unavailable')}- description={error}- />- );- }-- const errors = data.errors || {};-- return (- <div className="cf-storage">- <StorageSection- title={t('app.storagePanel.r2Buckets', 'R2 buckets')}- items={data.r2 || []}- error={errors.r2}- placeholder="my-bucket"- hint={t('app.storagePanel.r2IsS3CompatibleSoA', 'R2 is S3-compatible, so a bucket here can back ServerKit backups later.')}- renderItem={(b) => ({ key: b.name, label: b.name })}- onCreate={handleCreateR2}- onDelete={handleDeleteR2}- isAdmin={isAdmin}- busy={working}- />-- <StorageSection- title={t('app.storagePanel.kvNamespaces', 'KV namespaces')}- items={data.kv || []}- error={errors.kv}- placeholder="my-namespace"- renderItem={(n) => ({ key: n.id, label: n.title })}- onCreate={handleCreateKv}- onDelete={handleDeleteKv}- isAdmin={isAdmin}- busy={working}- />-- <StorageSection- title={t('app.storagePanel.d1Databases', 'D1 databases')}- items={data.d1 || []}- error={errors.d1}- placeholder="my-database"- renderItem={(d) => ({ key: d.uuid, label: d.name })}- onCreate={handleCreateD1}- onDelete={handleDeleteD1}- isAdmin={isAdmin}- busy={working}- />- </div>- );-}diff --git a/builtin-extensions/serverkit-cloudflare-ops/frontend/components/TunnelsPanel.jsx b/builtin-extensions/serverkit-cloudflare-ops/frontend/components/TunnelsPanel.jsxdeleted file mode 100644index f6dc8f6f..00000000--- a/builtin-extensions/serverkit-cloudflare-ops/frontend/components/TunnelsPanel.jsx+++ /dev/null@@ -1,362 +0,0 @@-import { useState, useEffect, useCallback } from 'react';-import { Network } from 'lucide-react';-import api from '../services/cloudflare';-import { Button, Input, Badge, EmptyState, useToast, copyToClipboard } from 'serverkit-sdk';-import { useTranslation } from 'react-i18next';--function InstallBox({ command }) {- const { t } = useTranslation();- const toast = useToast();-- if (!command) {- return <p className="cf-tunnels__hint">{t('app.tunnelsPanel.noInstallCommandAvailable', 'No install command available.')}</p>;- }-- const handleCopy = async () => {- if (await copyToClipboard(command)) toast.success(t('app.tunnelsPanel.copied', 'Copied'));- else toast.error(t('app.tunnelsPanel.couldNotCopyTheInstallCommand', 'Could not copy the install command'));- };-- return (- <div className="cf-tunnels__install">- <code className="cf-tunnels__cmd">{command}</code>- <Button size="sm" variant="outline" onClick={handleCopy}>- {t('common.actions.copy', 'Copy')}- </Button>- </div>- );-}--function TunnelRow({ zoneId, tunnel, isAdmin, onChanged }) {- const { t } = useTranslation();- const toast = useToast();-- const [install, setInstall] = useState(null);- const [expanded, setExpanded] = useState(false);- const [hostnames, setHostnames] = useState([]);- const [hostname, setHostname] = useState('');- const [service, setService] = useState('');- const [working, setWorking] = useState(false);-- const loadHostnames = useCallback(async () => {- try {- const res = await api.getCloudflareTunnelHostnames(zoneId, tunnel.id);- setHostnames(res.hostnames || []);- } catch (err) {- toast.error(err.message);- }- }, [zoneId, tunnel.id, toast]);-- const handleToggleInstall = async () => {- if (install) {- setInstall(null);- return;- }- setWorking(true);- try {- const res = await api.getCloudflareTunnelInstall(zoneId, tunnel.id);- setInstall(res.install || null);- } catch (err) {- toast.error(err.message);- } finally {- setWorking(false);- }- };-- const handleToggleHostnames = async () => {- const next = !expanded;- setExpanded(next);- if (next && hostnames.length === 0) {- await loadHostnames();- }- };-- const handleDelete = async () => {- setWorking(true);- try {- await api.deleteCloudflareTunnel(zoneId, tunnel.id);- toast.success(t('app.tunnelsPanel.deletedCloudflareTunnel', 'Deleted Cloudflare Tunnel "{{name}}"', { name: tunnel.name }));- onChanged();- } catch (err) {- toast.error(err.message);- } finally {- setWorking(false);- }- };-- const handleRemoveHostname = async (h) => {- setWorking(true);- try {- await api.removeCloudflareTunnelHostname(zoneId, tunnel.id, h.hostname);- toast.success(t('app.tunnelsPanel.hostnameRemoved', 'Hostname removed'));- await loadHostnames();- } catch (err) {- toast.error(err.message);- } finally {- setWorking(false);- }- };-- const handleAddHostname = async () => {- setWorking(true);- try {- const res = await api.addCloudflareTunnelHostname(- zoneId,- tunnel.id,- hostname,- service,- );- toast.success(t('app.tunnelsPanel.hostnameRouted', 'Hostname routed'));- if (res.dns && !res.dns.created) {- toast.error(t('app.tunnelsPanel.routeSetButTheDnsRecord', 'Route set, but the DNS record failed: ') + res.dns.error);- }- setHostname('');- setService('');- await loadHostnames();- } catch (err) {- toast.error(err.message);- } finally {- setWorking(false);- }- };-- const writeDisabled = !isAdmin || working;-- return (- <li className="cf-tunnels__item">- <div className="cf-tunnels__item-head">- <span className="cf-tunnels__name">{tunnel.name}</span>- <code className="cf-tunnels__meta">{tunnel.id.slice(0, 12)}…</code>- {tunnel.status && (- <span className="cf-tunnels__meta">{tunnel.status}</span>- )}- {tunnel.connections != null && (- <span className="cf-tunnels__meta">{tunnel.connections}</span>- )}- {tunnel.managed && <Badge variant="secondary">{t('common.labels.serverKit', 'ServerKit')}</Badge>}- </div>-- <div className="cf-tunnels__item-actions">- <Button- size="sm"- variant="outline"- onClick={handleToggleInstall}- disabled={!isAdmin || working}- >- {t('app.tunnelsPanel.installCommand', 'Install command')}- </Button>- <Button- size="sm"- variant="outline"- onClick={handleToggleHostnames}- disabled={working}- >- {t('app.tunnelsPanel.hostnames', 'Hostnames')}- </Button>- <Button- variant="destructive"- size="sm"- onClick={handleDelete}- disabled={writeDisabled}- >- {t('common.actions.delete', 'Delete')}- </Button>- </div>-- {install && <InstallBox command={install} />}-- {expanded && (- <div className="cf-tunnels__hostnames">- {hostnames.length === 0 ? (- <p className="cf-tunnels__hint">{t('app.tunnelsPanel.noPublicHostnamesRoutedYet', 'No public hostnames routed yet.')}</p>- ) : (- hostnames.map((h) => (- <div className="cf-tunnels__host" key={h.hostname}>- <span>- <code>{h.hostname}</code> → <code>{h.service}</code>- </span>- <Button- variant="destructive"- size="sm"- onClick={() => handleRemoveHostname(h)}- disabled={writeDisabled}- >- {t('common.actions.remove', 'Remove')}- </Button>- </div>- ))- )}-- <div className="cf-tunnels__host-add">- <Input- value={hostname}- placeholder="app.example.com"- onChange={(e) => setHostname(e.target.value)}- disabled={writeDisabled}- />- <Input- value={service}- placeholder="http://localhost:8080"- onChange={(e) => setService(e.target.value)}- disabled={writeDisabled}- />- <Button- size="sm"- onClick={handleAddHostname}- disabled={writeDisabled || !hostname.trim() || !service.trim()}- >- {t('common.actions.add', 'Add')}- </Button>- </div>- <p className="cf-tunnels__hint">- {t('app.tunnelsPanel.theHostnameShouldBeInsideThis', 'The hostname should be inside this zone\'s domain; a proxied DNS record is created automatically.')}- </p>- </div>- )}- </li>- );-}--export default function TunnelsPanel({ zoneId, isAdmin }) {- const { t } = useTranslation();- const toast = useToast();-- const [loading, setLoading] = useState(true);- const [error, setError] = useState(null);- const [tunnels, setTunnels] = useState([]);-- // Create form state- const [name, setName] = useState('');- const [creating, setCreating] = useState(false);- const [lastInstall, setLastInstall] = useState(null);-- const loadData = useCallback(async () => {- try {- const data = await api.getCloudflareTunnels(zoneId);- setTunnels(data.tunnels || []);- setError(null);- } catch (err) {- setError(err.message);- }- }, [zoneId]);-- useEffect(() => {- let active = true;- setLoading(true);- (async () => {- try {- const data = await api.getCloudflareTunnels(zoneId);- if (!active) return;- setTunnels(data.tunnels || []);- setError(null);- } catch (err) {- if (active) setError(err.message);- } finally {- if (active) setLoading(false);- }- })();- return () => {- active = false;- };- }, [zoneId]);-- const handleCreate = async () => {- setCreating(true);- try {- const res = await api.createCloudflareTunnel(zoneId, name);- toast.success(t('app.tunnelsPanel.createdTunnel', 'Created tunnel "{{name}}"', { name: name }));- setLastInstall({ name, install: res.install, token: res.token });- setName('');- await loadData();- } catch (err) {- toast.error(err.message);- } finally {- setCreating(false);- }- };-- if (loading) {- return <div className="cf-tunnels__loading">{t('app.tunnelsPanel.loadingCloudflareTunnels', 'Loading Cloudflare Tunnels…')}</div>;- }-- if (error) {- return (- <EmptyState- icon={Network}- title={t('app.tunnelsPanel.cloudflareTunnelsUnavailable', 'Cloudflare Tunnels unavailable')}- description={error}- />- );- }-- const createDisabled = !isAdmin || creating || !name.trim();-- return (- <div className="cf-tunnels">- {/* Create a Cloudflare Tunnel */}- <section className="cf-tunnels__section">- <h3 className="cf-tunnels__heading">{t('app.tunnelsPanel.createACloudflareTunnel', 'Create a Cloudflare Tunnel')}</h3>- <p className="cf-tunnels__hint">- {t('app.tunnelsPanel.aCloudflareTunnelExposesALocal', 'A Cloudflare Tunnel exposes a local or private service through Cloudflare\'s edge — no public IP or open ports required.')}- </p>-- <div className="cf-tunnels__field">- <label className="cf-tunnels__label">{t('common.labels.name', 'Name')}</label>- <Input- value={name}- placeholder="home-jellyfin"- onChange={(e) => setName(e.target.value)}- disabled={!isAdmin || creating}- />- </div>-- <div className="cf-tunnels__actions">- <Button onClick={handleCreate} disabled={createDisabled}>- {t('common.actions.create', 'Create')}- </Button>- </div>-- {lastInstall && (- <div className="cf-tunnels__install">- <p className="cf-tunnels__hint">- {t('app.tunnelsPanel.runThisOnceOnTheMachine', 'Run this once on the machine hosting your local service. The connector token is shown only now.')}- </p>- <InstallBox command={lastInstall.install} />- <Button- size="sm"- variant="ghost"- onClick={() => setLastInstall(null)}- >- {t('common.actions.dismiss', 'Dismiss')}- </Button>- </div>- )}- </section>-- {/* Cloudflare Tunnels list */}- <section className="cf-tunnels__section">- <h3 className="cf-tunnels__heading">{t('app.tunnelsPanel.cloudflareTunnels', 'Cloudflare Tunnels (')}{tunnels.length})</h3>-- {tunnels.length === 0 ? (- <EmptyState- icon={Network}- title={t('app.tunnelsPanel.noCloudflareTunnels', 'No Cloudflare Tunnels')}- description={t('app.tunnelsPanel.createOneAboveToExposeA', 'Create one above to expose a local service without a public IP.')}- />- ) : (- <ul className="cf-tunnels__list">- {tunnels.map((tunnel) => (- <TunnelRow- key={tunnel.id}- zoneId={zoneId}- tunnel={tunnel}- isAdmin={isAdmin}- onChanged={loadData}- />- ))}- </ul>- )}- </section>- </div>- );-}diff --git a/builtin-extensions/serverkit-cloudflare-ops/frontend/components/WorkersPanel.jsx b/builtin-extensions/serverkit-cloudflare-ops/frontend/components/WorkersPanel.jsxdeleted file mode 100644index 41b6ca10..00000000--- a/builtin-extensions/serverkit-cloudflare-ops/frontend/components/WorkersPanel.jsx+++ /dev/null@@ -1,253 +0,0 @@-import { useState, useEffect, useCallback } from 'react';-import { Zap } from 'lucide-react';-import api from '../services/cloudflare';-import { Button, Input, Textarea, Badge, EmptyState, useToast } from 'serverkit-sdk';-import { useTranslation } from 'react-i18next';--const STARTER_SCRIPT = `export default {- async fetch(request, env, ctx) {- return new Response("Hello from ServerKit + Cloudflare Workers!", {- headers: { "content-type": "text/plain" },- });- },-};`;--export default function WorkersPanel({ zoneId, isAdmin }) {- const { t } = useTranslation();- const toast = useToast();-- const [loading, setLoading] = useState(true);- const [error, setError] = useState(null);- const [workers, setWorkers] = useState([]);- const [routes, setRoutes] = useState([]);-- // Deploy form state- const [name, setName] = useState('');- const [code, setCode] = useState(STARTER_SCRIPT);- const [routePattern, setRoutePattern] = useState('');-- // Tracks any in-flight write so buttons can disable- const [deploying, setDeploying] = useState(false);- const [working, setWorking] = useState(false);-- const loadData = useCallback(async () => {- try {- const data = await api.getCloudflareWorkers(zoneId);- setWorkers(data.workers || []);- setRoutes(data.routes || []);- setError(null);- } catch (err) {- setError(err.message);- }- }, [zoneId]);-- useEffect(() => {- let active = true;- setLoading(true);- (async () => {- try {- const data = await api.getCloudflareWorkers(zoneId);- if (!active) return;- setWorkers(data.workers || []);- setRoutes(data.routes || []);- setError(null);- } catch (err) {- if (active) setError(err.message);- } finally {- if (active) setLoading(false);- }- })();- return () => {- active = false;- };- }, [zoneId]);-- const handleDeploy = async () => {- setDeploying(true);- try {- const res = await api.deployCloudflareWorker(zoneId, {- name,- code,- route_pattern: routePattern || undefined,- });- toast.success(t('app.workersPanel.deployedWorker', 'Deployed worker "{{name}}"', { name: name }));- if (res.route && !res.route.success) {- toast.error(t('app.workersPanel.workerDeployedButTheRouteFailed', 'Worker deployed, but the route failed: ') + res.route.error);- }- setName('');- setRoutePattern('');- await loadData();- } catch (err) {- toast.error(err.message);- } finally {- setDeploying(false);- }- };-- const handleDeleteWorker = async (worker) => {- setWorking(true);- try {- await api.deleteCloudflareWorker(zoneId, worker.name);- await loadData();- toast.success(t('app.workersPanel.deletedWorker', 'Deleted worker "{{name}}"', { name: worker.name }));- } catch (err) {- toast.error(err.message);- } finally {- setWorking(false);- }- };-- const handleDeleteRoute = async (route) => {- setWorking(true);- try {- await api.deleteCloudflareWorkerRoute(zoneId, route.id);- await loadData();- toast.success(t('app.workersPanel.routeRemoved', 'Route removed'));- } catch (err) {- toast.error(err.message);- } finally {- setWorking(false);- }- };-- if (loading) {- return <div className="cf-workers__loading">{t('app.workersPanel.loadingWorkers', 'Loading workers…')}</div>;- }-- if (error) {- return (- <EmptyState- icon={Zap}- title={t('app.workersPanel.workersUnavailable', 'Workers unavailable')}- description={error}- />- );- }-- const writeDisabled = !isAdmin || working;- const deployDisabled = !isAdmin || deploying || !name.trim() || !code.trim();-- return (- <div className="cf-workers">- {/* Deploy a Worker */}- <section className="cf-workers__section">- <h3 className="cf-workers__heading">{t('app.workersPanel.deployAWorker', 'Deploy a Worker')}</h3>-- <div className="cf-workers__field">- <label className="cf-workers__label">{t('common.labels.name', 'Name')}</label>- <Input- value={name}- placeholder="my-worker"- onChange={(e) => setName(e.target.value)}- disabled={!isAdmin || deploying}- />- </div>-- <div className="cf-workers__field">- <label className="cf-workers__label">{t('app.workersPanel.code', 'Code')}</label>- <Textarea- rows={8}- className="cf-workers__code"- value={code}- onChange={(e) => setCode(e.target.value)}- disabled={!isAdmin || deploying}- />- </div>-- <div className="cf-workers__field">- <label className="cf-workers__label">{t('app.workersPanel.routePatternOptional', 'Route pattern (optional)')}</label>- <Input- value={routePattern}- placeholder="example.com/*"- onChange={(e) => setRoutePattern(e.target.value)}- disabled={!isAdmin || deploying}- />- <p className="cf-workers__hint">- {t('app.workersPanel.attachesTheWorkerToThisDomain', 'Attaches the worker to this domain so matching traffic runs the script.')}- </p>- </div>-- <div className="cf-workers__actions">- <Button onClick={handleDeploy} disabled={deployDisabled}>- {t('app.workersPanel.deploy', 'Deploy')}- </Button>- </div>- </section>-- {/* Deployed workers */}- <section className="cf-workers__section">- <h3 className="cf-workers__heading">{t('app.workersPanel.workers', 'Workers (')}{workers.length})</h3>-- {workers.length === 0 ? (- <EmptyState- icon={Zap}- title={t('app.workersPanel.noWorkersDeployed', 'No Workers deployed')}- description={t('app.workersPanel.deployYourFirstEdgeScriptAbove', 'Deploy your first edge script above.')}- />- ) : (- <ul className="cf-workers__list">- {workers.map((worker) => (- <li className="cf-workers__item" key={worker.name}>- <div className="cf-workers__name">- <code>{worker.name}</code>- {worker.managed && (- <Badge variant="secondary">{t('common.labels.serverKit', 'ServerKit')}</Badge>- )}- {worker.modified_on && (- <span className="cf-workers__meta">- {new Date(worker.modified_on).toLocaleString()}- </span>- )}- </div>-- <div className="cf-workers__item-actions">- <Button- variant="destructive"- size="sm"- onClick={() => handleDeleteWorker(worker)}- disabled={writeDisabled}- >- {t('common.actions.delete', 'Delete')}- </Button>- </div>- </li>- ))}- </ul>- )}- </section>-- {/* Routes */}- <section className="cf-workers__section">- <h3 className="cf-workers__heading">{t('app.workersPanel.routes', 'Routes (')}{routes.length})</h3>-- {routes.length === 0 ? (- <p className="cf-workers__hint">- {t('app.workersPanel.noRoutesYetAddARoute', 'No routes yet. Add a route pattern when deploying to send traffic to a worker.')}- </p>- ) : (- <ul className="cf-workers__list">- {routes.map((route) => (- <li className="cf-workers__item" key={route.id}>- <div className="cf-workers__name">- <code>{route.pattern}</code>- <span className="cf-workers__meta">→ {route.script}</span>- </div>-- <div className="cf-workers__item-actions">- <Button- variant="destructive"- size="sm"- onClick={() => handleDeleteRoute(route)}- disabled={writeDisabled}- >- {t('common.actions.remove', 'Remove')}- </Button>- </div>- </li>- ))}- </ul>- )}- </section>- </div>- );-}diff --git a/builtin-extensions/serverkit-cloudflare-ops/frontend/index.jsx b/builtin-extensions/serverkit-cloudflare-ops/frontend/index.jsxdeleted file mode 100644index 19519290..00000000--- a/builtin-extensions/serverkit-cloudflare-ops/frontend/index.jsx+++ /dev/null@@ -1,26 +0,0 @@-// Cloudflare Zone Ops UI, contributed through the extension system. Both-// halves live in this extension: the zone-ops backend (the /api/v1/cloudflare-// blueprint + CloudflareService) under backend/, and the full page here-// (pages/CloudflareZoneSettings.jsx + the WAF/Workers/Tunnels/Storage panels-// + its own API client + SCSS). Imports go through 'serverkit-sdk' so the-// same source works baked in-tree (the panel's build-time glob) and as a-// runtime-ESM bundle once the extension leaves the tree (plan 52 Phase 2).-//-// DNS records and the Cloudflare connection itself stay core (they back-// /domains) — this page only adds the per-zone control panel, reached from-// the "Open in Cloudflare" button on a Cloudflare-managed domain.-//-// It's a single plain full-bleed route (cloudflare/zones/:zoneId, own-// PageTopbar + internal Settings/WAF/Workers/Tunnels/Storage tabs), so no-// tab-group shell or self-rendered sub-router is needed — unlike WordPress.-import './styles/cloudflare-zone.scss';--import CloudflareZoneSettings from './pages/CloudflareZoneSettings';--export function CloudflareZoneSettingsPage() {- return <CloudflareZoneSettings />;-}--// No default export on purpose: PluginLoader legacy-auto-renders any plugin-// default export globally (the page then runs with zoneId=undefined). The-// route contribution resolves the NAMED export via resolveComponent.diff --git a/builtin-extensions/serverkit-cloudflare-ops/frontend/pages/CloudflareZoneSettings.jsx b/builtin-extensions/serverkit-cloudflare-ops/frontend/pages/CloudflareZoneSettings.jsxdeleted file mode 100644index 645cc34f..00000000--- a/builtin-extensions/serverkit-cloudflare-ops/frontend/pages/CloudflareZoneSettings.jsx+++ /dev/null@@ -1,465 +0,0 @@-import { useState, useEffect, useCallback } from 'react';-import { useParams, Link } from 'react-router-dom';-import { Cloud, ShieldCheck, Lock, Gauge, Database, Wand2, Eraser, Flame, Zap, Network, HardDrive } from 'lucide-react';-import CloudflareWafPanel from '../components/CloudflareWafPanel';-import WorkersPanel from '../components/WorkersPanel';-import TunnelsPanel from '../components/TunnelsPanel';-import StoragePanel from '../components/StoragePanel';-import api from '../services/cloudflare';-import {- PageLayout, Tabs, TabsList, TabsTrigger, TabsContent, Switch, Button,- Badge, Textarea, Select, SelectTrigger, SelectContent, SelectItem,- SelectValue, PageLoader, EmptyState, ConfirmDialog, useToast, useAuth,-} from 'serverkit-sdk';-import { useTranslation } from 'react-i18next';--// HSTS max-age presets (seconds). 0 disables the max-age while keeping HSTS off.-const HSTS_MAX_AGE = [- { value: 0, labelKey: 'app.cloudflareZoneSettings.off', label: 'Off' },- { value: 86400, labelKey: 'app.cloudflareZoneSettings.1Day', label: '1 day' },- { value: 604800, labelKey: 'app.cloudflareZoneSettings.1Week', label: '1 week' },- { value: 2592000, labelKey: 'app.cloudflareZoneSettings.1Month', label: '1 month' },- { value: 15552000, labelKey: 'app.cloudflareZoneSettings.6Months', label: '6 months' },- { value: 31536000, labelKey: 'app.cloudflareZoneSettings.1Year', label: '1 year' },- { value: 63072000, labelKey: 'app.cloudflareZoneSettings.2Years', label: '2 years' },-];--const TAB_ICONS = {- ssl: <Lock size={15} />,- speed: <Gauge size={15} />,- caching: <Database size={15} />,- security: <ShieldCheck size={15} />,-};--const CloudflareZoneSettings = () => {- const { t } = useTranslation();- const { zoneId } = useParams();- const toast = useToast();- const { user } = useAuth();- const isAdmin = !!user?.is_admin;-- const [loading, setLoading] = useState(true);- const [error, setError] = useState(null);- const [zone, setZone] = useState(null);- const [groups, setGroups] = useState([]);- const [settings, setSettings] = useState({});- const [saving, setSaving] = useState(null); // setting id in flight- const [applying, setApplying] = useState(false);- const [purgeUrls, setPurgeUrls] = useState('');- const [purging, setPurging] = useState(false);- const [confirmPurgeAll, setConfirmPurgeAll] = useState(false);-- const loadSettings = useCallback(async () => {- setLoading(true);- setError(null);- try {- const data = await api.getCloudflareZoneSettings(zoneId);- setZone(data.zone || null);- setGroups(data.groups || []);- setSettings(data.settings || {});- } catch (err) {- setError(err.message || 'Failed to load Cloudflare settings');- } finally {- setLoading(false);- }- }, [zoneId]);-- useEffect(() => { loadSettings(); }, [loadSettings]);-- // Optimistically reflect the change, PATCH it, and reload truth on failure so- // the UI never drifts from Cloudflare.- const save = useCallback(async (settingId, value) => {- setSaving(settingId);- setSettings(prev => ({ ...prev, [settingId]: { ...(prev[settingId] || {}), value } }));- try {- await api.updateCloudflareZoneSetting(zoneId, settingId, value);- toast.success(t('app.cloudflareZoneSettings.settingSaved', 'Setting saved'));- } catch (err) {- toast.error(err.message || t('app.cloudflareZoneSettings.failedToSaveSetting', 'Failed to save setting'));- loadSettings();- } finally {- setSaving(null);- }- }, [zoneId, toast, loadSettings]);-- const handleApplyPreset = async () => {- setApplying(true);- try {- const res = await api.applyCloudflareSettingsPreset(zoneId);- const failed = (res.results || []).filter(r => !r.success);- if (failed.length === 0) {- toast.success(t('app.cloudflareZoneSettings.appliedRecommendedHardeningSettings', 'Applied recommended hardening ({{applied}} settings)', { applied: res.applied }));- } else {- toast.info(t('app.cloudflareZoneSettings.appliedNeedAHigherCloudflarePlan', 'Applied {{applied}}/{{total}}. {{length}} need a higher Cloudflare plan.', { applied: res.applied, total: res.total, length: failed.length }));- }- loadSettings();- } catch (err) {- toast.error(err.message || t('app.cloudflareZoneSettings.failedToApplyPreset', 'Failed to apply preset'));- } finally {- setApplying(false);- }- };-- const handlePurgeEverything = async () => {- setConfirmPurgeAll(false);- setPurging(true);- try {- await api.purgeCloudflareCache(zoneId, { purge_everything: true });- toast.success(t('app.cloudflareZoneSettings.purgedTheEntireCache', 'Purged the entire cache'));- } catch (err) {- toast.error(err.message || t('app.cloudflareZoneSettings.failedToPurgeCache', 'Failed to purge cache'));- } finally {- setPurging(false);- }- };-- const handlePurgeFiles = async () => {- const files = purgeUrls.split('\n').map(u => u.trim()).filter(Boolean);- if (files.length === 0) {- toast.error(t('app.cloudflareZoneSettings.enterAtLeastOneUrlTo', 'Enter at least one URL to purge'));- return;- }- setPurging(true);- try {- const res = await api.purgeCloudflareCache(zoneId, { files });- const n = res.purged?.files?.length ?? files.length;- toast.success(t('app.cloudflareZoneSettings.purgedUrlFromCache', 'Purged {{n}} URL{{value}} from cache', { n: n, value: n === 1 ? '' : 's' }));- setPurgeUrls('');- } catch (err) {- toast.error(err.message || t('app.cloudflareZoneSettings.failedToPurgeUrls', 'Failed to purge URLs'));- } finally {- setPurging(false);- }- };-- if (loading) return <PageLoader />;-- const crumbs = (- <span className="cf-crumbs">- <Link to="/dns">{t('app.cloudflareZoneSettings.dnsZones', 'DNS Zones')}</Link>- <span className="cf-crumbs__sep">/</span>- <span className="cf-crumbs__cur">{zone?.domain || `Zone ${zoneId}`}</span>- <span className="cf-crumbs__sep">/</span>- <span className="cf-crumbs__cur">{t('app.cloudflareZoneSettings.cloudflare', 'Cloudflare')}</span>- </span>- );-- if (error) {- return (- <PageLayout- className="cf-zone"- contentClassName="app-detail-page app-detail-page--wide"- icon={<Cloud size={18} />}- title={crumbs}- >- <div className="cf-zone__body">- <EmptyState- icon={Cloud}- title={t('app.cloudflareZoneSettings.cloudflareSettingsUnavailable', 'Cloudflare settings unavailable')}- description={error}- />- <div className="cf-zone__error-actions">- <Button variant="outline" onClick={loadSettings}>{t('common.actions.retry', 'Retry')}</Button>- <Link to="/dns"><Button variant="ghost">{t('app.cloudflareZoneSettings.backToDnsZones', 'Back to DNS Zones')}</Button></Link>- </div>- </div>- </PageLayout>- );- }-- const tabGroups = groups.filter(g => g.settings?.length);- const firstTab = tabGroups[0]?.key || 'actions';-- return (- <PageLayout- className="cf-zone"- contentClassName="app-detail-page app-detail-page--wide"- icon={<Cloud size={18} />}- title={crumbs}- meta={zone?.provider_zone_id ? `Zone ${zone.provider_zone_id}` : undefined}- >- <div className="cf-zone__body">- <Tabs defaultValue={firstTab} className="cf-zone__tabs">- <TabsList>- {tabGroups.map(g => (- <TabsTrigger key={g.key} value={g.key}>- {TAB_ICONS[g.key]}{g.label}- </TabsTrigger>- ))}- <TabsTrigger value="waf"><Flame size={15} />WAF</TabsTrigger>- <TabsTrigger value="workers"><Zap size={15} />{t('app.cloudflareZoneSettings.workers', 'Workers')}</TabsTrigger>- <TabsTrigger value="tunnels"><Network size={15} />{t('app.cloudflareZoneSettings.tunnels', 'Tunnels')}</TabsTrigger>- <TabsTrigger value="storage"><HardDrive size={15} />{t('common.labels.storage', 'Storage')}</TabsTrigger>- <TabsTrigger value="actions"><Wand2 size={15} />{t('common.labels.actions', 'Actions')}</TabsTrigger>- </TabsList>-- {tabGroups.map(g => (- <TabsContent key={g.key} value={g.key}>- <div className="cf-panel">- {g.settings.map(setting => (- <SettingRow- key={setting.id}- setting={setting}- state={settings[setting.id]}- saving={saving === setting.id}- disabled={!isAdmin}- onSave={save}- />- ))}- </div>- </TabsContent>- ))}-- <TabsContent value="waf">- <div className="cf-panel">- <CloudflareWafPanel zoneId={zoneId} isAdmin={isAdmin} />- </div>- </TabsContent>-- <TabsContent value="workers">- <div className="cf-panel">- <WorkersPanel zoneId={zoneId} isAdmin={isAdmin} />- </div>- </TabsContent>-- <TabsContent value="tunnels">- <div className="cf-panel">- <TunnelsPanel zoneId={zoneId} isAdmin={isAdmin} />- </div>- </TabsContent>-- <TabsContent value="storage">- <div className="cf-panel">- <StoragePanel zoneId={zoneId} isAdmin={isAdmin} />- </div>- </TabsContent>-- <TabsContent value="actions">- <div className="cf-panel cf-actions">- <div className="cf-action">- <div className="cf-action__text">- <h3>{t('app.cloudflareZoneSettings.applyRecommendedHardening', 'Apply recommended hardening')}</h3>- <p>- {t('app.cloudflareZoneSettings.setsFullStrictSslAlwaysUse', 'Sets Full (strict) SSL, Always Use HTTPS, HSTS (6 months), a TLS 1.2 floor with TLS 1.3, Brotli, HTTP/3, and a 4-hour browser cache. Settings your plan doesn\'t allow are skipped.')}- </p>- </div>- <Button onClick={handleApplyPreset} disabled={applying || !isAdmin}>- {applying ? 'Applying…' : 'Apply preset'}- </Button>- </div>- {!isAdmin && (- <p className="cf-actions__note">- {t('app.cloudflareZoneSettings.changingCloudflareSettingsRequiresAnAdmin', 'Changing Cloudflare settings requires an admin account.')}- </p>- )}- </div>-- <div className="cf-panel cf-actions">- <div className="cf-action">- <div className="cf-action__text">- <h3><Eraser size={15} /> {t('app.cloudflareZoneSettings.purgeCache', 'Purge cache')}</h3>- <p>- {t('app.cloudflareZoneSettings.clearCloudflareSCachedCopyOf', 'Clear Cloudflare\'s cached copy of your site so visitors get fresh content. Purge everything, or list specific URLs below.')}- </p>- </div>- <Button- variant="destructive"- onClick={() => setConfirmPurgeAll(true)}- disabled={purging || !isAdmin}- >- {purging ? 'Purging…' : 'Purge everything'}- </Button>- </div>- <div className="cf-purge-files">- <label htmlFor="cf-purge-urls" className="cf-purge-files__label">- {t('app.cloudflareZoneSettings.purgeSpecificUrlsOnePerLine', 'Purge specific URLs (one per line, up to 30)')}- </label>- <Textarea- id="cf-purge-urls"- rows={4}- placeholder={'https://example.com/style.css\nhttps://example.com/app.js'}- value={purgeUrls}- disabled={purging || !isAdmin}- onChange={(e) => setPurgeUrls(e.target.value)}- />- <div className="cf-purge-files__actions">- <Button- variant="outline"- onClick={handlePurgeFiles}- disabled={purging || !isAdmin || !purgeUrls.trim()}- >- {t('app.cloudflareZoneSettings.purgeUrls', 'Purge URLs')}- </Button>- </div>- </div>- </div>- </TabsContent>- </Tabs>- </div>-- {confirmPurgeAll && (- <ConfirmDialog- isOpen- title={t('app.cloudflareZoneSettings.purgeEntireCache', 'Purge entire cache')}- message={t('app.cloudflareZoneSettings.clearCloudflareSEntireCacheFor', 'Clear Cloudflare\'s entire cache for {{value}}?', { value: zone?.domain || 'this zone' })- + t('app.cloudflareZoneSettings.theNextVisitToEachPage', 'The next visit to each page will be served from your origin until ')- + t('app.cloudflareZoneSettings.itReCachesThisIsSafe', 'it re-caches. This is safe but can briefly increase origin load.')}- confirmText={t('app.cloudflareZoneSettings.purgeEverything', 'Purge everything')}- onConfirm={handlePurgeEverything}- onCancel={() => setConfirmPurgeAll(false)}- variant="danger"- />- )}- </PageLayout>- );-};--// A single setting row — label + help on the left, the control on the right.-// Reads the current value/editability from the live settings state; renders the-// control declaratively from the setting's `type`.-function SettingRow({ setting, state, saving, disabled, onSave }) {- const { t } = useTranslation();- const present = state !== undefined && state !== null;- const editable = present ? state.editable !== false : false;- const locked = disabled || !editable || saving;-- return (- <div className="cf-setting">- <div className="cf-setting__info">- <span className="cf-setting__label">{setting.label}</span>- {setting.help && <span className="cf-setting__help">{setting.help}</span>}- {!present && (- <Badge variant="secondary" className="cf-setting__badge">- {t('app.cloudflareZoneSettings.notAvailableOnThisZone', 'Not available on this zone')}- </Badge>- )}- {present && !editable && (- <Badge variant="secondary" className="cf-setting__badge">- {t('app.cloudflareZoneSettings.lockedByYourCloudflarePlan', 'Locked by your Cloudflare plan')}- </Badge>- )}- </div>- <div className="cf-setting__control">- <SettingControl- setting={setting}- value={present ? state.value : undefined}- locked={locked || !present}- onSave={onSave}- />- </div>- </div>- );-}--function SettingControl({ setting, value, locked, onSave }) {- if (setting.type === 'toggle') {- return (- <Switch- checked={value === 'on'}- disabled={locked}- onCheckedChange={(checked) => onSave(setting.id, checked ? 'on' : 'off')}- />- );- }-- if (setting.type === 'select') {- const current = value === undefined || value === null ? '' : String(value);- return (- <Select- value={current}- disabled={locked}- onValueChange={(v) => {- const opt = setting.options.find(o => String(o.value) === v);- onSave(setting.id, opt ? opt.value : v);- }}- >- <SelectTrigger className="cf-setting__select"><SelectValue /></SelectTrigger>- <SelectContent>- {setting.options.map(o => (- <SelectItem key={String(o.value)} value={String(o.value)}>{o.label}</SelectItem>- ))}- </SelectContent>- </Select>- );- }-- if (setting.type === 'hsts') {- return <HstsControl value={value} locked={locked} onSave={onSave} settingId={setting.id} />;- }-- return null;-}--// HSTS is a compound object setting; editing any field re-sends the whole-// strict_transport_security object so the others are preserved.-function HstsControl({ value, locked, onSave, settingId }) {- const { t } = useTranslation();- const sts = (value && value.strict_transport_security) || {};- const enabled = !!sts.enabled;-- const patch = (changes) => {- const next = {- enabled: sts.enabled || false,- max_age: sts.max_age || 0,- include_subdomains: sts.include_subdomains || false,- preload: sts.preload || false,- nosniff: sts.nosniff !== undefined ? sts.nosniff : true,- ...changes,- };- onSave(settingId, { strict_transport_security: next });- };-- return (- <div className="cf-hsts">- <div className="cf-hsts__row">- <span>{t('app.cloudflareZoneSettings.enabled', 'Enabled')}</span>- <Switch- checked={enabled}- disabled={locked}- onCheckedChange={(checked) => patch({- enabled: checked,- // Give a sane max-age when first enabling.- max_age: checked && !sts.max_age ? 15552000 : sts.max_age || 0,- })}- />- </div>- {enabled && (- <>- <div className="cf-hsts__row">- <span>{t('app.cloudflareZoneSettings.maxAge', 'Max age')}</span>- <Select- value={String(sts.max_age || 0)}- disabled={locked}- onValueChange={(v) => patch({ max_age: Number(v) })}- >- <SelectTrigger className="cf-setting__select"><SelectValue /></SelectTrigger>- <SelectContent>- {HSTS_MAX_AGE.map(o => (- <SelectItem key={o.value} value={String(o.value)}>{o.label}</SelectItem>- ))}- </SelectContent>- </Select>- </div>- <div className="cf-hsts__row">- <span>{t('app.cloudflareZoneSettings.includeSubdomains', 'Include subdomains')}</span>- <Switch- checked={!!sts.include_subdomains}- disabled={locked}- onCheckedChange={(checked) => patch({ include_subdomains: checked })}- />- </div>- <div className="cf-hsts__row">- <span>{t('app.cloudflareZoneSettings.preload', 'Preload')}</span>- <Switch- checked={!!sts.preload}- disabled={locked}- onCheckedChange={(checked) => patch({ preload: checked })}- />- </div>- </>- )}- </div>- );-}--export default CloudflareZoneSettings;diff --git a/builtin-extensions/serverkit-cloudflare-ops/frontend/services/cloudflare.js b/builtin-extensions/serverkit-cloudflare-ops/frontend/services/cloudflare.jsdeleted file mode 100644index b872628e..00000000--- a/builtin-extensions/serverkit-cloudflare-ops/frontend/services/cloudflare.js+++ /dev/null@@ -1,220 +0,0 @@-// Cloudflare operations — zone settings (SSL/TLS, Speed, Caching, Security) and-// one-click hardening, layered on the existing Cloudflare DNS connection. Zones-// are addressed by their ServerKit DNS zone id (same as the /dns API).-//-// The extension's own /api/v1/cloudflare client, built on the panel's-// ApiClient via the SDK singleton — moved out of the host's services/api/-// with the zone-ops surface (plan 52 Phase 2). The DNS-record layer and the-// Cloudflare connection itself stay core (they back /domains).-import { api } from 'serverkit-sdk';--async function getCloudflareZoneSettings(zoneId) {- return api.request(`/cloudflare/zones/${zoneId}/settings`);-}--async function getCloudflareZoneSetting(zoneId, settingId) {- return api.request(`/cloudflare/zones/${zoneId}/settings/${settingId}`);-}--async function updateCloudflareZoneSetting(zoneId, settingId, value) {- return api.request(`/cloudflare/zones/${zoneId}/settings/${settingId}`, {- method: 'PATCH',- body: { value },- });-}--async function applyCloudflareSettingsPreset(zoneId) {- return api.request(`/cloudflare/zones/${zoneId}/settings/apply-preset`, {- method: 'POST',- });-}--// Purge the zone's Cloudflare cache. payload is { purge_everything: true } or-// { files: [...] } (and on Enterprise, hosts/prefixes/tags).-async function purgeCloudflareCache(zoneId, payload) {- return api.request(`/cloudflare/zones/${zoneId}/purge-cache`, {- method: 'POST',- body: payload,- });-}--// WAF custom firewall rules (http_request_firewall_custom phase).-async function getCloudflareWafRules(zoneId) {- return api.request(`/cloudflare/zones/${zoneId}/waf/rules`);-}--async function addCloudflareWafRule(zoneId, rule) {- return api.request(`/cloudflare/zones/${zoneId}/waf/rules`, {- method: 'POST',- body: rule,- });-}--async function applyCloudflareWafPreset(zoneId, presetKey, params = {}) {- return api.request(`/cloudflare/zones/${zoneId}/waf/presets/${presetKey}`, {- method: 'POST',- body: { params },- });-}--async function updateCloudflareWafRule(zoneId, rulesetId, ruleId, fields) {- return api.request(`/cloudflare/zones/${zoneId}/waf/rulesets/${rulesetId}/rules/${ruleId}`, {- method: 'PATCH',- body: fields,- });-}--async function deleteCloudflareWafRule(zoneId, rulesetId, ruleId) {- return api.request(`/cloudflare/zones/${zoneId}/waf/rulesets/${rulesetId}/rules/${ruleId}`, {- method: 'DELETE',- });-}--// Workers (edge hosting). Account is resolved from the zone server-side.-async function getCloudflareWorkers(zoneId) {- return api.request(`/cloudflare/zones/${zoneId}/workers`);-}--async function deployCloudflareWorker(zoneId, payload) {- return api.request(`/cloudflare/zones/${zoneId}/workers`, {- method: 'POST',- body: payload,- });-}--async function deleteCloudflareWorker(zoneId, name) {- return api.request(`/cloudflare/zones/${zoneId}/workers/${encodeURIComponent(name)}`, {- method: 'DELETE',- });-}--async function addCloudflareWorkerRoute(zoneId, pattern, script) {- return api.request(`/cloudflare/zones/${zoneId}/workers/routes`, {- method: 'POST',- body: { pattern, script },- });-}--async function deleteCloudflareWorkerRoute(zoneId, routeId) {- return api.request(`/cloudflare/zones/${zoneId}/workers/routes/${routeId}`, {- method: 'DELETE',- });-}--// Cloudflare Tunnels (cloudflared) — expose a local service through the edge.-async function getCloudflareTunnels(zoneId) {- return api.request(`/cloudflare/zones/${zoneId}/tunnels`);-}--async function createCloudflareTunnel(zoneId, name) {- return api.request(`/cloudflare/zones/${zoneId}/tunnels`, {- method: 'POST',- body: { name },- });-}--async function deleteCloudflareTunnel(zoneId, tunnelId) {- return api.request(`/cloudflare/zones/${zoneId}/tunnels/${tunnelId}`, {- method: 'DELETE',- });-}--async function getCloudflareTunnelInstall(zoneId, tunnelId) {- return api.request(`/cloudflare/zones/${zoneId}/tunnels/${tunnelId}/install`);-}--async function getCloudflareTunnelHostnames(zoneId, tunnelId) {- return api.request(`/cloudflare/zones/${zoneId}/tunnels/${tunnelId}/hostnames`);-}--async function addCloudflareTunnelHostname(zoneId, tunnelId, hostname, service) {- return api.request(`/cloudflare/zones/${zoneId}/tunnels/${tunnelId}/hostnames`, {- method: 'POST',- body: { hostname, service },- });-}--async function removeCloudflareTunnelHostname(zoneId, tunnelId, hostname) {- return api.request(`/cloudflare/zones/${zoneId}/tunnels/${tunnelId}/hostnames`, {- method: 'DELETE',- body: { hostname },- });-}--// Developer platform — R2 buckets, KV namespaces, D1 databases (account-scoped).-async function getCloudflareStorage(zoneId) {- return api.request(`/cloudflare/zones/${zoneId}/storage`);-}--async function createCloudflareR2Bucket(zoneId, name) {- return api.request(`/cloudflare/zones/${zoneId}/storage/r2`, {- method: 'POST',- body: { name },- });-}--async function deleteCloudflareR2Bucket(zoneId, name) {- return api.request(`/cloudflare/zones/${zoneId}/storage/r2/${encodeURIComponent(name)}`, {- method: 'DELETE',- });-}--async function createCloudflareKvNamespace(zoneId, title) {- return api.request(`/cloudflare/zones/${zoneId}/storage/kv`, {- method: 'POST',- body: { title },- });-}--async function deleteCloudflareKvNamespace(zoneId, namespaceId) {- return api.request(`/cloudflare/zones/${zoneId}/storage/kv/${namespaceId}`, {- method: 'DELETE',- });-}--async function createCloudflareD1Database(zoneId, name) {- return api.request(`/cloudflare/zones/${zoneId}/storage/d1`, {- method: 'POST',- body: { name },- });-}--async function deleteCloudflareD1Database(zoneId, databaseId) {- return api.request(`/cloudflare/zones/${zoneId}/storage/d1/${databaseId}`, {- method: 'DELETE',- });-}--const cloudflareApi = {- getCloudflareZoneSettings,- getCloudflareZoneSetting,- updateCloudflareZoneSetting,- applyCloudflareSettingsPreset,- purgeCloudflareCache,- getCloudflareWafRules,- addCloudflareWafRule,- applyCloudflareWafPreset,- updateCloudflareWafRule,- deleteCloudflareWafRule,- getCloudflareWorkers,- deployCloudflareWorker,- deleteCloudflareWorker,- addCloudflareWorkerRoute,- deleteCloudflareWorkerRoute,- getCloudflareTunnels,- createCloudflareTunnel,- deleteCloudflareTunnel,- getCloudflareTunnelInstall,- getCloudflareTunnelHostnames,- addCloudflareTunnelHostname,- removeCloudflareTunnelHostname,- getCloudflareStorage,- createCloudflareR2Bucket,- deleteCloudflareR2Bucket,- createCloudflareKvNamespace,- deleteCloudflareKvNamespace,- createCloudflareD1Database,- deleteCloudflareD1Database,-};--export default cloudflareApi;diff --git a/builtin-extensions/serverkit-cloudflare-ops/frontend/styles/cloudflare-zone.scss b/builtin-extensions/serverkit-cloudflare-ops/frontend/styles/cloudflare-zone.scssdeleted file mode 100644index d0086ff3..00000000--- a/builtin-extensions/serverkit-cloudflare-ops/frontend/styles/cloudflare-zone.scss+++ /dev/null@@ -1,572 +0,0 @@-// Compiled through the extension's module graph (imported by index.jsx).-// The host's design-token partial is imported via a sync-safe relative-// path — the baked copy lives at frontend/src/plugins/serverkit-cloudflare-ops/,-// so this resolves to frontend/src/styles/_variables.scss.-@import '../../../styles/variables';--// Cloudflare zone settings — detail page reached from a Cloudflare-managed DNS-// zone. Full-bleed top bar (PageTopbar) + tabbed setting groups.--.cf-zone {- &__body {- padding: $spacing-lg;- max-width: 880px;- }-- &__tabs {- margin-top: $spacing-sm;- }-- &__error-actions {- display: flex;- justify-content: center;- gap: $spacing-sm;- margin-top: $spacing-md;- }-}--// Breadcrumb in the top-bar title slot (mirrors the service-detail crumbs).-.cf-crumbs {- display: inline-flex;- align-items: center;- gap: $spacing-xs;- font-size: 0.95rem;-- a {- color: $text-secondary;- text-decoration: none;-- &:hover { color: $primary-color; }- }-- &__sep { color: $text-tertiary; }- &__cur { color: $text-primary; font-weight: 600; }-}--.cf-panel {- background: $card-bg;- border: 1px solid $border-color;- border-radius: $radius-lg;- padding: $spacing-xs $spacing-lg;- margin-top: $spacing-md;-}--// One setting: label/help on the left, control hugging the right.-.cf-setting {- display: flex;- align-items: flex-start;- justify-content: space-between;- gap: $spacing-lg;- padding: $spacing-md 0;- border-bottom: 1px solid $border-color;-- &:last-child { border-bottom: none; }-- &__info {- display: flex;- flex-direction: column;- gap: 4px;- min-width: 0;- }-- &__label {- font-weight: 600;- color: $text-primary;- }-- &__help {- font-size: 0.85rem;- color: $text-muted;- max-width: 52ch;- line-height: 1.4;- }-- &__badge {- align-self: flex-start;- margin-top: 2px;- }-- &__control {- flex-shrink: 0;- display: flex;- align-items: center;- min-height: 32px;- }-- &__select {- min-width: 200px;- }-}--// HSTS compound control — a small stack of rows.-.cf-hsts {- display: flex;- flex-direction: column;- gap: $spacing-sm;- min-width: 240px;-- &__row {- display: flex;- align-items: center;- justify-content: space-between;- gap: $spacing-md;- font-size: 0.88rem;- color: $text-secondary;- }-}--.cf-actions {- & + & { margin-top: $spacing-md; }-- .cf-action {- display: flex;- align-items: center;- justify-content: space-between;- gap: $spacing-lg;- padding: $spacing-md 0;-- &__text {- h3 {- margin: 0 0 4px;- font-size: 1rem;- display: inline-flex;- align-items: center;- gap: $spacing-xs;- }- p { margin: 0; color: $text-muted; font-size: 0.88rem; max-width: 60ch; line-height: 1.5; }- }- }-- &__note {- margin: $spacing-sm 0 0;- color: $text-muted;- font-size: 0.85rem;- }-}--.cf-purge-files {- border-top: 1px solid $border-color;- padding-top: $spacing-md;-- &__label {- display: block;- font-size: 0.85rem;- color: $text-secondary;- margin-bottom: $spacing-xs;- }-- &__actions {- display: flex;- justify-content: flex-end;- margin-top: $spacing-sm;- }-}--// WAF tab — preset picker, custom-rule form, and the active-rules list.-.cf-waf {- &__loading {- padding: $spacing-lg;- color: $text-muted;- }-- &__section {- padding: $spacing-md 0;- border-bottom: 1px solid $border-color;-- &:last-child { border-bottom: none; }- }-- &__heading {- margin: 0 0 4px;- font-size: 0.95rem;- }-- &__hint {- margin: 0 0 $spacing-sm;- color: $text-muted;- font-size: 0.85rem;- }-- &__field {- margin-bottom: $spacing-sm;- }-- &__label {- display: block;- font-size: 0.82rem;- color: $text-secondary;- margin-bottom: 4px;- }-- &__select {- max-width: 320px;- }-- &__preset-desc {- margin: 0 0 $spacing-sm;- color: $text-secondary;- font-size: 0.85rem;- line-height: 1.4;- }-- &__params {- display: flex;- flex-wrap: wrap;- gap: $spacing-md;- }-- &__actions {- display: flex;- justify-content: flex-end;- margin-top: $spacing-sm;- }-- &__list {- list-style: none;- margin: $spacing-sm 0 0;- padding: 0;- display: flex;- flex-direction: column;- gap: $spacing-sm;- }-- &__rule {- display: flex;- align-items: flex-start;- justify-content: space-between;- gap: $spacing-md;- padding: $spacing-md;- background: $bg-elevated;- border: 1px solid $border-color;- border-radius: $radius-md;- }-- &__rule-main {- min-width: 0;- flex: 1;- }-- &__rule-head {- display: flex;- align-items: center;- gap: $spacing-sm;- margin-bottom: $spacing-xs;- }-- &__rule-desc {- font-weight: 600;- color: $text-primary;- }-- &__rule-expr {- display: block;- font-family: $font-mono;- font-size: 0.8rem;- color: $text-secondary;- background: $bg-code;- padding: $spacing-xs $spacing-sm;- border-radius: $radius-sm;- overflow-x: auto;- white-space: pre-wrap;- word-break: break-word;- }-- &__rule-actions {- display: flex;- align-items: center;- gap: $spacing-sm;- flex-shrink: 0;- }-}--// Workers tab — deploy form + script/route lists.-.cf-workers {- &__loading {- padding: $spacing-lg;- color: $text-muted;- }-- &__section {- padding: $spacing-md 0;- border-bottom: 1px solid $border-color;-- &:last-child { border-bottom: none; }- }-- &__heading {- margin: 0 0 $spacing-sm;- font-size: 0.95rem;- }-- &__hint {- margin: $spacing-xs 0 0;- color: $text-muted;- font-size: 0.82rem;- }-- &__field {- margin-bottom: $spacing-sm;- }-- &__label {- display: block;- font-size: 0.82rem;- color: $text-secondary;- margin-bottom: 4px;- }-- &__code {- font-family: $font-mono;- font-size: 0.82rem;- }-- &__actions {- display: flex;- justify-content: flex-end;- }-- &__list {- list-style: none;- margin: $spacing-sm 0 0;- padding: 0;- display: flex;- flex-direction: column;- gap: $spacing-xs;- }-- &__item {- display: flex;- align-items: center;- justify-content: space-between;- gap: $spacing-md;- padding: $spacing-sm $spacing-md;- background: $bg-elevated;- border: 1px solid $border-color;- border-radius: $radius-md;- }-- &__name {- display: flex;- align-items: center;- gap: $spacing-sm;- min-width: 0;- flex-wrap: wrap;-- code {- font-family: $font-mono;- font-size: 0.85rem;- color: $text-primary;- }- }-- &__meta {- color: $text-muted;- font-size: 0.8rem;- }-- &__item-actions {- flex-shrink: 0;- }-}--// Tunnels tab — create form, install command box, tunnel list with hostnames.-.cf-tunnels {- &__loading {- padding: $spacing-lg;- color: $text-muted;- }-- &__section {- padding: $spacing-md 0;- border-bottom: 1px solid $border-color;-- &:last-child { border-bottom: none; }- }-- &__heading {- margin: 0 0 $spacing-sm;- font-size: 0.95rem;- }-- &__hint {- margin: $spacing-xs 0 0;- color: $text-muted;- font-size: 0.82rem;- }-- &__field {- margin-bottom: $spacing-sm;- max-width: 420px;- }-- &__label {- display: block;- font-size: 0.82rem;- color: $text-secondary;- margin-bottom: 4px;- }-- &__actions {- display: flex;- justify-content: flex-start;- }-- &__install {- margin-top: $spacing-md;- padding: $spacing-md;- background: $bg-code;- border: 1px solid $border-color;- border-radius: $radius-md;- display: flex;- flex-direction: column;- gap: $spacing-sm;- align-items: flex-start;- }-- &__cmd {- display: block;- width: 100%;- font-family: $font-mono;- font-size: 0.8rem;- color: $text-primary;- white-space: pre-wrap;- word-break: break-all;- }-- &__list {- list-style: none;- margin: $spacing-sm 0 0;- padding: 0;- display: flex;- flex-direction: column;- gap: $spacing-sm;- }-- &__item {- padding: $spacing-md;- background: $bg-elevated;- border: 1px solid $border-color;- border-radius: $radius-md;- }-- &__item-head {- display: flex;- align-items: center;- gap: $spacing-sm;- flex-wrap: wrap;- }-- &__name {- font-weight: 600;- color: $text-primary;- }-- &__meta {- color: $text-muted;- font-size: 0.8rem;- font-family: $font-mono;- }-- &__item-actions {- display: flex;- gap: $spacing-sm;- margin-top: $spacing-sm;- flex-wrap: wrap;- }-- &__hostnames {- margin-top: $spacing-md;- padding-top: $spacing-md;- border-top: 1px solid $border-color;- display: flex;- flex-direction: column;- gap: $spacing-sm;- }-- &__host {- display: flex;- align-items: center;- justify-content: space-between;- gap: $spacing-md;-- code {- font-family: $font-mono;- font-size: 0.82rem;- color: $text-secondary;- }- }-- &__host-add {- display: flex;- gap: $spacing-sm;- flex-wrap: wrap;- align-items: center;- }-}--// Storage tab — R2 buckets, KV namespaces, D1 databases.-.cf-storage {- &__loading {- padding: $spacing-lg;- color: $text-muted;- }-- &__section {- padding: $spacing-md 0;- border-bottom: 1px solid $border-color;-- &:last-child { border-bottom: none; }- }-- &__heading {- margin: 0 0 $spacing-sm;- font-size: 0.95rem;- }-- &__hint {- margin: $spacing-xs 0;- color: $text-muted;- font-size: 0.82rem;- }-- &__error {- margin: $spacing-xs 0;- color: $text-muted;- font-size: 0.82rem;- font-style: italic;- }-- &__create {- display: flex;- gap: $spacing-sm;- align-items: center;- max-width: 420px;- margin-bottom: $spacing-sm;- }-- &__list {- list-style: none;- margin: 0;- padding: 0;- display: flex;- flex-direction: column;- gap: $spacing-xs;- }-- &__item {- display: flex;- align-items: center;- justify-content: space-between;- gap: $spacing-md;- padding: $spacing-sm $spacing-md;- background: $bg-elevated;- border: 1px solid $border-color;- border-radius: $radius-md;- }-- &__name {- font-family: $font-mono;- font-size: 0.85rem;- color: $text-primary;- }-}diff --git a/builtin-extensions/serverkit-cloudflare-ops/plugin.json b/builtin-extensions/serverkit-cloudflare-ops/plugin.jsondeleted file mode 100644index 5e193ede..00000000--- a/builtin-extensions/serverkit-cloudflare-ops/plugin.json+++ /dev/null@@ -1,25 +0,0 @@-{- "name": "serverkit-cloudflare-ops",- "display_name": "Cloudflare Zone Ops",- "version": "1.0.0",- "description": "Cloudflare zone operations on top of your existing Cloudflare DNS connection, covering zone settings, cache purge, WAF, Workers, Tunnels, and R2/KV/D1 storage. DNS records and the connection itself stay in the core Domains surface; this adds the per-zone control panel reached from a Cloudflare-managed domain.",- "author": "ServerKit",- "license": "MIT",- "category": "integration",- "homepage": "https://github.com/jhd3197/ServerKit",- "permissions": ["network"],- "min_panel_version": "1.7.0",- "featured": true,- "feature_score": 70,- "entry_point": "cloudflare:cloudflare_bp",- "url_prefix": "/api/v1/cloudflare",- "icon": "<path d=\"M20 17.5a3.5 3.5 0 00-.5-6.96A5.5 5.5 0 008.6 9.6 4 4 0 007 17.5z\"/>",- "contributions": {- "routes": [- { "path": "cloudflare/zones/:zoneId", "component": "CloudflareZoneSettingsPage" }- ],- "page_titles": {- "/cloudflare/zones": "Cloudflare Zone"- }- }-}diff --git a/frontend/src/plugins/plugins-manifest.json b/frontend/src/plugins/plugins-manifest.jsonindex 31ea7716..a5b818f5 100644--- a/frontend/src/plugins/plugins-manifest.json+++ b/frontend/src/plugins/plugins-manifest.json@@ -1,12 +1,3 @@{- "plugins": [- {- "name": "serverkit-cloudflare-ops",- "slug": "serverkit-cloudflare-ops",- "display_name": "Cloudflare Zone Ops",- "version": "1.0.0",- "frontend_entry": "",- "path": "serverkit-cloudflare-ops"- }- ]+ "plugins": []}diff --git a/frontend/src/plugins/serverkit-cloudflare-ops/components/CloudflareWafPanel.jsx b/frontend/src/plugins/serverkit-cloudflare-ops/components/CloudflareWafPanel.jsxdeleted file mode 100644index fbb7a2ea..00000000--- a/frontend/src/plugins/serverkit-cloudflare-ops/components/CloudflareWafPanel.jsx+++ /dev/null@@ -1,335 +0,0 @@-import { useState, useEffect, useCallback } from 'react';-import { ShieldAlert } from 'lucide-react';-import api from '../services/cloudflare';-import {- Button, Input, Textarea, Switch, Badge,- Select, SelectTrigger, SelectContent, SelectItem, SelectValue,- EmptyState, useToast,-} from 'serverkit-sdk';-import { useTranslation } from 'react-i18next';--const ACTION_OPTIONS = [- { value: 'block', labelKey: 'app.cloudflareWafPanel.block', label: 'Block' },- { value: 'managed_challenge', labelKey: 'app.cloudflareWafPanel.managedChallenge', label: 'Managed Challenge' },- { value: 'js_challenge', labelKey: 'app.cloudflareWafPanel.jsChallenge', label: 'JS Challenge' },- { value: 'log', labelKey: 'app.cloudflareWafPanel.log', label: 'Log' },-];--const EXPRESSION_PLACEHOLDER = '(http.request.uri.path contains "/admin")';--export default function CloudflareWafPanel({ zoneId, isAdmin }) {- const { t } = useTranslation();- const toast = useToast();-- const [loading, setLoading] = useState(true);- const [error, setError] = useState(null);- const [rulesetId, setRulesetId] = useState(null);- const [rules, setRules] = useState([]);- const [presets, setPresets] = useState([]);-- // Preset form state- const [selectedPreset, setSelectedPreset] = useState('');- const [presetParams, setPresetParams] = useState({});-- // Custom rule form state- const [customDescription, setCustomDescription] = useState('');- const [customExpression, setCustomExpression] = useState('');- const [customAction, setCustomAction] = useState('block');-- // Tracks any in-flight write so buttons can disable- const [applying, setApplying] = useState(false);-- const loadRules = useCallback(async () => {- try {- const data = await api.getCloudflareWafRules(zoneId);- setRulesetId(data.ruleset_id ?? null);- setRules(data.rules || []);- setPresets(data.presets || []);- setError(null);- } catch (err) {- setError(err.message);- }- }, [zoneId]);-- useEffect(() => {- let active = true;- setLoading(true);- (async () => {- try {- const data = await api.getCloudflareWafRules(zoneId);- if (!active) return;- setRulesetId(data.ruleset_id ?? null);- setRules(data.rules || []);- setPresets(data.presets || []);- setError(null);- } catch (err) {- if (active) setError(err.message);- } finally {- if (active) setLoading(false);- }- })();- return () => {- active = false;- };- }, [zoneId]);-- const activePreset = presets.find((p) => p.key === selectedPreset) || null;- const presetParamDefs = activePreset?.params || [];-- const handleSelectPreset = (key) => {- setSelectedPreset(key);- setPresetParams({});- };-- const handleParamChange = (key, value) => {- setPresetParams((prev) => ({ ...prev, [key]: value }));- };-- const handleApplyPreset = async () => {- if (!activePreset) return;- setApplying(true);- try {- await api.applyCloudflareWafPreset(zoneId, activePreset.key, presetParams);- await loadRules();- setPresetParams({});- toast.success(t('app.cloudflareWafPanel.addedQuickRule', 'Added quick rule: {{label}}', { label: activePreset.label }));- } catch (err) {- toast.error(err.message);- } finally {- setApplying(false);- }- };-- const handleAddCustomRule = async () => {- setApplying(true);- try {- await api.addCloudflareWafRule(zoneId, {- description: customDescription,- expression: customExpression,- action: customAction,- enabled: true,- });- await loadRules();- setCustomDescription('');- setCustomExpression('');- setCustomAction('block');- toast.success(t('app.cloudflareWafPanel.customRuleAdded', 'Custom rule added'));- } catch (err) {- toast.error(err.message);- } finally {- setApplying(false);- }- };-- const handleToggleRule = async (rule) => {- setApplying(true);- try {- await api.updateCloudflareWafRule(zoneId, rulesetId, rule.id, {- enabled: !rule.enabled,- });- await loadRules();- } catch (err) {- toast.error(err.message);- } finally {- setApplying(false);- }- };-- const handleDeleteRule = async (rule) => {- setApplying(true);- try {- await api.deleteCloudflareWafRule(zoneId, rulesetId, rule.id);- await loadRules();- toast.success(t('app.cloudflareWafPanel.ruleDeleted', 'Rule deleted'));- } catch (err) {- toast.error(err.message);- } finally {- setApplying(false);- }- };-- if (loading) {- return <div className="cf-waf__loading">{t('app.cloudflareWafPanel.loadingFirewallRules', 'Loading firewall rules…')}</div>;- }-- if (error) {- return (- <EmptyState- icon={ShieldAlert}- title={t('app.cloudflareWafPanel.firewallRulesUnavailable', 'Firewall rules unavailable')}- description={error}- />- );- }-- const writeDisabled = !isAdmin || applying;-- return (- <div className="cf-waf">- {/* Presets / quick rules */}- <section className="cf-waf__section">- <h3 className="cf-waf__heading">{t('app.cloudflareWafPanel.quickRules', 'Quick rules')}</h3>- <p className="cf-waf__hint">- {t('app.cloudflareWafPanel.applyACuratedCloudflareRuleWithout', 'Apply a curated Cloudflare rule without writing an expression by hand.')}- </p>-- <div className="cf-waf__field">- <Select- value={selectedPreset}- onValueChange={handleSelectPreset}- disabled={writeDisabled}- >- <SelectTrigger className="cf-waf__select">- <SelectValue placeholder={t('app.cloudflareWafPanel.chooseAQuickRule', 'Choose a quick rule…')} />- </SelectTrigger>- <SelectContent>- {presets.map((preset) => (- <SelectItem key={preset.key} value={preset.key}>- {preset.label}- </SelectItem>- ))}- </SelectContent>- </Select>- </div>-- {activePreset && (- <p className="cf-waf__preset-desc">{activePreset.description}</p>- )}-- {presetParamDefs.length > 0 && (- <div className="cf-waf__params">- {presetParamDefs.map((param) => (- <div className="cf-waf__field" key={param.key}>- <label className="cf-waf__label">{param.label}</label>- <Input- value={presetParams[param.key] || ''}- placeholder={param.placeholder}- onChange={(e) => handleParamChange(param.key, e.target.value)}- disabled={writeDisabled}- />- </div>- ))}- </div>- )}-- <div className="cf-waf__actions">- <Button- size="sm"- onClick={handleApplyPreset}- disabled={writeDisabled || !activePreset}- >- {t('app.cloudflareWafPanel.addRule', 'Add rule')}- </Button>- </div>- </section>-- {/* Custom rule */}- <section className="cf-waf__section">- <h3 className="cf-waf__heading">{t('app.cloudflareWafPanel.customRule', 'Custom rule')}</h3>- <p className="cf-waf__hint">- {t('app.cloudflareWafPanel.writeYourOwnCloudflareFirewallExpression', 'Write your own Cloudflare firewall expression for full control.')}- </p>-- <div className="cf-waf__field">- <label className="cf-waf__label">{t('common.labels.description', 'Description')}</label>- <Input- value={customDescription}- placeholder={t('app.cloudflareWafPanel.blockAdminFromOutsideTheOffice', 'Block admin from outside the office')}- onChange={(e) => setCustomDescription(e.target.value)}- disabled={writeDisabled}- />- </div>-- <div className="cf-waf__field">- <label className="cf-waf__label">{t('app.cloudflareWafPanel.expression', 'Expression')}</label>- <Textarea- rows={3}- value={customExpression}- placeholder={EXPRESSION_PLACEHOLDER}- onChange={(e) => setCustomExpression(e.target.value)}- disabled={writeDisabled}- />- </div>-- <div className="cf-waf__field">- <label className="cf-waf__label">{t('common.labels.action', 'Action')}</label>- <Select- value={customAction}- onValueChange={setCustomAction}- disabled={writeDisabled}- >- <SelectTrigger className="cf-waf__select">- <SelectValue />- </SelectTrigger>- <SelectContent>- {ACTION_OPTIONS.map((opt) => (- <SelectItem key={opt.value} value={opt.value}>- {opt.label}- </SelectItem>- ))}- </SelectContent>- </Select>- </div>-- <div className="cf-waf__actions">- <Button- size="sm"- onClick={handleAddCustomRule}- disabled={writeDisabled || !customExpression.trim()}- >- {t('app.cloudflareWafPanel.addCustomRule', 'Add custom rule')}- </Button>- </div>- </section>-- {/* Active rules list */}- <section className="cf-waf__section">- <h3 className="cf-waf__heading">{t('app.cloudflareWafPanel.activeRules', 'Active rules (')}{rules.length})</h3>-- {rules.length === 0 ? (- <EmptyState- icon={ShieldAlert}- title={t('app.cloudflareWafPanel.noCustomFirewallRules', 'No custom firewall rules')}- description={t('app.cloudflareWafPanel.addAQuickRuleOrA', 'Add a quick rule or a custom rule above.')}- />- ) : (- <ul className="cf-waf__list">- {rules.map((rule) => (- <li className="cf-waf__rule" key={rule.id}>- <div className="cf-waf__rule-main">- <div className="cf-waf__rule-head">- <Badge- variant={rule.action === 'block' ? 'destructive' : 'secondary'}- >- {rule.action}- </Badge>- <span className="cf-waf__rule-desc">- {rule.description || 'Untitled rule'}- </span>- </div>- <code className="cf-waf__rule-expr">{rule.expression}</code>- </div>-- <div className="cf-waf__rule-actions">- <Switch- checked={rule.enabled}- onCheckedChange={() => handleToggleRule(rule)}- disabled={writeDisabled}- />- <Button- variant="destructive"- size="sm"- onClick={() => handleDeleteRule(rule)}- disabled={writeDisabled}- >- {t('common.actions.delete', 'Delete')}- </Button>- </div>- </li>- ))}- </ul>- )}- </section>- </div>- );-}diff --git a/frontend/src/plugins/serverkit-cloudflare-ops/components/StoragePanel.jsx b/frontend/src/plugins/serverkit-cloudflare-ops/components/StoragePanel.jsxdeleted file mode 100644index 36fd6dfd..00000000--- a/frontend/src/plugins/serverkit-cloudflare-ops/components/StoragePanel.jsx+++ /dev/null@@ -1,266 +0,0 @@-import { useState, useEffect, useCallback } from 'react';-import { HardDrive } from 'lucide-react';-import api from '../services/cloudflare';-import { Button, Input, EmptyState, useToast } from 'serverkit-sdk';-import { useTranslation } from 'react-i18next';--function StorageSection({- title,- items,- error,- placeholder,- hint,- renderItem,- onCreate,- onDelete,- isAdmin,- busy,-}) {- const { t } = useTranslation();- const [value, setValue] = useState('');-- const writeDisabled = !isAdmin || busy;-- const handleCreate = async () => {- const trimmed = value.trim();- if (!trimmed) return;- // Only clear the input when the create succeeds; a throw leaves the text intact.- await onCreate(trimmed);- setValue('');- };-- return (- <section className="cf-storage__section">- <h3 className="cf-storage__heading">- {title} ({error ? 0 : items.length})- </h3>-- {hint && <p className="cf-storage__hint">{hint}</p>}-- {error ? (- <p className="cf-storage__error">{error}</p>- ) : (- <>- <div className="cf-storage__create">- <Input- value={value}- placeholder={placeholder}- onChange={(e) => setValue(e.target.value)}- disabled={writeDisabled}- />- <Button- size="sm"- onClick={handleCreate}- disabled={writeDisabled || !value.trim()}- >- {t('common.actions.add', 'Add')}- </Button>- </div>-- {items.length === 0 ? (- <p className="cf-storage__hint">{`No ${title.toLowerCase()} yet.`}</p>- ) : (- <ul className="cf-storage__list">- {items.map((item) => {- const { key, label } = renderItem(item);- return (- <li className="cf-storage__item" key={key}>- <code className="cf-storage__name">{label}</code>- <Button- variant="destructive"- size="sm"- onClick={() => onDelete(item)}- disabled={writeDisabled}- >- {t('common.actions.delete', 'Delete')}- </Button>- </li>- );- })}- </ul>- )}- </>- )}- </section>- );-}--export default function StoragePanel({ zoneId, isAdmin }) {- const { t } = useTranslation();- const toast = useToast();-- const [loading, setLoading] = useState(true);- const [error, setError] = useState(null);- const [data, setData] = useState(null);-- // Tracks any in-flight write so all write controls can disable- const [working, setWorking] = useState(false);-- const loadData = useCallback(async () => {- try {- const res = await api.getCloudflareStorage(zoneId);- setData(res);- setError(null);- } catch (err) {- setError(err.message);- }- }, [zoneId]);-- useEffect(() => {- let active = true;- setLoading(true);- (async () => {- try {- const res = await api.getCloudflareStorage(zoneId);- if (!active) return;- setData(res);- setError(null);- } catch (err) {- if (active) setError(err.message);- } finally {- if (active) setLoading(false);- }- })();- return () => {- active = false;- };- }, [zoneId]);-- const handleCreateR2 = async (name) => {- setWorking(true);- try {- await api.createCloudflareR2Bucket(zoneId, name);- toast.success(t('app.storagePanel.createdBucket', 'Created bucket "{{name}}"', { name: name }));- await loadData();- } catch (err) {- toast.error(err.message);- throw err;- } finally {- setWorking(false);- }- };-- const handleDeleteR2 = async (bucket) => {- setWorking(true);- try {- await api.deleteCloudflareR2Bucket(zoneId, bucket.name);- toast.success(t('app.storagePanel.deleted', 'Deleted'));- await loadData();- } catch (err) {- toast.error(err.message);- } finally {- setWorking(false);- }- };-- const handleCreateKv = async (title) => {- setWorking(true);- try {- await api.createCloudflareKvNamespace(zoneId, title);- toast.success(t('app.storagePanel.createdNamespace', 'Created namespace "{{title}}"', { title: title }));- await loadData();- } catch (err) {- toast.error(err.message);- throw err;- } finally {- setWorking(false);- }- };-- const handleDeleteKv = async (namespace) => {- setWorking(true);- try {- await api.deleteCloudflareKvNamespace(zoneId, namespace.id);- toast.success(t('app.storagePanel.deleted', 'Deleted'));- await loadData();- } catch (err) {- toast.error(err.message);- } finally {- setWorking(false);- }- };-- const handleCreateD1 = async (name) => {- setWorking(true);- try {- await api.createCloudflareD1Database(zoneId, name);- toast.success(t('app.storagePanel.createdDatabase', 'Created database "{{name}}"', { name: name }));- await loadData();- } catch (err) {- toast.error(err.message);- throw err;- } finally {- setWorking(false);- }- };-- const handleDeleteD1 = async (database) => {- setWorking(true);- try {- await api.deleteCloudflareD1Database(zoneId, database.uuid);- toast.success(t('app.storagePanel.deleted', 'Deleted'));- await loadData();- } catch (err) {- toast.error(err.message);- } finally {- setWorking(false);- }- };-- if (loading) {- return <div className="cf-storage__loading">{t('app.storagePanel.loadingStorage', 'Loading storage…')}</div>;- }-- if (error) {- return (- <EmptyState- icon={HardDrive}- title={t('app.storagePanel.storageUnavailable', 'Storage unavailable')}- description={error}- />- );- }-- const errors = data.errors || {};-- return (- <div className="cf-storage">- <StorageSection- title={t('app.storagePanel.r2Buckets', 'R2 buckets')}- items={data.r2 || []}- error={errors.r2}- placeholder="my-bucket"- hint={t('app.storagePanel.r2IsS3CompatibleSoA', 'R2 is S3-compatible, so a bucket here can back ServerKit backups later.')}- renderItem={(b) => ({ key: b.name, label: b.name })}- onCreate={handleCreateR2}- onDelete={handleDeleteR2}- isAdmin={isAdmin}- busy={working}- />-- <StorageSection- title={t('app.storagePanel.kvNamespaces', 'KV namespaces')}- items={data.kv || []}- error={errors.kv}- placeholder="my-namespace"- renderItem={(n) => ({ key: n.id, label: n.title })}- onCreate={handleCreateKv}- onDelete={handleDeleteKv}- isAdmin={isAdmin}- busy={working}- />-- <StorageSection- title={t('app.storagePanel.d1Databases', 'D1 databases')}- items={data.d1 || []}- error={errors.d1}- placeholder="my-database"- renderItem={(d) => ({ key: d.uuid, label: d.name })}- onCreate={handleCreateD1}- onDelete={handleDeleteD1}- isAdmin={isAdmin}- busy={working}- />- </div>- );-}diff --git a/frontend/src/plugins/serverkit-cloudflare-ops/components/TunnelsPanel.jsx b/frontend/src/plugins/serverkit-cloudflare-ops/components/TunnelsPanel.jsxdeleted file mode 100644index f6dc8f6f..00000000--- a/frontend/src/plugins/serverkit-cloudflare-ops/components/TunnelsPanel.jsx+++ /dev/null@@ -1,362 +0,0 @@-import { useState, useEffect, useCallback } from 'react';-import { Network } from 'lucide-react';-import api from '../services/cloudflare';-import { Button, Input, Badge, EmptyState, useToast, copyToClipboard } from 'serverkit-sdk';-import { useTranslation } from 'react-i18next';--function InstallBox({ command }) {- const { t } = useTranslation();- const toast = useToast();-- if (!command) {- return <p className="cf-tunnels__hint">{t('app.tunnelsPanel.noInstallCommandAvailable', 'No install command available.')}</p>;- }-- const handleCopy = async () => {- if (await copyToClipboard(command)) toast.success(t('app.tunnelsPanel.copied', 'Copied'));- else toast.error(t('app.tunnelsPanel.couldNotCopyTheInstallCommand', 'Could not copy the install command'));- };-- return (- <div className="cf-tunnels__install">- <code className="cf-tunnels__cmd">{command}</code>- <Button size="sm" variant="outline" onClick={handleCopy}>- {t('common.actions.copy', 'Copy')}- </Button>- </div>- );-}--function TunnelRow({ zoneId, tunnel, isAdmin, onChanged }) {- const { t } = useTranslation();- const toast = useToast();-- const [install, setInstall] = useState(null);- const [expanded, setExpanded] = useState(false);- const [hostnames, setHostnames] = useState([]);- const [hostname, setHostname] = useState('');- const [service, setService] = useState('');- const [working, setWorking] = useState(false);-- const loadHostnames = useCallback(async () => {- try {- const res = await api.getCloudflareTunnelHostnames(zoneId, tunnel.id);- setHostnames(res.hostnames || []);- } catch (err) {- toast.error(err.message);- }- }, [zoneId, tunnel.id, toast]);-- const handleToggleInstall = async () => {- if (install) {- setInstall(null);- return;- }- setWorking(true);- try {- const res = await api.getCloudflareTunnelInstall(zoneId, tunnel.id);- setInstall(res.install || null);- } catch (err) {- toast.error(err.message);- } finally {- setWorking(false);- }- };-- const handleToggleHostnames = async () => {- const next = !expanded;- setExpanded(next);- if (next && hostnames.length === 0) {- await loadHostnames();- }- };-- const handleDelete = async () => {- setWorking(true);- try {- await api.deleteCloudflareTunnel(zoneId, tunnel.id);- toast.success(t('app.tunnelsPanel.deletedCloudflareTunnel', 'Deleted Cloudflare Tunnel "{{name}}"', { name: tunnel.name }));- onChanged();- } catch (err) {- toast.error(err.message);- } finally {- setWorking(false);- }- };-- const handleRemoveHostname = async (h) => {- setWorking(true);- try {- await api.removeCloudflareTunnelHostname(zoneId, tunnel.id, h.hostname);- toast.success(t('app.tunnelsPanel.hostnameRemoved', 'Hostname removed'));- await loadHostnames();- } catch (err) {- toast.error(err.message);- } finally {- setWorking(false);- }- };-- const handleAddHostname = async () => {- setWorking(true);- try {- const res = await api.addCloudflareTunnelHostname(- zoneId,- tunnel.id,- hostname,- service,- );- toast.success(t('app.tunnelsPanel.hostnameRouted', 'Hostname routed'));- if (res.dns && !res.dns.created) {- toast.error(t('app.tunnelsPanel.routeSetButTheDnsRecord', 'Route set, but the DNS record failed: ') + res.dns.error);- }- setHostname('');- setService('');- await loadHostnames();- } catch (err) {- toast.error(err.message);- } finally {- setWorking(false);- }- };-- const writeDisabled = !isAdmin || working;-- return (- <li className="cf-tunnels__item">- <div className="cf-tunnels__item-head">- <span className="cf-tunnels__name">{tunnel.name}</span>- <code className="cf-tunnels__meta">{tunnel.id.slice(0, 12)}…</code>- {tunnel.status && (- <span className="cf-tunnels__meta">{tunnel.status}</span>- )}- {tunnel.connections != null && (- <span className="cf-tunnels__meta">{tunnel.connections}</span>- )}- {tunnel.managed && <Badge variant="secondary">{t('common.labels.serverKit', 'ServerKit')}</Badge>}- </div>-- <div className="cf-tunnels__item-actions">- <Button- size="sm"- variant="outline"- onClick={handleToggleInstall}- disabled={!isAdmin || working}- >- {t('app.tunnelsPanel.installCommand', 'Install command')}- </Button>- <Button- size="sm"- variant="outline"- onClick={handleToggleHostnames}- disabled={working}- >- {t('app.tunnelsPanel.hostnames', 'Hostnames')}- </Button>- <Button- variant="destructive"- size="sm"- onClick={handleDelete}- disabled={writeDisabled}- >- {t('common.actions.delete', 'Delete')}- </Button>- </div>-- {install && <InstallBox command={install} />}-- {expanded && (- <div className="cf-tunnels__hostnames">- {hostnames.length === 0 ? (- <p className="cf-tunnels__hint">{t('app.tunnelsPanel.noPublicHostnamesRoutedYet', 'No public hostnames routed yet.')}</p>- ) : (- hostnames.map((h) => (- <div className="cf-tunnels__host" key={h.hostname}>- <span>- <code>{h.hostname}</code> → <code>{h.service}</code>- </span>- <Button- variant="destructive"- size="sm"- onClick={() => handleRemoveHostname(h)}- disabled={writeDisabled}- >- {t('common.actions.remove', 'Remove')}- </Button>- </div>- ))- )}-- <div className="cf-tunnels__host-add">- <Input- value={hostname}- placeholder="app.example.com"- onChange={(e) => setHostname(e.target.value)}- disabled={writeDisabled}- />- <Input- value={service}- placeholder="http://localhost:8080"- onChange={(e) => setService(e.target.value)}- disabled={writeDisabled}- />- <Button- size="sm"- onClick={handleAddHostname}- disabled={writeDisabled || !hostname.trim() || !service.trim()}- >- {t('common.actions.add', 'Add')}- </Button>- </div>- <p className="cf-tunnels__hint">- {t('app.tunnelsPanel.theHostnameShouldBeInsideThis', 'The hostname should be inside this zone\'s domain; a proxied DNS record is created automatically.')}- </p>- </div>- )}- </li>- );-}--export default function TunnelsPanel({ zoneId, isAdmin }) {- const { t } = useTranslation();- const toast = useToast();-- const [loading, setLoading] = useState(true);- const [error, setError] = useState(null);- const [tunnels, setTunnels] = useState([]);-- // Create form state- const [name, setName] = useState('');- const [creating, setCreating] = useState(false);- const [lastInstall, setLastInstall] = useState(null);-- const loadData = useCallback(async () => {- try {- const data = await api.getCloudflareTunnels(zoneId);- setTunnels(data.tunnels || []);- setError(null);- } catch (err) {- setError(err.message);- }- }, [zoneId]);-- useEffect(() => {- let active = true;- setLoading(true);- (async () => {- try {- const data = await api.getCloudflareTunnels(zoneId);- if (!active) return;- setTunnels(data.tunnels || []);- setError(null);- } catch (err) {- if (active) setError(err.message);- } finally {- if (active) setLoading(false);- }- })();- return () => {- active = false;- };- }, [zoneId]);-- const handleCreate = async () => {- setCreating(true);- try {- const res = await api.createCloudflareTunnel(zoneId, name);- toast.success(t('app.tunnelsPanel.createdTunnel', 'Created tunnel "{{name}}"', { name: name }));- setLastInstall({ name, install: res.install, token: res.token });- setName('');- await loadData();- } catch (err) {- toast.error(err.message);- } finally {- setCreating(false);- }- };-- if (loading) {- return <div className="cf-tunnels__loading">{t('app.tunnelsPanel.loadingCloudflareTunnels', 'Loading Cloudflare Tunnels…')}</div>;- }-- if (error) {- return (- <EmptyState- icon={Network}- title={t('app.tunnelsPanel.cloudflareTunnelsUnavailable', 'Cloudflare Tunnels unavailable')}- description={error}- />- );- }-- const createDisabled = !isAdmin || creating || !name.trim();-- return (- <div className="cf-tunnels">- {/* Create a Cloudflare Tunnel */}- <section className="cf-tunnels__section">- <h3 className="cf-tunnels__heading">{t('app.tunnelsPanel.createACloudflareTunnel', 'Create a Cloudflare Tunnel')}</h3>- <p className="cf-tunnels__hint">- {t('app.tunnelsPanel.aCloudflareTunnelExposesALocal', 'A Cloudflare Tunnel exposes a local or private service through Cloudflare\'s edge — no public IP or open ports required.')}- </p>-- <div className="cf-tunnels__field">- <label className="cf-tunnels__label">{t('common.labels.name', 'Name')}</label>- <Input- value={name}- placeholder="home-jellyfin"- onChange={(e) => setName(e.target.value)}- disabled={!isAdmin || creating}- />- </div>-- <div className="cf-tunnels__actions">- <Button onClick={handleCreate} disabled={createDisabled}>- {t('common.actions.create', 'Create')}- </Button>- </div>-- {lastInstall && (- <div className="cf-tunnels__install">- <p className="cf-tunnels__hint">- {t('app.tunnelsPanel.runThisOnceOnTheMachine', 'Run this once on the machine hosting your local service. The connector token is shown only now.')}- </p>- <InstallBox command={lastInstall.install} />- <Button- size="sm"- variant="ghost"- onClick={() => setLastInstall(null)}- >- {t('common.actions.dismiss', 'Dismiss')}- </Button>- </div>- )}- </section>-- {/* Cloudflare Tunnels list */}- <section className="cf-tunnels__section">- <h3 className="cf-tunnels__heading">{t('app.tunnelsPanel.cloudflareTunnels', 'Cloudflare Tunnels (')}{tunnels.length})</h3>-- {tunnels.length === 0 ? (- <EmptyState- icon={Network}- title={t('app.tunnelsPanel.noCloudflareTunnels', 'No Cloudflare Tunnels')}- description={t('app.tunnelsPanel.createOneAboveToExposeA', 'Create one above to expose a local service without a public IP.')}- />- ) : (- <ul className="cf-tunnels__list">- {tunnels.map((tunnel) => (- <TunnelRow- key={tunnel.id}- zoneId={zoneId}- tunnel={tunnel}- isAdmin={isAdmin}- onChanged={loadData}- />- ))}- </ul>- )}- </section>- </div>- );-}diff --git a/frontend/src/plugins/serverkit-cloudflare-ops/components/WorkersPanel.jsx b/frontend/src/plugins/serverkit-cloudflare-ops/components/WorkersPanel.jsxdeleted file mode 100644index 41b6ca10..00000000--- a/frontend/src/plugins/serverkit-cloudflare-ops/components/WorkersPanel.jsx+++ /dev/null@@ -1,253 +0,0 @@-import { useState, useEffect, useCallback } from 'react';-import { Zap } from 'lucide-react';-import api from '../services/cloudflare';-import { Button, Input, Textarea, Badge, EmptyState, useToast } from 'serverkit-sdk';-import { useTranslation } from 'react-i18next';--const STARTER_SCRIPT = `export default {- async fetch(request, env, ctx) {- return new Response("Hello from ServerKit + Cloudflare Workers!", {- headers: { "content-type": "text/plain" },- });- },-};`;--export default function WorkersPanel({ zoneId, isAdmin }) {- const { t } = useTranslation();- const toast = useToast();-- const [loading, setLoading] = useState(true);- const [error, setError] = useState(null);- const [workers, setWorkers] = useState([]);- const [routes, setRoutes] = useState([]);-- // Deploy form state- const [name, setName] = useState('');- const [code, setCode] = useState(STARTER_SCRIPT);- const [routePattern, setRoutePattern] = useState('');-- // Tracks any in-flight write so buttons can disable- const [deploying, setDeploying] = useState(false);- const [working, setWorking] = useState(false);-- const loadData = useCallback(async () => {- try {- const data = await api.getCloudflareWorkers(zoneId);- setWorkers(data.workers || []);- setRoutes(data.routes || []);- setError(null);- } catch (err) {- setError(err.message);- }- }, [zoneId]);-- useEffect(() => {- let active = true;- setLoading(true);- (async () => {- try {- const data = await api.getCloudflareWorkers(zoneId);- if (!active) return;- setWorkers(data.workers || []);- setRoutes(data.routes || []);- setError(null);- } catch (err) {- if (active) setError(err.message);- } finally {- if (active) setLoading(false);- }- })();- return () => {- active = false;- };- }, [zoneId]);-- const handleDeploy = async () => {- setDeploying(true);- try {- const res = await api.deployCloudflareWorker(zoneId, {- name,- code,- route_pattern: routePattern || undefined,- });- toast.success(t('app.workersPanel.deployedWorker', 'Deployed worker "{{name}}"', { name: name }));- if (res.route && !res.route.success) {- toast.error(t('app.workersPanel.workerDeployedButTheRouteFailed', 'Worker deployed, but the route failed: ') + res.route.error);- }- setName('');- setRoutePattern('');- await loadData();- } catch (err) {- toast.error(err.message);- } finally {- setDeploying(false);- }- };-- const handleDeleteWorker = async (worker) => {- setWorking(true);- try {- await api.deleteCloudflareWorker(zoneId, worker.name);- await loadData();- toast.success(t('app.workersPanel.deletedWorker', 'Deleted worker "{{name}}"', { name: worker.name }));- } catch (err) {- toast.error(err.message);- } finally {- setWorking(false);- }- };-- const handleDeleteRoute = async (route) => {- setWorking(true);- try {- await api.deleteCloudflareWorkerRoute(zoneId, route.id);- await loadData();- toast.success(t('app.workersPanel.routeRemoved', 'Route removed'));- } catch (err) {- toast.error(err.message);- } finally {- setWorking(false);- }- };-- if (loading) {- return <div className="cf-workers__loading">{t('app.workersPanel.loadingWorkers', 'Loading workers…')}</div>;- }-- if (error) {- return (- <EmptyState- icon={Zap}- title={t('app.workersPanel.workersUnavailable', 'Workers unavailable')}- description={error}- />- );- }-- const writeDisabled = !isAdmin || working;- const deployDisabled = !isAdmin || deploying || !name.trim() || !code.trim();-- return (- <div className="cf-workers">- {/* Deploy a Worker */}- <section className="cf-workers__section">- <h3 className="cf-workers__heading">{t('app.workersPanel.deployAWorker', 'Deploy a Worker')}</h3>-- <div className="cf-workers__field">- <label className="cf-workers__label">{t('common.labels.name', 'Name')}</label>- <Input- value={name}- placeholder="my-worker"- onChange={(e) => setName(e.target.value)}- disabled={!isAdmin || deploying}- />- </div>-- <div className="cf-workers__field">- <label className="cf-workers__label">{t('app.workersPanel.code', 'Code')}</label>- <Textarea- rows={8}- className="cf-workers__code"- value={code}- onChange={(e) => setCode(e.target.value)}- disabled={!isAdmin || deploying}- />- </div>-- <div className="cf-workers__field">- <label className="cf-workers__label">{t('app.workersPanel.routePatternOptional', 'Route pattern (optional)')}</label>- <Input- value={routePattern}- placeholder="example.com/*"- onChange={(e) => setRoutePattern(e.target.value)}- disabled={!isAdmin || deploying}- />- <p className="cf-workers__hint">- {t('app.workersPanel.attachesTheWorkerToThisDomain', 'Attaches the worker to this domain so matching traffic runs the script.')}- </p>- </div>-- <div className="cf-workers__actions">- <Button onClick={handleDeploy} disabled={deployDisabled}>- {t('app.workersPanel.deploy', 'Deploy')}- </Button>- </div>- </section>-- {/* Deployed workers */}- <section className="cf-workers__section">- <h3 className="cf-workers__heading">{t('app.workersPanel.workers', 'Workers (')}{workers.length})</h3>-- {workers.length === 0 ? (- <EmptyState- icon={Zap}- title={t('app.workersPanel.noWorkersDeployed', 'No Workers deployed')}- description={t('app.workersPanel.deployYourFirstEdgeScriptAbove', 'Deploy your first edge script above.')}- />- ) : (- <ul className="cf-workers__list">- {workers.map((worker) => (- <li className="cf-workers__item" key={worker.name}>- <div className="cf-workers__name">- <code>{worker.name}</code>- {worker.managed && (- <Badge variant="secondary">{t('common.labels.serverKit', 'ServerKit')}</Badge>- )}- {worker.modified_on && (- <span className="cf-workers__meta">- {new Date(worker.modified_on).toLocaleString()}- </span>- )}- </div>-- <div className="cf-workers__item-actions">- <Button- variant="destructive"- size="sm"- onClick={() => handleDeleteWorker(worker)}- disabled={writeDisabled}- >- {t('common.actions.delete', 'Delete')}- </Button>- </div>- </li>- ))}- </ul>- )}- </section>-- {/* Routes */}- <section className="cf-workers__section">- <h3 className="cf-workers__heading">{t('app.workersPanel.routes', 'Routes (')}{routes.length})</h3>-- {routes.length === 0 ? (- <p className="cf-workers__hint">- {t('app.workersPanel.noRoutesYetAddARoute', 'No routes yet. Add a route pattern when deploying to send traffic to a worker.')}- </p>- ) : (- <ul className="cf-workers__list">- {routes.map((route) => (- <li className="cf-workers__item" key={route.id}>- <div className="cf-workers__name">- <code>{route.pattern}</code>- <span className="cf-workers__meta">→ {route.script}</span>- </div>-- <div className="cf-workers__item-actions">- <Button- variant="destructive"- size="sm"- onClick={() => handleDeleteRoute(route)}- disabled={writeDisabled}- >- {t('common.actions.remove', 'Remove')}- </Button>- </div>- </li>- ))}- </ul>- )}- </section>- </div>- );-}diff --git a/frontend/src/plugins/serverkit-cloudflare-ops/index.jsx b/frontend/src/plugins/serverkit-cloudflare-ops/index.jsxdeleted file mode 100644index 19519290..00000000--- a/frontend/src/plugins/serverkit-cloudflare-ops/index.jsx+++ /dev/null@@ -1,26 +0,0 @@-// Cloudflare Zone Ops UI, contributed through the extension system. Both-// halves live in this extension: the zone-ops backend (the /api/v1/cloudflare-// blueprint + CloudflareService) under backend/, and the full page here-// (pages/CloudflareZoneSettings.jsx + the WAF/Workers/Tunnels/Storage panels-// + its own API client + SCSS). Imports go through 'serverkit-sdk' so the-// same source works baked in-tree (the panel's build-time glob) and as a-// runtime-ESM bundle once the extension leaves the tree (plan 52 Phase 2).-//-// DNS records and the Cloudflare connection itself stay core (they back-// /domains) — this page only adds the per-zone control panel, reached from-// the "Open in Cloudflare" button on a Cloudflare-managed domain.-//-// It's a single plain full-bleed route (cloudflare/zones/:zoneId, own-// PageTopbar + internal Settings/WAF/Workers/Tunnels/Storage tabs), so no-// tab-group shell or self-rendered sub-router is needed — unlike WordPress.-import './styles/cloudflare-zone.scss';--import CloudflareZoneSettings from './pages/CloudflareZoneSettings';--export function CloudflareZoneSettingsPage() {- return <CloudflareZoneSettings />;-}--// No default export on purpose: PluginLoader legacy-auto-renders any plugin-// default export globally (the page then runs with zoneId=undefined). The-// route contribution resolves the NAMED export via resolveComponent.diff --git a/frontend/src/plugins/serverkit-cloudflare-ops/pages/CloudflareZoneSettings.jsx b/frontend/src/plugins/serverkit-cloudflare-ops/pages/CloudflareZoneSettings.jsxdeleted file mode 100644index 645cc34f..00000000--- a/frontend/src/plugins/serverkit-cloudflare-ops/pages/CloudflareZoneSettings.jsx+++ /dev/null@@ -1,465 +0,0 @@-import { useState, useEffect, useCallback } from 'react';-import { useParams, Link } from 'react-router-dom';-import { Cloud, ShieldCheck, Lock, Gauge, Database, Wand2, Eraser, Flame, Zap, Network, HardDrive } from 'lucide-react';-import CloudflareWafPanel from '../components/CloudflareWafPanel';-import WorkersPanel from '../components/WorkersPanel';-import TunnelsPanel from '../components/TunnelsPanel';-import StoragePanel from '../components/StoragePanel';-import api from '../services/cloudflare';-import {- PageLayout, Tabs, TabsList, TabsTrigger, TabsContent, Switch, Button,- Badge, Textarea, Select, SelectTrigger, SelectContent, SelectItem,- SelectValue, PageLoader, EmptyState, ConfirmDialog, useToast, useAuth,-} from 'serverkit-sdk';-import { useTranslation } from 'react-i18next';--// HSTS max-age presets (seconds). 0 disables the max-age while keeping HSTS off.-const HSTS_MAX_AGE = [- { value: 0, labelKey: 'app.cloudflareZoneSettings.off', label: 'Off' },- { value: 86400, labelKey: 'app.cloudflareZoneSettings.1Day', label: '1 day' },- { value: 604800, labelKey: 'app.cloudflareZoneSettings.1Week', label: '1 week' },- { value: 2592000, labelKey: 'app.cloudflareZoneSettings.1Month', label: '1 month' },- { value: 15552000, labelKey: 'app.cloudflareZoneSettings.6Months', label: '6 months' },- { value: 31536000, labelKey: 'app.cloudflareZoneSettings.1Year', label: '1 year' },- { value: 63072000, labelKey: 'app.cloudflareZoneSettings.2Years', label: '2 years' },-];--const TAB_ICONS = {- ssl: <Lock size={15} />,- speed: <Gauge size={15} />,- caching: <Database size={15} />,- security: <ShieldCheck size={15} />,-};--const CloudflareZoneSettings = () => {- const { t } = useTranslation();- const { zoneId } = useParams();- const toast = useToast();- const { user } = useAuth();- const isAdmin = !!user?.is_admin;-- const [loading, setLoading] = useState(true);- const [error, setError] = useState(null);- const [zone, setZone] = useState(null);- const [groups, setGroups] = useState([]);- const [settings, setSettings] = useState({});- const [saving, setSaving] = useState(null); // setting id in flight- const [applying, setApplying] = useState(false);- const [purgeUrls, setPurgeUrls] = useState('');- const [purging, setPurging] = useState(false);- const [confirmPurgeAll, setConfirmPurgeAll] = useState(false);-- const loadSettings = useCallback(async () => {- setLoading(true);- setError(null);- try {- const data = await api.getCloudflareZoneSettings(zoneId);- setZone(data.zone || null);- setGroups(data.groups || []);- setSettings(data.settings || {});- } catch (err) {- setError(err.message || 'Failed to load Cloudflare settings');- } finally {- setLoading(false);- }- }, [zoneId]);-- useEffect(() => { loadSettings(); }, [loadSettings]);-- // Optimistically reflect the change, PATCH it, and reload truth on failure so- // the UI never drifts from Cloudflare.- const save = useCallback(async (settingId, value) => {- setSaving(settingId);- setSettings(prev => ({ ...prev, [settingId]: { ...(prev[settingId] || {}), value } }));- try {- await api.updateCloudflareZoneSetting(zoneId, settingId, value);- toast.success(t('app.cloudflareZoneSettings.settingSaved', 'Setting saved'));- } catch (err) {- toast.error(err.message || t('app.cloudflareZoneSettings.failedToSaveSetting', 'Failed to save setting'));- loadSettings();- } finally {- setSaving(null);- }- }, [zoneId, toast, loadSettings]);-- const handleApplyPreset = async () => {- setApplying(true);- try {- const res = await api.applyCloudflareSettingsPreset(zoneId);- const failed = (res.results || []).filter(r => !r.success);- if (failed.length === 0) {- toast.success(t('app.cloudflareZoneSettings.appliedRecommendedHardeningSettings', 'Applied recommended hardening ({{applied}} settings)', { applied: res.applied }));- } else {- toast.info(t('app.cloudflareZoneSettings.appliedNeedAHigherCloudflarePlan', 'Applied {{applied}}/{{total}}. {{length}} need a higher Cloudflare plan.', { applied: res.applied, total: res.total, length: failed.length }));- }- loadSettings();- } catch (err) {- toast.error(err.message || t('app.cloudflareZoneSettings.failedToApplyPreset', 'Failed to apply preset'));- } finally {- setApplying(false);- }- };-- const handlePurgeEverything = async () => {- setConfirmPurgeAll(false);- setPurging(true);- try {- await api.purgeCloudflareCache(zoneId, { purge_everything: true });- toast.success(t('app.cloudflareZoneSettings.purgedTheEntireCache', 'Purged the entire cache'));- } catch (err) {- toast.error(err.message || t('app.cloudflareZoneSettings.failedToPurgeCache', 'Failed to purge cache'));- } finally {- setPurging(false);- }- };-- const handlePurgeFiles = async () => {- const files = purgeUrls.split('\n').map(u => u.trim()).filter(Boolean);- if (files.length === 0) {- toast.error(t('app.cloudflareZoneSettings.enterAtLeastOneUrlTo', 'Enter at least one URL to purge'));- return;- }- setPurging(true);- try {- const res = await api.purgeCloudflareCache(zoneId, { files });- const n = res.purged?.files?.length ?? files.length;- toast.success(t('app.cloudflareZoneSettings.purgedUrlFromCache', 'Purged {{n}} URL{{value}} from cache', { n: n, value: n === 1 ? '' : 's' }));- setPurgeUrls('');- } catch (err) {- toast.error(err.message || t('app.cloudflareZoneSettings.failedToPurgeUrls', 'Failed to purge URLs'));- } finally {- setPurging(false);- }- };-- if (loading) return <PageLoader />;-- const crumbs = (- <span className="cf-crumbs">- <Link to="/dns">{t('app.cloudflareZoneSettings.dnsZones', 'DNS Zones')}</Link>- <span className="cf-crumbs__sep">/</span>- <span className="cf-crumbs__cur">{zone?.domain || `Zone ${zoneId}`}</span>- <span className="cf-crumbs__sep">/</span>- <span className="cf-crumbs__cur">{t('app.cloudflareZoneSettings.cloudflare', 'Cloudflare')}</span>- </span>- );-- if (error) {- return (- <PageLayout- className="cf-zone"- contentClassName="app-detail-page app-detail-page--wide"- icon={<Cloud size={18} />}- title={crumbs}- >- <div className="cf-zone__body">- <EmptyState- icon={Cloud}- title={t('app.cloudflareZoneSettings.cloudflareSettingsUnavailable', 'Cloudflare settings unavailable')}- description={error}- />- <div className="cf-zone__error-actions">- <Button variant="outline" onClick={loadSettings}>{t('common.actions.retry', 'Retry')}</Button>- <Link to="/dns"><Button variant="ghost">{t('app.cloudflareZoneSettings.backToDnsZones', 'Back to DNS Zones')}</Button></Link>- </div>- </div>- </PageLayout>- );- }-- const tabGroups = groups.filter(g => g.settings?.length);- const firstTab = tabGroups[0]?.key || 'actions';-- return (- <PageLayout- className="cf-zone"- contentClassName="app-detail-page app-detail-page--wide"- icon={<Cloud size={18} />}- title={crumbs}- meta={zone?.provider_zone_id ? `Zone ${zone.provider_zone_id}` : undefined}- >- <div className="cf-zone__body">- <Tabs defaultValue={firstTab} className="cf-zone__tabs">- <TabsList>- {tabGroups.map(g => (- <TabsTrigger key={g.key} value={g.key}>- {TAB_ICONS[g.key]}{g.label}- </TabsTrigger>- ))}- <TabsTrigger value="waf"><Flame size={15} />WAF</TabsTrigger>- <TabsTrigger value="workers"><Zap size={15} />{t('app.cloudflareZoneSettings.workers', 'Workers')}</TabsTrigger>- <TabsTrigger value="tunnels"><Network size={15} />{t('app.cloudflareZoneSettings.tunnels', 'Tunnels')}</TabsTrigger>- <TabsTrigger value="storage"><HardDrive size={15} />{t('common.labels.storage', 'Storage')}</TabsTrigger>- <TabsTrigger value="actions"><Wand2 size={15} />{t('common.labels.actions', 'Actions')}</TabsTrigger>- </TabsList>-- {tabGroups.map(g => (- <TabsContent key={g.key} value={g.key}>- <div className="cf-panel">- {g.settings.map(setting => (- <SettingRow- key={setting.id}- setting={setting}- state={settings[setting.id]}- saving={saving === setting.id}- disabled={!isAdmin}- onSave={save}- />- ))}- </div>- </TabsContent>- ))}-- <TabsContent value="waf">- <div className="cf-panel">- <CloudflareWafPanel zoneId={zoneId} isAdmin={isAdmin} />- </div>- </TabsContent>-- <TabsContent value="workers">- <div className="cf-panel">- <WorkersPanel zoneId={zoneId} isAdmin={isAdmin} />- </div>- </TabsContent>-- <TabsContent value="tunnels">- <div className="cf-panel">- <TunnelsPanel zoneId={zoneId} isAdmin={isAdmin} />- </div>- </TabsContent>-- <TabsContent value="storage">- <div className="cf-panel">- <StoragePanel zoneId={zoneId} isAdmin={isAdmin} />- </div>- </TabsContent>-- <TabsContent value="actions">- <div className="cf-panel cf-actions">- <div className="cf-action">- <div className="cf-action__text">- <h3>{t('app.cloudflareZoneSettings.applyRecommendedHardening', 'Apply recommended hardening')}</h3>- <p>- {t('app.cloudflareZoneSettings.setsFullStrictSslAlwaysUse', 'Sets Full (strict) SSL, Always Use HTTPS, HSTS (6 months), a TLS 1.2 floor with TLS 1.3, Brotli, HTTP/3, and a 4-hour browser cache. Settings your plan doesn\'t allow are skipped.')}- </p>- </div>- <Button onClick={handleApplyPreset} disabled={applying || !isAdmin}>- {applying ? 'Applying…' : 'Apply preset'}- </Button>- </div>- {!isAdmin && (- <p className="cf-actions__note">- {t('app.cloudflareZoneSettings.changingCloudflareSettingsRequiresAnAdmin', 'Changing Cloudflare settings requires an admin account.')}- </p>- )}- </div>-- <div className="cf-panel cf-actions">- <div className="cf-action">- <div className="cf-action__text">- <h3><Eraser size={15} /> {t('app.cloudflareZoneSettings.purgeCache', 'Purge cache')}</h3>- <p>- {t('app.cloudflareZoneSettings.clearCloudflareSCachedCopyOf', 'Clear Cloudflare\'s cached copy of your site so visitors get fresh content. Purge everything, or list specific URLs below.')}- </p>- </div>- <Button- variant="destructive"- onClick={() => setConfirmPurgeAll(true)}- disabled={purging || !isAdmin}- >- {purging ? 'Purging…' : 'Purge everything'}- </Button>- </div>- <div className="cf-purge-files">- <label htmlFor="cf-purge-urls" className="cf-purge-files__label">- {t('app.cloudflareZoneSettings.purgeSpecificUrlsOnePerLine', 'Purge specific URLs (one per line, up to 30)')}- </label>- <Textarea- id="cf-purge-urls"- rows={4}- placeholder={'https://example.com/style.css\nhttps://example.com/app.js'}- value={purgeUrls}- disabled={purging || !isAdmin}- onChange={(e) => setPurgeUrls(e.target.value)}- />- <div className="cf-purge-files__actions">- <Button- variant="outline"- onClick={handlePurgeFiles}- disabled={purging || !isAdmin || !purgeUrls.trim()}- >- {t('app.cloudflareZoneSettings.purgeUrls', 'Purge URLs')}- </Button>- </div>- </div>- </div>- </TabsContent>- </Tabs>- </div>-- {confirmPurgeAll && (- <ConfirmDialog- isOpen- title={t('app.cloudflareZoneSettings.purgeEntireCache', 'Purge entire cache')}- message={t('app.cloudflareZoneSettings.clearCloudflareSEntireCacheFor', 'Clear Cloudflare\'s entire cache for {{value}}?', { value: zone?.domain || 'this zone' })- + t('app.cloudflareZoneSettings.theNextVisitToEachPage', 'The next visit to each page will be served from your origin until ')- + t('app.cloudflareZoneSettings.itReCachesThisIsSafe', 'it re-caches. This is safe but can briefly increase origin load.')}- confirmText={t('app.cloudflareZoneSettings.purgeEverything', 'Purge everything')}- onConfirm={handlePurgeEverything}- onCancel={() => setConfirmPurgeAll(false)}- variant="danger"- />- )}- </PageLayout>- );-};--// A single setting row — label + help on the left, the control on the right.-// Reads the current value/editability from the live settings state; renders the-// control declaratively from the setting's `type`.-function SettingRow({ setting, state, saving, disabled, onSave }) {- const { t } = useTranslation();- const present = state !== undefined && state !== null;- const editable = present ? state.editable !== false : false;- const locked = disabled || !editable || saving;-- return (- <div className="cf-setting">- <div className="cf-setting__info">- <span className="cf-setting__label">{setting.label}</span>- {setting.help && <span className="cf-setting__help">{setting.help}</span>}- {!present && (- <Badge variant="secondary" className="cf-setting__badge">- {t('app.cloudflareZoneSettings.notAvailableOnThisZone', 'Not available on this zone')}- </Badge>- )}- {present && !editable && (- <Badge variant="secondary" className="cf-setting__badge">- {t('app.cloudflareZoneSettings.lockedByYourCloudflarePlan', 'Locked by your Cloudflare plan')}- </Badge>- )}- </div>- <div className="cf-setting__control">- <SettingControl- setting={setting}- value={present ? state.value : undefined}- locked={locked || !present}- onSave={onSave}- />- </div>- </div>- );-}--function SettingControl({ setting, value, locked, onSave }) {- if (setting.type === 'toggle') {- return (- <Switch- checked={value === 'on'}- disabled={locked}- onCheckedChange={(checked) => onSave(setting.id, checked ? 'on' : 'off')}- />- );- }-- if (setting.type === 'select') {- const current = value === undefined || value === null ? '' : String(value);- return (- <Select- value={current}- disabled={locked}- onValueChange={(v) => {- const opt = setting.options.find(o => String(o.value) === v);- onSave(setting.id, opt ? opt.value : v);- }}- >- <SelectTrigger className="cf-setting__select"><SelectValue /></SelectTrigger>- <SelectContent>- {setting.options.map(o => (- <SelectItem key={String(o.value)} value={String(o.value)}>{o.label}</SelectItem>- ))}- </SelectContent>- </Select>- );- }-- if (setting.type === 'hsts') {- return <HstsControl value={value} locked={locked} onSave={onSave} settingId={setting.id} />;- }-- return null;-}--// HSTS is a compound object setting; editing any field re-sends the whole-// strict_transport_security object so the others are preserved.-function HstsControl({ value, locked, onSave, settingId }) {- const { t } = useTranslation();- const sts = (value && value.strict_transport_security) || {};- const enabled = !!sts.enabled;-- const patch = (changes) => {- const next = {- enabled: sts.enabled || false,- max_age: sts.max_age || 0,- include_subdomains: sts.include_subdomains || false,- preload: sts.preload || false,- nosniff: sts.nosniff !== undefined ? sts.nosniff : true,- ...changes,- };- onSave(settingId, { strict_transport_security: next });- };-- return (- <div className="cf-hsts">- <div className="cf-hsts__row">- <span>{t('app.cloudflareZoneSettings.enabled', 'Enabled')}</span>- <Switch- checked={enabled}- disabled={locked}- onCheckedChange={(checked) => patch({- enabled: checked,- // Give a sane max-age when first enabling.- max_age: checked && !sts.max_age ? 15552000 : sts.max_age || 0,- })}- />- </div>- {enabled && (- <>- <div className="cf-hsts__row">- <span>{t('app.cloudflareZoneSettings.maxAge', 'Max age')}</span>- <Select- value={String(sts.max_age || 0)}- disabled={locked}- onValueChange={(v) => patch({ max_age: Number(v) })}- >- <SelectTrigger className="cf-setting__select"><SelectValue /></SelectTrigger>- <SelectContent>- {HSTS_MAX_AGE.map(o => (- <SelectItem key={o.value} value={String(o.value)}>{o.label}</SelectItem>- ))}- </SelectContent>- </Select>- </div>- <div className="cf-hsts__row">- <span>{t('app.cloudflareZoneSettings.includeSubdomains', 'Include subdomains')}</span>- <Switch- checked={!!sts.include_subdomains}- disabled={locked}- onCheckedChange={(checked) => patch({ include_subdomains: checked })}- />- </div>- <div className="cf-hsts__row">- <span>{t('app.cloudflareZoneSettings.preload', 'Preload')}</span>- <Switch- checked={!!sts.preload}- disabled={locked}- onCheckedChange={(checked) => patch({ preload: checked })}- />- </div>- </>- )}- </div>- );-}--export default CloudflareZoneSettings;diff --git a/frontend/src/plugins/serverkit-cloudflare-ops/plugin.json b/frontend/src/plugins/serverkit-cloudflare-ops/plugin.jsondeleted file mode 100644index d73b29d4..00000000--- a/frontend/src/plugins/serverkit-cloudflare-ops/plugin.json+++ /dev/null@@ -1,30 +0,0 @@-{- "name": "serverkit-cloudflare-ops",- "display_name": "Cloudflare Zone Ops",- "version": "1.0.0",- "description": "Cloudflare zone operations on top of your existing Cloudflare DNS connection, covering zone settings, cache purge, WAF, Workers, Tunnels, and R2/KV/D1 storage. DNS records and the connection itself stay in the core Domains surface; this adds the per-zone control panel reached from a Cloudflare-managed domain.",- "author": "ServerKit",- "license": "MIT",- "category": "integration",- "homepage": "https://github.com/jhd3197/ServerKit",- "permissions": [- "network"- ],- "min_panel_version": "1.7.0",- "featured": true,- "feature_score": 70,- "entry_point": "cloudflare:cloudflare_bp",- "url_prefix": "/api/v1/cloudflare",- "icon": "<path d=\"M20 17.5a3.5 3.5 0 00-.5-6.96A5.5 5.5 0 008.6 9.6 4 4 0 007 17.5z\"/>",- "contributions": {- "routes": [- {- "path": "cloudflare/zones/:zoneId",- "component": "CloudflareZoneSettingsPage"- }- ],- "page_titles": {- "/cloudflare/zones": "Cloudflare Zone"- }- }-}diff --git a/frontend/src/plugins/serverkit-cloudflare-ops/services/cloudflare.js b/frontend/src/plugins/serverkit-cloudflare-ops/services/cloudflare.jsdeleted file mode 100644index b872628e..00000000--- a/frontend/src/plugins/serverkit-cloudflare-ops/services/cloudflare.js+++ /dev/null@@ -1,220 +0,0 @@-// Cloudflare operations — zone settings (SSL/TLS, Speed, Caching, Security) and-// one-click hardening, layered on the existing Cloudflare DNS connection. Zones-// are addressed by their ServerKit DNS zone id (same as the /dns API).-//-// The extension's own /api/v1/cloudflare client, built on the panel's-// ApiClient via the SDK singleton — moved out of the host's services/api/-// with the zone-ops surface (plan 52 Phase 2). The DNS-record layer and the-// Cloudflare connection itself stay core (they back /domains).-import { api } from 'serverkit-sdk';--async function getCloudflareZoneSettings(zoneId) {- return api.request(`/cloudflare/zones/${zoneId}/settings`);-}--async function getCloudflareZoneSetting(zoneId, settingId) {- return api.request(`/cloudflare/zones/${zoneId}/settings/${settingId}`);-}--async function updateCloudflareZoneSetting(zoneId, settingId, value) {- return api.request(`/cloudflare/zones/${zoneId}/settings/${settingId}`, {- method: 'PATCH',- body: { value },- });-}--async function applyCloudflareSettingsPreset(zoneId) {- return api.request(`/cloudflare/zones/${zoneId}/settings/apply-preset`, {- method: 'POST',- });-}--// Purge the zone's Cloudflare cache. payload is { purge_everything: true } or-// { files: [...] } (and on Enterprise, hosts/prefixes/tags).-async function purgeCloudflareCache(zoneId, payload) {- return api.request(`/cloudflare/zones/${zoneId}/purge-cache`, {- method: 'POST',- body: payload,- });-}--// WAF custom firewall rules (http_request_firewall_custom phase).-async function getCloudflareWafRules(zoneId) {- return api.request(`/cloudflare/zones/${zoneId}/waf/rules`);-}--async function addCloudflareWafRule(zoneId, rule) {- return api.request(`/cloudflare/zones/${zoneId}/waf/rules`, {- method: 'POST',- body: rule,- });-}--async function applyCloudflareWafPreset(zoneId, presetKey, params = {}) {- return api.request(`/cloudflare/zones/${zoneId}/waf/presets/${presetKey}`, {- method: 'POST',- body: { params },- });-}--async function updateCloudflareWafRule(zoneId, rulesetId, ruleId, fields) {- return api.request(`/cloudflare/zones/${zoneId}/waf/rulesets/${rulesetId}/rules/${ruleId}`, {- method: 'PATCH',- body: fields,- });-}--async function deleteCloudflareWafRule(zoneId, rulesetId, ruleId) {- return api.request(`/cloudflare/zones/${zoneId}/waf/rulesets/${rulesetId}/rules/${ruleId}`, {- method: 'DELETE',- });-}--// Workers (edge hosting). Account is resolved from the zone server-side.-async function getCloudflareWorkers(zoneId) {- return api.request(`/cloudflare/zones/${zoneId}/workers`);-}--async function deployCloudflareWorker(zoneId, payload) {- return api.request(`/cloudflare/zones/${zoneId}/workers`, {- method: 'POST',- body: payload,- });-}--async function deleteCloudflareWorker(zoneId, name) {- return api.request(`/cloudflare/zones/${zoneId}/workers/${encodeURIComponent(name)}`, {- method: 'DELETE',- });-}--async function addCloudflareWorkerRoute(zoneId, pattern, script) {- return api.request(`/cloudflare/zones/${zoneId}/workers/routes`, {- method: 'POST',- body: { pattern, script },- });-}--async function deleteCloudflareWorkerRoute(zoneId, routeId) {- return api.request(`/cloudflare/zones/${zoneId}/workers/routes/${routeId}`, {- method: 'DELETE',- });-}--// Cloudflare Tunnels (cloudflared) — expose a local service through the edge.-async function getCloudflareTunnels(zoneId) {- return api.request(`/cloudflare/zones/${zoneId}/tunnels`);-}--async function createCloudflareTunnel(zoneId, name) {- return api.request(`/cloudflare/zones/${zoneId}/tunnels`, {- method: 'POST',- body: { name },- });-}--async function deleteCloudflareTunnel(zoneId, tunnelId) {- return api.request(`/cloudflare/zones/${zoneId}/tunnels/${tunnelId}`, {- method: 'DELETE',- });-}--async function getCloudflareTunnelInstall(zoneId, tunnelId) {- return api.request(`/cloudflare/zones/${zoneId}/tunnels/${tunnelId}/install`);-}--async function getCloudflareTunnelHostnames(zoneId, tunnelId) {- return api.request(`/cloudflare/zones/${zoneId}/tunnels/${tunnelId}/hostnames`);-}--async function addCloudflareTunnelHostname(zoneId, tunnelId, hostname, service) {- return api.request(`/cloudflare/zones/${zoneId}/tunnels/${tunnelId}/hostnames`, {- method: 'POST',- body: { hostname, service },- });-}--async function removeCloudflareTunnelHostname(zoneId, tunnelId, hostname) {- return api.request(`/cloudflare/zones/${zoneId}/tunnels/${tunnelId}/hostnames`, {- method: 'DELETE',- body: { hostname },- });-}--// Developer platform — R2 buckets, KV namespaces, D1 databases (account-scoped).-async function getCloudflareStorage(zoneId) {- return api.request(`/cloudflare/zones/${zoneId}/storage`);-}--async function createCloudflareR2Bucket(zoneId, name) {- return api.request(`/cloudflare/zones/${zoneId}/storage/r2`, {- method: 'POST',- body: { name },- });-}--async function deleteCloudflareR2Bucket(zoneId, name) {- return api.request(`/cloudflare/zones/${zoneId}/storage/r2/${encodeURIComponent(name)}`, {- method: 'DELETE',- });-}--async function createCloudflareKvNamespace(zoneId, title) {- return api.request(`/cloudflare/zones/${zoneId}/storage/kv`, {- method: 'POST',- body: { title },- });-}--async function deleteCloudflareKvNamespace(zoneId, namespaceId) {- return api.request(`/cloudflare/zones/${zoneId}/storage/kv/${namespaceId}`, {- method: 'DELETE',- });-}--async function createCloudflareD1Database(zoneId, name) {- return api.request(`/cloudflare/zones/${zoneId}/storage/d1`, {- method: 'POST',- body: { name },- });-}--async function deleteCloudflareD1Database(zoneId, databaseId) {- return api.request(`/cloudflare/zones/${zoneId}/storage/d1/${databaseId}`, {- method: 'DELETE',- });-}--const cloudflareApi = {- getCloudflareZoneSettings,- getCloudflareZoneSetting,- updateCloudflareZoneSetting,- applyCloudflareSettingsPreset,- purgeCloudflareCache,- getCloudflareWafRules,- addCloudflareWafRule,- applyCloudflareWafPreset,- updateCloudflareWafRule,- deleteCloudflareWafRule,- getCloudflareWorkers,- deployCloudflareWorker,- deleteCloudflareWorker,- addCloudflareWorkerRoute,- deleteCloudflareWorkerRoute,- getCloudflareTunnels,- createCloudflareTunnel,- deleteCloudflareTunnel,- getCloudflareTunnelInstall,- getCloudflareTunnelHostnames,- addCloudflareTunnelHostname,- removeCloudflareTunnelHostname,- getCloudflareStorage,- createCloudflareR2Bucket,- deleteCloudflareR2Bucket,- createCloudflareKvNamespace,- deleteCloudflareKvNamespace,- createCloudflareD1Database,- deleteCloudflareD1Database,-};--export default cloudflareApi;diff --git a/frontend/src/plugins/serverkit-cloudflare-ops/styles/cloudflare-zone.scss b/frontend/src/plugins/serverkit-cloudflare-ops/styles/cloudflare-zone.scssdeleted file mode 100644index d0086ff3..00000000--- a/frontend/src/plugins/serverkit-cloudflare-ops/styles/cloudflare-zone.scss+++ /dev/null@@ -1,572 +0,0 @@-// Compiled through the extension's module graph (imported by index.jsx).-// The host's design-token partial is imported via a sync-safe relative-// path — the baked copy lives at frontend/src/plugins/serverkit-cloudflare-ops/,-// so this resolves to frontend/src/styles/_variables.scss.-@import '../../../styles/variables';--// Cloudflare zone settings — detail page reached from a Cloudflare-managed DNS-// zone. Full-bleed top bar (PageTopbar) + tabbed setting groups.--.cf-zone {- &__body {- padding: $spacing-lg;- max-width: 880px;- }-- &__tabs {- margin-top: $spacing-sm;- }-- &__error-actions {- display: flex;- justify-content: center;- gap: $spacing-sm;- margin-top: $spacing-md;- }-}--// Breadcrumb in the top-bar title slot (mirrors the service-detail crumbs).-.cf-crumbs {- display: inline-flex;- align-items: center;- gap: $spacing-xs;- font-size: 0.95rem;-- a {- color: $text-secondary;- text-decoration: none;-- &:hover { color: $primary-color; }- }-- &__sep { color: $text-tertiary; }- &__cur { color: $text-primary; font-weight: 600; }-}--.cf-panel {- background: $card-bg;- border: 1px solid $border-color;- border-radius: $radius-lg;- padding: $spacing-xs $spacing-lg;- margin-top: $spacing-md;-}--// One setting: label/help on the left, control hugging the right.-.cf-setting {- display: flex;- align-items: flex-start;- justify-content: space-between;- gap: $spacing-lg;- padding: $spacing-md 0;- border-bottom: 1px solid $border-color;-- &:last-child { border-bottom: none; }-- &__info {- display: flex;- flex-direction: column;- gap: 4px;- min-width: 0;- }-- &__label {- font-weight: 600;- color: $text-primary;- }-- &__help {- font-size: 0.85rem;- color: $text-muted;- max-width: 52ch;- line-height: 1.4;- }-- &__badge {- align-self: flex-start;- margin-top: 2px;- }-- &__control {- flex-shrink: 0;- display: flex;- align-items: center;- min-height: 32px;- }-- &__select {- min-width: 200px;- }-}--// HSTS compound control — a small stack of rows.-.cf-hsts {- display: flex;- flex-direction: column;- gap: $spacing-sm;- min-width: 240px;-- &__row {- display: flex;- align-items: center;- justify-content: space-between;- gap: $spacing-md;- font-size: 0.88rem;- color: $text-secondary;- }-}--.cf-actions {- & + & { margin-top: $spacing-md; }-- .cf-action {- display: flex;- align-items: center;- justify-content: space-between;- gap: $spacing-lg;- padding: $spacing-md 0;-- &__text {- h3 {- margin: 0 0 4px;- font-size: 1rem;- display: inline-flex;- align-items: center;- gap: $spacing-xs;- }- p { margin: 0; color: $text-muted; font-size: 0.88rem; max-width: 60ch; line-height: 1.5; }- }- }-- &__note {- margin: $spacing-sm 0 0;- color: $text-muted;- font-size: 0.85rem;- }-}--.cf-purge-files {- border-top: 1px solid $border-color;- padding-top: $spacing-md;-- &__label {- display: block;- font-size: 0.85rem;- color: $text-secondary;- margin-bottom: $spacing-xs;- }-- &__actions {- display: flex;- justify-content: flex-end;- margin-top: $spacing-sm;- }-}--// WAF tab — preset picker, custom-rule form, and the active-rules list.-.cf-waf {- &__loading {- padding: $spacing-lg;- color: $text-muted;- }-- &__section {- padding: $spacing-md 0;- border-bottom: 1px solid $border-color;-- &:last-child { border-bottom: none; }- }-- &__heading {- margin: 0 0 4px;- font-size: 0.95rem;- }-- &__hint {- margin: 0 0 $spacing-sm;- color: $text-muted;- font-size: 0.85rem;- }-- &__field {- margin-bottom: $spacing-sm;- }-- &__label {- display: block;- font-size: 0.82rem;- color: $text-secondary;- margin-bottom: 4px;- }-- &__select {- max-width: 320px;- }-- &__preset-desc {- margin: 0 0 $spacing-sm;- color: $text-secondary;- font-size: 0.85rem;- line-height: 1.4;- }-- &__params {- display: flex;- flex-wrap: wrap;- gap: $spacing-md;- }-- &__actions {- display: flex;- justify-content: flex-end;- margin-top: $spacing-sm;- }-- &__list {- list-style: none;- margin: $spacing-sm 0 0;- padding: 0;- display: flex;- flex-direction: column;- gap: $spacing-sm;- }-- &__rule {- display: flex;- align-items: flex-start;- justify-content: space-between;- gap: $spacing-md;- padding: $spacing-md;- background: $bg-elevated;- border: 1px solid $border-color;- border-radius: $radius-md;- }-- &__rule-main {- min-width: 0;- flex: 1;- }-- &__rule-head {- display: flex;- align-items: center;- gap: $spacing-sm;- margin-bottom: $spacing-xs;- }-- &__rule-desc {- font-weight: 600;- color: $text-primary;- }-- &__rule-expr {- display: block;- font-family: $font-mono;- font-size: 0.8rem;- color: $text-secondary;- background: $bg-code;- padding: $spacing-xs $spacing-sm;- border-radius: $radius-sm;- overflow-x: auto;- white-space: pre-wrap;- word-break: break-word;- }-- &__rule-actions {- display: flex;- align-items: center;- gap: $spacing-sm;- flex-shrink: 0;- }-}--// Workers tab — deploy form + script/route lists.-.cf-workers {- &__loading {- padding: $spacing-lg;- color: $text-muted;- }-- &__section {- padding: $spacing-md 0;- border-bottom: 1px solid $border-color;-- &:last-child { border-bottom: none; }- }-- &__heading {- margin: 0 0 $spacing-sm;- font-size: 0.95rem;- }-- &__hint {- margin: $spacing-xs 0 0;- color: $text-muted;- font-size: 0.82rem;- }-- &__field {- margin-bottom: $spacing-sm;- }-- &__label {- display: block;- font-size: 0.82rem;- color: $text-secondary;- margin-bottom: 4px;- }-- &__code {- font-family: $font-mono;- font-size: 0.82rem;- }-- &__actions {- display: flex;- justify-content: flex-end;- }-- &__list {- list-style: none;- margin: $spacing-sm 0 0;- padding: 0;- display: flex;- flex-direction: column;- gap: $spacing-xs;- }-- &__item {- display: flex;- align-items: center;- justify-content: space-between;- gap: $spacing-md;- padding: $spacing-sm $spacing-md;- background: $bg-elevated;- border: 1px solid $border-color;- border-radius: $radius-md;- }-- &__name {- display: flex;- align-items: center;- gap: $spacing-sm;- min-width: 0;- flex-wrap: wrap;-- code {- font-family: $font-mono;- font-size: 0.85rem;- color: $text-primary;- }- }-- &__meta {- color: $text-muted;- font-size: 0.8rem;- }-- &__item-actions {- flex-shrink: 0;- }-}--// Tunnels tab — create form, install command box, tunnel list with hostnames.-.cf-tunnels {- &__loading {- padding: $spacing-lg;- color: $text-muted;- }-- &__section {- padding: $spacing-md 0;- border-bottom: 1px solid $border-color;-- &:last-child { border-bottom: none; }- }-- &__heading {- margin: 0 0 $spacing-sm;- font-size: 0.95rem;- }-- &__hint {- margin: $spacing-xs 0 0;- color: $text-muted;- font-size: 0.82rem;- }-- &__field {- margin-bottom: $spacing-sm;- max-width: 420px;- }-- &__label {- display: block;- font-size: 0.82rem;- color: $text-secondary;- margin-bottom: 4px;- }-- &__actions {- display: flex;- justify-content: flex-start;- }-- &__install {- margin-top: $spacing-md;- padding: $spacing-md;- background: $bg-code;- border: 1px solid $border-color;- border-radius: $radius-md;- display: flex;- flex-direction: column;- gap: $spacing-sm;- align-items: flex-start;- }-- &__cmd {- display: block;- width: 100%;- font-family: $font-mono;- font-size: 0.8rem;- color: $text-primary;- white-space: pre-wrap;- word-break: break-all;- }-- &__list {- list-style: none;- margin: $spacing-sm 0 0;- padding: 0;- display: flex;- flex-direction: column;- gap: $spacing-sm;- }-- &__item {- padding: $spacing-md;- background: $bg-elevated;- border: 1px solid $border-color;- border-radius: $radius-md;- }-- &__item-head {- display: flex;- align-items: center;- gap: $spacing-sm;- flex-wrap: wrap;- }-- &__name {- font-weight: 600;- color: $text-primary;- }-- &__meta {- color: $text-muted;- font-size: 0.8rem;- font-family: $font-mono;- }-- &__item-actions {- display: flex;- gap: $spacing-sm;- margin-top: $spacing-sm;- flex-wrap: wrap;- }-- &__hostnames {- margin-top: $spacing-md;- padding-top: $spacing-md;- border-top: 1px solid $border-color;- display: flex;- flex-direction: column;- gap: $spacing-sm;- }-- &__host {- display: flex;- align-items: center;- justify-content: space-between;- gap: $spacing-md;-- code {- font-family: $font-mono;- font-size: 0.82rem;- color: $text-secondary;- }- }-- &__host-add {- display: flex;- gap: $spacing-sm;- flex-wrap: wrap;- align-items: center;- }-}--// Storage tab — R2 buckets, KV namespaces, D1 databases.-.cf-storage {- &__loading {- padding: $spacing-lg;- color: $text-muted;- }-- &__section {- padding: $spacing-md 0;- border-bottom: 1px solid $border-color;-- &:last-child { border-bottom: none; }- }-- &__heading {- margin: 0 0 $spacing-sm;- font-size: 0.95rem;- }-- &__hint {- margin: $spacing-xs 0;- color: $text-muted;- font-size: 0.82rem;- }-- &__error {- margin: $spacing-xs 0;- color: $text-muted;- font-size: 0.82rem;- font-style: italic;- }-- &__create {- display: flex;- gap: $spacing-sm;- align-items: center;- max-width: 420px;- margin-bottom: $spacing-sm;- }-- &__list {- list-style: none;- margin: 0;- padding: 0;- display: flex;- flex-direction: column;- gap: $spacing-xs;- }-- &__item {- display: flex;- align-items: center;- justify-content: space-between;- gap: $spacing-md;- padding: $spacing-sm $spacing-md;- background: $bg-elevated;- border: 1px solid $border-color;- border-radius: $radius-md;- }-- &__name {- font-family: $font-mono;- font-size: 0.85rem;- color: $text-primary;- }-}