@shijiu/jsview 1.9.783 → 1.9.829

package/dom/jsv-browser-debug-dom.js

@@ -1,15 +1,18 @@
-import "./browser-root-style.css"
+import './browser-root-style.css'
 
-import JsvCodeDebug from "./jsv-code-debug"
+import JsvCodeDebug from './jsv-code-debug'
 
 let domBrowser;
 
 if (!JsvCodeDebug.enableDebug) {
   // Release entry
-  domBrowser = await import("./bin/jsview-browser-debug-dom.min");
+  domBrowser = await import('./bin/jsview-browser-debug-dom.min');
 } else {
   // Debug entry
   domBrowser = await import(JsvCodeDebug.domBrowserPath);
+
+  // for Webpack
+  // domBrowser = await import('./code/src/dom-browser-hook');
 }
 
 export default domBrowser;

package/dom/jsv-code-debug.mjs

@@ -5,10 +5,10 @@ const JsvCodeDebug = {
   // TODO: 进行编译(yarn build)时，需要设置为fasle。
   enableDebug: false,
 
-  domBrowserPath: "./code/src/dom-browser-hook",
-  domNativePath: "./code/src/dom-wrapper",
-  engineBrowserPath: "./code/src/engine-js/browser",
-  forgeDefinePath: "./code/src/engine-js",
+  domBrowserPath: './code/src/dom-browser-hook',
+  domNativePath: './code/src/dom-wrapper',
+  engineBrowserPath: './code/src/engine-js/browser',
+  forgeDefinePath: './code/src/engine-js',
 };
 
-export default JsvCodeDebug;
+export default JsvCodeDebug;

package/dom/jsv-dom.js

@@ -1,13 +1,16 @@
-import JsvCodeDebug from "./jsv-code-debug"
+import JsvCodeDebug from './jsv-code-debug'
 
 let domNative;
 
 if (!JsvCodeDebug.enableDebug) {
   // Release entry
-  domNative = await import("./bin/jsview-dom.min");
+  domNative = await import('./bin/jsview-dom.min');
 } else {
   // Debug entry
   domNative = await import(JsvCodeDebug.domNativePath);
+
+  // for Webpack
+  // domNative = await import('./code/src/dom-wrapper');
 }
 
 export {

package/dom/jsv-engine-js-browser.js

@@ -8,6 +8,9 @@ if (!JsvCodeDebug.enableDebug) {
 } else {
   // Debug entry
   engineBrowser = await import(JsvCodeDebug.engineBrowserPath);
+
+  // for Webpack
+  // engineBrowser = await import('./code/src/engine-js/browser');
 }
 
 export default engineBrowser;

package/dom/jsv-forge-define.js

@@ -1,13 +1,16 @@
-import JsvCodeDebug from "./jsv-code-debug"
+import JsvCodeDebug from './jsv-code-debug'
 
 let forgeDefine;
 
 if (!JsvCodeDebug.enableDebug) {
   // Release entry
-  forgeDefine = await import("./bin/jsview-forge-define.min");
+  forgeDefine = await import('./bin/jsview-forge-define.min');
 } else {
   // Debug entry
   forgeDefine = await import(JsvCodeDebug.forgeDefinePath);
+
+  // for Webpack
+  // forgeDefine = await import('./code/src/engine-js');
 }
 
 const Forge = forgeDefine.Forge;

package/dom/target_core_revision.mjs

@@ -3,11 +3,11 @@
  */
 
 const TargetRevision = {
-  "CoreRevision": 1021230,
-  "CoreRevisionAndBranch": "1021230",
-  "JseRevision": "1.0.824",
+  "CoreRevision": 1021253,
+  "CoreRevisionAndBranch": "1021253",
+  "JseRevision": "1.0.827",
   "JseUrl":
-    "http://cdn.release.qcast.cn/forge_js/master/JsViewES6_react_r824.jsv.a2da4803.js"
+    "http://cdn.release.qcast.cn/forge_js/master/JsViewES6_react_r827.jsv.6825753b.js"
 };
 
 // 不要用export default，update-env脚本不能解析

package/loader/jsview-browser-forgeapp.js

@@ -0,0 +1,13 @@
+export default class JsViewBrowserForgeApp {
+  constructor() {
+    JsViewBrowserForgeApp.#render();
+  }
+
+  static setRender(render) {
+    JsViewBrowserForgeApp.#render = render;
+
+    window.Forge.RunApp(this);
+  };
+
+  static #render;
+}

package/loader/jsview-loader.js

@@ -0,0 +1,198 @@
+import JsViewDefConfig from "./jsview.config.default"
+import JsViewBrowserForgeApp from './jsview-browser-forgeapp'
+import TargetRevision from "../dom/target_core_revision"
+
+export default class JsViewLoader {
+  constructor() {
+  }
+
+  mergeConfig(newConfig) {
+    this.#config = this.#deepMergeConfig(this.#config, newConfig);
+
+    return this.#config;
+  }
+
+  initForgeEnv() {
+    if (typeof window.Forge === 'undefined') { // Browser没有默认Forge
+      window.Forge = {};
+    }
+
+    window.Forge.DesignMap = this.#makeForgeDesignedMap.bind(this);
+    window.Forge.RunApp = this.#runForgeApp.bind(this);
+  }
+
+  async initJsViewEnv(appName, onLoaded) {
+    // 参数说明：
+    await this.#initJsViewDom();
+
+    this.#loadJsViewEnvAsync(appName, onLoaded);
+
+    // 环境启动后，动态加载React框架和main
+    this.#checkEngineVersion();
+    this.#jsviewInited = true;
+    this.#tryStartForgeApp();
+
+    console.log("JsView Loader: Load done. AppName=" + appName);
+  }
+
+  async #initJsViewDom() {
+    if (window.JsView) {
+      // initHeaderScriptLoader(js_sub_path);
+      let { domNative } = await import("../dom/jsv-dom.js");
+
+      this.#forgeAppClass = domNative.JsViewForgeApp;
+      window.JsView.ForgeExt = domNative.ForgeExtension;
+
+      // /static/js/: (可选配置)填写main.js或者bundle.js相对于index.html的相对位置，用于image/import.then的相对寻址
+      window.JsView.Dom.JsSubPath = this.#config.jsviewConfig.jsSubPath;
+    } else {
+      // 在PC环境下没有处理加载EngineJs, 所以在此加载一下
+      await import("../dom/jsv-engine-js-browser.js");
+
+      // 加载jsv-dom的调试版本
+      await import("../dom/jsv-browser-debug-dom.js");
+
+      this.#forgeAppClass = JsViewBrowserForgeApp;
+    }
+  }
+
+  #deepMergeConfig(target, source) {
+    const isObject = (obj) => obj && typeof obj === 'object';
+
+    if (!isObject(target) || !isObject(source)) {
+      throw new Error('JsView Error: Failed to merge config:', source);
+    }
+
+    for (const key in source) {
+      const targetValue = target[key];
+      const sourceValue = source[key];
+
+      if (Array.isArray(targetValue) && Array.isArray(sourceValue)) {
+        target[key] = targetValue.concat(sourceValue);
+      } else if (isObject(targetValue) && isObject(sourceValue)) {
+        target[key] = this.#deepMergeConfig({...targetValue}, sourceValue);
+      } else {
+        target[key] = sourceValue;
+      }
+    }
+
+    return target;
+  }
+
+  #loadJsViewEnvAsync(appName, onLoaded) {
+    console.log("StartApp...");
+
+    // 运行在Native中
+    if (window.JsView) {
+      if (appName) {
+        window.JsView.notifyAppName?.(appName);
+      }
+
+      // (可选配置)按键接受的扩展，例如将静音按键(JAVA键值为164)映射为JS键值20001，PS:注意"164"的引号
+      window.JsView.addKeysMap(this.#config.vendorConfig.bindKeys);
+
+      // (可选配置)localStorage支持
+      let storageDomain = this.#config.jsviewConfig.localStorage.domain;
+      if (storageDomain == "default") {
+        storageDomain = this.#getHostName();
+      }
+      window.JsView.setStorageDomain(storageDomain); // Domain可以为任意字符串，各Domain的localStorage互相隔离
+      
+      const localStorageKeys = this.#config.jsviewConfig.localStorage.presetKeys;
+      window.JsView.enableStorageNames(...localStorageKeys);
+
+      // (可选设置)cookies的支持
+      const cookiesDomain = this.#config.jsviewConfig.cookies?.domain;
+      if (cookiesDomain) {
+        console.log("Enable cookie for domain " + cookiesDomain);
+        window.JsView.setCookieDomain?.(cookiesDomain);
+      }
+
+      // JsView Dom相关配置
+      window.JsView.Dom.Render = function () {
+        onLoaded()
+      };
+    } else {
+      JsViewBrowserForgeApp.setRender(function () {
+        onLoaded();
+      })
+    }
+  }
+
+  #checkEngineVersion() {
+    if (!window.JsView) {
+      return;
+    }
+
+    // 检查配套引擎的版本
+    if (window.JsView.CodeRevision !== TargetRevision.CoreRevision /* Native引擎版本(由APK启动参数 CORE 决定) */
+    || window.Forge.Version !== TargetRevision.JseRevision) {/* JS引擎版本(由APK启动参数 ENGINEJS 决定) */
+      console.warn(`Warning: JsView Engine version miss matched, some effect will be lost. url should be ${TargetRevision.JseUrl}`);
+    }
+  }
+
+  #getHostName() {
+    const fullUrl = window.location.href;
+    let idx = fullUrl.indexOf("://");
+    // const protocol = (idx > 0 ? fullUrl.substring(0, idx + 1) : "");
+    const hostPath = idx > 1 ? fullUrl.substring(idx + 3) : "";
+
+    idx = hostPath.indexOf("/");
+    const host = idx > 0 ? hostPath.substring(0, idx) : "";
+
+    return host;
+  }
+
+  #makeForgeDesignedMap() {
+    // {screenWidth:1280, displayScale:1.0}: (可选配置)设置屏幕坐标映射值，前者为屏幕画布定义的宽度，后者为清晰度，
+    //                                     默认值是画布宽度1280px, 清晰度为1.0
+    const inputDesignedMap = this.#config.vendorConfig.designedMap;
+    let designMap = { width: 1280, displayScale: 1.0 };
+    try {
+      if (inputDesignedMap) {
+        const newDesignedMap = {
+          width: inputDesignedMap.screenWidth,
+          displayScale: inputDesignedMap.displayScale
+        };
+        designMap = newDesignedMap;
+      }
+    } catch (e) {
+      console.error("JsView Error: Load designed map failed");
+    }
+
+    // 设置播放器的屏幕坐标尺寸
+    if (window.JsView) {
+      window.JsView.setVideoDesignMapWidth?.(designMap.width);
+    } else {
+      // 借助Audio标签设置基类BaseMedia的屏幕尺寸配置，绕开react的unref语法检测
+      if (Audio.setDesignMapWidth) {
+        Audio.setDesignMapWidth(designMap.width);
+      }
+    }
+
+    return designMap;
+  }
+
+  #runForgeApp(activityManager) {
+    console.log("JsView Loader: Run forge app.");
+    this.#forgeActivityManager = activityManager;
+    this.#tryStartForgeApp();
+  }
+
+  #tryStartForgeApp() {
+    if (!this.#forgeActivityManager ||
+      this.#jsviewInited == false) {
+      return;
+    }
+
+    console.log("JsView Loader: Start forge app.");
+    // eslint-disable-next-line new-cap
+    this.#forgeApp = new this.#forgeAppClass(this.#forgeActivityManager);
+  }
+
+  #config = JsViewDefConfig;
+  #jsviewInited = false;
+  #forgeActivityManager = null;
+  #forgeAppClass = null
+  #forgeApp = null;
+}

package/loader/jsview-main.js

@@ -1,41 +1,22 @@
-import JsViewDefConfig from "./jsview.default.config"
+import JsViewLoader from './jsview-loader'
+import AppData from '/src/appConfig/app.config'
 import JsViewVendorConfig from "/src/appConfig/jsview.config"
-import { loadJsViewEnv } from './loader'
 
-function deepMerge(target, source) {
-  const isObject = (obj) => obj && typeof obj === 'object';
-
-  if (!isObject(target) || !isObject(source)) {
-    return source;
-  }
-
-  Object.keys(source).forEach(key => {
-    const targetValue = target[key];
-    const sourceValue = source[key];
-
-    if (Array.isArray(targetValue) && Array.isArray(sourceValue)) {
-      target[key] = targetValue.concat(sourceValue);
-    } else if (isObject(targetValue) && isObject(sourceValue)) {
-      target[key] = deepMerge(Object.assign({}, targetValue), sourceValue);
-    } else {
-      target[key] = sourceValue;
-    }
-  });
+function main() {
+  const jsviewLoader = new JsViewLoader();
 
-  return target;
-}
+  // 使用vendor配置值覆盖默认配置。
+  const config = jsviewLoader.mergeConfig(JsViewVendorConfig);
+  console.log("JsView config: " + JSON.stringify(config));
 
-function main() {
-    // 使用vendor配置值覆盖默认配置。
-    let config = JsViewDefConfig;
-    deepMerge(config, JsViewVendorConfig);
-    console.log("JsView config: " + JSON.stringify(config));
+  jsviewLoader.initForgeEnv();
 
-    // 加载jsview运行环境。
-    loadJsViewEnv(config, () => {
-        // JsView环境加载完毕后，加载vue/react的main.js文件。
-        import('/src/main.tsx');
-    })
+  // 初始化jsview运行环境。
+  const onInitJsViewEnv = function () {
+    // JsView环境加载完毕后，加载vue/react的main.js文件。
+    import('/src/main.tsx');
+  };
+  jsviewLoader.initJsViewEnv(AppData.AppName, onInitJsViewEnv);
 }
 
 // webpack/vite运行入口

package/loader/jsview-react-main.js

@@ -0,0 +1,36 @@
+import JsViewLoader from './jsview-loader'
+import AppData from '/src/appConfig/app.config'
+import JsViewVendorConfig from "/src/appConfig/jsview.config"
+import initHeaderScriptLoader from "./jsview-react-script-loader";
+
+function main() {
+  const jsviewLoader = new JsViewLoader();
+
+  // 使用vendor配置值覆盖默认配置。
+  const config = jsviewLoader.mergeConfig(JsViewVendorConfig);
+  console.log("JsView config: " + JSON.stringify(config));
+
+  jsviewLoader.initForgeEnv();
+
+  // Webpack 并不能直接运行import语法，需要一个Script加载器
+  if (window.JsView) {
+    initHeaderScriptLoader(config.jsviewConfig.jsSubPath);
+  }
+
+  // 初始化jsview运行环境。
+  const onInitJsViewEnv = async function () {
+    // workaround: 因为React的npm run build后，不能支持top-level-await，
+    // 所以只能在这里加载 JsViewReactWidget/BrowserDebugWidget, 导致了反向依赖问题。
+    // 期待下一个版本的Webpack能修复此问题。
+    if (!window.JsView) {
+      await import("../../jsview-react/utils/JsViewReactWidget/BrowserDebugWidget/WidgetLoader");
+    }
+
+    // JsView环境加载完毕后，加载vue/react的main.js文件。
+    import('/src/main.tsx');
+  };
+  jsviewLoader.initJsViewEnv(AppData.AppName, onInitJsViewEnv);
+}
+
+// webpack/vite运行入口
+main();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shijiu/jsview",
-  "version": "1.9.783",
+  "version": "1.9.829",
   "bin": {
     "jsview-post-build": "./tools/jsview-post-build.js",
     "jsview-post-install": "./tools/jsview-post-install.js"