@blocklet/sdk 1.8.67-beta-794a8082 → 1.8.68-beta-500af7e5

package/lib/connect/authenticator.js

@@ -5,13 +5,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 const authenticator_1 = require("@did-connect/authenticator");
 const wallet_1 = __importDefault(require("../wallet"));
 const check_blocklet_env_1 = __importDefault(require("../util/check-blocklet-env"));
-const shared_1 = __importDefault(require("./shared"));
+const shared_1 = require("./shared");
 class BlockletAuthenticator extends authenticator_1.Authenticator {
     constructor(options = {}) {
         (0, check_blocklet_env_1.default)();
         super({
             wallet: (0, wallet_1.default)(),
-            ...(0, shared_1.default)(options),
+            ...(0, shared_1.getAuthenticatorProps)(options),
         });
     }
 }

package/lib/connect/shared.d.ts

@@ -1,4 +1,8 @@
-declare const connectShared: (options?: {}) => {
+import { WalletObject } from '@ocap/wallet';
+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;
@@ -8,6 +12,8 @@ declare const connectShared: (options?: {}) => {
         subscriptionEndpoint: string;
         nodeDid: string | undefined;
     }>;
+    delegator: () => WalletObject<string>;
+    delegation: () => string;
     chainInfo: () => Record<string, string>;
 };
-export = connectShared;
+export { getDelegation, getDelegator, getDelegatee, getAuthenticatorProps };

package/lib/connect/shared.js

@@ -2,12 +2,52 @@
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": 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 = __importDefault(require("@arcblock/jwt"));
+const wallet_1 = __importDefault(require("@blocklet/meta/lib/wallet"));
 const util_1 = require("@blocklet/meta/lib/util");
 const constants_1 = require("../util/constants");
 // wraps value in closure or returns closure
 const closure = (value) => (typeof value === 'function' ? value : () => value);
-const connectShared = (options = {}) => ({
+const getDelegator = () => {
+    const { BLOCKLET_APP_SK, BLOCKLET_APP_PSK, BLOCKLET_WALLET_TYPE } = process.env;
+    if (BLOCKLET_APP_SK && BLOCKLET_APP_PSK && BLOCKLET_APP_SK !== BLOCKLET_APP_PSK) {
+        return (0, wallet_1.default)(BLOCKLET_APP_PSK, undefined, BLOCKLET_WALLET_TYPE);
+    }
+    return null;
+};
+exports.getDelegator = getDelegator;
+const getDelegatee = () => {
+    const { BLOCKLET_APP_SK, BLOCKLET_WALLET_TYPE } = process.env;
+    return (0, wallet_1.default)(BLOCKLET_APP_SK, undefined, BLOCKLET_WALLET_TYPE);
+};
+exports.getDelegatee = getDelegatee;
+const getDelegation = (delegator, delegatee) => {
+    return jwt_1.default.signV2(delegator.address, delegator.secretKey, {
+        agentDid: `did:abt:${delegatee.address}`,
+        permissions: [
+            {
+                role: 'DIDConnectAgent',
+                claims: [
+                    'authPrincipal',
+                    'profile',
+                    'signature',
+                    'prepareTx',
+                    'agreement',
+                    'verifiableCredential',
+                    'asset',
+                    'keyPair',
+                    'encryptionKey',
+                ],
+            },
+        ],
+        exp: Math.floor(new Date().getTime() / 1000) + 60 * 60, // valid for 1 hour
+    });
+};
+exports.getDelegation = getDelegation;
+const getAuthenticatorProps = (options = {}) => ({
     chainInfo: () => (0, util_1.getChainInfo)(process.env),
     ...options,
     appInfo: async (...args) => {
@@ -25,5 +65,17 @@ const connectShared = (options = {}) => ({
             nodeDid: process.env.ABT_NODE_DID,
         };
     },
+    delegator: () => {
+        const delegator = getDelegator();
+        return delegator;
+    },
+    delegation: () => {
+        const delegator = getDelegator();
+        if (delegator) {
+            const delegatee = getDelegatee();
+            return getDelegation(delegator, delegatee);
+        }
+        return null;
+    },
 });
-module.exports = connectShared;
+exports.getAuthenticatorProps = getAuthenticatorProps;

package/lib/embed/adapters/express.d.ts

@@ -0,0 +1,3 @@
+import type { Request, Response } from 'express';
+declare function expressEmbed(req: Request, res: Response): Promise<void>;
+export default expressEmbed;

package/lib/embed/adapters/express.js

@@ -0,0 +1,13 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const get_embed_1 = __importDefault(require("../get-embed"));
+async function expressEmbed(req, res) {
+    const { query = {} } = req;
+    const { url = '' } = query;
+    const data = await (0, get_embed_1.default)(url);
+    res.json(data);
+}
+exports.default = expressEmbed;

package/lib/embed/generate.d.ts

@@ -0,0 +1,6 @@
+export default function generateBlockletEmbed(): {
+    name: string;
+    url: string;
+    origin: string;
+    embed: any[];
+};

package/lib/embed/generate.js

@@ -0,0 +1,30 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+function safeJsonParse(input, defaultValue) {
+    try {
+        return JSON.parse(input);
+    }
+    catch {
+        return defaultValue;
+    }
+}
+function generateBlockletEmbed() {
+    const { BLOCKLET_APP_NAME, BLOCKLET_APP_URL, BLOCKLET_REAL_NAME } = process.env;
+    const BLOCKLET_MOUNT_POINTS = safeJsonParse(process.env.BLOCKLET_MOUNT_POINTS, []);
+    let url = '/';
+    let name = BLOCKLET_APP_NAME;
+    const blockletNames = BLOCKLET_REAL_NAME.split('/');
+    const componentBlocklet = BLOCKLET_MOUNT_POINTS.find((blockletItem) => blockletItem.name === blockletNames[blockletNames.length - 1]);
+    if (componentBlocklet) {
+        // 先假设只有一层 component blocklet
+        url = componentBlocklet.mountPoint;
+        name = componentBlocklet.title;
+    }
+    return {
+        name,
+        url,
+        origin: BLOCKLET_APP_URL,
+        embed: [],
+    };
+}
+exports.default = generateBlockletEmbed;

package/lib/embed/get-embed-url.d.ts

@@ -0,0 +1 @@
+export default function getEmbedUrlFromUrl(url: string): Promise<string>;

package/lib/embed/get-embed-url.js

@@ -0,0 +1,55 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const slim_1 = require("cheerio/lib/slim");
+const ufo_1 = require("ufo");
+const axios_1 = __importDefault(require("axios"));
+/**
+ * 判断 htmlContent 是否为开发环境
+ * @param {string} htmlContent
+ * @returns boolean
+ */
+function checkViteDev(htmlContent) {
+    const $ = (0, slim_1.load)(htmlContent);
+    const scirptList = $('script[type="module"]');
+    return !![...scirptList].find((scriptItem) => {
+        if (scriptItem.firstChild?.type === 'text') {
+            return scriptItem.firstChild?.data?.includes('window.__vite_plugin_react_preamble_installed__ = true');
+        }
+        return false;
+    });
+}
+async function getEmbedUrlFromUrl(url) {
+    try {
+        const { data: htmlContent } = await axios_1.default.get(url, {
+            headers: {
+                accept: 'text/html,application/xhtml+xml,application/xml',
+            },
+        });
+        let prefix = '/';
+        let metaUrl = url;
+        const $ = (0, slim_1.load)(htmlContent);
+        const link = $('link[rel="blocklet-open-embed"]');
+        const blockletScript = $('script[src="__blocklet__.js"]');
+        if (link && link.length > 0) {
+            metaUrl = link.attr('href') || url;
+        }
+        else {
+            return url;
+        }
+        const isViteDev = checkViteDev(htmlContent);
+        if (blockletScript && blockletScript.length > 0) {
+            const scriptUrl = new URL('__blocklet__.js?type=json', (0, ufo_1.withTrailingSlash)(url));
+            const { data: blockletMeta } = await axios_1.default.get(scriptUrl.href);
+            prefix = blockletMeta.prefix;
+        }
+        // 在 vite 开发模式下，embed-url 指向的地址会自动被增加一个前缀
+        return isViteDev ? (0, ufo_1.joinURL)(prefix, metaUrl.replace(prefix, '')) : (0, ufo_1.joinURL)(prefix, metaUrl);
+    }
+    catch {
+        return url;
+    }
+}
+exports.default = getEmbedUrlFromUrl;

package/lib/embed/get-embed.d.ts

@@ -0,0 +1 @@
+export default function getBlockletEmbedFromUrl(url: string): Promise<object | null>;

package/lib/embed/get-embed.js

@@ -0,0 +1,32 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const path_1 = require("path");
+const lodash_1 = require("lodash");
+const axios_1 = __importDefault(require("axios"));
+const get_embed_url_1 = __importDefault(require("./get-embed-url"));
+async function getBlockletEmbedFromUrl(url) {
+    const metaUrl = await (0, get_embed_url_1.default)(url);
+    try {
+        if (metaUrl) {
+            let finalUrl = '';
+            if (metaUrl.startsWith('http://') || metaUrl.startsWith('https://')) {
+                finalUrl = metaUrl;
+            }
+            else {
+                finalUrl = `${new URL(url).origin}${(0, path_1.join)('/', metaUrl)}`;
+            }
+            const { data: metaData } = await axios_1.default.get(finalUrl);
+            if ((0, lodash_1.isObject)(metaData)) {
+                return metaData;
+            }
+        }
+    }
+    catch {
+        /* empty */
+    }
+    return null;
+}
+exports.default = getBlockletEmbedFromUrl;

package/lib/embed/index.d.ts

@@ -0,0 +1,10 @@
+import generateBlockletEmbed from './generate';
+import expressEmbed from './adapters/express';
+import getBlockletEmbedFromUrl from './get-embed';
+declare const _default: {
+    expressEmbed: typeof expressEmbed;
+    generateBlockletEmbed: typeof generateBlockletEmbed;
+    getBlockletEmbedFromUrl: typeof getBlockletEmbedFromUrl;
+};
+export default _default;
+export { expressEmbed, generateBlockletEmbed, getBlockletEmbedFromUrl };

package/lib/embed/index.js

@@ -0,0 +1,13 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getBlockletEmbedFromUrl = exports.generateBlockletEmbed = exports.expressEmbed = void 0;
+const generate_1 = __importDefault(require("./generate"));
+exports.generateBlockletEmbed = generate_1.default;
+const express_1 = __importDefault(require("./adapters/express"));
+exports.expressEmbed = express_1.default;
+const get_embed_1 = __importDefault(require("./get-embed"));
+exports.getBlockletEmbedFromUrl = get_embed_1.default;
+exports.default = { expressEmbed: express_1.default, generateBlockletEmbed: generate_1.default, getBlockletEmbedFromUrl: get_embed_1.default };

package/lib/embed/message.d.ts

@@ -0,0 +1,26 @@
+type InstanceType = 'client' | 'server';
+type MessageType = string;
+interface Callback {
+    (...args: any[]): void;
+}
+declare class Message {
+    id: string;
+    type: InstanceType;
+    private bc;
+    private eventMap;
+    init: (cb: Callback) => void;
+    onInit: (getData: () => any) => void;
+    close: () => void;
+    constructor(id: string, type?: InstanceType);
+    on(type: MessageType, cb: Callback): void;
+    off(type: MessageType, cb: Callback): void;
+    once(type: MessageType, cb: Callback): void;
+    send(type: MessageType, payload: any): void;
+}
+declare function useMessage(id?: string, type?: InstanceType): any;
+declare const _default: {
+    useMessage: typeof useMessage;
+    Message: typeof Message;
+};
+export default _default;
+export { useMessage, Message };

package/lib/embed/message.js

@@ -0,0 +1,134 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Message = exports.useMessage = void 0;
+const INIT = '__init';
+const ON_INIT = '__on-init';
+function checkKey(typeKey) {
+    return !typeKey.startsWith(INIT);
+}
+function ensureType(type) {
+    if (!checkKey(type)) {
+        throw new Error(`Type can't starts with ${INIT}`);
+    }
+}
+function notExist() {
+    console.error('function not exist');
+}
+class Message {
+    constructor(id, type = 'client') {
+        this.id = id;
+        this.type = type;
+        const bc = new BroadcastChannel(this.id);
+        this.bc = bc;
+        this.eventMap = new Map();
+        const onMessage = (event) => {
+            const { data } = event;
+            const { type: messageType, payload, id: dataId } = data;
+            if (dataId === this.id) {
+                const cbList = this.eventMap.get(messageType) || [];
+                cbList.forEach((cbItem) => {
+                    cbItem(payload);
+                });
+            }
+        };
+        window.addEventListener('message', onMessage, false);
+        this.close = () => {
+            window.removeEventListener('message', onMessage, false);
+            // v1 message
+            this.bc.close();
+        };
+        // v1 message
+        bc.onmessage = ({ data }) => {
+            const { type: messageType, payload } = data;
+            const cbList = this.eventMap.get(messageType) || [];
+            cbList.forEach((cbItem) => {
+                cbItem(payload);
+            });
+        };
+        this.init = notExist;
+        this.onInit = notExist;
+        if (type === 'server') {
+            this.onInit = (getData = () => null) => {
+                this.eventMap.set(INIT, [
+                    (listenKey) => {
+                        const initData = getData();
+                        this.send(listenKey, initData);
+                    },
+                ]);
+            };
+        }
+        if (type === 'client') {
+            this.init = (cb) => {
+                const uniqueId = String(+new Date());
+                const listenKey = `${ON_INIT}_${uniqueId}`;
+                this.once(listenKey, cb);
+                this.send(INIT, listenKey);
+            };
+        }
+    }
+    on(type, cb) {
+        ensureType(type);
+        const cbList = this.eventMap.get(type) || [];
+        cbList.push(cb);
+        this.eventMap.set(type, cbList);
+    }
+    off(type, cb) {
+        ensureType(type);
+        const cbList = this.eventMap.get(type) || [];
+        if (cb) {
+            const index = cbList.indexOf(cb);
+            if (index !== -1) {
+                cbList.splice(index, 1);
+            }
+        }
+        else {
+            cbList.length = 0;
+        }
+        this.eventMap.set(type, cbList);
+    }
+    once(type, cb) {
+        ensureType(type);
+        const callback = (...args) => {
+            cb(...args);
+            this.off(type, callback);
+        };
+        this.on(type, callback);
+    }
+    send(type, payload) {
+        const data = {
+            id: this.id,
+            type,
+            payload,
+        };
+        if (this.type === 'server') {
+            const iframeList = [...document.querySelectorAll(`iframe[data-id="${this.id}"]`)];
+            iframeList.forEach((iframeItem) => {
+                iframeItem.contentWindow.postMessage(data, '*');
+            });
+        }
+        else {
+            window.parent.postMessage(data, '*');
+        }
+        // v1 message
+        this.bc.postMessage(data);
+    }
+}
+exports.Message = Message;
+const messageCache = new Map();
+function useMessage(id, type = 'client') {
+    // eslint-disable-next-line @typescript-eslint/naming-convention
+    const _id = id || window.frameElement?.dataset.id || window.name;
+    if (messageCache.has(_id)) {
+        return messageCache.get(_id);
+    }
+    const isInIframe = window !== window.parent;
+    const message = (type === 'server' || isInIframe) && _id ? new Message(_id, type) : null;
+    const data = { message };
+    messageCache.set(_id, data);
+    return data;
+}
+exports.useMessage = useMessage;
+exports.default = {
+    useMessage,
+    Message,
+};

package/lib/index.d.ts

@@ -4,7 +4,6 @@ import WalletAuthenticator from './wallet-authenticator';
 import WalletHandlers from './wallet-handler';
 import BlockletAuthenticator from './connect/authenticator';
 import createConnectHandlers from './connect/handler';
-import connectShared from './connect/shared';
 import Database from './database/index';
 import env from './env';
 import middlewares from './middlewares/index';
@@ -20,7 +19,6 @@ export { WalletHandlers };
 export { WalletAuthenticator };
 export { BlockletAuthenticator };
 export { createConnectHandlers };
-export { connectShared };
 export { Database };
 export { getWallet };
 export { env };

package/lib/index.js

@@ -17,7 +17,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.config = exports.Security = exports.Component = exports.component = exports.middlewares = exports.env = exports.getWallet = exports.Database = exports.connectShared = exports.createConnectHandlers = exports.BlockletAuthenticator = exports.WalletAuthenticator = exports.WalletHandlers = exports.Notification = exports.NotificationService = exports.Auth = exports.AuthService = void 0;
+exports.config = exports.Security = exports.Component = exports.component = exports.middlewares = exports.env = exports.getWallet = exports.Database = exports.createConnectHandlers = exports.BlockletAuthenticator = exports.WalletAuthenticator = exports.WalletHandlers = exports.Notification = exports.NotificationService = exports.Auth = exports.AuthService = void 0;
 const auth_1 = __importDefault(require("./service/auth"));
 exports.AuthService = auth_1.default;
 exports.Auth = auth_1.default;
@@ -32,8 +32,6 @@ const authenticator_1 = __importDefault(require("./connect/authenticator"));
 exports.BlockletAuthenticator = authenticator_1.default;
 const handler_1 = __importDefault(require("./connect/handler"));
 exports.createConnectHandlers = handler_1.default;
-const shared_1 = __importDefault(require("./connect/shared"));
-exports.connectShared = shared_1.default;
 const index_1 = __importDefault(require("./database/index"));
 exports.Database = index_1.default;
 const env_1 = __importDefault(require("./env"));

package/lib/version.d.ts

@@ -1,4 +1,4 @@
-declare const version = "1.8.67";
+declare const version = "1.8.68";
 export { version };
 declare const _default: {
     version: string;

package/lib/version.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.version = void 0;
-const version = '1.8.67';
+const version = '1.8.68';
 exports.version = version;
 exports.default = { version };

package/lib/wallet-authenticator.js

@@ -5,13 +5,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 const did_auth_1 = require("@arcblock/did-auth");
 const wallet_1 = __importDefault(require("./wallet"));
 const check_blocklet_env_1 = __importDefault(require("./util/check-blocklet-env"));
-const shared_1 = __importDefault(require("./connect/shared"));
+const shared_1 = require("./connect/shared");
 class WalletAuthenticator extends did_auth_1.WalletAuthenticator {
     constructor(options = {}) {
         (0, check_blocklet_env_1.default)();
         super({
             wallet: (0, wallet_1.default)().toJSON(),
-            ...(0, shared_1.default)(options),
+            ...(0, shared_1.getAuthenticatorProps)(options),
         });
     }
 }

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.8.67-beta-794a8082",
+  "version": "1.8.68-beta-500af7e5",
   "description": "graphql client to read/write data on abt node",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -26,25 +26,27 @@
   "author": "linchen1987 <linchen.1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/client": "1.8.67-beta-794a8082",
-    "@abtnode/constant": "1.8.67-beta-794a8082",
-    "@abtnode/util": "1.8.67-beta-794a8082",
-    "@arcblock/did-auth": "1.18.54",
-    "@arcblock/jwt": "1.18.54",
-    "@arcblock/ws": "1.18.54",
-    "@blocklet/constant": "1.8.67-beta-794a8082",
-    "@blocklet/meta": "1.8.67-beta-794a8082",
-    "@did-connect/authenticator": "^2.1.39",
-    "@did-connect/handler": "^2.1.39",
+    "@abtnode/client": "1.8.68-beta-500af7e5",
+    "@abtnode/constant": "1.8.68-beta-500af7e5",
+    "@abtnode/util": "1.8.68-beta-500af7e5",
+    "@arcblock/did-auth": "1.18.57",
+    "@arcblock/jwt": "1.18.57",
+    "@arcblock/ws": "1.18.57",
+    "@blocklet/constant": "1.8.68-beta-500af7e5",
+    "@blocklet/meta": "1.8.68-beta-500af7e5",
+    "@did-connect/authenticator": "^2.1.41",
+    "@did-connect/handler": "^2.1.41",
     "@nedb/core": "^2.1.5",
-    "@ocap/mcrypto": "1.18.54",
-    "@ocap/wallet": "1.18.54",
+    "@ocap/mcrypto": "1.18.57",
+    "@ocap/wallet": "1.18.57",
     "axios": "^0.27.2",
+    "cheerio": "^1.0.0-rc.12",
     "fs-extra": "^10.1.0",
     "joi": "17.7.0",
     "json-stable-stringify": "^1.0.1",
     "lodash": "^4.17.21",
     "lru-cache": "^6.0.0",
+    "ufo": "^1.1.1",
     "url-join": "^4.0.1"
   },
   "resolutions": {
@@ -69,5 +71,5 @@
     "ts-node": "^10.9.1",
     "typescript": "^4.8.4"
   },
-  "gitHead": "f4ad32bea4d80b12971fb6bef941bdbe2af6a834"
+  "gitHead": "9070621373f317a10ff0d289323bf725e30d3521"
 }