@blocklet/sdk 1.8.2 → 1.8.5

package/lib/connect/authenticator.js

@@ -0,0 +1,16 @@
+const { Authenticator } = require('@did-connect/authenticator');
+
+const getWallet = require('../wallet');
+const checkBlockletEnv = require('../util/check-blocklet-env');
+const getShared = require('./shared');
+
+module.exports = class BlockletAuthenticator extends Authenticator {
+  constructor(options = {}) {
+    checkBlockletEnv();
+
+    super({
+      wallet: getWallet(),
+      ...getShared(options),
+    });
+  }
+};

package/lib/connect/handler.js

@@ -0,0 +1,73 @@
+const get = require('lodash/get');
+const { createHandlers } = require('@did-connect/handler');
+const Notification = require('../service/notification');
+
+const noop = () => ({});
+
+// whether app web page is in mobile DID wallet
+const inMobileWallet = (didwallet) => {
+  return didwallet && ['ios', 'android'].includes(didwallet.os);
+};
+
+const consoleLogger = { info: noop, error: console.error, warn: console.warn, debug: noop };
+const getConnectedDid = (session) => {
+  if (session.autoConnect === false) {
+    return '';
+  }
+
+  if (inMobileWallet(session.didwallet)) {
+    return '';
+  }
+
+  return get(session, 'previousConnected.userDid', '');
+};
+
+module.exports = ({ authenticator, storage, logger = consoleLogger, socketPathname, sendNotificationFn }) => {
+  const handlers = createHandlers({
+    storage,
+    authenticator,
+    logger,
+    socketPathname,
+  });
+
+  const originCreateHandler = handlers.handleSessionCreate;
+  handlers.handleSessionCreate = async (context) => {
+    const session = await originCreateHandler(context);
+    const connectedDid = getConnectedDid(session);
+
+    // send notification to wallet to trigger wallet to auto connect
+    if (connectedDid) {
+      // wallet use check url to check status of the session
+      let checkUrl = '';
+      try {
+        checkUrl = new URL(session.authUrl);
+        checkUrl.pathname = checkUrl.pathname.replace(/\/auth/, '/session');
+      } catch (e) {
+        checkUrl = '';
+        console.error(e);
+      }
+
+      const deepLink = new URL('https://abtwallet.io/i/');
+      deepLink.searchParams.set('action', 'requestAuth');
+      deepLink.searchParams.set('url', encodeURIComponent(session.authUrl));
+      const message = {
+        type: 'connect',
+        url: deepLink.href,
+      };
+
+      if (checkUrl) {
+        message.checkUrl = checkUrl.href;
+      }
+
+      // sendNotificationFn maybe custom function so we need params
+      const sendFn = sendNotificationFn || Notification.sendToUser.bind(Notification);
+      sendFn(connectedDid, message, { ...context, session }).catch((err) => {
+        console.error(err);
+      });
+    }
+
+    return session;
+  };
+
+  return handlers;
+};

package/lib/connect/shared.js

@@ -0,0 +1,34 @@
+const joinUrl = require('url-join');
+const { getConnectAppUrl } = require('@blocklet/meta/lib/util');
+const { SERVICE_PREFIX } = require('../util/constants');
+
+// wraps value in closure or returns closure
+const closure = (value) => (typeof value === 'function' ? value : () => value);
+
+module.exports = (options = {}) => ({
+  chainInfo: () => {
+    const chainHost = process.env.CHAIN_HOST;
+    return chainHost ? { host: chainHost, id: 'chain' } : { host: 'none', id: 'none' };
+  },
+
+  ...options,
+
+  appInfo: async (...args) => {
+    const info = await closure(options.appInfo)(...args);
+
+    const { request, baseUrl } = args[0];
+    const groupPathPrefix = request.headers['x-group-path-prefix'] || '/';
+    const blockletDid = request.headers['x-blocklet-did'];
+
+    return {
+      name: process.env.BLOCKLET_APP_NAME,
+      description: process.env.BLOCKLET_APP_DESCRIPTION,
+      ...(info || {}),
+      link: getConnectAppUrl(args[0]),
+      icon: joinUrl(baseUrl, SERVICE_PREFIX, `/blocklet/logo/${blockletDid}`),
+      updateSubEndpoint: true,
+      subscriptionEndpoint: joinUrl(groupPathPrefix, SERVICE_PREFIX, 'websocket'),
+      nodeDid: process.env.ABT_NODE_DID,
+    };
+  },
+});

package/lib/env.js

@@ -1,3 +1,24 @@
+const { getParentComponentName } = require('@blocklet/meta/lib/util');
+
+const parsePorts = () => JSON.parse(process.env.BLOCKLET_WEB_PORTS);
+
+const getWebEndpoint = (name) => {
+  const ports = parsePorts();
+  if (ports[name]) {
+    return `http://127.0.0.1:${ports[name]}`;
+  }
+  return '';
+};
+
+const getChildWebEndpoint = (name) => {
+  const fullName = `${process.env.BLOCKLET_REAL_NAME}/${name}`;
+  return getWebEndpoint(fullName);
+};
+const getParentWebEndpoint = () => {
+  const parentName = getParentComponentName(process.env.BLOCKLET_REAL_NAME);
+  return getWebEndpoint(parentName);
+};
+
 module.exports = Object.freeze({
   appId: process.env.BLOCKLET_APP_ID,
   appName: process.env.BLOCKLET_APP_NAME,
@@ -6,4 +27,7 @@ module.exports = Object.freeze({
   isComponent: process.env.BLOCKLET_DID !== process.env.BLOCKLET_REAL_DID,
   dataDir: process.env.BLOCKLET_DATA_DIR,
   cacheDir: process.env.BLOCKLET_CACHE_DIR,
+  getWebEndpoint,
+  getChildWebEndpoint,
+  getParentWebEndpoint,
 });

package/lib/index.js

@@ -2,6 +2,8 @@ const AuthService = require('./service/auth');
 const NotificationService = require('./service/notification');
 const WalletAuthenticator = require('./wallet-authenticator');
 const WalletHandlers = require('./wallet-handler');
+const BlockletAuthenticator = require('./connect/authenticator');
+const createConnectHandlers = require('./connect/handler');
 const Database = require('./database');
 const env = require('./env');
 const middlewares = require('./middlewares');
@@ -12,6 +14,8 @@ module.exports = {
   NotificationService,
   WalletHandlers,
   WalletAuthenticator,
+  BlockletAuthenticator,
+  createConnectHandlers,
   Database,
   getWallet,
   env,

package/lib/wallet-authenticator.js

@@ -1,14 +1,8 @@
-const joinUrl = require('url-join');
 const { WalletAuthenticator: Authenticator } = require('@arcblock/did-auth');
 
 const getWallet = require('./wallet');
 const checkBlockletEnv = require('./util/check-blocklet-env');
-const { SERVICE_PREFIX } = require('./util/constants');
-
-const env = require('./env');
-
-// wraps value in closure or returns closure
-const closure = (value) => (typeof value === 'function' ? value : () => value);
+const getShared = require('./connect/shared');
 
 class WalletAuthenticator extends Authenticator {
   constructor(options = {}) {
@@ -16,39 +10,7 @@ class WalletAuthenticator extends Authenticator {
 
     super({
       wallet: getWallet().toJSON(),
-
-      chainInfo: () => {
-        const chainHost = process.env.CHAIN_HOST;
-        return chainHost ? { host: chainHost, id: 'chain' } : { host: 'none', id: 'none' };
-      },
-
-      ...options,
-
-      appInfo: async (...args) => {
-        const info = await closure(options.appInfo)(...args);
-
-        const { request, baseUrl } = args[0];
-        const pathPrefix = request.headers['x-path-prefix'] || '/';
-        const groupPathPrefix = request.headers['x-group-path-prefix'] || '/';
-        const blockletDid = request.headers['x-blocklet-did'];
-
-        // Child blocklets should set appInfo.link to exactly the same path as the root blocklet
-        let appUrl = baseUrl;
-        if (env.isComponent && pathPrefix !== groupPathPrefix) {
-          appUrl = joinUrl(joinUrl(appUrl, '/').replace(pathPrefix, groupPathPrefix), '');
-        }
-
-        return {
-          name: process.env.BLOCKLET_APP_NAME,
-          description: process.env.BLOCKLET_APP_DESCRIPTION,
-          ...(info || {}),
-          link: appUrl,
-          icon: joinUrl(baseUrl, SERVICE_PREFIX, `/blocklet/logo/${blockletDid}`),
-          updateSubEndpoint: true,
-          subscriptionEndpoint: joinUrl(groupPathPrefix, SERVICE_PREFIX, 'websocket'),
-          nodeDid: process.env.ABT_NODE_DID,
-        };
-      },
+      ...getShared(options),
     });
   }
 }

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.8.2",
+  "version": "1.8.5",
   "description": "graphql client to read/write data on abt node",
   "main": "lib/index.js",
   "files": [
@@ -19,15 +19,17 @@
   "author": "linchen1987 <linchen.1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/client": "1.8.2",
-    "@abtnode/constant": "1.8.2",
-    "@arcblock/did-auth": "1.17.2",
-    "@arcblock/jwt": "1.17.2",
-    "@arcblock/ws": "1.17.2",
-    "@blocklet/meta": "1.8.2",
-    "@nedb/core": "^1.3.1",
-    "@ocap/mcrypto": "1.17.2",
-    "@ocap/wallet": "1.17.2",
+    "@abtnode/client": "1.8.5",
+    "@abtnode/constant": "1.8.5",
+    "@arcblock/did-auth": "1.17.6",
+    "@arcblock/jwt": "1.17.6",
+    "@arcblock/ws": "1.17.6",
+    "@blocklet/meta": "1.8.5",
+    "@did-connect/authenticator": "^2.0.18",
+    "@did-connect/handler": "^2.0.18",
+    "@nedb/core": "^1.3.2",
+    "@ocap/mcrypto": "1.17.6",
+    "@ocap/wallet": "1.17.6",
     "axios": "^0.27.2",
     "fs-extra": "^10.0.1",
     "joi": "^17.6.0",
@@ -39,5 +41,5 @@
     "detect-port": "^1.3.0",
     "jest": "^27.4.5"
   },
-  "gitHead": "fcbe3c97f3825c507ee16714f49bbf8f58c5b59f"
+  "gitHead": "58da88581cdf1dd45fd50e56db08a055be82626e"
 }