@blocklet/sdk 1.16.22 → 1.16.23-beta-f85576a6

package/lib/component/util.d.ts

@@ -5,6 +5,7 @@ type Resource = {
     version: string;
     status?: number;
     path?: string;
+    env?: Record<string, any>;
 };
 declare function getResources({ scope, components: allComponents, types, skipRunningCheck, ignorePublic, }?: {
     scope?: 'all' | 'pack' | 'excludePack';

package/lib/component/util.js

@@ -4,8 +4,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getResources = void 0;
+const path_1 = __importDefault(require("path"));
 const pick_1 = __importDefault(require("lodash/pick"));
 const constant_1 = require("@blocklet/constant");
+const parse_env_file_1 = require("../util/parse-env-file");
 function getResources({ scope, components: allComponents, types, skipRunningCheck, ignorePublic, } = {
     scope: 'all',
     components: [],
@@ -14,6 +16,7 @@ function getResources({ scope, components: allComponents, types, skipRunningChec
     if (!types?.length) {
         return list;
     }
+    const appDataDir = process.env.BLOCKLET_APP_DATA_DIR;
     let components = allComponents;
     if (scope === 'pack') {
         components = allComponents.filter((x) => x.group === constant_1.BlockletGroup.pack);
@@ -31,10 +34,20 @@ function getResources({ scope, components: allComponents, types, skipRunningChec
             return types.some((item) => item?.did === resourceDid && item?.type === resourceType);
         });
         if (resource?.path) {
-            list.push({
+            const item = {
                 ...(0, pick_1.default)(component, ['title', 'did', 'version', 'status']),
                 path: resource.path,
-            });
+            };
+            // import env from public env file
+            try {
+                const envFile = path_1.default.join(appDataDir, constant_1.APP_CONFIG_PUBLIC_DIR, component.did, constant_1.COMPONENT_ENV_FILE_NAME);
+                const env = (0, parse_env_file_1.parseEnvFile)(envFile);
+                item.env = env;
+            }
+            catch (error) {
+                console.error(error);
+            }
+            list.push(item);
         }
     });
     return list;

package/lib/config.js

@@ -21,6 +21,7 @@ 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"));
+const parse_env_file_1 = require("./util/parse-env-file");
 const events = new events_1.default();
 exports.events = events;
 const Events = {
@@ -71,18 +72,10 @@ if (appDataDir) {
     }
     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);
-        }
+        envFromDisk = (0, parse_env_file_1.parseEnvFile)(envFile, {
+            apiKey: process.env.BLOCKLET_COMPONENT_API_KEY,
+            componentDid: process.env.BLOCKLET_COMPONENT_DID,
+        });
     }
     catch (error) {
         logger.error(error);

package/lib/util/parse-env-file.d.ts

@@ -0,0 +1,12 @@
+declare const parseEnvFile: (envFile: string, { apiKey, componentDid }?: {
+    apiKey?: string;
+    componentDid?: string;
+}) => Record<string, any>;
+export { parseEnvFile };
+declare const _default: {
+    parseEnvFile: (envFile: string, { apiKey, componentDid }?: {
+        apiKey?: string;
+        componentDid?: string;
+    }) => Record<string, any>;
+};
+export default _default;

package/lib/util/parse-env-file.js

@@ -0,0 +1,28 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseEnvFile = void 0;
+const fs_extra_1 = __importDefault(require("fs-extra"));
+const util_1 = require("@blocklet/meta/lib/util");
+const util_2 = require("@blocklet/env/lib/util");
+const security_1 = require("../security");
+const parseEnvFile = (envFile, { apiKey, componentDid } = {}) => {
+    if (!fs_extra_1.default.existsSync(envFile)) {
+        return {};
+    }
+    const raw = fs_extra_1.default.readFileSync(envFile).toString();
+    const decrypted = apiKey ? (0, security_1.decrypt)(raw, apiKey, componentDid) : raw;
+    const configObj = JSON.parse(decrypted);
+    const env = Object.keys(configObj)
+        .filter((key) => !(0, util_1.isPreferenceKey)({ key }))
+        .reduce((o, key) => {
+        o[key] = configObj[key];
+        return o;
+    }, {});
+    env.preferences = (0, util_2.getBlockletPreferences)(configObj);
+    return env;
+};
+exports.parseEnvFile = parseEnvFile;
+exports.default = { parseEnvFile };

package/lib/version.d.ts

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

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.22",
+  "version": "1.16.23-beta-f85576a6",
   "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.22",
-    "@abtnode/constant": "1.16.22",
+    "@abtnode/client": "1.16.23-beta-f85576a6",
+    "@abtnode/constant": "1.16.23-beta-f85576a6",
     "@arcblock/did": "1.18.108",
     "@arcblock/did-auth": "1.18.108",
     "@arcblock/jwt": "1.18.108",
     "@arcblock/ws": "1.18.108",
-    "@blocklet/constant": "1.16.22",
-    "@blocklet/env": "1.16.22",
-    "@blocklet/meta": "1.16.22",
+    "@blocklet/constant": "1.16.23-beta-f85576a6",
+    "@blocklet/env": "1.16.23-beta-f85576a6",
+    "@blocklet/meta": "1.16.23-beta-f85576a6",
     "@did-connect/authenticator": "^2.2.1",
     "@did-connect/handler": "^2.2.1",
     "@nedb/core": "^2.1.5",
@@ -75,5 +75,5 @@
     "ts-node": "^10.9.1",
     "typescript": "^5.0.4"
   },
-  "gitHead": "eba523c2d8f62f2a1c742b23e3280774bf9bc4cf"
+  "gitHead": "bac83a74944b4cef3ccb386277023caf0e1d5cd4"
 }