@shijiu/jsview 2.3.151-test.0 → 3.0.0-test.0

package/loader/jsv-core-api/wasm/core-api.js

@@ -10,6 +10,7 @@ export default class WasmCoreApis {
         this.EngineJs = "embedded";
         this.UrlBuilder = URL;
         this.Platform = "pc-wasm"; // 平台信息，可选有 android/pc-wasm/harmony-webview
+        this.ProcessType = "wasm";
 
         this._ForgeHandle = null;
 
@@ -157,6 +158,14 @@ export default class WasmCoreApis {
         console.log("removeGlobalJsExceptionAck not implemented");
     }
 
+    addModuleFailedAck(callback) {
+        console.log("addModuleFailedAck not implemented");
+    }
+
+    removeModuleFailedAck(callback) {
+        console.log("removeModuleFailedAck not implemented");
+    }
+
     toggleViewVisible(toVisible) {
         console.log("toggleViewVisible not implemented");
     }
@@ -189,8 +198,22 @@ export default class WasmCoreApis {
         // wasm不支持调整 cookie domain
     }
 
+    refreshCookies() { 
+        // wasm不支持调整 cookie domain
+    }
+
     setRenderGlobalConfig(json) {
-        this._ForgeHandle?.sRenderBridge.SetGlobalConfig(json);
+        // 抓取forge_config中需要的配置, 保持未设时, 在forge_config中也不存在
+        const forge_config = {};
+        ['texCache', 'holderCache', 'simulDecodeNum', 'touchSlop', 'wheelRate'].forEach(key => { if (key in json) forge_config[key] = json[key]; });
+        this._ForgeHandle?.sRenderBridge.SetGlobalConfig(forge_config);
+
+        // 抓取dom_config中需要的配置, 保持未设时, 在dom_config中也不存在
+        const dom_config = {};
+        ['maxDomSync'].forEach(key => { if (key in json) dom_config[key] = json[key]; });
+        if (typeof dom_config.maxDomSync == 'number') {
+            window.JsvCode.Dom.SetLazyTaskOverLoadLevel(dom_config.maxDomSync);
+        }
     }
 
     setForgeJsHandle(forgeHandle) {
@@ -201,9 +224,71 @@ export default class WasmCoreApis {
         console.log("onMainTsDone...");
     }
 
-    // tag参数中以空格隔开每个tag
+    /**
+     * 完全释放GLView, 以达到完全清理GL内存的目的，一般配合JsView的visibility的回调一齐使用
+     * 场景1: 可以通过此接口，规避在android 9.0上把其他进程的GL内存都算在本进程的内存统计上的问题
+     * 场景2: 完全释放绘制资源，以保证作为Launcher时，退到后时最小化内存
+     *
+     * @param delayedTimeMs int类型 延迟关闭View的时间，可以为0, 单位:秒
+     */
+    delayRemoveGLView(delayedTimeSec) {
+        console.log("delayRemoveGLView not implemented in wasm");
+    }
+
+    /**
+     * 恢复已经被关闭的GLView，一般在delayRemoveGLView后对GLView进行重新展示
+     * 此接口内部有状态自查，可以在任何状态调用，既使 delayRemoveGLView 没有触发
+     */
+    restoreGLView() {
+        console.log("restoreGLView not implemented in wasm");
+    }
+
+    // wasm专属api调试api, tag参数中以空格隔开每个tag
     enableConsoleTag(tag) {
         this.WasmExt.ForgeLogRef?.EnableTag(tag);
         this.WasmExt.JseLogRef?.EnableTag(tag);
     }
+
+    /**
+     * 用户无操作时降帧的功能
+     *
+     * @param enable boolean类型, 是否开启此功能
+     * @param idleFps int类型, 0-60, 开启时限制的帧率
+     * @param idleTimeMs int类型, 用户无操作多少时间后降帧（毫秒）
+     */
+    setIdleFps(enable, idleFps, idleTimeMs) {
+        console.log("setIdleFps not implemented in wasm");
+    }
+
+    /**
+     * 保持fps高帧率的开关，主要用于灵活控制用户无操作时降帧功能的小开关
+     *
+     * @param enable boolean类型, 是否保持，保持时关闭降帧功能，不保持时开启降帧功能
+     */
+    keepFpsHighPerf(enable) {
+        console.log("keepFpsHighPerf not implemented in wasm");
+    }
+
+    /**
+     * 设置图片缓存上限，默认为80M，每次进行回收时会自动回收到其3/4
+     * @params new_level int, 新水位
+     */
+    setTextureMaxWaterLevel(level) {
+        console.log("setTextureMaxWaterLevel not implemented in wasm");
+    }
+
+    base64ToLatinBytes(base64String) {
+        // 在wasm版本中，String会转成uint8Array, 和C++的jse::impl::JseStringImpl中的处理呼应
+        // 因为在wasm，native层无法直接按照Latin-1编码提取String
+        const bytes = atob(base64String);
+        const uint8Array = new Uint8Array(bytes.length);
+        
+        for (let i = 0; i < bytes.length; i++) {
+            const code = bytes.charCodeAt(i);
+            // Latin-1 范围是 0x00-0xFF，超出范围的字符会被截断
+            uint8Array[i] = code & 0xFF;
+        }
+        
+        return uint8Array;
+    }
 }

package/loader/jsv-core-api/wasm/wasm-extension.js

@@ -34,4 +34,9 @@ export default class WasmCoreApisExtension {
         this.ForgeLogRef = forge_log_ref;
         this.JseLogRef = jse_log_ref;
     }
+}
+
+// 补充setJsvAppConfig api，用于在wasm场景下设置app配置
+if (!window.setJsvAppConfig) {
+    window.setJsvAppConfig = function(appConfig) {  }
 }

package/loader/jsview-loader.js

@@ -138,6 +138,13 @@ export default class JsViewLoader {
     // (可选配置)按键接受的扩展，例如将静音按键(JAVA键值为164)映射为JS键值20001，PS:注意"164"的引号
     window.JsvCoreApi.addKeysMap(this.#config.vendorConfig.bindKeys);
 
+    // 设置触摸滑动距离阈值
+    if (this.#config.vendorConfig.touchConfig.slop > 0) {
+      window.JsvCoreApi.setRenderGlobalConfig({
+        touchSlop: this.#config.vendorConfig.touchConfig.slop
+      });
+    }
+
     // (可选配置)localStorage支持
     let storageDomain = this.#config.jsviewConfig.localStorage.domain;
     if (!storageDomain || storageDomain === "default") {

package/loader/jsview-main.mjs

@@ -17,7 +17,8 @@ async function main() {
   const onInitJsViewEnv = async function () {
     // JsView环境加载完毕后，加载vue/react的main.js文件。
     try {
-      await import('/src/main.tsx');
+      window.setJsvAppConfig(JSON.stringify(appConfig));
+      await import('/src/main.ts');
     } finally {
       window.JsvCoreApi.onMainTsDone(); // 通知Java, 此时app首次渲染执行完毕
     }

package/loader/jsview.config.default.js

@@ -37,6 +37,10 @@ export default {
             displayScale: 1.5
         },
 
+        touchConfig: {
+            slop: undefined, // 触摸滑动距离阈值, 单位px，为undefined时表示使用JsView系统默认距离
+        },
+
         // (可选配置)按键接受的扩展，例如将静音按键(JAVA键值为164)映射为JS键值20001，
         // PS:注意'164'的引号
         bindKeys: {

package/package.json

@@ -1,9 +1,11 @@
 {
   "name": "@shijiu/jsview",
-  "version": "2.3.151-test.0",
+  "version": "3.0.0-test.0",
+  "type": "module",
   "bin": {
-    "jsview-post-build": "./tools/jsview-post-build.js",
-    "jsview-post-install": "./tools/jsview-post-install.js"
+    "jsview-post-build": "./tools/jsview-post-build.mjs",
+    "jsview-post-install": "./tools/jsview-post-install.mjs",
+    "jsview-run-tool": "./tools/jsview-run-tool.mjs"
   },
   "license": "MIT",
   "repository": "system/jsview-framework",
@@ -17,10 +19,10 @@
   ],
   "dependencies": {
     "gifuct-js": "2.1.2",
-    "postcss-js": "4.0.0"
+    "postcss-js": "5.1.0"
   },
   "devDependencies": {},
   "engines": {
-    "node": ">=16.0.0"
+    "node": ">=20.0.0"
   }
 }

package/patches/@vitejs+plugin-vue+4.0.0.patch

@@ -0,0 +1,51 @@
+diff --git a/node_modules/@vitejs/plugin-vue/dist/index.mjs b/node_modules/@vitejs/plugin-vue/dist/index.mjs
+index 52f6edb..038bed5 100644
+--- a/node_modules/@vitejs/plugin-vue/dist/index.mjs
++++ b/node_modules/@vitejs/plugin-vue/dist/index.mjs
+@@ -260,7 +260,33 @@ function resolveScript(descriptor, options, ssr) {
+     return null;
+   }
+   const cacheToUse = ssr ? ssrCache : clientCache;
+-  const cached = cacheToUse.get(descriptor);
++// JsView Added >>>
++// 1. 解决style内容发生变化，不使用cache，在templete class和style同时发生变化没有被更新问题。
++// 2. 解决@import的css文件没有被更新问题。
++  // const cached = cacheToUse.get(descriptor);
++  let cached = cacheToUse.get(descriptor);
++  if (cached && descriptor.filename?.endsWith('.vue') && descriptor.styles) {
++    for (const style of descriptor.styles) {
++      let useCache = false;
++      // 检查解决style内容发生变化
++      for(const cachedContent of cached.map.sourcesContent) {
++        if(cachedContent.includes(style.content)) {
++          useCache = true;
++          break;
++        }
++      }
++      // 检查@import的css文件。
++      if (style.content?.includes('@use')) {
++        useCache = false;
++      }
++
++      if(useCache == false) {
++        cached = null;
++        break;
++      }
++    }
++  }
++// JsView Added <<<
+   if (cached) {
+     return cached;
+   }
+@@ -2115,6 +2141,11 @@ async function handleHotUpdate({ file, modules, read, server }, options) {
+   if (prevStyles.length > nextStyles.length) {
+     affectedModules.add(mainModule);
+   }
++// JsView Added >>>
++// 当Style发生变化时，更新Script，同步CSS to JS
++  // 貌似没有作用，已经被上面修改的一起处理了。
++  // affectedModules.add(mainModule);
++// JsView Added <<<
+   const prevCustoms = prevDescriptor.customBlocks || [];
+   const nextCustoms = descriptor.customBlocks || [];
+   if (prevCustoms.length !== nextCustoms.length) {

package/patches/@vitejs+plugin-vue+6.0.6.patch

@@ -0,0 +1,54 @@
+diff --git a/node_modules/@vitejs/plugin-vue/dist/index.mjs b/node_modules/@vitejs/plugin-vue/dist/index.mjs
+index 6886d94..ef142d8 100644
+--- a/node_modules/@vitejs/plugin-vue/dist/index.mjs
++++ b/node_modules/@vitejs/plugin-vue/dist/index.mjs
+@@ -271,7 +271,34 @@ function isUseInlineTemplate(descriptor, options) {
+ const scriptIdentifier = `_sfc_main`;
+ function resolveScript(descriptor, options, ssr, customElement) {
+ 	if (!descriptor.script && !descriptor.scriptSetup) return null;
+-	const cached = getResolvedScript(descriptor, ssr);
++
++// JsView Modified >>>
++// 1. 解决style内容发生变化，不使用cache，在templete class和style同时发生变化没有被更新问题。
++// 2. 解决@import的css文件没有被更新问题。
++	let cached = getResolvedScript(descriptor, ssr);
++  if (cached && descriptor.filename?.endsWith('.vue') && descriptor.styles) {
++    for (const style of descriptor.styles) {
++      let useCache = false;
++      // 检查解决style内容发生变化
++      for(const cachedContent of cached.map.sourcesContent) {
++        if(cachedContent.includes(style.content)) {
++          useCache = true;
++          break;
++        }
++      }
++      // 检查@import的css文件。
++      if (style.content?.includes('@import')) {
++        useCache = false;
++      }
++
++      if(useCache == false) {
++        cached = null;
++        break;
++      }
++    }
++  }
++// JsView Modified <<<
++
+ 	if (cached) return cached;
+ 	const resolved = options.compiler.compileScript(descriptor, {
+ 		...options.script,
+@@ -1181,6 +1208,13 @@ async function handleHotUpdate({ file, modules, read }, options, customElement,
+ 		}
+ 	}
+ 	if (prevStyles.length > nextStyles.length) affectedModules.add(mainModule);
++
++// JsView Added >>>
++// 当Style发生变化时，更新Script，同步CSS to JS
++  // 貌似没有作用，已经被上面修改的一起处理了。
++  // affectedModules.add(mainModule);
++// JsView Added <<<
++
+ 	const prevCustoms = prevDescriptor.customBlocks || [];
+ 	const nextCustoms = descriptor.customBlocks || [];
+ 	if (prevCustoms.length !== nextCustoms.length) affectedModules.add(mainModule);

package/patches/@vue+compiler-dom+3.2.45.patch

@@ -0,0 +1,22 @@
+diff --git a/node_modules/@vue/compiler-dom/dist/compiler-dom.cjs.js b/node_modules/@vue/compiler-dom/dist/compiler-dom.cjs.js
+index dee1f5d..d173790 100644
+--- a/node_modules/@vue/compiler-dom/dist/compiler-dom.cjs.js
++++ b/node_modules/@vue/compiler-dom/dist/compiler-dom.cjs.js
+@@ -2641,6 +2641,17 @@ const resolveModifiers = (key, modifiers, context, loc) => {
+             // e.g. .passive & .capture
+             eventOptionModifiers.push(modifier);
+         }
++// JsView Added >>>
++// 处理自定义的 addEventListener() options, 前缀为jsv
++				else if(modifier.startsWith('jsv')) {
++						const regex = new RegExp('[A-Z]');
++						if (regex.test(modifier)) {
++								console.error("JsView Error: Failed to parse event option: " + modifier + ". Please use lower-case");
++								continue;
++						}
++						eventOptionModifiers.push(modifier);
++        }
++// JsView Added <<<
+         else {
+             // runtimeModifiers: modifiers that needs runtime guards
+             if (maybeKeyModifier(modifier)) {

package/patches/@vue+compiler-dom+3.6.0-beta.10.patch

@@ -0,0 +1,22 @@
+diff --git a/node_modules/@vue/compiler-dom/dist/compiler-dom.cjs.js b/node_modules/@vue/compiler-dom/dist/compiler-dom.cjs.js
+index f62528c..67c6411 100644
+--- a/node_modules/@vue/compiler-dom/dist/compiler-dom.cjs.js
++++ b/node_modules/@vue/compiler-dom/dist/compiler-dom.cjs.js
+@@ -204,6 +204,17 @@ const resolveModifiers = (key, modifiers, context, loc) => {
+ 		const modifier = modifiers[i].content;
+ 		if (modifier === "native" && context && (0, _vue_compiler_core.checkCompatEnabled)("COMPILER_V_ON_NATIVE", context, loc)) eventOptionModifiers.push(modifier);
+ 		else if (isEventOptionModifier(modifier)) eventOptionModifiers.push(modifier);
++// JsView Added >>>
++// 处理自定义的 addEventListener() options, 前缀为jsv
++    else if(modifier.startsWith('jsv')) {
++      const regex = new RegExp('[A-Z]');
++      if (regex.test(modifier)) {
++        console.error("JsView Error: Failed to parse event option: " + modifier + ". Please use lower-case");
++        continue;
++      }
++      eventOptionModifiers.push(modifier);
++    }
++// JsView Added <<<
+ 		else {
+ 			const keyString = (0, _vue_shared.isString)(key) ? key : (0, _vue_compiler_core.isStaticExp)(key) ? key.content : null;
+ 			if (maybeKeyModifier(modifier)) if (keyString) if (isKeyboardEvent(keyString.toLowerCase())) keyModifiers.push(modifier);