@capgo/cli 4.0.12 → 4.0.13

package/src/app/info.ts

@@ -1,90 +1,87 @@
-import { readFileSync } from "fs"
-import { join } from "node:path"
-import os from 'node:os';
-import getLatest from "get-latest-version"
-import Spinnies from '@trufflesuite/spinnies';
+import { readFileSync } from 'node:fs'
+import { join } from 'node:path'
+import os from 'node:os'
+import process from 'node:process'
+import getLatest from 'get-latest-version'
+import Spinnies from '@trufflesuite/spinnies'
+import * as p from '@clack/prompts'
 import pack from '../../package.json'
 
-const getLatestDependencies = async (installedDependencies: { [key: string]: string }) => {
-    const latestDependencies: { [key: string]: string } = {}
-    const all = []
-    for (const dependency in installedDependencies) {
-        if (Object.prototype.hasOwnProperty.call(installedDependencies, dependency)) {
-            // get in npm the last version of the dependency
-            all.push(getLatest(dependency))
-        }
+async function getLatestDependencies(installedDependencies: { [key: string]: string }) {
+  const latestDependencies: { [key: string]: string } = {}
+  const all = []
+  for (const dependency in installedDependencies) {
+    if (Object.prototype.hasOwnProperty.call(installedDependencies, dependency)) {
+      // get in npm the last version of the dependency
+      all.push(getLatest(dependency))
     }
-    await Promise.all(all)
-        .then((values) => {
-            const keys = Object.keys(installedDependencies)
-            for (let i = 0; i < values.length; i += 1) {
-                const v = values[i]
-                if (v) {
-                    latestDependencies[keys[i]] = v
-                }
-            }
-        })
-    return latestDependencies
+  }
+  await Promise.all(all)
+    .then((values) => {
+      const keys = Object.keys(installedDependencies)
+      for (let i = 0; i < values.length; i += 1) {
+        const v = values[i]
+        if (v)
+          latestDependencies[keys[i]] = v
+      }
+    })
+  return latestDependencies
 }
 
-const readPackageJson = async () => {
-    const packageJson = readFileSync(join(process.cwd(), 'package.json'))
-    return JSON.parse(packageJson as any)
+async function readPackageJson() {
+  const packageJson = readFileSync(join(process.cwd(), 'package.json'))
+  return JSON.parse(packageJson as any)
 }
 
-const getInstalledDependencies = async () => {
-    const { dependencies } = await readPackageJson()
-    const installedDependencies: { [key: string]: string } = {
-        '@capgo/cli': pack.version,
+async function getInstalledDependencies() {
+  const { dependencies } = await readPackageJson()
+  const installedDependencies: { [key: string]: string } = {
+    '@capgo/cli': pack.version,
+  }
+  for (const dependency in dependencies) {
+    if (Object.prototype.hasOwnProperty.call(dependencies, dependency) && dependency.startsWith('@capgo/')) {
+      // remove ^ or ~ from version
+      const version = dependencies[dependency].replace('^', '').replace('~', '')
+      installedDependencies[dependency] = version
     }
-    for (const dependency in dependencies) {
-        if (Object.prototype.hasOwnProperty.call(dependencies, dependency) && dependency.startsWith('@capgo/')) {
-            // remove ^ or ~ from version
-            const version = dependencies[dependency].replace('^', '').replace('~', '')
-            installedDependencies[dependency] = version
-        }
-    }
-    return installedDependencies
+  }
+  return installedDependencies
 }
 
-export const getInfo = async () => {
-    console.log('     💊   Capgo Doctor  💊\n')
-    console.log(` OS: ${os.platform()} ${os.version()}\n`)
-    console.log(` Node: ${process.version}\n`)
-    console.log(' Installed Dependencies:\n')
-    const installedDependencies = await getInstalledDependencies()
-    if (Object.keys(installedDependencies).length === 0) {
-        console.log('\n')
-        // display in red color in shell with console log
-        console.log('\x1b[31m%s\x1b[0m', '🚨 No dependencies found')
-        process.exit(1)
-    }
-    for (const dependency in installedDependencies) {
-        if (Object.prototype.hasOwnProperty.call(installedDependencies, dependency)) {
-            const installedVersion = (installedDependencies as any)[dependency]
-            console.log(`   ${dependency}: ${installedVersion}`)
-        }
-    }
-    console.log('\n')
-    const spinnies = new Spinnies();
-    spinnies.add('loading', { text: 'Loading latest dependencies' });
-    const latestDependencies = await getLatestDependencies(installedDependencies)
-    spinnies.succeed('loading', { text: 'Latest Dependencies:' });
-    console.log('\n')
-    for (const dependency in latestDependencies) {
-        if (Object.prototype.hasOwnProperty.call(latestDependencies, dependency)) {
-            const latestVersion = (latestDependencies as any)[dependency]
-            console.log(`   ${dependency}: ${latestVersion}`)
-        }
+export async function getInfo() {
+  p.log.info(' 💊   Capgo Doctor  💊\n')
+  p.log.info(` OS: ${os.platform()} ${os.version()}\n`)
+  p.log.info(` Node: ${process.version}\n`)
+  p.log.info(' Installed Dependencies:\n')
+  const installedDependencies = await getInstalledDependencies()
+  if (Object.keys(installedDependencies).length === 0) {
+    // display in red color in shell with console log
+    p.log.warning('\x1B[31m%s\x1B[0m 🚨 No dependencies found')
+    process.exit(1)
+  }
+  for (const dependency in installedDependencies) {
+    if (Object.prototype.hasOwnProperty.call(installedDependencies, dependency)) {
+      const installedVersion = (installedDependencies as any)[dependency]
+      p.log.info(`   ${dependency}: ${installedVersion}`)
     }
-    if (JSON.stringify(installedDependencies) !== JSON.stringify(latestDependencies)) {
-        console.log('\n')
-        // display in red color in shell with console log
-        console.log('\x1b[31m%s\x1b[0m', '🚨 Some dependencies are not up to date')
-        process.exit(1)
+  }
+  p.log.info('\n')
+  const spinnies = new Spinnies()
+  spinnies.add('loading', { text: '  Loading latest dependencies' })
+  const latestDependencies = await getLatestDependencies(installedDependencies)
+  spinnies.succeed('loading', { text: '  Latest Dependencies:' })
+  for (const dependency in latestDependencies) {
+    if (Object.prototype.hasOwnProperty.call(latestDependencies, dependency)) {
+      const latestVersion = (latestDependencies as any)[dependency]
+      p.log.info(`   ${dependency}: ${latestVersion}`)
     }
-    console.log('\n')
-    // display in green color in shell with console log
-    console.log('\x1b[32m%s\x1b[0m', '✅ All dependencies are up to date')
-    process.exit()
+  }
+  if (JSON.stringify(installedDependencies) !== JSON.stringify(latestDependencies)) {
+    // display in red color in shell with console log
+    p.log.warn('\x1B[31m🚨 Some dependencies are not up to date\x1B[0m')
+    process.exit(1)
+  }
+  // display in green color in shell with console log
+  p.log.success('\x1B[32m✅ All dependencies are up to date\x1B[0m')
+  process.exit()
 }

package/src/app/list.ts

@@ -1,61 +1,63 @@
-import { program } from 'commander';
-import { Table } from 'console-table-printer';
-import { SupabaseClient } from '@supabase/supabase-js';
-import * as p from '@clack/prompts';
-import { Database } from '../types/supabase.types';
-import { OptionsBase, createSupabaseClient, findSavedKey, getHumanDate, verifyUser } from '../utils';
-import { checkLatest } from '../api/update';
-
-const displayApp = (data: Database['public']['Tables']['apps']['Row'][]) => {
+import process from 'node:process'
+import { program } from 'commander'
+import { Table } from 'console-table-printer'
+import type { SupabaseClient } from '@supabase/supabase-js'
+import * as p from '@clack/prompts'
+import type { Database } from '../types/supabase.types'
+import type { OptionsBase } from '../utils'
+import { createSupabaseClient, findSavedKey, getHumanDate, verifyUser } from '../utils'
+import { checkLatest } from '../api/update'
+
+function displayApp(data: Database['public']['Tables']['apps']['Row'][]) {
   const t = new Table({
-    title: "Apps",
-    charLength: { "❌": 2, "✅": 2 },
-  });
+    title: 'Apps',
+    charLength: { '❌': 2, '✅': 2 },
+  })
 
   // add rows with color
-  data.reverse().forEach(row => {
+  data.reverse().forEach((row) => {
     t.addRow({
       Name: row.name,
       id: row.app_id,
-      Created: getHumanDate(row.created_at)
-    });
-  });
+      Created: getHumanDate(row.created_at),
+    })
+  })
 
-  p.log.success(t.render());
+  p.log.success(t.render())
 }
 
-export const getActiveApps = async (supabase: SupabaseClient<Database>) => {
+export async function getActiveApps(supabase: SupabaseClient<Database>) {
   const { data, error: vError } = await supabase
     .from('apps')
     .select()
     // .eq('user_id', userId)
-    .order('created_at', { ascending: false });
+    .order('created_at', { ascending: false })
 
   if (vError) {
-    p.log.error('Apps not found');
-    program.error('');
+    p.log.error('Apps not found')
+    program.error('')
   }
-  return data;
+  return data
 }
 
-export const listApp = async (options: OptionsBase) => {
-  p.intro(`List apps in Capgo`);
+export async function listApp(options: OptionsBase) {
+  p.intro(`List apps in Capgo`)
 
-  await checkLatest();
+  await checkLatest()
   options.apikey = options.apikey || findSavedKey()
 
   const supabase = await createSupabaseClient(options.apikey)
 
-  await verifyUser(supabase, options.apikey, ['write', 'all', 'read', 'upload']);
+  await verifyUser(supabase, options.apikey, ['write', 'all', 'read', 'upload'])
 
-  p.log.info(`Getting active bundle in Capgo`);
+  p.log.info(`Getting active bundle in Capgo`)
 
   // Get all active app versions we might possibly be able to cleanup
-  const allApps = await getActiveApps(supabase);
+  const allApps = await getActiveApps(supabase)
 
-  p.log.info(`Active app in Capgo: ${allApps?.length}`);
+  p.log.info(`Active app in Capgo: ${allApps?.length}`)
 
-  displayApp(allApps);
-  p.outro(`Done ✅`);
+  displayApp(allApps)
+  p.outro(`Done ✅`)
   process.exit()
 }

package/src/app/set.ts

@@ -1,91 +1,94 @@
-import { randomUUID } from "crypto";
-import mime from 'mime';
-import { program } from "commander";
-import * as p from '@clack/prompts';
-import { existsSync, readFileSync } from "node:fs";
-import { checkAppExistsAndHasPermissionErr, newIconPath, Options } from '../api/app';
-import { createSupabaseClient, findSavedKey, formatError, getConfig, verifyUser } from "../utils";
+import { randomUUID } from 'node:crypto'
+import { existsSync, readFileSync } from 'node:fs'
+import process from 'node:process'
+import mime from 'mime'
+import { program } from 'commander'
+import * as p from '@clack/prompts'
+import type { Options } from '../api/app'
+import { checkAppExistsAndHasPermissionErr, newIconPath } from '../api/app'
+import { createSupabaseClient, findSavedKey, formatError, getConfig, verifyUser } from '../utils'
 
-export const setApp = async (appId: string, options: Options) => {
-    p.intro(`Set app`);
-    options.apikey = options.apikey || findSavedKey()
-    const config = await getConfig();
-    appId = appId || config?.app?.appId
+export async function setApp(appId: string, options: Options) {
+  p.intro(`Set app`)
+  options.apikey = options.apikey || findSavedKey()
+  const config = await getConfig()
+  appId = appId || config?.app?.appId
 
-    if (!options.apikey) {
-        p.log.error(`Missing API key, you need to provide a API key to upload your bundle`);
-        program.error(``);
-    }
-    if (!appId) {
-        p.log.error("Missing argument, you need to provide a appId, or be in a capacitor project");
-        program.error(``);
-    }
-    const supabase = await createSupabaseClient(options.apikey)
+  if (!options.apikey) {
+    p.log.error(`Missing API key, you need to provide a API key to upload your bundle`)
+    program.error(``)
+  }
+  if (!appId) {
+    p.log.error('Missing argument, you need to provide a appId, or be in a capacitor project')
+    program.error(``)
+  }
+  const supabase = await createSupabaseClient(options.apikey)
 
-    const userId = await verifyUser(supabase, options.apikey, ['write', 'all']);
-    // Check we have app access to this appId
-    await checkAppExistsAndHasPermissionErr(supabase, options.apikey, appId);
+  const userId = await verifyUser(supabase, options.apikey, ['write', 'all'])
+  // Check we have app access to this appId
+  await checkAppExistsAndHasPermissionErr(supabase, options.apikey, appId)
 
-    const { name, icon, retention } = options;
+  const { name, icon, retention } = options
 
-    if (retention && !Number.isNaN(Number(retention))) {
-        p.log.error(`retention value must be a number`);
-        program.error(``);
-    }
-    else if (retention && retention < 0) {
-        p.log.error(`retention value cannot be less than 0`);
-        program.error(``)
-    }
+  if (retention && !Number.isNaN(Number(retention))) {
+    p.log.error(`retention value must be a number`)
+    program.error(``)
+  }
+  else if (retention && retention < 0) {
+    p.log.error(`retention value cannot be less than 0`)
+    program.error(``)
+  }
 
-    let iconBuff;
-    let iconType;
-    const fileName = `icon_${randomUUID()}`
-    let signedURL = 'https://xvwzpoazmxkqosrdewyv.supabase.co/storage/v1/object/public/images/capgo.png'
+  let iconBuff
+  let iconType
+  const fileName = `icon_${randomUUID()}`
+  let signedURL = 'https://xvwzpoazmxkqosrdewyv.supabase.co/storage/v1/object/public/images/capgo.png'
 
-    if (icon && existsSync(icon)) {
-        iconBuff = readFileSync(icon);
-        const contentType = mime.getType(icon);
-        iconType = contentType || 'image/png';
-        p.log.warn(`Found app icon ${icon}`);
-    }
-    else if (existsSync(newIconPath)) {
-        iconBuff = readFileSync(newIconPath);
-        const contentType = mime.getType(newIconPath);
-        iconType = contentType || 'image/png';
-        p.log.warn(`Found app icon ${newIconPath}`);
-    } else {
-        p.log.warn(`Cannot find app icon in any of the following locations: ${icon}, ${newIconPath}`);
-    }
-    if (iconBuff && iconType) {
-        const { error } = await supabase.storage
-            .from(`images/${userId}/${appId}`)
-            .upload(fileName, iconBuff, {
-                contentType: iconType,
-            })
-        if (error) {
-            p.log.error(`Could not add app ${formatError(error)}`);
-            program.error(``);
-        }
-        const { data: signedURLData } = await supabase
-            .storage
-            .from(`images/${userId}/${appId}`)
-            .getPublicUrl(fileName)
-        signedURL = signedURLData?.publicUrl || signedURL
-    }
-    // retention is in seconds in the database but received as days here
-    const { error: dbError } = await supabase
-        .from('apps')
-        .update({
-            icon_url: signedURL,
-            name,
-            retention: !retention ? undefined : retention * 24 * 60 * 60,
-        })
-        .eq('app_id', appId)
-        .eq('user_id', userId)
-    if (dbError) {
-        p.log.error(`Could not add app ${formatError(dbError)}`);
-        program.error(``);
+  if (icon && existsSync(icon)) {
+    iconBuff = readFileSync(icon)
+    const contentType = mime.getType(icon)
+    iconType = contentType || 'image/png'
+    p.log.warn(`Found app icon ${icon}`)
+  }
+  else if (existsSync(newIconPath)) {
+    iconBuff = readFileSync(newIconPath)
+    const contentType = mime.getType(newIconPath)
+    iconType = contentType || 'image/png'
+    p.log.warn(`Found app icon ${newIconPath}`)
+  }
+  else {
+    p.log.warn(`Cannot find app icon in any of the following locations: ${icon}, ${newIconPath}`)
+  }
+  if (iconBuff && iconType) {
+    const { error } = await supabase.storage
+      .from(`images/${userId}/${appId}`)
+      .upload(fileName, iconBuff, {
+        contentType: iconType,
+      })
+    if (error) {
+      p.log.error(`Could not add app ${formatError(error)}`)
+      program.error(``)
     }
-    p.outro(`Done ✅`);
-    process.exit()
+    const { data: signedURLData } = await supabase
+      .storage
+      .from(`images/${userId}/${appId}`)
+      .getPublicUrl(fileName)
+    signedURL = signedURLData?.publicUrl || signedURL
+  }
+  // retention is in seconds in the database but received as days here
+  const { error: dbError } = await supabase
+    .from('apps')
+    .update({
+      icon_url: signedURL,
+      name,
+      retention: !retention ? undefined : retention * 24 * 60 * 60,
+    })
+    .eq('app_id', appId)
+    .eq('user_id', userId)
+  if (dbError) {
+    p.log.error(`Could not add app ${formatError(dbError)}`)
+    program.error(``)
+  }
+  p.outro(`Done ✅`)
+  process.exit()
 }

package/src/bundle/check.ts

@@ -1,44 +1,42 @@
-import fs from 'node:fs';
-import path from "path";
+import fs from 'node:fs'
+import path from 'node:path'
 
-const searchInFile = (filePath: string, searchString: string) => {
-  const content = fs.readFileSync(filePath, "utf8");
-  return content.includes(searchString);
-};
+function searchInFile(filePath: string, searchString: string) {
+  const content = fs.readFileSync(filePath, 'utf8')
+  return content.includes(searchString)
+}
 
-export const searchInDirectory = (dirPath: string, searchString: string) => {
-  const files = fs.readdirSync(dirPath);
+export function searchInDirectory(dirPath: string, searchString: string) {
+  const files = fs.readdirSync(dirPath)
   for (const file of files) {
-    const filePath = path.join(dirPath, file);
-    const stats = fs.statSync(filePath);
+    const filePath = path.join(dirPath, file)
+    const stats = fs.statSync(filePath)
 
     if (stats.isDirectory()) {
-      if (searchInDirectory(filePath, searchString)) {
-        return true;
-      }
-    } else if (stats.isFile() && path.extname(filePath) === ".js") {
-      if (searchInFile(filePath, searchString)) {
-        return true;
-      }
+      if (searchInDirectory(filePath, searchString))
+        return true
+    }
+    else if (stats.isFile() && path.extname(filePath) === '.js') {
+      if (searchInFile(filePath, searchString))
+        return true
     }
   }
 
-  return false;
-};
+  return false
+}
 
-export const checkIndexPosition = (dirPath: string): boolean => {
+export function checkIndexPosition(dirPath: string): boolean {
   // look for index.html in the root folder or if there only one folder in the root folder look for index.html in this folder
-  const files = fs.readdirSync(dirPath);
+  const files = fs.readdirSync(dirPath)
   if (files.length === 1) {
-    const filePath = path.join(dirPath, files[0]);
-    const stats = fs.statSync(filePath);
-    if (stats.isDirectory()) {
-      return checkIndexPosition(filePath);
-    }
-  } 
-  const index = files.indexOf("index.html");
-  if (index > -1) {
-    return true;
+    const filePath = path.join(dirPath, files[0])
+    const stats = fs.statSync(filePath)
+    if (stats.isDirectory())
+      return checkIndexPosition(filePath)
   }
-  return false;
-};
+  const index = files.indexOf('index.html')
+  if (index > -1)
+    return true
+
+  return false
+}