@abtnode/core 1.16.28-beta-b30865b3 → 1.16.28-beta-cec13afc

package/lib/blocklet/manager/helper/install-component-from-url.js

@@ -95,9 +95,11 @@ const installComponentFromUrl = async ({
   const { dynamicComponents } = await parseComponents(newChild);
 
   const index = blocklet.children.findIndex((child) => child.meta.did === meta.did);
+
   if (index >= 0) {
     // if upgrade, do not update mountPoint and title
-    newChild.mountPoint = blocklet.children[index].mountPoint;
+    newChild.mountPoint =
+      blocklet.children[index].mountPoint || formatName(newChildMeta.title) || formatName(newChildMeta.name);
     // 更新版本时, title 应该更新
     // newChild.meta.title = blocklet.children[index].meta.title;
     newChild.installedAt = blocklet.children[index].installedAt;

package/lib/blocklet/project/create-pack-release.js

@@ -13,7 +13,7 @@ const { createRelease: createBlockletRelease } = require('@abtnode/util/lib/crea
 const urlPathFriendly = require('@blocklet/meta/lib/url-path-friendly').default;
 const { hasStartEngine } = require('@blocklet/meta/lib/util');
 
-const logger = require('@abtnode/logger')('create-resource-blocklet-pack');
+const logger = require('@abtnode/logger')('blocklet-studio-pack');
 
 const { createReleaseSchema } = require('../../validators/project');
 
@@ -228,7 +228,7 @@ const createPackRelease = async ({
     if (fs.existsSync(extendedMetaFile)) {
       const extendedMeta = readMetaFile(extendedMetaFile);
       logger.info('merge extended blocklet.yml', extendedMeta);
-      Object.assign(meta, pick(extendedMeta, ['environments', 'engine']));
+      Object.assign(meta, pick(extendedMeta, ['environments', 'engine', 'capabilities']));
     }
 
     // Reset group for blocklets with engine specified

package/lib/blocklet/project/index.js

@@ -10,7 +10,7 @@ const { titleSchema } = require('@blocklet/meta/lib/schema');
 const { validateNewDid } = require('@blocklet/meta/lib/name');
 const urlPathFriendly = require('@blocklet/meta/lib/url-path-friendly').default;
 
-const logger = require('@abtnode/logger')('create-resource-blocklet');
+const logger = require('@abtnode/logger')('blocklet-studio');
 
 const { createReleaseSchema } = require('../../validators/project');
 const getIsMultipleTenant = require('./get-is-multiple-tenant');
@@ -19,8 +19,10 @@ const {
   getLogoFile,
   exportBlockletResources,
   getResourceList,
+  checkUploadExists,
   checkResourceExists,
   getExtendedMetaFile,
+  exportUploadedResources,
 } = require('./util');
 const createPackRelease = require('./create-pack-release');
 const connectToStore = require('./connect-to-store');
@@ -172,6 +174,7 @@ const createRelease = async ({
   blockletIntroduction,
   blockletLogo,
   blockletScreenshots,
+  uploadedResource,
   blockletComponents,
   note,
   manager,
@@ -196,6 +199,7 @@ const createRelease = async ({
     blockletLogo,
     blockletIntroduction,
     blockletScreenshots,
+    uploadedResource,
     note,
   };
 
@@ -235,16 +239,16 @@ const createRelease = async ({
   if (action === 'update') {
     const release = await releaseState.findOne({ projectId, id: releaseId });
     if (!release) {
-      throw new Error('release not found');
+      throw new Error(`Blocklet release ${releaseId} not found for project ${projectId}`);
     }
     if (release.status !== 'draft') {
-      throw new Error('Can not update a published release');
+      throw new Error(`Can not update a published release: ${releaseId}`);
     }
   }
 
   const existVersion = await releaseState.findOne({ projectId, blockletVersion });
   if (existVersion && (action === 'create' || existVersion.id !== releaseId)) {
-    throw new Error(`blockletVersion ${blockletVersion} already exists`);
+    throw new Error(`Release version ${blockletVersion} already exists`);
   }
 
   const { blockletDid } = project0;
@@ -253,8 +257,14 @@ const createRelease = async ({
 
   const projectDir = path.join(blocklet.env.dataDir, PROJECT.DIR, `${projectId}`);
 
+  // validate resources
+  const isResourceFromUpload = !!uploadedResource;
   if (status !== PROJECT.RELEASE_STATUS.draft) {
-    await checkResourceExists(projectDir, action, releaseId);
+    if (isResourceFromUpload) {
+      await checkUploadExists(projectDir, action, releaseId, uploadedResource);
+    } else {
+      await checkResourceExists(projectDir, action, releaseId);
+    }
   }
 
   const release = await releaseState.upsertRelease({
@@ -264,6 +274,7 @@ const createRelease = async ({
     releaseId,
     status,
   });
+  logger.info('release upsert done', release);
 
   const _releaseId = release.id;
   const releaseDir = path.join(projectDir, PROJECT.RELEASE_DIR, `${_releaseId}`);
@@ -301,7 +312,7 @@ const createRelease = async ({
   }
 
   if (fs.existsSync(releaseFile)) {
-    logger.error('release file already exists, remove it', releaseFile);
+    logger.warn('release file exists, remove it', releaseFile);
     await fs.remove(releaseFile);
   }
 
@@ -338,17 +349,7 @@ const createRelease = async ({
     });
     await fs.outputFile(changelogDistFile, changelog.join('\n\n'));
 
-    // create resource
-    await exportBlockletResources({
-      app: blocklet,
-      projectId,
-      releaseId: _releaseId,
-      exportDir: releaseBundleDir,
-      blockletDid,
-    });
-
     // create blocklet.yml
-    const resourceList = await getResourceList(resourceDir);
     const meta = {
       did: blockletDid,
       name: blockletDid,
@@ -356,20 +357,53 @@ const createRelease = async ({
       description: blockletDescription,
       version: blockletVersion,
       logo: logoFileName,
-      resource: {
-        bundles: resourceList.length ? resourceList : undefined,
-      },
       components: [],
       files: project.blockletScreenshots?.length ? ['screenshots'] : [],
       screenshots: project.blockletScreenshots || [],
     };
 
+    // create resource
+    if (isResourceFromUpload) {
+      await exportUploadedResources({
+        app: blocklet,
+        projectId,
+        releaseId: _releaseId,
+        exportDir: releaseBundleDir,
+      });
+
+      meta.main = PROJECT.MAIN_DIR;
+      meta.engine = {
+        interpreter: 'blocklet',
+        source: {
+          // FIXME: @wangshijun publish this to production store
+          store: 'https://test.store.blocklet.dev',
+          name: 'z2qa2dGC9EmsjB2WJtUcmuRWx43zTwPUZQF7g',
+          version: 'latest',
+        },
+      };
+    } else {
+      await exportBlockletResources({
+        app: blocklet,
+        projectId,
+        releaseId: _releaseId,
+        exportDir: releaseBundleDir,
+        blockletDid,
+      });
+
+      const resourceList = await getResourceList(resourceDir);
+      if (resourceList) {
+        meta.resource = {
+          bundles: resourceList.length ? resourceList : undefined,
+        };
+      }
+    }
+
     // merge extended blocklet.yml
     const extendedMetaFile = getExtendedMetaFile({ app: blocklet, projectId, releaseId });
     if (fs.existsSync(extendedMetaFile)) {
       const extendedMeta = readMetaFile(extendedMetaFile);
-      logger.info('merge extended blocklet.yml', extendedMeta);
-      Object.assign(meta, pick(extendedMeta, ['environments', 'engine']));
+      logger.info('release extended blocklet.yml', extendedMeta);
+      Object.assign(meta, pick(extendedMeta, ['environments', 'engine', 'capabilities']));
     }
 
     // Enable mountPoint for blocklets with engine specified
@@ -411,7 +445,7 @@ const createRelease = async ({
       files: [releaseFileName],
     });
 
-    logger.info('create release success', res2);
+    logger.info('release finalized', res2);
 
     return res2;
   } catch (error) {

package/lib/blocklet/project/util.js

@@ -3,6 +3,7 @@ const fs = require('fs-extra');
 const fg = require('fast-glob');
 const { isValid: isValidDid } = require('@arcblock/did');
 const { PROJECT, BLOCKLET_RESOURCE_DIR, BLOCKLET_META_FILE } = require('@blocklet/constant');
+const { expandBundle } = require('../../util');
 
 const COMPONENT_CONFIG_MAP_DIR = '.component_config';
 
@@ -77,6 +78,15 @@ const exportBlockletResources = async ({
   }
 };
 
+const exportUploadedResources = async ({ app, projectId, releaseId, exportDir }) => {
+  const projectDir = path.join(app.env.dataDir, PROJECT.DIR, `${projectId}`);
+  const releaseDir = path.join(projectDir, PROJECT.RELEASE_DIR, `${releaseId}`);
+  const sourceDir = path.join(releaseDir, PROJECT.RESOURCE_DIR, PROJECT.MAIN_DIR);
+  const destDir = path.join(exportDir, PROJECT.MAIN_DIR);
+  await fs.ensureDir(destDir);
+  await fs.copy(sourceDir, destDir);
+};
+
 async function checkIfDirectory(file) {
   try {
     const stats = await fs.promises.stat(file);
@@ -135,6 +145,29 @@ const checkResourceExists = async (projectDir, action, releaseId) => {
   }
 };
 
+const checkUploadExists = async (projectDir, action, releaseId, uploadedResource) => {
+  const uploadedFile = path.join(projectDir, PROJECT.ASSET_DIR, uploadedResource);
+  if (!fs.existsSync(uploadedFile)) {
+    throw new Error(`Uploaded resource does not exist: ${uploadedResource}`);
+  }
+
+  const resourceDir =
+    action === 'create'
+      ? path.join(projectDir, PROJECT.RESOURCE_DIR, PROJECT.MAIN_DIR)
+      : path.join(projectDir, PROJECT.RELEASE_DIR, `${releaseId}`, PROJECT.RESOURCE_DIR, PROJECT.MAIN_DIR);
+
+  if (fs.existsSync(resourceDir)) {
+    fs.rmSync(resourceDir, { recursive: true });
+  }
+  fs.ensureDirSync(resourceDir);
+
+  await expandBundle(uploadedFile, resourceDir);
+  const files = ['index.html', 'index.htm'];
+  if (files.every((file) => fs.existsSync(path.join(resourceDir, file)) === false)) {
+    throw new Error(`Uploaded resource does not contain index.html or index.htm: ${uploadedResource}`);
+  }
+};
+
 const getExtendedMetaFile = ({ app, projectId, releaseId }) => {
   const { dataDir } = app.env;
   const dirArr = [dataDir, PROJECT.DIR, projectId || '/'];
@@ -148,7 +181,9 @@ const getExtendedMetaFile = ({ app, projectId, releaseId }) => {
 module.exports = {
   getLogoFile,
   exportBlockletResources,
+  exportUploadedResources,
   getResourceList,
+  checkUploadExists,
   checkResourceExists,
   getExtendedMetaFile,
 };

package/lib/states/release.js

@@ -31,6 +31,7 @@ class Release extends BaseState {
       'blockletScreenshots',
       'publishedStoreIds',
       'blockletComponents',
+      'uploadedResource',
       'note',
       'status',
       'files',

package/lib/validators/project.js

@@ -5,6 +5,7 @@ const note = Joi.string().min(1).max(PROJECT.MAX_NOTE_LENGTH);
 const blockletIntroduction = Joi.string().max(PROJECT.MAX_INTRO_LENGTH).allow('').allow(null);
 const blockletScreenshots = Joi.array().items(Joi.string().min(1).max(200));
 const blockletLogo = Joi.string().max(200).allow(null).allow('');
+const uploadedResource = Joi.string().max(255).allow(null).allow('');
 
 const createReleaseSchema = (status) =>
   Joi.object({
@@ -24,6 +25,7 @@ const createReleaseSchema = (status) =>
         required: Joi.boolean().allow(null),
       })
     ),
+    uploadedResource,
   });
 
 module.exports = {
@@ -31,5 +33,6 @@ module.exports = {
   blockletIntroduction,
   blockletScreenshots,
   blockletLogo,
+  uploadedResource,
   createReleaseSchema,
 };

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.28-beta-b30865b3",
+  "version": "1.16.28-beta-cec13afc",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -19,19 +19,19 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/analytics": "1.16.28-beta-b30865b3",
-    "@abtnode/auth": "1.16.28-beta-b30865b3",
-    "@abtnode/certificate-manager": "1.16.28-beta-b30865b3",
-    "@abtnode/constant": "1.16.28-beta-b30865b3",
-    "@abtnode/cron": "1.16.28-beta-b30865b3",
-    "@abtnode/logger": "1.16.28-beta-b30865b3",
-    "@abtnode/models": "1.16.28-beta-b30865b3",
-    "@abtnode/queue": "1.16.28-beta-b30865b3",
-    "@abtnode/rbac": "1.16.28-beta-b30865b3",
-    "@abtnode/router-provider": "1.16.28-beta-b30865b3",
-    "@abtnode/static-server": "1.16.28-beta-b30865b3",
-    "@abtnode/timemachine": "1.16.28-beta-b30865b3",
-    "@abtnode/util": "1.16.28-beta-b30865b3",
+    "@abtnode/analytics": "1.16.28-beta-cec13afc",
+    "@abtnode/auth": "1.16.28-beta-cec13afc",
+    "@abtnode/certificate-manager": "1.16.28-beta-cec13afc",
+    "@abtnode/constant": "1.16.28-beta-cec13afc",
+    "@abtnode/cron": "1.16.28-beta-cec13afc",
+    "@abtnode/logger": "1.16.28-beta-cec13afc",
+    "@abtnode/models": "1.16.28-beta-cec13afc",
+    "@abtnode/queue": "1.16.28-beta-cec13afc",
+    "@abtnode/rbac": "1.16.28-beta-cec13afc",
+    "@abtnode/router-provider": "1.16.28-beta-cec13afc",
+    "@abtnode/static-server": "1.16.28-beta-cec13afc",
+    "@abtnode/timemachine": "1.16.28-beta-cec13afc",
+    "@abtnode/util": "1.16.28-beta-cec13afc",
     "@arcblock/did": "1.18.123",
     "@arcblock/did-auth": "1.18.123",
     "@arcblock/did-ext": "^1.18.123",
@@ -42,12 +42,12 @@
     "@arcblock/pm2-events": "^0.0.5",
     "@arcblock/validator": "^1.18.123",
     "@arcblock/vc": "1.18.123",
-    "@blocklet/constant": "1.16.28-beta-b30865b3",
-    "@blocklet/env": "1.16.28-beta-b30865b3",
-    "@blocklet/meta": "1.16.28-beta-b30865b3",
-    "@blocklet/resolver": "1.16.28-beta-b30865b3",
-    "@blocklet/sdk": "1.16.28-beta-b30865b3",
-    "@blocklet/store": "1.16.28-beta-b30865b3",
+    "@blocklet/constant": "1.16.28-beta-cec13afc",
+    "@blocklet/env": "1.16.28-beta-cec13afc",
+    "@blocklet/meta": "1.16.28-beta-cec13afc",
+    "@blocklet/resolver": "1.16.28-beta-cec13afc",
+    "@blocklet/sdk": "1.16.28-beta-cec13afc",
+    "@blocklet/store": "1.16.28-beta-cec13afc",
     "@did-space/client": "^0.5.1",
     "@fidm/x509": "^1.2.1",
     "@ocap/mcrypto": "1.18.123",
@@ -103,5 +103,5 @@
     "jest": "^29.7.0",
     "unzipper": "^0.10.11"
   },
-  "gitHead": "93a071e3074207fa721a2198b1281f74d666cbbd"
+  "gitHead": "6ab117057365e4687296dba666f27470b4e31af2"
 }