@blocklet/sdk 1.5.0 → 1.5.4

package/lib/validators/notification.js

@@ -4,6 +4,11 @@ const { didExtension } = require('@blocklet/meta/lib/extension');
 
 const Joi = JOI.extend(didExtension);
 
+const TYPES = {
+  NOTIFICATION: 'notification',
+  CONNECT: 'connect',
+};
+
 const assetSchema = Joi.object({
   did: Joi.DID().trim().required(),
   chainHost: Joi.string().uri().required(),
@@ -39,13 +44,22 @@ const attachmentSchema = Joi.object({
     .concat(Joi.object().when('type', { is: 'token', then: tokenSchema })),
 }).required();
 
-const notificationSchema = Joi.object({
+const notificationTypeSchema = Joi.object({
+  type: Joi.string().valid(TYPES.NOTIFICATION),
   title: Joi.string(),
   body: Joi.string(),
   attachments: Joi.array().items(attachmentSchema).default([]),
   actions: Joi.array().items(actionSchema).default([]),
 }).required();
 
+const connectTypeSchema = Joi.object({
+  type: Joi.string().valid(TYPES.CONNECT),
+  url: Joi.string().uri().required(),
+  checkUrl: Joi.string().uri(),
+}).required();
+
+const notificationSchema = Joi.alternatives().try(notificationTypeSchema, connectTypeSchema).required();
+
 const receiverSchema = Joi.DID().trim().required();
 
 const inputNotificationSchema = Joi.alternatives()

package/lib/wallet-handler.js

@@ -0,0 +1,85 @@
+const get = require('lodash/get');
+const { WalletHandlers: Handler } = require('@arcblock/did-auth');
+const Notification = require('./service/notification');
+
+const noop = () => ({});
+
+const CONNECTED_DID_KEY = 'headers[x-connected-did]';
+
+// whether app web page is in mobile DID wallet
+const inMobileWallet = (abtwallet) => {
+  return abtwallet && ['ios', 'android'].includes(abtwallet.os);
+};
+
+class WalletHandlers extends Handler {
+  /**
+   * @param {boolean} autoConnect enable auto connect to wallet (wallet does not need to scan qr code)
+   * @param {boolean} connectedDidOnly only current login did or connected did can connect
+   */
+  constructor({ autoConnect = true, connectedDidOnly = false, options = {}, ...opts }) {
+    if (autoConnect && connectedDidOnly) {
+      options.sessionDidKey = CONNECTED_DID_KEY;
+    }
+
+    super({ options, ...opts });
+
+    this.enableConnect = !!autoConnect;
+  }
+
+  getConnectedDid = ({ req, abtwallet }) => {
+    if (!this.enableConnect) {
+      return null;
+    }
+
+    if (inMobileWallet(abtwallet)) {
+      return null;
+    }
+
+    return get(req, CONNECTED_DID_KEY);
+  };
+
+  attach({ onStart = noop, ...opts }) {
+    const _onStart = async (params) => {
+      const extra = (await onStart(params)) || {};
+
+      const connectedDid = this.getConnectedDid(params);
+
+      // fill extra
+      extra.connectedDid = connectedDid || '';
+      extra.saveConnect = this.enableConnect;
+
+      // 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(decodeURIComponent(new URL(params.deepLink).searchParams.get('url')));
+          checkUrl.pathname = checkUrl.pathname.replace(/auth$/, 'status');
+        } catch (e) {
+          checkUrl = '';
+          console.error(e);
+        }
+
+        const message = {
+          type: 'connect',
+          url: params.deepLink,
+        };
+
+        if (checkUrl) {
+          message.checkUrl = checkUrl.href;
+        }
+
+        Notification.sendToUser(connectedDid, message).catch((err) => console.error(err));
+      }
+
+      return extra;
+    };
+
+    super.attach({
+      onStart: _onStart,
+      ...opts,
+    });
+  }
+}
+
+module.exports = WalletHandlers;

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.5.0",
+  "version": "1.5.4",
   "description": "graphql client to read/write data on abt node",
   "main": "lib/index.js",
   "files": [
@@ -19,12 +19,12 @@
   "author": "linchen1987 <linchen.1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/client": "1.5.0",
-    "@abtnode/constant": "1.5.0",
-    "@arcblock/did-auth": "^1.13.16",
-    "@blocklet/meta": "1.5.0",
-    "@ocap/mcrypto": "^1.13.16",
-    "@ocap/wallet": "^1.13.16",
+    "@abtnode/client": "1.5.4",
+    "@abtnode/constant": "1.5.4",
+    "@arcblock/did-auth": "^1.13.28",
+    "@blocklet/meta": "1.5.4",
+    "@ocap/mcrypto": "^1.13.28",
+    "@ocap/wallet": "^1.13.28",
     "axios": "^0.21.4",
     "joi": "^17.4.0",
     "lodash": "^4.17.21",
@@ -34,5 +34,5 @@
     "detect-port": "^1.3.0",
     "jest": "^26.4.2"
   },
-  "gitHead": "bc78f2a10de0ccc7ae23b6b6f259c05606bad8f5"
+  "gitHead": "8856a7eae8ebd3e09ca11214892f57fb522f9b45"
 }