@blocklet/sdk 1.16.27 → 1.16.28-beta-bfbab430

package/lib/component/index.d.ts

@@ -27,6 +27,10 @@ declare const getResourceExportDir: ({ projectId, releaseId }?: {
     projectId: string;
     releaseId?: string;
 }) => string;
+declare const getReleaseExportDir: ({ projectId, releaseId }: {
+    projectId: string;
+    releaseId?: string;
+}) => string;
 declare const getResources: ({ scope, types, skipRunningCheck, }?: {
     scope?: 'all' | 'pack' | 'excludePack';
     did?: string;
@@ -49,6 +53,7 @@ export { getComponentMountPoint };
 export { getComponentWebEndpoint };
 export { waitForComponentRunning };
 export { getResourceExportDir };
+export { getReleaseExportDir };
 export { getResources };
 export { getPackResources };
 declare const _default: {
@@ -61,6 +66,10 @@ declare const _default: {
         projectId: string;
         releaseId?: string;
     }) => string;
+    getReleaseExportDir: ({ projectId, releaseId }: {
+        projectId: string;
+        releaseId?: string;
+    }) => string;
     getResources: ({ scope, types, skipRunningCheck, }?: {
         scope?: "all" | "pack" | "excludePack";
         did?: string;

package/lib/component/index.js

@@ -26,11 +26,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPackResources = exports.getResources = exports.getResourceExportDir = exports.waitForComponentRunning = exports.getComponentWebEndpoint = exports.getComponentMountPoint = exports.getUrl = exports.call = void 0;
+exports.getPackResources = exports.getResources = exports.getReleaseExportDir = exports.getResourceExportDir = exports.waitForComponentRunning = exports.getComponentWebEndpoint = exports.getComponentMountPoint = exports.getUrl = exports.call = void 0;
 const path_1 = require("path");
 const axios_1 = __importDefault(require("axios"));
 const get_1 = __importDefault(require("lodash/get"));
-const url_join_1 = __importDefault(require("url-join"));
+const ufo_1 = require("ufo");
 const wait_port_1 = __importDefault(require("wait-port"));
 const constant_1 = require("@blocklet/constant");
 const config_1 = require("../config");
@@ -82,7 +82,7 @@ const call = async ({ name, method = 'POST', path: _path, ...options }) => {
     if (!baseURL) {
         throw new Error(`can not find web endpoint for ${name}`);
     }
-    const url = (0, url_join_1.default)(baseURL, _path);
+    const url = (0, ufo_1.joinURL)(baseURL, _path);
     try {
         const resp = await doCall({ url, method, ...options });
         return resp;
@@ -103,7 +103,7 @@ exports.getComponentMountPoint = getComponentMountPoint;
 const getUrl = (...parts) => {
     const { BLOCKLET_COMPONENT_DID, BLOCKLET_APP_URL } = process.env;
     const mountPoint = getComponentMountPoint(BLOCKLET_COMPONENT_DID);
-    return (0, url_join_1.default)(BLOCKLET_APP_URL, mountPoint === '/' ? '' : mountPoint, ...parts);
+    return (0, ufo_1.joinURL)(BLOCKLET_APP_URL, mountPoint === '/' ? '' : mountPoint, ...parts);
 };
 exports.getUrl = getUrl;
 const getResourceExportDir = ({ projectId, releaseId } = { projectId: '' }) => {
@@ -119,6 +119,18 @@ const getResourceExportDir = ({ projectId, releaseId } = { projectId: '' }) => {
     return dir;
 };
 exports.getResourceExportDir = getResourceExportDir;
+const getReleaseExportDir = ({ projectId, releaseId }) => {
+    if (!projectId) {
+        throw new Error('getReleaseExportDir: projectId is required');
+    }
+    const dirArr = [process.env.BLOCKLET_APP_DATA_DIR, constant_1.PROJECT.DIR, projectId];
+    if (releaseId) {
+        dirArr.push(constant_1.PROJECT.RELEASE_DIR, releaseId || '/');
+    }
+    const dir = (0, path_1.join)(...dirArr);
+    return dir;
+};
+exports.getReleaseExportDir = getReleaseExportDir;
 const getResources = ({ scope = 'all', types, skipRunningCheck, } = {}) => {
     return Util.getResources({ components: config_1.components, scope, types, skipRunningCheck });
 };
@@ -137,10 +149,13 @@ const waitForComponentRunning = async (name, timeout = 30000, interval = 250) =>
         throw new Error(`can not find port for component ${name}`);
     }
     const result = await (0, wait_port_1.default)({ host: '127.0.0.1', port, timeout, interval });
-    if (result.open) {
+    if (typeof result === 'boolean' && result) {
+        return true;
+    }
+    if (typeof result.open === 'boolean' && result.open) {
         return true;
     }
-    throw new Error(`component ${name} is not running not unreachable`);
+    throw new Error(`component ${name} is not running or unreachable`);
 };
 exports.waitForComponentRunning = waitForComponentRunning;
 exports.default = {
@@ -150,6 +165,7 @@ exports.default = {
     getComponentWebEndpoint,
     waitForComponentRunning,
     getResourceExportDir,
+    getReleaseExportDir,
     getResources,
     getPackResources,
 };

package/lib/config.js

@@ -8,7 +8,7 @@ exports._handleComponentConfigUpdate = exports._handleComponentRemoved = exports
 /* eslint-disable no-console */
 const path_1 = __importDefault(require("path"));
 const fs_1 = __importDefault(require("fs"));
-const url_join_1 = __importDefault(require("url-join"));
+const ufo_1 = require("ufo");
 const events_1 = __importDefault(require("events"));
 const cloneDeep_1 = __importDefault(require("lodash/cloneDeep"));
 const throttle_1 = __importDefault(require("lodash/throttle"));
@@ -229,7 +229,7 @@ const fetchBlockletJs = async () => {
     const componentDid = process.env.BLOCKLET_COMPONENT_DID;
     try {
         const { mountPoint } = componentStore.find((x) => x.did === componentDid);
-        const res = await axios_1.default.get((0, url_join_1.default)(env.appUrl, mountPoint === '/' ? '' : mountPoint, `__blocklet__.js?force=1&t=${Date.now()}`), {
+        const res = await axios_1.default.get((0, ufo_1.joinURL)(env.appUrl, mountPoint === '/' ? '' : mountPoint, `__blocklet__.js?force=1&t=${Date.now()}`), {
             timeout: 8000,
             headers: {
                 'User-Agent': `BlockletSDK/${version_1.version}`,

package/lib/middlewares/fallback.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 const fs_1 = require("fs");
 const path_1 = require("path");
-const url_join_1 = __importDefault(require("url-join"));
+const ufo_1 = require("ufo");
 const escape_1 = __importDefault(require("lodash/escape"));
 const config_1 = require("../config");
 const fallback = (file, options = {}) => {
@@ -22,7 +22,7 @@ const fallback = (file, options = {}) => {
             const pageData = typeof options.getPageData === 'function' ? await options.getPageData(req) : {};
             pageData.title = (0, escape_1.default)(pageData.title || config_1.env.appName);
             pageData.description = (0, escape_1.default)(pageData.description || config_1.env.appDescription);
-            pageData.ogImage = pageData.ogImage || (0, url_join_1.default)(config_1.env.appUrl || '/', '/.well-known/service/blocklet/og.png');
+            pageData.ogImage = pageData.ogImage || (0, ufo_1.joinURL)(config_1.env.appUrl || '/', '/.well-known/service/blocklet/og.png');
             let source = sourceRaw.slice(0);
             // inject seo title
             if (pageData.title) {

package/lib/service/auth.d.ts

@@ -59,5 +59,6 @@ interface AuthService {
     deletePermission(name: string): Promise<Client.GeneralResponse>;
     getBlocklet(attachRuntimeInfo?: boolean): Promise<Client.ResponseBlocklet>;
     clearCache(args?: OmitTeamDid<Client.RequestClearCacheInput>): Promise<Client.ResponseClearCache>;
+    getComponent(did: string): Promise<Client.ComponentState>;
 }
 export = AuthService;

package/lib/service/auth.js

@@ -6,7 +6,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 /* eslint-disable max-classes-per-file */
 /* eslint-disable @typescript-eslint/indent */
 const pickBy_1 = __importDefault(require("lodash/pickBy"));
-const url_join_1 = __importDefault(require("url-join"));
+const ufo_1 = require("ufo");
 const client_1 = __importDefault(require("@abtnode/client"));
 const semver_1 = __importDefault(require("semver"));
 const mcrypto_1 = require("@ocap/mcrypto");
@@ -14,6 +14,7 @@ const wallet_1 = require("@ocap/wallet");
 const env_1 = require("@blocklet/env");
 const constant_1 = __importDefault(require("@abtnode/constant"));
 const constant_2 = require("@blocklet/constant");
+const util_1 = require("@blocklet/meta/lib/util");
 const check_blocklet_env_1 = __importDefault(require("../util/check-blocklet-env"));
 const version_1 = require("../version");
 const wallet_2 = __importDefault(require("../wallet"));
@@ -29,7 +30,7 @@ const type = chainType !== 'ethereum' && chainType !== 'eth'
 const fixAvatar = (user) => {
     const avatar = user?.avatar;
     if (avatar && avatar.startsWith(USER_AVATAR_URL_PREFIX)) {
-        user.avatar = (0, url_join_1.default)(WELLKNOWN_SERVICE_PATH_PREFIX, USER_AVATAR_PATH_PREFIX, avatar.replace(USER_AVATAR_URL_PREFIX, ''));
+        user.avatar = (0, ufo_1.joinURL)(WELLKNOWN_SERVICE_PATH_PREFIX, USER_AVATAR_PATH_PREFIX, avatar.replace(USER_AVATAR_URL_PREFIX, ''));
     }
     return user;
 };
@@ -64,10 +65,11 @@ class AuthService {
     constructor(httpEndpoint) {
         const client = new AuthClient(httpEndpoint);
         const apiList = [
-            // user
+            // session
             'login',
             'switchProfile',
             'refreshSession',
+            // user
             'getUsers',
             'getUsersCount',
             'getUsersCountPerRole',
@@ -115,6 +117,7 @@ class AuthService {
             // 'configTrustedFactories',
             // blocklet
             'getBlocklet',
+            'getComponent',
             'clearCache',
         ];
         const teamDid = process.env.BLOCKLET_DID;
@@ -185,6 +188,10 @@ class AuthService {
                 throw new Error(err.response ? err.response.data : err.message);
             }
         };
+        this.getComponent = async (did) => {
+            const { blocklet } = await this.getBlocklet();
+            return (0, util_1.findComponentByIdV2)(blocklet, did);
+        };
         // eslint-disable-next-line no-constructor-return
         return new Proxy(this, {
             get(target, propKey) {

package/lib/types/notification.d.ts

@@ -111,6 +111,7 @@ export interface TSendOptions {
      * Any Property
      */
     [x: string]: any;
+    channels?: ('app' | 'email' | 'push' | 'webhook')[];
     keepForOfflineUser?: boolean;
     locale?: string;
 }

package/lib/util/send-notification.js

@@ -33,6 +33,7 @@ const JWT = __importStar(require("@arcblock/jwt"));
 const constant_1 = __importDefault(require("@abtnode/constant"));
 const channel_1 = require("@blocklet/meta/lib/channel");
 const did_1 = require("@arcblock/did");
+const ufo_1 = require("ufo");
 const index_1 = require("../validators/index");
 const constants_1 = require("./constants");
 const version_1 = require("../version");
@@ -53,7 +54,7 @@ const getRequestHeaders = () => ({ 'User-Agent': `BlockletSDK/${VERSION}` });
  * @returns
  */
 const sendToUser = async (receiver, notification, { appDid, appSk, type }, port = process.env.ABT_NODE_SERVICE_PORT, options = {}, pathname = 'send-to-user') => {
-    if (pathname === 'send-to-user') {
+    if (['send-to-user', 'send-to-push-kit'].includes(pathname)) {
         await (0, index_1.validateReceiver)(receiver);
     }
     if (pathname === 'send-to-mail') {
@@ -65,7 +66,7 @@ const sendToUser = async (receiver, notification, { appDid, appSk, type }, port
         await (0, index_1.validateNotification)(notification);
     }
     try {
-        const { data: res } = await axios.post(`http://127.0.0.1:${port}${constants_1.SERVICE_PREFIX}/api/${pathname}`, {
+        const { data: res } = await axios.post((0, ufo_1.joinURL)(`http://127.0.0.1:${port}`, constants_1.SERVICE_PREFIX, 'api', pathname), {
             apiVersion: VERSION,
             data: {
                 sender: {

package/lib/util/verify-sign.d.ts

@@ -1,9 +1,10 @@
 import { DIDTypeShortcut } from '@arcblock/did';
-declare const verify: (data: object, sig: string, { type, appSk }?: {
+declare const verify: (data: object, sig: string, { type, appSk, appPk, }?: {
     type?: DIDTypeShortcut;
     appSk?: string;
-}) => boolean;
-declare const sign: (data: object, { type, appSk }?: {
+    appPk?: string;
+}) => any;
+declare const sign: (data: object, { type, appSk, }?: {
     type?: DIDTypeShortcut;
     appSk?: string;
 }) => string;

package/lib/util/verify-sign.js

@@ -2,19 +2,48 @@
 /*
  * @Description: 用于 sdk 中调用 blocklet-service 接口时的加解密工具库
  */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.sign = exports.verify = void 0;
 const json_stable_stringify_1 = __importDefault(require("json-stable-stringify"));
-const wallet_1 = __importDefault(require("../wallet"));
-const verify = (data, sig, { type, appSk } = {}) => {
+const wallet_1 = __importStar(require("../wallet"));
+const verify = (data, sig, { type, appSk, appPk, } = {}) => {
     try {
         if (!sig) {
             throw new Error('empty sig');
         }
-        const wallet = (0, wallet_1.default)(type, appSk);
+        let wallet;
+        if (appPk) {
+            wallet = (0, wallet_1.getPkWallet)(type, appPk);
+        }
+        else {
+            wallet = (0, wallet_1.default)(type, appSk);
+        }
         const verified = wallet.verify((0, json_stable_stringify_1.default)(data || {}), sig);
         return verified;
     }
@@ -23,7 +52,7 @@ const verify = (data, sig, { type, appSk } = {}) => {
     }
 };
 exports.verify = verify;
-const sign = (data, { type, appSk } = {}) => {
+const sign = (data, { type, appSk, } = {}) => {
     const wallet = (0, wallet_1.default)(type, appSk);
     return wallet.sign((0, json_stable_stringify_1.default)(data || {}));
 };

package/lib/validators/notification.js

@@ -206,6 +206,7 @@ const inputReceiverSchema = Joi.array().items(receiverSchema).single().required(
 const optionSchema = Joi.object({
     keepForOfflineUser: Joi.boolean(),
     locale: Joi.string(),
+    channels: Joi.array().items(Joi.allow('app', 'email', 'push', 'webhook')).optional(),
 })
     .unknown()
     .meta({ className: 'TSendOptions', unknownType: 'any' });

package/lib/version.d.ts

@@ -1,4 +1,4 @@
-declare const version = "1.16.27";
+declare const version = "1.16.28";
 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.16.27';
+const version = '1.16.28';
 exports.version = version;
 exports.default = { version };

package/lib/wallet.d.ts

@@ -9,5 +9,6 @@ declare const getWallet: {
     (type?: DIDTypeShortcut, appSk?: string): WalletObject;
     getPermanentWallet: () => WalletObject<string>;
     getEthereumWallet: (permanent?: boolean) => WalletObject<string>;
+    getPkWallet(type?: DIDTypeShortcut, appPk?: string): WalletObject<string>;
 };
 export = getWallet;

package/lib/wallet.js

@@ -28,4 +28,20 @@ const getPermanentWallet = () => getWallet(process.env.CHAIN_TYPE || process.env
 const getEthereumWallet = (permanent = false) => getWallet('ethereum', permanent ? process.env.BLOCKLET_APP_PSK : process.env.BLOCKLET_APP_SK);
 getWallet.getPermanentWallet = getPermanentWallet;
 getWallet.getEthereumWallet = getEthereumWallet;
+getWallet.getPkWallet = (type, appPk = process.env.BLOCKLET_APP_PK) => {
+    let t;
+    let sk;
+    // BLOCKLET_WALLET_TYPE is for backward compatibility
+    // eslint-disable-next-line no-param-reassign
+    type = type || process.env.CHAIN_TYPE || process.env.BLOCKLET_WALLET_TYPE;
+    if ((0, did_1.isEthereumType)((0, did_1.DidType)(type))) {
+        sk = appPk.slice(0, 66);
+        t = (0, wallet_1.WalletType)(type);
+    }
+    else {
+        sk = appPk;
+        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.fromPublicKey)(sk, t);
+};
 module.exports = getWallet;

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.27",
+  "version": "1.16.28-beta-bfbab430",
   "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",
-    "@abtnode/constant": "1.16.27",
+    "@abtnode/client": "1.16.28-beta-bfbab430",
+    "@abtnode/constant": "1.16.28-beta-bfbab430",
     "@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",
-    "@blocklet/env": "1.16.27",
-    "@blocklet/meta": "1.16.27",
+    "@blocklet/constant": "1.16.28-beta-bfbab430",
+    "@blocklet/env": "1.16.28-beta-bfbab430",
+    "@blocklet/meta": "1.16.28-beta-bfbab430",
     "@did-connect/authenticator": "^2.2.4",
     "@did-connect/handler": "^2.2.4",
     "@nedb/core": "^2.1.5",
@@ -51,7 +51,6 @@
     "semver": "^7.3.8",
     "sitemap": "^7.1.1",
     "ufo": "^1.1.1",
-    "url-join": "^4.0.1",
     "wait-port": "^1.1.0"
   },
   "resolutions": {
@@ -76,5 +75,5 @@
     "ts-node": "^10.9.1",
     "typescript": "^5.0.4"
   },
-  "gitHead": "b7dcd46b040c5ad3a273b14b1a411fafc1390828"
+  "gitHead": "f1fbf0752de46be00d1faa0d54eb7d28016e0bb9"
 }