@blocklet/pages-kit-block-studio 0.5.40 → 0.5.42

package/lib/esm/middlewares/init-block-studio-router.js

@@ -15,6 +15,52 @@ import { tsFileToZodSchema } from '../utils/ts-morph-utils';
 import { propertiesToZodSchema, zodSchemaToTypeString, zodSchemaToJsonSchema, jsonSchemaToProperties, } from '../utils/zod-utils';
 export const initBlockStudioRouter = Router();
 const BINARY_EXTENSIONS = ['.png', '.jpg', '.jpeg', '.gif', '.webp', '.ico', '.svg'];
+// 递归删除目录
+const removeDirectoryRecursive = (dirPath) => {
+    if (!fs.existsSync(dirPath)) {
+        return;
+    }
+    const stats = fs.statSync(dirPath);
+    if (stats.isDirectory()) {
+        const files = fs.readdirSync(dirPath);
+        for (const file of files) {
+            const filePath = path.join(dirPath, file);
+            const fileStats = fs.statSync(filePath);
+            if (fileStats.isDirectory()) {
+                removeDirectoryRecursive(filePath);
+            }
+            else {
+                fs.unlinkSync(filePath);
+            }
+        }
+        fs.rmdirSync(dirPath);
+    }
+    else {
+        fs.unlinkSync(dirPath);
+    }
+};
+// 根据路由查找对应的组件目录路径
+const findComponentDirByRoute = async (route) => {
+    try {
+        // Remove leading slash from route to get component name
+        const componentName = route.replace(/^\//, '');
+        // Find all component files
+        const allComponents = await findComponentFiles({
+            strictExistMetadata: true,
+        });
+        // Find the component that matches the block name
+        const matchedComponent = allComponents.find((component) => component.blockName === componentName);
+        if (matchedComponent) {
+            // Return the directory path (parent of the index file)
+            return path.dirname(matchedComponent.fullPath);
+        }
+        return null;
+    }
+    catch (error) {
+        console.error('Error finding component directory:', error);
+        return null;
+    }
+};
 // 共享的请求验证和文件路径处理
 const validateRequest = (req, res) => {
     if (!isDev) {
@@ -92,6 +138,10 @@ initBlockStudioRouter.post('/', async (req, res) => {
         if (!currentMetadata) {
             return res.status(404).json({ error: 'Metadata file not found' });
         }
+        // 核对 id 是否一致，不一致可能是手动修改过
+        if (currentMetadata.id !== content.id) {
+            return res.status(400).json({ error: 'ID is not consistent, please refresh the page' });
+        }
         const mergedContent = { ...currentMetadata, ...content };
         if (isEqual(currentMetadata, mergedContent)) {
             return res.json({ success: true, content: mergedContent, message: 'No changes' });
@@ -349,4 +399,74 @@ initBlockStudioRouter.post('/interface-to-properties', async (req, res) => {
         });
     }
 });
+// 添加删除组件的路由
+initBlockStudioRouter.delete('/delete', async (req, res) => {
+    if (!isDev) {
+        return res.status(403).json({ error: 'Only available in development mode' });
+    }
+    const { route } = req.body;
+    if (!route) {
+        return res.status(400).json({ error: 'Route is required' });
+    }
+    try {
+        // Find the component directory path
+        const componentDir = await findComponentDirByRoute(route);
+        if (!componentDir) {
+            return res.status(404).json({
+                success: false,
+                error: 'Component directory not found',
+            });
+        }
+        // Security check: ensure the path is safe and within expected bounds
+        if (!isPathSafe(componentDir)) {
+            return res.status(403).json({
+                success: false,
+                error: 'Invalid component directory path',
+            });
+        }
+        // Additional safety check: ensure it contains @metadata.json to confirm it's a component
+        const metadataPath = path.join(componentDir, METADATA_FILE_NAME);
+        if (!fs.existsSync(metadataPath)) {
+            return res.status(400).json({
+                success: false,
+                error: 'Invalid component directory: no metadata file found',
+            });
+        }
+        // Verify that this directory is indeed for component development
+        // Check if it's in the expected component structure
+        const pattern = getBlockEntryFilesPattern();
+        const baseDir = path.dirname(pattern.replace(/\*\*?/g, ''));
+        const relativePath = path.relative(baseDir, componentDir);
+        // Ensure the component is within the base directory and not trying to escape
+        if (relativePath.startsWith('..') || path.isAbsolute(relativePath)) {
+            return res.status(403).json({
+                success: false,
+                error: 'Component directory is outside allowed path',
+            });
+        }
+        // Perform the deletion
+        try {
+            removeDirectoryRecursive(componentDir);
+            return res.json({
+                success: true,
+                message: 'Component deleted successfully',
+                deletedPath: componentDir,
+            });
+        }
+        catch (deleteError) {
+            console.error('Failed to delete component directory:', deleteError);
+            return res.status(500).json({
+                success: false,
+                error: `Failed to delete component directory: ${deleteError.message}`,
+            });
+        }
+    }
+    catch (error) {
+        console.error('Failed to delete component:', error);
+        return res.status(500).json({
+            success: false,
+            error: `Failed to delete component: ${error.message}`,
+        });
+    }
+});
 export default initBlockStudioRouter;

package/lib/esm/middlewares/init-resource-router.js

@@ -1,10 +1,11 @@
 import { getResourceExportDir } from '@blocklet/sdk/lib/component';
+import { getMediaKitFileStream } from '@blocklet/uploader-server';
 import { spawn } from 'child_process';
 import { Router } from 'express';
 import fs from 'fs';
 import get from 'lodash/get';
 import set from 'lodash/set';
-import path, { join } from 'path';
+import path, { join, basename } from 'path';
 import { findComponentFiles, libDir, getPreviewImageRelativePath, generateYaml, logger, getEditComponentBlockName, } from '../utils/helper';
 const DID = 'z2qa7BQdkEb3TwYyEYC1psK6uvmGnHSUHt5RM';
 const RESOURCE_TYPE = 'page';
@@ -139,7 +140,7 @@ initResourceRouter.post('/', async (req, res) => {
         // get @metadata.json by glob
         const canUseComponents = findComponentFiles({ cwd: rootDir, filter: componentIds, strictExistMetadata: true });
         // Filter and process metadata files
-        const metadataList = canUseComponents.map(({ fullPath, blockName, metadata: _metadata }) => {
+        const metadataList = await Promise.all(canUseComponents.map(async ({ fullPath, blockName, metadata: _metadata }) => {
             // get metadata
             const metadata = _metadata;
             const jsName = `${blockName}.js`;
@@ -164,9 +165,6 @@ initResourceRouter.post('/', async (req, res) => {
             catch (error) {
                 // ignore error
             }
-            // write metadata to metadataPath
-            const metadataYmlPath = path.join(componentsDir, `${metadata.name || 'unnamed'}.${metadata.id}.yml`);
-            fs.writeFileSync(metadataYmlPath, generateYaml(metadata));
             // Handle preview image if exists
             if (metadata.previewImage) {
                 const imagePath = path.join(path.dirname(fullPath), getPreviewImageRelativePath(metadata.previewImage));
@@ -175,8 +173,59 @@ initResourceRouter.post('/', async (req, res) => {
                     fs.copyFileSync(imagePath, imageDestPath);
                 }
             }
+            // Handle type:url properties url
+            if (metadata.properties) {
+                const downloadPromises = [];
+                Object.keys(metadata.properties).forEach((key) => {
+                    const property = metadata.properties[key].data;
+                    if (property.type === 'url') {
+                        // 如果每个 locales 的默认值里面，存在 mediaKitUrl 的值，需要把图片下载放到 imagePath 里面
+                        Object.keys(property.locales).forEach((locale) => {
+                            if (property.locales[locale].defaultValue?.mediaKitUrl?.startsWith('mediakit://')) {
+                                const downloadPromise = (async () => {
+                                    try {
+                                        const fileName = basename(property.locales[locale].defaultValue.mediaKitUrl);
+                                        const targetPath = path.join(componentsDir, fileName);
+                                        // Check if file already exists to avoid redundant downloads
+                                        if (fs.existsSync(targetPath)) {
+                                            return;
+                                        }
+                                        const resWithStream = await getMediaKitFileStream(property.locales[locale].defaultValue.mediaKitUrl);
+                                        if (!resWithStream.data) {
+                                            return;
+                                        }
+                                        // create write stream
+                                        const writeStream = fs.createWriteStream(targetPath);
+                                        resWithStream.data.pipe(writeStream);
+                                        // wait for write stream to finish
+                                        await new Promise((resolve, reject) => {
+                                            writeStream.on('finish', () => {
+                                                // 修改 property.locales[locale].defaultValue.url 变为 mediakit:// 开头
+                                                property.locales[locale].defaultValue.url = property.locales[locale].defaultValue.mediaKitUrl;
+                                                resolve();
+                                            });
+                                            writeStream.on('error', reject);
+                                        });
+                                    }
+                                    catch (error) {
+                                        console.error('Download media kit file failed:', error.message);
+                                    }
+                                })();
+                                downloadPromises.push(downloadPromise);
+                            }
+                        });
+                    }
+                });
+                // Wait for all downloads to complete for this metadata
+                if (downloadPromises.length > 0) {
+                    await Promise.allSettled(downloadPromises);
+                }
+            }
+            // write metadata to metadataPath
+            const metadataYmlPath = path.join(componentsDir, `${metadata.name || 'unnamed'}.${metadata.id}.yml`);
+            fs.writeFileSync(metadataYmlPath, generateYaml(metadata));
             return metadata;
-        });
+        }));
         // cp chunks dir
         await copyRecursive(join(codeDir, 'chunks'), chunksDir);
         // write pages.config.yml