@things-factory/board-service 8.0.5 → 8.0.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/board-service",
-  "version": "8.0.5",
+  "version": "8.0.13",
   "main": "dist-server/index.js",
   "things-factory": true,
   "author": "",
@@ -23,15 +23,15 @@
     "migration:create": "node ../../node_modules/typeorm/cli.js migration:create ./server/migrations/migration"
   },
   "dependencies": {
-    "@things-factory/auth-base": "^8.0.5",
-    "@things-factory/env": "^8.0.2",
-    "@things-factory/fav-base": "^8.0.5",
-    "@things-factory/font-base": "^8.0.5",
-    "@things-factory/integration-base": "^8.0.5",
+    "@things-factory/auth-base": "^8.0.13",
+    "@things-factory/env": "^8.0.8",
+    "@things-factory/fav-base": "^8.0.13",
+    "@things-factory/font-base": "^8.0.13",
+    "@things-factory/integration-base": "^8.0.13",
     "@things-factory/operato-license-checker": "^4.0.4",
     "content-disposition": "^0.5.3",
     "generic-pool": "^3.8.2",
     "puppeteer": "^23.0.0"
   },
-  "gitHead": "9ab6fca18eeb58b9d2f3411661508a39d0ab6aee"
+  "gitHead": "66c1356c18b5c9a21e8280460eb40020f7ea2b37"
 }

package/server/controllers/headless-model.ts

@@ -46,7 +46,7 @@ export const headlessModel = async (target, draft: boolean = false) => {
   }
 
   return {
-    base: getContextPath(domain?.subdomain) + (domain ? '/' : ''),
+    base: getContextPath(domain),
     model,
     board
   }

package/server/controllers/headless-playlist.ts

@@ -65,7 +65,7 @@ export const headlessPlaylist = async (target, draft: boolean = false) => {
   }
 
   return {
-    base: getContextPath(domain?.subdomain) + (domain ? '/' : ''),
+    base: getContextPath(domain),
     playGroup
   }
 }

package/server/routes.ts

@@ -1,10 +1,11 @@
 import { config } from '@things-factory/env'
-import { getHeadlessPool as getHeadlessPoolForBoard } from './controllers/headless-pool-for-board'
-import { getHeadlessPool as getHeadlessPoolForLabel } from './controllers/headless-pool-for-label'
-import { internalBoardViewRouter } from './routers/internal-board-view-router'
-import { standaloneBoardServiceRouter } from './routers/standalone-board-service-router'
+import { getRoutePrefixForDomainType } from '@things-factory/shell'
+import { getHeadlessPool as getHeadlessPoolForBoard } from './controllers/headless-pool-for-board.js'
+import { getHeadlessPool as getHeadlessPoolForLabel } from './controllers/headless-pool-for-label.js'
+import { internalBoardViewRouter } from './routers/internal-board-view-router.js'
+import { standaloneBoardServiceRouter } from './routers/standalone-board-service-router.js'
 
-const isPathBaseDomain = !config.get('subdomain') && !config.get('useVirtualHostBasedDomain')
+const isPathBaseDomain = !config.get('subdomain')
 
 process.on('bootstrap-module-global-public-route' as any, (app, domainGlobalPublicRouter) => {
   getHeadlessPoolForLabel()
@@ -14,8 +15,9 @@ process.on('bootstrap-module-global-public-route' as any, (app, domainGlobalPubl
 
 process.on('bootstrap-module-domain-private-route' as any, (app, domainPrivateRouter) => {
   if (isPathBaseDomain) {
+    const domainType = 'domain'
     domainPrivateRouter.use(
-      '/domain/:domain',
+      `/${getRoutePrefixForDomainType()}/:domain`,
       standaloneBoardServiceRouter.routes(),
       standaloneBoardServiceRouter.allowedMethods()
     )

package/server/service/board/board-mutation.ts

@@ -42,8 +42,8 @@ export class BoardMutation {
   @Mutation(returns => Board, { description: 'To create new Board' })
   async createBoard(@Arg('board') board: NewBoard, @Ctx() context: ResolverContext): Promise<Board> {
     const { domain, user, notify, tx } = context.state
-    const repository = tx.getRepository(Board)
-    const groupRepository = tx.getRepository(Group)
+    const repository = getRepository(Board, tx)
+    const groupRepository = getRepository(Group, tx)
 
     const oldBoard: Board = await repository.findOneBy({
       name: board.name,
@@ -80,7 +80,7 @@ export class BoardMutation {
         mode: 'in-app',
         title: `Board '${created.name}' created`,
         body: `Board '${created.name}' created by ${user.name}\n${created.description}`,
-        url: getRedirectSubdomainPath(context, domain.subdomain, `/board-viewer/${created.id}`)
+        url: getRedirectSubdomainPath(context, domain, `/board-viewer/${created.id}`)
       })
 
     return created
@@ -98,7 +98,7 @@ export class BoardMutation {
   ): Promise<Board> {
     const { domain, user, notify, tx } = context.state
     const { t } = context
-    const repository = tx.getRepository(Board)
+    const repository = getRepository(Board, tx)
 
     const board = await repository.findOneBy({ domain: { id: In([domain.id, domain.parentId].filter(Boolean)) }, id })
 
@@ -114,7 +114,7 @@ export class BoardMutation {
 
     var targetDomain = domain
     if (targetDomain && domain.subdomain != targetSubdomain) {
-      targetDomain = await tx.getRepository(Domain).findOneBy({ subdomain: targetSubdomain })
+      targetDomain = await getRepository(Domain, tx).findOneBy({ subdomain: targetSubdomain })
       if (!targetDomain) {
         throw `given subdomain(${targetSubdomain}) not found`
       }
@@ -122,7 +122,7 @@ export class BoardMutation {
 
     var targetGroup = null
     if (targetGroupId) {
-      targetGroup = await tx.getRepository(Group).findOneBy({ domain: { id: targetDomain.id }, id: targetGroupId })
+      targetGroup = await getRepository(Group, tx).findOneBy({ domain: { id: targetDomain.id }, id: targetGroupId })
       if (!targetGroup) {
         throw `given group(${targetGroupId}) in domain(${targetSubdomain}) not found`
       }
@@ -146,8 +146,8 @@ export class BoardMutation {
         mode: 'in-app',
         title: `Board '${cloned.name}' cloned`,
         body: `Board '${cloned.name}' cloned by ${user.name}\n${cloned.description}`,
-        image: getRedirectSubdomainPath(context, targetSubdomain, `/thumbnail/${cloned.id}`),
-        url: getRedirectSubdomainPath(context, targetSubdomain, `/board-viewer/${cloned.id}`)
+        image: getRedirectSubdomainPath(context, targetDomain, `/thumbnail/${cloned.id}`),
+        url: getRedirectSubdomainPath(context, targetDomain, `/board-viewer/${cloned.id}`)
       })
 
     return cloned
@@ -162,7 +162,7 @@ export class BoardMutation {
     @Ctx() context: ResolverContext
   ): Promise<Board> {
     const { domain, user, notify, tx } = context.state
-    const repository = tx.getRepository(Board)
+    const repository = getRepository(Board, tx)
 
     const board = await repository.findOne({
       where: { domain: { id: domain.id }, id },
@@ -195,7 +195,7 @@ export class BoardMutation {
           .then(async thumbnailBase64 => {
             /* use new resource manager */
             await getDataSource().transaction(async (tx: EntityManager) => {
-              await tx.getRepository(Board).save({
+              await getRepository(Board, tx).save({
                 id: updated.id,
                 thumbnail: 'data:image/png;base64,' + thumbnailBase64.toString('base64')
               })
@@ -210,7 +210,7 @@ export class BoardMutation {
     const { groupId, ...patched } = patch
 
     if (groupId !== undefined) {
-      const groupRepository = tx.getRepository(Group)
+      const groupRepository = getRepository(Group, tx)
       board.group = groupId
         ? (await groupRepository.findOneBy({
             domain: { id: domain.id },
@@ -232,8 +232,8 @@ export class BoardMutation {
         mode: 'in-app',
         title: `Board '${updated.name}' updated`,
         body: `Board '${updated.name}' updated by ${user.name}\n${updated.description}`,
-        image: getRedirectSubdomainPath(context, domain.subdomain, `/thumbnail/${updated.id}`),
-        url: getRedirectSubdomainPath(context, domain.subdomain, `/board-viewer/${updated.id}`)
+        image: getRedirectSubdomainPath(context, domain, `/thumbnail/${updated.id}`),
+        url: getRedirectSubdomainPath(context, domain, `/board-viewer/${updated.id}`)
       })
 
     return updated
@@ -244,7 +244,7 @@ export class BoardMutation {
   @Mutation(returns => Board, { description: 'To release a Board' })
   async releaseBoard(@Arg('id') id: string, @Ctx() context: ResolverContext): Promise<Board> {
     const { domain, user, notify, tx } = context.state
-    const repository = tx.getRepository(Board)
+    const repository = getRepository(Board, tx)
 
     const board = await repository.findOne({
       where: { domain: { id: domain.id }, id },
@@ -272,8 +272,8 @@ export class BoardMutation {
         mode: 'in-app',
         title: `Board '${updated.name}' released`,
         body: `Board '${updated.name}' released by ${user.name}\n${updated.description}`,
-        image: getRedirectSubdomainPath(context, domain.subdomain, `/thumbnail/${updated.id}`),
-        url: getRedirectSubdomainPath(context, domain.subdomain, `/board-viewer/${updated.id}`)
+        image: getRedirectSubdomainPath(context, domain, `/thumbnail/${updated.id}`),
+        url: getRedirectSubdomainPath(context, domain, `/board-viewer/${updated.id}`)
       })
 
     return updated
@@ -288,7 +288,7 @@ export class BoardMutation {
     @Ctx() context: ResolverContext
   ): Promise<Board> {
     const { domain, user, notify, tx } = context.state
-    const repository = tx.getRepository(Board)
+    const repository = getRepository(Board, tx)
 
     const board = await repository.findOne({
       where: { domain: { id: domain.id }, id },
@@ -299,7 +299,7 @@ export class BoardMutation {
       throw `Board with id(${id}) is not found`
     }
 
-    const historyRepository = tx.getRepository(BoardHistory)
+    const historyRepository = getRepository(BoardHistory, tx)
 
     const boardHistory = await historyRepository.findOne({
       where: { domain: { id: domain.id }, originalId: id, version },
@@ -324,8 +324,8 @@ export class BoardMutation {
         mode: 'in-app',
         title: `Board '${updated.name}' updated`,
         body: `Board '${updated.name}' updated by ${user.name}\n${updated.description}`,
-        image: getRedirectSubdomainPath(context, domain.subdomain, `/thumbnail/${updated.id}`),
-        url: getRedirectSubdomainPath(context, domain.subdomain, `/board-viewer/${updated.id}`)
+        image: getRedirectSubdomainPath(context, domain, `/thumbnail/${updated.id}`),
+        url: getRedirectSubdomainPath(context, domain, `/board-viewer/${updated.id}`)
       })
 
     return updated
@@ -336,7 +336,7 @@ export class BoardMutation {
   @Mutation(returns => Boolean, { description: 'To delete Board' })
   async deleteBoard(@Arg('id') id: string, @Ctx() context: ResolverContext): Promise<boolean> {
     const { domain, user, notify, tx } = context.state
-    const repository = tx.getRepository(Board)
+    const repository = getRepository(Board, tx)
     const board = await repository.findOneBy({ domain: { id: domain.id }, id })
 
     const deleted = await repository.softDelete(id)
@@ -361,8 +361,8 @@ export class BoardMutation {
     @Ctx() context: ResolverContext
   ): Promise<Board[]> {
     const { domain, user, notify, tx } = context.state
-    const groupRepository = tx.getRepository(Group)
-    const boardRepository = tx.getRepository(Board)
+    const groupRepository = getRepository(Group, tx)
+    const boardRepository = getRepository(Board, tx)
     const group = await groupRepository.findOneBy({ domain: { id: domain.id }, id: groupId })
 
     if (!group) {

package/server/service/board-template/board-template-mutation.ts

@@ -1,10 +1,10 @@
 import { Resolver, Mutation, Arg, Ctx, Directive } from 'type-graphql'
 
-import { getRedirectSubdomainPath } from '@things-factory/shell'
-import { BoardTemplate } from './board-template'
-import { Board } from '../board/board'
-import { NewBoardTemplate, BoardTemplatePatch } from './board-template-type'
-import { thumbnail } from '../../controllers/thumbnail'
+import { getRedirectSubdomainPath, getRepository } from '@things-factory/shell'
+import { BoardTemplate } from './board-template.js'
+import { Board } from '../board/board.js'
+import { NewBoardTemplate, BoardTemplatePatch } from './board-template-type.js'
+import { thumbnail } from '../../controllers/thumbnail.js'
 
 @Resolver(BoardTemplate)
 export class BoardTemplateMutation {
@@ -16,7 +16,7 @@ export class BoardTemplateMutation {
     @Ctx() context: ResolverContext
   ): Promise<BoardTemplate> {
     const { domain, user, tx } = context.state
-    const repository = tx.getRepository(BoardTemplate)
+    const repository = getRepository(BoardTemplate, tx)
 
     const oldBoardTemplate: BoardTemplate = await repository.findOneBy({
       name: boardTemplate.name,
@@ -59,7 +59,7 @@ export class BoardTemplateMutation {
     @Ctx() context: ResolverContext
   ): Promise<BoardTemplate> {
     const { domain, user, tx } = context.state
-    const repository = tx.getRepository(BoardTemplate)
+    const repository = getRepository(BoardTemplate, tx)
 
     const boardTemplate = await repository.findOne({
       where: { domain: { id: domain.id }, id }
@@ -91,7 +91,7 @@ export class BoardTemplateMutation {
   async deleteBoardTemplate(@Arg('id') id: string, @Ctx() context: ResolverContext): Promise<boolean> {
     const { domain, tx } = context.state
 
-    await tx.getRepository(BoardTemplate).delete({ domain: { id: domain.id }, id })
+    await getRepository(BoardTemplate, tx).delete({ domain: { id: domain.id }, id })
 
     return true
   }
@@ -108,9 +108,9 @@ export class BoardTemplateMutation {
   ): Promise<BoardTemplate> {
     const { domain, user, notify, tx } = context.state
 
-    const boardTemplateRepository = tx.getRepository(BoardTemplate)
+    const boardTemplateRepository = getRepository(BoardTemplate, tx)
 
-    const board = await tx.getRepository(Board).findOne({
+    const board = await getRepository(Board, tx).findOne({
       where: { domain: { id: domain.id }, id }
     })
 
@@ -152,8 +152,8 @@ export class BoardTemplateMutation {
         mode: 'in-app',
         title: `BoardTemplate '${registered.name}' registered`,
         body: `BoardTemplate '${registered.name}' registered by ${user.name}\n${registered.description}`,
-        image: getRedirectSubdomainPath(context, domain.subdomain, `/board-template-thumbnail/${registered.id}`),
-        url: getRedirectSubdomainPath(context, domain.subdomain, `/board-template-viewer/${registered.id}`)
+        image: getRedirectSubdomainPath(context, domain, `/board-template-thumbnail/${registered.id}`),
+        url: getRedirectSubdomainPath(context, domain, `/board-template-viewer/${registered.id}`)
       })
 
     return registered