@things-factory/shell 4.0.37 → 4.0.41

package/dist-server/utils/list-query-builder.js.map

@@ -1 +1 @@
-{"version":3,"file":"list-query-builder.js","sourceRoot":"","sources":["../../server/utils/list-query-builder.ts"],"names":[],"mappings":";;;AAAA,2DAAoD;AAE7C,MAAM,UAAU,GAAG,UAAU,YAAiB,EAAE,MAAW,EAAE,OAAY,EAAE,YAAqB,IAAI;IACzG,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAA;IAC9B,MAAM,UAAU,GAAG,MAAM,CAAC,UAAU,CAAA;IACpC,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAA;IAChC,MAAM,QAAQ,GAAG,OAAO,IAAI,OAAO,CAAC,KAAK,CAAC,MAAM,IAAI,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAA;IAE3E,IAAI,OAAO,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;QACjC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;YACvB,MAAM,SAAS,GAAG,IAAA,kCAAc,EAC9B,YAAY,CAAC,KAAK,EAClB,MAAM,CAAC,IAAI,EACX,MAAM,CAAC,QAAQ,EACf,MAAM,CAAC,KAAK,EACZ,MAAM,CAAC,QAAQ,EACf,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,aAAa,EAAE,CAAC,CAAC,MAAM,CACjD,CAAA;YAED,IAAI,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,MAAM;gBAAE,YAAY,CAAC,QAAQ,CAAC,SAAS,CAAC,MAAM,CAAC,CAAA;YAC9D,IAAI,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,UAAU;gBAAE,YAAY,CAAC,aAAa,CAAC,SAAS,CAAC,UAAU,CAAC,CAAA;QAC7E,CAAC,CAAC,CAAA;KACH;IAED,IAAI,SAAS,EAAE;QACb,YAAY,CAAC,QAAQ,CAAC,GAAG,YAAY,CAAC,KAAK,qBAAqB,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAA;KAChF;IAED,IAAI,UAAU,IAAI,UAAU,CAAC,IAAI,GAAG,CAAC,IAAI,UAAU,CAAC,KAAK,GAAG,CAAC,EAAE;QAC7D,YAAY,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,GAAG,CAAC,UAAU,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,CAAA;QAC3D,YAAY,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAA;KACpC;IAED,IAAI,QAAQ,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;QACnC,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE;YAClC,MAAM,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,YAAY,CAAC,KAAK,IAAI,OAAO,CAAC,IAAI,EAAE,CAAA;YAC7G,IAAI,KAAK,KAAK,CAAC,EAAE;gBACf,YAAY,CAAC,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;aAC/D;iBAAM;gBACL,YAAY,CAAC,UAAU,CAAC,SAAS,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;aAClE;QACH,CAAC,CAAC,CAAA;KACH;AACH,CAAC,CAAA;AAzCY,QAAA,UAAU,cAyCtB"}
+{"version":3,"file":"list-query-builder.js","sourceRoot":"","sources":["../../server/utils/list-query-builder.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/shell",
-  "version": "4.0.37",
+  "version": "4.0.41",
   "description": "Core module for framework",
   "bin": {
     "things-factory": "bin/things-factory",
@@ -36,7 +36,7 @@
     "@graphql-tools/schema": "^8.2.0",
     "@graphql-tools/utils": "^8.3.0",
     "@hatiolab/koa-webpack": "^6.0.0",
-    "@hatiolab/things-scene": "^2.7.31",
+    "@hatiolab/things-scene": "^2.7.33",
     "@koa/cors": "^3.1.0",
     "@material/mwc-button": "^0.25.3",
     "@material/mwc-fab": "^0.25.3",
@@ -44,13 +44,14 @@
     "@material/mwc-icon-button": "^0.25.3",
     "@material/mwc-slider": "^0.25.3",
     "@material/mwc-textfield": "^0.25.3",
-    "@operato/board": "^0.3.17",
-    "@operato/graphql": "^0.3.17",
-    "@operato/utils": "^0.3.17",
-    "@things-factory/ejs-remote": "^4.0.37",
-    "@things-factory/env": "^4.0.37",
-    "@things-factory/styles": "^4.0.37",
-    "@things-factory/utils": "^4.0.37",
+    "@operato/board": "^0.3.21",
+    "@operato/graphql": "^0.3.21",
+    "@operato/shell": "^0.3.21",
+    "@operato/utils": "^0.3.21",
+    "@things-factory/ejs-remote": "^4.0.41",
+    "@things-factory/env": "^4.0.41",
+    "@things-factory/styles": "^4.0.41",
+    "@things-factory/utils": "^4.0.41",
     "@webcomponents/webcomponentsjs": "^2.6.0",
     "@webpack-contrib/schema-utils": "^1.0.0-beta.0",
     "apollo-server-core": "^3.5.0",
@@ -68,6 +69,7 @@
     "fs-extra": "^9.0.1",
     "glob": "^7.1.6",
     "graphql": "^15.7.2",
+    "graphql-kafka-subscriptions": "^0.4.0",
     "graphql-mqtt-subscriptions": "^1.2.0",
     "graphql-redis-subscriptions": "^2.4.2",
     "graphql-subscriptions": "^2.0.0",
@@ -93,7 +95,7 @@
     "loader-utils": "^2.0.0",
     "lodash": "^4.17.15",
     "mkdirp": "^1.0.3",
-    "mqtt": "^4.2.6",
+    "mqtt": "^4.3.4",
     "node-fetch": "^2.6.0",
     "node-sass": "^6.0.1",
     "nodemon": "^2.0.2",
@@ -124,5 +126,5 @@
   "resolutions": {
     "core-js": "^3.16.0"
   },
-  "gitHead": "7abd5ee06f7329c7fbb0c305f7b075a990bc2c18"
+  "gitHead": "1dd445b5b5e5b9e37291dc274886131199d7bf6a"
 }

package/server/pubsub.ts

@@ -1,3 +1,4 @@
+import { KafkaPubSub } from 'graphql-kafka-subscriptions'
 import { MQTTPubSub } from 'graphql-mqtt-subscriptions'
 import { RedisPubSub } from 'graphql-redis-subscriptions'
 import { PubSub } from 'graphql-subscriptions'
@@ -6,7 +7,7 @@ import { connect } from 'mqtt'
 
 import { config } from '@things-factory/env'
 
-const { middleware, host, port, nodes, options } = config.get('pubsub', {})
+const { middleware, host, port, nodes, topic, options } = config.get('pubsub', {})
 
 const debug = require('debug')('things-factory:shell')
 
@@ -43,9 +44,50 @@ switch (middleware) {
       subscriber: cluster
     })
     break
+  case 'kafka':
+    // globalConfig: {} // options passed directly to the consumer and producer
+    pubsub = new KafkaPubSub({
+      topic,
+      host,
+      port,
+      ...options
+    })
+    break
   default:
     pubsub = new PubSub()
     break
 }
 
+debug(middleware || 'default', 'pubsub initialized.')
+
+// kafka pubsub keeps connection and app port with 'ctrl+c' termination.
+const exitHandler = async (evt) => {
+  if (pubsub.close) {
+    try {
+      await pubsub.close()
+    } catch (err) {
+      console.error(err)
+    }
+  }
+  debug('exit on', evt.name)
+  if (evt.exit) process.exit()
+}
+
+/* 
+ * exit events hint from https://stackoverflow.com/a/14032965/14539284
+ */
+
+//do something when app is closing
+process.on('exit', exitHandler.bind(null, { name: 'exit', exit: true } ))
+
+//catches ctrl+c event
+process.on('SIGINT', exitHandler.bind(null, { name: 'SIGINT', exit: true } ))
+
+// catches "kill pid" (for example: nodemon restart)
+process.on('SIGUSR1', exitHandler.bind(null, { name: 'SIGUSR1', exit: true } ))
+process.on('SIGUSR2', exitHandler.bind(null, { name: 'SIGUSR2', exit: true } ))
+
+//catches uncaught exceptions
+process.on('uncaughtException', exitHandler.bind(null, { name: 'uncaughtException', exit: true } ))
+
 export { pubsub }

package/server/server-dev.ts

@@ -24,6 +24,7 @@ import koaBodyParser from 'koa-bodyparser'
 import koaStatic from 'koa-static'
 import koaWebpack from '@hatiolab/koa-webpack'
 import { schema } from './schema'
+import bytesFormat from 'bytes'
 
 const debug = require('debug')('things-factory:shell:server-dev')
 
@@ -47,12 +48,21 @@ const compiler = webpack(webpackConfig)
 
 const PORT = (process.env.PORT = flags.port)
 
+const requestBody = config.get('requestBody')||{}
+
 const bodyParserOption = {
-  formLimit: '10mb',
-  jsonLimit: '10mb',
-  textLimit: '10mb'
+  formLimit: requestBody.formLimit||'10mb',
+  jsonLimit: requestBody.jsonLimit||'10mb',
+  textLimit: requestBody.textLimit||'10mb'
+}
+
+const fileUpload = config.get('fileUpload')||{}
+const fileUploadOption = {
+  maxFileSize: bytesFormat.parse(fileUpload.maxFileSize)||bytesFormat.parse('10mb'),
+  maxFiles: fileUpload.maxFiles||10
 }
 
+
 /* bootstrap */
 const bootstrap = async () => {
   await databaseInitializer()
@@ -199,7 +209,7 @@ const bootstrap = async () => {
   })
 
   app.use(koaBodyParser(bodyParserOption))
-  app.use(graphqlUploadKoa({ maxFileSize: 10000000, maxFiles: 10 }))
+  app.use(graphqlUploadKoa(fileUploadOption))
 
   app.use(
     server.getMiddleware({

package/server/server.ts

@@ -20,6 +20,7 @@ import ip from 'koa-ip'
 import koaBodyParser from 'koa-bodyparser'
 import koaStatic from 'koa-static'
 import { schema } from './schema'
+import bytesFormat from 'bytes'
 
 const args = require('args')
 
@@ -31,12 +32,19 @@ const path = require('path')
 
 const PORT = (process.env.PORT = flags.port)
 
+const requestBody = config.get('requestBody')||{}
+
 const bodyParserOption = {
-  formLimit: '10mb',
-  jsonLimit: '10mb',
-  textLimit: '10mb'
+  formLimit: requestBody.formLimit||'10mb',
+  jsonLimit: requestBody.jsonLimit||'10mb',
+  textLimit: requestBody.textLimit||'10mb'
 }
 
+const fileUpload = config.get('fileUpload')||{}
+const fileUploadOption = {
+  maxFileSize: bytesFormat.parse(fileUpload.maxFileSize)||bytesFormat.parse('10mb'),
+  maxFiles: fileUpload.maxFiles||10
+}
 /* bootstrap */
 const bootstrap = async () => {
   await databaseInitializer()
@@ -165,7 +173,7 @@ const bootstrap = async () => {
   })
 
   app.use(koaBodyParser(bodyParserOption))
-  app.use(graphqlUploadKoa({ maxFileSize: 10000000, maxFiles: 10 }))
+  app.use(graphqlUploadKoa(fileUploadOption))
 
   app.use(
     server.getMiddleware({

package/server/utils/condition-builder.ts

@@ -25,6 +25,7 @@ export const buildCondition = function (
         parameters: { [`args${seq}`]: `${value}` }
       }
 
+    case 'search':
     case 'i_like':
       return {
         clause: `LOWER(${alias}.${fieldName}) LIKE :args${seq}`,

package/server/utils/list-params-converter.ts

@@ -1,13 +1,15 @@
-import { Equal, Not, Like, Raw, In, IsNull, Between } from 'typeorm'
+import { Between, Equal, ILike, In, IsNull, Like, Not, Raw } from 'typeorm'
+
 import { ListParam } from '../service/common-types'
 
 const OPERATION_FUNCTION_MAP = {
+  search: value => ILike(value),
   eq: value => Equal(value),
   noteq: value => Not(Equal(value)),
   like: value => Like(value),
-  i_like: value => Raw(alias => `LOWER(${alias}) LIKE '${String(value).toLowerCase()}'`),
+  i_like: value => ILike(value),
   nlike: value => Not(Like(value)),
-  i_nlike: value => Raw(alias => `LOWER(${alias}) NOT LIKE '${String(value).toLowerCase()}'`),
+  i_nlike: value => Not(ILike(value)),
   lt: value => Raw(alias => `${alias} < ${typeof value === 'string' ? "'" + value + "'" : value}`),
   gt: value => Raw(alias => `${alias} > ${typeof value === 'string' ? "'" + value + "'" : value}`),
   lte: value => Raw(alias => `${alias} <= ${typeof value === 'string' ? "'" + value + "'" : value}`),
@@ -25,51 +27,6 @@ const OPERATION_FUNCTION_MAP = {
   between: value => Between(value[0], value[1])
 }
 
-// function getOperatorFunction({ operator, name, value, dataType }) {
-//   switch (operator) {
-//     case 'eq':
-//       return Equal(value)
-//     case 'noteq':
-//       return Not(Equal(value))
-//     case 'like':
-//       return Like(value)
-//     case 'nlike':
-//       return Not(Like(value))
-//     case 'lt':
-//       return Raw(alias => `${alias} < ${value}`)
-//     case 'gt':
-//       return Raw(alias => `${alias} > ${value}`)
-//     case 'lte':
-//       return Raw(alias => `${alias} <= ${value}`)
-//     case 'gte':
-//       return Raw(alias => `${alias} >= ${value}`)
-//     case 'in':
-//       return In(value)
-//     case 'notin':
-//       return Not(In(value))
-//     case 'is_null':
-//       return IsNull()
-//     case 'is_not_null':
-//       return Not(IsNull())
-//     case 'is_false':
-//       return Raw(alias => `${alias} IS FALSE`)
-//     case 'is_true':
-//       return Raw(alias => `${alias} IS TRUE`)
-//     case 'is_not_false':
-//       return Raw(alias => `${alias} IS NOT FALSE`)
-//     case 'is_not_true':
-//       return Raw(alias => `${alias} IS NOT TRUE`)
-//     case 'is_present':
-//       return Raw(alias => `${alias} IS PRESENT`)
-//     case 'is_blank':
-//       return Raw(alias => `${alias} IS BLANK`)
-//     case 'is_empty_num_id':
-//       return Raw(alias => `${alias} IS EMPTY NUMERIC ID`)
-//     case 'between':
-//       return Between(value[0], value[1])
-//   }
-// }
-
 function getOperatorFunction({ operator, name, value, dataType }) {
   return OPERATION_FUNCTION_MAP[operator](value)
 }
@@ -111,17 +68,31 @@ function makeSortingParams(sortings) {
 }
 
 function makeFilterParams(filters) {
-  var jsonParams = {}
-  if (filters) {
-    var where = {}
-    filters.forEach(f => {
-      var operationFunc = getOperatorFunction(f)
-      where[f.name] = operationFunc
-    })
-    Object.assign(jsonParams, { where })
+  /* for where AND clauses */
+  const columnFilters = filters.filter(filter => filter.operator !== 'search')
+  const columnWhere = columnFilters.reduce((where, f) => {
+    where[f.name] = getOperatorFunction(f)
+    return where
+  }, {})
+
+  const searchFilters = filters.filter(filter => filter.operator === 'search')
+  if (searchFilters.length === 0) {
+    return {
+      where: columnWhere
+    }
   }
 
-  return jsonParams
+  /* for fulltext searching ... OR-AND composition */
+  const searchWheres = searchFilters.map(f => {
+    return {
+      [f.name]: getOperatorFunction(f),
+      ...columnWhere
+    }
+  })
+
+  return {
+    where: searchWheres
+  }
 }
 
 export function convertListParams(params: typeof ListParam, domain?: String) {

package/server/utils/list-query-builder.ts

@@ -1,13 +1,16 @@
+import { Brackets } from 'typeorm'
+
 import { buildCondition } from './condition-builder'
 
 export const buildQuery = function (queryBuilder: any, params: any, context: any, domainRef: Boolean = true) {
-  const filters = params.filters
+  const columnFilters = params.filters?.filter(filter => filter.operator !== 'search') || []
+  const searchFilters = params.filters?.filter(filter => filter.operator === 'search') || []
   const pagination = params.pagination
   const sortings = params.sortings
   const domainId = context && context.state.domain && context.state.domain.id
 
-  if (filters && filters.length > 0) {
-    filters.forEach(filter => {
+  if (columnFilters && columnFilters.length > 0) {
+    columnFilters.forEach(filter => {
       const condition = buildCondition(
         queryBuilder.alias,
         filter.name,
@@ -22,6 +25,19 @@ export const buildQuery = function (queryBuilder: any, params: any, context: any
     })
   }
 
+  if (searchFilters.length > 0) {
+    queryBuilder.andWhere(
+      new Brackets(qb => {
+        searchFilters.forEach((filter, index) => {
+          const clause = `${queryBuilder.alias}.${filter.name} LIKE :${filter.name}`
+          const parameters = { [filter.name]: filter.value }
+
+          index === 0 ? qb.where(clause, parameters) : qb.orWhere(clause, parameters)
+        })
+      })
+    )
+  }
+
   if (domainRef) {
     queryBuilder.andWhere(`${queryBuilder.alias}.domain = :domainId`, { domainId })
   }

package/client/actions/app.js

@@ -1,12 +0,0 @@
-export const UPDATE_MODULES = 'UPDATE_MODULES'
-export const UPDATE_BASE_URL = 'UPDATE_BASE_URL'
-export const UPDATE_CONTEXT_PATH = 'UPDATE_CONTEXT_PATH'
-export const SET_DOMAINS = 'SET-DOMAINS'
-
-export const updateDomains = (domains, domain) => (dispatch, getState) => {
-  dispatch({
-    type: SET_DOMAINS,
-    domains,
-    domain
-  })
-}

package/client/actions/index.js

@@ -1,2 +0,0 @@
-export * from './app'
-export * from './route'

package/client/actions/route.js

@@ -1,101 +0,0 @@
-import { store } from '../store'
-import { getPathInfo } from '@things-factory/utils'
-
-export const UPDATE_PAGE = 'UPDATE_PAGE'
-export const UPDATE_CONTEXT = 'UPDATE_CONTEXT'
-export const UPDATE_ACTIVE_PAGE = 'UPDATE_ACTIVE_PAGE'
-
-export const REGISTER_NAVIGATION_CALLBACK = 'REGISTER_NAVIGATION_CALLBACK'
-export const UNREGISTER_NAVIGATION_CALLBACK = 'UNREGISTER_NAVIGATION_CALLBACK'
-
-export const HOMEPAGE = ''
-
-/**
- * 페이지를 이동하는 방법으로는 다음 두가지가 있다.
- * 1. page link를 사용하는 방법 <a href='page'>goto page</a>
- *    이 방법은 route(page)와 동일하다.
- * 2. navigate('page')를 사용하는 방법
- *
- * @param string page
- */
-export const navigate = (location, replace) => {
-  if (replace) history.replaceState(history.state, '', location)
-  else history.pushState({}, '', location)
-
-  window.dispatchEvent(new Event('popstate'))
-}
-
-export const navigateWithSilence = ({ pathname: path, search }) => dispatch => {
-  const { path: pathname } = getPathInfo(path)
-
-  const reg = /\/([^\/]+)\/*([^\/]*)/
-  const decodePath = decodeURIComponent(pathname)
-  const matchReturn = decodePath.match(reg) || []
-  const page = matchReturn[1] || HOMEPAGE
-  const id = matchReturn[2]
-  const searchParams = new URLSearchParams(search)
-
-  var params = {}
-  searchParams.forEach((value, key) => {
-    params[key] = value
-  })
-
-  // Any other info you might want to extract from the path (like page type),
-  // you can do here
-  dispatch(loadPage(page, id, params))
-}
-
-const _preLoadPage = page => {
-  /*
-   * _preLoadPage 에서는 page를 load하기 전처리를 수행한다.
-   * 예를 들면, page dynamic import 또는 page re-routing
-   */
-  var state = store.getState()
-
-  /* override 기능을 위해서 dependency 관계의 역순으로 route를 실행한다. */
-  var modules = state.app.modules
-  if (modules) {
-    for (let i = modules.length - 1; i >= 0; i--) {
-      let factoryModule = modules[i]
-      let _page = factoryModule.route && factoryModule.route(page)
-      if (_page) {
-        return _page
-      }
-    }
-  }
-}
-
-export const loadPage = (page, id, params) => dispatch => {
-  var newPage = _preLoadPage(page)
-
-  if (page !== newPage && (newPage.indexOf('/') == 0)) {
-    dispatch(
-      navigateWithSilence({
-        pathname: newPage,
-        params
-      })
-    )
-    return
-  }
-
-  dispatch({
-    type: UPDATE_PAGE,
-    page: newPage,
-    resourceId: id,
-    params
-  })
-}
-
-export const route = url => {
-  /*
-   * Caution : This function works normally in a desktop environment, 
-   * but it is not guaranteed in a mobile environment, so be sure to check it.
-   */
-  const link = document.createElement('a')
-
-  link.setAttribute('href', url)
-
-  document.body.appendChild(link)
-  link.click()
-  document.body.removeChild(link)
-}

package/client/app/pages/page-view.js

@@ -1,144 +0,0 @@
-import { LitElement, html } from 'lit-element'
-
-import { store } from '../../store'
-import { UPDATE_CONTEXT } from '../../actions/route'
-
-import isEqual from 'lodash/isEqual'
-
-function diff(after, before) {
-  var changed = false
-  var changes = {}
-
-  Object.getOwnPropertyNames(after).forEach(function(key) {
-    let before_val = before[key]
-    let after_val = after[key]
-
-    if (!isEqual(before_val, after_val)) {
-      changes[key] = after_val
-      changed = true
-    }
-  })
-
-  return changed && changes
-}
-
-export class PageView extends LitElement {
-  // Only render this page if it's actually visible.
-  shouldUpdate(changes) {
-    var active = String(this.active) == 'true'
-    var { active: oldActive = false } = this._oldLifecycleInfo$ || {}
-
-    /*
-     * page lifecycle
-     * case 1. page가 새로 activate 되었다.
-     * case 2. page가 active 상태에서 lifecycle 정보가 바뀌었다.
-     **/
-    if (active) {
-      this.pageUpdate({
-        active
-      })
-    } else if (oldActive) {
-      this.pageUpdate({
-        active
-      })
-    }
-
-    return active
-  }
-
-  static get properties() {
-    return {
-      active: Boolean,
-      lifecycle: Object,
-      contextPath: { attribute: 'context-path' }
-    }
-  }
-
-  /* lifecycle */
-  async pageUpdate(changes = {}, force = false) {
-    var before = this._oldLifecycleInfo$ || {}
-
-    var after = {
-      ...before,
-      ...this.lifecycle,
-      contextPath: this.contextPath,
-      ...changes
-    }
-
-    if (!('initialized' in changes) && after.active && !before.initialized) {
-      after.initialized = true
-    }
-
-    if (force) {
-      after.updated = Date.now()
-    }
-
-    var changed = diff(after, before)
-    if (!changed) {
-      return
-    }
-
-    this._oldLifecycleInfo$ = after
-
-    /* page의 이미 초기화된 상태에서 contextPath가 바뀐다면, 무조건 page가 리셋되어야 한다. */
-    if (before.initialized && changed.contextPath) {
-      await this.pageReset()
-      return
-    }
-
-    if (changed.initialized) {
-      await this.pageInitialized(after)
-    }
-
-    if ('initialized' in changed) {
-      if (changed.initialized) {
-        /*
-         * 방금 초기화된 경우라면, 엘리먼트들이 만들어지지 않았을 가능성이 있으므로,
-         * 다음 animationFrame에서 pageUpdated 콜백을 호출한다.
-         */
-        requestAnimationFrame(async () => {
-          await this.pageUpdated(changed, after, before)
-          /* active page인 경우에는, page Context 갱신도 필요할 것이다. */
-          after.active && this.updateContext()
-        })
-      } else {
-        await this.pageDisposed(after)
-      }
-    } else {
-      await this.pageUpdated(changed, after, before)
-      /* active page인 경우에는, page Context 갱신도 필요할 것이다. */
-      after.active && this.updateContext()
-    }
-  }
-
-  async pageReset() {
-    var { initialized } = this._oldLifecycleInfo$ || {}
-
-    if (initialized) {
-      await this.pageDispose()
-      await this.pageUpdate({}, true)
-    }
-  }
-
-  async pageDispose() {
-    await this.pageUpdate({
-      initialized: false
-    })
-  }
-
-  pageInitialized(pageInfo) {}
-  pageUpdated(changes, after, before) {}
-  pageDisposed(pageInfo) {}
-
-  /* context */
-  updateContext(override) {
-    store.dispatch({
-      type: UPDATE_CONTEXT,
-      context: override ? { ...this.context, ...override } : this.context
-    })
-  }
-
-  get context() {
-    return {}
-  }
-}

package/client/reducers/app.js

@@ -1,40 +0,0 @@
-import { UPDATE_MODULES, UPDATE_BASE_URL, UPDATE_CONTEXT_PATH, SET_DOMAINS } from '../actions/app.js'
-import { getPathInfo } from '@things-factory/utils'
-
-const INITIAL_STATE = {
-  baseUrl: location.origin,
-  contextPath: getPathInfo(location.pathname).contextPath,
-  domains: []
-}
-
-const app = (state = INITIAL_STATE, action) => {
-  switch (action.type) {
-    case UPDATE_MODULES:
-      return {
-        ...state,
-        modules: action.modules
-      }
-    case UPDATE_BASE_URL:
-      return {
-        ...state,
-        baseUrl: action.baseUrl
-      }
-    case UPDATE_CONTEXT_PATH:
-      return {
-        ...state,
-        contextPath: action.contextPath
-      }
-
-    case SET_DOMAINS:
-      return {
-        ...state,
-        domains: action.domains,
-        domain: action.domain
-      }
-
-    default:
-      return state
-  }
-}
-
-export default app