v2

.eslintrc

@@ -0,0 +1,7 @@
+{
+	"rules": {
+		"max-depth": "off",
+		"no-loop-func": "off",
+		"promise/always-return": "off"
+	}
+}

.npmignore

@@ -12,6 +12,7 @@ junit.xml
 node_modules
 npm-debug.log
 yarn-error.log
+yarn.lock
 /src
 /test
 yarn.lock

CHANGELOG.md

@@ -1,3 +1,48 @@
+# v2.0.0
+
+ * BREAKING CHANGE(config): `config` command no longer returns status as apart of JSON output.
+ * BREAKING CHANGE(config): `config` command does not return current value when doing a `set`,
+   `push`, or `unshift`.
+ * BREAKING CHANGE(config): `config list` command no longer supports filtering, use `config get`
+   instead.
+ * BREAKING CHANGE(config): Write operations such as `set` return `"OK"` instead of `"Saved"`.
+ * BREAKING CHANGE: Dropped support for appcd plugin API version 1.0 and require API version 2.0,
+   which was initially introduced in `appcd@4.0.0`.
+ * feat(project): Project service with endpoints for `new`, `build`, `run`, `clean`, and info.
+   [(DAEMON-26)](https://jira.appcelerator.org/browse/DAEMON-26)
+   [(DAEMON-21)](https://jira.appcelerator.org/browse/DAEMON-21)
+ * feat(cli): Added `new` command. [(DAEMON-301)](https://jira.appcelerator.org/browse/DAEMON-301)
+ * feat(cli): Added `clean` command.
+   [(DAEMON-327)](https://jira.appcelerator.org/browse/DAEMON-327)
+ * feat(cli): Added `build` and `run` commands.
+   [(DAEMON-16)](https://jira.appcelerator.org/browse/DAEMON-16)
+ * feat(cli): Added auth commands `login`, `logout`, `whoami`, and `switch`.
+   [(DAEMON-300)](https://jira.appcelerator.org/browse/DAEMON-300)
+ * feat(legacy): Legacy Titanium CLI bootstrap for loading a Titanium SDK and running a `build` or
+   `clean` command. For differences between this and Titanium CLI v5, see the
+   [readme](https://github.com/appcelerator/appcd-plugin-titanium/blob/master/src/legacy/README.md).
+ * feat(legacy): Added support for remote encryption.
+ * feat(cli:sdk): Added aliases to sdk commands (i, ls, rm).
+ * feat(sdk): Added `find` endpoint to SDK service to get info about an installed Titanium SDK.
+ * feat(sdk): Added progress bars during SDK installation.
+ * feat(module): Added `/module/check-downloads` endpoint.
+ * feat(module): Added `/module/install` endpoint.
+ * feat(module): Added automatic checking of new Titanium module downloads.
+ * feat: Support for Titanium-specific telemetry.
+ * feat: Added HTTP proxy support.
+ * feat: Adopted appcd 4.x new `appcd.config.*`.
+ * feat(cli): Added `register` command to replace old --import flag.
+ * feat(project): Added `/project/register` endpoint.
+ * feat(amplify): Upgraded from AMPLIFY appcd plugin v1.x to v2.x.
+ * refactor: Updated to latest cli-kit with support for the new client/server architecture.
+ * refactor: Updated `config` command actions to be subcommands with improved help output.
+ * fix(legacy): Improved logging of uncaught exceptions and rejections.
+ * chore: Removed `source-map-support` as `appcd-plugin` already hooks it up.
+ * chore: Added plugin API version 2.x.
+ * chore: Transpile for Node 10 instead of Node 8. Not a breaking change as appcd has always
+   guaranteed Node 10 or newer.
+ * chore: Updated dependencies.
+
 # v1.8.2 (Jan 26, 2021)
 
  * refactor: Updated to cli-kit@1.9.3 adding support for the new client/server architecture.

README.md

@@ -2,7 +2,10 @@
 
 Titanium SDK services for the Appc Daemon.
 
-## Services
+> This plugin requires appcd plugin API version 2.x which was introduced in appcd@4.0.0 and the
+> AMPLIFY appcd plugin v2.x.
+
+## Service Endpoints
 
  * [SDKs](#SDKs)
    - [`/sdk/list/installed`](#sdklistinstalled)
@@ -131,6 +134,24 @@ $ appcd exec /titanium/latest/sdk/list/releases
 }
 ```
 
+### `/sdk/find/:name?`
+
+Returns information about the specified installed SDK.
+
+#### CLI Usage
+
+```sh
+$ appcd exec /titanium/latest/sdk/find
+```
+
+```sh
+$ appcd exec /titanium/latest/sdk/find/latest
+```
+
+```sh
+$ appcd exec /titanium/latest/sdk/find/9.0.0.GA
+```
+
 ### `/sdk/list/branches`
 
 Returns a list of continuous integration branches and which one is the default.

conf/config.json

@@ -0,0 +1,7 @@
+{
+	"home": "~/.axway/titanium",
+	"searchPaths": [],
+	"telemetry": {
+		"app": "de93eb9e-e53c-4f3a-9222-9e0d124950e5"
+	}
+}

package.json

@@ -16,20 +16,35 @@
     "test": "gulp test"
   },
   "dependencies": {
+    "@axway/amplify-request": "^2.1.1",
+    "@titanium-sdk/node-is-platform-guid": "^1.0.2",
+    "appc-security": "^0.1.0",
+    "appcd-fs": "^2.0.4",
+    "appcd-path": "^2.0.5",
+    "appcd-util": "^3.1.3",
     "chalk": "^4.1.0",
     "cli-kit": "^1.9.3",
+    "colors": "^1.4.0",
     "dateformat": "^4.5.0",
+    "enquirer": "^2.3.6",
+    "figures": "^3.2.0",
     "filesize": "^6.1.0",
+    "form-data": "^3.0.0",
     "fs-extra": "^9.1.0",
     "gawk": "^5.0.0",
     "get-port": "^5.1.1",
-    "node-pty-prebuilt-multiarch": "^0.9.0",
+    "global-modules": "^2.0.0",
+    "node-forge": "^0.10.0",
+    "open": "^7.3.1",
     "pluralize": "^8.0.0",
-    "prompts": "^2.4.0",
+    "progress": "^2.0.3",
+    "semver": "^7.3.4",
+    "simple-plist": "^1.1.1",
     "sort-object-keys": "^1.1.3",
-    "source-map-support": "^0.5.19",
+    "tar": "^6.1.0",
     "titaniumlib": "^3.0.1",
     "tmp": "^0.2.1",
+    "v8-compile-cache": "^2.2.0",
     "yauzl": "^2.10.0"
   },
   "devDependencies": {
@@ -39,8 +54,8 @@
   "bugs": "https://github.com/appcelerator/appcd-plugin-titanium/issues",
   "repository": "https://github.com/appcelerator/appcd-plugin-titanium",
   "appcd": {
-    "apiVersion": "1.x || 2.x",
-    "config": "./conf/config.js",
+    "apiVersion": "2.x",
+    "config": "./conf/config.json",
     "name": "titanium",
     "type": "external"
   },

src/cli/auth/login.js

@@ -0,0 +1,89 @@
+import { prompt } from '../../lib/prompt';
+
+const { alert, highlight } = appcd.logger.styles;
+
+/**
+ * Performs a login.
+ *
+ * @param {Object} opts - Various options.
+ * @param {Array.<String>} opts.argv - The parsed command line arguments.
+ * @param {Console} opts.console - The console instance to write to.
+ * @param {Function} opts.setExitCode - A function to set the exit code.
+ * @param {Terminal} opts.terminal - A cli-kit Terminal instance.
+ * @returns {Object} The account info.
+ */
+export async function login({ argv, console, setExitCode, terminal }) {
+	const data = {
+		baseUrl:      argv.baseUrl,
+		clientId:     argv.clientId,
+		clientSecret: argv.clientSecret,
+		env:          argv.env,
+		force:        argv.force,
+		password:     argv.password,
+		secretFile:   argv.secretFile,
+		username:     argv.username
+	};
+
+	if (argv.username !== undefined) {
+		const questions = [];
+
+		if (!argv.username || typeof argv.username !== 'string') {
+			questions.push({
+				type:    'input',
+				name:    'username',
+				message: 'Username:',
+				validate(s) {
+					return !!s || 'Please enter your username';
+				}
+			});
+		}
+
+		if (!argv.password || typeof argv.password !== 'string') {
+			questions.push({
+				type:    'password',
+				name:    'password',
+				message: 'Password:',
+				validate(s) {
+					return !!s || 'Please enter your password';
+				}
+			});
+		}
+
+		if (questions.length && argv.json) {
+			throw new Error('--username and --password are required when --json is set');
+		}
+
+		Object.assign(data, await prompt(questions, terminal));
+
+		if (!argv.json) {
+			// add a newline after prompting has completed
+			console.log();
+		}
+	}
+
+	try {
+		const { response: account } = await appcd.call('/amplify/2.x/auth/login', { data });
+		try {
+			await appcd.call('/module/check-downloads', { data: { accountName: account.name } });
+		} catch (err) {
+			// squelch
+		}
+		return account;
+	} catch (err) {
+		if (err.code === 'EAUTHENTICATED') {
+			const { account } = err;
+			if (argv.json) {
+				console.log(JSON.stringify(account, null, 2));
+			} else {
+				console.log(`You are already logged into ${highlight(account.org.name)} as ${highlight(account.user.email || account.name)}.`);
+			}
+		} else if (err.code === 'ERR_AUTH_FAILED') {
+			console.error(alert(err.message));
+			setExitCode(1);
+		} else {
+			throw err;
+		}
+	}
+}
+
+export default login;

src/cli/cli-service.js

@@ -1,13 +1,16 @@
-import CLI, { snooplogg } from 'cli-kit';
+import CLI from 'cli-kit';
 import Dispatcher from 'appcd-dispatcher';
 import fs from 'fs';
 import getPort from 'get-port';
 import path from 'path';
 
-import { get } from 'appcd-util';
+import { isFile } from 'appcd-fs';
+import { loadOptions } from './run-legacy';
 import { parseVersion } from '../lib/util';
+// import { Tiapp } from 'titaniumlib';
 
-const { highlight } = snooplogg.styles;
+const { log } = appcd.logger('cli-service');
+const { highlight } = appcd.logger.styles;
 
 /**
  * Defines a service endpoint for defining, processing, and dispatching Titanium CLI commands.
@@ -16,11 +19,10 @@ export default class CLIService extends Dispatcher {
 	/**
 	 * Registers all of the endpoints.
 	 *
-	 * @param {Object} cfg - The Appc Daemon config object.
 	 * @returns {Promise}
 	 * @access public
 	 */
-	async activate(cfg) {
+	async activate() {
 		const pluginVersion = JSON.parse(fs.readFileSync(path.resolve(__dirname, '..', '..', 'package.json'))).version;
 
 		const cli = new CLI({
@@ -31,18 +33,61 @@ export default class CLIService extends Dispatcher {
 			help: true,
 			helpExitCode: 2,
 			name: 'titanium',
+			options: {
+				'--no-prompt': 'Disable interactive prompting'
+			},
+			serverMode: true,
+			styles: {
+				subheading(s) {
+					return `\n${String(s).toUpperCase()}`;
+				}
+			},
 			version: ({ data }) => parseVersion(data.userAgent)
 		});
 
+		// inject the titanium config into the command data object before parsing starts so that
+		// it's available to the command callback
+		cli.on('parse', ({ data }) => {
+			data.config = appcd.config.get('titanium');
+			data.pluginVersion = pluginVersion;
+		});
+
+		// we need to add platform specific options for the build/run help, so first we listen for
+		// the help command, then we add in the options before the help is generated
+		cli.on('exec', async ({ cmd, contexts, data }) => {
+			// we need the help command, the build/run command, and a cwd containing a tiapp
+			cmd = data?.cwd && cmd?.name === 'help' && contexts[1];
+
+			if (!cmd || (cmd.name !== 'build' && cmd.name !== 'run')) {
+				return;
+			}
+
+			const tiappFile = path.resolve(data.cwd, 'tiapp.xml');
+			if (!isFile(tiappFile)) {
+				return;
+			}
+
+			cmd.on('generateHelp', async ctx => {
+				const sdk = '9.0.3.GA'; // data.tiapp.get('sdk-version');
+				await loadOptions({ config: data.config, ctx, sdk });
+			});
+		});
+
+		// find an available port to listen on
 		const port = await getPort({
-			port: get(cfg, 'port', 1733)
+			port: appcd.config.get('port', 1733)
 		});
 
+		// start the cli-kit server
 		this.server = await cli.listen({ port });
 
-		this.register('/', () => ({
-			url: `ws://127.0.0.1:${port}`
-		}));
+		// register the discovery endpoint for the cli-kit server
+		this.register('/', () => {
+			log(`Returning CLI server URL: ${highlight(`ws://127.0.0.1:${port}`)}`);
+			return {
+				url: `ws://127.0.0.1:${port}`
+			};
+		});
 
 		this.register('/schema', ({ headers }) => cli.schema({
 			data: {
@@ -52,7 +97,7 @@ export default class CLIService extends Dispatcher {
 	}
 
 	/**
-	 * Perform any necessary cleanup.
+	 * Stop the CLI server.
 	 *
 	 * @returns {Promise}
 	 * @access public

src/cli/commands/add.js

@@ -0,0 +1,19 @@
+import { promptLoop } from '../../lib/prompt';
+
+export default {
+	desc: 'Add a component or service to a project',
+	options: {
+		'-d, --project-dir [path]': 'The directory containing the project; defaults to the current directory'
+	},
+	async action(ctx) {
+		await promptLoop({
+			ctx,
+			data: {
+				cwd: ctx.data.cwd,
+				...ctx.argv
+			},
+			path: '/project/add',
+			ns: 'cli:add'
+		});
+	}
+};