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

package/tools/jsview-common.mjs

@@ -240,6 +240,7 @@ function getOptions(framework)
       }
     }
   }
+  options.distJsvConfigFile = path.resolve(options.distDir, 'jsv-config.json');
   options.distJsvListFile = path.resolve(options.distDir, 'jsv-list.json');
   options.distJsvInfoFile = path.resolve(options.distDir, 'jsv-info.json');
   options.distJsIndexFile = path.resolve(options.distDir, 'index.html');

package/tools/jsview-post-build.mjs

@@ -95,6 +95,7 @@ function updateOptions(options)
   options.appPrivKey = privKey;
   options.appPubKey = pubKey;
   options.appEntryMd5 = appEntryMd5;
+  options.appEntryFileName = `main.jsv.${options.appEntryMd5.slice(0, 8)}.js`;
 }
 
 function getOtherSignVerifyKeys(options)
@@ -156,7 +157,7 @@ async function prepareMainAppData(options)
   const encryptBase64 = getEncryptBase64(options.appPrivKey, options.appPubKey, options.appEntryMd5);
 
   // 获取 预加载的文件名
-  const filterKeys = [
+  const chunkFilterKeys = [
     'domNativePath',
     'NativePlatformDomBridge',
     'ForgeExtension',
@@ -165,7 +166,7 @@ async function prepareMainAppData(options)
     'mount("#app")',
   ];
   const preloadChunks = [];
-  const jsFileNames = fs.readdirSync(options.distJsDir);
+  let jsFileNames = fs.readdirSync(options.distJsDir);
   for(const fileName of jsFileNames) {
     if (!fileName.startsWith('chunk.jsv') || !fileName.endsWith('.js')) {
       continue;
@@ -173,17 +174,32 @@ async function prepareMainAppData(options)
 
     const filePath = path.resolve(options.distJsDir, fileName);
     const sourceContent = fs.readFileSync(filePath, 'utf8');
-    if(filterKeys.some(it => sourceContent.includes(it)) == false) {
+    if(chunkFilterKeys.some(it => sourceContent.includes(it)) == false) {
       continue;
     }
 
     preloadChunks.push(fileName);
   }
 
+  const preloadBurdenResources = [];
+  const bunderBaseUrl = process.env['JSVIEW_BURDEN_LOCAL'] ? '' : getBunderBaseUrl();
+  const burdenFilePathList = getBurdenFilePathList(options);
+  for(const filePath of burdenFilePathList) {
+    let fileName = path.basename(filePath);
+    if(process.env['JSVIEW_BURDEN_LOCAL']) {
+      fileName = path.relative(options.distJsDir, filePath);
+    }
+    preloadBurdenResources.push(fileName);
+  }
+
   // 组装AppData
   appConfig.PublicKeys = publicKeys; // 使用签名数组，支持后续追加签名
   appConfig.EncryptCodes = [encryptBase64]; // 同样使用数组，支持后续追加
   appConfig.PreloadChunks = preloadChunks;
+  appConfig.PreloadBurdens = {
+    BaseUrl: bunderBaseUrl,
+    Resources: preloadBurdenResources,
+  };
 
   return JSON.stringify(appConfig);
 }
@@ -254,10 +270,10 @@ async function signApp(options)
   }
 }
 
-function redirectBurdenResource(options)
+function getBunderBaseUrl()
 {
   if(process.env['JSVIEW_BURDEN_LOCAL']) {
-    return;
+    return undefined;
   }
 
   let burdenBaseUrl = process.env['JSVIEW_BURDEN_BASEURL'];
@@ -268,27 +284,47 @@ function redirectBurdenResource(options)
     burdenBaseUrl += '/';
   }
 
+  return burdenBaseUrl;
+}
+
+function getBurdenFilePathList(options)
+{
+  const burdenFilterSuffixes = [
+    '.wasm',
+    '.ttf',
+  ];
   const burdenFilePathList = [];
 
   const assetFileNames = fs.readdirSync(options.distAssetsDir);
   for(const fileName of assetFileNames) {
-    if (!fileName.endsWith('.ttf')) {
+    const fileExt = path.extname(fileName);
+    if (!burdenFilterSuffixes.includes(fileExt)) {
       continue;
     }
     burdenFilePathList.push(path.resolve(options.distAssetsDir, fileName));
   }
   const jsFileNames = fs.readdirSync(options.distJsDir);
   for(const fileName of jsFileNames) {
-    if (!fileName.endsWith('.wasm')) {
+    const fileExt = path.extname(fileName);
+    if (!burdenFilterSuffixes.includes(fileExt)) {
       continue;
     }
     burdenFilePathList.push(path.resolve(options.distJsDir, fileName));
   }
-  for(const filePath of burdenFilePathList) {
-    fs.rmSync(filePath);
-    Logger.Info('Config burden file: ' + path.relative(options.projectDir, filePath));
+
+  return burdenFilePathList;
+}
+
+function redirectBurdenResource(options)
+{
+  let burdenBaseUrl = getBunderBaseUrl();
+  if(!burdenBaseUrl) { // use local
+    return;
   }
+
+  const burdenFilePathList = getBurdenFilePathList(options);
   
+  const jsFileNames = fs.readdirSync(options.distJsDir);
   for(const fileName of jsFileNames) {
     if (!fileName.endsWith('.js') && !fileName.endsWith('.js.map')) {
       continue;
@@ -298,7 +334,8 @@ function redirectBurdenResource(options)
     let sourceContent = fs.readFileSync(filePath, 'utf8');
 
     for(const burdenFilePath of burdenFilePathList) {
-      const relativeBurdenFilePath = path.relative(options.distJsDir, burdenFilePath);
+      let relativeBurdenFilePath = path.relative(options.distJsDir, burdenFilePath);
+      relativeBurdenFilePath = relativeBurdenFilePath.replaceAll('\\', '/'); // 更正windows分隔符
       if(!sourceContent.includes(relativeBurdenFilePath)) {
         continue;
       }
@@ -306,13 +343,27 @@ function redirectBurdenResource(options)
       const burdenFileUrl = burdenBaseUrl + path.basename(burdenFilePath);
 
       sourceContent = sourceContent.replaceAll(relativeBurdenFilePath, burdenFileUrl);
-      Logger.Info('Burdenting ' + path.relative(options.projectDir, filePath) + ' for [' + relativeBurdenFilePath + ']');
+      Logger.Info('Burdening ' + path.relative(options.projectDir, filePath) + ' for [' + relativeBurdenFilePath + ']');
     }
 
     fs.writeFileSync(filePath, sourceContent, 'utf8');
   };
 }
 
+function cleanupBurdenResource(options)
+{
+  let burdenBaseUrl = getBunderBaseUrl();
+  if(!burdenBaseUrl) { // 本地用不要清除
+    return;
+  }
+
+  const burdenFilePathList = getBurdenFilePathList(options);
+  for(const filePath of burdenFilePathList) {
+    fs.rmSync(filePath);
+    Logger.Info('Cleanup burden file: ' + path.relative(options.projectDir, filePath));
+  }
+}
+
 function redirectSourceMappingURL(options)
 {
   const jsFileNames = fs.readdirSync(options.distJsDir);
@@ -346,14 +397,13 @@ function makeMainJsvMjs(options, framework)
 
   // 更新entry hash
   const jsEntryFilePath = getEntryFilePath(options);
-  const newEntryFileName = `main.jsv.${options.appEntryMd5.slice(0, 8)}.js`;
-  const newEntryFilePath = path.resolve(path.dirname(jsEntryFilePath), newEntryFileName);
+  const newEntryFilePath = path.resolve(options.distJsDir, options.appEntryFileName);
   Logger.Info(' -> ' + path.relative(options.projectDir, newEntryFilePath));
   fs.renameSync(jsEntryFilePath, newEntryFilePath);
 
   // 更新index.html hash
   var indexContent = fs.readFileSync(options.distJsIndexFile, 'utf8');
-  indexContent = indexContent.replace(path.basename(jsEntryFilePath), newEntryFileName);
+  indexContent = indexContent.replace(path.basename(jsEntryFilePath), options.appEntryFileName);
   Logger.Info(' -> ' + path.relative(options.projectDir, options.distJsIndexFile));
   fs.writeFileSync(options.distJsIndexFile, indexContent, 'utf8');
 
@@ -429,6 +479,25 @@ function makeDebugMap(options, framework)
   fs.copyFileSync(jsmapServePath, to);
 }
 
+async function makeJsvConfig(options)
+{
+  const jsviewVersionURL = url.pathToFileURL(options.jsviewDomRevisionFile);
+  const { default: jsviewTargetVersion } = await import(jsviewVersionURL);
+  const appEntryFilePath = path.resolve(options.distJsDir, options.appEntryFileName);
+  let appEntryFileName = `./${path.relative(options.distDir, appEntryFilePath)}`;
+  // appEntryFileName = appEntryFileName.replace(/\.js$/, '.mjs'); // deprecated
+  appEntryFileName = appEntryFileName.replaceAll('\\', '/'); // windows平台适配
+
+  const jsvConfig = {
+    "COREVERSIONRANGE":  jsviewTargetVersion.CoreRevisionAndBranch,
+    "ENGINE":  jsviewTargetVersion.JseUrl,
+    "URL": appEntryFileName,
+  };
+
+  const content = JSON.stringify(jsvConfig, null, 2);
+  fs.writeFileSync(options.distJsvConfigFile, content, 'utf8');
+}
+
 function makeJsvList(options)
 {
   let jsvList = makeFileListRecusive(options.distDir);
@@ -502,6 +571,10 @@ async function main(argv)
   await checkDomDebugDisabled(options);
 
   Logger.Info();
+  const jsviewPkgJson = loadPackageObject(options.jsviewDir);
+  Logger.Info(`JsView version: ${jsviewPkgJson.version}`);
+  Logger.Info();
+
   Logger.Info('Redirecting JsView burden resource...');
   redirectBurdenResource(options)
   Logger.Info('Redirected JsView burden resource...');
@@ -529,7 +602,12 @@ async function main(argv)
   makeDebugMap(options, argv.framework);
   Logger.Info('Made JsView Debug map.');
 
+  Logger.Info('Cleaning JsView Burden Resource...');
+  cleanupBurdenResource(options);
+  Logger.Info('Cleaned JsView Burden Resource...');
+
   Logger.Info('Making JsView info...');
+  await makeJsvConfig(options);
   makeJsvList(options);
   await makeJsvInfo(options);
   Logger.Info('Made JsView info...');

package/tools/jsview-post-install.mjs

@@ -250,6 +250,11 @@ function doPostInstall(framework, pkgNeedPatch, skipCheckVersion, skipCheckNpmcm
   const options = getOptions(framework);
   options.projectDir = process.cwd();
 
+  Logger.Info();
+  const jsviewPkgJson = loadPackageObject(options.jsviewDir);
+  Logger.Info(`JsView version: ${jsviewPkgJson.version}`);
+  Logger.Info();
+
   const linkablePkgNames = [
     '@shijiu/jsview',
     '@shijiu/jsview-vue',

package/tools/jsview-run-tool.mjs

@@ -24,17 +24,19 @@ async function getExtraOptions(argv)
     options.entryUrl = argv.url;
 
     let commandCount = 0;
-    commandCount += (argv.httpServer ? 1 : 0);
-    commandCount += (argv.httpsServer ? 1 : 0);
-    commandCount += (argv.httpVite ? 1 : 0);
-    commandCount += (argv.httpsVite ? 1 : 0);
     commandCount += (argv.configApp ? 1 : 0);
     commandCount += (argv.genKeypair ? 1 : 0);
     commandCount += (argv.runonAndroid ? 1 : 0);
     commandCount += (argv.buildMinifyExclude ? 1 : 0);
     commandCount += (argv.buildZip ? 1 : 0);
     commandCount += (argv.buildBurdenLocal ? 1 : 0);
+    commandCount += (argv.buildBurdenBaseurl ? 1 : 0);
     commandCount += (argv.moduleFederation ? 1 : 0);
+    commandCount += (argv.httpServer ? 1 : 0);
+    commandCount += (argv.httpsServer ? 1 : 0);
+    commandCount += (argv.httpVite ? 1 : 0);
+    commandCount += (argv.httpsVite ? 1 : 0);
+    commandCount += (argv.fowardArkweb ? 1 : 0);
     commandCount += (argv.vueDevtools ? 1 : 0);
     if(commandCount == 0) {
         if(argv.help || argv.h) {
@@ -43,17 +45,19 @@ async function getExtraOptions(argv)
         }
 
         const commandPrompt = [
-            'httpServer',
-            'httpsServer',
-            'httpVite',
-            'httpsVite',
             'runonAndroid',
             'configApp',
             'genKeypair',
             'buildMinifyExclude',
             'buildZip',
             'buildBurdenLocal',
+            'buildBurdenBaseurl',
             'vueDevtools',
+            'httpServer',
+            'httpsServer',
+            'httpVite',
+            'httpsVite',
+            'fowardArkweb',
             'moduleFederation',
         ];
 
@@ -70,17 +74,19 @@ async function getExtraOptions(argv)
         Logger.Info('command:', command);
         options[command] = true
     } else if(commandCount == 1) {
-        options.httpServer = argv.httpServer; 
-        options.httpsServer = argv.httpsServer; 
-        options.httpsVite = argv.httpsVite; 
-        options.httpVite = argv.httpVite; 
         options.runonAndroid = argv.runonAndroid; 
         options.configApp = argv.configApp; 
         options.genKeypair = argv.genKeypair; 
         options.buildMinifyExclude = argv.buildMinifyExclude;
         options.buildZip = argv.buildZip; 
         options.buildBurdenLocal = argv.buildBurdenLocal; 
+        options.buildBurdenBaseurl = argv.buildBurdenBaseurl; 
         options.vueDevtools = argv.vueDevtools; 
+        options.httpServer = argv.httpServer; 
+        options.httpsServer = argv.httpsServer; 
+        options.httpsVite = argv.httpsVite; 
+        options.httpVite = argv.httpVite; 
+        options.fowardArkweb = argv.fowardArkweb;
         options.moduleFederation = argv.moduleFederation; 
     } else if(commandCount > 1) {
         Logger.ErrorAndExitNoException("Only one command can be executed.");
@@ -110,13 +116,13 @@ function doCommand(options, argv) {
         let filter = options.buildMinifyExclude;
         if(typeof(filter) !== 'string') {
             filter = 'jsview-';
-            Logger.Warn('Minify filter is not set, use default value: ' + filter);
+            Logger.Warn(`Minify filter is not set, use default value: ${filter}`);
         }
 
         let script = argv.s ?? argv.script;
         if(typeof(script) !== 'string') {
             script = 'build';
-            Logger.Warn('Build script is not set, use default value: ' + script);
+            Logger.Warn(`Build script is not set, use default value: ${script}`);
         }
 
         command = 'node node_modules/@shijiu/jsview/tools/jsview-build-minify-exclude.mjs --filter=' + filter + ' --script=' + script;
@@ -124,28 +130,33 @@ function doCommand(options, argv) {
         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);
+            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}`;
     } else if(options.buildBurdenLocal) {
         command = 'JSVIEW_BURDEN_LOCAL=true npm run build';
+    } else if(options.buildBurdenBaseurl) {
+        if(typeof options.buildBurdenBaseurl != 'string') {
+            Logger.ErrorAndExitNoException("Bad build burden base url, please set valid url such as: https://example.com/burden-dir.");
+        }
+        command = `JSVIEW_BURDEN_BASEURL=${options.buildBurdenBaseurl} npm run build`;
     } else if(options.vueDevtools) {
         var defaultPort = 8098;
         const port = (typeof(options.vueDevtools) === 'string' ? options.vueDevtools : defaultPort);
         if(port !== options.vueDevtools) {
-            Logger.Warn('Vue Devtools server port is not set, use default value: ' + defaultPort);
+            Logger.Warn(`Vue Devtools server port is not set, use default value: ${port}`);
         }
 
-        command = 'node node_modules/@shijiu/jsview/tools/jsview-vue-devtools.mjs --port=' + port;
+        command = `node node_modules/@shijiu/jsview/tools/jsview-vue-devtools.mjs --port=${port}`;
     } else if(options.moduleFederation) {
         var argumentsLine = options.argumentsLine.replace(/ --framework.*? /, ' ');
         argumentsLine = argumentsLine.replace(' -f ', ' ').replace(' --module-federation ', ' ');
 
-        command = 'node node_modules/@shijiu/jsview/tools/jsview-module-federation.mjs' + argumentsLine;
+        command = `node node_modules/@shijiu/jsview/tools/jsview-module-federation.mjs ${argumentsLine}`;
     } else if(options.httpServer) {
         if(isCommandAvailable('serve') == false) {
-            Logger.ErrorAndExitNoException("Command `serve` is not found, please install it first by `npm install -g serve`.");
+            Logger.ErrorAndExitNoException("Command 'serve' is not found, please install it first by 'npm install -g serve'.");
         }
         if(typeof options.httpServer !== 'string') {
             Logger.ErrorAndExitNoException("Dir path is not found, please set dir by [-t|--http-server]=[DirPath].");
@@ -153,7 +164,7 @@ function doCommand(options, argv) {
         command = `serve -p 8080 --cors ${options.httpServer}`;
     } else if(options.httpsServer) {
         if(isCommandAvailable('serve') == false) {
-            Logger.ErrorAndExitNoException("Command `serve` is not found, please install it first by `npm install -g serve`.");
+            Logger.ErrorAndExitNoException("Command 'serve' is not found, please install it first by 'npm install -g serve'.");
         }
         if(typeof options.httpsServer !== 'string') {
             Logger.ErrorAndExitNoException("Dir path is not found, please set dir by [-s|--https-server]=[DirPath].");
@@ -169,6 +180,21 @@ function doCommand(options, argv) {
     } else if(options.httpsVite) {
         const exportPrefix = getExportPrefix();
         command = `${exportPrefix} JSVIEW_ENABLE_HTTPS=true && npm start`;
+    } else if(options.fowardArkweb) {
+        var defaultPort = 9220;
+        const port = (typeof(options.fowardArkweb) === 'string' ? options.fowardArkweb : defaultPort);
+        if(port !== options.fowardArkweb) {
+            Logger.Warn(`Foward webview port is not set, use default value: ${port}`);
+        }
+
+        command = `hdc shell cat /proc/net/unix | grep devtools`;
+        const output = execCommand(command, true);
+        if(output.includes('@webview_devtools_remote_') == false) {
+            Logger.ErrorAndThrow(`Failed to find foward webview process.`);
+        }
+        const webviewPid = output.substring(output.indexOf('@') + 1).trim();
+
+        command = `hdc fport tcp:${port} localabstract:${webviewPid}`;
     }
 
     execCommand(command);
@@ -187,17 +213,19 @@ const requiredUsages = {
   '--framework': 'Select from [vue|react]',
 };
 const optionalUsages = {
-  '-t | --http-server': '=[DirPath]. Start http server for debug, port is 8080.',
-  '-s | --https-server': '=[DirPath]. Start https server for debug, port is 8080.',
-  '-v | --http-vite': 'Start vite https server for debug, same as `npm start`',
-  '-i | --https-vite': 'Start vite https server for debug.',
   '-a | --runon-android': 'Run app on android devices.',
   '-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].',
-  '-b | --build-burden-local': 'Build target with local burden files.',
+  '-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].',
+  '-t | --http-server': '=[DirPath]. Start http server for debug, port is 8080.',
+  '-s | --https-server': '=[DirPath]. Start https server for debug, port is 8080.',
+  '-v | --http-vite': 'Start vite https server for debug, same as `npm start`',
+  '-i | --https-vite': 'Start vite https server for debug.',
+  '-p | --foward-arkweb': 'Foward port to openharmony webview devtools, like -p or --foward-arkweb=[port].',
   '-f | --module-federation': 'Make project to module federation, use --module-federation --help for details.',
 };
 const argv = parseArguments(requiredUsages, optionalUsages, true, true, true);