@blocklet/sdk 1.16.0-beta-b16cb035 → 1.16.0-beta-1d6c582e

package/lib/component/index.d.ts

@@ -1,4 +1,6 @@
-import { AxiosResponse } from 'axios';
+/// <reference types="node" />
+import { AxiosResponse, Method } from 'axios';
+import { IncomingMessage } from 'http';
 export type MountPoint = {
     did: string;
     name: string;
@@ -10,11 +12,20 @@ export type MountPoint = {
 declare const getChildWebEndpoint: (name: string) => string;
 declare const getParentWebEndpoint: () => string;
 declare const getComponentWebEndpoint: (keyword: string) => string;
-declare const call: ({ name, path: _path, data }: {
+type CallComponentOptions<D = any, P = any> = {
     name?: string;
+    method?: Method;
     path: string;
-    data: any;
-}) => Promise<AxiosResponse<any, any>>;
+    data?: D;
+    params?: P;
+};
+type CallComponent = {
+    (options: CallComponentOptions & {
+        responseType: 'stream';
+    }): Promise<AxiosResponse<IncomingMessage>>;
+    <T = any, D = any, P = any>(options: CallComponentOptions<D, P>): Promise<AxiosResponse<T, D>>;
+};
+declare const call: CallComponent;
 declare const getComponentMountPoint: (keyword: string) => string;
 export { call };
 export { getComponentMountPoint };
@@ -22,11 +33,7 @@ export { getComponentWebEndpoint };
 export { getChildWebEndpoint };
 export { getParentWebEndpoint };
 declare const _default: {
-    call: ({ name, path: _path, data }: {
-        name?: string;
-        path: string;
-        data: any;
-    }) => Promise<AxiosResponse<any, any>>;
+    call: CallComponent;
     getComponentMountPoint: (keyword: string) => string;
     getComponentWebEndpoint: (keyword: string) => string;
     getChildWebEndpoint: (name: string) => string;

package/lib/component/index.js

@@ -4,13 +4,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getParentWebEndpoint = exports.getChildWebEndpoint = exports.getComponentWebEndpoint = exports.getComponentMountPoint = exports.call = void 0;
+const util_1 = require("@blocklet/meta/lib/util");
 const axios_1 = __importDefault(require("axios"));
+const json_stable_stringify_1 = __importDefault(require("json-stable-stringify"));
 const get_1 = __importDefault(require("lodash/get"));
 const url_join_1 = __importDefault(require("url-join"));
-const json_stable_stringify_1 = __importDefault(require("json-stable-stringify"));
-const util_1 = require("@blocklet/meta/lib/util");
-const wallet_1 = __importDefault(require("../wallet"));
 const config_1 = require("../config");
+const wallet_1 = __importDefault(require("../wallet"));
 const parseMountPoints = () => {
     const mountPoints = JSON.parse(process.env.BLOCKLET_MOUNT_POINTS) || [];
     mountPoints.forEach((x) => {
@@ -25,9 +25,14 @@ const sign = (data) => {
     const signData = typeof data === 'undefined' ? {} : data;
     return { 'x-component-sig': wallet.sign((0, json_stable_stringify_1.default)(signData)) };
 };
-const doCall = async ({ url, data }) => {
+const doCall = async ({ url, ...options }) => {
     try {
-        const resp = await axios_1.default.post(url, data, { headers: sign(data), timeout: 60000 });
+        const resp = await (0, axios_1.default)({
+            url,
+            ...options,
+            headers: { ...sign(options.data ?? {}) },
+            timeout: 60000,
+        });
         config_1.logger.info(`call ${url} api success`);
         return resp;
     }
@@ -65,7 +70,7 @@ const getComponentWebEndpoint = (keyword) => {
     return item ? item.webEndpoint : '';
 };
 exports.getComponentWebEndpoint = getComponentWebEndpoint;
-const call = async ({ name, path: _path, data }) => {
+const call = async ({ name, method = 'POST', path: _path, ...options }) => {
     let baseURL;
     if (name) {
         baseURL = getComponentWebEndpoint(name) || getChildWebEndpoint(name);
@@ -77,7 +82,7 @@ const call = async ({ name, path: _path, data }) => {
         throw new Error(`can not find web endpoint for ${name}`);
     }
     const url = (0, url_join_1.default)(baseURL, _path);
-    return doCall({ url, data });
+    return doCall({ url, method, ...options });
 };
 exports.call = call;
 const getComponentMountPoint = (keyword) => {

package/lib/connect/shared.js

@@ -5,23 +5,23 @@ 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 wallet_1 = __importDefault(require("@blocklet/meta/lib/wallet"));
 const jwt_1 = require("@arcblock/jwt");
 const util_1 = require("@blocklet/meta/lib/util");
 const constants_1 = require("../util/constants");
+const wallet_1 = __importDefault(require("../wallet"));
 // wraps value in closure or returns closure
 const closure = (value) => (typeof value === 'function' ? value : () => value);
 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 (0, wallet_1.default)(BLOCKLET_WALLET_TYPE, BLOCKLET_APP_PSK);
     }
     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);
+    return (0, wallet_1.default)(BLOCKLET_WALLET_TYPE, BLOCKLET_APP_SK);
 };
 exports.getDelegatee = getDelegatee;
 const getDelegation = (delegator, delegatee) => {

package/lib/wallet.d.ts

@@ -1,3 +1,13 @@
 import { WalletObject } from '@ocap/wallet';
-declare const getWallet: () => WalletObject;
+import { DIDTypeShortcut } from '@arcblock/did';
+/**
+ * @param {string} [type=process.env.BLOCKLET_WALLET_TYPE] can only be 'eth|ethereum' or 'default|arcblock'
+ * @param {string} [appSk=process.env.BLOCKLET_APP_SK] must be hex
+ * @return {WalletObject}  {WalletObject}
+ */
+declare const getWallet: {
+    (type?: DIDTypeShortcut, appSk?: string): WalletObject;
+    getPermanentWallet: () => WalletObject<string>;
+    getEthereumWallet: (permanent?: boolean) => WalletObject<string>;
+};
 export = getWallet;

package/lib/wallet.js

@@ -1,10 +1,27 @@
 "use strict";
 const wallet_1 = require("@ocap/wallet");
 const mcrypto_1 = require("@ocap/mcrypto");
-const getWallet = () => {
-    const type = process.env.BLOCKLET_WALLET_TYPE !== 'eth'
-        ? (0, wallet_1.WalletType)({ role: mcrypto_1.types.RoleType.ROLE_APPLICATION, pk: mcrypto_1.types.KeyType.ED25519, hash: mcrypto_1.types.HashType.SHA3 })
-        : 'eth';
-    return (0, wallet_1.fromSecretKey)(process.env.BLOCKLET_APP_SK, type);
+const did_1 = require("@arcblock/did");
+/**
+ * @param {string} [type=process.env.BLOCKLET_WALLET_TYPE] can only be 'eth|ethereum' or 'default|arcblock'
+ * @param {string} [appSk=process.env.BLOCKLET_APP_SK] must be hex
+ * @return {WalletObject}  {WalletObject}
+ */
+const getWallet = (type = process.env.BLOCKLET_WALLET_TYPE, appSk = process.env.BLOCKLET_APP_SK) => {
+    let t;
+    let sk;
+    if ((0, did_1.isEthereumType)((0, did_1.DidType)(type))) {
+        sk = appSk.slice(0, 66);
+        t = (0, wallet_1.WalletType)(type);
+    }
+    else {
+        sk = appSk;
+        t = (0, wallet_1.WalletType)({ role: mcrypto_1.types.RoleType.ROLE_APPLICATION, pk: mcrypto_1.types.KeyType.ED25519, hash: mcrypto_1.types.HashType.SHA3 });
+    }
+    return (0, wallet_1.fromSecretKey)(sk, t);
 };
+const getPermanentWallet = () => getWallet(process.env.BLOCKLET_WALLET_TYPE, process.env.BLOCKLET_APP_PSK);
+const getEthereumWallet = (permanent = false) => getWallet('ethereum', permanent ? process.env.BLOCKLET_APP_PSK : process.env.BLOCKLET_APP_SK);
+getWallet.getPermanentWallet = getPermanentWallet;
+getWallet.getEthereumWallet = getEthereumWallet;
 module.exports = getWallet;

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.0-beta-b16cb035",
+  "version": "1.16.0-beta-1d6c582e",
   "description": "graphql client to read/write data on abt node",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -26,18 +26,19 @@
   "author": "linchen1987 <linchen.1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/client": "1.16.0-beta-b16cb035",
-    "@abtnode/constant": "1.16.0-beta-b16cb035",
-    "@arcblock/did-auth": "1.18.59",
-    "@arcblock/jwt": "1.18.59",
-    "@arcblock/ws": "1.18.59",
-    "@blocklet/constant": "1.16.0-beta-b16cb035",
-    "@blocklet/meta": "1.16.0-beta-b16cb035",
+    "@abtnode/client": "1.16.0-beta-1d6c582e",
+    "@abtnode/constant": "1.16.0-beta-1d6c582e",
+    "@arcblock/did": "1.18.62",
+    "@arcblock/did-auth": "1.18.62",
+    "@arcblock/jwt": "1.18.62",
+    "@arcblock/ws": "1.18.62",
+    "@blocklet/constant": "1.16.0-beta-1d6c582e",
+    "@blocklet/meta": "1.16.0-beta-1d6c582e",
     "@did-connect/authenticator": "^2.1.44",
     "@did-connect/handler": "^2.1.44",
     "@nedb/core": "^2.1.5",
-    "@ocap/mcrypto": "1.18.59",
-    "@ocap/wallet": "1.18.59",
+    "@ocap/mcrypto": "1.18.62",
+    "@ocap/wallet": "1.18.62",
     "axios": "^0.27.2",
     "cheerio": "^1.0.0-rc.12",
     "fs-extra": "^10.1.0",
@@ -70,5 +71,5 @@
     "ts-node": "^10.9.1",
     "typescript": "^4.8.4"
   },
-  "gitHead": "138bd91aee5a35b28c2de4e1e924c44932efaf3a"
+  "gitHead": "209fa1413ae05d8961942b2c21f2d83df66f4b68"
 }