@capgo/cli 3.14.63 → 3.14.67

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/cli",
-  "version": "3.14.63",
+  "version": "3.14.67",
   "description": "A CLI to upload to capgo servers",
   "main": "dist/index.js",
   "bin": {
@@ -14,8 +14,8 @@
     "url": "https://github.com/Cap-go/capgo-cli/issues"
   },
   "engines": {
-    "npm": ">=7.0.0",
-    "node": ">=16.0.0"
+    "npm": ">=8.0.0",
+    "node": ">=20.0.0"
   },
   "keywords": [
     "appflow alternative",
@@ -29,11 +29,11 @@
     "capgo-cli"
   ],
   "scripts": {
-    "dev": "set NODE_ENV=development && npx webpack --config webpack.config.js",
+    "build": "node build.mjs",
+    "dev": "NODE_ENV=development node build.mjs",
     "no-debug": "node dist/index.js",
     "test": "npx --yes ts-node -T src/index.ts",
-    "build": "npx --yes webpack --config webpack.config.js",
-    "dev-build": "SUPA_DB=development npx webpack --config webpack.config.js",
+    "dev-build": "SUPA_DB=development node build.mjs",
     "pack": "pkg",
     "types": "npx --yes supabase gen types typescript --project-id=xvwzpoazmxkqosrdewyv > src/types/supabase.types.ts",
     "test_rls": "ts-node ./test/test_headers_rls.ts",
@@ -42,56 +42,53 @@
   "author": "github.com/riderx",
   "license": "Apache 2.0",
   "dependencies": {
-    "@capacitor/cli": "5.5.1",
-    "@capgo/find-package-manager": "^0.0.7",
+    "@capacitor/cli": "5.7.0",
+    "@capgo/find-package-manager": "^0.0.9",
     "@clack/prompts": "^0.7.0",
-    "@supabase/supabase-js": "^2.38.5",
+    "@supabase/supabase-js": "^2.39.3",
     "@tomasklaen/checksum": "^1.1.0",
     "@trufflesuite/spinnies": "^0.1.1",
     "adm-zip": "^0.5.10",
-    "axios": "^1.6.2",
     "ci-info": "^4.0.0",
-    "commander": "11.1.0",
-    "console-table-printer": "^2.11.2",
+    "commander": "12.0.0",
+    "console-table-printer": "^2.12.0",
     "get-latest-version": "^5.1.0",
+    "ky": "^1.2.0",
     "logsnag": "1.0.0",
-    "mime": "^3.0.0",
+    "mime": "^4.0.1",
     "node-dir": "^0.1.17",
-    "open": "^9.1.0",
+    "open": "^10.0.3",
     "prettyjson": "^1.2.5",
     "prompt-sync": "^4.2.0",
     "qrcode": "^1.5.3",
-    "semver": "^7.5.4"
+    "semver": "^7.6.0"
   },
   "devDependencies": {
     "@types/adm-zip": "0.5.5",
     "@types/mime": "^3.0.4",
-    "@types/node": "^20.9.4",
+    "@types/node": "^20.11.17",
     "@types/node-dir": "^0.0.37",
     "@types/npmcli__ci-detect": "^2.0.3",
     "@types/prettyjson": "^0.0.33",
     "@types/prompt-sync": "^4.2.3",
     "@types/qrcode": "^1.5.5",
     "@types/semver": "^7.5.6",
-    "@typescript-eslint/eslint-plugin": "6.12.0",
-    "@typescript-eslint/parser": "6.12.0",
-    "eslint": "8.55.0",
+    "@typescript-eslint/eslint-plugin": "6.21.0",
+    "@typescript-eslint/parser": "6.21.0",
+    "esbuild": "^0.20.0",
+    "eslint": "8.56.0",
     "eslint-config-airbnb-base": "^15.0.0",
-    "eslint-config-prettier": "^9.0.0",
+    "eslint-config-prettier": "^9.1.0",
     "eslint-import-resolver-typescript": "3.6.1",
-    "eslint-plugin-import": "2.29.0",
-    "eslint-plugin-prettier": "^5.0.1",
+    "eslint-plugin-import": "2.29.1",
+    "eslint-plugin-prettier": "^5.1.3",
     "git-format-staged": "3.0.0",
-    "husky": "^8.0.3",
-    "nodemon": "3.0.2",
+    "husky": "^9.0.10",
     "pkg": "5.8.1",
-    "prettier": "3.1.1",
+    "prettier": "3.2.5",
     "ts-loader": "^9.5.1",
-    "ts-node": "^10.9.1",
+    "ts-node": "^10.9.2",
     "tsconfig-paths": "4.2.0",
-    "typescript": "5.3.3",
-    "webpack": "5.89.0",
-    "webpack-cli": "^5.1.4",
-    "webpack-node-externals": "^3.0.0"
+    "typescript": "5.3.3"
   }
 }

package/src/api/app.ts

@@ -1,7 +1,7 @@
 import { SupabaseClient } from '@supabase/supabase-js';
 import * as p from '@clack/prompts';
 import { program } from 'commander';
-import { Database } from 'types/supabase.types';
+import { Database } from '../types/supabase.types';
 import { isAllowedApp, isAllowedAppOrg, OptionsBase, OrganizationPerm } from '../utils';
 
 export const checkAppExists = async (supabase: SupabaseClient<Database>, appid: string) => {

package/src/api/channels.ts

@@ -2,7 +2,7 @@ import { SupabaseClient } from '@supabase/supabase-js';
 import { program } from 'commander';
 import { Table } from 'console-table-printer';
 import * as p from '@clack/prompts';
-import { Database } from 'types/supabase.types';
+import { Database } from '../types/supabase.types';
 import { formatError, getHumanDate } from '../utils';
 
 export const checkVersionNotUsedInChannel = async (supabase: SupabaseClient<Database>,

package/src/api/crypto.ts

@@ -4,7 +4,7 @@ import {
     constants,
     publicEncrypt, privateDecrypt,
     randomBytes, createCipheriv, createDecipheriv
-} from 'crypto';
+} from 'node:crypto';
 
 const algorithm = "aes-128-cbc";
 const oaepHash = 'sha256';

package/src/api/devices_override.ts

@@ -1,7 +1,7 @@
 import { SupabaseClient } from '@supabase/supabase-js';
 import { program } from 'commander';
 import * as p from '@clack/prompts';
-import { Database } from 'types/supabase.types';
+import { Database } from '../types/supabase.types';
 import { formatError } from '../utils';
 
 export const checkVersionNotUsedInDeviceOverride = async (supabase: SupabaseClient<Database>,

package/src/api/versions.ts

@@ -2,7 +2,7 @@ import { SupabaseClient } from '@supabase/supabase-js';
 import { program } from 'commander';
 import { Table } from 'console-table-printer';
 import * as p from '@clack/prompts';
-import { Database } from 'types/supabase.types';
+import { Database } from '../types/supabase.types';
 // import { definitions } from '../types/types_supabase';
 import { getHumanDate } from '../utils';
 import { checkVersionNotUsedInChannel } from './channels';

package/src/app/add.ts

@@ -1,5 +1,5 @@
-import { randomUUID } from 'crypto';
-import { getType } from 'mime';
+import { randomUUID } from 'node:crypto';
+import mime from 'mime';
 import { program } from 'commander';
 import * as p from '@clack/prompts';
 import { existsSync, readFileSync } from 'node:fs';
@@ -56,13 +56,13 @@ export const addApp = async (appId: string, options: Options, throwErr = true) =
 
   if (icon && existsSync(icon)) {
     iconBuff = readFileSync(icon);
-    const contentType = getType(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 = getType(newIconPath);
+    const contentType = mime.getType(newIconPath);
     iconType = contentType || 'image/png';
     p.log.warn(`Found app icon ${newIconPath}`);
   } else {

package/src/app/debug.ts

@@ -2,7 +2,7 @@ import * as p from '@clack/prompts';
 import { SupabaseClient } from '@supabase/supabase-js';
 import { program } from 'commander';
 import LogSnag from 'logsnag';
-import { Database } from 'types/supabase.types';
+import { Database } from '../types/supabase.types';
 import { checkAppExistsAndHasPermissionErr } from '../api/app';
 import { checkLatest } from '../api/update';
 import { convertAppName, createSupabaseClient, findSavedKey, getLocalConfig, useLogSnag, verifyUser, getConfig } from '../utils';
@@ -50,7 +50,9 @@ interface QueryStats {
 export async function getStats(supabase: SupabaseClient<Database>, query: QueryStats)
 : Promise<Database['public']['Tables']['stats']['Row'] | null> {
     try {
-        const res = await supabase.functions.invoke('get_stats', { body: JSON.stringify(query) })
+        const pathStats = 'get_stats'
+        // const pathStats = 'private/stats' // TODO: switch to new endpoint when new backend released
+        const res = await supabase.functions.invoke(pathStats, { body: JSON.stringify(query) })
         const listData = res.data.data as Database['public']['Tables']['stats']['Row'][]
         if (listData?.length > 0) {
             return listData[0]

package/src/app/info.ts

@@ -1,6 +1,6 @@
 import { readFileSync } from "fs"
-import { join } from "path"
-import os from 'os';
+import { join } from "node:path"
+import os from 'node:os';
 import getLatest from "get-latest-version"
 import Spinnies from '@trufflesuite/spinnies';
 import pack from '../../package.json'

package/src/app/list.ts

@@ -2,7 +2,7 @@ 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 { Database } from '../types/supabase.types';
 import { OptionsBase, createSupabaseClient, findSavedKey, getHumanDate, verifyUser } from '../utils';
 import { checkLatest } from '../api/update';
 

package/src/app/set.ts

@@ -1,5 +1,5 @@
 import { randomUUID } from "crypto";
-import { getType } from 'mime';
+import mime from 'mime';
 import { program } from "commander";
 import * as p from '@clack/prompts';
 import { existsSync, readFileSync } from "node:fs";
@@ -44,13 +44,13 @@ export const setApp = async (appId: string, options: Options) => {
 
     if (icon && existsSync(icon)) {
         iconBuff = readFileSync(icon);
-        const contentType = getType(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 = getType(newIconPath);
+        const contentType = mime.getType(newIconPath);
         iconType = contentType || 'image/png';
         p.log.warn(`Found app icon ${newIconPath}`);
     } else {

package/src/bundle/check.ts

@@ -1,4 +1,4 @@
-import fs from "fs";
+import fs from 'node:fs';
 import path from "path";
 
 const searchInFile = (filePath: string, searchString: string) => {

package/src/bundle/cleanup.ts

@@ -3,7 +3,7 @@ import semver from 'semver/preload';
 import * as p from '@clack/prompts';
 import promptSync from 'prompt-sync';
 import { SupabaseClient } from '@supabase/supabase-js';
-import { Database } from 'types/supabase.types';
+import { Database } from '../types/supabase.types';
 import { OptionsBase, createSupabaseClient, findSavedKey, getConfig, getHumanDate, verifyUser } from '../utils';
 import { deleteSpecificVersion, displayBundles, getActiveAppVersions, getChannelsVersion } from '../api/versions';
 import { checkAppExistsAndHasPermissionErr } from '../api/app';

package/src/bundle/decrypt.ts

@@ -1,4 +1,4 @@
-import { existsSync, readFileSync, writeFileSync } from 'fs'
+import { existsSync, readFileSync, writeFileSync } from 'node:fs'
 import { program } from 'commander'
 import * as p from '@clack/prompts';
 import { decryptSource } from '../api/crypto';

package/src/bundle/unlink.ts

@@ -1,11 +1,11 @@
 import { program } from 'commander';
 import * as p from '@clack/prompts';
-import { getVersionData } from 'api/versions';
+import { getVersionData } from '../api/versions';
 import { checkVersionNotUsedInDeviceOverride } from '../api/devices_override';
 import { checkVersionNotUsedInChannel } from '../api/channels';
 import { checkAppExistsAndHasPermissionErr } from "../api/app";
 import {
-    OptionsBase, 
+    OptionsBase,
     getConfig, createSupabaseClient,
     formatError, findSavedKey, checkPlanValid, useLogSnag, verifyUser
 } from '../utils';
@@ -47,7 +47,7 @@ export const unlinkDevice = async (channel: string, appId: string, options: Opti
         program.error('');
     }
     try {
-        await checkPlanValid(supabase, userId)
+        await checkPlanValid(supabase, userId, appId, options.apikey)
 
         const versionData = await getVersionData(supabase, appId, userId, bundle);
         await checkVersionNotUsedInChannel(supabase, appId, userId, versionData);

package/src/bundle/upload.ts

@@ -1,11 +1,11 @@
-import { randomUUID } from 'crypto';
-import { existsSync, readFileSync } from 'fs';
+import { randomUUID } from 'node:crypto';
+import { existsSync, readFileSync } from 'node:fs';
 import AdmZip from 'adm-zip';
 import { program } from 'commander';
 import * as p from '@clack/prompts';
 import { checksum as getChecksum } from '@tomasklaen/checksum';
 import ciDetect from 'ci-info';
-import axios from "axios";
+import ky from 'ky';
 import { checkLatest } from '../api/update';
 import { checkAppExistsAndHasPermissionOrgErr } from "../api/app";
 import { encryptSource } from '../api/crypto';
@@ -19,7 +19,8 @@ import {
   getLocalDepenencies,
   verifyUser,
   OrganizationPerm,
-  hasOrganizationPerm
+  hasOrganizationPerm,
+  getAppOwner
 } from '../utils';
 import { checkIndexPosition, searchInDirectory } from './check';
 
@@ -54,10 +55,10 @@ export const uploadBundle = async (appid: string, options: Options, shouldExit =
   channel = channel || 'dev';
 
   const config = await getConfig();
-  const localS3: boolean = (config.app.extConfig.plugins && config.app.extConfig.plugins.CapacitorUpdater 
+  const localS3: boolean = (config.app.extConfig.plugins && config.app.extConfig.plugins.CapacitorUpdater
     && config.app.extConfig.plugins.CapacitorUpdater.localS3) === true;
 
-  const checkNotifyAppReady = options.codeCheck 
+  const checkNotifyAppReady = options.codeCheck
   appid = appid || config?.app?.appId
   // create bundle name format : 1.0.0-beta.x where x is a uuid
   const uuid = randomUUID().split('-')[0];
@@ -90,8 +91,8 @@ export const uploadBundle = async (appid: string, options: Options, shouldExit =
     }
     const foundIndex = checkIndexPosition(path);
     if (!foundIndex) {
-        p.log.error(`index.html is missing in the root folder or in the only folder in the root folder`);
-        program.error('');
+      p.log.error(`index.html is missing in the root folder or in the only folder in the root folder`);
+      program.error('');
     }
   }
 
@@ -100,22 +101,22 @@ export const uploadBundle = async (appid: string, options: Options, shouldExit =
   const localConfig = await getLocalConfig()
   const supabase = await createSupabaseClient(options.apikey)
   const userId = await verifyUser(supabase, options.apikey, ['write', 'all', 'upload']);
-  await checkPlanValid(supabase, userId, false)
   // Check we have app access to this appId
   // await checkAppExistsAndHasPermissionErr(supabase, options.apikey, appid);
 
   const permissions = await checkAppExistsAndHasPermissionOrgErr(supabase, options.apikey, appid, OrganizationPerm.upload)
+  await checkPlanValid(supabase, userId, appid, options.apikey, false)
 
   const updateMetadataRequired = await requireUpdateMetadata(supabase, channel)
 
   // Check compatibility here
   const { data: channelData, error: channelError } = await supabase
-  .from('channels')
-  .select('version ( minUpdateVersion, native_packages )')
-  .eq('name', channel)
-  .eq('app_id', appid)
-  .single()
-      
+    .from('channels')
+    .select('version ( minUpdateVersion, native_packages )')
+    .eq('name', channel)
+    .eq('app_id', appid)
+    .single()
+
   // eslint-disable-next-line no-undef-init
   let localDependencies: Awaited<ReturnType<typeof getLocalDepenencies>> | undefined = undefined;
   let finalCompatibility: Awaited<ReturnType<typeof checkCompatibility>>['finalCompatibility'];
@@ -124,14 +125,14 @@ export const uploadBundle = async (appid: string, options: Options, shouldExit =
   if (!channelError && channelData && channelData.version && (channelData.version as any).native_packages && !ignoreMetadataCheck) {
     const spinner = p.spinner();
     spinner.start(`Checking bundle compatibility with channel ${channel}`);
-    const { 
+    const {
       finalCompatibility: finalCompatibilityWithChannel,
-      localDependencies: localDependenciesWithChannel 
+      localDependencies: localDependenciesWithChannel
     } = await checkCompatibility(supabase, appid, channel)
 
     finalCompatibility = finalCompatibilityWithChannel
     localDependencies = localDependenciesWithChannel
-    
+
     if (finalCompatibility.find((x) => x.localVersion !== x.remoteVersion)) {
       p.log.error(`Your bundle is not compatible with the channel ${channel}`);
       p.log.warn(`You can check compatibility with "npx @capgo/cli bundle compatibility"`);
@@ -147,7 +148,7 @@ export const uploadBundle = async (appid: string, options: Options, shouldExit =
           p.log.error('Invalid remote min update version, skipping auto setting compatibility');
           program.error('');
         }
-  
+
         minUpdateVersion = lastMinUpdateVersion
         p.log.info(`Auto set min-update-version to ${minUpdateVersion}`);
       } catch (error) {
@@ -285,15 +286,17 @@ It will be also visible in your dashboard\n`);
   }
 
   const hashedLocalDependencies = localDependencies ? new Map(localDependencies
-      .filter((a) => !!a.native && a.native !== undefined)
-      .map((a) => [a.name, a])) : new Map()
+    .filter((a) => !!a.native && a.native !== undefined)
+    .map((a) => [a.name, a])) : new Map()
 
   // eslint-disable-next-line max-len
   const nativePackages = (hashedLocalDependencies.size > 0 || !options.ignoreMetadataCheck) ? Array.from(hashedLocalDependencies, ([name, value]) => ({ name, version: value.version })) : undefined
 
+  const appOwner = await getAppOwner(supabase, appid)
+
   const versionData = {
     bucket_id: external ? undefined : fileName,
-    user_id: userId,
+    user_id: appOwner,
     name: bundle,
     app_id: appid,
     session_key: sessionKey,
@@ -317,20 +320,18 @@ It will be also visible in your dashboard\n`);
       p.log.error(`Cannot get upload url`);
       program.error('');
     }
-
-    await axios({
-      method: "put",
-      url,
-      data: zipped,
+    await ky.put(url, {
+      body: zipped,
       headers: (!localS3 ? {
-       "Content-Type": "application/octet-stream",
-       "Cache-Control": "public, max-age=456789, immutable",
-       "x-amz-meta-crc32": checksum,
+        "Content-Type": "application/octet-stream",
+        "Cache-Control": "public, max-age=456789, immutable",
+        "x-amz-meta-crc32": checksum,
       } : undefined)
     })
     versionData.storage_provider = 'r2'
     const { error: dbError2 } = await updateOrCreateVersion(supabase, versionData, options.apikey)
     if (dbError2) {
+      console.log(dbError2)
       p.log.error(`Cannot update bundle ${formatError(dbError)}`);
       program.error('');
     }
@@ -344,11 +345,12 @@ It will be also visible in your dashboard\n`);
     const { error: dbError3, data } = await updateOrCreateChannel(supabase, {
       name: channel,
       app_id: appid,
-      created_by: userId,
+      created_by: appOwner,
       version: versionId,
     })
     if (dbError3) {
       p.log.error(`Cannot set channel, the upload key is not allowed to do that, use the "all" for this.`);
+      console.log(dbError3)
       program.error('');
     }
     const appidWeb = convertAppName(appid)
@@ -359,7 +361,7 @@ It will be also visible in your dashboard\n`);
       p.log.info(`Link device to this bundle to try it: ${bundleUrl}`);
     }
 
-    if(options.bundleUrl) {
+    if (options.bundleUrl) {
       p.log.info(`Bundle url: ${bundleUrl}`);
     }
   } else if (!versionId) {

package/src/bundle/zip.ts

@@ -1,5 +1,5 @@
-import { randomUUID } from 'crypto';
-import { writeFileSync } from 'fs';
+import { randomUUID } from 'node:crypto';
+import { writeFileSync } from 'node:fs';
 import AdmZip from 'adm-zip';
 import { program } from 'commander';
 import * as p from '@clack/prompts';

package/src/channel/set.ts

@@ -1,6 +1,6 @@
 import { program } from 'commander';
 import * as p from '@clack/prompts';
-import { Database } from 'types/supabase.types';
+import { Database } from '../types/supabase.types';
 import { checkAppExistsAndHasPermissionErr } from "../api/app";
 import {
   OptionsBase,
@@ -66,7 +66,7 @@ export const setChannel = async (channel: string, appId: string, options: Option
     program.error('');
   }
   try {
-    await checkPlanValid(supabase, userId)
+    await checkPlanValid(supabase, userId, appId, options.apikey)
     const channelPayload: Database['public']['Tables']['channels']['Insert'] = {
       created_by: userId,
       app_id: appId,

package/src/index.ts

@@ -64,7 +64,6 @@ app
 
 app
   .command('delete [appId]')
-  .alias('d')
   .description('Delete an app in Capgo Cloud')
   .action(deleteApp)
   .option('-a, --apikey <apikey>', 'apikey to link to your account');
@@ -78,7 +77,6 @@ app
 
 app
   .command('debug  [appId]')
-  .alias('d')
   .description('Listen for live updates event in Capgo Cloud to debug your app')
   .option('-a, --apikey <apikey>', 'apikey to link to your account')
   .option('-d, --device <device>', 'the specific device to debug')
@@ -151,7 +149,6 @@ bundle
 
 bundle
   .command('unlink [appId]')
-  .alias('u')
   .description('Unlink a bundle in Capgo Cloud')
   .action(listBundle)
   .option('-a, --apikey <apikey>', 'apikey to link to your account')
@@ -169,7 +166,6 @@ bundle
 
 bundle
   .command('decrypt [zipPath] [sessionKey]')
-  .alias('l')
   .description('Decrypt a signed zip bundle')
   .action(decryptZip)
   .option('--key <key>', 'custom path for private signing key')

package/src/init.ts

@@ -1,11 +1,11 @@
-import { writeFileSync, readFileSync } from 'fs';
+import { writeFileSync, readFileSync } from 'node:fs';
 import { execSync, ExecSyncOptions, spawnSync } from 'child_process';
 import { findPackageManagerType } from '@capgo/find-package-manager'
 import * as p from '@clack/prompts';
 import { SupabaseClient } from '@supabase/supabase-js';
 import LogSnag from 'logsnag';
 import semver from 'semver'
-import { Database } from 'types/supabase.types';
+import { Database } from './types/supabase.types';
 import { markSnag , waitLog } from './app/debug';
 import { createKey } from './key';
 import { addChannel } from './channel/add';

package/src/key.ts

@@ -1,4 +1,4 @@
-import { existsSync, readFileSync, writeFileSync } from 'fs'
+import { existsSync, readFileSync, writeFileSync } from 'node:fs'
 import { program } from 'commander'
 import { writeConfig } from '@capacitor/cli/dist/config';
 import * as p from '@clack/prompts';

package/src/login.ts

@@ -1,5 +1,5 @@
-import { existsSync, writeFileSync, appendFileSync } from 'fs'
-import { homedir } from 'os'
+import { existsSync, writeFileSync, appendFileSync } from 'node:fs'
+import { homedir } from 'node:os'
 import { program } from 'commander';
 import * as p from '@clack/prompts';
 import { createSupabaseClient, useLogSnag, verifyUser } from './utils';

package/src/utils.ts

@@ -1,15 +1,15 @@
-import { existsSync, readdirSync, readFileSync } from 'fs';
-import { homedir } from 'os';
-import { resolve } from 'path';
+import { existsSync, readdirSync, readFileSync } from 'node:fs';
+import { homedir } from 'node:os';
+import { resolve } from 'node:path';
 import { loadConfig } from '@capacitor/cli/dist/config';
 import { program } from 'commander';
 import { createClient, SupabaseClient } from '@supabase/supabase-js';
 import prettyjson from 'prettyjson';
 import { LogSnag } from 'logsnag';
 import * as p from '@clack/prompts';
-import { Database } from 'types/supabase.types';
-import axios from 'axios';
+import ky from 'ky';
 import { promiseFiles } from 'node-dir'
+import { Database } from './types/supabase.types';
 
 export const baseKey = '.capgo_key';
 export const baseKeyPub = `${baseKey}.pub`;
@@ -68,9 +68,9 @@ interface CapgoConfig {
 export const getRemoteConfig = async () => {
     // call host + /api/get_config and parse the result as json using axios
     const localConfig = await getLocalConfig()
-    return axios
+    return ky
         .get(`${defaultApiHost}/get_config`)
-        .then((res) => res.data as CapgoConfig)
+        .then((res) => res.json<CapgoConfig>())
         .then(data => ({ ...data, ...localConfig } as CapgoConfig))
         .catch(() => {
             console.log('Local config', localConfig);
@@ -144,6 +144,31 @@ export const isAllowedAction = async (supabase: SupabaseClient<Database>, userId
     return !!data
 }
 
+export const isAllowedActionAppIdApiKey = async (supabase: SupabaseClient<Database>, appId: string, apikey: string): Promise<boolean> => {
+    const { data } = await supabase
+        .rpc('is_allowed_action', { apikey, appid: appId })
+        .single()
+
+    return !!data
+}
+
+export const getAppOwner = async (supabase: SupabaseClient<Database>, appId: string): Promise<string> => {
+    const { data, error } = await supabase
+        .from('apps')
+        .select('user_id')
+        .eq('app_id', appId)
+        .single()
+
+    if (error) {
+        p.log.error('Cannot get app owner, exiting')
+        p.log.error('Please report the following error to capgo\'s staff')
+        console.error(error)
+        process.exit(1)
+    }
+
+    return data.user_id
+}
+
 export const isAllowedApp = async (supabase: SupabaseClient<Database>, apikey: string, appId: string): Promise<boolean> => {
     const { data } = await supabase
         .rpc('is_app_owner', { apikey, appid: appId })
@@ -251,9 +276,9 @@ export const isAllowedAppOrg = async (
     }
 }
 
-export const checkPlanValid = async (supabase: SupabaseClient<Database>, userId: string, warning = true) => {
+export const checkPlanValid = async (supabase: SupabaseClient<Database>, userId: string, appId: string, apikey: string, warning = true) => {
     const config = await getRemoteConfig()
-    const validPlan = await isAllowedAction(supabase, userId)
+    const validPlan = await isAllowedActionAppIdApiKey(supabase, appId, apikey)
     if (!validPlan) {
         p.log.error(`You need to upgrade your plan to continue to use capgo.\n Upgrade here: ${config.hostWeb}/dashboard/settings/plans\n`);
         setTimeout(() => {
@@ -379,7 +404,9 @@ export async function uploadUrl(supabase: SupabaseClient<Database>, appId: strin
         bucket_id: bucketId,
     }
     try {
-        const res = await supabase.functions.invoke('upload_link', { body: JSON.stringify(data) })
+        const pathUploadLink = 'private/upload_link'
+        // const pathUploadLink = 'private/upload_link' // TODO: switch to new endpoint when new backend released
+        const res = await supabase.functions.invoke(pathUploadLink, { body: JSON.stringify(data) })
         return res.data.url
     } catch (error) {
         p.log.error(`Cannot get upload url ${JSON.stringify(error)}`);