@abtnode/blocklet-services 1.16.0-beta-ad6df3ae → 1.16.0-beta-58020de5

package/api/libs/connect/session.js

@@ -223,7 +223,7 @@ module.exports = {
       // Get user passport from vc
       let passport = vc ? createUserPassport(vc) : null;
       if (user && passport && isUserPassportRevoked(user, passport)) {
-        throw new Error(messages.passportRevoked[locale](name));
+        throw new Error(messages.passportRevoked[locale](passport.title, name));
       }
 
       // Get role
@@ -470,7 +470,7 @@ module.exports = {
       // Get user passport from vc
       let passport = vc ? createUserPassport(vc) : null;
       if (passport && isUserPassportRevoked(user, passport)) {
-        throw new Error(messages.passportRevoked[locale](name));
+        throw new Error(messages.passportRevoked[locale](passport.title, name));
       }
 
       // Get role

package/api/routes/blocklet.js

@@ -140,20 +140,34 @@ module.exports = {
       const { did: userDid, role } = req.user;
 
       // eslint-disable-next-line no-unreachable
-      const doc = await node.startBlocklet({
-        did: blocklet.meta.did,
-        checkHealthImmediately: true,
-        throwOnError: true,
-      });
-      await node.createAuditLog(
-        {
-          action: 'startBlocklet',
-          args: { did: blocklet.meta.did },
-          context: formatContext(req),
-          result: doc,
-        },
-        node
-      );
+
+      let startError;
+      let doc;
+      try {
+        doc = await node.startBlocklet({
+          did: blocklet.meta.did,
+          checkHealthImmediately: true,
+          throwOnError: true,
+        });
+      } catch (error) {
+        startError = error;
+      }
+
+      if (!startError) {
+        try {
+          await node.createAuditLog(
+            {
+              action: 'startBlocklet',
+              args: { did: blocklet.meta.did },
+              context: formatContext(req),
+              result: doc,
+            },
+            node
+          );
+        } catch (error) {
+          logger.error('create start-blocklet audit log failed', { error });
+        }
+      }
 
       if (fromSetup) {
         const teamDid = blocklet.meta.did;
@@ -169,7 +183,7 @@ module.exports = {
         // 调用 store 管理公开实例
         // 如果一个 blocklet 没有设置 公开实例，启动成功后不应给 store 发请求
         const { publicToStore } = blocklet.settings;
-        if (publicToStore) {
+        if (publicToStore && !startError) {
           try {
             await handleInstanceInStore(blocklet, { userDid, publicToStore });
           } catch (error) {
@@ -219,35 +233,80 @@ module.exports = {
           node
         );
 
-        // send vc to wallet
+        // send notification to wallet
         const receiver = userDid;
         const token = JWT.sign(wallet.address, wallet.secretKey);
-        const data = {
-          sender: { token, appDid: wallet.address },
-          receiver,
-          notification: {
+
+        if (!blocklet.settings.owner) {
+          // send owner vc
+          const notificationText = {
             title: {
-              en: 'Up and Running',
-              zh: '启动并运行',
+              en: 'You have become the application owner',
+              zh: '你已成为应用所有者',
             }[locale],
             body: {
-              en: 'The application is up and running successfully',
-              zh: '应用程序已启动并成功运行',
+              en: 'You have become the application owner',
+              zh: '你已成为应用所有者',
             }[locale],
-            attachments: [
-              {
-                type: 'vc',
-                data: {
-                  credential: vc,
-                  tag: role,
+          };
+
+          const data = {
+            sender: { token, appDid: wallet.address },
+            receiver,
+            notification: {
+              ...notificationText,
+              attachments: [
+                {
+                  type: 'vc',
+                  data: {
+                    credential: vc,
+                    tag: role,
+                  },
                 },
-              },
-            ],
+              ],
+            },
+          };
+          server.emit('sendToUser', data);
+        }
+
+        // send message
+        const notificationText = startError
+          ? {
+              title: {
+                en: 'Application start failed',
+                zh: '应用启动失败',
+              }[locale],
+              body: {
+                en: `Application start failed: ${startError.message}`,
+                zh: `应用启动失败: ${startError.message}`,
+              }[locale],
+            }
+          : {
+              title: {
+                en: 'Up and Running',
+                zh: '启动并运行',
+              }[locale],
+              body: {
+                en: 'The application is up and running successfully',
+                zh: '应用程序已启动并成功运行',
+              }[locale],
+            };
+
+        // send vc to wallet
+        const data = {
+          sender: { token, appDid: wallet.address },
+          receiver,
+          notification: {
+            ...notificationText,
           },
         };
         server.emit('sendToUser', data);
       }
 
+      if (startError) {
+        throw startError;
+      }
+
       return res.json(polishBlocklet(doc));
     });
 

package/build/asset-manifest.json

@@ -1,14 +1,14 @@
 {
   "files": {
     "main.css": "/.blocklet/proxy/blocklet-service/static/css/main.632501d5.css",
-    "main.js": "/.blocklet/proxy/blocklet-service/static/js/main.b81aec72.js",
+    "main.js": "/.blocklet/proxy/blocklet-service/static/js/main.73c39561.js",
     "static/js/716.e1534c42.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/716.e1534c42.chunk.js",
     "static/js/255.279b1bca.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/255.279b1bca.chunk.js",
-    "static/js/371.575d3b08.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/371.575d3b08.chunk.js",
-    "static/js/737.14f154ca.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/737.14f154ca.chunk.js",
+    "static/js/371.88127b62.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/371.88127b62.chunk.js",
+    "static/js/737.ed53dec5.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/737.ed53dec5.chunk.js",
     "static/js/460.3026a774.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/460.3026a774.chunk.js",
     "static/js/868.f2fac071.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/868.f2fac071.chunk.js",
-    "static/js/343.a77b905e.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/343.a77b905e.chunk.js",
+    "static/js/343.087cec35.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/343.087cec35.chunk.js",
     "static/js/682.c64ae291.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/682.c64ae291.chunk.js",
     "static/js/711.6c22b7c7.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/711.6c22b7c7.chunk.js",
     "static/js/437.d815f0c0.chunk.js": "/.blocklet/proxy/blocklet-service/static/js/437.d815f0c0.chunk.js",
@@ -42,14 +42,14 @@
     "router-template-styles/styles.css": "/.blocklet/proxy/blocklet-service/router-template-styles/styles.css",
     "index.html": "/.blocklet/proxy/blocklet-service/index.html",
     "main.632501d5.css.map": "/.blocklet/proxy/blocklet-service/static/css/main.632501d5.css.map",
-    "main.b81aec72.js.map": "/.blocklet/proxy/blocklet-service/static/js/main.b81aec72.js.map",
+    "main.73c39561.js.map": "/.blocklet/proxy/blocklet-service/static/js/main.73c39561.js.map",
     "716.e1534c42.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/716.e1534c42.chunk.js.map",
     "255.279b1bca.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/255.279b1bca.chunk.js.map",
-    "371.575d3b08.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/371.575d3b08.chunk.js.map",
-    "737.14f154ca.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/737.14f154ca.chunk.js.map",
+    "371.88127b62.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/371.88127b62.chunk.js.map",
+    "737.ed53dec5.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/737.ed53dec5.chunk.js.map",
     "460.3026a774.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/460.3026a774.chunk.js.map",
     "868.f2fac071.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/868.f2fac071.chunk.js.map",
-    "343.a77b905e.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/343.a77b905e.chunk.js.map",
+    "343.087cec35.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/343.087cec35.chunk.js.map",
     "682.c64ae291.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/682.c64ae291.chunk.js.map",
     "711.6c22b7c7.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/711.6c22b7c7.chunk.js.map",
     "437.d815f0c0.chunk.js.map": "/.blocklet/proxy/blocklet-service/static/js/437.d815f0c0.chunk.js.map",
@@ -64,6 +64,6 @@
   },
   "entrypoints": [
     "static/css/main.632501d5.css",
-    "static/js/main.b81aec72.js"
+    "static/js/main.73c39561.js"
   ]
 }

package/build/index.html

@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=0"/><meta name="theme-color" content="#000000"/><title>Blocklet Service</title><script src=".well-known/service/api/env"></script><script src="/__blocklet__.js"></script><script defer="defer" src="/.blocklet/proxy/blocklet-service/static/js/main.b81aec72.js"></script><link href="/.blocklet/proxy/blocklet-service/static/css/main.632501d5.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=0"/><meta name="theme-color" content="#000000"/><title>Blocklet Service</title><script src=".well-known/service/api/env"></script><script src="/__blocklet__.js"></script><script defer="defer" src="/.blocklet/proxy/blocklet-service/static/js/main.73c39561.js"></script><link href="/.blocklet/proxy/blocklet-service/static/css/main.632501d5.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>