@blocklet/sdk 1.16.27-beta-d27e19fa → 1.16.27-beta-21d213c5

package/lib/connect/shared.d.ts

@@ -3,14 +3,19 @@ declare const getDelegator: () => WalletObject<string>;
 declare const getDelegatee: () => WalletObject<string>;
 declare const getDelegation: (delegator: WalletObject, delegatee: WalletObject) => string;
 declare const getAuthenticatorProps: (options?: {}) => {
-    appInfo: (...args: any[]) => Promise<{
-        name: string | undefined;
-        description: string | undefined;
-        link: string;
+    appInfo(...args: any[]): Promise<any>;
+    memberAppInfo({ request, baseUrl }: {
+        request: any;
+        baseUrl: any;
+    }): Promise<{
+        name: any;
+        description: any;
         icon: string;
-        updateSubEndpoint: true;
+        link: string;
+        updateSubEndpoint: boolean;
         subscriptionEndpoint: string;
-        nodeDid: string | undefined;
+        nodeDid: string;
+        publisher: string;
     }>;
     delegator({ request }: {
         request: any;

package/lib/connect/shared.js

@@ -4,15 +4,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAuthenticatorProps = exports.getDelegatee = exports.getDelegator = exports.getDelegation = void 0;
-const url_join_1 = __importDefault(require("url-join"));
 const jwt_1 = require("@arcblock/jwt");
 const util_1 = require("@blocklet/meta/lib/util");
 const wallet_1 = require("@ocap/wallet");
 const mcrypto_1 = require("@ocap/mcrypto");
 const get_1 = __importDefault(require("lodash/get"));
-const constants_1 = require("../util/constants");
 const wallet_2 = __importDefault(require("../wallet"));
 const login_1 = require("../util/login");
+const app_info_1 = require("../util/app-info");
 // wraps value in closure or returns closure
 const closure = (value) => (typeof value === 'function' ? value : () => value);
 const getDelegator = () => {
@@ -57,31 +56,55 @@ exports.getDelegation = getDelegation;
 const getAuthenticatorProps = (options = {}) => ({
     chainInfo: () => (0, util_1.getChainInfo)(process.env),
     ...options,
-    appInfo: async (...args) => {
-        const info = await closure(options.appInfo)(...args);
+    async appInfo(...args) {
+        const mergeInfo = await closure(options.appInfo)(...args);
         const { request, baseUrl } = args[0];
-        const groupPathPrefix = request.headers['x-group-path-prefix'] || '/';
-        let agentDid;
-        const sourceAppPid = (0, login_1.getSourceAppPid)(request);
-        // federated 登录模式下，需要告知原有的 blocklet-did
-        if (sourceAppPid) {
-            // 对于 ux 来说， 要展示的始终是 pid，所以这个给 agentDid 的赋值也需要是 pid
-            agentDid = process.env.BLOCKLET_APP_PID;
-        }
+        const appInfo = await (0, app_info_1.getAppInfo)({
+            request,
+            baseUrl,
+            getBlocklet: async () => {
+                let blocklet;
+                try {
+                    ({ blocklet } = await this.authClient.getBlocklet());
+                }
+                catch {
+                    throw new Error('failed to get blocklet');
+                }
+                return blocklet;
+            },
+            getNodeInfo() {
+                return Promise.resolve({
+                    did: process.env.ABT_NODE_DID,
+                });
+            },
+        });
         return {
-            name: process.env.BLOCKLET_APP_NAME,
-            description: process.env.BLOCKLET_APP_DESCRIPTION,
-            ...(info || {}),
-            link: (0, util_1.getConnectAppUrl)(args[0]),
-            icon: (0, url_join_1.default)(baseUrl, constants_1.SERVICE_PREFIX, `/blocklet/logo?v=${process.env.BLOCKLET_APP_VERSION || ''}`),
-            updateSubEndpoint: true,
-            subscriptionEndpoint: (0, url_join_1.default)(groupPathPrefix, constants_1.SERVICE_PREFIX, 'websocket'),
-            nodeDid: process.env.ABT_NODE_DID,
-            agentDid,
+            ...(mergeInfo || {}),
+            ...appInfo,
         };
     },
-    // FIXME: @zhanghan 这里是否要增加 memberAppInfo 信息
-    // 这里用于非 blocklet-service 提供的 did-connect，因为其逻辑的处理是交由 blocklet-app 自己完成的，所以之前一直展示的都是当前应用的信息（member blocklet）
+    async memberAppInfo({ request, baseUrl }) {
+        const memberAppInfo = await (0, app_info_1.getMemberAppInfo)({
+            request,
+            baseUrl,
+            getBlocklet: async () => {
+                let blocklet;
+                try {
+                    ({ blocklet } = await this.authClient.getBlocklet());
+                }
+                catch {
+                    throw new Error('failed to get blocklet');
+                }
+                return blocklet;
+            },
+            getNodeInfo() {
+                return Promise.resolve({
+                    did: process.env.ABT_NODE_DID,
+                });
+            },
+        });
+        return memberAppInfo;
+    },
     async delegator({ request }) {
         const sourceAppPid = (0, login_1.getSourceAppPid)(request);
         if (sourceAppPid) {

package/lib/util/app-info.d.ts

@@ -0,0 +1,48 @@
+export declare function getFederatedMasterAppInfo({ blocklet, sourceAppPid, version, groupPathPrefix, nodeInfo, }: {
+    blocklet: any;
+    sourceAppPid: string;
+    version: string;
+    groupPathPrefix: string;
+    nodeInfo: any;
+}): {
+    name: any;
+    description: any;
+    icon: string;
+    link: any;
+    updateSubEndpoint: boolean;
+    subscriptionEndpoint: string;
+    nodeDid: any;
+};
+export declare function getAppInfo({ request, baseUrl, getBlocklet, getNodeInfo, }: {
+    request: $TSFixMe;
+    baseUrl: string;
+    getBlocklet: () => Promise<$TSFixMe>;
+    getNodeInfo: () => Promise<{
+        did: string;
+    }>;
+}): Promise<{
+    name: any;
+    description: any;
+    icon: string;
+    link: any;
+    updateSubEndpoint: boolean;
+    subscriptionEndpoint: string;
+    nodeDid: any;
+}>;
+export declare function getMemberAppInfo({ request, baseUrl, getBlocklet, getNodeInfo, }: {
+    request: any;
+    baseUrl: string;
+    getBlocklet: () => Promise<$TSFixMe>;
+    getNodeInfo: () => Promise<{
+        did: string;
+    }>;
+}): Promise<{
+    name: any;
+    description: any;
+    icon: string;
+    link: string;
+    updateSubEndpoint: boolean;
+    subscriptionEndpoint: string;
+    nodeDid: string;
+    publisher: string;
+}>;

package/lib/util/app-info.js

@@ -0,0 +1,72 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getMemberAppInfo = exports.getAppInfo = exports.getFederatedMasterAppInfo = void 0;
+const ufo_1 = require("ufo");
+const get_1 = __importDefault(require("lodash/get"));
+const util_1 = require("@blocklet/meta/lib/util");
+const constant_1 = require("@abtnode/constant");
+const login_1 = require("./login");
+function getFederatedMasterAppInfo({ blocklet, sourceAppPid, version, groupPathPrefix, nodeInfo, }) {
+    const { federated } = blocklet.settings;
+    const master = federated.sites.find((x) => x.appPid === sourceAppPid);
+    return {
+        name: master.appName,
+        description: master.appescription || `Connect to ${master.appName}`,
+        icon: (0, ufo_1.joinURL)(master.appUrl, constant_1.WELLKNOWN_SERVICE_PATH_PREFIX, `/blocklet/logo?v=${version}`),
+        link: master.appUrl,
+        updateSubEndpoint: true,
+        subscriptionEndpoint: (0, ufo_1.joinURL)(groupPathPrefix, constant_1.WELLKNOWN_SERVICE_PATH_PREFIX, 'websocket'),
+        nodeDid: nodeInfo.did,
+    };
+}
+exports.getFederatedMasterAppInfo = getFederatedMasterAppInfo;
+async function getAppInfo({ request, baseUrl, getBlocklet, getNodeInfo, }) {
+    const groupPathPrefix = request.headers['x-group-path-prefix'] || '/';
+    const [blocklet, info] = await Promise.all([getBlocklet(), getNodeInfo()]);
+    const sourceAppPid = (0, login_1.getSourceAppPid)(request);
+    const version = (0, get_1.default)(blocklet, 'meta.version', '');
+    if (sourceAppPid) {
+        return getFederatedMasterAppInfo({
+            blocklet,
+            sourceAppPid,
+            version,
+            groupPathPrefix,
+            nodeInfo: info,
+        });
+    }
+    return {
+        name: blocklet.meta.name,
+        description: blocklet.meta.description || `Connect to ${blocklet.meta.name}`,
+        icon: (0, ufo_1.joinURL)(baseUrl, constant_1.WELLKNOWN_SERVICE_PATH_PREFIX, `/blocklet/logo?v=${version}`),
+        link: (0, util_1.getConnectAppUrl)({ request, baseUrl }),
+        updateSubEndpoint: true,
+        subscriptionEndpoint: (0, ufo_1.joinURL)(groupPathPrefix, constant_1.WELLKNOWN_SERVICE_PATH_PREFIX, 'websocket'),
+        nodeDid: info.did,
+        // NOTE: publisher 是 WalletAuthenticator 中自动添加的
+    };
+}
+exports.getAppInfo = getAppInfo;
+async function getMemberAppInfo({ request, baseUrl, getBlocklet, getNodeInfo, }) {
+    const groupPathPrefix = request.headers['x-group-path-prefix'] || '/';
+    const [blocklet, info] = await Promise.all([getBlocklet(), getNodeInfo()]);
+    const sourceAppPid = (0, login_1.getSourceAppPid)(request);
+    const version = (0, get_1.default)(blocklet, 'meta.version', '');
+    if (sourceAppPid) {
+        return {
+            name: blocklet.meta.name,
+            description: blocklet.meta.description || `Connect to ${blocklet.meta.name}`,
+            icon: (0, ufo_1.joinURL)(baseUrl, constant_1.WELLKNOWN_SERVICE_PATH_PREFIX, `/blocklet/logo?v=${version}`),
+            link: (0, util_1.getConnectAppUrl)({ request, baseUrl }),
+            updateSubEndpoint: true,
+            subscriptionEndpoint: (0, ufo_1.joinURL)(groupPathPrefix, constant_1.WELLKNOWN_SERVICE_PATH_PREFIX, 'websocket'),
+            nodeDid: info.did,
+            // NOTICE: member appInfo 的 publisher 不是 delegator，所以需要手动指定
+            publisher: `did:abt:${blocklet.appPid}`,
+        };
+    }
+    return null;
+}
+exports.getMemberAppInfo = getMemberAppInfo;

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.27-beta-d27e19fa",
+  "version": "1.16.27-beta-21d213c5",
   "description": "graphql client to read/write data on abt node",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -27,15 +27,15 @@
   "author": "linchen1987 <linchen.1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/client": "1.16.27-beta-d27e19fa",
-    "@abtnode/constant": "1.16.27-beta-d27e19fa",
+    "@abtnode/client": "1.16.27-beta-21d213c5",
+    "@abtnode/constant": "1.16.27-beta-21d213c5",
     "@arcblock/did": "1.18.123",
     "@arcblock/did-auth": "1.18.123",
     "@arcblock/jwt": "1.18.123",
     "@arcblock/ws": "1.18.123",
-    "@blocklet/constant": "1.16.27-beta-d27e19fa",
-    "@blocklet/env": "1.16.27-beta-d27e19fa",
-    "@blocklet/meta": "1.16.27-beta-d27e19fa",
+    "@blocklet/constant": "1.16.27-beta-21d213c5",
+    "@blocklet/env": "1.16.27-beta-21d213c5",
+    "@blocklet/meta": "1.16.27-beta-21d213c5",
     "@did-connect/authenticator": "^2.2.4",
     "@did-connect/handler": "^2.2.4",
     "@nedb/core": "^2.1.5",
@@ -76,5 +76,5 @@
     "ts-node": "^10.9.1",
     "typescript": "^5.0.4"
   },
-  "gitHead": "7a83c248c1e5738e6d95e54fc26699f865479dab"
+  "gitHead": "1beb3311565336a17ee1b049379a8c864f494242"
 }