@things-factory/shell 8.0.0 → 8.0.8

package/server/service/domain/domain.ts

@@ -7,17 +7,11 @@ import {
   Entity,
   Index,
   UpdateDateColumn,
-  DeleteDateColumn
+  DeleteDateColumn,
+  PrimaryGeneratedColumn
 } from 'typeorm'
 import { ObjectType, Directive, Field, ID } from 'type-graphql'
-import { config } from '@things-factory/env'
-import { ScalarObject } from '../common-types'
-
-const numericTypes = ['int', 'int2', 'int4', 'int8', 'integer', 'tinyint', 'smallint', 'mediumint', 'bigint']
-const generatedStrategy = ['uuid', 'rowid', 'increment', 'identity']
-const domainPrimaryOption = config.get('domainPrimaryOption')
-const domainPrimaryType = domainPrimaryOption?.type
-const domainPrimaryStrategy = domainPrimaryOption?.strategy
+import { ScalarObject } from '../common-types/scalar-object.js'
 
 export type IPList = {
   whitelist?: string[]
@@ -36,37 +30,8 @@ export type IPList = {
 })
 @ObjectType()
 export class Domain {
+  @PrimaryGeneratedColumn('uuid')
   @Field(type => ID)
-  @Column(
-    domainPrimaryOption
-      ? {
-          type: domainPrimaryType,
-          primary: true,
-          transformer: {
-            //from(value: DatabaseType): EntityType
-            from: value => {
-              return value
-            },
-            //to(value: EntityType): DatabaseType
-            to: value => {
-              if (!value) {
-                value = 0
-              }
-              if (numericTypes.indexOf(domainPrimaryType) >= 0) {
-                return parseInt(value)
-              } else {
-                return value
-              }
-            }
-          },
-          generated: generatedStrategy.indexOf(domainPrimaryStrategy) >= 0 ? domainPrimaryStrategy : false
-        }
-      : {
-          type: 'uuid',
-          primary: true,
-          generated: 'uuid'
-        }
-  )
   readonly id: string
 
   @Field()

package/server/typeorm/json5-transform.ts

@@ -8,7 +8,7 @@ export const json5Transformer: ValueTransformer = {
    * @returns {string} - The stringified JSON5 representation of the entityValue.
    */
   to(entityValue: any) {
-    return json5.stringify(entityValue)
+    return entityValue === null || entityValue === undefined ? null : json5.stringify(entityValue)
   },
 
   /**
@@ -18,7 +18,7 @@ export const json5Transformer: ValueTransformer = {
    */
   from(databaseValue: string) {
     try {
-      return json5.parse(databaseValue)
+      return databaseValue === null ? null : json5.parse(databaseValue)
     } finally {
       return databaseValue
     }

package/server/utils/get-domain.ts

@@ -1,3 +1,4 @@
+import { In } from 'typeorm'
 import { URL } from 'url'
 
 import { config } from '@things-factory/env'
@@ -6,10 +7,9 @@ import { getPathInfo } from '@things-factory/utils'
 import { getRepository } from '../initializers/database'
 import { Domain } from '../service/domain/domain'
 
-const useVirtualHostBasedDomain = !!config.get('useVirtualHostBasedDomain')
 const protocol: string = config.get('protocol')
 const fixed = config.get('subdomain')
-const subdomainOffset = config.getNumber('subdomainOffset', 2)
+const domainTypes = config.get('domainTypes') || ['domain']
 
 /**
  * Creates a URL based on the given context and path.
@@ -51,18 +51,6 @@ export function getUrlFromContext(context, path = '') {
   return url
 }
 
-/**
- * Extracts subdomains from the Host header.
- *
- * @param context {Object} An object containing the current request context information.
- * @returns {string[]} An array of extracted subdomains.
- */
-function getSubdomainsFromHost(context: any) {
-  const { request } = context
-  var subdomains = request.headers.host.split('.').reverse()
-  return subdomains.slice(subdomainOffset)
-}
-
 /**
  * Extracts a subdomain from the path.
  *
@@ -72,9 +60,9 @@ function getSubdomainsFromHost(context: any) {
 function getSubdomainFromPath(context: any) {
   var { path } = context
 
-  var domain = getPathInfo(path || '')?.domain
-  if (domain) {
-    return domain
+  var subdomain = getPathInfo(path || '', domainTypes)?.subdomain
+  if (subdomain) {
+    return subdomain
   }
 
   var {
@@ -83,20 +71,32 @@ function getSubdomainFromPath(context: any) {
 
   if (referer) {
     var { pathname } = new URL(referer)
-    return getPathInfo(pathname || '')?.domain
+    return getPathInfo(pathname || '', domainTypes)?.subdomain
   }
 }
 
 /**
- * Extracts a subdomain based on virtual host.
+ * Extracts the subdomain type from the given context's path or referer header.
  *
- * @param context {Object} An object containing the current request context information.
- * @returns {string} The extracted subdomain.
+ * @param context - The context object containing path and header information.
+ * @returns The subdomain type if found, otherwise undefined.
  */
-function getSubdomainFromVhost(context: any) {
-  const subdomain = (context.subdomains || getSubdomainsFromHost(context)).slice(-1)[0]
+function getSubdomainTypeFromPath(context: any) {
+  var { path } = context
 
-  return subdomain
+  var prefix = getPathInfo(path || '', domainTypes)?.prefix
+  if (prefix) {
+    return prefix
+  }
+
+  var {
+    header: { referer }
+  } = context
+
+  if (referer) {
+    var { pathname } = new URL(referer)
+    return getPathInfo(pathname || '', domainTypes)?.prefix
+  }
 }
 
 /**
@@ -106,7 +106,11 @@ function getSubdomainFromVhost(context: any) {
  * @returns {string} The extracted subdomain.
  */
 function getSubdomainFromURL(context) {
-  return fixed || (useVirtualHostBasedDomain ? getSubdomainFromVhost(context) : getSubdomainFromPath(context))
+  return fixed || getSubdomainFromPath(context)
+}
+
+function getSubdomainTypeFromURL(context) {
+  return fixed ? '' : getSubdomainTypeFromPath(context)
 }
 
 /**
@@ -119,21 +123,21 @@ export async function getDomainFromURL(context: any): Promise<Domain> {
   const { header } = context
 
   const subdomain = header['x-things-factory-domain'] || getSubdomainFromURL(context)
+  const extType = header['x-things-factory-type'] || getSubdomainTypeFromURL(context)
 
   if (subdomain) {
-    return await getRepository(Domain).findOne({ where: { subdomain }, cache: true })
-  }
-}
-
-/**
- * Extracts the cookie domain from the hostname.
- *
- * @param hostname {string} The hostname.
- * @returns {string} The extracted cookie domain.
- */
-export function getCookieDomainFromHostname(hostname) {
-  if (useVirtualHostBasedDomain) {
-    return hostname.split('.').slice(-subdomainOffset).join('.')
+    return await getRepository(Domain).findOne({
+      where:
+        fixed || extType == 'domain' || !extType
+          ? {
+              subdomain
+            }
+          : {
+              subdomain,
+              extType
+            },
+      cache: true
+    })
   }
 }
 
@@ -143,42 +147,37 @@ export function getCookieDomainFromHostname(hostname) {
  * @param subdomain {string} The subdomain.
  * @returns {string} The generated context path.
  */
-export function getContextPath(subdomain) {
-  return fixed || useVirtualHostBasedDomain ? '' : '/domain/' + subdomain
+export function getContextPath(domain: Domain) {
+  const type = domain?.extType || 'domain'
+  return fixed || !domain ? '' : `${type}/${domain?.subdomain}/`
 }
 
 /**
  * Generates a redirection path considering the subdomain.
  *
  * @param context {Object} An object containing the current request context information.
- * @param subdomain {string} The subdomain.
+ * @param subdomain {Domain} The target domain.
  * @param redirectTo {string} The path to redirect to (optional).
  * @returns {string} The generated redirection path.
  */
-export function getRedirectSubdomainPath(context, subdomain, redirectTo = '/') {
-  if (fixed) {
+export function getRedirectSubdomainPath(context, domain: Partial<Domain>, redirectTo: string = '/') {
+  if (fixed || !domain) {
     return redirectTo || '/'
   }
 
+  const type = domain.extType || 'domain'
+  const subdomain = domain.subdomain || fixed
+
   var parsed = getUrlFromContext(context, redirectTo)
   var { hostname, pathname } = parsed
 
-  if (useVirtualHostBasedDomain) {
-    const splitHost = hostname.split('.').reverse()
-    splitHost[subdomainOffset] = subdomain
-    parsed.hostname = splitHost
-      .reverse()
-      .filter(a => a)
-      .join('.')
-  } else {
-    const contextPath = `/domain/${subdomain}`
-    const match = pathname.match(/^\/domain\/([^\/]+)/)
+  const contextPath = `/${type}/${subdomain}`
+  const match = pathname.match(new RegExp(`^/${type}/([^\/]+)`))
 
-    if (match) {
-      parsed.pathname = pathname.replace(match[0], contextPath)
-    } else {
-      parsed.pathname = `${contextPath}${pathname}`
-    }
+  if (match) {
+    parsed.pathname = pathname.replace(match[0], contextPath)
+  } else {
+    parsed.pathname = `${contextPath}${pathname}`
   }
 
   return parsed.toString()
@@ -197,13 +196,9 @@ export function findSubdomainFromPath(context, path) {
   }
 
   var parsed = getUrlFromContext(context, path)
-  var { hostname, pathname } = parsed
+  var { pathname } = parsed
 
-  if (useVirtualHostBasedDomain) {
-    return hostname.split('.').reverse()[subdomainOffset]
-  }
-
-  const match = pathname.match(/^\/domain\/([^\/]+)/)
+  const match = pathname.match(new RegExp(`^/${getSubdomainTypeFromURL(context)}/([^\/]+)`))
   return match && match[1]
 }
 
@@ -214,13 +209,5 @@ export function findSubdomainFromPath(context, path) {
  * @returns {string} The generated site root path.
  */
 export function getSiteRootPath(context) {
-  if (useVirtualHostBasedDomain) {
-    var { protocol, host } = context
-    protocol = protocol.replace(':', '')
-
-    let domainname = host.split('.').slice(-subdomainOffset).join('.')
-    return protocol + '://' + domainname + '/'
-  } else {
-    return '/'
-  }
+  return '/'
 }

package/server/utils/get-query-builder-from-list-params.ts

@@ -1,7 +1,7 @@
 import { Brackets, EntityMetadata, Repository, SelectQueryBuilder, WhereExpressionBuilder } from 'typeorm'
-import { RelationMetadata } from 'typeorm/metadata/RelationMetadata'
-import { Filter, Sorting, Pagination, ListParam, InheritedValueType } from '../service/common-types/list-param'
-import { Domain } from '../service/domain/domain'
+import { RelationMetadata } from 'typeorm/metadata/RelationMetadata.js'
+import { Filter, Sorting, Pagination, ListParam, InheritedValueType } from '../service/common-types/list-param.js'
+import { Domain } from '../service/domain/domain.js'
 
 /**
  * Creates a TypeORM SelectQueryBuilder based on the provided parameters.