@blocklet/sdk 1.8.66-beta-7f4224af → 1.8.66

package/lib/service/notification.d.ts

@@ -11,7 +11,6 @@ type $TSFixMe = any;
  * @returns
  */
 declare const doSendToUser: (receiver: string | string[], notification: TNotificationInput, options?: TSendOptions) => Promise<any>;
-declare const doSendToRelay: (topic: string, event: string, data: any) => Promise<any>;
 /**
  *
  * @param {Notification} notification
@@ -31,11 +30,9 @@ export declare const _message: {
     off: any;
 };
 export { doSendToUser as sendToUser };
-export { doSendToRelay as sendToRelay };
 export { broadcast };
 declare const _default: {
     sendToUser: (receiver: string | string[], notification: TNotificationInput, options?: TSendOptions) => Promise<any>;
-    sendToRelay: (topic: string, event: string, data: any) => Promise<any>;
     broadcast: (notification: TNotificationInput, options?: TSendOptions) => Promise<any>;
     on: (event: string, cb?: any) => EventEmitter;
     off: any;

package/lib/service/notification.js

@@ -35,7 +35,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.broadcast = exports.sendToRelay = exports.sendToUser = exports._message = exports.off = exports.on = void 0;
+exports.broadcast = exports.sendToUser = exports._message = exports.off = exports.on = void 0;
 /* eslint-disable @typescript-eslint/naming-convention */
 const Jwt = __importStar(require("@arcblock/jwt"));
 const events_1 = __importDefault(require("events"));
@@ -63,11 +63,6 @@ const doSendToUser = (receiver, notification, options) => __awaiter(void 0, void
     return (0, send_notification_1.sendToUser)(receiver, notification, getSender(), process.env.ABT_NODE_SERVICE_PORT, options);
 });
 exports.sendToUser = doSendToUser;
-const doSendToRelay = (topic, event, data) => __awaiter(void 0, void 0, void 0, function* () {
-    (0, check_blocklet_env_1.default)();
-    return (0, send_notification_1.sendToRelay)(topic, event, data, getSender(), process.env.ABT_NODE_SERVICE_PORT);
-});
-exports.sendToRelay = doSendToRelay;
 /**
  *
  * @param {Notification} notification
@@ -183,7 +178,6 @@ exports._message = {
 };
 exports.default = {
     sendToUser: doSendToUser,
-    sendToRelay: doSendToRelay,
     broadcast,
     on: exports.on,
     off: exports.off,

package/lib/util/send-notification.d.ts

@@ -16,11 +16,10 @@ export type TNotificationSender = {
  */
 declare const sendToUser: (receiver: string | string[], notification: TNotificationInput, { appDid, appSk }: TNotificationSender, port?: string, options?: {}) => Promise<any>;
 declare const sendToAppChannel: (channel: string, event: string, notification: TNotificationInput, { appDid, appSk }: TNotificationSender, port?: string, options?: TSendOptions) => Promise<any>;
-declare const sendToRelay: (topic: string, event: string, data: any, { appDid, appSk }: TNotificationSender, port?: string) => Promise<any>;
-export { sendToUser, sendToAppChannel, sendToRelay };
+export { sendToUser };
+export { sendToAppChannel };
 declare const _default: {
     sendToUser: (receiver: string | string[], notification: TNotificationInput, { appDid, appSk }: TNotificationSender, port?: string, options?: {}) => Promise<any>;
     sendToAppChannel: (channel: string, event: string, notification: TNotificationInput, { appDid, appSk }: TNotificationSender, port?: string, options?: TSendOptions) => Promise<any>;
-    sendToRelay: (topic: string, event: string, data: any, { appDid, appSk }: TNotificationSender, port?: string) => Promise<any>;
 };
 export default _default;

package/lib/util/send-notification.js

@@ -35,12 +35,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sendToRelay = exports.sendToAppChannel = exports.sendToUser = void 0;
+exports.sendToAppChannel = exports.sendToUser = void 0;
 const axios_1 = __importDefault(require("axios"));
 const pick_1 = __importDefault(require("lodash/pick"));
 const JWT = __importStar(require("@arcblock/jwt"));
 const constant_1 = __importDefault(require("@abtnode/constant"));
-const channel_1 = require("@blocklet/meta/lib/channel");
 const index_1 = require("../validators/index");
 const constants_1 = require("./constants");
 const version_1 = require("../version");
@@ -127,39 +126,7 @@ const sendToAppChannel = (channel, event, notification, { appDid, appSk }, port
     }
 });
 exports.sendToAppChannel = sendToAppChannel;
-const sendToRelay = (topic, event, data, { appDid, appSk }, port = process.env.ABT_NODE_SERVICE_PORT) => __awaiter(void 0, void 0, void 0, function* () {
-    if (!topic) {
-        throw new Error('topic is required');
-    }
-    if (!event) {
-        throw new Error('event is required');
-    }
-    if (!data) {
-        throw new Error('data is required');
-    }
-    try {
-        const { data: res } = yield axios.post(`http://127.0.0.1:${port}${constants_1.SERVICE_PREFIX}/relay/api/send-to-relay-channel`, {
-            apiVersion: VERSION,
-            data: {
-                sender: { appDid, token: JWT.sign(appDid, appSk) },
-                channel: (0, channel_1.getRelayChannel)(appDid, topic),
-                event,
-                data,
-            },
-        }, {
-            timeout: 60 * 1000,
-            headers: getRequestHeaders(),
-        });
-        return res;
-    }
-    catch (err) {
-        console.error(err.response ? err.response.data : err);
-        throw new Error(err.response ? err.response.data : err.message);
-    }
-});
-exports.sendToRelay = sendToRelay;
 exports.default = {
     sendToUser,
     sendToAppChannel,
-    sendToRelay,
 };

package/lib/wallet-handler.d.ts

@@ -1,15 +1,13 @@
 import { WalletHandlers as Handler } from '@arcblock/did-auth';
 declare class WalletHandlers extends Handler {
     enableConnect: boolean;
-    sendNotificationFn: Function;
-    sendToRelayFn: Function;
+    sendNotificationFn: $TSFixMe;
     /**
-     * @param {boolean} params.autoConnect enable auto connect to wallet (wallet does not need to scan qr code)
-     * @param {boolean} params.connectedDidOnly only current login did or connected did can connect
-     * @param {function} [params.sendNotificationFn] use in a non-blocklet environment
-     * @param {function} [params.sendToRelayFn]
+     * @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
+     * @param {function} sendNotificationFn use in a non-blocklet environment
      */
-    constructor({ autoConnect, connectedDidOnly, sendNotificationFn, sendToRelayFn, options, ...opts }: any);
+    constructor({ autoConnect, connectedDidOnly, sendNotificationFn, options, ...opts }: $TSFixMe);
     getConnectedDid: ({ req, didwallet, extraParams }: $TSFixMe) => any;
     attach({ onStart, ...opts }: {
         [x: string]: any;

package/lib/wallet-handler.js

@@ -56,13 +56,16 @@ const inMobileWallet = (didwallet) => {
 };
 class WalletHandlers extends did_auth_1.WalletHandlers {
     /**
-     * @param {boolean} params.autoConnect enable auto connect to wallet (wallet does not need to scan qr code)
-     * @param {boolean} params.connectedDidOnly only current login did or connected did can connect
-     * @param {function} [params.sendNotificationFn] use in a non-blocklet environment
-     * @param {function} [params.sendToRelayFn]
+     * @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
+     * @param {function} sendNotificationFn use in a non-blocklet environment
      */
     constructor(_a) {
-        var { autoConnect = true, connectedDidOnly = false, sendNotificationFn = null, sendToRelayFn = null, options = {} } = _a, opts = __rest(_a, ["autoConnect", "connectedDidOnly", "sendNotificationFn", "sendToRelayFn", "options"]);
+        var { autoConnect = true, connectedDidOnly = false, sendNotificationFn, options = {} } = _a, opts = __rest(_a, ["autoConnect", "connectedDidOnly", "sendNotificationFn", "options"]);
+        // FIXME: wait check
+        // if (autoConnect && connectedDidOnly) {
+        //  options.sessionDidKey = CONNECTED_DID_KEY;
+        // }
         super(Object.assign({ options: Object.assign(Object.assign({}, options), {
                 sessionDidKey: autoConnect && connectedDidOnly ? CONNECTED_DID_KEY : options === null || options === void 0 ? void 0 : options.sessionDidKey,
             }) }, opts));
@@ -80,11 +83,6 @@ class WalletHandlers extends did_auth_1.WalletHandlers {
         };
         this.enableConnect = !!autoConnect;
         this.sendNotificationFn = sendNotificationFn || notification_1.sendToUser.bind(notification_1.default);
-        this.sendToRelayFn = sendToRelayFn || notification_1.sendToRelay.bind(notification_1.default);
-        // @ts-ignore
-        this.on('updated', (session) => {
-            this.sendToRelayFn({ topic: session.token, event: 'updated', data: session }).catch(console.error);
-        });
     }
     attach(_a) {
         var { onStart = noop } = _a, opts = __rest(_a, ["onStart"]);
@@ -98,8 +96,9 @@ class WalletHandlers extends did_auth_1.WalletHandlers {
             // send notification to wallet to trigger wallet to auto connect
             if (connectedDid) {
                 // wallet use check url to check status of the session
-                let checkUrl;
+                let checkUrl = '';
                 try {
+                    // @ts-expect-error TS(2322) FIXME: Type 'URL' is not assignable to type 'string'.
                     checkUrl = new URL(decodeURIComponent(new URL(params.deepLink).searchParams.get('url')));
                     checkUrl.pathname = checkUrl.pathname.replace(/auth$/, 'status');
                 }

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.8.66-beta-7f4224af",
+  "version": "1.8.66",
   "description": "graphql client to read/write data on abt node",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -26,19 +26,18 @@
   "author": "linchen1987 <linchen.1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/client": "1.8.66-beta-7f4224af",
-    "@abtnode/constant": "1.8.66-beta-7f4224af",
-    "@abtnode/util": "1.8.66-beta-7f4224af",
-    "@arcblock/did-auth": "1.18.47",
-    "@arcblock/jwt": "1.18.47",
-    "@arcblock/ws": "1.18.47",
-    "@blocklet/constant": "1.8.66-beta-7f4224af",
-    "@blocklet/meta": "1.8.66-beta-7f4224af",
-    "@did-connect/authenticator": "^2.1.35",
-    "@did-connect/handler": "^2.1.35",
+    "@abtnode/client": "1.8.66",
+    "@abtnode/constant": "1.8.66",
+    "@arcblock/did-auth": "1.18.42",
+    "@arcblock/jwt": "1.18.42",
+    "@arcblock/ws": "1.18.42",
+    "@blocklet/constant": "1.8.66",
+    "@blocklet/meta": "1.8.66",
+    "@did-connect/authenticator": "^2.1.34",
+    "@did-connect/handler": "^2.1.34",
     "@nedb/core": "^2.1.5",
-    "@ocap/mcrypto": "1.18.47",
-    "@ocap/wallet": "1.18.47",
+    "@ocap/mcrypto": "1.18.42",
+    "@ocap/wallet": "1.18.42",
     "axios": "^0.27.2",
     "fs-extra": "^10.1.0",
     "joi": "17.7.0",
@@ -69,5 +68,5 @@
     "ts-node": "^10.9.1",
     "typescript": "^4.8.4"
   },
-  "gitHead": "72d418f63ecb76b1d5d62edbcc5f336cb62bf308"
+  "gitHead": "282247fd0ce6702e1d6920e90e2b3be0408cf879"
 }