chore: set option title, link

Author: hywax

Diff for: components/service/base/Index.vue

@@ -2,16 +2,17 @@
   <ServicePlaceholder v-if="loadingOverlay" />
   <div v-else class="p-4 flex gap-4">
     <div class="flex-shrink-0 flex">
-      <a :href="link" :target="target" class="self-center w-16 h-16 overflow-hidden rounded-2xl border border-fg/10 dark:border-fg/15">
+      <Component :is="isLink ? 'a' : 'div'" :href="link" :target="target" class="self-center w-16 h-16 overflow-hidden rounded-2xl border border-fg/10 dark:border-fg/15">
         <slot name="icon" :service="data">
           <ServiceBaseIcon v-if="icon" v-bind="icon" />
         </slot>
-      </a>
+      </Component>
     </div>
     <div>
       <h3 class="text-lg mt-1 font-semibold line-clamp-1 flex gap-2 items-center">
         <slot name="title" :service="data">
-          <a :href="link" :target="target">{{ title }}</a>
+          <a v-if="isLink" :href="link" :target="target">{{ title }}</a>
+          <span v-else>{{ title }}</span>
         </slot>
         <slot v-if="status" name="status" :data="data">
           <ServiceBaseStatus :ping="data?.ping" />
@@ -33,6 +34,7 @@ import type { Service, ServiceClient } from '~/types'
 const props = defineProps<ServiceClient<Service>>()
 
 const { $settings } = useNuxtApp()
+const isLink = computed(() => isUrl(props.link || ''))
 const target = computed(() => props.target || $settings.behaviour.target)
 
 const immediate = computed(() => props.status?.enabled || !!props.type || false)

Diff for: server/utils/config.ts

@@ -41,15 +41,15 @@ export function validateConfigSchema(config: any) {
   })
 
   const service = z.object({
-    title: z.string(),
+    title: z.string().optional(),
     description: z.string().optional(),
-    link: z.string(),
+    link: z.string().optional(),
     target: z.string().optional(),
     icon: icon.optional(),
     status: status.optional(),
     type: z.string().optional(),
-    options: z.record(z.string()).optional(),
-    secrets: z.record(z.string()).optional(),
+    options: z.record(z.any()).optional(),
+    secrets: z.record(z.any()).optional(),
   })
 
   const schema = z.object({

Diff for: server/utils/services.ts

@@ -1,8 +1,16 @@
 import type { H3Event } from 'h3'
 import type { PingServiceData, ReturnServiceWithData, Service, ServiceWithDefaultData } from '~/types'
+import { isUrl } from '~/utils/validation'
 
 export async function pingService(url: string): Promise<PingServiceData> {
   try {
+    if (!isUrl(url)) {
+      throw createError({
+        statusCode: 400,
+        statusMessage: 'URL is not valid',
+      })
+    }
+
     const startTime = new Date().getTime()
     await $fetch(url, { timeout: 15000 })
     const endTime = new Date().getTime()
@@ -47,7 +55,7 @@ export async function getService<T extends Service>(event: H3Event): Promise<T>
 export async function getServiceWithDefaultData<S extends Service>(event: H3Event): Promise<ServiceWithDefaultData<S>> {
   const config = await getService<S>(event)
   const defaultData = {
-    ping: config?.status?.enabled ? await pingService(config.link) : undefined,
+    ping: config?.status?.enabled ? await pingService(config.link || '') : undefined,
   }
 
   return { config, defaultData }

Diff for: types/services.d.ts

@@ -14,15 +14,15 @@ export interface ServiceIcon {
 export interface Service {
   id: string
   type?: string
-  title: string
+  title?: string
   description?: string
-  link: string
+  link?: string
   target?: '_blank' | '_self' | '_parent' | '_top'
   icon?: ServiceIcon
   status?: ServiceStatus
-  options?: Record<string, string | number | boolean>
-  secrets?: Record<string, string | number | boolean>
-  server?: Record<string, string | number | boolean>
+  options?: Record<string, any>
+  secrets?: Record<string, any>
+  server?: Record<string, any>
 }
 
 export type ServiceClient<T> = Omit<T, 'secrets' | 'server'>