diff --git a/resources/views/livewire/plugins/recipe.blade.php b/resources/views/livewire/plugins/recipe.blade.php
index 4be96cc..1597d5d 100644
--- a/resources/views/livewire/plugins/recipe.blade.php
+++ b/resources/views/livewire/plugins/recipe.blade.php
@@ -1,12 +1,16 @@
user()->plugins->contains($this->plugin), 403);
$this->blade_code = $this->plugin->render_markup;
+ // required to render some stuff
$this->configuration_template = $this->plugin->configuration_template ?? [];
- $this->configuration = is_array($this->plugin->configuration) ? $this->plugin->configuration : [];
if ($this->plugin->render_markup_view) {
try {
@@ -74,6 +77,12 @@ new class extends Component {
$this->fillformFields();
$this->data_payload_updated_at = $this->plugin->data_payload_updated_at;
+
+ // Set default preview device model
+ if ($this->preview_device_model_id === null) {
+ $defaultModel = DeviceModel::where('name', 'og_plus')->first() ?? DeviceModel::first();
+ $this->preview_device_model_id = $defaultModel?->id;
+ }
}
public function fillFormFields(): void
@@ -129,6 +138,19 @@ new class extends Component {
$validated = $this->validate();
$validated['data_payload'] = json_decode(Arr::get($validated,'data_payload'), true);
$this->plugin->update($validated);
+
+ foreach ($this->configuration_template as $fieldKey => $field) {
+ if (($field['field_type'] ?? null) !== 'multi_string') {
+ continue;
+ }
+
+ if (!isset($this->multiValues[$fieldKey])) {
+ continue;
+ }
+
+ $validated[$fieldKey] = implode(',', array_filter(array_map('trim', $this->multiValues[$fieldKey])));
+ }
+
}
protected function validatePollingUrl(): void
@@ -254,39 +276,6 @@ new class extends Component {
Flux::modal('add-to-playlist')->close();
}
- public function saveConfiguration()
- {
- abort_unless(auth()->user()->plugins->contains($this->plugin), 403);
-
- $configurationValues = [];
- if (isset($this->configuration_template['custom_fields'])) {
- foreach ($this->configuration_template['custom_fields'] as $field) {
- $fieldKey = $field['keyname'];
- if (isset($this->configuration[$fieldKey])) {
- $value = $this->configuration[$fieldKey];
-
- // For code fields, if the value is a JSON string and the original was an array, decode it
- if ($field['field_type'] === 'code' && is_string($value)) {
- $decoded = json_decode($value, true);
- // If it's valid JSON and decodes to an array/object, use the decoded value
- // Otherwise, keep the string as-is
- if (json_last_error() === JSON_ERROR_NONE && (is_array($decoded) || is_object($decoded))) {
- $value = $decoded;
- }
- }
-
- $configurationValues[$fieldKey] = $value;
- }
- }
- }
-
- $this->plugin->update([
- 'configuration' => $configurationValues
- ]);
-
- Flux::modal('configuration-modal')->close();
- }
-
public function getDevicePlaylists($deviceId)
{
return \App\Models\Playlist::where('device_id', $deviceId)->get();
@@ -307,8 +296,6 @@ new class extends Component {
return $this->configuration[$key] ?? $default;
}
-
-
public function renderExample(string $example)
{
switch ($example) {
@@ -377,13 +364,17 @@ HTML;
{
abort_unless(auth()->user()->plugins->contains($this->plugin), 403);
+ $this->preview_size = $size;
+
// If data strategy is polling and data_payload is null, fetch the data first
if ($this->plugin->data_strategy === 'polling' && $this->plugin->data_payload === null) {
$this->updateData();
}
try {
- $previewMarkup = $this->plugin->render($size);
+ // Create a device object with og_plus model and the selected bitdepth
+ $device = $this->createPreviewDevice();
+ $previewMarkup = $this->plugin->render($size, true, $device);
$this->dispatch('preview-updated', preview: $previewMarkup);
} catch (LiquidException $e) {
$this->dispatch('preview-error', message: $e->toLiquidErrorMessage());
@@ -392,6 +383,38 @@ HTML;
}
}
+ private function createPreviewDevice(): \App\Models\Device
+ {
+ $deviceModel = DeviceModel::with(['palette'])->find($this->preview_device_model_id)
+ ?? DeviceModel::with(['palette'])->first();
+
+ $device = new Device();
+ $device->setRelation('deviceModel', $deviceModel);
+
+ return $device;
+ }
+
+ public function getDeviceModels()
+ {
+ return DeviceModel::whereKind('trmnl')->orderBy('label')->get();
+ }
+
+ public function updatedPreviewDeviceModelId(): void
+ {
+ $this->renderPreview($this->preview_size);
+ }
+
+ public function duplicatePlugin(): void
+ {
+ abort_unless(auth()->user()->plugins->contains($this->plugin), 403);
+
+ // Use the model's duplicate method
+ $newPlugin = $this->plugin->duplicate(auth()->id());
+
+ // Redirect to the new plugin's detail page
+ $this->redirect(route('plugins.recipe', ['plugin' => $newPlugin]));
+ }
+
public function deletePlugin(): void
{
abort_unless(auth()->user()->plugins->contains($this->plugin), 403);
@@ -399,42 +422,31 @@ HTML;
$this->redirect(route('plugins.index'));
}
- public function loadXhrSelectOptions(string $fieldKey, string $endpoint, ?string $query = null): void
- {
- abort_unless(auth()->user()->plugins->contains($this->plugin), 403);
+ #[On('config-updated')]
+ public function refreshPlugin()
+ {
+ // This pulls the fresh 'configuration' from the DB
+ // and re-triggers the @if check in the Blade template
+ $this->plugin = $this->plugin->fresh();
+ }
- try {
- $requestData = [];
- if ($query !== null) {
- $requestData = [
- 'function' => $fieldKey,
- 'query' => $query
- ];
- }
-
- $response = $query !== null
- ? Http::post($endpoint, $requestData)
- : Http::post($endpoint);
-
- if ($response->successful()) {
- $this->xhrSelectOptions[$fieldKey] = $response->json();
- } else {
- $this->xhrSelectOptions[$fieldKey] = [];
- }
- } catch (\Exception $e) {
- $this->xhrSelectOptions[$fieldKey] = [];
- }
+ // Laravel Livewire computed property: access with $this->parsed_urls
+ #[Computed]
+ private function parsedUrls()
+ {
+ if (!isset($this->polling_url)) {
+ return null;
}
- public function searchXhrSelect(string $fieldKey, string $endpoint): void
- {
- $query = $this->searchQueries[$fieldKey] ?? '';
- if (!empty($query)) {
- $this->loadXhrSelectOptions($fieldKey, $endpoint, $query);
- }
+ try {
+ return $this->plugin->resolveLiquidVariables($this->polling_url);
+
+ } catch (\Exception $e) {
+ return 'PARSE_ERROR: ' . $e->getMessage();
}
+ }
+
}
-
?>
@@ -466,7 +478,6 @@ HTML;
-
@@ -476,6 +487,11 @@ HTML;
+
+ Recipe Settings
+
+ Duplicate Plugin
Delete Plugin
@@ -617,8 +633,15 @@ HTML;
-
+
Preview {{ $plugin->name }}
+
+
+ @foreach($this->getDeviceModels() as $model)
+ {{ $model->label ?? $model->name }}
+ @endforeach
+
+
@@ -626,269 +649,9 @@ HTML;
-
-
-
- Configuration
- Configure your plugin settings
-
+
-
-
+
Settings
@@ -976,7 +739,7 @@ HTML;
@endif
- Configuration
+ Configuration Fields
@endif
@@ -989,15 +752,62 @@ HTML;
@if($data_strategy === 'polling')
-
-
Polling URL
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Enter the URL(s) to poll for data:
+
-
-
+ rows="5"
+ />
+
+ {!! 'Hint: Supports multiple requests via line break separation. You can also use configuration variables with Liquid syntax . ' !!}
+
+
+
+
+
+
+ Preview computed URLs here (readonly):
+
+ {{ $this->parsed_urls }}
+
+
+
+
+
Fetch data now
+
@@ -1161,9 +971,6 @@ HTML;
-
-
-
@else
diff --git a/resources/views/livewire/plugins/recipes/settings.blade.php b/resources/views/livewire/plugins/recipes/settings.blade.php
new file mode 100644
index 0000000..8ae3d6f
--- /dev/null
+++ b/resources/views/livewire/plugins/recipes/settings.blade.php
@@ -0,0 +1,104 @@
+resetErrorBag();
+ // Reload data
+ $this->plugin = $this->plugin->fresh();
+ $this->trmnlp_id = $this->plugin->trmnlp_id;
+ $this->uuid = $this->plugin->uuid;
+ $this->alias = $this->plugin->alias ?? false;
+ }
+
+ public function saveTrmnlpId(): void
+ {
+ abort_unless(auth()->user()->plugins->contains($this->plugin), 403);
+
+ $this->validate([
+ 'trmnlp_id' => [
+ 'nullable',
+ 'string',
+ 'max:255',
+ Rule::unique('plugins', 'trmnlp_id')
+ ->where('user_id', auth()->id())
+ ->ignore($this->plugin->id),
+ ],
+ 'alias' => 'boolean',
+ ]);
+
+ $this->plugin->update([
+ 'trmnlp_id' => empty($this->trmnlp_id) ? null : $this->trmnlp_id,
+ 'alias' => $this->alias,
+ ]);
+
+ Flux::modal('trmnlp-settings')->close();
+ }
+
+ public function getAliasUrlProperty(): string
+ {
+ return url("/api/display/{$this->uuid}/alias");
+ }
+};?>
+
+
+
+
+ Recipe Settings
+
+
+
+
diff --git a/resources/views/recipes/zen.blade.php b/resources/views/recipes/zen.blade.php
index 5e01eac..0ae920f 100644
--- a/resources/views/recipes/zen.blade.php
+++ b/resources/views/recipes/zen.blade.php
@@ -3,11 +3,11 @@
- {{$data[0]['a']}}
- @if (strlen($data[0]['q']) < 300 && $size != 'quadrant')
- {{ $data[0]['q'] }}
+ {{$data['data'][0]['a'] ?? ''}}
+ @if (strlen($data['data'][0]['q'] ?? '') < 300 && $size != 'quadrant')
+ {{ $data['data'][0]['q'] ?? '' }}
@else
- {{ $data[0]['q'] }}
+ {{ $data['data'][0]['q'] ?? '' }}
@endif
diff --git a/routes/api.php b/routes/api.php
index b1d08b4..f3a31a1 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -549,6 +549,91 @@ Route::post('custom_plugins/{plugin_uuid}', function (string $plugin_uuid) {
return response()->json(['message' => 'Data updated successfully']);
})->name('api.custom_plugins.webhook');
+Route::post('plugin_settings/{uuid}/image', function (Request $request, string $uuid) {
+ $plugin = Plugin::where('uuid', $uuid)->firstOrFail();
+
+ // Check if plugin is image_webhook type
+ if ($plugin->plugin_type !== 'image_webhook') {
+ return response()->json(['error' => 'Plugin is not an image webhook plugin'], 400);
+ }
+
+ // Accept image from either multipart form or raw binary
+ $image = null;
+ $extension = null;
+
+ if ($request->hasFile('image')) {
+ $file = $request->file('image');
+ $extension = mb_strtolower($file->getClientOriginalExtension());
+ $image = $file->get();
+ } elseif ($request->has('image')) {
+ // Base64 encoded image
+ $imageData = $request->input('image');
+ if (preg_match('/^data:image\/(\w+);base64,/', $imageData, $matches)) {
+ $extension = mb_strtolower($matches[1]);
+ $image = base64_decode(mb_substr($imageData, mb_strpos($imageData, ',') + 1));
+ } else {
+ return response()->json(['error' => 'Invalid image format. Expected base64 data URI.'], 400);
+ }
+ } else {
+ // Try raw binary
+ $image = $request->getContent();
+ $contentType = $request->header('Content-Type', '');
+ $trimmedContent = mb_trim($image);
+
+ // Check if content is empty or just empty JSON
+ if (empty($image) || $trimmedContent === '' || $trimmedContent === '{}') {
+ return response()->json(['error' => 'No image data provided'], 400);
+ }
+
+ // If it's a JSON request without image field, return error
+ if (str_contains($contentType, 'application/json')) {
+ return response()->json(['error' => 'No image data provided'], 400);
+ }
+
+ // Detect image type from content
+ $finfo = finfo_open(FILEINFO_MIME_TYPE);
+ $mimeType = finfo_buffer($finfo, $image);
+ finfo_close($finfo);
+
+ $extension = match ($mimeType) {
+ 'image/png' => 'png',
+ 'image/bmp' => 'bmp',
+ default => null,
+ };
+
+ if (! $extension) {
+ return response()->json(['error' => 'Unsupported image format. Expected PNG or BMP.'], 400);
+ }
+ }
+
+ // Validate extension
+ $allowedExtensions = ['png', 'bmp'];
+ if (! in_array($extension, $allowedExtensions)) {
+ return response()->json(['error' => 'Unsupported image format. Expected PNG or BMP.'], 400);
+ }
+
+ // Generate a new UUID for each image upload to prevent device caching
+ $imageUuid = Str::uuid()->toString();
+ $filename = $imageUuid.'.'.$extension;
+ $path = 'images/generated/'.$filename;
+
+ // Save image to storage
+ Storage::disk('public')->put($path, $image);
+
+ // Update plugin's current_image field with the new UUID
+ $plugin->update([
+ 'current_image' => $imageUuid,
+ ]);
+
+ // Clean up old images
+ ImageGenerationService::cleanupFolder();
+
+ return response()->json([
+ 'message' => 'Image uploaded successfully',
+ 'image_url' => url('storage/'.$path),
+ ]);
+})->name('api.plugin_settings.image');
+
Route::get('plugin_settings/{trmnlp_id}/archive', function (Request $request, string $trmnlp_id) {
if (! $trmnlp_id || mb_trim($trmnlp_id) === '') {
return response()->json([
@@ -593,3 +678,90 @@ Route::post('plugin_settings/{trmnlp_id}/archive', function (Request $request, s
],
]);
})->middleware('auth:sanctum');
+
+Route::get('/display/{uuid}/alias', function (Request $request, string $uuid) {
+ $plugin = Plugin::where('uuid', $uuid)->firstOrFail();
+
+ // Check if alias is active
+ if (! $plugin->alias) {
+ return response()->json([
+ 'message' => 'Alias is not active for this plugin',
+ ], 403);
+ }
+
+ // Get device model name from query parameter, default to 'og_png'
+ $deviceModelName = $request->query('device-model', 'og_png');
+ $deviceModel = DeviceModel::where('name', $deviceModelName)->first();
+
+ if (! $deviceModel) {
+ return response()->json([
+ 'message' => "Device model '{$deviceModelName}' not found",
+ ], 404);
+ }
+
+ // Check if we can use cached image (only for og_png and if data is not stale)
+ $useCache = $deviceModelName === 'og_png' && ! $plugin->isDataStale() && $plugin->current_image !== null;
+
+ if ($useCache) {
+ // Return cached image
+ $imageUuid = $plugin->current_image;
+ $fileExtension = $deviceModel->mime_type === 'image/bmp' ? 'bmp' : 'png';
+ $imagePath = 'images/generated/'.$imageUuid.'.'.$fileExtension;
+
+ // Check if image exists, otherwise fall back to generation
+ if (Storage::disk('public')->exists($imagePath)) {
+ return response()->file(Storage::disk('public')->path($imagePath), [
+ 'Content-Type' => $deviceModel->mime_type,
+ ]);
+ }
+ }
+
+ // Generate new image
+ try {
+ // Update data if needed
+ if ($plugin->isDataStale()) {
+ $plugin->updateDataPayload();
+ $plugin->refresh();
+ }
+
+ // Load device model with palette relationship
+ $deviceModel->load('palette');
+
+ // Create a virtual device for rendering (Plugin::render needs a Device object)
+ $virtualDevice = new Device();
+ $virtualDevice->setRelation('deviceModel', $deviceModel);
+ $virtualDevice->setRelation('user', $plugin->user);
+ $virtualDevice->setRelation('palette', $deviceModel->palette);
+
+ // Render the plugin markup
+ $markup = $plugin->render(device: $virtualDevice);
+
+ // Generate image using the new method that doesn't require a device
+ $imageUuid = ImageGenerationService::generateImageFromModel(
+ markup: $markup,
+ deviceModel: $deviceModel,
+ user: $plugin->user,
+ palette: $deviceModel->palette
+ );
+
+ // Update plugin cache if using og_png
+ if ($deviceModelName === 'og_png') {
+ $plugin->update(['current_image' => $imageUuid]);
+ }
+
+ // Return the generated image
+ $fileExtension = $deviceModel->mime_type === 'image/bmp' ? 'bmp' : 'png';
+ $imagePath = Storage::disk('public')->path('images/generated/'.$imageUuid.'.'.$fileExtension);
+
+ return response()->file($imagePath, [
+ 'Content-Type' => $deviceModel->mime_type,
+ ]);
+ } catch (Exception $e) {
+ Log::error("Failed to generate alias image for plugin {$plugin->id} ({$plugin->name}): ".$e->getMessage());
+
+ return response()->json([
+ 'message' => 'Failed to generate image',
+ 'error' => $e->getMessage(),
+ ], 500);
+ }
+})->name('api.display.alias');
diff --git a/routes/web.php b/routes/web.php
index 7b7868d..b3069bd 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -31,6 +31,8 @@ Route::middleware(['auth'])->group(function () {
Volt::route('plugins/recipe/{plugin}', 'plugins.recipe')->name('plugins.recipe');
Volt::route('plugins/markup', 'plugins.markup')->name('plugins.markup');
Volt::route('plugins/api', 'plugins.api')->name('plugins.api');
+ Volt::route('plugins/image-webhook', 'plugins.image-webhook')->name('plugins.image-webhook');
+ Volt::route('plugins/image-webhook/{plugin}', 'plugins.image-webhook-instance')->name('plugins.image-webhook-instance');
Volt::route('playlists', 'playlists.index')->name('playlists.index');
Route::get('plugin_settings/{trmnlp_id}/edit', function (Request $request, string $trmnlp_id) {
diff --git a/tests/Feature/Api/ImageWebhookTest.php b/tests/Feature/Api/ImageWebhookTest.php
new file mode 100644
index 0000000..121f90a
--- /dev/null
+++ b/tests/Feature/Api/ImageWebhookTest.php
@@ -0,0 +1,196 @@
+makeDirectory('/images/generated');
+});
+
+test('can upload image to image webhook plugin via multipart form', function (): void {
+ $user = User::factory()->create();
+ $plugin = Plugin::factory()->imageWebhook()->create([
+ 'user_id' => $user->id,
+ ]);
+
+ $image = UploadedFile::fake()->image('test.png', 800, 480);
+
+ $response = $this->post("/api/plugin_settings/{$plugin->uuid}/image", [
+ 'image' => $image,
+ ]);
+
+ $response->assertOk()
+ ->assertJsonStructure([
+ 'message',
+ 'image_url',
+ ]);
+
+ $plugin->refresh();
+ expect($plugin->current_image)
+ ->not->toBeNull()
+ ->not->toBe($plugin->uuid); // Should be a new UUID, not the plugin's UUID
+
+ // File should exist with the new UUID
+ Storage::disk('public')->assertExists("images/generated/{$plugin->current_image}.png");
+
+ // Image URL should contain the new UUID
+ expect($response->json('image_url'))
+ ->toContain($plugin->current_image);
+});
+
+test('can upload image to image webhook plugin via raw binary', function (): void {
+ $user = User::factory()->create();
+ $plugin = Plugin::factory()->imageWebhook()->create([
+ 'user_id' => $user->id,
+ ]);
+
+ // Create a simple PNG image binary
+ $pngData = base64_decode('iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNk+M9QDwADhgGAWjR9awAAAABJRU5ErkJggg==');
+
+ $response = $this->call('POST', "/api/plugin_settings/{$plugin->uuid}/image", [], [], [], [
+ 'CONTENT_TYPE' => 'image/png',
+ ], $pngData);
+
+ $response->assertOk()
+ ->assertJsonStructure([
+ 'message',
+ 'image_url',
+ ]);
+
+ $plugin->refresh();
+ expect($plugin->current_image)
+ ->not->toBeNull()
+ ->not->toBe($plugin->uuid); // Should be a new UUID, not the plugin's UUID
+
+ // File should exist with the new UUID
+ Storage::disk('public')->assertExists("images/generated/{$plugin->current_image}.png");
+
+ // Image URL should contain the new UUID
+ expect($response->json('image_url'))
+ ->toContain($plugin->current_image);
+});
+
+test('can upload image to image webhook plugin via base64 data URI', function (): void {
+ $user = User::factory()->create();
+ $plugin = Plugin::factory()->imageWebhook()->create([
+ 'user_id' => $user->id,
+ ]);
+
+ // Create a simple PNG image as base64 data URI
+ $base64Image = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNk+M9QDwADhgGAWjR9awAAAABJRU5ErkJggg==';
+
+ $response = $this->postJson("/api/plugin_settings/{$plugin->uuid}/image", [
+ 'image' => $base64Image,
+ ]);
+
+ $response->assertOk()
+ ->assertJsonStructure([
+ 'message',
+ 'image_url',
+ ]);
+
+ $plugin->refresh();
+ expect($plugin->current_image)
+ ->not->toBeNull()
+ ->not->toBe($plugin->uuid); // Should be a new UUID, not the plugin's UUID
+
+ // File should exist with the new UUID
+ Storage::disk('public')->assertExists("images/generated/{$plugin->current_image}.png");
+
+ // Image URL should contain the new UUID
+ expect($response->json('image_url'))
+ ->toContain($plugin->current_image);
+});
+
+test('returns 400 for non-image-webhook plugin', function (): void {
+ $user = User::factory()->create();
+ $plugin = Plugin::factory()->create([
+ 'user_id' => $user->id,
+ 'plugin_type' => 'recipe',
+ ]);
+
+ $image = UploadedFile::fake()->image('test.png', 800, 480);
+
+ $response = $this->post("/api/plugin_settings/{$plugin->uuid}/image", [
+ 'image' => $image,
+ ]);
+
+ $response->assertStatus(400)
+ ->assertJson(['error' => 'Plugin is not an image webhook plugin']);
+});
+
+test('returns 404 for non-existent plugin', function (): void {
+ $image = UploadedFile::fake()->image('test.png', 800, 480);
+
+ $response = $this->post('/api/plugin_settings/'.Str::uuid().'/image', [
+ 'image' => $image,
+ ]);
+
+ $response->assertNotFound();
+});
+
+test('returns 400 for unsupported image format', function (): void {
+ $user = User::factory()->create();
+ $plugin = Plugin::factory()->imageWebhook()->create([
+ 'user_id' => $user->id,
+ ]);
+
+ // Create a fake GIF file (not supported)
+ $gifData = base64_decode('R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7');
+
+ $response = $this->call('POST', "/api/plugin_settings/{$plugin->uuid}/image", [], [], [], [
+ 'CONTENT_TYPE' => 'image/gif',
+ ], $gifData);
+
+ $response->assertStatus(400)
+ ->assertJson(['error' => 'Unsupported image format. Expected PNG or BMP.']);
+});
+
+test('returns 400 for JPG image format', function (): void {
+ $user = User::factory()->create();
+ $plugin = Plugin::factory()->imageWebhook()->create([
+ 'user_id' => $user->id,
+ ]);
+
+ // Create a fake JPG file (not supported)
+ $jpgData = base64_decode('/9j/4AAQSkZJRgABAQEAYABgAAD/2wBDAAEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQH/2wBDAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQH/wAARCAABAAEDASIAAhEBAxEB/8QAFQABAQAAAAAAAAAAAAAAAAAAAAv/xAAUEAEAAAAAAAAAAAAAAAAAAAAA/8QAFQEBAQAAAAAAAAAAAAAAAAAAAAX/xAAUEQEAAAAAAAAAAAAAAAAAAAAA/9oADAMBAAIRAxEAPwA/8A8A');
+
+ $response = $this->call('POST', "/api/plugin_settings/{$plugin->uuid}/image", [], [], [], [
+ 'CONTENT_TYPE' => 'image/jpeg',
+ ], $jpgData);
+
+ $response->assertStatus(400)
+ ->assertJson(['error' => 'Unsupported image format. Expected PNG or BMP.']);
+});
+
+test('returns 400 when no image data provided', function (): void {
+ $user = User::factory()->create();
+ $plugin = Plugin::factory()->imageWebhook()->create([
+ 'user_id' => $user->id,
+ ]);
+
+ $response = $this->postJson("/api/plugin_settings/{$plugin->uuid}/image", []);
+
+ $response->assertStatus(400)
+ ->assertJson(['error' => 'No image data provided']);
+});
+
+test('image webhook plugin isDataStale returns false', function (): void {
+ $plugin = Plugin::factory()->imageWebhook()->create();
+
+ expect($plugin->isDataStale())->toBeFalse();
+});
+
+test('image webhook plugin factory creates correct plugin type', function (): void {
+ $plugin = Plugin::factory()->imageWebhook()->create();
+
+ expect($plugin)
+ ->plugin_type->toBe('image_webhook')
+ ->data_strategy->toBe('static');
+});
diff --git a/tests/Feature/Jobs/FetchDeviceModelsJobTest.php b/tests/Feature/Jobs/FetchDeviceModelsJobTest.php
index 7674d7f..f0be135 100644
--- a/tests/Feature/Jobs/FetchDeviceModelsJobTest.php
+++ b/tests/Feature/Jobs/FetchDeviceModelsJobTest.php
@@ -44,6 +44,7 @@ test('fetch device models job handles successful api response', function (): voi
'mime_type' => 'image/png',
'offset_x' => 0,
'offset_y' => 0,
+ 'kind' => 'trmnl',
'published_at' => '2023-01-01T00:00:00Z',
],
],
@@ -74,6 +75,7 @@ test('fetch device models job handles successful api response', function (): voi
expect($deviceModel->mime_type)->toBe('image/png');
expect($deviceModel->offset_x)->toBe(0);
expect($deviceModel->offset_y)->toBe(0);
+ // expect($deviceModel->kind)->toBe('trmnl');
expect($deviceModel->source)->toBe('api');
});
@@ -312,6 +314,7 @@ test('fetch device models job handles device model with partial data', function
expect($deviceModel->mime_type)->toBe('');
expect($deviceModel->offset_x)->toBe(0);
expect($deviceModel->offset_y)->toBe(0);
+ expect($deviceModel->kind)->toBeNull();
expect($deviceModel->source)->toBe('api');
});
diff --git a/tests/Feature/Livewire/Plugins/ConfigModalTest.php b/tests/Feature/Livewire/Plugins/ConfigModalTest.php
new file mode 100644
index 0000000..4372991
--- /dev/null
+++ b/tests/Feature/Livewire/Plugins/ConfigModalTest.php
@@ -0,0 +1,124 @@
+create();
+ $this->actingAs($user);
+
+ $plugin = Plugin::create([
+ 'uuid' => Str::uuid(),
+ 'user_id' => $user->id,
+ 'name' => 'Test Plugin',
+ 'data_strategy' => 'static',
+ 'configuration_template' => [
+ 'custom_fields' => [[
+ 'keyname' => 'tags',
+ 'field_type' => 'multi_string',
+ 'name' => 'Reading Days',
+ 'default' => 'alpha,beta',
+ ]]
+ ],
+ 'configuration' => ['tags' => 'alpha,beta']
+ ]);
+
+ Volt::test('plugins.config-modal', ['plugin' => $plugin])
+ ->assertSet('multiValues.tags', ['alpha', 'beta']);
+});
+
+test('config modal validates against commas in multi_string boxes', function (): void {
+ $user = User::factory()->create();
+ $this->actingAs($user);
+
+ $plugin = Plugin::create([
+ 'uuid' => Str::uuid(),
+ 'user_id' => $user->id,
+ 'name' => 'Test Plugin',
+ 'data_strategy' => 'static',
+ 'configuration_template' => [
+ 'custom_fields' => [[
+ 'keyname' => 'tags',
+ 'field_type' => 'multi_string',
+ 'name' => 'Reading Days',
+ ]]
+ ]
+ ]);
+
+ Volt::test('plugins.config-modal', ['plugin' => $plugin])
+ ->set('multiValues.tags.0', 'no,commas,allowed')
+ ->call('saveConfiguration')
+ ->assertHasErrors(['multiValues.tags.0' => 'regex']);
+
+ // Assert DB remains unchanged
+ expect($plugin->fresh()->configuration['tags'] ?? '')->not->toBe('no,commas,allowed');
+});
+
+test('config modal merges multi_string boxes into a single CSV string on save', function (): void {
+ $user = User::factory()->create();
+ $this->actingAs($user);
+
+ $plugin = Plugin::create([
+ 'uuid' => Str::uuid(),
+ 'user_id' => $user->id,
+ 'name' => 'Test Plugin',
+ 'data_strategy' => 'static',
+ 'configuration_template' => [
+ 'custom_fields' => [[
+ 'keyname' => 'items',
+ 'field_type' => 'multi_string',
+ 'name' => 'Reading Days',
+ ]]
+ ],
+ 'configuration' => []
+ ]);
+
+ Volt::test('plugins.config-modal', ['plugin' => $plugin])
+ ->set('multiValues.items.0', 'First')
+ ->call('addMultiItem', 'items')
+ ->set('multiValues.items.1', 'Second')
+ ->call('saveConfiguration')
+ ->assertHasNoErrors();
+
+ expect($plugin->fresh()->configuration['items'])->toBe('First,Second');
+});
+
+test('config modal resetForm clears dirty state and increments resetIndex', function (): void {
+ $user = User::factory()->create();
+ $this->actingAs($user);
+
+ $plugin = Plugin::create([
+ 'uuid' => Str::uuid(),
+ 'user_id' => $user->id,
+ 'name' => 'Test Plugin',
+ 'data_strategy' => 'static',
+ 'configuration' => ['simple_key' => 'original_value']
+ ]);
+
+ Volt::test('plugins.config-modal', ['plugin' => $plugin])
+ ->set('configuration.simple_key', 'dirty_value')
+ ->call('resetForm')
+ ->assertSet('configuration.simple_key', 'original_value')
+ ->assertSet('resetIndex', 1);
+});
+
+test('config modal dispatches update event for parent warning refresh', function (): void {
+ $user = User::factory()->create();
+ $this->actingAs($user);
+
+ $plugin = Plugin::create([
+ 'uuid' => Str::uuid(),
+ 'user_id' => $user->id,
+ 'name' => 'Test Plugin',
+ 'data_strategy' => 'static'
+ ]);
+
+ Volt::test('plugins.config-modal', ['plugin' => $plugin])
+ ->call('saveConfiguration')
+ ->assertDispatched('config-updated');
+});
diff --git a/tests/Feature/Livewire/Plugins/RecipeSettingsTest.php b/tests/Feature/Livewire/Plugins/RecipeSettingsTest.php
new file mode 100644
index 0000000..a04815f
--- /dev/null
+++ b/tests/Feature/Livewire/Plugins/RecipeSettingsTest.php
@@ -0,0 +1,112 @@
+create();
+ $this->actingAs($user);
+
+ $plugin = Plugin::factory()->create([
+ 'user_id' => $user->id,
+ 'trmnlp_id' => null,
+ ]);
+
+ $trmnlpId = (string) Str::uuid();
+
+ Volt::test('plugins.recipes.settings', ['plugin' => $plugin])
+ ->set('trmnlp_id', $trmnlpId)
+ ->call('saveTrmnlpId')
+ ->assertHasNoErrors();
+
+ expect($plugin->fresh()->trmnlp_id)->toBe($trmnlpId);
+});
+
+test('recipe settings validates trmnlp_id is unique per user', function (): void {
+ $user = User::factory()->create();
+ $this->actingAs($user);
+
+ $existingPlugin = Plugin::factory()->create([
+ 'user_id' => $user->id,
+ 'trmnlp_id' => 'existing-id-123',
+ ]);
+
+ $newPlugin = Plugin::factory()->create([
+ 'user_id' => $user->id,
+ 'trmnlp_id' => null,
+ ]);
+
+ Volt::test('plugins.recipes.settings', ['plugin' => $newPlugin])
+ ->set('trmnlp_id', 'existing-id-123')
+ ->call('saveTrmnlpId')
+ ->assertHasErrors(['trmnlp_id' => 'unique']);
+
+ expect($newPlugin->fresh()->trmnlp_id)->toBeNull();
+});
+
+test('recipe settings allows same trmnlp_id for different users', function (): void {
+ $user1 = User::factory()->create();
+ $user2 = User::factory()->create();
+
+ $plugin1 = Plugin::factory()->create([
+ 'user_id' => $user1->id,
+ 'trmnlp_id' => 'shared-id-123',
+ ]);
+
+ $plugin2 = Plugin::factory()->create([
+ 'user_id' => $user2->id,
+ 'trmnlp_id' => null,
+ ]);
+
+ $this->actingAs($user2);
+
+ Volt::test('plugins.recipes.settings', ['plugin' => $plugin2])
+ ->set('trmnlp_id', 'shared-id-123')
+ ->call('saveTrmnlpId')
+ ->assertHasNoErrors();
+
+ expect($plugin2->fresh()->trmnlp_id)->toBe('shared-id-123');
+});
+
+test('recipe settings allows same trmnlp_id for the same plugin', function (): void {
+ $user = User::factory()->create();
+ $this->actingAs($user);
+
+ $trmnlpId = (string) Str::uuid();
+
+ $plugin = Plugin::factory()->create([
+ 'user_id' => $user->id,
+ 'trmnlp_id' => $trmnlpId,
+ ]);
+
+ Volt::test('plugins.recipes.settings', ['plugin' => $plugin])
+ ->set('trmnlp_id', $trmnlpId)
+ ->call('saveTrmnlpId')
+ ->assertHasNoErrors();
+
+ expect($plugin->fresh()->trmnlp_id)->toBe($trmnlpId);
+});
+
+test('recipe settings can clear trmnlp_id', function (): void {
+ $user = User::factory()->create();
+ $this->actingAs($user);
+
+ $plugin = Plugin::factory()->create([
+ 'user_id' => $user->id,
+ 'trmnlp_id' => 'some-id',
+ ]);
+
+ Volt::test('plugins.recipes.settings', ['plugin' => $plugin])
+ ->set('trmnlp_id', '')
+ ->call('saveTrmnlpId')
+ ->assertHasNoErrors();
+
+ expect($plugin->fresh()->trmnlp_id)->toBeNull();
+});
diff --git a/tests/Feature/PluginImportTest.php b/tests/Feature/PluginImportTest.php
index 1b20f93..f3ef1fa 100644
--- a/tests/Feature/PluginImportTest.php
+++ b/tests/Feature/PluginImportTest.php
@@ -83,19 +83,34 @@ it('throws exception for invalid zip file', function (): void {
->toThrow(Exception::class, 'Could not open the ZIP file.');
});
-it('throws exception for missing required files', function (): void {
+it('throws exception for missing settings.yml', function (): void {
$user = User::factory()->create();
$zipContent = createMockZipFile([
- 'src/settings.yml' => getValidSettingsYaml(),
- // Missing full.liquid
+ 'src/full.liquid' => getValidFullLiquid(),
+ // Missing settings.yml
]);
$zipFile = UploadedFile::fake()->createWithContent('test-plugin.zip', $zipContent);
$pluginImportService = new PluginImportService();
expect(fn (): Plugin => $pluginImportService->importFromZip($zipFile, $user))
- ->toThrow(Exception::class, 'Invalid ZIP structure. Required files settings.yml and full.liquid are missing.');
+ ->toThrow(Exception::class, 'Invalid ZIP structure. Required file settings.yml is missing.');
+});
+
+it('throws exception for missing template files', function (): void {
+ $user = User::factory()->create();
+
+ $zipContent = createMockZipFile([
+ 'src/settings.yml' => getValidSettingsYaml(),
+ // Missing all template files
+ ]);
+
+ $zipFile = UploadedFile::fake()->createWithContent('test-plugin.zip', $zipContent);
+
+ $pluginImportService = new PluginImportService();
+ expect(fn (): Plugin => $pluginImportService->importFromZip($zipFile, $user))
+ ->toThrow(Exception::class, 'Invalid ZIP structure. At least one of the following files is required: full.liquid, full.blade.php, shared.liquid, or shared.blade.php.');
});
it('sets default values when settings are missing', function (): void {
@@ -427,6 +442,103 @@ YAML;
->and($displayIncidentField['default'])->toBe('true');
});
+it('throws exception when multi_string default value contains a comma', function (): void {
+ $user = User::factory()->create();
+
+ // YAML with a comma in the 'default' field of a multi_string
+ $invalidYaml = <<<'YAML'
+name: Test Plugin
+refresh_interval: 30
+strategy: static
+polling_verb: get
+static_data: '{"test": "data"}'
+custom_fields:
+ - keyname: api_key
+ field_type: multi_string
+ default: default-api-key1,default-api-key2
+ label: API Key
+YAML;
+
+ $zipContent = createMockZipFile([
+ 'src/settings.yml' => $invalidYaml,
+ 'src/full.liquid' => getValidFullLiquid(),
+ ]);
+
+ $zipFile = UploadedFile::fake()->createWithContent('invalid-default.zip', $zipContent);
+ $pluginImportService = new PluginImportService();
+
+ expect(fn () => $pluginImportService->importFromZip($zipFile, $user))
+ ->toThrow(Exception::class, 'Validation Error: The default value for multistring fields like `api_key` cannot contain commas.');
+});
+
+it('throws exception when multi_string placeholder contains a comma', function (): void {
+ $user = User::factory()->create();
+
+ // YAML with a comma in the 'placeholder' field
+ $invalidYaml = <<<'YAML'
+name: Test Plugin
+refresh_interval: 30
+strategy: static
+polling_verb: get
+static_data: '{"test": "data"}'
+custom_fields:
+ - keyname: api_key
+ field_type: multi_string
+ default: default-api-key
+ label: API Key
+ placeholder: "value1, value2"
+YAML;
+
+ $zipContent = createMockZipFile([
+ 'src/settings.yml' => $invalidYaml,
+ 'src/full.liquid' => getValidFullLiquid(),
+ ]);
+
+ $zipFile = UploadedFile::fake()->createWithContent('invalid-placeholder.zip', $zipContent);
+ $pluginImportService = new PluginImportService();
+
+ expect(fn () => $pluginImportService->importFromZip($zipFile, $user))
+ ->toThrow(Exception::class, 'Validation Error: The placeholder value for multistring fields like `api_key` cannot contain commas.');
+});
+
+it('imports plugin with only shared.liquid file', function (): void {
+ $user = User::factory()->create();
+
+ $zipContent = createMockZipFile([
+ 'src/settings.yml' => getValidSettingsYaml(),
+ 'src/shared.liquid' => '{{ data.title }}
',
+ ]);
+
+ $zipFile = UploadedFile::fake()->createWithContent('test-plugin.zip', $zipContent);
+
+ $pluginImportService = new PluginImportService();
+ $plugin = $pluginImportService->importFromZip($zipFile, $user);
+
+ expect($plugin)->toBeInstanceOf(Plugin::class)
+ ->and($plugin->markup_language)->toBe('liquid')
+ ->and($plugin->render_markup)->toContain('')
+ ->and($plugin->render_markup)->toContain('
{{ data.title }}
');
+});
+
+it('imports plugin with only shared.blade.php file', function (): void {
+ $user = User::factory()->create();
+
+ $zipContent = createMockZipFile([
+ 'src/settings.yml' => getValidSettingsYaml(),
+ 'src/shared.blade.php' => '
{{ $data["title"] }}
',
+ ]);
+
+ $zipFile = UploadedFile::fake()->createWithContent('test-plugin.zip', $zipContent);
+
+ $pluginImportService = new PluginImportService();
+ $plugin = $pluginImportService->importFromZip($zipFile, $user);
+
+ expect($plugin)->toBeInstanceOf(Plugin::class)
+ ->and($plugin->markup_language)->toBe('blade')
+ ->and($plugin->render_markup)->toBe('
{{ $data["title"] }}
')
+ ->and($plugin->render_markup)->not->toContain('
');
+});
+
// Helper methods
function createMockZipFile(array $files): string
{
diff --git a/tests/Unit/Models/PluginTest.php b/tests/Unit/Models/PluginTest.php
index cf8ea97..aa9a28e 100644
--- a/tests/Unit/Models/PluginTest.php
+++ b/tests/Unit/Models/PluginTest.php
@@ -99,6 +99,35 @@ test('updateDataPayload handles multiple URLs with IDX_ prefixes', function ():
expect($plugin->data_payload['IDX_2'])->toBe(['headline' => 'test']);
});
+test('updateDataPayload skips empty lines in polling_url and maintains sequential IDX keys', function (): void {
+ $plugin = Plugin::factory()->create([
+ 'data_strategy' => 'polling',
+ // empty lines and extra spaces between the URL to generate empty entries
+ 'polling_url' => "https://api1.example.com/data\n \n\nhttps://api2.example.com/weather\n ",
+ 'polling_verb' => 'get',
+ ]);
+
+ // Mock only the valid URLs
+ Http::fake([
+ 'https://api1.example.com/data' => Http::response(['item' => 'first'], 200),
+ 'https://api2.example.com/weather' => Http::response(['item' => 'second'], 200),
+ ]);
+
+ $plugin->updateDataPayload();
+
+ // payload should only have 2 items, and they should be indexed 0 and 1
+ expect($plugin->data_payload)->toHaveCount(2);
+ expect($plugin->data_payload)->toHaveKey('IDX_0');
+ expect($plugin->data_payload)->toHaveKey('IDX_1');
+
+ // data is correct
+ expect($plugin->data_payload['IDX_0'])->toBe(['item' => 'first']);
+ expect($plugin->data_payload['IDX_1'])->toBe(['item' => 'second']);
+
+ // no empty index exists
+ expect($plugin->data_payload)->not->toHaveKey('IDX_2');
+});
+
test('updateDataPayload handles single URL without nesting', function (): void {
$plugin = Plugin::factory()->create([
'data_strategy' => 'polling',
@@ -679,3 +708,233 @@ test('plugin render includes utc_offset and time_zone_iana in trmnl.user context
->toContain('America/Chicago')
->and($rendered)->toMatch('/\|-?\d+/'); // Should contain a pipe followed by a number (offset in seconds)
});
+
+/**
+ * Plugin security: XSS Payload Dataset
+ * [Input, Expected Result, Forbidden String]
+ */
+dataset('xss_vectors', [
+ 'standard_script' => ['Safe ', 'Safe ', '
+
+
+