@blocklet/sdk 1.16.34-beta-20241126-120125-d0907434 → 1.16.34-beta-20241129-100152-679bd732

package/lib/component/index.js

@@ -45,6 +45,7 @@ const constant_1 = require("@blocklet/constant");
 const config_1 = require("../config");
 const Util = __importStar(require("./util"));
 const component_api_1 = __importDefault(require("../util/component-api"));
+const parse_docker_endpoint_1 = require("../util/parse-docker-endpoint");
 const doCall = async ({ url, headers = {}, ...options }) => {
     try {
         const resp = await (0, component_api_1.default)({
@@ -72,7 +73,8 @@ const getComponent = (name) => {
 };
 const getComponentWebEndpoint = (keyword) => {
     const item = getComponent(keyword);
-    return item ? item.webEndpoint : '';
+    const endpoint = item ? item.webEndpoint : '';
+    return (0, parse_docker_endpoint_1.parseDockerComponentEndpoint)(endpoint, item);
 };
 exports.getComponentWebEndpoint = getComponentWebEndpoint;
 const call = async ({ name, method = 'POST', path: _path, ...options }) => {
@@ -83,7 +85,7 @@ const call = async ({ name, method = 'POST', path: _path, ...options }) => {
     if (!component) {
         throw new Error(`can not find component ${name}`);
     }
-    const baseURL = component.webEndpoint;
+    const baseURL = (0, parse_docker_endpoint_1.parseDockerComponentEndpoint)(component.webEndpoint, component);
     if (!baseURL) {
         throw new Error(`can not find web endpoint for ${name}`);
     }
@@ -159,7 +161,7 @@ const waitForComponentRunning = async (name, timeout = 30000, interval = 250) =>
     if (!port) {
         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 });
+    const result = await (0, wait_port_1.default)({ host: (0, parse_docker_endpoint_1.parseDockerComponentHost)(component), port, timeout, interval });
     if (typeof result === 'boolean' && result) {
         return true;
     }

package/lib/config.js

@@ -23,6 +23,7 @@ const version_1 = require("./version");
 const notification_1 = __importDefault(require("./service/notification"));
 const server_version_1 = __importDefault(require("./util/server-version"));
 const parse_env_file_1 = require("./util/parse-env-file");
+const parse_docker_endpoint_1 = require("./util/parse-docker-endpoint");
 const debug = (0, debug_1.default)('@blocklet/sdk:config');
 const events = new events_1.EventEmitter();
 exports.events = events;
@@ -107,7 +108,7 @@ exports.env = env;
 const _fillWebEndpoint = (components) => {
     components.forEach((x) => {
         if (x.port) {
-            x.webEndpoint = `http://127.0.0.1:${x.port}`;
+            x.webEndpoint = (0, parse_docker_endpoint_1.parseDockerComponentEndpoint)(`http://127.0.0.1:${x.port}`, x);
         }
     });
 };
@@ -138,7 +139,7 @@ const _handleComponentUpdateOld = (data) => {
     componentStore.splice(0, componentStore.length);
     componentStore.push(...data.components.map((x) => {
         if (x.port) {
-            x.webEndpoint = `http://127.0.0.1:${x.port}`;
+            x.webEndpoint = (0, parse_docker_endpoint_1.parseDockerComponentEndpoint)(`http://127.0.0.1:${x.port}`, x);
         }
         return x;
     }));

package/lib/service/auth.js

@@ -19,6 +19,7 @@ const check_blocklet_env_1 = __importDefault(require("../util/check-blocklet-env
 const version_1 = require("../version");
 const wallet_2 = __importDefault(require("../wallet"));
 const service_api_1 = __importDefault(require("../util/service-api"));
+const parse_docker_endpoint_1 = require("../util/parse-docker-endpoint");
 const { WELLKNOWN_SERVICE_PATH_PREFIX, USER_AVATAR_URL_PREFIX, USER_AVATAR_PATH_PREFIX } = constant_1.default;
 const VERSION = version_1.version; // version of notification sdk
 const isNotNullOrUndefined = (x) => ![null, undefined].includes(x);
@@ -38,7 +39,7 @@ const toBuffer = (str) => (str.startsWith('0x') ? Buffer.from(str.slice(2), 'hex
 class AuthClient extends client_1.default {
     constructor(httpEndpoint) {
         (0, check_blocklet_env_1.default)();
-        super(httpEndpoint || `http://127.0.0.1:${process.env.ABT_NODE_PORT}/api/gql`.trim(), `BlockletSDK/${VERSION}`);
+        super(httpEndpoint || `http://${(0, parse_docker_endpoint_1.getServerHost)()}:${process.env.ABT_NODE_PORT}/api/gql`.trim(), `BlockletSDK/${VERSION}`);
         const wallet = (0, wallet_2.default)();
         const useNewSigner = !env_1.serverVersion || semver_1.default.gte(env_1.serverVersion, '1.16.7');
         this.setAuthAccessKey({

package/lib/service/notification.js

@@ -49,6 +49,7 @@ const send_notification_1 = require("../util/send-notification");
 const constants_1 = require("../util/constants");
 const wallet_1 = __importStar(require("../wallet"));
 const notification_1 = require("../validators/notification");
+const parse_docker_endpoint_1 = require("../util/parse-docker-endpoint");
 const debug = (0, debug_1.default)('@blocklet/sdk:notification');
 const getSender = () => {
     const wallet = (0, wallet_1.default)();
@@ -126,7 +127,7 @@ const initClient = () => {
         const wallet = (0, wallet_1.getPermanentWallet)();
         const componentDid = process.env.BLOCKLET_COMPONENT_DID;
         const { address: did, publicKey: pk, secretKey: sk } = wallet;
-        const url = `ws://127.0.0.1:${process.env.ABT_NODE_SERVICE_PORT}${constants_1.SERVICE_PREFIX}`;
+        const url = `ws://${(0, parse_docker_endpoint_1.getServerHost)()}:${process.env.ABT_NODE_SERVICE_PORT}${constants_1.SERVICE_PREFIX}`;
         const token = () => Jwt.sign(did, sk, {});
         client = new ws_1.WsClient(url, {
             heartbeatIntervalMs: 10 * 1000,

package/lib/util/parse-docker-endpoint.d.ts

@@ -0,0 +1,8 @@
+import { TComponentInternalInfo } from '@blocklet/meta/lib/blocklet';
+type MountPoint = TComponentInternalInfo & {
+    webEndpoint?: string;
+};
+export declare function parseDockerComponentHost(component: MountPoint): string;
+export declare function parseDockerComponentEndpoint(endpoint: string, component: MountPoint): string;
+export declare function getServerHost(): string;
+export {};

package/lib/util/parse-docker-endpoint.js

@@ -0,0 +1,30 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseDockerComponentHost = parseDockerComponentHost;
+exports.parseDockerComponentEndpoint = parseDockerComponentEndpoint;
+exports.getServerHost = getServerHost;
+function parseDockerHost(input) {
+    return input
+        .replace(/[^a-zA-Z0-9_-]/g, '-')
+        .replace(/^"|"$/g, '')
+        .replace('docker-network-', 'blocklet-')
+        .replace(/\\/g, '_')
+        .toLocaleLowerCase();
+}
+function parseDockerComponentHost(component) {
+    if (process.env.BLOCKLET_DOCKER_NETWORK && process.env.BLOCKLET_DOCKER_NETWORK !== 'host') {
+        return parseDockerHost(`${process.env.BLOCKLET_DOCKER_NETWORK}-${component.name || component.did}`);
+    }
+    return '127.0.0.1';
+}
+function parseDockerComponentEndpoint(endpoint, component) {
+    if (process.env.BLOCKLET_DOCKER_NETWORK && process.env.BLOCKLET_DOCKER_NETWORK !== 'host') {
+        const url = new URL(endpoint);
+        url.host = parseDockerHost(`${process.env.BLOCKLET_DOCKER_NETWORK}-${component.name || component.did}`);
+        return url.toString();
+    }
+    return endpoint;
+}
+function getServerHost() {
+    return process.env.BLOCKLET_HOST || '127.0.0.1';
+}

package/lib/util/send-notification.js

@@ -47,6 +47,7 @@ const ufo_1 = require("ufo");
 const index_1 = require("../validators/index");
 const constants_1 = require("./constants");
 const version_1 = require("../version");
+const parse_docker_endpoint_1 = require("./parse-docker-endpoint");
 const axios = axios_1.default.create({ proxy: false });
 const { NODE_MODES } = constant_1.default;
 const VERSION = version_1.version; // version of notification sdk
@@ -76,7 +77,7 @@ const sendToUser = async (receiver, notification, { appDid, appSk, type }, port
         await (0, index_1.validateNotification)(notification);
     }
     try {
-        const { data: res } = await axios.post((0, ufo_1.joinURL)(`http://127.0.0.1:${port}`, constants_1.SERVICE_PREFIX, 'api', pathname), {
+        const { data: res } = await axios.post((0, ufo_1.joinURL)(`http://${(0, parse_docker_endpoint_1.getServerHost)()}:${port}`, constants_1.SERVICE_PREFIX, 'api', pathname), {
             apiVersion: VERSION,
             data: {
                 sender: {
@@ -118,7 +119,7 @@ const sendToAppChannel = async (channel, event, notification, { appDid, appSk },
         await (0, index_1.validateNotification)(notification);
     }
     try {
-        const { data: res } = await axios.post(`http://127.0.0.1:${port}${constants_1.SERVICE_PREFIX}/api/send-to-app-channel`, {
+        const { data: res } = await axios.post(`http://${(0, parse_docker_endpoint_1.getServerHost)()}:${port}${constants_1.SERVICE_PREFIX}/api/send-to-app-channel`, {
             apiVersion: VERSION,
             data: {
                 sender: { appDid, token: JWT.sign(appDid, appSk) },
@@ -150,7 +151,7 @@ const sendToRelay = async (topic, event, data, { appDid, appSk }, port = process
         throw new Error('data is required');
     }
     try {
-        const { data: res } = await axios.post(`http://127.0.0.1:${port}${constants_1.SERVICE_PREFIX}/relay/api/send-to-relay-channel`, {
+        const { data: res } = await axios.post(`http://${(0, parse_docker_endpoint_1.getServerHost)()}:${port}${constants_1.SERVICE_PREFIX}/relay/api/send-to-relay-channel`, {
             apiVersion: VERSION,
             data: {
                 sender: { appDid, token: JWT.sign(appDid, appSk) },

package/lib/util/service-api.js

@@ -12,10 +12,11 @@ const env_1 = require("@blocklet/env");
 const ufo_1 = require("ufo");
 const constants_1 = require("./constants");
 const verify_sign_1 = require("./verify-sign");
+const parse_docker_endpoint_1 = require("./parse-docker-endpoint");
 const axios = axios_1.default.create({
     // 为当前机器的内部调用，必须禁止 proxy 配置
     proxy: false,
-    baseURL: `http://127.0.0.1:${process.env.ABT_NODE_SERVICE_PORT}${constants_1.SERVICE_PREFIX}`,
+    baseURL: `http://${(0, parse_docker_endpoint_1.getServerHost)()}:${process.env.ABT_NODE_SERVICE_PORT}${constants_1.SERVICE_PREFIX}`,
     // 内部调用，超时时间不用过长
     timeout: 6 * 1000,
     headers: {

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.34-beta-20241126-120125-d0907434",
+  "version": "1.16.34-beta-20241129-100152-679bd732",
   "description": "graphql client to read/write data on abt node",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -27,21 +27,21 @@
   "author": "linchen1987 <linchen.1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/client": "1.16.34-beta-20241126-120125-d0907434",
-    "@abtnode/constant": "1.16.34-beta-20241126-120125-d0907434",
-    "@abtnode/util": "1.16.34-beta-20241126-120125-d0907434",
-    "@arcblock/did": "1.18.145",
-    "@arcblock/did-auth": "1.18.145",
-    "@arcblock/jwt": "1.18.145",
-    "@arcblock/ws": "1.18.145",
-    "@blocklet/constant": "1.16.34-beta-20241126-120125-d0907434",
-    "@blocklet/env": "1.16.34-beta-20241126-120125-d0907434",
-    "@blocklet/meta": "1.16.34-beta-20241126-120125-d0907434",
+    "@abtnode/client": "1.16.34-beta-20241129-100152-679bd732",
+    "@abtnode/constant": "1.16.34-beta-20241129-100152-679bd732",
+    "@abtnode/util": "1.16.34-beta-20241129-100152-679bd732",
+    "@arcblock/did": "1.18.150",
+    "@arcblock/did-auth": "1.18.150",
+    "@arcblock/jwt": "1.18.150",
+    "@arcblock/ws": "1.18.150",
+    "@blocklet/constant": "1.16.34-beta-20241129-100152-679bd732",
+    "@blocklet/env": "1.16.34-beta-20241129-100152-679bd732",
+    "@blocklet/meta": "1.16.34-beta-20241129-100152-679bd732",
     "@did-connect/authenticator": "^2.2.4",
     "@did-connect/handler": "^2.2.4",
     "@nedb/core": "^2.1.5",
-    "@ocap/mcrypto": "1.18.145",
-    "@ocap/wallet": "1.18.145",
+    "@ocap/mcrypto": "1.18.150",
+    "@ocap/wallet": "1.18.150",
     "axios": "^1.7.5",
     "cheerio": "1.0.0-rc.12",
     "debug": "^4.3.7",
@@ -80,5 +80,5 @@
     "ts-node": "^10.9.1",
     "typescript": "^5.6.3"
   },
-  "gitHead": "30842c7d9355953abeac420fe901c6b9ef92b27e"
+  "gitHead": "eb4b66b66af715559402fea679fe15b2a19cce2f"
 }