@myvillage/cli 1.10.0 → 1.10.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@myvillage/cli",
-  "version": "1.10.0",
+  "version": "1.10.2",
   "description": "MyVillageOS CLI for community developers",
   "type": "module",
   "bin": {

package/src/commands/deploy.js

@@ -1,11 +1,13 @@
-import { existsSync, readFileSync, writeFileSync, readdirSync } from 'fs';
-import { join, resolve, relative } from 'path';
+import { existsSync, readFileSync, writeFileSync, readdirSync, statSync } from 'fs';
+import { join, resolve, relative, extname } from 'path';
 import { execSync } from 'child_process';
 import chalk from 'chalk';
 import ora from 'ora';
+import axios from 'axios';
+import inquirer from 'inquirer';
 import { villageSpinner, brand } from '../utils/brand.js';
 import { isAuthenticated } from '../utils/auth.js';
-import { deployGame } from '../utils/api.js';
+import { deployGame, getGameUploadUrl, confirmGameUpload } from '../utils/api.js';
 
 function readPackageJson(dir) {
   const pkgPath = join(dir, 'package.json');
@@ -156,6 +158,13 @@ async function deployThreeJsGame(projectDir, pkg) {
     console.log(`  Status: ${formatStatus(result.status)}`);
     if (result.slug) console.log(brand.teal(`  Slug:    ${result.slug}`));
     if (result.gameId) console.log(brand.teal(`  Game ID: ${result.gameId}`));
+
+    // Prompt for thumbnail/banner images
+    const finalGameId = result.gameId || pkg.myvillage.gameId;
+    if (finalGameId) {
+      await promptForImages(finalGameId);
+    }
+
     console.log();
     console.log(brand.teal('  Run "myvillage status" to check the review status.'));
     console.log();
@@ -258,6 +267,13 @@ async function deployUnityGame(projectDir, mvConfig, options) {
     console.log(`  Platform: ${platform}`);
     if (result.slug) console.log(brand.teal(`  Slug:     ${result.slug}`));
     if (result.gameId) console.log(brand.teal(`  Game ID:  ${result.gameId}`));
+
+    // Prompt for thumbnail/banner images
+    const finalGameId = result.gameId || mvConfig.gameId;
+    if (finalGameId) {
+      await promptForImages(finalGameId);
+    }
+
     console.log();
     console.log(brand.teal('  Run "myvillage status" to check the review status.'));
     console.log();
@@ -274,6 +290,113 @@ async function deployUnityGame(projectDir, mvConfig, options) {
   }
 }
 
+// ── Image upload helpers ──
+
+const IMAGE_EXTS = ['.png', '.jpg', '.jpeg', '.webp', '.gif'];
+const IMAGE_CONTENT_TYPES = {
+  '.png': 'image/png',
+  '.jpg': 'image/jpeg',
+  '.jpeg': 'image/jpeg',
+  '.webp': 'image/webp',
+  '.gif': 'image/gif',
+};
+
+async function uploadImageAsset(gameId, filePath, assetType) {
+  const resolved = resolve(filePath);
+  if (!existsSync(resolved)) {
+    console.log(chalk.red(`  ✗ File not found: ${resolved}`));
+    return false;
+  }
+
+  const ext = extname(resolved).toLowerCase();
+  if (!IMAGE_EXTS.includes(ext)) {
+    console.log(chalk.red(`  ✗ Unsupported format "${ext}". Use: ${IMAGE_EXTS.join(', ')}`));
+    return false;
+  }
+
+  const contentType = IMAGE_CONTENT_TYPES[ext];
+  const fileSize = statSync(resolved).size;
+  const fileName = `${assetType.toLowerCase()}${ext}`;
+  const label = assetType.toLowerCase();
+
+  const spinner = villageSpinner(`Uploading ${label}...`).start();
+
+  try {
+    const urlResult = await getGameUploadUrl(gameId, {
+      fileName,
+      assetType,
+      contentType,
+      fileSize,
+    });
+
+    const fileBuffer = readFileSync(resolved);
+    await axios.put(urlResult.uploadUrl, fileBuffer, {
+      headers: { 'Content-Type': contentType },
+      maxBodyLength: Infinity,
+      maxContentLength: Infinity,
+    });
+
+    await confirmGameUpload(gameId, {
+      s3Key: urlResult.s3Key,
+      fileName,
+      assetType,
+      contentType,
+    });
+
+    spinner.succeed(`${label.charAt(0).toUpperCase() + label.slice(1)} uploaded!`);
+    return true;
+  } catch (err) {
+    const message = err.response?.data?.error || err.message;
+    spinner.fail(`${label} upload failed: ${message}`);
+    return false;
+  }
+}
+
+async function promptForImages(gameId) {
+  console.log();
+  const { addThumbnail } = await inquirer.prompt([{
+    type: 'confirm',
+    name: 'addThumbnail',
+    message: 'Upload a thumbnail image? (shown on game cards)',
+    default: false,
+  }]);
+
+  if (addThumbnail) {
+    const { thumbnailPath } = await inquirer.prompt([{
+      type: 'input',
+      name: 'thumbnailPath',
+      message: 'Path to thumbnail image:',
+      validate: (input) => {
+        if (!input.trim()) return 'Path is required.';
+        if (!existsSync(resolve(input.trim()))) return 'File not found.';
+        return true;
+      },
+    }]);
+    await uploadImageAsset(gameId, thumbnailPath.trim(), 'THUMBNAIL');
+  }
+
+  const { addBanner } = await inquirer.prompt([{
+    type: 'confirm',
+    name: 'addBanner',
+    message: 'Upload a banner image? (shown on featured displays)',
+    default: false,
+  }]);
+
+  if (addBanner) {
+    const { bannerPath } = await inquirer.prompt([{
+      type: 'input',
+      name: 'bannerPath',
+      message: 'Path to banner image:',
+      validate: (input) => {
+        if (!input.trim()) return 'Path is required.';
+        if (!existsSync(resolve(input.trim()))) return 'File not found.';
+        return true;
+      },
+    }]);
+    await uploadImageAsset(gameId, bannerPath.trim(), 'BANNER');
+  }
+}
+
 function formatStatus(status) {
   switch (status) {
     case 'SUBMITTED':

package/src/commands/game.js

@@ -511,6 +511,87 @@ export async function gameUploadThumbnailCommand(filePath) {
   }
 }
 
+// ── game upload-banner ──────────────────────────────
+
+export async function gameUploadBannerCommand(filePath) {
+  if (!isAuthenticated()) {
+    console.log(chalk.red('  ✗ Authentication required. Run \'myvillage login\' first.'));
+    return;
+  }
+
+  const gameId = getGameId();
+  if (!gameId) return;
+
+  const resolvedPath = resolve(filePath);
+
+  if (!existsSync(resolvedPath)) {
+    console.log(chalk.red(`  ✗ File not found: ${resolvedPath}`));
+    return;
+  }
+
+  const ext = extname(resolvedPath).toLowerCase();
+  const allowedExts = ['.png', '.jpg', '.jpeg', '.webp', '.gif'];
+  if (!allowedExts.includes(ext)) {
+    console.log(chalk.red(`  ✗ Unsupported image format "${ext}". Use: ${allowedExts.join(', ')}`));
+    return;
+  }
+
+  const contentTypes = {
+    '.png': 'image/png',
+    '.jpg': 'image/jpeg',
+    '.jpeg': 'image/jpeg',
+    '.webp': 'image/webp',
+    '.gif': 'image/gif',
+  };
+  const contentType = contentTypes[ext];
+  const fileSize = statSync(resolvedPath).size;
+  const fileName = `banner${ext}`;
+
+  const spinner = villageSpinner(`Uploading banner (${formatBytes(fileSize)})...`).start();
+
+  try {
+    // 1. Get presigned URL
+    const urlResult = await getGameUploadUrl(gameId, {
+      fileName,
+      assetType: 'BANNER',
+      contentType,
+      fileSize,
+    });
+
+    // 2. Upload to S3
+    spinner.text = chalk.yellow('Uploading to storage...');
+    const fileBuffer = readFileSync(resolvedPath);
+
+    await axios.put(urlResult.uploadUrl, fileBuffer, {
+      headers: { 'Content-Type': contentType },
+      maxBodyLength: Infinity,
+      maxContentLength: Infinity,
+      onUploadProgress: (progressEvent) => {
+        if (progressEvent.total) {
+          const pct = Math.round((progressEvent.loaded / progressEvent.total) * 100);
+          spinner.text = chalk.yellow(`Uploading banner — ${pct}%`);
+        }
+      },
+    });
+
+    // 3. Confirm
+    spinner.text = chalk.yellow('Confirming upload...');
+    await confirmGameUpload(gameId, {
+      s3Key: urlResult.s3Key,
+      fileName,
+      assetType: 'BANNER',
+      contentType,
+    });
+
+    spinner.succeed('Banner uploaded!');
+    console.log(brand.teal(`  S3 key: ${urlResult.s3Key}`));
+    console.log();
+  } catch (err) {
+    const message = err.response?.data?.error || err.message;
+    spinner.fail(`Banner upload failed: ${message}`);
+  }
+}
+
 // ── game submit ─────────────────────────────────────
 
 export async function gameSubmitCommand() {
@@ -584,6 +665,72 @@ export async function gameSubmitCommand() {
   }
 }
 
+// ── game draft (return to draft) ────────────────────
+
+export async function gameDraftCommand() {
+  if (!isAuthenticated()) {
+    console.log(chalk.red('  ✗ Authentication required. Run \'myvillage login\' first.'));
+    return;
+  }
+
+  const gameId = getGameId();
+  if (!gameId) return;
+
+  const checkSpinner = villageSpinner('Checking game status...').start();
+  let game;
+  try {
+    const result = await getGameDetail(gameId);
+    game = result.game;
+    checkSpinner.stop();
+  } catch (err) {
+    const message = err.response?.data?.error || err.message;
+    checkSpinner.fail(`Failed to fetch game: ${message}`);
+    return;
+  }
+
+  if (game.status === 'DRAFT') {
+    console.log(brand.teal(`\n  "${game.title}" is already in DRAFT status.\n`));
+    return;
+  }
+
+  if (game.status === 'PUBLISHED') {
+    console.log(chalk.red(`\n  ✗ "${game.title}" is PUBLISHED and cannot be returned to draft.\n`));
+    return;
+  }
+
+  console.log();
+  console.log(brand.gold(`  Return "${game.title}" to DRAFT?`));
+  console.log(brand.teal(`  Current status: ${game.status}`));
+  console.log(brand.teal('  This will withdraw the game from review so you can make changes.'));
+  console.log();
+
+  const { confirm } = await inquirer.prompt([{
+    type: 'confirm',
+    name: 'confirm',
+    message: 'Return to draft?',
+    default: true,
+  }]);
+
+  if (!confirm) {
+    console.log(brand.teal('\n  Cancelled.\n'));
+    return;
+  }
+
+  const spinner = villageSpinner('Updating status...').start();
+
+  try {
+    await updateGameMetadata(gameId, { status: 'DRAFT' });
+    spinner.succeed('Game returned to draft!');
+    console.log();
+    console.log(brand.green(`  ✓ "${game.title}" is now in DRAFT status.`));
+    console.log(brand.teal('  You can now upload assets, update metadata, and redeploy.'));
+    console.log();
+  } catch (err) {
+    const message = err.response?.data?.error || err.message;
+    spinner.fail(`Failed to update status: ${message}`);
+  }
+}
+
 // ── Helpers ───────────────────────────────────────────
 
 function getGameId() {

package/src/index.js

@@ -56,7 +56,9 @@ import {
 import {
   gameUpdateCommand,
   gameUploadThumbnailCommand,
+  gameUploadBannerCommand,
   gameSubmitCommand,
+  gameDraftCommand,
   gameMissionsInitCommand,
   gameMissionsSyncCommand,
   gameMissionsListCommand,
@@ -144,11 +146,21 @@ export function run() {
     .description('Upload or replace game thumbnail image')
     .action(gameUploadThumbnailCommand);
 
+  gameCmd
+    .command('upload-banner <file>')
+    .description('Upload or replace game banner image')
+    .action(gameUploadBannerCommand);
+
   gameCmd
     .command('submit')
     .description('Submit a DRAFT game for admin review')
     .action(gameSubmitCommand);
 
+  gameCmd
+    .command('draft')
+    .description('Return a game to DRAFT status (withdraw from review)')
+    .action(gameDraftCommand);
+
   // Game missions subcommands
   const gameMissionsCmd = gameCmd
     .command('missions')

package/src/utils/templates.js

@@ -36,7 +36,7 @@ export function createGameProject(targetDir, options) {
   }
 
   // Write common files
-  writeFileSync(join(targetDir, 'package.json'), generatePackageJson(name, description, slug, type));
+  writeFileSync(join(targetDir, 'package.json'), generatePackageJson(name, description, slug, type, ageGroup));
   writeFileSync(join(targetDir, 'vite.config.js'), generateViteConfig());
   writeFileSync(join(targetDir, '.gitignore'), generateGitignore());
   writeFileSync(join(targetDir, 'README.md'), generateReadme(name, description, type, ageGroup));
@@ -670,7 +670,7 @@ Published games appear automatically in the Izi Graham mobile app or M-UNI web p
 
 // ── Three.js Templates ─────────────────────────────────────────────
 
-function generatePackageJson(name, description, slug, type) {
+function generatePackageJson(name, description, slug, type, ageGroup) {
   return JSON.stringify({
     name: slug,
     version: '1.0.0',
@@ -689,8 +689,10 @@ function generatePackageJson(name, description, slug, type) {
       vite: '^5.0.0',
     },
     myvillage: {
+      name: name,
       gameId: null,
       gameType: type,
+      targetAge: ageGroup,
       lastDeployed: null,
     },
   }, null, 2) + '\n';