@capgo/cli 4.10.3 → 4.10.7

package/CHANGELOG.md

@@ -2,6 +2,29 @@
 
 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.10.7](https://github.com/Cap-go/CLI/compare/v4.10.6...v4.10.7) (2024-05-27)
+
+
+### Bug Fixes
+
+* add snag for multipart upload ([eef8d38](https://github.com/Cap-go/CLI/commit/eef8d38d01bc7b25def9d5e9995ec3ae5acfc8cf))
+
+### [4.10.6](https://github.com/Cap-go/CLI/compare/v4.10.5...v4.10.6) (2024-05-24)
+
+
+### Bug Fixes
+
+* userId in logsnag ([b4f0cef](https://github.com/Cap-go/CLI/commit/b4f0cefd4e4f3366e5e8e6698f7c7b7b907eebba))
+
+### [4.10.5](https://github.com/Cap-go/CLI/compare/v4.10.4...v4.10.5) (2024-05-21)
+
+
+### Bug Fixes
+
+* issue returning channel list ([aee3ed5](https://github.com/Cap-go/CLI/commit/aee3ed5cb011c10854f8a7806f69a80d10b389ac))
+
+### [4.10.4](https://github.com/Cap-go/CLI/compare/v4.10.3...v4.10.4) (2024-05-15)
+
 ### [4.10.3](https://github.com/Cap-go/CLI/compare/v4.10.2...v4.10.3) (2024-05-14)
 
 

package/dist/index.js

@@ -109493,8 +109493,19 @@ async function finishMultipartDownload(key2, uploadId, url, parts) {
   });
 }
 var PART_SIZE = 10 * 1024 * 1024;
-async function uploadMultipart(supabase, appId, name, data) {
+async function uploadMultipart(supabase, appId, name, data, orgId) {
   try {
+    const snag = useLogSnag();
+    await snag.track({
+      channel: "app",
+      event: "App Multipart Prepare",
+      icon: "\u23EB",
+      user_id: orgId,
+      tags: {
+        "app-id": appId
+      },
+      notify: false
+    }).catch();
     const multipartPrep = await prepareMultipart(supabase, appId, name);
     if (!multipartPrep) {
       return false;
@@ -109504,6 +109515,16 @@ async function uploadMultipart(supabase, appId, name, data) {
     const uploadPromises = Array.from({ length: partCount }, (_3, index) => uploadPart(data, PART_SIZE, multipartPrep.url, multipartPrep.key, multipartPrep.uploadId, index));
     const parts = await Promise.all(uploadPromises);
     await finishMultipartDownload(multipartPrep.key, multipartPrep.uploadId, multipartPrep.url, parts);
+    await snag.track({
+      channel: "app",
+      event: "App Multipart done",
+      icon: "\u23EB",
+      user_id: orgId,
+      tags: {
+        "app-id": appId
+      },
+      notify: false
+    }).catch();
     return true;
   } catch (e2) {
     f2.error(`Could not upload via multipart ${formatError(e2)}`);
@@ -109783,7 +109804,7 @@ async function getUserId(options) {
 // package.json
 var package_default = {
   name: "@capgo/cli",
-  version: "4.10.3",
+  version: "4.10.7",
   description: "A CLI to upload to capgo servers",
   author: "github.com/riderx",
   license: "Apache 2.0",
@@ -110449,8 +110470,8 @@ function displayChannels(data) {
       "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",
+      "iOS": row.ios ? "\u2705" : "\u274C",
+      "Android": row.android ? "\u2705" : "\u274C",
       "\u2B06\uFE0F limit": row.disableAutoUpdate,
       "\u2B07\uFE0F under native": row.disableAutoUpdateUnderNative ? "\u274C" : "\u2705",
       "Self assign": row.allow_device_self_set ? "\u2705" : "\u274C",
@@ -110510,7 +110531,7 @@ async function addChannel(channelId, appId, options, shouldExit = true) {
     program.error("");
   }
   const supabase = await createSupabaseClient(options.apikey);
-  const userId = await verifyUser(supabase, options.apikey, ["write", "all"]);
+  await verifyUser(supabase, options.apikey, ["write", "all"]);
   await checkAppExistsAndHasPermissionOrgErr(supabase, options.apikey, appId, 4 /* admin */);
   f2.info(`Creating channel ${appId}#${channelId} to Capgo`);
   try {
@@ -110531,7 +110552,7 @@ async function addChannel(channelId, appId, options, shouldExit = true) {
       channel: "channel",
       event: "Create channel",
       icon: "\u2705",
-      user_id: userId,
+      user_id: orgId,
       tags: {
         "app-id": appId,
         "channel": channelId
@@ -110730,7 +110751,7 @@ Trial expires in ${isTrial} days`);
         channel: "app",
         event: "App encryption",
         icon: "\u{1F511}",
-        user_id: userId,
+        user_id: orgId,
         tags: {
           "app-id": appid
         },
@@ -110762,7 +110783,7 @@ The app size is ${mbSize} Mb, this may take a while to download for users
         channel: "app-error",
         event: "App Too Large",
         icon: "\u{1F69B}",
-        user_id: userId,
+        user_id: orgId,
         tags: {
           "app-id": appid
         },
@@ -110786,7 +110807,7 @@ The app size is ${mbSize} Mb, this may take a while to download for users
       channel: "app",
       event: "App external",
       icon: "\u{1F4E4}",
-      user_id: userId,
+      user_id: orgId,
       tags: {
         "app-id": appid
       },
@@ -110820,7 +110841,7 @@ The app size is ${mbSize} Mb, this may take a while to download for users
     const startTime = import_node_perf_hooks.performance.now();
     try {
       if (options.multipart !== void 0 && options.multipart) {
-        await uploadMultipart(supabase, appid, bundle2, zipped);
+        await uploadMultipart(supabase, appid, bundle2, zipped, orgId);
       } else {
         const url = await uploadUrl(supabase, appid, bundle2);
         if (!url) {
@@ -110913,7 +110934,7 @@ The app size is ${mbSize} Mb, this may take a while to download for users
     channel: "app",
     event: "App Uploaded",
     icon: "\u23EB",
-    user_id: userId,
+    user_id: orgId,
     tags: {
       "app-id": appid
     },
@@ -111004,7 +111025,6 @@ async function loginCommand(apikey, options) {
 }
 
 // src/app/add.ts
-var import_node_crypto4 = require("node:crypto");
 var import_node_fs10 = require("node:fs");
 var import_node_process15 = __toESM(require("node:process"));
 
@@ -111168,13 +111188,14 @@ async function addAppInternal(appId, options, organization, throwErr = true) {
   } else {
     f2.warn(`Cannot find app icon in any of the following locations: ${icon}, ${newIconPath}`);
   }
-  const fileName = `icon_${(0, import_node_crypto4.randomUUID)()}`;
+  const fileName = `icon`;
   let signedURL = "https://xvwzpoazmxkqosrdewyv.supabase.co/storage/v1/object/public/images/capgo.png";
   if (iconBuff && iconType) {
-    const { error } = await supabase.storage.from(`images/${userId}/${appId}`).upload(fileName, iconBuff, {
+    const { error } = await supabase.storage.from(`images/org/${organizationUid}/${appId}`).upload(fileName, iconBuff, {
       contentType: iconType
     });
     if (error) {
+      console.error(error);
       f2.error(`Could not add app ${formatError(error)}`);
       program.error("");
     }
@@ -111897,9 +111918,8 @@ async function setChannel(channel2, appId, options) {
       channel: "channel",
       event: "Set channel",
       icon: "\u2705",
-      user_id: userId,
+      user_id: orgId,
       tags: {
-        "user-id": userId,
         "app-id": appId
       },
       notify: false
@@ -112103,12 +112123,13 @@ async function deleteChannel(channelId, appId, options) {
   f2.info(`Deleting channel ${appId}#${channelId} from Capgo`);
   try {
     await delChannel(supabase, channelId, appId, userId);
+    const orgId = await getOrganizationId(supabase, appId);
     f2.success(`Channel deleted`);
     await snag.track({
       channel: "channel",
       event: "Delete channel",
       icon: "\u2705",
-      user_id: userId,
+      user_id: orgId,
       tags: {
         "user-id": userId,
         "app-id": appId,
@@ -112159,7 +112180,7 @@ async function listChannels(appId, options) {
 }
 
 // src/app/set.ts
-var import_node_crypto5 = require("node:crypto");
+var import_node_crypto4 = require("node:crypto");
 var import_node_fs15 = require("node:fs");
 var import_node_process29 = __toESM(require("node:process"));
 async function setApp(appId, options) {
@@ -112188,7 +112209,7 @@ async function setApp(appId, options) {
   }
   let iconBuff;
   let iconType;
-  const fileName = `icon_${(0, import_node_crypto5.randomUUID)()}`;
+  const fileName = `icon_${(0, import_node_crypto4.randomUUID)()}`;
   let signedURL = "https://xvwzpoazmxkqosrdewyv.supabase.co/storage/v1/object/public/images/capgo.png";
   if (icon && (0, import_node_fs15.existsSync)(icon)) {
     iconBuff = (0, import_node_fs15.readFileSync)(icon);
@@ -112246,7 +112267,7 @@ async function deleteApp(appId, options) {
   const supabase = await createSupabaseClient(options.apikey);
   const userId = await verifyUser(supabase, options.apikey, ["write", "all"]);
   await checkAppExistsAndHasPermissionOrgErr(supabase, options.apikey, appId, 5 /* super_admin */);
-  const { data: appOwnerRaw, error: appOwnerError } = await supabase.from("apps").select(`owner_org ( created_by )`).eq("app_id", appId).single();
+  const { data: appOwnerRaw, error: appOwnerError } = await supabase.from("apps").select(`owner_org ( created_by, id )`).eq("app_id", appId).single();
   const appOwner = appOwnerRaw;
   if (!appOwnerError && (appOwner?.owner_org.created_by ?? "") !== userId) {
     f2.warn("Deleting the app is not recomended for users that are not the organization owner");
@@ -112272,22 +112293,25 @@ async function deleteApp(appId, options) {
   } else if (appOwnerError) {
     f2.warn(`Cannot get the app owner ${formatError(appOwnerError)}`);
   }
-  const { error } = await supabase.storage.from(`images/${userId}`).remove([appId]);
-  if (error)
+  const { error } = await supabase.storage.from(`images`).remove([`org/${appOwner?.owner_org.id}/${appId}/icon`]);
+  if (error) {
+    console.error(error, `images/org/${appOwner?.owner_org.id}/${appId}`);
     f2.error("Could not delete app logo");
+  }
   const { error: delError } = await supabase.storage.from(`apps/${appId}/${userId}`).remove(["versions"]);
   if (delError)
     f2.error("Could not delete app version");
-  const { error: dbError } = await supabase.from("apps").delete().eq("app_id", appId).eq("user_id", userId);
+  const { error: dbError } = await supabase.from("apps").delete().eq("app_id", appId);
   if (dbError) {
     f2.error("Could not delete app");
     program.error("");
   }
+  const orgId = await getOrganizationId(supabase, appId);
   await snag.track({
     channel: "app",
     event: "App Deleted",
     icon: "\u{1F5D1}\uFE0F",
-    user_id: userId,
+    user_id: orgId,
     tags: {
       "app-id": appId
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/cli",
-  "version": "4.10.3",
+  "version": "4.10.7",
   "description": "A CLI to upload to capgo servers",
   "author": "github.com/riderx",
   "license": "Apache 2.0",

package/src/api/channels.ts

@@ -74,7 +74,24 @@ interface version {
   id: string
   name: string
 }
-export function displayChannels(data: (Database['public']['Tables']['channels']['Row'] & { version?: version, secondVersion?: version })[]) {
+interface Channel {
+  id: number
+  name: string
+  public: boolean
+  ios: boolean
+  android: boolean
+  disableAutoUpdate: string
+  disableAutoUpdateUnderNative: boolean
+  allow_device_self_set: boolean
+  enable_progressive_deploy: boolean
+  secondaryVersionPercentage: number
+  secondVersion?: version
+  enableAbTesting: boolean
+  allow_emulator: boolean
+  allow_dev: boolean
+  version?: version
+}
+export function displayChannels(data: Channel[]) {
   const t = new Table({
     title: 'Channels',
     charLength: { '❌': 2, '✅': 2 },
@@ -86,8 +103,8 @@ export function displayChannels(data: (Database['public']['Tables']['channels'][
       'Name': row.name,
       ...(row.version ? { Version: row.version.name } : undefined),
       'Public': row.public ? '✅' : '❌',
-      'iOS': row.ios ? '❌' : '✅',
-      'Android': row.android ? '❌' : '✅',
+      'iOS': row.ios ? '✅' : '❌',
+      'Android': row.android ? '✅' : '❌',
       '⬆️ limit': row.disableAutoUpdate,
       '⬇️ under native': row.disableAutoUpdateUnderNative ? '❌' : '✅',
       'Self assign': row.allow_device_self_set ? '✅' : '❌',
@@ -136,5 +153,5 @@ export async function getActiveChannels(supabase: SupabaseClient<Database>, appi
     p.log.error(`App ${appid} not found in database`)
     program.error('')
   }
-  return data
+  return data as any as Channel[]
 }

package/src/app/add.ts

@@ -1,4 +1,3 @@
-import { randomUUID } from 'node:crypto'
 import { existsSync, readFileSync } from 'node:fs'
 import process from 'node:process'
 import mime from 'mime'
@@ -95,17 +94,18 @@ export async function addAppInternal(appId: string, options: Options, organizati
     p.log.warn(`Cannot find app icon in any of the following locations: ${icon}, ${newIconPath}`)
   }
 
-  const fileName = `icon_${randomUUID()}`
+  const fileName = `icon`
   let signedURL = 'https://xvwzpoazmxkqosrdewyv.supabase.co/storage/v1/object/public/images/capgo.png'
 
   // upload image if available
   if (iconBuff && iconType) {
     const { error } = await supabase.storage
-      .from(`images/${userId}/${appId}`)
+      .from(`images/org/${organizationUid}/${appId}`)
       .upload(fileName, iconBuff, {
         contentType: iconType,
       })
     if (error) {
+      console.error(error)
       p.log.error(`Could not add app ${formatError(error)}`)
       program.error('')
     }

package/src/app/delete.ts

@@ -3,7 +3,7 @@ import { program } from 'commander'
 import * as p from '@clack/prompts'
 import { checkAppExistsAndHasPermissionOrgErr } from '../api/app'
 import type { OptionsBase } from '../utils'
-import { OrganizationPerm, createSupabaseClient, findSavedKey, formatError, getConfig, useLogSnag, verifyUser } from '../utils'
+import { OrganizationPerm, createSupabaseClient, findSavedKey, formatError, getConfig, getOrganizationId, useLogSnag, verifyUser } from '../utils'
 
 export async function deleteApp(appId: string, options: OptionsBase) {
   p.intro(`Deleting`)
@@ -27,11 +27,11 @@ export async function deleteApp(appId: string, options: OptionsBase) {
   await checkAppExistsAndHasPermissionOrgErr(supabase, options.apikey, appId, OrganizationPerm.super_admin)
 
   const { data: appOwnerRaw, error: appOwnerError } = await supabase.from('apps')
-    .select(`owner_org ( created_by )`)
+    .select(`owner_org ( created_by, id )`)
     .eq('app_id', appId)
     .single()
 
-  const appOwner = appOwnerRaw as { owner_org: { created_by: string } } | null
+  const appOwner = appOwnerRaw as { owner_org: { created_by: string, id: string } } | null
 
   if (!appOwnerError && (appOwner?.owner_org.created_by ?? '') !== userId) {
     // We are dealing with a member user that is not the owner
@@ -66,10 +66,12 @@ export async function deleteApp(appId: string, options: OptionsBase) {
 
   const { error } = await supabase
     .storage
-    .from(`images/${userId}`)
-    .remove([appId])
-  if (error)
+    .from(`images`)
+    .remove([`org/${appOwner?.owner_org.id}/${appId}/icon`])
+  if (error) {
+    console.error(error, `images/org/${appOwner?.owner_org.id}/${appId}`)
     p.log.error('Could not delete app logo')
+  }
 
   const { error: delError } = await supabase
     .storage
@@ -84,17 +86,18 @@ export async function deleteApp(appId: string, options: OptionsBase) {
     .from('apps')
     .delete()
     .eq('app_id', appId)
-    .eq('user_id', userId)
+    // .eq('user_id', userId)
 
   if (dbError) {
     p.log.error('Could not delete app')
     program.error('')
   }
+  const orgId = await getOrganizationId(supabase, appId)
   await snag.track({
     channel: 'app',
     event: 'App Deleted',
     icon: '🗑️',
-    user_id: userId,
+    user_id: orgId,
     tags: {
       'app-id': appId,
     },

package/src/bundle/upload.ts

@@ -289,7 +289,7 @@ export async function uploadBundle(appid: string, options: Options, shouldExit =
         channel: 'app',
         event: 'App encryption',
         icon: '🔑',
-        user_id: userId,
+        user_id: orgId,
         tags: {
           'app-id': appid,
         },
@@ -319,7 +319,7 @@ It will be also visible in your dashboard\n`)
         channel: 'app-error',
         event: 'App Too Large',
         icon: '🚛',
-        user_id: userId,
+        user_id: orgId,
         tags: {
           'app-id': appid,
         },
@@ -345,7 +345,7 @@ It will be also visible in your dashboard\n`)
       channel: 'app',
       event: 'App external',
       icon: '📤',
-      user_id: userId,
+      user_id: orgId,
       tags: {
         'app-id': appid,
       },
@@ -387,7 +387,7 @@ It will be also visible in your dashboard\n`)
 
     try {
       if (options.multipart !== undefined && options.multipart) {
-        await uploadMultipart(supabase, appid, bundle, zipped)
+        await uploadMultipart(supabase, appid, bundle, zipped, orgId)
       }
       else {
         const url = await uploadUrl(supabase, appid, bundle)
@@ -496,7 +496,7 @@ It will be also visible in your dashboard\n`)
     channel: 'app',
     event: 'App Uploaded',
     icon: '⏫',
-    user_id: userId,
+    user_id: orgId,
     tags: {
       'app-id': appid,
     },

package/src/channel/add.ts

@@ -27,7 +27,7 @@ export async function addChannel(channelId: string, appId: string, options: Opti
   }
   const supabase = await createSupabaseClient(options.apikey)
 
-  const userId = await verifyUser(supabase, options.apikey, ['write', 'all'])
+  await verifyUser(supabase, options.apikey, ['write', 'all'])
   // Check we have app access to this appId
   await checkAppExistsAndHasPermissionOrgErr(supabase, options.apikey, appId, OrganizationPerm.admin)
 
@@ -50,7 +50,7 @@ export async function addChannel(channelId: string, appId: string, options: Opti
       channel: 'channel',
       event: 'Create channel',
       icon: '✅',
-      user_id: userId,
+      user_id: orgId,
       tags: {
         'app-id': appId,
         'channel': channelId,

package/src/channel/delete.ts

@@ -4,7 +4,7 @@ import * as p from '@clack/prompts'
 import { checkAppExistsAndHasPermissionOrgErr } from '../api/app'
 import { delChannel } from '../api/channels'
 import type { OptionsBase } from '../utils'
-import { OrganizationPerm, createSupabaseClient, findSavedKey, getConfig, useLogSnag, verifyUser } from '../utils'
+import { OrganizationPerm, createSupabaseClient, findSavedKey, getConfig, getOrganizationId, useLogSnag, verifyUser } from '../utils'
 
 export async function deleteChannel(channelId: string, appId: string, options: OptionsBase) {
   p.intro(`Delete channel`)
@@ -30,12 +30,13 @@ export async function deleteChannel(channelId: string, appId: string, options: O
   p.log.info(`Deleting channel ${appId}#${channelId} from Capgo`)
   try {
     await delChannel(supabase, channelId, appId, userId)
+    const orgId = await getOrganizationId(supabase, appId)
     p.log.success(`Channel deleted`)
     await snag.track({
       channel: 'channel',
       event: 'Delete channel',
       icon: '✅',
-      user_id: userId,
+      user_id: orgId,
       tags: {
         'user-id': userId,
         'app-id': appId,

package/src/channel/set.ts

@@ -161,9 +161,8 @@ export async function setChannel(channel: string, appId: string, options: Option
       channel: 'channel',
       event: 'Set channel',
       icon: '✅',
-      user_id: userId,
+      user_id: orgId,
       tags: {
-        'user-id': userId,
         'app-id': appId,
       },
       notify: false,

package/src/utils.ts

@@ -537,8 +537,19 @@ async function finishMultipartDownload(key: string, uploadId: string, url: strin
 }
 
 const PART_SIZE = 10 * 1024 * 1024
-export async function uploadMultipart(supabase: SupabaseClient<Database>, appId: string, name: string, data: Buffer): Promise<boolean> {
+export async function uploadMultipart(supabase: SupabaseClient<Database>, appId: string, name: string, data: Buffer, orgId: string): Promise<boolean> {
   try {
+    const snag = useLogSnag()
+    await snag.track({
+      channel: 'app',
+      event: 'App Multipart Prepare',
+      icon: '⏫',
+      user_id: orgId,
+      tags: {
+        'app-id': appId,
+      },
+      notify: false,
+    }).catch()
     const multipartPrep = await prepareMultipart(supabase, appId, name)
     if (!multipartPrep) {
       // Just pass the error
@@ -555,6 +566,16 @@ export async function uploadMultipart(supabase: SupabaseClient<Database>, appId:
 
     await finishMultipartDownload(multipartPrep.key, multipartPrep.uploadId, multipartPrep.url, parts)
 
+    await snag.track({
+      channel: 'app',
+      event: 'App Multipart done',
+      icon: '⏫',
+      user_id: orgId,
+      tags: {
+        'app-id': appId,
+      },
+      notify: false,
+    }).catch()
     return true
   }
   catch (e) {