puter-cli 1.1.3 → 1.1.5

package/README.md

@@ -148,7 +148,7 @@ P.S. Please check the help command `help apps` for more details about any argume
 
 - **Create Application**: Create a new application.
 ```bash
-  puter app:create <name> [<remote_dir>] [--description=<description>] [--url=<url>]
+  puter app:create <name> [<directory>] [--description="My App Description"] [--url=<url>]
 ```
 P.S. By default a new `index.html` with basic content will be created, but you can set a directory when you create a new application as follows: `app:create nameOfApp ./appDir`, so all files will be copied to the `AppData` directoy, you can then update your app using `app:update <name> <remote_dir>`. This command will attempt to create a subdomain with a random `uid` prefixed with the name of the app.
 
@@ -170,7 +170,7 @@ The static sites are served from the selected directory (or the current director
 
 - **Deploy Site**: Deploy a static website from a directory.
 ```bash
-  puter site:create <dir> [--subdomain=<name>]
+  puter site:create <app_name> [<dir>] [--subdomain=<name>]
 ```
 P.S. If the subdomain already exists, it will generate a new random one can set your own subdomain using `--subdomain` argument.
 

package/bin/index.js

@@ -5,7 +5,6 @@ import { init } from '../commands/init.js';
 import { startShell } from '../commands/shell.js';
 import { PROJECT_NAME, getLatestVersion } from '../commands/commons.js';
 
-
 async function main() {
   const { version } = await getLatestVersion(PROJECT_NAME);
 
@@ -35,10 +34,32 @@ async function main() {
     .description('Start interactive shell')
     .action(startShell);
 
+
+  // App commands
+  program
+    .command('app:create <name>')
+    .description('Create a new Puter application')
+    .argument('<name>', 'Name of the application')
+    .argument('[directory]', 'Local directory path')
+    .option('-d, --description <description>', 'Application description')
+    .option('-u, --url <url>', 'Application URL', 'https://dev-center.puter.com/coming-soon.html')
+    .action(async (name, directory, options) => {
+      try {
+        await createApp({
+          name,
+          directory: directory || '',
+          description: options.description || '',
+          url: options.url
+        });
+      } catch (error) {
+        console.error(chalk.red(error.message));
+      }
+    });
+
   if (process.argv.length === 2) {
     startShell();
   } else {
-    program.parse();
+    program.parse(process.argv);
   }
 }
 

package/commands/apps.js

@@ -8,6 +8,7 @@ import { createSubdomain, getSubdomains } from './subdomains.js';
 import { deleteSite } from './sites.js';
 import { copyFile, createFile, listRemoteFiles, pathExists, removeFileOrDirectory } from './files.js';
 import { getCurrentDirectory } from './auth.js';
+import crypto from './crypto.js';
 
 /**
  * List all apps
@@ -125,25 +126,28 @@ export async function appInfo(args = []) {
 /**
  * Create a new web application
  * @param {string} name The name of the App
+ * @param {string} directory Optional directory path
  * @param {string} description A description of the App
  * @param {string} url A default coming-soon URL
- * @returns Output JSON data
+ * @returns {Promise<Object>} Output JSON data
  */
-export async function createApp(args = []) {
-    if (args.length < 1 || !isValidAppName(args[0])) {
-        console.log(chalk.red('Usage: app:create <valid_name_app> [<remote_dir>] [--description=<description>] [--url=<url>]'));
-        console.log(chalk.yellow('Example: app:create myapp'));
-        console.log(chalk.yellow('Example: app:create myapp ./myapp'));
-        console.log(chalk.yellow('Example: app:create myapp --description=myapp'));
-        return;
+export async function createApp(args) {
+    const name = args.name; // App name (required)
+    console.log(args);
+    if (!isValidAppName(name)) {
+        throw new Error('Invalid application name');
     }
-    const name = args[0]; // App name (required)
     // Use the default home page if the root directory if none specified
-    const localDir = (args[1] && !args[1].startsWith('--'))? resolvePath(getCurrentDirectory(), args[1]):'';
-    const description = (args.find(arg => arg.toLocaleLowerCase().startsWith('--description='))?.split('=')[1]) || ''; // Optional description
-    const url = (args.find(arg => arg.toLocaleLowerCase().startsWith('--url='))?.split('=')[1]) || 'https://dev-center.puter.com/coming-soon.html'; // Optional url
+    const localDir = args.directory ? resolvePath(getCurrentDirectory(), args.directory) : '';
+    // Optional description
+    const description = args.description || '';
+    const url = args.url || '';
+
+    console.log(chalk.green(`Creating app "${name}"...`));
+    console.log(chalk.dim(`Directory: ${localDir || '[default]'}`));
+    console.log(chalk.dim(`Description: ${description}`));
+    console.log(chalk.dim(`URL: ${url}`));
 
-    console.log(chalk.green(`Creating app: "${chalk.dim(name)}"...\n`));
     try {
         // Step 1: Create the app
         const createAppResponse = await fetch(`${API_BASE}/drivers/call`, {
@@ -379,7 +383,7 @@ export async function deleteApp(name) {
         const readData = await readResponse.json();
 
         if (!readData.success || !readData.result) {
-            console.log(chalk.log(`App "${chalk.red(name)}" not found.`));
+            console.log(chalk.red(`App "${chalk.bold(name)}" not found.`));
             return false;
         }
 

package/commands/crypto.js

@@ -0,0 +1,176 @@
+import { v4 as uuidv4 } from 'uuid';
+import { TextEncoder } from 'util';
+
+class Hash {
+  constructor(algorithm) {
+    this.algorithm = algorithm;
+    this.data = [];
+  }
+
+  update(data) {
+    if (typeof data === 'string') {
+      const encoder = new TextEncoder();
+      data = encoder.encode(data);
+    }
+    this.data.push(Buffer.from(data));
+    return this;
+  }
+
+  async digest(encoding = 'hex') {
+    const concatenatedData = Buffer.concat(this.data);
+    const hashBuffer = await crypto.subtle.digest(
+      this.algorithm.toUpperCase(),
+      concatenatedData
+    );
+    const hashArray = Array.from(new Uint8Array(hashBuffer));
+    
+    if (encoding === 'buffer') {
+      return Buffer.from(hashArray);
+    }
+    
+    const hashHex = hashArray
+      .map(byte => byte.toString(16).padStart(2, '0'))
+      .join('');
+      
+    if (encoding === 'hex') return hashHex;
+    if (encoding === 'base64') return Buffer.from(hashHex, 'hex').toString('base64');
+    
+    throw new Error(`Unsupported encoding: ${encoding}`);
+  }
+}
+
+class Hmac {
+  constructor(algorithm, key) {
+    this.algorithm = algorithm;
+    this.key = typeof key === 'string' ? Buffer.from(key) : key;
+    this.data = [];
+  }
+
+  update(data) {
+    if (typeof data === 'string') {
+      const encoder = new TextEncoder();
+      data = encoder.encode(data);
+    }
+    this.data.push(Buffer.from(data));
+    return this;
+  }
+
+  async digest(encoding = 'hex') {
+    const concatenatedData = Buffer.concat(this.data);
+    const key = await crypto.subtle.importKey(
+      'raw',
+      this.key,
+      { name: 'HMAC', hash: { name: this.algorithm.toUpperCase() } },
+      false,
+      ['sign']
+    );
+    
+    const signature = await crypto.subtle.sign(
+      'HMAC',
+      key,
+      concatenatedData
+    );
+    
+    const hashArray = Array.from(new Uint8Array(signature));
+    
+    if (encoding === 'buffer') {
+      return Buffer.from(hashArray);
+    }
+    
+    const hashHex = hashArray
+      .map(byte => byte.toString(16).padStart(2, '0'))
+      .join('');
+      
+    if (encoding === 'hex') return hashHex;
+    if (encoding === 'base64') return Buffer.from(hashHex, 'hex').toString('base64');
+    
+    throw new Error(`Unsupported encoding: ${encoding}`);
+  }
+}
+
+const randomBytes = (size) => {
+  const array = new Uint8Array(size);
+  crypto.getRandomValues(array);
+  return Buffer.from(array);
+};
+
+const createHash = (algorithm) => {
+  return new Hash(algorithm);
+};
+
+const createHmac = (algorithm, key) => {
+  return new Hmac(algorithm, key);
+};
+
+const randomUUID = () => {
+  return uuidv4();
+};
+
+const scrypt = async (password, salt, keylen, options = {}) => {
+  const encoder = new TextEncoder();
+  const passwordBuffer = encoder.encode(password);
+  const saltBuffer = encoder.encode(salt);
+  
+  const N = options.N || 16384;
+  const r = options.r || 8;
+  const p = options.p || 1;
+  
+  const key = await crypto.subtle.importKey(
+    'raw',
+    passwordBuffer,
+    'PBKDF2',
+    false,
+    ['deriveBits']
+  );
+  
+  const derivedKey = await crypto.subtle.deriveBits(
+    {
+      name: 'PBKDF2',
+      salt: saltBuffer,
+      iterations: N * r * p,
+      hash: 'SHA-256'
+    },
+    key,
+    keylen * 8
+  );
+  
+  return Buffer.from(derivedKey);
+};
+
+const pbkdf2 = async (password, salt, iterations, keylen, digest) => {
+  const encoder = new TextEncoder();
+  const passwordBuffer = encoder.encode(password);
+  const saltBuffer = encoder.encode(salt);
+  
+  const key = await crypto.subtle.importKey(
+    'raw',
+    passwordBuffer,
+    'PBKDF2',
+    false,
+    ['deriveBits']
+  );
+  
+  const derivedKey = await crypto.subtle.deriveBits(
+    {
+      name: 'PBKDF2',
+      salt: saltBuffer,
+      iterations,
+      hash: digest.toUpperCase()
+    },
+    key,
+    keylen * 8
+  );
+  
+  return Buffer.from(derivedKey);
+};
+
+export default {
+  createHash,
+  createHmac,
+  randomBytes,
+  randomUUID,
+  scrypt,
+  pbkdf2,
+  Hash,
+  Hmac
+};

package/commands/executor.js

@@ -1,5 +1,4 @@
 import chalk from 'chalk';
-import ora from 'ora';
 import Conf from 'conf';
 import { listApps, appInfo, createApp, updateApp, deleteApp } from './apps.js';
 import { listSites, createSite, deleteSite, infoSite } from './sites.js';
@@ -11,6 +10,7 @@ import { getUserInfo, getUsageInfo } from './auth.js';
 import { PROJECT_NAME, API_BASE, getHeaders } from './commons.js';
 import inquirer from 'inquirer';
 import { exec } from 'node:child_process';
+import { parseArgs } from './utils.js';
 
 const config = new Conf({ projectName: PROJECT_NAME });
 
@@ -37,12 +37,28 @@ const commands = {
     });
   },
   app: appInfo,
-  'app:create': async (args) => {
-    if (args.length < 1) {
-        console.log(chalk.red('Usage: app:create <name> [<remote_dir>] [--description=<description>] [--url=<url>]'));
+  'app:create': async (rawArgs) => {
+    try {
+      const args = parseArgs(rawArgs.join(' '));
+      // Consider using explicit argument definition if necessary
+      // const args = parseArgs(rawArgs.join(' '), {string: ['description', 'url'],
+      //   alias: { d: 'description', u: 'url', },
+      // });
+
+      if (!args.length < 1) {
+        console.log(chalk.red('Usage: app:create <name> [directory] [--description="My App Description"] [--url=app-url]'));
         return;
+      }
+
+      await createApp({
+        name: args._[0],
+        directory: args._[1] || '',
+        description: args.description || '',
+        url: args.url || 'https://dev-center.puter.com/coming-soon.html'
+      });
+    } catch (error) {
+      console.error(chalk.red(error.message));
     }
-    await createApp(args);
   },
   'app:update': async (args) => {
     if (args.length < 1) {
@@ -51,13 +67,20 @@ const commands = {
     }
     await updateApp(args);
   },
-  'app:delete': async (args) => {
+  'app:delete': async (rawArgs) => {
+    const args = parseArgs(rawArgs.join(' '), {
+      string: ['_'],
+      boolean: ['f'],
+      configuration: {
+        'populate--': true
+      }
+    });
     if (args.length < 1) {
         console.log(chalk.red('Usage: app:delete <name>'));
         return;
     }
-    const name = args.find(arg => arg !=='-f')
-    const force = args.some(arg => arg =='-f')? true: false;
+    const name = args._[0];
+    const force = !!args.f;
 
     if (!force){
       const { confirm } = await inquirer.prompt([
@@ -144,6 +167,7 @@ export async function execCommand(input) {
  * @param {string} [command] - The command to display help for.
  */
 function showHelp(command) {
+  // Consider using `program.helpInformation()` function for global "help" command...
   const commandHelp = {
     help: `
       ${chalk.cyan('help [command]')}
@@ -187,9 +211,9 @@ function showHelp(command) {
       Example: app myapp
     `,
     'app:create': `
-      ${chalk.cyan('app:create <name> [url]')}
+      ${chalk.cyan('app:create <name> [<remote_dir>] [--description="<description>"] [--url=<url>]')}
       Create a new app.
-      Example: app:create myapp https://example.com
+      Example: app:create myapp https://myapp.puter.site
     `,
     'app:update': `
       ${chalk.cyan('app:update <name> [dir]')}
@@ -279,9 +303,9 @@ function showHelp(command) {
       Example: site:delete sd-123456
     `,
     'site:create': `
-      ${chalk.cyan('site:create <dir> [--subdomain=<name>]')}
+      ${chalk.cyan('site:create <app_name> [<dir>] [--subdomain=<name>]')}
       Create a static website from directory.
-      Example: site:create /path/to/dir --subdomain=myapp
+      Example: site:create mywebsite /path/to/dir --subdomain=mywebsite
     `,
     '!': `
       ${chalk.cyan('!<command>')}

package/commands/files.js

@@ -11,6 +11,7 @@ import { formatDate, formatDateTime, formatSize } from './utils.js';
 import inquirer from 'inquirer';
 import { getAuthToken, getCurrentDirectory, getCurrentUserName } from './auth.js';
 import { updatePrompt } from './shell.js';
+import crypto from './crypto.js';
 
 const config = new Conf({ projectName: PROJECT_NAME });
 

package/commands/sites.js

@@ -153,7 +153,7 @@ export async function infoSite(args = []) {
     // Use the current directory as the root directory if none specified
     const remoteDir = resolvePath(getCurrentDirectory(), (args[1] && !args[1].startsWith('--'))?args[1]:'.');
   
-    console.log(chalk.green(`Creating site "${appName}" from "${remoteDir}"...\n`));
+    console.log(chalk.dim(`Creating site ${chalk.green(appName)} from: ${chalk.green(remoteDir)}...\n`));
     try {
         // Step 1: Determine the subdomain
         let subdomain;
@@ -182,7 +182,7 @@ export async function infoSite(args = []) {
                 } else {
                     console.log(chalk.yellow(`However, It's linked to different directory at: ${subdomainObj.root_dir?.path}`));
                     console.log(chalk.cyan(`We'll try to unlink this subdomain from that directory...`));
-                    const result = await deleteSubdomain(subdomainObj.uid);
+                    const result = await deleteSubdomain(subdomainObj?.uid);
                     if (result) {
                         console.log(chalk.green('Looks like this subdomain is free again, please try again.'));
                         return;
@@ -205,8 +205,8 @@ export async function infoSite(args = []) {
             return;
         }
   
-        console.log(chalk.green(`App "${chalk.red(appName)}" created successfully at:`));
-        console.log(chalk.dim(`https://${site.subdomain}.puter.site`));
+        console.log(chalk.green(`App ${chalk.dim(appName)} created successfully and accessible at:`));
+        console.log(chalk.cyan(`https://${site.subdomain}.puter.site`));
     } catch (error) {
         console.error(chalk.red('Failed to create site.'));
         console.error(chalk.red(`Error: ${error.message}`));

package/commands/utils.js

@@ -1,4 +1,5 @@
 import chalk from 'chalk';
+import yargsParser from 'yargs-parser';
 
 /**
  * Convert "2024-10-07T15:03:53.000Z" to "10/7/2024, 15:03:53"
@@ -89,4 +90,14 @@ export function displayNonNullValues(data) {
     });
     console.log(chalk.cyan('-'.repeat(maxKeyLength*3)));
     console.log(chalk.cyan(`You have ${chalk.green(tableData.length)} key/value pair(s).`));
-  }
+  }
+
+  /**
+ * Parse command line arguments including quoted strings
+ * @param {string} input Raw command line input
+ * @returns {Object} Parsed arguments
+ */
+export function parseArgs(input, options = {}) {
+  const result = yargsParser(input, options);
+  return result;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "puter-cli",
-  "version": "1.1.3",
+  "version": "1.1.5",
   "description": "Command line interface for Puter cloud platform",
   "main": "index.js",
   "bin": {
@@ -26,14 +26,16 @@
   "dependencies": {
     "chalk": "^5.3.0",
     "cli-table3": "^0.6.5",
-    "commander": "^11.1.0",
+    "commander": "^13.0.0",
     "conf": "^12.0.0",
     "cross-spawn": "^7.0.3",
     "glob": "^11.0.0",
     "inquirer": "^9.2.12",
     "minimatch": "^10.0.1",
     "node-fetch": "^3.3.2",
-    "ora": "^8.0.1"
+    "ora": "^8.0.1",
+    "uuid": "^11.0.5",
+    "yargs-parser": "^21.1.1"
   },
   "devDependencies": {
     "vitest": "^2.1.8"