Handle invalid URLs

phillip-kruger · Jun 4, 2024 · e8936fd · e8936fd
1 parent e21f4fb
commit e8936fd
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 4 deletions.
diff --git a/src/main/java/io/mvnpm/npm/model/Package.java b/src/main/java/io/mvnpm/npm/model/Package.java
@@ -14,7 +14,7 @@ public record Package(
         String description,
         @JsonDeserialize(using = LicenseDeserializer.class) License license,
         @JsonDeserialize(using = AuthorDeserializer.class) Author author,
-        URL homepage,
+        @JsonDeserialize(using = URLDeserializer.class) URL homepage,
         @JsonDeserialize(using = RepositoryDeserializer.class) Repository repository,
         @JsonDeserialize(using = BugsDeserializer.class) Bugs bugs,
         String main,

diff --git a/src/main/java/io/mvnpm/npm/model/Project.java b/src/main/java/io/mvnpm/npm/model/Project.java
@@ -11,7 +11,7 @@ public record Project(
         @JsonProperty("name") Name name,
         String description,
         @JsonProperty("dist-tags") DistTags distTags,
-        URL homepage,
+        @JsonDeserialize(using = URLDeserializer.class) URL homepage,
         @JsonDeserialize(using = LicenseDeserializer.class) License license,
         @JsonDeserialize(using = VersionDeserializer.class) Set<String> versions,
         Map<String, String> time) {

diff --git a/src/main/java/io/mvnpm/npm/model/URLDeserializer.java b/src/main/java/io/mvnpm/npm/model/URLDeserializer.java
@@ -0,0 +1,35 @@
+package io.mvnpm.npm.model;
+
+import java.io.IOException;
+import java.net.URL;
+
+import com.fasterxml.jackson.core.JacksonException;
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
+
+/**
+ * To handle some invalid URL values
+ *
+ * @author Phillip Kruger ([email protected])
+ */
+public class URLDeserializer extends StdDeserializer<URL> {
+
+    public URLDeserializer() {
+        this(null);
+    }
+
+    public URLDeserializer(Class<?> vc) {
+        super(vc);
+    }
+
+    @Override
+    public URL deserialize(JsonParser jp, DeserializationContext dc) throws IOException, JacksonException {
+        try {
+            return jp.readValueAs(URL.class);
+        } catch (Throwable t) {
+            return null;
+        }
+    }
+
+}
diff --git a/src/main/resources/web/app/mvnpm-home.ts b/src/main/resources/web/app/mvnpm-home.ts
@@ -396,8 +396,7 @@ export class MvnpmHome extends LitElement {
                             <div class="searchResultContent" slot="content">
                                 <div class="searchResultDetails">
                                     <div class="searchResultDescription">
-                                        ${unsafeHTML(marked(result.package.description))}
-                                        ${this._renderBy(result)}
+                                        ${this._renderPackageDescription(result)}
                                     </div>
                                     <div class="searchResultLinks">
                                         <a href="${result.package.links.npm}" target="_blank">
@@ -417,6 +416,14 @@ export class MvnpmHome extends LitElement {
         }
     }
 
+    _renderPackageDescription(result){
+        if(result.package.description){
+            return html`
+                ${unsafeHTML(marked(result.package.description))}
+                ${this._renderBy(result)}`;
+        }
+    }
+
     _renderBy(result){
         if(result.package.author && result.package.author.name){
             return html` - by ${result.package.author.name}`;