@capgo/cli 4.0.14 → 4.2.0

package/CHANGELOG.md

@@ -2,6 +2,20 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [4.2.0](https://github.com/Cap-go/CLI/compare/v4.1.0...v4.2.0) (2024-03-04)
+
+
+### Features
+
+* allow ussage of version in Capcitor config instead of package.json ([7b2084a](https://github.com/Cap-go/CLI/commit/7b2084ab6a8d1cede375cb393b6718f3a5aa23dc))
+
+## [4.1.0](https://github.com/Cap-go/CLI/compare/v4.0.14...v4.1.0) (2024-02-27)
+
+
+### Features
+
+* better channel list ([93c8b04](https://github.com/Cap-go/CLI/commit/93c8b04407d1b3fe43963d9d8f11dc5e419008e8))
+
 ### [4.0.14](https://github.com/Cap-go/CLI/compare/v4.0.13...v4.0.14) (2024-02-27)
 
 ### [4.0.13](https://github.com/Cap-go/CLI/compare/v4.0.12...v4.0.13) (2024-02-26)

package/dist/index.js

@@ -61137,7 +61137,7 @@ var {
 // package.json
 var package_default = {
   name: "@capgo/cli",
-  version: "4.0.14",
+  version: "4.2.0",
   description: "A CLI to upload to capgo servers",
   main: "dist/index.js",
   bin: {
@@ -63342,15 +63342,47 @@ function displayChannels(data) {
   });
   data.reverse().forEach((row) => {
     t.addRow({
-      Name: row.name,
-      Created: getHumanDate(row.created_at),
-      Public: row.public ? "\u2705" : "\u274C"
+      "Name": row.name,
+      ...row.version ? { Version: row.version.name } : void 0,
+      "Public": row.public ? "\u2705" : "\u274C",
+      "iOS": row.ios ? "\u274C" : "\u2705",
+      "Android": row.android ? "\u274C" : "\u2705",
+      "\u2B06\uFE0F limit": row.disableAutoUpdate,
+      "\u2B07\uFE0F under native": row.disableAutoUpdateUnderNative ? "\u274C" : "\u2705",
+      "Self assign": row.allow_device_self_set ? "\u2705" : "\u274C",
+      "Progressive": row.enable_progressive_deploy ? "\u2705" : "\u274C",
+      ...row.enable_progressive_deploy && row.secondVersion ? { "Next version": row.secondVersion.name } : void 0,
+      ...row.enable_progressive_deploy && row.secondVersion ? { "Next %": row.secondaryVersionPercentage } : void 0,
+      "AB Testing": row.enableAbTesting ? "\u2705" : "\u274C",
+      ...row.enableAbTesting && row.secondVersion ? { "Version B": row.secondVersion } : void 0,
+      ...row.enableAbTesting && row.secondVersion ? { "A/B %": row.secondaryVersionPercentage } : void 0,
+      "Emulator": row.allow_emulator ? "\u2705" : "\u274C",
+      "Dev \u{1F4F1}": row.allow_dev ? "\u2705" : "\u274C"
     });
   });
   f2.success(t.render());
 }
 async function getActiveChannels(supabase, appid) {
-  const { data, error: vError } = await supabase.from("channels").select().eq("app_id", appid).order("created_at", { ascending: false });
+  const { data, error: vError } = await supabase.from("channels").select(`
+      id,
+      name,
+      public,
+      allow_emulator,
+      allow_dev,
+      ios,
+      android,
+      allow_device_self_set,
+      disableAutoUpdateUnderNative,
+      disableAutoUpdate,
+      enable_progressive_deploy,
+      enableAbTesting,
+      secondaryVersionPercentage,
+      secondVersion (id, name),
+      created_at,
+      created_by,
+      app_id,
+      version (id, name)
+    `).eq("app_id", appid).order("created_at", { ascending: false });
   if (vError) {
     f2.error(`App ${appid} not found in database`);
     program.error("");
@@ -63437,7 +63469,7 @@ async function uploadBundle(appid, options, shouldExit = true) {
   const checkNotifyAppReady = options.codeCheck;
   appid = appid || config?.app?.appId;
   const uuid = (0, import_node_crypto3.randomUUID)().split("-")[0];
-  bundle2 = bundle2 || config?.app?.package?.version || `0.0.1-beta.${uuid}`;
+  bundle2 = bundle2 || config?.app?.extConfig?.plugins?.CapacitorUpdater?.version || config?.app?.package?.version || `0.0.1-beta.${uuid}`;
   if (!regexSemver.test(bundle2)) {
     f2.error(`Your bundle name ${bundle2}, is not valid it should follow semver convention : https://semver.org/`);
     program.error("");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/cli",
-  "version": "4.0.14",
+  "version": "4.2.0",
   "description": "A CLI to upload to capgo servers",
   "main": "dist/index.js",
   "bin": {

package/src/api/channels.ts

@@ -4,7 +4,7 @@ import { program } from 'commander'
 import { Table } from 'console-table-printer'
 import * as p from '@clack/prompts'
 import type { Database } from '../types/supabase.types'
-import { formatError, getHumanDate } from '../utils'
+import { formatError } from '../utils'
 
 export async function checkVersionNotUsedInChannel(supabase: SupabaseClient<Database>, appid: string, userId: string, versionData: Database['public']['Tables']['app_versions']['Row']) {
   const { data: channelFound, error: errorChannel } = await supabase
@@ -72,8 +72,11 @@ export function delChannel(supabase: SupabaseClient<Database>, name: string, app
     .eq('created_by', userId)
     .single()
 }
-
-export function displayChannels(data: (Database['public']['Tables']['channels']['Row'] & { keep?: string })[]) {
+interface version {
+  id: string
+  name: string
+}
+export function displayChannels(data: (Database['public']['Tables']['channels']['Row'] & { version?: version, secondVersion?: version })[]) {
   const t = new Table({
     title: 'Channels',
     charLength: { '❌': 2, '✅': 2 },
@@ -82,9 +85,22 @@ export function displayChannels(data: (Database['public']['Tables']['channels'][
   // add rows with color
   data.reverse().forEach((row) => {
     t.addRow({
-      Name: row.name,
-      Created: getHumanDate(row.created_at),
-      Public: row.public ? '✅' : '❌',
+      'Name': row.name,
+      ...(row.version ? { Version: row.version.name } : undefined),
+      'Public': row.public ? '✅' : '❌',
+      'iOS': row.ios ? '❌' : '✅',
+      'Android': row.android ? '❌' : '✅',
+      '⬆️ limit': row.disableAutoUpdate,
+      '⬇️ under native': row.disableAutoUpdateUnderNative ? '❌' : '✅',
+      'Self assign': row.allow_device_self_set ? '✅' : '❌',
+      'Progressive': row.enable_progressive_deploy ? '✅' : '❌',
+      ...(row.enable_progressive_deploy && row.secondVersion ? { 'Next version': row.secondVersion.name } : undefined),
+      ...(row.enable_progressive_deploy && row.secondVersion ? { 'Next %': row.secondaryVersionPercentage } : undefined),
+      'AB Testing': row.enableAbTesting ? '✅' : '❌',
+      ...(row.enableAbTesting && row.secondVersion ? { 'Version B': row.secondVersion } : undefined),
+      ...(row.enableAbTesting && row.secondVersion ? { 'A/B %': row.secondaryVersionPercentage } : undefined),
+      'Emulator': row.allow_emulator ? '✅' : '❌',
+      'Dev 📱': row.allow_dev ? '✅' : '❌',
     })
   })
 
@@ -94,7 +110,26 @@ export function displayChannels(data: (Database['public']['Tables']['channels'][
 export async function getActiveChannels(supabase: SupabaseClient<Database>, appid: string) {
   const { data, error: vError } = await supabase
     .from('channels')
-    .select()
+    .select(`
+      id,
+      name,
+      public,
+      allow_emulator,
+      allow_dev,
+      ios,
+      android,
+      allow_device_self_set,
+      disableAutoUpdateUnderNative,
+      disableAutoUpdate,
+      enable_progressive_deploy,
+      enableAbTesting,
+      secondaryVersionPercentage,
+      secondVersion (id, name),
+      created_at,
+      created_by,
+      app_id,
+      version (id, name)
+    `)
     .eq('app_id', appid)
     // .eq('created_by', userId)
     .order('created_at', { ascending: false })

package/src/bundle/upload.ts

@@ -75,7 +75,7 @@ export async function uploadBundle(appid: string, options: Options, shouldExit =
   appid = appid || config?.app?.appId
   // create bundle name format : 1.0.0-beta.x where x is a uuid
   const uuid = randomUUID().split('-')[0]
-  bundle = bundle || config?.app?.package?.version || `0.0.1-beta.${uuid}`
+  bundle = bundle || config?.app?.extConfig?.plugins?.CapacitorUpdater?.version || config?.app?.package?.version || `0.0.1-beta.${uuid}`
   // check if bundle is valid
   if (!regexSemver.test(bundle)) {
     p.log.error(`Your bundle name ${bundle}, is not valid it should follow semver convention : https://semver.org/`)

package/src/utils.ts

@@ -363,16 +363,25 @@ interface Config {
       plugins: {
         extConfig: object
         CapacitorUpdater: {
+          appReadyTimeout?: number
+          responseTimeout?: number
+          autoDeleteFailed?: boolean
+          autoDeletePrevious?: boolean
           autoUpdate?: boolean
+          resetWhenUpdate?: boolean
+          updateUrl?: string
+          statsUrl?: string
+          privateKey?: string
+          version?: string
+          directUpdate?: boolean
+          periodCheckDelay?: number
           localS3?: boolean
           localHost?: string
           localWebHost?: string
           localSupa?: string
           localSupaAnon?: string
-          statsUrl?: string
-          channelUrl?: string
-          updateUrl?: string
-          privateKey?: string
+          allowModifyUrl?: boolean
+          defaultChannel?: string
         }
       }
       server: {