@blocklet/sdk 1.16.38-beta-20250206-084543-4d7b4331 → 1.16.38-beta-20250207-102532-5be12f2c

package/lib/component/index.js

@@ -44,7 +44,7 @@ const ufo_1 = require("ufo");
 const p_retry_1 = __importDefault(require("p-retry"));
 const wait_port_1 = __importDefault(require("wait-port"));
 const constant_1 = require("@blocklet/constant");
-const config_1 = require("../config");
+const config_1 = __importStar(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");
@@ -59,12 +59,12 @@ const doCall = async ({ url, headers = {}, ...options }, retryOptions = {}) => (
             headers,
         });
         const duration = Date.now() - startTime;
-        config_1.logger.info(`component.call succeed in ${duration}ms: ${url} `);
+        config_1.default.logger.info(`component.call succeed in ${duration}ms: ${url} `);
         return res;
     }
     catch (error) {
         const duration = Date.now() - startTime;
-        config_1.logger.error(`component.call failed in ${duration}ms`, {
+        config_1.default.logger.error(`component.call failed in ${duration}ms`, {
             url,
             responseStatus: (0, get_1.default)(error, 'response.status'),
             responseData: (0, get_1.default)(error, 'response.data'),

package/lib/config.d.ts

@@ -9,7 +9,7 @@ declare const Events: {
     componentRemoved: string;
     envUpdate: string;
 };
-declare const logger: {
+declare let logger: {
     info: {
         (...data: any[]): void;
         (message?: any, ...optionalParams: any[]): void;
@@ -24,6 +24,7 @@ declare const logger: {
         (message?: any, ...optionalParams: any[]): void;
     };
 };
+declare const setLogger: (newLogger: typeof logger) => void;
 declare const env: {
     appId: string;
     appPid: string;
@@ -76,7 +77,7 @@ declare const _handleComponentInstalled: (data: {
 declare const _handleConfigUpdate: (data: any) => void;
 declare const _handleComponentConfigUpdate: (data: any) => void;
 declare const getBlockletJs: (pageGroup?: string, pathPrefix?: string, source?: string) => string;
-export { logger, env, componentStore as components, MountPoint, // @deprecated, for backward compatibility
+export { logger, setLogger, env, componentStore as components, MountPoint, // @deprecated, for backward compatibility
 TComponent, events, Events, getBlockletJs, _handleComponentUpdateOld, _handleConfigUpdate, _handleComponentInstalled, _handleComponentUpdated, _handleComponentStarted, _handleComponentStopped, _handleComponentRemoved, _handleComponentConfigUpdate, };
 declare const _default: {
     logger: {
@@ -94,6 +95,7 @@ declare const _default: {
             (message?: any, ...optionalParams: any[]): void;
         };
     };
+    setLogger: (newLogger: typeof logger) => void;
     env: {
         [key: string]: any;
         appId: string;

package/lib/config.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports._handleComponentConfigUpdate = exports._handleComponentRemoved = exports._handleComponentStopped = exports._handleComponentStarted = exports._handleComponentUpdated = exports._handleComponentInstalled = exports._handleConfigUpdate = exports._handleComponentUpdateOld = exports.getBlockletJs = exports.Events = exports.events = exports.components = exports.env = exports.logger = void 0;
+exports._handleComponentConfigUpdate = exports._handleComponentRemoved = exports._handleComponentStopped = exports._handleComponentStarted = exports._handleComponentUpdated = exports._handleComponentInstalled = exports._handleConfigUpdate = exports._handleComponentUpdateOld = exports.getBlockletJs = exports.Events = exports.events = exports.components = exports.env = exports.setLogger = exports.logger = void 0;
 /* eslint-disable prettier/prettier */
 /* eslint-disable no-console */
 const path_1 = __importDefault(require("path"));
@@ -48,7 +48,8 @@ const AppConfigKeyMap = {
     ABT_NODE_VERSION: 'serverVersion',
     ABT_NODE: 'serverVersion', // for backup compatibility
 };
-const logger = {
+// eslint-disable-next-line import/no-mutable-exports
+let logger = {
     info: console.info,
     debug: (...args) => {
         if (process.env.NODE_ENV === 'development') {
@@ -59,6 +60,10 @@ const logger = {
     error: console.error,
 };
 exports.logger = logger;
+const setLogger = (newLogger) => {
+    exports.logger = logger = newLogger;
+};
+exports.setLogger = setLogger;
 const appDataDir = process.env.BLOCKLET_APP_DATA_DIR;
 let appEnvFromDisk = {};
 let envFromDisk = {};
@@ -336,6 +341,7 @@ if (inRuntimeEnv && !process.env.BLOCKLET_HOOK_NAME && process.env.BLOCKLET_MODE
 }
 exports.default = {
     logger,
+    setLogger,
     env,
     components: componentStore,
     events,

package/lib/connect/handler.js

@@ -38,12 +38,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 const get_1 = __importDefault(require("lodash/get"));
 const handler_1 = require("@did-connect/handler");
 const notification_1 = __importStar(require("../service/notification"));
-const noop = () => ({});
+const config_1 = __importDefault(require("../config"));
 // whether app web page is in mobile DID wallet
 const inMobileWallet = (didwallet) => {
     return didwallet && ['ios', 'android'].includes(didwallet.os);
 };
-const consoleLogger = { info: noop, error: console.error, warn: console.warn, debug: noop };
 const getConnectedDid = (session) => {
     if (session.autoConnect === false) {
         return '';
@@ -53,7 +52,7 @@ const getConnectedDid = (session) => {
     }
     return (0, get_1.default)(session, 'previousConnected.userDid', '');
 };
-const createConnectHandlers = ({ authenticator, storage, logger = consoleLogger, socketPathname, sendNotificationFn, }) => {
+const createConnectHandlers = ({ authenticator, storage, logger = config_1.default.logger, socketPathname, sendNotificationFn, }) => {
     const handlers = (0, handler_1.createHandlers)({
         storage,
         authenticator,

package/lib/middlewares/blocklet.js

@@ -1,7 +1,10 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.verifyBlockletSig = void 0;
-const config_1 = require("../config");
+const config_1 = __importDefault(require("../config"));
 const verify_sign_1 = require("../util/verify-sign");
 const verifyBlockletSig = (req, res, next) => {
     try {
@@ -11,12 +14,12 @@ const verifyBlockletSig = (req, res, next) => {
         }
         const verified = (0, verify_sign_1.verify)(data, sig);
         if (!verified) {
-            config_1.logger.error('verify blocklet sig failed', { data, sig });
+            config_1.default.logger.error('verify blocklet sig failed', { data, sig });
             return res.status(401).json({ error: 'verify sig failed' });
         }
     }
     catch (error) {
-        config_1.logger.error('verify blocklet sig failed', { error });
+        config_1.default.logger.error('verify blocklet sig failed', { error });
         return res.status(401).json({ error: 'verify sig failed' });
     }
     return next();

package/lib/middlewares/component.js

@@ -1,7 +1,10 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.verifySig = void 0;
-const config_1 = require("../config");
+const config_1 = __importDefault(require("../config"));
 const verify_sign_1 = require("../util/verify-sign");
 const verifySig = async (req, res, next) => {
     try {
@@ -11,12 +14,12 @@ const verifySig = async (req, res, next) => {
         }
         const verified = await (0, verify_sign_1.verify)(data, sig);
         if (!verified) {
-            config_1.logger.error('verify component sig failed', { data, sig });
+            config_1.default.logger.error('verify component sig failed', { data, sig });
             return res.status(401).json({ error: 'verify sig failed' });
         }
     }
     catch (error) {
-        config_1.logger.error('verify component sig failed', { error });
+        config_1.default.logger.error('verify component sig failed', { error });
         return res.status(401).json({ error: 'verify sig failed' });
     }
     return next();

package/lib/middlewares/csrf.js

@@ -8,9 +8,9 @@ const isEmpty_1 = __importDefault(require("lodash/isEmpty"));
 const joi_1 = __importDefault(require("joi"));
 const digest_1 = require("../util/digest");
 const wallet_1 = require("../util/wallet");
-const config_1 = require("../config");
+const config_1 = __importDefault(require("../config"));
 function printCookieParserNotInstalledWarning() {
-    config_1.logger.warn('cookie-parser middleware is required for the csrf middleware to work properly.');
+    config_1.default.logger.warn('cookie-parser middleware is required for the csrf middleware to work properly.');
 }
 function defaultGenerateToken(req, res) {
     if (!req.cookies) {

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.38-beta-20250206-084543-4d7b4331",
+  "version": "1.16.38-beta-20250207-102532-5be12f2c",
   "description": "graphql client to read/write data on abt node",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -27,22 +27,22 @@
   "author": "linchen1987 <linchen.1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/client": "1.16.38-beta-20250206-084543-4d7b4331",
-    "@abtnode/constant": "1.16.38-beta-20250206-084543-4d7b4331",
-    "@abtnode/util": "1.16.38-beta-20250206-084543-4d7b4331",
-    "@arcblock/did": "1.19.6",
-    "@arcblock/did-auth": "1.19.6",
-    "@arcblock/jwt": "1.19.6",
-    "@arcblock/ws": "1.19.6",
-    "@blocklet/constant": "1.16.38-beta-20250206-084543-4d7b4331",
-    "@blocklet/env": "1.16.38-beta-20250206-084543-4d7b4331",
-    "@blocklet/meta": "1.16.38-beta-20250206-084543-4d7b4331",
+    "@abtnode/client": "1.16.38-beta-20250207-102532-5be12f2c",
+    "@abtnode/constant": "1.16.38-beta-20250207-102532-5be12f2c",
+    "@abtnode/util": "1.16.38-beta-20250207-102532-5be12f2c",
+    "@arcblock/did": "1.19.9",
+    "@arcblock/did-auth": "1.19.9",
+    "@arcblock/jwt": "1.19.9",
+    "@arcblock/ws": "1.19.9",
+    "@blocklet/constant": "1.16.38-beta-20250207-102532-5be12f2c",
+    "@blocklet/env": "1.16.38-beta-20250207-102532-5be12f2c",
+    "@blocklet/meta": "1.16.38-beta-20250207-102532-5be12f2c",
     "@did-connect/authenticator": "^2.2.7",
     "@did-connect/handler": "^2.2.7",
     "@nedb/core": "^2.1.5",
-    "@ocap/mcrypto": "1.19.6",
-    "@ocap/util": "1.19.6",
-    "@ocap/wallet": "1.19.6",
+    "@ocap/mcrypto": "1.19.9",
+    "@ocap/util": "1.19.9",
+    "@ocap/wallet": "1.19.9",
     "axios": "^1.7.9",
     "cheerio": "1.0.0-rc.12",
     "debug": "^4.3.7",
@@ -82,5 +82,5 @@
     "ts-node": "^10.9.1",
     "typescript": "^5.6.3"
   },
-  "gitHead": "933b2c2856240f2d78b3a392f8a3b4e8584860f0"
+  "gitHead": "bb8ce42b8f2c2f02ce3b3074e50d5c70d066d5b0"
 }