Skip to content

Refactor/maps php config #91

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
techtimo merged 5 commits into from
May 7, 2026
Merged

Refactor/maps php config #91

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0676242
refactor: replace Symfony YAML with plain PHP for maps config
techtimo May 6, 2026
6fa7416
fix(tests): remove vendor-prefixed autoload from test bootstrap
techtimo May 6, 2026
2d984c5
chore: update composer.lock after removing symfony/yaml dependency
techtimo May 6, 2026
43803d3
fix: teltonika expected content type + logging
techtimo May 7, 2026
21bfa3d
Merge branch 'main' into refactor/maps-php-config
techtimo May 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 40 additions & 9 deletions includes/class-spotmap-ingest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,12 +180,23 @@ public static function handle_osmand(WP_REST_Request $request): WP_REST_Response
*/
public static function handle_teltonika(WP_REST_Request $request): WP_REST_Response
{
// Log everything we have before any validation so we can see what Teltonika actually sends.
$raw_body = $request->get_body();
$key_raw = $request->get_param('key') ?? '';
$key_masked = strlen($key_raw) > 4 ? substr($key_raw, 0, 4) . str_repeat('*', strlen($key_raw) - 4) : '(empty)';
$ct = $request->get_content_type();

self::log_ingest_event(
'teltonika',
'request_received',
[
'method' => $request->get_method(),
'has_key' => $request->get_param('key') !== null,
'method' => $request->get_method(),
'content_type' => is_array($ct) ? ($ct['value'] ?? '') : (string) $ct,
'key_masked' => $key_masked,
'query_params' => array_diff_key($request->get_query_params(), [ 'key' => '' ]),
'body_length' => strlen($raw_body),
'body_raw' => substr($raw_body, 0, 2000),
'json_parsed' => $request->get_json_params(),
]
);

Expand All @@ -211,10 +222,25 @@ public static function handle_teltonika(WP_REST_Request $request): WP_REST_Respo
// 2. Build payload from wrapped JSON body.
$payload = self::build_teltonika_payload($request);
if ($payload === null) {
self::log_ingest_event('teltonika', 'invalid_payload', self::feed_context($feed));
$body_raw = $request->get_body();
self::log_ingest_event(
'teltonika',
'invalid_payload',
self::feed_context($feed) + [
'body_length' => strlen($body_raw),
'body_raw' => substr($body_raw, 0, 500),
'json_params' => $request->get_json_params(),
]
);
return new WP_REST_Response([ 'error' => 'Invalid payload. Expected wrapped JSON body: {"<key>": {"latitude":…, "longitude":…, "timestamp":…}}.' ], 400);
}

self::log_ingest_event(
'teltonika',
'payload_parsed',
self::feed_context($feed) + [ 'payload_keys' => array_keys($payload), 'payload' => $payload ]
);

// 3. Validate required fields.
if (! isset($payload['latitude'], $payload['longitude'], $payload['timestamp'])) {
self::log_ingest_event(
Expand Down Expand Up @@ -392,7 +418,14 @@ private static function is_unsubstituted($value): bool
*/
private static function build_teltonika_payload(WP_REST_Request $request): ?array
{
// get_json_params() only works when Content-Type is application/json.
// Teltonika sends application/x-www-form-urlencoded despite the body being JSON,
// so fall back to decoding the raw body directly.
$body = $request->get_json_params();
if (! is_array($body) || empty($body)) {
$raw = $request->get_body();
$body = $raw !== '' ? json_decode($raw, true) : null;
}
if (! is_array($body) || empty($body)) {
return null;
}
Expand Down Expand Up @@ -424,20 +457,18 @@ private static function feed_context(array $feed): array
*/
private static function log_ingest_event(string $provider, string $event, array $context = []): void
{
if (! defined('WP_DEBUG') || ! WP_DEBUG) {
if (! defined('WP_DEBUG_LOG') || ! WP_DEBUG_LOG) {
return;
}

$timestamp = gmdate('c');
$line = sprintf(
'[%s] [spotmap ingest] provider=%s event=%s context=%s',
$timestamp,
'[spotmap] provider=%s event=%s context=%s',
$provider,
$event,
wp_json_encode($context)
);

// phpcs:ignore WordPress.PHP.DevelopmentFunctions.error_log_trigger_error
trigger_error($line, E_USER_NOTICE);
// phpcs:ignore WordPress.PHP.DevelopmentFunctions.error_log_error_log
error_log($line);
}
}
3 changes: 2 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
"packages-update": "wp-scripts packages-update",
"version:bump": "node scripts/bump-version.js",
"plugin-zip": "npm run build && wp-scripts plugin-zip && node -e \"const fs=require('fs');const v=fs.readFileSync('spotmap.php','utf8').match(/Version:\\s+(\\S+)/)[1];fs.renameSync('spotmap.zip',`spotmap-${v}.zip`);console.log(`Created spotmap-${v}.zip`);\"",
"composer": "wp-env run cli --env-cwd=wp-content/plugins/Spotmap composer"
"composer": "wp-env run cli --env-cwd=wp-content/plugins/Spotmap -- composer"
},
"overrides": {
"serialize-javascript": "^7.0.3",
Expand All @@ -92,3 +92,4 @@
"babel-plugin-istanbul": "^8.0.0"
}
}

Loading