@abtnode/core 1.16.13 → 1.16.14-beta-0c29907f

package/lib/util/get-accessible-external-node-ip.js

@@ -1,6 +1,6 @@
 const joinUrl = require('url-join');
 const axios = require('@abtnode/util/lib/axios');
-const { DEFAULT_IP_DOMAIN, DEFAULT_ADMIN_PATH } = require('@abtnode/constant');
+const { DEFAULT_IP_DOMAIN, WELLKNOWN_SERVER_ADMIN_PATH } = require('@abtnode/constant');
 const logger = require('@abtnode/logger')('@abtnode/core:util:get-accessible-external-node-ip');
 const { get: getIp } = require('./ip');
 
@@ -13,7 +13,7 @@ const timeout = process.env.NODE_ENV === 'test' ? 500 : 5000;
 // check if node dashboard https endpoint return 2xx
 // FIXME: check connected by wellknown endpoint
 const checkConnected = async ({ ip, nodeInfo }) => {
-  const { adminPath = DEFAULT_ADMIN_PATH } = nodeInfo.routing || {};
+  const { adminPath = WELLKNOWN_SERVER_ADMIN_PATH } = nodeInfo.routing || {};
   const origin = `https://${getNodeDomain(ip)}`;
   const endpoint = joinUrl(origin, adminPath);
   await axios.get(endpoint, { timeout });

package/lib/util/get-domain-for-blocklet.js

@@ -1,4 +1,4 @@
-const { DEFAULT_IP_DOMAIN_SUFFIX, SLOT_FOR_IP_DNS_SITE } = require('@abtnode/constant');
+const { DEFAULT_IP_DOMAIN_SUFFIX, SLOT_FOR_IP_DNS_SITE, DEFAULT_DID_DOMAIN } = require('@abtnode/constant');
 const { encode: encodeBase32 } = require('@abtnode/util/lib/base32');
 const formatName = require('@abtnode/util/lib/format-name');
 
@@ -7,7 +7,7 @@ const getIpDnsDomainForBlocklet = (blocklet) => {
 };
 
 const getDidDomainForBlocklet = ({ appPid, didDomain }) => {
-  return `${encodeBase32(appPid)}.${didDomain}`;
+  return `${encodeBase32(appPid)}.${didDomain || DEFAULT_DID_DOMAIN}`;
 };
 
 module.exports = { getIpDnsDomainForBlocklet, getDidDomainForBlocklet, formatName };

package/lib/util/launcher.js

@@ -2,8 +2,13 @@ const path = require('path');
 const fs = require('fs-extra');
 const joinUrl = require('url-join');
 const pick = require('lodash/pick');
-const joinURL = require('url-join');
-const { parseUserAvatar, extractUserAvatar, getAvatarFile, getAvatarByUrl } = require('@abtnode/util/lib/user');
+const {
+  getUserAvatarUrl,
+  extractUserAvatar,
+  getAvatarFile,
+  getAvatarByUrl,
+  getAppAvatarUrl,
+} = require('@abtnode/util/lib/user');
 const { Hasher } = require('@ocap/mcrypto');
 const { getDisplayName } = require('@blocklet/meta/lib/util');
 const getBlockletInfo = require('@blocklet/meta/lib/info');
@@ -99,7 +104,7 @@ const setupAppOwner = async (node, sessionId) => {
       throw new Error(`Owner user not found from launcher: ${launcherUrl}`);
     }
     appOwnerProfile = pick(user, ['fullName', 'email', 'avatar']);
-    const avatarBase64 = await getAvatarByUrl(joinURL(launcherUrl, user.avatar));
+    const avatarBase64 = await getAvatarByUrl(joinUrl(launcherUrl, user.avatar));
     appOwnerProfile.avatar = await extractUserAvatar(avatarBase64, { dataDir });
     logger.info('Create owner from launcher for blocklet', { appDid, ownerDid, ownerPk, sessionId, appOwnerProfile });
   } else {
@@ -115,7 +120,7 @@ const setupAppOwner = async (node, sessionId) => {
       fs.mkdirpSync(path.dirname(destFile));
       fs.copyFileSync(srcFile, destFile);
     } else {
-      appOwnerProfile.avatar = extractUserAvatar(user.avatar, { dataDir });
+      appOwnerProfile.avatar = await extractUserAvatar(user.avatar, { dataDir });
     }
     logger.info('Create owner from session for blocklet', { appDid, ownerDid, ownerPk, sessionId, appOwnerProfile });
   }
@@ -125,6 +130,7 @@ const setupAppOwner = async (node, sessionId) => {
   const vc = createPassportVC({
     issuerName: getDisplayName(blocklet),
     issuerWallet: wallet,
+    issuerAvatarUrl: getAppAvatarUrl(appUrl),
     ownerDid,
     passport: await createPassport({
       name: role,
@@ -138,7 +144,7 @@ const setupAppOwner = async (node, sessionId) => {
       userDid: ownerDid,
       teamDid: appDid,
     }),
-    ownerProfile: { ...appOwnerProfile, avatar: await parseUserAvatar(user.avatar, { dataDir: serverDataDir }) },
+    ownerProfile: { ...appOwnerProfile, avatar: getUserAvatarUrl(appUrl, appOwnerProfile.avatar) },
     preferredColor: 'default',
     expirationDate: undefined,
   });

package/lib/util/store.js

@@ -1,4 +1,4 @@
-const joinURL = require('url-join');
+const joinUrl = require('url-join');
 const pick = require('lodash/pick');
 const isBase64 = require('is-base64');
 
@@ -47,7 +47,7 @@ const fixAndVerifyMetaFromStore = (meta) => {
 };
 
 const validateStoreUrl = async (registry) => {
-  const url = joinURL(registry, BLOCKLET_STORE_API_PREFIX, `/blocklets.json?__t__=${Date.now()}`);
+  const url = joinUrl(registry, BLOCKLET_STORE_API_PREFIX, `/blocklets.json?__t__=${Date.now()}`);
   try {
     const res = await request.get(url);
     if (Array.isArray(res.data)) {
@@ -64,7 +64,7 @@ const validateStoreUrl = async (registry) => {
 
 const getStoreMeta = async (registry) => {
   try {
-    const url = joinURL(registry, BLOCKLET_STORE_META_PATH, `?__t__=${Date.now()}`);
+    const url = joinUrl(registry, BLOCKLET_STORE_META_PATH, `?__t__=${Date.now()}`);
     const { data } = await request.get(url);
 
     if (!data) {
@@ -86,7 +86,7 @@ const getStoreMeta = async (registry) => {
       } else if (isBase64(logoUrl, { allowMime: true })) {
         result.logoUrl = logoUrl;
       } else {
-        result.logoUrl = joinURL(registry, logoUrl);
+        result.logoUrl = joinUrl(registry, logoUrl);
       }
     }
 
@@ -141,14 +141,14 @@ const resolveTarballURL = ({ did, tarball = '', storeUrl = '' }) => {
     return '';
   }
 
-  return joinURL(storeUrl, 'api', 'blocklets', did, tarball);
+  return joinUrl(storeUrl, 'api', 'blocklets', did, tarball);
 };
 
 const getBlockletMetaUrl = ({ did, storeUrl }) =>
-  joinURL(storeUrl, BLOCKLET_STORE_API_PREFIX, `/blocklets/${did}/blocklet.json`);
+  joinUrl(storeUrl, BLOCKLET_STORE_API_PREFIX, `/blocklets/${did}/blocklet.json`);
 
 const getBlockletMeta = async ({ did, storeUrl }) => {
-  const url = joinURL(storeUrl, BLOCKLET_STORE_API_PREFIX, `/blocklets/${did}/blocklet.json?__t__=${Date.now()}`);
+  const url = joinUrl(storeUrl, BLOCKLET_STORE_API_PREFIX, `/blocklets/${did}/blocklet.json?__t__=${Date.now()}`);
 
   const { data } = await request.get(url);
   try {

package/lib/webhook/index.js

@@ -10,10 +10,18 @@ const IP = require('../util/ip');
 const states = require('../states');
 const { getBaseUrls } = require('../util');
 
-const getSlackUrlInfo = async (actionPath = '/notifications', urls) => {
+const getSlackUrlInfo = async ({ blockletUrl, path: actionPath = '/notifications', serverUrls: urls }) => {
   const info = [];
 
-  if (actionPath && actionPath.startsWith('/blocklet/')) {
+  if (blockletUrl) {
+    info.push({
+      type: 'section',
+      text: {
+        type: 'mrkdwn',
+        text: 'Use the following links to visit your Blocklet dashboard:',
+      },
+    });
+  } else if (actionPath && actionPath.startsWith('/blocklet/')) {
     info.push({
       type: 'section',
       text: {
@@ -31,15 +39,18 @@ const getSlackUrlInfo = async (actionPath = '/notifications', urls) => {
     });
   }
 
-  const priorities = await evaluateURLs(
-    urls.map((item) => item.url),
-    { checkAccessible: checkURLAccessible }
-  );
-  const priorityUrl = priorities[0].url;
-
-  const { protocol } = new URL(priorityUrl);
-  const normalized = `${priorityUrl}${actionPath}`.replace(`${protocol}//`, '').replace(/\/+/g, '/');
-  const url = `${protocol}//${normalized}`;
+  let url = blockletUrl;
+  if (!url) {
+    const priorities = await evaluateURLs(
+      urls.map((item) => item.url),
+      { checkAccessible: checkURLAccessible }
+    );
+    const priorityUrl = priorities[0].url;
+
+    const { protocol } = new URL(priorityUrl);
+    const normalized = `${priorityUrl}${actionPath}`.replace(`${protocol}//`, '').replace(/\/+/g, '/');
+    url = `${protocol}//${normalized}`;
+  }
 
   info.push({
     type: 'actions',
@@ -89,7 +100,7 @@ module.exports = ({ events, dataDirs, instance }) => {
           const options = { ...message, nodeInfo, node: instance };
           if (item.type === 'slack') {
             // eslint-disable-next-line
-            options.urlInfo = await getSlackUrlInfo(message.action, baseUrls);
+            options.urlInfo = await getSlackUrlInfo({ blockletUrl: message.blockletUrl, path: message.action, serverUrls: baseUrls });
           }
           try {
             // eslint-disable-next-line
@@ -118,8 +129,8 @@ module.exports = ({ events, dataDirs, instance }) => {
   });
 
   events.on(EVENTS.NOTIFICATION_CREATE, (data) => {
-    const { title, description, severity, action, entityType } = data;
-    queue.push({ title, description, status: severity, action, entityType });
+    const { title, description, severity, action, entityType, blockletUrl } = data;
+    queue.push({ title, description, status: severity, action, entityType, blockletUrl });
   });
 
   events.on(EVENTS.NODE_STARTED, async (message) => {

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.13",
+  "version": "1.16.14-beta-0c29907f",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,38 +19,38 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/analytics": "1.16.13",
-    "@abtnode/auth": "1.16.13",
-    "@abtnode/certificate-manager": "1.16.13",
-    "@abtnode/constant": "1.16.13",
-    "@abtnode/cron": "1.16.13",
-    "@abtnode/logger": "1.16.13",
-    "@abtnode/models": "1.16.13",
-    "@abtnode/queue": "1.16.13",
-    "@abtnode/rbac": "1.16.13",
-    "@abtnode/router-provider": "1.16.13",
-    "@abtnode/static-server": "1.16.13",
-    "@abtnode/timemachine": "1.16.13",
-    "@abtnode/util": "1.16.13",
-    "@arcblock/did": "1.18.84",
-    "@arcblock/did-auth": "1.18.84",
-    "@arcblock/did-ext": "^1.18.84",
-    "@arcblock/did-motif": "^1.1.12",
-    "@arcblock/did-util": "1.18.84",
-    "@arcblock/event-hub": "1.18.84",
-    "@arcblock/jwt": "^1.18.84",
+    "@abtnode/analytics": "1.16.14-beta-0c29907f",
+    "@abtnode/auth": "1.16.14-beta-0c29907f",
+    "@abtnode/certificate-manager": "1.16.14-beta-0c29907f",
+    "@abtnode/constant": "1.16.14-beta-0c29907f",
+    "@abtnode/cron": "1.16.14-beta-0c29907f",
+    "@abtnode/logger": "1.16.14-beta-0c29907f",
+    "@abtnode/models": "1.16.14-beta-0c29907f",
+    "@abtnode/queue": "1.16.14-beta-0c29907f",
+    "@abtnode/rbac": "1.16.14-beta-0c29907f",
+    "@abtnode/router-provider": "1.16.14-beta-0c29907f",
+    "@abtnode/static-server": "1.16.14-beta-0c29907f",
+    "@abtnode/timemachine": "1.16.14-beta-0c29907f",
+    "@abtnode/util": "1.16.14-beta-0c29907f",
+    "@arcblock/did": "1.18.87",
+    "@arcblock/did-auth": "1.18.87",
+    "@arcblock/did-ext": "^1.18.87",
+    "@arcblock/did-motif": "^1.1.13",
+    "@arcblock/did-util": "1.18.87",
+    "@arcblock/event-hub": "1.18.87",
+    "@arcblock/jwt": "^1.18.87",
     "@arcblock/pm2-events": "^0.0.5",
-    "@arcblock/validator": "^1.18.84",
-    "@arcblock/vc": "1.18.84",
-    "@blocklet/constant": "1.16.13",
-    "@blocklet/meta": "1.16.13",
-    "@blocklet/resolver": "1.16.13",
-    "@blocklet/sdk": "1.16.13",
-    "@did-space/client": "^0.2.124",
+    "@arcblock/validator": "^1.18.87",
+    "@arcblock/vc": "1.18.87",
+    "@blocklet/constant": "1.16.14-beta-0c29907f",
+    "@blocklet/meta": "1.16.14-beta-0c29907f",
+    "@blocklet/resolver": "1.16.14-beta-0c29907f",
+    "@blocklet/sdk": "1.16.14-beta-0c29907f",
+    "@did-space/client": "^0.2.129",
     "@fidm/x509": "^1.2.1",
-    "@ocap/mcrypto": "1.18.84",
-    "@ocap/util": "1.18.84",
-    "@ocap/wallet": "1.18.84",
+    "@ocap/mcrypto": "1.18.87",
+    "@ocap/util": "1.18.87",
+    "@ocap/wallet": "1.18.87",
     "@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": "0f07f6617a8cf53a4fa693d6ca227f6f6bd90af2"
+  "gitHead": "1f02851a71861dbf09bfedfa9df6d9fc6d2355a3"
 }