@abtnode/core 1.16.19-beta-e6aac665 → 1.16.19-beta-7b2db880

package/lib/index.js

@@ -86,7 +86,9 @@ function ABTNode(options) {
     model: states.job,
     name: 'jobs',
     onJob: async (job) => {
+      // eslint-disable-next-line no-use-before-define
       if (typeof blockletManager.onJob === 'function') {
+        // eslint-disable-next-line no-use-before-define
         await blockletManager.onJob(job);
       }
     },
@@ -102,7 +104,9 @@ function ABTNode(options) {
     model: states.job,
     name: 'install_queue',
     onJob: async (job) => {
+      // eslint-disable-next-line no-use-before-define
       if (typeof blockletManager.onJob === 'function') {
+        // eslint-disable-next-line no-use-before-define
         await blockletManager.onJob(job);
       }
     },
@@ -120,7 +124,9 @@ function ABTNode(options) {
     model: states.job,
     name: 'backup_queue',
     onJob: async (job) => {
+      // eslint-disable-next-line no-use-before-define
       if (typeof blockletManager.onJob === 'function') {
+        // eslint-disable-next-line no-use-before-define
         await blockletManager.onJob(job);
       }
     },
@@ -140,7 +146,9 @@ function ABTNode(options) {
     name: 'restore_queue',
     model: states.job,
     onJob: async (job) => {
+      // eslint-disable-next-line no-use-before-define
       if (typeof blockletManager.onJob === 'function') {
+        // eslint-disable-next-line no-use-before-define
         await blockletManager.onJob(job);
       }
     },

package/lib/migrations/index.js

@@ -5,50 +5,13 @@ const path = require('path');
 const semver = require('semver');
 const uniqBy = require('lodash/uniqBy');
 const logger = require('@abtnode/logger')('@abtnode/core:migration');
-const {
-  doSchemaMigration,
-  doDataMigration,
-  getBlockletModels,
-  getServerModels,
-  getServiceModels,
-  getCertificateManagerModels,
-  createSequelize,
-} = require('@abtnode/models');
+const { doSchemaMigration, createSequelize } = require('@abtnode/models');
 const { getDbFilePath } = require('../util');
 
 const BACKUP_FILE_DB = 'server.db';
 const BACKUP_FILE_CONFIG = 'config.yml';
 
 const MODULES = ['certificate-manager'];
-const MAPPINGS = {
-  server: {
-    access_key: 'AccessKey',
-    'audit-log': 'AuditLog',
-    blocklet: 'Blocklet',
-    blocklet_extras: 'BlockletExtra',
-    cache: 'Cache',
-    migration: 'Migration',
-    node: 'Server',
-    notification: 'Notification',
-    routing_rule: 'Site',
-    session: 'Session',
-    user: 'User',
-    webhook: 'WebHook',
-  },
-  blocklet: {
-    user: 'User',
-    session: 'Session',
-    rbac: 'Rbac',
-  },
-  service: {
-    message: 'Message',
-  },
-  'certificate-manager': {
-    account: 'Account',
-    certificate: 'Certificate',
-    'http-challenge': 'HttpChallenge',
-  },
-};
 
 const getMigrationScripts = (scriptsDir) => {
   const files = fs.readdirSync(scriptsDir);
@@ -243,72 +206,6 @@ const runSchemaMigrations = async ({
   }
 };
 
-const runDataMigrations = async ({
-  dataDir,
-  blocklets = [],
-  printInfo = console.info, // eslint-disable-line
-  printSuccess = console.info, // eslint-disable-line
-  printError = console.error,
-}) => {
-  // migrate server data
-  await doDataMigration({
-    srcDir: path.join(dataDir, 'core'),
-    dbFile: path.join(dataDir, 'core/server.db'),
-    mapping: MAPPINGS.server,
-    models: getServerModels(),
-    printInfo,
-    printError,
-    printSuccess,
-  });
-  printSuccess('Server data successfully migrated');
-
-  // migrate service data
-  await doDataMigration({
-    srcDir: path.join(dataDir, 'services'),
-    dbFile: path.join(dataDir, 'services/service.db'),
-    models: getServiceModels(),
-    mapping: MAPPINGS.service,
-    printInfo,
-    printError,
-    printSuccess,
-  });
-  printSuccess('Service data successfully migrated');
-
-  // migrate blocklet data
-  for (let i = 0; i < blocklets.length; i++) {
-    const blocklet = blocklets[i];
-    const env = blocklet.environments.find((x) => x.key === 'BLOCKLET_DATA_DIR');
-    if (env) {
-      await doDataMigration({
-        srcDir: path.join(env.value),
-        dbFile: path.join(env.value, 'blocklet.db'),
-        models: getBlockletModels(),
-        mapping: MAPPINGS.blocklet,
-        printInfo,
-        printError,
-        printSuccess,
-      });
-      printSuccess(`Blocklet data successfully migrated: ${blocklet.appPid}`);
-    } else {
-      printInfo(`Skip migrate data for blocklet: ${blocklet.appPid}`);
-    }
-  }
-
-  // migrate certificate manager schema
-  for (let i = 0; i < MODULES.length; i++) {
-    await doDataMigration({
-      srcDir: path.join(dataDir, `modules/${MODULES[i]}/db`),
-      dbFile: path.join(dataDir, `modules/${MODULES[i]}/module.db`),
-      models: getCertificateManagerModels(),
-      mapping: MAPPINGS[MODULES[i]],
-      printInfo,
-      printError,
-      printSuccess,
-    });
-    printSuccess(`${MODULES[i]} data successfully migrated`);
-  }
-};
-
 const closeDatabaseConnections = ({
   dataDir,
   blocklets = [],
@@ -340,7 +237,6 @@ module.exports = {
   getMigrationScripts,
   runMigrationScripts,
   runSchemaMigrations,
-  runDataMigrations,
   closeDatabaseConnections,
   doBackup,
   doRestore,

package/lib/router/helper.js

@@ -949,6 +949,7 @@ module.exports = function getRouterHelpers({ dataDirs, routingSnapshot, routerMa
     }
 
     if (updatedResult.length) {
+      // eslint-disable-next-line no-use-before-define
       const hash = await takeRoutingSnapshot({ message: 'ensure dashboard routing rules', dryRun: false }, context);
       logger.info('take routing snapshot on ensure dashboard routing rules', { updatedResult, hash });
       return true;
@@ -1168,6 +1169,7 @@ module.exports = function getRouterHelpers({ dataDirs, routingSnapshot, routerMa
 
   const clearBlockletRoutingCache = async (blocklet) => {
     const info = await nodeState.read();
+    // eslint-disable-next-line no-use-before-define
     const provider = providers[info.routing.provider];
     if (provider) {
       await provider.clearCache(blocklet.appPid);
@@ -1214,6 +1216,7 @@ module.exports = function getRouterHelpers({ dataDirs, routingSnapshot, routerMa
     await removeBlockletRouting(blocklet);
     await ensureBlockletRouting(blocklet);
     if (refreshRouterProvider) {
+      // eslint-disable-next-line no-use-before-define
       const hash = await takeRoutingSnapshot({ message: `Reset blocklet ${did}`, dryRun: false });
       logger.info('reset blocklet routing rules', { did, hash });
     }
@@ -1301,6 +1304,7 @@ module.exports = function getRouterHelpers({ dataDirs, routingSnapshot, routerMa
 
   const analyzeRouterLog = async () => {
     const info = await nodeState.read();
+    // eslint-disable-next-line no-use-before-define
     const sites = await getRoutingSites({});
     const providerName = get(info, 'routing.provider', null);
     if (!providerName || !providers[providerName]) {
@@ -1404,6 +1408,7 @@ module.exports = function getRouterHelpers({ dataDirs, routingSnapshot, routerMa
 
       // We need to take snapshot after system rules ensured
       if (ensureBlockletResults.filter(Boolean).length) {
+        // eslint-disable-next-line no-use-before-define
         await takeRoutingSnapshot({ message: `Switch routing engine to ${newProvider}`, dryRun: false }, context);
         logger.info(`take routing snapshot on switch engine: ${newProvider}`, { ensureBlockletResults });
       }

package/lib/router/index.js

@@ -19,6 +19,18 @@ const { isGatewayCacheEnabled, isBlockletSite } = require('../util');
 
 const isServiceFeDevelopment = process.env.ABT_NODE_SERVICE_FE_PORT;
 
+const mergeAllowedOrigins = (domain, allowedOrigins) => {
+  const origins = Array.isArray(allowedOrigins) ? allowedOrigins : [domain];
+  if (origins.includes(domain) === false) {
+    origins.push(domain);
+  }
+
+  // skip site if domain is BLOCKLET_SITE_GROUP
+  const res = origins.filter((x) => !x.endsWith(BLOCKLET_SITE_GROUP_SUFFIX));
+
+  return res;
+};
+
 const expandSites = (sites = []) => {
   const result = [];
 
@@ -51,19 +63,8 @@ const expandSites = (sites = []) => {
   return result;
 };
 
-const mergeAllowedOrigins = (domain, allowedOrigins) => {
-  const origins = Array.isArray(allowedOrigins) ? allowedOrigins : [domain];
-  if (origins.includes(domain) === false) {
-    origins.push(domain);
-  }
-
-  // skip site if domain is BLOCKLET_SITE_GROUP
-  const res = origins.filter((x) => !x.endsWith(BLOCKLET_SITE_GROUP_SUFFIX));
-
-  return res;
-};
-
 const getRoutingTable = ({ sites, nodeInfo }) => {
+  // eslint-disable-next-line no-use-before-define
   let routingTable = Router.formatSites(sites);
   routingTable = expandSites(routingTable);
 

package/lib/states/node.js

@@ -284,14 +284,6 @@ class NodeState extends BaseState {
     }));
   }
 
-  // deprecated
-  async increaseCustomBlockletNumber() {
-    const { customBlockletNumber = 0 } = await this.read();
-    const num = customBlockletNumber + 1;
-    await this.update({ $set: { customBlockletNumber: num } });
-    return num;
-  }
-
   async updateGateway(gateway) {
     const { routing } = await this.read();
     routing.requestLimit = gateway.requestLimit;

package/lib/states/runtime-insight.js

@@ -18,7 +18,7 @@ class RuntimeInsight extends BaseState {
       where.date[Op.lte] = endDate;
     }
 
-    return super.paginate({ where }, { date: -1 }, paging);
+    return this.paginate({ where }, { date: -1 }, paging);
   }
 }
 

package/lib/states/traffic-insight.js

@@ -18,7 +18,7 @@ class TrafficInsight extends BaseState {
       where.date[Op.lte] = endDate;
     }
 
-    return super.paginate({ where }, { date: -1 }, paging);
+    return this.paginate({ where }, { date: -1 }, paging);
   }
 }
 

package/lib/util/blocklet.js

@@ -158,6 +158,7 @@ const getComponentDirs = (component, { dataDirs, ensure = false, ancestors = []
   if (component.source === BlockletSource.local) {
     appDir = component.deployedFrom;
   } else {
+    // eslint-disable-next-line no-use-before-define
     appDir = getBundleDir(dataDirs.blocklets, component.meta);
   }
 
@@ -523,6 +524,7 @@ const startBlockletProcess = async (
         return;
       }
 
+      // eslint-disable-next-line no-use-before-define
       if (shouldSkipComponent(b.meta.did, componentDids)) {
         logger.info('skip start process not selected', { processId });
         return;
@@ -616,6 +618,7 @@ const startBlockletProcess = async (
 
       await pm2.startAsync(options);
 
+      // eslint-disable-next-line no-use-before-define
       const status = await getProcessState(processId);
       if (status === BlockletStatus.error) {
         throw new Error(`${processId} is not running within 3 seconds`);
@@ -636,6 +639,7 @@ const startBlockletProcess = async (
  * @param {*} blocklet should contain env props
  */
 const stopBlockletProcess = (blocklet, { preStop = noop, skippedProcessIds = [], componentDids } = {}) => {
+  // eslint-disable-next-line no-use-before-define
   return deleteBlockletProcess(blocklet, { preDelete: preStop, skippedProcessIds, componentDids });
 };
 
@@ -657,6 +661,7 @@ const deleteBlockletProcess = async (blocklet, { preDelete = noop, skippedProces
         return;
       }
 
+      // eslint-disable-next-line no-use-before-define
       if (shouldSkipComponent(b.meta?.did, componentDids)) {
         logger.info(`skip delete process not selected: ${b.meta.did}`, { processId: b.env.processId });
         return;
@@ -667,6 +672,7 @@ const deleteBlockletProcess = async (blocklet, { preDelete = noop, skippedProces
       }
 
       await preDelete(b, { ancestors });
+      // eslint-disable-next-line no-use-before-define
       await deleteProcess(b.env.processId);
     },
     { parallel: true }
@@ -685,11 +691,13 @@ const reloadBlockletProcess = (blocklet, { componentDids } = {}) =>
         return;
       }
 
+      // eslint-disable-next-line no-use-before-define
       if (shouldSkipComponent(b.meta.did, componentDids)) {
         logger.info('skip reload process', { processId: b.env.processId });
         return;
       }
 
+      // eslint-disable-next-line no-use-before-define
       await reloadProcess(b.env.processId);
       logger.info('done reload process', { processId: b.env.processId });
     },
@@ -701,6 +709,7 @@ const reloadBlockletProcess = (blocklet, { componentDids } = {}) =>
  * @returns {BlockletStatus}
  */
 const getProcessState = async (processId) => {
+  // eslint-disable-next-line no-use-before-define
   const info = await getProcessInfo(processId);
   if (!statusMap[info.pm2_env.status]) {
     logger.error('Cannot find the blocklet status for pm2 status mapping', {
@@ -773,6 +782,7 @@ const checkBlockletProcessHealthy = async (blocklet, { minConsecutiveTime, timeo
         return;
       }
 
+      // eslint-disable-next-line no-use-before-define
       if (shouldSkipComponent(b.meta.did, componentDids)) {
         logger.info('skip check component healthy', { processId: b.env.processId });
         return;
@@ -781,6 +791,7 @@ const checkBlockletProcessHealthy = async (blocklet, { minConsecutiveTime, timeo
       const logToTerminal = [blocklet.mode, b.mode].includes(BLOCKLET_MODES.DEVELOPMENT);
 
       const startedAt = Date.now();
+      // eslint-disable-next-line no-use-before-define
       await _checkProcessHealthy(b, { minConsecutiveTime, timeout, logToTerminal });
       logger.info('done check component healthy', { processId: b.env.processId, time: Date.now() - startedAt });
     },
@@ -1334,6 +1345,7 @@ const getConfigFromPreferences = (blocklet) => {
 
 const getBlockletURLForLauncher = ({ blocklet, nodeInfo }) => {
   const didDomain = getDidDomainForBlocklet({
+    // eslint-disable-next-line no-use-before-define
     did: getSlpDid(nodeInfo.did, blocklet.appPid),
     didDomain: nodeInfo.slpDomain,
   });
@@ -1676,11 +1688,13 @@ const getBlockletDidDomainList = (blocklet, nodeInfo) => {
     domainAliases.push({ value: domain, isProtected: true });
   });
 
+  // eslint-disable-next-line no-use-before-define
   const enableSlpDomain = shouldEnableSlpDomain({
     mode: nodeInfo.mode,
     launcher: nodeInfo.launcher,
   });
   if (enableSlpDomain) {
+    // eslint-disable-next-line no-use-before-define
     const slpDid = getSlpDid(nodeInfo.did, blocklet.appPid);
     const domain = getDidDomainForBlocklet({ did: slpDid, didDomain: nodeInfo.slpDomain });
 

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.19-beta-e6aac665",
+  "version": "1.16.19-beta-7b2db880",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,19 +19,19 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/analytics": "1.16.19-beta-e6aac665",
-    "@abtnode/auth": "1.16.19-beta-e6aac665",
-    "@abtnode/certificate-manager": "1.16.19-beta-e6aac665",
-    "@abtnode/constant": "1.16.19-beta-e6aac665",
-    "@abtnode/cron": "1.16.19-beta-e6aac665",
-    "@abtnode/logger": "1.16.19-beta-e6aac665",
-    "@abtnode/models": "1.16.19-beta-e6aac665",
-    "@abtnode/queue": "1.16.19-beta-e6aac665",
-    "@abtnode/rbac": "1.16.19-beta-e6aac665",
-    "@abtnode/router-provider": "1.16.19-beta-e6aac665",
-    "@abtnode/static-server": "1.16.19-beta-e6aac665",
-    "@abtnode/timemachine": "1.16.19-beta-e6aac665",
-    "@abtnode/util": "1.16.19-beta-e6aac665",
+    "@abtnode/analytics": "1.16.19-beta-7b2db880",
+    "@abtnode/auth": "1.16.19-beta-7b2db880",
+    "@abtnode/certificate-manager": "1.16.19-beta-7b2db880",
+    "@abtnode/constant": "1.16.19-beta-7b2db880",
+    "@abtnode/cron": "1.16.19-beta-7b2db880",
+    "@abtnode/logger": "1.16.19-beta-7b2db880",
+    "@abtnode/models": "1.16.19-beta-7b2db880",
+    "@abtnode/queue": "1.16.19-beta-7b2db880",
+    "@abtnode/rbac": "1.16.19-beta-7b2db880",
+    "@abtnode/router-provider": "1.16.19-beta-7b2db880",
+    "@abtnode/static-server": "1.16.19-beta-7b2db880",
+    "@abtnode/timemachine": "1.16.19-beta-7b2db880",
+    "@abtnode/util": "1.16.19-beta-7b2db880",
     "@arcblock/did": "1.18.95",
     "@arcblock/did-auth": "1.18.95",
     "@arcblock/did-ext": "^1.18.95",
@@ -42,11 +42,11 @@
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/validator": "^1.18.95",
     "@arcblock/vc": "1.18.95",
-    "@blocklet/constant": "1.16.19-beta-e6aac665",
-    "@blocklet/env": "1.16.19-beta-e6aac665",
-    "@blocklet/meta": "1.16.19-beta-e6aac665",
-    "@blocklet/resolver": "1.16.19-beta-e6aac665",
-    "@blocklet/sdk": "1.16.19-beta-e6aac665",
+    "@blocklet/constant": "1.16.19-beta-7b2db880",
+    "@blocklet/env": "1.16.19-beta-7b2db880",
+    "@blocklet/meta": "1.16.19-beta-7b2db880",
+    "@blocklet/resolver": "1.16.19-beta-7b2db880",
+    "@blocklet/sdk": "1.16.19-beta-7b2db880",
     "@did-space/client": "^0.3.28",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "1.18.95",
@@ -80,7 +80,7 @@
     "p-retry": "4.6.1",
     "read-last-lines": "^1.8.0",
     "semver": "^7.3.8",
-    "sequelize": "^6.31.0",
+    "sequelize": "^6.35.0",
     "shelljs": "^0.8.5",
     "ssri": "^8.0.1",
     "stream-throttle": "^0.1.3",
@@ -101,5 +101,5 @@
     "jest": "^27.5.1",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "09b0172831521ef73f7879940b977c2696b5b247"
+  "gitHead": "598b576b97dd7accbfa1bb509b75e423ad27e5e2"
 }