remoteRF-server 1.7.11__tar.gz → 1.7.13__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/PKG-INFO +2 -33
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/README.md +1 -32
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/pyproject.toml +1 -1
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server/remote_admin_shell.py +3 -3
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server/server/commands.py +0 -5
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server/server/global_onboarding.py +95 -29
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server/server/grpc_server.py +0 -4
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server/server/reservation.py +70 -170
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server/serverrf_cli.py +0 -327
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server.egg-info/PKG-INFO +2 -33
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server.egg-info/SOURCES.txt +0 -3
- remoterf_server-1.7.13/tests/test_client_sessions.py +306 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/tests/test_global_onboarding.py +150 -1
- remoterf_server-1.7.11/src/remoteRF_server/tools/gist_status.py +0 -218
- remoterf_server-1.7.11/src/remoteRF_server/tools/gist_status_testing.py +0 -82
- remoterf_server-1.7.11/tests/test_client_sessions.py +0 -122
- remoterf_server-1.7.11/tests/test_status_push.py +0 -20
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/LICENSE +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/setup.cfg +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server/__init__.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server/common/__init__.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server/common/grpc/__init__.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server/common/grpc/deployment_capabilities.proto +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server/common/grpc/deployment_capabilities_pb2.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server/common/grpc/deployment_capabilities_pb2_grpc.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server/common/grpc/federation.proto +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server/common/grpc/federation_pb2.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server/common/grpc/federation_pb2_grpc.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server/common/grpc/grpc_host_pb2.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server/common/grpc/grpc_host_pb2_grpc.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server/common/grpc/grpc_pb2.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server/common/grpc/grpc_pb2_grpc.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server/common/grpc/v2_codec.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server/common/idl/__init__.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server/common/idl/device_schema.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server/common/idl/pluto_mimo_schema.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server/common/idl/pluto_schema.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server/common/idl/schema.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server/common/idl/v2.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server/common/utils/__init__.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server/common/utils/ansi_codes.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server/common/utils/api_token.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server/common/utils/db_connection.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server/common/utils/db_location.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server/common/utils/list_string.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server/common/utils/panel.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server/common/utils/process_arg.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server/drivers/__init__.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server/drivers/adalm_pluto/__init__.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server/drivers/adalm_pluto/pluto_diag.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server/drivers/adalm_pluto/pluto_mimo_schema.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server/drivers/adalm_pluto/pluto_remote_server.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server/drivers/adalm_pluto/pluto_schema.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server/drivers/adalm_pluto/poe.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server/drivers/bluetooth_diag.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server/drivers/gps_diag.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server/drivers/hackrf/__init__.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server/drivers/hackrf/hackrf_schema.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server/drivers/rtl_sdr/__init__.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server/drivers/rtl_sdr/rtl_sdr_diag.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server/drivers/rtl_sdr/rtl_sdr_schema.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server/drivers/ti_mmwave/__init__.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server/drivers/ti_mmwave/ti_mmwave_schema.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server/drivers/usrp/__init__.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server/drivers/usrp/policy.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server/drivers/usrp/profiles.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server/drivers/usrp/uhd_manifest.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server/drivers/usrp/usrp_diag.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server/drivers/usrp/usrp_schema.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server/drivers/usrp_phaser/__init__.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server/drivers/usrp_phaser/usrp_phaser_schema.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server/drivers/wifi/__init__.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server/drivers/wifi/wifi_schema.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server/host/__init__.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server/host/host_auth_token.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server/host/host_directory_store.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server/host/host_tunnel_server.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server/server/__init__.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server/server/acc_perms.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server/server/cert_provider.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server/server/console.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server/server/control.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server/server/deployment/__init__.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server/server/deployment/capabilities.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server/server/device_manager.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server/server/diag.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server/server/direct_path.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server/server/dynamic_v2.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server/server/dynamic_v2_bridge.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server/server/federation/__init__.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server/server/federation/admin.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server/server/federation/cli.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server/server/federation/cluster.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server/server/federation/contracts.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server/server/federation/destination.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server/server/federation/devices.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server/server/federation/enrollment.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server/server/federation/global_home.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server/server/federation/home.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server/server/federation/home_devices.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server/server/federation/identity.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server/server/federation/legacy_state.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server/server/federation/links.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server/server/federation/migrations.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server/server/federation/peers.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server/server/federation/permissions.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server/server/federation/principals.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server/server/federation/runtime.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server/server/federation/trust.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server/server/host_direct.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server/server/host_dynamic_v2.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server/server/json_output.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server/server/remote_admin.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server/server/remote_admin_ssh.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server/server/rpc_manager.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server/server/schema_registry.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server/server/startup_check.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server/server/user_group_cli.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server/server/user_group_handler.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server/server/v2_errors.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server/tools/__init__.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server/tools/gen_certs.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server/tools/introspect_uhd.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server.egg-info/dependency_links.txt +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server.egg-info/entry_points.txt +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server.egg-info/requires.txt +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server.egg-info/top_level.txt +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/rssi/__init__.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/rssi/cli.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/rssi/dongle.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/rssi/safety.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/rssi/scanner.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/tests/test_account_hardening.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/tests/test_account_names.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/tests/test_account_removal.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/tests/test_activity_log.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/tests/test_availability.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/tests/test_bind_host.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/tests/test_cert_provider.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/tests/test_cluster.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/tests/test_commands.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/tests/test_console.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/tests/test_contrib_drivers.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/tests/test_default_rtl_sdr_schema.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/tests/test_default_usrp_schema.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/tests/test_default_wifi_schema.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/tests/test_deployment_capabilities.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/tests/test_detached_device_rpc.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/tests/test_device_core_aliases.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/tests/test_device_handles.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/tests/test_device_init.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/tests/test_devices_add_wizard.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/tests/test_devices_list.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/tests/test_diag.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/tests/test_direct_fixed_port.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/tests/test_direct_path_server.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/tests/test_dynamic_v2.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/tests/test_federated_direct_path.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/tests/test_federated_dynamic_v2.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/tests/test_federation_edges.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/tests/test_first_run.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/tests/test_gate_d_contracts.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/tests/test_gate_e_federation.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/tests/test_gate_e_proto.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/tests/test_gate_f_enrollment.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/tests/test_gate_g1_logging.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/tests/test_gate_g_permissions.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/tests/test_gate_h_devices.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/tests/test_gate_i_direct_path.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/tests/test_gen_certs.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/tests/test_global_accounts_migration.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/tests/test_global_home.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/tests/test_global_v1_disposal.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/tests/test_hackrf_schema.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/tests/test_home_device_plane.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/tests/test_host_direct.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/tests/test_host_directory_store.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/tests/test_host_dynamic_v2.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/tests/test_idl_schema.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/tests/test_json_commands.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/tests/test_lab_logins.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/tests/test_panel.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/tests/test_peer_transport.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/tests/test_pluto_compat.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/tests/test_pluto_poe.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/tests/test_process_arg.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/tests/test_proxy_lifecycle.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/tests/test_remote_admin.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/tests/test_reservation_cancel.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/tests/test_reservation_handoff.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/tests/test_reservation_policy_b.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/tests/test_reservation_timestamps.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/tests/test_rpc_manager_batch.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/tests/test_rpc_manager_calln.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/tests/test_rpc_manager_host_legacy.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/tests/test_rpc_manager_rx_n.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/tests/test_rtl_sdr_schema.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/tests/test_schema_registry.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/tests/test_soak_federation.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/tests/test_startup_check.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/tests/test_ti_mmwave_hardware.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/tests/test_ti_mmwave_schema.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/tests/test_user_group_cli.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/tests/test_usrp_b205mini_uhd410_hardware.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/tests/test_usrp_client_server_hardware.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/tests/test_usrp_client_server_localhost.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/tests/test_usrp_n210_client_server_hardware.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/tests/test_usrp_preload.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/tests/test_usrp_profiles.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/tests/test_usrp_remoterf_rx_hardware.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/tests/test_usrp_uhd410_hardware.py +0 -0
- {remoterf_server-1.7.11 → remoterf_server-1.7.13}/tests/test_wipe.py +0 -0
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: remoteRF-server
|
|
3
|
-
Version: 1.7.
|
|
3
|
+
Version: 1.7.13
|
|
4
4
|
Summary: RemoteRF server-side control package
|
|
5
5
|
License: GPL-3.0-or-later
|
|
6
6
|
Classifier: Programming Language :: Python :: 3
|
|
@@ -215,7 +215,7 @@ Local IP: 164.67.195.210
|
|
|
215
215
|
Local Port: 61000
|
|
216
216
|
```
|
|
217
217
|
|
|
218
|
-
then run the below on a
|
|
218
|
+
then run the below on a separate terminal (make sure to keep serverrf -s RUNNING!)
|
|
219
219
|
|
|
220
220
|
Confirm that its reachable:
|
|
221
221
|
|
|
@@ -953,37 +953,6 @@ serverrf --host --delete host-name
|
|
|
953
953
|
serverrf --host --wipe
|
|
954
954
|
```
|
|
955
955
|
|
|
956
|
-
## Status (Optional)
|
|
957
|
-
|
|
958
|
-
If you desire to pull the server information (ie: live updates of reservation, server usage parameters, etc.)
|
|
959
|
-
|
|
960
|
-
It uses GitHub Gists to push the status updates.
|
|
961
|
-
|
|
962
|
-
Create public gist on your github. Keep note of the file name: (example)
|
|
963
|
-
https://gist.github.com/ethange1/2a35e08a90bf88a70dfe7f42a55685ed
|
|
964
|
-
|
|
965
|
-
The last one is the "GIST_ID" part of the URL, e.g. "2a35e08a90bf88a70dfe7f42a55685ed"
|
|
966
|
-
|
|
967
|
-
Creating the GitHub PAT Token
|
|
968
|
-
|
|
969
|
-
* GitHub → Settings
|
|
970
|
-
* Developer settings
|
|
971
|
-
* Personal access tokens → Fine-grained tokens
|
|
972
|
-
* Generate new token
|
|
973
|
-
* Set repository access to "Public Respositories"
|
|
974
|
-
* Permissions: enable Gists: Read and write
|
|
975
|
-
* Generate + copy the token (you only see it once)
|
|
976
|
-
|
|
977
|
-
```bash
|
|
978
|
-
serverrf --gist --set --id <gist_id> --file <filename>
|
|
979
|
-
```
|
|
980
|
-
|
|
981
|
-
Run the server normally, and you should see your gist change every minute!
|
|
982
|
-
|
|
983
|
-
```bash
|
|
984
|
-
serverrf -s
|
|
985
|
-
```
|
|
986
|
-
|
|
987
956
|
<!-- todo: -->
|
|
988
957
|
<!-- Adding plutos via the CLI -->
|
|
989
958
|
<!-- Testing functionality (disregarding Host pipeline) -->
|
|
@@ -182,7 +182,7 @@ Local IP: 164.67.195.210
|
|
|
182
182
|
Local Port: 61000
|
|
183
183
|
```
|
|
184
184
|
|
|
185
|
-
then run the below on a
|
|
185
|
+
then run the below on a separate terminal (make sure to keep serverrf -s RUNNING!)
|
|
186
186
|
|
|
187
187
|
Confirm that its reachable:
|
|
188
188
|
|
|
@@ -920,37 +920,6 @@ serverrf --host --delete host-name
|
|
|
920
920
|
serverrf --host --wipe
|
|
921
921
|
```
|
|
922
922
|
|
|
923
|
-
## Status (Optional)
|
|
924
|
-
|
|
925
|
-
If you desire to pull the server information (ie: live updates of reservation, server usage parameters, etc.)
|
|
926
|
-
|
|
927
|
-
It uses GitHub Gists to push the status updates.
|
|
928
|
-
|
|
929
|
-
Create public gist on your github. Keep note of the file name: (example)
|
|
930
|
-
https://gist.github.com/ethange1/2a35e08a90bf88a70dfe7f42a55685ed
|
|
931
|
-
|
|
932
|
-
The last one is the "GIST_ID" part of the URL, e.g. "2a35e08a90bf88a70dfe7f42a55685ed"
|
|
933
|
-
|
|
934
|
-
Creating the GitHub PAT Token
|
|
935
|
-
|
|
936
|
-
* GitHub → Settings
|
|
937
|
-
* Developer settings
|
|
938
|
-
* Personal access tokens → Fine-grained tokens
|
|
939
|
-
* Generate new token
|
|
940
|
-
* Set repository access to "Public Respositories"
|
|
941
|
-
* Permissions: enable Gists: Read and write
|
|
942
|
-
* Generate + copy the token (you only see it once)
|
|
943
|
-
|
|
944
|
-
```bash
|
|
945
|
-
serverrf --gist --set --id <gist_id> --file <filename>
|
|
946
|
-
```
|
|
947
|
-
|
|
948
|
-
Run the server normally, and you should see your gist change every minute!
|
|
949
|
-
|
|
950
|
-
```bash
|
|
951
|
-
serverrf -s
|
|
952
|
-
```
|
|
953
|
-
|
|
954
923
|
<!-- todo: -->
|
|
955
924
|
<!-- Adding plutos via the CLI -->
|
|
956
925
|
<!-- Testing functionality (disregarding Host pipeline) -->
|
|
@@ -47,7 +47,7 @@ TIERS = {
|
|
|
47
47
|
"help": READ, "status": READ, "devices list": READ, "users list": READ, "users perms": READ,
|
|
48
48
|
"reservations list": READ, "groups list": READ, "codes list": READ, "hosts status": READ,
|
|
49
49
|
"hosts tokens": READ, "certs list": READ, "config list": READ, "global status": READ,
|
|
50
|
-
"cluster list": READ, "cluster info": READ, "
|
|
50
|
+
"cluster list": READ, "cluster info": READ, "users prune-proxies": READ,
|
|
51
51
|
"cluster codes list": READ, "schema browse": READ,
|
|
52
52
|
# write
|
|
53
53
|
"devices add": WRITE, "devices remove": WRITE, "devices rename": WRITE, "groups create": WRITE,
|
|
@@ -63,7 +63,7 @@ TIERS = {
|
|
|
63
63
|
"groups remove": DESTRUCTIVE, "devices wipe": DESTRUCTIVE, "reservations purge": DESTRUCTIVE,
|
|
64
64
|
"stats purge": DESTRUCTIVE, "hosts wipe": DESTRUCTIVE, "hosts forget": DESTRUCTIVE,
|
|
65
65
|
"certs reset": DESTRUCTIVE, "certs wipe": DESTRUCTIVE, "config ports": DESTRUCTIVE,
|
|
66
|
-
"cluster remove": DESTRUCTIVE,
|
|
66
|
+
"cluster remove": DESTRUCTIVE,
|
|
67
67
|
# never remote: they cut remote access, nuke everything, or pin admins
|
|
68
68
|
"stop": NEVER, "detach": NEVER, "clear": NEVER, "wipe": NEVER, "users purge": NEVER, "db purge": NEVER,
|
|
69
69
|
"global cluster": NEVER, # an old alias for every `cluster` verb, remove included: use `cluster …`
|
|
@@ -74,7 +74,7 @@ TIERS = {
|
|
|
74
74
|
}
|
|
75
75
|
DENY_FLAGS = {"--secrets"}
|
|
76
76
|
# Destructive commands whose own confirmation -y answers (the step-up asked already).
|
|
77
|
-
TAKES_YES = {"devices wipe", "stats purge", "hosts wipe", "certs wipe", "
|
|
77
|
+
TAKES_YES = {"devices wipe", "stats purge", "hosts wipe", "certs wipe", "users prune-proxies",
|
|
78
78
|
"hosts tokens", "certs reset"}
|
|
79
79
|
KEEP_BACKUPS = 10
|
|
80
80
|
PAIR_CODE = re.compile(r"[A-Z2-7]{4}-[A-Z2-7]{4}-[A-Z2-7]{4}-[A-Z2-7]{4}")
|
|
@@ -178,10 +178,6 @@ def _table() -> list[Command]:
|
|
|
178
178
|
Command(("cluster peers",), "Partner listeners this deployment dials directly: cluster peers [add <id> <host:port> --ca <ca.crt> | remove <id>]", _federation("peers"), "Clusters"),
|
|
179
179
|
Command(("cluster accept",), "", _federation("accept"), "Clusters", hidden=True),
|
|
180
180
|
Command(("global cluster",), "", _federation("cluster"), "Global", hidden=True),
|
|
181
|
-
# ---- gist ----
|
|
182
|
-
Command(("gist list",), "Show gist status settings [--secrets]", _shell("cmd_gist_show"), "Gist status"),
|
|
183
|
-
Command(("gist set",), "gist set <gist_id> <file> [--token-stdin]", _shell("cmd_gist_set"), "Gist status"),
|
|
184
|
-
Command(("gist wipe",), "Forget the gist settings [-y]", _shell("cmd_gist_wipe"), "Gist status"),
|
|
185
181
|
# ---- database ----
|
|
186
182
|
Command(("db export",), "Archive DBs, devices, keys, certs to ~/Downloads [dir]", _shell("cmd_db_export"), "Database"),
|
|
187
183
|
Command(("stats purge",), "Delete the activity log (reservation stats) [-y]", _daemon("cmd_stats_purge"), "Database", where=D),
|
|
@@ -244,7 +240,6 @@ _SECTION_BLURB = {
|
|
|
244
240
|
"Global": "public address and relay",
|
|
245
241
|
"Clusters": "sharing devices with other deployments",
|
|
246
242
|
"Schemas": "driver schemas approved on RemoteRF Global",
|
|
247
|
-
"Gist status": "publishing status to a GitHub gist",
|
|
248
243
|
"Database": "export, or wipe everything",
|
|
249
244
|
"Remote admin": "admins who reach this console from anywhere",
|
|
250
245
|
}
|
{remoterf_server-1.7.11 → remoterf_server-1.7.13}/src/remoteRF_server/server/global_onboarding.py
RENAMED
|
@@ -60,10 +60,16 @@ cluster). Joining Global shares none of your hardware on its own.
|
|
|
60
60
|
|
|
61
61
|
Once an hour it sends Global a short note: this deployment's name and
|
|
62
62
|
ID, version, uptime, how many accounts (and how many visit from partner
|
|
63
|
-
deployments), what devices it has, how many reservations are active,
|
|
64
|
-
time reserved so far (
|
|
65
|
-
|
|
66
|
-
|
|
63
|
+
deployments), what devices it has, how many reservations are active, how many
|
|
64
|
+
reservations have been made and the total time reserved so far (two numbers),
|
|
65
|
+
and your LAN address. For the devices you share on Global it also sends how
|
|
66
|
+
many reservations start in each hour of the day and on each day of the week
|
|
67
|
+
(UTC), and the reservations and time reserved per device type (counts only).
|
|
68
|
+
Nothing else leaves your server -- no credentials, no user or reservation
|
|
69
|
+
details -- and the connection only goes outward. Global publishes the network
|
|
70
|
+
totals, these breakdowns, and each deployment's name, version, devices, when
|
|
71
|
+
it joined and was last online, and how many reservations it has had and the
|
|
72
|
+
time reserved, at https://{domain}/stats.json.
|
|
67
73
|
|
|
68
74
|
A RemoteRF admin will review your new deployment before its address goes live.
|
|
69
75
|
If you opt out, you cannot opt back in without a full data reset. You may leave
|
|
@@ -732,7 +738,9 @@ STATUS_FIELDS = frozenset(
|
|
|
732
738
|
"proxies",
|
|
733
739
|
"devices",
|
|
734
740
|
"active_reservations",
|
|
741
|
+
"reservations",
|
|
735
742
|
"reserved_s",
|
|
743
|
+
"usage",
|
|
736
744
|
"lan_address",
|
|
737
745
|
"cert_sha256",
|
|
738
746
|
}
|
|
@@ -754,23 +762,24 @@ def _db_dir() -> Path:
|
|
|
754
762
|
return cfg_dir() / "db"
|
|
755
763
|
|
|
756
764
|
|
|
757
|
-
def
|
|
765
|
+
def _rows(database: Path, sql: str, params=()) -> list:
|
|
758
766
|
import sqlite3
|
|
759
767
|
|
|
760
768
|
if not database.exists():
|
|
761
|
-
return
|
|
769
|
+
return []
|
|
762
770
|
try:
|
|
763
771
|
with sqlite3.connect(f"file:{database}?mode=ro", uri=True, timeout=2.0) as db:
|
|
764
|
-
return
|
|
772
|
+
return db.execute(sql, params).fetchall()
|
|
765
773
|
except sqlite3.Error:
|
|
766
|
-
return
|
|
774
|
+
return []
|
|
767
775
|
|
|
768
776
|
|
|
769
|
-
def
|
|
770
|
-
|
|
777
|
+
def _count(database: Path, sql: str, params=()) -> int:
|
|
778
|
+
rows = _rows(database, sql, params)
|
|
779
|
+
return int(rows[0][0]) if rows else 0
|
|
771
780
|
|
|
772
|
-
|
|
773
|
-
|
|
781
|
+
|
|
782
|
+
def _registered_devices() -> list:
|
|
774
783
|
import yaml
|
|
775
784
|
|
|
776
785
|
path = cfg_dir() / "devices.yml"
|
|
@@ -779,23 +788,74 @@ def device_summary() -> list:
|
|
|
779
788
|
devices = data.get("devices") or []
|
|
780
789
|
except (OSError, yaml.YAMLError):
|
|
781
790
|
return []
|
|
791
|
+
return [item for item in devices if type(item) is dict and "device_id" in item]
|
|
792
|
+
|
|
793
|
+
|
|
794
|
+
def _device_type(item: dict) -> str:
|
|
795
|
+
return str(item.get("device_type") or "unknown").lower()
|
|
796
|
+
|
|
797
|
+
|
|
798
|
+
def _device_types() -> dict:
|
|
799
|
+
"""Device id -> type: devices.yml entries, then the Host directory `serverrf status` lists.
|
|
800
|
+
|
|
801
|
+
Types are bounded the way Global accepts them: a Host names its own kinds.
|
|
802
|
+
"""
|
|
803
|
+
types = {int(item["device_id"]): _device_type(item) for item in _registered_devices()}
|
|
804
|
+
try:
|
|
805
|
+
from ..host import host_tunnel_server as hts
|
|
806
|
+
|
|
807
|
+
directory = hts.get_tunnel_registry().device_directory_cached(ttl_ms=0)
|
|
808
|
+
except Exception: # noqa: BLE001 - drivers are optional at report time
|
|
809
|
+
directory = {}
|
|
810
|
+
for device_id, (_host_id, info, _active) in directory.items():
|
|
811
|
+
if str(device_id).isdigit():
|
|
812
|
+
types.setdefault(int(device_id), str(getattr(info, "kind", "") or "").strip().lower() or "unknown")
|
|
813
|
+
return {gid: re.sub(r"[^a-z0-9_]", "_", kind)[:64] for gid, kind in types.items()}
|
|
814
|
+
|
|
815
|
+
|
|
816
|
+
def device_summary() -> list:
|
|
817
|
+
"""One entry per registered device: its type and whether it is connected.
|
|
818
|
+
|
|
819
|
+
Types and counts only — never a device identifier, serial, or any data.
|
|
820
|
+
"""
|
|
782
821
|
try:
|
|
783
822
|
from . import device_manager
|
|
784
823
|
|
|
785
824
|
connected = set(device_manager.get_all_devices())
|
|
786
825
|
except Exception: # noqa: BLE001 - drivers are optional at report time
|
|
787
826
|
connected = set()
|
|
788
|
-
|
|
789
|
-
|
|
790
|
-
|
|
827
|
+
return [{"type": kind, "online": gid in connected} for gid, kind in _device_types().items()]
|
|
828
|
+
|
|
829
|
+
|
|
830
|
+
def usage_summary() -> dict:
|
|
831
|
+
"""Reservations made on the devices shared on Global: by the UTC hour and
|
|
832
|
+
weekday they start, and reservations and seconds reserved per device type.
|
|
833
|
+
|
|
834
|
+
Counts only (ReservationBuckets); all zero when nothing is shared there.
|
|
835
|
+
"""
|
|
836
|
+
from .federation import cluster
|
|
837
|
+
|
|
838
|
+
usage = {"by_hour": [0] * 24, "by_weekday": [0] * 7, "by_type": {}}
|
|
839
|
+
try:
|
|
840
|
+
shared = {int(d) for group in cluster.groups(cluster.GLOBAL) for d in group["devices"]}
|
|
841
|
+
except Exception: # noqa: BLE001 - not in the global cluster (yet), or its state is unreadable
|
|
842
|
+
return usage
|
|
843
|
+
types = _device_types()
|
|
844
|
+
by_type = {}
|
|
845
|
+
for device_id, bucket, n, seconds in _rows(
|
|
846
|
+
_db_dir() / "reservations.db",
|
|
847
|
+
"SELECT device_id, bucket, reservations, CAST(ROUND(seconds) AS INTEGER) FROM ReservationBuckets"):
|
|
848
|
+
if device_id not in shared:
|
|
791
849
|
continue
|
|
792
|
-
|
|
793
|
-
{
|
|
794
|
-
|
|
795
|
-
|
|
796
|
-
|
|
797
|
-
|
|
798
|
-
|
|
850
|
+
if bucket == "all":
|
|
851
|
+
totals = by_type.setdefault(types.get(device_id, "unknown"), {"reservations": 0, "seconds": 0})
|
|
852
|
+
totals["reservations"] += n
|
|
853
|
+
totals["seconds"] = min(totals["seconds"] + seconds, 2**31)
|
|
854
|
+
else:
|
|
855
|
+
usage["by_hour" if bucket[0] == "h" else "by_weekday"][int(bucket[1:])] += n
|
|
856
|
+
busiest = sorted((kv for kv in by_type.items() if kv[1]["reservations"]), key=lambda kv: -kv[1]["reservations"])
|
|
857
|
+
usage["by_type"] = dict(busiest[:64]) # Global takes at most 64 types
|
|
858
|
+
return usage
|
|
799
859
|
|
|
800
860
|
|
|
801
861
|
def cert_sha256() -> Optional[str]:
|
|
@@ -826,7 +886,9 @@ def status_payload() -> dict:
|
|
|
826
886
|
"SELECT COUNT(*) FROM Reservations WHERE start_time <= ? AND end_time > ?",
|
|
827
887
|
(now, now),
|
|
828
888
|
),
|
|
889
|
+
"reservations": _count(reservations, "SELECT n FROM ReservationCount"),
|
|
829
890
|
"reserved_s": _count(reservations, "SELECT CAST(ROUND(seconds) AS INTEGER) FROM ReservedTotal"),
|
|
891
|
+
"usage": usage_summary(),
|
|
830
892
|
"lan_address": lan_endpoint(),
|
|
831
893
|
"cert_sha256": cert_sha256(),
|
|
832
894
|
}
|
|
@@ -845,13 +907,17 @@ def send_status() -> None:
|
|
|
845
907
|
from datetime import datetime, timezone
|
|
846
908
|
|
|
847
909
|
payload = status_payload()
|
|
848
|
-
|
|
849
|
-
|
|
850
|
-
|
|
851
|
-
|
|
852
|
-
|
|
853
|
-
|
|
854
|
-
|
|
910
|
+
# A Global older than a field refuses the note: drop the newest first
|
|
911
|
+
# (`usage`, then `reservations`), then `proxies`/`reserved_s`, as the note
|
|
912
|
+
# was before each of them.
|
|
913
|
+
steps = ((), ("usage",), ("usage", "reservations"), ("usage", "reservations", "proxies", "reserved_s"))
|
|
914
|
+
for drop in steps:
|
|
915
|
+
try:
|
|
916
|
+
call("POST", REPORT_PATH, {"kind": "status", "status": {k: v for k, v in payload.items() if k not in drop}})
|
|
917
|
+
break
|
|
918
|
+
except GlobalError as exc:
|
|
919
|
+
if exc.code != "invalid_status" or drop is steps[-1]:
|
|
920
|
+
raise
|
|
855
921
|
update(GLOBAL_LAST_REPORT_AT=datetime.now(timezone.utc).isoformat())
|
|
856
922
|
|
|
857
923
|
|
|
@@ -69,7 +69,6 @@ from prompt_toolkit import PromptSession
|
|
|
69
69
|
from prompt_toolkit.input import DummyInput
|
|
70
70
|
from prompt_toolkit.output import DummyOutput
|
|
71
71
|
|
|
72
|
-
from ..tools.gist_status import start_status_publisher
|
|
73
72
|
from .cert_provider import start_cert_provider, stop_cert_provider
|
|
74
73
|
try:
|
|
75
74
|
from . import direct_path
|
|
@@ -296,7 +295,6 @@ def start_server_runtime(
|
|
|
296
295
|
cert_dir: Path | None = None,
|
|
297
296
|
include_host_tunnel: bool = True,
|
|
298
297
|
run_reservation_updates: bool = True,
|
|
299
|
-
publish_status: bool = True,
|
|
300
298
|
federation_executor: Any = None,
|
|
301
299
|
home_federation_enroller: Any = None,
|
|
302
300
|
home_federation_permissions: Any = None,
|
|
@@ -444,8 +442,6 @@ def start_server_runtime(
|
|
|
444
442
|
)
|
|
445
443
|
update_thread.start()
|
|
446
444
|
start_usergroup_cleanup_loop(interval_sec=60)
|
|
447
|
-
if publish_status:
|
|
448
|
-
start_status_publisher()
|
|
449
445
|
except BaseException: # Ctrl-C during the startup check too: close_local_devices powers Plutos down
|
|
450
446
|
stop_event.set()
|
|
451
447
|
server.stop(0)
|
|
@@ -212,18 +212,84 @@ class ReservationHandler:
|
|
|
212
212
|
|
|
213
213
|
# Cumulative reserved seconds, kept by triggers because expired rows are
|
|
214
214
|
# purged. A cancel gives back the unused remainder, so only time actually
|
|
215
|
-
# held counts. Reported to Global as `reserved_s`.
|
|
215
|
+
# held counts. Reported to Global as `reserved_s`. A partner's device
|
|
216
|
+
# (alias id >= 1000000) is left to its owner, like ReservationCount below;
|
|
217
|
+
# the triggers are recreated so labs that had the unfiltered ones get these.
|
|
216
218
|
self.cursor.executescript('''
|
|
219
|
+
BEGIN IMMEDIATE;
|
|
217
220
|
CREATE TABLE IF NOT EXISTS ReservedTotal (id INTEGER PRIMARY KEY CHECK (id = 1), seconds REAL NOT NULL);
|
|
218
221
|
INSERT OR IGNORE INTO ReservedTotal
|
|
219
|
-
SELECT 1, COALESCE(SUM((julianday(end_time) - julianday(start_time)) * 86400), 0) FROM Reservations
|
|
220
|
-
|
|
222
|
+
SELECT 1, COALESCE(SUM((julianday(end_time) - julianday(start_time)) * 86400), 0) FROM Reservations
|
|
223
|
+
WHERE device_id < 1000000;
|
|
224
|
+
DROP TRIGGER IF EXISTS reserved_total_ins;
|
|
225
|
+
DROP TRIGGER IF EXISTS reserved_total_del;
|
|
226
|
+
CREATE TRIGGER reserved_total_ins AFTER INSERT ON Reservations
|
|
227
|
+
WHEN NEW.device_id < 1000000 BEGIN
|
|
221
228
|
UPDATE ReservedTotal SET seconds = seconds + (julianday(NEW.end_time) - julianday(NEW.start_time)) * 86400;
|
|
222
229
|
END;
|
|
223
|
-
CREATE TRIGGER
|
|
230
|
+
CREATE TRIGGER reserved_total_del AFTER DELETE ON Reservations
|
|
231
|
+
WHEN OLD.device_id < 1000000 BEGIN
|
|
224
232
|
UPDATE ReservedTotal SET seconds = seconds - MAX(0,
|
|
225
233
|
(julianday(OLD.end_time) - julianday(MAX(OLD.start_time, datetime('now', 'localtime')))) * 86400);
|
|
226
234
|
END;
|
|
235
|
+
COMMIT;
|
|
236
|
+
''')
|
|
237
|
+
|
|
238
|
+
# Reservations ever made, kept the same way; one cancelled before it
|
|
239
|
+
# started is taken back. Reported to Global as `reservations`. Only our
|
|
240
|
+
# own devices count: a partner's device (alias id >= ALIAS_BASE,
|
|
241
|
+
# home_devices) is counted by its owner.
|
|
242
|
+
self.cursor.executescript('''
|
|
243
|
+
CREATE TABLE IF NOT EXISTS ReservationCount (id INTEGER PRIMARY KEY CHECK (id = 1), n INTEGER NOT NULL);
|
|
244
|
+
INSERT OR IGNORE INTO ReservationCount SELECT 1, COUNT(*) FROM Reservations WHERE device_id < 1000000;
|
|
245
|
+
CREATE TRIGGER IF NOT EXISTS reservation_count_ins AFTER INSERT ON Reservations
|
|
246
|
+
WHEN NEW.device_id < 1000000 BEGIN
|
|
247
|
+
UPDATE ReservationCount SET n = n + 1;
|
|
248
|
+
END;
|
|
249
|
+
CREATE TRIGGER IF NOT EXISTS reservation_count_del AFTER DELETE ON Reservations
|
|
250
|
+
WHEN OLD.device_id < 1000000 AND OLD.start_time > datetime('now', 'localtime') BEGIN
|
|
251
|
+
UPDATE ReservationCount SET n = MAX(n - 1, 0);
|
|
252
|
+
END;
|
|
253
|
+
''')
|
|
254
|
+
|
|
255
|
+
# The same two counts per own device: overall ('all'), by the UTC hour
|
|
256
|
+
# of the start ('h00'..'h23') and by its UTC weekday ('d0' = Monday ..
|
|
257
|
+
# 'd6'). Reservations hold local time, hence the 'utc' modifier.
|
|
258
|
+
# Reported to Global as `usage`, for the devices shared there. Seeded
|
|
259
|
+
# only into an empty table: the bucket names follow the process TZ, so a
|
|
260
|
+
# restart under another TZ must not count the current rows again.
|
|
261
|
+
hour = lambda r: f"'h' || strftime('%H', {r}.start_time, 'utc')" # noqa: E731
|
|
262
|
+
day = lambda r: f"'d' || ((CAST(strftime('%w', {r}.start_time, 'utc') AS INTEGER) + 6) % 7)" # noqa: E731
|
|
263
|
+
length = lambda r: f"(julianday({r}.end_time) - julianday({r}.start_time)) * 86400" # noqa: E731
|
|
264
|
+
self.cursor.executescript(f'''
|
|
265
|
+
BEGIN IMMEDIATE;
|
|
266
|
+
CREATE TABLE IF NOT EXISTS ReservationBuckets (device_id INTEGER NOT NULL, bucket TEXT NOT NULL,
|
|
267
|
+
reservations INTEGER NOT NULL, seconds REAL NOT NULL, PRIMARY KEY (device_id, bucket));
|
|
268
|
+
INSERT INTO ReservationBuckets
|
|
269
|
+
SELECT device_id, bucket, COUNT(*), SUM(seconds) FROM (
|
|
270
|
+
SELECT device_id, 'all' AS bucket, {length("r")} AS seconds FROM Reservations r
|
|
271
|
+
UNION ALL SELECT device_id, {hour("r")}, {length("r")} FROM Reservations r
|
|
272
|
+
UNION ALL SELECT device_id, {day("r")}, {length("r")} FROM Reservations r)
|
|
273
|
+
WHERE device_id < 1000000 AND NOT EXISTS (SELECT 1 FROM ReservationBuckets)
|
|
274
|
+
GROUP BY device_id, bucket;
|
|
275
|
+
CREATE TRIGGER IF NOT EXISTS reservation_buckets_ins AFTER INSERT ON Reservations
|
|
276
|
+
WHEN NEW.device_id < 1000000 BEGIN
|
|
277
|
+
INSERT INTO ReservationBuckets VALUES
|
|
278
|
+
(NEW.device_id, 'all', 1, {length("NEW")}),
|
|
279
|
+
(NEW.device_id, {hour("NEW")}, 1, {length("NEW")}),
|
|
280
|
+
(NEW.device_id, {day("NEW")}, 1, {length("NEW")})
|
|
281
|
+
ON CONFLICT (device_id, bucket) DO UPDATE
|
|
282
|
+
SET reservations = reservations + 1, seconds = seconds + excluded.seconds;
|
|
283
|
+
END;
|
|
284
|
+
CREATE TRIGGER IF NOT EXISTS reservation_buckets_del AFTER DELETE ON Reservations
|
|
285
|
+
WHEN OLD.device_id < 1000000 BEGIN
|
|
286
|
+
UPDATE ReservationBuckets SET
|
|
287
|
+
reservations = MAX(reservations - (OLD.start_time > datetime('now', 'localtime')), 0),
|
|
288
|
+
seconds = MAX(seconds - MAX(0,
|
|
289
|
+
(julianday(OLD.end_time) - julianday(MAX(OLD.start_time, datetime('now', 'localtime')))) * 86400), 0)
|
|
290
|
+
WHERE device_id = OLD.device_id AND bucket IN ('all', {hour("OLD")}, {day("OLD")});
|
|
291
|
+
END;
|
|
292
|
+
COMMIT;
|
|
227
293
|
''')
|
|
228
294
|
|
|
229
295
|
# "Stay logged in" for the deployment protocol: a random token the
|
|
@@ -1428,172 +1494,6 @@ class ReservationHandler:
|
|
|
1428
1494
|
except (sqlite3.Error, ValueError):
|
|
1429
1495
|
return {}
|
|
1430
1496
|
|
|
1431
|
-
@db_connection
|
|
1432
|
-
def get_obfuscated_device_reservations_grouped_past_days(self, days: int) -> dict[str, dict[str, int]]:
|
|
1433
|
-
try:
|
|
1434
|
-
days = int(days)
|
|
1435
|
-
except Exception:
|
|
1436
|
-
return {}
|
|
1437
|
-
|
|
1438
|
-
if days < 0:
|
|
1439
|
-
return {}
|
|
1440
|
-
|
|
1441
|
-
now = datetime.now()
|
|
1442
|
-
cutoff = now - timedelta(days=days)
|
|
1443
|
-
|
|
1444
|
-
def _parse_logged_int(v) -> int:
|
|
1445
|
-
if isinstance(v, int):
|
|
1446
|
-
return v
|
|
1447
|
-
if isinstance(v, float):
|
|
1448
|
-
return int(v)
|
|
1449
|
-
|
|
1450
|
-
s = str(v).strip()
|
|
1451
|
-
|
|
1452
|
-
# Handles strings like:
|
|
1453
|
-
# "int64_value: 2"
|
|
1454
|
-
# "int64_value: 1772587800"
|
|
1455
|
-
if ":" in s:
|
|
1456
|
-
s = s.split(":", 1)[1].strip()
|
|
1457
|
-
|
|
1458
|
-
# remove quotes/newlines if present
|
|
1459
|
-
s = s.strip().strip('"').strip("'")
|
|
1460
|
-
return int(float(s))
|
|
1461
|
-
|
|
1462
|
-
# Take a consistent snapshot of the log file under the same lock used by writers.
|
|
1463
|
-
try:
|
|
1464
|
-
with log_lock:
|
|
1465
|
-
activity_log = _load_logs()
|
|
1466
|
-
except Exception:
|
|
1467
|
-
activity_log = []
|
|
1468
|
-
|
|
1469
|
-
out: dict[str, dict[str, int]] = {}
|
|
1470
|
-
|
|
1471
|
-
for entry in activity_log:
|
|
1472
|
-
try:
|
|
1473
|
-
if not isinstance(entry, dict):
|
|
1474
|
-
continue
|
|
1475
|
-
|
|
1476
|
-
if str(entry.get("action", "")).strip() != "reserve_device":
|
|
1477
|
-
continue
|
|
1478
|
-
|
|
1479
|
-
details = entry.get("details", {})
|
|
1480
|
-
if not isinstance(details, dict):
|
|
1481
|
-
continue
|
|
1482
|
-
|
|
1483
|
-
args = details.get("args", {})
|
|
1484
|
-
result = details.get("result", {})
|
|
1485
|
-
|
|
1486
|
-
if not isinstance(args, dict) or not isinstance(result, dict):
|
|
1487
|
-
continue
|
|
1488
|
-
|
|
1489
|
-
# Only count SUCCESSFUL reservations
|
|
1490
|
-
if "Token" not in result:
|
|
1491
|
-
continue
|
|
1492
|
-
|
|
1493
|
-
raw_device_id = args.get("dd")
|
|
1494
|
-
raw_start = args.get("st")
|
|
1495
|
-
raw_end = args.get("et")
|
|
1496
|
-
|
|
1497
|
-
if raw_device_id is None or raw_start is None or raw_end is None:
|
|
1498
|
-
continue
|
|
1499
|
-
|
|
1500
|
-
device_id = _parse_logged_int(raw_device_id)
|
|
1501
|
-
start_ts = _parse_logged_int(raw_start)
|
|
1502
|
-
end_ts = _parse_logged_int(raw_end)
|
|
1503
|
-
|
|
1504
|
-
start_dt = datetime.fromtimestamp(start_ts)
|
|
1505
|
-
end_dt = datetime.fromtimestamp(end_ts)
|
|
1506
|
-
|
|
1507
|
-
# Same overlap semantics as before
|
|
1508
|
-
if end_dt < cutoff or start_dt > now:
|
|
1509
|
-
continue
|
|
1510
|
-
|
|
1511
|
-
dev_key = str(device_id)
|
|
1512
|
-
day_key = start_dt.date().isoformat()
|
|
1513
|
-
|
|
1514
|
-
if dev_key not in out:
|
|
1515
|
-
out[dev_key] = {}
|
|
1516
|
-
|
|
1517
|
-
out[dev_key][day_key] = out[dev_key].get(day_key, 0) + 1
|
|
1518
|
-
|
|
1519
|
-
except Exception:
|
|
1520
|
-
continue
|
|
1521
|
-
|
|
1522
|
-
return dict(sorted(out.items(), key=lambda kv: int(kv[0])))
|
|
1523
|
-
|
|
1524
|
-
@db_connection
|
|
1525
|
-
def get_obfuscated_usage_summary(self) -> dict[str, int | float]:
|
|
1526
|
-
|
|
1527
|
-
int_re = re.compile(r'int64_value:\s*([0-9]+)')
|
|
1528
|
-
str_re = re.compile(r'string_value:\s*"([^"]*)"')
|
|
1529
|
-
|
|
1530
|
-
def _parse_proto_value(v):
|
|
1531
|
-
if isinstance(v, (int, float)):
|
|
1532
|
-
return v
|
|
1533
|
-
if not isinstance(v, str):
|
|
1534
|
-
return v
|
|
1535
|
-
|
|
1536
|
-
m_int = int_re.search(v)
|
|
1537
|
-
if m_int:
|
|
1538
|
-
return int(m_int.group(1))
|
|
1539
|
-
|
|
1540
|
-
m_str = str_re.search(v)
|
|
1541
|
-
if m_str:
|
|
1542
|
-
return m_str.group(1)
|
|
1543
|
-
|
|
1544
|
-
return v
|
|
1545
|
-
|
|
1546
|
-
try:
|
|
1547
|
-
with log_lock:
|
|
1548
|
-
activity_log = _load_logs()
|
|
1549
|
-
except Exception:
|
|
1550
|
-
activity_log = []
|
|
1551
|
-
|
|
1552
|
-
accounts: set[str] = set()
|
|
1553
|
-
total_reservations = 0
|
|
1554
|
-
total_reserved_seconds = 0
|
|
1555
|
-
|
|
1556
|
-
for entry in activity_log:
|
|
1557
|
-
try:
|
|
1558
|
-
if not isinstance(entry, dict):
|
|
1559
|
-
continue
|
|
1560
|
-
|
|
1561
|
-
action = entry.get("action")
|
|
1562
|
-
username = entry.get("username")
|
|
1563
|
-
details = entry.get("details", {}) or {}
|
|
1564
|
-
args = details.get("args", {}) or {}
|
|
1565
|
-
result = details.get("result", {}) or {}
|
|
1566
|
-
|
|
1567
|
-
if not isinstance(args, dict) or not isinstance(result, dict):
|
|
1568
|
-
continue
|
|
1569
|
-
|
|
1570
|
-
# Count accounts from successful logins
|
|
1571
|
-
if action == "login" and "UC" in result:
|
|
1572
|
-
uc_name = _parse_proto_value(result.get("UC"))
|
|
1573
|
-
if uc_name:
|
|
1574
|
-
accounts.add(str(uc_name))
|
|
1575
|
-
elif username:
|
|
1576
|
-
accounts.add(str(username))
|
|
1577
|
-
|
|
1578
|
-
# Count reservations + reserved time
|
|
1579
|
-
if action == "reserve_device":
|
|
1580
|
-
total_reservations += 1
|
|
1581
|
-
|
|
1582
|
-
st = _parse_proto_value(args.get("st"))
|
|
1583
|
-
et = _parse_proto_value(args.get("et"))
|
|
1584
|
-
|
|
1585
|
-
if isinstance(st, int) and isinstance(et, int) and et > st:
|
|
1586
|
-
total_reserved_seconds += (et - st)
|
|
1587
|
-
|
|
1588
|
-
except Exception:
|
|
1589
|
-
continue
|
|
1590
|
-
|
|
1591
|
-
return {
|
|
1592
|
-
"account_count": len(accounts),
|
|
1593
|
-
"total_reservations": int(total_reservations),
|
|
1594
|
-
"total_reserved_hours": round(total_reserved_seconds / 3600.0, 1),
|
|
1595
|
-
}
|
|
1596
|
-
|
|
1597
1497
|
def get_reservation_count(self, username):
|
|
1598
1498
|
self.cursor.execute("SELECT COUNT(*) FROM Reservations WHERE username = ?", (username,))
|
|
1599
1499
|
count = self.cursor.fetchone()[0]
|