Merge pull request #37 from andreban/npx

Enables running llama-pack using `npx`

Author: andreban

src/bin/llama-pack.js bin/llama-pack.js

@@ -18,4 +18,4 @@
 
 'use strict';
 
-require('..')();
+require('../dist')();

package.json

@@ -2,14 +2,12 @@
   "name": "llama-pack",
   "version": "0.1.0",
   "description": "CLI tool to Generate TWA projects from a Web Manifest",
-  "bin": {
-    "outside": "dist/bin/llama-pack"
-  },
+  "bin": "bin/llama-pack.js",
   "scripts": {
-    "llama-pack": "node dist/bin/llama-pack",
+    "postinstall": "tsc",
     "build": "tsc",
     "lint": "eslint .",
-    "test": "jasmine --config=jasmine.json"
+    "test": "tsc && jasmine --config=jasmine.json"
   },
   "main": "dist/index.js",
   "keywords": [
@@ -19,6 +17,10 @@
     "progressive-web-apps",
     "android"
   ],
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/GoogleChromeLabs/llama-pack.git"
+  },
   "author": "",
   "license": "Apache-2.0",
   "dependencies": {
@@ -31,13 +33,13 @@
     "node-fetch": "^2.6.0",
     "prompt": "^1.0.0",
     "tar": "^5.0.5",
-    "valid-url": "^1.0.9"
+    "valid-url": "^1.0.9",
+    "@types/node": "^12.12.12",    
+    "typescript": "^3.7.2"    
   },
   "devDependencies": {
-    "@types/node": "^12.12.12",
     "eslint": "^6.6.0",
     "eslint-config-google": "^0.14.0",
-    "jasmine": "^3.5.0",
-    "typescript": "^3.7.2"
+    "jasmine": "^3.5.0"
   }
 }

src/cli/cmds/build.js

@@ -16,7 +16,8 @@
 
 'use strict';
 
-const {androidSdkTools} = require('../../lib/androidSdk');
+const AndroidSdkTools = require('../../lib/androidSdk/AndroidSdkTools');
+const JdkHelper = require('../../lib/jdk/JdkHelper');
 const GradleWraper = require('../../lib/GradleWrapper');
 const TwaManifest = require('../../lib/TwaManifest');
 
@@ -25,7 +26,10 @@ const prompt = require('prompt');
 const colors = require('colors/safe');
 prompt.get = promisify(prompt.get);
 
-async function build() {
+async function build(_, config) {
+  const jdkHelper = new JdkHelper(process, config);
+  const androidSdkTools = new AndroidSdkTools(process, config, jdkHelper);
+
   if (!await androidSdkTools.checkBuildTools()) {
     console.log('Installing Android Build Tools. Please, read and accept the license agreement');
     await androidSdkTools.installBuildTools();

src/cli/cmds/init.js

@@ -19,7 +19,8 @@
 const colorString = require('color-string');
 const TwaGenerator = require('../../lib/TwaGenerator');
 const TwaManifest = require('../../lib/TwaManifest');
-const {keytool} = require('../../lib/jdk');
+const KeyTool = require('../../lib/jdk/KeyTool');
+const JdkHelper = require('../../lib/jdk/JdkHelper');
 const {promisify} = require('util');
 const colors = require('colors/safe');
 const prompt = require('prompt');
@@ -117,7 +118,7 @@ async function confirmTwaConfig(twaManifest) {
   return twaManifest;
 }
 
-async function init(args) {
+async function init(args, config) {
   console.log('Fetching Manifest: ', args.manifest);
   try {
     let twaManifest = await TwaManifest.fromWebManifest(args.manifest);
@@ -126,20 +127,23 @@ async function init(args) {
     const targetDirectory = args.directory || process.cwd();
     await twaManifest.saveToFile('./twa-manifest.json');
     await twaGenerator.createTwaProject(targetDirectory, twaManifest);
-    await createSigningKey(twaManifest);
+    await createSigningKey(twaManifest, config);
     return true;
   } catch (e) {
     console.error('Error Genearating TWA', e);
     return false;
   }
 }
 
-async function createSigningKey(twaManifest) {
+async function createSigningKey(twaManifest, config) {
   // Signing Key already exists. Skip creation.
   if (fs.existsSync(twaManifest.signingKey.path)) {
     return;
   }
 
+  const jdkHelper = new JdkHelper(process, config);
+  const keytool = new KeyTool(jdkHelper);
+
   prompt.start();
 
   // Ask user if they want to create a signing key now.
@@ -157,7 +161,7 @@ async function createSigningKey(twaManifest) {
     return;
   }
 
-  await keytool.createSigningKey(
+  await keytool.createSigningKeyIfNeeded(
       twaManifest.signingKey.path,
       twaManifest.signingKey.alias,
   );

src/cli/index.js

@@ -17,22 +17,23 @@
 'use strict';
 
 const minimist = require('minimist');
-const config = require('../lib/Config');
+const Config = require('../lib/Config');
 
 class Cli {
   async run(args) {
-    await config.check();
+    const config = await Config.loadOrCreate();
+
     args = minimist(args);
     const command = args._[0] || 'help';
     switch (command) {
       case 'help':
-        return await require('./cmds/help')(args);
+        return await require('./cmds/help')(args, config);
       case 'init':
-        return await require('./cmds/init')(args);
+        return await require('./cmds/init')(args, config);
       case 'update':
-        return await require('./cmds/update')(args);
+        return await require('./cmds/update')(args, config);
       case 'build':
-        return await require('./cmds/build')(args);
+        return await require('./cmds/build')(args, config);
       default:
         throw new Error(`"${command}" is not a valid command!`);
     }

src/lib/Config.js

@@ -18,9 +18,50 @@
 
 const {promisify} = require('util');
 const fs = require('fs');
+const homedir = require('os').homedir();
+const path = require('path');
 const fileExists = promisify(fs.exists);
+const prompt = require('prompt');
+prompt.get = promisify(prompt.get);
+
+const CONFIG_FILE_NAME = path.join(homedir, '/.llama-pack/llama-pack-config.json');
 
 class Config {
+  async loadConfig() {
+    if (!await fileExists(CONFIG_FILE_NAME)) {
+      return false;
+    }
+    const config = JSON.parse(await fs.promises.readFile(CONFIG_FILE_NAME));
+    Object.assign(this, config);
+    return true;
+  }
+
+  async saveConfig() {
+    await fs.promises.mkdir(path.join(homedir, '/.llama-pack'));
+    await fs.promises.writeFile(CONFIG_FILE_NAME, JSON.stringify(this));
+  }
+
+  async createConfig() {
+    const schema = {
+      properties: {
+        jdkPath: {
+          name: 'jdkPath',
+          description: 'Path to the JDK:',
+          required: true,
+          conform: fs.existsSync,
+        },
+        androidSdkPath: {
+          name: 'androidSdkPath',
+          description: 'Path to the Android SDK:',
+          required: true,
+          conform: fs.existsSync,
+        },
+      },
+    };
+    const result = await prompt.get(schema);
+    Object.assign(this, result);
+  }
+
   async check() {
     if (!await fileExists(this.jdkPath)) {
       throw new Error(`${this.jdkPath} does not exist. Check the jdkPath on your config`);
@@ -30,10 +71,16 @@ class Config {
           `${this.androidSdkPath} does not exist. Check the androidSdkPath on your config`);
     };
   }
+
+  static async loadOrCreate() {
+    const config = new Config();
+    const configExists = await config.loadConfig();
+    if (!configExists) {
+      await config.createConfig();
+      await config.saveConfig();
+    }
+    return config;
+  }
 }
 
-module.exports = (() => {
-  const config = new Config();
-  Object.assign(config, require('../llama-pack-config'));
-  return config;
-})();
+module.exports = Config;

src/lib/TwaGenerator.js

@@ -158,15 +158,16 @@ class TwaGenerator {
     };
 
     console.log('Generating Android Project files:');
-    const templateDirectory = path.join(__dirname, '../template_project');
+    console.log(__dirname);
+    const templateDirectory = path.join(__dirname, '../../template_project');
 
     const copyFileList = new Set(COPY_FILE_LIST);
     if (!args.maskableIconUrl) {
       DELETE_FILE_LIST.forEach((file) => copyFileList.delete(file));
     }
 
     // Copy Project Files
-    await this._copyStaticFiles(templateDirectory, targetDirectory, [...copyFileList]);
+    await this._copyStaticFiles(templateDirectory, targetDirectory, Array.from(copyFileList));
 
     // Generate templated files
     await this._applyTemplates(templateDirectory, targetDirectory, TEMPLATE_FILE_LIST, args);