@things-factory/i18n-base 7.0.66 → 7.0.68

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/i18n-base",
-  "version": "7.0.66",
+  "version": "7.0.68",
   "main": "dist-server/index.js",
   "browser": "dist-client/index.js",
   "things-factory": true,
@@ -28,8 +28,8 @@
   },
   "dependencies": {
     "@operato/i18n": "^7.0.0",
-    "@things-factory/auth-base": "^7.0.66",
-    "@things-factory/shell": "^7.0.66"
+    "@things-factory/auth-base": "^7.0.68",
+    "@things-factory/shell": "^7.0.68"
   },
-  "gitHead": "17363b9643b8e126c4f55bc5dc9f6dfbba2cedc3"
+  "gitHead": "a9328d1a0f4e0c89cc793839e9b6154c2790bd15"
 }

package/server/routers/translations-router.ts

@@ -0,0 +1,87 @@
+import Router from 'koa-router'
+import { ILike } from 'typeorm'
+
+import { getRepository } from '@things-factory/shell'
+import { Terminology } from '../service/terminology/terminology'
+import { config } from '@things-factory/env'
+
+const path = require('path')
+const cacheFS = require('fs')
+var fs = require('fs')
+
+const disableCustomTerminologyFeature = config.get('i18n/disableCustomTerminologyFeature')
+
+if (!disableCustomTerminologyFeature) {
+  process.on('client-rebuilt' as any, (app, compilerFileSystem) => {
+    /* change filesystem whenever webpacking assets done. only for development mode. */
+    fs = compilerFileSystem
+
+    const cacheFileFolder = path.join('cache', 'translations')
+
+    if (cacheFS.existsSync(cacheFileFolder)) {
+      cacheFS.rmSync(cacheFileFolder, { recursive: true })
+    }
+  })
+}
+
+export const translationsRouter = new Router()
+
+translationsRouter.get('/translations/:filename', async (context, next) => {
+  const { subdomain, filename } = context.params
+  const { domain } = context.state
+
+  const locale = (filename || 'en.json').split('.')[0]
+
+  // context.set('Cache-Control', 'public, max-age=31536000') // 캐시 기간 설정 : 1년
+  // context.set('Expires', new Date(Date.now() + 31536000000).toUTCString()) // 캐시 만료일 설정
+
+  if (disableCustomTerminologyFeature) {
+    var file = fs.readFileSync(path.resolve(path.join('dist-app', 'translations', filename)))
+
+    context.type = 'application/json'
+    context.body = file
+    return
+  }
+
+  const cacheFileFolder = path.join('cache', 'translations', subdomain)
+  const cacheFilePath = path.join(cacheFileFolder, filename)
+
+  if (cacheFS.existsSync(cacheFilePath)) {
+    var file = cacheFS.readFileSync(cacheFilePath)
+  } else {
+    var file = fs.readFileSync(path.resolve(path.join('dist-app', 'translations', filename)))
+
+    try {
+      const terminologies = await getRepository(Terminology).find({
+        where: { domain: { id: domain.id }, locale: ILike(locale + '%') }
+      })
+
+      const json = JSON.parse(file)
+
+      terminologies.forEach(term => {
+        const { name, category, display } = term
+        json[`${category}.${name}`] = display
+      })
+
+      try {
+        if (!cacheFS.existsSync(cacheFileFolder)) {
+          cacheFS.mkdirSync(cacheFileFolder, { recursive: true })
+        }
+
+        cacheFS.writeFileSync(cacheFilePath, JSON.stringify(json))
+      } catch (err) {
+        console.error(err)
+      }
+
+      context.type = 'application/json'
+      context.body = json
+
+      return
+    } catch (err) {
+      console.error(err)
+    }
+  }
+
+  context.type = 'application/json'
+  context.body = file
+})

package/server/routes.ts

@@ -1,27 +1,10 @@
 import i18next from 'i18next'
-import { ILike } from 'typeorm'
-
-import { getRepository } from '@things-factory/shell'
 import { config } from '@things-factory/env'
 
 const disableCustomTerminologyFeature = config.get('i18n/disableCustomTerminologyFeature')
+const isPathBaseDomain = !config.get('subdomain') && !config.get('useVirtualHostBasedDomain')
 
-import { Terminology } from './service/terminology/terminology'
-
-const path = require('path')
-const cacheFS = require('fs')
-var fs = require('fs')
-
-process.on('client-rebuilt' as any, (app, compilerFileSystem) => {
-  /* change filesystem whenever webpacking assets done. only for development mode. */
-  fs = compilerFileSystem
-
-  const cacheFileFolder = path.join('cache', 'translations')
-
-  if (cacheFS.existsSync(cacheFileFolder)) {
-    cacheFS.rmSync(cacheFileFolder, { recursive: true })
-  }
-})
+import { translationsRouter } from './routers/translations-router'
 
 process.on('bootstrap-module-global-public-route' as any, (app, globalPublicRouter) => {
   globalPublicRouter.get('/translations/translate/:lng/:key', async (context, next) => {
@@ -40,63 +23,9 @@ process.on('bootstrap-module-global-public-route' as any, (app, globalPublicRout
 })
 
 process.on('bootstrap-module-domain-public-route' as any, (app, domainPublicRouter) => {
-  domainPublicRouter.get('/domain/:subdomain/translations/:filename', async (context, next) => {
-    const { subdomain, filename } = context.params
-    const { domain } = context.state
-
-    const locale = (filename || 'en.json').split('.')[0]
-
-    // context.set('Cache-Control', 'public, max-age=31536000') // 캐시 기간 설정 : 1년
-    // context.set('Expires', new Date(Date.now() + 31536000000).toUTCString()) // 캐시 만료일 설정
-
-    if (disableCustomTerminologyFeature) {
-      var file = fs.readFileSync(path.resolve(path.join('dist-app', 'translations', filename)))
-
-      context.type = 'application/json'
-      context.body = file
-      return
-    }
-
-    const cacheFileFolder = path.join('cache', 'translations', subdomain)
-    const cacheFilePath = path.join(cacheFileFolder, filename)
-
-    if (cacheFS.existsSync(cacheFilePath)) {
-      var file = cacheFS.readFileSync(cacheFilePath)
-    } else {
-      var file = fs.readFileSync(path.resolve(path.join('dist-app', 'translations', filename)))
-
-      try {
-        const terminologies = await getRepository(Terminology).find({
-          where: { domain: { id: domain.id }, locale: ILike(locale + '%') }
-        })
-
-        const json = JSON.parse(file)
-
-        terminologies.forEach(term => {
-          const { name, category, display } = term
-          json[`${category}.${name}`] = display
-        })
-
-        try {
-          if (!cacheFS.existsSync(cacheFileFolder)) {
-            cacheFS.mkdirSync(cacheFileFolder, { recursive: true })
-          }
-
-          cacheFS.writeFileSync(cacheFilePath, JSON.stringify(json))
-        } catch (err) {
-          console.error(err)
-        }
-
-        context.type = 'application/json'
-        context.body = json
-
-        return
-      } catch (err) {
-        console.error(err)
-      }
-    }
-
-    context.type = 'application/json'
-    context.body = file
-  })
+  if (isPathBaseDomain) {
+    domainPublicRouter.use('/domain/:subdomain', translationsRouter.routes(), translationsRouter.allowedMethods())
+  } else if (!disableCustomTerminologyFeature) {
+    domainPublicRouter.use('', translationsRouter.routes(), translationsRouter.allowedMethods())
+  }
 })