@blocklet/sdk 1.6.18 → 1.6.22-beta

package/lib/service/notification.js

@@ -1,18 +1,83 @@
+const Jwt = require('@arcblock/jwt');
+const EventEmitter = require('events');
+
+const { WsClient } = require('@arcblock/ws');
+
 const checkBlockletEnv = require('../util/check-blocklet-env');
 const sendNotification = require('../util/send-notification');
+const { AUTH_SERVICE_PREFIX } = require('../util/constants');
+const getWallet = require('../wallet');
+
+const sendToUser = async (receiver, notification) => {
+  checkBlockletEnv();
+
+  const sender = {
+    appId: process.env.BLOCKLET_APP_ID,
+    appSk: process.env.BLOCKLET_APP_SK,
+    did: process.env.BLOCKLET_DID,
+  };
+
+  return sendNotification(receiver, notification, sender, process.env.ABT_NODE_SERVICE_PORT);
+};
+
+const emitter = new EventEmitter();
 
-class NotificationService {
-  static async sendToUser(receiver, notification) {
-    checkBlockletEnv();
+let client = null;
 
-    const sender = {
-      appId: process.env.BLOCKLET_APP_ID,
-      appSk: process.env.BLOCKLET_APP_SK,
-      did: process.env.BLOCKLET_DID,
-    };
+const initClient = () => {
+  if (!client) {
+    const wallet = getWallet();
+    const { address: did, publicKey: pk, secretKey: sk } = wallet;
+    const url = `ws://127.0.0.1:${process.env.ABT_NODE_SERVICE_PORT}${AUTH_SERVICE_PREFIX}`;
+    const token = Jwt.sign(did, sk, {});
 
-    return sendNotification(receiver, notification, sender, process.env.ABT_NODE_SERVICE_PORT);
+    client = new WsClient(url, {
+      heartbeatIntervalMs: 10 * 1000,
+      params: () => ({
+        token,
+        pk,
+      }),
+    });
+
+    client.connect();
+
+    const channel = client.channel(wallet.address, { token, pk });
+
+    channel
+      .join()
+      .receive('error', (err) => {
+        const msg = `join channel error: ${err.message}`;
+        console.error(msg);
+        emitter.emit('error', { message: msg });
+      })
+      .receive('timeout', () => {
+        const msg = 'join channel timeout';
+        console.error(msg);
+        emitter.emit('error', { message: msg });
+      });
+
+    channel.on('message', ({ status, response } = {}) => {
+      if (status === 'ok') {
+        emitter.emit(response.type, response);
+      } else {
+        emitter.emit('error', response);
+        console.error({
+          status,
+          response,
+        });
+      }
+    });
   }
-}
+};
+
+module.exports = {
+  sendToUser,
+  on: (event, cb) => {
+    if (!client) {
+      initClient();
+    }
 
-module.exports = NotificationService;
+    return emitter.on(event, cb);
+  },
+  off: emitter.off.bind(emitter),
+};

package/lib/validators/notification.js

@@ -8,6 +8,7 @@ const TYPES = {
   NOTIFICATION: 'notification',
   CONNECT: 'connect',
   FEED: 'feed',
+  HI: 'hi',
 };
 
 const assetSchema = Joi.object({
@@ -67,6 +68,17 @@ const feedTypeSchema = Joi.object({
 
 const notificationSchema = Joi.alternatives().try(notificationTypeSchema, connectTypeSchema, feedTypeSchema).required();
 
+const messageSchema = Joi.object({
+  id: Joi.string().required(),
+  createdAt: Joi.date().iso().required(),
+  type: Joi.string().required(),
+  receiver: Joi.object({
+    did: Joi.DID().trim().required(),
+  }).required(),
+})
+  .unknown()
+  .required();
+
 const receiverSchema = Joi.DID().trim().required();
 
 const inputNotificationSchema = Joi.alternatives()
@@ -78,10 +90,12 @@ const inputReceiverSchema = Joi.alternatives().try(Joi.array().items(receiverSch
 module.exports = {
   validateReceiver: inputReceiverSchema.validateAsync.bind(inputReceiverSchema),
   validateNotification: inputNotificationSchema.validateAsync.bind(inputNotificationSchema),
+  validateMessage: messageSchema.validateAsync.bind(messageSchema),
   tokenSchema,
   actionSchema,
   assetSchema,
   vcSchema,
   attachmentSchema,
   notificationSchema,
+  messageSchema,
 };

package/lib/wallet-authenticator.js

@@ -5,6 +5,8 @@ const getWallet = require('./wallet');
 const checkBlockletEnv = require('./util/check-blocklet-env');
 const { AUTH_SERVICE_PREFIX } = require('./util/constants');
 
+const env = require('./env');
+
 // wraps value in closure or returns closure
 const closure = (value) => (typeof value === 'function' ? value : () => value);
 
@@ -26,17 +28,26 @@ class WalletAuthenticator extends Authenticator {
         const info = await closure(options.appInfo)(...args);
 
         const { request, baseUrl } = args[0];
-        const groupPathPrefix = request.headers['x-group-path-prefix'] || '/';
+        const rootPath = '/';
+        const pathPrefix = request.headers['x-path-prefix'] || rootPath;
+        const groupPathPrefix = request.headers['x-group-path-prefix'] || rootPath;
         const blockletDid = request.headers['x-blocklet-did'];
 
+        let appUrl = baseUrl;
+        let subscriptionPath = joinUrl(groupPathPrefix, AUTH_SERVICE_PREFIX, 'websocket');
+        if (env.isComponent && pathPrefix !== rootPath) {
+          appUrl = joinUrl(appUrl, rootPath).replace(pathPrefix, rootPath);
+          subscriptionPath = joinUrl(pathPrefix, subscriptionPath);
+        }
+
         return {
           name: process.env.BLOCKLET_APP_NAME,
           description: process.env.BLOCKLET_APP_DESCRIPTION,
           ...(info || {}),
-          link: baseUrl,
+          link: appUrl,
           icon: joinUrl(baseUrl, AUTH_SERVICE_PREFIX, `/blocklet/logo/${blockletDid}`),
           updateSubEndpoint: true,
-          subscriptionEndpoint: joinUrl(groupPathPrefix, AUTH_SERVICE_PREFIX, 'websocket'),
+          subscriptionEndpoint: subscriptionPath,
           nodeDid: process.env.ABT_NODE_DID,
         };
       },

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.6.18",
+  "version": "1.6.22-beta",
   "description": "graphql client to read/write data on abt node",
   "main": "lib/index.js",
   "files": [
@@ -19,17 +19,18 @@
   "author": "linchen1987 <linchen.1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/client": "1.6.18",
-    "@abtnode/constant": "1.6.18",
-    "@arcblock/did-auth": "^1.14.8",
-    "@arcblock/jwt": "^1.14.8",
-    "@blocklet/meta": "1.6.18",
+    "@abtnode/client": "1.6.22",
+    "@abtnode/constant": "1.6.22",
+    "@arcblock/did-auth": "^1.14.17",
+    "@arcblock/jwt": "^1.14.17",
+    "@arcblock/ws": "^1.14.17",
+    "@blocklet/meta": "1.6.22",
     "@nedb/core": "^1.2.2",
-    "@ocap/mcrypto": "^1.14.8",
-    "@ocap/wallet": "^1.14.8",
-    "axios": "^0.21.4",
+    "@ocap/mcrypto": "^1.14.17",
+    "@ocap/wallet": "^1.14.17",
+    "axios": "^0.25.0",
     "fs-extra": "^10.0.0",
-    "joi": "^17.5.0",
+    "joi": "^17.6.0",
     "lodash": "^4.17.21",
     "lru-cache": "^6.0.0",
     "url-join": "^4.0.1"
@@ -37,6 +38,5 @@
   "devDependencies": {
     "detect-port": "^1.3.0",
     "jest": "^27.4.5"
-  },
-  "gitHead": "2f02f166869d8ebedc0466068f6ed90ab3e07b87"
+  }
 }