From f064237081c26d134445abda579da771d4b176e3 Mon Sep 17 00:00:00 2001 From: ryan Date: Sun, 30 Aug 2026 17:31:15 +0800 Subject: [PATCH] refactor(server): group OpenFlare domains into bounded contexts Drop the openflare/ and router/v1 nesting. Product code lives under site, fleet, pages, waf, tls, cloudflare, observability, dashboard and option; HTTP wiring is httpapi. Shared model/repository stay the kernel. --- .../server/{openflare => }/apiutil/bind.go | 0 .../server/{openflare => }/apiutil/errors.go | 0 .../{openflare => }/apiutil/middleware.go | 0 .../apiutil/middleware_test.go | 0 .../server/{openflare => }/apiutil/routes.go | 0 .../{openflare => }/cloudflare/client.go | 0 .../{openflare => }/cloudflare/client_test.go | 0 .../server/{openflare => }/cloudflare/errs.go | 0 .../{openflare => }/cloudflare/logics.go | 2 +- .../{openflare => }/cloudflare/reconcile.go | 0 .../cloudflare/reconcile_test.go | 4 +- .../{openflare => }/cloudflare/routers.go | 2 +- .../cloudflare/routers_test.go | 2 +- .../{openflare => }/cloudflare/tasks.go | 2 +- .../{openflare => }/cloudflare/tasks_test.go | 0 .../{openflare => }/cloudflare/types.go | 0 .../{openflare => }/credential/sensitive.go | 0 .../credential/sensitive_test.go | 0 .../server/{openflare => }/dashboard/cache.go | 0 .../{openflare => }/dashboard/helpers.go | 2 +- .../{openflare => }/dashboard/logics.go | 2 +- .../{openflare => }/dashboard/logics_test.go | 2 +- .../{openflare => }/dashboard/routers.go | 2 +- .../agent/access_log_region.go | 0 .../{openflare => fleet}/agent/auth_cache.go | 0 .../{openflare => fleet}/agent/config.go | 2 +- .../{openflare => fleet}/agent/config_test.go | 0 .../server/{openflare => fleet}/agent/errs.go | 0 .../{openflare => fleet}/agent/helpers.go | 2 +- .../agent/helpers_test.go | 2 +- .../{openflare => fleet}/agent/logics.go | 6 +- .../{openflare => fleet}/agent/middleware.go | 0 .../agent/middleware_test.go | 2 +- .../agent/observability.go | 0 .../agent/observability_test.go | 0 .../agent/protocol_alias.go | 0 .../{openflare => fleet}/agent/routers.go | 6 +- .../{openflare => fleet}/agent/types.go | 0 .../agent/waf_ip_group.go | 0 .../agent/waf_ip_group_test.go | 2 +- .../{openflare => fleet}/agent/ws_status.go | 2 +- .../{openflare => fleet}/async_tasks.go | 14 ++-- .../{openflare => fleet}/async_tasks_test.go | 4 +- .../{openflare => fleet}/flared/errs.go | 0 .../{openflare => fleet}/flared/helpers.go | 2 +- .../{openflare => fleet}/flared/logics.go | 2 +- .../{openflare => fleet}/flared/middleware.go | 2 +- .../flared/middleware_test.go | 2 +- .../flared/observability.go | 2 +- .../flared/observability_test.go | 4 +- .../flared/protocol_alias.go | 0 .../{openflare => fleet}/flared/routers.go | 4 +- .../integration/agent_protocol_test.go | 6 +- .../integration/auth_option_test.go | 4 +- .../integration/core_chain_test.go | 4 +- .../integration/helpers_test.go | 2 +- .../integration/security_test.go | 4 +- .../server/{openflare => fleet}/node/errs.go | 0 .../{openflare => fleet}/node/helpers.go | 2 +- .../{openflare => fleet}/node/logics.go | 6 +- .../{openflare => fleet}/node/logics_test.go | 4 +- .../{openflare => fleet}/node/routers.go | 2 +- .../{openflare => fleet}/node/version.go | 0 .../server/{openflare => fleet}/relay/errs.go | 0 .../{openflare => fleet}/relay/helpers.go | 0 .../{openflare => fleet}/relay/logics.go | 4 +- .../{openflare => fleet}/relay/logics_test.go | 4 +- .../{openflare => fleet}/relay/middleware.go | 2 +- .../relay/middleware_test.go | 2 +- .../relay/observability.go | 2 +- .../relay/protocol_alias.go | 0 .../{openflare => fleet}/relay/routers.go | 4 +- .../websocket/agent_hub.go | 0 .../websocket/client_core.go | 0 .../websocket/client_core_test.go | 0 .../{openflare => fleet}/websocket/common.go | 0 .../{openflare => fleet}/websocket/consts.go | 0 .../websocket/flared_hub.go | 0 .../websocket/read_pump.go | 0 .../websocket/relay_hub.go | 0 .../websocket/write_pump.go | 0 .../geoip/data/GeoLite2-Country.mmdb | Bin .../server/{openflare => }/geoip/data/data.go | 0 .../{openflare => }/geoip/data/data_test.go | 0 .../server/{openflare => }/geoip/lookup.go | 0 .../{openflare => }/geoip/lookup_test.go | 0 .../server/{openflare => }/geoip/node.go | 0 .../server/{openflare => }/geoip/runtime.go | 2 +- .../{openflare => }/geoip/runtime_test.go | 2 +- .../v1/openflare => httpapi}/openflare.go | 2 +- .../openflare => httpapi}/register_agent.go | 4 +- .../register_apply_log.go | 6 +- .../register_cloudflare.go | 6 +- .../register_config_version.go | 6 +- .../register_dashboard.go | 6 +- .../v1/openflare => httpapi}/register_node.go | 6 +- .../register_observability.go | 6 +- .../openflare => httpapi}/register_option.go | 6 +- .../openflare => httpapi}/register_origin.go | 6 +- .../openflare => httpapi}/register_pages.go | 6 +- .../register_proxy_route.go | 6 +- .../register_relay_flared.go | 6 +- .../v1/openflare => httpapi}/register_tls.go | 6 +- .../openflare => httpapi}/register_updater.go | 4 +- .../v1/openflare => httpapi}/register_waf.go | 6 +- .../v1/openflare => httpapi}/register_zone.go | 6 +- .../{router/v1/openflare => httpapi}/v1.go | 2 +- .../OpenFlare/plugins/server/migrate/stamp.go | 2 +- .../plugins/server/model/platform_aliases.go | 2 +- .../access_log_ip_summary_test.go | 0 .../observability/access_log_logics.go | 0 .../observability/analytics.go | 0 .../observability/analytics_test.go | 0 .../chwriter/dedup.go | 0 .../chwriter/dedup_test.go | 0 .../chwriter/live_ch_test.go | 4 +- .../chwriter/writer.go | 2 - .../{openflare => }/observability/errs.go | 0 .../tasks => observability}/log_db_switch.go | 8 +-- .../log_db_switch_test.go | 16 ++--- .../observability/node_logics.go | 0 .../observability/query_params_test.go | 0 .../{openflare => }/observability/routers.go | 2 +- .../{openflare => }/ofupload/ofupload.go | 0 .../server/{openflare => }/ofupload/remove.go | 0 ...00cea377a6ceffd4c72c76c77910686be8dc4e.zip | Bin 142 -> 0 bytes .../plugins/server/openflare/tasks/doc.go | 9 --- .../server/{openflare => }/option/errs.go | 0 .../server/{openflare => }/option/logics.go | 4 +- .../{openflare => }/option/logics_test.go | 2 +- .../option/openresty_validators.go | 0 .../option/openresty_validators_test.go | 0 .../server/{openflare => }/option/routers.go | 2 +- .../uptimekuma/client.go | 0 .../{openflare => option}/uptimekuma/sync.go | 0 .../uptimekuma/sync_helpers.go | 0 .../uptimekuma/sync_test.go | 2 +- .../server/{openflare => }/option/validate.go | 2 +- .../{openflare => }/pages/download_url.go | 0 .../pages/download_url_test.go | 0 .../server/{openflare => }/pages/errs.go | 0 .../{openflare => }/pages/github_source.go | 0 .../pages/github_source_action.go | 2 +- .../pages/github_source_identity_test.go | 2 +- .../pages/github_source_test.go | 4 +- .../server/{openflare => }/pages/helpers.go | 2 +- .../server/{openflare => }/pages/logics.go | 2 +- .../{openflare => }/pages/logics_test.go | 2 +- .../{openflare => }/pages/package_metadata.go | 2 +- .../pages/package_metadata_test.go | 2 +- .../server/{openflare => }/pages/rebind.go | 0 .../{openflare => }/pages/rebind_test.go | 2 +- .../server/{openflare => }/pages/routers.go | 2 +- .../pages/routers_source_test.go | 2 +- .../{openflare => }/pages/routers_test.go | 0 .../server/{openflare => }/pages/source.go | 0 .../pages/source_manual_test_helpers_test.go | 2 +- .../pages/source_orphan_cleanup.go | 2 +- .../pages/source_orphan_cleanup_test.go | 4 +- .../{openflare => }/pages/source_provider.go | 0 .../pages/source_provider_test.go | 0 .../{openflare => }/pages/source_runtime.go | 0 .../pages/source_runtime_test.go | 2 +- .../{openflare => }/pages/source_scanner.go | 2 +- .../pages/source_scanner_test.go | 2 +- .../{openflare => }/pages/source_sync.go | 4 +- .../{openflare => }/pages/source_sync_test.go | 4 +- .../{openflare => }/pages/source_tasks.go | 2 +- .../pages/source_tasks_test.go | 0 .../{openflare => }/pages/source_test.go | 2 +- .../server/platform/lifecycle/lifecycle.go | 68 ------------------ backend/OpenFlare/plugins/server/plugin.go | 13 ++-- .../OpenFlare/plugins/server/plugin_tasks.go | 18 ++--- .../repository/analytics/clickhouse_stats.go | 2 +- .../repository/analytics/node_access_log.go | 2 +- .../analytics/node_access_log_test.go | 2 +- .../analytics/node_access_log_writer.go | 4 +- .../analytics/node_observability.go | 2 +- .../analytics/node_observability_test.go | 2 +- .../analytics/node_observability_writer.go | 4 +- .../repository/logstore/cleanup_test.go | 2 +- .../repository/logstore/clickhouse_store.go | 2 +- .../repository/logstore/imports_test.go | 3 +- .../server/repository/logstore/provider.go | 4 +- .../repository/openflare_access_log_test.go | 2 +- .../repository/openflare_acme_account.go | 2 +- .../server/repository/openflare_apply_log.go | 2 +- .../server/repository/openflare_cloudflare.go | 2 +- .../repository/openflare_cloudflare_test.go | 2 +- .../repository/openflare_config_version.go | 2 +- .../repository/openflare_dns_account.go | 2 +- .../server/repository/openflare_node.go | 2 +- .../repository/openflare_observability.go | 2 +- .../server/repository/openflare_origin.go | 2 +- .../server/repository/openflare_pages.go | 2 +- .../repository/openflare_pages_cleanup.go | 2 +- .../repository/openflare_pages_source.go | 2 +- .../repository/openflare_proxy_route.go | 2 +- .../server/repository/openflare_tls.go | 2 +- .../server/repository/openflare_waf.go | 2 +- .../server/repository/openflare_zone.go | 2 +- .../plugins/server/shared/constants.go | 6 -- .../OpenFlare/plugins/server/shared/errs.go | 11 --- .../{openflare => site}/apply_log/errs.go | 0 .../{openflare => site}/apply_log/logics.go | 0 .../apply_log/logics_test.go | 2 +- .../{openflare => site}/apply_log/routers.go | 2 +- .../certificate_snapshot_test.go | 6 +- .../config_version/errs.go | 0 .../config_version/helpers.go | 0 .../config_version/logics.go | 2 +- .../config_version/logics_test.go | 4 +- .../origin_error_page_snapshot_test.go | 2 +- .../config_version/pages_snapshot.go | 0 .../config_version/pages_snapshot_test.go | 2 +- .../config_version/proxy_cache_path_test.go | 0 .../config_version/renderer.go | 0 .../config_version/routers.go | 2 +- .../config_version/snapshot.go | 4 +- .../config_version/waf_graph_snapshot_test.go | 4 +- .../server/{openflare => site}/origin/errs.go | 0 .../{openflare => site}/origin/helpers.go | 0 .../{openflare => site}/origin/logics.go | 0 .../{openflare => site}/origin/logics_test.go | 2 +- .../{openflare => site}/origin/routers.go | 2 +- .../proxy_route/build_helpers.go | 0 .../{openflare => site}/proxy_route/errs.go | 0 .../proxy_route/helpers.go | 0 .../proxy_route/helpers_limit_test.go | 0 .../{openflare => site}/proxy_route/logics.go | 0 .../proxy_route/logics_test.go | 2 +- .../proxy_route/origin_helpers.go | 0 .../proxy_route/routers.go | 2 +- .../routeidentity/identity.go | 0 .../routeidentity/identity_test.go | 0 .../server/{openflare => site}/zone/errs.go | 0 .../{openflare => site}/zone/legacy_import.go | 2 +- .../zone/legacy_import_test.go | 0 .../server/{openflare => site}/zone/logics.go | 2 +- .../{openflare => site}/zone/logics_test.go | 2 +- .../{openflare => site}/zone/routers.go | 2 +- .../server/{openflare => site}/zone/stats.go | 0 backend/OpenFlare/plugins/server/task/task.go | 2 +- .../plugins/server/testhelper/stub_auth.go | 8 +-- .../server/{openflare => }/tls/acme/client.go | 0 .../{openflare => }/tls/acme_obtain_test.go | 0 .../server/{openflare => }/tls/errs.go | 0 .../server/{openflare => }/tls/helpers.go | 0 .../server/{openflare => }/tls/logics.go | 2 +- .../server/{openflare => }/tls/logics_test.go | 2 +- .../server/{openflare => }/tls/obtain.go | 4 +- .../{openflare => }/tls/obtain_helpers.go | 2 +- .../server/{openflare => }/tls/routers.go | 2 +- .../server/{openflare => }/tls/sensitive.go | 2 +- .../{openflare/tasks => tls}/ssl_renew.go | 8 +-- .../tasks => tls}/ssl_renew_test.go | 5 +- .../server/{openflare => }/tls/tasks.go | 0 .../server/{openflare => }/tls/tasks_test.go | 0 .../server/{openflare => }/waf/errs.go | 0 .../{openflare => }/waf/graph_compile.go | 0 .../{openflare => }/waf/graph_compile_test.go | 0 .../server/{openflare => }/waf/graph_types.go | 0 .../{openflare => }/waf/graph_validate.go | 0 .../waf/graph_validate_test.go | 0 .../{openflare => }/waf/ip_group_sync.go | 4 +- .../{openflare => }/waf/ip_group_sync_test.go | 2 +- .../server/{openflare => }/waf/logics.go | 0 .../server/{openflare => }/waf/logics_test.go | 2 +- .../server/{openflare => }/waf/routers.go | 2 +- .../server/{openflare => }/waf/rule_logics.go | 0 .../{openflare => }/waf/rule_logics_test.go | 2 +- .../{openflare => }/waf/rule_routers.go | 2 +- docs/changelog/index.md | 1 + 273 files changed, 261 insertions(+), 355 deletions(-) rename backend/OpenFlare/plugins/server/{openflare => }/apiutil/bind.go (100%) rename backend/OpenFlare/plugins/server/{openflare => }/apiutil/errors.go (100%) rename backend/OpenFlare/plugins/server/{openflare => }/apiutil/middleware.go (100%) rename backend/OpenFlare/plugins/server/{openflare => }/apiutil/middleware_test.go (100%) rename backend/OpenFlare/plugins/server/{openflare => }/apiutil/routes.go (100%) rename backend/OpenFlare/plugins/server/{openflare => }/cloudflare/client.go (100%) rename backend/OpenFlare/plugins/server/{openflare => }/cloudflare/client_test.go (100%) rename backend/OpenFlare/plugins/server/{openflare => }/cloudflare/errs.go (100%) rename backend/OpenFlare/plugins/server/{openflare => }/cloudflare/logics.go (99%) rename backend/OpenFlare/plugins/server/{openflare => }/cloudflare/reconcile.go (100%) rename backend/OpenFlare/plugins/server/{openflare => }/cloudflare/reconcile_test.go (99%) rename backend/OpenFlare/plugins/server/{openflare => }/cloudflare/routers.go (99%) rename backend/OpenFlare/plugins/server/{openflare => }/cloudflare/routers_test.go (100%) rename backend/OpenFlare/plugins/server/{openflare => }/cloudflare/tasks.go (100%) rename backend/OpenFlare/plugins/server/{openflare => }/cloudflare/tasks_test.go (100%) rename backend/OpenFlare/plugins/server/{openflare => }/cloudflare/types.go (100%) rename backend/OpenFlare/plugins/server/{openflare => }/credential/sensitive.go (100%) rename backend/OpenFlare/plugins/server/{openflare => }/credential/sensitive_test.go (100%) rename backend/OpenFlare/plugins/server/{openflare => }/dashboard/cache.go (100%) rename backend/OpenFlare/plugins/server/{openflare => }/dashboard/helpers.go (96%) rename backend/OpenFlare/plugins/server/{openflare => }/dashboard/logics.go (99%) rename backend/OpenFlare/plugins/server/{openflare => }/dashboard/logics_test.go (100%) rename backend/OpenFlare/plugins/server/{openflare => }/dashboard/routers.go (94%) rename backend/OpenFlare/plugins/server/{openflare => fleet}/agent/access_log_region.go (100%) rename backend/OpenFlare/plugins/server/{openflare => fleet}/agent/auth_cache.go (100%) rename backend/OpenFlare/plugins/server/{openflare => fleet}/agent/config.go (97%) rename backend/OpenFlare/plugins/server/{openflare => fleet}/agent/config_test.go (100%) rename backend/OpenFlare/plugins/server/{openflare => fleet}/agent/errs.go (100%) rename backend/OpenFlare/plugins/server/{openflare => fleet}/agent/helpers.go (99%) rename backend/OpenFlare/plugins/server/{openflare => fleet}/agent/helpers_test.go (98%) rename backend/OpenFlare/plugins/server/{openflare => fleet}/agent/logics.go (97%) rename backend/OpenFlare/plugins/server/{openflare => fleet}/agent/middleware.go (100%) rename backend/OpenFlare/plugins/server/{openflare => fleet}/agent/middleware_test.go (100%) rename backend/OpenFlare/plugins/server/{openflare => fleet}/agent/observability.go (100%) rename backend/OpenFlare/plugins/server/{openflare => fleet}/agent/observability_test.go (100%) rename backend/OpenFlare/plugins/server/{openflare => fleet}/agent/protocol_alias.go (100%) rename backend/OpenFlare/plugins/server/{openflare => fleet}/agent/routers.go (98%) rename backend/OpenFlare/plugins/server/{openflare => fleet}/agent/types.go (100%) rename backend/OpenFlare/plugins/server/{openflare => fleet}/agent/waf_ip_group.go (100%) rename backend/OpenFlare/plugins/server/{openflare => fleet}/agent/waf_ip_group_test.go (100%) rename backend/OpenFlare/plugins/server/{openflare => fleet}/agent/ws_status.go (96%) rename backend/OpenFlare/plugins/server/{openflare => fleet}/async_tasks.go (94%) rename backend/OpenFlare/plugins/server/{openflare => fleet}/async_tasks_test.go (98%) rename backend/OpenFlare/plugins/server/{openflare => fleet}/flared/errs.go (100%) rename backend/OpenFlare/plugins/server/{openflare => fleet}/flared/helpers.go (98%) rename backend/OpenFlare/plugins/server/{openflare => fleet}/flared/logics.go (99%) rename backend/OpenFlare/plugins/server/{openflare => fleet}/flared/middleware.go (93%) rename backend/OpenFlare/plugins/server/{openflare => fleet}/flared/middleware_test.go (100%) rename backend/OpenFlare/plugins/server/{openflare => fleet}/flared/observability.go (96%) rename backend/OpenFlare/plugins/server/{openflare => fleet}/flared/observability_test.go (97%) rename backend/OpenFlare/plugins/server/{openflare => fleet}/flared/protocol_alias.go (100%) rename backend/OpenFlare/plugins/server/{openflare => fleet}/flared/routers.go (97%) rename backend/OpenFlare/plugins/server/{openflare => fleet}/integration/agent_protocol_test.go (98%) rename backend/OpenFlare/plugins/server/{openflare => fleet}/integration/auth_option_test.go (100%) rename backend/OpenFlare/plugins/server/{openflare => fleet}/integration/core_chain_test.go (99%) rename backend/OpenFlare/plugins/server/{openflare => fleet}/integration/helpers_test.go (97%) rename backend/OpenFlare/plugins/server/{openflare => fleet}/integration/security_test.go (100%) rename backend/OpenFlare/plugins/server/{openflare => fleet}/node/errs.go (100%) rename backend/OpenFlare/plugins/server/{openflare => fleet}/node/helpers.go (99%) rename backend/OpenFlare/plugins/server/{openflare => fleet}/node/logics.go (98%) rename backend/OpenFlare/plugins/server/{openflare => fleet}/node/logics_test.go (99%) rename backend/OpenFlare/plugins/server/{openflare => fleet}/node/routers.go (99%) rename backend/OpenFlare/plugins/server/{openflare => fleet}/node/version.go (100%) rename backend/OpenFlare/plugins/server/{openflare => fleet}/relay/errs.go (100%) rename backend/OpenFlare/plugins/server/{openflare => fleet}/relay/helpers.go (100%) rename backend/OpenFlare/plugins/server/{openflare => fleet}/relay/logics.go (96%) rename backend/OpenFlare/plugins/server/{openflare => fleet}/relay/logics_test.go (98%) rename backend/OpenFlare/plugins/server/{openflare => fleet}/relay/middleware.go (93%) rename backend/OpenFlare/plugins/server/{openflare => fleet}/relay/middleware_test.go (100%) rename backend/OpenFlare/plugins/server/{openflare => fleet}/relay/observability.go (97%) rename backend/OpenFlare/plugins/server/{openflare => fleet}/relay/protocol_alias.go (100%) rename backend/OpenFlare/plugins/server/{openflare => fleet}/relay/routers.go (94%) rename backend/OpenFlare/plugins/server/{openflare => fleet}/websocket/agent_hub.go (100%) rename backend/OpenFlare/plugins/server/{openflare => fleet}/websocket/client_core.go (100%) rename backend/OpenFlare/plugins/server/{openflare => fleet}/websocket/client_core_test.go (100%) rename backend/OpenFlare/plugins/server/{openflare => fleet}/websocket/common.go (100%) rename backend/OpenFlare/plugins/server/{openflare => fleet}/websocket/consts.go (100%) rename backend/OpenFlare/plugins/server/{openflare => fleet}/websocket/flared_hub.go (100%) rename backend/OpenFlare/plugins/server/{openflare => fleet}/websocket/read_pump.go (100%) rename backend/OpenFlare/plugins/server/{openflare => fleet}/websocket/relay_hub.go (100%) rename backend/OpenFlare/plugins/server/{openflare => fleet}/websocket/write_pump.go (100%) rename backend/OpenFlare/plugins/server/{openflare => }/geoip/data/GeoLite2-Country.mmdb (100%) rename backend/OpenFlare/plugins/server/{openflare => }/geoip/data/data.go (100%) rename backend/OpenFlare/plugins/server/{openflare => }/geoip/data/data_test.go (100%) rename backend/OpenFlare/plugins/server/{openflare => }/geoip/lookup.go (100%) rename backend/OpenFlare/plugins/server/{openflare => }/geoip/lookup_test.go (100%) rename backend/OpenFlare/plugins/server/{openflare => }/geoip/node.go (100%) rename backend/OpenFlare/plugins/server/{openflare => }/geoip/runtime.go (97%) rename backend/OpenFlare/plugins/server/{openflare => }/geoip/runtime_test.go (100%) rename backend/OpenFlare/plugins/server/{router/v1/openflare => httpapi}/openflare.go (97%) rename backend/OpenFlare/plugins/server/{router/v1/openflare => httpapi}/register_agent.go (94%) rename backend/OpenFlare/plugins/server/{router/v1/openflare => httpapi}/register_apply_log.go (78%) rename backend/OpenFlare/plugins/server/{router/v1/openflare => httpapi}/register_cloudflare.go (91%) rename backend/OpenFlare/plugins/server/{router/v1/openflare => httpapi}/register_config_version.go (88%) rename backend/OpenFlare/plugins/server/{router/v1/openflare => httpapi}/register_dashboard.go (75%) rename backend/OpenFlare/plugins/server/{router/v1/openflare => httpapi}/register_node.go (90%) rename backend/OpenFlare/plugins/server/{router/v1/openflare => httpapi}/register_observability.go (88%) rename backend/OpenFlare/plugins/server/{router/v1/openflare => httpapi}/register_option.go (86%) rename backend/OpenFlare/plugins/server/{router/v1/openflare => httpapi}/register_origin.go (83%) rename backend/OpenFlare/plugins/server/{router/v1/openflare => httpapi}/register_pages.go (92%) rename backend/OpenFlare/plugins/server/{router/v1/openflare => httpapi}/register_proxy_route.go (84%) rename backend/OpenFlare/plugins/server/{router/v1/openflare => httpapi}/register_relay_flared.go (85%) rename backend/OpenFlare/plugins/server/{router/v1/openflare => httpapi}/register_tls.go (93%) rename backend/OpenFlare/plugins/server/{router/v1/openflare => httpapi}/register_updater.go (91%) rename backend/OpenFlare/plugins/server/{router/v1/openflare => httpapi}/register_waf.go (91%) rename backend/OpenFlare/plugins/server/{router/v1/openflare => httpapi}/register_zone.go (87%) rename backend/OpenFlare/plugins/server/{router/v1/openflare => httpapi}/v1.go (98%) rename backend/OpenFlare/plugins/server/{openflare => }/observability/access_log_ip_summary_test.go (100%) rename backend/OpenFlare/plugins/server/{openflare => }/observability/access_log_logics.go (100%) rename backend/OpenFlare/plugins/server/{openflare => }/observability/analytics.go (100%) rename backend/OpenFlare/plugins/server/{openflare => }/observability/analytics_test.go (100%) rename backend/OpenFlare/plugins/server/{openflare => observability}/chwriter/dedup.go (100%) rename backend/OpenFlare/plugins/server/{openflare => observability}/chwriter/dedup_test.go (100%) rename backend/OpenFlare/plugins/server/{openflare => observability}/chwriter/live_ch_test.go (97%) rename backend/OpenFlare/plugins/server/{openflare => observability}/chwriter/writer.go (99%) rename backend/OpenFlare/plugins/server/{openflare => }/observability/errs.go (100%) rename backend/OpenFlare/plugins/server/{openflare/tasks => observability}/log_db_switch.go (99%) rename backend/OpenFlare/plugins/server/{openflare/tasks => observability}/log_db_switch_test.go (98%) rename backend/OpenFlare/plugins/server/{openflare => }/observability/node_logics.go (100%) rename backend/OpenFlare/plugins/server/{openflare => }/observability/query_params_test.go (100%) rename backend/OpenFlare/plugins/server/{openflare => }/observability/routers.go (99%) rename backend/OpenFlare/plugins/server/{openflare => }/ofupload/ofupload.go (100%) rename backend/OpenFlare/plugins/server/{openflare => }/ofupload/remove.go (100%) delete mode 100644 backend/OpenFlare/plugins/server/openflare/pages/data/pages/artifacts/published-site/1d0b1001941b126350515d2eaa00cea377a6ceffd4c72c76c77910686be8dc4e.zip delete mode 100644 backend/OpenFlare/plugins/server/openflare/tasks/doc.go rename backend/OpenFlare/plugins/server/{openflare => }/option/errs.go (100%) rename backend/OpenFlare/plugins/server/{openflare => }/option/logics.go (98%) rename backend/OpenFlare/plugins/server/{openflare => }/option/logics_test.go (100%) rename backend/OpenFlare/plugins/server/{openflare => }/option/openresty_validators.go (100%) rename backend/OpenFlare/plugins/server/{openflare => }/option/openresty_validators_test.go (100%) rename backend/OpenFlare/plugins/server/{openflare => }/option/routers.go (98%) rename backend/OpenFlare/plugins/server/{openflare => option}/uptimekuma/client.go (100%) rename backend/OpenFlare/plugins/server/{openflare => option}/uptimekuma/sync.go (100%) rename backend/OpenFlare/plugins/server/{openflare => option}/uptimekuma/sync_helpers.go (100%) rename backend/OpenFlare/plugins/server/{openflare => option}/uptimekuma/sync_test.go (100%) rename backend/OpenFlare/plugins/server/{openflare => }/option/validate.go (99%) rename backend/OpenFlare/plugins/server/{openflare => }/pages/download_url.go (100%) rename backend/OpenFlare/plugins/server/{openflare => }/pages/download_url_test.go (100%) rename backend/OpenFlare/plugins/server/{openflare => }/pages/errs.go (100%) rename backend/OpenFlare/plugins/server/{openflare => }/pages/github_source.go (100%) rename backend/OpenFlare/plugins/server/{openflare => }/pages/github_source_action.go (100%) rename backend/OpenFlare/plugins/server/{openflare => }/pages/github_source_identity_test.go (100%) rename backend/OpenFlare/plugins/server/{openflare => }/pages/github_source_test.go (100%) rename backend/OpenFlare/plugins/server/{openflare => }/pages/helpers.go (99%) rename backend/OpenFlare/plugins/server/{openflare => }/pages/logics.go (99%) rename backend/OpenFlare/plugins/server/{openflare => }/pages/logics_test.go (99%) rename backend/OpenFlare/plugins/server/{openflare => }/pages/package_metadata.go (96%) rename backend/OpenFlare/plugins/server/{openflare => }/pages/package_metadata_test.go (100%) rename backend/OpenFlare/plugins/server/{openflare => }/pages/rebind.go (100%) rename backend/OpenFlare/plugins/server/{openflare => }/pages/rebind_test.go (100%) rename backend/OpenFlare/plugins/server/{openflare => }/pages/routers.go (99%) rename backend/OpenFlare/plugins/server/{openflare => }/pages/routers_source_test.go (100%) rename backend/OpenFlare/plugins/server/{openflare => }/pages/routers_test.go (100%) rename backend/OpenFlare/plugins/server/{openflare => }/pages/source.go (100%) rename backend/OpenFlare/plugins/server/{openflare => }/pages/source_manual_test_helpers_test.go (95%) rename backend/OpenFlare/plugins/server/{openflare => }/pages/source_orphan_cleanup.go (99%) rename backend/OpenFlare/plugins/server/{openflare => }/pages/source_orphan_cleanup_test.go (99%) rename backend/OpenFlare/plugins/server/{openflare => }/pages/source_provider.go (100%) rename backend/OpenFlare/plugins/server/{openflare => }/pages/source_provider_test.go (100%) rename backend/OpenFlare/plugins/server/{openflare => }/pages/source_runtime.go (100%) rename backend/OpenFlare/plugins/server/{openflare => }/pages/source_runtime_test.go (100%) rename backend/OpenFlare/plugins/server/{openflare => }/pages/source_scanner.go (100%) rename backend/OpenFlare/plugins/server/{openflare => }/pages/source_scanner_test.go (100%) rename backend/OpenFlare/plugins/server/{openflare => }/pages/source_sync.go (99%) rename backend/OpenFlare/plugins/server/{openflare => }/pages/source_sync_test.go (99%) rename backend/OpenFlare/plugins/server/{openflare => }/pages/source_tasks.go (100%) rename backend/OpenFlare/plugins/server/{openflare => }/pages/source_tasks_test.go (100%) rename backend/OpenFlare/plugins/server/{openflare => }/pages/source_test.go (100%) delete mode 100644 backend/OpenFlare/plugins/server/platform/lifecycle/lifecycle.go delete mode 100644 backend/OpenFlare/plugins/server/shared/constants.go delete mode 100644 backend/OpenFlare/plugins/server/shared/errs.go rename backend/OpenFlare/plugins/server/{openflare => site}/apply_log/errs.go (100%) rename backend/OpenFlare/plugins/server/{openflare => site}/apply_log/logics.go (100%) rename backend/OpenFlare/plugins/server/{openflare => site}/apply_log/logics_test.go (100%) rename backend/OpenFlare/plugins/server/{openflare => site}/apply_log/routers.go (97%) rename backend/OpenFlare/plugins/server/{openflare => site}/config_version/certificate_snapshot_test.go (98%) rename backend/OpenFlare/plugins/server/{openflare => site}/config_version/errs.go (100%) rename backend/OpenFlare/plugins/server/{openflare => site}/config_version/helpers.go (100%) rename backend/OpenFlare/plugins/server/{openflare => site}/config_version/logics.go (99%) rename backend/OpenFlare/plugins/server/{openflare => site}/config_version/logics_test.go (99%) rename backend/OpenFlare/plugins/server/{openflare => site}/config_version/origin_error_page_snapshot_test.go (100%) rename backend/OpenFlare/plugins/server/{openflare => site}/config_version/pages_snapshot.go (100%) rename backend/OpenFlare/plugins/server/{openflare => site}/config_version/pages_snapshot_test.go (100%) rename backend/OpenFlare/plugins/server/{openflare => site}/config_version/proxy_cache_path_test.go (100%) rename backend/OpenFlare/plugins/server/{openflare => site}/config_version/renderer.go (100%) rename backend/OpenFlare/plugins/server/{openflare => site}/config_version/routers.go (99%) rename backend/OpenFlare/plugins/server/{openflare => site}/config_version/snapshot.go (99%) rename backend/OpenFlare/plugins/server/{openflare => site}/config_version/waf_graph_snapshot_test.go (99%) rename backend/OpenFlare/plugins/server/{openflare => site}/origin/errs.go (100%) rename backend/OpenFlare/plugins/server/{openflare => site}/origin/helpers.go (100%) rename backend/OpenFlare/plugins/server/{openflare => site}/origin/logics.go (100%) rename backend/OpenFlare/plugins/server/{openflare => site}/origin/logics_test.go (100%) rename backend/OpenFlare/plugins/server/{openflare => site}/origin/routers.go (98%) rename backend/OpenFlare/plugins/server/{openflare => site}/proxy_route/build_helpers.go (100%) rename backend/OpenFlare/plugins/server/{openflare => site}/proxy_route/errs.go (100%) rename backend/OpenFlare/plugins/server/{openflare => site}/proxy_route/helpers.go (100%) rename backend/OpenFlare/plugins/server/{openflare => site}/proxy_route/helpers_limit_test.go (100%) rename backend/OpenFlare/plugins/server/{openflare => site}/proxy_route/logics.go (100%) rename backend/OpenFlare/plugins/server/{openflare => site}/proxy_route/logics_test.go (100%) rename backend/OpenFlare/plugins/server/{openflare => site}/proxy_route/origin_helpers.go (100%) rename backend/OpenFlare/plugins/server/{openflare => site}/proxy_route/routers.go (98%) rename backend/OpenFlare/plugins/server/{openflare => site}/routeidentity/identity.go (100%) rename backend/OpenFlare/plugins/server/{openflare => site}/routeidentity/identity_test.go (100%) rename backend/OpenFlare/plugins/server/{openflare => site}/zone/errs.go (100%) rename backend/OpenFlare/plugins/server/{openflare => site}/zone/legacy_import.go (99%) rename backend/OpenFlare/plugins/server/{openflare => site}/zone/legacy_import_test.go (100%) rename backend/OpenFlare/plugins/server/{openflare => site}/zone/logics.go (99%) rename backend/OpenFlare/plugins/server/{openflare => site}/zone/logics_test.go (100%) rename backend/OpenFlare/plugins/server/{openflare => site}/zone/routers.go (99%) rename backend/OpenFlare/plugins/server/{openflare => site}/zone/stats.go (100%) rename backend/OpenFlare/plugins/server/{openflare => }/tls/acme/client.go (100%) rename backend/OpenFlare/plugins/server/{openflare => }/tls/acme_obtain_test.go (100%) rename backend/OpenFlare/plugins/server/{openflare => }/tls/errs.go (100%) rename backend/OpenFlare/plugins/server/{openflare => }/tls/helpers.go (100%) rename backend/OpenFlare/plugins/server/{openflare => }/tls/logics.go (100%) rename backend/OpenFlare/plugins/server/{openflare => }/tls/logics_test.go (98%) rename backend/OpenFlare/plugins/server/{openflare => }/tls/obtain.go (98%) rename backend/OpenFlare/plugins/server/{openflare => }/tls/obtain_helpers.go (97%) rename backend/OpenFlare/plugins/server/{openflare => }/tls/routers.go (99%) rename backend/OpenFlare/plugins/server/{openflare => }/tls/sensitive.go (87%) rename backend/OpenFlare/plugins/server/{openflare/tasks => tls}/ssl_renew.go (85%) rename backend/OpenFlare/plugins/server/{openflare/tasks => tls}/ssl_renew_test.go (92%) rename backend/OpenFlare/plugins/server/{openflare => }/tls/tasks.go (100%) rename backend/OpenFlare/plugins/server/{openflare => }/tls/tasks_test.go (100%) rename backend/OpenFlare/plugins/server/{openflare => }/waf/errs.go (100%) rename backend/OpenFlare/plugins/server/{openflare => }/waf/graph_compile.go (100%) rename backend/OpenFlare/plugins/server/{openflare => }/waf/graph_compile_test.go (100%) rename backend/OpenFlare/plugins/server/{openflare => }/waf/graph_types.go (100%) rename backend/OpenFlare/plugins/server/{openflare => }/waf/graph_validate.go (100%) rename backend/OpenFlare/plugins/server/{openflare => }/waf/graph_validate_test.go (100%) rename backend/OpenFlare/plugins/server/{openflare => }/waf/ip_group_sync.go (99%) rename backend/OpenFlare/plugins/server/{openflare => }/waf/ip_group_sync_test.go (100%) rename backend/OpenFlare/plugins/server/{openflare => }/waf/logics.go (100%) rename backend/OpenFlare/plugins/server/{openflare => }/waf/logics_test.go (100%) rename backend/OpenFlare/plugins/server/{openflare => }/waf/routers.go (99%) rename backend/OpenFlare/plugins/server/{openflare => }/waf/rule_logics.go (100%) rename backend/OpenFlare/plugins/server/{openflare => }/waf/rule_logics_test.go (100%) rename backend/OpenFlare/plugins/server/{openflare => }/waf/rule_routers.go (99%) diff --git a/backend/OpenFlare/plugins/server/openflare/apiutil/bind.go b/backend/OpenFlare/plugins/server/apiutil/bind.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/apiutil/bind.go rename to backend/OpenFlare/plugins/server/apiutil/bind.go diff --git a/backend/OpenFlare/plugins/server/openflare/apiutil/errors.go b/backend/OpenFlare/plugins/server/apiutil/errors.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/apiutil/errors.go rename to backend/OpenFlare/plugins/server/apiutil/errors.go diff --git a/backend/OpenFlare/plugins/server/openflare/apiutil/middleware.go b/backend/OpenFlare/plugins/server/apiutil/middleware.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/apiutil/middleware.go rename to backend/OpenFlare/plugins/server/apiutil/middleware.go diff --git a/backend/OpenFlare/plugins/server/openflare/apiutil/middleware_test.go b/backend/OpenFlare/plugins/server/apiutil/middleware_test.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/apiutil/middleware_test.go rename to backend/OpenFlare/plugins/server/apiutil/middleware_test.go diff --git a/backend/OpenFlare/plugins/server/openflare/apiutil/routes.go b/backend/OpenFlare/plugins/server/apiutil/routes.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/apiutil/routes.go rename to backend/OpenFlare/plugins/server/apiutil/routes.go diff --git a/backend/OpenFlare/plugins/server/openflare/cloudflare/client.go b/backend/OpenFlare/plugins/server/cloudflare/client.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/cloudflare/client.go rename to backend/OpenFlare/plugins/server/cloudflare/client.go diff --git a/backend/OpenFlare/plugins/server/openflare/cloudflare/client_test.go b/backend/OpenFlare/plugins/server/cloudflare/client_test.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/cloudflare/client_test.go rename to backend/OpenFlare/plugins/server/cloudflare/client_test.go diff --git a/backend/OpenFlare/plugins/server/openflare/cloudflare/errs.go b/backend/OpenFlare/plugins/server/cloudflare/errs.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/cloudflare/errs.go rename to backend/OpenFlare/plugins/server/cloudflare/errs.go diff --git a/backend/OpenFlare/plugins/server/openflare/cloudflare/logics.go b/backend/OpenFlare/plugins/server/cloudflare/logics.go similarity index 99% rename from backend/OpenFlare/plugins/server/openflare/cloudflare/logics.go rename to backend/OpenFlare/plugins/server/cloudflare/logics.go index bee6dee3..76895885 100644 --- a/backend/OpenFlare/plugins/server/openflare/cloudflare/logics.go +++ b/backend/OpenFlare/plugins/server/cloudflare/logics.go @@ -11,8 +11,8 @@ import ( "strings" "time" + "Wavelet/OpenFlare/plugins/server/credential" "Wavelet/OpenFlare/plugins/server/model" - "Wavelet/OpenFlare/plugins/server/openflare/credential" "Wavelet/OpenFlare/plugins/server/repository" "Wavelet/pkg/logger" diff --git a/backend/OpenFlare/plugins/server/openflare/cloudflare/reconcile.go b/backend/OpenFlare/plugins/server/cloudflare/reconcile.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/cloudflare/reconcile.go rename to backend/OpenFlare/plugins/server/cloudflare/reconcile.go diff --git a/backend/OpenFlare/plugins/server/openflare/cloudflare/reconcile_test.go b/backend/OpenFlare/plugins/server/cloudflare/reconcile_test.go similarity index 99% rename from backend/OpenFlare/plugins/server/openflare/cloudflare/reconcile_test.go rename to backend/OpenFlare/plugins/server/cloudflare/reconcile_test.go index 488ebdd3..ff932f1b 100644 --- a/backend/OpenFlare/plugins/server/openflare/cloudflare/reconcile_test.go +++ b/backend/OpenFlare/plugins/server/cloudflare/reconcile_test.go @@ -8,10 +8,10 @@ import ( "errors" "testing" - db "Wavelet/plugins/infra/database" + "Wavelet/OpenFlare/plugins/server/credential" "Wavelet/OpenFlare/plugins/server/model" - "Wavelet/OpenFlare/plugins/server/openflare/credential" "Wavelet/OpenFlare/plugins/server/repository" + db "Wavelet/plugins/infra/database" "github.com/glebarez/sqlite" "gorm.io/gorm" diff --git a/backend/OpenFlare/plugins/server/openflare/cloudflare/routers.go b/backend/OpenFlare/plugins/server/cloudflare/routers.go similarity index 99% rename from backend/OpenFlare/plugins/server/openflare/cloudflare/routers.go rename to backend/OpenFlare/plugins/server/cloudflare/routers.go index b02c52c9..73fc1ff5 100644 --- a/backend/OpenFlare/plugins/server/openflare/cloudflare/routers.go +++ b/backend/OpenFlare/plugins/server/cloudflare/routers.go @@ -7,7 +7,7 @@ import ( "errors" "net/http" - "Wavelet/OpenFlare/plugins/server/openflare/apiutil" + "Wavelet/OpenFlare/plugins/server/apiutil" "Wavelet/pkg/response" "github.com/gin-gonic/gin" diff --git a/backend/OpenFlare/plugins/server/openflare/cloudflare/routers_test.go b/backend/OpenFlare/plugins/server/cloudflare/routers_test.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/cloudflare/routers_test.go rename to backend/OpenFlare/plugins/server/cloudflare/routers_test.go index 096c2552..37a6c66f 100644 --- a/backend/OpenFlare/plugins/server/openflare/cloudflare/routers_test.go +++ b/backend/OpenFlare/plugins/server/cloudflare/routers_test.go @@ -9,9 +9,9 @@ import ( "strings" "testing" - db "Wavelet/plugins/infra/database" "Wavelet/OpenFlare/plugins/server/repository" "Wavelet/pkg/response" + db "Wavelet/plugins/infra/database" "github.com/gin-gonic/gin" ) diff --git a/backend/OpenFlare/plugins/server/openflare/cloudflare/tasks.go b/backend/OpenFlare/plugins/server/cloudflare/tasks.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/cloudflare/tasks.go rename to backend/OpenFlare/plugins/server/cloudflare/tasks.go index 05c3f441..66bcb68a 100644 --- a/backend/OpenFlare/plugins/server/openflare/cloudflare/tasks.go +++ b/backend/OpenFlare/plugins/server/cloudflare/tasks.go @@ -12,9 +12,9 @@ import ( "io" "strings" - "Wavelet/OpenFlare/plugins/server/task" "Wavelet/OpenFlare/plugins/server/model" "Wavelet/OpenFlare/plugins/server/repository" + "Wavelet/OpenFlare/plugins/server/task" "gorm.io/gorm" ) diff --git a/backend/OpenFlare/plugins/server/openflare/cloudflare/tasks_test.go b/backend/OpenFlare/plugins/server/cloudflare/tasks_test.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/cloudflare/tasks_test.go rename to backend/OpenFlare/plugins/server/cloudflare/tasks_test.go diff --git a/backend/OpenFlare/plugins/server/openflare/cloudflare/types.go b/backend/OpenFlare/plugins/server/cloudflare/types.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/cloudflare/types.go rename to backend/OpenFlare/plugins/server/cloudflare/types.go diff --git a/backend/OpenFlare/plugins/server/openflare/credential/sensitive.go b/backend/OpenFlare/plugins/server/credential/sensitive.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/credential/sensitive.go rename to backend/OpenFlare/plugins/server/credential/sensitive.go diff --git a/backend/OpenFlare/plugins/server/openflare/credential/sensitive_test.go b/backend/OpenFlare/plugins/server/credential/sensitive_test.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/credential/sensitive_test.go rename to backend/OpenFlare/plugins/server/credential/sensitive_test.go diff --git a/backend/OpenFlare/plugins/server/openflare/dashboard/cache.go b/backend/OpenFlare/plugins/server/dashboard/cache.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/dashboard/cache.go rename to backend/OpenFlare/plugins/server/dashboard/cache.go diff --git a/backend/OpenFlare/plugins/server/openflare/dashboard/helpers.go b/backend/OpenFlare/plugins/server/dashboard/helpers.go similarity index 96% rename from backend/OpenFlare/plugins/server/openflare/dashboard/helpers.go rename to backend/OpenFlare/plugins/server/dashboard/helpers.go index 2f9bf19b..2da007ad 100644 --- a/backend/OpenFlare/plugins/server/openflare/dashboard/helpers.go +++ b/backend/OpenFlare/plugins/server/dashboard/helpers.go @@ -8,8 +8,8 @@ import ( "strings" "time" + ofws "Wavelet/OpenFlare/plugins/server/fleet/websocket" "Wavelet/OpenFlare/plugins/server/model" - ofws "Wavelet/OpenFlare/plugins/server/openflare/websocket" ) const ( diff --git a/backend/OpenFlare/plugins/server/openflare/dashboard/logics.go b/backend/OpenFlare/plugins/server/dashboard/logics.go similarity index 99% rename from backend/OpenFlare/plugins/server/openflare/dashboard/logics.go rename to backend/OpenFlare/plugins/server/dashboard/logics.go index e98b4ad0..bc3ef173 100644 --- a/backend/OpenFlare/plugins/server/openflare/dashboard/logics.go +++ b/backend/OpenFlare/plugins/server/dashboard/logics.go @@ -11,7 +11,7 @@ import ( "Wavelet/OpenFlare/plugins/server/repository" "Wavelet/OpenFlare/plugins/server/model" - "Wavelet/OpenFlare/plugins/server/openflare/observability" + "Wavelet/OpenFlare/plugins/server/observability" ) // Summary is the dashboard node summary section. diff --git a/backend/OpenFlare/plugins/server/openflare/dashboard/logics_test.go b/backend/OpenFlare/plugins/server/dashboard/logics_test.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/dashboard/logics_test.go rename to backend/OpenFlare/plugins/server/dashboard/logics_test.go index 99db82d2..31f8a25c 100644 --- a/backend/OpenFlare/plugins/server/openflare/dashboard/logics_test.go +++ b/backend/OpenFlare/plugins/server/dashboard/logics_test.go @@ -11,8 +11,8 @@ import ( "Wavelet/OpenFlare/plugins/server/repository" "Wavelet/OpenFlare/plugins/server/testhelper" - db "Wavelet/plugins/infra/database" "Wavelet/OpenFlare/plugins/server/model" + db "Wavelet/plugins/infra/database" "github.com/glebarez/sqlite" "github.com/stretchr/testify/assert" diff --git a/backend/OpenFlare/plugins/server/openflare/dashboard/routers.go b/backend/OpenFlare/plugins/server/dashboard/routers.go similarity index 94% rename from backend/OpenFlare/plugins/server/openflare/dashboard/routers.go rename to backend/OpenFlare/plugins/server/dashboard/routers.go index e00debe0..99f32897 100644 --- a/backend/OpenFlare/plugins/server/openflare/dashboard/routers.go +++ b/backend/OpenFlare/plugins/server/dashboard/routers.go @@ -6,7 +6,7 @@ package dashboard import ( "net/http" - "Wavelet/OpenFlare/plugins/server/openflare/apiutil" + "Wavelet/OpenFlare/plugins/server/apiutil" "Wavelet/pkg/response" "github.com/gin-gonic/gin" diff --git a/backend/OpenFlare/plugins/server/openflare/agent/access_log_region.go b/backend/OpenFlare/plugins/server/fleet/agent/access_log_region.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/agent/access_log_region.go rename to backend/OpenFlare/plugins/server/fleet/agent/access_log_region.go diff --git a/backend/OpenFlare/plugins/server/openflare/agent/auth_cache.go b/backend/OpenFlare/plugins/server/fleet/agent/auth_cache.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/agent/auth_cache.go rename to backend/OpenFlare/plugins/server/fleet/agent/auth_cache.go diff --git a/backend/OpenFlare/plugins/server/openflare/agent/config.go b/backend/OpenFlare/plugins/server/fleet/agent/config.go similarity index 97% rename from backend/OpenFlare/plugins/server/openflare/agent/config.go rename to backend/OpenFlare/plugins/server/fleet/agent/config.go index fdd7e8df..de949e34 100644 --- a/backend/OpenFlare/plugins/server/openflare/agent/config.go +++ b/backend/OpenFlare/plugins/server/fleet/agent/config.go @@ -11,7 +11,7 @@ import ( "Wavelet/OpenFlare/plugins/server/repository" - "Wavelet/OpenFlare/plugins/server/openflare/pages" + "Wavelet/OpenFlare/plugins/server/pages" openrestyrender "Wavelet/OpenFlare/share/render/openresty" "gorm.io/gorm" diff --git a/backend/OpenFlare/plugins/server/openflare/agent/config_test.go b/backend/OpenFlare/plugins/server/fleet/agent/config_test.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/agent/config_test.go rename to backend/OpenFlare/plugins/server/fleet/agent/config_test.go diff --git a/backend/OpenFlare/plugins/server/openflare/agent/errs.go b/backend/OpenFlare/plugins/server/fleet/agent/errs.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/agent/errs.go rename to backend/OpenFlare/plugins/server/fleet/agent/errs.go diff --git a/backend/OpenFlare/plugins/server/openflare/agent/helpers.go b/backend/OpenFlare/plugins/server/fleet/agent/helpers.go similarity index 99% rename from backend/OpenFlare/plugins/server/openflare/agent/helpers.go rename to backend/OpenFlare/plugins/server/fleet/agent/helpers.go index 509684e6..f66943e8 100644 --- a/backend/OpenFlare/plugins/server/openflare/agent/helpers.go +++ b/backend/OpenFlare/plugins/server/fleet/agent/helpers.go @@ -11,8 +11,8 @@ import ( "strings" "time" + ofgeoip "Wavelet/OpenFlare/plugins/server/geoip" "Wavelet/OpenFlare/plugins/server/model" - ofgeoip "Wavelet/OpenFlare/plugins/server/openflare/geoip" "Wavelet/OpenFlare/plugins/server/repository" ) diff --git a/backend/OpenFlare/plugins/server/openflare/agent/helpers_test.go b/backend/OpenFlare/plugins/server/fleet/agent/helpers_test.go similarity index 98% rename from backend/OpenFlare/plugins/server/openflare/agent/helpers_test.go rename to backend/OpenFlare/plugins/server/fleet/agent/helpers_test.go index 6430f0cd..088decf9 100644 --- a/backend/OpenFlare/plugins/server/openflare/agent/helpers_test.go +++ b/backend/OpenFlare/plugins/server/fleet/agent/helpers_test.go @@ -8,8 +8,8 @@ import ( "net" "testing" + ofgeoip "Wavelet/OpenFlare/plugins/server/geoip" "Wavelet/OpenFlare/plugins/server/model" - ofgeoip "Wavelet/OpenFlare/plugins/server/openflare/geoip" pkggeoip "Wavelet/OpenFlare/share/geoip" ) diff --git a/backend/OpenFlare/plugins/server/openflare/agent/logics.go b/backend/OpenFlare/plugins/server/fleet/agent/logics.go similarity index 97% rename from backend/OpenFlare/plugins/server/openflare/agent/logics.go rename to backend/OpenFlare/plugins/server/fleet/agent/logics.go index 8c62b8a7..53a96ea1 100644 --- a/backend/OpenFlare/plugins/server/openflare/agent/logics.go +++ b/backend/OpenFlare/plugins/server/fleet/agent/logics.go @@ -9,12 +9,12 @@ import ( "strings" "time" - cf "Wavelet/OpenFlare/plugins/server/openflare/cloudflare" + cf "Wavelet/OpenFlare/plugins/server/cloudflare" "Wavelet/OpenFlare/plugins/server/repository" + "Wavelet/OpenFlare/plugins/server/fleet/node" + ofgeoip "Wavelet/OpenFlare/plugins/server/geoip" "Wavelet/OpenFlare/plugins/server/model" - ofgeoip "Wavelet/OpenFlare/plugins/server/openflare/geoip" - "Wavelet/OpenFlare/plugins/server/openflare/node" "Wavelet/pkg/logger" ) diff --git a/backend/OpenFlare/plugins/server/openflare/agent/middleware.go b/backend/OpenFlare/plugins/server/fleet/agent/middleware.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/agent/middleware.go rename to backend/OpenFlare/plugins/server/fleet/agent/middleware.go diff --git a/backend/OpenFlare/plugins/server/openflare/agent/middleware_test.go b/backend/OpenFlare/plugins/server/fleet/agent/middleware_test.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/agent/middleware_test.go rename to backend/OpenFlare/plugins/server/fleet/agent/middleware_test.go index 62eb3d6e..8f8a31d1 100644 --- a/backend/OpenFlare/plugins/server/openflare/agent/middleware_test.go +++ b/backend/OpenFlare/plugins/server/fleet/agent/middleware_test.go @@ -11,11 +11,11 @@ import ( "testing" "time" - db "Wavelet/plugins/infra/database" "Wavelet/OpenFlare/plugins/server/model" "Wavelet/OpenFlare/plugins/server/repository" "Wavelet/OpenFlare/plugins/server/testhelper" "Wavelet/pkg/response" + db "Wavelet/plugins/infra/database" "github.com/gin-gonic/gin" "github.com/glebarez/sqlite" diff --git a/backend/OpenFlare/plugins/server/openflare/agent/observability.go b/backend/OpenFlare/plugins/server/fleet/agent/observability.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/agent/observability.go rename to backend/OpenFlare/plugins/server/fleet/agent/observability.go diff --git a/backend/OpenFlare/plugins/server/openflare/agent/observability_test.go b/backend/OpenFlare/plugins/server/fleet/agent/observability_test.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/agent/observability_test.go rename to backend/OpenFlare/plugins/server/fleet/agent/observability_test.go diff --git a/backend/OpenFlare/plugins/server/openflare/agent/protocol_alias.go b/backend/OpenFlare/plugins/server/fleet/agent/protocol_alias.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/agent/protocol_alias.go rename to backend/OpenFlare/plugins/server/fleet/agent/protocol_alias.go diff --git a/backend/OpenFlare/plugins/server/openflare/agent/routers.go b/backend/OpenFlare/plugins/server/fleet/agent/routers.go similarity index 98% rename from backend/OpenFlare/plugins/server/openflare/agent/routers.go rename to backend/OpenFlare/plugins/server/fleet/agent/routers.go index 52408a42..ff03cc98 100644 --- a/backend/OpenFlare/plugins/server/openflare/agent/routers.go +++ b/backend/OpenFlare/plugins/server/fleet/agent/routers.go @@ -7,9 +7,9 @@ import ( "net/http" "strconv" - "Wavelet/OpenFlare/plugins/server/openflare/apiutil" - "Wavelet/OpenFlare/plugins/server/openflare/pages" - "Wavelet/OpenFlare/plugins/server/openflare/websocket" + "Wavelet/OpenFlare/plugins/server/apiutil" + "Wavelet/OpenFlare/plugins/server/fleet/websocket" + "Wavelet/OpenFlare/plugins/server/pages" "Wavelet/OpenFlare/share/protocol" "Wavelet/pkg/response" diff --git a/backend/OpenFlare/plugins/server/openflare/agent/types.go b/backend/OpenFlare/plugins/server/fleet/agent/types.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/agent/types.go rename to backend/OpenFlare/plugins/server/fleet/agent/types.go diff --git a/backend/OpenFlare/plugins/server/openflare/agent/waf_ip_group.go b/backend/OpenFlare/plugins/server/fleet/agent/waf_ip_group.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/agent/waf_ip_group.go rename to backend/OpenFlare/plugins/server/fleet/agent/waf_ip_group.go diff --git a/backend/OpenFlare/plugins/server/openflare/agent/waf_ip_group_test.go b/backend/OpenFlare/plugins/server/fleet/agent/waf_ip_group_test.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/agent/waf_ip_group_test.go rename to backend/OpenFlare/plugins/server/fleet/agent/waf_ip_group_test.go index cc0f5804..2ebc233b 100644 --- a/backend/OpenFlare/plugins/server/openflare/agent/waf_ip_group_test.go +++ b/backend/OpenFlare/plugins/server/fleet/agent/waf_ip_group_test.go @@ -12,9 +12,9 @@ import ( "Wavelet/OpenFlare/plugins/server/repository" - db "Wavelet/plugins/infra/database" "Wavelet/OpenFlare/plugins/server/model" "Wavelet/OpenFlare/share/protocol" + db "Wavelet/plugins/infra/database" "github.com/glebarez/sqlite" "github.com/stretchr/testify/assert" diff --git a/backend/OpenFlare/plugins/server/openflare/agent/ws_status.go b/backend/OpenFlare/plugins/server/fleet/agent/ws_status.go similarity index 96% rename from backend/OpenFlare/plugins/server/openflare/agent/ws_status.go rename to backend/OpenFlare/plugins/server/fleet/agent/ws_status.go index 826767e7..60bdac3b 100644 --- a/backend/OpenFlare/plugins/server/openflare/agent/ws_status.go +++ b/backend/OpenFlare/plugins/server/fleet/agent/ws_status.go @@ -10,7 +10,7 @@ import ( "Wavelet/OpenFlare/plugins/server/repository" - ofws "Wavelet/OpenFlare/plugins/server/openflare/websocket" + ofws "Wavelet/OpenFlare/plugins/server/fleet/websocket" ) // HandleWSStatus processes an agent websocket status payload (replaces HTTP heartbeat in WS mode). diff --git a/backend/OpenFlare/plugins/server/openflare/async_tasks.go b/backend/OpenFlare/plugins/server/fleet/async_tasks.go similarity index 94% rename from backend/OpenFlare/plugins/server/openflare/async_tasks.go rename to backend/OpenFlare/plugins/server/fleet/async_tasks.go index bcb0c68a..b209f94d 100644 --- a/backend/OpenFlare/plugins/server/openflare/async_tasks.go +++ b/backend/OpenFlare/plugins/server/fleet/async_tasks.go @@ -1,8 +1,8 @@ // Copyright 2026 Arctel.net // SPDX-License-Identifier: Apache-2.0 -// Package openflare implements openflare configuration, service orchestration, and background tasks. -package openflare +// Package fleet contains shared edge-fleet task metadata used by plugin registration. +package fleet import ( "context" @@ -10,12 +10,12 @@ import ( "sync" "time" - "Wavelet/OpenFlare/plugins/server/task" "Wavelet/OpenFlare/plugins/server/model" - "Wavelet/OpenFlare/plugins/server/openflare/tasks" - "Wavelet/OpenFlare/plugins/server/openflare/uptimekuma" - "Wavelet/OpenFlare/plugins/server/openflare/waf" + "Wavelet/OpenFlare/plugins/server/option/uptimekuma" "Wavelet/OpenFlare/plugins/server/repository" + "Wavelet/OpenFlare/plugins/server/task" + "Wavelet/OpenFlare/plugins/server/tls" + "Wavelet/OpenFlare/plugins/server/waf" ) const ( @@ -103,7 +103,7 @@ type SSLRenewHandler struct{} // Execute runs SSL certificate renewal for all due certificates. func (h *SSLRenewHandler) Execute(ctx context.Context, _ []byte) (*task.TaskResult, error) { task.AppendLog(ctx, "开始扫描待续期证书") - if err := tasks.RunSSLRenewJob(ctx); err != nil { + if err := tls.RunSSLRenewJob(ctx); err != nil { task.AppendLog(ctx, "SSL 自动续期失败: %v", err) return nil, err } diff --git a/backend/OpenFlare/plugins/server/openflare/async_tasks_test.go b/backend/OpenFlare/plugins/server/fleet/async_tasks_test.go similarity index 98% rename from backend/OpenFlare/plugins/server/openflare/async_tasks_test.go rename to backend/OpenFlare/plugins/server/fleet/async_tasks_test.go index 9ed01dde..55e6e287 100644 --- a/backend/OpenFlare/plugins/server/openflare/async_tasks_test.go +++ b/backend/OpenFlare/plugins/server/fleet/async_tasks_test.go @@ -1,15 +1,15 @@ // Copyright 2026 Arctel.net // SPDX-License-Identifier: Apache-2.0 -package openflare +package fleet import ( "context" "testing" - db "Wavelet/plugins/infra/database" "Wavelet/OpenFlare/plugins/server/model" "Wavelet/OpenFlare/plugins/server/repository" + db "Wavelet/plugins/infra/database" "github.com/glebarez/sqlite" "github.com/stretchr/testify/assert" diff --git a/backend/OpenFlare/plugins/server/openflare/flared/errs.go b/backend/OpenFlare/plugins/server/fleet/flared/errs.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/flared/errs.go rename to backend/OpenFlare/plugins/server/fleet/flared/errs.go diff --git a/backend/OpenFlare/plugins/server/openflare/flared/helpers.go b/backend/OpenFlare/plugins/server/fleet/flared/helpers.go similarity index 98% rename from backend/OpenFlare/plugins/server/openflare/flared/helpers.go rename to backend/OpenFlare/plugins/server/fleet/flared/helpers.go index ecdfb19c..a29f854b 100644 --- a/backend/OpenFlare/plugins/server/openflare/flared/helpers.go +++ b/backend/OpenFlare/plugins/server/fleet/flared/helpers.go @@ -12,8 +12,8 @@ import ( "Wavelet/OpenFlare/plugins/server/repository" + "Wavelet/OpenFlare/plugins/server/fleet/relay" "Wavelet/OpenFlare/plugins/server/model" - "Wavelet/OpenFlare/plugins/server/openflare/relay" ) const ( diff --git a/backend/OpenFlare/plugins/server/openflare/flared/logics.go b/backend/OpenFlare/plugins/server/fleet/flared/logics.go similarity index 99% rename from backend/OpenFlare/plugins/server/openflare/flared/logics.go rename to backend/OpenFlare/plugins/server/fleet/flared/logics.go index e193e925..85ba0f0a 100644 --- a/backend/OpenFlare/plugins/server/openflare/flared/logics.go +++ b/backend/OpenFlare/plugins/server/fleet/flared/logics.go @@ -12,8 +12,8 @@ import ( "Wavelet/OpenFlare/plugins/server/repository" + "Wavelet/OpenFlare/plugins/server/fleet/agent" "Wavelet/OpenFlare/plugins/server/model" - "Wavelet/OpenFlare/plugins/server/openflare/agent" "gorm.io/gorm" ) diff --git a/backend/OpenFlare/plugins/server/openflare/flared/middleware.go b/backend/OpenFlare/plugins/server/fleet/flared/middleware.go similarity index 93% rename from backend/OpenFlare/plugins/server/openflare/flared/middleware.go rename to backend/OpenFlare/plugins/server/fleet/flared/middleware.go index 2e95f3d5..6249c665 100644 --- a/backend/OpenFlare/plugins/server/openflare/flared/middleware.go +++ b/backend/OpenFlare/plugins/server/fleet/flared/middleware.go @@ -6,7 +6,7 @@ package flared import ( "strings" - "Wavelet/OpenFlare/plugins/server/openflare/agent" + "Wavelet/OpenFlare/plugins/server/fleet/agent" "Wavelet/pkg/response" diff --git a/backend/OpenFlare/plugins/server/openflare/flared/middleware_test.go b/backend/OpenFlare/plugins/server/fleet/flared/middleware_test.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/flared/middleware_test.go rename to backend/OpenFlare/plugins/server/fleet/flared/middleware_test.go index 60943049..9e619dff 100644 --- a/backend/OpenFlare/plugins/server/openflare/flared/middleware_test.go +++ b/backend/OpenFlare/plugins/server/fleet/flared/middleware_test.go @@ -11,9 +11,9 @@ import ( "Wavelet/OpenFlare/plugins/server/repository" - db "Wavelet/plugins/infra/database" "Wavelet/OpenFlare/plugins/server/model" "Wavelet/pkg/response" + db "Wavelet/plugins/infra/database" "github.com/gin-gonic/gin" "github.com/glebarez/sqlite" diff --git a/backend/OpenFlare/plugins/server/openflare/flared/observability.go b/backend/OpenFlare/plugins/server/fleet/flared/observability.go similarity index 96% rename from backend/OpenFlare/plugins/server/openflare/flared/observability.go rename to backend/OpenFlare/plugins/server/fleet/flared/observability.go index b6b965c6..02c38bd4 100644 --- a/backend/OpenFlare/plugins/server/openflare/flared/observability.go +++ b/backend/OpenFlare/plugins/server/fleet/flared/observability.go @@ -9,7 +9,7 @@ import ( "strings" "time" - "Wavelet/OpenFlare/plugins/server/openflare/agent" + "Wavelet/OpenFlare/plugins/server/fleet/agent" "go.uber.org/zap" ) diff --git a/backend/OpenFlare/plugins/server/openflare/flared/observability_test.go b/backend/OpenFlare/plugins/server/fleet/flared/observability_test.go similarity index 97% rename from backend/OpenFlare/plugins/server/openflare/flared/observability_test.go rename to backend/OpenFlare/plugins/server/fleet/flared/observability_test.go index a4ebead6..579d2f28 100644 --- a/backend/OpenFlare/plugins/server/openflare/flared/observability_test.go +++ b/backend/OpenFlare/plugins/server/fleet/flared/observability_test.go @@ -9,9 +9,9 @@ import ( "Wavelet/OpenFlare/plugins/server/repository" - db "Wavelet/plugins/infra/database" + "Wavelet/OpenFlare/plugins/server/fleet/agent" "Wavelet/OpenFlare/plugins/server/model" - "Wavelet/OpenFlare/plugins/server/openflare/agent" + db "Wavelet/plugins/infra/database" "github.com/glebarez/sqlite" "github.com/stretchr/testify/assert" diff --git a/backend/OpenFlare/plugins/server/openflare/flared/protocol_alias.go b/backend/OpenFlare/plugins/server/fleet/flared/protocol_alias.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/flared/protocol_alias.go rename to backend/OpenFlare/plugins/server/fleet/flared/protocol_alias.go diff --git a/backend/OpenFlare/plugins/server/openflare/flared/routers.go b/backend/OpenFlare/plugins/server/fleet/flared/routers.go similarity index 97% rename from backend/OpenFlare/plugins/server/openflare/flared/routers.go rename to backend/OpenFlare/plugins/server/fleet/flared/routers.go index e6df41b3..6dc238eb 100644 --- a/backend/OpenFlare/plugins/server/openflare/flared/routers.go +++ b/backend/OpenFlare/plugins/server/fleet/flared/routers.go @@ -6,9 +6,9 @@ package flared import ( "net/http" + "Wavelet/OpenFlare/plugins/server/apiutil" + ofws "Wavelet/OpenFlare/plugins/server/fleet/websocket" "Wavelet/OpenFlare/plugins/server/model" - "Wavelet/OpenFlare/plugins/server/openflare/apiutil" - ofws "Wavelet/OpenFlare/plugins/server/openflare/websocket" "Wavelet/pkg/response" "github.com/gin-gonic/gin" diff --git a/backend/OpenFlare/plugins/server/openflare/integration/agent_protocol_test.go b/backend/OpenFlare/plugins/server/fleet/integration/agent_protocol_test.go similarity index 98% rename from backend/OpenFlare/plugins/server/openflare/integration/agent_protocol_test.go rename to backend/OpenFlare/plugins/server/fleet/integration/agent_protocol_test.go index a28135db..6b89f97f 100644 --- a/backend/OpenFlare/plugins/server/openflare/integration/agent_protocol_test.go +++ b/backend/OpenFlare/plugins/server/fleet/integration/agent_protocol_test.go @@ -10,11 +10,11 @@ import ( "Wavelet/OpenFlare/plugins/server/repository" - db "Wavelet/plugins/infra/database" + "Wavelet/OpenFlare/plugins/server/fleet/agent" + ofnode "Wavelet/OpenFlare/plugins/server/fleet/node" "Wavelet/OpenFlare/plugins/server/model" - "Wavelet/OpenFlare/plugins/server/openflare/agent" - ofnode "Wavelet/OpenFlare/plugins/server/openflare/node" "Wavelet/OpenFlare/plugins/server/testhelper" + db "Wavelet/plugins/infra/database" "github.com/gin-gonic/gin" "github.com/glebarez/sqlite" diff --git a/backend/OpenFlare/plugins/server/openflare/integration/auth_option_test.go b/backend/OpenFlare/plugins/server/fleet/integration/auth_option_test.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/integration/auth_option_test.go rename to backend/OpenFlare/plugins/server/fleet/integration/auth_option_test.go index 3144c6fe..e95ee358 100644 --- a/backend/OpenFlare/plugins/server/openflare/integration/auth_option_test.go +++ b/backend/OpenFlare/plugins/server/fleet/integration/auth_option_test.go @@ -10,11 +10,11 @@ import ( "net/http/httptest" "testing" - "Wavelet/OpenFlare/plugins/server/runtimeconfig" - "Wavelet/pkg/idgen" "Wavelet/OpenFlare/plugins/server/model" "Wavelet/OpenFlare/plugins/server/repository" + "Wavelet/OpenFlare/plugins/server/runtimeconfig" "Wavelet/OpenFlare/plugins/server/testhelper" + "Wavelet/pkg/idgen" "github.com/gin-contrib/sessions" "github.com/gin-contrib/sessions/cookie" diff --git a/backend/OpenFlare/plugins/server/openflare/integration/core_chain_test.go b/backend/OpenFlare/plugins/server/fleet/integration/core_chain_test.go similarity index 99% rename from backend/OpenFlare/plugins/server/openflare/integration/core_chain_test.go rename to backend/OpenFlare/plugins/server/fleet/integration/core_chain_test.go index 1028a90c..e55decd6 100644 --- a/backend/OpenFlare/plugins/server/openflare/integration/core_chain_test.go +++ b/backend/OpenFlare/plugins/server/fleet/integration/core_chain_test.go @@ -9,10 +9,10 @@ import ( "testing" "time" - db "Wavelet/plugins/infra/database" + "Wavelet/OpenFlare/plugins/server/fleet/agent" "Wavelet/OpenFlare/plugins/server/model" - "Wavelet/OpenFlare/plugins/server/openflare/agent" "Wavelet/OpenFlare/plugins/server/testhelper" + db "Wavelet/plugins/infra/database" "github.com/gin-gonic/gin" "github.com/glebarez/sqlite" diff --git a/backend/OpenFlare/plugins/server/openflare/integration/helpers_test.go b/backend/OpenFlare/plugins/server/fleet/integration/helpers_test.go similarity index 97% rename from backend/OpenFlare/plugins/server/openflare/integration/helpers_test.go rename to backend/OpenFlare/plugins/server/fleet/integration/helpers_test.go index d2f0ec17..477de857 100644 --- a/backend/OpenFlare/plugins/server/openflare/integration/helpers_test.go +++ b/backend/OpenFlare/plugins/server/fleet/integration/helpers_test.go @@ -12,7 +12,7 @@ import ( "testing" "Wavelet/OpenFlare/plugins/server" - ofrouter "Wavelet/OpenFlare/plugins/server/router/v1/openflare" + ofrouter "Wavelet/OpenFlare/plugins/server/httpapi" "Wavelet/OpenFlare/plugins/server/testhelper" "Wavelet/core" "Wavelet/core/contracts" diff --git a/backend/OpenFlare/plugins/server/openflare/integration/security_test.go b/backend/OpenFlare/plugins/server/fleet/integration/security_test.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/integration/security_test.go rename to backend/OpenFlare/plugins/server/fleet/integration/security_test.go index acc1093b..f28a0bef 100644 --- a/backend/OpenFlare/plugins/server/openflare/integration/security_test.go +++ b/backend/OpenFlare/plugins/server/fleet/integration/security_test.go @@ -16,10 +16,10 @@ import ( "testing" "time" - "Wavelet/OpenFlare/plugins/server/runtimeconfig" - db "Wavelet/plugins/infra/database" "Wavelet/OpenFlare/plugins/server/model" + "Wavelet/OpenFlare/plugins/server/runtimeconfig" "Wavelet/OpenFlare/plugins/server/testhelper" + db "Wavelet/plugins/infra/database" "github.com/gin-gonic/gin" "github.com/glebarez/sqlite" diff --git a/backend/OpenFlare/plugins/server/openflare/node/errs.go b/backend/OpenFlare/plugins/server/fleet/node/errs.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/node/errs.go rename to backend/OpenFlare/plugins/server/fleet/node/errs.go diff --git a/backend/OpenFlare/plugins/server/openflare/node/helpers.go b/backend/OpenFlare/plugins/server/fleet/node/helpers.go similarity index 99% rename from backend/OpenFlare/plugins/server/openflare/node/helpers.go rename to backend/OpenFlare/plugins/server/fleet/node/helpers.go index 6f205cd5..bf78a837 100644 --- a/backend/OpenFlare/plugins/server/openflare/node/helpers.go +++ b/backend/OpenFlare/plugins/server/fleet/node/helpers.go @@ -18,8 +18,8 @@ import ( "strings" "time" + ofws "Wavelet/OpenFlare/plugins/server/fleet/websocket" "Wavelet/OpenFlare/plugins/server/model" - ofws "Wavelet/OpenFlare/plugins/server/openflare/websocket" ) const ( diff --git a/backend/OpenFlare/plugins/server/openflare/node/logics.go b/backend/OpenFlare/plugins/server/fleet/node/logics.go similarity index 98% rename from backend/OpenFlare/plugins/server/openflare/node/logics.go rename to backend/OpenFlare/plugins/server/fleet/node/logics.go index 30db9082..72b28a68 100644 --- a/backend/OpenFlare/plugins/server/openflare/node/logics.go +++ b/backend/OpenFlare/plugins/server/fleet/node/logics.go @@ -10,10 +10,10 @@ import ( "strings" "time" + cf "Wavelet/OpenFlare/plugins/server/cloudflare" + ofws "Wavelet/OpenFlare/plugins/server/fleet/websocket" "Wavelet/OpenFlare/plugins/server/model" - cf "Wavelet/OpenFlare/plugins/server/openflare/cloudflare" - "Wavelet/OpenFlare/plugins/server/openflare/observability" - ofws "Wavelet/OpenFlare/plugins/server/openflare/websocket" + "Wavelet/OpenFlare/plugins/server/observability" "Wavelet/OpenFlare/plugins/server/repository" "Wavelet/pkg/logger" diff --git a/backend/OpenFlare/plugins/server/openflare/node/logics_test.go b/backend/OpenFlare/plugins/server/fleet/node/logics_test.go similarity index 99% rename from backend/OpenFlare/plugins/server/openflare/node/logics_test.go rename to backend/OpenFlare/plugins/server/fleet/node/logics_test.go index 81e48efd..ff23fc0c 100644 --- a/backend/OpenFlare/plugins/server/openflare/node/logics_test.go +++ b/backend/OpenFlare/plugins/server/fleet/node/logics_test.go @@ -11,11 +11,11 @@ import ( "testing" "time" - db "Wavelet/plugins/infra/database" + cf "Wavelet/OpenFlare/plugins/server/cloudflare" "Wavelet/OpenFlare/plugins/server/model" - cf "Wavelet/OpenFlare/plugins/server/openflare/cloudflare" "Wavelet/OpenFlare/plugins/server/repository" "Wavelet/OpenFlare/plugins/server/testhelper" + db "Wavelet/plugins/infra/database" "github.com/glebarez/sqlite" "github.com/stretchr/testify/assert" diff --git a/backend/OpenFlare/plugins/server/openflare/node/routers.go b/backend/OpenFlare/plugins/server/fleet/node/routers.go similarity index 99% rename from backend/OpenFlare/plugins/server/openflare/node/routers.go rename to backend/OpenFlare/plugins/server/fleet/node/routers.go index 16fcd8b7..a7d27359 100644 --- a/backend/OpenFlare/plugins/server/openflare/node/routers.go +++ b/backend/OpenFlare/plugins/server/fleet/node/routers.go @@ -9,7 +9,7 @@ import ( "io" "net/http" - "Wavelet/OpenFlare/plugins/server/openflare/apiutil" + "Wavelet/OpenFlare/plugins/server/apiutil" "Wavelet/pkg/response" "github.com/gin-gonic/gin" diff --git a/backend/OpenFlare/plugins/server/openflare/node/version.go b/backend/OpenFlare/plugins/server/fleet/node/version.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/node/version.go rename to backend/OpenFlare/plugins/server/fleet/node/version.go diff --git a/backend/OpenFlare/plugins/server/openflare/relay/errs.go b/backend/OpenFlare/plugins/server/fleet/relay/errs.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/relay/errs.go rename to backend/OpenFlare/plugins/server/fleet/relay/errs.go diff --git a/backend/OpenFlare/plugins/server/openflare/relay/helpers.go b/backend/OpenFlare/plugins/server/fleet/relay/helpers.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/relay/helpers.go rename to backend/OpenFlare/plugins/server/fleet/relay/helpers.go diff --git a/backend/OpenFlare/plugins/server/openflare/relay/logics.go b/backend/OpenFlare/plugins/server/fleet/relay/logics.go similarity index 96% rename from backend/OpenFlare/plugins/server/openflare/relay/logics.go rename to backend/OpenFlare/plugins/server/fleet/relay/logics.go index 4fa32620..8961bf71 100644 --- a/backend/OpenFlare/plugins/server/openflare/relay/logics.go +++ b/backend/OpenFlare/plugins/server/fleet/relay/logics.go @@ -10,9 +10,9 @@ import ( "strings" "time" + "Wavelet/OpenFlare/plugins/server/fleet/agent" + ofgeoip "Wavelet/OpenFlare/plugins/server/geoip" "Wavelet/OpenFlare/plugins/server/model" - "Wavelet/OpenFlare/plugins/server/openflare/agent" - ofgeoip "Wavelet/OpenFlare/plugins/server/openflare/geoip" "Wavelet/OpenFlare/plugins/server/repository" ) diff --git a/backend/OpenFlare/plugins/server/openflare/relay/logics_test.go b/backend/OpenFlare/plugins/server/fleet/relay/logics_test.go similarity index 98% rename from backend/OpenFlare/plugins/server/openflare/relay/logics_test.go rename to backend/OpenFlare/plugins/server/fleet/relay/logics_test.go index 60ce2085..ae064b5a 100644 --- a/backend/OpenFlare/plugins/server/openflare/relay/logics_test.go +++ b/backend/OpenFlare/plugins/server/fleet/relay/logics_test.go @@ -12,9 +12,9 @@ import ( "Wavelet/OpenFlare/plugins/server/repository" "Wavelet/OpenFlare/plugins/server/testhelper" - db "Wavelet/plugins/infra/database" + "Wavelet/OpenFlare/plugins/server/fleet/agent" "Wavelet/OpenFlare/plugins/server/model" - "Wavelet/OpenFlare/plugins/server/openflare/agent" + db "Wavelet/plugins/infra/database" "github.com/glebarez/sqlite" "github.com/stretchr/testify/assert" diff --git a/backend/OpenFlare/plugins/server/openflare/relay/middleware.go b/backend/OpenFlare/plugins/server/fleet/relay/middleware.go similarity index 93% rename from backend/OpenFlare/plugins/server/openflare/relay/middleware.go rename to backend/OpenFlare/plugins/server/fleet/relay/middleware.go index 28dba96b..b3f15c2d 100644 --- a/backend/OpenFlare/plugins/server/openflare/relay/middleware.go +++ b/backend/OpenFlare/plugins/server/fleet/relay/middleware.go @@ -6,7 +6,7 @@ package relay import ( "strings" - "Wavelet/OpenFlare/plugins/server/openflare/agent" + "Wavelet/OpenFlare/plugins/server/fleet/agent" "Wavelet/pkg/response" diff --git a/backend/OpenFlare/plugins/server/openflare/relay/middleware_test.go b/backend/OpenFlare/plugins/server/fleet/relay/middleware_test.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/relay/middleware_test.go rename to backend/OpenFlare/plugins/server/fleet/relay/middleware_test.go index 447f7d36..19f1c8a8 100644 --- a/backend/OpenFlare/plugins/server/openflare/relay/middleware_test.go +++ b/backend/OpenFlare/plugins/server/fleet/relay/middleware_test.go @@ -11,9 +11,9 @@ import ( "Wavelet/OpenFlare/plugins/server/repository" - db "Wavelet/plugins/infra/database" "Wavelet/OpenFlare/plugins/server/model" "Wavelet/pkg/response" + db "Wavelet/plugins/infra/database" "github.com/gin-gonic/gin" "github.com/glebarez/sqlite" diff --git a/backend/OpenFlare/plugins/server/openflare/relay/observability.go b/backend/OpenFlare/plugins/server/fleet/relay/observability.go similarity index 97% rename from backend/OpenFlare/plugins/server/openflare/relay/observability.go rename to backend/OpenFlare/plugins/server/fleet/relay/observability.go index 6b6811dd..82165a50 100644 --- a/backend/OpenFlare/plugins/server/openflare/relay/observability.go +++ b/backend/OpenFlare/plugins/server/fleet/relay/observability.go @@ -9,8 +9,8 @@ import ( "Wavelet/OpenFlare/plugins/server/repository" + "Wavelet/OpenFlare/plugins/server/fleet/agent" "Wavelet/OpenFlare/plugins/server/model" - "Wavelet/OpenFlare/plugins/server/openflare/agent" "go.uber.org/zap" ) diff --git a/backend/OpenFlare/plugins/server/openflare/relay/protocol_alias.go b/backend/OpenFlare/plugins/server/fleet/relay/protocol_alias.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/relay/protocol_alias.go rename to backend/OpenFlare/plugins/server/fleet/relay/protocol_alias.go diff --git a/backend/OpenFlare/plugins/server/openflare/relay/routers.go b/backend/OpenFlare/plugins/server/fleet/relay/routers.go similarity index 94% rename from backend/OpenFlare/plugins/server/openflare/relay/routers.go rename to backend/OpenFlare/plugins/server/fleet/relay/routers.go index 0ac6574b..ff2d4ffe 100644 --- a/backend/OpenFlare/plugins/server/openflare/relay/routers.go +++ b/backend/OpenFlare/plugins/server/fleet/relay/routers.go @@ -6,9 +6,9 @@ package relay import ( "net/http" + "Wavelet/OpenFlare/plugins/server/apiutil" + ofws "Wavelet/OpenFlare/plugins/server/fleet/websocket" "Wavelet/OpenFlare/plugins/server/model" - "Wavelet/OpenFlare/plugins/server/openflare/apiutil" - ofws "Wavelet/OpenFlare/plugins/server/openflare/websocket" "Wavelet/pkg/response" "github.com/gin-gonic/gin" diff --git a/backend/OpenFlare/plugins/server/openflare/websocket/agent_hub.go b/backend/OpenFlare/plugins/server/fleet/websocket/agent_hub.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/websocket/agent_hub.go rename to backend/OpenFlare/plugins/server/fleet/websocket/agent_hub.go diff --git a/backend/OpenFlare/plugins/server/openflare/websocket/client_core.go b/backend/OpenFlare/plugins/server/fleet/websocket/client_core.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/websocket/client_core.go rename to backend/OpenFlare/plugins/server/fleet/websocket/client_core.go diff --git a/backend/OpenFlare/plugins/server/openflare/websocket/client_core_test.go b/backend/OpenFlare/plugins/server/fleet/websocket/client_core_test.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/websocket/client_core_test.go rename to backend/OpenFlare/plugins/server/fleet/websocket/client_core_test.go diff --git a/backend/OpenFlare/plugins/server/openflare/websocket/common.go b/backend/OpenFlare/plugins/server/fleet/websocket/common.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/websocket/common.go rename to backend/OpenFlare/plugins/server/fleet/websocket/common.go diff --git a/backend/OpenFlare/plugins/server/openflare/websocket/consts.go b/backend/OpenFlare/plugins/server/fleet/websocket/consts.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/websocket/consts.go rename to backend/OpenFlare/plugins/server/fleet/websocket/consts.go diff --git a/backend/OpenFlare/plugins/server/openflare/websocket/flared_hub.go b/backend/OpenFlare/plugins/server/fleet/websocket/flared_hub.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/websocket/flared_hub.go rename to backend/OpenFlare/plugins/server/fleet/websocket/flared_hub.go diff --git a/backend/OpenFlare/plugins/server/openflare/websocket/read_pump.go b/backend/OpenFlare/plugins/server/fleet/websocket/read_pump.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/websocket/read_pump.go rename to backend/OpenFlare/plugins/server/fleet/websocket/read_pump.go diff --git a/backend/OpenFlare/plugins/server/openflare/websocket/relay_hub.go b/backend/OpenFlare/plugins/server/fleet/websocket/relay_hub.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/websocket/relay_hub.go rename to backend/OpenFlare/plugins/server/fleet/websocket/relay_hub.go diff --git a/backend/OpenFlare/plugins/server/openflare/websocket/write_pump.go b/backend/OpenFlare/plugins/server/fleet/websocket/write_pump.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/websocket/write_pump.go rename to backend/OpenFlare/plugins/server/fleet/websocket/write_pump.go diff --git a/backend/OpenFlare/plugins/server/openflare/geoip/data/GeoLite2-Country.mmdb b/backend/OpenFlare/plugins/server/geoip/data/GeoLite2-Country.mmdb similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/geoip/data/GeoLite2-Country.mmdb rename to backend/OpenFlare/plugins/server/geoip/data/GeoLite2-Country.mmdb diff --git a/backend/OpenFlare/plugins/server/openflare/geoip/data/data.go b/backend/OpenFlare/plugins/server/geoip/data/data.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/geoip/data/data.go rename to backend/OpenFlare/plugins/server/geoip/data/data.go diff --git a/backend/OpenFlare/plugins/server/openflare/geoip/data/data_test.go b/backend/OpenFlare/plugins/server/geoip/data/data_test.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/geoip/data/data_test.go rename to backend/OpenFlare/plugins/server/geoip/data/data_test.go diff --git a/backend/OpenFlare/plugins/server/openflare/geoip/lookup.go b/backend/OpenFlare/plugins/server/geoip/lookup.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/geoip/lookup.go rename to backend/OpenFlare/plugins/server/geoip/lookup.go diff --git a/backend/OpenFlare/plugins/server/openflare/geoip/lookup_test.go b/backend/OpenFlare/plugins/server/geoip/lookup_test.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/geoip/lookup_test.go rename to backend/OpenFlare/plugins/server/geoip/lookup_test.go diff --git a/backend/OpenFlare/plugins/server/openflare/geoip/node.go b/backend/OpenFlare/plugins/server/geoip/node.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/geoip/node.go rename to backend/OpenFlare/plugins/server/geoip/node.go diff --git a/backend/OpenFlare/plugins/server/openflare/geoip/runtime.go b/backend/OpenFlare/plugins/server/geoip/runtime.go similarity index 97% rename from backend/OpenFlare/plugins/server/openflare/geoip/runtime.go rename to backend/OpenFlare/plugins/server/geoip/runtime.go index 3bfaf9c5..a86341e1 100644 --- a/backend/OpenFlare/plugins/server/openflare/geoip/runtime.go +++ b/backend/OpenFlare/plugins/server/geoip/runtime.go @@ -11,8 +11,8 @@ import ( "strings" "sync" + geodata "Wavelet/OpenFlare/plugins/server/geoip/data" "Wavelet/OpenFlare/plugins/server/model" - geodata "Wavelet/OpenFlare/plugins/server/openflare/geoip/data" "Wavelet/OpenFlare/plugins/server/repository" pkggeoip "Wavelet/OpenFlare/share/geoip" "Wavelet/pkg/logger" diff --git a/backend/OpenFlare/plugins/server/openflare/geoip/runtime_test.go b/backend/OpenFlare/plugins/server/geoip/runtime_test.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/geoip/runtime_test.go rename to backend/OpenFlare/plugins/server/geoip/runtime_test.go index 45e0ecef..f6a9f1b6 100644 --- a/backend/OpenFlare/plugins/server/openflare/geoip/runtime_test.go +++ b/backend/OpenFlare/plugins/server/geoip/runtime_test.go @@ -7,9 +7,9 @@ import ( "context" "testing" - db "Wavelet/plugins/infra/database" "Wavelet/OpenFlare/plugins/server/model" pkggeoip "Wavelet/OpenFlare/share/geoip" + db "Wavelet/plugins/infra/database" "github.com/glebarez/sqlite" "gorm.io/gorm" diff --git a/backend/OpenFlare/plugins/server/router/v1/openflare/openflare.go b/backend/OpenFlare/plugins/server/httpapi/openflare.go similarity index 97% rename from backend/OpenFlare/plugins/server/router/v1/openflare/openflare.go rename to backend/OpenFlare/plugins/server/httpapi/openflare.go index 948d9695..72aa34fe 100644 --- a/backend/OpenFlare/plugins/server/router/v1/openflare/openflare.go +++ b/backend/OpenFlare/plugins/server/httpapi/openflare.go @@ -4,7 +4,7 @@ // Package openflare registers OpenFlare HTTP routes. // Management console APIs are mounted via RegisterV1Routes under /api/v1/d. // Agent/Relay/Tunnel protocol routes are mounted via RegisterRoutes under /api/v1. -package openflare +package httpapi import ( "Wavelet/core" diff --git a/backend/OpenFlare/plugins/server/router/v1/openflare/register_agent.go b/backend/OpenFlare/plugins/server/httpapi/register_agent.go similarity index 94% rename from backend/OpenFlare/plugins/server/router/v1/openflare/register_agent.go rename to backend/OpenFlare/plugins/server/httpapi/register_agent.go index 18a7d9bd..6ca6ed0f 100644 --- a/backend/OpenFlare/plugins/server/router/v1/openflare/register_agent.go +++ b/backend/OpenFlare/plugins/server/httpapi/register_agent.go @@ -1,10 +1,10 @@ // Copyright 2026 Arctel.net // SPDX-License-Identifier: Apache-2.0 -package openflare +package httpapi import ( - "Wavelet/OpenFlare/plugins/server/openflare/agent" + "Wavelet/OpenFlare/plugins/server/fleet/agent" "Wavelet/core" ) diff --git a/backend/OpenFlare/plugins/server/router/v1/openflare/register_apply_log.go b/backend/OpenFlare/plugins/server/httpapi/register_apply_log.go similarity index 78% rename from backend/OpenFlare/plugins/server/router/v1/openflare/register_apply_log.go rename to backend/OpenFlare/plugins/server/httpapi/register_apply_log.go index 2a2ea603..601ec2d8 100644 --- a/backend/OpenFlare/plugins/server/router/v1/openflare/register_apply_log.go +++ b/backend/OpenFlare/plugins/server/httpapi/register_apply_log.go @@ -1,11 +1,11 @@ // Copyright 2026 Arctel.net // SPDX-License-Identifier: Apache-2.0 -package openflare +package httpapi import ( - "Wavelet/OpenFlare/plugins/server/openflare/apiutil" - "Wavelet/OpenFlare/plugins/server/openflare/apply_log" + "Wavelet/OpenFlare/plugins/server/apiutil" + "Wavelet/OpenFlare/plugins/server/site/apply_log" "Wavelet/core" "Wavelet/core/contracts" ) diff --git a/backend/OpenFlare/plugins/server/router/v1/openflare/register_cloudflare.go b/backend/OpenFlare/plugins/server/httpapi/register_cloudflare.go similarity index 91% rename from backend/OpenFlare/plugins/server/router/v1/openflare/register_cloudflare.go rename to backend/OpenFlare/plugins/server/httpapi/register_cloudflare.go index 326e4f65..55ebb74d 100644 --- a/backend/OpenFlare/plugins/server/router/v1/openflare/register_cloudflare.go +++ b/backend/OpenFlare/plugins/server/httpapi/register_cloudflare.go @@ -1,11 +1,11 @@ // Copyright 2026 Arctel.net // SPDX-License-Identifier: Apache-2.0 -package openflare +package httpapi import ( - "Wavelet/OpenFlare/plugins/server/openflare/apiutil" - cf "Wavelet/OpenFlare/plugins/server/openflare/cloudflare" + "Wavelet/OpenFlare/plugins/server/apiutil" + cf "Wavelet/OpenFlare/plugins/server/cloudflare" "Wavelet/core" "Wavelet/core/contracts" ) diff --git a/backend/OpenFlare/plugins/server/router/v1/openflare/register_config_version.go b/backend/OpenFlare/plugins/server/httpapi/register_config_version.go similarity index 88% rename from backend/OpenFlare/plugins/server/router/v1/openflare/register_config_version.go rename to backend/OpenFlare/plugins/server/httpapi/register_config_version.go index da959eb2..75ac863b 100644 --- a/backend/OpenFlare/plugins/server/router/v1/openflare/register_config_version.go +++ b/backend/OpenFlare/plugins/server/httpapi/register_config_version.go @@ -1,11 +1,11 @@ // Copyright 2026 Arctel.net // SPDX-License-Identifier: Apache-2.0 -package openflare +package httpapi import ( - "Wavelet/OpenFlare/plugins/server/openflare/apiutil" - "Wavelet/OpenFlare/plugins/server/openflare/config_version" + "Wavelet/OpenFlare/plugins/server/apiutil" + "Wavelet/OpenFlare/plugins/server/site/config_version" "Wavelet/core" "Wavelet/core/contracts" ) diff --git a/backend/OpenFlare/plugins/server/router/v1/openflare/register_dashboard.go b/backend/OpenFlare/plugins/server/httpapi/register_dashboard.go similarity index 75% rename from backend/OpenFlare/plugins/server/router/v1/openflare/register_dashboard.go rename to backend/OpenFlare/plugins/server/httpapi/register_dashboard.go index 9170106c..4f220828 100644 --- a/backend/OpenFlare/plugins/server/router/v1/openflare/register_dashboard.go +++ b/backend/OpenFlare/plugins/server/httpapi/register_dashboard.go @@ -1,11 +1,11 @@ // Copyright 2026 Arctel.net // SPDX-License-Identifier: Apache-2.0 -package openflare +package httpapi import ( - "Wavelet/OpenFlare/plugins/server/openflare/apiutil" - "Wavelet/OpenFlare/plugins/server/openflare/dashboard" + "Wavelet/OpenFlare/plugins/server/apiutil" + "Wavelet/OpenFlare/plugins/server/dashboard" "Wavelet/core" "Wavelet/core/contracts" ) diff --git a/backend/OpenFlare/plugins/server/router/v1/openflare/register_node.go b/backend/OpenFlare/plugins/server/httpapi/register_node.go similarity index 90% rename from backend/OpenFlare/plugins/server/router/v1/openflare/register_node.go rename to backend/OpenFlare/plugins/server/httpapi/register_node.go index e6045823..e84245da 100644 --- a/backend/OpenFlare/plugins/server/router/v1/openflare/register_node.go +++ b/backend/OpenFlare/plugins/server/httpapi/register_node.go @@ -1,11 +1,11 @@ // Copyright 2026 Arctel.net // SPDX-License-Identifier: Apache-2.0 -package openflare +package httpapi import ( - "Wavelet/OpenFlare/plugins/server/openflare/apiutil" - "Wavelet/OpenFlare/plugins/server/openflare/node" + "Wavelet/OpenFlare/plugins/server/apiutil" + "Wavelet/OpenFlare/plugins/server/fleet/node" "Wavelet/core" "Wavelet/core/contracts" ) diff --git a/backend/OpenFlare/plugins/server/router/v1/openflare/register_observability.go b/backend/OpenFlare/plugins/server/httpapi/register_observability.go similarity index 88% rename from backend/OpenFlare/plugins/server/router/v1/openflare/register_observability.go rename to backend/OpenFlare/plugins/server/httpapi/register_observability.go index 23061d65..f2e2899a 100644 --- a/backend/OpenFlare/plugins/server/router/v1/openflare/register_observability.go +++ b/backend/OpenFlare/plugins/server/httpapi/register_observability.go @@ -1,11 +1,11 @@ // Copyright 2026 Arctel.net // SPDX-License-Identifier: Apache-2.0 -package openflare +package httpapi import ( - "Wavelet/OpenFlare/plugins/server/openflare/apiutil" - "Wavelet/OpenFlare/plugins/server/openflare/observability" + "Wavelet/OpenFlare/plugins/server/apiutil" + "Wavelet/OpenFlare/plugins/server/observability" "Wavelet/core" "Wavelet/core/contracts" ) diff --git a/backend/OpenFlare/plugins/server/router/v1/openflare/register_option.go b/backend/OpenFlare/plugins/server/httpapi/register_option.go similarity index 86% rename from backend/OpenFlare/plugins/server/router/v1/openflare/register_option.go rename to backend/OpenFlare/plugins/server/httpapi/register_option.go index 9c14f45e..b506ba02 100644 --- a/backend/OpenFlare/plugins/server/router/v1/openflare/register_option.go +++ b/backend/OpenFlare/plugins/server/httpapi/register_option.go @@ -1,11 +1,11 @@ // Copyright 2026 Arctel.net // SPDX-License-Identifier: Apache-2.0 -package openflare +package httpapi import ( - "Wavelet/OpenFlare/plugins/server/openflare/apiutil" - "Wavelet/OpenFlare/plugins/server/openflare/option" + "Wavelet/OpenFlare/plugins/server/apiutil" + "Wavelet/OpenFlare/plugins/server/option" "Wavelet/core" "Wavelet/core/contracts" ) diff --git a/backend/OpenFlare/plugins/server/router/v1/openflare/register_origin.go b/backend/OpenFlare/plugins/server/httpapi/register_origin.go similarity index 83% rename from backend/OpenFlare/plugins/server/router/v1/openflare/register_origin.go rename to backend/OpenFlare/plugins/server/httpapi/register_origin.go index 184847c0..c064b2a6 100644 --- a/backend/OpenFlare/plugins/server/router/v1/openflare/register_origin.go +++ b/backend/OpenFlare/plugins/server/httpapi/register_origin.go @@ -1,11 +1,11 @@ // Copyright 2026 Arctel.net // SPDX-License-Identifier: Apache-2.0 -package openflare +package httpapi import ( - "Wavelet/OpenFlare/plugins/server/openflare/apiutil" - "Wavelet/OpenFlare/plugins/server/openflare/origin" + "Wavelet/OpenFlare/plugins/server/apiutil" + "Wavelet/OpenFlare/plugins/server/site/origin" "Wavelet/core" "Wavelet/core/contracts" ) diff --git a/backend/OpenFlare/plugins/server/router/v1/openflare/register_pages.go b/backend/OpenFlare/plugins/server/httpapi/register_pages.go similarity index 92% rename from backend/OpenFlare/plugins/server/router/v1/openflare/register_pages.go rename to backend/OpenFlare/plugins/server/httpapi/register_pages.go index 5f67883b..b9a25e42 100644 --- a/backend/OpenFlare/plugins/server/router/v1/openflare/register_pages.go +++ b/backend/OpenFlare/plugins/server/httpapi/register_pages.go @@ -1,11 +1,11 @@ // Copyright 2026 Arctel.net // SPDX-License-Identifier: Apache-2.0 -package openflare +package httpapi import ( - "Wavelet/OpenFlare/plugins/server/openflare/apiutil" - "Wavelet/OpenFlare/plugins/server/openflare/pages" + "Wavelet/OpenFlare/plugins/server/apiutil" + "Wavelet/OpenFlare/plugins/server/pages" "Wavelet/core" "Wavelet/core/contracts" ) diff --git a/backend/OpenFlare/plugins/server/router/v1/openflare/register_proxy_route.go b/backend/OpenFlare/plugins/server/httpapi/register_proxy_route.go similarity index 84% rename from backend/OpenFlare/plugins/server/router/v1/openflare/register_proxy_route.go rename to backend/OpenFlare/plugins/server/httpapi/register_proxy_route.go index 6270ab7b..e6a5833a 100644 --- a/backend/OpenFlare/plugins/server/router/v1/openflare/register_proxy_route.go +++ b/backend/OpenFlare/plugins/server/httpapi/register_proxy_route.go @@ -1,11 +1,11 @@ // Copyright 2026 Arctel.net // SPDX-License-Identifier: Apache-2.0 -package openflare +package httpapi import ( - "Wavelet/OpenFlare/plugins/server/openflare/apiutil" - "Wavelet/OpenFlare/plugins/server/openflare/proxy_route" + "Wavelet/OpenFlare/plugins/server/apiutil" + "Wavelet/OpenFlare/plugins/server/site/proxy_route" "Wavelet/core" "Wavelet/core/contracts" ) diff --git a/backend/OpenFlare/plugins/server/router/v1/openflare/register_relay_flared.go b/backend/OpenFlare/plugins/server/httpapi/register_relay_flared.go similarity index 85% rename from backend/OpenFlare/plugins/server/router/v1/openflare/register_relay_flared.go rename to backend/OpenFlare/plugins/server/httpapi/register_relay_flared.go index 383afb8f..edc8d481 100644 --- a/backend/OpenFlare/plugins/server/router/v1/openflare/register_relay_flared.go +++ b/backend/OpenFlare/plugins/server/httpapi/register_relay_flared.go @@ -1,11 +1,11 @@ // Copyright 2026 Arctel.net // SPDX-License-Identifier: Apache-2.0 -package openflare +package httpapi import ( - "Wavelet/OpenFlare/plugins/server/openflare/flared" - "Wavelet/OpenFlare/plugins/server/openflare/relay" + "Wavelet/OpenFlare/plugins/server/fleet/flared" + "Wavelet/OpenFlare/plugins/server/fleet/relay" "Wavelet/core" ) diff --git a/backend/OpenFlare/plugins/server/router/v1/openflare/register_tls.go b/backend/OpenFlare/plugins/server/httpapi/register_tls.go similarity index 93% rename from backend/OpenFlare/plugins/server/router/v1/openflare/register_tls.go rename to backend/OpenFlare/plugins/server/httpapi/register_tls.go index 886d301b..d32a783d 100644 --- a/backend/OpenFlare/plugins/server/router/v1/openflare/register_tls.go +++ b/backend/OpenFlare/plugins/server/httpapi/register_tls.go @@ -1,11 +1,11 @@ // Copyright 2026 Arctel.net // SPDX-License-Identifier: Apache-2.0 -package openflare +package httpapi import ( - "Wavelet/OpenFlare/plugins/server/openflare/apiutil" - "Wavelet/OpenFlare/plugins/server/openflare/tls" + "Wavelet/OpenFlare/plugins/server/apiutil" + "Wavelet/OpenFlare/plugins/server/tls" "Wavelet/core" "Wavelet/core/contracts" ) diff --git a/backend/OpenFlare/plugins/server/router/v1/openflare/register_updater.go b/backend/OpenFlare/plugins/server/httpapi/register_updater.go similarity index 91% rename from backend/OpenFlare/plugins/server/router/v1/openflare/register_updater.go rename to backend/OpenFlare/plugins/server/httpapi/register_updater.go index 81ee3346..1bec5e32 100644 --- a/backend/OpenFlare/plugins/server/router/v1/openflare/register_updater.go +++ b/backend/OpenFlare/plugins/server/httpapi/register_updater.go @@ -1,11 +1,11 @@ // Copyright 2026 Arctel.net // SPDX-License-Identifier: Apache-2.0 -package openflare +package httpapi import ( + "Wavelet/OpenFlare/plugins/server/apiutil" "Wavelet/OpenFlare/plugins/server/updater" - "Wavelet/OpenFlare/plugins/server/openflare/apiutil" "Wavelet/core" "Wavelet/core/contracts" ) diff --git a/backend/OpenFlare/plugins/server/router/v1/openflare/register_waf.go b/backend/OpenFlare/plugins/server/httpapi/register_waf.go similarity index 91% rename from backend/OpenFlare/plugins/server/router/v1/openflare/register_waf.go rename to backend/OpenFlare/plugins/server/httpapi/register_waf.go index 407ffd78..dd436da5 100644 --- a/backend/OpenFlare/plugins/server/router/v1/openflare/register_waf.go +++ b/backend/OpenFlare/plugins/server/httpapi/register_waf.go @@ -1,11 +1,11 @@ // Copyright 2026 Arctel.net // SPDX-License-Identifier: Apache-2.0 -package openflare +package httpapi import ( - "Wavelet/OpenFlare/plugins/server/openflare/apiutil" - "Wavelet/OpenFlare/plugins/server/openflare/waf" + "Wavelet/OpenFlare/plugins/server/apiutil" + "Wavelet/OpenFlare/plugins/server/waf" "Wavelet/core" "Wavelet/core/contracts" ) diff --git a/backend/OpenFlare/plugins/server/router/v1/openflare/register_zone.go b/backend/OpenFlare/plugins/server/httpapi/register_zone.go similarity index 87% rename from backend/OpenFlare/plugins/server/router/v1/openflare/register_zone.go rename to backend/OpenFlare/plugins/server/httpapi/register_zone.go index c49247d2..72b4d022 100644 --- a/backend/OpenFlare/plugins/server/router/v1/openflare/register_zone.go +++ b/backend/OpenFlare/plugins/server/httpapi/register_zone.go @@ -1,11 +1,11 @@ // Copyright 2026 Arctel.net // SPDX-License-Identifier: Apache-2.0 -package openflare +package httpapi import ( - "Wavelet/OpenFlare/plugins/server/openflare/apiutil" - "Wavelet/OpenFlare/plugins/server/openflare/zone" + "Wavelet/OpenFlare/plugins/server/apiutil" + "Wavelet/OpenFlare/plugins/server/site/zone" "Wavelet/core" "Wavelet/core/contracts" ) diff --git a/backend/OpenFlare/plugins/server/router/v1/openflare/v1.go b/backend/OpenFlare/plugins/server/httpapi/v1.go similarity index 98% rename from backend/OpenFlare/plugins/server/router/v1/openflare/v1.go rename to backend/OpenFlare/plugins/server/httpapi/v1.go index e1015226..b5754340 100644 --- a/backend/OpenFlare/plugins/server/router/v1/openflare/v1.go +++ b/backend/OpenFlare/plugins/server/httpapi/v1.go @@ -1,7 +1,7 @@ // Copyright 2026 Arctel.net // SPDX-License-Identifier: Apache-2.0 -package openflare +package httpapi import ( "Wavelet/core" diff --git a/backend/OpenFlare/plugins/server/migrate/stamp.go b/backend/OpenFlare/plugins/server/migrate/stamp.go index a167b588..1670fcb3 100644 --- a/backend/OpenFlare/plugins/server/migrate/stamp.go +++ b/backend/OpenFlare/plugins/server/migrate/stamp.go @@ -10,7 +10,7 @@ import ( "fmt" "unicode" - "Wavelet/OpenFlare/plugins/server/openflare/zone" + "Wavelet/OpenFlare/plugins/server/site/zone" "Wavelet/core" "Wavelet/core/contracts" ) diff --git a/backend/OpenFlare/plugins/server/model/platform_aliases.go b/backend/OpenFlare/plugins/server/model/platform_aliases.go index 23b3e1a9..8a339e52 100644 --- a/backend/OpenFlare/plugins/server/model/platform_aliases.go +++ b/backend/OpenFlare/plugins/server/model/platform_aliases.go @@ -11,8 +11,8 @@ import ( adminmodel "Wavelet/plugins/domain/admin/model" authmodel "Wavelet/plugins/domain/auth" - usermodel "Wavelet/plugins/domain/user" uploadmodels "Wavelet/plugins/domain/upload/models" + usermodel "Wavelet/plugins/domain/user" ) const ( diff --git a/backend/OpenFlare/plugins/server/openflare/observability/access_log_ip_summary_test.go b/backend/OpenFlare/plugins/server/observability/access_log_ip_summary_test.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/observability/access_log_ip_summary_test.go rename to backend/OpenFlare/plugins/server/observability/access_log_ip_summary_test.go diff --git a/backend/OpenFlare/plugins/server/openflare/observability/access_log_logics.go b/backend/OpenFlare/plugins/server/observability/access_log_logics.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/observability/access_log_logics.go rename to backend/OpenFlare/plugins/server/observability/access_log_logics.go diff --git a/backend/OpenFlare/plugins/server/openflare/observability/analytics.go b/backend/OpenFlare/plugins/server/observability/analytics.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/observability/analytics.go rename to backend/OpenFlare/plugins/server/observability/analytics.go diff --git a/backend/OpenFlare/plugins/server/openflare/observability/analytics_test.go b/backend/OpenFlare/plugins/server/observability/analytics_test.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/observability/analytics_test.go rename to backend/OpenFlare/plugins/server/observability/analytics_test.go diff --git a/backend/OpenFlare/plugins/server/openflare/chwriter/dedup.go b/backend/OpenFlare/plugins/server/observability/chwriter/dedup.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/chwriter/dedup.go rename to backend/OpenFlare/plugins/server/observability/chwriter/dedup.go diff --git a/backend/OpenFlare/plugins/server/openflare/chwriter/dedup_test.go b/backend/OpenFlare/plugins/server/observability/chwriter/dedup_test.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/chwriter/dedup_test.go rename to backend/OpenFlare/plugins/server/observability/chwriter/dedup_test.go diff --git a/backend/OpenFlare/plugins/server/openflare/chwriter/live_ch_test.go b/backend/OpenFlare/plugins/server/observability/chwriter/live_ch_test.go similarity index 97% rename from backend/OpenFlare/plugins/server/openflare/chwriter/live_ch_test.go rename to backend/OpenFlare/plugins/server/observability/chwriter/live_ch_test.go index 50df8cee..b5106dfd 100644 --- a/backend/OpenFlare/plugins/server/openflare/chwriter/live_ch_test.go +++ b/backend/OpenFlare/plugins/server/observability/chwriter/live_ch_test.go @@ -12,9 +12,9 @@ import ( "Wavelet/OpenFlare/plugins/server/repository" - db "Wavelet/plugins/infra/database" "Wavelet/OpenFlare/plugins/server/model" - "Wavelet/OpenFlare/plugins/server/openflare/chwriter" + "Wavelet/OpenFlare/plugins/server/observability/chwriter" + db "Wavelet/plugins/infra/database" ) // Run with Docker ClickHouse + config.yaml: diff --git a/backend/OpenFlare/plugins/server/openflare/chwriter/writer.go b/backend/OpenFlare/plugins/server/observability/chwriter/writer.go similarity index 99% rename from backend/OpenFlare/plugins/server/openflare/chwriter/writer.go rename to backend/OpenFlare/plugins/server/observability/chwriter/writer.go index 32ca321e..ca47c3ef 100644 --- a/backend/OpenFlare/plugins/server/openflare/chwriter/writer.go +++ b/backend/OpenFlare/plugins/server/observability/chwriter/writer.go @@ -12,7 +12,6 @@ import ( "time" analyticsmodel "Wavelet/OpenFlare/plugins/server/model/analytics" - "Wavelet/OpenFlare/plugins/server/platform/lifecycle" "Wavelet/OpenFlare/plugins/server/repository/logstore" "Wavelet/pkg/batchwriter" "Wavelet/pkg/logger" @@ -96,7 +95,6 @@ func Init(ctx context.Context) { nodeAccessLogWriter.Start(ctx) wireModelInsertHooks() - lifecycle.OnShutdown("openflare_chwriter", Stop) }) } diff --git a/backend/OpenFlare/plugins/server/openflare/observability/errs.go b/backend/OpenFlare/plugins/server/observability/errs.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/observability/errs.go rename to backend/OpenFlare/plugins/server/observability/errs.go diff --git a/backend/OpenFlare/plugins/server/openflare/tasks/log_db_switch.go b/backend/OpenFlare/plugins/server/observability/log_db_switch.go similarity index 99% rename from backend/OpenFlare/plugins/server/openflare/tasks/log_db_switch.go rename to backend/OpenFlare/plugins/server/observability/log_db_switch.go index df19dad1..2b25fbb1 100644 --- a/backend/OpenFlare/plugins/server/openflare/tasks/log_db_switch.go +++ b/backend/OpenFlare/plugins/server/observability/log_db_switch.go @@ -1,7 +1,7 @@ // Copyright 2026 Arctel.net // SPDX-License-Identifier: Apache-2.0 -package tasks +package observability import ( "context" @@ -10,13 +10,13 @@ import ( "fmt" "time" - "Wavelet/OpenFlare/plugins/server/runtimeconfig" - "Wavelet/OpenFlare/plugins/server/task" "Wavelet/OpenFlare/plugins/server/model" analyticsmodel "Wavelet/OpenFlare/plugins/server/model/analytics" - "Wavelet/OpenFlare/plugins/server/openflare/chwriter" + "Wavelet/OpenFlare/plugins/server/observability/chwriter" "Wavelet/OpenFlare/plugins/server/repository" "Wavelet/OpenFlare/plugins/server/repository/logstore" + "Wavelet/OpenFlare/plugins/server/runtimeconfig" + "Wavelet/OpenFlare/plugins/server/task" "Wavelet/pkg/logger" ) diff --git a/backend/OpenFlare/plugins/server/openflare/tasks/log_db_switch_test.go b/backend/OpenFlare/plugins/server/observability/log_db_switch_test.go similarity index 98% rename from backend/OpenFlare/plugins/server/openflare/tasks/log_db_switch_test.go rename to backend/OpenFlare/plugins/server/observability/log_db_switch_test.go index b256e479..b9c8c4b6 100644 --- a/backend/OpenFlare/plugins/server/openflare/tasks/log_db_switch_test.go +++ b/backend/OpenFlare/plugins/server/observability/log_db_switch_test.go @@ -1,7 +1,7 @@ // Copyright 2026 Arctel.net // SPDX-License-Identifier: Apache-2.0 -package tasks +package observability import ( "context" @@ -18,12 +18,12 @@ import ( "gorm.io/gorm" "gorm.io/gorm/logger" - "Wavelet/OpenFlare/plugins/server/runtimeconfig" - db "Wavelet/plugins/infra/database" "Wavelet/OpenFlare/plugins/server/model" analyticsmodel "Wavelet/OpenFlare/plugins/server/model/analytics" "Wavelet/OpenFlare/plugins/server/repository" "Wavelet/OpenFlare/plugins/server/repository/logstore" + "Wavelet/OpenFlare/plugins/server/runtimeconfig" + db "Wavelet/plugins/infra/database" ) var logDBSwitchDBSeq int64 @@ -49,7 +49,7 @@ func newLogDBSwitchDB(t *testing.T) *gorm.DB { // TestCopyAccessLogsPreservesIDs sqlite→sqlite 模拟：源 store 3 条，目标空库， // copyAccessLogs 后 ID 保留、数量一致。 func TestCopyAccessLogsPreservesIDs(t *testing.T) { - t.Cleanup(runtimeconfig.Override(false, false)) + t.Cleanup(runtimeconfig.Override(false, false)) logstore.ResetForTest() defer logstore.ResetForTest() @@ -95,7 +95,7 @@ func TestCopyAccessLogsPreservesIDs(t *testing.T) { // TestCopyUserAccessLogsPreservesIDs sqlite→sqlite 模拟：源库用户访问日志按 id 升序 // 复制到目标库，ID 保留、数量一致，且源库保持不变。 func TestCopyUserAccessLogsPreservesIDs(t *testing.T) { - t.Cleanup(runtimeconfig.Override(false, false)) + t.Cleanup(runtimeconfig.Override(false, false)) logstore.ResetForTest() defer logstore.ResetForTest() @@ -136,7 +136,7 @@ func TestCopyUserAccessLogsPreservesIDs(t *testing.T) { // TestClearTargetLogTablesClearsUserAccessLogs 验证清空目标包含用户访问日志表 // （6 张日志表之一），迁移「覆盖目标库已有日志」幂等前提成立。 func TestClearTargetLogTablesClearsUserAccessLogs(t *testing.T) { - t.Cleanup(runtimeconfig.Override(false, false)) + t.Cleanup(runtimeconfig.Override(false, false)) logstore.ResetForTest() defer logstore.ResetForTest() @@ -201,7 +201,7 @@ func TestClearTargetLogTablesDuringMigration(t *testing.T) { // TestValidateSwitch 各非法组合报错。 func TestValidateSwitch(t *testing.T) { - t.Cleanup(func() { + t.Cleanup(func() { }) gdb := newLogDBSwitchDB(t) @@ -282,7 +282,7 @@ func TestLogDBSwitchValidatePayload(t *testing.T) { // 在 FRESH DB（不预置 log_db_migration 行）上验证：setMigrationFlag 必须 upsert 建行， // 且失败后经缓存路径（GetSystemConfigByKey）可观察为空。 func TestExecuteFailureClearsMigrationFlag(t *testing.T) { - t.Cleanup(runtimeconfig.Override(true, runtimeconfig.ClickHouseEnabled())) + t.Cleanup(runtimeconfig.Override(true, runtimeconfig.ClickHouseEnabled())) logstore.ResetForTest() defer logstore.ResetForTest() diff --git a/backend/OpenFlare/plugins/server/openflare/observability/node_logics.go b/backend/OpenFlare/plugins/server/observability/node_logics.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/observability/node_logics.go rename to backend/OpenFlare/plugins/server/observability/node_logics.go diff --git a/backend/OpenFlare/plugins/server/openflare/observability/query_params_test.go b/backend/OpenFlare/plugins/server/observability/query_params_test.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/observability/query_params_test.go rename to backend/OpenFlare/plugins/server/observability/query_params_test.go diff --git a/backend/OpenFlare/plugins/server/openflare/observability/routers.go b/backend/OpenFlare/plugins/server/observability/routers.go similarity index 99% rename from backend/OpenFlare/plugins/server/openflare/observability/routers.go rename to backend/OpenFlare/plugins/server/observability/routers.go index 66ba9de7..da2f43ab 100644 --- a/backend/OpenFlare/plugins/server/openflare/observability/routers.go +++ b/backend/OpenFlare/plugins/server/observability/routers.go @@ -8,7 +8,7 @@ import ( "net/http" "strconv" - "Wavelet/OpenFlare/plugins/server/openflare/apiutil" + "Wavelet/OpenFlare/plugins/server/apiutil" "Wavelet/pkg/response" "github.com/gin-gonic/gin" diff --git a/backend/OpenFlare/plugins/server/openflare/ofupload/ofupload.go b/backend/OpenFlare/plugins/server/ofupload/ofupload.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/ofupload/ofupload.go rename to backend/OpenFlare/plugins/server/ofupload/ofupload.go diff --git a/backend/OpenFlare/plugins/server/openflare/ofupload/remove.go b/backend/OpenFlare/plugins/server/ofupload/remove.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/ofupload/remove.go rename to backend/OpenFlare/plugins/server/ofupload/remove.go diff --git a/backend/OpenFlare/plugins/server/openflare/pages/data/pages/artifacts/published-site/1d0b1001941b126350515d2eaa00cea377a6ceffd4c72c76c77910686be8dc4e.zip b/backend/OpenFlare/plugins/server/openflare/pages/data/pages/artifacts/published-site/1d0b1001941b126350515d2eaa00cea377a6ceffd4c72c76c77910686be8dc4e.zip deleted file mode 100644 index 75e34bb3d412d1181deb5fd01c11424adb87f239..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 142 zcmWIWW@Zs#-~d8&zy%b@%u7kF(90;v%{g_RjfH{X|Nj7Qb`JNucPc^ZnSeOJn~_O` e0bv5N9LNMzfG{t>o0SbD#|VTLK-vMsVE_R3B@`F{ diff --git a/backend/OpenFlare/plugins/server/openflare/tasks/doc.go b/backend/OpenFlare/plugins/server/openflare/tasks/doc.go deleted file mode 100644 index 5d8984ed..00000000 --- a/backend/OpenFlare/plugins/server/openflare/tasks/doc.go +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright 2026 Arctel.net -// SPDX-License-Identifier: Apache-2.0 - -// Package tasks hosts shared OpenFlare background job business logic. -// -// Scheduled execution is handled by the Wavelet Asynq task framework; handlers -// live in internal/apps/openflare/async_tasks.go and are registered via -// bootstrap.RegisterTasks(). -package tasks diff --git a/backend/OpenFlare/plugins/server/openflare/option/errs.go b/backend/OpenFlare/plugins/server/option/errs.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/option/errs.go rename to backend/OpenFlare/plugins/server/option/errs.go diff --git a/backend/OpenFlare/plugins/server/openflare/option/logics.go b/backend/OpenFlare/plugins/server/option/logics.go similarity index 98% rename from backend/OpenFlare/plugins/server/openflare/option/logics.go rename to backend/OpenFlare/plugins/server/option/logics.go index c8163452..a8bf0d5f 100644 --- a/backend/OpenFlare/plugins/server/openflare/option/logics.go +++ b/backend/OpenFlare/plugins/server/option/logics.go @@ -9,9 +9,9 @@ import ( "fmt" "strings" + "Wavelet/OpenFlare/plugins/server/geoip" "Wavelet/OpenFlare/plugins/server/model" - "Wavelet/OpenFlare/plugins/server/openflare/geoip" - "Wavelet/OpenFlare/plugins/server/openflare/uptimekuma" + "Wavelet/OpenFlare/plugins/server/option/uptimekuma" "Wavelet/OpenFlare/plugins/server/repository" "Wavelet/pkg/buildinfo" ) diff --git a/backend/OpenFlare/plugins/server/openflare/option/logics_test.go b/backend/OpenFlare/plugins/server/option/logics_test.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/option/logics_test.go rename to backend/OpenFlare/plugins/server/option/logics_test.go index 64a36e84..08bb6184 100644 --- a/backend/OpenFlare/plugins/server/openflare/option/logics_test.go +++ b/backend/OpenFlare/plugins/server/option/logics_test.go @@ -7,9 +7,9 @@ import ( "context" "testing" - db "Wavelet/plugins/infra/database" "Wavelet/OpenFlare/plugins/server/model" "Wavelet/OpenFlare/plugins/server/repository" + db "Wavelet/plugins/infra/database" "github.com/glebarez/sqlite" "github.com/stretchr/testify/assert" diff --git a/backend/OpenFlare/plugins/server/openflare/option/openresty_validators.go b/backend/OpenFlare/plugins/server/option/openresty_validators.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/option/openresty_validators.go rename to backend/OpenFlare/plugins/server/option/openresty_validators.go diff --git a/backend/OpenFlare/plugins/server/openflare/option/openresty_validators_test.go b/backend/OpenFlare/plugins/server/option/openresty_validators_test.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/option/openresty_validators_test.go rename to backend/OpenFlare/plugins/server/option/openresty_validators_test.go diff --git a/backend/OpenFlare/plugins/server/openflare/option/routers.go b/backend/OpenFlare/plugins/server/option/routers.go similarity index 98% rename from backend/OpenFlare/plugins/server/openflare/option/routers.go rename to backend/OpenFlare/plugins/server/option/routers.go index 28c8f4e7..7b1a1c78 100644 --- a/backend/OpenFlare/plugins/server/openflare/option/routers.go +++ b/backend/OpenFlare/plugins/server/option/routers.go @@ -6,8 +6,8 @@ package option import ( "net/http" + "Wavelet/OpenFlare/plugins/server/apiutil" "Wavelet/OpenFlare/plugins/server/model" - "Wavelet/OpenFlare/plugins/server/openflare/apiutil" "Wavelet/pkg/response" "github.com/gin-gonic/gin" diff --git a/backend/OpenFlare/plugins/server/openflare/uptimekuma/client.go b/backend/OpenFlare/plugins/server/option/uptimekuma/client.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/uptimekuma/client.go rename to backend/OpenFlare/plugins/server/option/uptimekuma/client.go diff --git a/backend/OpenFlare/plugins/server/openflare/uptimekuma/sync.go b/backend/OpenFlare/plugins/server/option/uptimekuma/sync.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/uptimekuma/sync.go rename to backend/OpenFlare/plugins/server/option/uptimekuma/sync.go diff --git a/backend/OpenFlare/plugins/server/openflare/uptimekuma/sync_helpers.go b/backend/OpenFlare/plugins/server/option/uptimekuma/sync_helpers.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/uptimekuma/sync_helpers.go rename to backend/OpenFlare/plugins/server/option/uptimekuma/sync_helpers.go diff --git a/backend/OpenFlare/plugins/server/openflare/uptimekuma/sync_test.go b/backend/OpenFlare/plugins/server/option/uptimekuma/sync_test.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/uptimekuma/sync_test.go rename to backend/OpenFlare/plugins/server/option/uptimekuma/sync_test.go index 7075187f..5b4582a7 100644 --- a/backend/OpenFlare/plugins/server/openflare/uptimekuma/sync_test.go +++ b/backend/OpenFlare/plugins/server/option/uptimekuma/sync_test.go @@ -15,9 +15,9 @@ import ( "testing" "time" - db "Wavelet/plugins/infra/database" "Wavelet/OpenFlare/plugins/server/model" "Wavelet/OpenFlare/plugins/server/repository" + db "Wavelet/plugins/infra/database" "github.com/glebarez/sqlite" "github.com/stretchr/testify/assert" diff --git a/backend/OpenFlare/plugins/server/openflare/option/validate.go b/backend/OpenFlare/plugins/server/option/validate.go similarity index 99% rename from backend/OpenFlare/plugins/server/openflare/option/validate.go rename to backend/OpenFlare/plugins/server/option/validate.go index 6f2a5880..0e203f1a 100644 --- a/backend/OpenFlare/plugins/server/openflare/option/validate.go +++ b/backend/OpenFlare/plugins/server/option/validate.go @@ -11,8 +11,8 @@ import ( "strconv" "strings" + "Wavelet/OpenFlare/plugins/server/geoip" "Wavelet/OpenFlare/plugins/server/model" - "Wavelet/OpenFlare/plugins/server/openflare/geoip" "Wavelet/OpenFlare/plugins/server/repository" ) diff --git a/backend/OpenFlare/plugins/server/openflare/pages/download_url.go b/backend/OpenFlare/plugins/server/pages/download_url.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/pages/download_url.go rename to backend/OpenFlare/plugins/server/pages/download_url.go diff --git a/backend/OpenFlare/plugins/server/openflare/pages/download_url_test.go b/backend/OpenFlare/plugins/server/pages/download_url_test.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/pages/download_url_test.go rename to backend/OpenFlare/plugins/server/pages/download_url_test.go diff --git a/backend/OpenFlare/plugins/server/openflare/pages/errs.go b/backend/OpenFlare/plugins/server/pages/errs.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/pages/errs.go rename to backend/OpenFlare/plugins/server/pages/errs.go diff --git a/backend/OpenFlare/plugins/server/openflare/pages/github_source.go b/backend/OpenFlare/plugins/server/pages/github_source.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/pages/github_source.go rename to backend/OpenFlare/plugins/server/pages/github_source.go diff --git a/backend/OpenFlare/plugins/server/openflare/pages/github_source_action.go b/backend/OpenFlare/plugins/server/pages/github_source_action.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/pages/github_source_action.go rename to backend/OpenFlare/plugins/server/pages/github_source_action.go index b531c361..318fdf04 100644 --- a/backend/OpenFlare/plugins/server/openflare/pages/github_source_action.go +++ b/backend/OpenFlare/plugins/server/pages/github_source_action.go @@ -13,10 +13,10 @@ import ( "strings" "time" - "Wavelet/OpenFlare/plugins/server/task" "Wavelet/OpenFlare/plugins/server/integration/githubrelease" "Wavelet/OpenFlare/plugins/server/model" "Wavelet/OpenFlare/plugins/server/repository" + "Wavelet/OpenFlare/plugins/server/task" "Wavelet/OpenFlare/share/pagesarchive" "Wavelet/pkg/logger" diff --git a/backend/OpenFlare/plugins/server/openflare/pages/github_source_identity_test.go b/backend/OpenFlare/plugins/server/pages/github_source_identity_test.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/pages/github_source_identity_test.go rename to backend/OpenFlare/plugins/server/pages/github_source_identity_test.go index 28ff44d2..32ab9066 100644 --- a/backend/OpenFlare/plugins/server/openflare/pages/github_source_identity_test.go +++ b/backend/OpenFlare/plugins/server/pages/github_source_identity_test.go @@ -8,8 +8,8 @@ import ( "testing" "time" - db "Wavelet/plugins/infra/database" "Wavelet/OpenFlare/plugins/server/model" + db "Wavelet/plugins/infra/database" ) func TestGitHubSourceIdentityLengthPrefixesFieldsAndResetsRuntime(t *testing.T) { diff --git a/backend/OpenFlare/plugins/server/openflare/pages/github_source_test.go b/backend/OpenFlare/plugins/server/pages/github_source_test.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/pages/github_source_test.go rename to backend/OpenFlare/plugins/server/pages/github_source_test.go index 6d1a603d..7bca710a 100644 --- a/backend/OpenFlare/plugins/server/openflare/pages/github_source_test.go +++ b/backend/OpenFlare/plugins/server/pages/github_source_test.go @@ -18,10 +18,10 @@ import ( "Wavelet/OpenFlare/plugins/server/repository" - db "Wavelet/plugins/infra/database" - "Wavelet/OpenFlare/plugins/server/task" "Wavelet/OpenFlare/plugins/server/integration/githubrelease" "Wavelet/OpenFlare/plugins/server/model" + "Wavelet/OpenFlare/plugins/server/task" + db "Wavelet/plugins/infra/database" "github.com/hibiken/asynq" "gorm.io/gorm" diff --git a/backend/OpenFlare/plugins/server/openflare/pages/helpers.go b/backend/OpenFlare/plugins/server/pages/helpers.go similarity index 99% rename from backend/OpenFlare/plugins/server/openflare/pages/helpers.go rename to backend/OpenFlare/plugins/server/pages/helpers.go index ab363353..3fbbbffc 100644 --- a/backend/OpenFlare/plugins/server/openflare/pages/helpers.go +++ b/backend/OpenFlare/plugins/server/pages/helpers.go @@ -19,8 +19,8 @@ import ( "strings" "Wavelet/OpenFlare/plugins/server/model" + "Wavelet/OpenFlare/plugins/server/ofupload" "Wavelet/OpenFlare/plugins/server/repository" - "Wavelet/OpenFlare/plugins/server/openflare/ofupload" "Wavelet/OpenFlare/share/pagesarchive" "Wavelet/pkg/logger" diff --git a/backend/OpenFlare/plugins/server/openflare/pages/logics.go b/backend/OpenFlare/plugins/server/pages/logics.go similarity index 99% rename from backend/OpenFlare/plugins/server/openflare/pages/logics.go rename to backend/OpenFlare/plugins/server/pages/logics.go index 1ce6cf26..3684ee2c 100644 --- a/backend/OpenFlare/plugins/server/openflare/pages/logics.go +++ b/backend/OpenFlare/plugins/server/pages/logics.go @@ -17,8 +17,8 @@ import ( "time" "Wavelet/OpenFlare/plugins/server/model" + "Wavelet/OpenFlare/plugins/server/ofupload" "Wavelet/OpenFlare/plugins/server/repository" - "Wavelet/OpenFlare/plugins/server/openflare/ofupload" "Wavelet/OpenFlare/share/pagesarchive" "Wavelet/pkg/logger" diff --git a/backend/OpenFlare/plugins/server/openflare/pages/logics_test.go b/backend/OpenFlare/plugins/server/pages/logics_test.go similarity index 99% rename from backend/OpenFlare/plugins/server/openflare/pages/logics_test.go rename to backend/OpenFlare/plugins/server/pages/logics_test.go index 46d3acae..9aa3037e 100644 --- a/backend/OpenFlare/plugins/server/openflare/pages/logics_test.go +++ b/backend/OpenFlare/plugins/server/pages/logics_test.go @@ -18,7 +18,7 @@ import ( "testing" "Wavelet/OpenFlare/plugins/server/model" - "Wavelet/OpenFlare/plugins/server/openflare/ofupload" + "Wavelet/OpenFlare/plugins/server/ofupload" "Wavelet/OpenFlare/plugins/server/repository" oftask "Wavelet/OpenFlare/plugins/server/task" "Wavelet/OpenFlare/plugins/server/testhelper" diff --git a/backend/OpenFlare/plugins/server/openflare/pages/package_metadata.go b/backend/OpenFlare/plugins/server/pages/package_metadata.go similarity index 96% rename from backend/OpenFlare/plugins/server/openflare/pages/package_metadata.go rename to backend/OpenFlare/plugins/server/pages/package_metadata.go index acd315b1..7dc5cc06 100644 --- a/backend/OpenFlare/plugins/server/openflare/pages/package_metadata.go +++ b/backend/OpenFlare/plugins/server/pages/package_metadata.go @@ -11,7 +11,7 @@ import ( "Wavelet/OpenFlare/plugins/server/repository" - "Wavelet/OpenFlare/plugins/server/openflare/ofupload" + "Wavelet/OpenFlare/plugins/server/ofupload" ) // ProjectLatestPackageMetadata describes the active package limits published to Agents. diff --git a/backend/OpenFlare/plugins/server/openflare/pages/package_metadata_test.go b/backend/OpenFlare/plugins/server/pages/package_metadata_test.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/pages/package_metadata_test.go rename to backend/OpenFlare/plugins/server/pages/package_metadata_test.go index 759cfe34..f52a45fd 100644 --- a/backend/OpenFlare/plugins/server/openflare/pages/package_metadata_test.go +++ b/backend/OpenFlare/plugins/server/pages/package_metadata_test.go @@ -10,8 +10,8 @@ import ( "fmt" "testing" - db "Wavelet/plugins/infra/database" "Wavelet/OpenFlare/plugins/server/model" + db "Wavelet/plugins/infra/database" ) func TestGetProjectLatestPackageMetadataPreservesZeroTotalSize(t *testing.T) { diff --git a/backend/OpenFlare/plugins/server/openflare/pages/rebind.go b/backend/OpenFlare/plugins/server/pages/rebind.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/pages/rebind.go rename to backend/OpenFlare/plugins/server/pages/rebind.go diff --git a/backend/OpenFlare/plugins/server/openflare/pages/rebind_test.go b/backend/OpenFlare/plugins/server/pages/rebind_test.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/pages/rebind_test.go rename to backend/OpenFlare/plugins/server/pages/rebind_test.go index b860d701..b237489c 100644 --- a/backend/OpenFlare/plugins/server/openflare/pages/rebind_test.go +++ b/backend/OpenFlare/plugins/server/pages/rebind_test.go @@ -8,8 +8,8 @@ import ( "encoding/json" "testing" - db "Wavelet/plugins/infra/database" "Wavelet/OpenFlare/plugins/server/model" + db "Wavelet/plugins/infra/database" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/backend/OpenFlare/plugins/server/openflare/pages/routers.go b/backend/OpenFlare/plugins/server/pages/routers.go similarity index 99% rename from backend/OpenFlare/plugins/server/openflare/pages/routers.go rename to backend/OpenFlare/plugins/server/pages/routers.go index 6f86a2ba..597cfabb 100644 --- a/backend/OpenFlare/plugins/server/openflare/pages/routers.go +++ b/backend/OpenFlare/plugins/server/pages/routers.go @@ -11,7 +11,7 @@ import ( "net/http" "strconv" - "Wavelet/OpenFlare/plugins/server/openflare/apiutil" + "Wavelet/OpenFlare/plugins/server/apiutil" "Wavelet/core/contracts" "Wavelet/pkg/logger" "Wavelet/pkg/response" diff --git a/backend/OpenFlare/plugins/server/openflare/pages/routers_source_test.go b/backend/OpenFlare/plugins/server/pages/routers_source_test.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/pages/routers_source_test.go rename to backend/OpenFlare/plugins/server/pages/routers_source_test.go index ac332871..d693bd15 100644 --- a/backend/OpenFlare/plugins/server/openflare/pages/routers_source_test.go +++ b/backend/OpenFlare/plugins/server/pages/routers_source_test.go @@ -13,10 +13,10 @@ import ( "testing" "time" - db "Wavelet/plugins/infra/database" "Wavelet/OpenFlare/plugins/server/model" "Wavelet/OpenFlare/plugins/server/testhelper" "Wavelet/core/contracts" + db "Wavelet/plugins/infra/database" "github.com/gin-gonic/gin" ) diff --git a/backend/OpenFlare/plugins/server/openflare/pages/routers_test.go b/backend/OpenFlare/plugins/server/pages/routers_test.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/pages/routers_test.go rename to backend/OpenFlare/plugins/server/pages/routers_test.go diff --git a/backend/OpenFlare/plugins/server/openflare/pages/source.go b/backend/OpenFlare/plugins/server/pages/source.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/pages/source.go rename to backend/OpenFlare/plugins/server/pages/source.go diff --git a/backend/OpenFlare/plugins/server/openflare/pages/source_manual_test_helpers_test.go b/backend/OpenFlare/plugins/server/pages/source_manual_test_helpers_test.go similarity index 95% rename from backend/OpenFlare/plugins/server/openflare/pages/source_manual_test_helpers_test.go rename to backend/OpenFlare/plugins/server/pages/source_manual_test_helpers_test.go index 2d827417..ec888146 100644 --- a/backend/OpenFlare/plugins/server/openflare/pages/source_manual_test_helpers_test.go +++ b/backend/OpenFlare/plugins/server/pages/source_manual_test_helpers_test.go @@ -8,7 +8,7 @@ import ( "time" "Wavelet/OpenFlare/plugins/server/model" - "Wavelet/OpenFlare/plugins/server/openflare/ofupload" + "Wavelet/OpenFlare/plugins/server/ofupload" ) func syncRemoteSource( diff --git a/backend/OpenFlare/plugins/server/openflare/pages/source_orphan_cleanup.go b/backend/OpenFlare/plugins/server/pages/source_orphan_cleanup.go similarity index 99% rename from backend/OpenFlare/plugins/server/openflare/pages/source_orphan_cleanup.go rename to backend/OpenFlare/plugins/server/pages/source_orphan_cleanup.go index f8a363e3..3a87d2d7 100644 --- a/backend/OpenFlare/plugins/server/openflare/pages/source_orphan_cleanup.go +++ b/backend/OpenFlare/plugins/server/pages/source_orphan_cleanup.go @@ -11,8 +11,8 @@ import ( "time" "Wavelet/OpenFlare/plugins/server/model" + "Wavelet/OpenFlare/plugins/server/ofupload" "Wavelet/OpenFlare/plugins/server/repository" - "Wavelet/OpenFlare/plugins/server/openflare/ofupload" "Wavelet/pkg/logger" "gorm.io/gorm" diff --git a/backend/OpenFlare/plugins/server/openflare/pages/source_orphan_cleanup_test.go b/backend/OpenFlare/plugins/server/pages/source_orphan_cleanup_test.go similarity index 99% rename from backend/OpenFlare/plugins/server/openflare/pages/source_orphan_cleanup_test.go rename to backend/OpenFlare/plugins/server/pages/source_orphan_cleanup_test.go index 2dc679f7..a6291dc0 100644 --- a/backend/OpenFlare/plugins/server/openflare/pages/source_orphan_cleanup_test.go +++ b/backend/OpenFlare/plugins/server/pages/source_orphan_cleanup_test.go @@ -10,9 +10,9 @@ import ( "testing" "time" - db "Wavelet/plugins/infra/database" "Wavelet/OpenFlare/plugins/server/model" - "Wavelet/OpenFlare/plugins/server/openflare/ofupload" + "Wavelet/OpenFlare/plugins/server/ofupload" + db "Wavelet/plugins/infra/database" "gorm.io/gorm" "gorm.io/gorm/clause" diff --git a/backend/OpenFlare/plugins/server/openflare/pages/source_provider.go b/backend/OpenFlare/plugins/server/pages/source_provider.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/pages/source_provider.go rename to backend/OpenFlare/plugins/server/pages/source_provider.go diff --git a/backend/OpenFlare/plugins/server/openflare/pages/source_provider_test.go b/backend/OpenFlare/plugins/server/pages/source_provider_test.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/pages/source_provider_test.go rename to backend/OpenFlare/plugins/server/pages/source_provider_test.go diff --git a/backend/OpenFlare/plugins/server/openflare/pages/source_runtime.go b/backend/OpenFlare/plugins/server/pages/source_runtime.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/pages/source_runtime.go rename to backend/OpenFlare/plugins/server/pages/source_runtime.go diff --git a/backend/OpenFlare/plugins/server/openflare/pages/source_runtime_test.go b/backend/OpenFlare/plugins/server/pages/source_runtime_test.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/pages/source_runtime_test.go rename to backend/OpenFlare/plugins/server/pages/source_runtime_test.go index d5ee9915..ac3ffc83 100644 --- a/backend/OpenFlare/plugins/server/openflare/pages/source_runtime_test.go +++ b/backend/OpenFlare/plugins/server/pages/source_runtime_test.go @@ -12,8 +12,8 @@ import ( "Wavelet/OpenFlare/plugins/server/repository" - db "Wavelet/plugins/infra/database" "Wavelet/OpenFlare/plugins/server/model" + db "Wavelet/plugins/infra/database" ) func TestSourceLeaseHeartbeatRenewsAndCancelsOnOwnershipLoss(t *testing.T) { diff --git a/backend/OpenFlare/plugins/server/openflare/pages/source_scanner.go b/backend/OpenFlare/plugins/server/pages/source_scanner.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/pages/source_scanner.go rename to backend/OpenFlare/plugins/server/pages/source_scanner.go index 4bf290fd..2e83cf10 100644 --- a/backend/OpenFlare/plugins/server/openflare/pages/source_scanner.go +++ b/backend/OpenFlare/plugins/server/pages/source_scanner.go @@ -11,9 +11,9 @@ import ( "fmt" "time" - "Wavelet/OpenFlare/plugins/server/task" "Wavelet/OpenFlare/plugins/server/model" "Wavelet/OpenFlare/plugins/server/repository" + "Wavelet/OpenFlare/plugins/server/task" "Wavelet/pkg/logger" ) diff --git a/backend/OpenFlare/plugins/server/openflare/pages/source_scanner_test.go b/backend/OpenFlare/plugins/server/pages/source_scanner_test.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/pages/source_scanner_test.go rename to backend/OpenFlare/plugins/server/pages/source_scanner_test.go index 1deee290..5f814c39 100644 --- a/backend/OpenFlare/plugins/server/openflare/pages/source_scanner_test.go +++ b/backend/OpenFlare/plugins/server/pages/source_scanner_test.go @@ -18,9 +18,9 @@ import ( "Wavelet/OpenFlare/plugins/server/repository" - db "Wavelet/plugins/infra/database" "Wavelet/OpenFlare/plugins/server/integration/githubrelease" "Wavelet/OpenFlare/plugins/server/model" + db "Wavelet/plugins/infra/database" "gorm.io/gorm" ) diff --git a/backend/OpenFlare/plugins/server/openflare/pages/source_sync.go b/backend/OpenFlare/plugins/server/pages/source_sync.go similarity index 99% rename from backend/OpenFlare/plugins/server/openflare/pages/source_sync.go rename to backend/OpenFlare/plugins/server/pages/source_sync.go index ff73ed5e..052b1aea 100644 --- a/backend/OpenFlare/plugins/server/openflare/pages/source_sync.go +++ b/backend/OpenFlare/plugins/server/pages/source_sync.go @@ -15,10 +15,10 @@ import ( "time" "unicode/utf8" - "Wavelet/OpenFlare/plugins/server/task" "Wavelet/OpenFlare/plugins/server/model" + "Wavelet/OpenFlare/plugins/server/ofupload" "Wavelet/OpenFlare/plugins/server/repository" - "Wavelet/OpenFlare/plugins/server/openflare/ofupload" + "Wavelet/OpenFlare/plugins/server/task" "Wavelet/pkg/logger" "Wavelet/pkg/util" diff --git a/backend/OpenFlare/plugins/server/openflare/pages/source_sync_test.go b/backend/OpenFlare/plugins/server/pages/source_sync_test.go similarity index 99% rename from backend/OpenFlare/plugins/server/openflare/pages/source_sync_test.go rename to backend/OpenFlare/plugins/server/pages/source_sync_test.go index 902d3a07..1348e98a 100644 --- a/backend/OpenFlare/plugins/server/openflare/pages/source_sync_test.go +++ b/backend/OpenFlare/plugins/server/pages/source_sync_test.go @@ -19,10 +19,10 @@ import ( "Wavelet/OpenFlare/plugins/server/repository" - db "Wavelet/plugins/infra/database" "Wavelet/OpenFlare/plugins/server/model" - "Wavelet/OpenFlare/plugins/server/openflare/ofupload" + "Wavelet/OpenFlare/plugins/server/ofupload" "Wavelet/OpenFlare/share/pagesarchive" + db "Wavelet/plugins/infra/database" "gorm.io/gorm" ) diff --git a/backend/OpenFlare/plugins/server/openflare/pages/source_tasks.go b/backend/OpenFlare/plugins/server/pages/source_tasks.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/pages/source_tasks.go rename to backend/OpenFlare/plugins/server/pages/source_tasks.go index 6af18acf..0b3bdc80 100644 --- a/backend/OpenFlare/plugins/server/openflare/pages/source_tasks.go +++ b/backend/OpenFlare/plugins/server/pages/source_tasks.go @@ -13,9 +13,9 @@ import ( "strconv" "strings" - "Wavelet/OpenFlare/plugins/server/task" "Wavelet/OpenFlare/plugins/server/model" "Wavelet/OpenFlare/plugins/server/repository" + "Wavelet/OpenFlare/plugins/server/task" "Wavelet/pkg/logger" "gorm.io/gorm" diff --git a/backend/OpenFlare/plugins/server/openflare/pages/source_tasks_test.go b/backend/OpenFlare/plugins/server/pages/source_tasks_test.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/pages/source_tasks_test.go rename to backend/OpenFlare/plugins/server/pages/source_tasks_test.go diff --git a/backend/OpenFlare/plugins/server/openflare/pages/source_test.go b/backend/OpenFlare/plugins/server/pages/source_test.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/pages/source_test.go rename to backend/OpenFlare/plugins/server/pages/source_test.go index 032937c6..89114331 100644 --- a/backend/OpenFlare/plugins/server/openflare/pages/source_test.go +++ b/backend/OpenFlare/plugins/server/pages/source_test.go @@ -12,8 +12,8 @@ import ( "Wavelet/OpenFlare/plugins/server/repository" - db "Wavelet/plugins/infra/database" "Wavelet/OpenFlare/plugins/server/model" + db "Wavelet/plugins/infra/database" ) func setupPagesSourceTest(t *testing.T) context.Context { diff --git a/backend/OpenFlare/plugins/server/platform/lifecycle/lifecycle.go b/backend/OpenFlare/plugins/server/platform/lifecycle/lifecycle.go deleted file mode 100644 index f0e1296d..00000000 --- a/backend/OpenFlare/plugins/server/platform/lifecycle/lifecycle.go +++ /dev/null @@ -1,68 +0,0 @@ -// Copyright 2026 Arctel.net -// SPDX-License-Identifier: Apache-2.0 - -// Package lifecycle manages global application and business component shutdown hooks. -package lifecycle - -import ( - "context" - "log" - "sync" - - "Wavelet/pkg/util" -) - -// ShutdownFunc defines the signature for a graceful shutdown callback. -type ShutdownFunc func(ctx context.Context) error - -type hook struct { - name string - fn ShutdownFunc -} - -var ( - hooks []hook - mu sync.Mutex -) - -// OnShutdown registers a callback to be run during graceful shutdown. -func OnShutdown(name string, fn ShutdownFunc) { - mu.Lock() - defer mu.Unlock() - hooks = append(hooks, hook{name: name, fn: fn}) -} - -// Stop executes all registered shutdown hooks concurrently and waits for completion or context timeout. -func Stop(ctx context.Context) { - mu.Lock() - localHooks := make([]hook, len(hooks)) - copy(localHooks, hooks) - mu.Unlock() - - var wg sync.WaitGroup - for _, h := range localHooks { - wg.Add(1) - go func(name string, fn ShutdownFunc) { - defer wg.Done() - log.Printf("[Lifecycle] stopping %s...\n", name) - if err := fn(ctx); err != nil { - log.Printf("[Lifecycle] stop %s failed: %v\n", name, err) - } else { - log.Printf("[Lifecycle] %s stopped successfully\n", name) - } - }(h.name, h.fn) - } - - done := make(chan struct{}) - util.Go(func() { - wg.Wait() - close(done) - }) - - select { - case <-done: - log.Println("[Lifecycle] all services stopped gracefully") - case <-ctx.Done(): - log.Printf("[Lifecycle] shutdown timed out: %v\n", ctx.Err()) - } -} diff --git a/backend/OpenFlare/plugins/server/plugin.go b/backend/OpenFlare/plugins/server/plugin.go index 8eb7ae78..9b8d8307 100644 --- a/backend/OpenFlare/plugins/server/plugin.go +++ b/backend/OpenFlare/plugins/server/plugin.go @@ -7,15 +7,15 @@ package server import ( + ofgeoip "Wavelet/OpenFlare/plugins/server/geoip" + ofrouter "Wavelet/OpenFlare/plugins/server/httpapi" "Wavelet/OpenFlare/plugins/server/migrate" + "Wavelet/OpenFlare/plugins/server/observability/chwriter" "Wavelet/OpenFlare/plugins/server/ofevents" - "Wavelet/OpenFlare/plugins/server/openflare/chwriter" - ofgeoip "Wavelet/OpenFlare/plugins/server/openflare/geoip" - "Wavelet/OpenFlare/plugins/server/openflare/ofupload" + "Wavelet/OpenFlare/plugins/server/ofupload" "Wavelet/OpenFlare/plugins/server/publicconfig" "Wavelet/OpenFlare/plugins/server/repository" "Wavelet/OpenFlare/plugins/server/repository/logstore" - ofrouter "Wavelet/OpenFlare/plugins/server/router/v1/openflare" "Wavelet/OpenFlare/plugins/server/runtimeconfig" oftask "Wavelet/OpenFlare/plugins/server/task" "Wavelet/core" @@ -26,7 +26,7 @@ import ( "embed" "reflect" - "Wavelet/OpenFlare/plugins/server/openflare/credential" + "Wavelet/OpenFlare/plugins/server/credential" _ "Wavelet/docs" adminservice "Wavelet/plugins/domain/admin/service" @@ -108,6 +108,9 @@ func (p *Plugin) Apply(ctx *core.Context) error { logger.ErrorF(ctx.GoContext(), "[server] init GeoIP provider failed: %v", err) } chwriter.Init(ctx.GoContext()) + ctx.OnDispose(func() error { + return chwriter.Stop(context.Background()) + }) var auth contracts.AuthService if err := core.Using[contracts.AuthService](ctx, func(s contracts.AuthService) { auth = s }); err != nil { diff --git a/backend/OpenFlare/plugins/server/plugin_tasks.go b/backend/OpenFlare/plugins/server/plugin_tasks.go index 1ad52301..be036617 100644 --- a/backend/OpenFlare/plugins/server/plugin_tasks.go +++ b/backend/OpenFlare/plugins/server/plugin_tasks.go @@ -6,21 +6,21 @@ package server import ( "context" - "Wavelet/OpenFlare/plugins/server/openflare" - cf "Wavelet/OpenFlare/plugins/server/openflare/cloudflare" - "Wavelet/OpenFlare/plugins/server/openflare/pages" - "Wavelet/OpenFlare/plugins/server/openflare/tasks" - "Wavelet/OpenFlare/plugins/server/openflare/tls" + cf "Wavelet/OpenFlare/plugins/server/cloudflare" + "Wavelet/OpenFlare/plugins/server/fleet" + "Wavelet/OpenFlare/plugins/server/observability" + "Wavelet/OpenFlare/plugins/server/pages" oftask "Wavelet/OpenFlare/plugins/server/task" + "Wavelet/OpenFlare/plugins/server/tls" "Wavelet/core" "Wavelet/core/extpoints" ) func registerOpenFlareTasks(ctx *core.Context) { - registerOFTask(ctx, openflare.SSLRenewTask, &openflare.SSLRenewHandler{}, openflare.SSLRenewMeta) - registerOFTask(ctx, openflare.WAFIPGroupSyncTask, &openflare.WAFIPGroupSyncHandler{}, openflare.WAFIPGroupSyncMeta) - registerOFTask(ctx, openflare.UptimeKumaSyncTask, &openflare.UptimeKumaSyncHandler{}, openflare.UptimeKumaSyncMeta) - registerOFTask(ctx, openflare.LogDBSwitchTask, &tasks.LogDBSwitchHandler{}, openflare.LogDBSwitchMeta) + registerOFTask(ctx, fleet.SSLRenewTask, &fleet.SSLRenewHandler{}, fleet.SSLRenewMeta) + registerOFTask(ctx, fleet.WAFIPGroupSyncTask, &fleet.WAFIPGroupSyncHandler{}, fleet.WAFIPGroupSyncMeta) + registerOFTask(ctx, fleet.UptimeKumaSyncTask, &fleet.UptimeKumaSyncHandler{}, fleet.UptimeKumaSyncMeta) + registerOFTask(ctx, fleet.LogDBSwitchTask, &observability.LogDBSwitchHandler{}, fleet.LogDBSwitchMeta) registerOFTask(ctx, cf.SyncMemberTask, &cf.SyncMemberTaskHandler{}, cf.SyncMemberMeta) registerOFTask(ctx, cf.SyncGroupTask, &cf.SyncGroupTaskHandler{}, cf.SyncGroupMeta) diff --git a/backend/OpenFlare/plugins/server/repository/analytics/clickhouse_stats.go b/backend/OpenFlare/plugins/server/repository/analytics/clickhouse_stats.go index 4aedc722..a5e85afc 100644 --- a/backend/OpenFlare/plugins/server/repository/analytics/clickhouse_stats.go +++ b/backend/OpenFlare/plugins/server/repository/analytics/clickhouse_stats.go @@ -8,9 +8,9 @@ import ( "errors" "fmt" + analyticsmodel "Wavelet/OpenFlare/plugins/server/model/analytics" "Wavelet/OpenFlare/plugins/server/runtimeconfig" db "Wavelet/plugins/infra/database" - analyticsmodel "Wavelet/OpenFlare/plugins/server/model/analytics" ) // ClickHouseOperationalStats summarizes ClickHouse merge/mutation pressure diff --git a/backend/OpenFlare/plugins/server/repository/analytics/node_access_log.go b/backend/OpenFlare/plugins/server/repository/analytics/node_access_log.go index 0244b2e0..2aab6863 100644 --- a/backend/OpenFlare/plugins/server/repository/analytics/node_access_log.go +++ b/backend/OpenFlare/plugins/server/repository/analytics/node_access_log.go @@ -10,8 +10,8 @@ import ( "strings" "time" - db "Wavelet/plugins/infra/database" analyticsmodel "Wavelet/OpenFlare/plugins/server/model/analytics" + db "Wavelet/plugins/infra/database" "github.com/ClickHouse/clickhouse-go/v2/lib/driver" ) diff --git a/backend/OpenFlare/plugins/server/repository/analytics/node_access_log_test.go b/backend/OpenFlare/plugins/server/repository/analytics/node_access_log_test.go index a1f308a8..d2e7b6ee 100644 --- a/backend/OpenFlare/plugins/server/repository/analytics/node_access_log_test.go +++ b/backend/OpenFlare/plugins/server/repository/analytics/node_access_log_test.go @@ -8,9 +8,9 @@ import ( "testing" "time" - db "Wavelet/plugins/infra/database" analyticsmodel "Wavelet/OpenFlare/plugins/server/model/analytics" "Wavelet/pkg/idgen" + db "Wavelet/plugins/infra/database" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/backend/OpenFlare/plugins/server/repository/analytics/node_access_log_writer.go b/backend/OpenFlare/plugins/server/repository/analytics/node_access_log_writer.go index 1c8032da..892d2f02 100644 --- a/backend/OpenFlare/plugins/server/repository/analytics/node_access_log_writer.go +++ b/backend/OpenFlare/plugins/server/repository/analytics/node_access_log_writer.go @@ -10,9 +10,9 @@ import ( "strings" "time" - db "Wavelet/plugins/infra/database" - "Wavelet/pkg/idgen" analyticsmodel "Wavelet/OpenFlare/plugins/server/model/analytics" + "Wavelet/pkg/idgen" + db "Wavelet/plugins/infra/database" ) // BatchInsertNodeAccessLogs writes node access logs to ClickHouse using the native batch API. diff --git a/backend/OpenFlare/plugins/server/repository/analytics/node_observability.go b/backend/OpenFlare/plugins/server/repository/analytics/node_observability.go index 967ff97d..29f57f0b 100644 --- a/backend/OpenFlare/plugins/server/repository/analytics/node_observability.go +++ b/backend/OpenFlare/plugins/server/repository/analytics/node_observability.go @@ -10,8 +10,8 @@ import ( "slices" "time" - db "Wavelet/plugins/infra/database" analyticsmodel "Wavelet/OpenFlare/plugins/server/model/analytics" + db "Wavelet/plugins/infra/database" "github.com/ClickHouse/clickhouse-go/v2/lib/driver" ) diff --git a/backend/OpenFlare/plugins/server/repository/analytics/node_observability_test.go b/backend/OpenFlare/plugins/server/repository/analytics/node_observability_test.go index f0ae4a2e..6d1656c2 100644 --- a/backend/OpenFlare/plugins/server/repository/analytics/node_observability_test.go +++ b/backend/OpenFlare/plugins/server/repository/analytics/node_observability_test.go @@ -8,8 +8,8 @@ import ( "testing" "time" - db "Wavelet/plugins/infra/database" analyticsmodel "Wavelet/OpenFlare/plugins/server/model/analytics" + db "Wavelet/plugins/infra/database" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/backend/OpenFlare/plugins/server/repository/analytics/node_observability_writer.go b/backend/OpenFlare/plugins/server/repository/analytics/node_observability_writer.go index e82d8278..fb78d7c4 100644 --- a/backend/OpenFlare/plugins/server/repository/analytics/node_observability_writer.go +++ b/backend/OpenFlare/plugins/server/repository/analytics/node_observability_writer.go @@ -10,9 +10,9 @@ import ( "strings" "time" - db "Wavelet/plugins/infra/database" - "Wavelet/pkg/idgen" analyticsmodel "Wavelet/OpenFlare/plugins/server/model/analytics" + "Wavelet/pkg/idgen" + db "Wavelet/plugins/infra/database" ) const edgeHealthStatusUnknown = "unknown" diff --git a/backend/OpenFlare/plugins/server/repository/logstore/cleanup_test.go b/backend/OpenFlare/plugins/server/repository/logstore/cleanup_test.go index d7c83d44..e530d9ed 100644 --- a/backend/OpenFlare/plugins/server/repository/logstore/cleanup_test.go +++ b/backend/OpenFlare/plugins/server/repository/logstore/cleanup_test.go @@ -15,9 +15,9 @@ import ( "gorm.io/gorm" "gorm.io/gorm/logger" - db "Wavelet/plugins/infra/database" "Wavelet/OpenFlare/plugins/server/model" analyticsmodel "Wavelet/OpenFlare/plugins/server/model/analytics" + db "Wavelet/plugins/infra/database" ) // cleanupTestModels 清理涉及的 5 张日志/可观测表。 diff --git a/backend/OpenFlare/plugins/server/repository/logstore/clickhouse_store.go b/backend/OpenFlare/plugins/server/repository/logstore/clickhouse_store.go index c1fd97d1..2027537e 100644 --- a/backend/OpenFlare/plugins/server/repository/logstore/clickhouse_store.go +++ b/backend/OpenFlare/plugins/server/repository/logstore/clickhouse_store.go @@ -10,10 +10,10 @@ import ( "math" "time" - db "Wavelet/plugins/infra/database" "Wavelet/OpenFlare/plugins/server/model" analyticsmodel "Wavelet/OpenFlare/plugins/server/model/analytics" analyticsrepo "Wavelet/OpenFlare/plugins/server/repository/analytics" + db "Wavelet/plugins/infra/database" "github.com/ClickHouse/clickhouse-go/v2/lib/driver" ) diff --git a/backend/OpenFlare/plugins/server/repository/logstore/imports_test.go b/backend/OpenFlare/plugins/server/repository/logstore/imports_test.go index 033c647e..52f84e8c 100644 --- a/backend/OpenFlare/plugins/server/repository/logstore/imports_test.go +++ b/backend/OpenFlare/plugins/server/repository/logstore/imports_test.go @@ -37,7 +37,8 @@ var allowedInfraPersistence = []string{ // domainScopes 是 server 插件内的业务域包（等价于改造前的 internal/apps/...）。 // 持久化与基础设施层（repository/infra/model/…）不受本门禁约束。 var domainScopes = []string{ - "openflare", "updater", + "site", "fleet", "pages", "waf", "tls", "cloudflare", + "observability", "dashboard", "option", "updater", } func TestDomainsMustNotImportLogBackendDirectly(t *testing.T) { diff --git a/backend/OpenFlare/plugins/server/repository/logstore/provider.go b/backend/OpenFlare/plugins/server/repository/logstore/provider.go index c97f29e2..92eed378 100644 --- a/backend/OpenFlare/plugins/server/repository/logstore/provider.go +++ b/backend/OpenFlare/plugins/server/repository/logstore/provider.go @@ -10,10 +10,10 @@ import ( "sync" "time" - "Wavelet/OpenFlare/plugins/server/runtimeconfig" - db "Wavelet/plugins/infra/database" "Wavelet/OpenFlare/plugins/server/model" + "Wavelet/OpenFlare/plugins/server/runtimeconfig" "Wavelet/pkg/logger" + db "Wavelet/plugins/infra/database" ) // logDatabaseKey / logMigrationKey 对应 model.ConfigKeyLogDatabase / ConfigKeyLogDBMigration。 diff --git a/backend/OpenFlare/plugins/server/repository/openflare_access_log_test.go b/backend/OpenFlare/plugins/server/repository/openflare_access_log_test.go index 72196c38..e2408350 100644 --- a/backend/OpenFlare/plugins/server/repository/openflare_access_log_test.go +++ b/backend/OpenFlare/plugins/server/repository/openflare_access_log_test.go @@ -14,11 +14,11 @@ import ( "gorm.io/gorm" "gorm.io/gorm/logger" - db "Wavelet/plugins/infra/database" "Wavelet/OpenFlare/plugins/server/model" analyticsmodel "Wavelet/OpenFlare/plugins/server/model/analytics" "Wavelet/OpenFlare/plugins/server/repository/logstore" "Wavelet/pkg/idgen" + db "Wavelet/plugins/infra/database" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/backend/OpenFlare/plugins/server/repository/openflare_acme_account.go b/backend/OpenFlare/plugins/server/repository/openflare_acme_account.go index 51300d83..92560116 100644 --- a/backend/OpenFlare/plugins/server/repository/openflare_acme_account.go +++ b/backend/OpenFlare/plugins/server/repository/openflare_acme_account.go @@ -9,8 +9,8 @@ import ( "gorm.io/gorm" - db "Wavelet/plugins/infra/database" "Wavelet/OpenFlare/plugins/server/model" + db "Wavelet/plugins/infra/database" ) // GetAcmeAccountByID 按 ID 查询 ACME 账号。 diff --git a/backend/OpenFlare/plugins/server/repository/openflare_apply_log.go b/backend/OpenFlare/plugins/server/repository/openflare_apply_log.go index 4438c1b9..f3c5047f 100644 --- a/backend/OpenFlare/plugins/server/repository/openflare_apply_log.go +++ b/backend/OpenFlare/plugins/server/repository/openflare_apply_log.go @@ -11,8 +11,8 @@ import ( "gorm.io/gorm" - db "Wavelet/plugins/infra/database" "Wavelet/OpenFlare/plugins/server/model" + db "Wavelet/plugins/infra/database" ) // ListOpenFlareApplyLogs returns apply logs ordered by id desc with optional pagination. diff --git a/backend/OpenFlare/plugins/server/repository/openflare_cloudflare.go b/backend/OpenFlare/plugins/server/repository/openflare_cloudflare.go index 862e64b5..1825d30c 100644 --- a/backend/OpenFlare/plugins/server/repository/openflare_cloudflare.go +++ b/backend/OpenFlare/plugins/server/repository/openflare_cloudflare.go @@ -7,8 +7,8 @@ import ( "context" "errors" - db "Wavelet/plugins/infra/database" "Wavelet/OpenFlare/plugins/server/model" + db "Wavelet/plugins/infra/database" "gorm.io/gorm" ) diff --git a/backend/OpenFlare/plugins/server/repository/openflare_cloudflare_test.go b/backend/OpenFlare/plugins/server/repository/openflare_cloudflare_test.go index d3d29886..62f979a6 100644 --- a/backend/OpenFlare/plugins/server/repository/openflare_cloudflare_test.go +++ b/backend/OpenFlare/plugins/server/repository/openflare_cloudflare_test.go @@ -7,8 +7,8 @@ import ( "context" "testing" - db "Wavelet/plugins/infra/database" "Wavelet/OpenFlare/plugins/server/model" + db "Wavelet/plugins/infra/database" "github.com/glebarez/sqlite" "gorm.io/gorm" diff --git a/backend/OpenFlare/plugins/server/repository/openflare_config_version.go b/backend/OpenFlare/plugins/server/repository/openflare_config_version.go index 24b37407..7769edcc 100644 --- a/backend/OpenFlare/plugins/server/repository/openflare_config_version.go +++ b/backend/OpenFlare/plugins/server/repository/openflare_config_version.go @@ -9,8 +9,8 @@ import ( "gorm.io/gorm" - db "Wavelet/plugins/infra/database" "Wavelet/OpenFlare/plugins/server/model" + db "Wavelet/plugins/infra/database" ) // ListConfigVersionSummaries returns config version summaries ordered by created_at desc. diff --git a/backend/OpenFlare/plugins/server/repository/openflare_dns_account.go b/backend/OpenFlare/plugins/server/repository/openflare_dns_account.go index 21f103bd..320064b5 100644 --- a/backend/OpenFlare/plugins/server/repository/openflare_dns_account.go +++ b/backend/OpenFlare/plugins/server/repository/openflare_dns_account.go @@ -7,8 +7,8 @@ import ( "context" "errors" - db "Wavelet/plugins/infra/database" "Wavelet/OpenFlare/plugins/server/model" + db "Wavelet/plugins/infra/database" ) // ListDNSAccounts 列出全部 DNS 账号（授权信息不通过 JSON 暴露）。 diff --git a/backend/OpenFlare/plugins/server/repository/openflare_node.go b/backend/OpenFlare/plugins/server/repository/openflare_node.go index ceeff202..199eb33b 100644 --- a/backend/OpenFlare/plugins/server/repository/openflare_node.go +++ b/backend/OpenFlare/plugins/server/repository/openflare_node.go @@ -10,8 +10,8 @@ import ( "gorm.io/gorm" - db "Wavelet/plugins/infra/database" "Wavelet/OpenFlare/plugins/server/model" + db "Wavelet/plugins/infra/database" ) const ( diff --git a/backend/OpenFlare/plugins/server/repository/openflare_observability.go b/backend/OpenFlare/plugins/server/repository/openflare_observability.go index 2e7a2030..bd7bf3ad 100644 --- a/backend/OpenFlare/plugins/server/repository/openflare_observability.go +++ b/backend/OpenFlare/plugins/server/repository/openflare_observability.go @@ -13,12 +13,12 @@ import ( "gorm.io/gorm" "gorm.io/gorm/clause" - db "Wavelet/plugins/infra/database" "Wavelet/OpenFlare/plugins/server/model" analyticsmodel "Wavelet/OpenFlare/plugins/server/model/analytics" analyticsrepo "Wavelet/OpenFlare/plugins/server/repository/analytics" "Wavelet/OpenFlare/plugins/server/repository/logstore" "Wavelet/pkg/logger" + db "Wavelet/plugins/infra/database" ) const ( diff --git a/backend/OpenFlare/plugins/server/repository/openflare_origin.go b/backend/OpenFlare/plugins/server/repository/openflare_origin.go index b3d9e468..4f2fce82 100644 --- a/backend/OpenFlare/plugins/server/repository/openflare_origin.go +++ b/backend/OpenFlare/plugins/server/repository/openflare_origin.go @@ -8,8 +8,8 @@ import ( "gorm.io/gorm" - db "Wavelet/plugins/infra/database" "Wavelet/OpenFlare/plugins/server/model" + db "Wavelet/plugins/infra/database" ) // WithOriginTx runs fn inside a database transaction for origin multi-step work. diff --git a/backend/OpenFlare/plugins/server/repository/openflare_pages.go b/backend/OpenFlare/plugins/server/repository/openflare_pages.go index a6f487bd..a3f25703 100644 --- a/backend/OpenFlare/plugins/server/repository/openflare_pages.go +++ b/backend/OpenFlare/plugins/server/repository/openflare_pages.go @@ -6,8 +6,8 @@ package repository import ( "context" - db "Wavelet/plugins/infra/database" "Wavelet/OpenFlare/plugins/server/model" + db "Wavelet/plugins/infra/database" ) // HasPagesProjectsTable 判断 Pages 项目表是否已迁移。 diff --git a/backend/OpenFlare/plugins/server/repository/openflare_pages_cleanup.go b/backend/OpenFlare/plugins/server/repository/openflare_pages_cleanup.go index 40df22df..62ab38c9 100644 --- a/backend/OpenFlare/plugins/server/repository/openflare_pages_cleanup.go +++ b/backend/OpenFlare/plugins/server/repository/openflare_pages_cleanup.go @@ -7,8 +7,8 @@ import ( "context" "errors" - db "Wavelet/plugins/infra/database" "Wavelet/OpenFlare/plugins/server/model" + db "Wavelet/plugins/infra/database" ) // ListPagesOrphanUploadCandidates returns at most 100 unreferenced, isolated diff --git a/backend/OpenFlare/plugins/server/repository/openflare_pages_source.go b/backend/OpenFlare/plugins/server/repository/openflare_pages_source.go index 46a13872..c6c1f755 100644 --- a/backend/OpenFlare/plugins/server/repository/openflare_pages_source.go +++ b/backend/OpenFlare/plugins/server/repository/openflare_pages_source.go @@ -10,8 +10,8 @@ import ( "gorm.io/gorm" "gorm.io/gorm/clause" - db "Wavelet/plugins/infra/database" "Wavelet/OpenFlare/plugins/server/model" + db "Wavelet/plugins/infra/database" ) const pagesRowLockStrength = "UPDATE" diff --git a/backend/OpenFlare/plugins/server/repository/openflare_proxy_route.go b/backend/OpenFlare/plugins/server/repository/openflare_proxy_route.go index e4a1d985..841937eb 100644 --- a/backend/OpenFlare/plugins/server/repository/openflare_proxy_route.go +++ b/backend/OpenFlare/plugins/server/repository/openflare_proxy_route.go @@ -10,8 +10,8 @@ import ( "gorm.io/gorm" "gorm.io/gorm/clause" - db "Wavelet/plugins/infra/database" "Wavelet/OpenFlare/plugins/server/model" + db "Wavelet/plugins/infra/database" ) // Zone domain binding sentinel errors (shared by proxy_route and zone binding helpers). diff --git a/backend/OpenFlare/plugins/server/repository/openflare_tls.go b/backend/OpenFlare/plugins/server/repository/openflare_tls.go index ae420bbc..865fb6b7 100644 --- a/backend/OpenFlare/plugins/server/repository/openflare_tls.go +++ b/backend/OpenFlare/plugins/server/repository/openflare_tls.go @@ -7,8 +7,8 @@ import ( "context" "errors" - db "Wavelet/plugins/infra/database" "Wavelet/OpenFlare/plugins/server/model" + db "Wavelet/plugins/infra/database" ) // HasTLSProxyRoutesTable 判断代理规则表是否已迁移。 diff --git a/backend/OpenFlare/plugins/server/repository/openflare_waf.go b/backend/OpenFlare/plugins/server/repository/openflare_waf.go index 945104ac..f2f8a626 100644 --- a/backend/OpenFlare/plugins/server/repository/openflare_waf.go +++ b/backend/OpenFlare/plugins/server/repository/openflare_waf.go @@ -10,8 +10,8 @@ import ( "gorm.io/gorm" - db "Wavelet/plugins/infra/database" "Wavelet/OpenFlare/plugins/server/model" + db "Wavelet/plugins/infra/database" ) func wafDB(ctx context.Context) (*gorm.DB, error) { diff --git a/backend/OpenFlare/plugins/server/repository/openflare_zone.go b/backend/OpenFlare/plugins/server/repository/openflare_zone.go index c29e4d2c..91e67e71 100644 --- a/backend/OpenFlare/plugins/server/repository/openflare_zone.go +++ b/backend/OpenFlare/plugins/server/repository/openflare_zone.go @@ -9,8 +9,8 @@ import ( "gorm.io/gorm" - db "Wavelet/plugins/infra/database" "Wavelet/OpenFlare/plugins/server/model" + db "Wavelet/plugins/infra/database" ) // ListZones returns all zones ordered by domain ascending. diff --git a/backend/OpenFlare/plugins/server/shared/constants.go b/backend/OpenFlare/plugins/server/shared/constants.go deleted file mode 100644 index d2793f58..00000000 --- a/backend/OpenFlare/plugins/server/shared/constants.go +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright 2025 linux.do -// Copyright 2026 Arctel.net -// SPDX-License-Identifier: Apache-2.0 - -// Package shared 提供跨模块共享的常量、错误定义和通用类型。 -package shared diff --git a/backend/OpenFlare/plugins/server/shared/errs.go b/backend/OpenFlare/plugins/server/shared/errs.go deleted file mode 100644 index c5c61b8c..00000000 --- a/backend/OpenFlare/plugins/server/shared/errs.go +++ /dev/null @@ -1,11 +0,0 @@ -// Copyright 2025 linux.do -// Copyright 2026 Arctel.net -// SPDX-License-Identifier: Apache-2.0 - -package shared - -// 通用业务错误消息常量 -const ( - BannedAccount = "账号已被封禁" - UnAuthorized = "未登录" -) diff --git a/backend/OpenFlare/plugins/server/openflare/apply_log/errs.go b/backend/OpenFlare/plugins/server/site/apply_log/errs.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/apply_log/errs.go rename to backend/OpenFlare/plugins/server/site/apply_log/errs.go diff --git a/backend/OpenFlare/plugins/server/openflare/apply_log/logics.go b/backend/OpenFlare/plugins/server/site/apply_log/logics.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/apply_log/logics.go rename to backend/OpenFlare/plugins/server/site/apply_log/logics.go diff --git a/backend/OpenFlare/plugins/server/openflare/apply_log/logics_test.go b/backend/OpenFlare/plugins/server/site/apply_log/logics_test.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/apply_log/logics_test.go rename to backend/OpenFlare/plugins/server/site/apply_log/logics_test.go index 36e52c2c..3ab89b69 100644 --- a/backend/OpenFlare/plugins/server/openflare/apply_log/logics_test.go +++ b/backend/OpenFlare/plugins/server/site/apply_log/logics_test.go @@ -10,8 +10,8 @@ import ( "Wavelet/OpenFlare/plugins/server/repository" - db "Wavelet/plugins/infra/database" "Wavelet/OpenFlare/plugins/server/model" + db "Wavelet/plugins/infra/database" "github.com/glebarez/sqlite" "github.com/stretchr/testify/assert" diff --git a/backend/OpenFlare/plugins/server/openflare/apply_log/routers.go b/backend/OpenFlare/plugins/server/site/apply_log/routers.go similarity index 97% rename from backend/OpenFlare/plugins/server/openflare/apply_log/routers.go rename to backend/OpenFlare/plugins/server/site/apply_log/routers.go index f5afd99e..0eae2642 100644 --- a/backend/OpenFlare/plugins/server/openflare/apply_log/routers.go +++ b/backend/OpenFlare/plugins/server/site/apply_log/routers.go @@ -7,7 +7,7 @@ import ( "net/http" "strconv" - "Wavelet/OpenFlare/plugins/server/openflare/apiutil" + "Wavelet/OpenFlare/plugins/server/apiutil" "Wavelet/pkg/response" "github.com/gin-gonic/gin" diff --git a/backend/OpenFlare/plugins/server/openflare/config_version/certificate_snapshot_test.go b/backend/OpenFlare/plugins/server/site/config_version/certificate_snapshot_test.go similarity index 98% rename from backend/OpenFlare/plugins/server/openflare/config_version/certificate_snapshot_test.go rename to backend/OpenFlare/plugins/server/site/config_version/certificate_snapshot_test.go index 6e965ed2..c2c26f26 100644 --- a/backend/OpenFlare/plugins/server/openflare/config_version/certificate_snapshot_test.go +++ b/backend/OpenFlare/plugins/server/site/config_version/certificate_snapshot_test.go @@ -17,10 +17,10 @@ import ( "Wavelet/OpenFlare/plugins/server/repository" - "Wavelet/OpenFlare/plugins/server/runtimeconfig" - db "Wavelet/plugins/infra/database" "Wavelet/OpenFlare/plugins/server/model" - oftls "Wavelet/OpenFlare/plugins/server/openflare/tls" + "Wavelet/OpenFlare/plugins/server/runtimeconfig" + oftls "Wavelet/OpenFlare/plugins/server/tls" + db "Wavelet/plugins/infra/database" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/backend/OpenFlare/plugins/server/openflare/config_version/errs.go b/backend/OpenFlare/plugins/server/site/config_version/errs.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/config_version/errs.go rename to backend/OpenFlare/plugins/server/site/config_version/errs.go diff --git a/backend/OpenFlare/plugins/server/openflare/config_version/helpers.go b/backend/OpenFlare/plugins/server/site/config_version/helpers.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/config_version/helpers.go rename to backend/OpenFlare/plugins/server/site/config_version/helpers.go diff --git a/backend/OpenFlare/plugins/server/openflare/config_version/logics.go b/backend/OpenFlare/plugins/server/site/config_version/logics.go similarity index 99% rename from backend/OpenFlare/plugins/server/openflare/config_version/logics.go rename to backend/OpenFlare/plugins/server/site/config_version/logics.go index 9c6ea5c2..6228103a 100644 --- a/backend/OpenFlare/plugins/server/openflare/config_version/logics.go +++ b/backend/OpenFlare/plugins/server/site/config_version/logics.go @@ -16,8 +16,8 @@ import ( "Wavelet/OpenFlare/plugins/server/repository" + "Wavelet/OpenFlare/plugins/server/fleet/websocket" "Wavelet/OpenFlare/plugins/server/model" - "Wavelet/OpenFlare/plugins/server/openflare/websocket" pkgprotocol "Wavelet/OpenFlare/share/protocol" openrestyrender "Wavelet/OpenFlare/share/render/openresty" diff --git a/backend/OpenFlare/plugins/server/openflare/config_version/logics_test.go b/backend/OpenFlare/plugins/server/site/config_version/logics_test.go similarity index 99% rename from backend/OpenFlare/plugins/server/openflare/config_version/logics_test.go rename to backend/OpenFlare/plugins/server/site/config_version/logics_test.go index a4a0c27d..094d3657 100644 --- a/backend/OpenFlare/plugins/server/openflare/config_version/logics_test.go +++ b/backend/OpenFlare/plugins/server/site/config_version/logics_test.go @@ -12,11 +12,11 @@ import ( "Wavelet/OpenFlare/plugins/server/repository" - db "Wavelet/plugins/infra/database" "Wavelet/OpenFlare/plugins/server/model" - "Wavelet/OpenFlare/plugins/server/openflare/waf" + "Wavelet/OpenFlare/plugins/server/waf" openrestyrender "Wavelet/OpenFlare/share/render/openresty" "Wavelet/pkg/cache/ram" + db "Wavelet/plugins/infra/database" "github.com/glebarez/sqlite" "github.com/stretchr/testify/assert" diff --git a/backend/OpenFlare/plugins/server/openflare/config_version/origin_error_page_snapshot_test.go b/backend/OpenFlare/plugins/server/site/config_version/origin_error_page_snapshot_test.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/config_version/origin_error_page_snapshot_test.go rename to backend/OpenFlare/plugins/server/site/config_version/origin_error_page_snapshot_test.go index d28173d0..91379115 100644 --- a/backend/OpenFlare/plugins/server/openflare/config_version/origin_error_page_snapshot_test.go +++ b/backend/OpenFlare/plugins/server/site/config_version/origin_error_page_snapshot_test.go @@ -8,9 +8,9 @@ import ( "encoding/json" "testing" - db "Wavelet/plugins/infra/database" "Wavelet/OpenFlare/plugins/server/model" "Wavelet/pkg/cache/ram" + db "Wavelet/plugins/infra/database" "github.com/glebarez/sqlite" "github.com/stretchr/testify/assert" diff --git a/backend/OpenFlare/plugins/server/openflare/config_version/pages_snapshot.go b/backend/OpenFlare/plugins/server/site/config_version/pages_snapshot.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/config_version/pages_snapshot.go rename to backend/OpenFlare/plugins/server/site/config_version/pages_snapshot.go diff --git a/backend/OpenFlare/plugins/server/openflare/config_version/pages_snapshot_test.go b/backend/OpenFlare/plugins/server/site/config_version/pages_snapshot_test.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/config_version/pages_snapshot_test.go rename to backend/OpenFlare/plugins/server/site/config_version/pages_snapshot_test.go index c13da391..dc477f0c 100644 --- a/backend/OpenFlare/plugins/server/openflare/config_version/pages_snapshot_test.go +++ b/backend/OpenFlare/plugins/server/site/config_version/pages_snapshot_test.go @@ -10,9 +10,9 @@ import ( "Wavelet/OpenFlare/plugins/server/repository" - db "Wavelet/plugins/infra/database" "Wavelet/OpenFlare/plugins/server/model" openrestyrender "Wavelet/OpenFlare/share/render/openresty" + db "Wavelet/plugins/infra/database" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/backend/OpenFlare/plugins/server/openflare/config_version/proxy_cache_path_test.go b/backend/OpenFlare/plugins/server/site/config_version/proxy_cache_path_test.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/config_version/proxy_cache_path_test.go rename to backend/OpenFlare/plugins/server/site/config_version/proxy_cache_path_test.go diff --git a/backend/OpenFlare/plugins/server/openflare/config_version/renderer.go b/backend/OpenFlare/plugins/server/site/config_version/renderer.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/config_version/renderer.go rename to backend/OpenFlare/plugins/server/site/config_version/renderer.go diff --git a/backend/OpenFlare/plugins/server/openflare/config_version/routers.go b/backend/OpenFlare/plugins/server/site/config_version/routers.go similarity index 99% rename from backend/OpenFlare/plugins/server/openflare/config_version/routers.go rename to backend/OpenFlare/plugins/server/site/config_version/routers.go index 53f3cf61..74718fee 100644 --- a/backend/OpenFlare/plugins/server/openflare/config_version/routers.go +++ b/backend/OpenFlare/plugins/server/site/config_version/routers.go @@ -6,7 +6,7 @@ package config_version import ( "net/http" - "Wavelet/OpenFlare/plugins/server/openflare/apiutil" + "Wavelet/OpenFlare/plugins/server/apiutil" "Wavelet/pkg/response" "github.com/gin-gonic/gin" diff --git a/backend/OpenFlare/plugins/server/openflare/config_version/snapshot.go b/backend/OpenFlare/plugins/server/site/config_version/snapshot.go similarity index 99% rename from backend/OpenFlare/plugins/server/openflare/config_version/snapshot.go rename to backend/OpenFlare/plugins/server/site/config_version/snapshot.go index 9774db90..ba8b26bd 100644 --- a/backend/OpenFlare/plugins/server/openflare/config_version/snapshot.go +++ b/backend/OpenFlare/plugins/server/site/config_version/snapshot.go @@ -14,9 +14,9 @@ import ( "strings" "Wavelet/OpenFlare/plugins/server/model" - oftls "Wavelet/OpenFlare/plugins/server/openflare/tls" - "Wavelet/OpenFlare/plugins/server/openflare/waf" "Wavelet/OpenFlare/plugins/server/repository" + oftls "Wavelet/OpenFlare/plugins/server/tls" + "Wavelet/OpenFlare/plugins/server/waf" "Wavelet/OpenFlare/share/protocol" openrestyrender "Wavelet/OpenFlare/share/render/openresty" diff --git a/backend/OpenFlare/plugins/server/openflare/config_version/waf_graph_snapshot_test.go b/backend/OpenFlare/plugins/server/site/config_version/waf_graph_snapshot_test.go similarity index 99% rename from backend/OpenFlare/plugins/server/openflare/config_version/waf_graph_snapshot_test.go rename to backend/OpenFlare/plugins/server/site/config_version/waf_graph_snapshot_test.go index c3b3d15c..63dc57ea 100644 --- a/backend/OpenFlare/plugins/server/openflare/config_version/waf_graph_snapshot_test.go +++ b/backend/OpenFlare/plugins/server/site/config_version/waf_graph_snapshot_test.go @@ -11,9 +11,9 @@ import ( "Wavelet/OpenFlare/plugins/server/repository" - db "Wavelet/plugins/infra/database" "Wavelet/OpenFlare/plugins/server/model" - "Wavelet/OpenFlare/plugins/server/openflare/waf" + "Wavelet/OpenFlare/plugins/server/waf" + db "Wavelet/plugins/infra/database" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/backend/OpenFlare/plugins/server/openflare/origin/errs.go b/backend/OpenFlare/plugins/server/site/origin/errs.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/origin/errs.go rename to backend/OpenFlare/plugins/server/site/origin/errs.go diff --git a/backend/OpenFlare/plugins/server/openflare/origin/helpers.go b/backend/OpenFlare/plugins/server/site/origin/helpers.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/origin/helpers.go rename to backend/OpenFlare/plugins/server/site/origin/helpers.go diff --git a/backend/OpenFlare/plugins/server/openflare/origin/logics.go b/backend/OpenFlare/plugins/server/site/origin/logics.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/origin/logics.go rename to backend/OpenFlare/plugins/server/site/origin/logics.go diff --git a/backend/OpenFlare/plugins/server/openflare/origin/logics_test.go b/backend/OpenFlare/plugins/server/site/origin/logics_test.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/origin/logics_test.go rename to backend/OpenFlare/plugins/server/site/origin/logics_test.go index f918142a..e0930de5 100644 --- a/backend/OpenFlare/plugins/server/openflare/origin/logics_test.go +++ b/backend/OpenFlare/plugins/server/site/origin/logics_test.go @@ -7,8 +7,8 @@ import ( "context" "testing" - db "Wavelet/plugins/infra/database" "Wavelet/OpenFlare/plugins/server/model" + db "Wavelet/plugins/infra/database" "github.com/glebarez/sqlite" "github.com/stretchr/testify/assert" diff --git a/backend/OpenFlare/plugins/server/openflare/origin/routers.go b/backend/OpenFlare/plugins/server/site/origin/routers.go similarity index 98% rename from backend/OpenFlare/plugins/server/openflare/origin/routers.go rename to backend/OpenFlare/plugins/server/site/origin/routers.go index 1652234b..9b644686 100644 --- a/backend/OpenFlare/plugins/server/openflare/origin/routers.go +++ b/backend/OpenFlare/plugins/server/site/origin/routers.go @@ -6,7 +6,7 @@ package origin import ( "net/http" - "Wavelet/OpenFlare/plugins/server/openflare/apiutil" + "Wavelet/OpenFlare/plugins/server/apiutil" "Wavelet/pkg/response" "github.com/gin-gonic/gin" diff --git a/backend/OpenFlare/plugins/server/openflare/proxy_route/build_helpers.go b/backend/OpenFlare/plugins/server/site/proxy_route/build_helpers.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/proxy_route/build_helpers.go rename to backend/OpenFlare/plugins/server/site/proxy_route/build_helpers.go diff --git a/backend/OpenFlare/plugins/server/openflare/proxy_route/errs.go b/backend/OpenFlare/plugins/server/site/proxy_route/errs.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/proxy_route/errs.go rename to backend/OpenFlare/plugins/server/site/proxy_route/errs.go diff --git a/backend/OpenFlare/plugins/server/openflare/proxy_route/helpers.go b/backend/OpenFlare/plugins/server/site/proxy_route/helpers.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/proxy_route/helpers.go rename to backend/OpenFlare/plugins/server/site/proxy_route/helpers.go diff --git a/backend/OpenFlare/plugins/server/openflare/proxy_route/helpers_limit_test.go b/backend/OpenFlare/plugins/server/site/proxy_route/helpers_limit_test.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/proxy_route/helpers_limit_test.go rename to backend/OpenFlare/plugins/server/site/proxy_route/helpers_limit_test.go diff --git a/backend/OpenFlare/plugins/server/openflare/proxy_route/logics.go b/backend/OpenFlare/plugins/server/site/proxy_route/logics.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/proxy_route/logics.go rename to backend/OpenFlare/plugins/server/site/proxy_route/logics.go diff --git a/backend/OpenFlare/plugins/server/openflare/proxy_route/logics_test.go b/backend/OpenFlare/plugins/server/site/proxy_route/logics_test.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/proxy_route/logics_test.go rename to backend/OpenFlare/plugins/server/site/proxy_route/logics_test.go index 5d064497..965332ab 100644 --- a/backend/OpenFlare/plugins/server/openflare/proxy_route/logics_test.go +++ b/backend/OpenFlare/plugins/server/site/proxy_route/logics_test.go @@ -7,9 +7,9 @@ import ( "context" "testing" - db "Wavelet/plugins/infra/database" "Wavelet/OpenFlare/plugins/server/model" "Wavelet/OpenFlare/plugins/server/repository" + db "Wavelet/plugins/infra/database" "github.com/glebarez/sqlite" "github.com/stretchr/testify/assert" diff --git a/backend/OpenFlare/plugins/server/openflare/proxy_route/origin_helpers.go b/backend/OpenFlare/plugins/server/site/proxy_route/origin_helpers.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/proxy_route/origin_helpers.go rename to backend/OpenFlare/plugins/server/site/proxy_route/origin_helpers.go diff --git a/backend/OpenFlare/plugins/server/openflare/proxy_route/routers.go b/backend/OpenFlare/plugins/server/site/proxy_route/routers.go similarity index 98% rename from backend/OpenFlare/plugins/server/openflare/proxy_route/routers.go rename to backend/OpenFlare/plugins/server/site/proxy_route/routers.go index 29c76b9b..be7865f8 100644 --- a/backend/OpenFlare/plugins/server/openflare/proxy_route/routers.go +++ b/backend/OpenFlare/plugins/server/site/proxy_route/routers.go @@ -6,7 +6,7 @@ package proxy_route import ( "net/http" - "Wavelet/OpenFlare/plugins/server/openflare/apiutil" + "Wavelet/OpenFlare/plugins/server/apiutil" "Wavelet/pkg/response" "github.com/gin-gonic/gin" diff --git a/backend/OpenFlare/plugins/server/openflare/routeidentity/identity.go b/backend/OpenFlare/plugins/server/site/routeidentity/identity.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/routeidentity/identity.go rename to backend/OpenFlare/plugins/server/site/routeidentity/identity.go diff --git a/backend/OpenFlare/plugins/server/openflare/routeidentity/identity_test.go b/backend/OpenFlare/plugins/server/site/routeidentity/identity_test.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/routeidentity/identity_test.go rename to backend/OpenFlare/plugins/server/site/routeidentity/identity_test.go diff --git a/backend/OpenFlare/plugins/server/openflare/zone/errs.go b/backend/OpenFlare/plugins/server/site/zone/errs.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/zone/errs.go rename to backend/OpenFlare/plugins/server/site/zone/errs.go diff --git a/backend/OpenFlare/plugins/server/openflare/zone/legacy_import.go b/backend/OpenFlare/plugins/server/site/zone/legacy_import.go similarity index 99% rename from backend/OpenFlare/plugins/server/openflare/zone/legacy_import.go rename to backend/OpenFlare/plugins/server/site/zone/legacy_import.go index 540b415a..8baebaf5 100644 --- a/backend/OpenFlare/plugins/server/openflare/zone/legacy_import.go +++ b/backend/OpenFlare/plugins/server/site/zone/legacy_import.go @@ -12,7 +12,7 @@ import ( "strconv" "strings" - "Wavelet/OpenFlare/plugins/server/openflare/routeidentity" + "Wavelet/OpenFlare/plugins/server/site/routeidentity" ) // ImportReport describes the idempotent legacy migration result. diff --git a/backend/OpenFlare/plugins/server/openflare/zone/legacy_import_test.go b/backend/OpenFlare/plugins/server/site/zone/legacy_import_test.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/zone/legacy_import_test.go rename to backend/OpenFlare/plugins/server/site/zone/legacy_import_test.go diff --git a/backend/OpenFlare/plugins/server/openflare/zone/logics.go b/backend/OpenFlare/plugins/server/site/zone/logics.go similarity index 99% rename from backend/OpenFlare/plugins/server/openflare/zone/logics.go rename to backend/OpenFlare/plugins/server/site/zone/logics.go index d6d12258..5c9173bd 100644 --- a/backend/OpenFlare/plugins/server/openflare/zone/logics.go +++ b/backend/OpenFlare/plugins/server/site/zone/logics.go @@ -10,8 +10,8 @@ import ( "strings" "time" + cf "Wavelet/OpenFlare/plugins/server/cloudflare" "Wavelet/OpenFlare/plugins/server/model" - cf "Wavelet/OpenFlare/plugins/server/openflare/cloudflare" "Wavelet/OpenFlare/plugins/server/repository" "Wavelet/pkg/logger" diff --git a/backend/OpenFlare/plugins/server/openflare/zone/logics_test.go b/backend/OpenFlare/plugins/server/site/zone/logics_test.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/zone/logics_test.go rename to backend/OpenFlare/plugins/server/site/zone/logics_test.go index 86efcd5f..db61127b 100644 --- a/backend/OpenFlare/plugins/server/openflare/zone/logics_test.go +++ b/backend/OpenFlare/plugins/server/site/zone/logics_test.go @@ -11,8 +11,8 @@ import ( "Wavelet/OpenFlare/plugins/server/repository" "Wavelet/OpenFlare/plugins/server/testhelper" - db "Wavelet/plugins/infra/database" "Wavelet/OpenFlare/plugins/server/model" + db "Wavelet/plugins/infra/database" "github.com/glebarez/sqlite" "github.com/stretchr/testify/require" diff --git a/backend/OpenFlare/plugins/server/openflare/zone/routers.go b/backend/OpenFlare/plugins/server/site/zone/routers.go similarity index 99% rename from backend/OpenFlare/plugins/server/openflare/zone/routers.go rename to backend/OpenFlare/plugins/server/site/zone/routers.go index c58e4136..3708d0be 100644 --- a/backend/OpenFlare/plugins/server/openflare/zone/routers.go +++ b/backend/OpenFlare/plugins/server/site/zone/routers.go @@ -7,7 +7,7 @@ import ( "errors" "net/http" - "Wavelet/OpenFlare/plugins/server/openflare/apiutil" + "Wavelet/OpenFlare/plugins/server/apiutil" "Wavelet/pkg/response" "github.com/gin-gonic/gin" diff --git a/backend/OpenFlare/plugins/server/openflare/zone/stats.go b/backend/OpenFlare/plugins/server/site/zone/stats.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/zone/stats.go rename to backend/OpenFlare/plugins/server/site/zone/stats.go diff --git a/backend/OpenFlare/plugins/server/task/task.go b/backend/OpenFlare/plugins/server/task/task.go index 13df1e62..99ed1133 100644 --- a/backend/OpenFlare/plugins/server/task/task.go +++ b/backend/OpenFlare/plugins/server/task/task.go @@ -20,7 +20,7 @@ const ( // QueueDefault is the default Asynq queue name. QueueDefault = "default" // DefaultMaxRetry is the default max retry count for OF tasks. - DefaultMaxRetry = 3 + DefaultMaxRetry = 3 defaultPermanentErrorMessage = "任务无法继续执行" ) diff --git a/backend/OpenFlare/plugins/server/testhelper/stub_auth.go b/backend/OpenFlare/plugins/server/testhelper/stub_auth.go index 0e0044d0..55055465 100644 --- a/backend/OpenFlare/plugins/server/testhelper/stub_auth.go +++ b/backend/OpenFlare/plugins/server/testhelper/stub_auth.go @@ -44,10 +44,10 @@ func (s StubAuth) VerifyToken(context.Context, string) (*contracts.UserDTO, erro func (s StubAuth) CreateSession(context.Context, uint64, map[string]any) (string, error) { return "", nil } -func (s StubAuth) RevokeToken(context.Context, string) error { return nil } -func (s StubAuth) RevokeUserSessions(context.Context, uint64) error { return nil } -func (s StubAuth) InvalidateCachedUser(context.Context, uint64) {} -func (s StubAuth) InvalidateCachedToken(context.Context, string) {} +func (s StubAuth) RevokeToken(context.Context, string) error { return nil } +func (s StubAuth) RevokeUserSessions(context.Context, uint64) error { return nil } +func (s StubAuth) InvalidateCachedUser(context.Context, uint64) {} +func (s StubAuth) InvalidateCachedToken(context.Context, string) {} func (s StubAuth) ListAuthSources(context.Context) ([]contracts.AuthSourceViewDTO, error) { return s.Sources, nil } diff --git a/backend/OpenFlare/plugins/server/openflare/tls/acme/client.go b/backend/OpenFlare/plugins/server/tls/acme/client.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/tls/acme/client.go rename to backend/OpenFlare/plugins/server/tls/acme/client.go diff --git a/backend/OpenFlare/plugins/server/openflare/tls/acme_obtain_test.go b/backend/OpenFlare/plugins/server/tls/acme_obtain_test.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/tls/acme_obtain_test.go rename to backend/OpenFlare/plugins/server/tls/acme_obtain_test.go diff --git a/backend/OpenFlare/plugins/server/openflare/tls/errs.go b/backend/OpenFlare/plugins/server/tls/errs.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/tls/errs.go rename to backend/OpenFlare/plugins/server/tls/errs.go diff --git a/backend/OpenFlare/plugins/server/openflare/tls/helpers.go b/backend/OpenFlare/plugins/server/tls/helpers.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/tls/helpers.go rename to backend/OpenFlare/plugins/server/tls/helpers.go diff --git a/backend/OpenFlare/plugins/server/openflare/tls/logics.go b/backend/OpenFlare/plugins/server/tls/logics.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/tls/logics.go rename to backend/OpenFlare/plugins/server/tls/logics.go index 18f77cbe..9cc32ea0 100644 --- a/backend/OpenFlare/plugins/server/openflare/tls/logics.go +++ b/backend/OpenFlare/plugins/server/tls/logics.go @@ -14,8 +14,8 @@ import ( "Wavelet/OpenFlare/plugins/server/repository" - "Wavelet/OpenFlare/plugins/server/task" "Wavelet/OpenFlare/plugins/server/model" + "Wavelet/OpenFlare/plugins/server/task" ) // CertificateInput TLS 证书创建/更新请求。 diff --git a/backend/OpenFlare/plugins/server/openflare/tls/logics_test.go b/backend/OpenFlare/plugins/server/tls/logics_test.go similarity index 98% rename from backend/OpenFlare/plugins/server/openflare/tls/logics_test.go rename to backend/OpenFlare/plugins/server/tls/logics_test.go index e12bfc0d..1e54855e 100644 --- a/backend/OpenFlare/plugins/server/openflare/tls/logics_test.go +++ b/backend/OpenFlare/plugins/server/tls/logics_test.go @@ -16,7 +16,7 @@ import ( "testing" "time" - "Wavelet/OpenFlare/plugins/server/openflare/credential" + "Wavelet/OpenFlare/plugins/server/credential" "Wavelet/OpenFlare/plugins/server/repository" oftask "Wavelet/OpenFlare/plugins/server/task" "Wavelet/OpenFlare/plugins/server/testhelper" diff --git a/backend/OpenFlare/plugins/server/openflare/tls/obtain.go b/backend/OpenFlare/plugins/server/tls/obtain.go similarity index 98% rename from backend/OpenFlare/plugins/server/openflare/tls/obtain.go rename to backend/OpenFlare/plugins/server/tls/obtain.go index 1bbd8602..0e5f4554 100644 --- a/backend/OpenFlare/plugins/server/openflare/tls/obtain.go +++ b/backend/OpenFlare/plugins/server/tls/obtain.go @@ -11,9 +11,9 @@ import ( "Wavelet/OpenFlare/plugins/server/repository" - "Wavelet/OpenFlare/plugins/server/task" "Wavelet/OpenFlare/plugins/server/model" - "Wavelet/OpenFlare/plugins/server/openflare/tls/acme" + "Wavelet/OpenFlare/plugins/server/task" + "Wavelet/OpenFlare/plugins/server/tls/acme" ) const ( diff --git a/backend/OpenFlare/plugins/server/openflare/tls/obtain_helpers.go b/backend/OpenFlare/plugins/server/tls/obtain_helpers.go similarity index 97% rename from backend/OpenFlare/plugins/server/openflare/tls/obtain_helpers.go rename to backend/OpenFlare/plugins/server/tls/obtain_helpers.go index 71a5631a..2f6b1e50 100644 --- a/backend/OpenFlare/plugins/server/openflare/tls/obtain_helpers.go +++ b/backend/OpenFlare/plugins/server/tls/obtain_helpers.go @@ -10,7 +10,7 @@ import ( "Wavelet/OpenFlare/plugins/server/repository" "Wavelet/OpenFlare/plugins/server/model" - "Wavelet/OpenFlare/plugins/server/openflare/tls/acme" + "Wavelet/OpenFlare/plugins/server/tls/acme" ) func resolveAcmeAccount(ctx context.Context, cert *model.TLSCertificate) (*model.AcmeAccount, error) { diff --git a/backend/OpenFlare/plugins/server/openflare/tls/routers.go b/backend/OpenFlare/plugins/server/tls/routers.go similarity index 99% rename from backend/OpenFlare/plugins/server/openflare/tls/routers.go rename to backend/OpenFlare/plugins/server/tls/routers.go index a2108ef6..37e6da89 100644 --- a/backend/OpenFlare/plugins/server/openflare/tls/routers.go +++ b/backend/OpenFlare/plugins/server/tls/routers.go @@ -6,7 +6,7 @@ package tls import ( "net/http" - "Wavelet/OpenFlare/plugins/server/openflare/apiutil" + "Wavelet/OpenFlare/plugins/server/apiutil" "Wavelet/pkg/response" "github.com/gin-gonic/gin" diff --git a/backend/OpenFlare/plugins/server/openflare/tls/sensitive.go b/backend/OpenFlare/plugins/server/tls/sensitive.go similarity index 87% rename from backend/OpenFlare/plugins/server/openflare/tls/sensitive.go rename to backend/OpenFlare/plugins/server/tls/sensitive.go index 0e797146..f3185dfa 100644 --- a/backend/OpenFlare/plugins/server/openflare/tls/sensitive.go +++ b/backend/OpenFlare/plugins/server/tls/sensitive.go @@ -3,7 +3,7 @@ package tls -import "Wavelet/OpenFlare/plugins/server/openflare/credential" +import "Wavelet/OpenFlare/plugins/server/credential" func sealSensitive(plaintext string) (string, error) { return credential.Seal(plaintext) diff --git a/backend/OpenFlare/plugins/server/openflare/tasks/ssl_renew.go b/backend/OpenFlare/plugins/server/tls/ssl_renew.go similarity index 85% rename from backend/OpenFlare/plugins/server/openflare/tasks/ssl_renew.go rename to backend/OpenFlare/plugins/server/tls/ssl_renew.go index 853b7f68..15c97f9a 100644 --- a/backend/OpenFlare/plugins/server/openflare/tasks/ssl_renew.go +++ b/backend/OpenFlare/plugins/server/tls/ssl_renew.go @@ -1,15 +1,13 @@ // Copyright 2026 Arctel.net // SPDX-License-Identifier: Apache-2.0 -package tasks +package tls import ( "context" "time" "Wavelet/OpenFlare/plugins/server/repository" - - "Wavelet/OpenFlare/plugins/server/openflare/tls" "Wavelet/pkg/logger" ) @@ -24,7 +22,7 @@ func RunSSLRenewJob(ctx context.Context) error { } now := time.Now() - due := tls.CertificatesDueForRenewal(certificates, now) + due := CertificatesDueForRenewal(certificates, now) if len(due) == 0 { logger.InfoF(ctx, "[OpenFlareTasks] SSL renew job completed: no certificates due") return nil @@ -33,7 +31,7 @@ func RunSSLRenewJob(ctx context.Context) error { var triggered int for _, cert := range due { logger.InfoF(ctx, "[OpenFlareTasks] renewing certificate id=%d domain=%s", cert.ID, cert.PrimaryDomain) - if _, err := tls.RenewCertificate(ctx, cert.ID); err != nil { + if _, err := RenewCertificate(ctx, cert.ID); err != nil { logger.ErrorF(ctx, "[OpenFlareTasks] renew certificate id=%d domain=%s failed: %v", cert.ID, cert.PrimaryDomain, err) continue } diff --git a/backend/OpenFlare/plugins/server/openflare/tasks/ssl_renew_test.go b/backend/OpenFlare/plugins/server/tls/ssl_renew_test.go similarity index 92% rename from backend/OpenFlare/plugins/server/openflare/tasks/ssl_renew_test.go rename to backend/OpenFlare/plugins/server/tls/ssl_renew_test.go index 5e7ce376..0fd59549 100644 --- a/backend/OpenFlare/plugins/server/openflare/tasks/ssl_renew_test.go +++ b/backend/OpenFlare/plugins/server/tls/ssl_renew_test.go @@ -1,7 +1,7 @@ // Copyright 2026 Arctel.net // SPDX-License-Identifier: Apache-2.0 -package tasks +package tls import ( "context" @@ -9,7 +9,6 @@ import ( "time" "Wavelet/OpenFlare/plugins/server/model" - "Wavelet/OpenFlare/plugins/server/openflare/tls" "Wavelet/OpenFlare/plugins/server/repository" "Wavelet/OpenFlare/plugins/server/runtimeconfig" oftask "Wavelet/OpenFlare/plugins/server/task" @@ -39,7 +38,7 @@ func TestRunSSLRenewJobTriggersDueCertificates(t *testing.T) { defer cleanup() ctx := context.Background() - restore := tls.SetObtainCertificateFuncForTest(func(ctx context.Context, cert *model.TLSCertificate) error { + restore := SetObtainCertificateFuncForTest(func(ctx context.Context, cert *model.TLSCertificate) error { return nil }) defer restore() diff --git a/backend/OpenFlare/plugins/server/openflare/tls/tasks.go b/backend/OpenFlare/plugins/server/tls/tasks.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/tls/tasks.go rename to backend/OpenFlare/plugins/server/tls/tasks.go diff --git a/backend/OpenFlare/plugins/server/openflare/tls/tasks_test.go b/backend/OpenFlare/plugins/server/tls/tasks_test.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/tls/tasks_test.go rename to backend/OpenFlare/plugins/server/tls/tasks_test.go diff --git a/backend/OpenFlare/plugins/server/openflare/waf/errs.go b/backend/OpenFlare/plugins/server/waf/errs.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/waf/errs.go rename to backend/OpenFlare/plugins/server/waf/errs.go diff --git a/backend/OpenFlare/plugins/server/openflare/waf/graph_compile.go b/backend/OpenFlare/plugins/server/waf/graph_compile.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/waf/graph_compile.go rename to backend/OpenFlare/plugins/server/waf/graph_compile.go diff --git a/backend/OpenFlare/plugins/server/openflare/waf/graph_compile_test.go b/backend/OpenFlare/plugins/server/waf/graph_compile_test.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/waf/graph_compile_test.go rename to backend/OpenFlare/plugins/server/waf/graph_compile_test.go diff --git a/backend/OpenFlare/plugins/server/openflare/waf/graph_types.go b/backend/OpenFlare/plugins/server/waf/graph_types.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/waf/graph_types.go rename to backend/OpenFlare/plugins/server/waf/graph_types.go diff --git a/backend/OpenFlare/plugins/server/openflare/waf/graph_validate.go b/backend/OpenFlare/plugins/server/waf/graph_validate.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/waf/graph_validate.go rename to backend/OpenFlare/plugins/server/waf/graph_validate.go diff --git a/backend/OpenFlare/plugins/server/openflare/waf/graph_validate_test.go b/backend/OpenFlare/plugins/server/waf/graph_validate_test.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/waf/graph_validate_test.go rename to backend/OpenFlare/plugins/server/waf/graph_validate_test.go diff --git a/backend/OpenFlare/plugins/server/openflare/waf/ip_group_sync.go b/backend/OpenFlare/plugins/server/waf/ip_group_sync.go similarity index 99% rename from backend/OpenFlare/plugins/server/openflare/waf/ip_group_sync.go rename to backend/OpenFlare/plugins/server/waf/ip_group_sync.go index b907c534..f3fdad16 100644 --- a/backend/OpenFlare/plugins/server/openflare/waf/ip_group_sync.go +++ b/backend/OpenFlare/plugins/server/waf/ip_group_sync.go @@ -20,9 +20,9 @@ import ( "Wavelet/OpenFlare/plugins/server/repository" + "Wavelet/OpenFlare/plugins/server/fleet/agent" + "Wavelet/OpenFlare/plugins/server/fleet/websocket" "Wavelet/OpenFlare/plugins/server/model" - "Wavelet/OpenFlare/plugins/server/openflare/agent" - "Wavelet/OpenFlare/plugins/server/openflare/websocket" exprlang "github.com/expr-lang/expr" "github.com/expr-lang/expr/vm" diff --git a/backend/OpenFlare/plugins/server/openflare/waf/ip_group_sync_test.go b/backend/OpenFlare/plugins/server/waf/ip_group_sync_test.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/waf/ip_group_sync_test.go rename to backend/OpenFlare/plugins/server/waf/ip_group_sync_test.go index d7943685..2d888f1d 100644 --- a/backend/OpenFlare/plugins/server/openflare/waf/ip_group_sync_test.go +++ b/backend/OpenFlare/plugins/server/waf/ip_group_sync_test.go @@ -14,8 +14,8 @@ import ( "Wavelet/OpenFlare/plugins/server/repository" "Wavelet/OpenFlare/plugins/server/testhelper" - db "Wavelet/plugins/infra/database" "Wavelet/OpenFlare/plugins/server/model" + db "Wavelet/plugins/infra/database" "github.com/glebarez/sqlite" "github.com/stretchr/testify/assert" diff --git a/backend/OpenFlare/plugins/server/openflare/waf/logics.go b/backend/OpenFlare/plugins/server/waf/logics.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/waf/logics.go rename to backend/OpenFlare/plugins/server/waf/logics.go diff --git a/backend/OpenFlare/plugins/server/openflare/waf/logics_test.go b/backend/OpenFlare/plugins/server/waf/logics_test.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/waf/logics_test.go rename to backend/OpenFlare/plugins/server/waf/logics_test.go index 121d9a57..2ed73b97 100644 --- a/backend/OpenFlare/plugins/server/openflare/waf/logics_test.go +++ b/backend/OpenFlare/plugins/server/waf/logics_test.go @@ -9,8 +9,8 @@ import ( "Wavelet/OpenFlare/plugins/server/repository" - db "Wavelet/plugins/infra/database" "Wavelet/OpenFlare/plugins/server/model" + db "Wavelet/plugins/infra/database" "github.com/glebarez/sqlite" "github.com/stretchr/testify/assert" diff --git a/backend/OpenFlare/plugins/server/openflare/waf/routers.go b/backend/OpenFlare/plugins/server/waf/routers.go similarity index 99% rename from backend/OpenFlare/plugins/server/openflare/waf/routers.go rename to backend/OpenFlare/plugins/server/waf/routers.go index 700e35c7..f2a28248 100644 --- a/backend/OpenFlare/plugins/server/openflare/waf/routers.go +++ b/backend/OpenFlare/plugins/server/waf/routers.go @@ -7,7 +7,7 @@ import ( "net/http" "strconv" - "Wavelet/OpenFlare/plugins/server/openflare/apiutil" + "Wavelet/OpenFlare/plugins/server/apiutil" "Wavelet/pkg/response" "github.com/gin-gonic/gin" diff --git a/backend/OpenFlare/plugins/server/openflare/waf/rule_logics.go b/backend/OpenFlare/plugins/server/waf/rule_logics.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/waf/rule_logics.go rename to backend/OpenFlare/plugins/server/waf/rule_logics.go diff --git a/backend/OpenFlare/plugins/server/openflare/waf/rule_logics_test.go b/backend/OpenFlare/plugins/server/waf/rule_logics_test.go similarity index 100% rename from backend/OpenFlare/plugins/server/openflare/waf/rule_logics_test.go rename to backend/OpenFlare/plugins/server/waf/rule_logics_test.go index 61d02b89..be75526e 100644 --- a/backend/OpenFlare/plugins/server/openflare/waf/rule_logics_test.go +++ b/backend/OpenFlare/plugins/server/waf/rule_logics_test.go @@ -14,9 +14,9 @@ import ( "Wavelet/OpenFlare/plugins/server/repository" - db "Wavelet/plugins/infra/database" "Wavelet/OpenFlare/plugins/server/model" "Wavelet/pkg/response" + db "Wavelet/plugins/infra/database" "github.com/gin-gonic/gin" "github.com/stretchr/testify/assert" diff --git a/backend/OpenFlare/plugins/server/openflare/waf/rule_routers.go b/backend/OpenFlare/plugins/server/waf/rule_routers.go similarity index 99% rename from backend/OpenFlare/plugins/server/openflare/waf/rule_routers.go rename to backend/OpenFlare/plugins/server/waf/rule_routers.go index 7f02083e..90f272a6 100644 --- a/backend/OpenFlare/plugins/server/openflare/waf/rule_routers.go +++ b/backend/OpenFlare/plugins/server/waf/rule_routers.go @@ -7,8 +7,8 @@ import ( "errors" "net/http" + "Wavelet/OpenFlare/plugins/server/apiutil" "Wavelet/OpenFlare/plugins/server/model" - "Wavelet/OpenFlare/plugins/server/openflare/apiutil" "Wavelet/pkg/logger" "Wavelet/pkg/response" diff --git a/docs/changelog/index.md b/docs/changelog/index.md index d0b34eff..84834e8d 100644 --- a/docs/changelog/index.md +++ b/docs/changelog/index.md @@ -13,6 +13,7 @@ sidebar: false ### 🛠 修复 - 人机验证与健康检查去掉双路径：浏览器只请求 `/api/v1/cap/challenge` 与 `/api/v1/cap/redeem`，探针只保留 `GET /api/healthz`（`{"status":"ok"}`）。旧的 `/api/cap/*`、`/api/health` 与 `/healthz` 不再注册。 +- 控制面 `server` 插件按限界上下文重排目录：去掉 `openflare/` 与 `router/v1` 嵌套，业务落在 `site`/`fleet`/`pages`/`waf`/`tls`/`cloudflare`/`observability`/`dashboard`/`option`，HTTP 装配在 `httpapi`。接口路径与表结构不变。 - `server` 插件把 stamp、of_* SQL 与 ClickHouse 迁入单一 `migrate/` 包，updater 提到 `server/updater/`；删除已停用的 76 条历史迁移。全新安装会写入 OpenFlare 定时任务与产品配置默认值，已 stamp 的升级库不重插。 ### 💄 其他/体验