@things-factory/shell 8.0.0 → 9.0.0-beta.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/shell",
-  "version": "8.0.0",
+  "version": "9.0.0-beta.5",
   "description": "Core module for framework",
   "bin": {
     "things-factory": "bin/things-factory",
@@ -43,7 +43,7 @@
     "@graphql-tools/schema": "^8.5.0",
     "@graphql-tools/utils": "^10.1.2",
     "@graphql-yoga/redis-event-target": "^3.0.1",
-    "@hatiolab/things-scene": "^3.2.0",
+    "@hatiolab/things-scene": "^9.0.0-beta",
     "@koa/cors": "^5.0.0",
     "@material-design-icons/font": "^0.14.9",
     "@material/mwc-button": "^0.27.0",
@@ -53,19 +53,19 @@
     "@material/mwc-textfield": "^0.27.0",
     "@material/web": "^2.0.0",
     "@open-wc/scoped-elements": "^2.1.3",
-    "@operato/board": "^8.0.0",
-    "@operato/graphql": "^8.0.0",
-    "@operato/help": "^8.0.0",
-    "@operato/layout": "^8.0.0",
-    "@operato/shell": "^8.0.0",
-    "@operato/typeorm-history": "^8.0.0",
-    "@operato/utils": "^8.0.0",
+    "@operato/board": "^9.0.0-beta",
+    "@operato/graphql": "^9.0.0-beta",
+    "@operato/help": "^9.0.0-beta",
+    "@operato/layout": "^9.0.0-beta",
+    "@operato/shell": "^9.0.0-beta",
+    "@operato/typeorm-history": "^9.0.0-beta",
+    "@operato/utils": "^9.0.0-beta",
     "@reduxjs/toolkit": "^2.2.5",
-    "@things-factory/ejs-remote": "^8.0.0",
-    "@things-factory/env": "^8.0.0",
+    "@things-factory/ejs-remote": "^9.0.0-beta.5",
+    "@things-factory/env": "^9.0.0-beta.5",
     "@things-factory/operato-license-checker": "^4.0.4",
-    "@things-factory/styles": "^8.0.0",
-    "@things-factory/utils": "^8.0.0",
+    "@things-factory/styles": "^9.0.0-beta.1",
+    "@things-factory/utils": "^9.0.0-beta.0",
     "@webcomponents/scoped-custom-element-registry": "^0.0.9",
     "@webcomponents/webcomponentsjs": "^2.6.0",
     "args": "^5.0.0",
@@ -75,7 +75,6 @@
     "core-js": "^3.26.0",
     "debug": "^4.1.1",
     "firebase": "^9.14.0",
-    "fs-extra": "^9.0.1",
     "glob": "^7.1.6",
     "graphql": "^16.5.0",
     "graphql-scalars": "^1.22.4",
@@ -98,7 +97,6 @@
     "koa-static": "^5.0.0",
     "koa2-connect-history-api-fallback": "^0.1.2",
     "lit": "^3.1.2",
-    "loader-utils": "^2.0.0",
     "lodash": "^4.17.21",
     "lodash-es": "^4.17.21",
     "material-symbols": "^0.17.2",
@@ -133,5 +131,5 @@
     "pg": "^8.7.3",
     "sqlite3": "^5.0.8"
   },
-  "gitHead": "07ef27d272dd9a067a9648ac7013748510556a18"
+  "gitHead": "f075f1bd00a9b902a677d44f1844bcbd9c85ea97"
 }

package/client/hot-client/hot.js

@@ -1,140 +0,0 @@
-const log = require('./log');
-
-const refresh = 'Please refresh the page.';
-const hotOptions = {
-  ignoreUnaccepted: true,
-  ignoreDeclined: true,
-  ignoreErrored: true,
-  onUnaccepted(data) {
-    const chain = [].concat(data.chain);
-    const last = chain[chain.length - 1];
-
-    if (last === 0) {
-      chain.pop();
-    }
-
-    log.warn(`Ignored an update to unaccepted module ${chain.join(' ➭ ')}`);
-  },
-  onDeclined(data) {
-    log.warn(`Ignored an update to declined module ${data.chain.join(' ➭ ')}`);
-  },
-  onErrored(data) {
-    log.warn(`Ignored an error while updating module ${data.moduleId} <${data.type}>`);
-    log.warn(data.error);
-  }
-};
-
-let lastHash;
-
-function upToDate() {
-  return lastHash.indexOf(__webpack_hash__) >= 0;
-}
-
-function result(modules, appliedModules) {
-  const unaccepted = modules.filter(
-    (moduleId) => appliedModules && appliedModules.indexOf(moduleId) < 0
-  );
-
-  if (unaccepted.length > 0) {
-    let message = 'The following modules could not be updated:';
-
-    for (const moduleId of unaccepted) {
-      message += `\n          ⦻ ${moduleId}`;
-    }
-    log.warn(message);
-  }
-
-  if (!(appliedModules || []).length) {
-    log.info('No Modules Updated.');
-  } else {
-    const message = ['The following modules were updated:'];
-
-    for (const moduleId of appliedModules) {
-      message.push(`         ↻ ${moduleId}`);
-    }
-
-    log.info(message.join('\n'));
-
-    const numberIds = appliedModules.every((moduleId) => typeof moduleId === 'number');
-    if (numberIds) {
-      log.info('Please consider using the NamedModulesPlugin for module names.');
-    }
-  }
-}
-
-function check(options) {
-  module.hot
-    .check()
-    .then((modules) => {
-      if (!modules) {
-        log.warn(`Cannot find update. The server may have been restarted. ${refresh}`);
-        if (options.reload) {
-          window.location.reload();
-        }
-        return null;
-      }
-
-      const hotOpts = options.reload ? {} : hotOptions;
-
-      return module.hot
-        .apply(hotOpts)
-        .then((appliedModules) => {
-          if (!upToDate()) {
-            check(options);
-          }
-
-          result(modules, appliedModules);
-
-          if (upToDate()) {
-            log.info('App is up to date.');
-          }
-        })
-        .catch((err) => {
-          const status = module.hot.status();
-          if (['abort', 'fail'].indexOf(status) >= 0) {
-            log.warn(`Cannot apply update. ${refresh}`);
-            log.warn(err.stack || err.message);
-            if (options.reload) {
-              window.location.reload();
-            }
-          } else {
-            log.warn(`Update failed: ${err.stack}` || err.message);
-          }
-        });
-    })
-    .catch((err) => {
-      const status = module.hot.status();
-      if (['abort', 'fail'].indexOf(status) >= 0) {
-        log.warn(`Cannot check for update. ${refresh}`);
-        log.warn(err.stack || err.message);
-        if (options.reload) {
-          window.location.reload();
-        }
-      } else {
-        log.warn(`Update check failed: ${err.stack}` || err.message);
-      }
-    });
-}
-
-if (module.hot) {
-  log.info('Hot Module Replacement Enabled. Waiting for signal.');
-} else {
-  log.error('Hot Module Replacement is disabled.');
-}
-
-module.exports = function update(currentHash, options) {
-  lastHash = currentHash;
-  if (!upToDate()) {
-    const status = module.hot.status();
-
-    if (status === 'idle') {
-      log.info('Checking for updates to the bundle.');
-      check(options);
-    } else if (['abort', 'fail'].indexOf(status) >= 0) {
-      log.warn(`Cannot apply update. A previous update ${status}ed. ${refresh}`);
-      if (options.reload) {
-        window.location.reload();
-      }
-    }
-  }
-};

package/client/hot-client/index.js

@@ -1,103 +0,0 @@
-/* eslint-disable global-require, consistent-return */
-
-(function hotClientEntry() {
-  // eslint-disable-next-line no-underscore-dangle
-  if (window.__webpackHotClient__) {
-    return;
-  }
-
-  // eslint-disable-next-line no-underscore-dangle
-  window.__webpackHotClient__ = {};
-
-  // this is piped in at runtime build via DefinePlugin in /lib/plugins.js
-  // eslint-disable-next-line no-unused-vars, no-undef
-  const options = __hotClientOptions__;
-
-  const log = require('./log'); // eslint-disable-line import/order
-
-  log.level = options.logLevel;
-
-  const update = require('./hot');
-  const socket = require('./socket');
-
-  if (!options) {
-    throw new Error(
-      'Something went awry and __hotClientOptions__ is undefined. Possible bad build. HMR cannot be enabled.'
-    );
-  }
-
-  let currentHash;
-  let initial = true;
-  let isUnloading;
-
-  window.addEventListener('beforeunload', () => {
-    isUnloading = true;
-  });
-
-  function reload() {
-    if (isUnloading) {
-      return;
-    }
-
-    if (options.hmr) {
-      log.info('App Updated, Reloading Modules');
-      update(currentHash, options);
-    } else if (options.reload) {
-      log.info('Refreshing Page');
-      window.location.reload();
-    } else {
-      log.warn('Please refresh the page manually.');
-      log.info('The `hot` and `reload` options are set to false.');
-    }
-  }
-
-  socket(options, {
-    compile({ compilerName }) {
-      log.info(`webpack: Compiling (${compilerName})`);
-    },
-
-    errors({ errors }) {
-      log.error('webpack: Encountered errors while compiling. Reload prevented.');
-
-      for (let i = 0; i < errors.length; i++) {
-        log.error(errors[i]);
-      }
-    },
-
-    hash({ hash }) {
-      currentHash = hash;
-    },
-
-    invalid({ fileName }) {
-      log.info(`App updated. Recompiling ${fileName}`);
-    },
-
-    ok() {
-      if (initial) {
-        initial = false;
-        return initial;
-      }
-
-      reload();
-    },
-
-    'window-reload': () => {
-      window.location.reload();
-    },
-
-    warnings({ warnings }) {
-      log.warn('Warnings while compiling.');
-
-      for (let i = 0; i < warnings.length; i++) {
-        log.warn(warnings[i]);
-      }
-
-      if (initial) {
-        initial = false;
-        return initial;
-      }
-
-      reload();
-    }
-  });
-})();

package/client/hot-client/log.js

@@ -1,44 +0,0 @@
-// eslint-disable-next-line import/no-extraneous-dependencies
-const loglevel = require('loglevelnext/dist/loglevelnext');
-
-const { MethodFactory } = loglevel.factories;
-const css = {
-  prefix:
-    'color: #999; padding: 0 0 0 20px; line-height: 16px; background: url(https://webpack.js.org/6bc5d8cf78d442a984e70195db059b69.svg) no-repeat; background-size: 16px 16px; background-position: 0 -2px;',
-  reset: 'color: #444'
-};
-const log = loglevel.getLogger({ name: 'hot', id: 'hot-middleware/client' });
-
-function IconFactory(logger) {
-  MethodFactory.call(this, logger);
-}
-
-IconFactory.prototype = Object.create(MethodFactory.prototype);
-IconFactory.prototype.constructor = IconFactory;
-
-IconFactory.prototype.make = function make(methodName) {
-  const og = MethodFactory.prototype.make.call(this, methodName);
-
-  return function _(...params) {
-    const args = [].concat(params);
-    const prefix = '%c｢hot｣ %c';
-    const [first] = args;
-
-    if (typeof first === 'string') {
-      args[0] = prefix + first;
-    } else {
-      args.unshift(prefix);
-    }
-
-    args.splice(1, 0, css.prefix, css.reset);
-    og(...args);
-  };
-};
-
-log.factory = new IconFactory(log, {});
-
-log.group = console.group; // eslint-disable-line no-console
-log.groupCollapsed = console.groupCollapsed; // eslint-disable-line no-console
-log.groupEnd = console.groupEnd; // eslint-disable-line no-console
-
-module.exports = log;

package/client/hot-client/socket.js

@@ -1,63 +0,0 @@
-const url = require('url');
-
-const log = require('./log');
-
-const maxRetries = 10;
-let retry = maxRetries;
-
-module.exports = function connect(options, handler) {
-  const { host } = options.webSocket;
-  const socketUrl = url.format({
-    protocol: options.https ? 'wss' : 'ws',
-    hostname: host === '*' ? window.location.hostname : host,
-    port: options.webSocket.port,
-    slashes: true
-  });
-
-  let open = false;
-  let socket = new WebSocket(socketUrl);
-
-  socket.addEventListener('open', () => {
-    open = true;
-    retry = maxRetries;
-    log.info('WebSocket connected');
-  });
-
-  socket.addEventListener('close', () => {
-    log.warn('WebSocket closed');
-
-    open = false;
-    socket = null;
-
-    // exponentation operator ** isn't supported by IE at all
-    const timeout =
-      // eslint-disable-next-line no-restricted-properties
-      1000 * Math.pow(maxRetries - retry, 2) + Math.random() * 100;
-
-    if (open || retry <= 0) {
-      log.warn(`WebSocket: ending reconnect after ${maxRetries} attempts`);
-      return;
-    }
-
-    log.info(`WebSocket: attempting reconnect in ${parseInt(timeout / 1000, 10)}s`);
-
-    setTimeout(() => {
-      retry -= 1;
-
-      connect(
-        options,
-        handler
-      );
-    }, timeout);
-  });
-
-  socket.addEventListener('message', (event) => {
-    log.debug('WebSocket: message:', event.data);
-
-    const message = JSON.parse(event.data);
-
-    if (handler[message.type]) {
-      handler[message.type](message.data);
-    }
-  });
-};

package/ormconfig.js

@@ -1,31 +0,0 @@
-const { orderedModuleNames, loader } = require('@things-factory/env')
-const { NamingStrategy } = require('@things-factory/shell')
-
-const debug = require('debug')('things-factory:shell:ormconfig')
-
-function flattenDeep(arr) {
-  return arr.reduce((acc, val) => (Array.isArray(val) ? acc.concat(flattenDeep(val)) : acc.concat(val)), [])
-}
-
-/*
-  dependencies list를 받아서, entities, migrations, subscribers 폴더 어레이를 빌드한다.
-*/
-var entities = orderedModuleNames.map(dep => loader(dep).entities).filter(entity => entity && entity.length > 0)
-entities = flattenDeep(entities)
-
-var migrations = orderedModuleNames.map(dep => loader(dep).migrations).filter(entity => entity && entity.length > 0)
-migrations = flattenDeep(migrations)
-
-var subscribers = orderedModuleNames.map(dep => loader(dep).subscribers).filter(entity => entity && entity.length > 0)
-subscribers = flattenDeep(subscribers)
-
-debug('entities', entities)
-debug('migrations', migrations)
-debug('subscribers', subscribers)
-
-module.exports = {
-  namingStrategy: new NamingStrategy(),
-  entities,
-  migrations,
-  subscribers
-}

package/server/graphql-local-client.ts

@@ -1,59 +0,0 @@
-/**
- * Apollo Client configuration for a local GraphQL schema.
- * This class provides a static method `init` to initialize the client with a schema and an app context.
- */
-import { ApolloClient, InMemoryCache, NormalizedCacheObject } from '@apollo/client'
-import { SchemaLink } from '@apollo/client/link/schema'
-
-const defaultOptions: any = {
-  watchQuery: {
-    fetchPolicy: 'no-cache',
-    errorPolicy: 'ignore'
-  },
-  query: {
-    fetchPolicy: 'no-cache',
-    errorPolicy: 'all'
-  },
-  mutate: {
-    errorPolicy: 'all'
-  }
-}
-
-/**
- * GraphqlLocalClient is a utility class for initializing an Apollo Client for a local GraphQL schema.
- * It provides a static `init` method for setting up the client with a schema and an app context.
- */
-export class GraphqlLocalClient {
-  /**
-   * Apollo Client instance for local GraphQL schema.
-   * @static
-   * @type {ApolloClient<NormalizedCacheObject>}
-   */
-  static client: ApolloClient<NormalizedCacheObject>
-
-  /**
-   * Initializes the Apollo Client for a local GraphQL schema.
-   * @static
-   * @param {object} schema - The GraphQL schema to use.
-   * @param {object} app - The application context to be passed in as part of the execution context.
-   */
-  static init(schema, app) {
-    const cache = new InMemoryCache({
-      addTypename: false
-    })
-
-    GraphqlLocalClient.client = new ApolloClient({
-      defaultOptions,
-      cache,
-      link: new SchemaLink({
-        schema,
-        context: (obj, args, context, info) => {
-          return {
-            ...obj.getContext(),
-            app
-          }
-        }
-      })
-    })
-  }
-}

package/server/index.ts

@@ -1,13 +0,0 @@
-export * from './migrations'
-export * from './initializers/naming-strategy'
-export * from './initializers/database'
-export * from './utils'
-export * from './pubsub'
-export * from './pubsub-log-transport'
-export * from './middlewares'
-export * from './graphql-local-client'
-export * from './service'
-
-export * from './typeorm/encrypt-transform'
-export * from './typeorm/json5-transform'
-export * from './typeorm/round-transform'

package/server/initializers/database.ts

@@ -1,96 +0,0 @@
-import { createConnection, DataSource, EntityManager, EntityTarget, Repository } from 'typeorm'
-
-import { appRootPath, config, logger } from '@things-factory/env'
-
-const path = require('path')
-
-var ormconfig
-try {
-  ormconfig = require(path.resolve(appRootPath, 'ormconfig'))
-} catch (e) {
-  ormconfig = require('@things-factory/shell/ormconfig')
-}
-
-const dataSources: { [name: string]: DataSource } = {}
-
-/**
- * Returns the specified DataSource by name.
- * @param {string} name - The name of the DataSource.
- * @returns {DataSource} - The DataSource with the specified name.
- */
-export function getDataSource(name?: string): DataSource {
-  return dataSources[name || 'default']
-}
-
-/**
- * Adds a new DataSource with the specified name.
- * @param {string} name - The name of the DataSource to add.
- * @param {DataSource} dataSource - The DataSource to add.
- */
-export function addDataSource(name: string, dataSource: DataSource) {
-  dataSources[name] = dataSource
-}
-
-/**
- * Removes a DataSource with the specified name.
- * @param {string} name - The name of the DataSource to remove.
- */
-export function removeDataSource(name: string) {
-  delete dataSources[name]
-}
-
-/**
- * Returns an array of all registered DataSource names.
- * @returns {string[]} - An array of DataSource names.
- */
-export function getDataSourceNames() {
-  return Object.keys(dataSources)
-}
-
-/**
- * Returns a repository for the specified entity.
- * @param {EntityTarget<X>} target - The target entity for which to get the repository.
- * @returns {Repository<X>} - The repository for the specified entity.
- */
-export function getRepository<X>(target: EntityTarget<X>, tx?: EntityManager): Repository<X> {
-  return tx ? tx.getRepository<X>(target) : getDataSource('default').getRepository<X>(target)
-}
-
-/**
- * Initializes the database connections and data sources.
- */
-export const databaseInitializer = async () => {
-  try {
-    const readConnectionConfig = config.get('ormconfig')
-
-    const dataSource = await createConnection({
-      ...ormconfig,
-      ...readConnectionConfig
-    })
-
-    addDataSource('default', dataSource)
-
-    logger.info('Default DataSource established')
-
-    if (readConnectionConfig.type == 'sqlite' && readConnectionConfig.synchronize == false) {
-      await dataSource.query('PRAGMA foreign_keys=OFF')
-      await dataSource.synchronize()
-      await dataSource.query('PRAGMA foreign_keys=ON')
-    }
-
-    if (config.get('ormconfig4Tx')) {
-      const dataSource4Tx = new DataSource({
-        ...ormconfig,
-        ...config.get('ormconfig4Tx')
-      })
-      await dataSource4Tx.initialize()
-      addDataSource('tx', dataSource4Tx)
-
-      logger.info('Transaction DataSource established')
-    } else {
-      addDataSource('tx', dataSource)
-    }
-  } catch (e) {
-    logger.error(e)
-  }
-}

package/server/initializers/naming-strategy.ts

@@ -1,14 +0,0 @@
-import { NamingStrategyInterface } from 'typeorm'
-import { DefaultNamingStrategy } from 'typeorm'
-import pluralize from 'pluralize'
-import _ from 'lodash'
-
-export class NamingStrategy extends DefaultNamingStrategy implements NamingStrategyInterface {
-  tableName(targetName: string, userSpecifiedName: string): string {
-    return userSpecifiedName || pluralize(_.snakeCase(targetName))
-  }
-
-  columnName(propertyName: string, customName: string, embeddedPrefixes: string[]): string {
-    return _.snakeCase(embeddedPrefixes.concat(customName || propertyName).join('_'))
-  }
-}

package/server/middlewares/domain-middleware.ts

@@ -1,60 +0,0 @@
-import requestIp from 'request-ip'
-import { getDomainFromURL } from '../utils'
-
-export async function domainMiddleware(context: any, next: any) {
-  var { domain } = context.state
-  if (!domain) {
-    /*
-     * The domainType should be checked only when signin and checkin.
-     * For purposes such as API calls, the target domainType may be different from the system domainType.
-     * So, we don't check domainType here.
-     */
-    domain = await getDomainFromURL(context)
-  }
-
-  if (domain) {
-    const ip = requestIp.getClientIp(context.req)
-    const { whitelist = [], blacklist = [], protectedlist = [], privileges = [] } = domain.iplist || {}
-
-    if (Array.isArray(whitelist) && whitelist.length > 0) {
-      /* whitelist 우선 */
-      const whitelisted =
-        Array.isArray(whitelist) &&
-        whitelist.some(item => {
-          return new RegExp(item).test(ip)
-        })
-
-      if (!whitelisted) {
-        context.status = 403
-        return
-      }
-    } else {
-      const blacklisted =
-        Array.isArray(blacklist) &&
-        blacklist.some(item => {
-          return new RegExp(item).test(ip)
-        })
-
-      if (blacklisted) {
-        context.status = 403
-        return
-      }
-    }
-
-    if (Array.isArray(protectedlist) && protectedlist.length > 0) {
-      const safe = protectedlist.some(item => {
-        return new RegExp(item).test(ip)
-      })
-
-      context.state.unsafeIP = !safe
-
-      if (!safe) {
-        context.state.prohibitedPrivileges = privileges
-      }
-    }
-  }
-
-  context.state.domain = domain
-
-  return next()
-}