@blocklet/sdk 1.16.15-beta-9318a201 → 1.16.15-beta-ed0db59e

package/lib/config.d.ts

@@ -25,7 +25,12 @@ declare const logger: {
         (message?: any, ...optionalParams: any[]): void;
     };
 };
-declare const env: Readonly<{
+declare const env: {
+    componentDid: string;
+    dataDir: string;
+    cacheDir: string;
+    mode: string;
+    preferences: any;
     appId: string;
     appPid: string;
     appIds: string[];
@@ -33,18 +38,13 @@ declare const env: Readonly<{
     appDescription: string;
     appUrl: string;
     isComponent: boolean;
-    dataDir: string;
-    cacheDir: string;
-    mode: string;
     appStorageEndpoint: string;
     serverVersion: string;
     languages: {
         code: string;
         name: string;
     }[];
-    preferences: Record<string, any>;
-    componentDid: string;
-}>;
+};
 type MountPoint = TComponentInternalInfo & {
     webEndpoint?: string;
 };
@@ -70,9 +70,10 @@ declare const _handleComponentInstalled: (data: {
     components: TComponents;
 }) => void;
 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
-TComponent, events, Events, getBlockletJs, _handleComponentUpdateOld, _handleConfigUpdate, _handleComponentInstalled, _handleComponentUpdated, _handleComponentStarted, _handleComponentStopped, _handleComponentRemoved, };
+TComponent, events, Events, getBlockletJs, _handleComponentUpdateOld, _handleConfigUpdate, _handleComponentInstalled, _handleComponentUpdated, _handleComponentStarted, _handleComponentStopped, _handleComponentRemoved, _handleComponentConfigUpdate, };
 declare const _default: {
     logger: {
         info: {
@@ -89,7 +90,12 @@ declare const _default: {
             (message?: any, ...optionalParams: any[]): void;
         };
     };
-    env: Readonly<{
+    env: {
+        componentDid: string;
+        dataDir: string;
+        cacheDir: string;
+        mode: string;
+        preferences: any;
         appId: string;
         appPid: string;
         appIds: string[];
@@ -97,18 +103,13 @@ declare const _default: {
         appDescription: string;
         appUrl: string;
         isComponent: boolean;
-        dataDir: string;
-        cacheDir: string;
-        mode: string;
         appStorageEndpoint: string;
         serverVersion: string;
         languages: {
             code: string;
             name: string;
         }[];
-        preferences: Record<string, any>;
-        componentDid: string;
-    }>;
+    };
     components: TComponents;
     events: EventEmitter;
     Events: {

package/lib/config.js

@@ -3,8 +3,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-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.logger = void 0;
 /* eslint-disable prettier/prettier */
+/* 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 events_1 = __importDefault(require("events"));
 const cloneDeep_1 = __importDefault(require("lodash/cloneDeep"));
@@ -14,6 +17,7 @@ const constant_1 = require("@blocklet/constant");
 const util_1 = require("@blocklet/env/lib/util");
 const util_2 = require("@blocklet/meta/lib/util");
 const axios_1 = __importDefault(require("axios"));
+const security_1 = require("./security");
 const version_1 = require("./version");
 const notification_1 = __importDefault(require("./service/notification"));
 const server_version_1 = __importDefault(require("./util/server-version"));
@@ -38,11 +42,9 @@ const AppConfigKeyMap = {
     ABT_NODE: 'serverVersion', // for backup compatibility
 };
 const logger = {
-    // eslint-disable-next-line no-console
     info: console.info,
     debug: (...args) => {
         if (process.env.NODE_ENV === 'development') {
-            // eslint-disable-next-line no-console
             console.debug(...args);
         }
     },
@@ -50,7 +52,55 @@ const logger = {
     error: console.error,
 };
 exports.logger = logger;
-const env = (0, cloneDeep_1.default)(env_1.default);
+const appDataDir = process.env.BLOCKLET_APP_DATA_DIR;
+let appEnvFromDisk = {};
+let envFromDisk = {};
+let componentsFromDisk;
+if (appDataDir) {
+    try {
+        const configFile = path_1.default.join(appDataDir, constant_1.APP_CONFIG_FILE_PATH);
+        if (fs_1.default.existsSync(configFile)) {
+            const config = JSON.parse(fs_1.default.readFileSync(configFile).toString());
+            appEnvFromDisk = config.env || {};
+            componentsFromDisk = config.components;
+        }
+    }
+    catch (error) {
+        console.error(error);
+    }
+    try {
+        const envFile = path_1.default.join(appDataDir, constant_1.APP_CONFIG_DIR, process.env.BLOCKLET_COMPONENT_DID, constant_1.COMPONENT_ENV_FILE_NAME);
+        if (fs_1.default.existsSync(envFile)) {
+            const raw = fs_1.default.readFileSync(envFile).toString();
+            const decrypted = (0, security_1.decrypt)(raw, process.env.BLOCKLET_COMPONENT_API_KEY, process.env.BLOCKLET_COMPONENT_DID);
+            const configObj = JSON.parse(decrypted);
+            envFromDisk = Object.keys(configObj)
+                .filter((key) => !(0, util_2.isPreferenceKey)({ key }))
+                .reduce((o, key) => {
+                o[key] = configObj[key];
+                return o;
+            }, {});
+            envFromDisk.preferences = (0, util_1.getBlockletPreferences)(configObj);
+        }
+    }
+    catch (error) {
+        console.error(error);
+    }
+}
+const env = {
+    ...env_1.default,
+    ...appEnvFromDisk,
+    ...envFromDisk,
+    componentDid: process.env.BLOCKLET_COMPONENT_DID,
+    dataDir: process.env.BLOCKLET_DATA_DIR,
+    cacheDir: process.env.BLOCKLET_CACHE_DIR,
+    mode: process.env.BLOCKLET_MODE,
+    preferences: {
+        ...env_1.default.preferences,
+        ...appEnvFromDisk.preferences,
+        ...envFromDisk.preferences,
+    }
+};
 exports.env = env;
 const _fillWebEndpoint = (components) => {
     components.forEach((x) => {
@@ -60,7 +110,9 @@ const _fillWebEndpoint = (components) => {
     });
 };
 const initComponentStore = () => {
-    const components = JSON.parse(process.env.BLOCKLET_MOUNT_POINTS || '[]') || [];
+    const components = componentsFromDisk
+        ? (0, cloneDeep_1.default)(componentsFromDisk)
+        : JSON.parse(process.env.BLOCKLET_MOUNT_POINTS || '[]') || [];
     _fillWebEndpoint(components);
     return components;
 };
@@ -150,6 +202,33 @@ const _handleConfigUpdate = (data) => {
     events.emit(Events.envUpdate, updates);
 };
 exports._handleConfigUpdate = _handleConfigUpdate;
+const _handleComponentConfigUpdate = (data) => {
+    try {
+        const decrypted = (0, security_1.decrypt)(data.configs || '[]', process.env.BLOCKLET_COMPONENT_API_KEY, process.env.BLOCKLET_COMPONENT_DID);
+        const configs = JSON.parse(decrypted);
+        const updates = configs
+            .filter((x) => !(0, util_2.isPreferenceKey)(x))
+            .reduce((o, { key, value }) => {
+            o[key] = value;
+            return o;
+        }, {});
+        Object.assign(env, updates);
+        const preferenceUpdates = (0, util_1.getBlockletPreferences)(configs.reduce((acc, x) => {
+            acc[x.key] = x.value;
+            return acc;
+        }, {}));
+        env.preferences = env.preferences || {};
+        Object.assign(env.preferences, preferenceUpdates);
+        events.emit(Events.envUpdate, {
+            ...updates,
+            preferences: preferenceUpdates,
+        });
+    }
+    catch (error) {
+        logger.error('Failed to update component config', error.message);
+    }
+};
+exports._handleComponentConfigUpdate = _handleComponentConfigUpdate;
 let blockletJs = '';
 const fetchBlockletJs = async () => {
     try {
@@ -162,7 +241,6 @@ const fetchBlockletJs = async () => {
             },
         });
         blockletJs = res.data;
-        // eslint-disable-next-line no-console
         logger.info('Fetch blocklet.js succeed', { componentDid });
         return res.data;
     }
@@ -202,9 +280,11 @@ const runInServer = (fn, type) =>
 const inRuntimeEnv = !!process.env.BLOCKLET_APP_SK;
 if (inRuntimeEnv && !process.env.BLOCKLET_HOOK_NAME) {
     notification_1.default.on(constant_1.BlockletInternalEvents.appConfigChanged, _handleConfigUpdate);
+    notification_1.default.on(constant_1.BlockletInternalEvents.componentConfigChanged, _handleComponentConfigUpdate);
     // Reactive fetch
     notification_1.default.on(constant_1.BlockletInternalEvents.appConfigChanged, refreshBlockletJs);
     notification_1.default.on(constant_1.BlockletInternalEvents.appSettingChanged, refreshBlockletJs);
+    notification_1.default.on(constant_1.BlockletInternalEvents.componentConfigChanged, refreshBlockletJs);
     notification_1.default.on(constant_1.BlockletInternalEvents.componentInstalled, runInServer(_handleComponentInstalled, 'new'));
     notification_1.default.on(constant_1.BlockletInternalEvents.componentUpgraded, runInServer(_handleComponentUpdated, 'new'));
     notification_1.default.on(constant_1.BlockletInternalEvents.componentUpdated, runInServer(_handleComponentUpdated, 'new'));

package/lib/security/index.d.ts

@@ -1,9 +1,9 @@
-declare const encrypt: (message: string) => string;
-declare const decrypt: (message: string) => string;
+declare const encrypt: (message: string, password?: string, salt?: string) => string;
+declare const decrypt: (message: string, password?: string, salt?: string) => string;
 export { encrypt };
 export { decrypt };
 declare const _default: {
-    encrypt: (message: string) => string;
-    decrypt: (message: string) => string;
+    encrypt: (message: string, password?: string, salt?: string) => string;
+    decrypt: (message: string, password?: string, salt?: string) => string;
 };
 export default _default;

package/lib/security/index.js

@@ -7,18 +7,22 @@ exports.decrypt = exports.encrypt = void 0;
 const crypto_1 = __importDefault(require("crypto"));
 const aes_legacy_1 = __importDefault(require("@ocap/mcrypto/lib/crypter/aes-legacy"));
 const AES = { default: aes_legacy_1.default }.default;
-const encrypt = (message) => {
-    if (!process.env.BLOCKLET_DID || !process.env.BLOCKLET_APP_EK) {
+const encrypt = (message, password, salt) => {
+    const _password = password || process.env.BLOCKLET_APP_EK;
+    const _salt = salt || process.env.BLOCKLET_DID;
+    if (!_password || !_salt) {
         return message;
     }
-    return (AES.encrypt(message, crypto_1.default.pbkdf2Sync(process.env.BLOCKLET_APP_EK, process.env.BLOCKLET_DID, 256, 32, 'sha512').toString('hex')));
+    return AES.encrypt(message, crypto_1.default.pbkdf2Sync(_password, _salt, 256, 32, 'sha512').toString('hex'));
 };
 exports.encrypt = encrypt;
-const decrypt = (message) => {
-    if (!process.env.BLOCKLET_DID || !process.env.BLOCKLET_APP_EK) {
+const decrypt = (message, password, salt) => {
+    const _password = password || process.env.BLOCKLET_APP_EK;
+    const _salt = salt || process.env.BLOCKLET_DID;
+    if (!_password || !_salt) {
         return message;
     }
-    return (AES.decrypt(message, crypto_1.default.pbkdf2Sync(process.env.BLOCKLET_APP_EK, process.env.BLOCKLET_DID, 256, 32, 'sha512').toString('hex')));
+    return AES.decrypt(message, crypto_1.default.pbkdf2Sync(_password, _salt, 256, 32, 'sha512').toString('hex'));
 };
 exports.decrypt = decrypt;
 exports.default = {

package/lib/service/notification.js

@@ -165,7 +165,8 @@ const initClient = () => {
                         return;
                     }
                     // verify sender is server
-                    if (!Jwt.verify(sender.token, process.env.ABT_NODE_PK)) {
+                    const tolerance = 600;
+                    if (!Jwt.verify(sender.token, process.env.ABT_NODE_PK, { tolerance })) {
                         const message = `verify sender failed in internal events. event: ${event}, sender: ${JSON.stringify(sender)}`;
                         emitError({ message });
                         console.error(message);

package/lib/util/login.js

@@ -5,15 +5,22 @@ exports.getLoginProvider = void 0;
 const constant_1 = require("@blocklet/constant");
 function getLoginProvider(request) {
     let provider;
-    // 1. 优先读取当前登录用户的 provider
-    ({ provider } = request.user || {});
-    if (!provider) {
-        // 2. 读取在 headers 中指定的 provider
-        provider = request.headers['x-user-provider'];
+    const extraParams = request?.context?.store?.extraParams || request.query || {};
+    // NOTICE: 某些情况下，需要优先读取参数中的 provider，其余情况均以当前登录用户的 provider 来决定
+    if (extraParams.providerMode === 'paramsFirst') {
+        provider = extraParams.provider;
     }
-    if (!provider) {
-        // 3. 读取在 extraParams 中指定的 provider
-        ({ provider } = request?.context?.store?.extraParams || {});
+    else {
+        // 1. 优先读取当前登录用户的 provider
+        provider = request.user?.provider;
+        if (!provider) {
+            // 2. 读取在 headers 中指定的 provider
+            provider = request.headers['x-user-provider'];
+        }
+        if (!provider) {
+            // 3. 读取在 extraParams 中指定的 provider
+            provider = extraParams.provider;
+        }
     }
     return provider || constant_1.LOGIN_PROVIDER.WALLET;
 }

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.15-beta-9318a201",
+  "version": "1.16.15-beta-ed0db59e",
   "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.15-beta-9318a201",
-    "@abtnode/constant": "1.16.15-beta-9318a201",
+    "@abtnode/client": "1.16.15-beta-ed0db59e",
+    "@abtnode/constant": "1.16.15-beta-ed0db59e",
     "@arcblock/did": "1.18.89",
     "@arcblock/did-auth": "1.18.89",
     "@arcblock/jwt": "1.18.89",
     "@arcblock/ws": "1.18.89",
-    "@blocklet/constant": "1.16.15-beta-9318a201",
-    "@blocklet/env": "1.16.15-beta-9318a201",
-    "@blocklet/meta": "1.16.15-beta-9318a201",
+    "@blocklet/constant": "1.16.15-beta-ed0db59e",
+    "@blocklet/env": "1.16.15-beta-ed0db59e",
+    "@blocklet/meta": "1.16.15-beta-ed0db59e",
     "@did-connect/authenticator": "^2.2.0",
     "@did-connect/handler": "^2.2.0",
     "@nedb/core": "^2.1.5",
@@ -74,5 +74,5 @@
     "ts-node": "^10.9.1",
     "typescript": "^5.0.4"
   },
-  "gitHead": "f3722cbd4fe10c5fa083cad7e859ecff6095060d"
+  "gitHead": "647ebe45f6214ea5c284c9234f1319b6ff72f915"
 }