@hyext/builder-revues 0.0.1-beta.11 → 0.0.1-beta.13

package/dist/index.js

@@ -52,6 +52,52 @@ function initCacheDir() {
     fs__default["default"].mkdirSync(cacheDir);
 }
 
+async function compile(projectPath, outputPath) {
+    initCacheDir();
+    await codeCompiler.compilerManager.init({
+        projectPath,
+        outputPath,
+        cachePath: cacheDir
+    });
+    await codeCompiler.compilerManager.compileDev();
+    copyProjectConfigJSON(projectPath, outputPath);
+}
+async function compileGame(projectPath, outputPath) {
+    initCacheDir();
+    await codeCompiler.compilerManager.init({
+        projectPath,
+        outputPath,
+        cachePath: cacheDir,
+        compileSettings: {
+            cocos: true
+        }
+    });
+    await codeCompiler.compilerManager.compileDev();
+    copyProjectConfigJSON(projectPath, outputPath);
+}
+async function watchGame(projectPath, outputPath, cb) {
+    await compileGame(projectPath, outputPath);
+    codeCompiler.compilerManager.watch('game', async (type, filePath) => {
+        await codeCompiler.compilerManager.compileSingleCode({
+            type,
+            filePath,
+            graphId: 'game'
+        });
+        cb && cb();
+    });
+}
+async function watch(projectPath, outputPath, cb) {
+    await compile(projectPath, outputPath);
+    codeCompiler.compilerManager.watch('miniprogram', async (type, filePath) => {
+        await codeCompiler.compilerManager.compileSingleCode({
+            type,
+            filePath,
+            graphId: 'miniprogram'
+        });
+        cb && cb();
+    });
+}
+
 const sep = chalk__default["default"].gray('·');
 const createLogger = (prefix) => {
     prefix = `   ${prefix}`;
@@ -76,47 +122,13 @@ const createLogger = (prefix) => {
 };
 var logger = createLogger('REVUE');
 
-// 写成构建插件是最好的，不入侵中间产物，现在图个快
-function replaceWebAdapter(projectPath) {
-    const sourcePath = path__default["default"].join(projectPath, 'web-adapter.js');
-    const nodePath = require.resolve('@revues/cocos-web-adapter/dist/index.js');
-    if (fs__default["default"].existsSync(sourcePath)) {
-        fs__default["default"].writeFileSync(sourcePath, fs__default["default"].readFileSync(nodePath));
-    }
-    else {
-        logger.log('The web-adapter.js was not found from project root.');
-    }
-}
-
-async function compile(projectPath, outputPath) {
-    initCacheDir();
-    await codeCompiler.compilerManager.init({
-        projectPath,
-        outputPath,
-        cachePath: cacheDir
-    });
-    await codeCompiler.compilerManager.compileDev();
-    copyProjectConfigJSON(projectPath, outputPath);
-}
-async function compileGame(projectPath, outputPath) {
-    initCacheDir();
-    replaceWebAdapter(projectPath);
-    await codeCompiler.compilerManager.init({
-        projectPath,
-        outputPath,
-        cachePath: cacheDir
-    });
-    await codeCompiler.compilerManager.compileDev();
-    copyProjectConfigJSON(projectPath, outputPath);
-}
-
 const HOST = {
     test: '//test-extsdk.msstatic.com',
     prod: '//extsdk-msstatic.cdn.huya.com'
 };
 // $1是动态的extType
 function getSDKUrlTemplate(opts) {
-    return `${HOST.prod}/sdk/$1/${opts.hostId}/${opts.extUuid || 0}/sdk.js`;
+    return `${HOST.prod}/sdk/${opts.extType}/${opts.hostId}/${opts.extUuid || 0}/sdk.js`;
 }
 
 function render(content, data, opts) {
@@ -155,7 +167,7 @@ function mergeSubPackagesToMainPackage(packagePath, main, subList, onMoveBefore)
     });
 }
 
-function mergeMainPackage(releasePath, onMoveBefore) {
+function mergeMainPackage(watch, releasePath, onMoveBefore) {
     const packagePath = path__default["default"].join(releasePath, 'package');
     const packageConfig = getPackageConfig(packagePath);
     const targetIndex = packageConfig.findIndex(item => {
@@ -171,16 +183,21 @@ function mergeMainPackage(releasePath, onMoveBefore) {
         // 合并分包资源到子包
         mergeSubPackagesToMainPackage(packagePath, mainPakConf, subPakConfList, onMoveBefore);
     }
-    const frameworkPath = path__default["default"].join(staticPath, 'framework');
-    // 安置本地框架文件
-    if (deployMode === EDeployMode.Integration) {
-        // 迁移运行框架
-        fs__default["default"].copySync(frameworkPath, path__default["default"].join(releasePath, 'framework'));
-        // 迁移SDK
-        const sdkPath = path__default["default"].join(releasePath, 'sdk');
-        fs__default["default"].mkdirSync(sdkPath);
-        injectNpm(sdkPath, '@revues/web-sdk-core');
-        injectNpm(sdkPath, '@revues/web-frame');
+    if (!watch) {
+        const frameworkPath = path__default["default"].join(staticPath, 'framework');
+        // 安置本地框架文件
+        if (deployMode === EDeployMode.Integration) {
+            // 迁移运行框架
+            fs__default["default"].copySync(frameworkPath, path__default["default"].join(releasePath, 'framework'));
+            // 迁移SDK
+            const sdkPath = path__default["default"].join(releasePath, 'sdk');
+            fs__default["default"].mkdirSync(sdkPath);
+            injectNpm(sdkPath, '@revues/web-sdk-core');
+            injectNpm(sdkPath, '@revues/web-frame');
+            injectNpm(sdkPath, '@revues/hyext-adapter');
+            // 这段代码是测试 @revues/js-sdk
+            injectNpm(sdkPath, '@revues/js-sdk');
+        }
     }
     return {
         mainPakConf,
@@ -210,71 +227,86 @@ function injectNpm(dest, packageName) {
 // TODO: 改异步
 // 合并游戏分包到主包
 function mergeGamePackage(releasePath, opts) {
+    const extUuid = opts.extUuid;
+    const builderConfig = opts.builderConfig;
+    const watch = !!opts.watch;
     const publicPath = ''; // 留口子，cdn资源路径
-    const { mainPakConf, packagePath } = mergeMainPackage(releasePath);
+    const { mainPakConf, packagePath } = mergeMainPackage(watch, releasePath);
     const templatePath = path__default["default"].join(staticPath, 'template');
     const mainPath = path__default["default"].join(packagePath, mainPakConf.name);
-    // 渲染模版
-    renderGameTemplate({
-        hyextSDKUrl: getSDKUrlTemplate({
-            hostId: opts.hostId,
-            extUuid: opts.extUuid
-        }),
-        sourcePathPrefix: deployMode === EDeployMode.Integration
-            ? path__default["default"].relative(mainPath, releasePath)
-            : publicPath,
-        templatePath,
-        mainPath
+    const entrys = builderConfig.supportExtTypes.map((extType) => {
+        const entryFilename = `index_${extType}.html`;
+        return {
+            extType,
+            entryPath: 'package/' + mainPakConf.name + '/' + entryFilename,
+            sdkUrl: getSDKUrlTemplate({
+                extType,
+                extUuid,
+                hostId: builderConfig.hostId
+            }),
+            entryFilename
+        };
     });
-    // wasn文件 会被 cocos 同步请求，由于二进制文件同步请求失败 所以改为 base64 文本
-    transformWasnFileToBase64File(mainPath);
-    return {
-        mainPath,
-        main: mainPakConf,
-        entryPath: 'package/' + mainPakConf.name + '/index.html'
-    };
+    if (!watch) {
+        // 渲染模版
+        renderGameTemplate({
+            entrys,
+            sourcePathPrefix: deployMode === EDeployMode.Integration
+                ? path__default["default"].relative(mainPath, releasePath)
+                : publicPath,
+            templatePath,
+            mainPath,
+            ...opts.template
+        });
+        // wasn文件 会被 cocos 同步请求，由于二进制文件同步请求失败 所以改为 base64 文本
+        transformWasnFileToBase64File(mainPath);
+    }
+    return entrys;
 }
 function renderGameTemplate(opts) {
-    const { mainPath, sourcePathPrefix, templatePath, hyextSDKUrl } = opts;
-    const data = {
-        sourcePathPrefix,
-        hyextSDKUrl
+    const { mainPath, sourcePathPrefix, templatePath, entrys, debug } = opts;
+    const gameFrameRenderItem = {
+        input: path__default["default"].join(templatePath, 'game-frame.hbs'),
+        output: path__default["default"].join(mainPath, 'game-frame.html'),
+        data: {
+            sourcePathPrefix,
+        }
     };
-    const templateConfList = [
-        {
-            input: path__default["default"].join(templatePath, 'game-frame.hbs'),
-            output: path__default["default"].join(mainPath, 'game-frame.html'),
-            data
-        },
-        {
+    const entryRenderConfList = entrys.map((info) => {
+        return {
             input: path__default["default"].join(templatePath, 'minigame-page-manager.hbs'),
-            output: path__default["default"].join(mainPath, 'index.html'),
-            data
-        }
-    ];
-    templateConfList.forEach(config => {
+            output: path__default["default"].join(mainPath, info.entryFilename),
+            data: {
+                sourcePathPrefix,
+                hyextSDKUrl: info.sdkUrl,
+                debug
+            }
+        };
+    });
+    // @ts-ignore
+    entryRenderConfList.concat(gameFrameRenderItem).forEach(config => {
         renderTemplate(config.input, config.output, config.data);
     });
 }
 const ignorePath = [
-    "node_modules/**/*",
-    "**/node_modules/**",
-    "**/.git/**",
-    ".git/**/*",
-    "**/.svn/**",
-    ".svn/**/*",
-    ".DS_Store",
-    "**/.DS_Store",
+    'node_modules/**/*',
+    '**/node_modules/**',
+    '**/.git/**',
+    '.git/**/*',
+    '**/.svn/**',
+    '.svn/**/*',
+    '.DS_Store',
+    '**/.DS_Store'
 ];
 function transformWasnFileToBase64File(mainPath) {
     const files = glob.sync('**/**.wasm', {
         cwd: mainPath,
         ignore: ignorePath,
         nodir: true,
-        absolute: false,
+        absolute: false
     });
     console.log('transform wasm to base64 files: \n', files);
-    files.forEach((file) => {
+    files.forEach(file => {
         const abs = path__default["default"].join(mainPath, file);
         const text = fs__default["default"].readFileSync(abs).toString('base64');
         fs__default["default"].outputFileSync(abs + '.txt', text);
@@ -294,50 +326,66 @@ function copyServiceBundleToDest(subRoot, mainRoot, config) {
     }
 }
 function mergeMiniprogramPackage(releasePath, opts) {
+    const extUuid = opts.extUuid;
+    const builderConfig = opts.builderConfig;
+    const watch = !!opts.watch;
     const publicPath = ''; // 留口子，cdn资源路径
-    const { mainPakConf, packagePath } = mergeMainPackage(releasePath, copyServiceBundleToDest);
+    const { mainPakConf, packagePath } = mergeMainPackage(watch, releasePath, copyServiceBundleToDest);
     const extConfig = getPackageExtConfig(packagePath);
     const templatePath = path__default["default"].join(staticPath, 'template');
     const mainPath = path__default["default"].join(packagePath, mainPakConf.name);
-    // 渲染模版
-    renderMiniprogramTemplate({
-        hyextSDKUrl: getSDKUrlTemplate({
-            hostId: opts.hostId,
-            extUuid: opts.extUuid
-        }),
-        sourcePathPrefix: deployMode === EDeployMode.Integration
-            ? path__default["default"].relative(mainPath, releasePath)
-            : publicPath,
-        packageExtConfig: extConfig,
-        templatePath,
-        mainPath
+    const entrys = builderConfig.supportExtTypes.map((extType) => {
+        const entryFilename = `index_${extType}.html`;
+        return {
+            extType,
+            entryPath: 'package/' + mainPakConf.name + '/' + entryFilename,
+            sdkUrl: getSDKUrlTemplate({
+                extType,
+                extUuid,
+                hostId: builderConfig.hostId
+            }),
+            entryFilename
+        };
     });
-    return {
-        mainPath,
-        main: mainPakConf,
-        entryPath: 'package/' + mainPakConf.name + '/index.html'
-    };
+    if (!watch) {
+        // 渲染模版
+        renderMiniprogramTemplate({
+            entrys,
+            sourcePathPrefix: deployMode === EDeployMode.Integration
+                ? path__default["default"].relative(mainPath, releasePath)
+                : publicPath,
+            packageExtConfig: extConfig,
+            templatePath,
+            mainPath,
+            ...opts.template
+        });
+    }
+    return entrys;
 }
 function renderMiniprogramTemplate(opts) {
-    const { mainPath, sourcePathPrefix, templatePath, hyextSDKUrl, packageExtConfig } = opts;
-    const data = {
-        sourcePathPrefix,
-        hyextSDKUrl,
-        packageExtConfig: JSON.stringify(packageExtConfig)
+    const { mainPath, sourcePathPrefix, templatePath, entrys, packageExtConfig, debug } = opts;
+    const packageExtConfigStr = JSON.stringify(packageExtConfig);
+    const serviceRenderItem = {
+        input: path__default["default"].join(templatePath, 'service.hbs'),
+        output: path__default["default"].join(mainPath, 'service.html'),
+        data: {
+            sourcePathPrefix,
+        }
     };
-    const templateConfList = [
-        {
+    const entryRenderConfList = entrys.map((info) => {
+        return {
             input: path__default["default"].join(templatePath, 'miniapp-page-manager.hbs'),
-            output: path__default["default"].join(mainPath, 'index.html'),
-            data
-        },
-        {
-            input: path__default["default"].join(templatePath, 'service.hbs'),
-            output: path__default["default"].join(mainPath, 'service.html'),
-            data
-        }
-    ];
-    templateConfList.forEach(config => {
+            output: path__default["default"].join(mainPath, info.entryFilename),
+            data: {
+                sourcePathPrefix,
+                packageExtConfig: packageExtConfigStr,
+                hyextSDKUrl: info.sdkUrl,
+                debug
+            }
+        };
+    });
+    // @ts-ignore
+    entryRenderConfList.concat(serviceRenderItem).forEach(config => {
         renderTemplate(config.input, config.output, config.data);
     });
 }
@@ -387,26 +435,26 @@ function compress(output) {
 }
 
 async function makeBuildResults(mode, opts) {
-    const { baseURI, extTypes, entryInfo, outputPath } = opts;
+    const { baseURI, entrys, outputPath } = opts;
     const releasePath = path__default["default"].join(outputPath, 'build-result');
     const buildResultMap = {};
-    const buildResultList = extTypes.map(type => {
+    const buildResultList = entrys.map(info => {
         const result = {
             type: 'HTML',
             content: {
                 pages: [
                     {
-                        path: getPagePath(type, entryInfo)
+                        path: getPagePath(info)
                     }
                 ],
                 baseURI
             }
         };
-        buildResultMap[type] = result;
+        buildResultMap[info.extType] = result;
         return {
-            type,
+            type: info.extType,
             buildResult: {
-                [type]: result
+                [info.extType]: result
             }
         };
     });
@@ -418,11 +466,12 @@ async function makeBuildResults(mode, opts) {
     }
     return buildResultMap;
 }
-function getPagePath(extType, entryInfo) {
-    let entry = entryInfo.entryPath + `?extType=${extType}`;
+function getPagePath(entryInfo) {
+    const extType = entryInfo.extType;
+    let entry = entryInfo.entryPath;
     // 移动端需要补 __module_busi__
     if (extType.endsWith('_h5')) {
-        entry += '&__module_busi__=kiwi-ExtSDK';
+        entry += '?__module_busi__=kiwi-ExtSDK';
     }
     return entry;
 }
@@ -521,43 +570,51 @@ class RevueBuilder {
         fs__default["default"].existsSync(outputPath) && fs__default["default"].removeSync(outputPath);
         // 把 inputPath 的文件 迁移到 outputPath
         await fs__default["default"].copy(inputPath, outputPath, { overwrite: true });
-        const entryInfo = mergePackage(projectConfig, outputPath, {
-            hostId: processedConfig.hostId,
-            extUuid: extUuid
+        const entrys = mergePackage(projectConfig, outputPath, {
+            builderConfig: processedConfig
         });
         return await makeBuildResults('production', {
-            entryInfo,
+            entrys: entrys,
             baseURI: publicPath,
-            extTypes: processedConfig.supportExtTypes,
             outputPath
         });
     }
     async start(opts) {
-        const { inputPath, projectConfig, outputPath: outputPath$1, config } = opts;
-        const outputPath = outputPath$1 || path__default["default"].join(__dirname, '../../temp');
+        const { debug, inputPath, projectConfig, outputPath: outputPath$1, config } = opts;
+        const outputPath = outputPath$1 || path__default["default"].join(inputPath, 'node_modules', '.revues-project');
         const processedConfig = processBuilderConfigJSON('development', config);
         if (projectConfig.compileType == 'game') {
-            await compileGame(inputPath, outputPath);
+            await watchGame(inputPath, outputPath, () => {
+                mergePackage(projectConfig, outputPath, {
+                    watch: true,
+                    builderConfig: processedConfig
+                });
+            });
         }
         else {
-            await compile(inputPath, outputPath);
+            await watch(inputPath, outputPath, () => {
+                mergePackage(projectConfig, outputPath, {
+                    watch: true,
+                    builderConfig: processedConfig
+                });
+            });
         }
-        const entryInfo = mergePackage(projectConfig, outputPath, {
-            hostId: processedConfig.hostId,
-            extUuid: undefined
+        const entrys = mergePackage(projectConfig, outputPath, {
+            builderConfig: processedConfig,
+            template: {
+                debug
+            }
         });
         logger.log('启动 live server 服务...');
         logger.success('本地访问地址：', getDevBaseURI(processedConfig) +
-            entryInfo.entryPath +
-            '?extType=web_video_com');
+            entrys[0]?.entryPath);
         startLiveServer({
             ...processedConfig,
             root: outputPath
         });
         return await makeBuildResults('development', {
-            entryInfo,
+            entrys,
             baseURI: getDevBaseURI(processedConfig),
-            extTypes: processedConfig.supportExtTypes,
             outputPath
         });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hyext/builder-revues",
-  "version": "0.0.1-beta.11",
+  "version": "0.0.1-beta.13",
   "description": "> TODO: description",
   "author": "diamondloler <857276958@qq.com>",
   "homepage": "",
@@ -22,10 +22,11 @@
   },
   "scripts": {},
   "dependencies": {
-    "@revues/cocos-web-adapter": "0.0.1-beta.11",
-    "@revues/code-compiler": "0.0.1-beta.11",
-    "@revues/web-frame": "0.0.1-beta.11",
-    "@revues/web-sdk-core": "0.0.1-beta.11",
+    "@revues/cocos-web-adapter": "0.0.1-beta.13",
+    "@revues/code-compiler": "0.0.1-beta.13",
+    "@revues/hyext-adapter": "0.0.1-beta.13",
+    "@revues/web-frame": "0.0.1-beta.13",
+    "@revues/web-sdk-core": "0.0.1-beta.13",
     "archiver": "^7.0.1",
     "chalk": "^2.4.2",
     "fs-extra": "8.1.0",
@@ -40,5 +41,5 @@
     "@types/live-server": "^1.2.3",
     "@types/ramda": "^0.29.11"
   },
-  "gitHead": "9d078e3e3c1bd0cb68c8d24746f8a7f4e7998b3d"
+  "gitHead": "81bcc35d151f138aa3b99138b0bc93c7b855bb9e"
 }

package/static/framework/css/index.css

@@ -893,23 +893,23 @@ div.wx-picker {
   position: fixed;
   width: 100%;
   left: 0;
-  bottom: 274px;
+  bottom: 0;
   z-index: 2048;
   -webkit-backface-visibility: hidden;
   backface-visibility: hidden;
-  -webkit-transform: translateY(100%);
+  /* -webkit-transform: translateY(100%);
   transform: translateY(100%);
   -webkit-transition: -webkit-transform .3s;
   transition: -webkit-transform .3s;
   transition: transform .3s;
-  transition: transform .3s, -webkit-transform .3s;
+  transition: transform .3s, -webkit-transform .3s; */
   -moz-user-select: none;
   -webkit-user-select: none;
   -ms-user-select: none
 }
 
 .wx-picker-android {
-  bottom: 414px
+  bottom: 0px
 }
 
 .wx-picker-show {
@@ -3113,7 +3113,8 @@ wx-video .wx-video-slot * {
 
 wx-video video {
   width: 100%;
-  height: 100%
+  height: 100%;
+  position: relative;
 }
 
 wx-video .wx-video-playmask {
@@ -3150,7 +3151,7 @@ wx-video .wx-video-bar {
   display: flex;
   -webkit-align-items: center;
   align-items: center;
-  padding: 0 10px
+  padding: 0 10px;
 }
 
 wx-video .wx-video-bar.full {

package/static/framework/script/game-adapt.js

@@ -8952,12 +8952,12 @@
     !window.isIDE &&
       ['log', 'warn', 'error', 'info'].forEach(function(e) {
         /** 先打印原生的错误，后面再优化 */
-        // var t = console[e].bind(console)
-        // console[e] = function() {
-        //   window.vConsole
-        //     ? t.apply(void 0, arguments)
-        //     : u.push({ method: e, log: arguments })
-        // }
+        var t = console[e].bind(console)
+        console[e] = function() {
+          window.vConsole
+            ? t.apply(void 0, arguments)
+            : u.push({ method: e, log: arguments })
+        }
       }),
       document.addEventListener('keydown', function(e) {
         wx.getEventChannel('onGameKeyDown').emit(e)

package/static/framework/script/game-service.js

@@ -10225,7 +10225,7 @@ window.__serviceStartTime__ = Date.now()
             ? arguments[1]
             : window.__path__
       if (
-        !/(https?|file|wdfile|finfile):/i.test(e) &&
+        !/(https?|file|wdfile|hyfile):/i.test(e) &&
         !/^\s*data:image/.test(e)
       ) {
         if ('/' === e.substring(0, 1))
@@ -15307,7 +15307,7 @@ window.__serviceStartTime__ = Date.now()
           }
           return (
             (t = n ? _r(t) : t),
-            /^(plugin|finfile|https?):\/\//.test(t) ? t : ar.getRealRoute(e, t)
+            /^(plugin|hyfile|https?):\/\//.test(t) ? t : ar.getRealRoute(e, t)
           )
         },
         getPlatform: function() {
@@ -19764,7 +19764,7 @@ window.__serviceStartTime__ = Date.now()
               wx.getImageInfo({
                 src: e,
                 success: function(e) {
-                  ;(r.tempSrc = e.path.startsWith('finfile')
+                  ;(r.tempSrc = e.path.startsWith('hyfile')
                     ? e.path
                     : '/'.concat(e.path)),
                     (r.width = e.width),
@@ -19918,7 +19918,7 @@ window.__serviceStartTime__ = Date.now()
       ue()(this, e),
         t instanceof Ia
           ? (this.image = t.tempSrc)
-          : (/^(finfile|http|\/)/.test(t)
+          : (/^(hyfile|http|\/)/.test(t)
               ? (this.image = t)
               : (this.image = '/' + Pr.getRealRoute(window.__path__, t, !1)),
             Za({
@@ -20659,7 +20659,7 @@ window.__serviceStartTime__ = Date.now()
             if (t instanceof Ia) arguments[0] = t.tempSrc
             else {
               if ('string' != typeof t) return
-              ;/^(finfile|http|\/)/.test(t) ||
+              ;/^(hyfile|http|\/)/.test(t) ||
                 (arguments[0] = '/' + Pr.getRealRoute(window.__path__, t, !1)),
                 Za({
                   canvasId: this.canvasId,
@@ -21416,7 +21416,7 @@ window.__serviceStartTime__ = Date.now()
         t = arguments.length > 1 ? arguments[1] : void 0,
         n = t.windowPath
       if (
-        !/(https?|file|wdfile|finfile):/i.test(e) &&
+        !/(https?|file|wdfile|hyfile):/i.test(e) &&
         !/^\s*data:image/.test(e)
       )
         if ('/' === e.substring(0, 1))
@@ -23421,7 +23421,7 @@ window.__serviceStartTime__ = Date.now()
                       e,
                       "compressImage:fail file doesn't exist"
                     )
-                  : ((e.src = /^finfile:\/\//.test(e.src)
+                  : ((e.src = /^hyfile:\/\//.test(e.src)
                       ? e.src
                       : '/'.concat(e.src)),
                     Rr.invokeMethod(
@@ -23460,7 +23460,7 @@ window.__serviceStartTime__ = Date.now()
               }
             )
           } else
-            /^(wdfile|finfile):\/\//.test(e.src),
+            /^(wdfile|hyfile):\/\//.test(e.src),
               Rr.invokeMethod('getImageInfo', e, {
                 beforeSuccess: function(t) {
                   t.path = e.src
@@ -25884,7 +25884,7 @@ window.__serviceStartTime__ = Date.now()
           if ('' !== e) {
             if ('string' == typeof e) {
               if ((e.startsWith('/') && (e = '.' + e), window.isWebviewGame)) {
-                if (!/(finfile|http)/.test(e))
+                if (!/(hyfile|http)/.test(e))
                   try {
                     wx.getFileSystemManager().accessSync(e)
                   } catch (e) {
@@ -26369,7 +26369,7 @@ window.__serviceStartTime__ = Date.now()
       }
     }
     ;(lf.env = {
-      USER_DATA_PATH: window.__fcjs_user_data_path || 'finfile://usr'
+      USER_DATA_PATH: window.__fcjs_user_data_path || 'hyfile://usr'
     }),
       (lf.loadExtApi = function(e) {
         if (e) {

package/static/framework/script/service.js

@@ -20254,7 +20254,7 @@ window.__serviceStartTime__ = Date.now()
             ? arguments[1]
             : window.__path__
       if (
-        !/(https?|file|wdfile|finfile):/i.test(e) &&
+        !/(https?|file|wdfile|hyfile):/i.test(e) &&
         !/^\s*data:image/.test(e)
       ) {
         if ('/' === e.substring(0, 1))
@@ -22213,12 +22213,8 @@ window.__serviceStartTime__ = Date.now()
             console.groupEnd()
         },
         info: function(e) {
-          console.info(e)
-         
-          // var t = __wxConfig__ && __wxConfig__.debug
-          // window.isIDE
-          //   ? t && console.info(e)
-          //   : window.__enableDebug && console.info(e)
+          var debug = __wxConfig__ && __wxConfig__.debug
+          debug && console.info(e)
         },
         surroundByTryCatch: function(e, t) {
           var n = this
@@ -25297,7 +25293,7 @@ window.__serviceStartTime__ = Date.now()
         }
         return (
           (t = n ? kr(t) : t),
-          /^(plugin|finfile|https?):\/\//.test(t) ? t : ir.getRealRoute(e, t)
+          /^(plugin|hyfile|https?):\/\//.test(t) ? t : ir.getRealRoute(e, t)
         )
       },
       getPlatform: function() {
@@ -27033,7 +27029,7 @@ window.__serviceStartTime__ = Date.now()
       return window.isNewCanvasSupported || !1
     }
     function Oo() {
-      return window.__fcjs_user_data_path || 'finfile://usr'
+      return window.__fcjs_user_data_path || 'hyfile://usr'
     }
     function Po() {
       return window.iosRemoteDebuggerLog
@@ -27071,8 +27067,6 @@ window.__serviceStartTime__ = Date.now()
             (this.shouldUpdateLocalStorage = !0)
           var n = this
           Lo.forEach(function(e) {
-            R ||
-              N ||
               (console[e] && (t.methods[e] = console[e].bind(console)),
               (console[e] = function() {
                 var t
@@ -27134,7 +27128,7 @@ window.__serviceStartTime__ = Date.now()
                       'undefined' != typeof __wxConfig__ && __wxConfig__.debug),
                   void 0 !== window.__enableDebug &&
                     (this.enableDebug = window.__enableDebug),
-                  !R && this.enableDebug
+                  this.enableDebug
                 )
               }
             },
@@ -27943,7 +27937,7 @@ window.__serviceStartTime__ = Date.now()
               wx.getImageInfo({
                 src: e,
                 success: function(e) {
-                  ;(r.tempSrc = e.path.startsWith('finfile')
+                  ;(r.tempSrc = e.path.startsWith('hyfile')
                     ? e.path
                     : '/'.concat(e.path)),
                     (r.width = e.width),
@@ -28102,7 +28096,7 @@ window.__serviceStartTime__ = Date.now()
       ce()(this, e),
         t instanceof Ii
           ? (this.image = t.tempSrc)
-          : (/^(finfile|http|\/)/.test(t)
+          : (/^(hyfile|http|\/)/.test(t)
               ? (this.image = t)
               : (this.image = '/' + Ar.getRealRoute(window.__path__, t, !1)),
             Zi({
@@ -28843,7 +28837,7 @@ window.__serviceStartTime__ = Date.now()
             if (t instanceof Ii) arguments[0] = t.tempSrc
             else {
               if ('string' != typeof t) return
-              ;/^(finfile|http|\/)/.test(t) ||
+              ;/^(hyfile|http|\/)/.test(t) ||
                 (arguments[0] = '/' + Ar.getRealRoute(window.__path__, t, !1)),
                 Zi({
                   canvasId: this.canvasId,
@@ -30073,7 +30067,7 @@ window.__serviceStartTime__ = Date.now()
         t = arguments.length > 1 ? arguments[1] : void 0,
         n = t.windowPath
       if (
-        !/(https?|file|wdfile|finfile):/i.test(e) &&
+        !/(https?|file|wdfile|hyfile):/i.test(e) &&
         !/^\s*data:image/.test(e)
       )
         if ('/' === e.substring(0, 1))
@@ -34161,7 +34155,7 @@ window.__serviceStartTime__ = Date.now()
                       e,
                       "compressImage:fail file doesn't exist"
                     )
-                  : ((e.src = /^finfile:\/\//.test(e.src)
+                  : ((e.src = /^hyfile:\/\//.test(e.src)
                       ? e.src
                       : '/'.concat(Ar.getRealRoute(us(), e.src, !1))),
                     $r.invokeMethod(
@@ -34200,7 +34194,7 @@ window.__serviceStartTime__ = Date.now()
               }
             )
           } else
-            /^(wdfile|finfile):\/\//.test(e.src)
+            /^(wdfile|hyfile):\/\//.test(e.src)
               ? $r.invokeMethod('getImageInfo', e, {
                   beforeSuccess: function(t) {
                     t.path = e.src

package/static/framework/script/view.js

@@ -52247,10 +52247,10 @@ window.__viewStartTime__ = Date.now()
                   : ''
               if (
                 (e.startsWith('//') && (e = 'https:'.concat(e)),
-                /(wdfile|finfile):/i.test(e))
+                /(wdfile|hyfile):/i.test(e))
               )
                 return e.replace(
-                  /(wdfile|finfile):\/\//i,
+                  /(wdfile|hyfile):\/\//i,
                   '/miniprogram/preview/'
                 )
               if (/(https?|file):/i.test(e) || /^\s*data:image/.test(e))
@@ -52276,7 +52276,7 @@ window.__viewStartTime__ = Date.now()
                     ? arguments[1]
                     : window.__path__
               if (
-                !/(https?|file|wdfile|finfile):/i.test(t) &&
+                !/(https?|file|wdfile|hyfile):/i.test(t) &&
                 !/^\s*data:image/.test(t)
               ) {
                 if ('/' === t.substring(0, 1))
@@ -60027,6 +60027,9 @@ window.__viewStartTime__ = Date.now()
           },
           { capture: !0, passive: !1 }
         ),
+        document.addEventListener('touchstart', (e) => {
+            // 不加这个ios不触发touch事件
+          }),
           e.addEventListener(
             'touchstart',
             function(e) {
@@ -60630,7 +60633,7 @@ window.__viewStartTime__ = Date.now()
           if (
             !/^(http|https):\/\//.test(e) &&
             !/^\s*data:image\//.test(e) &&
-            (il || !/^finfile:\/\//.test(e))
+            (il || !/^hyfile:\/\//.test(e))
           )
             if (this.ownerShadowRoot) {
               var n = this.ownerShadowRoot.__wxHost.__componentOptions.domain
@@ -66484,7 +66487,7 @@ window.__viewStartTime__ = Date.now()
                         o.removeIntersectionObserver()
                       var c = r || i
                       if (
-                        (c.indexOf('finfile://') > -1 &&
+                        (c.indexOf('hyfile://') > -1 &&
                           $i &&
                           (c += '?t='.concat(v()())),
                         (s.src = c),
@@ -68982,7 +68985,7 @@ window.__viewStartTime__ = Date.now()
       var e =
         arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : ''
       if (
-        !/(https?|file|wdfile|finfile):/i.test(e) &&
+        !/(https?|file|wdfile|hyfile):/i.test(e) &&
         !/^\s*data:image/.test(e)
       )
         if ('/' === e.substring(0, 1))
@@ -77925,6 +77928,7 @@ window.__viewStartTime__ = Date.now()
         },
         attached: function() {
           var e = this
+          this._addListeners()
           this.duration < 0 && (this.duration = 0),
             FinChatJSBridge.publish('videoPlayerInsertFinish', {
               domId: this.id,
@@ -77979,20 +77983,20 @@ window.__viewStartTime__ = Date.now()
               t.stopPropagation(), (e.muted = !e.muted)
             }),
             (this.$.button.$$.onclick = function(t) {
-              t.stopPropagation(), e.$.player[e._buttonType]()
+              t.stopPropagation(), e.$.player.$$[e._buttonType]()
             }),
             (this.$.progress.$$.onclick = function(t) {
               t.stopPropagation()
               var n = e._computeRate(t.clientX)
-              ;(e.$.player.currentTime = e.$.player.duration * n),
+              ;(e.$.player.$$.currentTime = e.$.player.$$.duration * n),
                 e._resetDanmu()
             }),
-            (this.$.fullscreen.onclick = function(t) {
+            (this.$.fullscreen.$$.onclick = function(t) {
               t.stopPropagation(),
                 'android' === wd.getPlatform()
                   ? (e.enableFullScreen = !0)
                   : (e.enableFullScreen = !e.enableFullScreen),
-                e.enableFullScreen && e.$.player.webkitEnterFullscreen(),
+                e.enableFullScreen && e.$.player.$$.webkitEnterFullscreen(),
                 e.triggerEvent('togglefullscreen', {
                   enable: e.enableFullScreen
                 }),
@@ -78002,7 +78006,7 @@ window.__viewStartTime__ = Date.now()
                   type: 'fullscreen'
                 })
             }),
-            (this.$.danmuBtn.onclick = function(t) {
+            (this.$.danmuBtn.$$.onclick = function(t) {
               t.stopPropagation(),
                 (e.enableDanmu = !e.enableDanmu),
                 e.triggerEvent('toggledanmu', { enable: e.enableDanmu })
@@ -78014,10 +78018,98 @@ window.__viewStartTime__ = Date.now()
               }
             ),
             wd.onAppEnterBackground(function(t) {
-              e.$.player.pause()
+              e.$.player.$$.pause()
             })
         },
         methods: {
+          _addListeners: function() {
+            var e = this
+            if (this.$.player) {
+              for (
+                var t = this.$.player.$$ || this.$.player,
+                  n = this,
+                  i = {},
+                  o = 0,
+                  r = E()(MediaError);
+                o < r.length;
+                o++
+              ) {
+                var a = r[o]
+                i[MediaError[a]] = a
+              }
+              ;(t.onerror = function(e) {
+                if ((e.stopPropagation(), e.srcElement.error)) {
+                  var t = e.srcElement.error.code
+                  n._publish('error', { errMsg: i[t] })
+                }
+              }),
+                (t.onplaying = function(e) {
+                  ;(n.playing = !0),
+                    e.stopPropagation(),
+                    (n._buttonType = 'pause'),
+                    (n.paused = !1)
+                }),
+                (t.onwaiting = function(e) {
+                  ;(n.playing = !1),
+                    e.stopPropagation(),
+                    n._publish('waiting', {}),
+                    (n._buttonType = 'waiting'),
+                    'function' == typeof n.onWaiting && n.onWaiting(e)
+                }),
+                (t.onplay = function(e) {
+                  ;(n.playing = !0),
+                    e.stopPropagation(),
+                    n._publish('play', {}),
+                    (n._buttonType = 'pause'),
+                    'function' == typeof n.onPlay && n.onPlay(e),
+                    (n.paused = !1)
+                }),
+                (t.onpause = function(e) {
+                  ;(n.playing = !1),
+                    e.stopPropagation(),
+                    n._publish('pause', {}),
+                    (n._buttonType = 'play'),
+                    'function' == typeof n.onPause && n.onPause(e),
+                    (n.paused = !0)
+                }),
+                (t.onended = function(e) {
+                  ;(n.playing = !1),
+                    e.stopPropagation(),
+                    n._publish('ended', {}),
+                    'function' == typeof n.onEnded && n.onEnded(e)
+                }),
+                (t.onratechange = function(e) {
+                  e.stopPropagation(),
+                    n._publish('ratechange', { playbackRate: t.playbackRate })
+                })
+              var s = 0
+              t.addEventListener('timeupdate', function(e) {
+                e.stopPropagation(),
+                  Math.abs(t.currentTime - s) % t.duration >= 1 &&
+                    (n._publish('timeupdate', {
+                      currentTime: t.currentTime,
+                      duration: t.duration
+                    }),
+                    (s = 1e3 * t.currentTime)),
+                  n._isLockTimeUpdateProgress ||
+                    (n._currentTime = n._formatTime(Math.floor(t.currentTime))),
+                  'function' == typeof n.onTimeUpdate && n.onTimeUpdate(e)
+              }),
+                t.addEventListener('progress', function(e) {
+                  e.stopPropagation(),
+                    n._publish('progress', {
+                      buffered: (t.currentTime / t.duration) * 100
+                    }),
+                    'function' == typeof n.onProgress && n.onProgress(e)
+                }),
+                t.addEventListener('durationchange', function() {
+                  t.duration === 1 / 0 ? (e._isLive = !0) : (e._isLive = !1),
+                    isNaN(t.duration) ||
+                      0 !== e.duration ||
+                      (n._duration = n._formatTime(Math.floor(t.duration)))
+                })
+            }
+          },
           _reset: function() {
             ;(this._buttonType = 'play'),
               (this._currentTime = '00:00'),
@@ -78158,7 +78250,7 @@ window.__viewStartTime__ = Date.now()
                 (t.textContent = e.text),
                 (t.style.top = this._genDanmuPosition() + '%'),
                 (t.style.color = e.color),
-                this.$.danmu.appendChild(t),
+                this.$.danmu.$$.appendChild(t),
                 (t.style.left = '-' + t.offsetWidth + 'px')
             }
           },
@@ -78213,7 +78305,7 @@ window.__viewStartTime__ = Date.now()
           onBallTouchStart: function() {
             var e = 'touchmove',
               t = 'touchend'
-            if ((P && ((e = 'mousemove'), (t = 'mouseup')), !this.isLive)) {
+            if (!this.isLive) {
               var n = this
               n._isLockTimeUpdateProgress = !0
               var i = function(e) {
@@ -78222,9 +78314,9 @@ window.__viewStartTime__ = Date.now()
                   (n._rate = n._computeRate(e.touches[0].clientX)),
                   n._setProgress(n._rate)
               }
-              document.addEventListener(e, i),
+              document.addEventListener(e, i, { passive: false }),
                 document.addEventListener(t, function o(r) {
-                  ;(n.$.player.currentTime = n.$.player.duration * n._rate),
+                  ;(n.$.player.$$.currentTime = n.$.player.$$.duration * n._rate),
                     document.removeEventListener(e, i),
                     document.removeEventListener(t, o),
                     (n._isLockTimeUpdateProgress = !1),
@@ -78234,7 +78326,7 @@ window.__viewStartTime__ = Date.now()
           },
           _resetDanmu: function() {
             var e = this
-            ;(this.$.danmu.innerHTML = ''),
+            ;(this.$.danmu.$$.innerHTML = ''),
               E()(this.danmuObject).forEach(function(t) {
                 e.danmuObject[t].forEach(function(e) {
                   e.flag = !1
@@ -81336,7 +81428,7 @@ window.__viewStartTime__ = Date.now()
                         i.scrollIntoView(),
                         t.init()
                     }
-                  if (/^finfile:\/\//.test(f)) {
+                  if (/^hyfile:\/\//.test(f)) {
                     var N = document.createElement('img')
                     N.setAttribute('crossOrigin', 'Anonymous'),
                       (N.onload = function() {

package/static/template/miniapp-page-manager.hbs

@@ -49,16 +49,26 @@
       flex-direction: column;
       margin: 0;
       padding: 0;
+    }
+
+    * {
       box-sizing: border-box;
     }
   </style>
+  {{#if debug}}
+  <script charset="utf-8" src="https://cdnjs.cloudflare.com/ajax/libs/vConsole/3.15.1/vconsole.min.js"></script>
+  <script>
+    new VConsole()
+  </script>
+   {{/if}}
   <link rel='stylesheet' href='{{sourcePathPrefix}}/sdk/web-frame.css'>
   <script charset="utf-8">
     window.__packageExtConfig = {{ packageExtConfig }}
-    window.__sdkUrlTemplate = "{{hyextSDKUrl}}"
   </script>
   <script charset="utf-8" src="{{sourcePathPrefix}}/sdk/web-sdk-core.js"></script>
   <script charset="utf-8" src="{{sourcePathPrefix}}/sdk/web-frame.js"></script>
+  <script charset="utf-8" src="{{hyextSDKUrl}}"></script>
+  <script charset="utf-8" src="{{sourcePathPrefix}}/sdk/hyext-adapter.js"></script>
 </head>
 
 <body>

package/static/template/minigame-page-manager.hbs

@@ -3,7 +3,8 @@
 
 <head>
   <meta charset="UTF-8" />
-  <meta id="viewport" name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, viewport-fit=cover" />
+  <meta id="viewport" name="viewport"
+    content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, viewport-fit=cover" />
   <meta name="content-type" content="text/html; charset=utf-8">
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <style>
@@ -17,26 +18,52 @@
       height: 1px;
       opacity: 0;
     }
+
     .views>.webview {
       position: absolute;
       width: 100%;
       height: 100%;
     }
+
     .service.service-view {
       width: 100%;
       height: 100%;
       opacity: 1;
-      z-index: 10;
+      z-index: 4;
+      border: none;
+    }
+
+    html,
+    body {
+      position: relative;
+      width: 100%;
+      height: 100%;
     }
+
     body {
+      color: #333;
+      display: flex;
       overscroll-behavior: none;
+      flex-direction: column;
+      margin: 0;
+      padding: 0;
+    }
+
+    * {
+      box-sizing: border-box;
     }
   </style>
-  <script charset="utf-8">
-    window.__sdkUrlTemplate = "{{hyextSDKUrl}}"
+  {{#if debug}}
+  <script charset="utf-8" src="https://cdnjs.cloudflare.com/ajax/libs/vConsole/3.15.1/vconsole.min.js"></script>
+  <script>
+    new VConsole()
   </script>
+   {{/if}}
+  <link rel='stylesheet' href='{{sourcePathPrefix}}/sdk/web-frame.css'>
   <script charset="utf-8" src="{{sourcePathPrefix}}/sdk/web-sdk-core.js"></script>
   <script charset="utf-8" src="{{sourcePathPrefix}}/sdk/web-frame.js"></script>
+  <script charset="utf-8" src="{{hyextSDKUrl}}"></script>
+  <script charset="utf-8" src="{{sourcePathPrefix}}/sdk/hyext-adapter.js"></script>
 </head>
 
 <body>
@@ -45,4 +72,4 @@
   </div>
 </body>
 
-</html>
+</html>