pake-cli 0.0.1-beta.9 → 0.0.2

package/bin/builders/MacBuilder.ts

@@ -4,22 +4,20 @@ import prompts from 'prompts';
 import { checkRustInstalled, installRust } from '@/helpers/rust.js';
 import { PakeAppOptions } from '@/types.js';
 import { IBuilder } from './base.js';
-import appRootPath from 'app-root-path';
 import { shellExec } from '@/utils/shell.js';
 import tauriConf from '../../src-tauri/tauri.conf.json';
-import { dir } from 'tmp-promise';
+import { fileURLToPath } from 'url';
+import log from 'loglevel';
 
 export default class MacBuilder implements IBuilder {
   async prepare() {
     if (checkRustInstalled()) {
-      console.log('Rust has been installed');
       return;
     }
 
-    console.warn('Rust is not installed, show prompt');
     const res = await prompts({
       type: 'confirm',
-      message: 'Detect you have not installed Rust, install it now?',
+      message: 'We detected that you have not installed Rust. Install it now?',
       name: 'value',
     });
 
@@ -27,40 +25,41 @@ export default class MacBuilder implements IBuilder {
       // TODO 国内有可能会超时
       await installRust();
     } else {
-      console.error('Error: Pake need Rust to package your webapp!!!');
+      log.error('Error: Pake need Rust to package your webapp!!!');
       process.exit(2);
     }
   }
 
   async build(url: string, options: PakeAppOptions) {
-    console.log('PakeAppOptions', options);
+    log.debug('PakeAppOptions', options);
 
-    const { width, height, fullscreen, transparent, title, resizable, identifier, name } = options;
+    const { width, height, fullscreen, transparent, resizable, identifier, name } = options;
 
     const tauriConfWindowOptions = {
       width,
       height,
       fullscreen,
       transparent,
-      title,
       resizable,
     };
 
+    // TODO 下面这块逻辑还可以再拆 目前比较简单
     Object.assign(tauriConf.tauri.windows[0], { url, ...tauriConfWindowOptions });
     tauriConf.package.productName = name;
     tauriConf.tauri.bundle.identifier = identifier;
     tauriConf.tauri.bundle.icon = [options.icon];
 
-    const { path: dirPath } = await dir();
-    const configJsonPath = `${dirPath}/config.json`;
+    const npmDirectory = path.join(path.dirname(fileURLToPath(import.meta.url)), '..');
+    const configJsonPath = path.join(npmDirectory, 'src-tauri/tauri.conf.json');
     await fs.writeFile(configJsonPath, Buffer.from(JSON.stringify(tauriConf), 'utf-8'));
 
-    const code = await shellExec(`npx tauri build --config ${configJsonPath} --target universal-apple-darwin`);
+    const code = await shellExec(`cd ${npmDirectory} && npm run build`);
     const dmgName = `${name}_${'0.2.0'}_universal.dmg`;
-    await fs.copyFile(this.getBuildedAppPath(dmgName), path.resolve(dmgName));
+    const appPath = this.getBuildedAppPath(npmDirectory, dmgName);
+    await fs.copyFile(appPath, path.resolve(`${name}_universal.dmg`));
   }
 
-  getBuildedAppPath(dmgName: string) {
-    return path.join(appRootPath.path, 'src-tauri/target/universal-apple-darwin/release/bundle/dmg', dmgName);
+  getBuildedAppPath(npmDirectory: string, dmgName: string) {
+    return path.join(npmDirectory, 'src-tauri/target/universal-apple-darwin/release/bundle/dmg', dmgName);
   }
 }

package/bin/builders/base.ts

@@ -1,7 +1,16 @@
 import { PakeAppOptions } from '@/types.js';
 
+/**
+ * Builder接口
+ * 不同平台打包过程需要实现 prepare 和 build 方法
+ */
 export interface IBuilder {
+  /** 前置检查 */
   prepare(): Promise<void>;
+  /**
+   * 开始打包
+   * @param url 打包url
+   * @param options 配置参数
+   */
   build(url: string, options: PakeAppOptions): Promise<void>;
-  // getIcon(icon?: string): Promise<string>;
 }

package/bin/builders/common.ts

@@ -1,6 +1,11 @@
-import path from 'path';
-import appRootPath from 'app-root-path';
+import prompts from 'prompts';
 
-export function getBuildedAppPath(name: string, version: string) {
-  return path.join(appRootPath.path, 'src-tauri/target/universal-apple-darwin/release/bundle/dmg', `${name}_${version}_universal.dmg`);
+export async function promptText(message: string, initial?: string) {
+  const response = await prompts({
+    type: 'text',
+    name: 'content',
+    message,
+    initial,
+  });
+  return response.content;
 }

package/bin/cli.ts

@@ -4,20 +4,27 @@ import { PakeCliOptions } from './types.js';
 import { validateNumberInput, validateUrlInput } from './utils/validate.js';
 import handleInputOptions from './options/index.js';
 import BuilderFactory from './builders/BuilderFactory.js';
+import log from 'loglevel';
 
-program.version('0.0.1').description('A cli application can build app from website, driven by tauri');
+program.version('0.0.1').description('A cli application can package a web page to desktop application');
 
 program
+  .showHelpAfterError()
   .argument('<url>', 'the web url you want to package', validateUrlInput)
   .option('--name <string>', 'application name')
-  .option('--title <string>', 'application window title')
   .option('--icon <string>', 'application icon', DEFAULT_PAKE_OPTIONS.icon)
-  .option('--height <number>', 'application window height', validateNumberInput, DEFAULT_PAKE_OPTIONS.height)
-  .option('--width <number>', 'application window width', validateNumberInput, DEFAULT_PAKE_OPTIONS.width)
-  .option('--no-resizable', 'whether the application window can be resizable', DEFAULT_PAKE_OPTIONS.resizable)
+  .option('--height <number>', 'window height', validateNumberInput, DEFAULT_PAKE_OPTIONS.height)
+  .option('--width <number>', 'window width', validateNumberInput, DEFAULT_PAKE_OPTIONS.width)
+  .option('--no-resizable', 'whether the window can be resizable', DEFAULT_PAKE_OPTIONS.resizable)
   .option('--fullscreen', 'makes the packaged app start in full screen', DEFAULT_PAKE_OPTIONS.fullscreen)
   .option('--transparent', 'transparent title bar', DEFAULT_PAKE_OPTIONS.transparent)
+  .option('--debug', 'debug', DEFAULT_PAKE_OPTIONS.transparent)
   .action(async (url: string, options: PakeCliOptions) => {
+    log.setDefaultLevel('info')
+    if (options.debug) {
+      log.setLevel('debug');
+    }
+
     const builder = BuilderFactory.create();
     await builder.prepare();
 

package/bin/defaults.ts

@@ -7,6 +7,7 @@ export const DEFAULT_PAKE_OPTIONS: PakeCliOptions = {
   fullscreen: false,
   resizable: true,
   transparent: false,
+  debug: false,
 };
 
 export const DEFAULT_APP_NAME = 'Pake';

package/bin/options/icon.ts

@@ -1,16 +1,13 @@
 import axios from 'axios';
 import { fileTypeFromBuffer } from 'file-type';
-import url from 'url';
 import { PakeAppOptions } from '../types.js';
-import { dir, file } from 'tmp-promise';
+import { dir } from 'tmp-promise';
 import path from 'path';
-import pageIcon from 'page-icon';
-import png2icons from 'png2icons';
-import ICO from 'icojs';
 import fs from 'fs/promises';
+import { fileURLToPath } from 'url';
+import log from 'loglevel';
 
 export async function handleIcon(options: PakeAppOptions, url: string) {
-  console.log(options.icon);
   if (options.icon) {
     if (options.icon.startsWith('http')) {
       return downloadIcon(options.icon);
@@ -24,52 +21,47 @@ export async function handleIcon(options: PakeAppOptions, url: string) {
 }
 
 export async function inferIcon(name: string, url: string) {
-  let icon = await getIconFromMacosIcons(name);
-  if (!icon) {
-    icon = await getIconFromPageUrl(url);
-  }
-  if (!icon) {
-    // TODO default icon
-  }
-  return icon;
+  log.info('You have not provided an app icon, use the default icon(can use --icon option to assign an icon)')
+  const npmDirectory = path.join(path.dirname(fileURLToPath(import.meta.url)), '..');
+  return path.join(npmDirectory, 'pake-default.icns');
 }
 
-export async function getIconFromPageUrl(url: string) {
-  const icon = await pageIcon(url);
-  console.log(icon);
-  if (icon.ext === '.ico') {
-    const a = await ICO.parse(icon.data);
-    icon.data = Buffer.from(a[0].buffer);
-  }
+// export async function getIconFromPageUrl(url: string) {
+//   const icon = await pageIcon(url);
+//   console.log(icon);
+//   if (icon.ext === '.ico') {
+//     const a = await ICO.parse(icon.data);
+//     icon.data = Buffer.from(a[0].buffer);
+//   }
 
-  const iconDir = (await dir()).path;
-  const iconPath = path.join(iconDir, `/icon.icns`);
+//   const iconDir = (await dir()).path;
+//   const iconPath = path.join(iconDir, `/icon.icns`);
 
-  const out = png2icons.createICNS(icon.data, png2icons.BILINEAR, 0);
+//   const out = png2icons.createICNS(icon.data, png2icons.BILINEAR, 0);
 
-  await fs.writeFile(iconPath, out);
-  return iconPath;
-}
+//   await fs.writeFile(iconPath, out);
+//   return iconPath;
+// }
 
-export async function getIconFromMacosIcons(name: string) {
-  const data = {
-    query: name,
-    filters: 'approved:true',
-    hitsPerPage: 10,
-    page: 1,
-  };
-  const res = await axios.post('https://p1txh7zfb3-2.algolianet.com/1/indexes/macOSicons/query?x-algolia-agent=Algolia%20for%20JavaScript%20(4.13.1)%3B%20Browser', data, {
-    headers: {
-      'x-algolia-api-key': '0ba04276e457028f3e11e38696eab32c',
-      'x-algolia-application-id': 'P1TXH7ZFB3',
-    },
-  });
-  if (!res.data.hits.length) {
-    return '';
-  } else {
-    return downloadIcon(res.data.hits[0].icnsUrl);
-  }
-}
+// export async function getIconFromMacosIcons(name: string) {
+//   const data = {
+//     query: name,
+//     filters: 'approved:true',
+//     hitsPerPage: 10,
+//     page: 1,
+//   };
+//   const res = await axios.post('https://p1txh7zfb3-2.algolianet.com/1/indexes/macOSicons/query?x-algolia-agent=Algolia%20for%20JavaScript%20(4.13.1)%3B%20Browser', data, {
+//     headers: {
+//       'x-algolia-api-key': '0ba04276e457028f3e11e38696eab32c',
+//       'x-algolia-application-id': 'P1TXH7ZFB3',
+//     },
+//   });
+//   if (!res.data.hits.length) {
+//     return '';
+//   } else {
+//     return downloadIcon(res.data.hits[0].icnsUrl);
+//   }
+// }
 
 export async function downloadIcon(iconUrl: string) {
   let iconResponse;

package/bin/options/index.ts

@@ -1,19 +1,17 @@
+import { promptText } from '@/builders/common.js';
+import { getDomain } from '@/utils/url.js';
 import { getIdentifier } from '../helpers/tauriConfig.js';
 import { PakeAppOptions, PakeCliOptions } from '../types.js';
 import { handleIcon } from './icon.js';
-import { getTitleByURL } from './title.js';
 
 export default async function handleOptions(options: PakeCliOptions, url: string): Promise<PakeAppOptions> {
   const appOptions: PakeAppOptions = {
     ...options,
     identifier: '',
   };
-  if (!appOptions.title) {
-    appOptions.title = await getTitleByURL(url);
-  }
 
   if (!appOptions.name) {
-    appOptions.name = appOptions.title;
+    appOptions.name = await promptText('please input your application name', getDomain(url));
   }
 
   appOptions.identifier = getIdentifier(appOptions.name, url);

package/bin/types.ts

@@ -2,9 +2,6 @@ export interface PakeCliOptions {
   /** 应用名称 */
   name?: string;
 
-  /** 不填会取 url 的 title，取不到默认 webapp */
-  title?: string;
-
   /** 应用icon */
   icon: string;
 
@@ -22,6 +19,9 @@ export interface PakeCliOptions {
 
   /** 是否开启沉浸式头部，默认为 false 不开启 ƒ*/
   transparent: boolean;
+
+  /** 调试模式，会输出更多日志 */
+  debug: boolean;
 }
 
 export interface PakeAppOptions extends PakeCliOptions {

package/bin/utils/shell.ts

@@ -1,12 +1,13 @@
-import shelljs from 'shelljs';
+import shelljs from "shelljs";
+
 export function shellExec(command: string) {
   return new Promise<number>((resolve, reject) => {
-    shelljs.exec(command, { async: true, silent: false}, (code) => {
-			if (code === 0) {
-				resolve(0);
-			} else {
-				reject(new Error(`${code}`));
-			}
-		});
+    shelljs.exec(command, { async: true, silent: false }, (code) => {
+      if (code === 0) {
+        resolve(0);
+      } else {
+        reject(new Error(`${code}`));
+      }
+    });
   });
 }