@blocklet/pages-kit-block-studio 0.6.14 → 0.6.16

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

@@ -198,6 +198,40 @@ exports.initBlockStudioRouter.post('/', async (req, res) => {
                 });
             }
         }
+        // check if the properties has mediaKitUrl
+        if ((0, helper_1.isMetadataFile)(filePath) && content.properties) {
+            const downloadPromises = [];
+            Object.keys(content.properties).forEach((key) => {
+                const property = content.properties[key].data;
+                if (property.type === 'url') {
+                    Object.keys(property.locales).forEach((locale) => {
+                        if (property.locales[locale].defaultValue?.mediaKitUrl?.startsWith('mediakit://')) {
+                            const downloadPromise = (async () => {
+                                try {
+                                    const fileName = path_1.default.basename(property.locales[locale].defaultValue.mediaKitUrl);
+                                    const targetPath = path_1.default.join(dir, (0, helper_1.getPreviewImageRelativePath)(fileName));
+                                    if (fs_1.default.existsSync(targetPath)) {
+                                        return;
+                                    }
+                                    await (0, helper_1.downloadAsset)({
+                                        asset: fileName,
+                                        savePath: targetPath,
+                                        componentDid: process.env.BLOCKLET_COMPONENT_DID || '',
+                                    });
+                                }
+                                catch (error) {
+                                    console.error('Download media kit file failed:', error.message);
+                                }
+                            })();
+                            downloadPromises.push(downloadPromise);
+                        }
+                    });
+                }
+            });
+            if (downloadPromises.length > 0) {
+                await Promise.allSettled(downloadPromises);
+            }
+        }
         fs_1.default.writeFileSync(filePath, JSON.stringify(mergedContent, null, 2));
         return res.json({ success: true, content: mergedContent, message: 'Updated' });
     }

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

@@ -1,95 +1,16 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.initResourceRouter = void 0;
-exports.copyFile = copyFile;
-exports.copyDirectory = copyDirectory;
-exports.copyRecursive = copyRecursive;
 const component_1 = require("@blocklet/sdk/lib/component");
-const uploader_server_1 = require("@blocklet/uploader-server");
 const child_process_1 = require("child_process");
 const express_1 = require("express");
-const fs_1 = __importDefault(require("fs"));
-const get_1 = __importDefault(require("lodash/get"));
-const set_1 = __importDefault(require("lodash/set"));
-const path_1 = __importStar(require("path"));
-const typescript_1 = __importDefault(require("typescript"));
+const path_1 = require("path");
 const helper_1 = require("../utils/helper");
+const allTag = '@ALL_COMPONENTS';
 const DID = 'z2qa7BQdkEb3TwYyEYC1psK6uvmGnHSUHt5RM';
 const RESOURCE_TYPE = 'page';
-const allTag = '@ALL_COMPONENTS';
 // use for tracking build process
 let currentBuildProcess = null;
-function copyFile(src, dest) {
-    return new Promise((resolve, reject) => {
-        const readStream = fs_1.default.createReadStream(src);
-        const writeStream = fs_1.default.createWriteStream(dest);
-        readStream.on('error', reject);
-        writeStream.on('error', reject);
-        writeStream.on('finish', resolve);
-        readStream.pipe(writeStream);
-    });
-}
-async function copyDirectory(src, dest) {
-    await fs_1.default.promises.mkdir(dest, { recursive: true });
-    const entries = await fs_1.default.promises.readdir(src, { withFileTypes: true });
-    for (const entry of entries) {
-        const srcPath = path_1.default.join(src, entry.name);
-        const destPath = path_1.default.join(dest, entry.name);
-        if (entry.isDirectory()) {
-            // eslint-disable-next-line no-await-in-loop
-            await copyDirectory(srcPath, destPath);
-        }
-        else {
-            // eslint-disable-next-line no-await-in-loop
-            await copyFile(srcPath, destPath);
-        }
-    }
-}
-async function copyRecursive(src, dest) {
-    const srcStats = await fs_1.default.promises.stat(src);
-    if (srcStats.isDirectory()) {
-        await copyDirectory(src, dest);
-    }
-    else {
-        await copyFile(src, dest);
-    }
-}
 const getExportDir = (projectId, releaseId) => {
     const exportDir = (0, component_1.getResourceExportDir)({ projectId, releaseId });
     const dir = (0, path_1.join)(exportDir, DID, RESOURCE_TYPE);
@@ -101,8 +22,6 @@ exports.initResourceRouter.get('/', async (_req, res) => {
     const rootDir = process.cwd();
     const files = (0, helper_1.findComponentFiles)({ cwd: rootDir, strictExistMetadata: true });
     for (const file of files) {
-        // const filePath = path.join(rootDir, file);
-        // const fileContent = fs.readFileSync(filePath, 'utf8');
         const { blockName } = file;
         resources.push({
             id: blockName,
@@ -136,9 +55,11 @@ exports.initResourceRouter.post('/', async (req, res) => {
             currentBuildProcess = null;
         }
         if (componentIds.length === 0) {
-            throw new Error('No components founds, please check has any component been selected');
+            throw new Error('No components found, please check has any component been selected');
         }
-        // Execute build command with filtered components
+        // Get export directory
+        const exportDir = getExportDir(projectId, releaseId);
+        // Execute build command with export directory
         const buildProcess = (0, child_process_1.spawn)('pnpm', ['run', 'build-lib'], {
             stdio: 'inherit',
             shell: true,
@@ -146,6 +67,7 @@ exports.initResourceRouter.post('/', async (req, res) => {
                 ...process.env,
                 FORCE_COLOR: '1',
                 BLOCK_FILTER: componentIds.join(','),
+                EXPORT_DIR: exportDir,
                 NODE_OPTIONS: '--max_old_space_size=16384',
                 NODE_ENV: 'production',
             },
@@ -164,183 +86,6 @@ exports.initResourceRouter.post('/', async (req, res) => {
                 reject(error);
             });
         });
-        const dir = getExportDir(projectId, releaseId);
-        fs_1.default.rmSync(dir, { recursive: true, force: true });
-        fs_1.default.mkdirSync(dir, { recursive: true });
-        const rootDir = process.cwd();
-        const distDir = (0, path_1.join)(rootDir, helper_1.libDir);
-        const codeDir = (0, path_1.join)(distDir, 'es');
-        const tmpPackage = (0, path_1.join)(distDir, 'resource-blocklet');
-        fs_1.default.mkdirSync(tmpPackage, { recursive: true });
-        const pagesDir = (0, path_1.join)(tmpPackage, 'pages');
-        fs_1.default.mkdirSync(pagesDir, { recursive: true });
-        const componentsDir = (0, path_1.join)(tmpPackage, 'components');
-        fs_1.default.mkdirSync(componentsDir, { recursive: true });
-        const chunksDir = (0, path_1.join)(tmpPackage, 'chunks');
-        fs_1.default.mkdirSync(chunksDir, { recursive: true });
-        const chunksMapPath = (0, path_1.join)(codeDir, 'chunks-map.json');
-        const chunksMap = JSON.parse(fs_1.default.readFileSync(chunksMapPath, 'utf8'));
-        // get @metadata.json by glob
-        const canUseComponents = (0, helper_1.findComponentFiles)({ cwd: rootDir, filter: componentIds, strictExistMetadata: true });
-        // Filter and process metadata files
-        const metadataList = await Promise.all(canUseComponents.map(async ({ fullPath, blockName, metadata: _metadata }) => {
-            // get metadata
-            const metadata = _metadata;
-            const jsName = `${blockName}.js`;
-            // set version to 2
-            (0, set_1.default)(metadata, 'version', 2);
-            // get code to metadata
-            const code = fs_1.default.readFileSync((0, path_1.join)(codeDir, `${(0, helper_1.getComponentScriptName)(blockName, 'esm')}.js`), 'utf8');
-            if (code) {
-                (0, set_1.default)(metadata, 'renderer.script', code);
-                (0, set_1.default)(metadata, 'renderer.type', 'react-component');
-                (0, set_1.default)(metadata, 'renderer.chunks', chunksMap[jsName] || []);
-            }
-            // get cjs by code with transpileModule
-            try {
-                const cjsCode = typescript_1.default.transpileModule(code, {
-                    compilerOptions: {
-                        jsx: typescript_1.default.JsxEmit.React,
-                        target: typescript_1.default.ScriptTarget.ES2016,
-                        module: typescript_1.default.ModuleKind.CommonJS,
-                        moduleResolution: typescript_1.default.ModuleResolutionKind.Node16,
-                    },
-                }).outputText;
-                if (cjsCode) {
-                    (0, set_1.default)(metadata, 'renderer.cjsScript', cjsCode);
-                }
-            }
-            catch (error) {
-                // ignore error
-            }
-            // get edit component code
-            try {
-                const editComponentJsName = `${(0, helper_1.getEditComponentBlockName)(blockName)}.js`;
-                const editComponentCode = fs_1.default.readFileSync((0, path_1.join)(codeDir, editComponentJsName), 'utf8');
-                if (editComponentCode) {
-                    // add edit component code
-                    (0, set_1.default)(metadata, 'renderer.editComponent', editComponentCode);
-                    // append edit component chunks
-                    (0, set_1.default)(metadata, 'renderer.chunks', Array.from(new Set([...(0, get_1.default)(metadata, 'renderer.chunks', []), ...(chunksMap[editComponentJsName] || [])])));
-                }
-            }
-            catch (error) {
-                // ignore error
-            }
-            // get aigne output value schema
-            try {
-                const aigneOutputValueSchemaJsName = `${(0, helper_1.getAigneOutputValueSchemaBlockName)(blockName)}.js`;
-                const aigneOutputValueSchemaCode = fs_1.default.readFileSync((0, path_1.join)(codeDir, aigneOutputValueSchemaJsName), 'utf8');
-                if (aigneOutputValueSchemaCode) {
-                    (0, set_1.default)(metadata, 'renderer.aigneOutputValueSchema', aigneOutputValueSchemaCode);
-                }
-            }
-            catch (error) {
-                // ignore error
-            }
-            // get properties schema
-            try {
-                const propertiesSchemaJsName = `${(0, helper_1.getPropertiesSchemaBlockName)(blockName)}.js`;
-                const propertiesSchemaCode = fs_1.default.readFileSync((0, path_1.join)(codeDir, propertiesSchemaJsName), 'utf8');
-                if (propertiesSchemaCode) {
-                    (0, set_1.default)(metadata, 'renderer.PROPERTIES_SCHEMA', propertiesSchemaCode);
-                }
-            }
-            catch (error) {
-                // ignore error
-            }
-            // get getServerSideProps
-            try {
-                const getServerSidePropsJsName = `${(0, helper_1.getGetServerSidePropsBlockName)(blockName)}.js`;
-                const getServerSidePropsCode = fs_1.default.readFileSync((0, path_1.join)(codeDir, getServerSidePropsJsName), 'utf8');
-                if (getServerSidePropsCode) {
-                    (0, set_1.default)(metadata, 'renderer.getServerSideProps', getServerSidePropsCode);
-                }
-            }
-            catch (error) {
-                // ignore error
-            }
-            // Handle preview image if exists
-            if (metadata.previewImage) {
-                const imagePath = path_1.default.join(path_1.default.dirname(fullPath), (0, helper_1.getPreviewImageRelativePath)(metadata.previewImage));
-                const imageDestPath = path_1.default.join(componentsDir, metadata.previewImage);
-                if (fs_1.default.existsSync(imagePath)) {
-                    fs_1.default.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 = (0, path_1.basename)(property.locales[locale].defaultValue.mediaKitUrl);
-                                        const targetPath = path_1.default.join(componentsDir, fileName);
-                                        // Check if file already exists to avoid redundant downloads
-                                        if (fs_1.default.existsSync(targetPath)) {
-                                            return;
-                                        }
-                                        const resWithStream = await (0, uploader_server_1.getMediaKitFileStream)(property.locales[locale].defaultValue.mediaKitUrl);
-                                        if (!resWithStream.data) {
-                                            return;
-                                        }
-                                        // create write stream
-                                        const writeStream = fs_1.default.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_1.default.join(componentsDir, `${metadata.name || 'unnamed'}.${metadata.id}.yml`);
-            fs_1.default.writeFileSync(metadataYmlPath, (0, helper_1.generateYaml)(metadata));
-            return metadata;
-        }));
-        // cp chunks dir
-        await copyRecursive((0, path_1.join)(codeDir, 'chunks'), chunksDir);
-        // write pages.config.yml
-        const pagesConfigPath = path_1.default.join(tmpPackage, '.blocklet/pages/pages.config.yml');
-        fs_1.default.mkdirSync(path_1.default.dirname(pagesConfigPath), { recursive: true });
-        const pagesConfig = {
-            version: 2,
-            pages: [],
-            components: metadataList.map((metadata) => ({
-                id: metadata.id,
-                name: metadata.name,
-            })),
-            supportedLocales: [],
-            config: {},
-        };
-        fs_1.default.writeFileSync(pagesConfigPath, (0, helper_1.generateYaml)(pagesConfig));
-        helper_1.logger.info('generate resource blocklet block count:', metadataList.length);
-        await copyRecursive(tmpPackage, dir);
-        // remove tmpPackage
-        // fs.rmSync(tmpPackage, { recursive: true, force: true });
         res.json({ success: true });
     }
     catch (error) {