@abtnode/core 1.16.45-beta-20250625-103530-e1f5b0b8 → 1.16.45-beta-20250627-075343-5af3ad9a

package/lib/api/node.js

@@ -9,6 +9,7 @@ const getFolderSize = require('@abtnode/util/lib/get-folder-size');
 const canPackageReadWrite = require('@abtnode/util/lib/can-pkg-rw');
 const { toDelegateAddress } = require('@arcblock/did-util');
 const { MONITOR_RECORD_INTERVAL_SEC, NODE_MODES } = require('@abtnode/constant');
+const { getLauncherInfo } = require('@abtnode/auth/lib/launcher');
 
 const logger = require('@abtnode/logger')('@abtnode/core:api:node');
 
@@ -48,6 +49,12 @@ class NodeAPI {
     }
 
     try {
+      if (entity.registerUrl) {
+        const launcherInfo = await getLauncherInfo(entity.registerUrl);
+        entity.registerInfo = launcherInfo;
+        logger.info(`Updated launcher info from ${entity.registerUrl}`, launcherInfo);
+      }
+
       const updateResult = await this.state.updateNodeInfo(entity);
       return updateResult;
     } catch (error) {

package/lib/blocklet/manager/config-synchronizer.js

@@ -35,6 +35,11 @@ class ConfigSynchronizer {
   async syncAppConfig(did, { serverVersion: inputServerVersion } = {}) {
     try {
       const app = isAppObj(did) ? did : await this.manager.getBlocklet(did);
+      const dataDir = getValueFromEnvironments(app.environments, 'BLOCKLET_DATA_DIR');
+      if (!dataDir) {
+        return;
+      }
+
       const serverVersion = inputServerVersion || (await this.states.node.read()).version;
       const env = {
         appId: app.appDid,
@@ -58,8 +63,6 @@ class ConfigSynchronizer {
 
       const config = { env, components };
 
-      const dataDir = getValueFromEnvironments(app.environments, 'BLOCKLET_DATA_DIR');
-
       await fs.outputFile(path.join(dataDir, APP_CONFIG_FILE_PATH), JSON.stringify(config));
     } catch (error) {
       logger.error('sync app config failed', { error });
@@ -69,6 +72,11 @@ class ConfigSynchronizer {
   async syncComponentConfig(did, rootDid, { serverSk }) {
     try {
       const app = await this.manager.getBlocklet(rootDid);
+      const dataDir = getValueFromEnvironments(app.environments, 'BLOCKLET_DATA_DIR');
+      if (!dataDir) {
+        return;
+      }
+
       const component = findComponentByIdV2(app, did);
 
       const hasResources = !!component.meta.resource?.bundles?.length;
@@ -84,8 +92,6 @@ class ConfigSynchronizer {
         component,
       });
 
-      const dataDir = getValueFromEnvironments(app.environments, 'BLOCKLET_DATA_DIR');
-
       await fs.outputFile(
         path.join(dataDir, APP_CONFIG_DIR, component.meta.did, COMPONENT_ENV_FILE_NAME),
         encrypt(JSON.stringify(env), componentApiKey, component.meta.did)

package/lib/blocklet/migration-dist/migration.cjs

@@ -258,7 +258,7 @@ const RBAC_CONFIG = {
 
     // external user
     [SERVER_ROLES.EXTERNAL_BLOCKLET_CONTROLLER]: ['query_blocklets', 'mutate_blocklets'],
-    [SERVER_ROLES.EXTERNAL_BLOCKLETS_MANAGER]: ['query_blocklets', 'mutate_blocklets'],
+    [SERVER_ROLES.EXTERNAL_BLOCKLETS_MANAGER]: ['query_blocklets', 'mutate_blocklets', 'query_node'],
   }),
 };
 
@@ -485,7 +485,7 @@ module.exports = Object.freeze({
   PROCESS_NAME_LOG_ROTATE: 'abt-node-log-rotate',
   PROCESS_NAME_EVENT_HUB: 'abt-node-event-hub',
 
-  NODE_REGISTER_URL: 'https://install.arcblock.io/',
+  BLOCKLET_LAUNCHER_URL: 'https://launcher.arcblock.io/',
   WEB_WALLET_URL: 'https://web.abtwallet.io',
   TEST_STORE_URL,
   BLOCKLET_STORE_URL,

package/lib/migrations/1.0.25.js

@@ -3,7 +3,7 @@ const yaml = require('js-yaml');
 const get = require('lodash/get');
 const set = require('lodash/set');
 
-const { NODE_REGISTER_URL, NODE_COMMAND_NAME, NODE_PACKAGE_NAME } = require('@abtnode/constant');
+const { BLOCKLET_LAUNCHER_URL, NODE_COMMAND_NAME, NODE_PACKAGE_NAME } = require('@abtnode/constant');
 const canPackageReadWrite = require('@abtnode/util/lib/can-pkg-rw');
 
 module.exports = async ({ states, config, configFile, printInfo }) => {
@@ -14,7 +14,7 @@ module.exports = async ({ states, config, configFile, printInfo }) => {
   const info = await states.node.read();
 
   const updates = [
-    { key: 'registerUrl', value: NODE_REGISTER_URL },
+    { key: 'registerUrl', value: BLOCKLET_LAUNCHER_URL },
     { key: 'autoUpgrade', value: canPackageReadWrite(NODE_COMMAND_NAME, NODE_PACKAGE_NAME) },
   ];
   updates.forEach(({ key, value }) => {

package/lib/states/access-key.js

@@ -103,7 +103,6 @@ class AccessKeyState extends BaseState {
 
   // eslint-disable-next-line no-unused-vars
   async detail({ accessKeyId } = {}, context) {
-    logger.info('get access key', { accessKeyId });
     if (!accessKeyId) {
       throw new CustomError(400, 'accessKeyId should not be empty');
     }
@@ -143,7 +142,7 @@ class AccessKeyState extends BaseState {
   }
 
   async refreshLastUsed(accessKeyId) {
-    logger.info('update lastUsed', { accessKeyId });
+    logger.debug('update lastUsed', { accessKeyId });
     if (!accessKeyId) {
       throw new CustomError(400, 'accessKeyId should not be empty');
     }

package/lib/util/blocklet.js

@@ -454,6 +454,7 @@ const getComponentSystemEnvironments = (blocklet) => {
     BLOCKLET_REAL_DID: blocklet.env.id, // <appDid>/componentDid> e.g. xxxxx/xxxxx
     BLOCKLET_REAL_NAME: blocklet.env.name,
     BLOCKLET_COMPONENT_DID: blocklet.meta.did, // component meta did e.g. xxxxxx
+    BLOCKLET_COMPONENT_VERSION: blocklet.meta.version,
     BLOCKLET_DATA_DIR: blocklet.env.dataDir,
     BLOCKLET_LOG_DIR: blocklet.env.logsDir,
     BLOCKLET_CACHE_DIR: blocklet.env.cacheDir,
@@ -1520,6 +1521,54 @@ const needBlockletDownload = (blocklet, oldBlocklet) => {
   return get(oldBlocklet, 'meta.dist.integrity') !== get(blocklet, 'meta.dist.integrity');
 };
 
+const formatBlockletTheme = (rawTheme) => {
+  let themeConfig = {};
+
+  if (rawTheme) {
+    if (Array.isArray(rawTheme.concepts) && rawTheme.currentConceptId) {
+      const concept = rawTheme.concepts.find((x) => x.id === rawTheme.currentConceptId);
+      themeConfig = {
+        ...concept.themeConfig,
+        prefer: concept.prefer,
+      };
+    } else {
+      // 兼容旧数据
+      themeConfig = {
+        light: rawTheme.light || {},
+        dark: rawTheme.dark || {},
+        common: rawTheme.common || {},
+        prefer: rawTheme.prefer || 'system',
+      };
+    }
+  }
+
+  const result = mergeWith(
+    // 至少提供 palette 色板值（客户端会使用）
+    cloneDeep({
+      light: { palette: BLOCKLET_THEME_LIGHT.palette },
+      dark: { palette: BLOCKLET_THEME_DARK.palette },
+      prefer: 'system',
+    }),
+    themeConfig,
+    // 数组值直接替换
+    (_, srcValue) => {
+      if (Array.isArray(srcValue)) {
+        return srcValue;
+      }
+      return undefined;
+    }
+  );
+
+  // 保留原始数据，用于 settings 保存
+  Object.defineProperty(result, 'raw', {
+    value: rawTheme,
+    enumerable: false,
+    writable: false,
+  });
+
+  return result;
+};
+
 const _getBlocklet = async ({
   did,
   dataDirs,
@@ -1575,22 +1624,7 @@ const _getBlocklet = async ({
   }
 
   blocklet.settings.storeList = blocklet.settings.storeList || [];
-  blocklet.settings.theme = mergeWith(
-    cloneDeep({
-      light: { palette: BLOCKLET_THEME_LIGHT.palette },
-      dark: { palette: BLOCKLET_THEME_DARK.palette },
-      prefer: 'light',
-    }),
-    blocklet.settings.theme,
-    // 数组值直接替换
-    (_, srcValue) => {
-      if (Array.isArray(srcValue)) {
-        return srcValue;
-      }
-      return undefined;
-    }
-  );
-
+  blocklet.settings.theme = formatBlockletTheme(blocklet.settings.theme);
   blocklet.settings.languages = blocklet.settings.languages || [];
 
   // 移除第一个版本中 from 为 tmpl 的导航

package/lib/util/default-node-config.js

@@ -1,4 +1,4 @@
-const { NODE_REGISTER_URL, BLOCKLET_STORE, BLOCKLET_STORE_DEV } = require('@abtnode/constant');
+const { BLOCKLET_LAUNCHER_URL, BLOCKLET_STORE, BLOCKLET_STORE_DEV } = require('@abtnode/constant');
 const canPackageReadWrite = require('@abtnode/util/lib/can-pkg-rw');
 
 const getDefaultAutoUpgrade = () => {
@@ -25,7 +25,7 @@ const defaultNodeConfigs = {
       },
     ],
   },
-  registerUrl: { getDefaultValue: () => NODE_REGISTER_URL },
+  registerUrl: { getDefaultValue: () => BLOCKLET_LAUNCHER_URL },
 };
 
 const lib = {

package/lib/util/launcher.js

@@ -188,6 +188,7 @@ const consumeLauncherSession = async ({ params, blocklet }) => {
  * @param {object} param.node node instance
  * @param {string} param.sessionId blocklet setup session id
  * @param {boolean} param.justCreate just create owner, not set owner
+ * @param {boolean} param.autoStart auto initialize the blocklet, skip setup process
  * @param {string} [param.provider=LOGIN_PROVIDER.WALLET] provider
  * @param {object} param.context context
  * @param {string} param.context.visitorId visitorId
@@ -200,7 +201,14 @@ const consumeLauncherSession = async ({ params, blocklet }) => {
  * @param {string} param.context.device.clientName deviceClientName
  * @returns
  */
-const setupAppOwner = async ({ node, sessionId, justCreate = false, context, provider = LOGIN_PROVIDER.WALLET }) => {
+const setupAppOwner = async ({
+  node,
+  sessionId,
+  justCreate = false,
+  autoStart = false,
+  context,
+  provider = LOGIN_PROVIDER.WALLET,
+}) => {
   const session = await node.getSession({ id: sessionId });
   if (!session) {
     throw new Error(`Blocklet setup session not found in server: ${sessionId}`);
@@ -345,7 +353,7 @@ const setupAppOwner = async ({ node, sessionId, justCreate = false, context, pro
     elevated: true,
   });
 
-  if (justCreate) {
+  if (justCreate || autoStart) {
     await node.setBlockletInitialized({ did: appDid, owner: { did: ownerDid, pk: ownerPk } });
   } else {
     await node.setBlockletOwner({ did: appDid, owner: { did: ownerDid, pk: ownerPk } });
@@ -377,6 +385,20 @@ const setupAppOwner = async ({ node, sessionId, justCreate = false, context, pro
 
   logger.info('created user session', { appDid, ownerDid, userSession });
 
+  // FIXME: this always throw error
+  // if (autoStart) {
+  //   node
+  //     .startBlocklet({
+  //       did: appDid,
+  //       checkHealthImmediately: false,
+  //       throwOnError: true,
+  //       atomic: false,
+  //     })
+  //     .catch((error) => {
+  //       logger.error('blocklet auto start failed', { error, appDid });
+  //     });
+  // }
+
   return {
     session,
     blocklet,

package/lib/validators/node.js

@@ -21,7 +21,7 @@ const nodeInfoSchema = Joi.object({
     .messages({ zh: { 'string.empty': '描述不能为空' }, en: { 'string.empty': 'Description cannot be empty' } }),
   registerUrl: Joi.string()
     .uri({ scheme: [/https?/] })
-    .label('register url')
+    .label('launcher url')
     .allow('')
     .optional()
     .messages({

package/lib/validators/theme.js

@@ -147,11 +147,49 @@ const muiThemeSchema = Joi.object({
   components: componentsSchema.optional(),
 }).options({ allowUnknown: true, stripUnknown: true });
 
+const editorStateSchema = Joi.object({
+  colors: Joi.object()
+    .pattern(
+      Joi.string(),
+      Joi.object({
+        isLocked: Joi.boolean().required(),
+      })
+    )
+    .optional(),
+  typography: Joi.object()
+    .pattern(
+      Joi.string(),
+      Joi.object({
+        isLocked: Joi.boolean().required(),
+      })
+    )
+    .optional(),
+  styles: Joi.object()
+    .pattern(
+      Joi.string(),
+      Joi.object({
+        isLocked: Joi.boolean().required(),
+      })
+    )
+    .optional(),
+}).options({ allowUnknown: true, stripUnknown: true });
+
+const conceptSchema = Joi.object({
+  id: Joi.string().required(),
+  name: Joi.string().required(),
+  mode: Joi.string().valid('light', 'dark').required(),
+  prefer: Joi.string().valid('light', 'dark', 'system').required(),
+  themeConfig: Joi.object({
+    light: muiThemeSchema.required(),
+    dark: muiThemeSchema.required(),
+    common: muiThemeSchema.required(),
+  }).required(),
+  editor: editorStateSchema.required(),
+}).options({ allowUnknown: true, stripUnknown: true });
+
 const blockletThemeSchema = Joi.object({
-  common: muiThemeSchema.required(),
-  light: muiThemeSchema.required(),
-  dark: muiThemeSchema.required(),
-  prefer: Joi.string().valid('light', 'dark', 'system').default('light'),
+  concepts: Joi.array().items(conceptSchema).required(),
+  currentConceptId: Joi.string().required(),
 }).options({ allowUnknown: true, stripUnknown: true });
 
 module.exports = {

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.45-beta-20250625-103530-e1f5b0b8",
+  "version": "1.16.45-beta-20250627-075343-5af3ad9a",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,22 +19,22 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/analytics": "1.16.45-beta-20250625-103530-e1f5b0b8",
-    "@abtnode/auth": "1.16.45-beta-20250625-103530-e1f5b0b8",
-    "@abtnode/certificate-manager": "1.16.45-beta-20250625-103530-e1f5b0b8",
-    "@abtnode/client": "1.16.45-beta-20250625-103530-e1f5b0b8",
-    "@abtnode/constant": "1.16.45-beta-20250625-103530-e1f5b0b8",
-    "@abtnode/cron": "1.16.45-beta-20250625-103530-e1f5b0b8",
-    "@abtnode/db-cache": "1.16.45-beta-20250625-103530-e1f5b0b8",
-    "@abtnode/docker-utils": "1.16.45-beta-20250625-103530-e1f5b0b8",
-    "@abtnode/logger": "1.16.45-beta-20250625-103530-e1f5b0b8",
-    "@abtnode/models": "1.16.45-beta-20250625-103530-e1f5b0b8",
-    "@abtnode/queue": "1.16.45-beta-20250625-103530-e1f5b0b8",
-    "@abtnode/rbac": "1.16.45-beta-20250625-103530-e1f5b0b8",
-    "@abtnode/router-provider": "1.16.45-beta-20250625-103530-e1f5b0b8",
-    "@abtnode/static-server": "1.16.45-beta-20250625-103530-e1f5b0b8",
-    "@abtnode/timemachine": "1.16.45-beta-20250625-103530-e1f5b0b8",
-    "@abtnode/util": "1.16.45-beta-20250625-103530-e1f5b0b8",
+    "@abtnode/analytics": "1.16.45-beta-20250627-075343-5af3ad9a",
+    "@abtnode/auth": "1.16.45-beta-20250627-075343-5af3ad9a",
+    "@abtnode/certificate-manager": "1.16.45-beta-20250627-075343-5af3ad9a",
+    "@abtnode/client": "1.16.45-beta-20250627-075343-5af3ad9a",
+    "@abtnode/constant": "1.16.45-beta-20250627-075343-5af3ad9a",
+    "@abtnode/cron": "1.16.45-beta-20250627-075343-5af3ad9a",
+    "@abtnode/db-cache": "1.16.45-beta-20250627-075343-5af3ad9a",
+    "@abtnode/docker-utils": "1.16.45-beta-20250627-075343-5af3ad9a",
+    "@abtnode/logger": "1.16.45-beta-20250627-075343-5af3ad9a",
+    "@abtnode/models": "1.16.45-beta-20250627-075343-5af3ad9a",
+    "@abtnode/queue": "1.16.45-beta-20250627-075343-5af3ad9a",
+    "@abtnode/rbac": "1.16.45-beta-20250627-075343-5af3ad9a",
+    "@abtnode/router-provider": "1.16.45-beta-20250627-075343-5af3ad9a",
+    "@abtnode/static-server": "1.16.45-beta-20250627-075343-5af3ad9a",
+    "@abtnode/timemachine": "1.16.45-beta-20250627-075343-5af3ad9a",
+    "@abtnode/util": "1.16.45-beta-20250627-075343-5af3ad9a",
     "@arcblock/did": "1.20.14",
     "@arcblock/did-auth": "1.20.14",
     "@arcblock/did-ext": "1.20.14",
@@ -45,14 +45,14 @@
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/validator": "1.20.14",
     "@arcblock/vc": "1.20.14",
-    "@blocklet/constant": "1.16.45-beta-20250625-103530-e1f5b0b8",
+    "@blocklet/constant": "1.16.45-beta-20250627-075343-5af3ad9a",
     "@blocklet/did-space-js": "^1.0.62",
-    "@blocklet/env": "1.16.45-beta-20250625-103530-e1f5b0b8",
+    "@blocklet/env": "1.16.45-beta-20250627-075343-5af3ad9a",
     "@blocklet/error": "^0.2.5",
-    "@blocklet/meta": "1.16.45-beta-20250625-103530-e1f5b0b8",
-    "@blocklet/resolver": "1.16.45-beta-20250625-103530-e1f5b0b8",
-    "@blocklet/sdk": "1.16.45-beta-20250625-103530-e1f5b0b8",
-    "@blocklet/store": "1.16.45-beta-20250625-103530-e1f5b0b8",
+    "@blocklet/meta": "1.16.45-beta-20250627-075343-5af3ad9a",
+    "@blocklet/resolver": "1.16.45-beta-20250627-075343-5af3ad9a",
+    "@blocklet/sdk": "1.16.45-beta-20250627-075343-5af3ad9a",
+    "@blocklet/store": "1.16.45-beta-20250627-075343-5af3ad9a",
     "@blocklet/theme": "^2.13.70",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "1.20.14",
@@ -116,5 +116,5 @@
     "jest": "^29.7.0",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "68ba563213161265ceb38eaec06d43454a341f48"
+  "gitHead": "9a6e725b4831161020f627cddbb36173d2348306"
 }