@shijiu/jsview 2.3.151-test.0 → 2.3.728-alpha.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,79 @@ 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;
+    }
+
+    AddSwappedOnceListener(callback) {
+        console.log("AddSwappedOnceListener not implemented in wasm");
+    }
+
+    RemoveSwappedOnceListener(callback) {
+        console.log("RemoveSwappedOnceListener not implemented in wasm");
+    }
 }

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

@@ -20,7 +20,7 @@ class JsThreadBlockTester {
     if (gap > CYCLE_TIME + BLOCK_CHECK_TIME) {
       console.warn(JsThreadBlockTester.#TAG, `js thread blocked, preTime: ${preTimestamp}, curTime: ${JsThreadBlockTester.#timestamp}, curTime-preTime: ${gap}`);
     }
-    JsThreadBlockTester.#timeoutHandler = setTimeout(JsThreadBlockTester.#checkTask, CYCLE_TIME);
+    JsThreadBlockTester.#timeoutHandler = window.JsvCoreApi.BackgroundTask.postDelay(JsThreadBlockTester.#checkTask, CYCLE_TIME);
   };
   static #onVisibleChange = (data) => {
     if (data.status == "hide") {
@@ -42,12 +42,12 @@ class JsThreadBlockTester {
   static #start() {
     console.log(JsThreadBlockTester.#TAG, "start");
     JsThreadBlockTester.#timestamp = Date.now();
-    JsThreadBlockTester.#timeoutHandler = setTimeout(JsThreadBlockTester.#checkTask, CYCLE_TIME);
+    JsThreadBlockTester.#timeoutHandler = window.JsvCoreApi.BackgroundTask.postDelay(JsThreadBlockTester.#checkTask, CYCLE_TIME);
   }
 
   static #stop() {
     console.log(JsThreadBlockTester.#TAG, "stop");
-    clearTimeout(JsThreadBlockTester.#timeoutHandler);
+    window.JsvCoreApi.BackgroundTask.clear(JsThreadBlockTester.#timeoutHandler);
     JsThreadBlockTester.#timeoutHandler = -1;
   }
 }
@@ -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,6 +17,7 @@ async function main() {
   const onInitJsViewEnv = async function () {
     // JsView环境加载完毕后，加载vue/react的main.js文件。
     try {
+      window.setJsvAppConfig(JSON.stringify(appConfig));
       await import('/src/main.tsx');
     } 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,6 +1,6 @@
 {
   "name": "@shijiu/jsview",
-  "version": "2.3.151-test.0",
+  "version": "2.3.728-alpha.0",
   "bin": {
     "jsview-post-build": "./tools/jsview-post-build.js",
     "jsview-post-install": "./tools/jsview-post-install.js"

package/patches/node_modules/@vue/runtime-core/dist/runtime-core.esm-bundler.js

@@ -368,6 +368,7 @@ const comparator = (a, b) => {
 };
 // JsView Modified >>>
 let JsvRenderCount = 0;
+let hasBreakEnableApi = !!(window.JsView?.ifRenderBreakEnable);
 // JsView Modified <<<
 function flushJobs(seen) {
     isFlushPending = false;
@@ -5167,8 +5168,9 @@ function baseCreateRenderer(options, createHydrationFns) {
         // 有按键打断, 取消patch
         if (n1 == null && n2) {
             if (n2.key == "__QcodeJsviewMetroWidgetSlot" 
+            && (!hasBreakEnableApi || window.JsView.ifRenderBreakEnable())
             && (jsvPendingForFirstDelayRender 
-                || window.JsvCode.Dom.GetLazyTaskAmount() > 1200 // 1200个同步单位时间 = 60ms(每个相当于50us)
+                || window.JsvCode.Dom.IsLazyTaskQueueOverLoad() // 用于解决一次性dom元素过多导致一帧卡太久的问题
                 || window.JsView?.hasPendingUserInput?.()) 
             && JsvRenderCount >= (window.JsView?.getInstantRenderNum?.() ?? 0)) {
                 // 创建Comment节点, 以解决el释放可能出错问题
@@ -5184,7 +5186,9 @@ function baseCreateRenderer(options, createHydrationFns) {
                     }
                 };
 
-                if (n2.children[0].key === "__QcodeJsviewMetroWidgetSlot") {
+                // TODO: 有时候children[0]不存在
+                // TODO: 为什么需要对children[0]进行设置？是否是考虑patch时第一子节点不递归的问题, 需要vue版本升级时重新评估                
+                if (n2.children?.[0]?.key === "__QcodeJsviewMetroWidgetSlot") {
                     n2.children[0].anchor = anchor;
                     n2.children[0].jsvRenderBreaker = {
                         breaked: true,

package/tools/jsview-build-zip.mjs

@@ -21,12 +21,16 @@ async function main(argv)
   const zipName = 'dist.dat';
   const zipPath = path.resolve(options.distDir, zipName);
 
-  const password = argv.password ?? 'jsview.shijiu.com';
+  let password = argv.password ?? 'jsview.shijiu.com';
+  if(argv.noPassword) {
+    password = null;
+  }
 
   execCommand('npm run build');
 
   let childFileNames = fs.readdirSync(options.distDir);
   childFileNames = childFileNames.filter(it => it !== zipName);
+  childFileNames = childFileNames.filter(it => it !== 'debug');
   childFileNames = childFileNames.map(it => path.resolve(options.distDir, it));
 
   makeZip(zipPath, password, ...childFileNames)
@@ -37,7 +41,8 @@ async function main(argv)
 const requiredUsages = {
 };
 const optionalUsages = {
-  '--password': 'Input passwork',
+  '--password': 'Input password',
+  '--no-password': 'Ignore password',
 };
 const argv = parseArguments(requiredUsages, optionalUsages);
 main(argv);

package/tools/jsview-common.mjs

@@ -1,4 +1,4 @@
-#!/usr/bin/env node
+// #!/usr/bin/env node
 'use strict';
 
 import childProcess from 'node:child_process';
@@ -66,6 +66,10 @@ function parseArguments(requiredUsages = {},
     || value === 'null'
     || value === '') {
       formattedValue = null;
+    } else if(value === 'true') {
+      formattedValue = true;
+    } else if(value === 'false') {
+      formattedValue = false;
     }
     return formattedValue;
   }
@@ -180,6 +184,7 @@ function parseArguments(requiredUsages = {},
  * jsview-test-project
  * ├── dist
  * │   ├── assets
+ * │   ├── css
  * │   ├── debug
  * │   │   └── map
  * │   └── js
@@ -197,6 +202,7 @@ function parseArguments(requiredUsages = {},
  * │   │   │   ├── tools
  * │   │   ├── jsview-vue -> ../../../../@shijiu/jsview-vue
  * │   │   │   └── utils
+ * │   │   ├── jsview-vue-plus -> ../../../../@shijiu/jsview-vue-plus
  * │   │   └── jsview-vue-samples -> ../../../../@shijiu/jsview-vue-samples
  * └── src
  *     └── appConfig
@@ -217,6 +223,7 @@ function getOptions(framework)
   options.jsviewDomRevisionFile = path.resolve(options.jsviewDir, 'dom', 'target_core_revision.mjs');
 
   options.jsviewVueDir = path.resolve(options.modulesDir, '@shijiu', 'jsview-vue');
+  options.jsviewVuePlusDir = path.resolve(options.modulesDir, '@shijiu', 'jsview-vue-plus');
   options.jsviewReactDir = path.resolve(options.modulesDir, '@shijiu', 'jsview-react');
   if (framework) {
     options.jsviewFrameworkDir = path.resolve(options.modulesDir, '@shijiu', 'jsview-' + framework);
@@ -245,6 +252,7 @@ function getOptions(framework)
   options.distJsvInfoFile = path.resolve(options.distDir, 'jsv-info.json');
   options.distJsIndexFile = path.resolve(options.distDir, 'index.html');
   options.distAssetsDir = path.resolve(options.distDir, 'assets');
+  options.distCssDir = path.resolve(options.distDir, 'css');
   options.distJsDir = path.resolve(options.distDir, 'js');
   options.distDebugDir = path.resolve(options.distDir, 'debug');
   options.distDebugMapDir = path.resolve(options.distDebugDir, 'map');

package/tools/jsview-post-build.mjs

@@ -192,6 +192,22 @@ async function prepareMainAppData(options)
     preloadBurdenResources.push(fileName);
   }
 
+  const aesKeyFilePath = path.resolve(options.appConfigDir, 'fingerprint_aes_key.mjs');
+  if (fs.existsSync(aesKeyFilePath)) {
+    const aesKeyFileUrl = url.pathToFileURL(aesKeyFilePath);
+    const { default: aesKeyConfig } = await import (aesKeyFileUrl);
+    const aesKey = aesKeyConfig.aes_key;
+    const aesIv = aesKeyConfig.iv;
+    
+    // 对appConfig.AppName进行aes加密并赋值给EncryptCode2
+    if (aesKey && aesIv) {
+      const cipher = crypto.createCipheriv('aes-128-cbc', Buffer.from(aesKey, 'utf8'), Buffer.from(aesIv, 'utf8'));
+      let encrypted = cipher.update(appConfig.AppName, 'utf8', 'base64');
+      encrypted += cipher.final('base64');
+      appConfig.EncryptCode2 = encrypted;
+    }
+  }
+
   // 组装AppData
   appConfig.PublicKeys = publicKeys; // 使用签名数组，支持后续追加签名
   appConfig.EncryptCodes = [encryptBase64]; // 同样使用数组，支持后续追加
@@ -200,10 +216,32 @@ async function prepareMainAppData(options)
     BaseUrl: bunderBaseUrl,
     Resources: preloadBurdenResources,
   };
+  if (appConfig.FingerPrint) {
+    // 删除FingerPrint的存储,节省信息字节数
+    delete appConfig.FingerPrint;
+  }
 
   return JSON.stringify(appConfig);
 }
 
+async function checkCssFileSize(options)
+{
+  if(fs.existsSync(options.distCssDir) == false) {
+    return;
+  }
+
+  const cssFileNames = fs.readdirSync(options.distCssDir);
+  for(const fileName of cssFileNames) {
+    const filePath = path.resolve(options.distCssDir, fileName)
+    const fileStats = await fs.statSync(filePath);
+    if (fileStats.size > 0) {
+      continue;
+    }
+
+    fs.writeFileSync(filePath, ' ', 'utf8'); // 防止空文件。
+  }
+}
+
 async function checkAppConfig(options)
 {
   const appConfigFilePath = path.resolve(options.appConfigDir, 'app.config.mjs');
@@ -488,12 +526,25 @@ async function makeJsvConfig(options)
   // appEntryFileName = appEntryFileName.replace(/\.js$/, '.mjs'); // deprecated
   appEntryFileName = appEntryFileName.replaceAll('\\', '/'); // windows平台适配
 
+  const appConfigFilePath = path.resolve(options.appConfigDir, 'app.config.mjs');
+  if (!fs.existsSync(appConfigFilePath)) {
+    Logger.ErrorAndExit('Failed to open app config file from ' + appConfigFilePath);
+  }
+  const appConfigFileUrl = url.pathToFileURL(appConfigFilePath);
+  const { default: appConfig } = await import(appConfigFileUrl);
+
   const jsvConfig = {
     "COREVERSIONRANGE":  jsviewTargetVersion.CoreRevisionAndBranch,
     "ENGINE":  jsviewTargetVersion.JseUrl,
     "URL": appEntryFileName,
+    "MINIAPPNAME": appConfig.AppName,
   };
 
+  // 启动图
+  if (appConfig.StartImageUrl && appConfig.StartImageUrl.length != 0) {
+    jsvConfig.STARTIMG = appConfig.StartImageUrl;
+  }
+
   const content = JSON.stringify(jsvConfig, null, 2);
   fs.writeFileSync(options.distJsvConfigFile, content, 'utf8');
 }
@@ -586,6 +637,10 @@ async function main(argv)
   // EntryMd5 要放在sourcemap更新之后
   updateOptions(options);
 
+  Logger.Info('Checking JsView css file size...');
+  await checkCssFileSize(options);
+  Logger.Info('Checked JsView css file size...');
+
   Logger.Info('Checking JsView app config...');
   await checkAppConfig(options);
   Logger.Info('Checked JsView app config...');

package/tools/jsview-post-install.mjs

@@ -230,10 +230,10 @@ async function printRevision(options)
           let versionFilePath = path.resolve(pathname, 'version.mjs'); 
           if (fs.existsSync(versionFilePath)) {
             const versionFileURL = url.pathToFileURL(versionFilePath);
-            const { default: targetVersion } = await import(versionFileURL);
-            Logger.Info(`*    [${path.basename
-              (pathname)}] : ${targetVersion.packageName
-              } : ${targetVersion.version}`);
+            const versionModule = await import(versionFileURL);
+            // 兼容 default 导出（JsvAudio/JsvPlayer）与命名导出 PluginInfo（JsvLatex）
+            const targetVersion = versionModule.PluginInfo ?? versionModule.default;
+            Logger.Info(`*    [${path.basename(pathname)}] : ${targetVersion.packageName} : ${targetVersion.version}`);
             pluginCount++;
           }
         }
@@ -258,6 +258,7 @@ function doPostInstall(framework, pkgNeedPatch, skipCheckVersion, skipCheckNpmcm
   const linkablePkgNames = [
     '@shijiu/jsview',
     '@shijiu/jsview-vue',
+    '@shijiu/jsview-vue-plus',
     '@shijiu/jsview-vue-samples',
     '@shijiu/jsview-vue-extra-samples',
     '@shijiu/jsview-react',

package/tools/jsview-run-tool.mjs

@@ -79,6 +79,7 @@ async function getExtraOptions(argv)
         options.genKeypair = argv.genKeypair; 
         options.buildMinifyExclude = argv.buildMinifyExclude;
         options.buildZip = argv.buildZip; 
+        options.noPassword = argv.noPassword; 
         options.buildBurdenLocal = argv.buildBurdenLocal; 
         options.buildBurdenBaseurl = argv.buildBurdenBaseurl; 
         options.vueDevtools = argv.vueDevtools; 
@@ -129,11 +130,7 @@ function doCommand(options, argv) {
     } else if(options.buildZip) {
         const defaultPassword = 'jsview.shijiu.com';
         const password = (typeof(options.buildZip) === 'string' ? options.buildZip : defaultPassword);
-        if(password !== options.buildZip) {
-            Logger.Warn(`Zip password is not set, use default value: ${defaultPassword}`);
-        }
-
-        command = `node node_modules/@shijiu/jsview/tools/jsview-build-zip.mjs --password=${password}`;
+        command = `node node_modules/@shijiu/jsview/tools/jsview-build-zip.mjs --password=${password} ${options.noPassword ? '--no-password' : ''}`;
     } else if(options.buildBurdenLocal) {
         command = 'JSVIEW_BURDEN_LOCAL=true npm run build';
     } else if(options.buildBurdenBaseurl) {
@@ -217,7 +214,7 @@ const optionalUsages = {
   '-c | --config-app': 'Config app, like: -c or --config-app=[AppName:AppTitle].',
   '-g | --gen-keypair': 'Generate sign keypair.',
   '-m | --build-minify-exclude': 'Build target with minify-exclude filter, like: -m or --build-minify-exclude=[filter], additional options: -s or --script=build:dev.',
-  '-z | --build-zip': 'Build target to offline zip package, like: -z or --build-zip=[password].',
+  '-z | --build-zip': 'Build target to offline zip package, like: -z, --build-zip=[password] or --build-zip --no-password.',
   '-l | --build-burden-local': 'Build target with local burden files.',
   '-b | --build-burden-baseurl': 'Build target with custom burden base url.',
   '-d | --vue-devtools': 'Start vue dev server and vue-devtools standalone, like: -d or --vue-devtools=[port].',