@@ -734,7 +739,7 @@ HTML;
@endif
- Configuration
+ Configuration Fields
@endif
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..d07a243
--- /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/routes/api.php b/routes/api.php
index 5700a43..f3a31a1 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -613,7 +613,7 @@ Route::post('plugin_settings/{uuid}/image', function (Request $request, string $
}
// Generate a new UUID for each image upload to prevent device caching
- $imageUuid = \Illuminate\Support\Str::uuid()->toString();
+ $imageUuid = Str::uuid()->toString();
$filename = $imageUuid.'.'.$extension;
$path = 'images/generated/'.$filename;
@@ -678,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/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 fae28a8..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 {
@@ -431,7 +446,7 @@ it('throws exception when multi_string default value contains a comma', function
$user = User::factory()->create();
// YAML with a comma in the 'default' field of a multi_string
- $invalidYaml = <<
$pluginImportService->importFromZip($zipFile, $user))
- ->toThrow(Exception::class, "Validation Error: The default value for multistring fields like `api_key` cannot contain commas.");
+ ->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 = << $pluginImportService->importFromZip($zipFile, $user))
- ->toThrow(Exception::class, "Validation Error: The placeholder value for multistring fields like `api_key` cannot contain commas.");
+ ->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