@shijiu/jsview 2.1.366-test.0 → 2.1.428

package/dom/jsv-forge-define.d.ts

@@ -0,0 +1 @@
+declare module '@shijiu/jsview/dom/jsv-forge-define.mjs';

package/dom/target_core_revision.mjs

@@ -3,12 +3,12 @@
  */
 
 const TargetRevision = {
-  "CoreRevision": 1021721,
-  "CoreRevisionAndBranch": "1021721",
-  "JseRevision": "1.0.944",
+  "CoreRevision": 1021744,
+  "CoreRevisionAndBranch": "1021744",
+  "JseRevision": "1.0.950",
   "JseUrl":
-    "http://cdn.release.qcast.cn/forge_js/master/JsViewES6_js2c_r944.jsv.48186e42.js",
-  "JseName": "JsViewES6_js2c_r944.jsv.48186e42.js",
+    "http://cdn.release.qcast.cn/forge_js/master/JsViewES6_js2c_r950.jsv.33b8f0af.js",
+  "JseName": "JsViewES6_js2c_r950.jsv.33b8f0af.js",
   "JsidtName": "libjsidt.102.7.so",
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shijiu/jsview",
-  "version": "2.1.366-test.0",
+  "version": "2.1.428",
   "bin": {
     "jsview-post-build": "./tools/jsview-post-build.js",
     "jsview-post-install": "./tools/jsview-post-install.js"

package/tools/jsview-common.mjs

@@ -3,18 +3,12 @@
 
 import childProcess from 'node:child_process';
 import fs from 'node:fs';
-import https from 'node:https';
+import os from 'node:os';
 import path from 'node:path';
 import { Logger } from "./jsview-logger.js";
 
 function printArgumentsUsages(requiredUsages, optionalUsages, helpUsages)
 {
-  if(!helpUsages) {
-    helpUsages = {
-      '-h | --help': 'Print help usages.',
-    }
-  }
-
   let maxLength = 0;
   for (const usage in requiredUsages) {
     maxLength = (maxLength > usage.length ? maxLength : usage.length);
@@ -47,9 +41,7 @@ function printArgumentsUsages(requiredUsages, optionalUsages, helpUsages)
 
 function parseArguments(requiredUsages = {},
                         optionalUsages = {},
-                        withoutUnparsed = true,
-                        ignoreUnknown = false,
-                        ignoreHelpUsage = false)
+                        withoutUnparsed = true)
 {
   const keySeparator = '|';
   const formatKey = (key) => {
@@ -118,8 +110,7 @@ function parseArguments(requiredUsages = {},
   }
 
   let options = {
-    unparsed: [],
-    argumentsLine: '',
+    unparsed: []
   };
 
   // arg0: node
@@ -139,8 +130,7 @@ function parseArguments(requiredUsages = {},
       }
     }
 
-    if (ignoreUnknown == false
-    && hasKey(helpUsages, key) == false
+    if (hasKey(helpUsages, key) == false
     && hasKey(requiredUsages, key) == false
     && hasKey(optionalUsages, key) == false) {
         Logger.ErrorAndExitNoException('Failed to parse usage: ' + argu);
@@ -149,13 +139,11 @@ function parseArguments(requiredUsages = {},
     let formattedKey = formatKey(key);
     let formattedValue = formatValue(value);
     options[formattedKey] = formattedValue;
-
-    options.argumentsLine += ' ' + argu;
   }
 
   for (const checker in helpUsages) {
     const aliasedOptions = checkAliases(checker, options);
-    if (aliasedOptions && ignoreHelpUsage == false) {
+    if (aliasedOptions) {
       printArgumentsUsages(requiredUsages, optionalUsages, helpUsages);
       process.exit(0);
     }
@@ -220,8 +208,6 @@ function getOptions(framework)
   }
 
   options.appConfigDir = path.resolve(options.projectDir, 'src', 'appConfig');
-  options.appConfigFile = path.resolve(options.appConfigDir, 'app.config.mjs');
-  options.appJsviewConfigFile = path.resolve(options.appConfigDir, 'jsview.config.mjs');
   options.appPrivKeyFile = path.resolve(options.appConfigDir, 'app_sign_private_key.crt');
   options.appPubKeyFile = path.resolve(options.appConfigDir, 'app_sign_public_key.pem');
 
@@ -238,19 +224,19 @@ function getOptions(framework)
   }
   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');
   options.distJsDir = path.resolve(options.distDir, 'js');
   options.distDebugDir = path.resolve(options.distDir, 'debug');
   options.distDebugMapDir = path.resolve(options.distDebugDir, 'map');
 
   const cacheName = (framework == 'vue' ? '.vite' : '.cache');
   options.cacheDir = path.resolve(options.modulesDir, cacheName);
-  options.cacheJsViewDir = path.resolve(options.cacheDir, 'jsview');
-  options.baseUrlFile = path.resolve(options.cacheJsViewDir, 'network.mjs');
+  options.baseUrlFile = path.resolve(options.cacheDir, 'jsview', 'network.mjs');
 
   return options;
 }
 
-function loadPackageObject(modulePath)
+function getPackageObject(modulePath)
 {
   const pkgFullFile = path.resolve(modulePath, 'package.json');
   if (!fs.existsSync(pkgFullFile)) {
@@ -262,16 +248,6 @@ function loadPackageObject(modulePath)
   return pkgObj;
 }
 
-function savePackageObject(modulePath, pkgObj)
-{
-  const pkgFullFile = path.resolve(modulePath, 'package.json');
-  const pkgContent = JSON.stringify(pkgObj, null, 2);
-
-  fs.writeFileSync(pkgFullFile, pkgContent, 'utf8');
-
-  return pkgObj;
-}
-
 function cpSync(workDir, srcPath, destPath, ignore=[])
 {
   const exists = fs.existsSync(srcPath);
@@ -409,44 +385,14 @@ function makeZip(zipFilePath, password, ...args)
   }
 }
 
-function downloadFileAsync(url, localPath, workDir)
+function convertHomeDirectory(filePath)
 {
-  const relativePath = path.relative(workDir, localPath);
-  Logger.Info('Downloading ' + url + ' => ' + relativePath);
-
-  const file = fs.createWriteStream(localPath);
-
-  return new Promise((resolve, reject) => {
-    const request = https.get(url, (response) => {
-      response.pipe(file);
-
-      file.on('finish', () => {
-        file.close(() => {
-          Logger.Info('Success to download file to ' + relativePath);
-          resolve();
-        });
-      });
-    });
-
-    request.on('error', (err) => {
-      fs.unlink(localPath, () => {
-        Logger.ErrorAndExit('Failed to download file from ' + url);
-        reject(err);
-      });
-    });
-  });
-}
-
-function unzipFile(zipFilePath, toDir, workDir)
-{
-  var relativePath = path.relative(workDir, toDir);
-  if(!relativePath) {
-    relativePath = './'
+  if(!filePath) {
+    return null;
   }
-  Logger.Info('Unzipping ' + zipFilePath + ' => ' + relativePath);
 
-  const cmdline = 'npx -y extract-zip ' + zipFilePath + ' ' + toDir;
-  execCommand(cmdline);
+  const homeDir = os.homedir();
+  return filePath.replace(/^~\//, homeDir + '/');
 }
 
 function getNpmRegistry()
@@ -457,20 +403,17 @@ function getNpmRegistry()
 export {
   askAndAnswer,
   checkNodeVersion,
+  convertHomeDirectory,
   cpSync,
-  downloadFileAsync,
   execCommand,
   getOptions,
+  getPackageObject,
   getNpmRegistry,
   isSymlinkSync,
-  loadPackageObject,
   makeZip,
   parseArguments,
-  printArgumentsUsages,
   readJsonFile,
   rmSync,
-  savePackageObject,
   symlinkSync,
-  unzipFile,
   Logger,
 }

package/tools/jsview-post-build.mjs

@@ -8,7 +8,7 @@ import url from 'node:url'
 import {
   checkNodeVersion,
   getOptions,
-  loadPackageObject,
+  getPackageObject,
   parseArguments,
   Logger,
 } from './jsview-common.mjs';
@@ -181,9 +181,17 @@ function makeMainJsvMjs(options, framework)
     }
   };
 
-  const to = jsEntryFilePath.replace(/.js$/, '.mjs');
-  Logger.Info(' -> ' + path.relative(options.projectDir, to));
-  fs.copyFileSync(jsEntryFilePath, to);
+  const sourceContent = fs.readFileSync(jsEntryFilePath, 'utf8');
+  const hash = sourceContent.replace(/\n/g, '').replace(/.*\/\*jsvmd5:([a-fA-F0-9]{8})[a-fA-F0-9]*\*\/.*/, '$1');
+  const newEntryFileName = `main.jsv.${hash}.mjs`;
+  const newEntryFilePath = path.resolve(path.dirname(jsEntryFilePath), `main.jsv.${hash}.mjs`);
+  Logger.Info(' -> ' + path.relative(options.projectDir, newEntryFilePath));
+  fs.renameSync(jsEntryFilePath, newEntryFilePath);
+
+  var indexContent = fs.readFileSync(options.distJsIndexFile, 'utf8');
+  indexContent = indexContent.replace(path.basename(jsEntryFilePath), newEntryFileName);
+  Logger.Info(' -> ' + path.relative(options.projectDir, options.distJsIndexFile));
+  fs.writeFileSync(options.distJsIndexFile, indexContent, 'utf8');
 }
 
 function makeDebugMap(options, framework)
@@ -193,7 +201,7 @@ function makeDebugMap(options, framework)
   let jsEntryFilePath;
   const jsFileNames = fs.readdirSync(options.distJsDir);
   for(const fileName of jsFileNames) {
-    if (fileName.startsWith('main.jsv') && fileName.endsWith('.js')) {
+    if (fileName.startsWith('main.jsv') && fileName.endsWith('.mjs')) {
       jsEntryFilePath = path.resolve(options.distJsDir, fileName);
     }
     if (!fileName.endsWith('.map')) {
@@ -202,7 +210,7 @@ function makeDebugMap(options, framework)
 
     const from = path.resolve(options.distJsDir, fileName);
     const to = path.resolve(options.distDebugMapDir, fileName);
-    // Logger.Info(' -> ' + path.relative(options.projectDir, to));
+    Logger.Info(' -> ' + path.relative(options.projectDir, to));
     fs.renameSync(from, to);
   };
 
@@ -241,7 +249,7 @@ function makeJsvList(options)
 
 async function makeJsvInfo(options)
 {
-  const jsviewPkgJson = loadPackageObject(options.jsviewDir);
+  const jsviewPkgJson = getPackageObject(options.jsviewDir);
 
   const jsviewVersionURL = url.pathToFileURL(options.jsviewDomRevisionFile);
   const { default: jsviewTargetVersion } = await import(jsviewVersionURL);

package/tools/jsview-post-install.mjs

@@ -9,7 +9,7 @@ import {
   cpSync,
   execCommand,
   getOptions,
-  loadPackageObject,
+  getPackageObject,
   isSymlinkSync,
   parseArguments,
   symlinkSync,
@@ -33,7 +33,7 @@ function checkNpmCommand()
 
 function checkNpmLinkForDebug(options, linkablePkgNames)
 {
-  const pkgObj = loadPackageObject(options.projectDir);
+  const pkgObj = getPackageObject(options.projectDir);
 
   // node 16 不会安装本地包的二次依赖, 需要手动安装。
   let missingDepPkgs = '';
@@ -46,7 +46,7 @@ function checkNpmLinkForDebug(options, linkablePkgNames)
     }
 
     const linkablePath = path.resolve(options.modulesDir, linkableName);
-    const linkablePkgObj = loadPackageObject(linkablePath);
+    const linkablePkgObj = getPackageObject(linkablePath);
 
     for (const dep in linkablePkgObj.dependencies ?? {}) {
       const depPath = path.resolve(options.modulesDir, dep);
@@ -98,11 +98,11 @@ function checkPatches(options, pkgNeedPatch, skipCheckVersion)
   for (const pkgName of pkgNeedPatch) {
     if (skipCheckVersion !== true) {
       const patchPkgDir = path.resolve(options.jsviewPatchModulesDir, pkgName);
-      const patchPkgObj = loadPackageObject(patchPkgDir);
+      const patchPkgObj = getPackageObject(patchPkgDir);
       Logger.Info('  ' + pkgName + ': ' + patchPkgObj.version);
 
       const modulePkgDir = path.resolve(options.modulesDir, pkgName);
-      const modulePkgObj = loadPackageObject(modulePkgDir);
+      const modulePkgObj = getPackageObject(modulePkgDir);
       if (modulePkgObj.version != patchPkgObj.version) {
         Logger.ErrorAndExit(pkgName + '@' + modulePkgObj.version + ' is not supported, required version is ' + patchPkgObj.version);
       }
@@ -114,7 +114,7 @@ function checkPatches(options, pkgNeedPatch, skipCheckVersion)
 
 function installPatches(options, pkgNeedPatch)
 {
-  Logger.Info('Stage 1: Installing patches for JsView:');
+  Logger.Info('Patching JsView:');
   for (const pkgName of pkgNeedPatch) {
     const patchSrc = path.resolve(options.jsviewPatchModulesDir, pkgName);
     const patchDest = path.resolve(options.modulesDir, pkgName);
@@ -126,86 +126,6 @@ function installPatches(options, pkgNeedPatch)
   rmSync(options.projectDir, options.cacheDir);
 }
 
-function getPatchListRecursive(patchDir)
-{
-  var patchList = [];
-
-  const pkgNameArray = fs.readdirSync(patchDir);
-  for (const pkgName of pkgNameArray) {
-    const pkgFullPath = path.resolve(patchDir, pkgName);
-
-    const isDirectory = fs.statSync(pkgFullPath).isDirectory();
-    if(isDirectory) {
-      const subPatchList = getPatchListRecursive(pkgFullPath);
-      patchList = [...patchList, ...subPatchList];
-    } else {
-      if(pkgFullPath.endsWith('.patch') == false) {
-        continue;
-      }
-
-      patchList.push(pkgFullPath);
-    }
-  }
-
-  return patchList;
-}
-
-function autoPatchPackages(options)
-{
-  Logger.Info('Stage 2: Auto patching packages:');
-
-  const patchCacheDir = path.resolve(options.cacheJsViewDir, 'patches');
-  fs.mkdirSync(patchCacheDir, { recursive: true, force: true });
-
-  const patchInfo = {};
-  const patchList = getPatchListRecursive(options.jsviewPatchModulesDir);
-  for (const patchFullPath of patchList) {
-    const patchRelativePath = path.relative(options.jsviewPatchModulesDir, patchFullPath);
-    const patchNameAndVersion = path.dirname(patchRelativePath);
-    const patchVersion = path.basename(patchNameAndVersion);
-    const patchName = path.dirname(patchNameAndVersion);
-
-    if(!patchInfo[patchName]) {
-      patchInfo[patchName] = [];
-    }
-    patchInfo[patchName].push(patchVersion);
-  }
-
-  for(const [patchName, patchVersions] of Object.entries(patchInfo)) {
-    const pkgFullDir = path.resolve(options.modulesDir, patchName);
-    const pkgJsonFullPath = path.resolve(pkgFullDir, 'package.json');
-    if(fs.existsSync(pkgJsonFullPath) == false) {
-      continue;
-    }
-
-    const pkgObj = loadPackageObject(pkgFullDir);
-    const pkgVersion = pkgObj.version;
-    if(patchVersions.includes(pkgVersion) == false) {
-      Logger.Warn('  Patch file for ' + patchName + '@' + pkgVersion + ' is not found.');
-      continue;
-    }
-
-    const patchFullDir = path.resolve(options.jsviewPatchModulesDir, patchName, pkgVersion);
-    const patchFiles = fs.readdirSync(patchFullDir);
-    for (const file of patchFiles) {
-      if(file.endsWith('.patch') == false) {
-        continue;
-      }
-
-      const copyFromPath = path.resolve(patchFullDir, file);
-      const copyToPath = path.resolve(patchCacheDir, file);
-      cpSync(options.projectDir, copyFromPath, copyToPath);
-    }
-  }
-
-  const hasPatches = fs.readdirSync(patchCacheDir);
-  if(hasPatches && hasPatches.length > 0) {
-    execCommand('npx patch-package --patch-dir ' + path.relative(options.projectDir, patchCacheDir));
-  } else {
-    Logger.Info('  No patch files found.');
-  }
-}
-
 async function printRevision(options)
 {
   const jsviewVersionURL = url.pathToFileURL(options.jsviewDomRevisionFile);
@@ -268,8 +188,6 @@ function doPostInstall(framework, pkgNeedPatch, skipCheckVersion)
 
   installPatches(options, pkgNeedPatch);
 
-  autoPatchPackages(options);
-
   printRevision(options);
 }
 

package/tools/jsview-retrieve-sourcemap.mjs

@@ -0,0 +1,194 @@
+#!/usr/bin/env node
+'use strict';
+
+import fs from 'node:fs';
+import path from 'node:path';
+import {
+    askAndAnswer,
+    checkNodeVersion,
+    convertHomeDirectory,
+    execCommand,
+    getOptions,
+    parseArguments,
+    Logger,
+} from './jsview-common.mjs';
+
+function getDefaultSourceMapDir() {
+  return './dist/debug/map';
+}
+
+function getExtraOptions(argv)
+{
+  const options = getOptions(argv.framework);
+
+  options.inputFile = convertHomeDirectory(argv.inputFile);
+  options.outputFile = convertHomeDirectory(argv.outputFile);
+  options.sourcemapDir = convertHomeDirectory(argv.sourcemapDir) ?? getDefaultSourceMapDir();
+  options.sourceMapMoudulePath = path.resolve(options.modulesDir, 'source-map', 'source-map.js');
+
+  if(!argv.sourcemapDir) {
+    Logger.Warn('Use default source map dir: ' + options.sourcemapDir);
+  }
+  if(fs.existsSync(options.sourcemapDir) == false) {
+    Logger.ErrorAndExit('Source map dir is not exists. Please check dir: ' + options.sourcemapDir);
+  }
+
+  return options;
+}
+
+async function ensureSourceMapModule(options)
+{
+  if (fs.existsSync(options.sourceMapMoudulePath)) {
+    return;
+  }
+
+  Logger.Warn('node module "source-map" is not found.')
+  Logger.Warn(' Do you want to install it?');
+  const answer = askAndAnswer('(Y/n) ');
+  if (answer && answer.substring(0, 1) != 'y' && answer.substring(0, 3) != 'yes') {
+    Logger.ErrorAndExitNoException('User cancelled.')
+  }
+
+  let cmdline = 'npm install --package-lock-only --save-exact --save-dev source-map';
+  execCommand(cmdline);
+  cmdline = 'npm ci'
+  execCommand(cmdline);
+}
+
+async function parseConsoleLog(options)
+{
+  options.sourceMapModule = await import(options.sourceMapMoudulePath);
+  options.sourceMapConsumerMap = { };
+
+  const content = fs.readFileSync(options.inputFile, 'utf-8');
+  const contentLines = content.split('\n');
+
+  const regexCharAt = /^\s+at\s+(\S+)?\s?\(?(.*):(\d+):(\d+)\)?$/;
+  const regexSymbolAt = /^(\S+) @ (.*?):(\d+)(?::(\d+))?$/;
+
+  var resultLines = [];
+  for(const line of contentLines) {
+    var recovered = line.replace(/.*?:\d+ /, '');
+
+    if(regexCharAt.test(recovered)) {
+      recovered = await recoverCharAt(options, recovered, regexCharAt);
+    } else if(regexSymbolAt.test(recovered)) {
+      recovered = await recoverSymbolAt(options, recovered, regexSymbolAt);
+    }
+
+    if(!options.outputFile) {
+      console.log(recovered);
+    } else {
+      resultLines.push(recovered);
+    }
+  }
+
+  const result = resultLines.join('\n');
+  if(options.outputFile) {
+    fs.writeFileSync(options.outputFile, result, 'utf-8');
+  }
+}
+
+async function recoverCharAt(options, content, regex)
+{
+  const matchResult = regex.exec(content);
+  var funcName = matchResult?.[1];
+  var fileName = matchResult?.[2];
+  var fileRow = matchResult?.[3];
+  var fileColumn = matchResult?.[4];
+
+  // at file.js:row:column
+  if(!fileName) {
+    fileName = funcName;
+    funcName = "";
+  } else { // at func (file.js:row:column)
+    // do nothing
+  }
+
+  const origPos = await getOriginalPosition(options, fileName, fileRow, fileColumn);
+  if(!origPos) {
+    return content;
+  }
+
+  funcName = (origPos.name ?? funcName);
+  content  = '    at ';
+  content += funcName
+  content += (funcName ? ' (' : '');
+  content += (origPos.source + ':' + origPos.line + ':' + origPos.column);
+  content += (funcName ? ') ' : '');
+
+  return content;
+}
+
+async function recoverSymbolAt(options, content, regex)
+{
+  // 忽略，拿不到column，不能解析出结果
+  // const matchResult = regex.exec(content);
+  // var funcName = matchResult?.[1];
+  // var fileName = matchResult?.[2];
+  // var fileRow = matchResult?.[3];
+  // var fileColumn = matchResult?.[4];
+
+  // const origPos = await getOriginalPosition(options, fileName, fileRow, fileColumn);
+  // if(!origPos) {
+  //   return content;
+  // }
+
+  // funcName = (origPos.name ?? funcName);
+  // content = funcName
+  // content += ' @ '
+  // content += (origPos.source + ':' + origPos.line + ':' + origPos.column);
+
+  return content;
+}
+
+async function getOriginalPosition(options, fileName, fileRow, fileColumn)
+{
+  if(!fileName || !fileRow || !fileColumn) {
+    return null;
+  }
+
+  const sourceMapFilePath = path.resolve(options.sourcemapDir, fileName + '.map');
+  if(fs.existsSync(sourceMapFilePath) == false) {
+    Logger.Warn('Source map file is not found: ' + sourceMapFilePath)
+    return null;
+  }
+
+  var sourceMapConsumer = options.sourceMapConsumerMap[sourceMapFilePath];
+  if(!sourceMapConsumer) {
+    const sourceMapContent = fs.readFileSync(sourceMapFilePath, 'utf-8');
+    sourceMapConsumer = new options.sourceMapModule.SourceMapConsumer(sourceMapContent);
+	  if(sourceMapConsumer instanceof Promise) {
+	    sourceMapConsumer = await sourceMapConsumer ;
+	  }
+    options.sourceMapConsumerMap[sourceMapFilePath] = sourceMapConsumer;
+  }
+
+  const originalPosition = sourceMapConsumer.originalPositionFor({
+    line: Number(fileRow),
+    column: Number(fileColumn),
+  });
+
+  return originalPosition;
+}
+
+async function main(argv)
+{
+  checkNodeVersion();
+
+  const options = getExtraOptions(argv);
+
+  await ensureSourceMapModule(options);
+
+  await parseConsoleLog(options);
+}
+
+const requiredUsages = {
+  '--input-file': 'Chromium console log file path.',
+};
+const optionalUsages = {
+  '-d | --sourcemap-dir': 'Source map dir. Default dir is: ' + getDefaultSourceMapDir(),
+  '-o | --output-file': 'Recovered console log file path.',
+};
+const argv = parseArguments(requiredUsages, optionalUsages, false);
+main(argv)