pake-cli 2.5.0 → 2.5.2

package/README.md

@@ -1,4 +1,4 @@
-<h4 align="right"><strong>English</strong> | <a href="https://github.com/tw93/Pake/blob/master/README_CN.md">简体中文</a></h4>
+<h4 align="right"><strong>English</strong> | <a href="https://github.com/tw93/Pake/blob/master/README_CN.md">简体中文</a> | <a href="https://github.com/tw93/Pake/blob/master/README_JP.md">日本語</a></h4>
 <p align="center">
     <img src=https://gw.alipayobjects.com/zos/k/fa/logo-modified.png width=138/>
 </p>
@@ -257,6 +257,13 @@ Pake's development can not be without these Hackers. They contributed a lot of c
         </a>
     </td></tr>
 <tr>
+    <td align="center">
+        <a href="https://github.com/YangguangZhou">
+            <img src="https://avatars.githubusercontent.com/u/61733195?v=4" width="90;" alt="YangguangZhou"/>
+            <br />
+            <sub><b>Jerry Zhou</b></sub>
+        </a>
+    </td>
     <td align="center">
         <a href="https://github.com/AielloChan">
             <img src="https://avatars.githubusercontent.com/u/7900765?v=4" width="90;" alt="AielloChan"/>
@@ -278,6 +285,13 @@ Pake's development can not be without these Hackers. They contributed a lot of c
             <sub><b>Pake Actions</b></sub>
         </a>
     </td>
+    <td align="center">
+        <a href="https://github.com/eltociear">
+            <img src="https://avatars.githubusercontent.com/u/22633385?v=4" width="90;" alt="eltociear"/>
+            <br />
+            <sub><b>Ikko Eltociear Ashimine</b></sub>
+        </a>
+    </td>
     <td align="center">
         <a href="https://github.com/QingZ11">
             <img src="https://avatars.githubusercontent.com/u/38887077?v=4" width="90;" alt="QingZ11"/>
@@ -291,7 +305,8 @@ Pake's development can not be without these Hackers. They contributed a lot of c
             <br />
             <sub><b>孟世博</b></sub>
         </a>
-    </td>
+    </td></tr>
+<tr>
     <td align="center">
         <a href="https://github.com/2nthony">
             <img src="https://avatars.githubusercontent.com/u/19513289?v=4" width="90;" alt="2nthony"/>
@@ -305,8 +320,7 @@ Pake's development can not be without these Hackers. They contributed a lot of c
             <br />
             <sub><b>Null</b></sub>
         </a>
-    </td></tr>
-<tr>
+    </td>
     <td align="center">
         <a href="https://github.com/imabutahersiddik">
             <img src="https://avatars.githubusercontent.com/u/138387257?v=4" width="90;" alt="imabutahersiddik"/>
@@ -341,12 +355,13 @@ Pake's development can not be without these Hackers. They contributed a lot of c
             <br />
             <sub><b>Fechin</b></sub>
         </a>
-    </td>
+    </td></tr>
+<tr>
     <td align="center">
-        <a href="https://github.com/eltociear">
-            <img src="https://avatars.githubusercontent.com/u/22633385?v=4" width="90;" alt="eltociear"/>
+        <a href="https://github.com/ImgBotApp">
+            <img src="https://avatars.githubusercontent.com/u/31427850?v=4" width="90;" alt="ImgBotApp"/>
             <br />
-            <sub><b>Ikko Eltociear Ashimine</b></sub>
+            <sub><b>Imgbot</b></sub>
         </a>
     </td>
     <td align="center">
@@ -355,8 +370,7 @@ Pake's development can not be without these Hackers. They contributed a lot of c
             <br />
             <sub><b>Jiaqi Gu</b></sub>
         </a>
-    </td></tr>
-<tr>
+    </td>
     <td align="center">
         <a href="https://github.com/Milo123459">
             <img src="https://avatars.githubusercontent.com/u/50248166?v=4" width="90;" alt="Milo123459"/>
@@ -391,7 +405,8 @@ Pake's development can not be without these Hackers. They contributed a lot of c
             <br />
             <sub><b>Null</b></sub>
         </a>
-    </td>
+    </td></tr>
+<tr>
     <td align="center">
         <a href="https://github.com/liudonghua123">
             <img src="https://avatars.githubusercontent.com/u/2276718?v=4" width="90;" alt="liudonghua123"/>
@@ -405,8 +420,7 @@ Pake's development can not be without these Hackers. They contributed a lot of c
             <br />
             <sub><b>Liusishan</b></sub>
         </a>
-    </td></tr>
-<tr>
+    </td>
     <td align="center">
         <a href="https://github.com/piaoyidage">
             <img src="https://avatars.githubusercontent.com/u/5135405?v=4" width="90;" alt="piaoyidage"/>

package/dist/cli.js

@@ -20,7 +20,7 @@ import psl from 'psl';
 import isUrl from 'is-url';
 
 var name = "pake-cli";
-var version = "2.5.0";
+var version = "2.5.2";
 var description = "🤱🏻 Turn any webpage into a desktop app with Rust. 🤱🏻 利用 Rust 轻松构建轻量级多端桌面应用。";
 var engines = {
 	node: ">=16.0.0"
@@ -465,9 +465,11 @@ async function combineFiles(files, output) {
     const contents = files.map(file => {
         const fileContent = fs.readFileSync(file);
         if (file.endsWith('.css')) {
-            return "window.addEventListener('DOMContentLoaded', (_event) => { const css = `" + fileContent + "`; const style = document.createElement('style'); style.innerHTML = css; document.head.appendChild(style); });";
+            return ("window.addEventListener('DOMContentLoaded', (_event) => { const css = `" +
+                fileContent +
+                "`; const style = document.createElement('style'); style.innerHTML = css; document.head.appendChild(style); });");
         }
-        return "window.addEventListener('DOMContentLoaded', (_event) => { " + fileContent + " });";
+        return "window.addEventListener('DOMContentLoaded', (_event) => { " + fileContent + ' });';
     });
     fs.writeFileSync(output, contents.join('\n'));
     return files;
@@ -633,7 +635,7 @@ async function mergeConfig(url, options, tauriConf) {
             logger.error('The injected file must be in either CSS or JS format.');
             return;
         }
-        const files = inject.map(filepath => path.isAbsolute(filepath) ? filepath : path.join(process.cwd(), filepath));
+        const files = inject.map(filepath => (path.isAbsolute(filepath) ? filepath : path.join(process.cwd(), filepath)));
         tauriConf.pake.inject = files;
         await combineFiles(files, injectFilePath);
     }
@@ -1014,10 +1016,7 @@ ${green('| |_) / _` | |/ / _ \\')}
 ${green('|  __/ (_| |   <  __/')}  ${yellow('https://github.com/tw93/pake')}
 ${green('|_|   \\__,_|_|\\_\\___|  can turn any webpage into a desktop app with Rust.')}
 `;
-program
-    .addHelpText('beforeAll', logo)
-    .usage(`[url] [options]`)
-    .showHelpAfterError();
+program.addHelpText('beforeAll', logo).usage(`[url] [options]`).showHelpAfterError();
 program
     .argument('[url]', 'The web URL you want to package', validateUrlInput)
     .option('--name <string>', 'Application name')
@@ -1034,8 +1033,12 @@ program
     .addOption(new Option('--user-agent <string>', 'Custom user agent').default(DEFAULT_PAKE_OPTIONS.userAgent).hideHelp())
     .addOption(new Option('--targets <string>', 'Only for Linux, option "deb" or "appimage"').default(DEFAULT_PAKE_OPTIONS.targets).hideHelp())
     .addOption(new Option('--always-on-top', 'Always on the top level').default(DEFAULT_PAKE_OPTIONS.alwaysOnTop).hideHelp())
-    .addOption(new Option('--disabled-web-shortcuts', 'Disabled webPage shortcuts').default(DEFAULT_PAKE_OPTIONS.disabledWebShortcuts).hideHelp())
-    .addOption(new Option('--safe-domain [domains...]', 'Domains that Require Security Configuration').default(DEFAULT_PAKE_OPTIONS.safeDomain).hideHelp())
+    .addOption(new Option('--disabled-web-shortcuts', 'Disabled webPage shortcuts')
+    .default(DEFAULT_PAKE_OPTIONS.disabledWebShortcuts)
+    .hideHelp())
+    .addOption(new Option('--safe-domain [domains...]', 'Domains that Require Security Configuration')
+    .default(DEFAULT_PAKE_OPTIONS.safeDomain)
+    .hideHelp())
     .addOption(new Option('--show-system-tray', 'Show system tray in app').default(DEFAULT_PAKE_OPTIONS.showSystemTray).hideHelp())
     .addOption(new Option('--system-tray-icon <string>', 'Custom system tray icon').default(DEFAULT_PAKE_OPTIONS.systemTrayIcon).hideHelp())
     .version(packageJson.version, '-v, --version', 'Output the current version')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pake-cli",
-  "version": "2.5.0",
+  "version": "2.5.2",
   "description": "🤱🏻 Turn any webpage into a desktop app with Rust. 🤱🏻 利用 Rust 轻松构建轻量级多端桌面应用。",
   "engines": {
     "node": ">=16.0.0"

package/src-tauri/src/inject/component.js

@@ -6,16 +6,15 @@ document.addEventListener('DOMContentLoaded', () => {
     m.style.cssText =
       'max-width:60%;min-width: 80px;padding:0 12px;height: 32px;color: rgb(255, 255, 255);line-height: 32px;text-align: center;border-radius: 8px;position: fixed; bottom:24px;right: 28px;z-index: 999999;background: rgba(0, 0, 0,.8);font-size: 13px;';
     document.body.appendChild(m);
-    setTimeout(function() {
+    setTimeout(function () {
       const d = 0.5;
       m.style.transition = 'transform ' + d + 's ease-in, opacity ' + d + 's ease-in';
       m.style.opacity = '0';
-      setTimeout(function() {
+      setTimeout(function () {
         document.body.removeChild(m);
       }, d * 1000);
     }, 3000);
   }
 
   window.pakeToast = pakeToast;
-
 });

package/src-tauri/src/inject/event.js

@@ -1,13 +1,13 @@
 const shortcuts = {
-  'ArrowUp': () => scrollTo(0, 0),
-  'ArrowDown': () => scrollTo(0, document.body.scrollHeight),
   '[': () => window.history.back(),
   ']': () => window.history.forward(),
-  'r': () => window.location.reload(),
   '-': () => zoomOut(),
   '=': () => zoomIn(),
   '+': () => zoomIn(),
-  '0': () => setZoom('100%'),
+  0: () => setZoom('100%'),
+  r: () => window.location.reload(),
+  ArrowUp: () => scrollTo(0, 0),
+  ArrowDown: () => scrollTo(0, document.body.scrollHeight),
 };
 
 function setZoom(zoom) {
@@ -22,11 +22,11 @@ function zoomCommon(zoomChange) {
 }
 
 function zoomIn() {
-  zoomCommon((currentZoom) => `${Math.min(parseInt(currentZoom) + 10, 200)}%`);
+  zoomCommon(currentZoom => `${Math.min(parseInt(currentZoom) + 10, 200)}%`);
 }
 
 function zoomOut() {
-  zoomCommon((currentZoom) => `${Math.max(parseInt(currentZoom) - 10, 30)}%`);
+  zoomCommon(currentZoom => `${Math.max(parseInt(currentZoom) - 10, 30)}%`);
 }
 
 function handleShortcut(event) {
@@ -38,11 +38,14 @@ function handleShortcut(event) {
 
 // Judgment of file download.
 function isDownloadLink(url) {
+  // prettier-ignore
   const fileExtensions = [
-    '3gp', '7z', 'ai', 'apk', 'avi', 'bmp', 'csv', 'dmg', 'doc', 'docx', 'fla', 'flv', 'gif', 'gz', 'gzip',
-    'ico', 'iso', 'indd', 'jar', 'jpeg', 'jpg', 'm3u8', 'mov', 'mp3', 'mp4', 'mpa', 'mpg',
-    'mpeg', 'msi', 'odt', 'ogg', 'ogv', 'pdf', 'png', 'ppt', 'pptx', 'psd', 'rar', 'raw', 'rss', 'svg',
-    'swf', 'tar', 'tif', 'tiff', 'ts', 'txt', 'wav', 'webm', 'webp', 'wma', 'wmv', 'xls', 'xlsx', 'xml', 'zip',
+    '3gp', '7z', 'ai', 'apk', 'avi', 'bmp', 'csv', 'dmg', 'doc', 'docx',
+    'fla', 'flv', 'gif', 'gz', 'gzip', 'ico', 'iso', 'indd', 'jar', 'jpeg',
+    'jpg', 'm3u8', 'mov', 'mp3', 'mp4', 'mpa', 'mpg', 'mpeg', 'msi', 'odt',
+    'ogg', 'ogv', 'pdf', 'png', 'ppt', 'pptx', 'psd', 'rar', 'raw', 'rss',
+    'svg', 'swf', 'tar', 'tif', 'tiff', 'ts', 'txt', 'wav', 'webm', 'webp',
+    'wma', 'wmv', 'xls', 'xlsx', 'xml', 'zip', 'json', 'yaml', '7zip', 'mkv'
   ];
   const downloadLinkPattern = new RegExp(`\\.(${fileExtensions.join('|')})$`, 'i');
   return downloadLinkPattern.test(url);
@@ -75,7 +78,7 @@ document.addEventListener('DOMContentLoaded', () => {
     appWindow.startDragging().then();
   });
 
-  domEl.addEventListener('mousedown', (e) => {
+  domEl.addEventListener('mousedown', e => {
     e.preventDefault();
     if (e.buttons === 1 && e.detail !== 2) {
       appWindow.startDragging().then();
@@ -83,13 +86,13 @@ document.addEventListener('DOMContentLoaded', () => {
   });
 
   domEl.addEventListener('dblclick', () => {
-    appWindow.isFullscreen().then((fullscreen) => {
+    appWindow.isFullscreen().then(fullscreen => {
       appWindow.setFullscreen(!fullscreen).then();
     });
   });
 
   if (window['pakeConfig']?.disabled_web_shortcuts !== true) {
-    document.addEventListener('keyup', (event) => {
+    document.addEventListener('keyup', event => {
       if (/windows|linux/i.test(navigator.userAgent) && event.ctrlKey) {
         handleShortcut(event);
       }
@@ -103,7 +106,7 @@ document.addEventListener('DOMContentLoaded', () => {
   function collectUrlToBlobs() {
     const backupCreateObjectURL = window.URL.createObjectURL;
     window.blobToUrlCaches = new Map();
-    window.URL.createObjectURL = (blob) => {
+    window.URL.createObjectURL = blob => {
       const url = backupCreateObjectURL.call(window.URL, blob);
       window.blobToUrlCaches.set(url, blob);
       return url;
@@ -111,7 +114,7 @@ document.addEventListener('DOMContentLoaded', () => {
   }
 
   function convertBlobUrlToBinary(blobUrl) {
-    return new Promise((resolve) => {
+    return new Promise(resolve => {
       const blob = window.blobToUrlCaches.get(blobUrl);
       const reader = new FileReader();
 
@@ -145,7 +148,7 @@ document.addEventListener('DOMContentLoaded', () => {
   }
 
   function downloadFromBlobUrl(blobUrl, filename) {
-    convertBlobUrlToBinary(blobUrl).then((binary) => {
+    convertBlobUrlToBinary(blobUrl).then(binary => {
       invoke('download_file_by_binary', {
         params: {
           filename,
@@ -155,37 +158,40 @@ document.addEventListener('DOMContentLoaded', () => {
     });
   }
 
-// detect blob download by createElement("a")
+  // detect blob download by createElement("a")
   function detectDownloadByCreateAnchor() {
     const createEle = document.createElement;
-    document.createElement = (el) => {
+    document.createElement = el => {
       if (el !== 'a') return createEle.call(document, el);
       const anchorEle = createEle.call(document, el);
 
       // use addEventListener to avoid overriding the original click event.
-      anchorEle.addEventListener('click', (e) => {
-        const url = anchorEle.href;
-        const filename = anchorEle.download || getFilenameFromUrl(url);
-        if (window.blobToUrlCaches.has(url)) {
-          downloadFromBlobUrl(url, filename);
-          // case: download from dataURL -> convert dataURL ->
-        } else if (url.startsWith('data:')) {
-          downloadFromDataUri(url, filename);
-        } else if (isDownloadLink(url) || anchorEle.hostname !== window.location.host) {
-          handleExternalLink(e, url);
-        }
-      }, true);
+      anchorEle.addEventListener(
+        'click',
+        e => {
+          const url = anchorEle.href;
+          const filename = anchorEle.download || getFilenameFromUrl(url);
+          if (window.blobToUrlCaches.has(url)) {
+            downloadFromBlobUrl(url, filename);
+            // case: download from dataURL -> convert dataURL ->
+          } else if (url.startsWith('data:')) {
+            downloadFromDataUri(url, filename);
+          } else if (isDownloadLink(url) || anchorEle.host !== window.location.host) {
+            handleExternalLink(e, url);
+          }
+        },
+        true,
+      );
 
       return anchorEle;
     };
   }
 
-  const isExternalLink = (link) => window.location.host !== link.host;
+  const isExternalLink = link => window.location.host !== link.host;
   // process special download protocol['data:','blob:']
-  const isSpecialDownload = (url) => ['blob', 'data'].some(protocol => url.startsWith(protocol));
+  const isSpecialDownload = url => ['blob', 'data'].some(protocol => url.startsWith(protocol));
 
-  const isDownloadRequired = (url, anchorElement, e) =>
-    anchorElement.download || e.metaKey || e.ctrlKey || isDownloadLink(url);
+  const isDownloadRequired = (url, anchorElement, e) => anchorElement.download || e.metaKey || e.ctrlKey || isDownloadLink(url);
 
   const handleExternalLink = (e, url) => {
     e.preventDefault();
@@ -197,16 +203,19 @@ document.addEventListener('DOMContentLoaded', () => {
     invoke('download_file', { params: { url, filename } });
   };
 
-  const detectAnchorElementClick = (e) => {
+  const detectAnchorElementClick = e => {
     const anchorElement = e.target.closest('a');
     if (anchorElement && anchorElement.href) {
-      anchorElement.target = '_self';
+      if (!anchorElement.target) {
+        anchorElement.target = '_self';
+      }
+
       const hrefUrl = new URL(anchorElement.href);
       const absoluteUrl = hrefUrl.href;
       let filename = anchorElement.download || getFilenameFromUrl(absoluteUrl);
 
       // Handling external link redirection.
-      if (isExternalLink(absoluteUrl) && (['_blank', '_new'].includes(anchorElement.target) || externalTargetLink())) {
+      if ((isExternalLink(absoluteUrl) && ['_blank', '_new'].includes(anchorElement.target)) || externalTargetLink()) {
         handleExternalLink(e, absoluteUrl);
         return;
       }
@@ -226,7 +235,7 @@ document.addEventListener('DOMContentLoaded', () => {
 
   // Rewrite the window.open function.
   const originalWindowOpen = window.open;
-  window.open = function(url, name, specs) {
+  window.open = function (url, name, specs) {
     // Apple login and google login
     if (name === 'AppleAuthentication') {
       //do nothing
@@ -249,10 +258,13 @@ document.addEventListener('DOMContentLoaded', () => {
   }
 
   // Fix Chinese input method "Enter" on Safari
-  document.addEventListener('keydown', (e) => {
-    if (e.keyCode === 229) e.stopPropagation();
-  }, true);
-
+  document.addEventListener(
+    'keydown',
+    e => {
+      if (e.keyCode === 229) e.stopPropagation();
+    },
+    true,
+  );
 });
 
 function setDefaultZoom() {

package/src-tauri/tauri.linux.conf.json

@@ -8,7 +8,7 @@
       "copyright": "",
       "deb": {
         "depends": ["curl", "wget"],
-        "files": {"/usr/share/applications/com-pake-weread.desktop": "assets/com-pake-weread.desktop"}
+        "files": { "/usr/share/applications/com-pake-weread.desktop": "assets/com-pake-weread.desktop" }
       },
       "externalBin": [],
       "longDescription": "",