@abtnode/core 1.16.19-beta-7d3ef675 → 1.16.19-beta-630ac853

package/lib/blocklet/manager/disk.js

@@ -448,16 +448,6 @@ class DiskBlockletManager extends BaseBlockletManager {
     return migrateApplicationToStructV2({ did, appSk, context, manager: this, states });
   }
 
-  // ============================================================================================
-  // Public API for GQL or internal
-  // ============================================================================================
-
-  async getBlockletForLauncher({ did }) {
-    const blocklet = await states.blocklet.getBlocklet(did);
-    const isRunning = blocklet ? blocklet.status === BlockletStatus.running : false;
-    return { did, isInstalled: !!blocklet, isRunning };
-  }
-
   async start(
     { did, throwOnError, checkHealthImmediately = false, e2eMode = false, componentDids: inputComponentDids, atomic },
     context
@@ -2920,37 +2910,41 @@ class DiskBlockletManager extends BaseBlockletManager {
       }
       logger.info('done migration on upgrading', { did, componentDids });
 
+      // handle component status
+      const runningDids = [];
+      const stoppedDids = [];
       if (action === INSTALL_ACTIONS.INSTALL_COMPONENT) {
-        await states.blocklet.setBlockletStatus(did, BlockletStatus.installed, { componentDids });
+        for (const componentDid of componentDids) {
+          const component = blocklet.children.find((x) => x.meta.did === componentDid);
+          if (hasStartEngine(component.meta)) {
+            // NOT start immediately for runnable component
+            stoppedDids.push(componentDid);
+          } else {
+            // Start immediately for resource component
+            runningDids.push(componentDid);
+          }
+        }
       } else {
-        const runningDids = [];
-        const stoppedDids = [];
-        const installedDids = [];
         for (const componentDid of componentDids) {
           const old = oldBlocklet.children.find((x) => x.meta.did === componentDid);
           if (old?.status === BlockletStatus.running) {
             runningDids.push(componentDid);
-          } else if (old?.status === BlockletStatus.installed) {
-            installedDids.push(componentDid);
           } else {
             stoppedDids.push(componentDid);
           }
         }
-        if (runningDids.length) {
-          try {
-            await this.start({ did, componentDids: runningDids }, context);
-            logger.info('started blocklet for upgrading', { did, version, runningDids });
-          } catch (error) {
-            logger.error('failed to start blocklet for upgrading', { did, version, runningDids, error });
-          }
-        }
-        if (stoppedDids.length) {
-          await states.blocklet.setBlockletStatus(did, BlockletStatus.stopped, { componentDids: stoppedDids });
-        }
-        if (installedDids.length) {
-          await states.blocklet.setBlockletStatus(did, BlockletStatus.installed, { componentDids: installedDids });
+      }
+      if (runningDids.length) {
+        try {
+          await this.start({ did, componentDids: runningDids }, context);
+          logger.info('started blocklet for upgrading', { did, version, runningDids });
+        } catch (error) {
+          logger.error('failed to start blocklet for upgrading', { did, version, runningDids, error });
         }
       }
+      if (stoppedDids.length) {
+        await states.blocklet.setBlockletStatus(did, BlockletStatus.stopped, { componentDids: stoppedDids });
+      }
 
       blocklet = await this.getBlocklet(did, context);
 

package/lib/blocklet/project/index.js

@@ -202,6 +202,7 @@ const createRelease = async ({
 
   const tmpExportDir = path.join(tmpDir, 'export');
   const tmpBundleDir = path.join(tmpExportDir, 'bundle');
+  const tmpReleaseDir = path.join(tmpExportDir, 'release');
 
   const moniker = (urlPathFriendly(slugify(release.blockletTitle)) || 'blocklet').toLowerCase();
   const releaseFileName = `${moniker}-${release.blockletVersion}.zip`;
@@ -252,10 +253,6 @@ const createRelease = async ({
     await fs.ensureDir(resourceDir);
     await fs.copy(resourceDir, path.join(tmpBundleDir, 'resource'));
 
-    // copy resource to tmpResourceDir
-    await fs.remove(tmpResourceDir);
-    await fs.copy(resourceDir, tmpResourceDir);
-
     // create blocklet.yml
     const resourceList = await fs.readdir(resourceDir);
     const resourcesPaths = resourceList
@@ -284,7 +281,7 @@ const createRelease = async ({
 
     await new Promise((resolve, reject) => {
       archive
-        .directory(tmpExportDir, false)
+        .directory(tmpReleaseDir, false)
         .on('error', (err) => reject(err))
         .pipe(writeStream);
 

package/lib/index.js

@@ -263,7 +263,6 @@ function ABTNode(options) {
     devBlocklet: blockletManager.dev.bind(blockletManager),
     checkComponentsForUpdates: blockletManager.checkComponentsForUpdates.bind(blockletManager),
     upgradeComponents: blockletManager.upgradeComponents.bind(blockletManager),
-    getBlockletForLauncher: blockletManager.getBlockletForLauncher.bind(blockletManager),
     getBlockletDomainAliases: blockletManager.getDomainAliases.bind(blockletManager),
     resetBlocklet: blockletManager.reset.bind(blockletManager),
     deleteBlockletProcess: blockletManager.deleteProcess.bind(blockletManager),

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.19-beta-7d3ef675",
+  "version": "1.16.19-beta-630ac853",
   "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-7d3ef675",
-    "@abtnode/auth": "1.16.19-beta-7d3ef675",
-    "@abtnode/certificate-manager": "1.16.19-beta-7d3ef675",
-    "@abtnode/constant": "1.16.19-beta-7d3ef675",
-    "@abtnode/cron": "1.16.19-beta-7d3ef675",
-    "@abtnode/logger": "1.16.19-beta-7d3ef675",
-    "@abtnode/models": "1.16.19-beta-7d3ef675",
-    "@abtnode/queue": "1.16.19-beta-7d3ef675",
-    "@abtnode/rbac": "1.16.19-beta-7d3ef675",
-    "@abtnode/router-provider": "1.16.19-beta-7d3ef675",
-    "@abtnode/static-server": "1.16.19-beta-7d3ef675",
-    "@abtnode/timemachine": "1.16.19-beta-7d3ef675",
-    "@abtnode/util": "1.16.19-beta-7d3ef675",
+    "@abtnode/analytics": "1.16.19-beta-630ac853",
+    "@abtnode/auth": "1.16.19-beta-630ac853",
+    "@abtnode/certificate-manager": "1.16.19-beta-630ac853",
+    "@abtnode/constant": "1.16.19-beta-630ac853",
+    "@abtnode/cron": "1.16.19-beta-630ac853",
+    "@abtnode/logger": "1.16.19-beta-630ac853",
+    "@abtnode/models": "1.16.19-beta-630ac853",
+    "@abtnode/queue": "1.16.19-beta-630ac853",
+    "@abtnode/rbac": "1.16.19-beta-630ac853",
+    "@abtnode/router-provider": "1.16.19-beta-630ac853",
+    "@abtnode/static-server": "1.16.19-beta-630ac853",
+    "@abtnode/timemachine": "1.16.19-beta-630ac853",
+    "@abtnode/util": "1.16.19-beta-630ac853",
     "@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-7d3ef675",
-    "@blocklet/env": "1.16.19-beta-7d3ef675",
-    "@blocklet/meta": "1.16.19-beta-7d3ef675",
-    "@blocklet/resolver": "1.16.19-beta-7d3ef675",
-    "@blocklet/sdk": "1.16.19-beta-7d3ef675",
+    "@blocklet/constant": "1.16.19-beta-630ac853",
+    "@blocklet/env": "1.16.19-beta-630ac853",
+    "@blocklet/meta": "1.16.19-beta-630ac853",
+    "@blocklet/resolver": "1.16.19-beta-630ac853",
+    "@blocklet/sdk": "1.16.19-beta-630ac853",
     "@did-space/client": "^0.3.33",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "1.18.95",
@@ -101,5 +101,5 @@
     "jest": "^27.5.1",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "af968e7bab22e67bd42d3dc93ff3ce827b9a91fe"
+  "gitHead": "a4feb519d9122ef75873dd8d657486afca2d4ac9"
 }