@capgo/cli 2.5.10-alpha.0 → 2.5.11

package/src/{channel → bin}/set.ts

@@ -1,14 +1,15 @@
 import { program } from 'commander';
+import LogSnag from 'logsnag';
 import { Database } from 'types/supabase.types';
-import { OptionsBase } from '../api/utils';
 import { checkAppExistsAndHasPermission } from "../api/app";
 import {
   getConfig, createSupabaseClient, updateOrCreateChannel,
   formatError, findSavedKey, checkPlanValid, useLogSnag, verifyUser
-} from '../utils';
+} from './utils';
 // import { definitions } from '../types/types_supabase';
 
-interface Options extends OptionsBase {
+interface Options {
+  apikey: string;
   bundle: string;
   state?: string;
   downgrade?: boolean;
@@ -20,24 +21,7 @@ interface Options extends OptionsBase {
   channel?: string;
 }
 
-export const setChannel = async (appId: string, options: Options) => {
-  options.apikey = options.apikey || findSavedKey() || ''
-  const config = await getConfig();
-  appId = appId || config?.app?.appId
-  const snag = useLogSnag()
-
-  if (!options.apikey) {
-    program.error("Missing API key, you need to provide a API key to upload your bundle");
-  }
-  if (!appId) {
-    program.error("Missing argument, you need to provide a appId, or be in a capacitor project");
-  }
-  const supabase = createSupabaseClient(options.apikey)
-
-  const userId = await verifyUser(supabase, options.apikey, ['write', 'all']);
-  // Check we have app access to this appId
-  await checkAppExistsAndHasPermission(supabase, appId, options.apikey);
-
+export const setChannelInternal = async (appid: string, apikey: string, defaulVersion: string, snag: LogSnag, options: Options) => {
   const { bundle, latest, downgrade, upgrade, ios, android, selfAssign, channel, state } = options;
   if (!channel) {
     program.error("Missing argument, you need to provide a channel");
@@ -56,59 +40,61 @@ export const setChannel = async (appId: string, options: Options) => {
     program.error("Missing argument, you need to provide a option to set");
   }
   try {
+    const supabase = createSupabaseClient(apikey)
+    const userId = await verifyUser(supabase, apikey, ['write', 'all']);
     await checkPlanValid(supabase, userId)
     // Check we have app access to this appId
-    await checkAppExistsAndHasPermission(supabase, appId, options.apikey);
+    await checkAppExistsAndHasPermission(supabase, appid, apikey);
     const channelPayload: Database['public']['Tables']['channels']['Insert'] = {
       created_by: userId,
-      app_id: appId,
+      app_id: appid,
       name: channel,
       version: undefined as any,
     }
-    const bundleVersion = latest ? config?.app?.package?.version : bundle
+    const bundleVersion = latest ? defaulVersion : bundle
     if (bundleVersion != null) {
       const { data, error: vError } = await supabase
         .from('app_versions')
         .select()
-        .eq('app_id', appId)
+        .eq('app_id', appid)
         .eq('name', bundleVersion)
         .eq('user_id', userId)
         .eq('deleted', false)
         .single()
       if (vError || !data)
         program.error(`Cannot find version ${bundleVersion}`);
-      console.log(`Set ${appId} channel: ${channel} to @${bundleVersion}`);
+      console.log(`Set ${appid} channel: ${channel} to @${bundleVersion}`);
       channelPayload.version = data.id
     }
     if (state != null) {
       if (state === 'public' || state === 'private') {
-        console.log(`Set ${appId} channel: ${channel} to public or private is deprecated, use default or normal instead`);
+        console.log(`Set ${appid} channel: ${channel} to public or private is deprecated, use default or normal instead`);
       }
-      console.log(`Set ${appId} channel: ${channel} to ${state === 'public' || state === 'default' ? 'default' : 'normal'}`);
+      console.log(`Set ${appid} channel: ${channel} to ${state === 'public' || state === 'default' ? 'default' : 'normal'}`);
       channelPayload.public = state === 'public' || state === 'default'
     }
     if (downgrade != null) {
-      console.log(`Set ${appId} channel: ${channel} to ${downgrade ? 'allow' : 'disallow'} downgrade`);
+      console.log(`Set ${appid} channel: ${channel} to ${downgrade ? 'allow' : 'disallow'} downgrade`);
       channelPayload.disableAutoUpdateUnderNative = !downgrade
     }
     if (upgrade != null) {
-      console.log(`Set ${appId} channel: ${channel} to ${upgrade ? 'allow' : 'disallow'} upgrade`);
+      console.log(`Set ${appid} channel: ${channel} to ${upgrade ? 'allow' : 'disallow'} upgrade`);
       channelPayload.disableAutoUpdateToMajor = !upgrade
     }
     if (ios != null) {
-      console.log(`Set ${appId} channel: ${channel} to ${ios ? 'allow' : 'disallow'} ios update`);
+      console.log(`Set ${appid} channel: ${channel} to ${ios ? 'allow' : 'disallow'} ios update`);
       channelPayload.ios = !!ios
     }
     if (android != null) {
-      console.log(`Set ${appId} channel: ${channel} to ${android ? 'allow' : 'disallow'} android update`);
+      console.log(`Set ${appid} channel: ${channel} to ${android ? 'allow' : 'disallow'} android update`);
       channelPayload.android = !!android
     }
     if (selfAssign != null) {
-      console.log(`Set ${appId} channel: ${channel} to ${selfAssign ? 'allow' : 'disallow'} self assign to this channel`);
+      console.log(`Set ${appid} channel: ${channel} to ${selfAssign ? 'allow' : 'disallow'} self assign to this channel`);
       channelPayload.allow_device_self_set = !!selfAssign
     }
     try {
-      const { error: dbError } = await updateOrCreateChannel(supabase, channelPayload, options.apikey)
+      const { error: dbError } = await updateOrCreateChannel(supabase, channelPayload, apikey)
       if (dbError)
         program.error(`Cannot set channel ${formatError(dbError)}`);
     }
@@ -121,7 +107,7 @@ export const setChannel = async (appId: string, options: Options) => {
       icon: '✅',
       tags: {
         'user-id': userId,
-        'app-id': appId,
+        'app-id': appid,
       },
       notify: false,
     }).catch()
@@ -129,5 +115,21 @@ export const setChannel = async (appId: string, options: Options) => {
     program.error(`Unknow error ${formatError(err)}`);
   }
   console.log(`Done ✅`);
+}
+
+export const setChannel = async (appid: string, options: Options) => {
+  const apikey = options.apikey || findSavedKey()
+  const config = await getConfig()
+  const snag = useLogSnag()
+
+  console.log('COMMAND DEPRECATED, use "channel set" instead')
+  appid = appid || config?.app?.appId
+  if (!apikey) {
+    program.error("Missing API key, you need to provide a API key to set your app");
+  }
+  if (!appid) {
+    program.error("Missing argument, you need to provide a appid, or be in a capacitor project");
+  }
+  return setChannelInternal(appid, apikey, config?.app?.package?.version, snag, options)
   process.exit()
-}
+}

package/src/{bundle → bin}/upload.ts

@@ -4,7 +4,6 @@ import { randomUUID } from 'crypto';
 import cliProgress from 'cli-progress';
 import { existsSync, readFileSync } from 'fs';
 import { checksum as getChecksum } from '@tomasklaen/checksum';
-import { OptionsBase } from '../api/utils';
 import { checkAppExistsAndHasPermission } from "../api/app";
 import { encryptSource } from '../api/crypto';
 import {
@@ -12,19 +11,20 @@ import {
   updateOrCreateChannel, updateOrCreateVersion,
   formatError, findSavedKey, checkPlanValid,
   useLogSnag, verifyUser, regexSemver, baseKeyPub, convertAppName
-} from '../utils';
+} from './utils';
 
-const alertMb = 20;
-
-interface Options extends OptionsBase {
+interface Options {
   bundle: string
   path: string
+  apikey: string
   channel?: string
   displayIvSession?: boolean
   external?: string
   key?: boolean | string
 }
 
+const alertMb = 20;
+
 export const uploadVersion = async (appid: string, options: Options) => {
   let { bundle, path, channel } = options;
   const { external, key = false, displayIvSession } = options;
@@ -206,6 +206,5 @@ It will be also visible in your dashboard\n`);
     },
     notify: false,
   }).catch()
-  console.log(`Done ✅`);
   process.exit()
-}
+}

package/src/{utils.ts → bin/utils.ts}

@@ -217,7 +217,7 @@ export const verifyUser = async (supabase: SupabaseClient<Database>, apikey: str
     return userId;
 }
 
-export const getHumanDate = (createdA: string | null) => {
-    const date = new Date(createdA || '');
+export const getHumanDate = (row: Database['public']['Tables']['app_versions']['Row']) => {
+    const date = new Date(row.created_at || '');
     return date.toLocaleString();
 }

package/webpack.config.js

@@ -6,7 +6,7 @@ module.exports = {
   mode: process.env.NODE_ENV || 'production',
   target: 'node',
   externals: [nodeExternals()],
-  entry: './src/index.ts',
+  entry: './src/bin/index.ts',
   module: {
     rules: [
       {

package/src/api/utils.ts

@@ -1,4 +0,0 @@
-
-export interface OptionsBase {
-    apikey: string;
-}

package/src/app/delete.ts

@@ -1,61 +0,0 @@
-import { program } from "commander";
-import { OptionsBase } from "../api/utils";
-import { checkAppExistsAndHasPermission } from '../api/app';
-import { createSupabaseClient, findSavedKey, formatError, getConfig, useLogSnag, verifyUser } from "../utils";
-
-export const deleteApp = async (appId: string, userId: string, options: OptionsBase) => {
-    options.apikey = options.apikey || findSavedKey() || ''
-    const config = await getConfig();
-    appId = appId || config?.app?.appId
-    const snag = useLogSnag()
-
-    if (!options.apikey) {
-        program.error("Missing API key, you need to provide a API key to upload your bundle");
-    }
-    if (!appId) {
-        program.error("Missing argument, you need to provide a appId, or be in a capacitor project");
-    }
-    const supabase = createSupabaseClient(options.apikey)
-
-    await verifyUser(supabase, options.apikey, ['write', 'all']);
-    // Check we have app access to this appId
-    await checkAppExistsAndHasPermission(supabase, appId, options.apikey);
-
-    const { error } = await supabase
-        .storage
-        .from(`images/${userId}`)
-        .remove([appId])
-    if (error) {
-        program.error(`Could not add app ${formatError(error)}`);
-    }
-    const { error: delError } = await supabase
-        .storage
-        .from(`apps/${appId}/${userId}`)
-        .remove(['versions'])
-    if (delError) {
-        program.error(`Could not delete app version ${formatError(delError)}`);
-    }
-
-    const { error: dbError } = await supabase
-        .from('apps')
-        .delete()
-        .eq('app_id', appId)
-        .eq('user_id', userId)
-
-    if (dbError) {
-        program.error(`Could not delete app ${formatError(dbError)}`);
-    }
-    await snag.publish({
-        channel: 'app',
-        event: 'App Deleted',
-        icon: '🗑️',
-        tags: {
-            'user-id': userId,
-            'app-id': appId,
-        },
-        notify: false,
-    }).catch()
-    console.log("App deleted in Capgo")
-    console.log(`Done ✅`);
-    process.exit()
-}

package/src/app/set.ts

@@ -1,74 +0,0 @@
-import { getType } from 'mime';
-import { program } from "commander";
-import { randomUUID } from "crypto";
-import { existsSync, readFileSync } from "fs-extra";
-import { checkAppExistsAndHasPermission, newIconPath, Options } from '../api/app';
-import { createSupabaseClient, findSavedKey, formatError, getConfig, verifyUser } from "../utils";
-
-export const setApp = async (appId: string, userId: string, options: Options) => {
-    options.apikey = options.apikey || findSavedKey() || ''
-    const config = await getConfig();
-    appId = appId || config?.app?.appId
-
-    if (!options.apikey) {
-        program.error("Missing API key, you need to provide a API key to upload your bundle");
-    }
-    if (!appId) {
-        program.error("Missing argument, you need to provide a appId, or be in a capacitor project");
-    }
-    const supabase = createSupabaseClient(options.apikey)
-
-    await verifyUser(supabase, options.apikey, ['write', 'all']);
-    // Check we have app access to this appId
-    await checkAppExistsAndHasPermission(supabase, appId, options.apikey);
-
-    const { name, icon } = options;
-
-    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 = getType(icon);
-        iconType = contentType || 'image/png';
-        console.warn(`Found app icon ${icon}`);
-    }
-    else if (existsSync(newIconPath)) {
-        iconBuff = readFileSync(newIconPath);
-        const contentType = getType(newIconPath);
-        iconType = contentType || 'image/png';
-        console.warn(`Found app icon ${newIconPath}`);
-    } else {
-        console.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) {
-            program.error(`Could not add app ${formatError(error)}`);
-        }
-        const { data: signedURLData } = await supabase
-            .storage
-            .from(`images/${userId}/${appId}`)
-            .getPublicUrl(fileName)
-        signedURL = signedURLData?.publicUrl || signedURL
-    }
-    const { error: dbError } = await supabase
-        .from('apps')
-        .update({
-            icon_url: signedURL,
-            name,
-        })
-        .eq('app_id', appId)
-        .eq('user_id', userId)
-    if (dbError) {
-        program.error(`Could not add app ${formatError(dbError)}`);
-    }
-    console.log(`Done ✅`);
-    process.exit()
-}

package/src/bundle/delete.ts

@@ -1,54 +0,0 @@
-import { program } from 'commander';
-import { checkAppExistsAndHasPermission } from '../api/app';
-import { OptionsBase } from '../api/utils';
-import { createSupabaseClient, findSavedKey, getConfig, verifyUser } from '../utils';
-import { deleteSpecificVersion } from '../api/versions';
-
-interface Options extends OptionsBase {
-  bundle: string;
-}
-
-export const deleteVersion = async (appId: string, bundleId: string, options: Options) => {
-  options.apikey = options.apikey || findSavedKey() || ''
-  const config = await getConfig();
-  appId = appId || config?.app?.appId
-
-  if (!options.apikey) {
-    program.error("Missing API key, you need to provide a API key to upload your bundle");
-  }
-  if (!appId) {
-    program.error("Missing argument, you need to provide a appId, or be in a capacitor project");
-  }
-  const supabase = createSupabaseClient(options.apikey)
-
-  const userId = await verifyUser(supabase, options.apikey, ['write', 'all']);
-  // Check we have app access to this appId
-  await checkAppExistsAndHasPermission(supabase, appId, options.apikey);
-
-  const apikey = options.apikey || findSavedKey()
-
-  appId = appId || config?.app?.appId
-  if (!apikey) {
-    program.error('Missing API key, you need to provide an API key to delete your app');
-  }
-  if (!bundleId) {
-    program.error('Missing argument, you need to provide a bundleId, or be in a capacitor project');
-  }
-  if (!appId) {
-    program.error('Missing argument, you need to provide a appId, or be in a capacitor project');
-  }
-
-  const { data: app, error: dbError0 } = await supabase
-    .rpc('exist_app', { appid: appId, apikey })
-    .single()
-  if (!app || dbError0) {
-    program.error('No permission to delete')
-  }
-
-  console.log(`Delete ${appId}@${bundleId} from Capgo`);
-
-  await deleteSpecificVersion(supabase, appId, userId, bundleId);
-  console.log(`${appId}@${bundleId} deleted from server`)
-  console.log(`Done ✅`);
-  process.exit()
-}

package/src/channel/add.ts

@@ -1,49 +0,0 @@
-import { program } from "commander";
-import { checkAppExistsAndHasPermission } from "../api/app";
-import { createChannel, findUnknownVersion } from "../api/channels";
-import { OptionsBase } from "../api/utils";
-import { findSavedKey, getConfig, useLogSnag, createSupabaseClient, verifyUser } from "../utils";
-
-export const addChannel = async (channelId: string, appId: string, options: OptionsBase) => {
-    options.apikey = options.apikey || findSavedKey() || ''
-    const config = await getConfig();
-    appId = appId || config?.app?.appId
-    const snag = useLogSnag()
-
-    if (!options.apikey) {
-        program.error("Missing API key, you need to provide a API key to upload your bundle");
-    }
-    if (!appId) {
-        program.error("Missing argument, you need to provide a appId, or be in a capacitor project");
-    }
-    const supabase = createSupabaseClient(options.apikey)
-
-    const userId = await verifyUser(supabase, options.apikey, ['write', 'all']);
-    // Check we have app access to this appId
-    await checkAppExistsAndHasPermission(supabase, appId, options.apikey);
-
-    console.log(`Create channel ${appId}#${channelId} to Capgo cloud`);
-    try {
-        const { data } = await findUnknownVersion(supabase, appId)
-        if (!data) {
-            program.error(`Cannot find default version for channel creation, please contact Capgo support 🤨`);
-        }
-        await createChannel(supabase, { name: channelId, app_id: appId, version: data.id, created_by: userId });
-        console.log(`Channel created ✅`);
-        await snag.publish({
-            channel: 'app',
-            event: 'Create channel',
-            icon: '✅',
-            tags: {
-                'user-id': userId,
-                'app-id': appId,
-                'channel': channelId,
-            },
-            notify: false,
-        }).catch()
-    } catch (error) {
-        console.log(`Cannot create Channel 🙀`, error);
-    }
-    console.log(`Done ✅`);
-    process.exit()
-}

package/src/channel/delete.ts

@@ -1,45 +0,0 @@
-import { program } from "commander";
-import { checkAppExistsAndHasPermission } from "../api/app";
-import { delChannel } from "../api/channels";
-import { OptionsBase } from "../api/utils";
-import { findSavedKey, getConfig, useLogSnag, createSupabaseClient, verifyUser } from "../utils";
-
-export const deleteChannel = async (channelId: string, appId: string, options: OptionsBase) => {
-    options.apikey = options.apikey || findSavedKey() || ''
-    const config = await getConfig();
-    appId = appId || config?.app?.appId
-    const snag = useLogSnag()
-
-    if (!options.apikey) {
-        program.error("Missing API key, you need to provide a API key to upload your bundle");
-    }
-    if (!appId) {
-        program.error("Missing argument, you need to provide a appId, or be in a capacitor project");
-    }
-    const supabase = createSupabaseClient(options.apikey)
-
-    const userId = await verifyUser(supabase, options.apikey, ['write', 'all']);
-    // Check we have app access to this appId
-    await checkAppExistsAndHasPermission(supabase, appId, options.apikey);
-
-    console.log(`Delete channel ${appId}#${channelId} to Capgo cloud`);
-    try {
-        await delChannel(supabase, channelId, appId, userId);
-        console.log(`Channel Delete ✅`);
-        await snag.publish({
-            channel: 'app',
-            event: 'Delete channel',
-            icon: '✅',
-            tags: {
-                'user-id': userId,
-                'app-id': appId,
-                'channel': channelId,
-            },
-            notify: false,
-        }).catch()
-    } catch (error) {
-        console.log(`Cannot delete Channel 🙀`, error);
-    }
-    console.log(`Done ✅`);
-    process.exit()
-}

package/src/channel/list.ts

@@ -1,37 +0,0 @@
-import { program } from 'commander';
-import { checkAppExistsAndHasPermission } from '../api/app';
-import { getActiveChannels, displayChannels } from '../api/channels';
-import { OptionsBase } from '../api/utils';
-import { findSavedKey, getConfig, createSupabaseClient, verifyUser } from '../utils';
-
-export const listChannels = async (appId: string, options: OptionsBase) => {
-  options.apikey = options.apikey || findSavedKey() || ''
-  const config = await getConfig();
-  appId = appId || config?.app?.appId
-
-  if (!options.apikey) {
-    program.error("Missing API key, you need to provide a API key to upload your bundle");
-  }
-  if (!appId) {
-    program.error("Missing argument, you need to provide a appId, or be in a capacitor project");
-  }
-  const supabase = createSupabaseClient(options.apikey)
-
-  const userId = await verifyUser(supabase, options.apikey, ['write', 'all']);
-  // Check we have app access to this appId
-  await checkAppExistsAndHasPermission(supabase, appId, options.apikey);
-
-  console.log(`Querying available versions in Capgo`);
-
-  // Check we have app access to this appId
-  await checkAppExistsAndHasPermission(supabase, appId, options.apikey);
-
-  // Get all active app versions we might possibly be able to cleanup
-  const allVersions = await getActiveChannels(supabase, appId, userId);
-
-  console.log(`Active channels in Capgo: ${allVersions?.length}`);
-
-  displayChannels(allVersions);
-  console.log(`Done ✅`);
-  process.exit()
-}