@abtnode/auth 1.16.6-beta-56be9f01 → 1.16.6-beta-e2082fec

package/lib/auth.js

@@ -10,7 +10,7 @@ const { getChainClient } = require('@abtnode/util/lib/get-chain-client');
 const { fromPublicKey } = require('@ocap/wallet');
 const { fromBase58, toAddress } = require('@ocap/util');
 const { toTypeInfo, isFromPublicKey } = require('@arcblock/did');
-const Mcrypto = require('@ocap/mcrypto');
+const { getRandomBytes, Hasher } = require('@ocap/mcrypto');
 const getBlockletInfo = require('@blocklet/meta/lib/info');
 const {
   PASSPORT_STATUS,
@@ -95,6 +95,10 @@ const messages = {
     en: 'You are not the owner of this application',
     zh: '你不是该应用的所有者',
   },
+  notSupported: {
+    en: 'This application is not supported on this server',
+    zh: '此应用不支持在当前节点安装',
+  },
   missingCredentialClaim: {
     en: 'Credential is not provided',
     zh: '请提供凭证',
@@ -311,7 +315,7 @@ const getPassportStatusEndpoint = ({ baseUrl, userDid, teamDid }) => {
 };
 
 const getRandomMessage = (len = 16) => {
-  const hex = Mcrypto.getRandomBytes(len);
+  const hex = getRandomBytes(len);
   return hex.replace(/^0x/, '').toUpperCase();
 };
 
@@ -324,6 +328,7 @@ const getApplicationInfo = async ({ node, nodeInfo = {}, teamDid }) => {
   let passportColor;
   let owner;
   let dataDir;
+  let secret;
 
   if (teamDid === nodeInfo.did) {
     name = nodeInfo.name;
@@ -335,6 +340,7 @@ const getApplicationInfo = async ({ node, nodeInfo = {}, teamDid }) => {
     passportColor = 'default';
     owner = nodeInfo.nodeOwner;
     dataDir = path.join(node.dataDirs.data, NODE_DATA_DIR_NAME);
+    secret = Hasher.SHA3.hash256(Buffer.concat([_wallet.secretKey, _wallet.address].map(Buffer.from)));
   } else {
     const blocklet = await node.getBlocklet({ did: teamDid, attachRuntimeInfo: false });
     const blockletInfo = getBlockletInfo(blocklet, nodeInfo.sk);
@@ -346,6 +352,7 @@ const getApplicationInfo = async ({ node, nodeInfo = {}, teamDid }) => {
     type = TEAM_TYPE.BLOCKLET;
     owner = get(blocklet, 'settings.owner');
     dataDir = blocklet.env.dataDir;
+    secret = blockletInfo.secret;
   }
 
   return {
@@ -357,6 +364,7 @@ const getApplicationInfo = async ({ node, nodeInfo = {}, teamDid }) => {
     passportColor,
     owner,
     dataDir,
+    secret,
   };
 };
 
@@ -577,8 +585,10 @@ const handleInvitationReceive = async ({
     dataDir,
   });
 
+  let doc;
+
   if (user) {
-    const doc = await node.loginUser({
+    doc = await node.loginUser({
       teamDid,
       user: {
         ...profile,
@@ -606,7 +616,7 @@ const handleInvitationReceive = async ({
       node
     );
   } else {
-    const doc = await node.loginUser({
+    doc = await node.loginUser({
       teamDid,
       user: {
         ...profile,

package/lib/server.js

@@ -25,6 +25,7 @@ const {
   NFT_TYPE_SERVERLESS,
   MAIN_CHAIN_ENDPOINT,
   APP_STRUCT_VERSION,
+  NODE_MODES,
 } = require('@abtnode/constant');
 const {
   messages,
@@ -818,6 +819,24 @@ const createRestoreOnServerlessHandler =
     };
   };
 
+const createServerlessInstallGuard = (node) => {
+  return async ({ extraParams }) => {
+    const { locale, blockletMetaUrl } = extraParams;
+    const [info, blocklet] = await Promise.all([
+      node.getNodeInfo(),
+      blockletMetaUrl ? node.getBlockletMetaFromUrl({ url: blockletMetaUrl, checkPrice: true }) : null,
+    ]);
+
+    // check if serverless is supported
+    if (blocklet && info.mode === NODE_MODES.SERVERLESS) {
+      const isServerlessSupported = get(blocklet.meta, 'capabilities.serverless', true);
+      if (!isServerlessSupported) {
+        throw new Error(messages.notSupported[locale]);
+      }
+    }
+  };
+};
+
 module.exports = {
   getAuthVcClaim,
   getKeyPairClaim,
@@ -839,4 +858,5 @@ module.exports = {
   getLauncherAppIdList,
   getAuthPrincipalForMigrateAppToV2,
   getAuthPrincipalForTransferAppOwnerShip,
+  createServerlessInstallGuard,
 };

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.6-beta-56be9f01",
+  "version": "1.16.6-beta-e2082fec",
   "description": "Simple lib to manage auth in ABT Node",
   "main": "lib/index.js",
   "files": [
@@ -20,16 +20,16 @@
   "author": "linchen <linchen1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/constant": "1.16.6-beta-56be9f01",
-    "@abtnode/logger": "1.16.6-beta-56be9f01",
-    "@abtnode/util": "1.16.6-beta-56be9f01",
-    "@arcblock/did": "1.18.76",
-    "@arcblock/vc": "1.18.76",
-    "@blocklet/constant": "1.16.6-beta-56be9f01",
-    "@blocklet/meta": "1.16.6-beta-56be9f01",
-    "@ocap/mcrypto": "1.18.76",
-    "@ocap/util": "1.18.76",
-    "@ocap/wallet": "1.18.76",
+    "@abtnode/constant": "1.16.6-beta-e2082fec",
+    "@abtnode/logger": "1.16.6-beta-e2082fec",
+    "@abtnode/util": "1.16.6-beta-e2082fec",
+    "@arcblock/did": "1.18.77",
+    "@arcblock/vc": "1.18.77",
+    "@blocklet/constant": "1.16.6-beta-e2082fec",
+    "@blocklet/meta": "1.16.6-beta-e2082fec",
+    "@ocap/mcrypto": "1.18.77",
+    "@ocap/util": "1.18.77",
+    "@ocap/wallet": "1.18.77",
     "joi": "17.7.0",
     "jsonwebtoken": "^9.0.0",
     "lodash": "^4.17.21",
@@ -41,5 +41,5 @@
   "devDependencies": {
     "jest": "^27.5.1"
   },
-  "gitHead": "f93c24693ed27c4a2821ec33c345696afe6f001a"
+  "gitHead": "851e0ab17f1c6e160aedc47fcdbf7dd54dfa7237"
 }