@shijiu/jsview 2.1.6-alpha.0 → 2.1.23

package/dom/target_core_revision.mjs

@@ -3,11 +3,11 @@
  */
 
 const TargetRevision = {
-  "CoreRevision": 1021500,
-  "CoreRevisionAndBranch": "1021500",
-  "JseRevision": "1.0.891",
+  "CoreRevision": 1021540,
+  "CoreRevisionAndBranch": "1021540",
+  "JseRevision": "1.0.894",
   "JseUrl":
-    "http://cdn.release.qcast.cn/forge_js/master/JsViewES6_js2c_r891.jsv.1be123f4.js"
+    "http://cdn.release.qcast.cn/forge_js/master/JsViewES6_js2c_r894.jsv.efbd22ea.js"
 };
 
 // 版本是否存在测试方法

package/loader/jsview-loader.js

@@ -84,7 +84,29 @@ export default class JsViewLoader {
       window.JsView.addKeysMap(this.#config.vendorConfig.bindKeys);
 
       // (可选配置)localStorage支持
-      window.JsView.setStorageDomain(this.#config.jsviewConfig.localStorage.domain ?? appName); // Domain为app包名
+      let storageDomain = this.#config.jsviewConfig.localStorage.domain;
+      if (!storageDomain || storageDomain === "default") {
+        // 兼容历史版本出现的default字符串设置
+        storageDomain = appName; // null/default场景，不和其他应用共享localStorage, 也规避了考虑同名item问题
+      } else if (storageDomain === "follow-url") {
+        if (window.location.protocol == "file:") {
+          // file方式加载，使用appName
+          storageDomain = appName;
+          console.warn("Storage domain follow-url not support file://");
+        } else {
+          storageDomain = window.location.hostname;
+
+          const ipv4Regex = /^(\d{1,3}\.){3}\d{1,3}$/;
+          const ipv6Regex = /^([0-9a-fA-F]{1,4}:){7}[0-9a-fA-F]{1,4}$/;
+          if (ipv4Regex.test(storageDomain) || ipv6Regex.test(storageDomain)) {
+            // ip形式, 不能作为合格domain, 使用appName作为domain
+            storageDomain = appName;
+            console.warn("Storage domain follow-url not support host with ip");
+          }
+        }
+      }
+      console.log(`Storage domain [${storageDomain}]`);
+      window.JsView.setStorageDomain(storageDomain); // Domain为app包名
 
       const localStorageKeys = this.#config.jsviewConfig.localStorage.presetKeys;
       window.JsView.enableStorageNames(...localStorageKeys);
@@ -115,7 +137,7 @@ export default class JsViewLoader {
     // 检查配套引擎的版本
     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}`);
+      console.warn(`Warning: JsView Engine version miss matched, some effect will be lost. core should be ${TargetRevision.CoreRevision}, url should be ${TargetRevision.JseUrl}`);
     }
   }
 

package/loader/jsview.config.default.js

@@ -1,37 +1,50 @@
+// 同主工程中的 jsview.config.mjs 默认值
 export default {
     jsviewConfig: {
+        // (可选配置)remote loader
+        remoteLoader: null,
+
         // (可选配置)localStorage支持
-        // domain可以为任意字符串，各Domain的localStorage互相隔离, 默认值是hostname
-        // presetKeys为预置key，可以直接使用localStorage.xxx的形式，避免undefined错误
         localStorage: {
-            domain: "default",
+            // 默认自动使用app.config.mjs的AppName作为domain, 可取值:
+            // null, 'defualt': 使用 app.config.mjs 中的AppName作为Domain, 和其他小程序数据完全隔离，不担心重名问题
+            // 'follow-url': 使用运行时的 window.location.hostname 作为domain
+            // 其他字符串: 使用给定字符串作为domain
+            domain: null,
+
+            // presetKeys为预置key，可以直接使用localStorage.xxx的形式，避免undefined错误
             presetKeys: [
-                "value1",
-                "value2"
-            ],
+                // 例如: 设置 value1, value3
+                // 'value1',
+                // 'value3'
+            ]
+        },
+
+        cookies: {
+            domain: '' // 当非null非空时，激活cookie功能，使ajax请求时自动带上cookies，并且document.cookie的get/set可用
         },
 
         // (可选配置)填写main.js或者bundle.js相对于index.html的相对位置，
         // 用于image/import.then的相对寻址, vue3默认值是/js/
-        jsSubPath: "/js/",
+        jsSubPath: '/js/'
     },
 
     vendorConfig: {
         // (可选配置)设置屏幕坐标映射值，screenWidth为屏幕画布定义的宽度，displayScale为清晰度，
-        // 默认值是画布宽度1280px, 清晰度为1.0
+        // 默认值是画布宽度1280px, 清晰度为1.5
         designedMap: {
             screenWidth: 1280,
-            displayScale: 1.0
+            displayScale: 1.5
         },
 
         // (可选配置)按键接受的扩展，例如将静音按键(JAVA键值为164)映射为JS键值20001，
-        // PS:注意"164"的引号
+        // PS:注意'164'的引号
         bindKeys: {
             keys: {
-                "164": 20001
+                '164': 20001
             },
             syncKeys: {
             }
-        },
+        }
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shijiu/jsview",
-  "version": "2.1.6-alpha.0",
+  "version": "2.1.23",
   "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

@@ -6231,6 +6231,16 @@ function baseCreateRenderer(options, createHydrationFns) {
         }
     };
     const unmount = (vnode, parentComponent, parentSuspense, doRemove = false, optimized = false) => {
+        const { type, props, ref, children, dynamicChildren, shapeFlag, patchFlag, dirs } = vnode;
+        // unset ref
+        if (ref != null) {
+            setRef(ref, null, parentSuspense, vnode, true);
+        }
+        if (shapeFlag & 256 /* ShapeFlags.COMPONENT_SHOULD_KEEP_ALIVE */) {
+            parentComponent.ctx.deactivate(vnode);
+            return;
+        }
+        
 // JsView Added >>>
         if (!vnode.jsvPatchedFlag) {
             // unmount动作要进行的是vnode中的子节点进行unmount，但是vnode本身没有去进行创建，所以也不用去销毁
@@ -6249,15 +6259,6 @@ function baseCreateRenderer(options, createHydrationFns) {
         }
 // JsView Added <<<
 
-        const { type, props, ref, children, dynamicChildren, shapeFlag, patchFlag, dirs } = vnode;
-        // unset ref
-        if (ref != null) {
-            setRef(ref, null, parentSuspense, vnode, true);
-        }
-        if (shapeFlag & 256 /* ShapeFlags.COMPONENT_SHOULD_KEEP_ALIVE */) {
-            parentComponent.ctx.deactivate(vnode);
-            return;
-        }
         const shouldInvokeDirs = shapeFlag & 1 /* ShapeFlags.ELEMENT */ && dirs;
         const shouldInvokeVnodeHook = !isAsyncWrapper(vnode);
         let vnodeHook;

package/patches/node_modules/vite/dist/node/jsview-vite-extension.js

@@ -52,6 +52,8 @@ const jsviewConfig = defineConfig({
     ],
     exclude: [
       '@shijiu/jsview/loader/jsview-main.mjs', // 解决windows上出现解析异常的问题。
+      '@shijiu/jsview-vue',
+      '@shijiu/jsview-vue-samples',
       'jsview',
       'jsview-vue',
       'jsview-vue-samples',

package/tools/jsview-post-build.mjs

@@ -78,18 +78,38 @@ async function prepareMainAppData(options, fileMd5)
   if (!fs.existsSync(appConfigFilePath)) {
     Logger.ErrorAndExit('Failed to open app config file from ' + appConfigFilePath);
   }
-  // const appConfigText = fs.readFileSync(appConfigFile);
-  // const appDataOriginJson = JSON.parse(appConfigText);
   const appConfigFileUrl = url.pathToFileURL(appConfigFilePath);
-  const appDataOriginJson = await import(appConfigFileUrl);
+  const { default: appConfig } = await import(appConfigFileUrl);
 
   // 组装AppData
-  let targetAppData = {};
-  Object.assign(targetAppData, appDataOriginJson.default); // 同步包括AppName在内的所有信息
-  targetAppData.PublicKeys = [publicKeyDerText]; // 使用签名数组，支持后续追加签名
-  targetAppData.EncryptCodes = [encryptCodeBase64]; // 同样使用数组，支持后续追加
+  appConfig.PublicKeys = [publicKeyDerText]; // 使用签名数组，支持后续追加签名
+  appConfig.EncryptCodes = [encryptCodeBase64]; // 同样使用数组，支持后续追加
 
-  return JSON.stringify(targetAppData);
+  return JSON.stringify(appConfig);
+}
+
+async function checkAppConfig(options)
+{
+  const appConfigFilePath = path.resolve(options.appConfigDir, 'app.config.mjs');
+  const appConfigRelativePath = path.relative(options.projectDir, appConfigFilePath);
+  if (!fs.existsSync(appConfigFilePath)) {
+    Logger.ErrorAndExitNoException('Failed to open app config file from ' + appConfigRelativePath);
+  }
+  const appConfigFileUrl = url.pathToFileURL(appConfigFilePath);
+  const { default: appConfig } = await import(appConfigFileUrl);
+
+  if(typeof appConfig.AppName !== 'string'
+  || appConfig.AppName.trim().length <= 0
+  || appConfig.AppName.trim() == '-') {
+    Logger.ErrorNoException('Failed to check [' + appConfigRelativePath + '], AppName is not valid.');
+    Logger.ErrorAndExitNoException('Please refer to: http://jsview-dev.shijiutv.com/guide/2.environments/2.6.deploy.html');
+  }
+  if(typeof appConfig.AppTitle !== 'string'
+  || appConfig.AppTitle.trim().length <= 0
+  || appConfig.AppTitle.trim() == '-') {
+    Logger.ErrorNoException('Failed to check [' + appConfigRelativePath + '], AppTitle is not valid.');
+    Logger.ErrorAndExitNoException('Please refer to: http://jsview-dev.shijiutv.com/guide/2.environments/2.6.deploy.html');
+  }
 }
 
 async function signApp(options)
@@ -263,6 +283,10 @@ async function main(argv)
   redirectSourceMappingURL(options)
   Logger.Info('Redirected JsView source map...');
 
+  Logger.Info('Checking JsView app config...');
+  await checkAppConfig(options);
+  Logger.Info('Checked JsView app config...');
+
   Logger.Info('Signing JsView App...');
   await signApp(options);
   Logger.Info('Signed JsView App.');

package/tools/jsview-post-install.mjs

@@ -39,7 +39,9 @@ function checkNpmLinkForDebug(options, linkablePkgNames)
   let missingDepPkgs = '';
   for (const linkableName of linkablePkgNames) {
     let linkableTarget = pkgObj.dependencies?.[linkableName];
-    if (!linkableTarget || !linkableTarget.startsWith('file:')) {
+    if (!linkableTarget?.startsWith('file:')
+    && !linkableTarget?.startsWith('http:')
+    && !linkableTarget?.startsWith('https:')) {
       continue;
     }