@tachybase/module-multi-app 1.6.0 → 1.6.2

package/README.md

@@ -1,34 +1,34 @@
-# multi-app-manager
-
-English | [中文](./README.zh-CN.md)
-
-多应用管理插件。
-
-## 安装激活
-
-```bash
-yarn pm enable multi-app-manager
-```
-
-## 使用方法
-
-注意目前仅支持部分在应用启动时传入的环境变量，具体列表如下：
-
-```ini
-APP_KEY=test-key
-API_BASE_PATH=/api/
-DB_DIALECT=sqlite
-DB_STORAGE=storage/db/tachybase.sqlite
-DB_TABLE_PREFIX=
-DB_HOST=localhost
-DB_PORT=5432
-DB_DATABASE=postgres
-DB_USER=tachybase
-DB_PASSWORD=tachybase
-DB_UNDERSCORED=false
-DB_TIMEZONE=+08:00
-DB_SCHEMA=
-CACHE_DEFAULT_STORE=memory
-CACHE_MEMORY_MAX=2000
-```
-
+# multi-app-manager
+
+English | [中文](./README.zh-CN.md)
+
+多应用管理插件。
+
+## 安装激活
+
+```bash
+yarn pm enable multi-app-manager
+```
+
+## 使用方法
+
+注意目前仅支持部分在应用启动时传入的环境变量，具体列表如下：
+
+```ini
+APP_KEY=test-key
+API_BASE_PATH=/api/
+DB_DIALECT=sqlite
+DB_STORAGE=storage/db/tachybase.sqlite
+DB_TABLE_PREFIX=
+DB_HOST=localhost
+DB_PORT=5432
+DB_DATABASE=postgres
+DB_USER=tachybase
+DB_PASSWORD=tachybase
+DB_UNDERSCORED=false
+DB_TIMEZONE=+08:00
+DB_SCHEMA=
+CACHE_DEFAULT_STORE=memory
+CACHE_MEMORY_MAX=2000
+```
+

package/README.zh-CN.md

@@ -1,34 +1,34 @@
-# multi-app-manager
-
-[English](./README.md) | 中文
-
-多应用管理插件。
-
-## 安装激活
-
-```bash
-yarn pm enable multi-app-manager
-```
-
-## 使用方法
-
-注意目前仅支持部分在应用启动时传入的环境变量，具体列表如下：
-
-```ini
-APP_KEY=test-key
-API_BASE_PATH=/api/
-DB_DIALECT=sqlite
-DB_STORAGE=storage/db/tachybase.sqlite
-DB_TABLE_PREFIX=
-DB_HOST=localhost
-DB_PORT=5432
-DB_DATABASE=postgres
-DB_USER=tachybase
-DB_PASSWORD=tachybase
-DB_UNDERSCORED=false
-DB_TIMEZONE=+08:00
-DB_SCHEMA=
-CACHE_DEFAULT_STORE=memory
-CACHE_MEMORY_MAX=2000
-```
-
+# multi-app-manager
+
+[English](./README.md) | 中文
+
+多应用管理插件。
+
+## 安装激活
+
+```bash
+yarn pm enable multi-app-manager
+```
+
+## 使用方法
+
+注意目前仅支持部分在应用启动时传入的环境变量，具体列表如下：
+
+```ini
+APP_KEY=test-key
+API_BASE_PATH=/api/
+DB_DIALECT=sqlite
+DB_STORAGE=storage/db/tachybase.sqlite
+DB_TABLE_PREFIX=
+DB_HOST=localhost
+DB_PORT=5432
+DB_DATABASE=postgres
+DB_USER=tachybase
+DB_PASSWORD=tachybase
+DB_UNDERSCORED=false
+DB_TIMEZONE=+08:00
+DB_SCHEMA=
+CACHE_DEFAULT_STORE=memory
+CACHE_MEMORY_MAX=2000
+```
+

package/client.d.ts

@@ -1 +1 @@
-export * from './dist/client/index';
+export * from './dist/client/index';

package/client.js

@@ -1 +1 @@
-module.exports = require('./dist/client/index.js');
+module.exports = require('./dist/client/index.js');

package/dist/externalVersion.js

@@ -1,14 +1,14 @@
 module.exports = {
   "react-i18next": "16.2.1",
-  "@tachybase/client": "1.6.0",
-  "@tego/server": "1.3.52",
+  "@tachybase/client": "1.6.1",
+  "@tego/server": "1.6.0",
   "lodash": "4.17.21",
   "mysql2": "3.14.3",
   "pg": "8.16.3",
   "react": "18.3.1",
-  "@tachybase/schema": "1.3.52",
+  "@tachybase/schema": "1.6.0",
   "antd": "5.22.5",
   "react-router-dom": "6.28.1",
-  "@tego/client": "1.3.52",
-  "@ant-design/icons": "5.6.1"
+  "@tego/client": "1.6.0",
+  "@ant-design/icons": "6.1.0"
 };

package/dist/locale/en-US.json

@@ -1,48 +1,48 @@
-{
-  "All sub-applications have stopped serving, unless you reopen them": "All sub-applications have stopped serving, unless you reopen them",
-  "App ID": "App ID",
-  "App display name": "App display name",
-  "App is already running": "App is already running",
-  "App is not running": "App is not running",
-  "App status": "App status",
-  "Applications": "Applications",
-  "Auto start": "Auto start",
-  "Can be empty, or selected from the template library or personal applications": "Can be empty, or selected from the template library or personal applications",
-  "Commanding": "Commanding",
-  "Custom domain": "Custom domain",
-  "Custom domain prefix": "Custom domain prefix",
-  "Custom domain prefix must be 1-63 characters, lowercase letters, numbers, or hyphens (-), and cannot start or end with a hyphen (-)": "Custom domain prefix must be 1-63 characters, lowercase letters, numbers, or hyphens (-), and cannot start or end with a hyphen (-)",
-  "Error": "Error",
-  "Failed to start app": "Failed to start app",
-  "Initialized": "Initialized",
-  "Initializing": "Initializing",
-  "Is template": "Is template",
-  "Manage applications": "Manage applications",
-  "Multi-app display": "Multi-app display",
-  "Multi-app manager": "Multi-app manager",
-  "Not found": "Not found",
-  "Pin to menu": "Pin to menu",
-  "Please enter a valid custom domain prefix": "Please enter a valid custom domain prefix",
-  "Preset": "Preset",
-  "Processing...": "Processing...",
-  "Refresh": "Refresh",
-  "Running": "Running",
-  "Standalone deployment": "Standalone deployment",
-  "Start": "Start",
-  "Start all": "Start all",
-  "Start count": "Start count",
-  "Start environment variables": "Start environment variables",
-  "Start mode": "Start mode",
-  "Start on first visit": "Start on first visit",
-  "Start with main application": "Start with main application",
-  "Starting all sub-applications may cause lag. The more applications you have, the longer the waiting time": "All sub-applications have stopped serving, unless you reopen them",
-  "Stop": "Stop",
-  "Stop all": "Stop all",
-  "Stop count": "Stop count",
-  "Stopped": "Stopped",
-  "Template": "Template",
-  "Template is in use": "Template is in use",
-  "Template not exists": "Template not exists",
-  "This database does not support to create application using template": "This database does not support to create application using template",
-  "View": "View"
-}
+{
+  "All sub-applications have stopped serving, unless you reopen them": "All sub-applications have stopped serving, unless you reopen them",
+  "App ID": "App ID",
+  "App display name": "App display name",
+  "App is already running": "App is already running",
+  "App is not running": "App is not running",
+  "App status": "App status",
+  "Applications": "Applications",
+  "Auto start": "Auto start",
+  "Can be empty, or selected from the template library or personal applications": "Can be empty, or selected from the template library or personal applications",
+  "Commanding": "Commanding",
+  "Custom domain": "Custom domain",
+  "Custom domain prefix": "Custom domain prefix",
+  "Custom domain prefix must be 1-63 characters, lowercase letters, numbers, or hyphens (-), and cannot start or end with a hyphen (-)": "Custom domain prefix must be 1-63 characters, lowercase letters, numbers, or hyphens (-), and cannot start or end with a hyphen (-)",
+  "Error": "Error",
+  "Failed to start app": "Failed to start app",
+  "Initialized": "Initialized",
+  "Initializing": "Initializing",
+  "Is template": "Is template",
+  "Manage applications": "Manage applications",
+  "Multi-app display": "Multi-app display",
+  "Multi-app manager": "Multi-app manager",
+  "Not found": "Not found",
+  "Pin to menu": "Pin to menu",
+  "Please enter a valid custom domain prefix": "Please enter a valid custom domain prefix",
+  "Preset": "Preset",
+  "Processing...": "Processing...",
+  "Refresh": "Refresh",
+  "Running": "Running",
+  "Standalone deployment": "Standalone deployment",
+  "Start": "Start",
+  "Start all": "Start all",
+  "Start count": "Start count",
+  "Start environment variables": "Start environment variables",
+  "Start mode": "Start mode",
+  "Start on first visit": "Start on first visit",
+  "Start with main application": "Start with main application",
+  "Starting all sub-applications may cause lag. The more applications you have, the longer the waiting time": "All sub-applications have stopped serving, unless you reopen them",
+  "Stop": "Stop",
+  "Stop all": "Stop all",
+  "Stop count": "Stop count",
+  "Stopped": "Stopped",
+  "Template": "Template",
+  "Template is in use": "Template is in use",
+  "Template not exists": "Template not exists",
+  "This database does not support to create application using template": "This database does not support to create application using template",
+  "View": "View"
+}

package/dist/locale/es-ES.json

@@ -1,9 +1,9 @@
-{
-  "App ID": "ID de aplicación",
-  "App display name": "Mostrar nombre de aplicación",
-  "Applications": "Aplicaciones",
-  "Custom domain": "Dominio personalizado",
-  "Manage applications": "Gestionar aplicaciones",
-  "Multi-app manager": "Gestor de aplicaciones múltiples",
-  "Pin to menu": " Fijar al menú"
-}
+{
+  "App ID": "ID de aplicación",
+  "App display name": "Mostrar nombre de aplicación",
+  "Applications": "Aplicaciones",
+  "Custom domain": "Dominio personalizado",
+  "Manage applications": "Gestionar aplicaciones",
+  "Multi-app manager": "Gestor de aplicaciones múltiples",
+  "Pin to menu": " Fijar al menú"
+}

package/dist/locale/ko_KR.json

@@ -1,11 +1,11 @@
-{
-  "App ID": "앱 식별자",
-  "App display name": "앱 표시 이름",
-  "Applications": "앱",
-  "Auto start": "자동 시작",
-  "Custom domain": "사용자 정의 도메인",
-  "Manage applications": "앱 관리",
-  "Multi-app manager": "다중 앱 관리",
-  "Pin to menu": "메뉴에 고정",
-  "Standalone deployment": "독립형 배포"
-}
+{
+  "App ID": "앱 식별자",
+  "App display name": "앱 표시 이름",
+  "Applications": "앱",
+  "Auto start": "자동 시작",
+  "Custom domain": "사용자 정의 도메인",
+  "Manage applications": "앱 관리",
+  "Multi-app manager": "다중 앱 관리",
+  "Pin to menu": "메뉴에 고정",
+  "Standalone deployment": "독립형 배포"
+}

package/dist/locale/pt-BR.json

@@ -1,9 +1,9 @@
-{
-  "App ID": "ID do aplicativo",
-  "App display name": "Nome de exibição do aplicativo",
-  "Applications": "Aplicativos",
-  "Custom domain": "Domínio personalizado",
-  "Manage applications": "Gerenciar aplicativos",
-  "Multi-app manager": "Gerenciador de aplicativos múltiplos",
-  "Pin to menu": "Fixar no menu"
-}
+{
+  "App ID": "ID do aplicativo",
+  "App display name": "Nome de exibição do aplicativo",
+  "Applications": "Aplicativos",
+  "Custom domain": "Domínio personalizado",
+  "Manage applications": "Gerenciar aplicativos",
+  "Multi-app manager": "Gerenciador de aplicativos múltiplos",
+  "Pin to menu": "Fixar no menu"
+}

package/dist/locale/zh-CN.json

@@ -1,58 +1,58 @@
-{
-  "Add by Phone Number": "通过手机添加",
-  "Add partners": "添加协作者",
-  "Add user": "添加用户",
-  "All sub-applications have stopped serving, unless you restart them": "所有子应用停止服务,除非你重新打开",
-  "App ID": "应用标识",
-  "App already started": "应用已启动",
-  "App already stopped": "应用已关闭",
-  "App display name": "应用名称",
-  "App is already running": "应用已启动",
-  "App is not running": "应用未启动, 需要先在<系统-多应用管理>里启动应用",
-  "App status": "应用状态",
-  "Applications": "应用",
-  "Auto start": "自动启动",
-  "Can be empty, or selected from the template library or personal applications": "可以为空,或从模板库和个人应用中选择",
-  "Collaborator": "协作者",
-  "Commanding": "命令中",
-  "Custom domain": "自定义域名",
-  "Custom domain prefix": "自定义域名前缀",
-  "Custom domain prefix must be 1-63 characters, lowercase letters, numbers, or hyphens (-), and cannot start or end with a hyphen (-)": "自定义域名前缀必须为1-63位小写字母、数字或短横线(-),且不能以短横线(-)开头或结尾",
-  "Enter phone number please": "请输入手机号",
-  "Error": "错误",
-  "Failed to start app": "启动应用失败",
-  "Initialized": "初始化完成",
-  "Initializing": "初始化",
-  "Is template": "是否模板",
-  "Manage applications": "管理应用",
-  "Multi-app display": "多应用展示",
-  "Multi-app manager": "多应用管理",
-  "Not a valid cellphone number, please re-enter": "不是有效的手机号，请重新输入",
-  "Not found": "未找到",
-  "PhoneNumber not found": "未找到该手机用户",
-  "Pin to menu": "在菜单上显示",
-  "Please enter a valid custom domain prefix": "请输入有效的自定义域名前缀",
-  "Preset": "预设",
-  "Processing...": "处理中...",
-  "Refresh": "刷新",
-  "Running": "运行中",
-  "Standalone deployment": "独立部署",
-  "Start": "启动",
-  "Start all": "启动所有",
-  "Start count": "启动数量",
-  "Start environment variables": "启动环境变量",
-  "Start mode": "启动方式",
-  "Start on first visit": "首次访问时启动",
-  "Start with main application": "随主应用一同启动",
-  "Starting all sub-applications may cause lag. The more applications you have, the longer the waiting time": "启动所有子应用,可能会造成卡顿,你的应用越多等待时间越长",
-  "Stop": "停止",
-  "Stop all": "关闭所有",
-  "Stop count": "关闭数量",
-  "Stopped": "已停止",
-  "Template": "模板",
-  "Template is in use": "模板正在使用",
-  "Template not exists": "模板不存在",
-  "This database does not support to create application using template": "该数据库不支持使用模板创建应用程序",
-  "User already exist": "用户已存在",
-  "View": "访问"
-}
+{
+  "Add by Phone Number": "通过手机添加",
+  "Add partners": "添加协作者",
+  "Add user": "添加用户",
+  "All sub-applications have stopped serving, unless you restart them": "所有子应用停止服务,除非你重新打开",
+  "App ID": "应用标识",
+  "App already started": "应用已启动",
+  "App already stopped": "应用已关闭",
+  "App display name": "应用名称",
+  "App is already running": "应用已启动",
+  "App is not running": "应用未启动, 需要先在<系统-多应用管理>里启动应用",
+  "App status": "应用状态",
+  "Applications": "应用",
+  "Auto start": "自动启动",
+  "Can be empty, or selected from the template library or personal applications": "可以为空,或从模板库和个人应用中选择",
+  "Collaborator": "协作者",
+  "Commanding": "命令中",
+  "Custom domain": "自定义域名",
+  "Custom domain prefix": "自定义域名前缀",
+  "Custom domain prefix must be 1-63 characters, lowercase letters, numbers, or hyphens (-), and cannot start or end with a hyphen (-)": "自定义域名前缀必须为1-63位小写字母、数字或短横线(-),且不能以短横线(-)开头或结尾",
+  "Enter phone number please": "请输入手机号",
+  "Error": "错误",
+  "Failed to start app": "启动应用失败",
+  "Initialized": "初始化完成",
+  "Initializing": "初始化",
+  "Is template": "是否模板",
+  "Manage applications": "管理应用",
+  "Multi-app display": "多应用展示",
+  "Multi-app manager": "多应用管理",
+  "Not a valid cellphone number, please re-enter": "不是有效的手机号，请重新输入",
+  "Not found": "未找到",
+  "PhoneNumber not found": "未找到该手机用户",
+  "Pin to menu": "在菜单上显示",
+  "Please enter a valid custom domain prefix": "请输入有效的自定义域名前缀",
+  "Preset": "预设",
+  "Processing...": "处理中...",
+  "Refresh": "刷新",
+  "Running": "运行中",
+  "Standalone deployment": "独立部署",
+  "Start": "启动",
+  "Start all": "启动所有",
+  "Start count": "启动数量",
+  "Start environment variables": "启动环境变量",
+  "Start mode": "启动方式",
+  "Start on first visit": "首次访问时启动",
+  "Start with main application": "随主应用一同启动",
+  "Starting all sub-applications may cause lag. The more applications you have, the longer the waiting time": "启动所有子应用,可能会造成卡顿,你的应用越多等待时间越长",
+  "Stop": "停止",
+  "Stop all": "关闭所有",
+  "Stop count": "关闭数量",
+  "Stopped": "已停止",
+  "Template": "模板",
+  "Template is in use": "模板正在使用",
+  "Template not exists": "模板不存在",
+  "This database does not support to create application using template": "该数据库不支持使用模板创建应用程序",
+  "User already exist": "用户已存在",
+  "View": "访问"
+}

package/dist/node_modules/mariadb/callback.js

@@ -1,14 +1,18 @@
+//  SPDX-License-Identifier: LGPL-2.1-or-later
+//  Copyright (c) 2015-2024 MariaDB Corporation Ab
+
 'use strict';
-const pkg = require('./package.json');
-require('please-upgrade-node')(pkg);
+
+require('./check-node');
 
 const ConnectionCallback = require('./lib/connection-callback');
-const PoolClusterCallback = require('./lib/pool-cluster-callback');
+const ClusterCallback = require('./lib/cluster-callback');
 const PoolCallback = require('./lib/pool-callback');
 
 const ConnOptions = require('./lib/config/connection-options');
 const PoolOptions = require('./lib/config/pool-options');
-const PoolClusterOptions = require('./lib/config/pool-cluster-options');
+const ClusterOptions = require('./lib/config/cluster-options');
+const Connection = require('./lib/connection');
 
 module.exports.version = require('./package.json').version;
 module.exports.SqlError = require('./lib/misc/errors').SqlError;
@@ -25,17 +29,48 @@ module.exports.defaultOptions = function defaultOptions(opts) {
 };
 
 module.exports.createConnection = function createConnection(opts) {
-  return new ConnectionCallback(new ConnOptions(opts));
+  const conn = new Connection(new ConnOptions(opts));
+  const connCallback = new ConnectionCallback(conn);
+  conn
+    .connect()
+    .then(
+      function () {
+        conn.emit('connect');
+      }.bind(conn)
+    )
+    .catch(conn.emit.bind(conn, 'connect'));
+  return connCallback;
 };
 
 exports.createPool = function createPool(opts) {
   const options = new PoolOptions(opts);
   const pool = new PoolCallback(options);
-  pool.initialize();
+  // adding a default error handler to avoid exiting application on connection error.
+  pool.on('error', (err) => {});
   return pool;
 };
 
 exports.createPoolCluster = function createPoolCluster(opts) {
-  const options = new PoolClusterOptions(opts);
-  return new PoolClusterCallback(options);
+  const options = new ClusterOptions(opts);
+  return new ClusterCallback(options);
+};
+
+module.exports.importFile = function importFile(opts, callback) {
+  const cb = callback ? callback : () => {};
+  try {
+    const options = new ConnOptions(opts);
+    const conn = new Connection(options);
+    conn
+      .connect()
+      .then(() => {
+        return new Promise(conn.importFile.bind(conn, Object.assign({ skipDbCheck: true }, opts)));
+      })
+      .then(() => cb())
+      .catch((err) => cb(err))
+      .finally(() => {
+        new Promise(conn.end.bind(conn, {})).catch(console.log);
+      });
+  } catch (err) {
+    cb(err);
+  }
 };

package/dist/node_modules/mariadb/check-node.js

@@ -0,0 +1,30 @@
+//  SPDX-License-Identifier: LGPL-2.1-or-later
+//  Copyright (c) 2015-2024 MariaDB Corporation Ab
+
+'use strict';
+
+const hasMinVersion = function (nodeVersionStr, connectorRequirement) {
+  const versNode = nodeVersionStr.split('.');
+  const versReq = connectorRequirement.split('.');
+
+  const majorNode = Number(versNode[0]);
+  const majorReq = Number(versReq[0]);
+  if (majorNode > majorReq) return true;
+  if (majorNode < majorReq) return false;
+
+  if (versReq.length === 1) return true;
+
+  const minorNode = Number(versNode[1]);
+  const minorReq = Number(versReq[1]);
+  return minorNode >= minorReq;
+};
+
+module.exports.hasMinVersion = hasMinVersion;
+
+const requirement = require('./package.json').engines.node;
+const connectorRequirement = requirement.replace('>=', '').trim();
+const currentNodeVersion = process.version.replace('v', '');
+if (!hasMinVersion(currentNodeVersion, connectorRequirement)) {
+  console.error(`please upgrade node: mariadb requires at least version ${connectorRequirement}`);
+  process.exit(1);
+}

package/dist/node_modules/mariadb/lib/cluster-callback.js

@@ -0,0 +1,84 @@
+//  SPDX-License-Identifier: LGPL-2.1-or-later
+//  Copyright (c) 2015-2024 MariaDB Corporation Ab
+
+'use strict';
+
+const Cluster = require('./cluster');
+
+/**
+ * Create a new Cluster.
+ * Cluster handle pools with patterns and handle failover / distributed load
+ * according to selectors (round-robin / random / ordered )
+ *
+ * @param args      cluster arguments. see pool-cluster-options.
+ * @constructor
+ */
+class ClusterCallback {
+  #cluster;
+  constructor(args) {
+    this.#cluster = new Cluster(args);
+    this.#cluster._setCallback();
+    this.on = this.#cluster.on.bind(this.#cluster);
+    this.once = this.#cluster.once.bind(this.#cluster);
+  }
+
+  /**
+   * End cluster (and underlying pools).
+   *
+   * @param callback - not mandatory
+   */
+  end(callback) {
+    if (callback && typeof callback !== 'function') {
+      throw new Error('callback parameter must be a function');
+    }
+    const endingFct = callback ? callback : () => {};
+
+    this.#cluster
+      .end()
+      .then(() => {
+        endingFct();
+      })
+      .catch(endingFct);
+  }
+
+  /**
+   * Get connection from an available pools matching pattern, according to selector
+   *
+   * @param pattern       pattern filter (not mandatory)
+   * @param selector      node selector ('RR','RANDOM' or 'ORDER')
+   * @param callback      callback function
+   */
+  getConnection(pattern, selector, callback) {
+    let pat = pattern,
+      sel = selector,
+      cal = callback;
+    if (typeof pattern === 'function') {
+      pat = null;
+      sel = null;
+      cal = pattern;
+    } else if (typeof selector === 'function') {
+      sel = null;
+      cal = selector;
+    }
+    const endingFct = cal ? cal : (err, conn) => {};
+    this.#cluster.getConnection(pat, sel, endingFct);
+  }
+
+  add(id, config) {
+    this.#cluster.add(id, config);
+  }
+
+  of(pattern, selector) {
+    return this.#cluster.of(pattern, selector);
+  }
+
+  remove(pattern) {
+    this.#cluster.remove(pattern);
+  }
+
+  get __tests() {
+    return this.#cluster.__tests;
+  }
+}
+
+module.exports = ClusterCallback;