@abtnode/core 1.16.8-next-f9099675 → 1.16.8-next-e7fab584

package/lib/blocklet/downloader/blocklet-downloader.js

@@ -2,6 +2,7 @@ const { EventEmitter } = require('events');
 const fs = require('fs-extra');
 const path = require('path');
 const get = require('lodash/get');
+const pick = require('lodash/pick');
 const { toBase58 } = require('@ocap/util');
 
 const defaultLogger = require('@abtnode/logger')('@abtnode/core:blocklet-downloader');
@@ -119,6 +120,7 @@ class BlockletDownloader extends EventEmitter {
    * @param {{
    *   preDownload: ({ downloadList: Array<meta>, downloadComponentIds: Array<string> }) => any
    *   postDownload: ({ downloadList: Array<meta>, downloadComponentIds: Array<string>, isCancelled: boolean }) => any
+   *   onProgress: ({ step?: string, ...extras }) => any
    *   skipCheckIntegrity: boolean
    * }} [options={}]
    * @return {*}
@@ -130,7 +132,7 @@ class BlockletDownloader extends EventEmitter {
 
     this.logger.info('Download Blocklet', { name, did });
 
-    const { preDownload = () => {}, postDownload = () => {}, skipCheckIntegrity } = options;
+    const { preDownload = () => {}, postDownload = () => {}, skipCheckIntegrity, onProgress = () => {} } = options;
 
     const { downloadComponentIds, downloadList } = await this.getDownloadList({
       blocklet,
@@ -148,7 +150,14 @@ class BlockletDownloader extends EventEmitter {
       const tasks = [];
       for (const meta of downloadList) {
         const url = meta.dist.tarball;
-        tasks.push(this.bundleDownloader.download(meta, did, url, options));
+        tasks.push(
+          this.bundleDownloader.download(meta, did, url, {
+            ...options,
+            onProgress: (data) => {
+              onProgress({ ...data, component: pick(meta, ['title', 'name', 'did', 'version']) });
+            },
+          })
+        );
       }
       const results = await Promise.all(tasks);
 

package/lib/blocklet/downloader/bundle-downloader.js

@@ -66,12 +66,15 @@ class BundleDownloader extends EventEmitter {
       this.downloadLocks[lockName] = lock;
     }
 
+    const onProgress = context.onProgress || (() => {});
+
     try {
       await lock.acquire();
       this.logger.info('downloaded blocklet for installing', { name, version, tarball, integrity });
       const cwd = path.join(this.downloadDir, 'download', name);
       await fs.ensureDir(cwd);
       this.logger.info('start download blocklet', { name, version, cwd, tarball, integrity });
+      onProgress({ status: 'downloading' });
       const tarballPath = await this._downloadTarball({
         name,
         did,
@@ -84,6 +87,7 @@ class BundleDownloader extends EventEmitter {
         rootDid,
         url,
         context,
+        onProgress,
       });
       this.logger.info('downloaded blocklet tar file', { name, version, tarballPath });
       if (tarballPath === downloadFile.CANCEL) {
@@ -92,7 +96,13 @@ class BundleDownloader extends EventEmitter {
       }
 
       // resolve tarball and mv tarball to cache after resolved
-      await resolveDownload(tarballPath, this.installDir, { removeTarFile: false });
+      await resolveDownload(tarballPath, this.installDir, {
+        removeTarFile: false,
+        onProgress: ({ name: _name }) => {
+          onProgress({ status: 'extracting', name: _name });
+        },
+      });
+      onProgress({ status: 'completed' });
       await this._addCacheTarFile(tarballPath, integrity, getComponentBundleId({ meta }));
 
       this.logger.info('resolved blocklet tar file to install dir', { name, version });
@@ -130,7 +140,18 @@ class BundleDownloader extends EventEmitter {
    * @return {*}
    * @memberof BlockletManager
    */
-  async _downloadTarball({ url, cwd, tarball, did, integrity, verify = true, ctrlStore = {}, rootDid, context = {} }) {
+  async _downloadTarball({
+    url,
+    cwd,
+    tarball,
+    did,
+    integrity,
+    verify = true,
+    ctrlStore = {},
+    rootDid,
+    context = {},
+    onProgress = () => {},
+  }) {
     fs.mkdirSync(cwd, { recursive: true });
 
     const tarballName = url.split('/').slice(-1)[0];
@@ -172,7 +193,20 @@ class BundleDownloader extends EventEmitter {
         headers['x-download-token'] = exist.token;
       }
 
-      await downloadFile(url, path.join(cwd, tarballName), { cancelCtrl }, { ...context, headers });
+      await downloadFile(
+        url,
+        path.join(cwd, tarballName),
+        {
+          cancelCtrl,
+          onProgress: ({ total, current }) => {
+            onProgress({ status: 'downloading', total, current });
+          },
+        },
+        {
+          ...context,
+          headers,
+        }
+      );
 
       if (ctrlStore[rootDid]) {
         ctrlStore[rootDid].delete(did);

package/lib/blocklet/downloader/resolve-download.js

@@ -26,7 +26,7 @@ const asyncFs = fs.promises;
 const resolveDownload = async (
   tarFile,
   dist,
-  { cwd = '/', removeTarFile = true, logger = defaultLogger, originalMeta } = {}
+  { cwd = '/', removeTarFile = true, logger = defaultLogger, originalMeta, onProgress } = {}
 ) => {
   // eslint-disable-next-line no-param-reassign
   tarFile = path.join(cwd, tarFile);
@@ -36,6 +36,9 @@ const resolveDownload = async (
   const downloadDir = path.join(path.dirname(tarFile), path.basename(tarFile, path.extname(tarFile)));
   const tmp = `${downloadDir}-tmp`;
   try {
+    if (typeof onProgress === 'function') {
+      onProgress({ name: 'blocklet.tar.gz' });
+    }
     await expandTarball({ source: tarFile, dest: tmp, strip: 0 });
   } catch (error) {
     logger.error('expand blocklet tar file error', { error });
@@ -78,6 +81,9 @@ const resolveDownload = async (
     }
     await validateBlockletEntry(downloadDir, meta);
 
+    if (typeof onProgress === 'function') {
+      onProgress({ name: 'blocklet.zip' });
+    }
     await ensureBlockletExpanded(meta, downloadDir);
 
     installDir = getBundleDir(dist, meta);

package/lib/blocklet/manager/disk.js

@@ -2118,7 +2118,7 @@ class BlockletManager extends BaseBlockletManager {
 
         if (level === 0) {
           component.diskInfo = await getDiskInfo(component, {
-            useFakeDiskInfo: !diskInfo,
+            useFakeDiskInfo: !diskInfo || isBeforeInstalled(component.status),
           });
         }
 
@@ -2504,6 +2504,7 @@ class BlockletManager extends BaseBlockletManager {
    */
   async _downloadBlocklet(blocklet, context = {}) {
     const {
+      appDid,
       meta: { did },
     } = blocklet;
 
@@ -2516,6 +2517,9 @@ class BlockletManager extends BaseBlockletManager {
         });
         this.emit(BlockletEvents.statusChange, blocklet1);
       },
+      onProgress: async (data) => {
+        this.emit(BlockletEvents.downloadBundleProgress, { appDid: appDid || did, meta: { did }, ...data });
+      },
       postDownload: async ({ isCancelled }) => {
         if (!isCancelled) {
           // since preferences only exist in blocklet bundle, we need to populate then after downloaded

package/lib/blocklet/manager/helper/install-application-from-backup.js

@@ -196,7 +196,12 @@ const installApplicationFromBackup = async ({
     try {
       logger.info('start download blocklet', { did });
       // 从 store 下载 blocklet
-      await manager.blockletDownloader.download(blockletState, { skipCheckIntegrity: true });
+      await manager.blockletDownloader.download(blockletState, {
+        skipCheckIntegrity: true,
+        onProgress: async (data) => {
+          manager.emit(BlockletEvents.downloadBundleProgress, { appDid: wallet.address, meta: { did }, ...data });
+        },
+      });
     } catch (error) {
       logger.error('download blocklet failed', { did, error });
 
@@ -205,6 +210,10 @@ const installApplicationFromBackup = async ({
       throw error;
     }
     logger.info('start install blocklet', { did });
+
+    const state = await states.blocklet.setBlockletStatus(did, BlockletStatus.installing);
+    manager.emit(BlockletEvents.statusChange, state);
+
     return manager._installBlocklet({ did, context });
   }
 

package/lib/blocklet/manager/helper/install-component-from-upload.js

@@ -87,9 +87,8 @@ const installComponentFromUpload = async ({
   };
   const index = newBlocklet.children.findIndex((child) => child.meta.did === meta.did);
   if (index >= 0) {
-    // if upgrade, do not update mountPoint and title
+    // if upgrade, do not update mountPoint
     newChild.mountPoint = newBlocklet.children[index].mountPoint;
-    newChild.meta.title = newBlocklet.children[index].meta.title;
     newBlocklet.children.splice(index, 1, newChild);
   } else {
     newBlocklet.children.push(newChild);

package/lib/crons/monitor-disk-usage.js

@@ -10,6 +10,10 @@ const check = async (threshold) => {
   const { disks } = await info.getSysInfo();
   for (const disk of disks) {
     const usageRatio = (disk.used / disk.total) * 100;
+    if (Number.isNaN(usageRatio)) {
+      return;
+    }
+
     const usageRatioPercent = `${usageRatio.toFixed(2)}%`;
     logger.info('check disk usage', { usage: usageRatioPercent, threshold });
 

package/lib/event.js

@@ -367,6 +367,7 @@ module.exports = ({
 
     BlockletEvents.backupProgress,
     BlockletEvents.restoreProgress,
+    BlockletEvents.downloadBundleProgress,
 
     BlockletEvents.spaceConnected,
     BlockletEvents.nftConsumed,

package/lib/index.js

@@ -523,24 +523,25 @@ function ABTNode(options) {
   };
 
   if (options.daemon) {
-    // 启动证书服务
-    certManager
-      .start()
-      .then(() => logger.info('start certificate manager service successfully'))
-      .catch((error) => logger.error('start certificate manager service failed', { error }));
-
-    if (process.env.NODE_ENV === 'development') {
+    onStatesReady(() => {
+      // start cert manager
+      certManager
+        .start()
+        .then(() => logger.info('Certificate manager service start successfully'))
+        .catch((error) => logger.error('Certificate manager service start failed', { error }));
+
+      // start jobs
       setTimeout(() => {
-        initCron();
+        if (process.env.NODE_ENV === 'development') {
+          initCron();
+        } else {
+          pm2Events.resume();
+          initCron();
+          createCLILog('startServer');
+          logger.info('Cron jobs start successfully on daemon start');
+        }
       }, 1000);
-    } else {
-      // We should only respond to pm2 events when node is alive
-      events.on(EVENTS.NODE_STARTED, () => {
-        pm2Events.resume();
-        initCron();
-        createCLILog('startServer');
-      });
-    }
+    });
   }
 
   events.on(EVENTS.NODE_STOPPED, () => {

package/lib/migrations/1.16.6-chain-info.js

@@ -71,7 +71,7 @@ module.exports = async ({ states, printInfo }) => {
     }
 
     if (shouldUpdate) {
-      await states.blockletExtras.update({ _id: extra._id }, { $set: { configs: appConfigs } });
+      await states.blockletExtras.update({ did: extra.did }, { $set: { configs: appConfigs } });
       printInfo(`Blocklet in blocklet_extra.db updated: ${extra.did}`);
     }
   }

package/lib/states/access-key.js

@@ -1,7 +1,7 @@
 const get = require('lodash/get');
 const { fromRandom } = require('@ocap/wallet');
 const { toBase58 } = require('@ocap/util');
-const logger = require('@abtnode/logger')('@abtnode/core:access-key');
+const logger = require('@abtnode/logger')('@abtnode/core:states:access-key');
 const BaseState = require('./base');
 
 const validateRemark = (remark) => {

package/lib/states/base.js

@@ -1,5 +1,5 @@
 const { BaseState } = require('@abtnode/models');
-const logger = require('@abtnode/logger')('@abtnode/core:states');
+const logger = require('@abtnode/logger')('@abtnode/core:states:base');
 
 const { isCLI } = require('../util');
 

package/lib/states/blocklet-extras.js

@@ -1,7 +1,7 @@
 /* eslint-disable function-paren-newline */
 /* eslint-disable no-underscore-dangle */
 /* eslint-disable consistent-return */
-const logger = require('@abtnode/logger')('state-blocklet-extras');
+const logger = require('@abtnode/logger')('@abtnode/core:states:blocklet-extras');
 const { EXPIRED_BLOCKLET_DATA_RETENTION_DAYS } = require('@abtnode/constant');
 const camelCase = require('lodash/camelCase');
 const get = require('lodash/get');

package/lib/states/blocklet.js

@@ -19,7 +19,7 @@ const {
 const { BlockletStatus, BlockletSource, BLOCKLET_MODES, BLOCKLET_DEFAULT_PORT_NAME } = require('@blocklet/constant');
 const { APP_STRUCT_VERSION } = require('@abtnode/constant');
 
-const logger = require('@abtnode/logger')('state-blocklet');
+const logger = require('@abtnode/logger')('@abtnode/core:states:blocklet');
 
 const BaseState = require('./base');
 const { checkDuplicateComponents, ensureMeta } = require('../util/blocklet');

package/lib/states/index.js

@@ -1,5 +1,6 @@
 const path = require('path');
 const { createSequelize, createStateFactory, getServerModels, setupModels } = require('@abtnode/models');
+const logger = require('@abtnode/logger')('@abtnode/core:states');
 
 const NodeState = require('./node');
 const BlockletState = require('./blocklet');
@@ -22,7 +23,7 @@ const init = (dataDirs, config = {}) => {
   const dbPath = getDbFilePath(path.join(dataDirs.core, 'server.db'));
   const sequelize = createSequelize(dbPath);
   setupModels(models, sequelize);
-  console.info(`Init server states in ${dbPath}`); // eslint-disable-line
+  logger.info(`Init server states in ${dbPath}`);
 
   const notificationState = new NotificationState(models.Notification, config);
   const nodeState = new NodeState(models.Server, config, dataDirs, notificationState);

package/lib/states/node.js

@@ -5,7 +5,7 @@ const isEmpty = require('lodash/isEmpty');
 const security = require('@abtnode/util/lib/security');
 const { isFromPublicKey } = require('@arcblock/did');
 const { NODE_MODES, DISK_ALERT_THRESHOLD_PERCENT, EVENTS, SERVER_STATUS } = require('@abtnode/constant');
-// const logger = require('@abtnode/logger')('@abtnode/core:node');
+// const logger = require('@abtnode/logger')('@abtnode/core:states:node');
 
 const BaseState = require('./base');
 const { validateOwner } = require('../util');

package/lib/util/sysinfo.js

@@ -39,7 +39,7 @@ const getSysInfo = async () => {
         used: x.used,
         free: x.size - x.used,
       }))
-      .filter((x) => x.total > 0),
+      .filter((x) => x.total > 0 && x.mountPoint.startsWith('/')),
   };
 };
 

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.8-next-f9099675",
+  "version": "1.16.8-next-e7fab584",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,36 +19,36 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/auth": "1.16.8-next-f9099675",
-    "@abtnode/certificate-manager": "1.16.8-next-f9099675",
-    "@abtnode/constant": "1.16.8-next-f9099675",
-    "@abtnode/cron": "1.16.8-next-f9099675",
-    "@abtnode/logger": "1.16.8-next-f9099675",
-    "@abtnode/models": "1.16.8-next-f9099675",
-    "@abtnode/queue": "1.16.8-next-f9099675",
-    "@abtnode/rbac": "1.16.8-next-f9099675",
-    "@abtnode/router-provider": "1.16.8-next-f9099675",
-    "@abtnode/static-server": "1.16.8-next-f9099675",
-    "@abtnode/timemachine": "1.16.8-next-f9099675",
-    "@abtnode/util": "1.16.8-next-f9099675",
-    "@arcblock/did": "1.18.78",
-    "@arcblock/did-auth": "1.18.78",
-    "@arcblock/did-ext": "^1.18.78",
+    "@abtnode/auth": "1.16.8-next-e7fab584",
+    "@abtnode/certificate-manager": "1.16.8-next-e7fab584",
+    "@abtnode/constant": "1.16.8-next-e7fab584",
+    "@abtnode/cron": "1.16.8-next-e7fab584",
+    "@abtnode/logger": "1.16.8-next-e7fab584",
+    "@abtnode/models": "1.16.8-next-e7fab584",
+    "@abtnode/queue": "1.16.8-next-e7fab584",
+    "@abtnode/rbac": "1.16.8-next-e7fab584",
+    "@abtnode/router-provider": "1.16.8-next-e7fab584",
+    "@abtnode/static-server": "1.16.8-next-e7fab584",
+    "@abtnode/timemachine": "1.16.8-next-e7fab584",
+    "@abtnode/util": "1.16.8-next-e7fab584",
+    "@arcblock/did": "1.18.80",
+    "@arcblock/did-auth": "1.18.80",
+    "@arcblock/did-ext": "^1.18.80",
     "@arcblock/did-motif": "^1.1.10",
-    "@arcblock/did-util": "1.18.78",
-    "@arcblock/event-hub": "1.18.78",
-    "@arcblock/jwt": "^1.18.78",
+    "@arcblock/did-util": "1.18.80",
+    "@arcblock/event-hub": "1.18.80",
+    "@arcblock/jwt": "^1.18.80",
     "@arcblock/pm2-events": "^0.0.5",
-    "@arcblock/validator": "^1.18.78",
-    "@arcblock/vc": "1.18.78",
-    "@blocklet/constant": "1.16.8-next-f9099675",
-    "@blocklet/meta": "1.16.8-next-f9099675",
-    "@blocklet/sdk": "1.16.8-next-f9099675",
+    "@arcblock/validator": "^1.18.80",
+    "@arcblock/vc": "1.18.80",
+    "@blocklet/constant": "1.16.8-next-e7fab584",
+    "@blocklet/meta": "1.16.8-next-e7fab584",
+    "@blocklet/sdk": "1.16.8-next-e7fab584",
     "@did-space/client": "^0.2.91",
     "@fidm/x509": "^1.2.1",
-    "@ocap/mcrypto": "1.18.78",
-    "@ocap/util": "1.18.78",
-    "@ocap/wallet": "1.18.78",
+    "@ocap/mcrypto": "1.18.80",
+    "@ocap/util": "1.18.80",
+    "@ocap/wallet": "1.18.80",
     "@slack/webhook": "^5.0.4",
     "archiver": "^5.3.1",
     "axios": "^0.27.2",
@@ -96,5 +96,5 @@
     "express": "^4.18.2",
     "jest": "^27.5.1"
   },
-  "gitHead": "02702513382f0b2297eff3520fc77f630eec578f"
+  "gitHead": "65d5a71c762d73765befe957e3361a2570dc9882"
 }