From 06d5fedbfc4087f2992d75b43444b4bd39b57503 Mon Sep 17 00:00:00 2001 From: ryan Date: Sun, 30 Aug 2026 17:35:26 +0800 Subject: [PATCH] refactor(server): nest kernel and domain under classified roots Keep only plugin entry, httpapi, migrate and updater at the server root. Shared model/repository/adapters live in kernel/; product bounded contexts live in domain/. --- AGENTS.md | 2 +- .../server/{ => domain}/cloudflare/client.go | 0 .../{ => domain}/cloudflare/client_test.go | 0 .../server/{ => domain}/cloudflare/errs.go | 0 .../server/{ => domain}/cloudflare/logics.go | 6 +++--- .../{ => domain}/cloudflare/reconcile.go | 4 ++-- .../{ => domain}/cloudflare/reconcile_test.go | 6 +++--- .../server/{ => domain}/cloudflare/routers.go | 2 +- .../{ => domain}/cloudflare/routers_test.go | 2 +- .../server/{ => domain}/cloudflare/tasks.go | 6 +++--- .../{ => domain}/cloudflare/tasks_test.go | 0 .../server/{ => domain}/cloudflare/types.go | 0 .../server/{ => domain}/dashboard/cache.go | 0 .../server/{ => domain}/dashboard/helpers.go | 4 ++-- .../server/{ => domain}/dashboard/logics.go | 6 +++--- .../{ => domain}/dashboard/logics_test.go | 6 +++--- .../server/{ => domain}/dashboard/routers.go | 2 +- .../fleet/agent/access_log_region.go | 0 .../{ => domain}/fleet/agent/auth_cache.go | 4 ++-- .../server/{ => domain}/fleet/agent/config.go | 4 ++-- .../{ => domain}/fleet/agent/config_test.go | 0 .../server/{ => domain}/fleet/agent/errs.go | 0 .../{ => domain}/fleet/agent/helpers.go | 6 +++--- .../{ => domain}/fleet/agent/helpers_test.go | 4 ++-- .../server/{ => domain}/fleet/agent/logics.go | 10 ++++----- .../{ => domain}/fleet/agent/middleware.go | 2 +- .../fleet/agent/middleware_test.go | 6 +++--- .../{ => domain}/fleet/agent/observability.go | 4 ++-- .../fleet/agent/observability_test.go | 0 .../fleet/agent/protocol_alias.go | 0 .../{ => domain}/fleet/agent/routers.go | 6 +++--- .../server/{ => domain}/fleet/agent/types.go | 2 +- .../{ => domain}/fleet/agent/waf_ip_group.go | 4 ++-- .../fleet/agent/waf_ip_group_test.go | 4 ++-- .../{ => domain}/fleet/agent/ws_status.go | 4 ++-- .../server/{ => domain}/fleet/async_tasks.go | 12 +++++------ .../{ => domain}/fleet/async_tasks_test.go | 4 ++-- .../server/{ => domain}/fleet/flared/errs.go | 0 .../{ => domain}/fleet/flared/helpers.go | 6 +++--- .../{ => domain}/fleet/flared/logics.go | 6 +++--- .../{ => domain}/fleet/flared/middleware.go | 2 +- .../fleet/flared/middleware_test.go | 4 ++-- .../fleet/flared/observability.go | 2 +- .../fleet/flared/observability_test.go | 6 +++--- .../fleet/flared/protocol_alias.go | 0 .../{ => domain}/fleet/flared/routers.go | 6 +++--- .../fleet/integration/agent_protocol_test.go | 10 ++++----- .../fleet/integration/auth_option_test.go | 8 +++---- .../fleet/integration/core_chain_test.go | 6 +++--- .../fleet/integration/helpers_test.go | 2 +- .../fleet/integration/security_test.go | 6 +++--- .../server/{ => domain}/fleet/node/errs.go | 0 .../server/{ => domain}/fleet/node/helpers.go | 4 ++-- .../server/{ => domain}/fleet/node/logics.go | 10 ++++----- .../{ => domain}/fleet/node/logics_test.go | 8 +++---- .../server/{ => domain}/fleet/node/routers.go | 2 +- .../server/{ => domain}/fleet/node/version.go | 0 .../server/{ => domain}/fleet/relay/errs.go | 0 .../{ => domain}/fleet/relay/helpers.go | 4 ++-- .../server/{ => domain}/fleet/relay/logics.go | 8 +++---- .../{ => domain}/fleet/relay/logics_test.go | 8 +++---- .../{ => domain}/fleet/relay/middleware.go | 2 +- .../fleet/relay/middleware_test.go | 4 ++-- .../{ => domain}/fleet/relay/observability.go | 6 +++--- .../fleet/relay/protocol_alias.go | 0 .../{ => domain}/fleet/relay/routers.go | 6 +++--- .../{ => domain}/fleet/websocket/agent_hub.go | 0 .../fleet/websocket/client_core.go | 0 .../fleet/websocket/client_core_test.go | 0 .../{ => domain}/fleet/websocket/common.go | 0 .../{ => domain}/fleet/websocket/consts.go | 0 .../fleet/websocket/flared_hub.go | 0 .../{ => domain}/fleet/websocket/read_pump.go | 0 .../{ => domain}/fleet/websocket/relay_hub.go | 0 .../fleet/websocket/write_pump.go | 0 .../access_log_ip_summary_test.go | 0 .../observability/access_log_logics.go | 6 +++--- .../{ => domain}/observability/analytics.go | 4 ++-- .../observability/analytics_test.go | 2 +- .../observability/chwriter/dedup.go | 0 .../observability/chwriter/dedup_test.go | 2 +- .../observability/chwriter/live_ch_test.go | 6 +++--- .../observability/chwriter/writer.go | 4 ++-- .../server/{ => domain}/observability/errs.go | 0 .../observability/log_db_switch.go | 14 ++++++------ .../observability/log_db_switch_test.go | 10 ++++----- .../{ => domain}/observability/node_logics.go | 4 ++-- .../observability/query_params_test.go | 0 .../{ => domain}/observability/routers.go | 2 +- .../server/{ => domain}/option/errs.go | 0 .../server/{ => domain}/option/logics.go | 8 +++---- .../server/{ => domain}/option/logics_test.go | 4 ++-- .../option/openresty_validators.go | 2 +- .../option/openresty_validators_test.go | 2 +- .../server/{ => domain}/option/routers.go | 4 ++-- .../{ => domain}/option/uptimekuma/client.go | 0 .../{ => domain}/option/uptimekuma/sync.go | 4 ++-- .../option/uptimekuma/sync_helpers.go | 2 +- .../option/uptimekuma/sync_test.go | 4 ++-- .../server/{ => domain}/option/validate.go | 6 +++--- .../server/{ => domain}/pages/download_url.go | 0 .../{ => domain}/pages/download_url_test.go | 0 .../plugins/server/{ => domain}/pages/errs.go | 0 .../{ => domain}/pages/github_source.go | 4 ++-- .../pages/github_source_action.go | 8 +++---- .../pages/github_source_identity_test.go | 2 +- .../{ => domain}/pages/github_source_test.go | 8 +++---- .../server/{ => domain}/pages/helpers.go | 6 +++--- .../server/{ => domain}/pages/logics.go | 6 +++--- .../server/{ => domain}/pages/logics_test.go | 10 ++++----- .../{ => domain}/pages/package_metadata.go | 4 ++-- .../pages/package_metadata_test.go | 2 +- .../server/{ => domain}/pages/rebind.go | 4 ++-- .../server/{ => domain}/pages/rebind_test.go | 2 +- .../server/{ => domain}/pages/routers.go | 2 +- .../{ => domain}/pages/routers_source_test.go | 4 ++-- .../server/{ => domain}/pages/routers_test.go | 2 +- .../server/{ => domain}/pages/source.go | 4 ++-- .../pages/source_manual_test_helpers_test.go | 4 ++-- .../pages/source_orphan_cleanup.go | 6 +++--- .../pages/source_orphan_cleanup_test.go | 4 ++-- .../{ => domain}/pages/source_provider.go | 0 .../pages/source_provider_test.go | 0 .../{ => domain}/pages/source_runtime.go | 4 ++-- .../{ => domain}/pages/source_runtime_test.go | 4 ++-- .../{ => domain}/pages/source_scanner.go | 6 +++--- .../{ => domain}/pages/source_scanner_test.go | 6 +++--- .../server/{ => domain}/pages/source_sync.go | 8 +++---- .../{ => domain}/pages/source_sync_test.go | 6 +++--- .../server/{ => domain}/pages/source_tasks.go | 6 +++--- .../{ => domain}/pages/source_tasks_test.go | 0 .../server/{ => domain}/pages/source_test.go | 4 ++-- .../{ => domain}/site/apply_log/errs.go | 0 .../{ => domain}/site/apply_log/logics.go | 4 ++-- .../site/apply_log/logics_test.go | 4 ++-- .../{ => domain}/site/apply_log/routers.go | 2 +- .../certificate_snapshot_test.go | 8 +++---- .../{ => domain}/site/config_version/errs.go | 0 .../site/config_version/helpers.go | 4 ++-- .../site/config_version/logics.go | 6 +++--- .../site/config_version/logics_test.go | 6 +++--- .../origin_error_page_snapshot_test.go | 2 +- .../site/config_version/pages_snapshot.go | 4 ++-- .../config_version/pages_snapshot_test.go | 4 ++-- .../config_version/proxy_cache_path_test.go | 0 .../site/config_version/renderer.go | 0 .../site/config_version/routers.go | 2 +- .../site/config_version/snapshot.go | 8 +++---- .../config_version/waf_graph_snapshot_test.go | 6 +++--- .../server/{ => domain}/site/origin/errs.go | 0 .../{ => domain}/site/origin/helpers.go | 0 .../server/{ => domain}/site/origin/logics.go | 4 ++-- .../{ => domain}/site/origin/logics_test.go | 2 +- .../{ => domain}/site/origin/routers.go | 2 +- .../site/proxy_route/build_helpers.go | 2 +- .../{ => domain}/site/proxy_route/errs.go | 0 .../{ => domain}/site/proxy_route/helpers.go | 4 ++-- .../site/proxy_route/helpers_limit_test.go | 0 .../{ => domain}/site/proxy_route/logics.go | 4 ++-- .../site/proxy_route/logics_test.go | 4 ++-- .../site/proxy_route/origin_helpers.go | 2 +- .../{ => domain}/site/proxy_route/routers.go | 2 +- .../site/routeidentity/identity.go | 0 .../site/routeidentity/identity_test.go | 0 .../server/{ => domain}/site/zone/errs.go | 0 .../{ => domain}/site/zone/legacy_import.go | 2 +- .../site/zone/legacy_import_test.go | 0 .../server/{ => domain}/site/zone/logics.go | 6 +++--- .../{ => domain}/site/zone/logics_test.go | 6 +++--- .../server/{ => domain}/site/zone/routers.go | 2 +- .../server/{ => domain}/site/zone/stats.go | 4 ++-- .../server/{ => domain}/tls/acme/client.go | 0 .../{ => domain}/tls/acme_obtain_test.go | 4 ++-- .../plugins/server/{ => domain}/tls/errs.go | 0 .../server/{ => domain}/tls/helpers.go | 0 .../plugins/server/{ => domain}/tls/logics.go | 6 +++--- .../server/{ => domain}/tls/logics_test.go | 12 +++++------ .../plugins/server/{ => domain}/tls/obtain.go | 8 +++---- .../server/{ => domain}/tls/obtain_helpers.go | 6 +++--- .../server/{ => domain}/tls/routers.go | 2 +- .../server/{ => domain}/tls/sensitive.go | 2 +- .../server/{ => domain}/tls/ssl_renew.go | 2 +- .../server/{ => domain}/tls/ssl_renew_test.go | 10 ++++----- .../plugins/server/{ => domain}/tls/tasks.go | 4 ++-- .../server/{ => domain}/tls/tasks_test.go | 4 ++-- .../plugins/server/{ => domain}/waf/errs.go | 0 .../server/{ => domain}/waf/graph_compile.go | 0 .../{ => domain}/waf/graph_compile_test.go | 0 .../server/{ => domain}/waf/graph_types.go | 0 .../server/{ => domain}/waf/graph_validate.go | 0 .../{ => domain}/waf/graph_validate_test.go | 0 .../server/{ => domain}/waf/ip_group_sync.go | 8 +++---- .../{ => domain}/waf/ip_group_sync_test.go | 6 +++--- .../plugins/server/{ => domain}/waf/logics.go | 4 ++-- .../server/{ => domain}/waf/logics_test.go | 4 ++-- .../server/{ => domain}/waf/routers.go | 2 +- .../server/{ => domain}/waf/rule_logics.go | 4 ++-- .../{ => domain}/waf/rule_logics_test.go | 4 ++-- .../server/{ => domain}/waf/rule_routers.go | 4 ++-- .../plugins/server/httpapi/register_agent.go | 2 +- .../server/httpapi/register_apply_log.go | 4 ++-- .../server/httpapi/register_cloudflare.go | 4 ++-- .../server/httpapi/register_config_version.go | 4 ++-- .../server/httpapi/register_dashboard.go | 4 ++-- .../plugins/server/httpapi/register_node.go | 4 ++-- .../server/httpapi/register_observability.go | 4 ++-- .../plugins/server/httpapi/register_option.go | 4 ++-- .../plugins/server/httpapi/register_origin.go | 4 ++-- .../plugins/server/httpapi/register_pages.go | 4 ++-- .../server/httpapi/register_proxy_route.go | 4 ++-- .../server/httpapi/register_relay_flared.go | 4 ++-- .../plugins/server/httpapi/register_tls.go | 4 ++-- .../server/httpapi/register_updater.go | 2 +- .../plugins/server/httpapi/register_waf.go | 4 ++-- .../plugins/server/httpapi/register_zone.go | 4 ++-- .../server/{ => kernel}/apiutil/bind.go | 0 .../server/{ => kernel}/apiutil/errors.go | 0 .../server/{ => kernel}/apiutil/middleware.go | 0 .../{ => kernel}/apiutil/middleware_test.go | 2 +- .../server/{ => kernel}/apiutil/routes.go | 0 .../{ => kernel}/credential/sensitive.go | 2 +- .../{ => kernel}/credential/sensitive_test.go | 2 +- .../geoip/data/GeoLite2-Country.mmdb | Bin .../server/{ => kernel}/geoip/data/data.go | 0 .../{ => kernel}/geoip/data/data_test.go | 0 .../server/{ => kernel}/geoip/lookup.go | 0 .../server/{ => kernel}/geoip/lookup_test.go | 0 .../plugins/server/{ => kernel}/geoip/node.go | 2 +- .../server/{ => kernel}/geoip/runtime.go | 6 +++--- .../server/{ => kernel}/geoip/runtime_test.go | 2 +- .../githubrelease/client.go | 0 .../githubrelease/client_test.go | 0 .../githubrelease/transport.go | 0 .../{ => kernel}/model/analytics/filter.go | 0 .../model/analytics/node_access_log.go | 0 .../model/analytics/node_access_log_stats.go | 0 .../model/analytics/node_observability.go | 0 .../model/analytics/user_access_log.go | 0 .../model/analytics/user_agent.go | 0 .../plugins/server/{ => kernel}/model/errs.go | 0 .../model/openflare_access_log.go | 0 .../model/openflare_acme_account.go | 0 .../{ => kernel}/model/openflare_apply_log.go | 0 .../model/openflare_cloudflare.go | 0 .../model/openflare_config_version.go | 0 .../model/openflare_dns_account.go | 0 .../{ => kernel}/model/openflare_node.go | 0 .../model/openflare_observability.go | 0 .../{ => kernel}/model/openflare_option.go | 0 .../{ => kernel}/model/openflare_origin.go | 0 .../{ => kernel}/model/openflare_pages.go | 0 .../model/openflare_pages_cleanup.go | 0 .../model/openflare_pages_source.go | 0 .../model/openflare_pages_source_test.go | 0 .../model/openflare_proxy_route.go | 0 .../{ => kernel}/model/openflare_tls.go | 0 .../{ => kernel}/model/openflare_waf.go | 0 .../{ => kernel}/model/openflare_zone.go | 0 .../{ => kernel}/model/platform_aliases.go | 0 .../{ => kernel}/model/system_configs.go | 0 .../server/{ => kernel}/ofevents/events.go | 0 .../server/{ => kernel}/ofupload/ofupload.go | 0 .../server/{ => kernel}/ofupload/remove.go | 0 .../{ => kernel}/publicconfig/provider.go | 2 +- .../publicconfig/provider_test.go | 6 +++--- .../repository/analytics/ch_mocks_test.go | 0 .../repository/analytics/clickhouse_count.go | 0 .../analytics/clickhouse_count_test.go | 0 .../analytics/clickhouse_maintenance.go | 0 .../analytics/clickhouse_maintenance_test.go | 0 .../repository/analytics/clickhouse_stats.go | 4 ++-- .../repository/analytics/node_access_log.go | 2 +- .../analytics/node_access_log_delete.go | 0 .../analytics/node_access_log_filter.go | 2 +- .../analytics/node_access_log_stats.go | 2 +- .../analytics/node_access_log_test.go | 2 +- .../analytics/node_access_log_writer.go | 2 +- .../analytics/node_observability.go | 2 +- .../analytics/node_observability_delete.go | 0 .../analytics/node_observability_filter.go | 2 +- .../node_observability_latest_test.go | 0 .../analytics/node_observability_test.go | 2 +- .../analytics/node_observability_writer.go | 2 +- .../repository/analytics/sql_fragments.go | 0 .../repository/analytics/user_access_log.go | 2 +- .../server/{ => kernel}/repository/errs.go | 0 .../repository/logstore/cleanup.go | 2 +- .../repository/logstore/cleanup_test.go | 4 ++-- .../repository/logstore/clickhouse_store.go | 6 +++--- .../logstore/clickhouse_store_test.go | 0 .../repository/logstore/dialect_postgres.go | 0 .../repository/logstore/dialect_sqlite.go | 0 .../{ => kernel}/repository/logstore/hooks.go | 2 +- .../repository/logstore/imports_test.go | 11 +++++----- .../repository/logstore/insert_hooks_test.go | 4 ++-- .../repository/logstore/logstore.go | 4 ++-- .../repository/logstore/partition_cleanup.go | 0 .../postgres_partition_integration_test.go | 2 +- .../repository/logstore/postgres_store.go | 4 ++-- .../logstore/postgres_store_test.go | 4 ++-- .../repository/logstore/provider.go | 4 ++-- .../repository/logstore/provider_test.go | 2 +- .../repository/openflare_access_log.go | 6 +++--- .../repository/openflare_access_log_test.go | 6 +++--- .../repository/openflare_acme_account.go | 2 +- .../repository/openflare_apply_log.go | 2 +- .../repository/openflare_apply_log_test.go | 2 +- .../repository/openflare_cloudflare.go | 2 +- .../repository/openflare_cloudflare_test.go | 2 +- .../repository/openflare_config_version.go | 2 +- .../repository/openflare_dns_account.go | 2 +- .../{ => kernel}/repository/openflare_node.go | 2 +- .../repository/openflare_observability.go | 8 +++---- .../repository/openflare_origin.go | 2 +- .../repository/openflare_pages.go | 2 +- .../repository/openflare_pages_cleanup.go | 2 +- .../openflare_pages_cleanup_test.go | 2 +- .../repository/openflare_pages_source.go | 2 +- .../repository/openflare_proxy_route.go | 2 +- .../{ => kernel}/repository/openflare_tls.go | 2 +- .../{ => kernel}/repository/openflare_waf.go | 2 +- .../repository/openflare_waf_bindings_test.go | 2 +- .../repository/openflare_waf_graph_test.go | 2 +- .../{ => kernel}/repository/openflare_zone.go | 2 +- .../repository/openflare_zone_test.go | 2 +- .../{ => kernel}/repository/services.go | 0 .../{ => kernel}/repository/system_config.go | 2 +- .../{ => kernel}/repository/system_user.go | 2 +- .../repository/system_user_test.go | 0 .../{ => kernel}/runtimeconfig/runtime.go | 0 .../server/{ => kernel}/task/dispatch_test.go | 0 .../plugins/server/{ => kernel}/task/task.go | 0 .../server/{ => kernel}/testhelper/cleanup.go | 0 .../server/{ => kernel}/testhelper/gin.go | 0 .../{ => kernel}/testhelper/noop_task.go | 0 .../{ => kernel}/testhelper/stub_auth.go | 0 .../{ => kernel}/testhelper/test_helper.go | 8 +++---- .../plugins/server/migrate/clickhouse.go | 2 +- .../plugins/server/migrate/clickhouse_test.go | 2 +- .../OpenFlare/plugins/server/migrate/stamp.go | 2 +- backend/OpenFlare/plugins/server/plugin.go | 20 +++++++++--------- .../OpenFlare/plugins/server/plugin_tasks.go | 12 +++++------ .../plugins/server/updater/logics.go | 4 ++-- docs/changelog/index.md | 2 +- 344 files changed, 470 insertions(+), 469 deletions(-) rename backend/OpenFlare/plugins/server/{ => domain}/cloudflare/client.go (100%) rename backend/OpenFlare/plugins/server/{ => domain}/cloudflare/client_test.go (100%) rename backend/OpenFlare/plugins/server/{ => domain}/cloudflare/errs.go (100%) rename backend/OpenFlare/plugins/server/{ => domain}/cloudflare/logics.go (98%) rename backend/OpenFlare/plugins/server/{ => domain}/cloudflare/reconcile.go (97%) rename backend/OpenFlare/plugins/server/{ => domain}/cloudflare/reconcile_test.go (98%) rename backend/OpenFlare/plugins/server/{ => domain}/cloudflare/routers.go (99%) rename backend/OpenFlare/plugins/server/{ => domain}/cloudflare/routers_test.go (97%) rename backend/OpenFlare/plugins/server/{ => domain}/cloudflare/tasks.go (98%) rename backend/OpenFlare/plugins/server/{ => domain}/cloudflare/tasks_test.go (100%) rename backend/OpenFlare/plugins/server/{ => domain}/cloudflare/types.go (100%) rename backend/OpenFlare/plugins/server/{ => domain}/dashboard/cache.go (100%) rename backend/OpenFlare/plugins/server/{ => domain}/dashboard/helpers.go (92%) rename backend/OpenFlare/plugins/server/{ => domain}/dashboard/logics.go (98%) rename backend/OpenFlare/plugins/server/{ => domain}/dashboard/logics_test.go (97%) rename backend/OpenFlare/plugins/server/{ => domain}/dashboard/routers.go (95%) rename backend/OpenFlare/plugins/server/{ => domain}/fleet/agent/access_log_region.go (100%) rename backend/OpenFlare/plugins/server/{ => domain}/fleet/agent/auth_cache.go (97%) rename backend/OpenFlare/plugins/server/{ => domain}/fleet/agent/config.go (95%) rename backend/OpenFlare/plugins/server/{ => domain}/fleet/agent/config_test.go (100%) rename backend/OpenFlare/plugins/server/{ => domain}/fleet/agent/errs.go (100%) rename backend/OpenFlare/plugins/server/{ => domain}/fleet/agent/helpers.go (98%) rename backend/OpenFlare/plugins/server/{ => domain}/fleet/agent/helpers_test.go (97%) rename backend/OpenFlare/plugins/server/{ => domain}/fleet/agent/logics.go (96%) rename backend/OpenFlare/plugins/server/{ => domain}/fleet/agent/middleware.go (96%) rename backend/OpenFlare/plugins/server/{ => domain}/fleet/agent/middleware_test.go (97%) rename backend/OpenFlare/plugins/server/{ => domain}/fleet/agent/observability.go (98%) rename backend/OpenFlare/plugins/server/{ => domain}/fleet/agent/observability_test.go (100%) rename backend/OpenFlare/plugins/server/{ => domain}/fleet/agent/protocol_alias.go (100%) rename backend/OpenFlare/plugins/server/{ => domain}/fleet/agent/routers.go (98%) rename backend/OpenFlare/plugins/server/{ => domain}/fleet/agent/types.go (96%) rename backend/OpenFlare/plugins/server/{ => domain}/fleet/agent/waf_ip_group.go (98%) rename backend/OpenFlare/plugins/server/{ => domain}/fleet/agent/waf_ip_group_test.go (98%) rename backend/OpenFlare/plugins/server/{ => domain}/fleet/agent/ws_status.go (93%) rename backend/OpenFlare/plugins/server/{ => domain}/fleet/async_tasks.go (94%) rename backend/OpenFlare/plugins/server/{ => domain}/fleet/async_tasks_test.go (89%) rename backend/OpenFlare/plugins/server/{ => domain}/fleet/flared/errs.go (100%) rename backend/OpenFlare/plugins/server/{ => domain}/fleet/flared/helpers.go (95%) rename backend/OpenFlare/plugins/server/{ => domain}/fleet/flared/logics.go (97%) rename backend/OpenFlare/plugins/server/{ => domain}/fleet/flared/middleware.go (93%) rename backend/OpenFlare/plugins/server/{ => domain}/fleet/flared/middleware_test.go (96%) rename backend/OpenFlare/plugins/server/{ => domain}/fleet/flared/observability.go (96%) rename backend/OpenFlare/plugins/server/{ => domain}/fleet/flared/observability_test.go (91%) rename backend/OpenFlare/plugins/server/{ => domain}/fleet/flared/protocol_alias.go (100%) rename backend/OpenFlare/plugins/server/{ => domain}/fleet/flared/routers.go (96%) rename backend/OpenFlare/plugins/server/{ => domain}/fleet/integration/agent_protocol_test.go (95%) rename backend/OpenFlare/plugins/server/{ => domain}/fleet/integration/auth_option_test.go (96%) rename backend/OpenFlare/plugins/server/{ => domain}/fleet/integration/core_chain_test.go (98%) rename backend/OpenFlare/plugins/server/{ => domain}/fleet/integration/helpers_test.go (98%) rename backend/OpenFlare/plugins/server/{ => domain}/fleet/integration/security_test.go (98%) rename backend/OpenFlare/plugins/server/{ => domain}/fleet/node/errs.go (100%) rename backend/OpenFlare/plugins/server/{ => domain}/fleet/node/helpers.go (99%) rename backend/OpenFlare/plugins/server/{ => domain}/fleet/node/logics.go (98%) rename backend/OpenFlare/plugins/server/{ => domain}/fleet/node/logics_test.go (98%) rename backend/OpenFlare/plugins/server/{ => domain}/fleet/node/routers.go (99%) rename backend/OpenFlare/plugins/server/{ => domain}/fleet/node/version.go (100%) rename backend/OpenFlare/plugins/server/{ => domain}/fleet/relay/errs.go (100%) rename backend/OpenFlare/plugins/server/{ => domain}/fleet/relay/helpers.go (97%) rename backend/OpenFlare/plugins/server/{ => domain}/fleet/relay/logics.go (93%) rename backend/OpenFlare/plugins/server/{ => domain}/fleet/relay/logics_test.go (95%) rename backend/OpenFlare/plugins/server/{ => domain}/fleet/relay/middleware.go (92%) rename backend/OpenFlare/plugins/server/{ => domain}/fleet/relay/middleware_test.go (96%) rename backend/OpenFlare/plugins/server/{ => domain}/fleet/relay/observability.go (91%) rename backend/OpenFlare/plugins/server/{ => domain}/fleet/relay/protocol_alias.go (100%) rename backend/OpenFlare/plugins/server/{ => domain}/fleet/relay/routers.go (92%) rename backend/OpenFlare/plugins/server/{ => domain}/fleet/websocket/agent_hub.go (100%) rename backend/OpenFlare/plugins/server/{ => domain}/fleet/websocket/client_core.go (100%) rename backend/OpenFlare/plugins/server/{ => domain}/fleet/websocket/client_core_test.go (100%) rename backend/OpenFlare/plugins/server/{ => domain}/fleet/websocket/common.go (100%) rename backend/OpenFlare/plugins/server/{ => domain}/fleet/websocket/consts.go (100%) rename backend/OpenFlare/plugins/server/{ => domain}/fleet/websocket/flared_hub.go (100%) rename backend/OpenFlare/plugins/server/{ => domain}/fleet/websocket/read_pump.go (100%) rename backend/OpenFlare/plugins/server/{ => domain}/fleet/websocket/relay_hub.go (100%) rename backend/OpenFlare/plugins/server/{ => domain}/fleet/websocket/write_pump.go (100%) rename backend/OpenFlare/plugins/server/{ => domain}/observability/access_log_ip_summary_test.go (100%) rename backend/OpenFlare/plugins/server/{ => domain}/observability/access_log_logics.go (99%) rename backend/OpenFlare/plugins/server/{ => domain}/observability/analytics.go (99%) rename backend/OpenFlare/plugins/server/{ => domain}/observability/analytics_test.go (99%) rename backend/OpenFlare/plugins/server/{ => domain}/observability/chwriter/dedup.go (100%) rename backend/OpenFlare/plugins/server/{ => domain}/observability/chwriter/dedup_test.go (98%) rename backend/OpenFlare/plugins/server/{ => domain}/observability/chwriter/live_ch_test.go (92%) rename backend/OpenFlare/plugins/server/{ => domain}/observability/chwriter/writer.go (98%) rename backend/OpenFlare/plugins/server/{ => domain}/observability/errs.go (100%) rename backend/OpenFlare/plugins/server/{ => domain}/observability/log_db_switch.go (96%) rename backend/OpenFlare/plugins/server/{ => domain}/observability/log_db_switch_test.go (97%) rename backend/OpenFlare/plugins/server/{ => domain}/observability/node_logics.go (98%) rename backend/OpenFlare/plugins/server/{ => domain}/observability/query_params_test.go (100%) rename backend/OpenFlare/plugins/server/{ => domain}/observability/routers.go (99%) rename backend/OpenFlare/plugins/server/{ => domain}/option/errs.go (100%) rename backend/OpenFlare/plugins/server/{ => domain}/option/logics.go (96%) rename backend/OpenFlare/plugins/server/{ => domain}/option/logics_test.go (96%) rename backend/OpenFlare/plugins/server/{ => domain}/option/openresty_validators.go (99%) rename backend/OpenFlare/plugins/server/{ => domain}/option/openresty_validators_test.go (98%) rename backend/OpenFlare/plugins/server/{ => domain}/option/routers.go (98%) rename backend/OpenFlare/plugins/server/{ => domain}/option/uptimekuma/client.go (100%) rename backend/OpenFlare/plugins/server/{ => domain}/option/uptimekuma/sync.go (98%) rename backend/OpenFlare/plugins/server/{ => domain}/option/uptimekuma/sync_helpers.go (98%) rename backend/OpenFlare/plugins/server/{ => domain}/option/uptimekuma/sync_test.go (99%) rename backend/OpenFlare/plugins/server/{ => domain}/option/validate.go (97%) rename backend/OpenFlare/plugins/server/{ => domain}/pages/download_url.go (100%) rename backend/OpenFlare/plugins/server/{ => domain}/pages/download_url_test.go (100%) rename backend/OpenFlare/plugins/server/{ => domain}/pages/errs.go (100%) rename backend/OpenFlare/plugins/server/{ => domain}/pages/github_source.go (99%) rename backend/OpenFlare/plugins/server/{ => domain}/pages/github_source_action.go (99%) rename backend/OpenFlare/plugins/server/{ => domain}/pages/github_source_identity_test.go (98%) rename backend/OpenFlare/plugins/server/{ => domain}/pages/github_source_test.go (99%) rename backend/OpenFlare/plugins/server/{ => domain}/pages/helpers.go (98%) rename backend/OpenFlare/plugins/server/{ => domain}/pages/logics.go (99%) rename backend/OpenFlare/plugins/server/{ => domain}/pages/logics_test.go (99%) rename backend/OpenFlare/plugins/server/{ => domain}/pages/package_metadata.go (93%) rename backend/OpenFlare/plugins/server/{ => domain}/pages/package_metadata_test.go (97%) rename backend/OpenFlare/plugins/server/{ => domain}/pages/rebind.go (98%) rename backend/OpenFlare/plugins/server/{ => domain}/pages/rebind_test.go (98%) rename backend/OpenFlare/plugins/server/{ => domain}/pages/routers.go (99%) rename backend/OpenFlare/plugins/server/{ => domain}/pages/routers_source_test.go (98%) rename backend/OpenFlare/plugins/server/{ => domain}/pages/routers_test.go (98%) rename backend/OpenFlare/plugins/server/{ => domain}/pages/source.go (99%) rename backend/OpenFlare/plugins/server/{ => domain}/pages/source_manual_test_helpers_test.go (92%) rename backend/OpenFlare/plugins/server/{ => domain}/pages/source_orphan_cleanup.go (98%) rename backend/OpenFlare/plugins/server/{ => domain}/pages/source_orphan_cleanup_test.go (99%) rename backend/OpenFlare/plugins/server/{ => domain}/pages/source_provider.go (100%) rename backend/OpenFlare/plugins/server/{ => domain}/pages/source_provider_test.go (100%) rename backend/OpenFlare/plugins/server/{ => domain}/pages/source_runtime.go (99%) rename backend/OpenFlare/plugins/server/{ => domain}/pages/source_runtime_test.go (99%) rename backend/OpenFlare/plugins/server/{ => domain}/pages/source_scanner.go (98%) rename backend/OpenFlare/plugins/server/{ => domain}/pages/source_scanner_test.go (99%) rename backend/OpenFlare/plugins/server/{ => domain}/pages/source_sync.go (99%) rename backend/OpenFlare/plugins/server/{ => domain}/pages/source_sync_test.go (99%) rename backend/OpenFlare/plugins/server/{ => domain}/pages/source_tasks.go (98%) rename backend/OpenFlare/plugins/server/{ => domain}/pages/source_tasks_test.go (100%) rename backend/OpenFlare/plugins/server/{ => domain}/pages/source_test.go (99%) rename backend/OpenFlare/plugins/server/{ => domain}/site/apply_log/errs.go (100%) rename backend/OpenFlare/plugins/server/{ => domain}/site/apply_log/logics.go (96%) rename backend/OpenFlare/plugins/server/{ => domain}/site/apply_log/logics_test.go (96%) rename backend/OpenFlare/plugins/server/{ => domain}/site/apply_log/routers.go (97%) rename backend/OpenFlare/plugins/server/{ => domain}/site/config_version/certificate_snapshot_test.go (95%) rename backend/OpenFlare/plugins/server/{ => domain}/site/config_version/errs.go (100%) rename backend/OpenFlare/plugins/server/{ => domain}/site/config_version/helpers.go (98%) rename backend/OpenFlare/plugins/server/{ => domain}/site/config_version/logics.go (99%) rename backend/OpenFlare/plugins/server/{ => domain}/site/config_version/logics_test.go (98%) rename backend/OpenFlare/plugins/server/{ => domain}/site/config_version/origin_error_page_snapshot_test.go (98%) rename backend/OpenFlare/plugins/server/{ => domain}/site/config_version/pages_snapshot.go (97%) rename backend/OpenFlare/plugins/server/{ => domain}/site/config_version/pages_snapshot_test.go (96%) rename backend/OpenFlare/plugins/server/{ => domain}/site/config_version/proxy_cache_path_test.go (100%) rename backend/OpenFlare/plugins/server/{ => domain}/site/config_version/renderer.go (100%) rename backend/OpenFlare/plugins/server/{ => domain}/site/config_version/routers.go (99%) rename backend/OpenFlare/plugins/server/{ => domain}/site/config_version/snapshot.go (99%) rename backend/OpenFlare/plugins/server/{ => domain}/site/config_version/waf_graph_snapshot_test.go (97%) rename backend/OpenFlare/plugins/server/{ => domain}/site/origin/errs.go (100%) rename backend/OpenFlare/plugins/server/{ => domain}/site/origin/helpers.go (100%) rename backend/OpenFlare/plugins/server/{ => domain}/site/origin/logics.go (98%) rename backend/OpenFlare/plugins/server/{ => domain}/site/origin/logics_test.go (97%) rename backend/OpenFlare/plugins/server/{ => domain}/site/origin/routers.go (98%) rename backend/OpenFlare/plugins/server/{ => domain}/site/proxy_route/build_helpers.go (98%) rename backend/OpenFlare/plugins/server/{ => domain}/site/proxy_route/errs.go (100%) rename backend/OpenFlare/plugins/server/{ => domain}/site/proxy_route/helpers.go (99%) rename backend/OpenFlare/plugins/server/{ => domain}/site/proxy_route/helpers_limit_test.go (100%) rename backend/OpenFlare/plugins/server/{ => domain}/site/proxy_route/logics.go (99%) rename backend/OpenFlare/plugins/server/{ => domain}/site/proxy_route/logics_test.go (98%) rename backend/OpenFlare/plugins/server/{ => domain}/site/proxy_route/origin_helpers.go (97%) rename backend/OpenFlare/plugins/server/{ => domain}/site/proxy_route/routers.go (98%) rename backend/OpenFlare/plugins/server/{ => domain}/site/routeidentity/identity.go (100%) rename backend/OpenFlare/plugins/server/{ => domain}/site/routeidentity/identity_test.go (100%) rename backend/OpenFlare/plugins/server/{ => domain}/site/zone/errs.go (100%) rename backend/OpenFlare/plugins/server/{ => domain}/site/zone/legacy_import.go (99%) rename backend/OpenFlare/plugins/server/{ => domain}/site/zone/legacy_import_test.go (100%) rename backend/OpenFlare/plugins/server/{ => domain}/site/zone/logics.go (97%) rename backend/OpenFlare/plugins/server/{ => domain}/site/zone/logics_test.go (96%) rename backend/OpenFlare/plugins/server/{ => domain}/site/zone/routers.go (99%) rename backend/OpenFlare/plugins/server/{ => domain}/site/zone/stats.go (98%) rename backend/OpenFlare/plugins/server/{ => domain}/tls/acme/client.go (100%) rename backend/OpenFlare/plugins/server/{ => domain}/tls/acme_obtain_test.go (98%) rename backend/OpenFlare/plugins/server/{ => domain}/tls/errs.go (100%) rename backend/OpenFlare/plugins/server/{ => domain}/tls/helpers.go (100%) rename backend/OpenFlare/plugins/server/{ => domain}/tls/logics.go (98%) rename backend/OpenFlare/plugins/server/{ => domain}/tls/logics_test.go (92%) rename backend/OpenFlare/plugins/server/{ => domain}/tls/obtain.go (95%) rename backend/OpenFlare/plugins/server/{ => domain}/tls/obtain_helpers.go (93%) rename backend/OpenFlare/plugins/server/{ => domain}/tls/routers.go (99%) rename backend/OpenFlare/plugins/server/{ => domain}/tls/sensitive.go (87%) rename backend/OpenFlare/plugins/server/{ => domain}/tls/ssl_renew.go (95%) rename backend/OpenFlare/plugins/server/{ => domain}/tls/ssl_renew_test.go (88%) rename backend/OpenFlare/plugins/server/{ => domain}/tls/tasks.go (96%) rename backend/OpenFlare/plugins/server/{ => domain}/tls/tasks_test.go (97%) rename backend/OpenFlare/plugins/server/{ => domain}/waf/errs.go (100%) rename backend/OpenFlare/plugins/server/{ => domain}/waf/graph_compile.go (100%) rename backend/OpenFlare/plugins/server/{ => domain}/waf/graph_compile_test.go (100%) rename backend/OpenFlare/plugins/server/{ => domain}/waf/graph_types.go (100%) rename backend/OpenFlare/plugins/server/{ => domain}/waf/graph_validate.go (100%) rename backend/OpenFlare/plugins/server/{ => domain}/waf/graph_validate_test.go (100%) rename backend/OpenFlare/plugins/server/{ => domain}/waf/ip_group_sync.go (98%) rename backend/OpenFlare/plugins/server/{ => domain}/waf/ip_group_sync_test.go (98%) rename backend/OpenFlare/plugins/server/{ => domain}/waf/logics.go (99%) rename backend/OpenFlare/plugins/server/{ => domain}/waf/logics_test.go (95%) rename backend/OpenFlare/plugins/server/{ => domain}/waf/routers.go (99%) rename backend/OpenFlare/plugins/server/{ => domain}/waf/rule_logics.go (98%) rename backend/OpenFlare/plugins/server/{ => domain}/waf/rule_logics_test.go (98%) rename backend/OpenFlare/plugins/server/{ => domain}/waf/rule_routers.go (98%) rename backend/OpenFlare/plugins/server/{ => kernel}/apiutil/bind.go (100%) rename backend/OpenFlare/plugins/server/{ => kernel}/apiutil/errors.go (100%) rename backend/OpenFlare/plugins/server/{ => kernel}/apiutil/middleware.go (100%) rename backend/OpenFlare/plugins/server/{ => kernel}/apiutil/middleware_test.go (96%) rename backend/OpenFlare/plugins/server/{ => kernel}/apiutil/routes.go (100%) rename backend/OpenFlare/plugins/server/{ => kernel}/credential/sensitive.go (96%) rename backend/OpenFlare/plugins/server/{ => kernel}/credential/sensitive_test.go (97%) rename backend/OpenFlare/plugins/server/{ => kernel}/geoip/data/GeoLite2-Country.mmdb (100%) rename backend/OpenFlare/plugins/server/{ => kernel}/geoip/data/data.go (100%) rename backend/OpenFlare/plugins/server/{ => kernel}/geoip/data/data_test.go (100%) rename backend/OpenFlare/plugins/server/{ => kernel}/geoip/lookup.go (100%) rename backend/OpenFlare/plugins/server/{ => kernel}/geoip/lookup_test.go (100%) rename backend/OpenFlare/plugins/server/{ => kernel}/geoip/node.go (97%) rename backend/OpenFlare/plugins/server/{ => kernel}/geoip/runtime.go (94%) rename backend/OpenFlare/plugins/server/{ => kernel}/geoip/runtime_test.go (96%) rename backend/OpenFlare/plugins/server/{integration => kernel}/githubrelease/client.go (100%) rename backend/OpenFlare/plugins/server/{integration => kernel}/githubrelease/client_test.go (100%) rename backend/OpenFlare/plugins/server/{integration => kernel}/githubrelease/transport.go (100%) rename backend/OpenFlare/plugins/server/{ => kernel}/model/analytics/filter.go (100%) rename backend/OpenFlare/plugins/server/{ => kernel}/model/analytics/node_access_log.go (100%) rename backend/OpenFlare/plugins/server/{ => kernel}/model/analytics/node_access_log_stats.go (100%) rename backend/OpenFlare/plugins/server/{ => kernel}/model/analytics/node_observability.go (100%) rename backend/OpenFlare/plugins/server/{ => kernel}/model/analytics/user_access_log.go (100%) rename backend/OpenFlare/plugins/server/{ => kernel}/model/analytics/user_agent.go (100%) rename backend/OpenFlare/plugins/server/{ => kernel}/model/errs.go (100%) rename backend/OpenFlare/plugins/server/{ => kernel}/model/openflare_access_log.go (100%) rename backend/OpenFlare/plugins/server/{ => kernel}/model/openflare_acme_account.go (100%) rename backend/OpenFlare/plugins/server/{ => kernel}/model/openflare_apply_log.go (100%) rename backend/OpenFlare/plugins/server/{ => kernel}/model/openflare_cloudflare.go (100%) rename backend/OpenFlare/plugins/server/{ => kernel}/model/openflare_config_version.go (100%) rename backend/OpenFlare/plugins/server/{ => kernel}/model/openflare_dns_account.go (100%) rename backend/OpenFlare/plugins/server/{ => kernel}/model/openflare_node.go (100%) rename backend/OpenFlare/plugins/server/{ => kernel}/model/openflare_observability.go (100%) rename backend/OpenFlare/plugins/server/{ => kernel}/model/openflare_option.go (100%) rename backend/OpenFlare/plugins/server/{ => kernel}/model/openflare_origin.go (100%) rename backend/OpenFlare/plugins/server/{ => kernel}/model/openflare_pages.go (100%) rename backend/OpenFlare/plugins/server/{ => kernel}/model/openflare_pages_cleanup.go (100%) rename backend/OpenFlare/plugins/server/{ => kernel}/model/openflare_pages_source.go (100%) rename backend/OpenFlare/plugins/server/{ => kernel}/model/openflare_pages_source_test.go (100%) rename backend/OpenFlare/plugins/server/{ => kernel}/model/openflare_proxy_route.go (100%) rename backend/OpenFlare/plugins/server/{ => kernel}/model/openflare_tls.go (100%) rename backend/OpenFlare/plugins/server/{ => kernel}/model/openflare_waf.go (100%) rename backend/OpenFlare/plugins/server/{ => kernel}/model/openflare_zone.go (100%) rename backend/OpenFlare/plugins/server/{ => kernel}/model/platform_aliases.go (100%) rename backend/OpenFlare/plugins/server/{ => kernel}/model/system_configs.go (100%) rename backend/OpenFlare/plugins/server/{ => kernel}/ofevents/events.go (100%) rename backend/OpenFlare/plugins/server/{ => kernel}/ofupload/ofupload.go (100%) rename backend/OpenFlare/plugins/server/{ => kernel}/ofupload/remove.go (100%) rename backend/OpenFlare/plugins/server/{ => kernel}/publicconfig/provider.go (94%) rename backend/OpenFlare/plugins/server/{ => kernel}/publicconfig/provider_test.go (92%) rename backend/OpenFlare/plugins/server/{ => kernel}/repository/analytics/ch_mocks_test.go (100%) rename backend/OpenFlare/plugins/server/{ => kernel}/repository/analytics/clickhouse_count.go (100%) rename backend/OpenFlare/plugins/server/{ => kernel}/repository/analytics/clickhouse_count_test.go (100%) rename backend/OpenFlare/plugins/server/{ => kernel}/repository/analytics/clickhouse_maintenance.go (100%) rename backend/OpenFlare/plugins/server/{ => kernel}/repository/analytics/clickhouse_maintenance_test.go (100%) rename backend/OpenFlare/plugins/server/{ => kernel}/repository/analytics/clickhouse_stats.go (93%) rename backend/OpenFlare/plugins/server/{ => kernel}/repository/analytics/node_access_log.go (99%) rename backend/OpenFlare/plugins/server/{ => kernel}/repository/analytics/node_access_log_delete.go (100%) rename backend/OpenFlare/plugins/server/{ => kernel}/repository/analytics/node_access_log_filter.go (98%) rename backend/OpenFlare/plugins/server/{ => kernel}/repository/analytics/node_access_log_stats.go (99%) rename backend/OpenFlare/plugins/server/{ => kernel}/repository/analytics/node_access_log_test.go (95%) rename backend/OpenFlare/plugins/server/{ => kernel}/repository/analytics/node_access_log_writer.go (95%) rename backend/OpenFlare/plugins/server/{ => kernel}/repository/analytics/node_observability.go (99%) rename backend/OpenFlare/plugins/server/{ => kernel}/repository/analytics/node_observability_delete.go (100%) rename backend/OpenFlare/plugins/server/{ => kernel}/repository/analytics/node_observability_filter.go (95%) rename backend/OpenFlare/plugins/server/{ => kernel}/repository/analytics/node_observability_latest_test.go (100%) rename backend/OpenFlare/plugins/server/{ => kernel}/repository/analytics/node_observability_test.go (94%) rename backend/OpenFlare/plugins/server/{ => kernel}/repository/analytics/node_observability_writer.go (98%) rename backend/OpenFlare/plugins/server/{ => kernel}/repository/analytics/sql_fragments.go (100%) rename backend/OpenFlare/plugins/server/{ => kernel}/repository/analytics/user_access_log.go (97%) rename backend/OpenFlare/plugins/server/{ => kernel}/repository/errs.go (100%) rename backend/OpenFlare/plugins/server/{ => kernel}/repository/logstore/cleanup.go (99%) rename backend/OpenFlare/plugins/server/{ => kernel}/repository/logstore/cleanup_test.go (99%) rename backend/OpenFlare/plugins/server/{ => kernel}/repository/logstore/clickhouse_store.go (99%) rename backend/OpenFlare/plugins/server/{ => kernel}/repository/logstore/clickhouse_store_test.go (100%) rename backend/OpenFlare/plugins/server/{ => kernel}/repository/logstore/dialect_postgres.go (100%) rename backend/OpenFlare/plugins/server/{ => kernel}/repository/logstore/dialect_sqlite.go (100%) rename backend/OpenFlare/plugins/server/{ => kernel}/repository/logstore/hooks.go (95%) rename backend/OpenFlare/plugins/server/{ => kernel}/repository/logstore/imports_test.go (91%) rename backend/OpenFlare/plugins/server/{ => kernel}/repository/logstore/insert_hooks_test.go (93%) rename backend/OpenFlare/plugins/server/{ => kernel}/repository/logstore/logstore.go (98%) rename backend/OpenFlare/plugins/server/{ => kernel}/repository/logstore/partition_cleanup.go (100%) rename backend/OpenFlare/plugins/server/{ => kernel}/repository/logstore/postgres_partition_integration_test.go (99%) rename backend/OpenFlare/plugins/server/{ => kernel}/repository/logstore/postgres_store.go (99%) rename backend/OpenFlare/plugins/server/{ => kernel}/repository/logstore/postgres_store_test.go (99%) rename backend/OpenFlare/plugins/server/{ => kernel}/repository/logstore/provider.go (98%) rename backend/OpenFlare/plugins/server/{ => kernel}/repository/logstore/provider_test.go (97%) rename backend/OpenFlare/plugins/server/{ => kernel}/repository/openflare_access_log.go (98%) rename backend/OpenFlare/plugins/server/{ => kernel}/repository/openflare_access_log_test.go (96%) rename backend/OpenFlare/plugins/server/{ => kernel}/repository/openflare_acme_account.go (97%) rename backend/OpenFlare/plugins/server/{ => kernel}/repository/openflare_apply_log.go (98%) rename backend/OpenFlare/plugins/server/{ => kernel}/repository/openflare_apply_log_test.go (97%) rename backend/OpenFlare/plugins/server/{ => kernel}/repository/openflare_cloudflare.go (99%) rename backend/OpenFlare/plugins/server/{ => kernel}/repository/openflare_cloudflare_test.go (98%) rename backend/OpenFlare/plugins/server/{ => kernel}/repository/openflare_config_version.go (98%) rename backend/OpenFlare/plugins/server/{ => kernel}/repository/openflare_dns_account.go (97%) rename backend/OpenFlare/plugins/server/{ => kernel}/repository/openflare_node.go (99%) rename backend/OpenFlare/plugins/server/{ => kernel}/repository/openflare_observability.go (98%) rename backend/OpenFlare/plugins/server/{ => kernel}/repository/openflare_origin.go (98%) rename backend/OpenFlare/plugins/server/{ => kernel}/repository/openflare_pages.go (98%) rename backend/OpenFlare/plugins/server/{ => kernel}/repository/openflare_pages_cleanup.go (97%) rename backend/OpenFlare/plugins/server/{ => kernel}/repository/openflare_pages_cleanup_test.go (99%) rename backend/OpenFlare/plugins/server/{ => kernel}/repository/openflare_pages_source.go (99%) rename backend/OpenFlare/plugins/server/{ => kernel}/repository/openflare_proxy_route.go (99%) rename backend/OpenFlare/plugins/server/{ => kernel}/repository/openflare_tls.go (98%) rename backend/OpenFlare/plugins/server/{ => kernel}/repository/openflare_waf.go (99%) rename backend/OpenFlare/plugins/server/{ => kernel}/repository/openflare_waf_bindings_test.go (96%) rename backend/OpenFlare/plugins/server/{ => kernel}/repository/openflare_waf_graph_test.go (98%) rename backend/OpenFlare/plugins/server/{ => kernel}/repository/openflare_zone.go (99%) rename backend/OpenFlare/plugins/server/{ => kernel}/repository/openflare_zone_test.go (98%) rename backend/OpenFlare/plugins/server/{ => kernel}/repository/services.go (100%) rename backend/OpenFlare/plugins/server/{ => kernel}/repository/system_config.go (98%) rename backend/OpenFlare/plugins/server/{ => kernel}/repository/system_user.go (97%) rename backend/OpenFlare/plugins/server/{ => kernel}/repository/system_user_test.go (100%) rename backend/OpenFlare/plugins/server/{ => kernel}/runtimeconfig/runtime.go (100%) rename backend/OpenFlare/plugins/server/{ => kernel}/task/dispatch_test.go (100%) rename backend/OpenFlare/plugins/server/{ => kernel}/task/task.go (100%) rename backend/OpenFlare/plugins/server/{ => kernel}/testhelper/cleanup.go (100%) rename backend/OpenFlare/plugins/server/{ => kernel}/testhelper/gin.go (100%) rename backend/OpenFlare/plugins/server/{ => kernel}/testhelper/noop_task.go (100%) rename backend/OpenFlare/plugins/server/{ => kernel}/testhelper/stub_auth.go (100%) rename backend/OpenFlare/plugins/server/{ => kernel}/testhelper/test_helper.go (97%) diff --git a/AGENTS.md b/AGENTS.md index 6f826f3d..ed3ca8da 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -104,7 +104,7 @@ Strong success criteria let you loop independently. Weak criteria ("make it work - **分层**：`apps → repository → model`，`repository → infra/persistence`；禁止 `model → repository`。 - `model`：实体、表名、配置 key、查询 DTO、无 IO 规则。禁止 `db.DB` / Redis / CH；禁止 `import repository`。GORM hook 仅可 mutate 自身字段，禁止在 hook 内再查 DB/缓存。 - `repository`：唯一持久化入口。apps/logics 禁止为业务 CRUD 直调 `db.DB`（管理端 SQL 控制台、infra 内部等例外保留）。禁止新增 `model.Get/List/Create/...` 类数据访问 API。 -- 日志/分析表（节点访问日志、用户访问日志、可观测时序）走 `backend/OpenFlare/plugins/server/repository/logstore`，禁止 apps 直连 `repository/analytics` 或 `db.ChConn`/`db.ChDB`。判定与接入步骤见 `logstore` skill。 +- 日志/分析表（节点访问日志、用户访问日志、可观测时序）走 `backend/OpenFlare/plugins/server/kernel/repository/logstore`，禁止 apps 直连 `repository/analytics` 或 `db.ChConn`/`db.ChDB`。判定与接入步骤见 `logstore` skill。 - 跨模块集成（任务 Handler、推送事件、域监听、完成钩子）禁止 `init()` 注册；经 `backend/OpenFlare/plugins/server/platform/bootstrap` 在 `backend/cmd` 入口显式装配。 - 核心业务（如 `oauth`、`user`）禁止直接 import push/custom_events；经 `backend/OpenFlare/plugins/server/listener` 发域事件，push 在 bootstrap 订阅。 - 依赖任务/推送注册的测试须显式 `bootstrap.RegisterTasks()` / `RegisterPushDomainEvents()` 等，不依赖 `init()`。 diff --git a/backend/OpenFlare/plugins/server/cloudflare/client.go b/backend/OpenFlare/plugins/server/domain/cloudflare/client.go similarity index 100% rename from backend/OpenFlare/plugins/server/cloudflare/client.go rename to backend/OpenFlare/plugins/server/domain/cloudflare/client.go diff --git a/backend/OpenFlare/plugins/server/cloudflare/client_test.go b/backend/OpenFlare/plugins/server/domain/cloudflare/client_test.go similarity index 100% rename from backend/OpenFlare/plugins/server/cloudflare/client_test.go rename to backend/OpenFlare/plugins/server/domain/cloudflare/client_test.go diff --git a/backend/OpenFlare/plugins/server/cloudflare/errs.go b/backend/OpenFlare/plugins/server/domain/cloudflare/errs.go similarity index 100% rename from backend/OpenFlare/plugins/server/cloudflare/errs.go rename to backend/OpenFlare/plugins/server/domain/cloudflare/errs.go diff --git a/backend/OpenFlare/plugins/server/cloudflare/logics.go b/backend/OpenFlare/plugins/server/domain/cloudflare/logics.go similarity index 98% rename from backend/OpenFlare/plugins/server/cloudflare/logics.go rename to backend/OpenFlare/plugins/server/domain/cloudflare/logics.go index 76895885..c5337924 100644 --- a/backend/OpenFlare/plugins/server/cloudflare/logics.go +++ b/backend/OpenFlare/plugins/server/domain/cloudflare/logics.go @@ -11,9 +11,9 @@ import ( "strings" "time" - "Wavelet/OpenFlare/plugins/server/credential" - "Wavelet/OpenFlare/plugins/server/model" - "Wavelet/OpenFlare/plugins/server/repository" + "Wavelet/OpenFlare/plugins/server/kernel/credential" + "Wavelet/OpenFlare/plugins/server/kernel/model" + "Wavelet/OpenFlare/plugins/server/kernel/repository" "Wavelet/pkg/logger" "gorm.io/gorm" diff --git a/backend/OpenFlare/plugins/server/cloudflare/reconcile.go b/backend/OpenFlare/plugins/server/domain/cloudflare/reconcile.go similarity index 97% rename from backend/OpenFlare/plugins/server/cloudflare/reconcile.go rename to backend/OpenFlare/plugins/server/domain/cloudflare/reconcile.go index 86142b35..59e02b30 100644 --- a/backend/OpenFlare/plugins/server/cloudflare/reconcile.go +++ b/backend/OpenFlare/plugins/server/domain/cloudflare/reconcile.go @@ -11,8 +11,8 @@ import ( "sync" "time" - "Wavelet/OpenFlare/plugins/server/model" - "Wavelet/OpenFlare/plugins/server/repository" + "Wavelet/OpenFlare/plugins/server/kernel/model" + "Wavelet/OpenFlare/plugins/server/kernel/repository" "Wavelet/pkg/logger" "gorm.io/gorm" diff --git a/backend/OpenFlare/plugins/server/cloudflare/reconcile_test.go b/backend/OpenFlare/plugins/server/domain/cloudflare/reconcile_test.go similarity index 98% rename from backend/OpenFlare/plugins/server/cloudflare/reconcile_test.go rename to backend/OpenFlare/plugins/server/domain/cloudflare/reconcile_test.go index ff932f1b..aea964e3 100644 --- a/backend/OpenFlare/plugins/server/cloudflare/reconcile_test.go +++ b/backend/OpenFlare/plugins/server/domain/cloudflare/reconcile_test.go @@ -8,9 +8,9 @@ import ( "errors" "testing" - "Wavelet/OpenFlare/plugins/server/credential" - "Wavelet/OpenFlare/plugins/server/model" - "Wavelet/OpenFlare/plugins/server/repository" + "Wavelet/OpenFlare/plugins/server/kernel/credential" + "Wavelet/OpenFlare/plugins/server/kernel/model" + "Wavelet/OpenFlare/plugins/server/kernel/repository" db "Wavelet/plugins/infra/database" "github.com/glebarez/sqlite" diff --git a/backend/OpenFlare/plugins/server/cloudflare/routers.go b/backend/OpenFlare/plugins/server/domain/cloudflare/routers.go similarity index 99% rename from backend/OpenFlare/plugins/server/cloudflare/routers.go rename to backend/OpenFlare/plugins/server/domain/cloudflare/routers.go index 73fc1ff5..37c81689 100644 --- a/backend/OpenFlare/plugins/server/cloudflare/routers.go +++ b/backend/OpenFlare/plugins/server/domain/cloudflare/routers.go @@ -7,7 +7,7 @@ import ( "errors" "net/http" - "Wavelet/OpenFlare/plugins/server/apiutil" + "Wavelet/OpenFlare/plugins/server/kernel/apiutil" "Wavelet/pkg/response" "github.com/gin-gonic/gin" diff --git a/backend/OpenFlare/plugins/server/cloudflare/routers_test.go b/backend/OpenFlare/plugins/server/domain/cloudflare/routers_test.go similarity index 97% rename from backend/OpenFlare/plugins/server/cloudflare/routers_test.go rename to backend/OpenFlare/plugins/server/domain/cloudflare/routers_test.go index 37a6c66f..3a1196e3 100644 --- a/backend/OpenFlare/plugins/server/cloudflare/routers_test.go +++ b/backend/OpenFlare/plugins/server/domain/cloudflare/routers_test.go @@ -9,7 +9,7 @@ import ( "strings" "testing" - "Wavelet/OpenFlare/plugins/server/repository" + "Wavelet/OpenFlare/plugins/server/kernel/repository" "Wavelet/pkg/response" db "Wavelet/plugins/infra/database" diff --git a/backend/OpenFlare/plugins/server/cloudflare/tasks.go b/backend/OpenFlare/plugins/server/domain/cloudflare/tasks.go similarity index 98% rename from backend/OpenFlare/plugins/server/cloudflare/tasks.go rename to backend/OpenFlare/plugins/server/domain/cloudflare/tasks.go index 66bcb68a..3df6bfd1 100644 --- a/backend/OpenFlare/plugins/server/cloudflare/tasks.go +++ b/backend/OpenFlare/plugins/server/domain/cloudflare/tasks.go @@ -12,9 +12,9 @@ import ( "io" "strings" - "Wavelet/OpenFlare/plugins/server/model" - "Wavelet/OpenFlare/plugins/server/repository" - "Wavelet/OpenFlare/plugins/server/task" + "Wavelet/OpenFlare/plugins/server/kernel/model" + "Wavelet/OpenFlare/plugins/server/kernel/repository" + "Wavelet/OpenFlare/plugins/server/kernel/task" "gorm.io/gorm" ) diff --git a/backend/OpenFlare/plugins/server/cloudflare/tasks_test.go b/backend/OpenFlare/plugins/server/domain/cloudflare/tasks_test.go similarity index 100% rename from backend/OpenFlare/plugins/server/cloudflare/tasks_test.go rename to backend/OpenFlare/plugins/server/domain/cloudflare/tasks_test.go diff --git a/backend/OpenFlare/plugins/server/cloudflare/types.go b/backend/OpenFlare/plugins/server/domain/cloudflare/types.go similarity index 100% rename from backend/OpenFlare/plugins/server/cloudflare/types.go rename to backend/OpenFlare/plugins/server/domain/cloudflare/types.go diff --git a/backend/OpenFlare/plugins/server/dashboard/cache.go b/backend/OpenFlare/plugins/server/domain/dashboard/cache.go similarity index 100% rename from backend/OpenFlare/plugins/server/dashboard/cache.go rename to backend/OpenFlare/plugins/server/domain/dashboard/cache.go diff --git a/backend/OpenFlare/plugins/server/dashboard/helpers.go b/backend/OpenFlare/plugins/server/domain/dashboard/helpers.go similarity index 92% rename from backend/OpenFlare/plugins/server/dashboard/helpers.go rename to backend/OpenFlare/plugins/server/domain/dashboard/helpers.go index 2da007ad..27c5f70c 100644 --- a/backend/OpenFlare/plugins/server/dashboard/helpers.go +++ b/backend/OpenFlare/plugins/server/domain/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/domain/fleet/websocket" + "Wavelet/OpenFlare/plugins/server/kernel/model" ) const ( diff --git a/backend/OpenFlare/plugins/server/dashboard/logics.go b/backend/OpenFlare/plugins/server/domain/dashboard/logics.go similarity index 98% rename from backend/OpenFlare/plugins/server/dashboard/logics.go rename to backend/OpenFlare/plugins/server/domain/dashboard/logics.go index bc3ef173..afc3315a 100644 --- a/backend/OpenFlare/plugins/server/dashboard/logics.go +++ b/backend/OpenFlare/plugins/server/domain/dashboard/logics.go @@ -8,10 +8,10 @@ import ( "sort" "time" - "Wavelet/OpenFlare/plugins/server/repository" + "Wavelet/OpenFlare/plugins/server/kernel/repository" - "Wavelet/OpenFlare/plugins/server/model" - "Wavelet/OpenFlare/plugins/server/observability" + "Wavelet/OpenFlare/plugins/server/domain/observability" + "Wavelet/OpenFlare/plugins/server/kernel/model" ) // Summary is the dashboard node summary section. diff --git a/backend/OpenFlare/plugins/server/dashboard/logics_test.go b/backend/OpenFlare/plugins/server/domain/dashboard/logics_test.go similarity index 97% rename from backend/OpenFlare/plugins/server/dashboard/logics_test.go rename to backend/OpenFlare/plugins/server/domain/dashboard/logics_test.go index 31f8a25c..2e0ba511 100644 --- a/backend/OpenFlare/plugins/server/dashboard/logics_test.go +++ b/backend/OpenFlare/plugins/server/domain/dashboard/logics_test.go @@ -8,10 +8,10 @@ import ( "testing" "time" - "Wavelet/OpenFlare/plugins/server/repository" - "Wavelet/OpenFlare/plugins/server/testhelper" + "Wavelet/OpenFlare/plugins/server/kernel/repository" + "Wavelet/OpenFlare/plugins/server/kernel/testhelper" - "Wavelet/OpenFlare/plugins/server/model" + "Wavelet/OpenFlare/plugins/server/kernel/model" db "Wavelet/plugins/infra/database" "github.com/glebarez/sqlite" diff --git a/backend/OpenFlare/plugins/server/dashboard/routers.go b/backend/OpenFlare/plugins/server/domain/dashboard/routers.go similarity index 95% rename from backend/OpenFlare/plugins/server/dashboard/routers.go rename to backend/OpenFlare/plugins/server/domain/dashboard/routers.go index 99f32897..d5eb6a40 100644 --- a/backend/OpenFlare/plugins/server/dashboard/routers.go +++ b/backend/OpenFlare/plugins/server/domain/dashboard/routers.go @@ -6,7 +6,7 @@ package dashboard import ( "net/http" - "Wavelet/OpenFlare/plugins/server/apiutil" + "Wavelet/OpenFlare/plugins/server/kernel/apiutil" "Wavelet/pkg/response" "github.com/gin-gonic/gin" diff --git a/backend/OpenFlare/plugins/server/fleet/agent/access_log_region.go b/backend/OpenFlare/plugins/server/domain/fleet/agent/access_log_region.go similarity index 100% rename from backend/OpenFlare/plugins/server/fleet/agent/access_log_region.go rename to backend/OpenFlare/plugins/server/domain/fleet/agent/access_log_region.go diff --git a/backend/OpenFlare/plugins/server/fleet/agent/auth_cache.go b/backend/OpenFlare/plugins/server/domain/fleet/agent/auth_cache.go similarity index 97% rename from backend/OpenFlare/plugins/server/fleet/agent/auth_cache.go rename to backend/OpenFlare/plugins/server/domain/fleet/agent/auth_cache.go index 26abad62..54fa01d2 100644 --- a/backend/OpenFlare/plugins/server/fleet/agent/auth_cache.go +++ b/backend/OpenFlare/plugins/server/domain/fleet/agent/auth_cache.go @@ -10,9 +10,9 @@ import ( "sync" "time" - "Wavelet/OpenFlare/plugins/server/repository" + "Wavelet/OpenFlare/plugins/server/kernel/repository" - "Wavelet/OpenFlare/plugins/server/model" + "Wavelet/OpenFlare/plugins/server/kernel/model" "gorm.io/gorm" ) diff --git a/backend/OpenFlare/plugins/server/fleet/agent/config.go b/backend/OpenFlare/plugins/server/domain/fleet/agent/config.go similarity index 95% rename from backend/OpenFlare/plugins/server/fleet/agent/config.go rename to backend/OpenFlare/plugins/server/domain/fleet/agent/config.go index de949e34..3927abfa 100644 --- a/backend/OpenFlare/plugins/server/fleet/agent/config.go +++ b/backend/OpenFlare/plugins/server/domain/fleet/agent/config.go @@ -9,9 +9,9 @@ import ( "errors" "strings" - "Wavelet/OpenFlare/plugins/server/repository" + "Wavelet/OpenFlare/plugins/server/kernel/repository" - "Wavelet/OpenFlare/plugins/server/pages" + "Wavelet/OpenFlare/plugins/server/domain/pages" openrestyrender "Wavelet/OpenFlare/share/render/openresty" "gorm.io/gorm" diff --git a/backend/OpenFlare/plugins/server/fleet/agent/config_test.go b/backend/OpenFlare/plugins/server/domain/fleet/agent/config_test.go similarity index 100% rename from backend/OpenFlare/plugins/server/fleet/agent/config_test.go rename to backend/OpenFlare/plugins/server/domain/fleet/agent/config_test.go diff --git a/backend/OpenFlare/plugins/server/fleet/agent/errs.go b/backend/OpenFlare/plugins/server/domain/fleet/agent/errs.go similarity index 100% rename from backend/OpenFlare/plugins/server/fleet/agent/errs.go rename to backend/OpenFlare/plugins/server/domain/fleet/agent/errs.go diff --git a/backend/OpenFlare/plugins/server/fleet/agent/helpers.go b/backend/OpenFlare/plugins/server/domain/fleet/agent/helpers.go similarity index 98% rename from backend/OpenFlare/plugins/server/fleet/agent/helpers.go rename to backend/OpenFlare/plugins/server/domain/fleet/agent/helpers.go index f66943e8..1a781e97 100644 --- a/backend/OpenFlare/plugins/server/fleet/agent/helpers.go +++ b/backend/OpenFlare/plugins/server/domain/fleet/agent/helpers.go @@ -11,9 +11,9 @@ import ( "strings" "time" - ofgeoip "Wavelet/OpenFlare/plugins/server/geoip" - "Wavelet/OpenFlare/plugins/server/model" - "Wavelet/OpenFlare/plugins/server/repository" + ofgeoip "Wavelet/OpenFlare/plugins/server/kernel/geoip" + "Wavelet/OpenFlare/plugins/server/kernel/model" + "Wavelet/OpenFlare/plugins/server/kernel/repository" ) const ( diff --git a/backend/OpenFlare/plugins/server/fleet/agent/helpers_test.go b/backend/OpenFlare/plugins/server/domain/fleet/agent/helpers_test.go similarity index 97% rename from backend/OpenFlare/plugins/server/fleet/agent/helpers_test.go rename to backend/OpenFlare/plugins/server/domain/fleet/agent/helpers_test.go index 088decf9..01fc9f0a 100644 --- a/backend/OpenFlare/plugins/server/fleet/agent/helpers_test.go +++ b/backend/OpenFlare/plugins/server/domain/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/kernel/geoip" + "Wavelet/OpenFlare/plugins/server/kernel/model" pkggeoip "Wavelet/OpenFlare/share/geoip" ) diff --git a/backend/OpenFlare/plugins/server/fleet/agent/logics.go b/backend/OpenFlare/plugins/server/domain/fleet/agent/logics.go similarity index 96% rename from backend/OpenFlare/plugins/server/fleet/agent/logics.go rename to backend/OpenFlare/plugins/server/domain/fleet/agent/logics.go index 53a96ea1..8448da29 100644 --- a/backend/OpenFlare/plugins/server/fleet/agent/logics.go +++ b/backend/OpenFlare/plugins/server/domain/fleet/agent/logics.go @@ -9,12 +9,12 @@ import ( "strings" "time" - cf "Wavelet/OpenFlare/plugins/server/cloudflare" - "Wavelet/OpenFlare/plugins/server/repository" + cf "Wavelet/OpenFlare/plugins/server/domain/cloudflare" + "Wavelet/OpenFlare/plugins/server/kernel/repository" - "Wavelet/OpenFlare/plugins/server/fleet/node" - ofgeoip "Wavelet/OpenFlare/plugins/server/geoip" - "Wavelet/OpenFlare/plugins/server/model" + "Wavelet/OpenFlare/plugins/server/domain/fleet/node" + ofgeoip "Wavelet/OpenFlare/plugins/server/kernel/geoip" + "Wavelet/OpenFlare/plugins/server/kernel/model" "Wavelet/pkg/logger" ) diff --git a/backend/OpenFlare/plugins/server/fleet/agent/middleware.go b/backend/OpenFlare/plugins/server/domain/fleet/agent/middleware.go similarity index 96% rename from backend/OpenFlare/plugins/server/fleet/agent/middleware.go rename to backend/OpenFlare/plugins/server/domain/fleet/agent/middleware.go index 23a0d786..269d500d 100644 --- a/backend/OpenFlare/plugins/server/fleet/agent/middleware.go +++ b/backend/OpenFlare/plugins/server/domain/fleet/agent/middleware.go @@ -6,7 +6,7 @@ package agent import ( "strings" - "Wavelet/OpenFlare/plugins/server/model" + "Wavelet/OpenFlare/plugins/server/kernel/model" "Wavelet/pkg/response" "github.com/gin-gonic/gin" diff --git a/backend/OpenFlare/plugins/server/fleet/agent/middleware_test.go b/backend/OpenFlare/plugins/server/domain/fleet/agent/middleware_test.go similarity index 97% rename from backend/OpenFlare/plugins/server/fleet/agent/middleware_test.go rename to backend/OpenFlare/plugins/server/domain/fleet/agent/middleware_test.go index 8f8a31d1..c27b77b9 100644 --- a/backend/OpenFlare/plugins/server/fleet/agent/middleware_test.go +++ b/backend/OpenFlare/plugins/server/domain/fleet/agent/middleware_test.go @@ -11,9 +11,9 @@ import ( "testing" "time" - "Wavelet/OpenFlare/plugins/server/model" - "Wavelet/OpenFlare/plugins/server/repository" - "Wavelet/OpenFlare/plugins/server/testhelper" + "Wavelet/OpenFlare/plugins/server/kernel/model" + "Wavelet/OpenFlare/plugins/server/kernel/repository" + "Wavelet/OpenFlare/plugins/server/kernel/testhelper" "Wavelet/pkg/response" db "Wavelet/plugins/infra/database" diff --git a/backend/OpenFlare/plugins/server/fleet/agent/observability.go b/backend/OpenFlare/plugins/server/domain/fleet/agent/observability.go similarity index 98% rename from backend/OpenFlare/plugins/server/fleet/agent/observability.go rename to backend/OpenFlare/plugins/server/domain/fleet/agent/observability.go index 02c0b6fe..a4da1696 100644 --- a/backend/OpenFlare/plugins/server/fleet/agent/observability.go +++ b/backend/OpenFlare/plugins/server/domain/fleet/agent/observability.go @@ -9,9 +9,9 @@ import ( "strings" "time" - "Wavelet/OpenFlare/plugins/server/repository" + "Wavelet/OpenFlare/plugins/server/kernel/repository" - "Wavelet/OpenFlare/plugins/server/model" + "Wavelet/OpenFlare/plugins/server/kernel/model" "go.uber.org/zap" ) diff --git a/backend/OpenFlare/plugins/server/fleet/agent/observability_test.go b/backend/OpenFlare/plugins/server/domain/fleet/agent/observability_test.go similarity index 100% rename from backend/OpenFlare/plugins/server/fleet/agent/observability_test.go rename to backend/OpenFlare/plugins/server/domain/fleet/agent/observability_test.go diff --git a/backend/OpenFlare/plugins/server/fleet/agent/protocol_alias.go b/backend/OpenFlare/plugins/server/domain/fleet/agent/protocol_alias.go similarity index 100% rename from backend/OpenFlare/plugins/server/fleet/agent/protocol_alias.go rename to backend/OpenFlare/plugins/server/domain/fleet/agent/protocol_alias.go diff --git a/backend/OpenFlare/plugins/server/fleet/agent/routers.go b/backend/OpenFlare/plugins/server/domain/fleet/agent/routers.go similarity index 98% rename from backend/OpenFlare/plugins/server/fleet/agent/routers.go rename to backend/OpenFlare/plugins/server/domain/fleet/agent/routers.go index ff03cc98..4d38eb7c 100644 --- a/backend/OpenFlare/plugins/server/fleet/agent/routers.go +++ b/backend/OpenFlare/plugins/server/domain/fleet/agent/routers.go @@ -7,9 +7,9 @@ import ( "net/http" "strconv" - "Wavelet/OpenFlare/plugins/server/apiutil" - "Wavelet/OpenFlare/plugins/server/fleet/websocket" - "Wavelet/OpenFlare/plugins/server/pages" + "Wavelet/OpenFlare/plugins/server/domain/fleet/websocket" + "Wavelet/OpenFlare/plugins/server/domain/pages" + "Wavelet/OpenFlare/plugins/server/kernel/apiutil" "Wavelet/OpenFlare/share/protocol" "Wavelet/pkg/response" diff --git a/backend/OpenFlare/plugins/server/fleet/agent/types.go b/backend/OpenFlare/plugins/server/domain/fleet/agent/types.go similarity index 96% rename from backend/OpenFlare/plugins/server/fleet/agent/types.go rename to backend/OpenFlare/plugins/server/domain/fleet/agent/types.go index 3a9b88e9..4f0ed5b6 100644 --- a/backend/OpenFlare/plugins/server/fleet/agent/types.go +++ b/backend/OpenFlare/plugins/server/domain/fleet/agent/types.go @@ -6,7 +6,7 @@ package agent import ( "time" - "Wavelet/OpenFlare/plugins/server/model" + "Wavelet/OpenFlare/plugins/server/kernel/model" ) const ( diff --git a/backend/OpenFlare/plugins/server/fleet/agent/waf_ip_group.go b/backend/OpenFlare/plugins/server/domain/fleet/agent/waf_ip_group.go similarity index 98% rename from backend/OpenFlare/plugins/server/fleet/agent/waf_ip_group.go rename to backend/OpenFlare/plugins/server/domain/fleet/agent/waf_ip_group.go index a479d53a..2ea26e62 100644 --- a/backend/OpenFlare/plugins/server/fleet/agent/waf_ip_group.go +++ b/backend/OpenFlare/plugins/server/domain/fleet/agent/waf_ip_group.go @@ -16,9 +16,9 @@ import ( "strconv" "strings" - "Wavelet/OpenFlare/plugins/server/repository" + "Wavelet/OpenFlare/plugins/server/kernel/repository" - "Wavelet/OpenFlare/plugins/server/model" + "Wavelet/OpenFlare/plugins/server/kernel/model" "Wavelet/OpenFlare/share/protocol" openrestyrender "Wavelet/OpenFlare/share/render/openresty" ) diff --git a/backend/OpenFlare/plugins/server/fleet/agent/waf_ip_group_test.go b/backend/OpenFlare/plugins/server/domain/fleet/agent/waf_ip_group_test.go similarity index 98% rename from backend/OpenFlare/plugins/server/fleet/agent/waf_ip_group_test.go rename to backend/OpenFlare/plugins/server/domain/fleet/agent/waf_ip_group_test.go index 2ebc233b..cb8a303b 100644 --- a/backend/OpenFlare/plugins/server/fleet/agent/waf_ip_group_test.go +++ b/backend/OpenFlare/plugins/server/domain/fleet/agent/waf_ip_group_test.go @@ -10,9 +10,9 @@ import ( "strings" "testing" - "Wavelet/OpenFlare/plugins/server/repository" + "Wavelet/OpenFlare/plugins/server/kernel/repository" - "Wavelet/OpenFlare/plugins/server/model" + "Wavelet/OpenFlare/plugins/server/kernel/model" "Wavelet/OpenFlare/share/protocol" db "Wavelet/plugins/infra/database" diff --git a/backend/OpenFlare/plugins/server/fleet/agent/ws_status.go b/backend/OpenFlare/plugins/server/domain/fleet/agent/ws_status.go similarity index 93% rename from backend/OpenFlare/plugins/server/fleet/agent/ws_status.go rename to backend/OpenFlare/plugins/server/domain/fleet/agent/ws_status.go index 60bdac3b..7da58911 100644 --- a/backend/OpenFlare/plugins/server/fleet/agent/ws_status.go +++ b/backend/OpenFlare/plugins/server/domain/fleet/agent/ws_status.go @@ -8,9 +8,9 @@ import ( "encoding/json" "log/slog" - "Wavelet/OpenFlare/plugins/server/repository" + "Wavelet/OpenFlare/plugins/server/kernel/repository" - ofws "Wavelet/OpenFlare/plugins/server/fleet/websocket" + ofws "Wavelet/OpenFlare/plugins/server/domain/fleet/websocket" ) // HandleWSStatus processes an agent websocket status payload (replaces HTTP heartbeat in WS mode). diff --git a/backend/OpenFlare/plugins/server/fleet/async_tasks.go b/backend/OpenFlare/plugins/server/domain/fleet/async_tasks.go similarity index 94% rename from backend/OpenFlare/plugins/server/fleet/async_tasks.go rename to backend/OpenFlare/plugins/server/domain/fleet/async_tasks.go index b209f94d..187b262b 100644 --- a/backend/OpenFlare/plugins/server/fleet/async_tasks.go +++ b/backend/OpenFlare/plugins/server/domain/fleet/async_tasks.go @@ -10,12 +10,12 @@ import ( "sync" "time" - "Wavelet/OpenFlare/plugins/server/model" - "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" + "Wavelet/OpenFlare/plugins/server/domain/option/uptimekuma" + "Wavelet/OpenFlare/plugins/server/domain/tls" + "Wavelet/OpenFlare/plugins/server/domain/waf" + "Wavelet/OpenFlare/plugins/server/kernel/model" + "Wavelet/OpenFlare/plugins/server/kernel/repository" + "Wavelet/OpenFlare/plugins/server/kernel/task" ) const ( diff --git a/backend/OpenFlare/plugins/server/fleet/async_tasks_test.go b/backend/OpenFlare/plugins/server/domain/fleet/async_tasks_test.go similarity index 89% rename from backend/OpenFlare/plugins/server/fleet/async_tasks_test.go rename to backend/OpenFlare/plugins/server/domain/fleet/async_tasks_test.go index 55e6e287..74875c5f 100644 --- a/backend/OpenFlare/plugins/server/fleet/async_tasks_test.go +++ b/backend/OpenFlare/plugins/server/domain/fleet/async_tasks_test.go @@ -7,8 +7,8 @@ import ( "context" "testing" - "Wavelet/OpenFlare/plugins/server/model" - "Wavelet/OpenFlare/plugins/server/repository" + "Wavelet/OpenFlare/plugins/server/kernel/model" + "Wavelet/OpenFlare/plugins/server/kernel/repository" db "Wavelet/plugins/infra/database" "github.com/glebarez/sqlite" diff --git a/backend/OpenFlare/plugins/server/fleet/flared/errs.go b/backend/OpenFlare/plugins/server/domain/fleet/flared/errs.go similarity index 100% rename from backend/OpenFlare/plugins/server/fleet/flared/errs.go rename to backend/OpenFlare/plugins/server/domain/fleet/flared/errs.go diff --git a/backend/OpenFlare/plugins/server/fleet/flared/helpers.go b/backend/OpenFlare/plugins/server/domain/fleet/flared/helpers.go similarity index 95% rename from backend/OpenFlare/plugins/server/fleet/flared/helpers.go rename to backend/OpenFlare/plugins/server/domain/fleet/flared/helpers.go index a29f854b..e202cb76 100644 --- a/backend/OpenFlare/plugins/server/fleet/flared/helpers.go +++ b/backend/OpenFlare/plugins/server/domain/fleet/flared/helpers.go @@ -10,10 +10,10 @@ import ( "strconv" "strings" - "Wavelet/OpenFlare/plugins/server/repository" + "Wavelet/OpenFlare/plugins/server/kernel/repository" - "Wavelet/OpenFlare/plugins/server/fleet/relay" - "Wavelet/OpenFlare/plugins/server/model" + "Wavelet/OpenFlare/plugins/server/domain/fleet/relay" + "Wavelet/OpenFlare/plugins/server/kernel/model" ) const ( diff --git a/backend/OpenFlare/plugins/server/fleet/flared/logics.go b/backend/OpenFlare/plugins/server/domain/fleet/flared/logics.go similarity index 97% rename from backend/OpenFlare/plugins/server/fleet/flared/logics.go rename to backend/OpenFlare/plugins/server/domain/fleet/flared/logics.go index 85ba0f0a..33c51f54 100644 --- a/backend/OpenFlare/plugins/server/fleet/flared/logics.go +++ b/backend/OpenFlare/plugins/server/domain/fleet/flared/logics.go @@ -10,10 +10,10 @@ import ( "strings" "time" - "Wavelet/OpenFlare/plugins/server/repository" + "Wavelet/OpenFlare/plugins/server/kernel/repository" - "Wavelet/OpenFlare/plugins/server/fleet/agent" - "Wavelet/OpenFlare/plugins/server/model" + "Wavelet/OpenFlare/plugins/server/domain/fleet/agent" + "Wavelet/OpenFlare/plugins/server/kernel/model" "gorm.io/gorm" ) diff --git a/backend/OpenFlare/plugins/server/fleet/flared/middleware.go b/backend/OpenFlare/plugins/server/domain/fleet/flared/middleware.go similarity index 93% rename from backend/OpenFlare/plugins/server/fleet/flared/middleware.go rename to backend/OpenFlare/plugins/server/domain/fleet/flared/middleware.go index 6249c665..6282dcee 100644 --- a/backend/OpenFlare/plugins/server/fleet/flared/middleware.go +++ b/backend/OpenFlare/plugins/server/domain/fleet/flared/middleware.go @@ -6,7 +6,7 @@ package flared import ( "strings" - "Wavelet/OpenFlare/plugins/server/fleet/agent" + "Wavelet/OpenFlare/plugins/server/domain/fleet/agent" "Wavelet/pkg/response" diff --git a/backend/OpenFlare/plugins/server/fleet/flared/middleware_test.go b/backend/OpenFlare/plugins/server/domain/fleet/flared/middleware_test.go similarity index 96% rename from backend/OpenFlare/plugins/server/fleet/flared/middleware_test.go rename to backend/OpenFlare/plugins/server/domain/fleet/flared/middleware_test.go index 9e619dff..e8a5501f 100644 --- a/backend/OpenFlare/plugins/server/fleet/flared/middleware_test.go +++ b/backend/OpenFlare/plugins/server/domain/fleet/flared/middleware_test.go @@ -9,9 +9,9 @@ import ( "net/http/httptest" "testing" - "Wavelet/OpenFlare/plugins/server/repository" + "Wavelet/OpenFlare/plugins/server/kernel/repository" - "Wavelet/OpenFlare/plugins/server/model" + "Wavelet/OpenFlare/plugins/server/kernel/model" "Wavelet/pkg/response" db "Wavelet/plugins/infra/database" diff --git a/backend/OpenFlare/plugins/server/fleet/flared/observability.go b/backend/OpenFlare/plugins/server/domain/fleet/flared/observability.go similarity index 96% rename from backend/OpenFlare/plugins/server/fleet/flared/observability.go rename to backend/OpenFlare/plugins/server/domain/fleet/flared/observability.go index 02c38bd4..92fa4934 100644 --- a/backend/OpenFlare/plugins/server/fleet/flared/observability.go +++ b/backend/OpenFlare/plugins/server/domain/fleet/flared/observability.go @@ -9,7 +9,7 @@ import ( "strings" "time" - "Wavelet/OpenFlare/plugins/server/fleet/agent" + "Wavelet/OpenFlare/plugins/server/domain/fleet/agent" "go.uber.org/zap" ) diff --git a/backend/OpenFlare/plugins/server/fleet/flared/observability_test.go b/backend/OpenFlare/plugins/server/domain/fleet/flared/observability_test.go similarity index 91% rename from backend/OpenFlare/plugins/server/fleet/flared/observability_test.go rename to backend/OpenFlare/plugins/server/domain/fleet/flared/observability_test.go index 579d2f28..0a1e6419 100644 --- a/backend/OpenFlare/plugins/server/fleet/flared/observability_test.go +++ b/backend/OpenFlare/plugins/server/domain/fleet/flared/observability_test.go @@ -7,10 +7,10 @@ import ( "context" "testing" - "Wavelet/OpenFlare/plugins/server/repository" + "Wavelet/OpenFlare/plugins/server/kernel/repository" - "Wavelet/OpenFlare/plugins/server/fleet/agent" - "Wavelet/OpenFlare/plugins/server/model" + "Wavelet/OpenFlare/plugins/server/domain/fleet/agent" + "Wavelet/OpenFlare/plugins/server/kernel/model" db "Wavelet/plugins/infra/database" "github.com/glebarez/sqlite" diff --git a/backend/OpenFlare/plugins/server/fleet/flared/protocol_alias.go b/backend/OpenFlare/plugins/server/domain/fleet/flared/protocol_alias.go similarity index 100% rename from backend/OpenFlare/plugins/server/fleet/flared/protocol_alias.go rename to backend/OpenFlare/plugins/server/domain/fleet/flared/protocol_alias.go diff --git a/backend/OpenFlare/plugins/server/fleet/flared/routers.go b/backend/OpenFlare/plugins/server/domain/fleet/flared/routers.go similarity index 96% rename from backend/OpenFlare/plugins/server/fleet/flared/routers.go rename to backend/OpenFlare/plugins/server/domain/fleet/flared/routers.go index 6dc238eb..b0c096d7 100644 --- a/backend/OpenFlare/plugins/server/fleet/flared/routers.go +++ b/backend/OpenFlare/plugins/server/domain/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" + ofws "Wavelet/OpenFlare/plugins/server/domain/fleet/websocket" + "Wavelet/OpenFlare/plugins/server/kernel/apiutil" + "Wavelet/OpenFlare/plugins/server/kernel/model" "Wavelet/pkg/response" "github.com/gin-gonic/gin" diff --git a/backend/OpenFlare/plugins/server/fleet/integration/agent_protocol_test.go b/backend/OpenFlare/plugins/server/domain/fleet/integration/agent_protocol_test.go similarity index 95% rename from backend/OpenFlare/plugins/server/fleet/integration/agent_protocol_test.go rename to backend/OpenFlare/plugins/server/domain/fleet/integration/agent_protocol_test.go index 6b89f97f..7ff44c6c 100644 --- a/backend/OpenFlare/plugins/server/fleet/integration/agent_protocol_test.go +++ b/backend/OpenFlare/plugins/server/domain/fleet/integration/agent_protocol_test.go @@ -8,12 +8,12 @@ import ( "net/http" "testing" - "Wavelet/OpenFlare/plugins/server/repository" + "Wavelet/OpenFlare/plugins/server/kernel/repository" - "Wavelet/OpenFlare/plugins/server/fleet/agent" - ofnode "Wavelet/OpenFlare/plugins/server/fleet/node" - "Wavelet/OpenFlare/plugins/server/model" - "Wavelet/OpenFlare/plugins/server/testhelper" + "Wavelet/OpenFlare/plugins/server/domain/fleet/agent" + ofnode "Wavelet/OpenFlare/plugins/server/domain/fleet/node" + "Wavelet/OpenFlare/plugins/server/kernel/model" + "Wavelet/OpenFlare/plugins/server/kernel/testhelper" db "Wavelet/plugins/infra/database" "github.com/gin-gonic/gin" diff --git a/backend/OpenFlare/plugins/server/fleet/integration/auth_option_test.go b/backend/OpenFlare/plugins/server/domain/fleet/integration/auth_option_test.go similarity index 96% rename from backend/OpenFlare/plugins/server/fleet/integration/auth_option_test.go rename to backend/OpenFlare/plugins/server/domain/fleet/integration/auth_option_test.go index e95ee358..2eacc31e 100644 --- a/backend/OpenFlare/plugins/server/fleet/integration/auth_option_test.go +++ b/backend/OpenFlare/plugins/server/domain/fleet/integration/auth_option_test.go @@ -10,10 +10,10 @@ import ( "net/http/httptest" "testing" - "Wavelet/OpenFlare/plugins/server/model" - "Wavelet/OpenFlare/plugins/server/repository" - "Wavelet/OpenFlare/plugins/server/runtimeconfig" - "Wavelet/OpenFlare/plugins/server/testhelper" + "Wavelet/OpenFlare/plugins/server/kernel/model" + "Wavelet/OpenFlare/plugins/server/kernel/repository" + "Wavelet/OpenFlare/plugins/server/kernel/runtimeconfig" + "Wavelet/OpenFlare/plugins/server/kernel/testhelper" "Wavelet/pkg/idgen" "github.com/gin-contrib/sessions" diff --git a/backend/OpenFlare/plugins/server/fleet/integration/core_chain_test.go b/backend/OpenFlare/plugins/server/domain/fleet/integration/core_chain_test.go similarity index 98% rename from backend/OpenFlare/plugins/server/fleet/integration/core_chain_test.go rename to backend/OpenFlare/plugins/server/domain/fleet/integration/core_chain_test.go index e55decd6..1d4f5ed1 100644 --- a/backend/OpenFlare/plugins/server/fleet/integration/core_chain_test.go +++ b/backend/OpenFlare/plugins/server/domain/fleet/integration/core_chain_test.go @@ -9,9 +9,9 @@ import ( "testing" "time" - "Wavelet/OpenFlare/plugins/server/fleet/agent" - "Wavelet/OpenFlare/plugins/server/model" - "Wavelet/OpenFlare/plugins/server/testhelper" + "Wavelet/OpenFlare/plugins/server/domain/fleet/agent" + "Wavelet/OpenFlare/plugins/server/kernel/model" + "Wavelet/OpenFlare/plugins/server/kernel/testhelper" db "Wavelet/plugins/infra/database" "github.com/gin-gonic/gin" diff --git a/backend/OpenFlare/plugins/server/fleet/integration/helpers_test.go b/backend/OpenFlare/plugins/server/domain/fleet/integration/helpers_test.go similarity index 98% rename from backend/OpenFlare/plugins/server/fleet/integration/helpers_test.go rename to backend/OpenFlare/plugins/server/domain/fleet/integration/helpers_test.go index 477de857..e411d88e 100644 --- a/backend/OpenFlare/plugins/server/fleet/integration/helpers_test.go +++ b/backend/OpenFlare/plugins/server/domain/fleet/integration/helpers_test.go @@ -13,7 +13,7 @@ import ( "Wavelet/OpenFlare/plugins/server" ofrouter "Wavelet/OpenFlare/plugins/server/httpapi" - "Wavelet/OpenFlare/plugins/server/testhelper" + "Wavelet/OpenFlare/plugins/server/kernel/testhelper" "Wavelet/core" "Wavelet/core/contracts" "Wavelet/pkg/response" diff --git a/backend/OpenFlare/plugins/server/fleet/integration/security_test.go b/backend/OpenFlare/plugins/server/domain/fleet/integration/security_test.go similarity index 98% rename from backend/OpenFlare/plugins/server/fleet/integration/security_test.go rename to backend/OpenFlare/plugins/server/domain/fleet/integration/security_test.go index f28a0bef..0dc96172 100644 --- a/backend/OpenFlare/plugins/server/fleet/integration/security_test.go +++ b/backend/OpenFlare/plugins/server/domain/fleet/integration/security_test.go @@ -16,9 +16,9 @@ import ( "testing" "time" - "Wavelet/OpenFlare/plugins/server/model" - "Wavelet/OpenFlare/plugins/server/runtimeconfig" - "Wavelet/OpenFlare/plugins/server/testhelper" + "Wavelet/OpenFlare/plugins/server/kernel/model" + "Wavelet/OpenFlare/plugins/server/kernel/runtimeconfig" + "Wavelet/OpenFlare/plugins/server/kernel/testhelper" db "Wavelet/plugins/infra/database" "github.com/gin-gonic/gin" diff --git a/backend/OpenFlare/plugins/server/fleet/node/errs.go b/backend/OpenFlare/plugins/server/domain/fleet/node/errs.go similarity index 100% rename from backend/OpenFlare/plugins/server/fleet/node/errs.go rename to backend/OpenFlare/plugins/server/domain/fleet/node/errs.go diff --git a/backend/OpenFlare/plugins/server/fleet/node/helpers.go b/backend/OpenFlare/plugins/server/domain/fleet/node/helpers.go similarity index 99% rename from backend/OpenFlare/plugins/server/fleet/node/helpers.go rename to backend/OpenFlare/plugins/server/domain/fleet/node/helpers.go index bf78a837..18162db3 100644 --- a/backend/OpenFlare/plugins/server/fleet/node/helpers.go +++ b/backend/OpenFlare/plugins/server/domain/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/domain/fleet/websocket" + "Wavelet/OpenFlare/plugins/server/kernel/model" ) const ( diff --git a/backend/OpenFlare/plugins/server/fleet/node/logics.go b/backend/OpenFlare/plugins/server/domain/fleet/node/logics.go similarity index 98% rename from backend/OpenFlare/plugins/server/fleet/node/logics.go rename to backend/OpenFlare/plugins/server/domain/fleet/node/logics.go index 72b28a68..6954a681 100644 --- a/backend/OpenFlare/plugins/server/fleet/node/logics.go +++ b/backend/OpenFlare/plugins/server/domain/fleet/node/logics.go @@ -10,11 +10,11 @@ import ( "strings" "time" - cf "Wavelet/OpenFlare/plugins/server/cloudflare" - ofws "Wavelet/OpenFlare/plugins/server/fleet/websocket" - "Wavelet/OpenFlare/plugins/server/model" - "Wavelet/OpenFlare/plugins/server/observability" - "Wavelet/OpenFlare/plugins/server/repository" + cf "Wavelet/OpenFlare/plugins/server/domain/cloudflare" + ofws "Wavelet/OpenFlare/plugins/server/domain/fleet/websocket" + "Wavelet/OpenFlare/plugins/server/domain/observability" + "Wavelet/OpenFlare/plugins/server/kernel/model" + "Wavelet/OpenFlare/plugins/server/kernel/repository" "Wavelet/pkg/logger" "gorm.io/gorm" diff --git a/backend/OpenFlare/plugins/server/fleet/node/logics_test.go b/backend/OpenFlare/plugins/server/domain/fleet/node/logics_test.go similarity index 98% rename from backend/OpenFlare/plugins/server/fleet/node/logics_test.go rename to backend/OpenFlare/plugins/server/domain/fleet/node/logics_test.go index ff23fc0c..d7309327 100644 --- a/backend/OpenFlare/plugins/server/fleet/node/logics_test.go +++ b/backend/OpenFlare/plugins/server/domain/fleet/node/logics_test.go @@ -11,10 +11,10 @@ import ( "testing" "time" - cf "Wavelet/OpenFlare/plugins/server/cloudflare" - "Wavelet/OpenFlare/plugins/server/model" - "Wavelet/OpenFlare/plugins/server/repository" - "Wavelet/OpenFlare/plugins/server/testhelper" + cf "Wavelet/OpenFlare/plugins/server/domain/cloudflare" + "Wavelet/OpenFlare/plugins/server/kernel/model" + "Wavelet/OpenFlare/plugins/server/kernel/repository" + "Wavelet/OpenFlare/plugins/server/kernel/testhelper" db "Wavelet/plugins/infra/database" "github.com/glebarez/sqlite" diff --git a/backend/OpenFlare/plugins/server/fleet/node/routers.go b/backend/OpenFlare/plugins/server/domain/fleet/node/routers.go similarity index 99% rename from backend/OpenFlare/plugins/server/fleet/node/routers.go rename to backend/OpenFlare/plugins/server/domain/fleet/node/routers.go index a7d27359..1b6bc297 100644 --- a/backend/OpenFlare/plugins/server/fleet/node/routers.go +++ b/backend/OpenFlare/plugins/server/domain/fleet/node/routers.go @@ -9,7 +9,7 @@ import ( "io" "net/http" - "Wavelet/OpenFlare/plugins/server/apiutil" + "Wavelet/OpenFlare/plugins/server/kernel/apiutil" "Wavelet/pkg/response" "github.com/gin-gonic/gin" diff --git a/backend/OpenFlare/plugins/server/fleet/node/version.go b/backend/OpenFlare/plugins/server/domain/fleet/node/version.go similarity index 100% rename from backend/OpenFlare/plugins/server/fleet/node/version.go rename to backend/OpenFlare/plugins/server/domain/fleet/node/version.go diff --git a/backend/OpenFlare/plugins/server/fleet/relay/errs.go b/backend/OpenFlare/plugins/server/domain/fleet/relay/errs.go similarity index 100% rename from backend/OpenFlare/plugins/server/fleet/relay/errs.go rename to backend/OpenFlare/plugins/server/domain/fleet/relay/errs.go diff --git a/backend/OpenFlare/plugins/server/fleet/relay/helpers.go b/backend/OpenFlare/plugins/server/domain/fleet/relay/helpers.go similarity index 97% rename from backend/OpenFlare/plugins/server/fleet/relay/helpers.go rename to backend/OpenFlare/plugins/server/domain/fleet/relay/helpers.go index 7b49882b..5a9d7ec3 100644 --- a/backend/OpenFlare/plugins/server/fleet/relay/helpers.go +++ b/backend/OpenFlare/plugins/server/domain/fleet/relay/helpers.go @@ -8,8 +8,8 @@ import ( "net" "strings" - "Wavelet/OpenFlare/plugins/server/model" - "Wavelet/OpenFlare/plugins/server/repository" + "Wavelet/OpenFlare/plugins/server/kernel/model" + "Wavelet/OpenFlare/plugins/server/kernel/repository" ) const ( diff --git a/backend/OpenFlare/plugins/server/fleet/relay/logics.go b/backend/OpenFlare/plugins/server/domain/fleet/relay/logics.go similarity index 93% rename from backend/OpenFlare/plugins/server/fleet/relay/logics.go rename to backend/OpenFlare/plugins/server/domain/fleet/relay/logics.go index 8961bf71..faaca374 100644 --- a/backend/OpenFlare/plugins/server/fleet/relay/logics.go +++ b/backend/OpenFlare/plugins/server/domain/fleet/relay/logics.go @@ -10,10 +10,10 @@ import ( "strings" "time" - "Wavelet/OpenFlare/plugins/server/fleet/agent" - ofgeoip "Wavelet/OpenFlare/plugins/server/geoip" - "Wavelet/OpenFlare/plugins/server/model" - "Wavelet/OpenFlare/plugins/server/repository" + "Wavelet/OpenFlare/plugins/server/domain/fleet/agent" + ofgeoip "Wavelet/OpenFlare/plugins/server/kernel/geoip" + "Wavelet/OpenFlare/plugins/server/kernel/model" + "Wavelet/OpenFlare/plugins/server/kernel/repository" ) const nodeStatusOnline = "online" diff --git a/backend/OpenFlare/plugins/server/fleet/relay/logics_test.go b/backend/OpenFlare/plugins/server/domain/fleet/relay/logics_test.go similarity index 95% rename from backend/OpenFlare/plugins/server/fleet/relay/logics_test.go rename to backend/OpenFlare/plugins/server/domain/fleet/relay/logics_test.go index ae064b5a..ec9ee989 100644 --- a/backend/OpenFlare/plugins/server/fleet/relay/logics_test.go +++ b/backend/OpenFlare/plugins/server/domain/fleet/relay/logics_test.go @@ -9,11 +9,11 @@ import ( "testing" "time" - "Wavelet/OpenFlare/plugins/server/repository" - "Wavelet/OpenFlare/plugins/server/testhelper" + "Wavelet/OpenFlare/plugins/server/kernel/repository" + "Wavelet/OpenFlare/plugins/server/kernel/testhelper" - "Wavelet/OpenFlare/plugins/server/fleet/agent" - "Wavelet/OpenFlare/plugins/server/model" + "Wavelet/OpenFlare/plugins/server/domain/fleet/agent" + "Wavelet/OpenFlare/plugins/server/kernel/model" db "Wavelet/plugins/infra/database" "github.com/glebarez/sqlite" diff --git a/backend/OpenFlare/plugins/server/fleet/relay/middleware.go b/backend/OpenFlare/plugins/server/domain/fleet/relay/middleware.go similarity index 92% rename from backend/OpenFlare/plugins/server/fleet/relay/middleware.go rename to backend/OpenFlare/plugins/server/domain/fleet/relay/middleware.go index b3f15c2d..a9fe2843 100644 --- a/backend/OpenFlare/plugins/server/fleet/relay/middleware.go +++ b/backend/OpenFlare/plugins/server/domain/fleet/relay/middleware.go @@ -6,7 +6,7 @@ package relay import ( "strings" - "Wavelet/OpenFlare/plugins/server/fleet/agent" + "Wavelet/OpenFlare/plugins/server/domain/fleet/agent" "Wavelet/pkg/response" diff --git a/backend/OpenFlare/plugins/server/fleet/relay/middleware_test.go b/backend/OpenFlare/plugins/server/domain/fleet/relay/middleware_test.go similarity index 96% rename from backend/OpenFlare/plugins/server/fleet/relay/middleware_test.go rename to backend/OpenFlare/plugins/server/domain/fleet/relay/middleware_test.go index 19f1c8a8..e18ea7ec 100644 --- a/backend/OpenFlare/plugins/server/fleet/relay/middleware_test.go +++ b/backend/OpenFlare/plugins/server/domain/fleet/relay/middleware_test.go @@ -9,9 +9,9 @@ import ( "net/http/httptest" "testing" - "Wavelet/OpenFlare/plugins/server/repository" + "Wavelet/OpenFlare/plugins/server/kernel/repository" - "Wavelet/OpenFlare/plugins/server/model" + "Wavelet/OpenFlare/plugins/server/kernel/model" "Wavelet/pkg/response" db "Wavelet/plugins/infra/database" diff --git a/backend/OpenFlare/plugins/server/fleet/relay/observability.go b/backend/OpenFlare/plugins/server/domain/fleet/relay/observability.go similarity index 91% rename from backend/OpenFlare/plugins/server/fleet/relay/observability.go rename to backend/OpenFlare/plugins/server/domain/fleet/relay/observability.go index 82165a50..5732b9a1 100644 --- a/backend/OpenFlare/plugins/server/fleet/relay/observability.go +++ b/backend/OpenFlare/plugins/server/domain/fleet/relay/observability.go @@ -7,10 +7,10 @@ import ( "context" "time" - "Wavelet/OpenFlare/plugins/server/repository" + "Wavelet/OpenFlare/plugins/server/kernel/repository" - "Wavelet/OpenFlare/plugins/server/fleet/agent" - "Wavelet/OpenFlare/plugins/server/model" + "Wavelet/OpenFlare/plugins/server/domain/fleet/agent" + "Wavelet/OpenFlare/plugins/server/kernel/model" "go.uber.org/zap" ) diff --git a/backend/OpenFlare/plugins/server/fleet/relay/protocol_alias.go b/backend/OpenFlare/plugins/server/domain/fleet/relay/protocol_alias.go similarity index 100% rename from backend/OpenFlare/plugins/server/fleet/relay/protocol_alias.go rename to backend/OpenFlare/plugins/server/domain/fleet/relay/protocol_alias.go diff --git a/backend/OpenFlare/plugins/server/fleet/relay/routers.go b/backend/OpenFlare/plugins/server/domain/fleet/relay/routers.go similarity index 92% rename from backend/OpenFlare/plugins/server/fleet/relay/routers.go rename to backend/OpenFlare/plugins/server/domain/fleet/relay/routers.go index ff2d4ffe..9caf5102 100644 --- a/backend/OpenFlare/plugins/server/fleet/relay/routers.go +++ b/backend/OpenFlare/plugins/server/domain/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" + ofws "Wavelet/OpenFlare/plugins/server/domain/fleet/websocket" + "Wavelet/OpenFlare/plugins/server/kernel/apiutil" + "Wavelet/OpenFlare/plugins/server/kernel/model" "Wavelet/pkg/response" "github.com/gin-gonic/gin" diff --git a/backend/OpenFlare/plugins/server/fleet/websocket/agent_hub.go b/backend/OpenFlare/plugins/server/domain/fleet/websocket/agent_hub.go similarity index 100% rename from backend/OpenFlare/plugins/server/fleet/websocket/agent_hub.go rename to backend/OpenFlare/plugins/server/domain/fleet/websocket/agent_hub.go diff --git a/backend/OpenFlare/plugins/server/fleet/websocket/client_core.go b/backend/OpenFlare/plugins/server/domain/fleet/websocket/client_core.go similarity index 100% rename from backend/OpenFlare/plugins/server/fleet/websocket/client_core.go rename to backend/OpenFlare/plugins/server/domain/fleet/websocket/client_core.go diff --git a/backend/OpenFlare/plugins/server/fleet/websocket/client_core_test.go b/backend/OpenFlare/plugins/server/domain/fleet/websocket/client_core_test.go similarity index 100% rename from backend/OpenFlare/plugins/server/fleet/websocket/client_core_test.go rename to backend/OpenFlare/plugins/server/domain/fleet/websocket/client_core_test.go diff --git a/backend/OpenFlare/plugins/server/fleet/websocket/common.go b/backend/OpenFlare/plugins/server/domain/fleet/websocket/common.go similarity index 100% rename from backend/OpenFlare/plugins/server/fleet/websocket/common.go rename to backend/OpenFlare/plugins/server/domain/fleet/websocket/common.go diff --git a/backend/OpenFlare/plugins/server/fleet/websocket/consts.go b/backend/OpenFlare/plugins/server/domain/fleet/websocket/consts.go similarity index 100% rename from backend/OpenFlare/plugins/server/fleet/websocket/consts.go rename to backend/OpenFlare/plugins/server/domain/fleet/websocket/consts.go diff --git a/backend/OpenFlare/plugins/server/fleet/websocket/flared_hub.go b/backend/OpenFlare/plugins/server/domain/fleet/websocket/flared_hub.go similarity index 100% rename from backend/OpenFlare/plugins/server/fleet/websocket/flared_hub.go rename to backend/OpenFlare/plugins/server/domain/fleet/websocket/flared_hub.go diff --git a/backend/OpenFlare/plugins/server/fleet/websocket/read_pump.go b/backend/OpenFlare/plugins/server/domain/fleet/websocket/read_pump.go similarity index 100% rename from backend/OpenFlare/plugins/server/fleet/websocket/read_pump.go rename to backend/OpenFlare/plugins/server/domain/fleet/websocket/read_pump.go diff --git a/backend/OpenFlare/plugins/server/fleet/websocket/relay_hub.go b/backend/OpenFlare/plugins/server/domain/fleet/websocket/relay_hub.go similarity index 100% rename from backend/OpenFlare/plugins/server/fleet/websocket/relay_hub.go rename to backend/OpenFlare/plugins/server/domain/fleet/websocket/relay_hub.go diff --git a/backend/OpenFlare/plugins/server/fleet/websocket/write_pump.go b/backend/OpenFlare/plugins/server/domain/fleet/websocket/write_pump.go similarity index 100% rename from backend/OpenFlare/plugins/server/fleet/websocket/write_pump.go rename to backend/OpenFlare/plugins/server/domain/fleet/websocket/write_pump.go diff --git a/backend/OpenFlare/plugins/server/observability/access_log_ip_summary_test.go b/backend/OpenFlare/plugins/server/domain/observability/access_log_ip_summary_test.go similarity index 100% rename from backend/OpenFlare/plugins/server/observability/access_log_ip_summary_test.go rename to backend/OpenFlare/plugins/server/domain/observability/access_log_ip_summary_test.go diff --git a/backend/OpenFlare/plugins/server/observability/access_log_logics.go b/backend/OpenFlare/plugins/server/domain/observability/access_log_logics.go similarity index 99% rename from backend/OpenFlare/plugins/server/observability/access_log_logics.go rename to backend/OpenFlare/plugins/server/domain/observability/access_log_logics.go index d363932a..830dcaab 100644 --- a/backend/OpenFlare/plugins/server/observability/access_log_logics.go +++ b/backend/OpenFlare/plugins/server/domain/observability/access_log_logics.go @@ -11,10 +11,10 @@ import ( "strings" "time" - "Wavelet/OpenFlare/plugins/server/repository" + "Wavelet/OpenFlare/plugins/server/kernel/repository" - "Wavelet/OpenFlare/plugins/server/model" - analyticsmodel "Wavelet/OpenFlare/plugins/server/model/analytics" + "Wavelet/OpenFlare/plugins/server/kernel/model" + analyticsmodel "Wavelet/OpenFlare/plugins/server/kernel/model/analytics" "Wavelet/pkg/logger" ) diff --git a/backend/OpenFlare/plugins/server/observability/analytics.go b/backend/OpenFlare/plugins/server/domain/observability/analytics.go similarity index 99% rename from backend/OpenFlare/plugins/server/observability/analytics.go rename to backend/OpenFlare/plugins/server/domain/observability/analytics.go index 97a1cbd5..b74a508e 100644 --- a/backend/OpenFlare/plugins/server/observability/analytics.go +++ b/backend/OpenFlare/plugins/server/domain/observability/analytics.go @@ -9,9 +9,9 @@ import ( "strings" "time" - "Wavelet/OpenFlare/plugins/server/repository" + "Wavelet/OpenFlare/plugins/server/kernel/repository" - "Wavelet/OpenFlare/plugins/server/model" + "Wavelet/OpenFlare/plugins/server/kernel/model" ) const observabilityTrendBuckets = 24 diff --git a/backend/OpenFlare/plugins/server/observability/analytics_test.go b/backend/OpenFlare/plugins/server/domain/observability/analytics_test.go similarity index 99% rename from backend/OpenFlare/plugins/server/observability/analytics_test.go rename to backend/OpenFlare/plugins/server/domain/observability/analytics_test.go index cadf9207..883d117a 100644 --- a/backend/OpenFlare/plugins/server/observability/analytics_test.go +++ b/backend/OpenFlare/plugins/server/domain/observability/analytics_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "Wavelet/OpenFlare/plugins/server/model" + "Wavelet/OpenFlare/plugins/server/kernel/model" ) func TestBuildTrafficTrendPointsFromHourlyBucketsByHour(t *testing.T) { diff --git a/backend/OpenFlare/plugins/server/observability/chwriter/dedup.go b/backend/OpenFlare/plugins/server/domain/observability/chwriter/dedup.go similarity index 100% rename from backend/OpenFlare/plugins/server/observability/chwriter/dedup.go rename to backend/OpenFlare/plugins/server/domain/observability/chwriter/dedup.go diff --git a/backend/OpenFlare/plugins/server/observability/chwriter/dedup_test.go b/backend/OpenFlare/plugins/server/domain/observability/chwriter/dedup_test.go similarity index 98% rename from backend/OpenFlare/plugins/server/observability/chwriter/dedup_test.go rename to backend/OpenFlare/plugins/server/domain/observability/chwriter/dedup_test.go index bedcaa0f..7ff3e42e 100644 --- a/backend/OpenFlare/plugins/server/observability/chwriter/dedup_test.go +++ b/backend/OpenFlare/plugins/server/domain/observability/chwriter/dedup_test.go @@ -10,7 +10,7 @@ import ( "testing" "time" - analyticsmodel "Wavelet/OpenFlare/plugins/server/model/analytics" + analyticsmodel "Wavelet/OpenFlare/plugins/server/kernel/model/analytics" "Wavelet/pkg/batchwriter" ) diff --git a/backend/OpenFlare/plugins/server/observability/chwriter/live_ch_test.go b/backend/OpenFlare/plugins/server/domain/observability/chwriter/live_ch_test.go similarity index 92% rename from backend/OpenFlare/plugins/server/observability/chwriter/live_ch_test.go rename to backend/OpenFlare/plugins/server/domain/observability/chwriter/live_ch_test.go index b5106dfd..769ae1dc 100644 --- a/backend/OpenFlare/plugins/server/observability/chwriter/live_ch_test.go +++ b/backend/OpenFlare/plugins/server/domain/observability/chwriter/live_ch_test.go @@ -10,10 +10,10 @@ import ( "testing" "time" - "Wavelet/OpenFlare/plugins/server/repository" + "Wavelet/OpenFlare/plugins/server/kernel/repository" - "Wavelet/OpenFlare/plugins/server/model" - "Wavelet/OpenFlare/plugins/server/observability/chwriter" + "Wavelet/OpenFlare/plugins/server/domain/observability/chwriter" + "Wavelet/OpenFlare/plugins/server/kernel/model" db "Wavelet/plugins/infra/database" ) diff --git a/backend/OpenFlare/plugins/server/observability/chwriter/writer.go b/backend/OpenFlare/plugins/server/domain/observability/chwriter/writer.go similarity index 98% rename from backend/OpenFlare/plugins/server/observability/chwriter/writer.go rename to backend/OpenFlare/plugins/server/domain/observability/chwriter/writer.go index ca47c3ef..f678fcd8 100644 --- a/backend/OpenFlare/plugins/server/observability/chwriter/writer.go +++ b/backend/OpenFlare/plugins/server/domain/observability/chwriter/writer.go @@ -11,8 +11,8 @@ import ( "sync" "time" - analyticsmodel "Wavelet/OpenFlare/plugins/server/model/analytics" - "Wavelet/OpenFlare/plugins/server/repository/logstore" + analyticsmodel "Wavelet/OpenFlare/plugins/server/kernel/model/analytics" + "Wavelet/OpenFlare/plugins/server/kernel/repository/logstore" "Wavelet/pkg/batchwriter" "Wavelet/pkg/logger" ) diff --git a/backend/OpenFlare/plugins/server/observability/errs.go b/backend/OpenFlare/plugins/server/domain/observability/errs.go similarity index 100% rename from backend/OpenFlare/plugins/server/observability/errs.go rename to backend/OpenFlare/plugins/server/domain/observability/errs.go diff --git a/backend/OpenFlare/plugins/server/observability/log_db_switch.go b/backend/OpenFlare/plugins/server/domain/observability/log_db_switch.go similarity index 96% rename from backend/OpenFlare/plugins/server/observability/log_db_switch.go rename to backend/OpenFlare/plugins/server/domain/observability/log_db_switch.go index 2b25fbb1..e4fb1246 100644 --- a/backend/OpenFlare/plugins/server/observability/log_db_switch.go +++ b/backend/OpenFlare/plugins/server/domain/observability/log_db_switch.go @@ -10,13 +10,13 @@ import ( "fmt" "time" - "Wavelet/OpenFlare/plugins/server/model" - analyticsmodel "Wavelet/OpenFlare/plugins/server/model/analytics" - "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/OpenFlare/plugins/server/domain/observability/chwriter" + "Wavelet/OpenFlare/plugins/server/kernel/model" + analyticsmodel "Wavelet/OpenFlare/plugins/server/kernel/model/analytics" + "Wavelet/OpenFlare/plugins/server/kernel/repository" + "Wavelet/OpenFlare/plugins/server/kernel/repository/logstore" + "Wavelet/OpenFlare/plugins/server/kernel/runtimeconfig" + "Wavelet/OpenFlare/plugins/server/kernel/task" "Wavelet/pkg/logger" ) diff --git a/backend/OpenFlare/plugins/server/observability/log_db_switch_test.go b/backend/OpenFlare/plugins/server/domain/observability/log_db_switch_test.go similarity index 97% rename from backend/OpenFlare/plugins/server/observability/log_db_switch_test.go rename to backend/OpenFlare/plugins/server/domain/observability/log_db_switch_test.go index b9c8c4b6..d63d2d1b 100644 --- a/backend/OpenFlare/plugins/server/observability/log_db_switch_test.go +++ b/backend/OpenFlare/plugins/server/domain/observability/log_db_switch_test.go @@ -18,11 +18,11 @@ import ( "gorm.io/gorm" "gorm.io/gorm/logger" - "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" + "Wavelet/OpenFlare/plugins/server/kernel/model" + analyticsmodel "Wavelet/OpenFlare/plugins/server/kernel/model/analytics" + "Wavelet/OpenFlare/plugins/server/kernel/repository" + "Wavelet/OpenFlare/plugins/server/kernel/repository/logstore" + "Wavelet/OpenFlare/plugins/server/kernel/runtimeconfig" db "Wavelet/plugins/infra/database" ) diff --git a/backend/OpenFlare/plugins/server/observability/node_logics.go b/backend/OpenFlare/plugins/server/domain/observability/node_logics.go similarity index 98% rename from backend/OpenFlare/plugins/server/observability/node_logics.go rename to backend/OpenFlare/plugins/server/domain/observability/node_logics.go index 66236b2d..1c6dc8cf 100644 --- a/backend/OpenFlare/plugins/server/observability/node_logics.go +++ b/backend/OpenFlare/plugins/server/domain/observability/node_logics.go @@ -10,9 +10,9 @@ import ( "sync" "time" - "Wavelet/OpenFlare/plugins/server/repository" + "Wavelet/OpenFlare/plugins/server/kernel/repository" - "Wavelet/OpenFlare/plugins/server/model" + "Wavelet/OpenFlare/plugins/server/kernel/model" "gorm.io/gorm" ) diff --git a/backend/OpenFlare/plugins/server/observability/query_params_test.go b/backend/OpenFlare/plugins/server/domain/observability/query_params_test.go similarity index 100% rename from backend/OpenFlare/plugins/server/observability/query_params_test.go rename to backend/OpenFlare/plugins/server/domain/observability/query_params_test.go diff --git a/backend/OpenFlare/plugins/server/observability/routers.go b/backend/OpenFlare/plugins/server/domain/observability/routers.go similarity index 99% rename from backend/OpenFlare/plugins/server/observability/routers.go rename to backend/OpenFlare/plugins/server/domain/observability/routers.go index da2f43ab..3a9877e3 100644 --- a/backend/OpenFlare/plugins/server/observability/routers.go +++ b/backend/OpenFlare/plugins/server/domain/observability/routers.go @@ -8,7 +8,7 @@ import ( "net/http" "strconv" - "Wavelet/OpenFlare/plugins/server/apiutil" + "Wavelet/OpenFlare/plugins/server/kernel/apiutil" "Wavelet/pkg/response" "github.com/gin-gonic/gin" diff --git a/backend/OpenFlare/plugins/server/option/errs.go b/backend/OpenFlare/plugins/server/domain/option/errs.go similarity index 100% rename from backend/OpenFlare/plugins/server/option/errs.go rename to backend/OpenFlare/plugins/server/domain/option/errs.go diff --git a/backend/OpenFlare/plugins/server/option/logics.go b/backend/OpenFlare/plugins/server/domain/option/logics.go similarity index 96% rename from backend/OpenFlare/plugins/server/option/logics.go rename to backend/OpenFlare/plugins/server/domain/option/logics.go index a8bf0d5f..051c743d 100644 --- a/backend/OpenFlare/plugins/server/option/logics.go +++ b/backend/OpenFlare/plugins/server/domain/option/logics.go @@ -9,10 +9,10 @@ import ( "fmt" "strings" - "Wavelet/OpenFlare/plugins/server/geoip" - "Wavelet/OpenFlare/plugins/server/model" - "Wavelet/OpenFlare/plugins/server/option/uptimekuma" - "Wavelet/OpenFlare/plugins/server/repository" + "Wavelet/OpenFlare/plugins/server/domain/option/uptimekuma" + "Wavelet/OpenFlare/plugins/server/kernel/geoip" + "Wavelet/OpenFlare/plugins/server/kernel/model" + "Wavelet/OpenFlare/plugins/server/kernel/repository" "Wavelet/pkg/buildinfo" ) diff --git a/backend/OpenFlare/plugins/server/option/logics_test.go b/backend/OpenFlare/plugins/server/domain/option/logics_test.go similarity index 96% rename from backend/OpenFlare/plugins/server/option/logics_test.go rename to backend/OpenFlare/plugins/server/domain/option/logics_test.go index 08bb6184..aa879eec 100644 --- a/backend/OpenFlare/plugins/server/option/logics_test.go +++ b/backend/OpenFlare/plugins/server/domain/option/logics_test.go @@ -7,8 +7,8 @@ import ( "context" "testing" - "Wavelet/OpenFlare/plugins/server/model" - "Wavelet/OpenFlare/plugins/server/repository" + "Wavelet/OpenFlare/plugins/server/kernel/model" + "Wavelet/OpenFlare/plugins/server/kernel/repository" db "Wavelet/plugins/infra/database" "github.com/glebarez/sqlite" diff --git a/backend/OpenFlare/plugins/server/option/openresty_validators.go b/backend/OpenFlare/plugins/server/domain/option/openresty_validators.go similarity index 99% rename from backend/OpenFlare/plugins/server/option/openresty_validators.go rename to backend/OpenFlare/plugins/server/domain/option/openresty_validators.go index 2212fad8..165d45b3 100644 --- a/backend/OpenFlare/plugins/server/option/openresty_validators.go +++ b/backend/OpenFlare/plugins/server/domain/option/openresty_validators.go @@ -10,7 +10,7 @@ import ( "strconv" "strings" - "Wavelet/OpenFlare/plugins/server/model" + "Wavelet/OpenFlare/plugins/server/kernel/model" openrestyrender "Wavelet/OpenFlare/share/render/openresty" ) diff --git a/backend/OpenFlare/plugins/server/option/openresty_validators_test.go b/backend/OpenFlare/plugins/server/domain/option/openresty_validators_test.go similarity index 98% rename from backend/OpenFlare/plugins/server/option/openresty_validators_test.go rename to backend/OpenFlare/plugins/server/domain/option/openresty_validators_test.go index d7df373c..319fd64e 100644 --- a/backend/OpenFlare/plugins/server/option/openresty_validators_test.go +++ b/backend/OpenFlare/plugins/server/domain/option/openresty_validators_test.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - "Wavelet/OpenFlare/plugins/server/model" + "Wavelet/OpenFlare/plugins/server/kernel/model" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/backend/OpenFlare/plugins/server/option/routers.go b/backend/OpenFlare/plugins/server/domain/option/routers.go similarity index 98% rename from backend/OpenFlare/plugins/server/option/routers.go rename to backend/OpenFlare/plugins/server/domain/option/routers.go index 7b1a1c78..294fd028 100644 --- a/backend/OpenFlare/plugins/server/option/routers.go +++ b/backend/OpenFlare/plugins/server/domain/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/kernel/apiutil" + "Wavelet/OpenFlare/plugins/server/kernel/model" "Wavelet/pkg/response" "github.com/gin-gonic/gin" diff --git a/backend/OpenFlare/plugins/server/option/uptimekuma/client.go b/backend/OpenFlare/plugins/server/domain/option/uptimekuma/client.go similarity index 100% rename from backend/OpenFlare/plugins/server/option/uptimekuma/client.go rename to backend/OpenFlare/plugins/server/domain/option/uptimekuma/client.go diff --git a/backend/OpenFlare/plugins/server/option/uptimekuma/sync.go b/backend/OpenFlare/plugins/server/domain/option/uptimekuma/sync.go similarity index 98% rename from backend/OpenFlare/plugins/server/option/uptimekuma/sync.go rename to backend/OpenFlare/plugins/server/domain/option/uptimekuma/sync.go index e1963c01..81d7d8a1 100644 --- a/backend/OpenFlare/plugins/server/option/uptimekuma/sync.go +++ b/backend/OpenFlare/plugins/server/domain/option/uptimekuma/sync.go @@ -11,8 +11,8 @@ import ( "strings" "sync/atomic" - "Wavelet/OpenFlare/plugins/server/model" - "Wavelet/OpenFlare/plugins/server/repository" + "Wavelet/OpenFlare/plugins/server/kernel/model" + "Wavelet/OpenFlare/plugins/server/kernel/repository" ) const uptimeKumaTagOpenFlare = "OpenFlare" diff --git a/backend/OpenFlare/plugins/server/option/uptimekuma/sync_helpers.go b/backend/OpenFlare/plugins/server/domain/option/uptimekuma/sync_helpers.go similarity index 98% rename from backend/OpenFlare/plugins/server/option/uptimekuma/sync_helpers.go rename to backend/OpenFlare/plugins/server/domain/option/uptimekuma/sync_helpers.go index f98b89ab..7f061ac0 100644 --- a/backend/OpenFlare/plugins/server/option/uptimekuma/sync_helpers.go +++ b/backend/OpenFlare/plugins/server/domain/option/uptimekuma/sync_helpers.go @@ -11,7 +11,7 @@ import ( "strings" "time" - "Wavelet/OpenFlare/plugins/server/model" + "Wavelet/OpenFlare/plugins/server/kernel/model" ) const monitorListWaitTimeout = 5 * time.Second diff --git a/backend/OpenFlare/plugins/server/option/uptimekuma/sync_test.go b/backend/OpenFlare/plugins/server/domain/option/uptimekuma/sync_test.go similarity index 99% rename from backend/OpenFlare/plugins/server/option/uptimekuma/sync_test.go rename to backend/OpenFlare/plugins/server/domain/option/uptimekuma/sync_test.go index 5b4582a7..dd7e84c5 100644 --- a/backend/OpenFlare/plugins/server/option/uptimekuma/sync_test.go +++ b/backend/OpenFlare/plugins/server/domain/option/uptimekuma/sync_test.go @@ -15,8 +15,8 @@ import ( "testing" "time" - "Wavelet/OpenFlare/plugins/server/model" - "Wavelet/OpenFlare/plugins/server/repository" + "Wavelet/OpenFlare/plugins/server/kernel/model" + "Wavelet/OpenFlare/plugins/server/kernel/repository" db "Wavelet/plugins/infra/database" "github.com/glebarez/sqlite" diff --git a/backend/OpenFlare/plugins/server/option/validate.go b/backend/OpenFlare/plugins/server/domain/option/validate.go similarity index 97% rename from backend/OpenFlare/plugins/server/option/validate.go rename to backend/OpenFlare/plugins/server/domain/option/validate.go index 0e203f1a..33f0e433 100644 --- a/backend/OpenFlare/plugins/server/option/validate.go +++ b/backend/OpenFlare/plugins/server/domain/option/validate.go @@ -11,9 +11,9 @@ import ( "strconv" "strings" - "Wavelet/OpenFlare/plugins/server/geoip" - "Wavelet/OpenFlare/plugins/server/model" - "Wavelet/OpenFlare/plugins/server/repository" + "Wavelet/OpenFlare/plugins/server/kernel/geoip" + "Wavelet/OpenFlare/plugins/server/kernel/model" + "Wavelet/OpenFlare/plugins/server/kernel/repository" ) const maxOpenRestyGzipCompLevel = 9 diff --git a/backend/OpenFlare/plugins/server/pages/download_url.go b/backend/OpenFlare/plugins/server/domain/pages/download_url.go similarity index 100% rename from backend/OpenFlare/plugins/server/pages/download_url.go rename to backend/OpenFlare/plugins/server/domain/pages/download_url.go diff --git a/backend/OpenFlare/plugins/server/pages/download_url_test.go b/backend/OpenFlare/plugins/server/domain/pages/download_url_test.go similarity index 100% rename from backend/OpenFlare/plugins/server/pages/download_url_test.go rename to backend/OpenFlare/plugins/server/domain/pages/download_url_test.go diff --git a/backend/OpenFlare/plugins/server/pages/errs.go b/backend/OpenFlare/plugins/server/domain/pages/errs.go similarity index 100% rename from backend/OpenFlare/plugins/server/pages/errs.go rename to backend/OpenFlare/plugins/server/domain/pages/errs.go diff --git a/backend/OpenFlare/plugins/server/pages/github_source.go b/backend/OpenFlare/plugins/server/domain/pages/github_source.go similarity index 99% rename from backend/OpenFlare/plugins/server/pages/github_source.go rename to backend/OpenFlare/plugins/server/domain/pages/github_source.go index 4da3958d..3e17409b 100644 --- a/backend/OpenFlare/plugins/server/pages/github_source.go +++ b/backend/OpenFlare/plugins/server/domain/pages/github_source.go @@ -17,8 +17,8 @@ import ( "unicode" "unicode/utf8" - "Wavelet/OpenFlare/plugins/server/model" - "Wavelet/OpenFlare/plugins/server/repository" + "Wavelet/OpenFlare/plugins/server/kernel/model" + "Wavelet/OpenFlare/plugins/server/kernel/repository" "Wavelet/pkg/logger" "gorm.io/gorm" diff --git a/backend/OpenFlare/plugins/server/pages/github_source_action.go b/backend/OpenFlare/plugins/server/domain/pages/github_source_action.go similarity index 99% rename from backend/OpenFlare/plugins/server/pages/github_source_action.go rename to backend/OpenFlare/plugins/server/domain/pages/github_source_action.go index 318fdf04..a4eeacf0 100644 --- a/backend/OpenFlare/plugins/server/pages/github_source_action.go +++ b/backend/OpenFlare/plugins/server/domain/pages/github_source_action.go @@ -13,10 +13,10 @@ import ( "strings" "time" - "Wavelet/OpenFlare/plugins/server/integration/githubrelease" - "Wavelet/OpenFlare/plugins/server/model" - "Wavelet/OpenFlare/plugins/server/repository" - "Wavelet/OpenFlare/plugins/server/task" + "Wavelet/OpenFlare/plugins/server/kernel/githubrelease" + "Wavelet/OpenFlare/plugins/server/kernel/model" + "Wavelet/OpenFlare/plugins/server/kernel/repository" + "Wavelet/OpenFlare/plugins/server/kernel/task" "Wavelet/OpenFlare/share/pagesarchive" "Wavelet/pkg/logger" diff --git a/backend/OpenFlare/plugins/server/pages/github_source_identity_test.go b/backend/OpenFlare/plugins/server/domain/pages/github_source_identity_test.go similarity index 98% rename from backend/OpenFlare/plugins/server/pages/github_source_identity_test.go rename to backend/OpenFlare/plugins/server/domain/pages/github_source_identity_test.go index 32ab9066..6f1282d9 100644 --- a/backend/OpenFlare/plugins/server/pages/github_source_identity_test.go +++ b/backend/OpenFlare/plugins/server/domain/pages/github_source_identity_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "Wavelet/OpenFlare/plugins/server/model" + "Wavelet/OpenFlare/plugins/server/kernel/model" db "Wavelet/plugins/infra/database" ) diff --git a/backend/OpenFlare/plugins/server/pages/github_source_test.go b/backend/OpenFlare/plugins/server/domain/pages/github_source_test.go similarity index 99% rename from backend/OpenFlare/plugins/server/pages/github_source_test.go rename to backend/OpenFlare/plugins/server/domain/pages/github_source_test.go index 7bca710a..b54ac12a 100644 --- a/backend/OpenFlare/plugins/server/pages/github_source_test.go +++ b/backend/OpenFlare/plugins/server/domain/pages/github_source_test.go @@ -16,11 +16,11 @@ import ( "testing" "time" - "Wavelet/OpenFlare/plugins/server/repository" + "Wavelet/OpenFlare/plugins/server/kernel/repository" - "Wavelet/OpenFlare/plugins/server/integration/githubrelease" - "Wavelet/OpenFlare/plugins/server/model" - "Wavelet/OpenFlare/plugins/server/task" + "Wavelet/OpenFlare/plugins/server/kernel/githubrelease" + "Wavelet/OpenFlare/plugins/server/kernel/model" + "Wavelet/OpenFlare/plugins/server/kernel/task" db "Wavelet/plugins/infra/database" "github.com/hibiken/asynq" diff --git a/backend/OpenFlare/plugins/server/pages/helpers.go b/backend/OpenFlare/plugins/server/domain/pages/helpers.go similarity index 98% rename from backend/OpenFlare/plugins/server/pages/helpers.go rename to backend/OpenFlare/plugins/server/domain/pages/helpers.go index 3fbbbffc..6c0d8a0b 100644 --- a/backend/OpenFlare/plugins/server/pages/helpers.go +++ b/backend/OpenFlare/plugins/server/domain/pages/helpers.go @@ -18,9 +18,9 @@ import ( "strconv" "strings" - "Wavelet/OpenFlare/plugins/server/model" - "Wavelet/OpenFlare/plugins/server/ofupload" - "Wavelet/OpenFlare/plugins/server/repository" + "Wavelet/OpenFlare/plugins/server/kernel/model" + "Wavelet/OpenFlare/plugins/server/kernel/ofupload" + "Wavelet/OpenFlare/plugins/server/kernel/repository" "Wavelet/OpenFlare/share/pagesarchive" "Wavelet/pkg/logger" diff --git a/backend/OpenFlare/plugins/server/pages/logics.go b/backend/OpenFlare/plugins/server/domain/pages/logics.go similarity index 99% rename from backend/OpenFlare/plugins/server/pages/logics.go rename to backend/OpenFlare/plugins/server/domain/pages/logics.go index 3684ee2c..f5b25a0a 100644 --- a/backend/OpenFlare/plugins/server/pages/logics.go +++ b/backend/OpenFlare/plugins/server/domain/pages/logics.go @@ -16,9 +16,9 @@ import ( "strings" "time" - "Wavelet/OpenFlare/plugins/server/model" - "Wavelet/OpenFlare/plugins/server/ofupload" - "Wavelet/OpenFlare/plugins/server/repository" + "Wavelet/OpenFlare/plugins/server/kernel/model" + "Wavelet/OpenFlare/plugins/server/kernel/ofupload" + "Wavelet/OpenFlare/plugins/server/kernel/repository" "Wavelet/OpenFlare/share/pagesarchive" "Wavelet/pkg/logger" diff --git a/backend/OpenFlare/plugins/server/pages/logics_test.go b/backend/OpenFlare/plugins/server/domain/pages/logics_test.go similarity index 99% rename from backend/OpenFlare/plugins/server/pages/logics_test.go rename to backend/OpenFlare/plugins/server/domain/pages/logics_test.go index 9aa3037e..48d894ab 100644 --- a/backend/OpenFlare/plugins/server/pages/logics_test.go +++ b/backend/OpenFlare/plugins/server/domain/pages/logics_test.go @@ -17,11 +17,11 @@ import ( "path/filepath" "testing" - "Wavelet/OpenFlare/plugins/server/model" - "Wavelet/OpenFlare/plugins/server/ofupload" - "Wavelet/OpenFlare/plugins/server/repository" - oftask "Wavelet/OpenFlare/plugins/server/task" - "Wavelet/OpenFlare/plugins/server/testhelper" + "Wavelet/OpenFlare/plugins/server/kernel/model" + "Wavelet/OpenFlare/plugins/server/kernel/ofupload" + "Wavelet/OpenFlare/plugins/server/kernel/repository" + oftask "Wavelet/OpenFlare/plugins/server/kernel/task" + "Wavelet/OpenFlare/plugins/server/kernel/testhelper" "Wavelet/pkg/idgen" uploadshared "Wavelet/plugins/domain/upload/shared" db "Wavelet/plugins/infra/database" diff --git a/backend/OpenFlare/plugins/server/pages/package_metadata.go b/backend/OpenFlare/plugins/server/domain/pages/package_metadata.go similarity index 93% rename from backend/OpenFlare/plugins/server/pages/package_metadata.go rename to backend/OpenFlare/plugins/server/domain/pages/package_metadata.go index 7dc5cc06..e1272704 100644 --- a/backend/OpenFlare/plugins/server/pages/package_metadata.go +++ b/backend/OpenFlare/plugins/server/domain/pages/package_metadata.go @@ -9,9 +9,9 @@ import ( "fmt" "strings" - "Wavelet/OpenFlare/plugins/server/repository" + "Wavelet/OpenFlare/plugins/server/kernel/repository" - "Wavelet/OpenFlare/plugins/server/ofupload" + "Wavelet/OpenFlare/plugins/server/kernel/ofupload" ) // ProjectLatestPackageMetadata describes the active package limits published to Agents. diff --git a/backend/OpenFlare/plugins/server/pages/package_metadata_test.go b/backend/OpenFlare/plugins/server/domain/pages/package_metadata_test.go similarity index 97% rename from backend/OpenFlare/plugins/server/pages/package_metadata_test.go rename to backend/OpenFlare/plugins/server/domain/pages/package_metadata_test.go index f52a45fd..2cc0b64b 100644 --- a/backend/OpenFlare/plugins/server/pages/package_metadata_test.go +++ b/backend/OpenFlare/plugins/server/domain/pages/package_metadata_test.go @@ -10,7 +10,7 @@ import ( "fmt" "testing" - "Wavelet/OpenFlare/plugins/server/model" + "Wavelet/OpenFlare/plugins/server/kernel/model" db "Wavelet/plugins/infra/database" ) diff --git a/backend/OpenFlare/plugins/server/pages/rebind.go b/backend/OpenFlare/plugins/server/domain/pages/rebind.go similarity index 98% rename from backend/OpenFlare/plugins/server/pages/rebind.go rename to backend/OpenFlare/plugins/server/domain/pages/rebind.go index d357593d..51dc7935 100644 --- a/backend/OpenFlare/plugins/server/pages/rebind.go +++ b/backend/OpenFlare/plugins/server/domain/pages/rebind.go @@ -11,9 +11,9 @@ import ( "path" "strings" - "Wavelet/OpenFlare/plugins/server/repository" + "Wavelet/OpenFlare/plugins/server/kernel/repository" - "Wavelet/OpenFlare/plugins/server/model" + "Wavelet/OpenFlare/plugins/server/kernel/model" openrestyrender "Wavelet/OpenFlare/share/render/openresty" "gorm.io/gorm" diff --git a/backend/OpenFlare/plugins/server/pages/rebind_test.go b/backend/OpenFlare/plugins/server/domain/pages/rebind_test.go similarity index 98% rename from backend/OpenFlare/plugins/server/pages/rebind_test.go rename to backend/OpenFlare/plugins/server/domain/pages/rebind_test.go index b237489c..f54a15f8 100644 --- a/backend/OpenFlare/plugins/server/pages/rebind_test.go +++ b/backend/OpenFlare/plugins/server/domain/pages/rebind_test.go @@ -8,7 +8,7 @@ import ( "encoding/json" "testing" - "Wavelet/OpenFlare/plugins/server/model" + "Wavelet/OpenFlare/plugins/server/kernel/model" db "Wavelet/plugins/infra/database" "github.com/stretchr/testify/assert" diff --git a/backend/OpenFlare/plugins/server/pages/routers.go b/backend/OpenFlare/plugins/server/domain/pages/routers.go similarity index 99% rename from backend/OpenFlare/plugins/server/pages/routers.go rename to backend/OpenFlare/plugins/server/domain/pages/routers.go index 597cfabb..2c0e8c0a 100644 --- a/backend/OpenFlare/plugins/server/pages/routers.go +++ b/backend/OpenFlare/plugins/server/domain/pages/routers.go @@ -11,7 +11,7 @@ import ( "net/http" "strconv" - "Wavelet/OpenFlare/plugins/server/apiutil" + "Wavelet/OpenFlare/plugins/server/kernel/apiutil" "Wavelet/core/contracts" "Wavelet/pkg/logger" "Wavelet/pkg/response" diff --git a/backend/OpenFlare/plugins/server/pages/routers_source_test.go b/backend/OpenFlare/plugins/server/domain/pages/routers_source_test.go similarity index 98% rename from backend/OpenFlare/plugins/server/pages/routers_source_test.go rename to backend/OpenFlare/plugins/server/domain/pages/routers_source_test.go index d693bd15..ee9769b2 100644 --- a/backend/OpenFlare/plugins/server/pages/routers_source_test.go +++ b/backend/OpenFlare/plugins/server/domain/pages/routers_source_test.go @@ -13,8 +13,8 @@ import ( "testing" "time" - "Wavelet/OpenFlare/plugins/server/model" - "Wavelet/OpenFlare/plugins/server/testhelper" + "Wavelet/OpenFlare/plugins/server/kernel/model" + "Wavelet/OpenFlare/plugins/server/kernel/testhelper" "Wavelet/core/contracts" db "Wavelet/plugins/infra/database" diff --git a/backend/OpenFlare/plugins/server/pages/routers_test.go b/backend/OpenFlare/plugins/server/domain/pages/routers_test.go similarity index 98% rename from backend/OpenFlare/plugins/server/pages/routers_test.go rename to backend/OpenFlare/plugins/server/domain/pages/routers_test.go index 69849ea3..3c5f582c 100644 --- a/backend/OpenFlare/plugins/server/pages/routers_test.go +++ b/backend/OpenFlare/plugins/server/domain/pages/routers_test.go @@ -13,7 +13,7 @@ import ( "strconv" "testing" - "Wavelet/OpenFlare/plugins/server/repository" + "Wavelet/OpenFlare/plugins/server/kernel/repository" "Wavelet/core/contracts" "github.com/gin-gonic/gin" diff --git a/backend/OpenFlare/plugins/server/pages/source.go b/backend/OpenFlare/plugins/server/domain/pages/source.go similarity index 99% rename from backend/OpenFlare/plugins/server/pages/source.go rename to backend/OpenFlare/plugins/server/domain/pages/source.go index c5e8bb8b..842be117 100644 --- a/backend/OpenFlare/plugins/server/pages/source.go +++ b/backend/OpenFlare/plugins/server/domain/pages/source.go @@ -15,8 +15,8 @@ import ( "strings" "time" - "Wavelet/OpenFlare/plugins/server/model" - "Wavelet/OpenFlare/plugins/server/repository" + "Wavelet/OpenFlare/plugins/server/kernel/model" + "Wavelet/OpenFlare/plugins/server/kernel/repository" "gorm.io/gorm" ) diff --git a/backend/OpenFlare/plugins/server/pages/source_manual_test_helpers_test.go b/backend/OpenFlare/plugins/server/domain/pages/source_manual_test_helpers_test.go similarity index 92% rename from backend/OpenFlare/plugins/server/pages/source_manual_test_helpers_test.go rename to backend/OpenFlare/plugins/server/domain/pages/source_manual_test_helpers_test.go index ec888146..cf4236d4 100644 --- a/backend/OpenFlare/plugins/server/pages/source_manual_test_helpers_test.go +++ b/backend/OpenFlare/plugins/server/domain/pages/source_manual_test_helpers_test.go @@ -7,8 +7,8 @@ import ( "context" "time" - "Wavelet/OpenFlare/plugins/server/model" - "Wavelet/OpenFlare/plugins/server/ofupload" + "Wavelet/OpenFlare/plugins/server/kernel/model" + "Wavelet/OpenFlare/plugins/server/kernel/ofupload" ) func syncRemoteSource( diff --git a/backend/OpenFlare/plugins/server/pages/source_orphan_cleanup.go b/backend/OpenFlare/plugins/server/domain/pages/source_orphan_cleanup.go similarity index 98% rename from backend/OpenFlare/plugins/server/pages/source_orphan_cleanup.go rename to backend/OpenFlare/plugins/server/domain/pages/source_orphan_cleanup.go index 3a87d2d7..d16d5405 100644 --- a/backend/OpenFlare/plugins/server/pages/source_orphan_cleanup.go +++ b/backend/OpenFlare/plugins/server/domain/pages/source_orphan_cleanup.go @@ -10,9 +10,9 @@ import ( "strconv" "time" - "Wavelet/OpenFlare/plugins/server/model" - "Wavelet/OpenFlare/plugins/server/ofupload" - "Wavelet/OpenFlare/plugins/server/repository" + "Wavelet/OpenFlare/plugins/server/kernel/model" + "Wavelet/OpenFlare/plugins/server/kernel/ofupload" + "Wavelet/OpenFlare/plugins/server/kernel/repository" "Wavelet/pkg/logger" "gorm.io/gorm" diff --git a/backend/OpenFlare/plugins/server/pages/source_orphan_cleanup_test.go b/backend/OpenFlare/plugins/server/domain/pages/source_orphan_cleanup_test.go similarity index 99% rename from backend/OpenFlare/plugins/server/pages/source_orphan_cleanup_test.go rename to backend/OpenFlare/plugins/server/domain/pages/source_orphan_cleanup_test.go index a6291dc0..fa3a80ea 100644 --- a/backend/OpenFlare/plugins/server/pages/source_orphan_cleanup_test.go +++ b/backend/OpenFlare/plugins/server/domain/pages/source_orphan_cleanup_test.go @@ -10,8 +10,8 @@ import ( "testing" "time" - "Wavelet/OpenFlare/plugins/server/model" - "Wavelet/OpenFlare/plugins/server/ofupload" + "Wavelet/OpenFlare/plugins/server/kernel/model" + "Wavelet/OpenFlare/plugins/server/kernel/ofupload" db "Wavelet/plugins/infra/database" "gorm.io/gorm" diff --git a/backend/OpenFlare/plugins/server/pages/source_provider.go b/backend/OpenFlare/plugins/server/domain/pages/source_provider.go similarity index 100% rename from backend/OpenFlare/plugins/server/pages/source_provider.go rename to backend/OpenFlare/plugins/server/domain/pages/source_provider.go diff --git a/backend/OpenFlare/plugins/server/pages/source_provider_test.go b/backend/OpenFlare/plugins/server/domain/pages/source_provider_test.go similarity index 100% rename from backend/OpenFlare/plugins/server/pages/source_provider_test.go rename to backend/OpenFlare/plugins/server/domain/pages/source_provider_test.go diff --git a/backend/OpenFlare/plugins/server/pages/source_runtime.go b/backend/OpenFlare/plugins/server/domain/pages/source_runtime.go similarity index 99% rename from backend/OpenFlare/plugins/server/pages/source_runtime.go rename to backend/OpenFlare/plugins/server/domain/pages/source_runtime.go index 6056b671..adb7229b 100644 --- a/backend/OpenFlare/plugins/server/pages/source_runtime.go +++ b/backend/OpenFlare/plugins/server/domain/pages/source_runtime.go @@ -11,8 +11,8 @@ import ( "strings" "time" - "Wavelet/OpenFlare/plugins/server/model" - "Wavelet/OpenFlare/plugins/server/repository" + "Wavelet/OpenFlare/plugins/server/kernel/model" + "Wavelet/OpenFlare/plugins/server/kernel/repository" "gorm.io/gorm" ) diff --git a/backend/OpenFlare/plugins/server/pages/source_runtime_test.go b/backend/OpenFlare/plugins/server/domain/pages/source_runtime_test.go similarity index 99% rename from backend/OpenFlare/plugins/server/pages/source_runtime_test.go rename to backend/OpenFlare/plugins/server/domain/pages/source_runtime_test.go index ac3ffc83..e808476e 100644 --- a/backend/OpenFlare/plugins/server/pages/source_runtime_test.go +++ b/backend/OpenFlare/plugins/server/domain/pages/source_runtime_test.go @@ -10,9 +10,9 @@ import ( "testing" "time" - "Wavelet/OpenFlare/plugins/server/repository" + "Wavelet/OpenFlare/plugins/server/kernel/repository" - "Wavelet/OpenFlare/plugins/server/model" + "Wavelet/OpenFlare/plugins/server/kernel/model" db "Wavelet/plugins/infra/database" ) diff --git a/backend/OpenFlare/plugins/server/pages/source_scanner.go b/backend/OpenFlare/plugins/server/domain/pages/source_scanner.go similarity index 98% rename from backend/OpenFlare/plugins/server/pages/source_scanner.go rename to backend/OpenFlare/plugins/server/domain/pages/source_scanner.go index 2e83cf10..18d8031c 100644 --- a/backend/OpenFlare/plugins/server/pages/source_scanner.go +++ b/backend/OpenFlare/plugins/server/domain/pages/source_scanner.go @@ -11,9 +11,9 @@ import ( "fmt" "time" - "Wavelet/OpenFlare/plugins/server/model" - "Wavelet/OpenFlare/plugins/server/repository" - "Wavelet/OpenFlare/plugins/server/task" + "Wavelet/OpenFlare/plugins/server/kernel/model" + "Wavelet/OpenFlare/plugins/server/kernel/repository" + "Wavelet/OpenFlare/plugins/server/kernel/task" "Wavelet/pkg/logger" ) diff --git a/backend/OpenFlare/plugins/server/pages/source_scanner_test.go b/backend/OpenFlare/plugins/server/domain/pages/source_scanner_test.go similarity index 99% rename from backend/OpenFlare/plugins/server/pages/source_scanner_test.go rename to backend/OpenFlare/plugins/server/domain/pages/source_scanner_test.go index 5f814c39..bc4de159 100644 --- a/backend/OpenFlare/plugins/server/pages/source_scanner_test.go +++ b/backend/OpenFlare/plugins/server/domain/pages/source_scanner_test.go @@ -16,10 +16,10 @@ import ( "testing" "time" - "Wavelet/OpenFlare/plugins/server/repository" + "Wavelet/OpenFlare/plugins/server/kernel/repository" - "Wavelet/OpenFlare/plugins/server/integration/githubrelease" - "Wavelet/OpenFlare/plugins/server/model" + "Wavelet/OpenFlare/plugins/server/kernel/githubrelease" + "Wavelet/OpenFlare/plugins/server/kernel/model" db "Wavelet/plugins/infra/database" "gorm.io/gorm" diff --git a/backend/OpenFlare/plugins/server/pages/source_sync.go b/backend/OpenFlare/plugins/server/domain/pages/source_sync.go similarity index 99% rename from backend/OpenFlare/plugins/server/pages/source_sync.go rename to backend/OpenFlare/plugins/server/domain/pages/source_sync.go index 052b1aea..a55296ea 100644 --- a/backend/OpenFlare/plugins/server/pages/source_sync.go +++ b/backend/OpenFlare/plugins/server/domain/pages/source_sync.go @@ -15,10 +15,10 @@ import ( "time" "unicode/utf8" - "Wavelet/OpenFlare/plugins/server/model" - "Wavelet/OpenFlare/plugins/server/ofupload" - "Wavelet/OpenFlare/plugins/server/repository" - "Wavelet/OpenFlare/plugins/server/task" + "Wavelet/OpenFlare/plugins/server/kernel/model" + "Wavelet/OpenFlare/plugins/server/kernel/ofupload" + "Wavelet/OpenFlare/plugins/server/kernel/repository" + "Wavelet/OpenFlare/plugins/server/kernel/task" "Wavelet/pkg/logger" "Wavelet/pkg/util" diff --git a/backend/OpenFlare/plugins/server/pages/source_sync_test.go b/backend/OpenFlare/plugins/server/domain/pages/source_sync_test.go similarity index 99% rename from backend/OpenFlare/plugins/server/pages/source_sync_test.go rename to backend/OpenFlare/plugins/server/domain/pages/source_sync_test.go index 1348e98a..d0e11ab4 100644 --- a/backend/OpenFlare/plugins/server/pages/source_sync_test.go +++ b/backend/OpenFlare/plugins/server/domain/pages/source_sync_test.go @@ -17,10 +17,10 @@ import ( "testing" "time" - "Wavelet/OpenFlare/plugins/server/repository" + "Wavelet/OpenFlare/plugins/server/kernel/repository" - "Wavelet/OpenFlare/plugins/server/model" - "Wavelet/OpenFlare/plugins/server/ofupload" + "Wavelet/OpenFlare/plugins/server/kernel/model" + "Wavelet/OpenFlare/plugins/server/kernel/ofupload" "Wavelet/OpenFlare/share/pagesarchive" db "Wavelet/plugins/infra/database" diff --git a/backend/OpenFlare/plugins/server/pages/source_tasks.go b/backend/OpenFlare/plugins/server/domain/pages/source_tasks.go similarity index 98% rename from backend/OpenFlare/plugins/server/pages/source_tasks.go rename to backend/OpenFlare/plugins/server/domain/pages/source_tasks.go index 0b3bdc80..870d0160 100644 --- a/backend/OpenFlare/plugins/server/pages/source_tasks.go +++ b/backend/OpenFlare/plugins/server/domain/pages/source_tasks.go @@ -13,9 +13,9 @@ import ( "strconv" "strings" - "Wavelet/OpenFlare/plugins/server/model" - "Wavelet/OpenFlare/plugins/server/repository" - "Wavelet/OpenFlare/plugins/server/task" + "Wavelet/OpenFlare/plugins/server/kernel/model" + "Wavelet/OpenFlare/plugins/server/kernel/repository" + "Wavelet/OpenFlare/plugins/server/kernel/task" "Wavelet/pkg/logger" "gorm.io/gorm" diff --git a/backend/OpenFlare/plugins/server/pages/source_tasks_test.go b/backend/OpenFlare/plugins/server/domain/pages/source_tasks_test.go similarity index 100% rename from backend/OpenFlare/plugins/server/pages/source_tasks_test.go rename to backend/OpenFlare/plugins/server/domain/pages/source_tasks_test.go diff --git a/backend/OpenFlare/plugins/server/pages/source_test.go b/backend/OpenFlare/plugins/server/domain/pages/source_test.go similarity index 99% rename from backend/OpenFlare/plugins/server/pages/source_test.go rename to backend/OpenFlare/plugins/server/domain/pages/source_test.go index 89114331..b9949202 100644 --- a/backend/OpenFlare/plugins/server/pages/source_test.go +++ b/backend/OpenFlare/plugins/server/domain/pages/source_test.go @@ -10,9 +10,9 @@ import ( "testing" "time" - "Wavelet/OpenFlare/plugins/server/repository" + "Wavelet/OpenFlare/plugins/server/kernel/repository" - "Wavelet/OpenFlare/plugins/server/model" + "Wavelet/OpenFlare/plugins/server/kernel/model" db "Wavelet/plugins/infra/database" ) diff --git a/backend/OpenFlare/plugins/server/site/apply_log/errs.go b/backend/OpenFlare/plugins/server/domain/site/apply_log/errs.go similarity index 100% rename from backend/OpenFlare/plugins/server/site/apply_log/errs.go rename to backend/OpenFlare/plugins/server/domain/site/apply_log/errs.go diff --git a/backend/OpenFlare/plugins/server/site/apply_log/logics.go b/backend/OpenFlare/plugins/server/domain/site/apply_log/logics.go similarity index 96% rename from backend/OpenFlare/plugins/server/site/apply_log/logics.go rename to backend/OpenFlare/plugins/server/domain/site/apply_log/logics.go index ad244f2b..d079e7fb 100644 --- a/backend/OpenFlare/plugins/server/site/apply_log/logics.go +++ b/backend/OpenFlare/plugins/server/domain/site/apply_log/logics.go @@ -9,9 +9,9 @@ import ( "strings" "time" - "Wavelet/OpenFlare/plugins/server/repository" + "Wavelet/OpenFlare/plugins/server/kernel/repository" - "Wavelet/OpenFlare/plugins/server/model" + "Wavelet/OpenFlare/plugins/server/kernel/model" ) const ( diff --git a/backend/OpenFlare/plugins/server/site/apply_log/logics_test.go b/backend/OpenFlare/plugins/server/domain/site/apply_log/logics_test.go similarity index 96% rename from backend/OpenFlare/plugins/server/site/apply_log/logics_test.go rename to backend/OpenFlare/plugins/server/domain/site/apply_log/logics_test.go index 3ab89b69..64a98b54 100644 --- a/backend/OpenFlare/plugins/server/site/apply_log/logics_test.go +++ b/backend/OpenFlare/plugins/server/domain/site/apply_log/logics_test.go @@ -8,9 +8,9 @@ import ( "testing" "time" - "Wavelet/OpenFlare/plugins/server/repository" + "Wavelet/OpenFlare/plugins/server/kernel/repository" - "Wavelet/OpenFlare/plugins/server/model" + "Wavelet/OpenFlare/plugins/server/kernel/model" db "Wavelet/plugins/infra/database" "github.com/glebarez/sqlite" diff --git a/backend/OpenFlare/plugins/server/site/apply_log/routers.go b/backend/OpenFlare/plugins/server/domain/site/apply_log/routers.go similarity index 97% rename from backend/OpenFlare/plugins/server/site/apply_log/routers.go rename to backend/OpenFlare/plugins/server/domain/site/apply_log/routers.go index 0eae2642..6cf7f165 100644 --- a/backend/OpenFlare/plugins/server/site/apply_log/routers.go +++ b/backend/OpenFlare/plugins/server/domain/site/apply_log/routers.go @@ -7,7 +7,7 @@ import ( "net/http" "strconv" - "Wavelet/OpenFlare/plugins/server/apiutil" + "Wavelet/OpenFlare/plugins/server/kernel/apiutil" "Wavelet/pkg/response" "github.com/gin-gonic/gin" diff --git a/backend/OpenFlare/plugins/server/site/config_version/certificate_snapshot_test.go b/backend/OpenFlare/plugins/server/domain/site/config_version/certificate_snapshot_test.go similarity index 95% rename from backend/OpenFlare/plugins/server/site/config_version/certificate_snapshot_test.go rename to backend/OpenFlare/plugins/server/domain/site/config_version/certificate_snapshot_test.go index c2c26f26..d62f47b9 100644 --- a/backend/OpenFlare/plugins/server/site/config_version/certificate_snapshot_test.go +++ b/backend/OpenFlare/plugins/server/domain/site/config_version/certificate_snapshot_test.go @@ -15,11 +15,11 @@ import ( "testing" "time" - "Wavelet/OpenFlare/plugins/server/repository" + "Wavelet/OpenFlare/plugins/server/kernel/repository" - "Wavelet/OpenFlare/plugins/server/model" - "Wavelet/OpenFlare/plugins/server/runtimeconfig" - oftls "Wavelet/OpenFlare/plugins/server/tls" + oftls "Wavelet/OpenFlare/plugins/server/domain/tls" + "Wavelet/OpenFlare/plugins/server/kernel/model" + "Wavelet/OpenFlare/plugins/server/kernel/runtimeconfig" db "Wavelet/plugins/infra/database" "github.com/stretchr/testify/assert" diff --git a/backend/OpenFlare/plugins/server/site/config_version/errs.go b/backend/OpenFlare/plugins/server/domain/site/config_version/errs.go similarity index 100% rename from backend/OpenFlare/plugins/server/site/config_version/errs.go rename to backend/OpenFlare/plugins/server/domain/site/config_version/errs.go diff --git a/backend/OpenFlare/plugins/server/site/config_version/helpers.go b/backend/OpenFlare/plugins/server/domain/site/config_version/helpers.go similarity index 98% rename from backend/OpenFlare/plugins/server/site/config_version/helpers.go rename to backend/OpenFlare/plugins/server/domain/site/config_version/helpers.go index 2b277d55..c23087d5 100644 --- a/backend/OpenFlare/plugins/server/site/config_version/helpers.go +++ b/backend/OpenFlare/plugins/server/domain/site/config_version/helpers.go @@ -12,9 +12,9 @@ import ( "strconv" "strings" - "Wavelet/OpenFlare/plugins/server/repository" + "Wavelet/OpenFlare/plugins/server/kernel/repository" - "Wavelet/OpenFlare/plugins/server/model" + "Wavelet/OpenFlare/plugins/server/kernel/model" ) type customHeaderInput struct { diff --git a/backend/OpenFlare/plugins/server/site/config_version/logics.go b/backend/OpenFlare/plugins/server/domain/site/config_version/logics.go similarity index 99% rename from backend/OpenFlare/plugins/server/site/config_version/logics.go rename to backend/OpenFlare/plugins/server/domain/site/config_version/logics.go index 6228103a..f9dd98b8 100644 --- a/backend/OpenFlare/plugins/server/site/config_version/logics.go +++ b/backend/OpenFlare/plugins/server/domain/site/config_version/logics.go @@ -14,10 +14,10 @@ import ( "strings" "time" - "Wavelet/OpenFlare/plugins/server/repository" + "Wavelet/OpenFlare/plugins/server/kernel/repository" - "Wavelet/OpenFlare/plugins/server/fleet/websocket" - "Wavelet/OpenFlare/plugins/server/model" + "Wavelet/OpenFlare/plugins/server/domain/fleet/websocket" + "Wavelet/OpenFlare/plugins/server/kernel/model" pkgprotocol "Wavelet/OpenFlare/share/protocol" openrestyrender "Wavelet/OpenFlare/share/render/openresty" diff --git a/backend/OpenFlare/plugins/server/site/config_version/logics_test.go b/backend/OpenFlare/plugins/server/domain/site/config_version/logics_test.go similarity index 98% rename from backend/OpenFlare/plugins/server/site/config_version/logics_test.go rename to backend/OpenFlare/plugins/server/domain/site/config_version/logics_test.go index 094d3657..f63640d2 100644 --- a/backend/OpenFlare/plugins/server/site/config_version/logics_test.go +++ b/backend/OpenFlare/plugins/server/domain/site/config_version/logics_test.go @@ -10,10 +10,10 @@ import ( "testing" "time" - "Wavelet/OpenFlare/plugins/server/repository" + "Wavelet/OpenFlare/plugins/server/kernel/repository" - "Wavelet/OpenFlare/plugins/server/model" - "Wavelet/OpenFlare/plugins/server/waf" + "Wavelet/OpenFlare/plugins/server/domain/waf" + "Wavelet/OpenFlare/plugins/server/kernel/model" openrestyrender "Wavelet/OpenFlare/share/render/openresty" "Wavelet/pkg/cache/ram" db "Wavelet/plugins/infra/database" diff --git a/backend/OpenFlare/plugins/server/site/config_version/origin_error_page_snapshot_test.go b/backend/OpenFlare/plugins/server/domain/site/config_version/origin_error_page_snapshot_test.go similarity index 98% rename from backend/OpenFlare/plugins/server/site/config_version/origin_error_page_snapshot_test.go rename to backend/OpenFlare/plugins/server/domain/site/config_version/origin_error_page_snapshot_test.go index 91379115..660244ef 100644 --- a/backend/OpenFlare/plugins/server/site/config_version/origin_error_page_snapshot_test.go +++ b/backend/OpenFlare/plugins/server/domain/site/config_version/origin_error_page_snapshot_test.go @@ -8,7 +8,7 @@ import ( "encoding/json" "testing" - "Wavelet/OpenFlare/plugins/server/model" + "Wavelet/OpenFlare/plugins/server/kernel/model" "Wavelet/pkg/cache/ram" db "Wavelet/plugins/infra/database" diff --git a/backend/OpenFlare/plugins/server/site/config_version/pages_snapshot.go b/backend/OpenFlare/plugins/server/domain/site/config_version/pages_snapshot.go similarity index 97% rename from backend/OpenFlare/plugins/server/site/config_version/pages_snapshot.go rename to backend/OpenFlare/plugins/server/domain/site/config_version/pages_snapshot.go index 587f7957..6b1211c7 100644 --- a/backend/OpenFlare/plugins/server/site/config_version/pages_snapshot.go +++ b/backend/OpenFlare/plugins/server/domain/site/config_version/pages_snapshot.go @@ -10,9 +10,9 @@ import ( "path" "strings" - "Wavelet/OpenFlare/plugins/server/repository" + "Wavelet/OpenFlare/plugins/server/kernel/repository" - "Wavelet/OpenFlare/plugins/server/model" + "Wavelet/OpenFlare/plugins/server/kernel/model" "Wavelet/OpenFlare/share/pagesarchive" openrestyrender "Wavelet/OpenFlare/share/render/openresty" diff --git a/backend/OpenFlare/plugins/server/site/config_version/pages_snapshot_test.go b/backend/OpenFlare/plugins/server/domain/site/config_version/pages_snapshot_test.go similarity index 96% rename from backend/OpenFlare/plugins/server/site/config_version/pages_snapshot_test.go rename to backend/OpenFlare/plugins/server/domain/site/config_version/pages_snapshot_test.go index dc477f0c..85828a8f 100644 --- a/backend/OpenFlare/plugins/server/site/config_version/pages_snapshot_test.go +++ b/backend/OpenFlare/plugins/server/domain/site/config_version/pages_snapshot_test.go @@ -8,9 +8,9 @@ import ( "encoding/json" "testing" - "Wavelet/OpenFlare/plugins/server/repository" + "Wavelet/OpenFlare/plugins/server/kernel/repository" - "Wavelet/OpenFlare/plugins/server/model" + "Wavelet/OpenFlare/plugins/server/kernel/model" openrestyrender "Wavelet/OpenFlare/share/render/openresty" db "Wavelet/plugins/infra/database" diff --git a/backend/OpenFlare/plugins/server/site/config_version/proxy_cache_path_test.go b/backend/OpenFlare/plugins/server/domain/site/config_version/proxy_cache_path_test.go similarity index 100% rename from backend/OpenFlare/plugins/server/site/config_version/proxy_cache_path_test.go rename to backend/OpenFlare/plugins/server/domain/site/config_version/proxy_cache_path_test.go diff --git a/backend/OpenFlare/plugins/server/site/config_version/renderer.go b/backend/OpenFlare/plugins/server/domain/site/config_version/renderer.go similarity index 100% rename from backend/OpenFlare/plugins/server/site/config_version/renderer.go rename to backend/OpenFlare/plugins/server/domain/site/config_version/renderer.go diff --git a/backend/OpenFlare/plugins/server/site/config_version/routers.go b/backend/OpenFlare/plugins/server/domain/site/config_version/routers.go similarity index 99% rename from backend/OpenFlare/plugins/server/site/config_version/routers.go rename to backend/OpenFlare/plugins/server/domain/site/config_version/routers.go index 74718fee..5677679f 100644 --- a/backend/OpenFlare/plugins/server/site/config_version/routers.go +++ b/backend/OpenFlare/plugins/server/domain/site/config_version/routers.go @@ -6,7 +6,7 @@ package config_version import ( "net/http" - "Wavelet/OpenFlare/plugins/server/apiutil" + "Wavelet/OpenFlare/plugins/server/kernel/apiutil" "Wavelet/pkg/response" "github.com/gin-gonic/gin" diff --git a/backend/OpenFlare/plugins/server/site/config_version/snapshot.go b/backend/OpenFlare/plugins/server/domain/site/config_version/snapshot.go similarity index 99% rename from backend/OpenFlare/plugins/server/site/config_version/snapshot.go rename to backend/OpenFlare/plugins/server/domain/site/config_version/snapshot.go index ba8b26bd..a9126e09 100644 --- a/backend/OpenFlare/plugins/server/site/config_version/snapshot.go +++ b/backend/OpenFlare/plugins/server/domain/site/config_version/snapshot.go @@ -13,10 +13,10 @@ import ( "strconv" "strings" - "Wavelet/OpenFlare/plugins/server/model" - "Wavelet/OpenFlare/plugins/server/repository" - oftls "Wavelet/OpenFlare/plugins/server/tls" - "Wavelet/OpenFlare/plugins/server/waf" + oftls "Wavelet/OpenFlare/plugins/server/domain/tls" + "Wavelet/OpenFlare/plugins/server/domain/waf" + "Wavelet/OpenFlare/plugins/server/kernel/model" + "Wavelet/OpenFlare/plugins/server/kernel/repository" "Wavelet/OpenFlare/share/protocol" openrestyrender "Wavelet/OpenFlare/share/render/openresty" diff --git a/backend/OpenFlare/plugins/server/site/config_version/waf_graph_snapshot_test.go b/backend/OpenFlare/plugins/server/domain/site/config_version/waf_graph_snapshot_test.go similarity index 97% rename from backend/OpenFlare/plugins/server/site/config_version/waf_graph_snapshot_test.go rename to backend/OpenFlare/plugins/server/domain/site/config_version/waf_graph_snapshot_test.go index 63dc57ea..165a1cf7 100644 --- a/backend/OpenFlare/plugins/server/site/config_version/waf_graph_snapshot_test.go +++ b/backend/OpenFlare/plugins/server/domain/site/config_version/waf_graph_snapshot_test.go @@ -9,10 +9,10 @@ import ( "strings" "testing" - "Wavelet/OpenFlare/plugins/server/repository" + "Wavelet/OpenFlare/plugins/server/kernel/repository" - "Wavelet/OpenFlare/plugins/server/model" - "Wavelet/OpenFlare/plugins/server/waf" + "Wavelet/OpenFlare/plugins/server/domain/waf" + "Wavelet/OpenFlare/plugins/server/kernel/model" db "Wavelet/plugins/infra/database" "github.com/stretchr/testify/assert" diff --git a/backend/OpenFlare/plugins/server/site/origin/errs.go b/backend/OpenFlare/plugins/server/domain/site/origin/errs.go similarity index 100% rename from backend/OpenFlare/plugins/server/site/origin/errs.go rename to backend/OpenFlare/plugins/server/domain/site/origin/errs.go diff --git a/backend/OpenFlare/plugins/server/site/origin/helpers.go b/backend/OpenFlare/plugins/server/domain/site/origin/helpers.go similarity index 100% rename from backend/OpenFlare/plugins/server/site/origin/helpers.go rename to backend/OpenFlare/plugins/server/domain/site/origin/helpers.go diff --git a/backend/OpenFlare/plugins/server/site/origin/logics.go b/backend/OpenFlare/plugins/server/domain/site/origin/logics.go similarity index 98% rename from backend/OpenFlare/plugins/server/site/origin/logics.go rename to backend/OpenFlare/plugins/server/domain/site/origin/logics.go index f9af2f43..a9dbc84a 100644 --- a/backend/OpenFlare/plugins/server/site/origin/logics.go +++ b/backend/OpenFlare/plugins/server/domain/site/origin/logics.go @@ -11,8 +11,8 @@ import ( "sort" "strings" - "Wavelet/OpenFlare/plugins/server/model" - "Wavelet/OpenFlare/plugins/server/repository" + "Wavelet/OpenFlare/plugins/server/kernel/model" + "Wavelet/OpenFlare/plugins/server/kernel/repository" "gorm.io/gorm" ) diff --git a/backend/OpenFlare/plugins/server/site/origin/logics_test.go b/backend/OpenFlare/plugins/server/domain/site/origin/logics_test.go similarity index 97% rename from backend/OpenFlare/plugins/server/site/origin/logics_test.go rename to backend/OpenFlare/plugins/server/domain/site/origin/logics_test.go index e0930de5..04dfd97f 100644 --- a/backend/OpenFlare/plugins/server/site/origin/logics_test.go +++ b/backend/OpenFlare/plugins/server/domain/site/origin/logics_test.go @@ -7,7 +7,7 @@ import ( "context" "testing" - "Wavelet/OpenFlare/plugins/server/model" + "Wavelet/OpenFlare/plugins/server/kernel/model" db "Wavelet/plugins/infra/database" "github.com/glebarez/sqlite" diff --git a/backend/OpenFlare/plugins/server/site/origin/routers.go b/backend/OpenFlare/plugins/server/domain/site/origin/routers.go similarity index 98% rename from backend/OpenFlare/plugins/server/site/origin/routers.go rename to backend/OpenFlare/plugins/server/domain/site/origin/routers.go index 9b644686..ee94afbd 100644 --- a/backend/OpenFlare/plugins/server/site/origin/routers.go +++ b/backend/OpenFlare/plugins/server/domain/site/origin/routers.go @@ -6,7 +6,7 @@ package origin import ( "net/http" - "Wavelet/OpenFlare/plugins/server/apiutil" + "Wavelet/OpenFlare/plugins/server/kernel/apiutil" "Wavelet/pkg/response" "github.com/gin-gonic/gin" diff --git a/backend/OpenFlare/plugins/server/site/proxy_route/build_helpers.go b/backend/OpenFlare/plugins/server/domain/site/proxy_route/build_helpers.go similarity index 98% rename from backend/OpenFlare/plugins/server/site/proxy_route/build_helpers.go rename to backend/OpenFlare/plugins/server/domain/site/proxy_route/build_helpers.go index 17b7b224..aff25a66 100644 --- a/backend/OpenFlare/plugins/server/site/proxy_route/build_helpers.go +++ b/backend/OpenFlare/plugins/server/domain/site/proxy_route/build_helpers.go @@ -10,7 +10,7 @@ import ( "errors" "strings" - "Wavelet/OpenFlare/plugins/server/model" + "Wavelet/OpenFlare/plugins/server/kernel/model" ) type proxyRouteJSONFields struct { diff --git a/backend/OpenFlare/plugins/server/site/proxy_route/errs.go b/backend/OpenFlare/plugins/server/domain/site/proxy_route/errs.go similarity index 100% rename from backend/OpenFlare/plugins/server/site/proxy_route/errs.go rename to backend/OpenFlare/plugins/server/domain/site/proxy_route/errs.go diff --git a/backend/OpenFlare/plugins/server/site/proxy_route/helpers.go b/backend/OpenFlare/plugins/server/domain/site/proxy_route/helpers.go similarity index 99% rename from backend/OpenFlare/plugins/server/site/proxy_route/helpers.go rename to backend/OpenFlare/plugins/server/domain/site/proxy_route/helpers.go index dcb2c86b..453bb8ec 100644 --- a/backend/OpenFlare/plugins/server/site/proxy_route/helpers.go +++ b/backend/OpenFlare/plugins/server/domain/site/proxy_route/helpers.go @@ -17,9 +17,9 @@ import ( "strings" "unicode" - "Wavelet/OpenFlare/plugins/server/repository" + "Wavelet/OpenFlare/plugins/server/kernel/repository" - "Wavelet/OpenFlare/plugins/server/model" + "Wavelet/OpenFlare/plugins/server/kernel/model" "gorm.io/gorm" ) diff --git a/backend/OpenFlare/plugins/server/site/proxy_route/helpers_limit_test.go b/backend/OpenFlare/plugins/server/domain/site/proxy_route/helpers_limit_test.go similarity index 100% rename from backend/OpenFlare/plugins/server/site/proxy_route/helpers_limit_test.go rename to backend/OpenFlare/plugins/server/domain/site/proxy_route/helpers_limit_test.go diff --git a/backend/OpenFlare/plugins/server/site/proxy_route/logics.go b/backend/OpenFlare/plugins/server/domain/site/proxy_route/logics.go similarity index 99% rename from backend/OpenFlare/plugins/server/site/proxy_route/logics.go rename to backend/OpenFlare/plugins/server/domain/site/proxy_route/logics.go index ee57f081..1723c0c3 100644 --- a/backend/OpenFlare/plugins/server/site/proxy_route/logics.go +++ b/backend/OpenFlare/plugins/server/domain/site/proxy_route/logics.go @@ -10,8 +10,8 @@ import ( "strings" "time" - "Wavelet/OpenFlare/plugins/server/model" - "Wavelet/OpenFlare/plugins/server/repository" + "Wavelet/OpenFlare/plugins/server/kernel/model" + "Wavelet/OpenFlare/plugins/server/kernel/repository" "gorm.io/gorm" ) diff --git a/backend/OpenFlare/plugins/server/site/proxy_route/logics_test.go b/backend/OpenFlare/plugins/server/domain/site/proxy_route/logics_test.go similarity index 98% rename from backend/OpenFlare/plugins/server/site/proxy_route/logics_test.go rename to backend/OpenFlare/plugins/server/domain/site/proxy_route/logics_test.go index 965332ab..7fc0142a 100644 --- a/backend/OpenFlare/plugins/server/site/proxy_route/logics_test.go +++ b/backend/OpenFlare/plugins/server/domain/site/proxy_route/logics_test.go @@ -7,8 +7,8 @@ import ( "context" "testing" - "Wavelet/OpenFlare/plugins/server/model" - "Wavelet/OpenFlare/plugins/server/repository" + "Wavelet/OpenFlare/plugins/server/kernel/model" + "Wavelet/OpenFlare/plugins/server/kernel/repository" db "Wavelet/plugins/infra/database" "github.com/glebarez/sqlite" diff --git a/backend/OpenFlare/plugins/server/site/proxy_route/origin_helpers.go b/backend/OpenFlare/plugins/server/domain/site/proxy_route/origin_helpers.go similarity index 97% rename from backend/OpenFlare/plugins/server/site/proxy_route/origin_helpers.go rename to backend/OpenFlare/plugins/server/domain/site/proxy_route/origin_helpers.go index 01eaf6e5..cb78c959 100644 --- a/backend/OpenFlare/plugins/server/site/proxy_route/origin_helpers.go +++ b/backend/OpenFlare/plugins/server/domain/site/proxy_route/origin_helpers.go @@ -8,7 +8,7 @@ import ( "errors" "strings" - "Wavelet/OpenFlare/plugins/server/repository" + "Wavelet/OpenFlare/plugins/server/kernel/repository" "gorm.io/gorm" ) diff --git a/backend/OpenFlare/plugins/server/site/proxy_route/routers.go b/backend/OpenFlare/plugins/server/domain/site/proxy_route/routers.go similarity index 98% rename from backend/OpenFlare/plugins/server/site/proxy_route/routers.go rename to backend/OpenFlare/plugins/server/domain/site/proxy_route/routers.go index be7865f8..6f2d06e7 100644 --- a/backend/OpenFlare/plugins/server/site/proxy_route/routers.go +++ b/backend/OpenFlare/plugins/server/domain/site/proxy_route/routers.go @@ -6,7 +6,7 @@ package proxy_route import ( "net/http" - "Wavelet/OpenFlare/plugins/server/apiutil" + "Wavelet/OpenFlare/plugins/server/kernel/apiutil" "Wavelet/pkg/response" "github.com/gin-gonic/gin" diff --git a/backend/OpenFlare/plugins/server/site/routeidentity/identity.go b/backend/OpenFlare/plugins/server/domain/site/routeidentity/identity.go similarity index 100% rename from backend/OpenFlare/plugins/server/site/routeidentity/identity.go rename to backend/OpenFlare/plugins/server/domain/site/routeidentity/identity.go diff --git a/backend/OpenFlare/plugins/server/site/routeidentity/identity_test.go b/backend/OpenFlare/plugins/server/domain/site/routeidentity/identity_test.go similarity index 100% rename from backend/OpenFlare/plugins/server/site/routeidentity/identity_test.go rename to backend/OpenFlare/plugins/server/domain/site/routeidentity/identity_test.go diff --git a/backend/OpenFlare/plugins/server/site/zone/errs.go b/backend/OpenFlare/plugins/server/domain/site/zone/errs.go similarity index 100% rename from backend/OpenFlare/plugins/server/site/zone/errs.go rename to backend/OpenFlare/plugins/server/domain/site/zone/errs.go diff --git a/backend/OpenFlare/plugins/server/site/zone/legacy_import.go b/backend/OpenFlare/plugins/server/domain/site/zone/legacy_import.go similarity index 99% rename from backend/OpenFlare/plugins/server/site/zone/legacy_import.go rename to backend/OpenFlare/plugins/server/domain/site/zone/legacy_import.go index 8baebaf5..1b0050e8 100644 --- a/backend/OpenFlare/plugins/server/site/zone/legacy_import.go +++ b/backend/OpenFlare/plugins/server/domain/site/zone/legacy_import.go @@ -12,7 +12,7 @@ import ( "strconv" "strings" - "Wavelet/OpenFlare/plugins/server/site/routeidentity" + "Wavelet/OpenFlare/plugins/server/domain/site/routeidentity" ) // ImportReport describes the idempotent legacy migration result. diff --git a/backend/OpenFlare/plugins/server/site/zone/legacy_import_test.go b/backend/OpenFlare/plugins/server/domain/site/zone/legacy_import_test.go similarity index 100% rename from backend/OpenFlare/plugins/server/site/zone/legacy_import_test.go rename to backend/OpenFlare/plugins/server/domain/site/zone/legacy_import_test.go diff --git a/backend/OpenFlare/plugins/server/site/zone/logics.go b/backend/OpenFlare/plugins/server/domain/site/zone/logics.go similarity index 97% rename from backend/OpenFlare/plugins/server/site/zone/logics.go rename to backend/OpenFlare/plugins/server/domain/site/zone/logics.go index 5c9173bd..1dc6f9e7 100644 --- a/backend/OpenFlare/plugins/server/site/zone/logics.go +++ b/backend/OpenFlare/plugins/server/domain/site/zone/logics.go @@ -10,9 +10,9 @@ import ( "strings" "time" - cf "Wavelet/OpenFlare/plugins/server/cloudflare" - "Wavelet/OpenFlare/plugins/server/model" - "Wavelet/OpenFlare/plugins/server/repository" + cf "Wavelet/OpenFlare/plugins/server/domain/cloudflare" + "Wavelet/OpenFlare/plugins/server/kernel/model" + "Wavelet/OpenFlare/plugins/server/kernel/repository" "Wavelet/pkg/logger" "golang.org/x/net/publicsuffix" diff --git a/backend/OpenFlare/plugins/server/site/zone/logics_test.go b/backend/OpenFlare/plugins/server/domain/site/zone/logics_test.go similarity index 96% rename from backend/OpenFlare/plugins/server/site/zone/logics_test.go rename to backend/OpenFlare/plugins/server/domain/site/zone/logics_test.go index db61127b..f79b0022 100644 --- a/backend/OpenFlare/plugins/server/site/zone/logics_test.go +++ b/backend/OpenFlare/plugins/server/domain/site/zone/logics_test.go @@ -8,10 +8,10 @@ import ( "testing" "time" - "Wavelet/OpenFlare/plugins/server/repository" - "Wavelet/OpenFlare/plugins/server/testhelper" + "Wavelet/OpenFlare/plugins/server/kernel/repository" + "Wavelet/OpenFlare/plugins/server/kernel/testhelper" - "Wavelet/OpenFlare/plugins/server/model" + "Wavelet/OpenFlare/plugins/server/kernel/model" db "Wavelet/plugins/infra/database" "github.com/glebarez/sqlite" diff --git a/backend/OpenFlare/plugins/server/site/zone/routers.go b/backend/OpenFlare/plugins/server/domain/site/zone/routers.go similarity index 99% rename from backend/OpenFlare/plugins/server/site/zone/routers.go rename to backend/OpenFlare/plugins/server/domain/site/zone/routers.go index 3708d0be..7e28c4d5 100644 --- a/backend/OpenFlare/plugins/server/site/zone/routers.go +++ b/backend/OpenFlare/plugins/server/domain/site/zone/routers.go @@ -7,7 +7,7 @@ import ( "errors" "net/http" - "Wavelet/OpenFlare/plugins/server/apiutil" + "Wavelet/OpenFlare/plugins/server/kernel/apiutil" "Wavelet/pkg/response" "github.com/gin-gonic/gin" diff --git a/backend/OpenFlare/plugins/server/site/zone/stats.go b/backend/OpenFlare/plugins/server/domain/site/zone/stats.go similarity index 98% rename from backend/OpenFlare/plugins/server/site/zone/stats.go rename to backend/OpenFlare/plugins/server/domain/site/zone/stats.go index 1af0af41..adc61fde 100644 --- a/backend/OpenFlare/plugins/server/site/zone/stats.go +++ b/backend/OpenFlare/plugins/server/domain/site/zone/stats.go @@ -9,8 +9,8 @@ import ( "strings" "time" - "Wavelet/OpenFlare/plugins/server/model" - "Wavelet/OpenFlare/plugins/server/repository" + "Wavelet/OpenFlare/plugins/server/kernel/model" + "Wavelet/OpenFlare/plugins/server/kernel/repository" "gorm.io/gorm" ) diff --git a/backend/OpenFlare/plugins/server/tls/acme/client.go b/backend/OpenFlare/plugins/server/domain/tls/acme/client.go similarity index 100% rename from backend/OpenFlare/plugins/server/tls/acme/client.go rename to backend/OpenFlare/plugins/server/domain/tls/acme/client.go diff --git a/backend/OpenFlare/plugins/server/tls/acme_obtain_test.go b/backend/OpenFlare/plugins/server/domain/tls/acme_obtain_test.go similarity index 98% rename from backend/OpenFlare/plugins/server/tls/acme_obtain_test.go rename to backend/OpenFlare/plugins/server/domain/tls/acme_obtain_test.go index 1a2f256c..2247472c 100644 --- a/backend/OpenFlare/plugins/server/tls/acme_obtain_test.go +++ b/backend/OpenFlare/plugins/server/domain/tls/acme_obtain_test.go @@ -8,9 +8,9 @@ import ( "testing" "time" - "Wavelet/OpenFlare/plugins/server/repository" + "Wavelet/OpenFlare/plugins/server/kernel/repository" - "Wavelet/OpenFlare/plugins/server/model" + "Wavelet/OpenFlare/plugins/server/kernel/model" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/backend/OpenFlare/plugins/server/tls/errs.go b/backend/OpenFlare/plugins/server/domain/tls/errs.go similarity index 100% rename from backend/OpenFlare/plugins/server/tls/errs.go rename to backend/OpenFlare/plugins/server/domain/tls/errs.go diff --git a/backend/OpenFlare/plugins/server/tls/helpers.go b/backend/OpenFlare/plugins/server/domain/tls/helpers.go similarity index 100% rename from backend/OpenFlare/plugins/server/tls/helpers.go rename to backend/OpenFlare/plugins/server/domain/tls/helpers.go diff --git a/backend/OpenFlare/plugins/server/tls/logics.go b/backend/OpenFlare/plugins/server/domain/tls/logics.go similarity index 98% rename from backend/OpenFlare/plugins/server/tls/logics.go rename to backend/OpenFlare/plugins/server/domain/tls/logics.go index 9cc32ea0..9a0b2eaa 100644 --- a/backend/OpenFlare/plugins/server/tls/logics.go +++ b/backend/OpenFlare/plugins/server/domain/tls/logics.go @@ -12,10 +12,10 @@ import ( "mime/multipart" "strings" - "Wavelet/OpenFlare/plugins/server/repository" + "Wavelet/OpenFlare/plugins/server/kernel/repository" - "Wavelet/OpenFlare/plugins/server/model" - "Wavelet/OpenFlare/plugins/server/task" + "Wavelet/OpenFlare/plugins/server/kernel/model" + "Wavelet/OpenFlare/plugins/server/kernel/task" ) // CertificateInput TLS 证书创建/更新请求。 diff --git a/backend/OpenFlare/plugins/server/tls/logics_test.go b/backend/OpenFlare/plugins/server/domain/tls/logics_test.go similarity index 92% rename from backend/OpenFlare/plugins/server/tls/logics_test.go rename to backend/OpenFlare/plugins/server/domain/tls/logics_test.go index 1e54855e..e5ee5d9f 100644 --- a/backend/OpenFlare/plugins/server/tls/logics_test.go +++ b/backend/OpenFlare/plugins/server/domain/tls/logics_test.go @@ -16,13 +16,13 @@ import ( "testing" "time" - "Wavelet/OpenFlare/plugins/server/credential" - "Wavelet/OpenFlare/plugins/server/repository" - oftask "Wavelet/OpenFlare/plugins/server/task" - "Wavelet/OpenFlare/plugins/server/testhelper" + "Wavelet/OpenFlare/plugins/server/kernel/credential" + "Wavelet/OpenFlare/plugins/server/kernel/repository" + oftask "Wavelet/OpenFlare/plugins/server/kernel/task" + "Wavelet/OpenFlare/plugins/server/kernel/testhelper" - "Wavelet/OpenFlare/plugins/server/model" - "Wavelet/OpenFlare/plugins/server/runtimeconfig" + "Wavelet/OpenFlare/plugins/server/kernel/model" + "Wavelet/OpenFlare/plugins/server/kernel/runtimeconfig" "Wavelet/pkg/idgen" db "Wavelet/plugins/infra/database" diff --git a/backend/OpenFlare/plugins/server/tls/obtain.go b/backend/OpenFlare/plugins/server/domain/tls/obtain.go similarity index 95% rename from backend/OpenFlare/plugins/server/tls/obtain.go rename to backend/OpenFlare/plugins/server/domain/tls/obtain.go index 0e5f4554..9a279349 100644 --- a/backend/OpenFlare/plugins/server/tls/obtain.go +++ b/backend/OpenFlare/plugins/server/domain/tls/obtain.go @@ -9,11 +9,11 @@ import ( "strings" "time" - "Wavelet/OpenFlare/plugins/server/repository" + "Wavelet/OpenFlare/plugins/server/kernel/repository" - "Wavelet/OpenFlare/plugins/server/model" - "Wavelet/OpenFlare/plugins/server/task" - "Wavelet/OpenFlare/plugins/server/tls/acme" + "Wavelet/OpenFlare/plugins/server/domain/tls/acme" + "Wavelet/OpenFlare/plugins/server/kernel/model" + "Wavelet/OpenFlare/plugins/server/kernel/task" ) const ( diff --git a/backend/OpenFlare/plugins/server/tls/obtain_helpers.go b/backend/OpenFlare/plugins/server/domain/tls/obtain_helpers.go similarity index 93% rename from backend/OpenFlare/plugins/server/tls/obtain_helpers.go rename to backend/OpenFlare/plugins/server/domain/tls/obtain_helpers.go index 2f6b1e50..29a268c9 100644 --- a/backend/OpenFlare/plugins/server/tls/obtain_helpers.go +++ b/backend/OpenFlare/plugins/server/domain/tls/obtain_helpers.go @@ -7,10 +7,10 @@ import ( "context" "fmt" - "Wavelet/OpenFlare/plugins/server/repository" + "Wavelet/OpenFlare/plugins/server/kernel/repository" - "Wavelet/OpenFlare/plugins/server/model" - "Wavelet/OpenFlare/plugins/server/tls/acme" + "Wavelet/OpenFlare/plugins/server/domain/tls/acme" + "Wavelet/OpenFlare/plugins/server/kernel/model" ) func resolveAcmeAccount(ctx context.Context, cert *model.TLSCertificate) (*model.AcmeAccount, error) { diff --git a/backend/OpenFlare/plugins/server/tls/routers.go b/backend/OpenFlare/plugins/server/domain/tls/routers.go similarity index 99% rename from backend/OpenFlare/plugins/server/tls/routers.go rename to backend/OpenFlare/plugins/server/domain/tls/routers.go index 37e6da89..842749ae 100644 --- a/backend/OpenFlare/plugins/server/tls/routers.go +++ b/backend/OpenFlare/plugins/server/domain/tls/routers.go @@ -6,7 +6,7 @@ package tls import ( "net/http" - "Wavelet/OpenFlare/plugins/server/apiutil" + "Wavelet/OpenFlare/plugins/server/kernel/apiutil" "Wavelet/pkg/response" "github.com/gin-gonic/gin" diff --git a/backend/OpenFlare/plugins/server/tls/sensitive.go b/backend/OpenFlare/plugins/server/domain/tls/sensitive.go similarity index 87% rename from backend/OpenFlare/plugins/server/tls/sensitive.go rename to backend/OpenFlare/plugins/server/domain/tls/sensitive.go index f3185dfa..c72cedf3 100644 --- a/backend/OpenFlare/plugins/server/tls/sensitive.go +++ b/backend/OpenFlare/plugins/server/domain/tls/sensitive.go @@ -3,7 +3,7 @@ package tls -import "Wavelet/OpenFlare/plugins/server/credential" +import "Wavelet/OpenFlare/plugins/server/kernel/credential" func sealSensitive(plaintext string) (string, error) { return credential.Seal(plaintext) diff --git a/backend/OpenFlare/plugins/server/tls/ssl_renew.go b/backend/OpenFlare/plugins/server/domain/tls/ssl_renew.go similarity index 95% rename from backend/OpenFlare/plugins/server/tls/ssl_renew.go rename to backend/OpenFlare/plugins/server/domain/tls/ssl_renew.go index 15c97f9a..7ee5acf4 100644 --- a/backend/OpenFlare/plugins/server/tls/ssl_renew.go +++ b/backend/OpenFlare/plugins/server/domain/tls/ssl_renew.go @@ -7,7 +7,7 @@ import ( "context" "time" - "Wavelet/OpenFlare/plugins/server/repository" + "Wavelet/OpenFlare/plugins/server/kernel/repository" "Wavelet/pkg/logger" ) diff --git a/backend/OpenFlare/plugins/server/tls/ssl_renew_test.go b/backend/OpenFlare/plugins/server/domain/tls/ssl_renew_test.go similarity index 88% rename from backend/OpenFlare/plugins/server/tls/ssl_renew_test.go rename to backend/OpenFlare/plugins/server/domain/tls/ssl_renew_test.go index 0fd59549..13acda8a 100644 --- a/backend/OpenFlare/plugins/server/tls/ssl_renew_test.go +++ b/backend/OpenFlare/plugins/server/domain/tls/ssl_renew_test.go @@ -8,11 +8,11 @@ import ( "testing" "time" - "Wavelet/OpenFlare/plugins/server/model" - "Wavelet/OpenFlare/plugins/server/repository" - "Wavelet/OpenFlare/plugins/server/runtimeconfig" - oftask "Wavelet/OpenFlare/plugins/server/task" - "Wavelet/OpenFlare/plugins/server/testhelper" + "Wavelet/OpenFlare/plugins/server/kernel/model" + "Wavelet/OpenFlare/plugins/server/kernel/repository" + "Wavelet/OpenFlare/plugins/server/kernel/runtimeconfig" + oftask "Wavelet/OpenFlare/plugins/server/kernel/task" + "Wavelet/OpenFlare/plugins/server/kernel/testhelper" db "Wavelet/plugins/infra/database" "github.com/stretchr/testify/assert" diff --git a/backend/OpenFlare/plugins/server/tls/tasks.go b/backend/OpenFlare/plugins/server/domain/tls/tasks.go similarity index 96% rename from backend/OpenFlare/plugins/server/tls/tasks.go rename to backend/OpenFlare/plugins/server/domain/tls/tasks.go index 0cfa0661..27bf4595 100644 --- a/backend/OpenFlare/plugins/server/tls/tasks.go +++ b/backend/OpenFlare/plugins/server/domain/tls/tasks.go @@ -9,9 +9,9 @@ import ( "errors" "fmt" - "Wavelet/OpenFlare/plugins/server/repository" + "Wavelet/OpenFlare/plugins/server/kernel/repository" - "Wavelet/OpenFlare/plugins/server/task" + "Wavelet/OpenFlare/plugins/server/kernel/task" ) const ( diff --git a/backend/OpenFlare/plugins/server/tls/tasks_test.go b/backend/OpenFlare/plugins/server/domain/tls/tasks_test.go similarity index 97% rename from backend/OpenFlare/plugins/server/tls/tasks_test.go rename to backend/OpenFlare/plugins/server/domain/tls/tasks_test.go index 626e583f..e16a9941 100644 --- a/backend/OpenFlare/plugins/server/tls/tasks_test.go +++ b/backend/OpenFlare/plugins/server/domain/tls/tasks_test.go @@ -9,9 +9,9 @@ import ( "errors" "testing" - "Wavelet/OpenFlare/plugins/server/repository" + "Wavelet/OpenFlare/plugins/server/kernel/repository" - "Wavelet/OpenFlare/plugins/server/model" + "Wavelet/OpenFlare/plugins/server/kernel/model" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/backend/OpenFlare/plugins/server/waf/errs.go b/backend/OpenFlare/plugins/server/domain/waf/errs.go similarity index 100% rename from backend/OpenFlare/plugins/server/waf/errs.go rename to backend/OpenFlare/plugins/server/domain/waf/errs.go diff --git a/backend/OpenFlare/plugins/server/waf/graph_compile.go b/backend/OpenFlare/plugins/server/domain/waf/graph_compile.go similarity index 100% rename from backend/OpenFlare/plugins/server/waf/graph_compile.go rename to backend/OpenFlare/plugins/server/domain/waf/graph_compile.go diff --git a/backend/OpenFlare/plugins/server/waf/graph_compile_test.go b/backend/OpenFlare/plugins/server/domain/waf/graph_compile_test.go similarity index 100% rename from backend/OpenFlare/plugins/server/waf/graph_compile_test.go rename to backend/OpenFlare/plugins/server/domain/waf/graph_compile_test.go diff --git a/backend/OpenFlare/plugins/server/waf/graph_types.go b/backend/OpenFlare/plugins/server/domain/waf/graph_types.go similarity index 100% rename from backend/OpenFlare/plugins/server/waf/graph_types.go rename to backend/OpenFlare/plugins/server/domain/waf/graph_types.go diff --git a/backend/OpenFlare/plugins/server/waf/graph_validate.go b/backend/OpenFlare/plugins/server/domain/waf/graph_validate.go similarity index 100% rename from backend/OpenFlare/plugins/server/waf/graph_validate.go rename to backend/OpenFlare/plugins/server/domain/waf/graph_validate.go diff --git a/backend/OpenFlare/plugins/server/waf/graph_validate_test.go b/backend/OpenFlare/plugins/server/domain/waf/graph_validate_test.go similarity index 100% rename from backend/OpenFlare/plugins/server/waf/graph_validate_test.go rename to backend/OpenFlare/plugins/server/domain/waf/graph_validate_test.go diff --git a/backend/OpenFlare/plugins/server/waf/ip_group_sync.go b/backend/OpenFlare/plugins/server/domain/waf/ip_group_sync.go similarity index 98% rename from backend/OpenFlare/plugins/server/waf/ip_group_sync.go rename to backend/OpenFlare/plugins/server/domain/waf/ip_group_sync.go index f3fdad16..3ee170c4 100644 --- a/backend/OpenFlare/plugins/server/waf/ip_group_sync.go +++ b/backend/OpenFlare/plugins/server/domain/waf/ip_group_sync.go @@ -18,11 +18,11 @@ import ( "strings" "time" - "Wavelet/OpenFlare/plugins/server/repository" + "Wavelet/OpenFlare/plugins/server/kernel/repository" - "Wavelet/OpenFlare/plugins/server/fleet/agent" - "Wavelet/OpenFlare/plugins/server/fleet/websocket" - "Wavelet/OpenFlare/plugins/server/model" + "Wavelet/OpenFlare/plugins/server/domain/fleet/agent" + "Wavelet/OpenFlare/plugins/server/domain/fleet/websocket" + "Wavelet/OpenFlare/plugins/server/kernel/model" exprlang "github.com/expr-lang/expr" "github.com/expr-lang/expr/vm" diff --git a/backend/OpenFlare/plugins/server/waf/ip_group_sync_test.go b/backend/OpenFlare/plugins/server/domain/waf/ip_group_sync_test.go similarity index 98% rename from backend/OpenFlare/plugins/server/waf/ip_group_sync_test.go rename to backend/OpenFlare/plugins/server/domain/waf/ip_group_sync_test.go index 2d888f1d..d55e7951 100644 --- a/backend/OpenFlare/plugins/server/waf/ip_group_sync_test.go +++ b/backend/OpenFlare/plugins/server/domain/waf/ip_group_sync_test.go @@ -11,10 +11,10 @@ import ( "testing" "time" - "Wavelet/OpenFlare/plugins/server/repository" - "Wavelet/OpenFlare/plugins/server/testhelper" + "Wavelet/OpenFlare/plugins/server/kernel/repository" + "Wavelet/OpenFlare/plugins/server/kernel/testhelper" - "Wavelet/OpenFlare/plugins/server/model" + "Wavelet/OpenFlare/plugins/server/kernel/model" db "Wavelet/plugins/infra/database" "github.com/glebarez/sqlite" diff --git a/backend/OpenFlare/plugins/server/waf/logics.go b/backend/OpenFlare/plugins/server/domain/waf/logics.go similarity index 99% rename from backend/OpenFlare/plugins/server/waf/logics.go rename to backend/OpenFlare/plugins/server/domain/waf/logics.go index b0e9e606..f10b5331 100644 --- a/backend/OpenFlare/plugins/server/waf/logics.go +++ b/backend/OpenFlare/plugins/server/domain/waf/logics.go @@ -14,9 +14,9 @@ import ( "strings" "time" - "Wavelet/OpenFlare/plugins/server/repository" + "Wavelet/OpenFlare/plugins/server/kernel/repository" - "Wavelet/OpenFlare/plugins/server/model" + "Wavelet/OpenFlare/plugins/server/kernel/model" exprlang "github.com/expr-lang/expr" "gorm.io/gorm" diff --git a/backend/OpenFlare/plugins/server/waf/logics_test.go b/backend/OpenFlare/plugins/server/domain/waf/logics_test.go similarity index 95% rename from backend/OpenFlare/plugins/server/waf/logics_test.go rename to backend/OpenFlare/plugins/server/domain/waf/logics_test.go index 2ed73b97..695264fa 100644 --- a/backend/OpenFlare/plugins/server/waf/logics_test.go +++ b/backend/OpenFlare/plugins/server/domain/waf/logics_test.go @@ -7,9 +7,9 @@ import ( "context" "testing" - "Wavelet/OpenFlare/plugins/server/repository" + "Wavelet/OpenFlare/plugins/server/kernel/repository" - "Wavelet/OpenFlare/plugins/server/model" + "Wavelet/OpenFlare/plugins/server/kernel/model" db "Wavelet/plugins/infra/database" "github.com/glebarez/sqlite" diff --git a/backend/OpenFlare/plugins/server/waf/routers.go b/backend/OpenFlare/plugins/server/domain/waf/routers.go similarity index 99% rename from backend/OpenFlare/plugins/server/waf/routers.go rename to backend/OpenFlare/plugins/server/domain/waf/routers.go index f2a28248..1823aeff 100644 --- a/backend/OpenFlare/plugins/server/waf/routers.go +++ b/backend/OpenFlare/plugins/server/domain/waf/routers.go @@ -7,7 +7,7 @@ import ( "net/http" "strconv" - "Wavelet/OpenFlare/plugins/server/apiutil" + "Wavelet/OpenFlare/plugins/server/kernel/apiutil" "Wavelet/pkg/response" "github.com/gin-gonic/gin" diff --git a/backend/OpenFlare/plugins/server/waf/rule_logics.go b/backend/OpenFlare/plugins/server/domain/waf/rule_logics.go similarity index 98% rename from backend/OpenFlare/plugins/server/waf/rule_logics.go rename to backend/OpenFlare/plugins/server/domain/waf/rule_logics.go index 4460cbe7..1de6be8d 100644 --- a/backend/OpenFlare/plugins/server/waf/rule_logics.go +++ b/backend/OpenFlare/plugins/server/domain/waf/rule_logics.go @@ -11,9 +11,9 @@ import ( "strings" "time" - "Wavelet/OpenFlare/plugins/server/repository" + "Wavelet/OpenFlare/plugins/server/kernel/repository" - "Wavelet/OpenFlare/plugins/server/model" + "Wavelet/OpenFlare/plugins/server/kernel/model" "gorm.io/gorm" ) diff --git a/backend/OpenFlare/plugins/server/waf/rule_logics_test.go b/backend/OpenFlare/plugins/server/domain/waf/rule_logics_test.go similarity index 98% rename from backend/OpenFlare/plugins/server/waf/rule_logics_test.go rename to backend/OpenFlare/plugins/server/domain/waf/rule_logics_test.go index be75526e..02d8d81d 100644 --- a/backend/OpenFlare/plugins/server/waf/rule_logics_test.go +++ b/backend/OpenFlare/plugins/server/domain/waf/rule_logics_test.go @@ -12,9 +12,9 @@ import ( "strconv" "testing" - "Wavelet/OpenFlare/plugins/server/repository" + "Wavelet/OpenFlare/plugins/server/kernel/repository" - "Wavelet/OpenFlare/plugins/server/model" + "Wavelet/OpenFlare/plugins/server/kernel/model" "Wavelet/pkg/response" db "Wavelet/plugins/infra/database" diff --git a/backend/OpenFlare/plugins/server/waf/rule_routers.go b/backend/OpenFlare/plugins/server/domain/waf/rule_routers.go similarity index 98% rename from backend/OpenFlare/plugins/server/waf/rule_routers.go rename to backend/OpenFlare/plugins/server/domain/waf/rule_routers.go index 90f272a6..107ae5ef 100644 --- a/backend/OpenFlare/plugins/server/waf/rule_routers.go +++ b/backend/OpenFlare/plugins/server/domain/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/kernel/apiutil" + "Wavelet/OpenFlare/plugins/server/kernel/model" "Wavelet/pkg/logger" "Wavelet/pkg/response" diff --git a/backend/OpenFlare/plugins/server/httpapi/register_agent.go b/backend/OpenFlare/plugins/server/httpapi/register_agent.go index 6ca6ed0f..f9ff0a95 100644 --- a/backend/OpenFlare/plugins/server/httpapi/register_agent.go +++ b/backend/OpenFlare/plugins/server/httpapi/register_agent.go @@ -4,7 +4,7 @@ package httpapi import ( - "Wavelet/OpenFlare/plugins/server/fleet/agent" + "Wavelet/OpenFlare/plugins/server/domain/fleet/agent" "Wavelet/core" ) diff --git a/backend/OpenFlare/plugins/server/httpapi/register_apply_log.go b/backend/OpenFlare/plugins/server/httpapi/register_apply_log.go index 601ec2d8..451d93bb 100644 --- a/backend/OpenFlare/plugins/server/httpapi/register_apply_log.go +++ b/backend/OpenFlare/plugins/server/httpapi/register_apply_log.go @@ -4,8 +4,8 @@ package httpapi import ( - "Wavelet/OpenFlare/plugins/server/apiutil" - "Wavelet/OpenFlare/plugins/server/site/apply_log" + "Wavelet/OpenFlare/plugins/server/domain/site/apply_log" + "Wavelet/OpenFlare/plugins/server/kernel/apiutil" "Wavelet/core" "Wavelet/core/contracts" ) diff --git a/backend/OpenFlare/plugins/server/httpapi/register_cloudflare.go b/backend/OpenFlare/plugins/server/httpapi/register_cloudflare.go index 55ebb74d..e9d3c65a 100644 --- a/backend/OpenFlare/plugins/server/httpapi/register_cloudflare.go +++ b/backend/OpenFlare/plugins/server/httpapi/register_cloudflare.go @@ -4,8 +4,8 @@ package httpapi import ( - "Wavelet/OpenFlare/plugins/server/apiutil" - cf "Wavelet/OpenFlare/plugins/server/cloudflare" + cf "Wavelet/OpenFlare/plugins/server/domain/cloudflare" + "Wavelet/OpenFlare/plugins/server/kernel/apiutil" "Wavelet/core" "Wavelet/core/contracts" ) diff --git a/backend/OpenFlare/plugins/server/httpapi/register_config_version.go b/backend/OpenFlare/plugins/server/httpapi/register_config_version.go index 75ac863b..48028bb0 100644 --- a/backend/OpenFlare/plugins/server/httpapi/register_config_version.go +++ b/backend/OpenFlare/plugins/server/httpapi/register_config_version.go @@ -4,8 +4,8 @@ package httpapi import ( - "Wavelet/OpenFlare/plugins/server/apiutil" - "Wavelet/OpenFlare/plugins/server/site/config_version" + "Wavelet/OpenFlare/plugins/server/domain/site/config_version" + "Wavelet/OpenFlare/plugins/server/kernel/apiutil" "Wavelet/core" "Wavelet/core/contracts" ) diff --git a/backend/OpenFlare/plugins/server/httpapi/register_dashboard.go b/backend/OpenFlare/plugins/server/httpapi/register_dashboard.go index 4f220828..d9e0caaa 100644 --- a/backend/OpenFlare/plugins/server/httpapi/register_dashboard.go +++ b/backend/OpenFlare/plugins/server/httpapi/register_dashboard.go @@ -4,8 +4,8 @@ package httpapi import ( - "Wavelet/OpenFlare/plugins/server/apiutil" - "Wavelet/OpenFlare/plugins/server/dashboard" + "Wavelet/OpenFlare/plugins/server/domain/dashboard" + "Wavelet/OpenFlare/plugins/server/kernel/apiutil" "Wavelet/core" "Wavelet/core/contracts" ) diff --git a/backend/OpenFlare/plugins/server/httpapi/register_node.go b/backend/OpenFlare/plugins/server/httpapi/register_node.go index e84245da..d9f0cbaa 100644 --- a/backend/OpenFlare/plugins/server/httpapi/register_node.go +++ b/backend/OpenFlare/plugins/server/httpapi/register_node.go @@ -4,8 +4,8 @@ package httpapi import ( - "Wavelet/OpenFlare/plugins/server/apiutil" - "Wavelet/OpenFlare/plugins/server/fleet/node" + "Wavelet/OpenFlare/plugins/server/domain/fleet/node" + "Wavelet/OpenFlare/plugins/server/kernel/apiutil" "Wavelet/core" "Wavelet/core/contracts" ) diff --git a/backend/OpenFlare/plugins/server/httpapi/register_observability.go b/backend/OpenFlare/plugins/server/httpapi/register_observability.go index f2e2899a..22423782 100644 --- a/backend/OpenFlare/plugins/server/httpapi/register_observability.go +++ b/backend/OpenFlare/plugins/server/httpapi/register_observability.go @@ -4,8 +4,8 @@ package httpapi import ( - "Wavelet/OpenFlare/plugins/server/apiutil" - "Wavelet/OpenFlare/plugins/server/observability" + "Wavelet/OpenFlare/plugins/server/domain/observability" + "Wavelet/OpenFlare/plugins/server/kernel/apiutil" "Wavelet/core" "Wavelet/core/contracts" ) diff --git a/backend/OpenFlare/plugins/server/httpapi/register_option.go b/backend/OpenFlare/plugins/server/httpapi/register_option.go index b506ba02..5a67411f 100644 --- a/backend/OpenFlare/plugins/server/httpapi/register_option.go +++ b/backend/OpenFlare/plugins/server/httpapi/register_option.go @@ -4,8 +4,8 @@ package httpapi import ( - "Wavelet/OpenFlare/plugins/server/apiutil" - "Wavelet/OpenFlare/plugins/server/option" + "Wavelet/OpenFlare/plugins/server/domain/option" + "Wavelet/OpenFlare/plugins/server/kernel/apiutil" "Wavelet/core" "Wavelet/core/contracts" ) diff --git a/backend/OpenFlare/plugins/server/httpapi/register_origin.go b/backend/OpenFlare/plugins/server/httpapi/register_origin.go index c064b2a6..c5ef9c9f 100644 --- a/backend/OpenFlare/plugins/server/httpapi/register_origin.go +++ b/backend/OpenFlare/plugins/server/httpapi/register_origin.go @@ -4,8 +4,8 @@ package httpapi import ( - "Wavelet/OpenFlare/plugins/server/apiutil" - "Wavelet/OpenFlare/plugins/server/site/origin" + "Wavelet/OpenFlare/plugins/server/domain/site/origin" + "Wavelet/OpenFlare/plugins/server/kernel/apiutil" "Wavelet/core" "Wavelet/core/contracts" ) diff --git a/backend/OpenFlare/plugins/server/httpapi/register_pages.go b/backend/OpenFlare/plugins/server/httpapi/register_pages.go index b9a25e42..eee1f606 100644 --- a/backend/OpenFlare/plugins/server/httpapi/register_pages.go +++ b/backend/OpenFlare/plugins/server/httpapi/register_pages.go @@ -4,8 +4,8 @@ package httpapi import ( - "Wavelet/OpenFlare/plugins/server/apiutil" - "Wavelet/OpenFlare/plugins/server/pages" + "Wavelet/OpenFlare/plugins/server/domain/pages" + "Wavelet/OpenFlare/plugins/server/kernel/apiutil" "Wavelet/core" "Wavelet/core/contracts" ) diff --git a/backend/OpenFlare/plugins/server/httpapi/register_proxy_route.go b/backend/OpenFlare/plugins/server/httpapi/register_proxy_route.go index e6a5833a..145c498e 100644 --- a/backend/OpenFlare/plugins/server/httpapi/register_proxy_route.go +++ b/backend/OpenFlare/plugins/server/httpapi/register_proxy_route.go @@ -4,8 +4,8 @@ package httpapi import ( - "Wavelet/OpenFlare/plugins/server/apiutil" - "Wavelet/OpenFlare/plugins/server/site/proxy_route" + "Wavelet/OpenFlare/plugins/server/domain/site/proxy_route" + "Wavelet/OpenFlare/plugins/server/kernel/apiutil" "Wavelet/core" "Wavelet/core/contracts" ) diff --git a/backend/OpenFlare/plugins/server/httpapi/register_relay_flared.go b/backend/OpenFlare/plugins/server/httpapi/register_relay_flared.go index edc8d481..a6b26e66 100644 --- a/backend/OpenFlare/plugins/server/httpapi/register_relay_flared.go +++ b/backend/OpenFlare/plugins/server/httpapi/register_relay_flared.go @@ -4,8 +4,8 @@ package httpapi import ( - "Wavelet/OpenFlare/plugins/server/fleet/flared" - "Wavelet/OpenFlare/plugins/server/fleet/relay" + "Wavelet/OpenFlare/plugins/server/domain/fleet/flared" + "Wavelet/OpenFlare/plugins/server/domain/fleet/relay" "Wavelet/core" ) diff --git a/backend/OpenFlare/plugins/server/httpapi/register_tls.go b/backend/OpenFlare/plugins/server/httpapi/register_tls.go index d32a783d..380f1f5e 100644 --- a/backend/OpenFlare/plugins/server/httpapi/register_tls.go +++ b/backend/OpenFlare/plugins/server/httpapi/register_tls.go @@ -4,8 +4,8 @@ package httpapi import ( - "Wavelet/OpenFlare/plugins/server/apiutil" - "Wavelet/OpenFlare/plugins/server/tls" + "Wavelet/OpenFlare/plugins/server/domain/tls" + "Wavelet/OpenFlare/plugins/server/kernel/apiutil" "Wavelet/core" "Wavelet/core/contracts" ) diff --git a/backend/OpenFlare/plugins/server/httpapi/register_updater.go b/backend/OpenFlare/plugins/server/httpapi/register_updater.go index 1bec5e32..abaf7b85 100644 --- a/backend/OpenFlare/plugins/server/httpapi/register_updater.go +++ b/backend/OpenFlare/plugins/server/httpapi/register_updater.go @@ -4,7 +4,7 @@ package httpapi import ( - "Wavelet/OpenFlare/plugins/server/apiutil" + "Wavelet/OpenFlare/plugins/server/kernel/apiutil" "Wavelet/OpenFlare/plugins/server/updater" "Wavelet/core" "Wavelet/core/contracts" diff --git a/backend/OpenFlare/plugins/server/httpapi/register_waf.go b/backend/OpenFlare/plugins/server/httpapi/register_waf.go index dd436da5..8d91f80a 100644 --- a/backend/OpenFlare/plugins/server/httpapi/register_waf.go +++ b/backend/OpenFlare/plugins/server/httpapi/register_waf.go @@ -4,8 +4,8 @@ package httpapi import ( - "Wavelet/OpenFlare/plugins/server/apiutil" - "Wavelet/OpenFlare/plugins/server/waf" + "Wavelet/OpenFlare/plugins/server/domain/waf" + "Wavelet/OpenFlare/plugins/server/kernel/apiutil" "Wavelet/core" "Wavelet/core/contracts" ) diff --git a/backend/OpenFlare/plugins/server/httpapi/register_zone.go b/backend/OpenFlare/plugins/server/httpapi/register_zone.go index 72b4d022..6e641b5c 100644 --- a/backend/OpenFlare/plugins/server/httpapi/register_zone.go +++ b/backend/OpenFlare/plugins/server/httpapi/register_zone.go @@ -4,8 +4,8 @@ package httpapi import ( - "Wavelet/OpenFlare/plugins/server/apiutil" - "Wavelet/OpenFlare/plugins/server/site/zone" + "Wavelet/OpenFlare/plugins/server/domain/site/zone" + "Wavelet/OpenFlare/plugins/server/kernel/apiutil" "Wavelet/core" "Wavelet/core/contracts" ) diff --git a/backend/OpenFlare/plugins/server/apiutil/bind.go b/backend/OpenFlare/plugins/server/kernel/apiutil/bind.go similarity index 100% rename from backend/OpenFlare/plugins/server/apiutil/bind.go rename to backend/OpenFlare/plugins/server/kernel/apiutil/bind.go diff --git a/backend/OpenFlare/plugins/server/apiutil/errors.go b/backend/OpenFlare/plugins/server/kernel/apiutil/errors.go similarity index 100% rename from backend/OpenFlare/plugins/server/apiutil/errors.go rename to backend/OpenFlare/plugins/server/kernel/apiutil/errors.go diff --git a/backend/OpenFlare/plugins/server/apiutil/middleware.go b/backend/OpenFlare/plugins/server/kernel/apiutil/middleware.go similarity index 100% rename from backend/OpenFlare/plugins/server/apiutil/middleware.go rename to backend/OpenFlare/plugins/server/kernel/apiutil/middleware.go diff --git a/backend/OpenFlare/plugins/server/apiutil/middleware_test.go b/backend/OpenFlare/plugins/server/kernel/apiutil/middleware_test.go similarity index 96% rename from backend/OpenFlare/plugins/server/apiutil/middleware_test.go rename to backend/OpenFlare/plugins/server/kernel/apiutil/middleware_test.go index 3ea5fddc..6a5587ef 100644 --- a/backend/OpenFlare/plugins/server/apiutil/middleware_test.go +++ b/backend/OpenFlare/plugins/server/kernel/apiutil/middleware_test.go @@ -8,7 +8,7 @@ import ( "net/http/httptest" "testing" - "Wavelet/OpenFlare/plugins/server/testhelper" + "Wavelet/OpenFlare/plugins/server/kernel/testhelper" "Wavelet/pkg/response" "github.com/gin-gonic/gin" diff --git a/backend/OpenFlare/plugins/server/apiutil/routes.go b/backend/OpenFlare/plugins/server/kernel/apiutil/routes.go similarity index 100% rename from backend/OpenFlare/plugins/server/apiutil/routes.go rename to backend/OpenFlare/plugins/server/kernel/apiutil/routes.go diff --git a/backend/OpenFlare/plugins/server/credential/sensitive.go b/backend/OpenFlare/plugins/server/kernel/credential/sensitive.go similarity index 96% rename from backend/OpenFlare/plugins/server/credential/sensitive.go rename to backend/OpenFlare/plugins/server/kernel/credential/sensitive.go index 099804bc..42c5fa9d 100644 --- a/backend/OpenFlare/plugins/server/credential/sensitive.go +++ b/backend/OpenFlare/plugins/server/kernel/credential/sensitive.go @@ -10,7 +10,7 @@ import ( "errors" "strings" - "Wavelet/OpenFlare/plugins/server/runtimeconfig" + "Wavelet/OpenFlare/plugins/server/kernel/runtimeconfig" "Wavelet/pkg/util" ) diff --git a/backend/OpenFlare/plugins/server/credential/sensitive_test.go b/backend/OpenFlare/plugins/server/kernel/credential/sensitive_test.go similarity index 97% rename from backend/OpenFlare/plugins/server/credential/sensitive_test.go rename to backend/OpenFlare/plugins/server/kernel/credential/sensitive_test.go index 162e5cb3..404c7c60 100644 --- a/backend/OpenFlare/plugins/server/credential/sensitive_test.go +++ b/backend/OpenFlare/plugins/server/kernel/credential/sensitive_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "Wavelet/OpenFlare/plugins/server/runtimeconfig" + "Wavelet/OpenFlare/plugins/server/kernel/runtimeconfig" ) func TestSealAndOpenSensitiveValue(t *testing.T) { diff --git a/backend/OpenFlare/plugins/server/geoip/data/GeoLite2-Country.mmdb b/backend/OpenFlare/plugins/server/kernel/geoip/data/GeoLite2-Country.mmdb similarity index 100% rename from backend/OpenFlare/plugins/server/geoip/data/GeoLite2-Country.mmdb rename to backend/OpenFlare/plugins/server/kernel/geoip/data/GeoLite2-Country.mmdb diff --git a/backend/OpenFlare/plugins/server/geoip/data/data.go b/backend/OpenFlare/plugins/server/kernel/geoip/data/data.go similarity index 100% rename from backend/OpenFlare/plugins/server/geoip/data/data.go rename to backend/OpenFlare/plugins/server/kernel/geoip/data/data.go diff --git a/backend/OpenFlare/plugins/server/geoip/data/data_test.go b/backend/OpenFlare/plugins/server/kernel/geoip/data/data_test.go similarity index 100% rename from backend/OpenFlare/plugins/server/geoip/data/data_test.go rename to backend/OpenFlare/plugins/server/kernel/geoip/data/data_test.go diff --git a/backend/OpenFlare/plugins/server/geoip/lookup.go b/backend/OpenFlare/plugins/server/kernel/geoip/lookup.go similarity index 100% rename from backend/OpenFlare/plugins/server/geoip/lookup.go rename to backend/OpenFlare/plugins/server/kernel/geoip/lookup.go diff --git a/backend/OpenFlare/plugins/server/geoip/lookup_test.go b/backend/OpenFlare/plugins/server/kernel/geoip/lookup_test.go similarity index 100% rename from backend/OpenFlare/plugins/server/geoip/lookup_test.go rename to backend/OpenFlare/plugins/server/kernel/geoip/lookup_test.go diff --git a/backend/OpenFlare/plugins/server/geoip/node.go b/backend/OpenFlare/plugins/server/kernel/geoip/node.go similarity index 97% rename from backend/OpenFlare/plugins/server/geoip/node.go rename to backend/OpenFlare/plugins/server/kernel/geoip/node.go index e72440eb..53af7dab 100644 --- a/backend/OpenFlare/plugins/server/geoip/node.go +++ b/backend/OpenFlare/plugins/server/kernel/geoip/node.go @@ -8,7 +8,7 @@ import ( "net" "strings" - "Wavelet/OpenFlare/plugins/server/model" + "Wavelet/OpenFlare/plugins/server/kernel/model" pkggeoip "Wavelet/OpenFlare/share/geoip" "Wavelet/pkg/logger" ) diff --git a/backend/OpenFlare/plugins/server/geoip/runtime.go b/backend/OpenFlare/plugins/server/kernel/geoip/runtime.go similarity index 94% rename from backend/OpenFlare/plugins/server/geoip/runtime.go rename to backend/OpenFlare/plugins/server/kernel/geoip/runtime.go index a86341e1..4efcb2be 100644 --- a/backend/OpenFlare/plugins/server/geoip/runtime.go +++ b/backend/OpenFlare/plugins/server/kernel/geoip/runtime.go @@ -11,9 +11,9 @@ import ( "strings" "sync" - geodata "Wavelet/OpenFlare/plugins/server/geoip/data" - "Wavelet/OpenFlare/plugins/server/model" - "Wavelet/OpenFlare/plugins/server/repository" + geodata "Wavelet/OpenFlare/plugins/server/kernel/geoip/data" + "Wavelet/OpenFlare/plugins/server/kernel/model" + "Wavelet/OpenFlare/plugins/server/kernel/repository" pkggeoip "Wavelet/OpenFlare/share/geoip" "Wavelet/pkg/logger" ) diff --git a/backend/OpenFlare/plugins/server/geoip/runtime_test.go b/backend/OpenFlare/plugins/server/kernel/geoip/runtime_test.go similarity index 96% rename from backend/OpenFlare/plugins/server/geoip/runtime_test.go rename to backend/OpenFlare/plugins/server/kernel/geoip/runtime_test.go index f6a9f1b6..010a5bd3 100644 --- a/backend/OpenFlare/plugins/server/geoip/runtime_test.go +++ b/backend/OpenFlare/plugins/server/kernel/geoip/runtime_test.go @@ -7,7 +7,7 @@ import ( "context" "testing" - "Wavelet/OpenFlare/plugins/server/model" + "Wavelet/OpenFlare/plugins/server/kernel/model" pkggeoip "Wavelet/OpenFlare/share/geoip" db "Wavelet/plugins/infra/database" diff --git a/backend/OpenFlare/plugins/server/integration/githubrelease/client.go b/backend/OpenFlare/plugins/server/kernel/githubrelease/client.go similarity index 100% rename from backend/OpenFlare/plugins/server/integration/githubrelease/client.go rename to backend/OpenFlare/plugins/server/kernel/githubrelease/client.go diff --git a/backend/OpenFlare/plugins/server/integration/githubrelease/client_test.go b/backend/OpenFlare/plugins/server/kernel/githubrelease/client_test.go similarity index 100% rename from backend/OpenFlare/plugins/server/integration/githubrelease/client_test.go rename to backend/OpenFlare/plugins/server/kernel/githubrelease/client_test.go diff --git a/backend/OpenFlare/plugins/server/integration/githubrelease/transport.go b/backend/OpenFlare/plugins/server/kernel/githubrelease/transport.go similarity index 100% rename from backend/OpenFlare/plugins/server/integration/githubrelease/transport.go rename to backend/OpenFlare/plugins/server/kernel/githubrelease/transport.go diff --git a/backend/OpenFlare/plugins/server/model/analytics/filter.go b/backend/OpenFlare/plugins/server/kernel/model/analytics/filter.go similarity index 100% rename from backend/OpenFlare/plugins/server/model/analytics/filter.go rename to backend/OpenFlare/plugins/server/kernel/model/analytics/filter.go diff --git a/backend/OpenFlare/plugins/server/model/analytics/node_access_log.go b/backend/OpenFlare/plugins/server/kernel/model/analytics/node_access_log.go similarity index 100% rename from backend/OpenFlare/plugins/server/model/analytics/node_access_log.go rename to backend/OpenFlare/plugins/server/kernel/model/analytics/node_access_log.go diff --git a/backend/OpenFlare/plugins/server/model/analytics/node_access_log_stats.go b/backend/OpenFlare/plugins/server/kernel/model/analytics/node_access_log_stats.go similarity index 100% rename from backend/OpenFlare/plugins/server/model/analytics/node_access_log_stats.go rename to backend/OpenFlare/plugins/server/kernel/model/analytics/node_access_log_stats.go diff --git a/backend/OpenFlare/plugins/server/model/analytics/node_observability.go b/backend/OpenFlare/plugins/server/kernel/model/analytics/node_observability.go similarity index 100% rename from backend/OpenFlare/plugins/server/model/analytics/node_observability.go rename to backend/OpenFlare/plugins/server/kernel/model/analytics/node_observability.go diff --git a/backend/OpenFlare/plugins/server/model/analytics/user_access_log.go b/backend/OpenFlare/plugins/server/kernel/model/analytics/user_access_log.go similarity index 100% rename from backend/OpenFlare/plugins/server/model/analytics/user_access_log.go rename to backend/OpenFlare/plugins/server/kernel/model/analytics/user_access_log.go diff --git a/backend/OpenFlare/plugins/server/model/analytics/user_agent.go b/backend/OpenFlare/plugins/server/kernel/model/analytics/user_agent.go similarity index 100% rename from backend/OpenFlare/plugins/server/model/analytics/user_agent.go rename to backend/OpenFlare/plugins/server/kernel/model/analytics/user_agent.go diff --git a/backend/OpenFlare/plugins/server/model/errs.go b/backend/OpenFlare/plugins/server/kernel/model/errs.go similarity index 100% rename from backend/OpenFlare/plugins/server/model/errs.go rename to backend/OpenFlare/plugins/server/kernel/model/errs.go diff --git a/backend/OpenFlare/plugins/server/model/openflare_access_log.go b/backend/OpenFlare/plugins/server/kernel/model/openflare_access_log.go similarity index 100% rename from backend/OpenFlare/plugins/server/model/openflare_access_log.go rename to backend/OpenFlare/plugins/server/kernel/model/openflare_access_log.go diff --git a/backend/OpenFlare/plugins/server/model/openflare_acme_account.go b/backend/OpenFlare/plugins/server/kernel/model/openflare_acme_account.go similarity index 100% rename from backend/OpenFlare/plugins/server/model/openflare_acme_account.go rename to backend/OpenFlare/plugins/server/kernel/model/openflare_acme_account.go diff --git a/backend/OpenFlare/plugins/server/model/openflare_apply_log.go b/backend/OpenFlare/plugins/server/kernel/model/openflare_apply_log.go similarity index 100% rename from backend/OpenFlare/plugins/server/model/openflare_apply_log.go rename to backend/OpenFlare/plugins/server/kernel/model/openflare_apply_log.go diff --git a/backend/OpenFlare/plugins/server/model/openflare_cloudflare.go b/backend/OpenFlare/plugins/server/kernel/model/openflare_cloudflare.go similarity index 100% rename from backend/OpenFlare/plugins/server/model/openflare_cloudflare.go rename to backend/OpenFlare/plugins/server/kernel/model/openflare_cloudflare.go diff --git a/backend/OpenFlare/plugins/server/model/openflare_config_version.go b/backend/OpenFlare/plugins/server/kernel/model/openflare_config_version.go similarity index 100% rename from backend/OpenFlare/plugins/server/model/openflare_config_version.go rename to backend/OpenFlare/plugins/server/kernel/model/openflare_config_version.go diff --git a/backend/OpenFlare/plugins/server/model/openflare_dns_account.go b/backend/OpenFlare/plugins/server/kernel/model/openflare_dns_account.go similarity index 100% rename from backend/OpenFlare/plugins/server/model/openflare_dns_account.go rename to backend/OpenFlare/plugins/server/kernel/model/openflare_dns_account.go diff --git a/backend/OpenFlare/plugins/server/model/openflare_node.go b/backend/OpenFlare/plugins/server/kernel/model/openflare_node.go similarity index 100% rename from backend/OpenFlare/plugins/server/model/openflare_node.go rename to backend/OpenFlare/plugins/server/kernel/model/openflare_node.go diff --git a/backend/OpenFlare/plugins/server/model/openflare_observability.go b/backend/OpenFlare/plugins/server/kernel/model/openflare_observability.go similarity index 100% rename from backend/OpenFlare/plugins/server/model/openflare_observability.go rename to backend/OpenFlare/plugins/server/kernel/model/openflare_observability.go diff --git a/backend/OpenFlare/plugins/server/model/openflare_option.go b/backend/OpenFlare/plugins/server/kernel/model/openflare_option.go similarity index 100% rename from backend/OpenFlare/plugins/server/model/openflare_option.go rename to backend/OpenFlare/plugins/server/kernel/model/openflare_option.go diff --git a/backend/OpenFlare/plugins/server/model/openflare_origin.go b/backend/OpenFlare/plugins/server/kernel/model/openflare_origin.go similarity index 100% rename from backend/OpenFlare/plugins/server/model/openflare_origin.go rename to backend/OpenFlare/plugins/server/kernel/model/openflare_origin.go diff --git a/backend/OpenFlare/plugins/server/model/openflare_pages.go b/backend/OpenFlare/plugins/server/kernel/model/openflare_pages.go similarity index 100% rename from backend/OpenFlare/plugins/server/model/openflare_pages.go rename to backend/OpenFlare/plugins/server/kernel/model/openflare_pages.go diff --git a/backend/OpenFlare/plugins/server/model/openflare_pages_cleanup.go b/backend/OpenFlare/plugins/server/kernel/model/openflare_pages_cleanup.go similarity index 100% rename from backend/OpenFlare/plugins/server/model/openflare_pages_cleanup.go rename to backend/OpenFlare/plugins/server/kernel/model/openflare_pages_cleanup.go diff --git a/backend/OpenFlare/plugins/server/model/openflare_pages_source.go b/backend/OpenFlare/plugins/server/kernel/model/openflare_pages_source.go similarity index 100% rename from backend/OpenFlare/plugins/server/model/openflare_pages_source.go rename to backend/OpenFlare/plugins/server/kernel/model/openflare_pages_source.go diff --git a/backend/OpenFlare/plugins/server/model/openflare_pages_source_test.go b/backend/OpenFlare/plugins/server/kernel/model/openflare_pages_source_test.go similarity index 100% rename from backend/OpenFlare/plugins/server/model/openflare_pages_source_test.go rename to backend/OpenFlare/plugins/server/kernel/model/openflare_pages_source_test.go diff --git a/backend/OpenFlare/plugins/server/model/openflare_proxy_route.go b/backend/OpenFlare/plugins/server/kernel/model/openflare_proxy_route.go similarity index 100% rename from backend/OpenFlare/plugins/server/model/openflare_proxy_route.go rename to backend/OpenFlare/plugins/server/kernel/model/openflare_proxy_route.go diff --git a/backend/OpenFlare/plugins/server/model/openflare_tls.go b/backend/OpenFlare/plugins/server/kernel/model/openflare_tls.go similarity index 100% rename from backend/OpenFlare/plugins/server/model/openflare_tls.go rename to backend/OpenFlare/plugins/server/kernel/model/openflare_tls.go diff --git a/backend/OpenFlare/plugins/server/model/openflare_waf.go b/backend/OpenFlare/plugins/server/kernel/model/openflare_waf.go similarity index 100% rename from backend/OpenFlare/plugins/server/model/openflare_waf.go rename to backend/OpenFlare/plugins/server/kernel/model/openflare_waf.go diff --git a/backend/OpenFlare/plugins/server/model/openflare_zone.go b/backend/OpenFlare/plugins/server/kernel/model/openflare_zone.go similarity index 100% rename from backend/OpenFlare/plugins/server/model/openflare_zone.go rename to backend/OpenFlare/plugins/server/kernel/model/openflare_zone.go diff --git a/backend/OpenFlare/plugins/server/model/platform_aliases.go b/backend/OpenFlare/plugins/server/kernel/model/platform_aliases.go similarity index 100% rename from backend/OpenFlare/plugins/server/model/platform_aliases.go rename to backend/OpenFlare/plugins/server/kernel/model/platform_aliases.go diff --git a/backend/OpenFlare/plugins/server/model/system_configs.go b/backend/OpenFlare/plugins/server/kernel/model/system_configs.go similarity index 100% rename from backend/OpenFlare/plugins/server/model/system_configs.go rename to backend/OpenFlare/plugins/server/kernel/model/system_configs.go diff --git a/backend/OpenFlare/plugins/server/ofevents/events.go b/backend/OpenFlare/plugins/server/kernel/ofevents/events.go similarity index 100% rename from backend/OpenFlare/plugins/server/ofevents/events.go rename to backend/OpenFlare/plugins/server/kernel/ofevents/events.go diff --git a/backend/OpenFlare/plugins/server/ofupload/ofupload.go b/backend/OpenFlare/plugins/server/kernel/ofupload/ofupload.go similarity index 100% rename from backend/OpenFlare/plugins/server/ofupload/ofupload.go rename to backend/OpenFlare/plugins/server/kernel/ofupload/ofupload.go diff --git a/backend/OpenFlare/plugins/server/ofupload/remove.go b/backend/OpenFlare/plugins/server/kernel/ofupload/remove.go similarity index 100% rename from backend/OpenFlare/plugins/server/ofupload/remove.go rename to backend/OpenFlare/plugins/server/kernel/ofupload/remove.go diff --git a/backend/OpenFlare/plugins/server/publicconfig/provider.go b/backend/OpenFlare/plugins/server/kernel/publicconfig/provider.go similarity index 94% rename from backend/OpenFlare/plugins/server/publicconfig/provider.go rename to backend/OpenFlare/plugins/server/kernel/publicconfig/provider.go index 5a7b640a..3ced504a 100644 --- a/backend/OpenFlare/plugins/server/publicconfig/provider.go +++ b/backend/OpenFlare/plugins/server/kernel/publicconfig/provider.go @@ -7,7 +7,7 @@ package publicconfig import ( "context" - "Wavelet/OpenFlare/plugins/server/repository" + "Wavelet/OpenFlare/plugins/server/kernel/repository" "Wavelet/core" ) diff --git a/backend/OpenFlare/plugins/server/publicconfig/provider_test.go b/backend/OpenFlare/plugins/server/kernel/publicconfig/provider_test.go similarity index 92% rename from backend/OpenFlare/plugins/server/publicconfig/provider_test.go rename to backend/OpenFlare/plugins/server/kernel/publicconfig/provider_test.go index e75c20b6..7abfa686 100644 --- a/backend/OpenFlare/plugins/server/publicconfig/provider_test.go +++ b/backend/OpenFlare/plugins/server/kernel/publicconfig/provider_test.go @@ -7,9 +7,9 @@ import ( "context" "testing" - "Wavelet/OpenFlare/plugins/server/model" - "Wavelet/OpenFlare/plugins/server/repository" - "Wavelet/OpenFlare/plugins/server/testhelper" + "Wavelet/OpenFlare/plugins/server/kernel/model" + "Wavelet/OpenFlare/plugins/server/kernel/repository" + "Wavelet/OpenFlare/plugins/server/kernel/testhelper" ) func TestPublicConfigSeesSaveOrUpdateThroughAdminCache(t *testing.T) { diff --git a/backend/OpenFlare/plugins/server/repository/analytics/ch_mocks_test.go b/backend/OpenFlare/plugins/server/kernel/repository/analytics/ch_mocks_test.go similarity index 100% rename from backend/OpenFlare/plugins/server/repository/analytics/ch_mocks_test.go rename to backend/OpenFlare/plugins/server/kernel/repository/analytics/ch_mocks_test.go diff --git a/backend/OpenFlare/plugins/server/repository/analytics/clickhouse_count.go b/backend/OpenFlare/plugins/server/kernel/repository/analytics/clickhouse_count.go similarity index 100% rename from backend/OpenFlare/plugins/server/repository/analytics/clickhouse_count.go rename to backend/OpenFlare/plugins/server/kernel/repository/analytics/clickhouse_count.go diff --git a/backend/OpenFlare/plugins/server/repository/analytics/clickhouse_count_test.go b/backend/OpenFlare/plugins/server/kernel/repository/analytics/clickhouse_count_test.go similarity index 100% rename from backend/OpenFlare/plugins/server/repository/analytics/clickhouse_count_test.go rename to backend/OpenFlare/plugins/server/kernel/repository/analytics/clickhouse_count_test.go diff --git a/backend/OpenFlare/plugins/server/repository/analytics/clickhouse_maintenance.go b/backend/OpenFlare/plugins/server/kernel/repository/analytics/clickhouse_maintenance.go similarity index 100% rename from backend/OpenFlare/plugins/server/repository/analytics/clickhouse_maintenance.go rename to backend/OpenFlare/plugins/server/kernel/repository/analytics/clickhouse_maintenance.go diff --git a/backend/OpenFlare/plugins/server/repository/analytics/clickhouse_maintenance_test.go b/backend/OpenFlare/plugins/server/kernel/repository/analytics/clickhouse_maintenance_test.go similarity index 100% rename from backend/OpenFlare/plugins/server/repository/analytics/clickhouse_maintenance_test.go rename to backend/OpenFlare/plugins/server/kernel/repository/analytics/clickhouse_maintenance_test.go diff --git a/backend/OpenFlare/plugins/server/repository/analytics/clickhouse_stats.go b/backend/OpenFlare/plugins/server/kernel/repository/analytics/clickhouse_stats.go similarity index 93% rename from backend/OpenFlare/plugins/server/repository/analytics/clickhouse_stats.go rename to backend/OpenFlare/plugins/server/kernel/repository/analytics/clickhouse_stats.go index a5e85afc..dc36ba44 100644 --- a/backend/OpenFlare/plugins/server/repository/analytics/clickhouse_stats.go +++ b/backend/OpenFlare/plugins/server/kernel/repository/analytics/clickhouse_stats.go @@ -8,8 +8,8 @@ import ( "errors" "fmt" - analyticsmodel "Wavelet/OpenFlare/plugins/server/model/analytics" - "Wavelet/OpenFlare/plugins/server/runtimeconfig" + analyticsmodel "Wavelet/OpenFlare/plugins/server/kernel/model/analytics" + "Wavelet/OpenFlare/plugins/server/kernel/runtimeconfig" db "Wavelet/plugins/infra/database" ) diff --git a/backend/OpenFlare/plugins/server/repository/analytics/node_access_log.go b/backend/OpenFlare/plugins/server/kernel/repository/analytics/node_access_log.go similarity index 99% rename from backend/OpenFlare/plugins/server/repository/analytics/node_access_log.go rename to backend/OpenFlare/plugins/server/kernel/repository/analytics/node_access_log.go index 2aab6863..a01ff1fc 100644 --- a/backend/OpenFlare/plugins/server/repository/analytics/node_access_log.go +++ b/backend/OpenFlare/plugins/server/kernel/repository/analytics/node_access_log.go @@ -10,7 +10,7 @@ import ( "strings" "time" - analyticsmodel "Wavelet/OpenFlare/plugins/server/model/analytics" + analyticsmodel "Wavelet/OpenFlare/plugins/server/kernel/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_delete.go b/backend/OpenFlare/plugins/server/kernel/repository/analytics/node_access_log_delete.go similarity index 100% rename from backend/OpenFlare/plugins/server/repository/analytics/node_access_log_delete.go rename to backend/OpenFlare/plugins/server/kernel/repository/analytics/node_access_log_delete.go diff --git a/backend/OpenFlare/plugins/server/repository/analytics/node_access_log_filter.go b/backend/OpenFlare/plugins/server/kernel/repository/analytics/node_access_log_filter.go similarity index 98% rename from backend/OpenFlare/plugins/server/repository/analytics/node_access_log_filter.go rename to backend/OpenFlare/plugins/server/kernel/repository/analytics/node_access_log_filter.go index dc653870..5bc2e55d 100644 --- a/backend/OpenFlare/plugins/server/repository/analytics/node_access_log_filter.go +++ b/backend/OpenFlare/plugins/server/kernel/repository/analytics/node_access_log_filter.go @@ -7,7 +7,7 @@ import ( "fmt" "strings" - analyticsmodel "Wavelet/OpenFlare/plugins/server/model/analytics" + analyticsmodel "Wavelet/OpenFlare/plugins/server/kernel/model/analytics" "Wavelet/pkg/util" ) diff --git a/backend/OpenFlare/plugins/server/repository/analytics/node_access_log_stats.go b/backend/OpenFlare/plugins/server/kernel/repository/analytics/node_access_log_stats.go similarity index 99% rename from backend/OpenFlare/plugins/server/repository/analytics/node_access_log_stats.go rename to backend/OpenFlare/plugins/server/kernel/repository/analytics/node_access_log_stats.go index 0872d628..d3590484 100644 --- a/backend/OpenFlare/plugins/server/repository/analytics/node_access_log_stats.go +++ b/backend/OpenFlare/plugins/server/kernel/repository/analytics/node_access_log_stats.go @@ -9,7 +9,7 @@ import ( "strings" "time" - analyticsmodel "Wavelet/OpenFlare/plugins/server/model/analytics" + analyticsmodel "Wavelet/OpenFlare/plugins/server/kernel/model/analytics" ) // NodeAccessLogBucketAggregate is a folded bucket aggregate row. diff --git a/backend/OpenFlare/plugins/server/repository/analytics/node_access_log_test.go b/backend/OpenFlare/plugins/server/kernel/repository/analytics/node_access_log_test.go similarity index 95% rename from backend/OpenFlare/plugins/server/repository/analytics/node_access_log_test.go rename to backend/OpenFlare/plugins/server/kernel/repository/analytics/node_access_log_test.go index d2e7b6ee..c267d506 100644 --- a/backend/OpenFlare/plugins/server/repository/analytics/node_access_log_test.go +++ b/backend/OpenFlare/plugins/server/kernel/repository/analytics/node_access_log_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - analyticsmodel "Wavelet/OpenFlare/plugins/server/model/analytics" + analyticsmodel "Wavelet/OpenFlare/plugins/server/kernel/model/analytics" "Wavelet/pkg/idgen" db "Wavelet/plugins/infra/database" diff --git a/backend/OpenFlare/plugins/server/repository/analytics/node_access_log_writer.go b/backend/OpenFlare/plugins/server/kernel/repository/analytics/node_access_log_writer.go similarity index 95% rename from backend/OpenFlare/plugins/server/repository/analytics/node_access_log_writer.go rename to backend/OpenFlare/plugins/server/kernel/repository/analytics/node_access_log_writer.go index 892d2f02..2bfaf06c 100644 --- a/backend/OpenFlare/plugins/server/repository/analytics/node_access_log_writer.go +++ b/backend/OpenFlare/plugins/server/kernel/repository/analytics/node_access_log_writer.go @@ -10,7 +10,7 @@ import ( "strings" "time" - analyticsmodel "Wavelet/OpenFlare/plugins/server/model/analytics" + analyticsmodel "Wavelet/OpenFlare/plugins/server/kernel/model/analytics" "Wavelet/pkg/idgen" db "Wavelet/plugins/infra/database" ) diff --git a/backend/OpenFlare/plugins/server/repository/analytics/node_observability.go b/backend/OpenFlare/plugins/server/kernel/repository/analytics/node_observability.go similarity index 99% rename from backend/OpenFlare/plugins/server/repository/analytics/node_observability.go rename to backend/OpenFlare/plugins/server/kernel/repository/analytics/node_observability.go index 29f57f0b..74c0f22f 100644 --- a/backend/OpenFlare/plugins/server/repository/analytics/node_observability.go +++ b/backend/OpenFlare/plugins/server/kernel/repository/analytics/node_observability.go @@ -10,7 +10,7 @@ import ( "slices" "time" - analyticsmodel "Wavelet/OpenFlare/plugins/server/model/analytics" + analyticsmodel "Wavelet/OpenFlare/plugins/server/kernel/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_delete.go b/backend/OpenFlare/plugins/server/kernel/repository/analytics/node_observability_delete.go similarity index 100% rename from backend/OpenFlare/plugins/server/repository/analytics/node_observability_delete.go rename to backend/OpenFlare/plugins/server/kernel/repository/analytics/node_observability_delete.go diff --git a/backend/OpenFlare/plugins/server/repository/analytics/node_observability_filter.go b/backend/OpenFlare/plugins/server/kernel/repository/analytics/node_observability_filter.go similarity index 95% rename from backend/OpenFlare/plugins/server/repository/analytics/node_observability_filter.go rename to backend/OpenFlare/plugins/server/kernel/repository/analytics/node_observability_filter.go index b2d40dd5..bb8b030d 100644 --- a/backend/OpenFlare/plugins/server/repository/analytics/node_observability_filter.go +++ b/backend/OpenFlare/plugins/server/kernel/repository/analytics/node_observability_filter.go @@ -6,7 +6,7 @@ package analytics import ( "strings" - analyticsmodel "Wavelet/OpenFlare/plugins/server/model/analytics" + analyticsmodel "Wavelet/OpenFlare/plugins/server/kernel/model/analytics" ) const nodeObservabilityFilterClauseCapacity = 3 diff --git a/backend/OpenFlare/plugins/server/repository/analytics/node_observability_latest_test.go b/backend/OpenFlare/plugins/server/kernel/repository/analytics/node_observability_latest_test.go similarity index 100% rename from backend/OpenFlare/plugins/server/repository/analytics/node_observability_latest_test.go rename to backend/OpenFlare/plugins/server/kernel/repository/analytics/node_observability_latest_test.go diff --git a/backend/OpenFlare/plugins/server/repository/analytics/node_observability_test.go b/backend/OpenFlare/plugins/server/kernel/repository/analytics/node_observability_test.go similarity index 94% rename from backend/OpenFlare/plugins/server/repository/analytics/node_observability_test.go rename to backend/OpenFlare/plugins/server/kernel/repository/analytics/node_observability_test.go index 6d1656c2..adc9fe20 100644 --- a/backend/OpenFlare/plugins/server/repository/analytics/node_observability_test.go +++ b/backend/OpenFlare/plugins/server/kernel/repository/analytics/node_observability_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - analyticsmodel "Wavelet/OpenFlare/plugins/server/model/analytics" + analyticsmodel "Wavelet/OpenFlare/plugins/server/kernel/model/analytics" db "Wavelet/plugins/infra/database" "github.com/stretchr/testify/assert" diff --git a/backend/OpenFlare/plugins/server/repository/analytics/node_observability_writer.go b/backend/OpenFlare/plugins/server/kernel/repository/analytics/node_observability_writer.go similarity index 98% rename from backend/OpenFlare/plugins/server/repository/analytics/node_observability_writer.go rename to backend/OpenFlare/plugins/server/kernel/repository/analytics/node_observability_writer.go index fb78d7c4..66038251 100644 --- a/backend/OpenFlare/plugins/server/repository/analytics/node_observability_writer.go +++ b/backend/OpenFlare/plugins/server/kernel/repository/analytics/node_observability_writer.go @@ -10,7 +10,7 @@ import ( "strings" "time" - analyticsmodel "Wavelet/OpenFlare/plugins/server/model/analytics" + analyticsmodel "Wavelet/OpenFlare/plugins/server/kernel/model/analytics" "Wavelet/pkg/idgen" db "Wavelet/plugins/infra/database" ) diff --git a/backend/OpenFlare/plugins/server/repository/analytics/sql_fragments.go b/backend/OpenFlare/plugins/server/kernel/repository/analytics/sql_fragments.go similarity index 100% rename from backend/OpenFlare/plugins/server/repository/analytics/sql_fragments.go rename to backend/OpenFlare/plugins/server/kernel/repository/analytics/sql_fragments.go diff --git a/backend/OpenFlare/plugins/server/repository/analytics/user_access_log.go b/backend/OpenFlare/plugins/server/kernel/repository/analytics/user_access_log.go similarity index 97% rename from backend/OpenFlare/plugins/server/repository/analytics/user_access_log.go rename to backend/OpenFlare/plugins/server/kernel/repository/analytics/user_access_log.go index f3c2add4..f76d7058 100644 --- a/backend/OpenFlare/plugins/server/repository/analytics/user_access_log.go +++ b/backend/OpenFlare/plugins/server/kernel/repository/analytics/user_access_log.go @@ -7,7 +7,7 @@ import ( "context" "time" - analyticsmodel "Wavelet/OpenFlare/plugins/server/model/analytics" + analyticsmodel "Wavelet/OpenFlare/plugins/server/kernel/model/analytics" risklogstore "Wavelet/plugins/domain/risk_control/logstore" ) diff --git a/backend/OpenFlare/plugins/server/repository/errs.go b/backend/OpenFlare/plugins/server/kernel/repository/errs.go similarity index 100% rename from backend/OpenFlare/plugins/server/repository/errs.go rename to backend/OpenFlare/plugins/server/kernel/repository/errs.go diff --git a/backend/OpenFlare/plugins/server/repository/logstore/cleanup.go b/backend/OpenFlare/plugins/server/kernel/repository/logstore/cleanup.go similarity index 99% rename from backend/OpenFlare/plugins/server/repository/logstore/cleanup.go rename to backend/OpenFlare/plugins/server/kernel/repository/logstore/cleanup.go index b175c8bc..1307f559 100644 --- a/backend/OpenFlare/plugins/server/repository/logstore/cleanup.go +++ b/backend/OpenFlare/plugins/server/kernel/repository/logstore/cleanup.go @@ -11,7 +11,7 @@ import ( "strings" "time" - "Wavelet/OpenFlare/plugins/server/model" + "Wavelet/OpenFlare/plugins/server/kernel/model" "Wavelet/pkg/logger" ) diff --git a/backend/OpenFlare/plugins/server/repository/logstore/cleanup_test.go b/backend/OpenFlare/plugins/server/kernel/repository/logstore/cleanup_test.go similarity index 99% rename from backend/OpenFlare/plugins/server/repository/logstore/cleanup_test.go rename to backend/OpenFlare/plugins/server/kernel/repository/logstore/cleanup_test.go index e530d9ed..70c8e35e 100644 --- a/backend/OpenFlare/plugins/server/repository/logstore/cleanup_test.go +++ b/backend/OpenFlare/plugins/server/kernel/repository/logstore/cleanup_test.go @@ -15,8 +15,8 @@ import ( "gorm.io/gorm" "gorm.io/gorm/logger" - "Wavelet/OpenFlare/plugins/server/model" - analyticsmodel "Wavelet/OpenFlare/plugins/server/model/analytics" + "Wavelet/OpenFlare/plugins/server/kernel/model" + analyticsmodel "Wavelet/OpenFlare/plugins/server/kernel/model/analytics" db "Wavelet/plugins/infra/database" ) diff --git a/backend/OpenFlare/plugins/server/repository/logstore/clickhouse_store.go b/backend/OpenFlare/plugins/server/kernel/repository/logstore/clickhouse_store.go similarity index 99% rename from backend/OpenFlare/plugins/server/repository/logstore/clickhouse_store.go rename to backend/OpenFlare/plugins/server/kernel/repository/logstore/clickhouse_store.go index 2027537e..dfe81343 100644 --- a/backend/OpenFlare/plugins/server/repository/logstore/clickhouse_store.go +++ b/backend/OpenFlare/plugins/server/kernel/repository/logstore/clickhouse_store.go @@ -10,9 +10,9 @@ import ( "math" "time" - "Wavelet/OpenFlare/plugins/server/model" - analyticsmodel "Wavelet/OpenFlare/plugins/server/model/analytics" - analyticsrepo "Wavelet/OpenFlare/plugins/server/repository/analytics" + "Wavelet/OpenFlare/plugins/server/kernel/model" + analyticsmodel "Wavelet/OpenFlare/plugins/server/kernel/model/analytics" + analyticsrepo "Wavelet/OpenFlare/plugins/server/kernel/repository/analytics" db "Wavelet/plugins/infra/database" "github.com/ClickHouse/clickhouse-go/v2/lib/driver" diff --git a/backend/OpenFlare/plugins/server/repository/logstore/clickhouse_store_test.go b/backend/OpenFlare/plugins/server/kernel/repository/logstore/clickhouse_store_test.go similarity index 100% rename from backend/OpenFlare/plugins/server/repository/logstore/clickhouse_store_test.go rename to backend/OpenFlare/plugins/server/kernel/repository/logstore/clickhouse_store_test.go diff --git a/backend/OpenFlare/plugins/server/repository/logstore/dialect_postgres.go b/backend/OpenFlare/plugins/server/kernel/repository/logstore/dialect_postgres.go similarity index 100% rename from backend/OpenFlare/plugins/server/repository/logstore/dialect_postgres.go rename to backend/OpenFlare/plugins/server/kernel/repository/logstore/dialect_postgres.go diff --git a/backend/OpenFlare/plugins/server/repository/logstore/dialect_sqlite.go b/backend/OpenFlare/plugins/server/kernel/repository/logstore/dialect_sqlite.go similarity index 100% rename from backend/OpenFlare/plugins/server/repository/logstore/dialect_sqlite.go rename to backend/OpenFlare/plugins/server/kernel/repository/logstore/dialect_sqlite.go diff --git a/backend/OpenFlare/plugins/server/repository/logstore/hooks.go b/backend/OpenFlare/plugins/server/kernel/repository/logstore/hooks.go similarity index 95% rename from backend/OpenFlare/plugins/server/repository/logstore/hooks.go rename to backend/OpenFlare/plugins/server/kernel/repository/logstore/hooks.go index e0316117..13b3b0d5 100644 --- a/backend/OpenFlare/plugins/server/repository/logstore/hooks.go +++ b/backend/OpenFlare/plugins/server/kernel/repository/logstore/hooks.go @@ -6,7 +6,7 @@ package logstore import ( "sync" - analyticsmodel "Wavelet/OpenFlare/plugins/server/model/analytics" + analyticsmodel "Wavelet/OpenFlare/plugins/server/kernel/model/analytics" ) // AccessLogHooks 节点访问日志异步入队回调（由 chwriter 装配）。 diff --git a/backend/OpenFlare/plugins/server/repository/logstore/imports_test.go b/backend/OpenFlare/plugins/server/kernel/repository/logstore/imports_test.go similarity index 91% rename from backend/OpenFlare/plugins/server/repository/logstore/imports_test.go rename to backend/OpenFlare/plugins/server/kernel/repository/logstore/imports_test.go index 52f84e8c..3cf6f9a1 100644 --- a/backend/OpenFlare/plugins/server/repository/logstore/imports_test.go +++ b/backend/OpenFlare/plugins/server/kernel/repository/logstore/imports_test.go @@ -14,7 +14,7 @@ const serverPkg = "Wavelet/OpenFlare/plugins/server" // forbiddenImports 业务域禁止直接触碰的底层日志实现。 var forbiddenImports = []string{ - serverPkg + "/repository/analytics", + serverPkg + "/kernel/repository/analytics", } // allowedAnalyticsDelegation 允许直接依赖 analytics 仓储的委托层： @@ -24,8 +24,8 @@ var forbiddenImports = []string{ // // 除此之外，依赖闭包内任何包都禁止引入 analytics 仓储。 var allowedAnalyticsDelegation = map[string]bool{ - serverPkg + "/repository": true, - serverPkg + "/repository/logstore": true, + serverPkg + "/kernel/repository": true, + serverPkg + "/kernel/repository/logstore": true, } // allowedInfraPersistence 允许业务域包引入的 infra/persistence 子包。 @@ -37,8 +37,9 @@ var allowedInfraPersistence = []string{ // domainScopes 是 server 插件内的业务域包（等价于改造前的 internal/apps/...）。 // 持久化与基础设施层（repository/infra/model/…）不受本门禁约束。 var domainScopes = []string{ - "site", "fleet", "pages", "waf", "tls", "cloudflare", - "observability", "dashboard", "option", "updater", + "domain/site", "domain/fleet", "domain/pages", "domain/waf", "domain/tls", + "domain/cloudflare", "domain/observability", "domain/dashboard", "domain/option", + "updater", } func TestDomainsMustNotImportLogBackendDirectly(t *testing.T) { diff --git a/backend/OpenFlare/plugins/server/repository/logstore/insert_hooks_test.go b/backend/OpenFlare/plugins/server/kernel/repository/logstore/insert_hooks_test.go similarity index 93% rename from backend/OpenFlare/plugins/server/repository/logstore/insert_hooks_test.go rename to backend/OpenFlare/plugins/server/kernel/repository/logstore/insert_hooks_test.go index cb2efd05..c7660ea1 100644 --- a/backend/OpenFlare/plugins/server/repository/logstore/insert_hooks_test.go +++ b/backend/OpenFlare/plugins/server/kernel/repository/logstore/insert_hooks_test.go @@ -8,8 +8,8 @@ import ( "testing" "time" - "Wavelet/OpenFlare/plugins/server/model" - analyticsmodel "Wavelet/OpenFlare/plugins/server/model/analytics" + "Wavelet/OpenFlare/plugins/server/kernel/model" + analyticsmodel "Wavelet/OpenFlare/plugins/server/kernel/model/analytics" ) // TestGormAccessLogInsertBatchHooks 覆盖访问日志写入入口： diff --git a/backend/OpenFlare/plugins/server/repository/logstore/logstore.go b/backend/OpenFlare/plugins/server/kernel/repository/logstore/logstore.go similarity index 98% rename from backend/OpenFlare/plugins/server/repository/logstore/logstore.go rename to backend/OpenFlare/plugins/server/kernel/repository/logstore/logstore.go index 5707ad28..0adf9605 100644 --- a/backend/OpenFlare/plugins/server/repository/logstore/logstore.go +++ b/backend/OpenFlare/plugins/server/kernel/repository/logstore/logstore.go @@ -10,8 +10,8 @@ import ( "errors" "time" - "Wavelet/OpenFlare/plugins/server/model" - analyticsmodel "Wavelet/OpenFlare/plugins/server/model/analytics" + "Wavelet/OpenFlare/plugins/server/kernel/model" + analyticsmodel "Wavelet/OpenFlare/plugins/server/kernel/model/analytics" ) // ErrMigrating 表示日志数据库正在迁移，当前禁止写入。 diff --git a/backend/OpenFlare/plugins/server/repository/logstore/partition_cleanup.go b/backend/OpenFlare/plugins/server/kernel/repository/logstore/partition_cleanup.go similarity index 100% rename from backend/OpenFlare/plugins/server/repository/logstore/partition_cleanup.go rename to backend/OpenFlare/plugins/server/kernel/repository/logstore/partition_cleanup.go diff --git a/backend/OpenFlare/plugins/server/repository/logstore/postgres_partition_integration_test.go b/backend/OpenFlare/plugins/server/kernel/repository/logstore/postgres_partition_integration_test.go similarity index 99% rename from backend/OpenFlare/plugins/server/repository/logstore/postgres_partition_integration_test.go rename to backend/OpenFlare/plugins/server/kernel/repository/logstore/postgres_partition_integration_test.go index baff20aa..d3933ea6 100644 --- a/backend/OpenFlare/plugins/server/repository/logstore/postgres_partition_integration_test.go +++ b/backend/OpenFlare/plugins/server/kernel/repository/logstore/postgres_partition_integration_test.go @@ -16,7 +16,7 @@ import ( "gorm.io/gorm" "gorm.io/gorm/logger" - analyticsmodel "Wavelet/OpenFlare/plugins/server/model/analytics" + analyticsmodel "Wavelet/OpenFlare/plugins/server/kernel/model/analytics" ) // TestEnsurePartitionsPostgresInsertAcrossMonths 需要 TEST_POSTGRES_DSN（未设置时跳过）： diff --git a/backend/OpenFlare/plugins/server/repository/logstore/postgres_store.go b/backend/OpenFlare/plugins/server/kernel/repository/logstore/postgres_store.go similarity index 99% rename from backend/OpenFlare/plugins/server/repository/logstore/postgres_store.go rename to backend/OpenFlare/plugins/server/kernel/repository/logstore/postgres_store.go index 28300fd7..96f0ae41 100644 --- a/backend/OpenFlare/plugins/server/repository/logstore/postgres_store.go +++ b/backend/OpenFlare/plugins/server/kernel/repository/logstore/postgres_store.go @@ -13,8 +13,8 @@ import ( "strings" "time" - "Wavelet/OpenFlare/plugins/server/model" - analyticsmodel "Wavelet/OpenFlare/plugins/server/model/analytics" + "Wavelet/OpenFlare/plugins/server/kernel/model" + analyticsmodel "Wavelet/OpenFlare/plugins/server/kernel/model/analytics" "Wavelet/pkg/idgen" "Wavelet/pkg/util" diff --git a/backend/OpenFlare/plugins/server/repository/logstore/postgres_store_test.go b/backend/OpenFlare/plugins/server/kernel/repository/logstore/postgres_store_test.go similarity index 99% rename from backend/OpenFlare/plugins/server/repository/logstore/postgres_store_test.go rename to backend/OpenFlare/plugins/server/kernel/repository/logstore/postgres_store_test.go index 233ee533..422586eb 100644 --- a/backend/OpenFlare/plugins/server/repository/logstore/postgres_store_test.go +++ b/backend/OpenFlare/plugins/server/kernel/repository/logstore/postgres_store_test.go @@ -17,8 +17,8 @@ import ( "gorm.io/gorm" "gorm.io/gorm/logger" - "Wavelet/OpenFlare/plugins/server/model" - analyticsmodel "Wavelet/OpenFlare/plugins/server/model/analytics" + "Wavelet/OpenFlare/plugins/server/kernel/model" + analyticsmodel "Wavelet/OpenFlare/plugins/server/kernel/model/analytics" "Wavelet/pkg/idgen" ) diff --git a/backend/OpenFlare/plugins/server/repository/logstore/provider.go b/backend/OpenFlare/plugins/server/kernel/repository/logstore/provider.go similarity index 98% rename from backend/OpenFlare/plugins/server/repository/logstore/provider.go rename to backend/OpenFlare/plugins/server/kernel/repository/logstore/provider.go index 92eed378..edf96203 100644 --- a/backend/OpenFlare/plugins/server/repository/logstore/provider.go +++ b/backend/OpenFlare/plugins/server/kernel/repository/logstore/provider.go @@ -10,8 +10,8 @@ import ( "sync" "time" - "Wavelet/OpenFlare/plugins/server/model" - "Wavelet/OpenFlare/plugins/server/runtimeconfig" + "Wavelet/OpenFlare/plugins/server/kernel/model" + "Wavelet/OpenFlare/plugins/server/kernel/runtimeconfig" "Wavelet/pkg/logger" db "Wavelet/plugins/infra/database" ) diff --git a/backend/OpenFlare/plugins/server/repository/logstore/provider_test.go b/backend/OpenFlare/plugins/server/kernel/repository/logstore/provider_test.go similarity index 97% rename from backend/OpenFlare/plugins/server/repository/logstore/provider_test.go rename to backend/OpenFlare/plugins/server/kernel/repository/logstore/provider_test.go index 8258ecd6..16fad797 100644 --- a/backend/OpenFlare/plugins/server/repository/logstore/provider_test.go +++ b/backend/OpenFlare/plugins/server/kernel/repository/logstore/provider_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - analyticsmodel "Wavelet/OpenFlare/plugins/server/model/analytics" + analyticsmodel "Wavelet/OpenFlare/plugins/server/kernel/model/analytics" ) func TestMigratingReadsConfig(t *testing.T) { diff --git a/backend/OpenFlare/plugins/server/repository/openflare_access_log.go b/backend/OpenFlare/plugins/server/kernel/repository/openflare_access_log.go similarity index 98% rename from backend/OpenFlare/plugins/server/repository/openflare_access_log.go rename to backend/OpenFlare/plugins/server/kernel/repository/openflare_access_log.go index 38ee3f90..2dee25f1 100644 --- a/backend/OpenFlare/plugins/server/repository/openflare_access_log.go +++ b/backend/OpenFlare/plugins/server/kernel/repository/openflare_access_log.go @@ -9,10 +9,10 @@ import ( "strings" "time" - analyticsmodel "Wavelet/OpenFlare/plugins/server/model/analytics" + analyticsmodel "Wavelet/OpenFlare/plugins/server/kernel/model/analytics" - "Wavelet/OpenFlare/plugins/server/model" - "Wavelet/OpenFlare/plugins/server/repository/logstore" + "Wavelet/OpenFlare/plugins/server/kernel/model" + "Wavelet/OpenFlare/plugins/server/kernel/repository/logstore" ) const ( diff --git a/backend/OpenFlare/plugins/server/repository/openflare_access_log_test.go b/backend/OpenFlare/plugins/server/kernel/repository/openflare_access_log_test.go similarity index 96% rename from backend/OpenFlare/plugins/server/repository/openflare_access_log_test.go rename to backend/OpenFlare/plugins/server/kernel/repository/openflare_access_log_test.go index e2408350..27c8577f 100644 --- a/backend/OpenFlare/plugins/server/repository/openflare_access_log_test.go +++ b/backend/OpenFlare/plugins/server/kernel/repository/openflare_access_log_test.go @@ -14,9 +14,9 @@ import ( "gorm.io/gorm" "gorm.io/gorm/logger" - "Wavelet/OpenFlare/plugins/server/model" - analyticsmodel "Wavelet/OpenFlare/plugins/server/model/analytics" - "Wavelet/OpenFlare/plugins/server/repository/logstore" + "Wavelet/OpenFlare/plugins/server/kernel/model" + analyticsmodel "Wavelet/OpenFlare/plugins/server/kernel/model/analytics" + "Wavelet/OpenFlare/plugins/server/kernel/repository/logstore" "Wavelet/pkg/idgen" db "Wavelet/plugins/infra/database" diff --git a/backend/OpenFlare/plugins/server/repository/openflare_acme_account.go b/backend/OpenFlare/plugins/server/kernel/repository/openflare_acme_account.go similarity index 97% rename from backend/OpenFlare/plugins/server/repository/openflare_acme_account.go rename to backend/OpenFlare/plugins/server/kernel/repository/openflare_acme_account.go index 92560116..21c436c9 100644 --- a/backend/OpenFlare/plugins/server/repository/openflare_acme_account.go +++ b/backend/OpenFlare/plugins/server/kernel/repository/openflare_acme_account.go @@ -9,7 +9,7 @@ import ( "gorm.io/gorm" - "Wavelet/OpenFlare/plugins/server/model" + "Wavelet/OpenFlare/plugins/server/kernel/model" db "Wavelet/plugins/infra/database" ) diff --git a/backend/OpenFlare/plugins/server/repository/openflare_apply_log.go b/backend/OpenFlare/plugins/server/kernel/repository/openflare_apply_log.go similarity index 98% rename from backend/OpenFlare/plugins/server/repository/openflare_apply_log.go rename to backend/OpenFlare/plugins/server/kernel/repository/openflare_apply_log.go index f3c5047f..f3289bbc 100644 --- a/backend/OpenFlare/plugins/server/repository/openflare_apply_log.go +++ b/backend/OpenFlare/plugins/server/kernel/repository/openflare_apply_log.go @@ -11,7 +11,7 @@ import ( "gorm.io/gorm" - "Wavelet/OpenFlare/plugins/server/model" + "Wavelet/OpenFlare/plugins/server/kernel/model" db "Wavelet/plugins/infra/database" ) diff --git a/backend/OpenFlare/plugins/server/repository/openflare_apply_log_test.go b/backend/OpenFlare/plugins/server/kernel/repository/openflare_apply_log_test.go similarity index 97% rename from backend/OpenFlare/plugins/server/repository/openflare_apply_log_test.go rename to backend/OpenFlare/plugins/server/kernel/repository/openflare_apply_log_test.go index cb9ddc11..72e8424c 100644 --- a/backend/OpenFlare/plugins/server/repository/openflare_apply_log_test.go +++ b/backend/OpenFlare/plugins/server/kernel/repository/openflare_apply_log_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "Wavelet/OpenFlare/plugins/server/model" + "Wavelet/OpenFlare/plugins/server/kernel/model" db "Wavelet/plugins/infra/database" diff --git a/backend/OpenFlare/plugins/server/repository/openflare_cloudflare.go b/backend/OpenFlare/plugins/server/kernel/repository/openflare_cloudflare.go similarity index 99% rename from backend/OpenFlare/plugins/server/repository/openflare_cloudflare.go rename to backend/OpenFlare/plugins/server/kernel/repository/openflare_cloudflare.go index 1825d30c..91fba9c4 100644 --- a/backend/OpenFlare/plugins/server/repository/openflare_cloudflare.go +++ b/backend/OpenFlare/plugins/server/kernel/repository/openflare_cloudflare.go @@ -7,7 +7,7 @@ import ( "context" "errors" - "Wavelet/OpenFlare/plugins/server/model" + "Wavelet/OpenFlare/plugins/server/kernel/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/kernel/repository/openflare_cloudflare_test.go similarity index 98% rename from backend/OpenFlare/plugins/server/repository/openflare_cloudflare_test.go rename to backend/OpenFlare/plugins/server/kernel/repository/openflare_cloudflare_test.go index 62f979a6..e622e526 100644 --- a/backend/OpenFlare/plugins/server/repository/openflare_cloudflare_test.go +++ b/backend/OpenFlare/plugins/server/kernel/repository/openflare_cloudflare_test.go @@ -7,7 +7,7 @@ import ( "context" "testing" - "Wavelet/OpenFlare/plugins/server/model" + "Wavelet/OpenFlare/plugins/server/kernel/model" db "Wavelet/plugins/infra/database" "github.com/glebarez/sqlite" diff --git a/backend/OpenFlare/plugins/server/repository/openflare_config_version.go b/backend/OpenFlare/plugins/server/kernel/repository/openflare_config_version.go similarity index 98% rename from backend/OpenFlare/plugins/server/repository/openflare_config_version.go rename to backend/OpenFlare/plugins/server/kernel/repository/openflare_config_version.go index 7769edcc..d6dce775 100644 --- a/backend/OpenFlare/plugins/server/repository/openflare_config_version.go +++ b/backend/OpenFlare/plugins/server/kernel/repository/openflare_config_version.go @@ -9,7 +9,7 @@ import ( "gorm.io/gorm" - "Wavelet/OpenFlare/plugins/server/model" + "Wavelet/OpenFlare/plugins/server/kernel/model" db "Wavelet/plugins/infra/database" ) diff --git a/backend/OpenFlare/plugins/server/repository/openflare_dns_account.go b/backend/OpenFlare/plugins/server/kernel/repository/openflare_dns_account.go similarity index 97% rename from backend/OpenFlare/plugins/server/repository/openflare_dns_account.go rename to backend/OpenFlare/plugins/server/kernel/repository/openflare_dns_account.go index 320064b5..ed375f73 100644 --- a/backend/OpenFlare/plugins/server/repository/openflare_dns_account.go +++ b/backend/OpenFlare/plugins/server/kernel/repository/openflare_dns_account.go @@ -7,7 +7,7 @@ import ( "context" "errors" - "Wavelet/OpenFlare/plugins/server/model" + "Wavelet/OpenFlare/plugins/server/kernel/model" db "Wavelet/plugins/infra/database" ) diff --git a/backend/OpenFlare/plugins/server/repository/openflare_node.go b/backend/OpenFlare/plugins/server/kernel/repository/openflare_node.go similarity index 99% rename from backend/OpenFlare/plugins/server/repository/openflare_node.go rename to backend/OpenFlare/plugins/server/kernel/repository/openflare_node.go index 199eb33b..cbe7b736 100644 --- a/backend/OpenFlare/plugins/server/repository/openflare_node.go +++ b/backend/OpenFlare/plugins/server/kernel/repository/openflare_node.go @@ -10,7 +10,7 @@ import ( "gorm.io/gorm" - "Wavelet/OpenFlare/plugins/server/model" + "Wavelet/OpenFlare/plugins/server/kernel/model" db "Wavelet/plugins/infra/database" ) diff --git a/backend/OpenFlare/plugins/server/repository/openflare_observability.go b/backend/OpenFlare/plugins/server/kernel/repository/openflare_observability.go similarity index 98% rename from backend/OpenFlare/plugins/server/repository/openflare_observability.go rename to backend/OpenFlare/plugins/server/kernel/repository/openflare_observability.go index bd7bf3ad..d8a9f7e2 100644 --- a/backend/OpenFlare/plugins/server/repository/openflare_observability.go +++ b/backend/OpenFlare/plugins/server/kernel/repository/openflare_observability.go @@ -13,10 +13,10 @@ import ( "gorm.io/gorm" "gorm.io/gorm/clause" - "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/OpenFlare/plugins/server/kernel/model" + analyticsmodel "Wavelet/OpenFlare/plugins/server/kernel/model/analytics" + analyticsrepo "Wavelet/OpenFlare/plugins/server/kernel/repository/analytics" + "Wavelet/OpenFlare/plugins/server/kernel/repository/logstore" "Wavelet/pkg/logger" db "Wavelet/plugins/infra/database" ) diff --git a/backend/OpenFlare/plugins/server/repository/openflare_origin.go b/backend/OpenFlare/plugins/server/kernel/repository/openflare_origin.go similarity index 98% rename from backend/OpenFlare/plugins/server/repository/openflare_origin.go rename to backend/OpenFlare/plugins/server/kernel/repository/openflare_origin.go index 4f2fce82..a1b72483 100644 --- a/backend/OpenFlare/plugins/server/repository/openflare_origin.go +++ b/backend/OpenFlare/plugins/server/kernel/repository/openflare_origin.go @@ -8,7 +8,7 @@ import ( "gorm.io/gorm" - "Wavelet/OpenFlare/plugins/server/model" + "Wavelet/OpenFlare/plugins/server/kernel/model" db "Wavelet/plugins/infra/database" ) diff --git a/backend/OpenFlare/plugins/server/repository/openflare_pages.go b/backend/OpenFlare/plugins/server/kernel/repository/openflare_pages.go similarity index 98% rename from backend/OpenFlare/plugins/server/repository/openflare_pages.go rename to backend/OpenFlare/plugins/server/kernel/repository/openflare_pages.go index a3f25703..63a27cc5 100644 --- a/backend/OpenFlare/plugins/server/repository/openflare_pages.go +++ b/backend/OpenFlare/plugins/server/kernel/repository/openflare_pages.go @@ -6,7 +6,7 @@ package repository import ( "context" - "Wavelet/OpenFlare/plugins/server/model" + "Wavelet/OpenFlare/plugins/server/kernel/model" db "Wavelet/plugins/infra/database" ) diff --git a/backend/OpenFlare/plugins/server/repository/openflare_pages_cleanup.go b/backend/OpenFlare/plugins/server/kernel/repository/openflare_pages_cleanup.go similarity index 97% rename from backend/OpenFlare/plugins/server/repository/openflare_pages_cleanup.go rename to backend/OpenFlare/plugins/server/kernel/repository/openflare_pages_cleanup.go index 62ab38c9..08d4b725 100644 --- a/backend/OpenFlare/plugins/server/repository/openflare_pages_cleanup.go +++ b/backend/OpenFlare/plugins/server/kernel/repository/openflare_pages_cleanup.go @@ -7,7 +7,7 @@ import ( "context" "errors" - "Wavelet/OpenFlare/plugins/server/model" + "Wavelet/OpenFlare/plugins/server/kernel/model" db "Wavelet/plugins/infra/database" ) diff --git a/backend/OpenFlare/plugins/server/repository/openflare_pages_cleanup_test.go b/backend/OpenFlare/plugins/server/kernel/repository/openflare_pages_cleanup_test.go similarity index 99% rename from backend/OpenFlare/plugins/server/repository/openflare_pages_cleanup_test.go rename to backend/OpenFlare/plugins/server/kernel/repository/openflare_pages_cleanup_test.go index d3b7f492..7742a994 100644 --- a/backend/OpenFlare/plugins/server/repository/openflare_pages_cleanup_test.go +++ b/backend/OpenFlare/plugins/server/kernel/repository/openflare_pages_cleanup_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - "Wavelet/OpenFlare/plugins/server/model" + "Wavelet/OpenFlare/plugins/server/kernel/model" db "Wavelet/plugins/infra/database" diff --git a/backend/OpenFlare/plugins/server/repository/openflare_pages_source.go b/backend/OpenFlare/plugins/server/kernel/repository/openflare_pages_source.go similarity index 99% rename from backend/OpenFlare/plugins/server/repository/openflare_pages_source.go rename to backend/OpenFlare/plugins/server/kernel/repository/openflare_pages_source.go index c6c1f755..f31c0adf 100644 --- a/backend/OpenFlare/plugins/server/repository/openflare_pages_source.go +++ b/backend/OpenFlare/plugins/server/kernel/repository/openflare_pages_source.go @@ -10,7 +10,7 @@ import ( "gorm.io/gorm" "gorm.io/gorm/clause" - "Wavelet/OpenFlare/plugins/server/model" + "Wavelet/OpenFlare/plugins/server/kernel/model" db "Wavelet/plugins/infra/database" ) diff --git a/backend/OpenFlare/plugins/server/repository/openflare_proxy_route.go b/backend/OpenFlare/plugins/server/kernel/repository/openflare_proxy_route.go similarity index 99% rename from backend/OpenFlare/plugins/server/repository/openflare_proxy_route.go rename to backend/OpenFlare/plugins/server/kernel/repository/openflare_proxy_route.go index 841937eb..ea77f4fd 100644 --- a/backend/OpenFlare/plugins/server/repository/openflare_proxy_route.go +++ b/backend/OpenFlare/plugins/server/kernel/repository/openflare_proxy_route.go @@ -10,7 +10,7 @@ import ( "gorm.io/gorm" "gorm.io/gorm/clause" - "Wavelet/OpenFlare/plugins/server/model" + "Wavelet/OpenFlare/plugins/server/kernel/model" db "Wavelet/plugins/infra/database" ) diff --git a/backend/OpenFlare/plugins/server/repository/openflare_tls.go b/backend/OpenFlare/plugins/server/kernel/repository/openflare_tls.go similarity index 98% rename from backend/OpenFlare/plugins/server/repository/openflare_tls.go rename to backend/OpenFlare/plugins/server/kernel/repository/openflare_tls.go index 865fb6b7..c46939fa 100644 --- a/backend/OpenFlare/plugins/server/repository/openflare_tls.go +++ b/backend/OpenFlare/plugins/server/kernel/repository/openflare_tls.go @@ -7,7 +7,7 @@ import ( "context" "errors" - "Wavelet/OpenFlare/plugins/server/model" + "Wavelet/OpenFlare/plugins/server/kernel/model" db "Wavelet/plugins/infra/database" ) diff --git a/backend/OpenFlare/plugins/server/repository/openflare_waf.go b/backend/OpenFlare/plugins/server/kernel/repository/openflare_waf.go similarity index 99% rename from backend/OpenFlare/plugins/server/repository/openflare_waf.go rename to backend/OpenFlare/plugins/server/kernel/repository/openflare_waf.go index f2f8a626..8bc30a22 100644 --- a/backend/OpenFlare/plugins/server/repository/openflare_waf.go +++ b/backend/OpenFlare/plugins/server/kernel/repository/openflare_waf.go @@ -10,7 +10,7 @@ import ( "gorm.io/gorm" - "Wavelet/OpenFlare/plugins/server/model" + "Wavelet/OpenFlare/plugins/server/kernel/model" db "Wavelet/plugins/infra/database" ) diff --git a/backend/OpenFlare/plugins/server/repository/openflare_waf_bindings_test.go b/backend/OpenFlare/plugins/server/kernel/repository/openflare_waf_bindings_test.go similarity index 96% rename from backend/OpenFlare/plugins/server/repository/openflare_waf_bindings_test.go rename to backend/OpenFlare/plugins/server/kernel/repository/openflare_waf_bindings_test.go index de62134e..617b1b4d 100644 --- a/backend/OpenFlare/plugins/server/repository/openflare_waf_bindings_test.go +++ b/backend/OpenFlare/plugins/server/kernel/repository/openflare_waf_bindings_test.go @@ -7,7 +7,7 @@ import ( "context" "testing" - "Wavelet/OpenFlare/plugins/server/model" + "Wavelet/OpenFlare/plugins/server/kernel/model" db "Wavelet/plugins/infra/database" diff --git a/backend/OpenFlare/plugins/server/repository/openflare_waf_graph_test.go b/backend/OpenFlare/plugins/server/kernel/repository/openflare_waf_graph_test.go similarity index 98% rename from backend/OpenFlare/plugins/server/repository/openflare_waf_graph_test.go rename to backend/OpenFlare/plugins/server/kernel/repository/openflare_waf_graph_test.go index 9b6efef6..ffe566a0 100644 --- a/backend/OpenFlare/plugins/server/repository/openflare_waf_graph_test.go +++ b/backend/OpenFlare/plugins/server/kernel/repository/openflare_waf_graph_test.go @@ -7,7 +7,7 @@ import ( "context" "testing" - "Wavelet/OpenFlare/plugins/server/model" + "Wavelet/OpenFlare/plugins/server/kernel/model" db "Wavelet/plugins/infra/database" diff --git a/backend/OpenFlare/plugins/server/repository/openflare_zone.go b/backend/OpenFlare/plugins/server/kernel/repository/openflare_zone.go similarity index 99% rename from backend/OpenFlare/plugins/server/repository/openflare_zone.go rename to backend/OpenFlare/plugins/server/kernel/repository/openflare_zone.go index 91e67e71..c09f342a 100644 --- a/backend/OpenFlare/plugins/server/repository/openflare_zone.go +++ b/backend/OpenFlare/plugins/server/kernel/repository/openflare_zone.go @@ -9,7 +9,7 @@ import ( "gorm.io/gorm" - "Wavelet/OpenFlare/plugins/server/model" + "Wavelet/OpenFlare/plugins/server/kernel/model" db "Wavelet/plugins/infra/database" ) diff --git a/backend/OpenFlare/plugins/server/repository/openflare_zone_test.go b/backend/OpenFlare/plugins/server/kernel/repository/openflare_zone_test.go similarity index 98% rename from backend/OpenFlare/plugins/server/repository/openflare_zone_test.go rename to backend/OpenFlare/plugins/server/kernel/repository/openflare_zone_test.go index 3123d294..8abe408f 100644 --- a/backend/OpenFlare/plugins/server/repository/openflare_zone_test.go +++ b/backend/OpenFlare/plugins/server/kernel/repository/openflare_zone_test.go @@ -7,7 +7,7 @@ import ( "context" "testing" - "Wavelet/OpenFlare/plugins/server/model" + "Wavelet/OpenFlare/plugins/server/kernel/model" db "Wavelet/plugins/infra/database" diff --git a/backend/OpenFlare/plugins/server/repository/services.go b/backend/OpenFlare/plugins/server/kernel/repository/services.go similarity index 100% rename from backend/OpenFlare/plugins/server/repository/services.go rename to backend/OpenFlare/plugins/server/kernel/repository/services.go diff --git a/backend/OpenFlare/plugins/server/repository/system_config.go b/backend/OpenFlare/plugins/server/kernel/repository/system_config.go similarity index 98% rename from backend/OpenFlare/plugins/server/repository/system_config.go rename to backend/OpenFlare/plugins/server/kernel/repository/system_config.go index 22f01e05..62237e19 100644 --- a/backend/OpenFlare/plugins/server/repository/system_config.go +++ b/backend/OpenFlare/plugins/server/kernel/repository/system_config.go @@ -7,7 +7,7 @@ import ( "context" "errors" - "Wavelet/OpenFlare/plugins/server/model" + "Wavelet/OpenFlare/plugins/server/kernel/model" adminrepo "Wavelet/plugins/domain/admin/repository" db "Wavelet/plugins/infra/database" ) diff --git a/backend/OpenFlare/plugins/server/repository/system_user.go b/backend/OpenFlare/plugins/server/kernel/repository/system_user.go similarity index 97% rename from backend/OpenFlare/plugins/server/repository/system_user.go rename to backend/OpenFlare/plugins/server/kernel/repository/system_user.go index 0036f44e..eed3bb43 100644 --- a/backend/OpenFlare/plugins/server/repository/system_user.go +++ b/backend/OpenFlare/plugins/server/kernel/repository/system_user.go @@ -7,7 +7,7 @@ import ( "context" "errors" - "Wavelet/OpenFlare/plugins/server/model" + "Wavelet/OpenFlare/plugins/server/kernel/model" adminrepo "Wavelet/plugins/domain/admin/repository" ) diff --git a/backend/OpenFlare/plugins/server/repository/system_user_test.go b/backend/OpenFlare/plugins/server/kernel/repository/system_user_test.go similarity index 100% rename from backend/OpenFlare/plugins/server/repository/system_user_test.go rename to backend/OpenFlare/plugins/server/kernel/repository/system_user_test.go diff --git a/backend/OpenFlare/plugins/server/runtimeconfig/runtime.go b/backend/OpenFlare/plugins/server/kernel/runtimeconfig/runtime.go similarity index 100% rename from backend/OpenFlare/plugins/server/runtimeconfig/runtime.go rename to backend/OpenFlare/plugins/server/kernel/runtimeconfig/runtime.go diff --git a/backend/OpenFlare/plugins/server/task/dispatch_test.go b/backend/OpenFlare/plugins/server/kernel/task/dispatch_test.go similarity index 100% rename from backend/OpenFlare/plugins/server/task/dispatch_test.go rename to backend/OpenFlare/plugins/server/kernel/task/dispatch_test.go diff --git a/backend/OpenFlare/plugins/server/task/task.go b/backend/OpenFlare/plugins/server/kernel/task/task.go similarity index 100% rename from backend/OpenFlare/plugins/server/task/task.go rename to backend/OpenFlare/plugins/server/kernel/task/task.go diff --git a/backend/OpenFlare/plugins/server/testhelper/cleanup.go b/backend/OpenFlare/plugins/server/kernel/testhelper/cleanup.go similarity index 100% rename from backend/OpenFlare/plugins/server/testhelper/cleanup.go rename to backend/OpenFlare/plugins/server/kernel/testhelper/cleanup.go diff --git a/backend/OpenFlare/plugins/server/testhelper/gin.go b/backend/OpenFlare/plugins/server/kernel/testhelper/gin.go similarity index 100% rename from backend/OpenFlare/plugins/server/testhelper/gin.go rename to backend/OpenFlare/plugins/server/kernel/testhelper/gin.go diff --git a/backend/OpenFlare/plugins/server/testhelper/noop_task.go b/backend/OpenFlare/plugins/server/kernel/testhelper/noop_task.go similarity index 100% rename from backend/OpenFlare/plugins/server/testhelper/noop_task.go rename to backend/OpenFlare/plugins/server/kernel/testhelper/noop_task.go diff --git a/backend/OpenFlare/plugins/server/testhelper/stub_auth.go b/backend/OpenFlare/plugins/server/kernel/testhelper/stub_auth.go similarity index 100% rename from backend/OpenFlare/plugins/server/testhelper/stub_auth.go rename to backend/OpenFlare/plugins/server/kernel/testhelper/stub_auth.go diff --git a/backend/OpenFlare/plugins/server/testhelper/test_helper.go b/backend/OpenFlare/plugins/server/kernel/testhelper/test_helper.go similarity index 97% rename from backend/OpenFlare/plugins/server/testhelper/test_helper.go rename to backend/OpenFlare/plugins/server/kernel/testhelper/test_helper.go index bf1d7390..2528d381 100644 --- a/backend/OpenFlare/plugins/server/testhelper/test_helper.go +++ b/backend/OpenFlare/plugins/server/kernel/testhelper/test_helper.go @@ -9,10 +9,10 @@ import ( "context" "testing" - "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/kernel/model" + analyticsmodel "Wavelet/OpenFlare/plugins/server/kernel/model/analytics" + "Wavelet/OpenFlare/plugins/server/kernel/repository" + "Wavelet/OpenFlare/plugins/server/kernel/repository/logstore" "Wavelet/pkg/idgen" db "Wavelet/plugins/infra/database" diff --git a/backend/OpenFlare/plugins/server/migrate/clickhouse.go b/backend/OpenFlare/plugins/server/migrate/clickhouse.go index 78d2f45b..fe1ecaf5 100644 --- a/backend/OpenFlare/plugins/server/migrate/clickhouse.go +++ b/backend/OpenFlare/plugins/server/migrate/clickhouse.go @@ -12,7 +12,7 @@ import ( "log" "time" - "Wavelet/OpenFlare/plugins/server/runtimeconfig" + "Wavelet/OpenFlare/plugins/server/kernel/runtimeconfig" "github.com/ClickHouse/clickhouse-go/v2" "github.com/pressly/goose/v3" diff --git a/backend/OpenFlare/plugins/server/migrate/clickhouse_test.go b/backend/OpenFlare/plugins/server/migrate/clickhouse_test.go index 87e833c9..ecadc77a 100644 --- a/backend/OpenFlare/plugins/server/migrate/clickhouse_test.go +++ b/backend/OpenFlare/plugins/server/migrate/clickhouse_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "Wavelet/OpenFlare/plugins/server/runtimeconfig" + "Wavelet/OpenFlare/plugins/server/kernel/runtimeconfig" "github.com/pressly/goose/v3" ) diff --git a/backend/OpenFlare/plugins/server/migrate/stamp.go b/backend/OpenFlare/plugins/server/migrate/stamp.go index 1670fcb3..565afe9f 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/site/zone" + "Wavelet/OpenFlare/plugins/server/domain/site/zone" "Wavelet/core" "Wavelet/core/contracts" ) diff --git a/backend/OpenFlare/plugins/server/plugin.go b/backend/OpenFlare/plugins/server/plugin.go index 9b8d8307..5619e54c 100644 --- a/backend/OpenFlare/plugins/server/plugin.go +++ b/backend/OpenFlare/plugins/server/plugin.go @@ -7,17 +7,17 @@ package server import ( - ofgeoip "Wavelet/OpenFlare/plugins/server/geoip" + "Wavelet/OpenFlare/plugins/server/domain/observability/chwriter" ofrouter "Wavelet/OpenFlare/plugins/server/httpapi" + ofgeoip "Wavelet/OpenFlare/plugins/server/kernel/geoip" + "Wavelet/OpenFlare/plugins/server/kernel/ofevents" + "Wavelet/OpenFlare/plugins/server/kernel/ofupload" + "Wavelet/OpenFlare/plugins/server/kernel/publicconfig" + "Wavelet/OpenFlare/plugins/server/kernel/repository" + "Wavelet/OpenFlare/plugins/server/kernel/repository/logstore" + "Wavelet/OpenFlare/plugins/server/kernel/runtimeconfig" + oftask "Wavelet/OpenFlare/plugins/server/kernel/task" "Wavelet/OpenFlare/plugins/server/migrate" - "Wavelet/OpenFlare/plugins/server/observability/chwriter" - "Wavelet/OpenFlare/plugins/server/ofevents" - "Wavelet/OpenFlare/plugins/server/ofupload" - "Wavelet/OpenFlare/plugins/server/publicconfig" - "Wavelet/OpenFlare/plugins/server/repository" - "Wavelet/OpenFlare/plugins/server/repository/logstore" - "Wavelet/OpenFlare/plugins/server/runtimeconfig" - oftask "Wavelet/OpenFlare/plugins/server/task" "Wavelet/core" "Wavelet/core/contracts" "Wavelet/pkg/logger" @@ -26,7 +26,7 @@ import ( "embed" "reflect" - "Wavelet/OpenFlare/plugins/server/credential" + "Wavelet/OpenFlare/plugins/server/kernel/credential" _ "Wavelet/docs" adminservice "Wavelet/plugins/domain/admin/service" diff --git a/backend/OpenFlare/plugins/server/plugin_tasks.go b/backend/OpenFlare/plugins/server/plugin_tasks.go index be036617..8f8666fb 100644 --- a/backend/OpenFlare/plugins/server/plugin_tasks.go +++ b/backend/OpenFlare/plugins/server/plugin_tasks.go @@ -6,12 +6,12 @@ package server import ( "context" - 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" + cf "Wavelet/OpenFlare/plugins/server/domain/cloudflare" + "Wavelet/OpenFlare/plugins/server/domain/fleet" + "Wavelet/OpenFlare/plugins/server/domain/observability" + "Wavelet/OpenFlare/plugins/server/domain/pages" + "Wavelet/OpenFlare/plugins/server/domain/tls" + oftask "Wavelet/OpenFlare/plugins/server/kernel/task" "Wavelet/core" "Wavelet/core/extpoints" ) diff --git a/backend/OpenFlare/plugins/server/updater/logics.go b/backend/OpenFlare/plugins/server/updater/logics.go index a5ed1933..02730de6 100644 --- a/backend/OpenFlare/plugins/server/updater/logics.go +++ b/backend/OpenFlare/plugins/server/updater/logics.go @@ -22,8 +22,8 @@ import ( "sync" "time" - "Wavelet/OpenFlare/plugins/server/model" - "Wavelet/OpenFlare/plugins/server/repository" + "Wavelet/OpenFlare/plugins/server/kernel/model" + "Wavelet/OpenFlare/plugins/server/kernel/repository" "Wavelet/pkg/buildinfo" "Wavelet/pkg/logger" diff --git a/docs/changelog/index.md b/docs/changelog/index.md index 84834e8d..fc090640 100644 --- a/docs/changelog/index.md +++ b/docs/changelog/index.md @@ -13,7 +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` 插件按限界上下文重排目录：去掉 `openflare/` 与 `router/v1` 嵌套；业务在 `domain/`（site/fleet/pages 等），共享内核在 `kernel/`（model/repository 与适配器），HTTP 装配在 `httpapi`。接口路径与表结构不变。 - `server` 插件把 stamp、of_* SQL 与 ClickHouse 迁入单一 `migrate/` 包，updater 提到 `server/updater/`；删除已停用的 76 条历史迁移。全新安装会写入 OpenFlare 定时任务与产品配置默认值，已 stamp 的升级库不重插。 ### 💄 其他/体验