@blocklet/sdk 1.16.11-next-a232f5fb → 1.16.11-next-3d2b39f7

package/lib/component/index.d.ts

@@ -1,14 +1,6 @@
 /// <reference types="node" />
 import { AxiosResponse, Method } from 'axios';
 import { IncomingMessage } from 'http';
-export type MountPoint = {
-    did: string;
-    name: string;
-    title: string;
-    port: number;
-    webEndpoint: string;
-    mountPoint: string;
-};
 declare const getChildWebEndpoint: (name: string) => string;
 declare const getParentWebEndpoint: () => string;
 declare const getComponentWebEndpoint: (keyword: string) => string;

package/lib/component/index.js

@@ -8,17 +8,9 @@ const util_1 = require("@blocklet/meta/lib/util");
 const axios_1 = __importDefault(require("axios"));
 const get_1 = __importDefault(require("lodash/get"));
 const url_join_1 = __importDefault(require("url-join"));
+const constant_1 = require("@blocklet/constant");
 const config_1 = require("../config");
 const verify_sign_1 = require("../util/verify-sign");
-const parseMountPoints = () => {
-    const mountPoints = JSON.parse(process.env.BLOCKLET_MOUNT_POINTS) || [];
-    mountPoints.forEach((x) => {
-        if (x.port) {
-            x.webEndpoint = `http://127.0.0.1:${x.port}`;
-        }
-    });
-    return mountPoints;
-};
 const doCall = async ({ url, ...options }) => {
     try {
         const resp = await (0, axios_1.default)({
@@ -33,13 +25,16 @@ const doCall = async ({ url, ...options }) => {
         return resp;
     }
     catch (error) {
+        delete error.config;
+        delete error.request;
+        delete error.response;
         config_1.logger.error(`call ${url} api failed`, {
             url,
             responseStatus: (0, get_1.default)(error, 'response.status'),
             responseData: (0, get_1.default)(error, 'response.data'),
             error,
         });
-        throw new Error(`call ${url} api failed`);
+        throw new Error(`call ${url} api failed: ${error.message}`);
     }
 };
 const parsePorts = () => JSON.parse(process.env.BLOCKLET_WEB_PORTS);
@@ -60,30 +55,42 @@ const getParentWebEndpoint = () => {
     return getWebEndpoint(parentName);
 };
 exports.getParentWebEndpoint = getParentWebEndpoint;
+const getComponent = (name) => {
+    const item = config_1.components.find((x) => [x.title, x.name, x.did].includes(name));
+    return item;
+};
 const getComponentWebEndpoint = (keyword) => {
-    const mountPoints = parseMountPoints();
-    const item = mountPoints.find((x) => [x.title, x.name, x.did].includes(keyword));
+    const item = getComponent(keyword);
     return item ? item.webEndpoint : '';
 };
 exports.getComponentWebEndpoint = getComponentWebEndpoint;
 const call = async ({ name, method = 'POST', path: _path, ...options }) => {
-    let baseURL;
-    if (name) {
-        baseURL = getComponentWebEndpoint(name) || getChildWebEndpoint(name);
+    if (!name) {
+        throw new Error('component.call: name is required');
     }
-    else {
-        baseURL = getParentWebEndpoint();
+    const component = getComponent(name);
+    if (!component) {
+        throw new Error(`can not find component ${name}`);
     }
+    const baseURL = component.webEndpoint;
     if (!baseURL) {
         throw new Error(`can not find web endpoint for ${name}`);
     }
     const url = (0, url_join_1.default)(baseURL, _path);
-    return doCall({ url, method, ...options });
+    try {
+        const resp = await doCall({ url, method, ...options });
+        return resp;
+    }
+    catch (error) {
+        if (component.status !== constant_1.BlockletStatus.running) {
+            throw new Error(`component ${name} is not running`);
+        }
+        throw error;
+    }
 };
 exports.call = call;
 const getComponentMountPoint = (keyword) => {
-    const mountPoints = parseMountPoints();
-    const item = mountPoints.find((x) => [x.title, x.name, x.did].includes(keyword));
+    const item = getComponent(keyword);
     return item ? item.mountPoint : '';
 };
 exports.getComponentMountPoint = getComponentMountPoint;
@@ -92,5 +99,5 @@ exports.default = {
     getComponentMountPoint,
     getComponentWebEndpoint,
     getChildWebEndpoint,
-    getParentWebEndpoint,
+    getParentWebEndpoint, // deprecated
 };

package/lib/config.d.ts

@@ -1,4 +1,5 @@
-export declare const logger: {
+import { TComponentInternalInfo } from '@blocklet/meta/lib/util';
+declare const logger: {
     info: {
         (...data: any[]): void;
         (message?: any, ...optionalParams: any[]): void;
@@ -13,6 +14,29 @@ export declare const logger: {
         (message?: any, ...optionalParams: any[]): void;
     };
 };
+declare const env: Readonly<{
+    appId: string;
+    appPid: string;
+    appIds: string[];
+    appName: string;
+    appDescription: string;
+    appUrl: string;
+    isComponent: boolean;
+    dataDir: string;
+    cacheDir: string;
+    mode: string;
+    appStorageEndpoint: string;
+    serverVersion: string;
+    preferences: {
+        [key: string]: any;
+    };
+}>;
+type MountPoint = TComponentInternalInfo & {
+    webEndpoint: string;
+};
+type TComponents = Array<MountPoint>;
+declare const components: TComponents;
+export { logger, env, components, MountPoint };
 declare const _default: {
     logger: {
         info: {
@@ -29,5 +53,23 @@ declare const _default: {
             (message?: any, ...optionalParams: any[]): void;
         };
     };
+    env: Readonly<{
+        appId: string;
+        appPid: string;
+        appIds: string[];
+        appName: string;
+        appDescription: string;
+        appUrl: string;
+        isComponent: boolean;
+        dataDir: string;
+        cacheDir: string;
+        mode: string;
+        appStorageEndpoint: string;
+        serverVersion: string;
+        preferences: {
+            [key: string]: any;
+        };
+    }>;
+    components: TComponents;
 };
 export default _default;

package/lib/config.js

@@ -1,8 +1,29 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.logger = void 0;
+exports.components = exports.env = exports.logger = void 0;
 /* eslint-disable no-console */
-exports.logger = {
+const events_1 = __importDefault(require("events"));
+const cloneDeep_1 = __importDefault(require("lodash/cloneDeep"));
+const env_1 = __importDefault(require("@blocklet/env"));
+const constant_1 = require("@blocklet/constant");
+const notification_1 = __importDefault(require("./service/notification"));
+const emitter = new events_1.default();
+const Events = {
+    componentsUpdate: 'componentsUpdate',
+    envUpdate: 'envUpdate',
+};
+const AppConfigKeyMap = {
+    BLOCKLET_APP_NAME: 'appName',
+    BLOCKLET_APP_DESCRIPTION: 'appDescription',
+    BLOCKLET_APP_URL: 'appUrl',
+    BLOCKLET_APP_SPACE_ENDPOINT: 'appStorageEndpoint',
+    ABT_NODE_VERSION: 'serverVersion',
+    ABT_NODE: 'serverVersion', // for backup compatibility
+};
+const logger = {
     info: console.log,
     debug: (...args) => {
         if (process.env.NODE_ENV === 'development') {
@@ -12,6 +33,43 @@ exports.logger = {
     warn: console.warn,
     error: console.error,
 };
+exports.logger = logger;
+const env = (0, cloneDeep_1.default)(env_1.default);
+exports.env = env;
+const parseComponents = () => {
+    const mountPoints = JSON.parse(process.env.BLOCKLET_MOUNT_POINTS || '[]') || [];
+    mountPoints.forEach((x) => {
+        if (x.port) {
+            x.webEndpoint = `http://127.0.0.1:${x.port}`;
+        }
+    });
+    return mountPoints;
+};
+const components = parseComponents();
+exports.components = components;
+const inRuntimeEnv = !!process.env.BLOCKLET_APP_SK;
+if (inRuntimeEnv) {
+    notification_1.default.on(constant_1.BlockletInternalEvents.componentsUpdated, (data) => {
+        components.splice(0, components.length);
+        components.push(...data.components.map((x) => {
+            if (x.port) {
+                x.webEndpoint = `http://127.0.0.1:${x.port}`;
+            }
+            return x;
+        }));
+        emitter.emit(Events.componentsUpdate, components);
+    });
+    notification_1.default.on(constant_1.BlockletInternalEvents.appConfigChanged, (data) => {
+        const configObj = (data.configs || []).reduce(({ key, value }, o) => {
+            o[AppConfigKeyMap[key] || key] = value;
+            return o;
+        }, {});
+        Object.assign(env, configObj);
+        emitter.emit(Events.envUpdate, configObj);
+    });
+}
 exports.default = {
-    logger: exports.logger,
+    logger,
+    env,
+    components,
 };

package/lib/index.d.ts

@@ -9,9 +9,9 @@ import createConnectHandlers from './connect/handler';
 import Database from './database/index';
 import middlewares from './middlewares/index';
 import getWallet from './wallet';
-import Component, { MountPoint } from './component/index';
+import Component from './component/index';
 import Security from './security/index';
-import config from './config';
+import config, { MountPoint } from './config';
 export { Auth as AuthService };
 export { Auth };
 export { Notification as NotificationService };

package/lib/service/notification.js

@@ -32,6 +32,7 @@ const Jwt = __importStar(require("@arcblock/jwt"));
 const events_1 = __importDefault(require("events"));
 const ws_1 = require("@arcblock/ws");
 const channel_1 = require("@blocklet/meta/lib/channel");
+const constant_1 = require("@blocklet/constant");
 const check_blocklet_env_1 = __importDefault(require("../util/check-blocklet-env"));
 const send_notification_1 = require("../util/send-notification");
 const constants_1 = require("../util/constants");
@@ -116,6 +117,18 @@ const initClient = () => {
             console.error(msg);
             emitError({ message: msg });
         });
+        appPublicChannel
+            .join()
+            .receive('error', (err) => {
+            const msg = `join channel error: ${err.message}`;
+            console.error(msg);
+            emitter.emit('error', { message: msg });
+        })
+            .receive('timeout', () => {
+            const msg = 'join channel timeout';
+            console.error(msg);
+            emitter.emit('error', { message: msg });
+        });
         messageChannel.on('message', ({ status, response } = {}) => {
             if (status === 'ok') {
                 messageEmitter.emit(response.type, response);
@@ -131,17 +144,27 @@ const initClient = () => {
                 });
             }
         });
-        appPublicChannel
-            .join()
-            .receive('error', (err) => {
-            const msg = `join channel error: ${err.message}`;
-            console.error(msg);
-            emitter.emit('error', { message: msg });
-        })
-            .receive('timeout', () => {
-            const msg = 'join channel timeout';
-            console.error(msg);
-            emitter.emit('error', { message: msg });
+        [constant_1.BlockletInternalEvents.componentsUpdated, constant_1.BlockletInternalEvents.appConfigChanged].forEach((event) => {
+            messageChannel.on(event, ({ status, response } = {}) => {
+                if (status === 'ok') {
+                    const { data, sender } = response;
+                    // verify sender is server
+                    if (!Jwt.verify(sender.token, process.env.ABT_NODE_PK)) {
+                        const message = `verify sender failed in internal events. event: ${event}, sender: ${JSON.stringify(sender)}`;
+                        emitError({ message });
+                        console.error(message);
+                        return;
+                    }
+                    emitter.emit(event, data);
+                }
+                else {
+                    emitError(response);
+                    console.error({
+                        status,
+                        response,
+                    });
+                }
+            });
         });
         appPublicChannel.on(notification_1.NOTIFICATION_TYPES.HI, ({ status, response } = {}) => {
             if (status === 'ok') {

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.11-next-a232f5fb",
+  "version": "1.16.11-next-3d2b39f7",
   "description": "graphql client to read/write data on abt node",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -26,15 +26,15 @@
   "author": "linchen1987 <linchen.1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/client": "1.16.11-next-a232f5fb",
-    "@abtnode/constant": "1.16.11-next-a232f5fb",
+    "@abtnode/client": "1.16.11-next-3d2b39f7",
+    "@abtnode/constant": "1.16.11-next-3d2b39f7",
     "@arcblock/did": "1.18.80",
     "@arcblock/did-auth": "1.18.80",
     "@arcblock/jwt": "1.18.80",
     "@arcblock/ws": "1.18.80",
-    "@blocklet/constant": "1.16.11-next-a232f5fb",
-    "@blocklet/env": "1.16.11-next-a232f5fb",
-    "@blocklet/meta": "1.16.11-next-a232f5fb",
+    "@blocklet/constant": "1.16.11-next-3d2b39f7",
+    "@blocklet/env": "1.16.11-next-3d2b39f7",
+    "@blocklet/meta": "1.16.11-next-3d2b39f7",
     "@did-connect/authenticator": "^2.1.59",
     "@did-connect/handler": "^2.1.59",
     "@nedb/core": "^2.1.5",
@@ -73,5 +73,5 @@
     "ts-node": "^10.9.1",
     "typescript": "^5.0.4"
   },
-  "gitHead": "1af264e9b6648aa191fbf23c67717262ac717697"
+  "gitHead": "d0142bd2d1e49b94dcb5542d78e294a7b2258faa"
 }