@blocklet/meta 1.16.0-beta-ad6df3ae → 1.16.0-beta-7a7d5d97

package/lib/util.d.ts

@@ -105,7 +105,12 @@ declare const getConnectAppUrl: ({ request, baseUrl }: {
     baseUrl: string;
 }) => string;
 declare const replaceSlotToIp: (url?: string, ip?: string) => string;
-declare const getChainInfo: (env: Record<string, string>) => Record<string, string>;
+type ChainInfo = {
+    type: 'arcblock' | 'ethereum' | 'solona';
+    id: string;
+    host: string;
+};
+declare const getChainInfo: (env: Record<string, string>) => ChainInfo;
 declare const isExternalBlocklet: (blocklet?: BlockletState) => boolean;
 declare const getRolesFromAuthConfig: (config: {
     whoCanAccess: string;
@@ -191,7 +196,7 @@ declare const _default: {
         request: Partial<Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>>;
         baseUrl: string;
     }) => string;
-    getChainInfo: (env: Record<string, string>) => Record<string, string>;
+    getChainInfo: (env: Record<string, string>) => ChainInfo;
     isExternalBlocklet: (blocklet?: BlockletState) => boolean;
     isPreferenceKey: (x: TConfig) => Boolean;
     getRolesFromAuthConfig: (config: {

package/lib/util.js

@@ -448,13 +448,18 @@ const getConnectAppUrl = ({ request, baseUrl }) => {
 exports.getConnectAppUrl = getConnectAppUrl;
 const replaceSlotToIp = (url, ip) => (url || '').replace(SLOT_FOR_IP_DNS_SITE, (ip || '').replace(/\./g, '-'));
 exports.replaceSlotToIp = replaceSlotToIp;
-// transform process.env.CHAIN_x => { x: v }
-const getChainInfo = (env) => Object.entries(CHAIN_INFO_CONFIG).reduce((info, x) => {
-    // @ts-expect-error TS(2488) FIXME: Type 'unknown' must have a '[Symbol.iterator]()' m... Remove this comment to see the full error message
-    const [envName, [key, value]] = x;
-    info[key] = (0, get_1.default)(env, envName) || value;
-    return info;
-}, {});
+const getChainInfo = (env) => {
+    // @ts-ignore
+    const result = Object.entries(CHAIN_INFO_CONFIG).reduce((info, x) => {
+        const [envName, [key, value]] = x;
+        info[key] = (0, get_1.default)(env, envName) || value;
+        return info;
+    }, {});
+    if (result.type === 'ethereum' && result.id === 'none') {
+        result.id = '1';
+    }
+    return result;
+};
 exports.getChainInfo = getChainInfo;
 const isExternalBlocklet = (blocklet) => !!blocklet?.controller;
 exports.isExternalBlocklet = isExternalBlocklet;

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.0-beta-ad6df3ae",
+  "version": "1.16.0-beta-7a7d5d97",
   "description": "Library to parse/validate/fix blocklet meta",
   "main": "./lib/index.js",
   "typings": "./lib/index.d.ts",
@@ -24,14 +24,14 @@
   "author": "wangshijun <wangshijun2020@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/client": "1.16.0-beta-ad6df3ae",
-    "@abtnode/constant": "1.16.0-beta-ad6df3ae",
-    "@abtnode/util": "1.16.0-beta-ad6df3ae",
+    "@abtnode/client": "1.16.0-beta-7a7d5d97",
+    "@abtnode/constant": "1.16.0-beta-7a7d5d97",
+    "@abtnode/util": "1.16.0-beta-7a7d5d97",
     "@arcblock/did": "1.18.64",
     "@arcblock/did-ext": "1.18.64",
     "@arcblock/did-util": "1.18.64",
     "@arcblock/jwt": "1.18.64",
-    "@blocklet/constant": "1.16.0-beta-ad6df3ae",
+    "@blocklet/constant": "1.16.0-beta-7a7d5d97",
     "@ocap/asset": "1.18.64",
     "@ocap/mcrypto": "1.18.64",
     "@ocap/types": "1.18.64",
@@ -81,5 +81,5 @@
     "ts-node": "^10.9.1",
     "typescript": "^4.8.4"
   },
-  "gitHead": "8fa60176a00400cd412b308df3c7d6dcd9af2db1"
+  "gitHead": "c25ddcc371454b2e2f7038aa5e64c7b7c27763cb"
 }