@dargmuesli/nuxt-vio 21.0.10 → 22.0.0-beta.2

package/.config/lint.js

@@ -24,7 +24,7 @@ export const VIO_ESLINT_CONFIG = [
   prettierConfiguration, // must be last
 
   {
-    files: ['.config/**/*', 'server/**/*'],
+    files: ['.config/**/*', 'node/**/*', 'server/**/*'],
     rules: {
       'compat/compat': 'off',
     },

package/app/composables/networking.ts

@@ -1,20 +1,25 @@
 export const useGetServiceHref = () => {
   const host = useHost()
   const runtimeConfig = useRuntimeConfig()
+  const isTesting = useIsTesting()
 
   return ({
     isSsr = true,
     name,
+    path,
     port,
   }: {
     isSsr?: boolean
-    name?: string
+    name: string
+    path?: string
     port?: number
   }) =>
     getServiceHref({
       host,
       isSsr,
+      isTesting,
       name,
+      path,
       port,
       stagingHost: runtimeConfig.public.vio.stagingHost,
     })
@@ -28,3 +33,13 @@ export const useHost = () => {
 
   return host
 }
+
+export const useServiceFetch = (
+  options: Parameters<ReturnType<typeof useGetServiceHref>>[0],
+) => {
+  const getServiceHref = useGetServiceHref()
+
+  return $fetch.create({
+    baseURL: getServiceHref(options),
+  })
+}

package/app/composables/strapi.ts

@@ -1,7 +1,8 @@
-export const useStrapiFetch = () => {
-  const getServiceHref = useGetServiceHref()
-
-  return $fetch.create({
-    baseURL: getServiceHref({ name: 'creal_strapi', port: 1337 }) + '/api',
+export const useStrapiFetch = (
+  options?: Parameters<ReturnType<typeof useGetServiceHref>>[0],
+) =>
+  useServiceFetch({
+    ...(options ? options : {}),
+    name: options?.name || 'strapi',
+    path: options?.path || '/api',
   })
-}

package/app/composables/testing.ts

@@ -1,6 +1,13 @@
-export const useIsTesting = () => {
-  const cookie = useCookie(TESTING_COOKIE_NAME).value
+export const useIsTesting = ({
+  isCookieEnabled = true,
+}: { isCookieEnabled?: boolean } | undefined = {}) => {
   const runtimeConfig = useRuntimeConfig()
 
-  return runtimeConfig.public.vio.isTesting || !!cookie
+  const isTestingByRuntimeConfig = runtimeConfig.public.vio.isTesting
+  if (isTestingByRuntimeConfig) return true
+
+  if (isCookieEnabled) {
+    const isTestingByCookie = !!useCookie(TESTING_COOKIE_NAME).value
+    if (isTestingByCookie) return true
+  }
 }

package/app/utils/dateTime.ts

@@ -1,5 +1,5 @@
-export const getTimezone = () =>
-  useNuxtApp().ssrContext?.event.context.$timezone ||
+export const getTimeZone = () =>
+  useNuxtApp().ssrContext?.event.context.$timeZone ||
   useCookie(TIMEZONE_COOKIE_NAME, {
     httpOnly: false,
     sameSite: 'strict',

package/node/static/environment.ts

@@ -5,3 +5,4 @@ export const IS_IN_FRONTEND_DEVELOPMENT = !IS_IN_PRODUCTION && !IS_IN_STACK
 export const SITE_URL =
   process.env.NUXT_PUBLIC_I18N_BASE_URL ||
   `https://${process.env.HOST || 'app.localhost'}:${process.env.PORT || '3000'}`
+export const SITE_URL_TYPED = new URL(SITE_URL)

package/package.json

@@ -97,7 +97,7 @@
     "url": "git+https://github.com/dargmuesli/vio.git"
   },
   "type": "module",
-  "version": "21.0.10",
+  "version": "22.0.0-beta.2",
   "scripts": {
     "build": "pnpm run build:node",
     "build:node": "NUXT_PUBLIC_I18N_BASE_URL=https://app.localhost:3001 nuxt build playground",

package/server/middleware/dateTime.ts

@@ -1,9 +1,10 @@
 export default defineEventHandler(async (event) => {
-  event.context.$timezone = await getTimezone(event)
+  const isTesting = useIsTesting()
+  event.context.$timeZone = await getTimeZone({ event, isTesting })
 })
 
 declare module 'h3' {
   interface H3EventContext {
-    $timezone?: string
+    $timeZone?: string
   }
 }

package/server/utils/dateTime.ts

@@ -1,28 +1,41 @@
 import type { H3Event } from 'h3'
 
-export const getTimezone = async (event: H3Event) => {
-  const timezoneBySsr = event.context.$timezone
+export const getTimeZone = async ({
+  event,
+  isTesting,
+}: {
+  event: H3Event
+  isTesting?: boolean
+}) => {
+  const timeZoneBySsr = event.context.$timeZone
 
-  if (timezoneBySsr) return timezoneBySsr
+  if (timeZoneBySsr) return timeZoneBySsr
 
-  const timezoneByCookie = getCookie(event, TIMEZONE_COOKIE_NAME)
+  const timeZoneByCookie = getCookie(event, TIMEZONE_COOKIE_NAME)
 
-  if (timezoneByCookie) return timezoneByCookie
+  if (timeZoneByCookie) return timeZoneByCookie
 
-  const ip = getRequestIP(event, { xForwardedFor: true })
+  if (!isTesting) {
+    const ip = getRequestIP(event, { xForwardedFor: true })
 
-  if (ip) {
-    const timezoneByIpApi = await getTimezoneByIpApi(ip)
+    if (ip) {
+      const timeZoneByIpApi = await getTimeZoneByIpApi({ ip })
 
-    if (timezoneByIpApi) return timezoneByIpApi
+      if (timeZoneByIpApi) return timeZoneByIpApi
+    }
   }
 }
 
-export const getTimezoneByIpApi = async (ip: string) => {
-  if (isTestingServer()) return // TODO: mock
+export const useTimeZone = async () => {
+  const event = useEvent()
+  const isTesting = useIsTesting()
 
+  return await getTimeZone({ event, isTesting })
+}
+
+export const getTimeZoneByIpApi = async ({ ip }: { ip: string }) => {
   const ipApiResult = await $fetch<{ timezone: string }>(
-    `http://ip-api.com/json/${ip}`,
+    `http://geoip:8080/${ip}`,
   ).catch(() => {})
 
   if (ipApiResult) {

package/server/utils/dependencies/dargstack.ts

@@ -0,0 +1 @@
+export const DARGSTACK_SECRET_UNUSED_THIRD_PARTY = 'UNSET THIRD PARTY SECRET'

package/server/utils/dependencies/index.ts

@@ -1 +1,2 @@
+export * from './dargstack'
 export * from './turnstile'

package/server/utils/networking.ts

@@ -1,28 +1,35 @@
-export const useGetServiceHref = () => {
-  const host = useHost()
+import type { H3Event } from 'h3'
+
+export const useGetServiceHref = ({ event }: { event?: H3Event } = {}) => {
+  const host = useHost({ event })
   const runtimeConfig = useRuntimeConfig()
+  const isTesting = useIsTesting()
 
   return ({
     isSsr = true,
     name,
+    path,
     port,
   }: {
     isSsr?: boolean
-    name?: string
+    name: string
+    path?: string
     port?: number
   }) =>
     getServiceHref({
       host,
       isSsr,
+      isTesting,
       name,
+      path,
       port,
       stagingHost: runtimeConfig.public.vio.stagingHost,
-    }).toString()
+    })
 }
 
-export const useHost = () => {
-  const event = useEvent()
-  const host = getHost(event)
+export const useHost = ({ event }: { event?: H3Event } = {}) => {
+  const { siteUrlTyped: siteUrl } = useSiteUrl()
+  const host = event ? getHost(event) : siteUrl.host
 
   if (!host) throw new Error('Host is not given!')
 

package/server/utils/testing.ts

@@ -1,13 +1,32 @@
 import type { H3Event } from 'h3'
 
-export const isTestingServer = (event?: H3Event) => {
-  const isTestingByRuntimeConfig = useRuntimeConfig().public.vio.isTesting
+export const useIsTesting = ({
+  isCookieEnabled = true,
+}:
+  | {
+      isCookieEnabled?: boolean
+    }
+  | undefined = {}) => {
+  const event = useEvent()
+  const runtimeConfig = useRuntimeConfig()
 
+  return getIsTesting({ event, isCookieEnabled, runtimeConfig })
+}
+
+export const getIsTesting = ({
+  event,
+  isCookieEnabled,
+  runtimeConfig,
+}: {
+  event?: H3Event
+  isCookieEnabled?: boolean
+  runtimeConfig: ReturnType<typeof useRuntimeConfig>
+}) => {
+  const isTestingByRuntimeConfig = runtimeConfig.public.vio.isTesting
   if (isTestingByRuntimeConfig) return true
 
-  if (event) {
+  if (isCookieEnabled && event) {
     const isTestingByCookie = !!getCookie(event, TESTING_COOKIE_NAME)
-
     if (isTestingByCookie) return true
   }
 }

package/shared/utils/networking.ts

@@ -3,6 +3,7 @@ import type { H3Event } from 'h3'
 import { computed, reactive } from 'vue'
 import type { Ref } from 'vue'
 
+import { SITE_URL_TYPED } from '../../node/static'
 import type { ApiData, BackendError } from '../types/api'
 
 export const getApiDataDefault = (): ApiData =>
@@ -87,25 +88,41 @@ export const getHost = (event: H3Event) => {
 export const getServiceHref = ({
   host,
   isSsr = true,
+  isTesting,
   name,
+  path,
   port,
   stagingHost,
 }: {
-  host: string
+  host?: string
   isSsr?: boolean
-  name?: string
+  isTesting?: boolean
+  name: string
+  path?: string
   port?: number
   stagingHost?: string
 }) => {
-  const nameSubdomain = name?.replaceAll('_', '-')
+  const nameSubdomain =
+    name !== VIO_SITE_NAME ? name?.replaceAll('_', '-') : undefined
   const nameSubdomainString = nameSubdomain ? `${nameSubdomain}.` : ''
   const portString = port ? `:${port}` : ''
+  const pathString = path ? `/${path.replace(/^\/+/, '')}` : ''
+
+  if (isTesting) {
+    return `${SITE_URL_TYPED.protocol}//${nameSubdomainString}${SITE_URL_TYPED.host}${pathString}`
+  }
 
   if (stagingHost) {
-    return `https://${nameSubdomainString}${stagingHost}`
-  } else if (isSsr && import.meta.server) {
-    return `http://${name}${portString}`
-  } else {
-    return `https://${nameSubdomainString}${getRootHost(host)}`
+    return `https://${nameSubdomainString}${stagingHost}${pathString}`
+  }
+
+  if (import.meta.server && isSsr) {
+    return `http://${name}${portString}${pathString}`
   }
+
+  if (host) {
+    return `https://${nameSubdomainString}${host}${pathString}`
+  }
+
+  throw new Error('Could not get service href!')
 }