@abtnode/core 1.7.9 → 1.7.12

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.7.9",
+  "version": "1.7.12",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,31 +19,30 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/certificate-manager": "1.7.9",
-    "@abtnode/constant": "1.7.9",
-    "@abtnode/cron": "1.7.9",
-    "@abtnode/db": "1.7.9",
-    "@abtnode/logger": "1.7.9",
-    "@abtnode/queue": "1.7.9",
-    "@abtnode/rbac": "1.7.9",
-    "@abtnode/router-provider": "1.7.9",
-    "@abtnode/static-server": "1.7.9",
-    "@abtnode/timemachine": "1.7.9",
-    "@abtnode/util": "1.7.9",
-    "@arcblock/did": "^1.16.4",
+    "@abtnode/certificate-manager": "1.7.12",
+    "@abtnode/constant": "1.7.12",
+    "@abtnode/cron": "1.7.12",
+    "@abtnode/db": "1.7.12",
+    "@abtnode/logger": "1.7.12",
+    "@abtnode/queue": "1.7.12",
+    "@abtnode/rbac": "1.7.12",
+    "@abtnode/router-provider": "1.7.12",
+    "@abtnode/static-server": "1.7.12",
+    "@abtnode/timemachine": "1.7.12",
+    "@abtnode/util": "1.7.12",
+    "@arcblock/did": "^1.16.6",
     "@arcblock/did-motif": "^1.1.5",
-    "@arcblock/event-hub": "1.16.4",
+    "@arcblock/event-hub": "1.16.6",
     "@arcblock/pm2-events": "^0.0.5",
-    "@arcblock/vc": "^1.16.4",
-    "@blocklet/meta": "1.7.9",
+    "@arcblock/vc": "^1.16.6",
+    "@blocklet/meta": "1.7.12",
     "@fidm/x509": "^1.2.1",
     "@nedb/core": "^1.2.2",
     "@nedb/multi": "^1.2.2",
-    "@ocap/mcrypto": "^1.16.4",
-    "@ocap/util": "^1.16.4",
-    "@ocap/wallet": "^1.16.4",
+    "@ocap/mcrypto": "^1.16.6",
+    "@ocap/util": "^1.16.6",
+    "@ocap/wallet": "^1.16.6",
     "@slack/webhook": "^5.0.3",
-    "ajv": "^7.0.3",
     "axios": "^0.26.1",
     "axon": "^2.0.3",
     "chalk": "^4.0.0",
@@ -68,6 +67,7 @@
     "stream-to-promise": "^3.0.0",
     "systeminformation": "^5.11.5",
     "tar": "^6.1.0",
+    "ua-parser-js": "^1.0.2",
     "unzipper": "^0.10.11",
     "url-join": "^4.0.1",
     "uuid": "7.0.3"
@@ -78,5 +78,5 @@
     "express": "^4.17.1",
     "jest": "^27.4.5"
   },
-  "gitHead": "285f4fedd41fcb8e1814ce5d8250ac10616e67e0"
+  "gitHead": "afc78b9cb92448676149262fb02432bc256a5524"
 }

package/lib/util/service.js

@@ -1,81 +0,0 @@
-const fs = require('fs-extra');
-const cloneDeep = require('lodash/cloneDeep');
-const Ajv = require('ajv').default;
-
-const { NODE_SERVICES } = require('@abtnode/constant');
-
-const ajv = new Ajv({
-  useDefaults: true,
-  removeAdditional: 'all',
-});
-
-const SERVICES = {
-  AUTH: fs.readJSONSync(require.resolve('@abtnode/blocklet-services/configs/auth.json')),
-};
-
-const getServices = ({ stringifySchema = false } = {}) => {
-  const list = Object.values(SERVICES).map((x) => {
-    const data = cloneDeep(x);
-    if (stringifySchema) {
-      data.schema = JSON.stringify(x.schema);
-    }
-    return data;
-  });
-
-  // backward compatible
-  const authService = cloneDeep(list.find((x) => x.name === NODE_SERVICES.AUTH));
-  authService.name = NODE_SERVICES.AUTH_SERVICE;
-  list.push(authService);
-
-  return list;
-};
-
-const getServiceMeta = (serviceName) => {
-  if (!serviceName) {
-    throw new Error('service name should not be empty');
-  }
-  const metas = getServices();
-  const meta = metas.find((x) => x.name === serviceName);
-  if (!meta) {
-    throw new Error(`service ${serviceName} does not exist`);
-  }
-
-  return meta;
-};
-
-const getServiceConfig = (service, customConfig) => {
-  const serviceMeta = typeof service === 'string' ? getServiceMeta(service) : service;
-
-  const validate = ajv.compile(serviceMeta.schema.JSONSchema);
-
-  const data = cloneDeep(customConfig || {});
-  // this method may have side effect thar will fill default value to customConfig
-  validate(data || {});
-
-  return data;
-};
-
-const getDefaultServiceConfig = (service) => {
-  const serviceMeta = typeof service === 'string' ? getServiceMeta(service) : service;
-
-  // parse empty custom config to get default config
-  return getServiceConfig(serviceMeta, {});
-};
-
-const findService = (services, name) => {
-  const names = [name];
-
-  // backward compatible
-  if (name === NODE_SERVICES.AUTH) {
-    names.push(NODE_SERVICES.AUTH_SERVICE);
-  }
-
-  return (services || []).find((x) => names.includes(x.name));
-};
-
-module.exports = {
-  getServices,
-  getServiceConfig,
-  getDefaultServiceConfig,
-  findService,
-};